From f85dfa90b867c80b7a456c07ee03f99c9b71a987 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Wed, 10 Nov 2021 09:15:13 -0500
Subject: [PATCH] Remove legacy blue theme

Causing too many theming issues/complexity. This will make the Material 3 transition easier.
---
 .../data/preference/PreferenceValues.kt       |  4 +--
 .../ui/base/activity/BaseThemedActivity.kt    |  4 ---
 .../kanade/tachiyomi/ui/main/MainActivity.kt  |  4 +--
 app/src/main/res/values/colors.xml            |  2 --
 app/src/main/res/values/strings.xml           |  1 -
 app/src/main/res/values/styles.xml            | 33 -------------------
 app/src/main/res/values/themes.xml            | 29 ----------------
 7 files changed, 3 insertions(+), 74 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
index 41a5f1831..f7a6e40f0 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
@@ -31,11 +31,11 @@ object PreferenceValues {
         GREEN_APPLE(R.string.theme_greenapple),
         TEALTURQUOISE(R.string.theme_tealturquoise),
         YINYANG(R.string.theme_yinyang),
-        BLUE(R.string.theme_blue),
 
         // Deprecated
         DARK_BLUE(null),
         HOT_PINK(null),
+        BLUE(null),
     }
 
     enum class TappingInvertMode(val shouldInvertHorizontal: Boolean = false, val shouldInvertVertical: Boolean = false) {
@@ -61,6 +61,6 @@ object PreferenceValues {
     enum class ExtensionInstaller {
         LEGACY,
         PACKAGEINSTALLER,
-        SHIZUKU
+        SHIZUKU,
     }
 }
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 48a46ce9f..c8b05e5da 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
@@ -34,10 +34,6 @@ abstract class BaseThemedActivity : AppCompatActivity() {
                 PreferenceValues.AppTheme.MONET -> {
                     resIds += R.style.Theme_Tachiyomi_Monet
                 }
-                PreferenceValues.AppTheme.BLUE -> {
-                    resIds += R.style.Theme_Tachiyomi_Blue
-                    resIds += R.style.ThemeOverlay_Tachiyomi_ColoredBars
-                }
                 PreferenceValues.AppTheme.GREEN_APPLE -> {
                     resIds += R.style.Theme_Tachiyomi_GreenApple
                 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index 66bdc8346..435fcf73c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -33,7 +33,6 @@ import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.Migrations
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.notification.NotificationReceiver
-import eu.kanade.tachiyomi.data.preference.PreferenceValues
 import eu.kanade.tachiyomi.data.preference.asImmediateFlow
 import eu.kanade.tachiyomi.data.updater.AppUpdateChecker
 import eu.kanade.tachiyomi.data.updater.AppUpdateResult
@@ -568,8 +567,7 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
 
             binding.root.isLiftAppBarOnScroll = to !is NoAppBarElevationController
 
-            binding.appbar.isTransparentWhenNotLifted = to is MangaController &&
-                preferences.appTheme().get() != PreferenceValues.AppTheme.BLUE
+            binding.appbar.isTransparentWhenNotLifted = to is MangaController
             binding.controllerContainer.overlapHeader = to is MangaController
         }
     }
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 292b37d16..f5cc2e7c8 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -21,9 +21,7 @@
     <color name="on_background_monet" tools:targetApi="31">@color/on_surface_monet</color>
 
     <!-- Blue Theme -->
-    <color name="primary_blue">#3598FE</color>
     <color name="accent_blue">#54759E</color>
-    <color name="ripple_colored_blue">#1F54759E</color>
 
     <!-- Green Apple Theme -->
     <color name="accent_greenapple">#188140</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a273027bd..353b19264 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -152,7 +152,6 @@
     <string name="theme_dark">On</string>
     <string name="pref_app_theme">App theme</string>
     <string name="theme_monet">Dynamic</string>
-    <string name="theme_blue">Legacy Blue</string>
     <string name="theme_greenapple">Green Apple</string>
     <string name="theme_midnightdusk">Midnight Dusk</string>
     <string name="theme_strawberrydaiquiri">Strawberry Daiquiri</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1c92d9f05..70b32fbcc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,10 +9,6 @@
         <item name="android:colorControlHighlight">?attr/rippleColorToolbar</item>
     </style>
 
-    <style name="ThemeOverlay.Tachiyomi.ActionBar.Colored" parent="ThemeOverlay.MaterialComponents.ActionBar">
-        <item name="android:colorControlHighlight">?attr/colorOnToolbar</item>
-    </style>
-
     <style name="Widget.Tachiyomi.Toolbar.Button.Navigation" parent="Widget.AppCompat.Toolbar.Button.Navigation">
         <item name="tint">?attr/colorOnToolbar</item>
     </style>
@@ -30,13 +26,6 @@
         <item name="android:tint">?attr/colorOnToolbar</item>
     </style>
 
-    <style name="Widget.Tachiyomi.Toolbar.Colored" parent="Widget.MaterialComponents.Toolbar">
-        <item name="android:background">?attr/colorToolbar</item>
-        <item name="titleTextColor">?attr/colorOnToolbar</item>
-        <item name="subtitleTextColor">?attr/colorOnToolbar</item>
-        <item name="android:elevation">0dp</item>
-    </style>
-
 
     <!--===========-->
     <!--AlertDialog-->
@@ -201,18 +190,6 @@
         <item name="tabRippleColor">@color/ripple_toolbar_fainter</item>
     </style>
 
-    <style name="Widget.Tachiyomi.TabLayout.Colored" parent="Widget.MaterialComponents.TabLayout.Colored">
-        <item name="android:background">?attr/colorToolbar</item>
-        <item name="tabGravity">center</item>
-        <item name="tabIndicator">@drawable/tab_indicator</item>
-        <item name="tabIndicatorFullWidth">false</item>
-        <item name="tabIndicatorHeight">3dp</item>
-        <item name="tabInlineLabel">true</item>
-        <item name="tabMinWidth">75dp</item>
-        <item name="tabMode">scrollable</item>
-        <item name="tabRippleColor">?attr/colorOnPrimary</item>
-    </style>
-
     <!--==============-->
     <!--Widgets.Switch-->
     <!--==============-->
@@ -241,21 +218,11 @@
         <item name="labelVisibilityMode">labeled</item>
     </style>
 
-    <style name="Widget.Tachiyomi.BottomNavigationView.Colored" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
-        <item name="android:background">?attr/colorToolbar</item>
-        <item name="labelVisibilityMode">labeled</item>
-    </style>
-
     <style name="Widget.Tachiyomi.NavigationRailView" parent="Widget.MaterialComponents.NavigationRailView">
         <item name="itemRippleColor">@color/ripple_toolbar_fainter</item>
         <item name="labelVisibilityMode">labeled</item>
     </style>
 
-    <style name="Widget.Tachiyomi.NavigationRailView.Colored" parent="Widget.MaterialComponents.NavigationRailView.Colored">
-        <item name="android:background">?attr/colorToolbar</item>
-        <item name="labelVisibilityMode">labeled</item>
-    </style>
-
 
     <!--============-->
     <!--FastScroller-->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index e72de8e56..c56230a76 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -85,15 +85,6 @@
     <!-- Monet theme only support S+ -->
     <style name="Theme.Tachiyomi.Monet" />
 
-    <!--== Blue Theme ==-->
-    <style name="Theme.Tachiyomi.Blue">
-        <!-- Theme Colors -->
-        <item name="colorToolbar">@color/accent_blue</item>
-        <item name="colorOnToolbar">@color/md_white_1000</item>
-        <item name="colorPrimary">@color/primary_blue</item>
-        <item name="colorControlHighlight">@color/ripple_colored_blue</item>
-    </style>
-
     <!--== Green Apple Theme ==-->
     <style name="Theme.Tachiyomi.GreenApple">
         <!-- Theme Colors -->
@@ -172,26 +163,6 @@
     <!--== AMOLED Mode Overlay ==-->
     <style name="ThemeOverlay.Tachiyomi.Amoled" parent="" />
 
-    <!--== Colored Bars (toolbar-navbar-navrail) Mode Overlay ==-->
-    <style name="ThemeOverlay.Tachiyomi.ColoredBars" parent="">
-        <!-- Base background/text colors -->
-        <item name="background">?attr/colorPrimary</item>
-
-        <!-- Themes -->
-        <item name="actionBarTheme">@style/ThemeOverlay.Tachiyomi.ActionBar.Colored</item>
-        <item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
-        <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Primary</item>
-        <item name="toolbarStyle">@style/Widget.Tachiyomi.Toolbar.Colored</item>
-        <item name="tabStyle">@style/Widget.Tachiyomi.TabLayout.Colored</item>
-        <item name="bottomNavigationStyle">@style/Widget.Tachiyomi.BottomNavigationView.Colored</item>
-        <item name="navigationRailStyle">@style/Widget.Tachiyomi.NavigationRailView.Colored</item>
-
-        <!-- Status/Navigation bar -->
-        <item name="android:windowLightStatusBar" tools:targetApi="m">?attr/lightSystemBarsOnPrimary</item>
-        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">?attr/lightSystemBarsOnPrimary</item>
-        <item name="android:navigationBarColor">?attr/colorToolbar</item>
-    </style>
-
     <!--===============-->
     <!-- Launch Screen -->
     <!--===============-->