From b7547a84585c8c58e64d17a3374ee7ae47900015 Mon Sep 17 00:00:00 2001
From: Soitora <simon.mattila@protonmail.com>
Date: Sun, 11 Jul 2021 21:45:42 +0200
Subject: [PATCH] Optimize the Green Apple theme variant (#5530)

---
 app/src/main/res/values-night/colors.xml |  5 +++++
 app/src/main/res/values-night/themes.xml | 10 ----------
 app/src/main/res/values/colors.xml       |  6 +++---
 app/src/main/res/values/themes.xml       |  4 ++--
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 892e0febf7..a1b1e56215 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -9,6 +9,11 @@
     <color name="background_default">#202125</color>
     <color name="ripple_colored_default">#1F3399FF</color>
 
+    <!-- Green Apple Theme -->
+    <color name="accent_greenapple">#48E484</color>
+    <color name="color_on_primary_greenapple">@color/md_black_1000</color>
+    <color name="ripple_colored_greenapple">#1F48E484</color>
+
     <!-- Yin Yang Theme -->
     <color name="accent_yinyang">#FFFFFF</color>
     <color name="color_on_secondary_yinyang">#000000</color>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 58a9aa2c68..3148c1ce75 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -19,14 +19,4 @@
         <item name="android:colorBackground">@color/background_midnightdusk</item>
     </style>
 
-    <!--== Green Apple theme ==-->
-    <style name="Theme.Tachiyomi.GreenApple">
-        <!-- Theme colors -->
-        <item name="colorPrimary">@color/accent_greenapple</item>
-        <item name="colorOnPrimary">@color/md_black_1000</item>
-        <item name="colorTertiary">@color/md_blue_A400</item>
-        <item name="colorControlHighlight">@color/ripple_colored_greenapple</item>
-        <item name="lightSystemBarsOnPrimary">true</item>
-    </style>
-
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 42fc625e80..9a63f1d2c5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,9 +22,9 @@
     <color name="ripple_colored_yotsuba">#1FFC8C5C</color>
 
     <!-- Green Apple Theme -->
-    <color name="accent_greenapple">#48E484</color>
-    <color name="accent_greenapple_variant">#188140</color>
-    <color name="ripple_colored_greenapple">#1F48E484</color>
+    <color name="accent_greenapple">#188140</color>
+    <color name="color_on_primary_greenapple">@color/md_white_1000</color>
+    <color name="ripple_colored_greenapple">#1F188140</color>
 
     <!-- Yin Yang Theme -->
     <color name="accent_yinyang">#000000</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 851ad462e8..aaf2deb788 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -104,8 +104,8 @@
     <!--== Green Apple theme ==-->
     <style name="Theme.Tachiyomi.GreenApple">
         <!-- Theme colors -->
-        <item name="colorPrimary">@color/accent_greenapple_variant</item>
-        <item name="colorOnPrimary">@color/md_white_1000</item>
+        <item name="colorPrimary">@color/accent_greenapple</item>
+        <item name="colorOnPrimary">@color/color_on_primary_greenapple</item>
         <item name="colorTertiary">@color/md_blue_A400</item>
         <item name="colorControlHighlight">@color/ripple_colored_greenapple</item>
         <item name="lightSystemBarsOnPrimary">true</item>