Dbrant has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364233 )
Change subject: Hygiene: dark mode cleanup: tab colors and selectors. ...................................................................... Hygiene: dark mode cleanup: tab colors and selectors. This cleans up several colors and selectors that can be coalesced, or are no longer necessary. Change-Id: I5008dc94b0ff839050502945cdbdb02093af3afa --- R app/src/main/res/drawable/tab_item_selector.xml D app/src/main/res/drawable/tab_item_selector_dark.xml C app/src/main/res/drawable/tab_item_shape.xml D app/src/main/res/drawable/tab_item_shape_light.xml R app/src/main/res/drawable/tab_item_shape_selected.xml D app/src/main/res/drawable/tab_item_shape_selected_dark.xml D app/src/main/res/drawable/tab_item_shape_selected_light.xml M app/src/main/res/layout/activity_page.xml M app/src/main/res/layout/item_tab_entry.xml M app/src/main/res/values/colors.xml M app/src/main/res/values/styles_dark.xml M app/src/main/res/values/styles_light.xml 12 files changed, 13 insertions(+), 45 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/33/364233/1 diff --git a/app/src/main/res/drawable/tab_item_selector_light.xml b/app/src/main/res/drawable/tab_item_selector.xml similarity index 64% rename from app/src/main/res/drawable/tab_item_selector_light.xml rename to app/src/main/res/drawable/tab_item_selector.xml index 0974c4d..b5ad1d2 100644 --- a/app/src/main/res/drawable/tab_item_selector_light.xml +++ b/app/src/main/res/drawable/tab_item_selector.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> - <selector xmlns:android="http://schemas.android.com/apk/res/android";> - <item android:state_checked="true" android:drawable="@drawable/tab_item_shape_selected_light" /> - <item android:state_pressed="true" android:drawable="@drawable/tab_item_shape_selected_light" /> - <item android:drawable="@drawable/tab_item_shape_light" /> + <item android:state_checked="true" android:drawable="@drawable/tab_item_shape_selected" /> + <item android:state_pressed="true" android:drawable="@drawable/tab_item_shape_selected" /> + <item android:drawable="@drawable/tab_item_shape" /> </selector> \ No newline at end of file diff --git a/app/src/main/res/drawable/tab_item_selector_dark.xml b/app/src/main/res/drawable/tab_item_selector_dark.xml deleted file mode 100644 index 7706b2b..0000000 --- a/app/src/main/res/drawable/tab_item_selector_dark.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<selector xmlns:android="http://schemas.android.com/apk/res/android";> - <item android:state_checked="true" android:drawable="@drawable/tab_item_shape_selected_dark" /> - <item android:state_pressed="true" android:drawable="@drawable/tab_item_shape_selected_dark" /> - <item android:drawable="@drawable/tab_item_shape_dark" /> -</selector> \ No newline at end of file diff --git a/app/src/main/res/drawable/tab_item_shape_dark.xml b/app/src/main/res/drawable/tab_item_shape.xml similarity index 80% copy from app/src/main/res/drawable/tab_item_shape_dark.xml copy to app/src/main/res/drawable/tab_item_shape.xml index f93b793..233895d 100644 --- a/app/src/main/res/drawable/tab_item_shape_dark.xml +++ b/app/src/main/res/drawable/tab_item_shape.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"; android:shape="rectangle"> - <solid android:color="@color/window_background_dark"/> + <solid android:color="?attr/window_background_color"/> <corners android:topLeftRadius="@dimen/corner_radius" android:topRightRadius="@dimen/corner_radius"/> </shape> \ No newline at end of file diff --git a/app/src/main/res/drawable/tab_item_shape_light.xml b/app/src/main/res/drawable/tab_item_shape_light.xml deleted file mode 100644 index 5750ed4..0000000 --- a/app/src/main/res/drawable/tab_item_shape_light.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android"; - android:shape="rectangle"> - <solid android:color="@color/window_background_light"/> - <corners android:topLeftRadius="@dimen/corner_radius" android:topRightRadius="@dimen/corner_radius"/> -</shape> \ No newline at end of file diff --git a/app/src/main/res/drawable/tab_item_shape_dark.xml b/app/src/main/res/drawable/tab_item_shape_selected.xml similarity index 80% rename from app/src/main/res/drawable/tab_item_shape_dark.xml rename to app/src/main/res/drawable/tab_item_shape_selected.xml index f93b793..64e12b8 100644 --- a/app/src/main/res/drawable/tab_item_shape_dark.xml +++ b/app/src/main/res/drawable/tab_item_shape_selected.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"; android:shape="rectangle"> - <solid android:color="@color/window_background_dark"/> + <solid android:color="?attr/tab_shadow_color"/> <corners android:topLeftRadius="@dimen/corner_radius" android:topRightRadius="@dimen/corner_radius"/> </shape> \ No newline at end of file diff --git a/app/src/main/res/drawable/tab_item_shape_selected_dark.xml b/app/src/main/res/drawable/tab_item_shape_selected_dark.xml deleted file mode 100644 index a415318..0000000 --- a/app/src/main/res/drawable/tab_item_shape_selected_dark.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android"; - android:shape="rectangle"> - <solid android:color="@color/background_floating_material_dark"/> - <corners android:topLeftRadius="@dimen/corner_radius" android:topRightRadius="@dimen/corner_radius"/> -</shape> \ No newline at end of file diff --git a/app/src/main/res/drawable/tab_item_shape_selected_light.xml b/app/src/main/res/drawable/tab_item_shape_selected_light.xml deleted file mode 100644 index a4eb874..0000000 --- a/app/src/main/res/drawable/tab_item_shape_selected_light.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android"; - android:shape="rectangle"> - <solid android:color="@color/background_floating_material_light"/> - <corners android:topLeftRadius="@dimen/corner_radius" android:topRightRadius="@dimen/corner_radius"/> -</shape> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_page.xml b/app/src/main/res/layout/activity_page.xml index b010426..40d4590 100644 --- a/app/src/main/res/layout/activity_page.xml +++ b/app/src/main/res/layout/activity_page.xml @@ -30,7 +30,7 @@ android:dividerHeight="0dp" android:stackFromBottom="true" android:transcriptMode="alwaysScroll" - android:listSelector="?attr/tab_item_selector" + android:listSelector="@drawable/tab_item_selector" /> </FrameLayout> diff --git a/app/src/main/res/layout/item_tab_entry.xml b/app/src/main/res/layout/item_tab_entry.xml index 7d8831c..46cfa3d 100644 --- a/app/src/main/res/layout/item_tab_entry.xml +++ b/app/src/main/res/layout/item_tab_entry.xml @@ -10,7 +10,7 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/tab_item_selector" + android:background="@drawable/tab_item_selector" > <com.facebook.drawee.view.SimpleDraweeView style="@style/SimpleDraweeViewPlaceholder.Article" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 43a1575..f6c50fe 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -66,8 +66,6 @@ <color name="new_lead_gradient_start">#50000000</color> <color name="main_toolbar_background">@color/actionbar_background</color> - <color name="window_background_light">#fff</color> - <color name="page_background_light">#fff</color> <color name="search_background_light">#fff</color> <color name="toc_background_light">#fff</color> <color name="toc_section_text_light">#333</color> @@ -85,8 +83,6 @@ <color name="list_item_text_secondary_light">#777</color> <color name="multi_select_background_light">@color/accent90</color> - <color name="window_background_dark">#000</color> - <color name="page_background_dark">#000</color> <color name="search_background_dark">#303030</color> <color name="toc_background_dark">#0c0c0c</color> <color name="toc_section_text_dark">#d0d0d0</color> diff --git a/app/src/main/res/values/styles_dark.xml b/app/src/main/res/values/styles_dark.xml index 8d372da..d37bd3c 100644 --- a/app/src/main/res/values/styles_dark.xml +++ b/app/src/main/res/values/styles_dark.xml @@ -27,10 +27,10 @@ <item name="popupMenuStyle">@style/Theme.Dark.PopupMenuStyle</item> <item name="alertDialogTheme">@style/Theme.Dark.Dialog.Alert</item> <item name="colorAccent">@color/foundation_blue</item> - <item name="android:windowBackground">@color/window_background_dark</item> - <item name="window_background_color">@color/window_background_dark</item> + <item name="android:windowBackground">@android:color/black</item> + <item name="window_background_color">@android:color/black</item> <item name="window_inverse_color">@android:color/white</item> - <item name="page_background_color">@color/page_background_dark</item> + <item name="page_background_color">@android:color/black</item> <item name="search_background_color">@color/search_background_dark</item> <item name="toc_background_color">@color/toc_background_dark</item> <item name="toc_section_text_color">@color/toc_section_text_dark</item> @@ -44,7 +44,6 @@ <item name="list_separator_drawable">@drawable/divider_dark</item> <item name="syntax_highlight_template_color">@color/syntax_highlight_template_dark</item> <item name="subtle_gray_color">@color/subtle_gray_dark</item> - <item name="tab_item_selector">@drawable/tab_item_selector_dark</item> <item name="tab_shadow_drawable">@drawable/tab_item_bottom_gradient_light</item> <item name="tab_shadow_color">@color/tab_shadow_dark</item> <item name="tool_tip_default_color">@color/tool_tip_default_dark</item> diff --git a/app/src/main/res/values/styles_light.xml b/app/src/main/res/values/styles_light.xml index 45f5649..52c8a6a 100644 --- a/app/src/main/res/values/styles_light.xml +++ b/app/src/main/res/values/styles_light.xml @@ -27,10 +27,10 @@ <item name="popupMenuStyle">@style/Theme.Light.PopupMenuStyle</item> <item name="alertDialogTheme">@style/Theme.Light.Dialog.Alert</item> <item name="colorAccent">@color/foundation_blue</item> - <item name="android:windowBackground">@color/window_background_light</item> - <item name="window_background_color">@color/window_background_light</item> + <item name="android:windowBackground">@android:color/white</item> + <item name="window_background_color">@android:color/white</item> <item name="window_inverse_color">@android:color/black</item> - <item name="page_background_color">@color/page_background_light</item> + <item name="page_background_color">@android:color/white</item> <item name="search_background_color">@color/search_background_light</item> <item name="toc_background_color">@color/toc_background_light</item> <item name="toc_section_text_color">@color/toc_section_text_light</item> @@ -45,7 +45,6 @@ <item name="list_separator_drawable">@drawable/divider_light</item> <item name="syntax_highlight_template_color">@color/syntax_highlight_template_light</item> <item name="subtle_gray_color">@color/subtle_gray_light</item> - <item name="tab_item_selector">@drawable/tab_item_selector_light</item> <item name="tab_shadow_drawable">@drawable/tab_item_bottom_gradient_light</item> <item name="tab_shadow_color">@color/tab_shadow_light</item> <item name="tool_tip_default_color">@color/tool_tip_default_light</item> -- To view, visit https://gerrit.wikimedia.org/r/364233 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5008dc94b0ff839050502945cdbdb02093af3afa Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
