From 8162d1100db4688b0a96c6d41a7be91028b08626 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 10 Jun 2021 17:43:43 +0200
Subject: [PATCH] Update navigation colors

---
 .../color/bottom_navigation_icon_tint_selector.xml   |  2 +-
 .../src/main/res/drawable/bg_bottom_navigation.xml   |  6 ++++++
 vector/src/main/res/layout/fragment_home_detail.xml  |  4 ----
 .../src/main/res/values/styles_bottom_navigation.xml | 12 ++++++++++++
 vector/src/main/res/values/theme_dark.xml            |  1 +
 vector/src/main/res/values/theme_light.xml           |  1 +
 6 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 vector/src/main/res/drawable/bg_bottom_navigation.xml
 create mode 100644 vector/src/main/res/values/styles_bottom_navigation.xml

diff --git a/vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml b/vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml
index a6cf578295..403ed865e7 100644
--- a/vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml
+++ b/vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="?colorPrimary" android:state_checked="true" />
-    <item android:color="?vctr_content_secondary" />
+    <item android:color="?vctr_content_tertiary" />
 </selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_bottom_navigation.xml b/vector/src/main/res/drawable/bg_bottom_navigation.xml
new file mode 100644
index 0000000000..3011da0026
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_bottom_navigation.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="?vctr_toolbar_background"/>
+
+</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index df21c6af80..3b8030a828 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -164,10 +164,6 @@
         android:id="@+id/bottomNavigationView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:background="?vctr_system"
-        app:itemIconSize="20dp"
-        app:itemIconTint="@color/bottom_navigation_icon_tint_selector"
-        app:labelVisibilityMode="unlabeled"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/values/styles_bottom_navigation.xml b/vector/src/main/res/values/styles_bottom_navigation.xml
new file mode 100644
index 0000000000..ddd5e7d30a
--- /dev/null
+++ b/vector/src/main/res/values/styles_bottom_navigation.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="VectorBottomNavigation" parent="Widget.MaterialComponents.BottomNavigationView">
+        <item name="android:background">@drawable/bg_bottom_navigation</item>
+        <item name="itemBackground">@drawable/bg_bottom_navigation</item>
+        <item name="itemIconSize">20dp</item>
+        <item name="itemIconTint">@color/bottom_navigation_icon_tint_selector</item>
+        <item name="labelVisibilityMode">unlabeled</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 3904ac5b45..4d200149ed 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -68,6 +68,7 @@
         <item name="materialButtonStyle">@style/VectorButtonStyle</item>
         <item name="toolbarStyle">@style/VectorToolbar</item>
         <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleDark</item>
+        <item name="bottomNavigationStyle">@style/VectorBottomNavigation</item>
 
         <!-- Default style for text input -->
         <item name="textInputStyle">@style/VectorTextInputLayout</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 61e7242c94..1b46d09726 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -68,6 +68,7 @@
         <item name="materialButtonStyle">@style/VectorButtonStyle</item>
         <item name="toolbarStyle">@style/VectorToolbar</item>
         <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleLight</item>
+        <item name="bottomNavigationStyle">@style/VectorBottomNavigation</item>
 
         <!-- Default style for text input -->
         <item name="textInputStyle">@style/VectorTextInputLayout</item>