From 1927008c2e1d06601f06e72f2772ae256622996e Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Sat, 16 Jul 2022 18:36:11 +0300
Subject: [PATCH] Actualize app colors + revert old accent color

---
 app/build.gradle                              |  2 +-
 .../main/res/values-night/colors_kotatsu.xml  | 29 +++++++++--------
 app/src/main/res/values/colors_kotatsu.xml    | 31 ++++++++++---------
 app/src/main/res/values/styles.xml            | 13 ++++++++
 app/src/main/res/values/themes.xml            |  5 ++-
 5 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d6a93def9..11fd34f91 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -100,7 +100,7 @@ dependencies {
 	implementation 'androidx.preference:preference-ktx:1.2.0'
 	implementation 'androidx.work:work-runtime-ktx:2.7.1'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha04'
-	implementation 'com.google.android.material:material:1.7.0-alpha02'
+	implementation 'com.google.android.material:material:1.7.0-alpha03'
 	//noinspection LifecycleAnnotationProcessorWithJava8
 	kapt 'androidx.lifecycle:lifecycle-compiler:2.5.0'
 
diff --git a/app/src/main/res/values-night/colors_kotatsu.xml b/app/src/main/res/values-night/colors_kotatsu.xml
index d6991db12..cf5be500a 100644
--- a/app/src/main/res/values-night/colors_kotatsu.xml
+++ b/app/src/main/res/values-night/colors_kotatsu.xml
@@ -4,26 +4,29 @@
   ~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
 -->
 <resources>
-	<color name="kotatsu_primary">#A4C8FF</color>
-	<color name="kotatsu_onPrimary">#003060</color>
-	<color name="kotatsu_primaryContainer">#004788</color>
-	<color name="kotatsu_onPrimaryContainer">#D3E3FF</color>
+	<color name="kotatsu_primary">#A5C8FF</color>
+	<color name="kotatsu_onPrimary">#00315F</color>
+	<color name="kotatsu_primaryContainer">#004786</color>
+	<color name="kotatsu_onPrimaryContainer">#D4E3FF</color>
 	<color name="kotatsu_secondary">#BCC7DC</color>
 	<color name="kotatsu_onSecondary">#273141</color>
 	<color name="kotatsu_secondaryContainer">#3D4758</color>
 	<color name="kotatsu_onSecondaryContainer">#D8E3F8</color>
-	<color name="kotatsu_tertiary">#DABDE2</color>
-	<color name="kotatsu_onTertiary">#3D2846</color>
-	<color name="kotatsu_tertiaryContainer">#553F5D</color>
-	<color name="kotatsu_onTertiaryContainer">#F7D8FF</color>
-	<color name="kotatsu_background">#1B1B1D</color>
+	<color name="kotatsu_tertiary">#FFB3AE</color>
+	<color name="kotatsu_onTertiary">#68000B</color>
+	<color name="kotatsu_tertiaryContainer">#910816</color>
+	<color name="kotatsu_onTertiaryContainer">#FFDAD7</color>
+	<color name="kotatsu_background">#1A1C1E</color>
 	<color name="kotatsu_onBackground">#E3E2E6</color>
-	<color name="kotatsu_surface">#1B1B1D</color>
+	<color name="kotatsu_surface">#1A1C1E</color>
 	<color name="kotatsu_onSurface">#E3E2E6</color>
 	<color name="kotatsu_surfaceVariant">#43474E</color>
 	<color name="kotatsu_onSurfaceVariant">#C3C6CF</color>
-	<color name="kotatsu_outline">#8E919A</color>
-	<color name="kotatsu_inverseOnSurface">#1B1B1D</color>
+	<color name="kotatsu_outline">#8D9199</color>
+	<color name="kotatsu_inverseOnSurface">#1A1C1E</color>
 	<color name="kotatsu_inverseSurface">#E3E2E6</color>
-	<color name="kotatsu_primaryInverse">#005FB1</color>
+	<color name="kotatsu_inversePrimary">#005FAF</color>
+	<color name="kotatsu_shadow">#000000</color>
+	<color name="kotatsu_surfaceTint">#A5C8FF</color>
+	<color name="kotatsu_surfaceTintColor">#A5C8FF</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors_kotatsu.xml b/app/src/main/res/values/colors_kotatsu.xml
index a188485cd..fc6e81a36 100644
--- a/app/src/main/res/values/colors_kotatsu.xml
+++ b/app/src/main/res/values/colors_kotatsu.xml
@@ -4,26 +4,29 @@
   ~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
 -->
 <resources>
-	<color name="kotatsu_primary">#005FB1</color>
+	<color name="kotatsu_primary">#005FAF</color>
 	<color name="kotatsu_onPrimary">#FFFFFF</color>
-	<color name="kotatsu_primaryContainer">#D3E3FF</color>
-	<color name="kotatsu_onPrimaryContainer">#001C3B</color>
-	<color name="kotatsu_secondary">#555F71</color>
+	<color name="kotatsu_primaryContainer">#D4E3FF</color>
+	<color name="kotatsu_onPrimaryContainer">#001C3A</color>
+	<color name="kotatsu_secondary">#545F71</color>
 	<color name="kotatsu_onSecondary">#FFFFFF</color>
 	<color name="kotatsu_secondaryContainer">#D8E3F8</color>
-	<color name="kotatsu_onSecondaryContainer">#121C2B</color>
-	<color name="kotatsu_tertiary">#6E5676</color>
+	<color name="kotatsu_onSecondaryContainer">#111C2B</color>
+	<color name="kotatsu_tertiary">#B3272A</color>
 	<color name="kotatsu_onTertiary">#FFFFFF</color>
-	<color name="kotatsu_tertiaryContainer">#F7D8FF</color>
-	<color name="kotatsu_onTertiaryContainer">#271330</color>
-	<color name="kotatsu_background">#FDFBFF</color>
-	<color name="kotatsu_onBackground">#1B1B1D</color>
-	<color name="kotatsu_surface">#FDFBFF</color>
-	<color name="kotatsu_onSurface">#1B1B1D</color>
-	<color name="kotatsu_surfaceVariant">#DFE2EB</color>
+	<color name="kotatsu_tertiaryContainer">#FFDAD7</color>
+	<color name="kotatsu_onTertiaryContainer">#410004</color>
+	<color name="kotatsu_background">#FDFCFF</color>
+	<color name="kotatsu_onBackground">#1A1C1E</color>
+	<color name="kotatsu_surface">#FDFCFF</color>
+	<color name="kotatsu_onSurface">#1A1C1E</color>
+	<color name="kotatsu_surfaceVariant">#E0E2EC</color>
 	<color name="kotatsu_onSurfaceVariant">#43474E</color>
 	<color name="kotatsu_outline">#74777F</color>
 	<color name="kotatsu_inverseOnSurface">#F1F0F4</color>
 	<color name="kotatsu_inverseSurface">#2F3033</color>
-	<color name="kotatsu_primaryInverse">#A4C8FF</color>
+	<color name="kotatsu_inversePrimary">#A5C8FF</color>
+	<color name="kotatsu_shadow">#000000</color>
+	<color name="kotatsu_surfaceTint">#005FAF</color>
+	<color name="kotatsu_surfaceTintColor">#005FAF</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 02f0925de..3d3944375 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -17,6 +17,15 @@
 		<item name="theme">@style/ThemeOverlay.Kotatsu.ActionMode</item>
 	</style>
 
+	<!--AlertDialog-->
+
+	<style name="ThemeOverlay.Kotatsu.MaterialAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+		<item name="android:background">?attr/colorSurface</item>
+		<item name="android:textColorPrimary">?attr/colorOnSurface</item>
+		<item name="android:textColor">?attr/colorOnSurface</item>
+		<item name="dialogCornerRadius">28dp</item>
+	</style>
+
 	<!-- Bottom sheet -->
 
 	<style name="ThemeOverlay.Kotatsu.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
@@ -98,6 +107,10 @@
 		<item name="iconPadding">16dp</item>
 	</style>
 
+	<style name="Widget.Kotatsu.RecyclerView" parent="">
+		<item name="android:scrollbarStyle">outsideOverlay</item>
+	</style>
+
 	<style name="Widget.Kotatsu.FastScroller" parent="">
 		<item name="thumbColor">?colorTertiary</item>
 		<item name="bubbleColor">?colorTertiary</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0c7146559..1f67c8f18 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -29,7 +29,7 @@
 		<item name="colorOutline">@color/kotatsu_outline</item>
 		<item name="colorOnSurfaceInverse">@color/kotatsu_inverseOnSurface</item>
 		<item name="colorSurfaceInverse">@color/kotatsu_inverseSurface</item>
-		<item name="colorPrimaryInverse">@color/kotatsu_primaryInverse</item>
+		<item name="colorPrimaryInverse">@color/kotatsu_inversePrimary</item>
 		<item name="colorError">@color/error</item>
 		<item name="colorOnError">@color/onError</item>
 		<item name="colorErrorContainer">@color/errorContainer</item>
@@ -52,7 +52,9 @@
 		<item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
 		<item name="android:enforceStatusBarContrast" tools:targetApi="Q">false</item>
 		<item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item>
+		<item name="alertDialogTheme">@style/ThemeOverlay.Kotatsu.MaterialAlertDialog</item>
 		<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Kotatsu.BottomSheetDialog</item>
+		<item name="materialAlertDialogTheme">@style/ThemeOverlay.Kotatsu.MaterialAlertDialog</item>
 		<item name="textAppearanceButton">@style/TextAppearance.Kotatsu.Button</item>
 		<item name="android:buttonStyle">?attr/borderlessButtonStyle</item>
 		<item name="android:backgroundDimAmount">0.32</item>
@@ -68,6 +70,7 @@
 		<item name="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView</item>
 		<item name="tabStyle">@style/Widget.Kotatsu.Tabs</item>
 		<item name="materialCardViewStyle">@style/Widget.Material3.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>
 		<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>