From 95e46249c53f7904a08a1fc8439114aaf6ee0e88 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Sat, 11 Feb 2023 00:25:07 +0300
Subject: [PATCH] Add Mamimi theme and made some theme tweaks

---
 .../kotatsu/core/prefs/ColorScheme.kt         |  1 +
 .../res/color-v23/bottom_menu_active_item.xml |  5 ++
 .../res/color/bottom_menu_active_item.xml     |  5 ++
 .../res/values-night-v23/color_themes.xml     | 89 ++++++++++++-------
 app/src/main/res/values-v23/color_themes.xml  | 63 +++++++++----
 app/src/main/res/values/color_themes.xml      |  2 +
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/values/styles.xml            |  3 +-
 8 files changed, 121 insertions(+), 48 deletions(-)
 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_item.xml

diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/ColorScheme.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/ColorScheme.kt
index d67ab311d..4ebda2877 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/ColorScheme.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/ColorScheme.kt
@@ -17,6 +17,7 @@ enum class ColorScheme(
 	FROG(R.style.Theme_Kotatsu_Mion, R.string.theme_name_mion),
 	BLUEBERRY(R.style.Theme_Kotatsu_Rikka, R.string.theme_name_rikka),
 	NAME2(R.style.Theme_Kotatsu_Sakura, R.string.theme_name_sakura),
+	MAMIMI(R.style.Theme_Kotatsu_Mamimi, R.string.theme_name_mamimi),
 	;
 
 	companion object {
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..c2c510e6d
--- /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/colorOnPrimaryContainer" android:state_checked="true" />
+	<item android:color="?attr/colorControlNormal" android:state_checked="false" />
+</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..2c439130a
--- /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_onPrimaryContainer" android:state_checked="true" />
+	<item android:color="?attr/colorControlNormal" android:state_checked="false" />
+</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 7994430e2..40c932b74 100644
--- a/app/src/main/res/values-night-v23/color_themes.xml
+++ b/app/src/main/res/values-night-v23/color_themes.xml
@@ -89,14 +89,14 @@
 	</style>
 
 	<style name="Theme.Kotatsu.Rikka">
-		<item name="colorPrimary">#C2C1FF</item>
-		<item name="colorOnPrimary">#1800A7</item>
-		<item name="colorPrimaryContainer">#2C1BD7</item>
-		<item name="colorOnPrimaryContainer">#E2DFFF</item>
-		<item name="colorSecondary">#F7ACFF</item>
-		<item name="colorOnSecondary">#560067</item>
-		<item name="colorSecondaryContainer">#761789</item>
-		<item name="colorOnSecondaryContainer">#FFD6FF</item>
+		<item name="colorPrimary">#FFC2C4</item>
+		<item name="colorOnPrimary">#C44B50</item>
+		<item name="colorPrimaryContainer">#91363A</item>
+		<item name="colorOnPrimaryContainer">#FFDADB</item>
+		<item name="colorSecondary">#9886A3</item>
+		<item name="colorOnSecondary">#544B59</item>
+		<item name="colorSecondaryContainer">#3E3543</item>
+		<item name="colorOnSecondaryContainer">#F0D5FF</item>
 		<item name="colorTertiary">#E9B9D2</item>
 		<item name="colorOnTertiary">#47263A</item>
 		<item name="colorTertiaryContainer">#5F3C51</item>
@@ -105,44 +105,73 @@
 		<item name="colorErrorContainer">#93000A</item>
 		<item name="colorOnError">#690005</item>
 		<item name="colorOnErrorContainer">#FFDAD6</item>
-		<item name="android:colorBackground">#1C1B1F</item>
+		<item name="android:colorBackground">#28202B</item>
 		<item name="colorOnBackground">#E5E1E6</item>
-		<item name="colorSurface">#1C1B1F</item>
+		<item name="colorSurface">#28202B</item>
 		<item name="colorOnSurface">#E5E1E6</item>
-		<item name="colorSurfaceVariant">#47464F</item>
+		<item name="colorSurfaceVariant">#332837</item>
 		<item name="colorOnSurfaceVariant">#C8C5D0</item>
 		<item name="colorOutline">#918F9A</item>
-		<item name="colorOnSurfaceInverse">#1C1B1F</item>
+		<item name="colorOnSurfaceInverse">#28202B</item>
 		<item name="colorSurfaceInverse">#E5E1E6</item>
-		<item name="colorPrimaryInverse">#4841EE</item>
+		<item name="colorPrimaryInverse">#8A3B49</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Sakura">
-		<item name="colorPrimary">#FFB1C8</item>
-		<item name="colorOnPrimary">#650033</item>
-		<item name="colorPrimaryContainer">#8E004A</item>
-		<item name="colorOnPrimaryContainer">#FFD9E2</item>
-		<item name="colorSecondary">#FFB5A0</item>
-		<item name="colorOnSecondary">#601500</item>
-		<item name="colorSecondaryContainer">#872100</item>
-		<item name="colorOnSecondaryContainer">#FFDBD1</item>
-		<item name="colorTertiary">#EFBD94</item>
-		<item name="colorOnTertiary">#48290B</item>
-		<item name="colorTertiaryContainer">#613F20</item>
-		<item name="colorOnTertiaryContainer">#FFDCC1</item>
+		<item name="colorPrimary">#6993A1</item>
+		<item name="colorOnPrimary">#39545d</item>
+		<item name="colorPrimaryContainer">#263C43</item>
+		<item name="colorOnPrimaryContainer">#CCF2FF</item>
+		<item name="colorSecondary">#FFA8AC</item>
+		<item name="colorOnSecondary">#C54F54</item>
+		<item name="colorSecondaryContainer">#393233</item>
+		<item name="colorOnSecondaryContainer">#FFC8CA</item>
+		<item name="colorTertiary">#97DDF4</item>
+		<item name="colorOnTertiary">#072A37</item>
+		<item name="colorTertiaryContainer">#293F47</item>
+		<item name="colorOnTertiaryContainer">#BFEFFF</item>
 		<item name="colorError">#FFB4AB</item>
 		<item name="colorErrorContainer">#93000A</item>
 		<item name="colorOnError">#690005</item>
 		<item name="colorOnErrorContainer">#FFDAD6</item>
-		<item name="android:colorBackground">#201A1B</item>
+		<item name="android:colorBackground">#201C1D</item>
 		<item name="colorOnBackground">#EBE0E1</item>
-		<item name="colorSurface">#201A1B</item>
+		<item name="colorSurface">#201C1D</item>
 		<item name="colorOnSurface">#EBE0E1</item>
-		<item name="colorSurfaceVariant">#514347</item>
+		<item name="colorSurfaceVariant">#393233</item>
 		<item name="colorOnSurfaceVariant">#D5C2C6</item>
 		<item name="colorOutline">#9E8C90</item>
-		<item name="colorOnSurfaceInverse">#201A1B</item>
+		<item name="colorOnSurfaceInverse">#201C1D</item>
 		<item name="colorSurfaceInverse">#EBE0E1</item>
-		<item name="colorPrimaryInverse">#B31A62</item>
+		<item name="colorPrimaryInverse">#423B3D</item>
+	</style>
+
+	<style name="Theme.Kotatsu.Mamimi">
+		<item name="colorPrimary">#EAB1B2</item>
+		<item name="colorOnPrimary">#9C4346</item>
+		<item name="colorPrimaryContainer">#5C3436</item>
+		<item name="colorOnPrimaryContainer">#FFC8CA</item>
+		<item name="colorSecondary">#72A3CD</item>
+		<item name="colorOnSecondary">#294055</item>
+		<item name="colorSecondaryContainer">#2F4559</item>
+		<item name="colorOnSecondaryContainer">#C7E5FF</item>
+		<item name="colorTertiary">#9A9486</item>
+		<item name="colorOnTertiary">#5C574A</item>
+		<item name="colorTertiaryContainer">#43403A</item>
+		<item name="colorOnTertiaryContainer">#FFF1CF</item>
+		<item name="colorError">#FFB4AB</item>
+		<item name="colorErrorContainer">#93000A</item>
+		<item name="colorOnError">#690005</item>
+		<item name="colorOnErrorContainer">#FFDAD6</item>
+		<item name="android:colorBackground">#232B33</item>
+		<item name="colorOnBackground">#EBE0E1</item>
+		<item name="colorSurface">#232B33</item>
+		<item name="colorOnSurface">#EBE0E1</item>
+		<item name="colorSurfaceVariant">#294055</item>
+		<item name="colorOnSurfaceVariant">#D5C2C6</item>
+		<item name="colorOutline">#9E8C90</item>
+		<item name="colorOnSurfaceInverse">#232B33</item>
+		<item name="colorSurfaceInverse">#EBE0E1</item>
+		<item name="colorPrimaryInverse">#525a6d</item>
 	</style>
 </resources>
diff --git a/app/src/main/res/values-v23/color_themes.xml b/app/src/main/res/values-v23/color_themes.xml
index bc43a62c3..f95f51612 100644
--- a/app/src/main/res/values-v23/color_themes.xml
+++ b/app/src/main/res/values-v23/color_themes.xml
@@ -60,25 +60,25 @@
 	</style>
 
 	<style name="Theme.Kotatsu.Mion">
-		<item name="colorPrimary">#006E2F</item>
+		<item name="colorPrimary">#2D956A</item>
 		<item name="colorOnPrimary">#FFFFFF</item>
 		<item name="colorPrimaryContainer">#9AF7A8</item>
-		<item name="colorOnPrimaryContainer">#002109</item>
+		<item name="colorOnPrimaryContainer">#00301C</item>
 		<item name="colorSecondary">#725C00</item>
 		<item name="colorOnSecondary">#FFFFFF</item>
-		<item name="colorSecondaryContainer">#FFE080</item>
+		<item name="colorSecondaryContainer">#FFEFC0</item>
 		<item name="colorOnSecondaryContainer">#231B00</item>
-		<item name="colorTertiary">#00677E</item>
+		<item name="colorTertiary">#f28795</item>
 		<item name="colorOnTertiary">#FFFFFF</item>
-		<item name="colorTertiaryContainer">#B4EBFF</item>
-		<item name="colorOnTertiaryContainer">#001F27</item>
+		<item name="colorTertiaryContainer">#FFB3BD</item>
+		<item name="colorOnTertiaryContainer">#2B0006</item>
 		<item name="colorError">#BA1A1A</item>
 		<item name="colorErrorContainer">#FFDAD6</item>
 		<item name="colorOnError">#FFFFFF</item>
 		<item name="colorOnErrorContainer">#410002</item>
-		<item name="android:colorBackground">#FCFDF7</item>
+		<item name="android:colorBackground">#FDFFF3</item>
 		<item name="colorOnBackground">#1A1C19</item>
-		<item name="colorSurface">#FCFDF7</item>
+		<item name="colorSurface">#FDFFF3</item>
 		<item name="colorOnSurface">#1A1C19</item>
 		<item name="colorSurfaceVariant">#DDE5DA</item>
 		<item name="colorOnSurfaceVariant">#414941</item>
@@ -89,18 +89,18 @@
 	</style>
 
 	<style name="Theme.Kotatsu.Rikka">
-		<item name="colorPrimary">#4841EE</item>
+		<item name="colorPrimary">#4b4965</item>
 		<item name="colorOnPrimary">#FFFFFF</item>
-		<item name="colorPrimaryContainer">#E2DFFF</item>
-		<item name="colorOnPrimaryContainer">#0B006B</item>
-		<item name="colorSecondary">#9135A3</item>
+		<item name="colorPrimaryContainer">#E3E1FF</item>
+		<item name="colorOnPrimaryContainer">#1E1C49</item>
+		<item name="colorSecondary">#c44b50</item>
 		<item name="colorOnSecondary">#FFFFFF</item>
-		<item name="colorSecondaryContainer">#FFD6FF</item>
-		<item name="colorOnSecondaryContainer">#350040</item>
-		<item name="colorTertiary">#795369</item>
+		<item name="colorSecondaryContainer">#FFD3D5</item>
+		<item name="colorOnSecondaryContainer">#450003</item>
+		<item name="colorTertiary">#592A2A</item>
 		<item name="colorOnTertiary">#FFFFFF</item>
-		<item name="colorTertiaryContainer">#FFD8EB</item>
-		<item name="colorOnTertiaryContainer">#2F1124</item>
+		<item name="colorTertiaryContainer">#FFD8D8</item>
+		<item name="colorOnTertiaryContainer">#301111</item>
 		<item name="colorError">#BA1A1A</item>
 		<item name="colorErrorContainer">#FFDAD6</item>
 		<item name="colorOnError">#FFFFFF</item>
@@ -145,4 +145,33 @@
 		<item name="colorSurfaceInverse">#352F30</item>
 		<item name="colorPrimaryInverse">#FFB1C8</item>
 	</style>
+
+	<style name="Theme.Kotatsu.Mamimi">
+		<item name="colorPrimary">#964d54</item>
+		<item name="colorOnPrimary">#FFFFFF</item>
+		<item name="colorPrimaryContainer">#FFD6DA</item>
+		<item name="colorOnPrimaryContainer">#400006</item>
+		<item name="colorSecondary">#385068</item>
+		<item name="colorOnSecondary">#FFFFFF</item>
+		<item name="colorSecondaryContainer">#CAE5FF</item>
+		<item name="colorOnSecondaryContainer">#002142</item>
+		<item name="colorTertiary">#A19086</item>
+		<item name="colorOnTertiary">#FFFFFF</item>
+		<item name="colorTertiaryContainer">#FFD7BF</item>
+		<item name="colorOnTertiaryContainer">#491B00</item>
+		<item name="colorError">#BA1A1A</item>
+		<item name="colorErrorContainer">#FFDAD6</item>
+		<item name="colorOnError">#FFFFFF</item>
+		<item name="colorOnErrorContainer">#410002</item>
+		<item name="android:colorBackground">#F0F7FF</item>
+		<item name="colorOnBackground">#201A1B</item>
+		<item name="colorSurface">#F0F7FF</item>
+		<item name="colorOnSurface">#201A1B</item>
+		<item name="colorSurfaceVariant">#CAE5FF</item>
+		<item name="colorOnSurfaceVariant">#514347</item>
+		<item name="colorOutline">#837377</item>
+		<item name="colorOnSurfaceInverse">#FAEEEF</item>
+		<item name="colorSurfaceInverse">#352F30</item>
+		<item name="colorPrimaryInverse">#FFB1C8</item>
+	</style>
 </resources>
diff --git a/app/src/main/res/values/color_themes.xml b/app/src/main/res/values/color_themes.xml
index 95b07bb67..93230514a 100644
--- a/app/src/main/res/values/color_themes.xml
+++ b/app/src/main/res/values/color_themes.xml
@@ -10,4 +10,6 @@
 	<style name="Theme.Kotatsu.Rikka" />
 
 	<style name="Theme.Kotatsu.Sakura" />
+
+	<style name="Theme.Kotatsu.Mamimi" />
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2e2e1181e..4e0bcf023 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -416,6 +416,7 @@
 	<string name="theme_name_mion">Mion</string>
 	<string name="theme_name_rikka">Rikka</string>
 	<string name="theme_name_sakura">Sakura</string>
+	<string name="theme_name_mamimi">Mamimi</string>
 	<string name="nothing_here">There is nothing here</string>
 	<string name="scrobbling_empty_hint">To track reading progress, select Menu → Track on the manga details screen.</string>
 	<string name="services">Services</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6939659cb..841f36517 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,6 +14,7 @@
 
 	<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">
@@ -163,7 +164,7 @@
 		<item name="iconGravity">start</item>
 		<item name="android:insetTop">2dp</item>
 		<item name="android:insetBottom">2dp</item>
-		<item name="iconTint">?attr/colorPrimary</item>
+		<item name="iconTint">?attr/colorSecondary</item>
 		<item name="android:gravity">start|center_vertical</item>
 		<item name="android:textAppearance">?textAppearanceButton</item>
 	</style>