From 4af13e3536493db7de3ff5e24ae5794c1efe3661 Mon Sep 17 00:00:00 2001
From: Soitora <simon.mattila@protonmail.com>
Date: Tue, 25 May 2021 14:26:17 +0200
Subject: [PATCH] Added "Green Apple" theme (#5184)

* Added "Green Apple" theme

Totally not stolen from other forks.

Although to cover all my bases I co-author all people who adapted the theme in any form.

Neko, J2K and Tako

Co-Authored-By: Carlos <2092019+CarlosEsco@users.noreply.github.com>
Co-Authored-By: Jays2Kings <jays@outlook.com>
Co-Authored-By: CrepeTF <70870719+CrepeTF@users.noreply.github.com>

* Add black as the OnSecondary color

Co-authored-by: Carlos <2092019+CarlosEsco@users.noreply.github.com>
Co-authored-by: Jays2Kings <jays@outlook.com>
Co-authored-by: CrepeTF <70870719+CrepeTF@users.noreply.github.com>
---
 .../tachiyomi/data/preference/PreferenceValues.kt |  1 +
 .../ui/base/activity/BaseThemedActivity.kt        |  1 +
 .../ui/setting/SettingsGeneralController.kt       |  2 ++
 app/src/main/res/values/colors.xml                |  6 ++++++
 app/src/main/res/values/strings.xml               |  1 +
 app/src/main/res/values/themes.xml                | 15 +++++++++++++++
 6 files changed, 26 insertions(+)

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 d6ed3a14b1..77015fc96f 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
@@ -25,6 +25,7 @@ object PreferenceValues {
     enum class DarkThemeVariant {
         default,
         blue,
+        greenapple,
         midnightdusk,
         amoled,
         hotpink,
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 bcafc3dbca..209402c5e5 100644
--- 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
@@ -25,6 +25,7 @@ abstract class BaseThemedActivity : AppCompatActivity() {
             when (preferences.themeDark().get()) {
                 DarkThemeVariant.default -> R.style.Theme_Tachiyomi_Dark
                 DarkThemeVariant.blue -> R.style.Theme_Tachiyomi_Dark_Blue
+                DarkThemeVariant.greenapple -> R.style.Theme_Tachiyomi_Dark_GreenApple
                 DarkThemeVariant.midnightdusk -> R.style.Theme_Tachiyomi_Dark_MidnightDusk
                 DarkThemeVariant.amoled -> R.style.Theme_Tachiyomi_Amoled
                 DarkThemeVariant.hotpink -> R.style.Theme_Tachiyomi_Amoled_HotPink
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 c0e42ecd28..61a15ac2b8 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
@@ -143,6 +143,7 @@ class SettingsGeneralController : SettingsController() {
                 entriesRes = arrayOf(
                     R.string.theme_dark_default,
                     R.string.theme_dark_blue,
+                    R.string.theme_dark_greenapple,
                     R.string.theme_dark_midnightdusk,
                     R.string.theme_dark_amoled,
                     R.string.theme_dark_amoled_hotpink
@@ -150,6 +151,7 @@ class SettingsGeneralController : SettingsController() {
                 entryValues = arrayOf(
                     Values.DarkThemeVariant.default.name,
                     Values.DarkThemeVariant.blue.name,
+                    Values.DarkThemeVariant.greenapple.name,
                     Values.DarkThemeVariant.midnightdusk.name,
                     Values.DarkThemeVariant.amoled.name,
                     Values.DarkThemeVariant.hotpink.name
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 18cfbddbbb..3eed70bdae 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -46,6 +46,12 @@
     <color name="dialogDark">@color/colorDarkPrimary</color>
     <color name="selectorColorDark">@color/md_blue_A200_50</color>
 
+    <!-- Green Apple Theme -->
+    <color name="colorAccentApple">#48E484</color>
+    <color name="colorOnSecondaryApple">@color/md_black_1000</color>
+    <color name="rippleSecondaryColorApple">#0A48E484</color>
+    <color name="selectorColorApple">#8048E484</color>
+
     <!-- Midnight Dusk Theme -->
     <color name="colorAccentDusk">#F02475</color>
     <color name="textColorPrimaryDusk">@color/md_white_1000</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cc83ff7cc7..a0444d8991 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -160,6 +160,7 @@
     <string name="pref_theme_dark">Dark theme</string>
     <string name="theme_dark_default">Default</string>
     <string name="theme_dark_blue">Dark Blue</string>
+    <string name="theme_dark_greenapple">Green Apple</string>
     <string name="theme_dark_midnightdusk">Midnight Dusk</string>
     <string name="theme_dark_amoled">AMOLED Black</string>
     <string name="theme_dark_amoled_hotpink">Hot Pink</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 959d37aa62..ff0a008e03 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -248,6 +248,21 @@
         <item name="rippleToolbarColor">@color/md_black_1000_12</item>
     </style>
 
+    <!--== Green Apple theme ==-->
+    <style name="Theme.Tachiyomi.Dark.GreenApple">
+        <!-- Theme colors -->
+        <item name="colorAccentOnPrimary">@color/colorAccentApple</item>
+        <item name="colorSecondary">@color/colorAccentApple</item>
+        <item name="colorOnSecondary">@color/colorOnSecondaryApple</item>
+        <item name="colorAccent">@color/colorAccentApple</item>
+
+        <!-- Ripples -->
+        <item name="rippleSecondaryColor">@color/rippleSecondaryColorApple</item>
+
+        <!-- Custom Attributes-->
+        <item name="colorLibrarySelectionActive">@color/selectorColorApple</item>
+    </style>
+
     <!--== Midnight Dusk theme ==-->
     <style name="Theme.Tachiyomi.Dark.MidnightDusk" parent="Theme.Base.Dark">
         <!-- Theme colors -->