From a98a578af3183a63fe7d4c378e2a112f0cf22996 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Sat, 10 Apr 2021 17:13:38 -0400
Subject: [PATCH] Adding Black 'n' Red theme

And I thought the dusk theme was edgy

and this is the one that actually closes #719
---
 .../java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt  | 10 ++++++++--
 app/src/main/res/values-night/themes.xml               |  6 ++++++
 app/src/main/res/values/strings.xml                    |  1 +
 app/src/main/res/values/themes.xml                     |  1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt
index 0ce5588530..f7083cf2fa 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt
@@ -76,6 +76,11 @@ object ThemeUtil {
             AppCompatDelegate.MODE_NIGHT_YES,
             R.string.amoled_black
         ),
+        BLACK_N_RED(
+            R.style.Theme_Tachiyomi_BlackAndRed,
+            AppCompatDelegate.MODE_NIGHT_YES,
+            R.string.black_and_red
+        ),
         LIGHT_BLUE(
             R.style.Theme_Tachiyomi_AllBlue,
             AppCompatDelegate.MODE_NIGHT_NO,
@@ -155,7 +160,7 @@ object ThemeUtil {
         @ColorInt
         val darkBackground: Int = Color.parseColor(
             when (styleRes) {
-                R.style.Theme_Tachiyomi_Amoled -> "#000000"
+                R.style.Theme_Tachiyomi_Amoled, R.style.Theme_Tachiyomi_BlackAndRed -> "#000000"
                 R.style.Theme_Tachiyomi_MidnightDusk -> "#16151D"
                 else -> "#1C1C1D"
             }
@@ -173,6 +178,7 @@ object ThemeUtil {
         val darkAccent: Int = Color.parseColor(
             when (styleRes) {
                 R.style.Theme_Tachiyomi_MidnightDusk -> "#F02475"
+                R.style.Theme_Tachiyomi_BlackAndRed -> "#AA2200"
                 else -> "#3399FF"
             }
         )
@@ -215,7 +221,7 @@ object ThemeUtil {
         val darkBottomBar: Int = Color.parseColor(
             when (styleRes) {
                 R.style.Theme_Tachiyomi_AllBlue -> "#54759E"
-                R.style.Theme_Tachiyomi_Amoled -> "#000000"
+                R.style.Theme_Tachiyomi_Amoled, R.style.Theme_Tachiyomi_BlackAndRed -> "#000000"
                 R.style.Theme_Tachiyomi_MidnightDusk -> "#201F27"
                 else -> "#212121"
             }
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index fa3e17e721..563a5cd450 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -21,4 +21,10 @@
         <!-- Material Dialog colors -->
         <item name="md_background_color">@color/colorAmoledPrimary</item>
     </style>
+
+    <style name="Theme.Tachiyomi.BlackAndRed" parent="Theme.Tachiyomi.Amoled">
+        <item name="colorAccent">@color/holo_red</item>
+        <item name="colorAccentText">@color/md_red_500</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1357261d26..ddbea71279 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -568,6 +568,7 @@
     <string name="dark_blue">Dark Blue</string>
     <string name="midnight_dusk">Midnight Dusk</string>
     <string name="spring_blossom">Spring Blossom</string>
+    <string name="black_and_red">Black \'n\' Red</string>
     <string name="white_theme">Pure White</string>
     <string name="system_default_amoled">System default (White + Black)</string>
     <string name="system_default_all_blue">System default (All Blue)</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 7abd62e6dd..806fce1505 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -69,6 +69,7 @@
         <item name="android:windowLightNavigationBar" tools:targetApi="27">false</item>
     </style>
     <style name="Theme.Tachiyomi.Amoled" parent="Theme.Tachiyomi"/>
+    <style name="Theme.Tachiyomi.BlackAndRed" parent="Theme.Tachiyomi.Amoled"/>
     <style name="Theme.Tachiyomi.MidnightDusk" parent="Theme.Tachiyomi">
         <item name="colorPrimary">@color/dialogDuskDawn</item>
         <item name="colorPrimaryDark">@color/dialogDuskDawn</item>