From 4a1e832bf5079ced09b92b28013e368f1b2a88bd Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sun, 29 Nov 2020 17:19:29 -0500
Subject: [PATCH] Revert "Cool gray theme  (#169)"

This reverts commit ac31f1213867a6546b6a69b3d9921ca21abb91ee.
---
 .../data/preference/PreferenceValues.kt       |  1 -
 .../ui/base/activity/BaseActivity.kt          |  1 -
 .../ui/setting/SettingsGeneralController.kt   |  2 --
 app/src/main/res/values/colors.xml            | 14 ------------
 app/src/main/res/values/strings.xml           |  1 -
 app/src/main/res/values/styles.xml            |  4 ----
 app/src/main/res/values/themes.xml            | 22 -------------------
 7 files changed, 45 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 875bf1dde..28e48707f 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
@@ -23,7 +23,6 @@ object PreferenceValues {
         default,
         blue,
         amoled,
-        gray,
         red,
     }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt
index 1b124a3de..946d03e1e 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt
@@ -58,7 +58,6 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
         when (preferences.themeDark().get()) {
             Values.DarkThemeVariant.blue -> R.style.Theme_Tachiyomi_DarkBlue
             Values.DarkThemeVariant.amoled -> R.style.Theme_Tachiyomi_Amoled
-            Values.DarkThemeVariant.gray -> R.style.Theme_Tachiyomi_Gray
             Values.DarkThemeVariant.red -> R.style.Theme_Tachiyomi_Red
             else -> R.style.Theme_Tachiyomi_Dark
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
index cbbcb31c5..577320fb0 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
@@ -133,14 +133,12 @@ class SettingsGeneralController : SettingsController() {
                     R.string.theme_dark_default,
                     R.string.theme_dark_blue,
                     R.string.theme_dark_amoled,
-                    R.string.theme_dark_gray,
                     R.string.theme_dark_red
                 )
                 entryValues = arrayOf(
                     Values.DarkThemeVariant.default.name,
                     Values.DarkThemeVariant.blue.name,
                     Values.DarkThemeVariant.amoled.name,
-                    Values.DarkThemeVariant.gray.name,
                     Values.DarkThemeVariant.red.name
                 )
                 defaultValue = Values.DarkThemeVariant.default.name
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index fcaa425e8..1c3fb948b 100755
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -36,20 +36,6 @@
     <color name="red">#FF0000</color>
     <color name="dark_red">#880000</color>
 
-    <!-- Gray Theme -->
-    <color name="colorAccentGray">#3399FF</color>
-    <color name="textColorPrimaryGray">@color/md_white_1000</color>
-    <color name="textColorSecondaryGray">@color/md_white_1000_70</color>
-    <color name="textColorHintGray">@color/md_white_1000_50</color>
-    <color name="dividerGray">@android:color/transparent</color>
-    <color name="rippleColorGray">@color/md_white_1000_20</color>
-    <color name="backgroundGray">#202125</color>
-    <color name="dialogGray">#242529</color>
-    <color name="selectorColorGray">@color/md_blue_A200_50</color>
-
-    <color name="gray">#202125</color>
-    <color name="light_gray">#242529</color>
-
     <!-- Reader Theme -->
     <color name="readerColorDarkPrimary">@color/colorDarkPrimary</color>
     <color name="pageNumberBackgroundLight">@color/md_grey_50_75</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 63dbf0396..0d62feb5a 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -151,7 +151,6 @@
     <string name="theme_dark_default">Default</string>
     <string name="theme_dark_blue">Dark blue</string>
     <string name="theme_dark_amoled">AMOLED black</string>
-    <string name="theme_dark_gray">Cool gray</string>
     <string name="theme_dark_red">Black-Red</string>
     <string name="pref_start_screen">Start screen</string>
     <string name="pref_language">Language</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d7e3e5bfd..f5429be89 100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,10 +6,6 @@
     <!--========-->
     <style name="Theme.Toolbar" parent="@style/ThemeOverlay.MaterialComponents.ActionBar" />
 
-    <style name="Theme.Toolbar.Gray" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
-        <item name="android:textColorPrimary">@color/md_white_1000</item>
-    </style>
-
     <style name="Theme.Toolbar.Red" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
         <item name="android:textColorPrimary">@color/red</item>
     </style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index dcbb64be5..4c90132a4 100755
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -181,28 +181,6 @@
     <style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark">
     </style>
 
-    <style name="Theme.Tachiyomi.Gray" parent="Theme.Base.Dark">
-        <item name="colorPrimary">@color/light_gray</item>
-        <item name="colorOnPrimary">@color/textColorPrimaryGray</item>
-        <item name="colorAccentOnPrimary">@color/colorAccentGray</item>
-        <item name="colorPrimaryVariant">@color/light_gray</item>
-        <item name="colorSecondary">@color/colorAccentGray</item>
-        <item name="colorOnSecondary">@color/textColorPrimaryGray</item>
-        <item name="colorSurface">@color/light_gray</item>
-        <item name="colorOnSurface">@color/textColorPrimaryGray</item>
-        <item name="colorOnBackground">@color/textColorPrimaryGray</item>
-        <item name="colorAccent">@color/colorAccentGray</item>
-
-        <item name="android:colorBackground">@color/backgroundGray</item>
-
-        <!-- Some ROMs make black navbars white (e.g. OxygenOS) -->
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-
-        <!-- Custom Attributes -->
-        <item name="colorLibrarySelection">@color/selectorColorDark</item>
-        <item name="colorLibrarySelectionActive">@color/selectorColorDark</item>
-    </style>
-
     <style name="Theme.Tachiyomi.DarkBlue" parent="Theme.Base.Dark">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>