From b46ea0aba8454d7315c56276f5fb7f7ebbb69ee3 Mon Sep 17 00:00:00 2001
From: Tim Borisenko <borisenkotim@gmail.com>
Date: Fri, 15 Mar 2019 12:48:18 -0700
Subject: [PATCH] Fix #2186: Standardize tab theming across app, and fix
 related night mode issues (#2227)

---
 .../nrw/commons/bookmarks/BookmarksActivity.java  |  2 +-
 .../commons/category/CategoryDetailsActivity.java |  2 +-
 .../free/nrw/commons/explore/SearchActivity.java  |  2 +-
 app/src/main/res/layout/activity_bookmarks.xml    | 15 +++++++++------
 .../main/res/layout/activity_category_details.xml |  9 +++++----
 .../main/res/layout/activity_contributions.xml    | 15 ++++++---------
 app/src/main/res/layout/activity_search.xml       | 12 ++++++------
 app/src/main/res/values/styles.xml                | 10 ++++++++--
 8 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksActivity.java b/app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksActivity.java
index 6f362d373a..c5dcb7bc8e 100644
--- a/app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksActivity.java
@@ -30,7 +30,7 @@ public class BookmarksActivity extends NavigationBaseActivity
     private MediaDetailPagerFragment mediaDetails;
     @BindView(R.id.viewPagerBookmarks)
     ViewPager viewPager;
-    @BindView(R.id.tabLayoutBookmarks)
+    @BindView(R.id.tab_layout)
     TabLayout tabLayout;
 
     @Inject
diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.java b/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.java
index bf4617c094..d715880e67 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.java
@@ -46,7 +46,7 @@ public class CategoryDetailsActivity extends NavigationBaseActivity
     private MediaDetailPagerFragment mediaDetails;
     private String categoryName;
     @BindView(R.id.mediaContainer) FrameLayout mediaContainer;
-    @BindView(R.id.tabLayout) TabLayout tabLayout;
+    @BindView(R.id.tab_layout) TabLayout tabLayout;
     @BindView(R.id.viewPager) ViewPager viewPager;
 
     ViewPagerAdapter viewPagerAdapter;
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java b/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java
index 9d7ba08ca9..e7ab596782 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java
@@ -42,7 +42,7 @@ public class SearchActivity extends NavigationBaseActivity implements MediaDetai
     @BindView(R.id.searchHistoryContainer) FrameLayout searchHistoryContainer;
     @BindView(R.id.mediaContainer) FrameLayout mediaContainer;
     @BindView(R.id.searchBox) SearchView searchView;
-    @BindView(R.id.tabLayout) TabLayout tabLayout;
+    @BindView(R.id.tab_layout) TabLayout tabLayout;
     @BindView(R.id.viewPager) ViewPager viewPager;
 
     private SearchImageFragment searchImageFragment;
diff --git a/app/src/main/res/layout/activity_bookmarks.xml b/app/src/main/res/layout/activity_bookmarks.xml
index 2ceca03cd1..7502d22f63 100644
--- a/app/src/main/res/layout/activity_bookmarks.xml
+++ b/app/src/main/res/layout/activity_bookmarks.xml
@@ -17,12 +17,15 @@
             app:layout_scrollFlags="scroll" />
 
         <android.support.design.widget.TabLayout
-            android:id="@+id/tabLayoutBookmarks"
-            android:layout_width="0dp"
+            android:id="@+id/tab_layout"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/toolbar" />
+            android:background="?attr/tabBackground"
+            app:layout_constraintTop_toBottomOf="@id/toolbar"
+            app:tabIndicatorColor="?attr/tabIndicatorColor"
+            app:tabMode="fixed"
+            app:tabSelectedTextColor="?attr/tabSelectedTextColor"
+            app:tabTextColor="?attr/tabTextColor" />
 
         <android.support.v4.view.ViewPager
             android:id="@+id/viewPagerBookmarks"
@@ -32,7 +35,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tabLayoutBookmarks" />
+            app:layout_constraintTop_toBottomOf="@id/tab_layout" />
 
         <FrameLayout
             android:id="@+id/fragmentContainer"
diff --git a/app/src/main/res/layout/activity_category_details.xml b/app/src/main/res/layout/activity_category_details.xml
index 04b50074a8..18e5226cd6 100644
--- a/app/src/main/res/layout/activity_category_details.xml
+++ b/app/src/main/res/layout/activity_category_details.xml
@@ -21,13 +21,14 @@
                 android:layout_height="wrap_content" />
 
             <android.support.design.widget.TabLayout
-                android:id="@+id/tabLayout"
+                android:id="@+id/tab_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget"
+                android:background="?attr/tabBackground"
+                app:tabIndicatorColor="?attr/tabIndicatorColor"
+                app:tabSelectedTextColor="?attr/tabSelectedTextColor"
+                app:tabTextColor="?attr/tabTextColor"
                 app:tabMode="scrollable"
-                app:tabSelectedTextColor="@color/white"
-                app:tabTextColor="@color/opak_middle_grey"
                 android:layout_below="@id/toolbar"
                 />
         </android.support.design.widget.AppBarLayout>
diff --git a/app/src/main/res/layout/activity_contributions.xml b/app/src/main/res/layout/activity_contributions.xml
index 2e6e927281..443d2eba29 100644
--- a/app/src/main/res/layout/activity_contributions.xml
+++ b/app/src/main/res/layout/activity_contributions.xml
@@ -22,15 +22,12 @@
             android:id="@+id/tab_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:tabMaxWidth="0dp"
-            app:tabGravity="fill"
-            app:tabMode="fixed"
-            android:layout_below="@+id/toolbar"
-            android:elevation="6dp"
-            android:minHeight="?attr/actionBarSize"
-            app:tabIndicatorColor="@android:color/white"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-            android:background="?attr/mainTabBackground"/>
+            android:background="?attr/tabBackground"
+            app:tabIndicatorColor="?attr/tabIndicatorColor"
+            app:tabSelectedTextColor="?attr/tabSelectedTextColor"
+            app:tabTextColor="?attr/tabTextColor"
+            android:layout_below="@id/toolbar"
+            app:tabMode="fixed" />
 
         <FrameLayout android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index d1d46ef698..ebe20e0df7 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -50,16 +50,16 @@
                 />
         </android.support.v7.widget.Toolbar>
         <android.support.design.widget.TabLayout
-            android:id="@+id/tabLayout"
-            android:visibility="gone"
+            android:id="@+id/tab_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget"
-            android:background="@color/item_white_background"
+            android:background="?attr/tabBackground"
+            app:tabIndicatorColor="?attr/tabIndicatorColor"
+            app:tabSelectedTextColor="?attr/tabSelectedTextColor"
+            app:tabTextColor="?attr/tabTextColor"
             app:tabMode="scrollable"
-            app:tabSelectedTextColor="@color/primaryColor"
-            app:tabTextColor="@color/button_background_dark"
             android:layout_below="@id/toolbar_search"
+            android:visibility="gone"
             />
         </android.support.design.widget.AppBarLayout>
         <FrameLayout
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f3f38aab38..2aff854c1d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,7 +2,10 @@
 
     <style name="DarkAppTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="contributionsListBackground">@color/contributionListDarkBackground</item>
-        <item name="mainTabBackground">@color/contributionListDarkBackground</item>
+        <item name="tabBackground">@color/contributionListDarkBackground</item>
+        <item name="tabIndicatorColor">@color/white</item>
+        <item name="tabSelectedTextColor">@color/white</item>
+        <item name="tabTextColor">@color/white</item>
         <item name="mainBackground">@color/main_background_dark</item>
         <item name="achievementBackground">@color/achievement_background_dark</item>
         <item name="drawerHeaderBackground">@color/drawerHeader_background_dark</item>
@@ -33,7 +36,10 @@
 
     <style name="LightAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="contributionsListBackground">@color/white</item>
-        <item name="mainTabBackground">@color/primaryColor</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="mainBackground">@color/main_background_light</item>
         <item name="achievementBackground">@color/achievement_background_light</item>
         <item name="drawerHeaderBackground">@color/drawerHeader_background_light</item>