Fixes #2843 New main screen UI in v3.0 (#3891)

* Add additional classes from 2019 hackathon implementation

* Make first tab work

* Make explore tab work

* Handle back button for contrib and nearby

* Fix framelayout and nav bar allignment

* Fix nav bar tint

* Fix nearby card layout

* Make contributions number visible

* Change menu icon according to fragment

* Make notification icon work and remove drawer

* Make favourites accessible from nav bar

* Turn bookmark and explore activities into fragments

* Use bottom sheet instead of more fragment

* Add actions

* Remove unused classes

* Fix indentation

* remove more fragment title

* Fix explore fragment indentation

* Make toolbar settings as we wanted

* Set card view styles

* Make colors for explore actiivty

* Remove drawer from achievements activity

* Add back button to achievements activity

* remove drawer from review activity

* Remove drawer from settings activity

* Remove drawer from about activity

* Fix dagger injection of fragment

* Implement skip login version

* Add theme missing colors

* Add style to moresheet

* refactor name

* call login with button

* Remove all old bookmarks activity dependency

* Make explore tab items clickable

* Do nothing if same tab is selected

* Fix notification icon color for dark theme

* Fix wrong drawable colors

* Handle back button after media details is visible from contrib and explore fragments

* make favourites open media details

* Fix profile icon

* Make user name visible instead

* Move user back to contrib fragment

* Remove NavigationBaseAvticity

* Fix typo in bookmark fragment

* Fix menu button colors

* Remove explore activity

* remove drawer and dependencies

* Make bookmark media details visible

* Cleanup code

* Code cleanup

* Remove unused layout

* Make contriblist UI look like in mockups

* Change limited connecton toggle

* Move list menu item to nearby fragment

* Fix search button crash

* Make media detail appear

* Back button added

* Fix back button npe

* Change bookmark list view

* Fix always the firs item displayed issue

* Allign contrib list bottom line to simple drawee bottom

* fix fragment string

* Fix back button for mobile uploads

* Make lists appear

* Make fav item selected

* Make favourites clickable

* Add back button to media details

* Add toolbar of notification activity

* Change contributions icon

* Fix card UI

* Fix back button in explore

* Make card views look similar to mockups

* Solve campaign bug visible issue

* Make borders a little softer
This commit is contained in:
neslihanturan 2020-11-06 19:04:04 +03:00 committed by GitHub
parent 5d82629109
commit 71d200ee41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
110 changed files with 2225 additions and 1629 deletions

View file

@ -32,7 +32,7 @@
<item name="buttonBackgroundPressed">@color/pressed_button_dark</item>
<item name="textDisabled">@color/disabled_button_text_color_dark</item>
<item name="textEnabled">@color/enabled_button_text_color_dark</item>
<item name="mainCardBackground">@color/main_background_dark</item>
<item name="mainCardBackground">@color/black</item>
<item name="mainScreenNearbyPermissionbutton">@style/DarkFlatNearbyPermissionButton</item>
<item name="iconInfo24">@drawable/ic_info_outline_24dp</item>
<item name="iconMap24" >@drawable/ic_map_white_24dp</item>
@ -40,14 +40,27 @@
<item name="mediaDetailsHeadingText">@color/layout_light_grey</item>
<item name="mediaDetailNominationBackground">@color/deleteRedDark</item>
<item name="mediaDetailSpacerColor">@color/browser_actions_divider_color</item>
<item name="nav_tab_item_color_state">@color/color_state_nav_tab_dark</item>
<item name="navbar_item_text_color">@color/color_state_nav_tab_dark</item>
<item name="nav_bar_background">@color/main_background_dark</item>
<item name="toolbar_text_color">@color/white</item>
<item name="more_bottom_sheet_style">@style/DarkMoreBottomSheetStyle</item>
<item name="more_bottom_sheet_drawable_color">@color/white</item>
<item name="card_item_color">@color/white</item>
<item name="notification_icon_drawable">@drawable/ic_notifications_white_24dp</item>
<item name="notification_icon_text_color">@color/white</item>
<item name="toggle_theme">@style/SwitchThemeDark</item>
<item name="contributionsListTextPrimary">@color/white</item>
<item name="contributionsListTextSecondary">@color/browser_actions_divider_color</item>
<item name="menu_item_tint">@color/white</item>
</style>
<style name="LightAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="contributionsListBackground">@color/white</item>
<item name="tabBackground">@color/primaryColor</item>
<item name="tabIndicatorColor">@color/white</item>
<item name="tabSelectedTextColor">@color/white</item>
<item name="tabTextColor">@color/white</item>
<item name="tabBackground">@color/card_light_grey</item>
<item name="tabIndicatorColor">@color/primaryDarkColor</item>
<item name="tabSelectedTextColor">@color/primaryDarkColor</item>
<item name="tabTextColor">@color/primaryDarkColor</item>
<item name="mainBackground">@color/main_background_light</item>
<item name="achievementBackground">@color/achievement_background_light</item>
<item name="drawerHeaderBackground">@color/drawerHeader_background_light</item>
@ -73,14 +86,45 @@
<item name="buttonBackgroundPressed">@color/pressed_button_light</item>
<item name="textDisabled">@color/disabled_button_text_color_light</item>
<item name="textEnabled">@color/enabled_button_text_color_light</item>
<item name="mainCardBackground">@color/primaryDarkColor</item>
<item name="mainCardBackground">@color/card_light_grey</item>
<item name="mainScreenNearbyPermissionbutton">@style/LightFlatNearbyPermissionButton</item>
<item name="iconInfo24">@drawable/ic_info_outline_dark_24dp</item>
<item name="iconMap24">@drawable/ic_map_dark_24dp</item>
<item name="mediaDetailsText">@color/enabled_button_text_color_light</item>
<item name="mediaDetailsHeadingText">@color/primaryDarkColor</item>
<item name="mediaDetailsHeadingText">@color/primaryColor</item>
<item name="mediaDetailNominationBackground">@color/deleteRed</item>
<item name="mediaDetailSpacerColor">@color/divider_grey</item>
<item name="nav_tab_item_color_state">@color/color_state_nav_tab_light</item>
<item name="navbar_item_text_color">@color/color_state_nav_tab_light</item>
<item name="nav_bar_background">@color/white</item>
<item name="toolbar_text_color">@color/primaryDarkColor</item>
<item name="more_bottom_sheet_style">@style/LightMoreBottomSheetStyle</item>
<item name="more_bottom_sheet_drawable_color">@color/black</item>
<item name="card_item_color">@color/primaryDarkColor</item>
<item name="notification_icon_drawable">@drawable/ic_notifications_blue_24dp</item>
<item name="notification_icon_text_color">@color/primaryDarkColor</item>
<item name="toggle_theme">@style/SwitchThemeLight</item>
<item name="contributionsListTextPrimary">@color/black</item>
<item name="contributionsListTextSecondary">@color/disabled_button_text_color_dark</item>
<item name="menu_item_tint">@color/primaryDarkColor</item>
</style>
<style name="LightMoreBottomSheetStyle" parent="LightAppTheme">
<item name="android:background">@color/white</item>
<item name="android:textColor">@color/black</item>
</style>
<style name="DarkMoreBottomSheetStyle" parent="DarkAppTheme">
<item name="android:background">@color/black</item>
<item name="android:textColor">@color/white</item>
</style>
<style name="LightToolbarStyle" parent="LightAppTheme">
<item name="android:background">@color/white</item>
</style>
<style name="DarkToolbarStyle" parent="DarkAppTheme">
<item name="android:textColor">@color/primaryDarkColor</item>
</style>
<style name="WhiteSearchBarTheme" parent="DarkAppTheme">
@ -172,4 +216,12 @@
<item name="android:textSize">@dimen/description_text_size</item>
</style>
<style name="SwitchThemeLight" parent="LightAppTheme" >
<item name="colorControlActivated">@color/primaryDarkColor</item>
</style>
<style name="SwitchThemeDark" parent="DarkAppTheme" >
<item name="colorControlActivated">@color/primaryColor</item>
</style>
</resources>