Преглед на файлове

add Yin Yang Theme (#5508)

* add Yin Yang Theme

* change download badge color to yin yang as well

* update string

* fix &
Riztard Lanthorn преди 3 години
родител
ревизия
d9ea621e54

+ 1 - 0
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt

@@ -28,6 +28,7 @@ object PreferenceValues {
         MIDNIGHT_DUSK(R.string.theme_midnightdusk),
         STRAWBERRY_DAIQUIRI(R.string.theme_strawberrydaiquiri),
         YOTSUBA(R.string.theme_yotsuba),
+        YINYANG(R.string.theme_yinyang),
 
         // Deprecated
         DARK_BLUE(null),

+ 3 - 0
app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt

@@ -56,6 +56,9 @@ abstract class BaseThemedActivity : AppCompatActivity() {
                 PreferenceValues.AppTheme.YOTSUBA -> {
                     resIds += R.style.Theme_Tachiyomi_Yotsuba
                 }
+                PreferenceValues.AppTheme.YINYANG -> {
+                    resIds += R.style.Theme_Tachiyomi_YinYang
+                }
                 else -> {
                     resIds += R.style.Theme_Tachiyomi
                 }

+ 6 - 0
app/src/main/res/values-night/colors.xml

@@ -2,9 +2,15 @@
 <resources>
     <color name="splash">@color/background_default</color>
 
+    <!-- Default Theme -->
     <color name="accent_default">#3399FF</color>
     <color name="divider_default">@color/md_white_1000_12</color>
     <color name="surface_default">#242529</color>
     <color name="background_default">#202125</color>
     <color name="ripple_colored_default">#1F3399FF</color>
+
+    <!-- Yin Yang Theme -->
+    <color name="accent_yinyang">#FFFFFF</color>
+    <color name="color_on_secondary_yinyang">#000000</color>
+    <color name="ripple_colored_yinyang">#777777</color>
 </resources>

+ 5 - 0
app/src/main/res/values/colors.xml

@@ -25,6 +25,11 @@
     <color name="accent_greenapple">#48E484</color>
     <color name="ripple_colored_greenapple">#1F48E484</color>
 
+    <!-- Yin Yang Theme -->
+    <color name="accent_yinyang">#000000</color>
+    <color name="color_on_secondary_yinyang">#FFFFFF</color>
+    <color name="ripple_colored_yinyang">#999999</color>
+
     <!-- Midnight Dusk Theme -->
     <color name="accent_midnightdusk">#F02475</color>
     <color name="background_midnightdusk">#16151D</color>

+ 1 - 0
app/src/main/res/values/strings.xml

@@ -152,6 +152,7 @@
     <string name="theme_yotsuba">Yotsuba</string>
     <string name="theme_blue">Blue</string>
     <string name="theme_greenapple">Green Apple</string>
+    <string name="theme_yinyang">Yin &amp; Yang</string>
     <string name="theme_midnightdusk">Midnight Dusk</string>
     <string name="pref_dark_theme_pure_black">Pure black dark mode</string>
     <string name="pref_start_screen">Start screen</string>

+ 10 - 0
app/src/main/res/values/themes.xml

@@ -111,6 +111,16 @@
         <item name="lightSystemBarsOnPrimary">true</item>
     </style>
 
+    <!--== Yin Yang theme ==-->
+    <style name="Theme.Tachiyomi.YinYang">
+        <!-- Theme colors -->
+        <item name="colorPrimary">@color/accent_yinyang</item>
+        <item name="colorOnSecondary">@color/color_on_secondary_yinyang</item>
+        <item name="colorTertiary">@color/color_on_secondary_yinyang</item>
+        <item name="colorOnTertiary">@color/accent_yinyang</item>
+        <item name="colorControlHighlight">@color/ripple_colored_yinyang</item>
+    </style>
+
     <!--== Midnight Dusk theme ==-->
     <style name="Theme.Tachiyomi.MidnightDusk">
         <!-- Theme colors -->