Sharvaniharan has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/374820 )
Change subject: Dark Mode : Change card colors for dark mode ...................................................................... Dark Mode : Change card colors for dark mode - Changed Search bar style to a custom search background of base12 [ Exosphere Gray] instead of the android defined 'selectable items gray' - Changed CardView backgrounds to base14 [Thermosphere Gray] instead of default material standard of #424242 for dark mode. Light mode is still material default. - Found background to be base10 [Darkest Gray] as required. No changes to that. Screenshots for change : https://drive.google.com/open?id=0B_maM54cPModWkNGY1E5dmZXdms Bug: T173302 Change-Id: I458fc765938cef8e76f2f24d8558de6d11a4c96b --- M app/src/main/res/layout/fragment_local_compilations.xml M app/src/main/res/layout/view_card_announcement.xml M app/src/main/res/layout/view_card_featured_article.xml M app/src/main/res/layout/view_card_featured_image.xml M app/src/main/res/layout/view_card_offline_compilation.xml M app/src/main/res/layout/view_card_onboarding.xml M app/src/main/res/layout/view_horizontal_scroll_list_item_card.xml M app/src/main/res/layout/view_list_card.xml M app/src/main/res/layout/view_static_card.xml M app/src/main/res/values/attrs.xml M app/src/main/res/values/styles_dark.xml M app/src/main/res/values/styles_light.xml 12 files changed, 26 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/20/374820/1 diff --git a/app/src/main/res/layout/fragment_local_compilations.xml b/app/src/main/res/layout/fragment_local_compilations.xml index 2abbf17..b29380c 100644 --- a/app/src/main/res/layout/fragment_local_compilations.xml +++ b/app/src/main/res/layout/fragment_local_compilations.xml @@ -36,6 +36,7 @@ <android.support.v7.widget.CardView android:id="@+id/compilation_list_container" + style="?attr/cardStyle" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="8dp" diff --git a/app/src/main/res/layout/view_card_announcement.xml b/app/src/main/res/layout/view_card_announcement.xml index 5096b11..485cf61 100644 --- a/app/src/main/res/layout/view_card_announcement.xml +++ b/app/src/main/res/layout/view_card_announcement.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"; xmlns:tools="http://schemas.android.com/tools"; + style="?attr/cardStyle" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> diff --git a/app/src/main/res/layout/view_card_featured_article.xml b/app/src/main/res/layout/view_card_featured_article.xml index a5ba86f..221a3e2 100644 --- a/app/src/main/res/layout/view_card_featured_article.xml +++ b/app/src/main/res/layout/view_card_featured_article.xml @@ -3,6 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"; xmlns:app="http://schemas.android.com/apk/res-auto"; xmlns:tools="http://schemas.android.com/tools"; + style="?attr/cardStyle" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> diff --git a/app/src/main/res/layout/view_card_featured_image.xml b/app/src/main/res/layout/view_card_featured_image.xml index 9bb59ce..7eb210e 100644 --- a/app/src/main/res/layout/view_card_featured_image.xml +++ b/app/src/main/res/layout/view_card_featured_image.xml @@ -2,6 +2,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"; xmlns:app="http://schemas.android.com/apk/res-auto"; xmlns:tools="http://schemas.android.com/tools"; + style="?attr/cardStyle" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> diff --git a/app/src/main/res/layout/view_card_offline_compilation.xml b/app/src/main/res/layout/view_card_offline_compilation.xml index 1d9e1a1..e43d800 100644 --- a/app/src/main/res/layout/view_card_offline_compilation.xml +++ b/app/src/main/res/layout/view_card_offline_compilation.xml @@ -2,6 +2,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"; xmlns:app="http://schemas.android.com/apk/res-auto"; xmlns:tools="http://schemas.android.com/tools"; + style="?attr/cardStyle" android:id="@+id/offline_container" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/view_card_onboarding.xml b/app/src/main/res/layout/view_card_onboarding.xml index 561f826..fd15cd0 100644 --- a/app/src/main/res/layout/view_card_onboarding.xml +++ b/app/src/main/res/layout/view_card_onboarding.xml @@ -3,6 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"; xmlns:tools="http://schemas.android.com/tools"; xmlns:app="http://schemas.android.com/apk/res-auto"; + style="?attr/cardStyle" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> diff --git a/app/src/main/res/layout/view_horizontal_scroll_list_item_card.xml b/app/src/main/res/layout/view_horizontal_scroll_list_item_card.xml index 805e53d..337c861 100644 --- a/app/src/main/res/layout/view_horizontal_scroll_list_item_card.xml +++ b/app/src/main/res/layout/view_horizontal_scroll_list_item_card.xml @@ -2,10 +2,10 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"; xmlns:app="http://schemas.android.com/apk/res-auto"; + style="?attr/cardStyle" android:layout_width="180dp" android:layout_height="208dp" - android:orientation="vertical" - android:background="?attr/selectableItemBackground"> + android:orientation="vertical"> <org.wikipedia.views.FaceAndColorDetectImageView style="@style/SimpleDraweeViewPlaceholder" diff --git a/app/src/main/res/layout/view_list_card.xml b/app/src/main/res/layout/view_list_card.xml index 3184108..a44dabf 100644 --- a/app/src/main/res/layout/view_list_card.xml +++ b/app/src/main/res/layout/view_list_card.xml @@ -1,7 +1,8 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"; android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + style="?attr/cardStyle"> <View android:id="@+id/view_list_card_header" diff --git a/app/src/main/res/layout/view_static_card.xml b/app/src/main/res/layout/view_static_card.xml index 78d37b1..564e7aa 100644 --- a/app/src/main/res/layout/view_static_card.xml +++ b/app/src/main/res/layout/view_static_card.xml @@ -2,9 +2,9 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"; xmlns:tools="http://schemas.android.com/tools"; + style="?attr/cardStyle" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?attr/selectableItemBackground"> + android:layout_height="wrap_content"> <LinearLayout android:id="@+id/view_static_card_text_holder" diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index f68826f..c786020 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -42,7 +42,7 @@ <attr name="overflow_button" format="reference" /> <attr name="multi_select_background_color" format="reference" /> <attr name="searchItemBackground" format="reference" /> - <attr name="cardBackgroundColor" format="color" /> + <attr name="cardStyle" format="reference" /> <declare-styleable name="CabSearchView"> <attr name="cabEnabled" format="boolean" /> diff --git a/app/src/main/res/values/styles_dark.xml b/app/src/main/res/values/styles_dark.xml index 072eeca..e4fb734 100644 --- a/app/src/main/res/values/styles_dark.xml +++ b/app/src/main/res/values/styles_dark.xml @@ -75,7 +75,11 @@ <item name="feed_text_secondary_color">@color/feed_text_secondary_dark</item> <item name="feed_text_tertiary_color">@color/feed_text_tertiary_dark</item> <item name="searchItemBackground">@color/base12</item> - <item name="cardBackgroundColor">@color/base14</item> + <item name="cardStyle">@style/Theme.Dark.CardView</item> + </style> + + <style name="Theme.Dark.CardView" parent="CardView.Dark"> + <item name="android:background">@color/base14</item> </style> <style name="Theme.Dark.Dialog.Alert" parent="Theme.AppCompat.Dialog.Alert"> diff --git a/app/src/main/res/values/styles_light.xml b/app/src/main/res/values/styles_light.xml index 39b8c8a..3957d02 100644 --- a/app/src/main/res/values/styles_light.xml +++ b/app/src/main/res/values/styles_light.xml @@ -75,19 +75,27 @@ <item name="feed_text_secondary_color">@color/feed_text_secondary_light</item> <item name="feed_text_tertiary_color">@color/feed_text_tertiary_light</item> <item name="searchItemBackground">@color/base100</item> + <item name="cardStyle">@style/Theme.Light.CardView</item> + </style> + + <style name="Theme.Light.CardView" parent="CardView.Light"> + <item name="android:background">@color/base100</item> </style> <style name="Theme.Light.Dialog.Alert" parent="Theme.AppCompat.Light.Dialog.Alert"> <item name="colorAccent">@color/accent50</item> + <item name="android:background">@color/base100</item> </style> <style name="Theme.Light.Dialog" parent="Theme.AppCompat.Light.Dialog"> <item name="windowActionBar">false</item> <item name="windowNoTitle">true</item> + <item name="android:background">@color/base100</item> <item name="colorAccent">@color/accent50</item> </style> <style name="Theme.Light.PopupMenuStyle" parent="Widget.AppCompat.Light.PopupMenu"> + <item name="android:background">@color/base100</item> <item name="overlapAnchor">true</item> </style> -- To view, visit https://gerrit.wikimedia.org/r/374820 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I458fc765938cef8e76f2f24d8558de6d11a4c96b Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Sharvaniharan <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
