From 33dcdc159949e76933f07130fd43d0537c7ea46f Mon Sep 17 00:00:00 2001
From: Soitora <simon.mattila@protonmail.com>
Date: Sun, 23 May 2021 00:08:48 +0200
Subject: [PATCH] Ripples patch (#5144)

* Combine ripple_dark and ripple_light

Fixes AMOLED theme and doesn't require two seperate items.

* Fix ripple for the new About icons

* Fixes nav/tab ripple in Dark Blue and Light Blue themes

* Theme some ripples using their Style instead
---
 .../{ripple_dark.xml => ripple_background.xml}         |  2 +-
 app/src/main/res/drawable/ripple_light.xml             |  5 -----
 app/src/main/res/layout/common_tabbed_sheet.xml        |  1 -
 app/src/main/res/layout/main_activity.xml              |  3 +--
 app/src/main/res/layout/main_activity_toolbar.xml      |  3 +--
 app/src/main/res/layout/manga_info_header.xml          |  5 +----
 app/src/main/res/values/styles.xml                     | 10 ++++------
 app/src/main/res/values/themes.xml                     |  7 +++++--
 8 files changed, 13 insertions(+), 23 deletions(-)
 rename app/src/main/res/drawable/{ripple_dark.xml => ripple_background.xml} (71%)
 delete mode 100644 app/src/main/res/drawable/ripple_light.xml

diff --git a/app/src/main/res/drawable/ripple_dark.xml b/app/src/main/res/drawable/ripple_background.xml
similarity index 71%
rename from app/src/main/res/drawable/ripple_dark.xml
rename to app/src/main/res/drawable/ripple_background.xml
index 82fdde550b..7c51636027 100644
--- a/app/src/main/res/drawable/ripple_dark.xml
+++ b/app/src/main/res/drawable/ripple_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
     android:color="?attr/rippleColor">
-    <item android:drawable="@color/backgroundDark" />
+    <item android:drawable="?android:attr/colorBackground" />
 </ripple>
diff --git a/app/src/main/res/drawable/ripple_light.xml b/app/src/main/res/drawable/ripple_light.xml
deleted file mode 100644
index a2bfca1d9d..0000000000
--- a/app/src/main/res/drawable/ripple_light.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/rippleColor">
-    <item android:drawable="@color/backgroundLight" />
-</ripple>
diff --git a/app/src/main/res/layout/common_tabbed_sheet.xml b/app/src/main/res/layout/common_tabbed_sheet.xml
index cc62721b93..39a8044a93 100644
--- a/app/src/main/res/layout/common_tabbed_sheet.xml
+++ b/app/src/main/res/layout/common_tabbed_sheet.xml
@@ -24,7 +24,6 @@
             app:tabGravity="fill"
             app:tabIndicatorColor="?attr/colorAccent"
             app:tabMode="fixed"
-            app:tabRippleColor="?attr/rippleNavColor"
             app:tabTextColor="@color/tabs_selector_background" />
 
         <ImageButton
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index d033fd51cb..745ef3885a 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -25,8 +25,7 @@
             android:id="@+id/tabs"
             style="@style/Theme.Widget.Tabs"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:tabRippleColor="?attr/rippleNavColor" />
+            android:layout_height="wrap_content" />
 
         <FrameLayout
             android:id="@+id/downloaded_only"
diff --git a/app/src/main/res/layout/main_activity_toolbar.xml b/app/src/main/res/layout/main_activity_toolbar.xml
index f08ada36f6..47dedf572b 100644
--- a/app/src/main/res/layout/main_activity_toolbar.xml
+++ b/app/src/main/res/layout/main_activity_toolbar.xml
@@ -19,8 +19,7 @@
         android:id="@+id/tabs"
         style="@style/Theme.Widget.Tabs"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:tabRippleColor="?attr/rippleNavColor" />
+        android:layout_height="wrap_content" />
 
     <FrameLayout
         android:id="@+id/downloaded_only"
diff --git a/app/src/main/res/layout/manga_info_header.xml b/app/src/main/res/layout/manga_info_header.xml
index 9bfc791a45..3f2eaa4072 100644
--- a/app/src/main/res/layout/manga_info_header.xml
+++ b/app/src/main/res/layout/manga_info_header.xml
@@ -144,8 +144,7 @@
             app:icon="@drawable/ic_favorite_border_24dp"
             app:layout_constraintEnd_toStartOf="@+id/btn_tracking"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/manga_info"
-            app:rippleColor="?attr/rippleColor" />
+            app:layout_constraintTop_toBottomOf="@+id/manga_info" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_tracking"
@@ -158,7 +157,6 @@
             app:layout_constraintEnd_toStartOf="@+id/btn_webview"
             app:layout_constraintStart_toEndOf="@+id/btn_favorite"
             app:layout_constraintTop_toBottomOf="@+id/manga_info"
-            app:rippleColor="?attr/rippleColor"
             tools:visibility="visible" />
 
         <com.google.android.material.button.MaterialButton
@@ -173,7 +171,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/btn_tracking"
             app:layout_constraintTop_toBottomOf="@+id/manga_info"
-            app:rippleColor="?attr/rippleColor"
             tools:visibility="visible" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7b158ea978..07351f3ee7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -308,6 +308,7 @@
         <item name="android:textAllCaps">false</item>
 
         <item name="backgroundTint">@android:color/transparent</item>
+        <item name="rippleColor">?attr/rippleColor</item>
 
         <item name="iconGravity">top</item>
         <item name="iconTint">@color/button_action_selector</item>
@@ -347,6 +348,7 @@
         <item name="tabMinWidth">75dp</item>
         <item name="tabMode">scrollable</item>
         <item name="tabTextAppearance">@style/TextAppearance.Widget.Tab</item>
+        <item name="tabRippleColor">?attr/rippleNavColor</item>
     </style>
 
 
@@ -370,12 +372,8 @@
     <!--===============-->
     <!--Custom Selector-->
     <!--===============-->
-    <style name="PreferenceThemeLight" parent="@style/PreferenceThemeOverlay">
-        <item name="android:selectableItemBackground">@drawable/ripple_light</item>
-    </style>
-
-    <style name="PreferenceThemeDark" parent="@style/PreferenceThemeOverlay">
-        <item name="android:selectableItemBackground">@drawable/ripple_dark</item>
+    <style name="PreferenceThemeCustom" parent="@style/PreferenceThemeOverlay">
+        <item name="android:selectableItemBackground">@drawable/ripple_background</item>
     </style>
 
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4477d23f7c..e88bc11988 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -59,7 +59,7 @@
         <item name="actionModeCloseDrawable">@drawable/ic_close_24dp</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents</item>
         <item name="toolbarNavigationButtonStyle">@style/Theme.Toolbar.Navigation</item>
-        <item name="preferenceTheme">@style/PreferenceThemeLight</item>
+        <item name="preferenceTheme">@style/PreferenceThemeCustom</item>
         <item name="dialogTheme">@style/Theme.AlertDialog.Light</item>
         <item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Light</item>
         <item name="bottomSheetDialogTheme">@style/Theme.BottomSheet</item>
@@ -104,6 +104,7 @@
         <item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
         <item name="colorPrimaryVariant">@color/colorPrimaryDark</item>
         <item name="colorFilterActive">@color/filterColorDark</item>
+        <item name="rippleNavColor">@color/md_white_1000_6</item>
         <item name="actionBarTheme">@style/Theme.Toolbar.Light</item>
         <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
@@ -157,7 +158,7 @@
         <item name="actionBarTheme">@style/Theme.Toolbar.Custom</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents</item>
         <item name="toolbarNavigationButtonStyle">@style/Theme.Toolbar.Navigation</item>
-        <item name="preferenceTheme">@style/PreferenceThemeDark</item>
+        <item name="preferenceTheme">@style/PreferenceThemeCustom</item>
         <item name="dialogTheme">@style/Theme.AlertDialog.Dark</item>
         <item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Dark</item>
         <item name="bottomSheetDialogTheme">@style/Theme.BottomSheet</item>
@@ -193,6 +194,8 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
         <item name="colorPrimaryVariant">@color/colorPrimary</item>
+
+        <item name="rippleNavColor">@color/md_white_1000_6</item>
     </style>
 
     <style name="Theme.Tachiyomi.Dark.Amoled">