Added "Tako" theme (#5546)

* Added "Ninomae" theme

Based on the lovely Ninomae Ina'nis, for Arkon and Flat

* Use updated colors from Ghostbear

Adapted after feedback

Co-Authored-By: Andreas <6576096+ghostbear@users.noreply.github.com>

* Tweak the Ninomae theme further

* Sort themes alphabetically

- Sorts themes alphabetically.
- Use the same capital word system in colors.xml for themes.xml as well.
- Rename AMOLED theme to AMOLED mode in theme.xml and color.xml references.

* More tweaks

* Style incognito bar

Uses a dark purple which looks super clean instead of a washed out gray

This sets the groundwork for other themes too

* Tweak final onPrimary color

* Rename Ninomae to Tako

RIP

Co-authored-by: Andreas <6576096+ghostbear@users.noreply.github.com>
This commit is contained in:
Soitora
2021-07-15 14:46:30 +02:00
committed by GitHub
parent b7c2890250
commit 0d62aedfbb
11 changed files with 122 additions and 68 deletions

View File

@@ -5,12 +5,12 @@
<!-- Base Theme -->
<!--============-->
<!--== Theme base ==-->
<!--== Theme Base ==-->
<style name="Base.Theme.Tachiyomi" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Disallow "Force dark theme" -->
<item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
<!-- Theme colors -->
<!-- Theme Colors -->
<item name="colorPrimary">@color/accent_default</item>
<item name="colorPrimaryVariant">?attr/colorPrimary</item>
<item name="colorOnPrimary">@color/md_white_1000</item>
@@ -30,7 +30,7 @@
<item name="colorControlHighlight">@color/ripple_colored_default</item>
<item name="rippleColorToolbar">?attr/colorControlHighlight</item>
<!-- Handles RTL text -->
<!-- Handles RTL Text -->
<item name="android:textAlignment">gravity</item>
<item name="android:textDirection">locale</item>
@@ -53,6 +53,7 @@
<item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
<item name="incognitoBackgroundColor">@color/md_grey_800</item>
<item name="chipStyle">@style/Widget.Tachiyomi.Chip.Action</item>
<item name="chipTextColor">?android:attr/textColorPrimary</item>
<item name="chipBackgroundColor">?attr/colorControlHighlight</item>
@@ -71,33 +72,19 @@
<item name="colorFilterActive">@color/filter_light</item>
</style>
<!--== Default Theme ==-->
<style name="Theme.Tachiyomi" parent="Base.Theme.Tachiyomi" />
<!--== Blue Theme ==-->
<style name="Theme.Tachiyomi.Blue">
<!-- Theme colors -->
<!-- Theme Colors -->
<item name="colorPrimary">@color/accent_blue</item>
<item name="colorControlHighlight">@color/ripple_colored_blue</item>
</style>
<!--== Strawberry Daiquiri theme ==-->
<style name="Theme.Tachiyomi.StrawberryDaiquiri">
<!-- Theme colors -->
<item name="colorPrimary">@color/accent_strawberry</item>
<item name="colorTertiary">@color/md_blue_A400</item>
<item name="colorControlHighlight">@color/ripple_colored_strawberry</item>
</style>
<!--== Yotsuba theme ==-->
<style name="Theme.Tachiyomi.Yotsuba">
<!-- Theme colors -->
<item name="colorPrimary">@color/accent_yotsuba</item>
<item name="colorTertiary">@color/md_blue_A400</item>
<item name="colorControlHighlight">@color/ripple_colored_yotsuba</item>
</style>
<!--== Green Apple theme ==-->
<!--== Green Apple Theme ==-->
<style name="Theme.Tachiyomi.GreenApple">
<!-- Theme colors -->
<!-- Theme Colors -->
<item name="colorPrimary">@color/accent_greenapple</item>
<item name="colorOnPrimary">@color/color_on_primary_greenapple</item>
<item name="colorTertiary">@color/md_blue_A400</item>
@@ -105,9 +92,43 @@
<item name="lightSystemBarsOnPrimary">true</item>
</style>
<!--== Yin Yang theme ==-->
<!--== Midnight Dusk Theme ==-->
<style name="Theme.Tachiyomi.MidnightDusk">
<!-- Theme Colors -->
<item name="colorPrimary">@color/accent_midnightdusk</item>
<item name="colorTertiary">@color/md_blue_A400</item>
<item name="colorControlHighlight">@color/ripple_colored_midnightdusk</item>
</style>
<!--== Strawberry Daiquiri Theme ==-->
<style name="Theme.Tachiyomi.StrawberryDaiquiri">
<!-- Theme Colors -->
<item name="colorPrimary">@color/accent_strawberry</item>
<item name="colorTertiary">@color/md_blue_A400</item>
<item name="colorControlHighlight">@color/ripple_colored_strawberry</item>
</style>
<!--== Tako Theme ==-->
<style name="Theme.Tachiyomi.Tako">
<!-- Theme Colors -->
<item name="colorPrimary">@color/accent_tako</item>
<item name="colorOnPrimary">@color/color_on_primary_tako</item>
<item name="colorTertiary">@color/tertiary_tako</item>
<item name="colorOnTertiary">@color/color_on_tertiary_tako</item>
<item name="colorControlHighlight">@color/ripple_colored_tako</item>
<item name="colorSurface">@color/surface_tako</item>
<item name="android:colorBackground">@color/background_tako</item>
<!-- Themes -->
<item name="incognitoBackgroundColor">@color/incognito_background_tako</item>
<!-- Custom Attributes-->
<item name="colorFilterActive">@color/filter_tako</item>
</style>
<!--== Yin & Yang Theme ==-->
<style name="Theme.Tachiyomi.YinYang">
<!-- Theme colors -->
<!-- Theme Colors -->
<item name="colorPrimary">@color/accent_yinyang</item>
<item name="colorOnPrimary">@color/color_on_secondary_yinyang</item>
<item name="colorOnSecondary">@color/color_on_secondary_yinyang</item>
@@ -120,18 +141,18 @@
<item name="chipBackgroundColor">@color/accent_yinyang</item>
</style>
<!--== Midnight Dusk theme ==-->
<style name="Theme.Tachiyomi.MidnightDusk">
<!-- Theme colors -->
<item name="colorPrimary">@color/accent_midnightdusk</item>
<!--== Yotsuba Theme ==-->
<style name="Theme.Tachiyomi.Yotsuba">
<!-- Theme Colors -->
<item name="colorPrimary">@color/accent_yotsuba</item>
<item name="colorTertiary">@color/md_blue_A400</item>
<item name="colorControlHighlight">@color/ripple_colored_midnightdusk</item>
<item name="colorControlHighlight">@color/ripple_colored_yotsuba</item>
</style>
<!--== AMOLED theme overlay ==-->
<!--== AMOLED Mode Overlay ==-->
<style name="ThemeOverlay.Tachiyomi.Amoled" parent="" />
<!--== Colored bars (toolbar-navbar-navrail) theme overlay ==-->
<!--== Colored Bars (toolbar-navbar-navrail) Mode Overlay ==-->
<style name="ThemeOverlay.Tachiyomi.ColoredBars" parent="">
<item name="colorToolbar">?attr/colorPrimary</item>
<item name="colorOnToolbar">?attr/colorOnPrimary</item>
@@ -160,7 +181,7 @@
<!-- Launch Screen -->
<!--===============-->
<!--== Splash theme ==-->
<!--== Splash Theme ==-->
<style name="Theme.Splash" parent="Theme.Tachiyomi">
<item name="android:windowBackground">@drawable/splash_background</item>
<item name="android:statusBarColor">@android:color/transparent</item>