From 4b3d92a050fb694de8b5001c8d89dc6ebebf9d12 Mon Sep 17 00:00:00 2001
From: CrepeTF <70870719+CrepeTF@users.noreply.github.com>
Date: Sun, 27 Dec 2020 00:25:34 +0000
Subject: [PATCH] Added "Midnight Dusk" theme (#183)

* Added Midnight Dusk theme + tweaks

* Added Midnight Dusk theme + tweaks

* Colouring mistakes

* Space error
---
 .../data/preference/PreferenceValues.kt       |  1 +
 .../ui/base/activity/BaseThemedActivity.kt    |  1 +
 .../ui/setting/SettingsGeneralController.kt   |  6 ++--
 app/src/main/res/values/colors.xml            | 11 +++++++
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/values/styles.xml            |  4 +++
 app/src/main/res/values/themes.xml            |  5 ++++
 app/src/main/res/values/themes_sy.xml         | 30 +++++++++++++++++++
 8 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/values/themes_sy.xml

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 0956d75bf..f94711391 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,6 +24,7 @@ object PreferenceValues {
         blue,
         amoled,
         red,
+        midnightdusk,
     }
 
     enum class DisplayMode {
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 febbd59e9..9b064a4c0 100755
--- 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
@@ -49,6 +49,7 @@ abstract class BaseThemedActivity : AppCompatActivity() {
             Values.DarkThemeVariant.blue -> R.style.Theme_Tachiyomi_DarkBlue
             Values.DarkThemeVariant.amoled -> R.style.Theme_Tachiyomi_Amoled
             Values.DarkThemeVariant.red -> R.style.Theme_Tachiyomi_Red
+            Values.DarkThemeVariant.midnightdusk -> R.style.Theme_Tachiyomi_MidnightDusk
             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 df5cafa17..7a11799df 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,13 +133,15 @@ class SettingsGeneralController : SettingsController() {
                     R.string.theme_dark_default,
                     R.string.theme_dark_blue,
                     R.string.theme_dark_amoled,
-                    R.string.theme_dark_red
+                    R.string.theme_dark_red,
+                    R.string.theme_dark_midnightdusk,
                 )
                 entryValues = arrayOf(
                     Values.DarkThemeVariant.default.name,
                     Values.DarkThemeVariant.blue.name,
                     Values.DarkThemeVariant.amoled.name,
-                    Values.DarkThemeVariant.red.name
+                    Values.DarkThemeVariant.red.name,
+                    Values.DarkThemeVariant.midnightdusk.name,
                 )
                 defaultValue = Values.DarkThemeVariant.default.name
                 summary = "%s"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1c3fb948b..ad20129e2 100755
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -36,6 +36,17 @@
     <color name="red">#FF0000</color>
     <color name="dark_red">#880000</color>
 
+    <!-- Midnight Dusk Theme -->
+    <color name="colorAccentDusk">#E21063</color>
+    <color name="textColorPrimaryDusk">@color/md_white_1000</color>
+    <color name="textColorSecondaryDusk">@color/md_white_1000_70</color>
+    <color name="textColorHintDusk">@color/md_white_1000_50</color>
+    <color name="dividerDusk">#12ffffff</color>
+    <color name="rippleColorDusk">@color/md_white_1000_20</color>
+    <color name="backgroundDusk">#16151D</color>
+    <color name="dialogDusk">#201F27</color>
+    <color name="selectorColorDusk">#80FEF936</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 5523c54fe..1076f33e6 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -152,6 +152,7 @@
     <string name="theme_dark_blue">Dark blue</string>
     <string name="theme_dark_amoled">AMOLED black</string>
     <string name="theme_dark_red">Black-Red</string>
+    <string name="theme_dark_midnightdusk">Midnight Dusk</string>
     <string name="pref_start_screen">Start screen</string>
     <string name="pref_language">Language</string>
     <string name="system_default">Default</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index dee6e193d..bd1b724ca 100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -10,6 +10,10 @@
         <item name="android:textColorPrimary">@color/red</item>
     </style>
 
+    <style name="Theme.Toolbar.MidnightDusk" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
+        <item name="android:textColorPrimary">@color/md_white_1000</item>
+    </style>
+
     <style name="Theme.Toolbar.Light" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
         <item name="popupTheme">@style/ThemeOverlay.MaterialComponents.Light</item>
     </style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0bca7c174..d073e2b26 100755
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -90,6 +90,7 @@
     <style name="Theme.Tachiyomi.Light" parent="Theme.Base">
         <item name="android:statusBarColor">@color/md_black_1000_54</item>
         <item name="android:navigationBarColor">@color/md_black_1000_54</item>
+        <item name="background">@color/dialogLight</item>
 
         <item name="colorFilterActive">@color/filterColorLight</item>
     </style>
@@ -99,6 +100,7 @@
         <item name="colorOnPrimary">@color/textColorPrimaryDark</item>
         <item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
         <item name="colorPrimaryVariant">@color/colorPrimaryDark</item>
+        <item name="background">@color/colorPrimary</item>
 
         <item name="actionBarTheme">@style/Theme.Toolbar.Light</item>
     </style>
@@ -122,6 +124,7 @@
         <item name="colorOnSurface">@color/textColorPrimaryDark</item>
         <item name="colorOnBackground">@color/textColorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccentDark</item>
+        <item name="background">@color/colorDarkPrimaryDark</item>
 
         <!-- Handles RTL text -->
         <item name="android:textAlignment">gravity</item>
@@ -189,12 +192,14 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
         <item name="colorPrimaryVariant">@color/colorPrimary</item>
+        <item name="background">@color/colorPrimary</item>
     </style>
 
     <style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Dark">
         <item name="colorPrimary">@color/colorAmoledPrimary</item>
         <item name="colorPrimaryVariant">@color/colorAmoledPrimary</item>
         <item name="colorSurface">@color/colorAmoledPrimary</item>
+        <item name="background">@color/colorAmoledPrimary</item>
 
         <item name="android:colorBackground">@color/colorAmoledPrimary</item>
 
diff --git a/app/src/main/res/values/themes_sy.xml b/app/src/main/res/values/themes_sy.xml
new file mode 100644
index 000000000..ab99474cc
--- /dev/null
+++ b/app/src/main/res/values/themes_sy.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--=============-->
+    <!-- Dark Themes -->
+    <!--=============-->
+    <style name="Theme.Tachiyomi.MidnightDusk" parent="Theme.Base.Dark">
+        <item name="colorPrimary">@color/dialogDusk</item>
+        <item name="colorOnPrimary">@color/textColorPrimaryDusk</item>
+        <item name="colorAccentOnPrimary">@color/colorAccentDusk</item>
+        <item name="colorPrimaryVariant">@color/dialogDusk</item>
+        <item name="colorSecondary">@color/colorAccentDusk</item>
+        <item name="colorOnSecondary">@color/textColorPrimaryDusk</item>
+        <item name="colorSurface">@color/dialogDusk</item>
+        <item name="colorOnSurface">@color/textColorPrimaryDusk</item>
+        <item name="colorOnBackground">@color/textColorPrimaryDusk</item>
+        <item name="colorAccent">@color/colorAccentDusk</item>
+        <item name="background">@color/backgroundDusk</item>
+
+        <item name="android:colorBackground">@color/backgroundDusk</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>
+
+</resources>
\ No newline at end of file