From 42360c678f5c5b5dff7c615275bbedcbfe5621b4 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Fri, 15 Dec 2023 22:25:24 +0300
Subject: [PATCH] Revert BottomNav and CTBLayout styles

---
 .../color-v23/bottom_menu_active_indicator.xml   |  4 ++++
 .../res/color-v23/bottom_menu_active_item.xml    |  5 +++++
 .../res/color/bottom_menu_active_indicator.xml   |  4 ++++
 .../main/res/color/bottom_menu_active_item.xml   |  5 +++++
 app/src/main/res/values/styles.xml               | 16 +++++++++++++---
 5 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/color-v23/bottom_menu_active_indicator.xml
 create mode 100644 app/src/main/res/color-v23/bottom_menu_active_item.xml
 create mode 100644 app/src/main/res/color/bottom_menu_active_indicator.xml
 create mode 100644 app/src/main/res/color/bottom_menu_active_item.xml

diff --git a/app/src/main/res/color-v23/bottom_menu_active_indicator.xml b/app/src/main/res/color-v23/bottom_menu_active_indicator.xml
new file mode 100644
index 000000000..bbd22d907
--- /dev/null
+++ b/app/src/main/res/color-v23/bottom_menu_active_indicator.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:alpha="0.2" android:color="?attr/colorPrimary" />
+</selector>
diff --git a/app/src/main/res/color-v23/bottom_menu_active_item.xml b/app/src/main/res/color-v23/bottom_menu_active_item.xml
new file mode 100644
index 000000000..6b6938f5e
--- /dev/null
+++ b/app/src/main/res/color-v23/bottom_menu_active_item.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="?attr/colorOnSecondaryContainer" android:state_checked="true" />
+	<item android:color="?attr/colorOnSurfaceVariant" android:state_checked="false" />
+</selector>
diff --git a/app/src/main/res/color/bottom_menu_active_indicator.xml b/app/src/main/res/color/bottom_menu_active_indicator.xml
new file mode 100644
index 000000000..3dd89e625
--- /dev/null
+++ b/app/src/main/res/color/bottom_menu_active_indicator.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:alpha="0.2" android:color="@color/kotatsu_primary" />
+</selector>
diff --git a/app/src/main/res/color/bottom_menu_active_item.xml b/app/src/main/res/color/bottom_menu_active_item.xml
new file mode 100644
index 000000000..a56980d3c
--- /dev/null
+++ b/app/src/main/res/color/bottom_menu_active_item.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="@color/kotatsu_secondaryContainer" android:state_checked="true" />
+	<item android:color="@color/kotatsu_onSurfaceVariant" android:state_checked="false" />
+</selector>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d57d5efbc..bd129354e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,7 +2,9 @@
 
 	<!--Toolbars-->
 
-	<style name="Widget.Kotatsu.CollapsingToolbar" parent="@style/Widget.Material3.CollapsingToolbar.Medium" />
+	<style name="Widget.Kotatsu.CollapsingToolbar" parent="@style/Widget.Material3.CollapsingToolbar.Medium">
+		<item name="contentScrim">?attr/m3ColorBottomMenuBackground</item>
+	</style>
 
 	<style name="Widget.Kotatsu.AppBarLayout" parent="@style/Widget.Material3.AppBarLayout">
 		<item name="android:background">?attr/m3ColorBackground</item>
@@ -12,11 +14,19 @@
 
 	<style name="Widget.Kotatsu.BottomNavigationView" parent="Widget.Material3.BottomNavigationView">
 		<item name="labelVisibilityMode">labeled</item>
+		<item name="android:background">?attr/m3ColorBottomMenuBackground</item>
+		<item name="itemActiveIndicatorStyle">@style/Widget.Kotatsu.BottomNavigationView.ActiveIndicator</item>
+		<item name="itemIconTint">@color/bottom_menu_active_item</item>
 	</style>
 
-	<style name="Widget.Kotatsu.BottomNavigationView.ColoredIndicators" />
+	<style name="Widget.Kotatsu.BottomNavigationView.ColoredIndicators">
+		<item name="itemActiveIndicatorStyle">@style/Widget.Kotatsu.BottomNavigationView.ActiveIndicator</item>
+		<item name="itemIconTint">@color/bottom_menu_active_item</item>
+	</style>
 
-	<style name="Widget.Kotatsu.BottomNavigationView.ActiveIndicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator" />
+	<style name="Widget.Kotatsu.BottomNavigationView.ActiveIndicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator">
+		<item name="android:color">@color/bottom_menu_active_indicator</item>
+	</style>
 
 	<style name="Widget.Kotatsu.ActionMode" parent="Base.Widget.Material3.ActionMode">
 		<!--<item name="titleTextStyle">@style/TextAppearance.Kotatsu.ActionBar.Title</item>-->