From 06d927a9119d6603226ebc36027a2c331e86b9f0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 5 Aug 2020 19:26:00 +0200
Subject: [PATCH] Rework tabbar style

---
 .../res/drawable/vector_tabbar_background.xml | 21 ++++++++++++++++++
 .../vector_tabbar_background_dark.xml         | 21 ------------------
 .../vector_tabbar_background_light.xml        | 21 ------------------
 .../vector_tabbar_background_status.xml       | 21 ------------------
 .../vector_tabbar_selected_background.xml     | 14 ++++++++++++
 ...vector_tabbar_selected_background_dark.xml | 22 -------------------
 ...ector_tabbar_selected_background_light.xml | 22 -------------------
 ...ctor_tabbar_selected_background_status.xml | 22 -------------------
 ...> vector_tabbar_unselected_background.xml} |  3 +--
 ...tor_tabbar_unselected_background_light.xml |  9 --------
 ...or_tabbar_unselected_background_status.xml |  9 --------
 vector/src/main/res/values/colors_riot.xml    | 14 +++++++-----
 vector/src/main/res/values/styles_riot.xml    |  5 +++++
 vector/src/main/res/values/theme_dark.xml     | 12 +++++-----
 vector/src/main/res/values/theme_light.xml    | 12 +++++-----
 vector/src/main/res/values/theme_status.xml   | 12 +++-------
 16 files changed, 62 insertions(+), 178 deletions(-)
 create mode 100644 vector/src/main/res/drawable/vector_tabbar_background.xml
 delete mode 100644 vector/src/main/res/drawable/vector_tabbar_background_dark.xml
 delete mode 100644 vector/src/main/res/drawable/vector_tabbar_background_light.xml
 delete mode 100644 vector/src/main/res/drawable/vector_tabbar_background_status.xml
 create mode 100644 vector/src/main/res/drawable/vector_tabbar_selected_background.xml
 delete mode 100644 vector/src/main/res/drawable/vector_tabbar_selected_background_dark.xml
 delete mode 100644 vector/src/main/res/drawable/vector_tabbar_selected_background_light.xml
 delete mode 100644 vector/src/main/res/drawable/vector_tabbar_selected_background_status.xml
 rename vector/src/main/res/drawable/{vector_tabbar_unselected_background_dark.xml => vector_tabbar_unselected_background.xml} (65%)
 delete mode 100644 vector/src/main/res/drawable/vector_tabbar_unselected_background_light.xml
 delete mode 100644 vector/src/main/res/drawable/vector_tabbar_unselected_background_status.xml

diff --git a/vector/src/main/res/drawable/vector_tabbar_background.xml b/vector/src/main/res/drawable/vector_tabbar_background.xml
new file mode 100644
index 0000000000..a1e1e7ae1f
--- /dev/null
+++ b/vector/src/main/res/drawable/vector_tabbar_background.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Non focused states -->
+    <item android:drawable="@drawable/vector_tabbar_unselected_background" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/vector_tabbar_selected_background" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
+
+    <!-- Focused states -->
+    <item android:drawable="@drawable/vector_tabbar_unselected_background" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/vector_tabbar_selected_background" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
+
+    <!-- Pressed -->
+    <!-- Non focused states -->
+    <item android:drawable="@drawable/vector_tabbar_unselected_background" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
+    <item android:drawable="@drawable/vector_tabbar_selected_background" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
+
+    <!-- Focused states -->
+    <item android:drawable="@drawable/vector_tabbar_unselected_background" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
+    <item android:drawable="@drawable/vector_tabbar_selected_background" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
+
+</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_background_dark.xml b/vector/src/main/res/drawable/vector_tabbar_background_dark.xml
deleted file mode 100644
index 74b4a8c4c3..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_background_dark.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_dark" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_dark" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_dark" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_dark" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Pressed -->
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_dark" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_dark" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_dark" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_dark" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
-
-</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_background_light.xml b/vector/src/main/res/drawable/vector_tabbar_background_light.xml
deleted file mode 100644
index 432be45bbe..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_background_light.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_light" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_light" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_light" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_light" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Pressed -->
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_light" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_light" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_light" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_light" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
-
-</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_background_status.xml b/vector/src/main/res/drawable/vector_tabbar_background_status.xml
deleted file mode 100644
index f0f38a6439..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_background_status.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_status" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_status" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_status" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_status" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Pressed -->
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_status" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_status" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_status" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_status" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
-
-</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_selected_background.xml b/vector/src/main/res/drawable/vector_tabbar_selected_background.xml
new file mode 100644
index 0000000000..c4a7ae037c
--- /dev/null
+++ b/vector/src/main/res/drawable/vector_tabbar_selected_background.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/riotx_accent" />
+            <padding android:bottom="2dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="?tab_bar_selected_background_color" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_selected_background_dark.xml b/vector/src/main/res/drawable/vector_tabbar_selected_background_dark.xml
deleted file mode 100644
index ce8ba4eb8d..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_selected_background_dark.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/list_divider_color_dark" />
-            <padding android:bottom="1dp" />
-        </shape>
-    </item>
-
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/white" />
-            <padding android:bottom="2dp" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_bar_selected_background_color_dark" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_selected_background_light.xml b/vector/src/main/res/drawable/vector_tabbar_selected_background_light.xml
deleted file mode 100644
index 9625ac483f..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_selected_background_light.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/list_divider_color_light" />
-            <padding android:bottom="1dp" />
-        </shape>
-    </item>
-
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/white" />
-            <padding android:bottom="2dp" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_bar_selected_background_color_light" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_selected_background_status.xml b/vector/src/main/res/drawable/vector_tabbar_selected_background_status.xml
deleted file mode 100644
index ee338a5a39..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_selected_background_status.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/list_divider_color_light" />
-            <padding android:bottom="1dp" />
-        </shape>
-    </item>
-
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/white" />
-            <padding android:bottom="2dp" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_bar_selected_background_color_status" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_unselected_background_dark.xml b/vector/src/main/res/drawable/vector_tabbar_unselected_background.xml
similarity index 65%
rename from vector/src/main/res/drawable/vector_tabbar_unselected_background_dark.xml
rename to vector/src/main/res/drawable/vector_tabbar_unselected_background.xml
index cb302f5111..72fbda740c 100644
--- a/vector/src/main/res/drawable/vector_tabbar_unselected_background_dark.xml
+++ b/vector/src/main/res/drawable/vector_tabbar_unselected_background.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/tab_bar_unselected_background_color_dark" />
+            <solid android:color="?tab_bar_unselected_background_color" />
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_unselected_background_light.xml b/vector/src/main/res/drawable/vector_tabbar_unselected_background_light.xml
deleted file mode 100644
index a7a286e724..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_unselected_background_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_bar_unselected_background_color_light" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_unselected_background_status.xml b/vector/src/main/res/drawable/vector_tabbar_unselected_background_status.xml
deleted file mode 100644
index e2c7613c50..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_unselected_background_status.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_bar_unselected_background_color_status" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/values/colors_riot.xml b/vector/src/main/res/values/colors_riot.xml
index d939b9ddc5..a606f880a1 100644
--- a/vector/src/main/res/values/colors_riot.xml
+++ b/vector/src/main/res/values/colors_riot.xml
@@ -53,13 +53,15 @@
     <!--Black/Line break mobile-->
     <color name="list_divider_color_black">#FF22262E</color>
 
-    <color name="tab_bar_selected_background_color_light">@color/primary_color_light</color>
-    <color name="tab_bar_selected_background_color_dark">@color/primary_color_dark</color>
-    <color name="tab_bar_selected_background_color_status">@color/primary_color_status</color>
+    <attr name="tab_bar_selected_background_color" format="color" />
+    <color name="tab_bar_selected_background_color_light">@color/riotx_android_secondary_light</color>
+    <color name="tab_bar_selected_background_color_dark">@color/riotx_android_secondary_dark</color>
+    <color name="tab_bar_selected_background_color_status">@color/riotx_android_secondary_black</color>
 
-    <color name="tab_bar_unselected_background_color_light">@color/primary_color_light</color>
-    <color name="tab_bar_unselected_background_color_dark">@color/primary_color_dark</color>
-    <color name="tab_bar_unselected_background_color_status">@color/primary_color_status</color>
+    <attr name="tab_bar_unselected_background_color" format="color" />
+    <color name="tab_bar_unselected_background_color_light">@color/riotx_background_light</color>
+    <color name="tab_bar_unselected_background_color_dark">@color/riotx_background_dark</color>
+    <color name="tab_bar_unselected_background_color_status">@color/riotx_background_black</color>
 
     <!-- Hint Colors -->
     <color name="primary_hint_text_color_light">#FFFFFF</color>
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index 1899084f69..b3430a59c8 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -371,4 +371,9 @@
         <item name="android:textColor">?vctr_message_text_color</item>
     </style>
 
+    <style name="Vector.TabView" parent="Widget.AppCompat.ActionBar.TabView">
+        <item name="android:background">@drawable/vector_tabbar_background</item>
+        <item name="background">@drawable/vector_tabbar_background</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 64855223ee..3e3cc8bbac 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -147,13 +147,16 @@
         <item name="android:actionBarDivider">@null</item>
 
         <!-- tabbar background -->
-        <item name="android:actionBarTabStyle">@style/Vector.TabView.Dark</item>
-        <item name="actionBarTabStyle">@style/Vector.TabView.Dark</item>
+        <item name="android:actionBarTabStyle">@style/Vector.TabView</item>
+        <item name="actionBarTabStyle">@style/Vector.TabView</item>
 
         <!-- tabbar text color -->
         <item name="android:actionBarTabTextStyle">@style/Vector.TabText</item>
         <item name="actionBarTabTextStyle">@style/Vector.TabText</item>
 
+        <item name="tab_bar_selected_background_color">@color/tab_bar_selected_background_color_dark</item>
+        <item name="tab_bar_unselected_background_color">@color/tab_bar_unselected_background_color_dark</item>
+
         <!-- Preference -->
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
@@ -180,9 +183,4 @@
 
     <style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
 
-    <style name="Vector.TabView.Dark" parent="Widget.AppCompat.ActionBar.TabView">
-        <item name="android:background">@drawable/vector_tabbar_background_dark</item>
-        <item name="background">@drawable/vector_tabbar_background_dark</item>
-    </style>
-
 </resources>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 88510e526a..943f2dc8c2 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -147,13 +147,16 @@
         <item name="android:actionBarDivider">@null</item>
 
         <!-- tabbar background -->
-        <item name="android:actionBarTabStyle">@style/Vector.TabView.Light</item>
-        <item name="actionBarTabStyle">@style/Vector.TabView.Light</item>
+        <item name="android:actionBarTabStyle">@style/Vector.TabView</item>
+        <item name="actionBarTabStyle">@style/Vector.TabView</item>
 
         <!-- tabbar text color -->
         <item name="android:actionBarTabTextStyle">@style/Vector.TabText</item>
         <item name="actionBarTabTextStyle">@style/Vector.TabText</item>
 
+        <item name="tab_bar_selected_background_color">@color/tab_bar_selected_background_color_light</item>
+        <item name="tab_bar_unselected_background_color">@color/tab_bar_unselected_background_color_light</item>
+
         <!-- Preference -->
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
@@ -180,9 +183,4 @@
 
     <style name="AppTheme.Light" parent="AppTheme.Base.Light" />
 
-    <style name="Vector.TabView.Light" parent="Widget.AppCompat.ActionBar.TabView">
-        <item name="android:background">@drawable/vector_tabbar_background_light</item>
-        <item name="background">@drawable/vector_tabbar_background_light</item>
-    </style>
-
 </resources>
diff --git a/vector/src/main/res/values/theme_status.xml b/vector/src/main/res/values/theme_status.xml
index 97e546d239..c127baf3ca 100644
--- a/vector/src/main/res/values/theme_status.xml
+++ b/vector/src/main/res/values/theme_status.xml
@@ -85,14 +85,13 @@
         <!-- no divider -->
         <item name="android:actionBarDivider">@null</item>
 
-        <!-- tabbar background -->
-        <item name="android:actionBarTabStyle">@style/Vector.TabView.Status</item>
-        <item name="actionBarTabStyle">@style/Vector.TabView.Status</item>
-
         <!-- tabbar text color -->
         <item name="android:actionBarTabTextStyle">@style/Vector.TabText</item>
         <item name="actionBarTabTextStyle">@style/Vector.TabText</item>
 
+        <item name="tab_bar_selected_background_color">@color/tab_bar_selected_background_color_status</item>
+        <item name="tab_bar_unselected_background_color">@color/tab_bar_unselected_background_color_status</item>
+
         <!-- Preference -->
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
@@ -101,9 +100,4 @@
 
     <style name="AppTheme.Status" parent="AppTheme.Base.Status" />
 
-    <style name="Vector.TabView.Status" parent="Widget.AppCompat.ActionBar.TabView">
-        <item name="android:background">@drawable/vector_tabbar_background_status</item>
-        <item name="background">@drawable/vector_tabbar_background_status</item>
-    </style>
-
 </resources>