From 040bac3da2a215802ebad02f8e6a418bb200cb9c Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sun, 4 Jul 2021 17:51:15 -0400
Subject: [PATCH] Resource cleanup post-theme removal

---
 .../ui/base/activity/BaseThemedActivity.kt    |  2 +-
 .../util/system/ContextExtensions.kt          |  2 +-
 .../sc_collections_bookmark_48dp.xml          |  2 +-
 .../main/res/drawable-v26/sc_explore_48dp.xml |  2 +-
 .../main/res/drawable-v26/sc_history_48dp.xml |  2 +-
 .../res/drawable-v26/sc_new_releases_48dp.xml |  2 +-
 .../drawable/sc_collections_bookmark_48dp.xml |  2 +-
 app/src/main/res/drawable/sc_explore_48dp.xml |  2 +-
 app/src/main/res/drawable/sc_history_48dp.xml |  2 +-
 .../res/drawable/sc_new_releases_48dp.xml     |  2 +-
 app/src/main/res/values-night/themes.xml      |  2 +-
 app/src/main/res/values/colors.xml            | 23 ++++++-------------
 app/src/main/res/values/themes.xml            | 22 +++++-------------
 13 files changed, 24 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
index 03d84e160..58329b9ae 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
@@ -35,7 +35,7 @@ abstract class BaseThemedActivity : AppCompatActivity() {
             val resIds = mutableListOf<Int>()
             when (preferences.appTheme().get()) {
                 PreferenceValues.AppTheme.BLUE -> {
-                    resIds += R.style.Theme_Tachiyomi_DarkBlue
+                    resIds += R.style.Theme_Tachiyomi_Blue
                     resIds += R.style.ThemeOverlay_Tachiyomi_ColoredBars
                 }
                 PreferenceValues.AppTheme.GREEN_APPLE -> {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
index 563d562a0..95cb979f2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
@@ -94,7 +94,7 @@ fun Context.copyToClipboard(label: String, content: String) {
  */
 fun Context.notificationBuilder(channelId: String, block: (NotificationCompat.Builder.() -> Unit)? = null): NotificationCompat.Builder {
     val builder = NotificationCompat.Builder(this, channelId)
-        .setColor(ContextCompat.getColor(this, R.color.accent_lightblue))
+        .setColor(ContextCompat.getColor(this, R.color.accent_blue))
     if (block != null) {
         builder.block()
     }
diff --git a/app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml b/app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml
index 5233c9fe8..e7cfad267 100644
--- a/app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml
+++ b/app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-<background android:drawable="@color/accent_lightblue"/>
+<background android:drawable="@color/accent_blue"/>
 <foreground>
     <vector
         android:width="120dp"
diff --git a/app/src/main/res/drawable-v26/sc_explore_48dp.xml b/app/src/main/res/drawable-v26/sc_explore_48dp.xml
index 61f1e9e39..2e166e6e2 100644
--- a/app/src/main/res/drawable-v26/sc_explore_48dp.xml
+++ b/app/src/main/res/drawable-v26/sc_explore_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-<background android:drawable="@color/accent_lightblue"/>
+<background android:drawable="@color/accent_blue"/>
 <foreground>
     <vector
         android:width="120dp"
diff --git a/app/src/main/res/drawable-v26/sc_history_48dp.xml b/app/src/main/res/drawable-v26/sc_history_48dp.xml
index 3b9cbc93f..5007e9783 100644
--- a/app/src/main/res/drawable-v26/sc_history_48dp.xml
+++ b/app/src/main/res/drawable-v26/sc_history_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-<background android:drawable="@color/accent_lightblue"/>
+<background android:drawable="@color/accent_blue"/>
 <foreground>
     <vector
         android:width="120dp"
diff --git a/app/src/main/res/drawable-v26/sc_new_releases_48dp.xml b/app/src/main/res/drawable-v26/sc_new_releases_48dp.xml
index 401d906e5..99b96b1e6 100644
--- a/app/src/main/res/drawable-v26/sc_new_releases_48dp.xml
+++ b/app/src/main/res/drawable-v26/sc_new_releases_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-<background android:drawable="@color/accent_lightblue"/>
+<background android:drawable="@color/accent_blue"/>
 <foreground>
     <vector
         android:width="120dp"
diff --git a/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml b/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml
index e14bcd139..6cae83bc8 100644
--- a/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml
+++ b/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="48">
 
     <path
-        android:fillColor="@color/accent_lightblue"
+        android:fillColor="@color/accent_blue"
         android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
 
     <group
diff --git a/app/src/main/res/drawable/sc_explore_48dp.xml b/app/src/main/res/drawable/sc_explore_48dp.xml
index 10847d5b7..75d4f717b 100644
--- a/app/src/main/res/drawable/sc_explore_48dp.xml
+++ b/app/src/main/res/drawable/sc_explore_48dp.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="48">
 
     <path
-        android:fillColor="@color/accent_lightblue"
+        android:fillColor="@color/accent_blue"
         android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
 
     <group
diff --git a/app/src/main/res/drawable/sc_history_48dp.xml b/app/src/main/res/drawable/sc_history_48dp.xml
index 2630973ba..6bf0c4a9f 100644
--- a/app/src/main/res/drawable/sc_history_48dp.xml
+++ b/app/src/main/res/drawable/sc_history_48dp.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="48">
 
     <path
-        android:fillColor="@color/accent_lightblue"
+        android:fillColor="@color/accent_blue"
         android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
 
     <group
diff --git a/app/src/main/res/drawable/sc_new_releases_48dp.xml b/app/src/main/res/drawable/sc_new_releases_48dp.xml
index 84ee72809..af4e4385f 100644
--- a/app/src/main/res/drawable/sc_new_releases_48dp.xml
+++ b/app/src/main/res/drawable/sc_new_releases_48dp.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="48">
 
     <path
-        android:fillColor="@color/accent_lightblue"
+        android:fillColor="@color/accent_blue"
         android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
 
     <group
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 81719d09a..3148c1ce7 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -6,7 +6,7 @@
         <item name="colorSurface">@color/surface_amoled</item>
         <item name="android:colorBackground">@color/background_amoled</item>
         <item name="android:divider">@color/divider_amoled</item>
-        <item name="colorFilterActive">@color/filterColorAmoled</item>
+        <item name="colorFilterActive">@color/filter_dark</item>
     </style>
 
     <!--== Midnight Dusk theme ==-->
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5343f94e6..8e3b8f341 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="splash">@color/accent_lightblue</color>
+    <color name="splash">@color/accent_blue</color>
 
-    <!-- Light Theme -->
+    <!-- Default Theme -->
     <color name="accent_default">@color/md_blue_A400</color>
     <color name="divider_default">@color/md_black_1000_12</color>
     <color name="surface_default">@color/md_white_1000</color>
     <color name="background_default">@color/md_grey_50</color>
     <color name="ripple_colored_default">@color/md_blue_A400_12</color>
 
-    <!-- Light Blue Theme -->
-    <color name="accent_lightblue">#54759E</color>
-    <color name="ripple_colored_lightblue">#1F54759E</color>
+    <!-- Blue Theme -->
+    <color name="accent_blue">#54759E</color>
+    <color name="ripple_colored_blue">#1F54759E</color>
 
     <!-- Strawberry Daiquiri Theme -->
     <color name="accent_strawberry">#ED4A65</color>
@@ -21,10 +21,6 @@
     <color name="accent_yotsuba">#FC8C5C</color>
     <color name="ripple_colored_yotsuba">#1FFC8C5C</color>
 
-    <!-- Dark Blue Theme -->
-    <color name="accent_darkblue">#54759E</color>
-    <color name="ripple_colored_darkblue">#1F54759E</color>
-
     <!-- Green Apple Theme -->
     <color name="accent_greenapple">#48E484</color>
     <color name="ripple_colored_greenapple">#1F48E484</color>
@@ -40,13 +36,8 @@
     <color name="surface_amoled">#000001</color>
     <color name="background_amoled">#000000</color>
 
-    <!-- Hot Pink Theme -->
-    <color name="accent_hotpink">#FF3399</color>
-    <color name="ripple_colored_hotpink">#1FFF3399</color>
-
-    <color name="filterColorLight">#FFC107</color>
-    <color name="filterColorDark">#FFEB3B</color>
-    <color name="filterColorAmoled">#FFEB3B</color>
+    <color name="filter_light">#FFC107</color>
+    <color name="filter_dark">#FFEB3B</color>
 
     <color name="reader_background_dark">#202125</color>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 858fc9f8b..a8f455d2f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -7,7 +7,7 @@
 
     <!--== Theme base ==-->
     <style name="Base.Theme.Tachiyomi" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <!-- Disallow 'Force dark theme' -->
+        <!-- Disallow "Force dark theme" -->
         <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
 
         <!-- Theme colors -->
@@ -42,6 +42,7 @@
         <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="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
         <item name="android:backgroundDimAmount">0.32</item>
         <item name="windowActionModeOverlay">true</item>
         <item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
@@ -64,9 +65,6 @@
         <item name="elevationOverlayEnabled">false</item>
         <item name="lightSystemBarsOnPrimary">false</item>
 
-        <!-- Text Appearances -->
-        <item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
-
         <!-- Material Dialogs -->
         <item name="md_background_color">?attr/colorSurface</item>
         <item name="md_color_title">?attr/colorOnSurface</item>
@@ -76,15 +74,15 @@
         <item name="md_corner_radius">@dimen/dialog_radius</item>
 
         <!-- Custom Attributes-->
-        <item name="colorFilterActive">@color/filterColorLight</item>
+        <item name="colorFilterActive">@color/filter_light</item>
     </style>
 
     <style name="Theme.Tachiyomi" parent="Base.Theme.Tachiyomi" />
 
-    <style name="Theme.Tachiyomi.DarkBlue">
+    <style name="Theme.Tachiyomi.Blue">
         <!-- Theme colors -->
-        <item name="colorPrimary">@color/accent_lightblue</item>
-        <item name="colorControlHighlight">@color/ripple_colored_lightblue</item>
+        <item name="colorPrimary">@color/accent_blue</item>
+        <item name="colorControlHighlight">@color/ripple_colored_blue</item>
     </style>
 
     <!--== Strawberry Daiquiri theme ==-->
@@ -121,14 +119,6 @@
         <item name="colorControlHighlight">@color/ripple_colored_midnightdusk</item>
     </style>
 
-    <!--== Hot Pink theme ==-->
-    <style name="Theme.Tachiyomi.HotPink">
-        <!-- Theme colors -->
-        <item name="colorPrimary">@color/accent_hotpink</item>
-        <item name="colorTertiary">@color/md_blue_A400</item>
-        <item name="colorControlHighlight">@color/ripple_colored_hotpink</item>
-    </style>
-
     <!--== AMOLED theme overlay ==-->
     <style name="ThemeOverlay.Tachiyomi.Amoled" parent="" />