From 3cc0fbe7bca669a742e6bdcd5c40e2241e1bacf0 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Wed, 23 Aug 2023 20:42:40 +0300
Subject: [PATCH] Update UI

---
 .../kotatsu/core/ui/widgets/TipView.kt        |  2 +-
 app/src/main/res/layout/activity_details.xml  |  2 +-
 app/src/main/res/layout/activity_reader.xml   |  5 ++--
 app/src/main/res/layout/item_tip2.xml         |  2 +-
 .../res/values-night-v23/color_themes.xml     | 21 +++++++++++++++++
 app/src/main/res/values-night/colors.xml      | 14 +++++------
 .../main/res/values-night/colors_kotatsu.xml  |  1 -
 app/src/main/res/values-v23/color_themes.xml  | 23 ++++++++++++++++++-
 app/src/main/res/values-v31/themes.xml        |  1 -
 app/src/main/res/values/colors.xml            | 12 +++++-----
 app/src/main/res/values/colors_kotatsu.xml    |  4 +++-
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/values/styles.xml            |  3 ++-
 app/src/main/res/values/themes.xml            |  1 -
 app/src/main/res/xml/pref_appearance.xml      |  2 +-
 15 files changed, 69 insertions(+), 25 deletions(-)

diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/TipView.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/TipView.kt
index b3fe08f3f..96174748a 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/TipView.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/TipView.kt
@@ -76,7 +76,7 @@ class TipView @JvmOverloads constructor(
 			val shapeAppearanceModel = ShapeAppearanceModel.builder(context, attrs, defStyleAttr, 0).build()
 			background = MaterialShapeDrawable(shapeAppearanceModel).also {
 				it.fillColor = getColorStateList(R.styleable.TipView_cardBackgroundColor)
-					?: context.getThemeColorStateList(materialR.attr.colorBackgroundFloating)
+					?: context.getThemeColorStateList(R.attr.m3ColorExploreButton)
 				it.strokeWidth = getDimension(R.styleable.TipView_strokeWidth, 0f)
 				it.strokeColor = getColorStateList(R.styleable.TipView_strokeColor)
 				it.elevation = getDimension(R.styleable.TipView_elevation, 0f)
diff --git a/app/src/main/res/layout/activity_details.xml b/app/src/main/res/layout/activity_details.xml
index beb67f619..219cbaece 100644
--- a/app/src/main/res/layout/activity_details.xml
+++ b/app/src/main/res/layout/activity_details.xml
@@ -41,7 +41,7 @@
 		style="@style/Widget.Material3.BottomSheet"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:backgroundTint="?colorBackgroundFloating"
+		android:backgroundTint="?attr/m3ColorBottomMenuBackground"
 		android:orientation="vertical"
 		android:visibility="gone"
 		app:behavior_hideable="false"
diff --git a/app/src/main/res/layout/activity_reader.xml b/app/src/main/res/layout/activity_reader.xml
index 2faed85f9..4786a5680 100644
--- a/app/src/main/res/layout/activity_reader.xml
+++ b/app/src/main/res/layout/activity_reader.xml
@@ -26,7 +26,7 @@
 		android:id="@+id/appbar_top"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:background="?colorBackgroundFloating"
+		android:background="?m3ColorBottomMenuBackground"
 		android:elevation="@dimen/m3_card_elevated_elevation"
 		app:elevation="@dimen/m3_card_elevated_elevation"
 		app:liftOnScroll="false">
@@ -48,7 +48,7 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="bottom"
 		android:layout_margin="8dp"
-		app:cardBackgroundColor="?colorBackgroundFloating"
+		app:cardBackgroundColor="?m3ColorBottomMenuBackground"
 		app:layout_insetEdge="bottom">
 
 		<com.google.android.material.appbar.MaterialToolbar
@@ -63,6 +63,7 @@
 				android:layout_height="wrap_content"
 				android:stepSize="1"
 				android:valueFrom="0"
+				app:trackColorInactive="?attr/m3ColorBackground"
 				app:labelBehavior="floating"
 				app:tickVisible="false" />
 
diff --git a/app/src/main/res/layout/item_tip2.xml b/app/src/main/res/layout/item_tip2.xml
index 208761732..996c0cdd6 100644
--- a/app/src/main/res/layout/item_tip2.xml
+++ b/app/src/main/res/layout/item_tip2.xml
@@ -5,8 +5,8 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:layout_marginVertical="8dp"
 	android:layout_marginHorizontal="8dp"
+	android:layout_marginVertical="8dp"
 	app:shapeAppearance="?shapeAppearanceCornerExtraLarge"
 	tools:icon="@drawable/ic_notification"
 	tools:primaryButtonText="@string/settings"
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 79510fa7e..9cce29aef 100644
--- a/app/src/main/res/values-night-v23/color_themes.xml
+++ b/app/src/main/res/values-night-v23/color_themes.xml
@@ -36,6 +36,9 @@
 		<item name="colorOnErrorContainer">#FFDAD6</item>
 		<item name="colorOutline">#899391</item>
 		<item name="colorOutlineVariant">#3F4947</item>
+		<item name="m3ColorBackground">@color/background_miku</item>
+		<item name="m3ColorExploreButton">#1D2020</item>
+		<item name="m3ColorBottomMenuBackground">#272B2A</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Asuka">
@@ -73,6 +76,9 @@
 		<item name="colorOnErrorContainer">#FFDAD6</item>
 		<item name="colorOutline">#A08C8B</item>
 		<item name="colorOutlineVariant">#534342</item>
+		<item name="m3ColorBackground">@color/background_asuka</item>
+		<item name="m3ColorExploreButton">#251E1E</item>
+		<item name="m3ColorBottomMenuBackground">#2F2828</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Mion">
@@ -110,6 +116,9 @@
 		<item name="colorOnErrorContainer">#FFDAD6</item>
 		<item name="colorOutline">#8A938C</item>
 		<item name="colorOutlineVariant">#404943</item>
+		<item name="m3ColorBackground">@color/background_mion</item>
+		<item name="m3ColorExploreButton">#1D201E</item>
+		<item name="m3ColorBottomMenuBackground">#272B28</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Rikka">
@@ -147,6 +156,9 @@
 		<item name="colorOnErrorContainer">#FFDAD6</item>
 		<item name="colorOutline">#9F8C8C</item>
 		<item name="colorOutlineVariant">#524343</item>
+		<item name="m3ColorBackground">@color/background_rikka</item>
+		<item name="m3ColorExploreButton">#241E1E</item>
+		<item name="m3ColorBottomMenuBackground">#2F2828</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Sakura">
@@ -184,6 +196,9 @@
 		<item name="colorOnErrorContainer">#FFDAD6</item>
 		<item name="colorOutline">#899296</item>
 		<item name="colorOutlineVariant">#40484B</item>
+		<item name="m3ColorBackground">@color/background_sakura</item>
+		<item name="m3ColorExploreButton">#1D2021</item>
+		<item name="m3ColorBottomMenuBackground">#272A2C</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Mamimi">
@@ -221,6 +236,9 @@
 		<item name="colorOnErrorContainer">#FFDAD6</item>
 		<item name="colorOutline">#9F8C8D</item>
 		<item name="colorOutlineVariant">#524344</item>
+		<item name="m3ColorBackground">@color/background_mamimi</item>
+		<item name="m3ColorExploreButton">#241E1E</item>
+		<item name="m3ColorBottomMenuBackground">#2F2828</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Kanade">
@@ -258,5 +276,8 @@
 		<item name="colorOnErrorContainer">#FFDAD6</item>
 		<item name="colorOutline">#959595</item>
 		<item name="colorOutlineVariant">#494949</item>
+		<item name="m3ColorBackground">@color/background_kanade</item>
+		<item name="m3ColorExploreButton">#292929</item>
+		<item name="m3ColorBottomMenuBackground">#2C2C2C</item>
 	</style>
 </resources>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 6633cc8cb..dc407501e 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -14,11 +14,11 @@
 	<color name="splash_primary">#0C4091</color>
 
 	<!-- Color schemes colors -->
-	<color name="background_miku">#272B2A</color>
-	<color name="background_asuka">#2F2828</color>
-	<color name="background_mion">#272B28</color>
-	<color name="background_rikka">#2F2828</color>
-	<color name="background_sakura">#272A2C</color>
-	<color name="background_mamimi">#2F2828</color>
-	<color name="background_kanade">#2B2B2B</color>
+	<color name="background_miku">#191C1C</color>
+	<color name="background_asuka">#201A1A</color>
+	<color name="background_mion">#191C1A</color>
+	<color name="background_rikka">#201A1A</color>
+	<color name="background_sakura">#191C1D</color>
+	<color name="background_mamimi">#201A1A</color>
+	<color name="background_kanade">#222222</color>
 </resources>
diff --git a/app/src/main/res/values-night/colors_kotatsu.xml b/app/src/main/res/values-night/colors_kotatsu.xml
index 630483e96..04e99341f 100644
--- a/app/src/main/res/values-night/colors_kotatsu.xml
+++ b/app/src/main/res/values-night/colors_kotatsu.xml
@@ -44,5 +44,4 @@
 	<color name="kotatsu_m3_background">#1A1B1F</color>
 	<color name="kotatsu_m3_exploreButton">#292A2D</color>
 	<color name="kotatsu_m3_bottom_menu">#2F3033</color>
-	<color name="kotatsu_m3_content_scrim">#2F3033</color>
 </resources>
diff --git a/app/src/main/res/values-v23/color_themes.xml b/app/src/main/res/values-v23/color_themes.xml
index 05c91904b..dd0d590e8 100644
--- a/app/src/main/res/values-v23/color_themes.xml
+++ b/app/src/main/res/values-v23/color_themes.xml
@@ -36,6 +36,9 @@
 		<item name="colorOnErrorContainer">#410002</item>
 		<item name="colorOutline">#6F7977</item>
 		<item name="colorOutlineVariant">#BEC9C6</item>
+		<item name="m3ColorBackground">@color/background_miku</item>
+		<item name="m3ColorExploreButton">#FFFFFF</item>
+		<item name="m3ColorBottomMenuBackground">#C4FFF7</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Asuka">
@@ -73,6 +76,9 @@
 		<item name="colorOnErrorContainer">#410002</item>
 		<item name="colorOutline">#857372</item>
 		<item name="colorOutlineVariant">#D8C1C0</item>
+		<item name="m3ColorBackground">@color/background_asuka</item>
+		<item name="m3ColorExploreButton">#FFFFFF</item>
+		<item name="m3ColorBottomMenuBackground">#FFDAD7</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Mion">
@@ -110,6 +116,9 @@
 		<item name="colorOnErrorContainer">#410002</item>
 		<item name="colorOutline">#707973</item>
 		<item name="colorOutlineVariant">#C0C9C1</item>
+		<item name="m3ColorBackground">@color/background_mion</item>
+		<item name="m3ColorExploreButton">#FFFFFF</item>
+		<item name="m3ColorBottomMenuBackground">#CDFFE1</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Rikka">
@@ -147,6 +156,9 @@
 		<item name="colorOnErrorContainer">#410002</item>
 		<item name="colorOutline">#787680</item>
 		<item name="colorOutlineVariant">#C8C5D0</item>
+		<item name="m3ColorBackground">@color/background_rikka</item>
+		<item name="m3ColorExploreButton">#FFFFFF</item>
+		<item name="m3ColorBottomMenuBackground">#F0EBFF</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Sakura">
@@ -184,6 +196,9 @@
 		<item name="colorOnErrorContainer">#410002</item>
 		<item name="colorOutline">#837377</item>
 		<item name="colorOutlineVariant">#D5C2C6</item>
+		<item name="m3ColorBackground">@color/background_sakura</item>
+		<item name="m3ColorExploreButton">#FFFFFF</item>
+		<item name="m3ColorBottomMenuBackground">#FFE8ED</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Mamimi">
@@ -221,10 +236,13 @@
 		<item name="colorOnErrorContainer">#410002</item>
 		<item name="colorOutline">#857373</item>
 		<item name="colorOutlineVariant">#D7C1C2</item>
+		<item name="m3ColorBackground">@color/background_mamimi</item>
+		<item name="m3ColorExploreButton">#FFFFFF</item>
+		<item name="m3ColorBottomMenuBackground">#FFE1E2</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Kanade">
-		<item name="colorPrimary">#A1A1A1</item>
+		<item name="colorPrimary">#606060</item>
 		<item name="colorPrimaryContainer">#D3D3D3</item>
 		<item name="colorOnPrimary">#FFFFFF</item>
 		<item name="colorOnPrimaryContainer">#404040</item>
@@ -258,5 +276,8 @@
 		<item name="colorOnErrorContainer">#410002</item>
 		<item name="colorOutline">#808080</item>
 		<item name="colorOutlineVariant">#D5D5D5</item>
+		<item name="m3ColorBackground">@color/background_kanade</item>
+		<item name="m3ColorExploreButton">#FFFFFF</item>
+		<item name="m3ColorBottomMenuBackground">#DCDCDC</item>
 	</style>
 </resources>
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index 7f670e9dc..29f004dae 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -49,7 +49,6 @@
 		<item name="m3ColorBackground">@android:color/system_neutral2_50</item>
 		<item name="m3ColorExploreButton">@android:color/white</item>
 		<item name="m3ColorBottomMenuBackground">@android:color/system_neutral2_100</item>
-		<item name="liftOnScrollColor">@android:color/system_neutral2_100</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/colors.xml b/app/src/main/res/values/colors.xml
index e9c187d8b..b6973bb66 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -28,11 +28,11 @@
 	<color name="splash_primary">#90CAF9</color>
 
 	<!-- Color schemes colors -->
-	<color name="background_miku">#E6E9E7</color>
-	<color name="background_asuka">#F2E5E4</color>
-	<color name="background_mion">#E7E9E5</color>
-	<color name="background_rikka">#EBE7EC</color>
-	<color name="background_sakura">#F1E5E7</color>
-	<color name="background_mamimi">#F2E5E5</color>
+	<color name="background_miku">#E4FFFA</color>
+	<color name="background_asuka">#FFEDEB</color>
+	<color name="background_mion">#E8FFEF</color>
+	<color name="background_rikka">#F6F2FF</color>
+	<color name="background_sakura">#FFF8F8</color>
+	<color name="background_mamimi">#FFF0F0</color>
 	<color name="background_kanade">#E6E6E6</color>
 </resources>
diff --git a/app/src/main/res/values/colors_kotatsu.xml b/app/src/main/res/values/colors_kotatsu.xml
index 7813ff933..e0c485a6e 100644
--- a/app/src/main/res/values/colors_kotatsu.xml
+++ b/app/src/main/res/values/colors_kotatsu.xml
@@ -41,8 +41,10 @@
 	<color name="kotatsu_shadow">#000000</color>
 	<color name="kotatsu_surfaceTint">#0059C8</color>
 	<color name="kotatsu_scrim">#000000</color>
+	<!-- Primary 95 -->
 	<color name="kotatsu_m3_background">#EDF0FF</color>
+	<!-- White -->
 	<color name="kotatsu_m3_exploreButton">#FFFFFF</color>
+	<!-- Primary 90 -->
 	<color name="kotatsu_m3_bottom_menu">#D9E2FF</color>
-	<color name="kotatsu_m3_content_scrim">#D9E2FF</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a433d924a..a5b00ba31 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -477,4 +477,5 @@
 	<string name="related_manga_summary">Show a list of related manga. In some cases it may be inaccurate or missing</string>
 	<string name="advanced">Advanced</string>
 	<string name="default_section">Default section</string>
+	<string name="manga_list">Manga list</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4f8d1b870..c059608f1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -50,6 +50,7 @@
 
 	<style name="Widget.Kotatsu.BottomSheet.Modal" parent="Widget.Material3.BottomSheet.Modal">
 		<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Kotatsu.BottomSheet</item>
+		<item name="backgroundTint">?attr/m3ColorBottomMenuBackground</item>
 	</style>
 
 	<style name="Widget.Kotatsu.BottomSheet.DragHandle" parent="Widget.Material3.BottomSheet.DragHandle">
@@ -211,7 +212,7 @@
 		<item name="backgroundTint">?attr/m3ColorExploreButton</item>
 		<!-- Hack. Removing shadow. For AMOLED -->
 		<item name="android:outlineProvider">none</item>
-		<item name="elevation">3dp</item>
+		<item name="elevation">24dp</item>
 	</style>
 
 	<style name="Widget.Kotatsu.TextView.Indicator" parent="Widget.MaterialComponents.TextView">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 8c7613f69..a3c728ec6 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -38,7 +38,6 @@
 		<item name="m3ColorBackground">@color/kotatsu_m3_background</item>
 		<item name="m3ColorExploreButton">@color/kotatsu_m3_exploreButton</item>
 		<item name="m3ColorBottomMenuBackground">@color/kotatsu_m3_bottom_menu</item>
-		<item name="liftOnScrollColor">@color/kotatsu_m3_content_scrim</item>
 		<item name="colorOnBackground">@color/kotatsu_onSurface</item>
 		<item name="colorError">@color/error</item>
 		<item name="colorErrorContainer">@color/errorContainer</item>
diff --git a/app/src/main/res/xml/pref_appearance.xml b/app/src/main/res/xml/pref_appearance.xml
index f33d73f96..cd9182b39 100644
--- a/app/src/main/res/xml/pref_appearance.xml
+++ b/app/src/main/res/xml/pref_appearance.xml
@@ -22,7 +22,7 @@
 		android:summary="@string/black_dark_theme_summary"
 		android:title="@string/black_dark_theme" />
 
-	<PreferenceCategory android:title="Manga list">
+	<PreferenceCategory android:title="@string/manga_list">
 
 		<ListPreference
 			android:entries="@array/list_modes"