From 069f4e12d8b6a05d647f4fcebf639dd298eca13c Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 4 Sep 2021 11:50:00 -0400
Subject: [PATCH] Rearrange themes, rename "Blue" to "Legacy Blue"

---
 .../kanade/tachiyomi/data/download/DownloadNotifier.kt |  2 +-
 .../tachiyomi/data/preference/PreferenceValues.kt      | 10 +++++-----
 app/src/main/res/values/strings.xml                    |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
index 8caa67bced..ae9d1be7d5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
@@ -52,7 +52,7 @@ internal class DownloadNotifier(private val context: Context) {
     /**
      * Updated when error is thrown
      */
-    var errorThrown = false
+    private var errorThrown = false
 
     /**
      * Updated when paused
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 d210f6ec58..985f8cd661 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
@@ -24,14 +24,14 @@ object PreferenceValues {
     enum class AppTheme(val titleResId: Int?) {
         DEFAULT(R.string.label_default),
         MONET(R.string.theme_monet),
-        BLUE(R.string.theme_blue),
-        GREEN_APPLE(R.string.theme_greenapple),
         MIDNIGHT_DUSK(R.string.theme_midnightdusk),
         STRAWBERRY_DAIQUIRI(R.string.theme_strawberrydaiquiri),
+        YOTSUBA(R.string.theme_yotsuba),
         TAKO(R.string.theme_tako),
+        GREEN_APPLE(R.string.theme_greenapple),
         TEALTURQUOISE(R.string.theme_tealturquoise),
         YINYANG(R.string.theme_yinyang),
-        YOTSUBA(R.string.theme_yotsuba),
+        BLUE(R.string.theme_blue),
 
         // Deprecated
         DARK_BLUE(null),
@@ -49,12 +49,12 @@ object PreferenceValues {
         HIGHEST(5),
         HIGH(13),
         LOW(31),
-        LOWEST(47)
+        LOWEST(47),
     }
 
     enum class TabletUiMode {
         ALWAYS,
         LANDSCAPE,
-        NEVER
+        NEVER,
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aae8a8bec8..8f947d868c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -150,7 +150,7 @@
     <string name="theme_dark">On</string>
     <string name="pref_app_theme">App theme</string>
     <string name="theme_monet">Dynamic</string>
-    <string name="theme_blue">Blue</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>