From fb674b60283f6198db3184394ff28ecb4fa7ee11 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Mon, 3 Jul 2023 16:11:05 +0300
Subject: [PATCH] More M3 theming

---
 .../bottom_menu_active_indicator.xml          |  2 +-
 .../res/color-v23/bottom_menu_active_item.xml |  4 +--
 .../color/bottom_menu_active_indicator.xml    |  2 +-
 .../res/color/bottom_menu_active_item.xml     |  4 +--
 app/src/main/res/color/ripple_toolbar.xml     |  4 +--
 .../main/res/drawable-v23/tabs_background.xml | 18 +++++++++++++
 .../res/drawable-v23/toolbar_background.xml   |  2 +-
 app/src/main/res/drawable/tabs_background.xml | 18 +++++++++++++
 .../main/res/drawable/toolbar_background.xml  |  2 +-
 app/src/main/res/layout/item_manga_grid.xml   |  3 ++-
 app/src/main/res/values-night-v31/themes.xml  | 26 ++++++++++++-------
 app/src/main/res/values-night/colors.xml      |  2 +-
 app/src/main/res/values-v31/themes.xml        | 26 ++++++++++++-------
 app/src/main/res/values/styles.xml            | 12 ++++++---
 14 files changed, 92 insertions(+), 33 deletions(-)
 create mode 100644 app/src/main/res/drawable-v23/tabs_background.xml
 create mode 100644 app/src/main/res/drawable/tabs_background.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
index 6bb0c8f83..bbd22d907 100644
--- a/app/src/main/res/color-v23/bottom_menu_active_indicator.xml
+++ b/app/src/main/res/color-v23/bottom_menu_active_indicator.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:alpha="0.4" android:color="?attr/colorPrimaryInverse" />
+	<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
index c2c510e6d..6b6938f5e 100644
--- a/app/src/main/res/color-v23/bottom_menu_active_item.xml
+++ b/app/src/main/res/color-v23/bottom_menu_active_item.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="?attr/colorOnPrimaryContainer" android:state_checked="true" />
-	<item android:color="?attr/colorControlNormal" android:state_checked="false" />
+	<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
index cd82add77..3dd89e625 100644
--- a/app/src/main/res/color/bottom_menu_active_indicator.xml
+++ b/app/src/main/res/color/bottom_menu_active_indicator.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:alpha="0.4" android:color="@color/kotatsu_inversePrimary" />
+	<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
index 2c439130a..715da6df6 100644
--- a/app/src/main/res/color/bottom_menu_active_item.xml
+++ b/app/src/main/res/color/bottom_menu_active_item.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="@color/kotatsu_onPrimaryContainer" android:state_checked="true" />
-	<item android:color="?attr/colorControlNormal" android:state_checked="false" />
+	<item android:color="@color/kotatsu_onSecondaryContainer" android:state_checked="true" />
+	<item android:color="@color/kotatsu_onSurfaceVariant" android:state_checked="false" />
 </selector>
diff --git a/app/src/main/res/color/ripple_toolbar.xml b/app/src/main/res/color/ripple_toolbar.xml
index 7ef8081de..979d0f94a 100644
--- a/app/src/main/res/color/ripple_toolbar.xml
+++ b/app/src/main/res/color/ripple_toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<!-- 34% of 12% = ~4% -->
-	<item android:alpha="0.34" android:color="?attr/colorControlHighlight" />
-</selector>
\ No newline at end of file
+	<item android:alpha="0.34" android:color="?attr/colorPrimary" />
+</selector>
diff --git a/app/src/main/res/drawable-v23/tabs_background.xml b/app/src/main/res/drawable-v23/tabs_background.xml
new file mode 100644
index 000000000..7679bfbcf
--- /dev/null
+++ b/app/src/main/res/drawable-v23/tabs_background.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<!-- Fills the entire area with the divider's color first... -->
+	<item>
+		<shape
+			android:shape="rectangle">
+			<solid android:color="?attr/colorOutline"/>
+		</shape>
+	</item>
+	<!-- ..., then draws a rectangle with the container color to cover the area not for the divider. -->
+	<item
+		android:bottom="1dp">
+		<shape
+			android:shape="rectangle">
+			<solid android:color="?attr/colorSurfaceContainerHigh"/>
+		</shape>
+	</item>
+</layer-list>
diff --git a/app/src/main/res/drawable-v23/toolbar_background.xml b/app/src/main/res/drawable-v23/toolbar_background.xml
index 774e73986..7679bfbcf 100644
--- a/app/src/main/res/drawable-v23/toolbar_background.xml
+++ b/app/src/main/res/drawable-v23/toolbar_background.xml
@@ -4,7 +4,7 @@
 	<item>
 		<shape
 			android:shape="rectangle">
-			<solid android:color="?attr/colorSecondary"/>
+			<solid android:color="?attr/colorOutline"/>
 		</shape>
 	</item>
 	<!-- ..., then draws a rectangle with the container color to cover the area not for the divider. -->
diff --git a/app/src/main/res/drawable/tabs_background.xml b/app/src/main/res/drawable/tabs_background.xml
new file mode 100644
index 000000000..79f3ec5f3
--- /dev/null
+++ b/app/src/main/res/drawable/tabs_background.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<!-- Fills the entire area with the divider's color first... -->
+	<item>
+		<shape
+			android:shape="rectangle">
+			<solid android:color="@color/kotatsu_outline"/>
+		</shape>
+	</item>
+	<!-- ..., then draws a rectangle with the container color to cover the area not for the divider. -->
+	<item
+		android:bottom="1dp">
+		<shape
+			android:shape="rectangle">
+			<solid android:color="@color/kotatsu_surfaceContainerHigh"/>
+		</shape>
+	</item>
+</layer-list>
diff --git a/app/src/main/res/drawable/toolbar_background.xml b/app/src/main/res/drawable/toolbar_background.xml
index e032e2149..2a07082ae 100644
--- a/app/src/main/res/drawable/toolbar_background.xml
+++ b/app/src/main/res/drawable/toolbar_background.xml
@@ -4,7 +4,7 @@
 	<item>
 		<shape
 			android:shape="rectangle">
-			<solid android:color="@color/kotatsu_secondary"/>
+			<solid android:color="@color/kotatsu_primaryContainer"/>
 		</shape>
 	</item>
 	<!-- ..., then draws a rectangle with the container color to cover the area not for the divider. -->
diff --git a/app/src/main/res/layout/item_manga_grid.xml b/app/src/main/res/layout/item_manga_grid.xml
index c7f630690..534b0b03e 100644
--- a/app/src/main/res/layout/item_manga_grid.xml
+++ b/app/src/main/res/layout/item_manga_grid.xml
@@ -4,10 +4,11 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	style="@style/Widget.Kotatsu.CardView.Outlined"
+	app:cardBackgroundColor="?attr/colorSurfaceContainerHighest"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:clipChildren="false"
-	app:cardCornerRadius="16dp"
+	app:cardCornerRadius="12dp"
 	tools:layout_width="140dp">
 
 	<LinearLayout
diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
index 8c93dcd18..da4b204b0 100644
--- a/app/src/main/res/values-night-v31/themes.xml
+++ b/app/src/main/res/values-night-v31/themes.xml
@@ -5,31 +5,39 @@
 		<item name="isMaterial3DynamicColorApplied">true</item>
 		<!-- Color palettes -->
 		<item name="colorPrimary">@color/m3_sys_color_dynamic_dark_primary</item>
-		<item name="colorOnPrimary">@color/m3_sys_color_dynamic_dark_on_primary</item>
-		<item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_dark_inverse_primary</item>
 		<item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_dark_primary_container</item>
+		<item name="colorOnPrimary">@color/m3_sys_color_dynamic_dark_on_primary</item>
 		<item name="colorOnPrimaryContainer">@color/m3_sys_color_dynamic_dark_on_primary_container</item>
+		<item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_dark_inverse_primary</item>
 		<item name="colorSecondary">@color/m3_sys_color_dynamic_dark_secondary</item>
-		<item name="colorOnSecondary">@color/m3_sys_color_dynamic_dark_on_secondary</item>
 		<item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_dark_secondary_container</item>
+		<item name="colorOnSecondary">@color/m3_sys_color_dynamic_dark_on_secondary</item>
 		<item name="colorOnSecondaryContainer">@color/m3_sys_color_dynamic_dark_on_secondary_container</item>
 		<item name="colorTertiary">@color/m3_sys_color_dynamic_dark_tertiary</item>
-		<item name="colorOnTertiary">@color/m3_sys_color_dynamic_dark_on_tertiary</item>
 		<item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_dark_tertiary_container</item>
+		<item name="colorOnTertiary">@color/m3_sys_color_dynamic_dark_on_tertiary</item>
 		<item name="colorOnTertiaryContainer">@color/m3_sys_color_dynamic_dark_on_tertiary_container</item>
-		<item name="android:colorBackground">@color/m3_sys_color_dynamic_dark_background</item>
-		<item name="colorOnBackground">@color/m3_sys_color_dynamic_dark_on_background</item>
 		<item name="colorSurface">@color/m3_sys_color_dynamic_dark_surface</item>
-		<item name="colorOnSurface">@color/m3_sys_color_dynamic_dark_on_surface</item>
+		<item name="colorSurfaceDim">@color/m3_sys_color_dynamic_dark_surface_dim</item>
+		<item name="colorSurfaceBright">@color/m3_sys_color_dynamic_dark_surface_bright</item>
+		<item name="colorSurfaceContainerLowest">@color/m3_sys_color_dynamic_dark_surface_container_lowest</item>
+		<item name="colorSurfaceContainerLow">@color/m3_sys_color_dynamic_dark_surface_container_low</item>
+		<item name="colorSurfaceContainer">@color/m3_sys_color_dynamic_dark_surface_container</item>
+		<item name="colorSurfaceContainerHigh">@color/m3_sys_color_dynamic_dark_surface_container_high</item>
+		<item name="colorSurfaceContainerHighest">@color/m3_sys_color_dynamic_dark_surface_container_highest</item>
 		<item name="colorSurfaceVariant">@color/m3_sys_color_dynamic_dark_surface_variant</item>
+		<item name="colorOnSurface">@color/m3_sys_color_dynamic_dark_on_surface</item>
 		<item name="colorOnSurfaceVariant">@color/m3_sys_color_dynamic_dark_on_surface_variant</item>
 		<item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_dark_inverse_surface</item>
 		<item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_dark_inverse_on_surface</item>
-		<item name="colorOutline">@color/m3_sys_color_dynamic_dark_outline</item>
+		<item name="colorOnBackground">@color/m3_sys_color_dynamic_dark_on_background</item>
 		<item name="colorError">@color/m3_sys_color_dark_error</item>
-		<item name="colorOnError">@color/m3_sys_color_dark_on_error</item>
 		<item name="colorErrorContainer">@color/m3_sys_color_dark_error_container</item>
+		<item name="colorOnError">@color/m3_sys_color_dark_on_error</item>
 		<item name="colorOnErrorContainer">@color/m3_sys_color_dark_on_error_container</item>
+		<item name="colorOutline">@color/m3_sys_color_dynamic_dark_outline</item>
+		<item name="colorOutlineVariant">@color/m3_sys_color_dynamic_dark_outline_variant</item>
+		<item name="android:colorBackground">@color/m3_sys_color_dynamic_dark_surface_container_high</item>
 		<!-- Default Framework Text Colors. -->
 		<item name="android:textColorPrimary">@color/m3_dynamic_dark_default_color_primary_text</item>
 		<item name="android:textColorPrimaryInverse">@color/m3_dynamic_default_color_primary_text</item>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 59fe57a5c..3bd14edc9 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -10,7 +10,7 @@
 	<color name="divider_default">#1FFFFFFF</color>
 	<color name="status_bar_incognito">#66311B92</color>
 	<color name="warning">#FB8C00</color>
-	<color name="launcher_background">#000000</color>
+	<color name="launcher_background">#222222</color>
 	<color name="splash_primary">#0C4091</color>
 
 	<!-- Color schemes colors -->
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index b888a80e4..aae4b36f1 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -13,31 +13,39 @@
 		<item name="isMaterial3DynamicColorApplied">true</item>
 		<!-- Color palettes -->
 		<item name="colorPrimary">@color/m3_sys_color_dynamic_light_primary</item>
-		<item name="colorOnPrimary">@color/m3_sys_color_dynamic_light_on_primary</item>
-		<item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_light_inverse_primary</item>
 		<item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_light_primary_container</item>
+		<item name="colorOnPrimary">@color/m3_sys_color_dynamic_light_on_primary</item>
 		<item name="colorOnPrimaryContainer">@color/m3_sys_color_dynamic_light_on_primary_container</item>
+		<item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_light_inverse_primary</item>
 		<item name="colorSecondary">@color/m3_sys_color_dynamic_light_secondary</item>
-		<item name="colorOnSecondary">@color/m3_sys_color_dynamic_light_on_secondary</item>
 		<item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_light_secondary_container</item>
+		<item name="colorOnSecondary">@color/m3_sys_color_dynamic_light_on_secondary</item>
 		<item name="colorOnSecondaryContainer">@color/m3_sys_color_dynamic_light_on_secondary_container</item>
 		<item name="colorTertiary">@color/m3_sys_color_dynamic_light_tertiary</item>
-		<item name="colorOnTertiary">@color/m3_sys_color_dynamic_light_on_tertiary</item>
 		<item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_light_tertiary_container</item>
+		<item name="colorOnTertiary">@color/m3_sys_color_dynamic_light_on_tertiary</item>
 		<item name="colorOnTertiaryContainer">@color/m3_sys_color_dynamic_light_on_tertiary_container</item>
-		<item name="android:colorBackground">@color/m3_sys_color_dynamic_light_background</item>
-		<item name="colorOnBackground">@color/m3_sys_color_dynamic_light_on_background</item>
 		<item name="colorSurface">@color/m3_sys_color_dynamic_light_surface</item>
-		<item name="colorOnSurface">@color/m3_sys_color_dynamic_light_on_surface</item>
+		<item name="colorSurfaceDim">@color/m3_sys_color_dynamic_light_surface_dim</item>
+		<item name="colorSurfaceBright">@color/m3_sys_color_dynamic_light_surface_bright</item>
+		<item name="colorSurfaceContainerLowest">@color/m3_sys_color_dynamic_light_surface_container_lowest</item>
+		<item name="colorSurfaceContainerLow">@color/m3_sys_color_dynamic_light_surface_container_low</item>
+		<item name="colorSurfaceContainer">@color/m3_sys_color_dynamic_light_surface_container</item>
+		<item name="colorSurfaceContainerHigh">@color/m3_sys_color_dynamic_light_surface_container_high</item>
+		<item name="colorSurfaceContainerHighest">@color/m3_sys_color_dynamic_light_surface_container_highest</item>
 		<item name="colorSurfaceVariant">@color/m3_sys_color_dynamic_light_surface_variant</item>
+		<item name="colorOnSurface">@color/m3_sys_color_dynamic_light_on_surface</item>
 		<item name="colorOnSurfaceVariant">@color/m3_sys_color_dynamic_light_on_surface_variant</item>
 		<item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_light_inverse_surface</item>
 		<item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_light_inverse_on_surface</item>
-		<item name="colorOutline">@color/m3_sys_color_dynamic_light_outline</item>
+		<item name="colorOnBackground">@color/m3_sys_color_dynamic_light_on_background</item>
 		<item name="colorError">@color/m3_sys_color_light_error</item>
-		<item name="colorOnError">@color/m3_sys_color_light_on_error</item>
 		<item name="colorErrorContainer">@color/m3_sys_color_light_error_container</item>
+		<item name="colorOnError">@color/m3_sys_color_light_on_error</item>
 		<item name="colorOnErrorContainer">@color/m3_sys_color_light_on_error_container</item>
+		<item name="colorOutline">@color/m3_sys_color_dynamic_light_outline</item>
+		<item name="colorOutlineVariant">@color/m3_sys_color_dynamic_light_outline_variant</item>
+		<item name="android:colorBackground">@color/m3_sys_color_dynamic_light_surface_container_high</item>
 		<!-- Default Framework Text Colors. -->
 		<item name="android:textColorPrimary">@color/m3_dynamic_default_color_primary_text</item>
 		<item name="android:textColorPrimaryInverse">@color/m3_dynamic_dark_default_color_primary_text</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 18920805d..7ed21fa7f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -11,7 +11,8 @@
 	<style name="Widget.Kotatsu.BottomNavigationView" parent="Widget.Material3.BottomNavigationView">
 		<item name="labelVisibilityMode">labeled</item>
 		<item name="android:background">?attr/colorSurfaceContainerHighest</item>
-		<item name="compatShadowEnabled">false</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">
@@ -73,6 +74,7 @@
 	</style>
 
 	<style name="Widget.Kotatsu.Tabs" parent="@style/Widget.Material3.TabLayout">
+		<item name="tabBackground">@drawable/tabs_background</item>
 		<item name="tabGravity">center</item>
 		<item name="tabInlineLabel">true</item>
 		<item name="tabMinWidth">75dp</item>
@@ -84,7 +86,7 @@
 		<item name="iconifiedByDefault">false</item>
 		<item name="searchIcon">@null</item>
 		<item name="queryBackground">@null</item>
-		<item name="android:textColorHint">?attr/colorControlNormal</item>
+		<item name="android:textAppearance">@style/TextAppearance.Kotatsu.SearchView</item>
 		<item name="android:textSize">18sp</item>
 	</style>
 
@@ -192,7 +194,7 @@
 		<item name="android:insetBottom">2dp</item>
 		<item name="android:gravity">start|center_vertical</item>
 		<item name="android:textAppearance">?textAppearanceButton</item>
-		<item name="backgroundTint">@color/colored_button</item>
+		<item name="backgroundTint">?attr/colorSurfaceContainerLow</item>
 	</style>
 
 	<style name="Widget.Kotatsu.TextView.Indicator" parent="Widget.MaterialComponents.TextView">
@@ -212,6 +214,10 @@
 
 	<!-- TextAppearance -->
 
+	<style name="TextAppearance.Kotatsu.SearchView" parent="TextAppearance.Material3.SearchBar">
+		<item name="android:textColor">?attr/colorOnSurfaceVariant</item>
+	</style>
+
 	<style name="TextAppearance.Widget.Menu" parent="TextAppearance.AppCompat.Menu">
 		<item name="android:textColor">?attr/colorOnBackground</item>
 	</style>