Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Themes #1130

Closed
wants to merge 1 commit into from
Closed

Themes #1130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/src/main/java/eu/kanade/domain/ui/model/AppTheme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ import eu.kanade.tachiyomi.R
enum class AppTheme(val titleResId: Int?) {
DEFAULT(R.string.label_default),
MONET(R.string.theme_monet),
COTTONCANDY(R.string.theme_cottoncandy),
GREEN_APPLE(R.string.theme_greenapple),
LAVENDER(R.string.theme_lavender),
MIDNIGHT_DUSK(R.string.theme_midnightdusk),
MOCHA(R.string.theme_mocha),
STRAWBERRY_DAIQUIRI(R.string.theme_strawberrydaiquiri),
TAKO(R.string.theme_tako),
TEALTURQUOISE(R.string.theme_tealturquoise),
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/ThemingDelegate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ interface ThemingDelegate {
AppTheme.MONET -> {
resIds += R.style.Theme_Tachiyomi_Monet
}
AppTheme.COTTONCANDY -> {
resIds += R.style.Theme_Tachiyomi_CottonCandy
}
AppTheme.GREEN_APPLE -> {
resIds += R.style.Theme_Tachiyomi_GreenApple
}
Expand All @@ -26,6 +29,9 @@ interface ThemingDelegate {
AppTheme.MIDNIGHT_DUSK -> {
resIds += R.style.Theme_Tachiyomi_MidnightDusk
}
AppTheme.MOCHA -> {
resIds += R.style.Theme_Tachiyomi_Mocha
}
AppTheme.STRAWBERRY_DAIQUIRI -> {
resIds += R.style.Theme_Tachiyomi_StrawberryDaiquiri
}
Expand Down
27 changes: 27 additions & 0 deletions app/src/main/res/values-night/colors_cottoncandy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>

<resources>
<color name="cottoncandy_primary">#FFB1C1</color>
<color name="cottoncandy_onPrimary">#5F112B</color>
<color name="cottoncandy_primaryContainer">#7C2941</color>
<color name="cottoncandy_onPrimaryContainer">#FFD9DF</color>
<color name="cottoncandy_secondary">#64D3FF</color>
<color name="cottoncandy_onSecondary">#003546</color>
<color name="cottoncandy_secondaryContainer">#004D63</color>
<color name="cottoncandy_onSecondaryContainer">#BCE9FF</color>
<color name="cottoncandy_tertiary">#FFB1C1</color>
<color name="cottoncandy_tertiaryContainer">#7C2941</color>
<color name="cottoncandy_onTertiaryContainer">#FFD9DF</color>
<color name="cottoncandy_background">#201A1B</color>
<color name="cottoncandy_onBackground">#ECE0E0</color>
<color name="cottoncandy_surface">#201A1B</color>
<color name="cottoncandy_onSurface">#ECE0E0</color>
<color name="cottoncandy_surfaceVariant">#524345</color>
<color name="cottoncandy_onSurfaceVariant">#D6C2C4</color>
<color name="cottoncandy_outline">#9F8C8F</color>
<color name="cottoncandy_inverseOnSurface">#201A1B</color>
<color name="cottoncandy_inverseSurface">#ECE0E0</color>
<color name="cottoncandy_primaryInverse">#9A4058</color>
<color name="cottoncandy_elevationOverlay">@color/cottoncandy_primary</color>
</resources>

36 changes: 36 additions & 0 deletions app/src/main/res/values-night/colors_mocha.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Colors for Mocha theme
~ Original color scheme by farnsie
~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
~
~ Key colors:
~ Primary #ebc248
~ Secondary #ebc248
~ Tertiary #adcfad
~ Neutral #998e8e
-->
<resources>
<color name="mocha_primary">#ebc248</color>
<color name="mocha_onPrimary">#3d2f00</color>
<color name="mocha_primaryContainer">#584400</color>
<color name="mocha_onPrimaryContainer">#ffe08d</color>
<color name="mocha_secondary">#ebc248</color>
<color name="mocha_onSecondary">#3d2f00</color>
<color name="mocha_secondaryContainer">#584400</color>
<color name="mocha_onSecondaryContainer">#ffe08d</color>
<color name="mocha_tertiary">#adcfad</color>
<color name="mocha_onTertiary">#19361f</color>
<color name="mocha_tertiaryContainer">#304d34</color>
<color name="mocha_onTertiaryContainer">#c9ecc8</color>
<color name="mocha_background">#1e1b16</color>
<color name="mocha_onBackground">#e8e1d9</color>
<color name="mocha_surface">#1e1b16</color>
<color name="mocha_onSurface">#e8e1d9</color>
<color name="mocha_surfaceVariant">#4c4639</color>
<color name="mocha_onSurfaceVariant">#cfc5b4</color>
<color name="mocha_outline">#989080</color>
<color name="mocha_inverseOnSurface">#211A18</color>
<color name="mocha_inverseSurface">#EDE0DD</color>
<color name="mocha_primaryInverse">#AE3200</color>
</resources>
28 changes: 28 additions & 0 deletions app/src/main/res/values/colors_cottoncandy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>

<resources>
<color name="cottoncandy_primary">#9A4058</color>
<color name="cottoncandy_onPrimary">#FFFFFF</color>
<color name="cottoncandy_primaryContainer">#FFD9DF</color>
<color name="cottoncandy_onPrimaryContainer">#3F0017</color>
<color name="cottoncandy_secondary">#5bcefa</color>
<color name="cottoncandy_onSecondary">#FFFFFF</color>
<color name="cottoncandy_secondaryContainer">#BCE9FF</color>
<color name="cottoncandy_onSecondaryContainer">#001F2A</color>
<color name="cottoncandy_tertiary">#9A4058</color>
<color name="cottoncandy_onTertiary">#FFFFFF</color>
<color name="cottoncandy_tertiaryContainer">#FFD9DF</color>
<color name="cottoncandy_onTertiaryContainer">#3F0017</color>
<color name="cottoncandy_background">#FFFBFF</color>
<color name="cottoncandy_onBackground">#201A1B</color>
<color name="cottoncandy_surface">#FFFBFF</color>
<color name="cottoncandy_onSurface">#201A1B</color>
<color name="cottoncandy_surfaceVariant">#F3DDE0</color>
<color name="cottoncandy_onSurfaceVariant">#524345</color>
<color name="cottoncandy_outline">#847375</color>
<color name="cottoncandy_inverseOnSurface">#FAEEEF</color>
<color name="cottoncandy_inverseSurface">#352F30</color>
<color name="cottoncandy_primaryInverse">#FFB1C1</color>
<color name="cottoncandy_elevationOverlay">@color/cottoncandy_primary</color>
</resources>

36 changes: 36 additions & 0 deletions app/src/main/res/values/colors_mocha.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Colors for Mocha theme
~ Original color scheme by farnsie
~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
~
~ Key colors:
~ Primary #745b00
~ Secondary #745b00
~ Tertiary #47664a
~ Neutral #998e8e
-->
<resources>
<color name="mocha_primary">#745b00</color>
<color name="mocha_onPrimary">#ffffff</color>
<color name="mocha_primaryContainer">#ffe08d</color>
<color name="mocha_onPrimaryContainer">#241a00</color>
<color name="mocha_secondary">#745b00</color>
<color name="mocha_onSecondary">#ffffff</color>
<color name="mocha_secondaryContainer">#ffe08d</color>
<color name="mocha_onSecondaryContainer">#241a00</color>
<color name="mocha_tertiary">#47664a</color>
<color name="mocha_onTertiary">#ffffff</color>
<color name="mocha_tertiaryContainer">#c9ecc8</color>
<color name="mocha_onTertiaryContainer">#04210b</color>
<color name="mocha_background">#fffbff</color>
<color name="mocha_onBackground">#1e1b16</color>
<color name="mocha_surface">#fffbff</color>
<color name="mocha_onSurface">#1e1b16</color>
<color name="mocha_surfaceVariant">#ebe1cf</color>
<color name="mocha_onSurfaceVariant">#4c4639</color>
<color name="mocha_outline">#7e7667</color>
<color name="mocha_inverseOnSurface">#FBEEEB</color>
<color name="mocha_inverseSurface">#362F2D</color>
<color name="mocha_primaryInverse">#FFB59D</color>
</resources>
54 changes: 54 additions & 0 deletions app/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,33 @@
<!-- Monet theme only support S+ -->
<style name="Theme.Tachiyomi.Monet" />

<!--== Cotton Candy Theme ==-->
<style name="Theme.Tachiyomi.CottonCandy">
<!-- Theme Colors -->
<item name="colorPrimary">@color/cottoncandy_primary</item>
<item name="colorOnPrimary">@color/cottoncandy_onPrimary</item>
<item name="colorPrimaryContainer">@color/cottoncandy_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/cottoncandy_onPrimaryContainer</item>
<item name="colorSecondary">@color/cottoncandy_secondary</item>
<item name="colorOnSecondary">@color/cottoncandy_onSecondary</item>
<item name="colorSecondaryContainer">@color/cottoncandy_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/cottoncandy_onSecondaryContainer</item>
<item name="colorTertiary">@color/cottoncandy_tertiary</item>
<item name="colorOnTertiary">@color/cottoncandy_onTertiary</item>
<item name="colorTertiaryContainer">@color/cottoncandy_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/cottoncandy_onTertiaryContainer</item>
<item name="android:colorBackground">@color/cottoncandy_background</item>
<item name="colorOnBackground">@color/cottoncandy_onBackground</item>
<item name="colorSurface">@color/cottoncandy_surface</item>
<item name="colorOnSurface">@color/cottoncandy_onSurface</item>
<item name="colorSurfaceVariant">@color/cottoncandy_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/cottoncandy_onSurfaceVariant</item>
<item name="colorOutline">@color/cottoncandy_outline</item>
<item name="colorOnSurfaceInverse">@color/cottoncandy_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/cottoncandy_inverseSurface</item>
<item name="colorPrimaryInverse">@color/cottoncandy_primaryInverse</item>
</style>

<!--== Green Apple Theme ==-->
<style name="Theme.Tachiyomi.GreenApple">
<!-- Theme Colors -->
Expand Down Expand Up @@ -171,6 +198,33 @@
<item name="elevationOverlayColor">@color/midnightdusk_elevationOverlay</item>
</style>

<!--== Mocha Theme ==-->
<style name="Theme.Tachiyomi.mocha">
<!-- Theme Colors -->
<item name="colorPrimary">@color/mocha_primary</item>
<item name="colorOnPrimary">@color/mocha_onPrimary</item>
<item name="colorPrimaryContainer">@color/mocha_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/mocha_onPrimaryContainer</item>
<item name="colorSecondary">@color/mocha_secondary</item>
<item name="colorOnSecondary">@color/mocha_onSecondary</item>
<item name="colorSecondaryContainer">@color/mocha_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/mocha_onSecondaryContainer</item>
<item name="colorTertiary">@color/mocha_tertiary</item>
<item name="colorOnTertiary">@color/mocha_onTertiary</item>
<item name="colorTertiaryContainer">@color/mocha_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/mocha_onTertiaryContainer</item>
<item name="android:colorBackground">@color/mocha_background</item>
<item name="colorOnBackground">@color/mocha_onBackground</item>
<item name="colorSurface">@color/mocha_surface</item>
<item name="colorOnSurface">@color/mocha_onSurface</item>
<item name="colorSurfaceVariant">@color/mocha_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/mocha_onSurfaceVariant</item>
<item name="colorOutline">@color/mocha_outline</item>
<item name="colorOnSurfaceInverse">@color/mocha_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/mocha_inverseSurface</item>
<item name="colorPrimaryInverse">@color/mocha_primaryInverse</item>
</style>

<!--== Strawberry Daiquiri Theme ==-->
<style name="Theme.Tachiyomi.StrawberryDaiquiri">
<!-- Theme Colors -->
Expand Down
3 changes: 3 additions & 0 deletions i18n/src/main/res/values/strings-aniyomi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,4 +286,7 @@
<string name="label_migration_anime">Migrate Anime</string>
<string name="settings">Settings</string>
<string name="extension_settings">Extension settings</string>
<!-- Themes -->
<string name="theme_cottoncandy">Cotton Candy</string>
<string name="theme_mocha">Mocha</string>
</resources>
Loading