From 38fef11287452df1d95a097c49d4d1ec11c71573 Mon Sep 17 00:00:00 2001
From: Soitora <simon.mattila@protonmail.com>
Date: Mon, 24 May 2021 00:23:22 +0200
Subject: [PATCH] Fix SY themes after custom ripple changes (#332)

* Fix SY Themes and Ripples

* Slightly increase ripple brightness in AMOLED

* Override AMOLED highlight for the failure that is Hot Pink
---
 app/src/main/res/values/colors.xml    | 5 ++++-
 app/src/main/res/values/themes.xml    | 2 ++
 app/src/main/res/values/themes_sy.xml | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9e69be0e4..c9eec40ee 100755
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -40,6 +40,7 @@
     
     <color name="red">#FF0000</color>
     <color name="dark_red">#880000</color>
+    <color name="dark_red_6">#0F880000</color>
 
     <!-- Midnight Dusk Theme -->
     <color name="colorAccentDusk">#F02475</color>
@@ -47,7 +48,7 @@
     <color name="textColorSecondaryDusk">@color/md_white_1000_70</color>
     <color name="textColorHintDusk">@color/md_white_1000_50</color>
     <color name="dividerDusk">#12ffffff</color>
-    <color name="rippleColorDusk">@color/md_white_1000_20</color>
+    <color name="rippleColorDusk">#0FF02475</color>
     <color name="backgroundDusk">#16151D</color>
     <color name="dialogDusk">#201F27</color>
     <color name="selectorColorDusk">#80F02475</color>
@@ -57,6 +58,7 @@
     <color name="textColorPrimaryPink">@color/md_white_1000</color>
     <color name="textColorSecondaryPink">@color/md_white_1000_70</color>
     <color name="textColorHintPink">@color/md_white_1000_50</color>
+    <color name="rippleColorPink">#0FFF3399</color>
     <color name="backgroundPink">@color/md_black_1000</color>
     <color name="dialogPink">@color/md_black_1000</color>
     <color name="selectorColorPink">#80FF69B4</color>
@@ -82,6 +84,7 @@
     <color name="md_white_1000_50">#80FFFFFF</color>
     <color name="md_white_1000_20">#33FFFFFF</color>
     <color name="md_white_1000_12">#1FFFFFFF</color>
+    <color name="md_white_1000_8">#14FFFFFF</color>
     <color name="md_white_1000_6">#0FFFFFFF</color>
 
     <!-- Material Design Colors -->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index f350a7a2a..b3f71e032 100755
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -213,6 +213,8 @@
         <item name="colorPrimary">@color/colorAmoledPrimary</item>
         <item name="colorPrimaryVariant">@color/colorAmoledPrimary</item>
         <item name="colorSurface">@color/colorAmoledPrimary</item>
+        <item name="rippleColor">@color/md_white_1000_8</item>
+        <item name="rippleToolbarColor">@color/md_white_1000_8</item>
         <item name="background">@color/colorAmoledPrimary</item>
 
         <item name="android:colorBackground">@color/colorAmoledPrimary</item>
diff --git a/app/src/main/res/values/themes_sy.xml b/app/src/main/res/values/themes_sy.xml
index 5ff36a061..7702d8feb 100644
--- a/app/src/main/res/values/themes_sy.xml
+++ b/app/src/main/res/values/themes_sy.xml
@@ -10,6 +10,8 @@
         <item name="colorPrimaryVariant">@color/colorPrimary</item>
         <item name="background">@color/colorPrimary</item>
         <item name="colorSurface">@color/dialogDark</item>
+        <item name="rippleSecondaryColor">@color/md_black_1000_6</item>
+        <item name="rippleToolbarColor">@color/md_black_1000_12</item>
     </style>
 
     <style name="Theme.Tachiyomi.Dark.Red" parent="Theme.Tachiyomi.Dark.Amoled">
@@ -20,6 +22,7 @@
         <item name="colorOnSurface">@color/red</item>
         <item name="colorAccent">@color/dark_red</item>
         <item name="colorOnPrimary">@color/red</item>
+        <item name="rippleSecondaryColor">@color/dark_red_6</item>
         <item name="android:textColor">@color/red</item>
         <item name="android:textColorPrimary">@color/red</item>
         <item name="android:textColorSecondary">@color/dark_red</item>
@@ -38,6 +41,7 @@
         <item name="colorOnSurface">@color/textColorPrimaryDusk</item>
         <item name="colorOnBackground">@color/textColorPrimaryDusk</item>
         <item name="colorAccent">@color/colorAccentDusk</item>
+        <item name="rippleSecondaryColor">@color/rippleColorDusk</item>
         <item name="background">@color/backgroundDusk</item>
 
         <item name="android:colorBackground">@color/backgroundDusk</item>
@@ -59,6 +63,9 @@
         <item name="colorOnSurface">@color/textColorPrimaryPink</item>
         <item name="colorOnBackground">@color/textColorPrimaryPink</item>
         <item name="colorAccent">@color/colorAccentPink</item>
+        <item name="rippleColor">@color/md_white_1000_8</item>
+        <item name="rippleSecondaryColor">@color/rippleColorPink</item>
+        <item name="rippleToolbarColor">@color/md_white_1000_8</item>
         <item name="background">@color/backgroundPink</item>
 
         <item name="android:colorBackground">@color/backgroundPink</item>