From 2c4fd340c88d1bc9501e6e40ae6a8e2c2ea6c760 Mon Sep 17 00:00:00 2001
From: inorichi <len@kanade.eu>
Date: Sat, 27 Oct 2018 19:10:11 +0200
Subject: [PATCH] Restore dark blue theme. Closes #1302

---
 .../eu/kanade/tachiyomi/ui/main/MainActivity.kt  |  1 +
 .../ui/setting/SettingsGeneralController.kt      |  5 +++--
 app/src/main/res/values-v21/themes.xml           | 16 +++++++++++++---
 app/src/main/res/values/strings.xml              |  1 +
 app/src/main/res/values/themes.xml               |  5 +++++
 5 files changed, 23 insertions(+), 5 deletions(-)

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 4cd8b2a81f..d96b222c29 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
@@ -50,6 +50,7 @@ class MainActivity : BaseActivity() {
         setTheme(when (preferences.theme()) {
             2 -> R.style.Theme_Tachiyomi_Dark
             3 -> R.style.Theme_Tachiyomi_Amoled
+            4 -> R.style.Theme_Tachiyomi_DarkBlue
             else -> R.style.Theme_Tachiyomi
         })
         super.onCreate(savedInstanceState)
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 2c52bbcd30..ab81f4787d 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
@@ -52,8 +52,9 @@ class SettingsGeneralController : SettingsController() {
         intListPreference {
             key = Keys.theme
             titleRes = R.string.pref_theme
-            entriesRes = arrayOf(R.string.light_theme, R.string.dark_theme, R.string.amoled_theme)
-            entryValues = arrayOf("1", "2", "3")
+            entriesRes = arrayOf(R.string.light_theme, R.string.dark_theme,
+                    R.string.amoled_theme, R.string.darkblue_theme)
+            entryValues = arrayOf("1", "2", "3", "4")
             defaultValue = "1"
             summary = "%s"
 
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index 84ccab60fb..a84911b1e4 100644
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -10,9 +10,9 @@
         <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
     </style>
 
-    <!--============-->
-    <!-- Dark Theme -->
-    <!--============-->
+    <!--=============-->
+    <!-- Dark Themes -->
+    <!--=============-->
     <style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark">
         <!-- Attributes specific for SDK 21 and up  -->
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
@@ -20,6 +20,16 @@
         <item name="android:navigationBarColor">@color/colorDarkPrimaryDark</item>
     </style>
 
+    <style name="Theme.Tachiyomi.DarkBlue" parent="Theme.Base.Dark">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+
+        <!-- Attributes specific for SDK 21 and up  -->
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@color/colorDarkPrimaryDark</item>
+    </style>
+
     <!--==============-->
     <!-- Amoled Theme -->
     <!--==============-->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2ae703eaf2..520f70e43d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -139,6 +139,7 @@
     <string name="light_theme">Main theme</string>
     <string name="dark_theme">Dark theme</string>
     <string name="amoled_theme">AMOLED theme</string>
+    <string name="darkblue_theme">Dark blue</string>
     <string name="pref_start_screen">Start screen</string>
     <string name="pref_language">Language</string>
     <string name="system_default">System default</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 90fdb2696c..c04866ac69 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -83,6 +83,11 @@
         <!-- Attributes specific for SDK 16 to SDK 20 -->
     </style>
 
+    <style name="Theme.Tachiyomi.DarkBlue" parent="Theme.Base.Dark">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+    </style>
+
     <!--==============-->
     <!-- Amoled Theme -->
     <!--==============-->