mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-12-22 19:41:50 +01:00
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>
This commit is contained in:
parent
e76e903060
commit
4af13e3536
@ -25,6 +25,7 @@ object PreferenceValues {
|
|||||||
enum class DarkThemeVariant {
|
enum class DarkThemeVariant {
|
||||||
default,
|
default,
|
||||||
blue,
|
blue,
|
||||||
|
greenapple,
|
||||||
midnightdusk,
|
midnightdusk,
|
||||||
amoled,
|
amoled,
|
||||||
hotpink,
|
hotpink,
|
||||||
|
@ -25,6 +25,7 @@ abstract class BaseThemedActivity : AppCompatActivity() {
|
|||||||
when (preferences.themeDark().get()) {
|
when (preferences.themeDark().get()) {
|
||||||
DarkThemeVariant.default -> R.style.Theme_Tachiyomi_Dark
|
DarkThemeVariant.default -> R.style.Theme_Tachiyomi_Dark
|
||||||
DarkThemeVariant.blue -> R.style.Theme_Tachiyomi_Dark_Blue
|
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.midnightdusk -> R.style.Theme_Tachiyomi_Dark_MidnightDusk
|
||||||
DarkThemeVariant.amoled -> R.style.Theme_Tachiyomi_Amoled
|
DarkThemeVariant.amoled -> R.style.Theme_Tachiyomi_Amoled
|
||||||
DarkThemeVariant.hotpink -> R.style.Theme_Tachiyomi_Amoled_HotPink
|
DarkThemeVariant.hotpink -> R.style.Theme_Tachiyomi_Amoled_HotPink
|
||||||
|
@ -143,6 +143,7 @@ class SettingsGeneralController : SettingsController() {
|
|||||||
entriesRes = arrayOf(
|
entriesRes = arrayOf(
|
||||||
R.string.theme_dark_default,
|
R.string.theme_dark_default,
|
||||||
R.string.theme_dark_blue,
|
R.string.theme_dark_blue,
|
||||||
|
R.string.theme_dark_greenapple,
|
||||||
R.string.theme_dark_midnightdusk,
|
R.string.theme_dark_midnightdusk,
|
||||||
R.string.theme_dark_amoled,
|
R.string.theme_dark_amoled,
|
||||||
R.string.theme_dark_amoled_hotpink
|
R.string.theme_dark_amoled_hotpink
|
||||||
@ -150,6 +151,7 @@ class SettingsGeneralController : SettingsController() {
|
|||||||
entryValues = arrayOf(
|
entryValues = arrayOf(
|
||||||
Values.DarkThemeVariant.default.name,
|
Values.DarkThemeVariant.default.name,
|
||||||
Values.DarkThemeVariant.blue.name,
|
Values.DarkThemeVariant.blue.name,
|
||||||
|
Values.DarkThemeVariant.greenapple.name,
|
||||||
Values.DarkThemeVariant.midnightdusk.name,
|
Values.DarkThemeVariant.midnightdusk.name,
|
||||||
Values.DarkThemeVariant.amoled.name,
|
Values.DarkThemeVariant.amoled.name,
|
||||||
Values.DarkThemeVariant.hotpink.name
|
Values.DarkThemeVariant.hotpink.name
|
||||||
|
@ -46,6 +46,12 @@
|
|||||||
<color name="dialogDark">@color/colorDarkPrimary</color>
|
<color name="dialogDark">@color/colorDarkPrimary</color>
|
||||||
<color name="selectorColorDark">@color/md_blue_A200_50</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 -->
|
<!-- Midnight Dusk Theme -->
|
||||||
<color name="colorAccentDusk">#F02475</color>
|
<color name="colorAccentDusk">#F02475</color>
|
||||||
<color name="textColorPrimaryDusk">@color/md_white_1000</color>
|
<color name="textColorPrimaryDusk">@color/md_white_1000</color>
|
||||||
|
@ -160,6 +160,7 @@
|
|||||||
<string name="pref_theme_dark">Dark theme</string>
|
<string name="pref_theme_dark">Dark theme</string>
|
||||||
<string name="theme_dark_default">Default</string>
|
<string name="theme_dark_default">Default</string>
|
||||||
<string name="theme_dark_blue">Dark Blue</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_midnightdusk">Midnight Dusk</string>
|
||||||
<string name="theme_dark_amoled">AMOLED Black</string>
|
<string name="theme_dark_amoled">AMOLED Black</string>
|
||||||
<string name="theme_dark_amoled_hotpink">Hot Pink</string>
|
<string name="theme_dark_amoled_hotpink">Hot Pink</string>
|
||||||
|
@ -248,6 +248,21 @@
|
|||||||
<item name="rippleToolbarColor">@color/md_black_1000_12</item>
|
<item name="rippleToolbarColor">@color/md_black_1000_12</item>
|
||||||
</style>
|
</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 ==-->
|
<!--== Midnight Dusk theme ==-->
|
||||||
<style name="Theme.Tachiyomi.Dark.MidnightDusk" parent="Theme.Base.Dark">
|
<style name="Theme.Tachiyomi.Dark.MidnightDusk" parent="Theme.Base.Dark">
|
||||||
<!-- Theme colors -->
|
<!-- Theme colors -->
|
||||||
|
Loading…
Reference in New Issue
Block a user