From 2b2498cb38b154d7ac62dd4734b360af0ea92ef6 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Wed, 11 Oct 2023 19:23:51 +0300
Subject: [PATCH] UI tweaks

---
 app/src/main/res/color-v23/dim_statusbar.xml       |  4 ----
 app/src/main/res/color/dim_statusbar.xml           |  4 ----
 app/src/main/res/values-night-v23/color_themes.xml |  7 +++++++
 app/src/main/res/values-night-v31/themes.xml       |  1 +
 app/src/main/res/values-night/colors_kotatsu.xml   |  1 +
 app/src/main/res/values-night/themes.xml           |  1 +
 app/src/main/res/values-v23/color_themes.xml       |  7 +++++++
 app/src/main/res/values-v23/themes.xml             | 10 ++++++++++
 app/src/main/res/values-v27/themes.xml             |  2 +-
 app/src/main/res/values-v31/themes.xml             |  1 +
 app/src/main/res/values/attrs.xml                  |  1 +
 app/src/main/res/values/colors_kotatsu.xml         |  1 +
 app/src/main/res/values/styles.xml                 |  6 +++---
 app/src/main/res/values/themes.xml                 |  5 +++--
 14 files changed, 37 insertions(+), 14 deletions(-)
 delete mode 100644 app/src/main/res/color-v23/dim_statusbar.xml
 delete mode 100644 app/src/main/res/color/dim_statusbar.xml
 create mode 100644 app/src/main/res/values-v23/themes.xml

diff --git a/app/src/main/res/color-v23/dim_statusbar.xml b/app/src/main/res/color-v23/dim_statusbar.xml
deleted file mode 100644
index eb7267045..000000000
--- a/app/src/main/res/color-v23/dim_statusbar.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:alpha="0.6" android:color="?android:colorBackground" />
-</selector>
diff --git a/app/src/main/res/color/dim_statusbar.xml b/app/src/main/res/color/dim_statusbar.xml
deleted file mode 100644
index 9891f13c8..000000000
--- a/app/src/main/res/color/dim_statusbar.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:alpha="0.6" android:color="@android:color/black" />
-</selector>
diff --git a/app/src/main/res/values-night-v23/color_themes.xml b/app/src/main/res/values-night-v23/color_themes.xml
index 9cce29aef..fe4f62f42 100644
--- a/app/src/main/res/values-night-v23/color_themes.xml
+++ b/app/src/main/res/values-night-v23/color_themes.xml
@@ -38,6 +38,7 @@
 		<item name="colorOutlineVariant">#3F4947</item>
 		<item name="m3ColorBackground">@color/background_miku</item>
 		<item name="m3ColorExploreButton">#1D2020</item>
+		<item name="m3ColorCardBackground">#282C2C</item>
 		<item name="m3ColorBottomMenuBackground">#272B2A</item>
 	</style>
 
@@ -78,6 +79,7 @@
 		<item name="colorOutlineVariant">#534342</item>
 		<item name="m3ColorBackground">@color/background_asuka</item>
 		<item name="m3ColorExploreButton">#251E1E</item>
+		<item name="m3ColorCardBackground">#2E2525</item>
 		<item name="m3ColorBottomMenuBackground">#2F2828</item>
 	</style>
 
@@ -118,6 +120,7 @@
 		<item name="colorOutlineVariant">#404943</item>
 		<item name="m3ColorBackground">@color/background_mion</item>
 		<item name="m3ColorExploreButton">#1D201E</item>
+		<item name="m3ColorCardBackground">#262B28</item>
 		<item name="m3ColorBottomMenuBackground">#272B28</item>
 	</style>
 
@@ -158,6 +161,7 @@
 		<item name="colorOutlineVariant">#524343</item>
 		<item name="m3ColorBackground">@color/background_rikka</item>
 		<item name="m3ColorExploreButton">#241E1E</item>
+		<item name="m3ColorCardBackground">#302828</item>
 		<item name="m3ColorBottomMenuBackground">#2F2828</item>
 	</style>
 
@@ -198,6 +202,7 @@
 		<item name="colorOutlineVariant">#40484B</item>
 		<item name="m3ColorBackground">@color/background_sakura</item>
 		<item name="m3ColorExploreButton">#1D2021</item>
+		<item name="m3ColorCardBackground">#25292B</item>
 		<item name="m3ColorBottomMenuBackground">#272A2C</item>
 	</style>
 
@@ -238,6 +243,7 @@
 		<item name="colorOutlineVariant">#524344</item>
 		<item name="m3ColorBackground">@color/background_mamimi</item>
 		<item name="m3ColorExploreButton">#241E1E</item>
+		<item name="m3ColorCardBackground">#2B2323</item>
 		<item name="m3ColorBottomMenuBackground">#2F2828</item>
 	</style>
 
@@ -278,6 +284,7 @@
 		<item name="colorOutlineVariant">#494949</item>
 		<item name="m3ColorBackground">@color/background_kanade</item>
 		<item name="m3ColorExploreButton">#292929</item>
+		<item name="m3ColorCardBackground">#303030</item>
 		<item name="m3ColorBottomMenuBackground">#2C2C2C</item>
 	</style>
 </resources>
diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
index 705b3d182..fac1f3d35 100644
--- a/app/src/main/res/values-night-v31/themes.xml
+++ b/app/src/main/res/values-night-v31/themes.xml
@@ -57,6 +57,7 @@
 		<item name="android:colorBackground">@android:color/system_neutral2_900</item>
 		<item name="m3ColorBackground">@android:color/system_neutral2_900</item>
 		<item name="m3ColorExploreButton">@android:color/system_neutral2_800</item>
+		<item name="m3ColorCardBackground">@android:color/system_neutral2_700</item>
 		<item name="m3ColorBottomMenuBackground">@android:color/system_neutral2_800</item>
 		<!-- Default Framework Text Colors. -->
 		<item name="android:textColorPrimary">@color/m3_dynamic_dark_default_color_primary_text
diff --git a/app/src/main/res/values-night/colors_kotatsu.xml b/app/src/main/res/values-night/colors_kotatsu.xml
index 04e99341f..c3d361233 100644
--- a/app/src/main/res/values-night/colors_kotatsu.xml
+++ b/app/src/main/res/values-night/colors_kotatsu.xml
@@ -43,5 +43,6 @@
 	<color name="kotatsu_scrim">#000000</color>
 	<color name="kotatsu_m3_background">#1A1B1F</color>
 	<color name="kotatsu_m3_exploreButton">#292A2D</color>
+	<color name="kotatsu_m3_cardBackground">#313235</color>
 	<color name="kotatsu_m3_bottom_menu">#2F3033</color>
 </resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 20b0de500..1a216ca3c 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -8,6 +8,7 @@
 		<item name="android:colorBackground">@color/background_amoled</item>
 		<item name="m3ColorBackground">@color/background_amoled</item>
 		<item name="m3ColorExploreButton">@color/surface_amoled</item>
+		<item name="m3ColorCardBackground">@color/surface_amoled</item>
 		<item name="m3ColorBottomMenuBackground">@color/surface_amoled</item>
 	</style>
 
diff --git a/app/src/main/res/values-v23/color_themes.xml b/app/src/main/res/values-v23/color_themes.xml
index dd0d590e8..f6cc227aa 100644
--- a/app/src/main/res/values-v23/color_themes.xml
+++ b/app/src/main/res/values-v23/color_themes.xml
@@ -38,6 +38,7 @@
 		<item name="colorOutlineVariant">#BEC9C6</item>
 		<item name="m3ColorBackground">@color/background_miku</item>
 		<item name="m3ColorExploreButton">#FFFFFF</item>
+		<item name="m3ColorCardBackground">#FFFFFF</item>
 		<item name="m3ColorBottomMenuBackground">#C4FFF7</item>
 	</style>
 
@@ -78,6 +79,7 @@
 		<item name="colorOutlineVariant">#D8C1C0</item>
 		<item name="m3ColorBackground">@color/background_asuka</item>
 		<item name="m3ColorExploreButton">#FFFFFF</item>
+		<item name="m3ColorCardBackground">#FFFFFF</item>
 		<item name="m3ColorBottomMenuBackground">#FFDAD7</item>
 	</style>
 
@@ -118,6 +120,7 @@
 		<item name="colorOutlineVariant">#C0C9C1</item>
 		<item name="m3ColorBackground">@color/background_mion</item>
 		<item name="m3ColorExploreButton">#FFFFFF</item>
+		<item name="m3ColorCardBackground">#FFFFFF</item>
 		<item name="m3ColorBottomMenuBackground">#CDFFE1</item>
 	</style>
 
@@ -158,6 +161,7 @@
 		<item name="colorOutlineVariant">#C8C5D0</item>
 		<item name="m3ColorBackground">@color/background_rikka</item>
 		<item name="m3ColorExploreButton">#FFFFFF</item>
+		<item name="m3ColorCardBackground">#FFFFFF</item>
 		<item name="m3ColorBottomMenuBackground">#F0EBFF</item>
 	</style>
 
@@ -198,6 +202,7 @@
 		<item name="colorOutlineVariant">#D5C2C6</item>
 		<item name="m3ColorBackground">@color/background_sakura</item>
 		<item name="m3ColorExploreButton">#FFFFFF</item>
+		<item name="m3ColorCardBackground">#FFFFFF</item>
 		<item name="m3ColorBottomMenuBackground">#FFE8ED</item>
 	</style>
 
@@ -238,6 +243,7 @@
 		<item name="colorOutlineVariant">#D7C1C2</item>
 		<item name="m3ColorBackground">@color/background_mamimi</item>
 		<item name="m3ColorExploreButton">#FFFFFF</item>
+		<item name="m3ColorCardBackground">#FFFFFF</item>
 		<item name="m3ColorBottomMenuBackground">#FFE1E2</item>
 	</style>
 
@@ -278,6 +284,7 @@
 		<item name="colorOutlineVariant">#D5D5D5</item>
 		<item name="m3ColorBackground">@color/background_kanade</item>
 		<item name="m3ColorExploreButton">#FFFFFF</item>
+		<item name="m3ColorCardBackground">#FFFFFF</item>
 		<item name="m3ColorBottomMenuBackground">#DCDCDC</item>
 	</style>
 </resources>
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
new file mode 100644
index 000000000..a0b9e171e
--- /dev/null
+++ b/app/src/main/res/values-v23/themes.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<style name="Base.V23.Kotatsu" parent="Base.Theme.Kotatsu">
+		<item name="android:statusBarColor">@android:color/transparent</item>
+	</style>
+
+	<style name="Theme.Kotatsu" parent="Base.V23.Kotatsu" />
+
+</resources>
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
index fa9a0402a..94d572af9 100644
--- a/app/src/main/res/values-v27/themes.xml
+++ b/app/src/main/res/values-v27/themes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-	<style name="Base.V27.Kotatsu" parent="Base.Theme.Kotatsu">
+	<style name="Base.V27.Kotatsu" parent="Base.V23.Kotatsu">
 		<item name="android:navigationBarColor">@color/navigation_bar_scrim</item>
 		<item name="android:windowLightNavigationBar">@bool/light_navigation_bar</item>
 	</style>
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index 6a2175ddb..006e554df 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -68,6 +68,7 @@
 		<item name="android:colorBackground">@android:color/system_neutral2_50</item>
 		<item name="m3ColorBackground">@android:color/system_neutral2_50</item>
 		<item name="m3ColorExploreButton">@android:color/white</item>
+		<item name="m3ColorCardBackground">@android:color/white</item>
 		<item name="m3ColorBottomMenuBackground">@android:color/system_neutral2_100</item>
 		<!-- Default Framework Text Colors. -->
 		<item name="android:textColorPrimary">@color/m3_dynamic_default_color_primary_text</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index b3c109ae5..b80354b04 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -10,6 +10,7 @@
 	<attr name="tipViewStyle" />
 	<attr name="m3ColorBackground" />
 	<attr name="m3ColorExploreButton" />
+	<attr name="m3ColorCardBackground" />
 	<attr name="m3ColorBottomMenuBackground" />
 
 	<!--CoverImageView attrs-->
diff --git a/app/src/main/res/values/colors_kotatsu.xml b/app/src/main/res/values/colors_kotatsu.xml
index e0c485a6e..f4244e522 100644
--- a/app/src/main/res/values/colors_kotatsu.xml
+++ b/app/src/main/res/values/colors_kotatsu.xml
@@ -45,6 +45,7 @@
 	<color name="kotatsu_m3_background">#EDF0FF</color>
 	<!-- White -->
 	<color name="kotatsu_m3_exploreButton">#FFFFFF</color>
+	<color name="kotatsu_m3_cardBackground">#FFFFFF</color>
 	<!-- Primary 90 -->
 	<color name="kotatsu_m3_bottom_menu">#D9E2FF</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 70d83af9d..8fd970973 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -78,8 +78,8 @@
 		<item name="cardBackgroundColor">?attr/colorSurfaceContainerLow</item>
 	</style>
 
-	<style name="Widget.Kotatsu.MaterialCardView.Filled" parent="Widget.Material3.CardView.Filled">
-		<item name="cardBackgroundColor">?attr/m3ColorExploreButton</item>
+	<style name="Widget.Kotatsu.CardView.Filled" parent="Widget.Material3.CardView.Filled">
+		<item name="cardBackgroundColor">?attr/m3ColorCardBackground</item>
 		<item name="shapeAppearance">?attr/shapeAppearanceCornerExtraLarge</item>
 	</style>
 
@@ -226,7 +226,7 @@
 	</style>
 
 	<style name="ThemeOverlay.Kotatsu.CardContainer" parent="">
-		<item name="android:colorBackground">?m3ColorExploreButton</item>
+		<item name="android:colorBackground">?m3ColorCardBackground</item>
 	</style>
 
 	<style name="ThemeOverlay.Kotatsu.ActionMode" parent="">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index da141bd7e..a0be20982 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -37,6 +37,7 @@
 		<item name="android:colorBackground">@color/kotatsu_m3_background</item>
 		<item name="m3ColorBackground">@color/kotatsu_m3_background</item>
 		<item name="m3ColorExploreButton">@color/kotatsu_m3_exploreButton</item>
+		<item name="m3ColorCardBackground">@color/kotatsu_m3_cardBackground</item>
 		<item name="m3ColorBottomMenuBackground">@color/kotatsu_m3_bottom_menu</item>
 		<item name="colorOnBackground">@color/kotatsu_onSurface</item>
 		<item name="colorError">@color/error</item>
@@ -54,7 +55,7 @@
 
 		<!-- Themes -->
 		<item name="android:windowLightStatusBar" tools:targetApi="M">@bool/light_status_bar</item>
-		<item name="android:statusBarColor">@color/dim_statusbar</item>
+		<item name="android:statusBarColor">@color/dim</item>
 		<item name="android:navigationBarColor">@color/surface_amoled</item>
 		<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
 		<item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
@@ -79,7 +80,7 @@
 			@style/Widget.Kotatsu.BottomNavigationView.ColoredIndicators
 		</item>
 		<item name="tabStyle">@style/Widget.Kotatsu.Tabs</item>
-		<item name="materialCardViewStyle">@style/Widget.Kotatsu.MaterialCardView.Filled</item>
+		<item name="materialCardViewStyle">@style/Widget.Kotatsu.CardView.Filled</item>
 		<item name="recyclerViewStyle">@style/Widget.Kotatsu.RecyclerView</item>
 		<item name="fastScrollerStyle">@style/Widget.Kotatsu.FastScroller</item>
 		<item name="listItemTextViewStyle">@style/Widget.Kotatsu.ListItemTextView</item>