mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-11-29 09:39:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'tachiyomiorg:master' into master

Browse source
This commit is contained in:
jmir1 2021-07-08 17:32:29 +02:00 committed by GitHub
commit 2b1d2f1400
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
View file

@ -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
app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
View file

@ -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
app/src/main/res/values-night/colors.xml
View file

@ -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
app/src/main/res/values/colors.xml
View file

@ -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
app/src/main/res/values/strings.xml
View file

@ -176,6 +176,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
app/src/main/res/values/themes.xml
View file

@ -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 -->