Optimize the Green Apple theme variant (#5530)

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>

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>

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>

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>