jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/373986 )
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: If8c21e6b3375163a7bf06057aac3254345e10135 --- M app/src/main/java/org/wikipedia/feed/searchbar/SearchCardView.java M app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java M app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java 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 6 files changed, 13 insertions(+), 1 deletion(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/main/java/org/wikipedia/feed/searchbar/SearchCardView.java b/app/src/main/java/org/wikipedia/feed/searchbar/SearchCardView.java index c1c4c42..debd79e 100644 --- a/app/src/main/java/org/wikipedia/feed/searchbar/SearchCardView.java +++ b/app/src/main/java/org/wikipedia/feed/searchbar/SearchCardView.java @@ -5,6 +5,7 @@ import org.wikipedia.R; import org.wikipedia.feed.view.DefaultFeedCardView; import org.wikipedia.util.FeedbackUtil; +import org.wikipedia.util.ResourceUtil; import butterknife.ButterKnife; import butterknife.OnClick; @@ -18,6 +19,7 @@ public SearchCardView(Context context) { super(context); inflate(getContext(), R.layout.view_search_bar, this); + setCardBackgroundColor(ResourceUtil.getThemedColor(context, R.attr.searchItemBackground)); ButterKnife.bind(this); FeedbackUtil.setToolbarButtonLongPressToast(findViewById(R.id.voice_search_button)); } diff --git a/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java b/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java index b6d51ef..1b57372 100644 --- a/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java +++ b/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java @@ -5,7 +5,9 @@ import android.support.annotation.Nullable; import android.support.v7.widget.CardView; +import org.wikipedia.R; import org.wikipedia.feed.model.Card; +import org.wikipedia.util.ResourceUtil; public abstract class DefaultFeedCardView<T extends Card> extends CardView implements FeedCardView<T> { @Nullable private T card; @@ -13,6 +15,7 @@ public DefaultFeedCardView(Context context) { super(context); + setCardBackgroundColor(ResourceUtil.getThemedColor(context, R.attr.cardBackgroundColor)); } @Override public void setCard(@NonNull T card) { diff --git a/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java b/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java index 6be9a2a..cfc273c 100644 --- a/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java +++ b/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java @@ -10,6 +10,7 @@ import org.wikipedia.R; import org.wikipedia.richtext.RichTextUtil; +import org.wikipedia.util.ResourceUtil; import org.wikipedia.views.FaceAndColorDetectImageView; import butterknife.BindView; @@ -23,6 +24,7 @@ public HorizontalScrollingListCardItemView(@NonNull Context context) { super(context); inflate(getContext(), R.layout.view_horizontal_scroll_list_item_card, this); + setCardBackgroundColor(ResourceUtil.getThemedColor(context, R.attr.cardBackgroundColor)); ButterKnife.bind(this); imageView.setLegacyVisibilityHandlingEnabled(true); } diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 15084fa..4c2b1f8 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -41,6 +41,7 @@ <attr name="overflow_button" format="reference" /> <attr name="multi_select_background_color" format="reference" /> + <attr name="searchItemBackground" 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 2b1906b..3ced21b 100644 --- a/app/src/main/res/values/styles_dark.xml +++ b/app/src/main/res/values/styles_dark.xml @@ -69,11 +69,12 @@ <!-- TODO: move to AppTheme when style hierarchy is corrected. --> <item name="android:listViewStyle">@style/ListView</item> - <item name="feed_window_background_color">@color/feed_window_background_dark</item> <item name="feed_text_primary_color">@color/feed_text_primary_dark</item> <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> </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 e842397..f535ce2 100644 --- a/app/src/main/res/values/styles_light.xml +++ b/app/src/main/res/values/styles_light.xml @@ -74,6 +74,9 @@ <item name="feed_text_primary_color">@color/feed_text_primary_light</item> <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="cardBackgroundColor">@color/base100</item> + </style> <style name="Theme.Light.Dialog.Alert" parent="Theme.AppCompat.Light.Dialog.Alert"> -- To view, visit https://gerrit.wikimedia.org/r/373986 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If8c21e6b3375163a7bf06057aac3254345e10135 Gerrit-PatchSet: 6 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Sharvaniharan <sha...@wikimedia.org> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: Cooltey <cf...@wikimedia.org> Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org> Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org> Gerrit-Reviewer: Sharvaniharan <sha...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
