jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/380826 )
Change subject: Consolidation: normalize usage of background / paper color
throughout.
......................................................................
Consolidation: normalize usage of background / paper color throughout.
One of the major design themes that has emerged from the consolidation is
the following:
- All activities shall have a default background color of base80 (light) /
base10 (dark)
- All components (controls, cards, list items) that appear in an activity
shall have a background of "paper_color", which is base100/base14.
This patch sweeps through all activities/framents and normalizes (and
corrects where necessary) their usages of these two colors.
This also consolidates the unnecessary "base_color" style, being
equivalent to windowBackground.
Change-Id: Iaed1ad7016944a4c21c96dfe7ac0a5cbca31d6f2
---
M app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.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/java/org/wikipedia/offline/LocalCompilationsFragment.java
M app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
M app/src/main/res/layout/activity_create_account.xml
M app/src/main/res/layout/activity_edit_section.xml
M app/src/main/res/layout/activity_langlinks.xml
M app/src/main/res/layout/activity_login.xml
M app/src/main/res/layout/dialog_preference_languages.xml
M app/src/main/res/layout/fragment_compilation_detail.xml
M app/src/main/res/layout/fragment_description_edit.xml
M app/src/main/res/layout/fragment_description_edit_help.xml
M app/src/main/res/layout/fragment_feed.xml
M app/src/main/res/layout/fragment_history.xml
M app/src/main/res/layout/fragment_local_compilations.xml
M app/src/main/res/layout/fragment_page.xml
M app/src/main/res/layout/fragment_preview_edit.xml
M app/src/main/res/layout/fragment_reading_list.xml
M app/src/main/res/layout/fragment_reading_lists.xml
M app/src/main/res/layout/fragment_remote_compilations.xml
M app/src/main/res/layout/fragment_search.xml
M app/src/main/res/layout/fragment_search_recent.xml
M app/src/main/res/layout/fragment_search_results.xml
M app/src/main/res/layout/inflate_create_account_onboarding.xml
M app/src/main/res/layout/item_language_list_entry.xml
M app/src/main/res/layout/item_page_list_entry.xml
M app/src/main/res/layout/item_reading_list.xml
M app/src/main/res/layout/item_search_recent.xml
M app/src/main/res/layout/item_search_result.xml
M app/src/main/res/layout/view_explore_overflow.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
34 files changed, 61 insertions(+), 63 deletions(-)
Approvals:
jenkins-bot: Verified
Mholloway: Looks good to me, approved
diff --git a/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
b/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
index cbb2eb9..231d6e0 100644
--- a/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
@@ -53,7 +53,7 @@
}
private void resetBackgroundColor() {
- setBackgroundColor(ResourceUtil.getThemedColor(getContext(),
R.attr.cardBackgroundColor));
+ setBackgroundColor(ResourceUtil.getThemedColor(getContext(),
R.attr.paper_color));
}
private class ImageLoadListener implements
FaceAndColorDetectImageView.OnImageLoadListener {
@@ -81,7 +81,7 @@
private void animateBackgroundColor(@NonNull View view, @ColorInt int
targetColor) {
final int animDuration = 500;
ObjectAnimator animator = ObjectAnimator.ofInt(view,
"backgroundColor",
- ResourceUtil.getThemedColor(getContext(),
R.attr.cardBackgroundColor),
+ ResourceUtil.getThemedColor(getContext(),
R.attr.paper_color),
targetColor);
animator.setEvaluator(new ArgbEvaluator());
animator.setDuration(animDuration);
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 1b57372..656ddcb 100644
--- a/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java
@@ -15,7 +15,7 @@
public DefaultFeedCardView(Context context) {
super(context);
- setCardBackgroundColor(ResourceUtil.getThemedColor(context,
R.attr.cardBackgroundColor));
+ setCardBackgroundColor(ResourceUtil.getThemedColor(context,
R.attr.paper_color));
}
@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 cfc273c..3b54686 100644
---
a/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java
+++
b/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java
@@ -24,7 +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));
+ setCardBackgroundColor(ResourceUtil.getThemedColor(context,
R.attr.paper_color));
ButterKnife.bind(this);
imageView.setLegacyVisibilityHandlingEnabled(true);
}
diff --git
a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
index e7ff259..a45d171 100644
--- a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
@@ -196,7 +196,7 @@
DimenUtil.roundedDpToPx(DimenUtil.getDimension(R.dimen.list_item_footer_padding)),
DimenUtil.roundedDpToPx(DimenUtil.getDimension(R.dimen.activity_horizontal_margin)),
DimenUtil.roundedDpToPx(DimenUtil.getDimension(R.dimen.list_item_footer_padding)));
-
controlView.setBackgroundColor(ResourceUtil.getThemedColor(getContext(),
R.attr.base_color));
+
controlView.setBackgroundColor(ResourceUtil.getThemedColor(getContext(),
android.R.attr.windowBackground));
controlView.setCallback(new
CompilationDownloadControlView.Callback() {
@Override
public void onCancel() {
diff --git
a/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
b/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
index 0778124..72bb951 100644
--- a/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
@@ -205,7 +205,7 @@
DimenUtil.roundedDpToPx(DimenUtil.getDimension(R.dimen.list_item_footer_padding)),
DimenUtil.roundedDpToPx(DimenUtil.getDimension(R.dimen.activity_horizontal_margin)),
DimenUtil.roundedDpToPx(DimenUtil.getDimension(R.dimen.list_item_footer_padding)));
-
controlView.setBackgroundColor(ResourceUtil.getThemedColor(getContext(),
R.attr.base_color));
+
controlView.setBackgroundColor(ResourceUtil.getThemedColor(getContext(),
android.R.attr.windowBackground));
controlView.setCallback(new
CompilationDownloadControlView.Callback() {
@Override
public void onCancel() {
diff --git a/app/src/main/res/layout/activity_create_account.xml
b/app/src/main/res/layout/activity_create_account.xml
index 3f947b6..2da0f96 100644
--- a/app/src/main/res/layout/activity_create_account.xml
+++ b/app/src/main/res/layout/activity_create_account.xml
@@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto";
xmlns:tools="http://schemas.android.com/tools";
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:background="?attr/paper_color">
<ScrollView
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_edit_section.xml
b/app/src/main/res/layout/activity_edit_section.xml
index 10c9f5d..e629d4a 100644
--- a/app/src/main/res/layout/activity_edit_section.xml
+++ b/app/src/main/res/layout/activity_edit_section.xml
@@ -73,7 +73,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="?attr/base_color">
+ android:background="?android:windowBackground">
<ImageView
android:id="@+id/edit_section_abusefilter_image"
android:layout_width="48dp"
diff --git a/app/src/main/res/layout/activity_langlinks.xml
b/app/src/main/res/layout/activity_langlinks.xml
index 9ad6253..c91f2fa 100644
--- a/app/src/main/res/layout/activity_langlinks.xml
+++ b/app/src/main/res/layout/activity_langlinks.xml
@@ -35,8 +35,9 @@
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="12dp"
- android:hint="@string/langlinks_filter_hint">
+ android:padding="12dp"
+ android:hint="@string/langlinks_filter_hint"
+ android:background="?attr/paper_color">
<org.wikipedia.views.PlainPasteEditText
android:id="@+id/langlinks_filter"
@@ -56,14 +57,13 @@
android:text="@string/langlinks_no_match"
android:textAlignment="center"
style="?android:textAppearanceLarge"
- android:layout_marginLeft="16dp"
- android:layout_marginRight="16dp"
+ android:layout_margin="16dp"
android:visibility="gone" />
<ListView
android:id="@+id/langlinks_list"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent" />
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
</LinearLayout>
@@ -74,7 +74,7 @@
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
- android:background="@color/base80"
+ android:background="?android:windowBackground"
android:visibility="gone"
tools:visibility="visible"/>
</FrameLayout>
diff --git a/app/src/main/res/layout/activity_login.xml
b/app/src/main/res/layout/activity_login.xml
index a15320c..c20221d 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto";
xmlns:tools="http://schemas.android.com/tools";
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:background="?attr/paper_color">
<ScrollView
android:layout_width="match_parent"
@@ -17,7 +18,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="?attr/base_color"
+ android:background="?android:windowBackground"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingTop="8dp">
diff --git a/app/src/main/res/layout/dialog_preference_languages.xml
b/app/src/main/res/layout/dialog_preference_languages.xml
index 9a8cdeb..6b27f60 100644
--- a/app/src/main/res/layout/dialog_preference_languages.xml
+++ b/app/src/main/res/layout/dialog_preference_languages.xml
@@ -3,14 +3,14 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android";
android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="?android:windowBackground">
+ android:layout_height="match_parent">
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="12dp"
- android:hint="@string/preference_languages_filter_hint">
+ android:padding="12dp"
+ android:hint="@string/preference_languages_filter_hint"
+ android:background="?attr/paper_color">
<org.wikipedia.views.PlainPasteEditText
android:id="@+id/preference_languages_filter"
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_compilation_detail.xml
b/app/src/main/res/layout/fragment_compilation_detail.xml
index 5ec8d7e..dc65c36 100644
--- a/app/src/main/res/layout/fragment_compilation_detail.xml
+++ b/app/src/main/res/layout/fragment_compilation_detail.xml
@@ -5,7 +5,6 @@
xmlns:tools="http://schemas.android.com/tools";
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="?attr/base_color"
android:fitsSystemWindows="true">
<android.support.design.widget.AppBarLayout
diff --git a/app/src/main/res/layout/fragment_description_edit.xml
b/app/src/main/res/layout/fragment_description_edit.xml
index 701e475..7b043a1 100644
--- a/app/src/main/res/layout/fragment_description_edit.xml
+++ b/app/src/main/res/layout/fragment_description_edit.xml
@@ -3,4 +3,5 @@
xmlns:android="http://schemas.android.com/apk/res/android";
android:id="@+id/fragment_description_edit_view"
android:layout_width="match_parent"
- android:layout_height="match_parent"/>
\ No newline at end of file
+ android:layout_height="match_parent"
+ android:background="?attr/paper_color"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_description_edit_help.xml
b/app/src/main/res/layout/fragment_description_edit_help.xml
index e6bc0f3..3b1fad0 100644
--- a/app/src/main/res/layout/fragment_description_edit_help.xml
+++ b/app/src/main/res/layout/fragment_description_edit_help.xml
@@ -4,4 +4,5 @@
android:id="@+id/fragment_description_edit_help_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginTop="?attr/actionBarSize" />
\ No newline at end of file
+ android:layout_marginTop="?attr/actionBarSize"
+ android:background="?attr/paper_color"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_feed.xml
b/app/src/main/res/layout/fragment_feed.xml
index c05bf70..095e713 100644
--- a/app/src/main/res/layout/fragment_feed.xml
+++ b/app/src/main/res/layout/fragment_feed.xml
@@ -4,8 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto";
android:id="@+id/feed_swipe_refresh_layout"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="?attr/base_color">
+ android:layout_height="match_parent">
<FrameLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_history.xml
b/app/src/main/res/layout/fragment_history.xml
index 21dc587..8145f0f 100644
--- a/app/src/main/res/layout/fragment_history.xml
+++ b/app/src/main/res/layout/fragment_history.xml
@@ -4,8 +4,7 @@
xmlns:android="http://schemas.android.com/apk/res/android";
xmlns:app="http://schemas.android.com/apk/res-auto";
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="?attr/base_color">
+ android:layout_height="match_parent">
<LinearLayout
android:id="@+id/history_empty_container"
@@ -54,7 +53,6 @@
android:id="@+id/history_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:scrollbars="vertical"
- android:background="?android:windowBackground"/>
+ android:scrollbars="vertical"/>
</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_local_compilations.xml
b/app/src/main/res/layout/fragment_local_compilations.xml
index 52b83ea..b65548a 100644
--- a/app/src/main/res/layout/fragment_local_compilations.xml
+++ b/app/src/main/res/layout/fragment_local_compilations.xml
@@ -6,8 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:layout_marginTop="?attr/actionBarSize"
- android:background="?attr/base_color">
+ android:layout_marginTop="?attr/actionBarSize">
<LinearLayout
android:layout_width="match_parent"
@@ -39,7 +38,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
- app:cardBackgroundColor="?android:windowBackground">
+ app:cardBackgroundColor="?attr/paper_color">
<LinearLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_page.xml
b/app/src/main/res/layout/fragment_page.xml
index d1a7ba4..b1784b9 100644
--- a/app/src/main/res/layout/fragment_page.xml
+++ b/app/src/main/res/layout/fragment_page.xml
@@ -56,7 +56,7 @@
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
- android:background="@color/base80"
+ android:background="?android:windowBackground"
android:visibility="gone"/>
<org.wikipedia.page.PageActionTabLayout
diff --git a/app/src/main/res/layout/fragment_preview_edit.xml
b/app/src/main/res/layout/fragment_preview_edit.xml
index 7f49f33..1b44148 100644
--- a/app/src/main/res/layout/fragment_preview_edit.xml
+++ b/app/src/main/res/layout/fragment_preview_edit.xml
@@ -82,8 +82,7 @@
android:paddingBottom="10dp"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/edit_preview"
- android:background="@color/base80"
- android:textColor="@color/base0"
+ android:background="?android:windowBackground"
android:gravity="center_vertical"/>
<org.wikipedia.views.ObservableWebView
diff --git a/app/src/main/res/layout/fragment_reading_list.xml
b/app/src/main/res/layout/fragment_reading_list.xml
index 8452931..411d26d 100644
--- a/app/src/main/res/layout/fragment_reading_list.xml
+++ b/app/src/main/res/layout/fragment_reading_list.xml
@@ -5,7 +5,6 @@
xmlns:tools="http://schemas.android.com/tools";
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="?attr/base_color"
android:fitsSystemWindows="true">
<android.support.design.widget.AppBarLayout
@@ -51,8 +50,7 @@
android:id="@+id/reading_list_contents"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:scrollbars="vertical"
- android:background="?android:windowBackground"/>
+ android:scrollbars="vertical"/>
<TextView
android:id="@+id/reading_list_empty_text"
diff --git a/app/src/main/res/layout/fragment_reading_lists.xml
b/app/src/main/res/layout/fragment_reading_lists.xml
index e8fe4dd..c64dcb7 100644
--- a/app/src/main/res/layout/fragment_reading_lists.xml
+++ b/app/src/main/res/layout/fragment_reading_lists.xml
@@ -4,8 +4,7 @@
xmlns:android="http://schemas.android.com/apk/res/android";
xmlns:app="http://schemas.android.com/apk/res-auto";
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="?attr/base_color">
+ android:layout_height="match_parent">
<LinearLayout
android:id="@+id/empty_container"
@@ -66,8 +65,7 @@
android:id="@+id/reading_list_list"
android:scrollbars="vertical"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="?android:windowBackground" />
+ android:layout_height="wrap_content"/>
</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_remote_compilations.xml
b/app/src/main/res/layout/fragment_remote_compilations.xml
index eaabe60..e46c650 100644
--- a/app/src/main/res/layout/fragment_remote_compilations.xml
+++ b/app/src/main/res/layout/fragment_remote_compilations.xml
@@ -4,8 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto";
xmlns:tools="http://schemas.android.com/tools";
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="?attr/base_color">
+ android:layout_height="match_parent">
<android.support.design.widget.AppBarLayout
android:id="@+id/compilation_list_app_bar"
@@ -77,8 +76,7 @@
android:id="@+id/compilation_list_contents"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:scrollbars="vertical"
- android:background="?android:windowBackground"/>
+ android:scrollbars="vertical"/>
<ProgressBar
android:id="@+id/compilation_list_progress"
diff --git a/app/src/main/res/layout/fragment_search.xml
b/app/src/main/res/layout/fragment_search.xml
index 192e248..6d82893 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -117,7 +117,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="?attr/base_color">
+ android:background="?android:windowBackground">
<fragment
android:id="@+id/fragment_search_results"
diff --git a/app/src/main/res/layout/fragment_search_recent.xml
b/app/src/main/res/layout/fragment_search_recent.xml
index 2812b9a..481a141 100644
--- a/app/src/main/res/layout/fragment_search_recent.xml
+++ b/app/src/main/res/layout/fragment_search_recent.xml
@@ -4,7 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto";
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="?attr/base_color"
+ android:background="?android:windowBackground"
android:id="@+id/recent_searches_container">
<LinearLayout
@@ -15,7 +15,7 @@
android:gravity="center"
android:orientation="vertical"
android:visibility="gone"
- android:background="?attr/base_color">
+ android:background="?android:windowBackground">
<ImageView
android:id="@+id/search_empty_image"
diff --git a/app/src/main/res/layout/fragment_search_results.xml
b/app/src/main/res/layout/fragment_search_results.xml
index a5ef334..9205d35 100644
--- a/app/src/main/res/layout/fragment_search_results.xml
+++ b/app/src/main/res/layout/fragment_search_results.xml
@@ -42,7 +42,7 @@
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
- android:background="@color/base80"
+ android:background="?android:windowBackground"
android:visibility="gone"/>
<org.wikipedia.views.SearchEmptyView
diff --git a/app/src/main/res/layout/inflate_create_account_onboarding.xml
b/app/src/main/res/layout/inflate_create_account_onboarding.xml
index 8b51abf..4eeae18 100644
--- a/app/src/main/res/layout/inflate_create_account_onboarding.xml
+++ b/app/src/main/res/layout/inflate_create_account_onboarding.xml
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
- android:background="?attr/base_color"
+ android:background="?android:windowBackground"
android:gravity="center_horizontal"
android:orientation="vertical">
diff --git a/app/src/main/res/layout/item_language_list_entry.xml
b/app/src/main/res/layout/item_language_list_entry.xml
index a922610..1cfec6d 100644
--- a/app/src/main/res/layout/item_language_list_entry.xml
+++ b/app/src/main/res/layout/item_language_list_entry.xml
@@ -8,7 +8,9 @@
android:paddingTop="@dimen/list_item_vertical_padding"
android:paddingRight="@dimen/list_item_horizontal_padding"
android:paddingBottom="@dimen/list_item_vertical_padding"
- android:paddingLeft="@dimen/list_item_horizontal_padding">
+ android:paddingLeft="@dimen/list_item_horizontal_padding"
+ android:background="?attr/paper_color"
+ android:foreground="?attr/selectableItemBackground">
<TextView
android:id="@+id/localized_language_name"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/item_page_list_entry.xml
b/app/src/main/res/layout/item_page_list_entry.xml
index 2a8fea3..38b26e3 100644
--- a/app/src/main/res/layout/item_page_list_entry.xml
+++ b/app/src/main/res/layout/item_page_list_entry.xml
@@ -9,7 +9,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/list_item_vertical_padding"
- android:background="?attr/selectableItemBackground"
+ android:background="?attr/paper_color"
+ android:foreground="?attr/selectableItemBackground"
android:gravity="top">
<!-- TODO: this probably shouldn't be part of an item cell since it has to
do with a collection
diff --git a/app/src/main/res/layout/item_reading_list.xml
b/app/src/main/res/layout/item_reading_list.xml
index 783c3cc..4da4f0b 100644
--- a/app/src/main/res/layout/item_reading_list.xml
+++ b/app/src/main/res/layout/item_reading_list.xml
@@ -7,7 +7,8 @@
android:id="@+id/item_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="?attr/selectableItemBackground">
+ android:background="?attr/paper_color"
+ android:foreground="?attr/selectableItemBackground">
<LinearLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_search_recent.xml
b/app/src/main/res/layout/item_search_recent.xml
index 8aa5eb2..e2d8030 100644
--- a/app/src/main/res/layout/item_search_recent.xml
+++ b/app/src/main/res/layout/item_search_recent.xml
@@ -4,7 +4,9 @@
xmlns:tools="http://schemas.android.com/tools";
android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:background="?attr/paper_color"
+ android:foreground="?attr/selectableItemBackground">
<TextView
android:id="@+id/text1"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/item_search_result.xml
b/app/src/main/res/layout/item_search_result.xml
index 125034e..f9d7380 100644
--- a/app/src/main/res/layout/item_search_result.xml
+++ b/app/src/main/res/layout/item_search_result.xml
@@ -11,7 +11,8 @@
android:paddingRight="@dimen/list_item_horizontal_padding"
android:paddingBottom="@dimen/list_item_vertical_padding"
android:paddingLeft="@dimen/list_item_horizontal_padding"
- android:background="?attr/selectableItemBackground"
+ android:background="?attr/paper_color"
+ android:foreground="?attr/selectableItemBackground"
android:gravity="top">
<com.facebook.drawee.view.SimpleDraweeView
diff --git a/app/src/main/res/layout/view_explore_overflow.xml
b/app/src/main/res/layout/view_explore_overflow.xml
index 6dec5af..cf85ec7 100644
--- a/app/src/main/res/layout/view_explore_overflow.xml
+++ b/app/src/main/res/layout/view_explore_overflow.xml
@@ -43,7 +43,7 @@
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp"
- android:background="?android:windowBackground">
+ android:background="?attr/paper_color">
<TextView
android:id="@+id/explore_overflow_compilations"
diff --git a/app/src/main/res/values/attrs.xml
b/app/src/main/res/values/attrs.xml
index 39664ff..937b34c 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -26,7 +26,6 @@
<attr name="primary_text_color" format="color" />
<attr name="secondary_text_color" format="color" />
<attr name="section_title_color" format="color" />
- <attr name="base_color" format="color" />
<attr name="paper_color" format="color" />
<declare-styleable name="CabSearchView">
diff --git a/app/src/main/res/values/styles_dark.xml
b/app/src/main/res/values/styles_dark.xml
index f907524..ec88801 100644
--- a/app/src/main/res/values/styles_dark.xml
+++ b/app/src/main/res/values/styles_dark.xml
@@ -49,7 +49,6 @@
<item
name="nav_tab_item_color_state">@color/color_state_nav_tab_dark</item>
<item name="multi_select_background_color">@color/accent30</item>
<item name="searchItemBackground">@color/base12</item>
- <item name="cardBackgroundColor">@color/base14</item>
<item name="material_theme_primary_color">@color/base100</item>
<item name="material_theme_secondary_color">@color/white70</item>
<item name="material_theme_de_emphasised_color">@color/white50</item>
@@ -58,7 +57,8 @@
<item name="primary_text_color">@color/base90</item>
<item name="secondary_text_color">@color/base70</item>
<item name="section_title_color">@color/base90</item>
- <item name="base_color">@color/base10</item>
+
+ <!-- Background for cards, lists, and controls -->
<item name="paper_color">@color/base14</item>
</style>
diff --git a/app/src/main/res/values/styles_light.xml
b/app/src/main/res/values/styles_light.xml
index d60064d..711a599 100644
--- a/app/src/main/res/values/styles_light.xml
+++ b/app/src/main/res/values/styles_light.xml
@@ -49,7 +49,6 @@
<item
name="nav_tab_item_color_state">@color/color_state_nav_tab_light</item>
<item name="multi_select_background_color">@color/accent90</item>
<item name="searchItemBackground">@color/base100</item>
- <item name="cardBackgroundColor">@color/base100</item>
<item name="material_theme_primary_color">@color/black87</item>
<item name="material_theme_secondary_color">@color/black54</item>
<item name="material_theme_de_emphasised_color">@color/black38</item>
@@ -58,7 +57,8 @@
<item name="primary_text_color">@color/base10</item>
<item name="secondary_text_color">@color/base30</item>
<item name="section_title_color">@color/base20</item>
- <item name="base_color">@color/base80</item>
+
+ <!-- Background for cards, lists, and controls -->
<item name="paper_color">@color/base100</item>
</style>
--
To view, visit https://gerrit.wikimedia.org/r/380826
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaed1ad7016944a4c21c96dfe7ac0a5cbca31d6f2
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Cooltey <cf...@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
