mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-11-20 04:49:15 +01:00
Adding Strawberry Daiquiri and Yotsuba
These requests come at a price Soi Co-Authored-By: Zakhar Timoshenko <61558546+ztimms73@users.noreply.github.com> Co-Authored-By: Soitora <simon.mattila@protonmail.com>
This commit is contained in:
parent
f7c08e9957
commit
ea4c41988c
@ -33,6 +33,11 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
|
|||||||
AppCompatDelegate.MODE_NIGHT_YES,
|
AppCompatDelegate.MODE_NIGHT_YES,
|
||||||
R.string.amoled_black
|
R.string.amoled_black
|
||||||
),
|
),
|
||||||
|
STRAWBERRY_DAIQUIRI(
|
||||||
|
R.style.Theme_Tachiyomi_StrawberryDaiquiri,
|
||||||
|
AppCompatDelegate.MODE_NIGHT_NO,
|
||||||
|
R.string.strawberry_daiquiri
|
||||||
|
),
|
||||||
BLACK_N_RED(
|
BLACK_N_RED(
|
||||||
R.style.Theme_Tachiyomi_BlackAndRed,
|
R.style.Theme_Tachiyomi_BlackAndRed,
|
||||||
AppCompatDelegate.MODE_NIGHT_YES,
|
AppCompatDelegate.MODE_NIGHT_YES,
|
||||||
@ -43,6 +48,11 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
|
|||||||
AppCompatDelegate.MODE_NIGHT_YES,
|
AppCompatDelegate.MODE_NIGHT_YES,
|
||||||
R.string.hot_pink
|
R.string.hot_pink
|
||||||
),
|
),
|
||||||
|
YOTSUBA(
|
||||||
|
R.style.Theme_Tachiyomi_Yotsuba,
|
||||||
|
AppCompatDelegate.MODE_NIGHT_NO,
|
||||||
|
R.string.yotsuba
|
||||||
|
),
|
||||||
LIGHT_BLUE(
|
LIGHT_BLUE(
|
||||||
R.style.Theme_Tachiyomi_AllBlue,
|
R.style.Theme_Tachiyomi_AllBlue,
|
||||||
AppCompatDelegate.MODE_NIGHT_NO,
|
AppCompatDelegate.MODE_NIGHT_NO,
|
||||||
@ -140,6 +150,8 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
|
|||||||
val lightAccent: Int = Color.parseColor(
|
val lightAccent: Int = Color.parseColor(
|
||||||
when (styleRes) {
|
when (styleRes) {
|
||||||
R.style.Theme_Tachiyomi_MidnightDusk -> "#c43c97"
|
R.style.Theme_Tachiyomi_MidnightDusk -> "#c43c97"
|
||||||
|
R.style.Theme_Tachiyomi_StrawberryDaiquiri -> "#ED4A65"
|
||||||
|
R.style.Theme_Tachiyomi_Yotsuba -> "#FC8C5C"
|
||||||
else -> "#2979FF"
|
else -> "#2979FF"
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
@ -92,4 +92,12 @@
|
|||||||
<color name="colorAccentLimeText">#2C2D32</color>
|
<color name="colorAccentLimeText">#2C2D32</color>
|
||||||
<color name="dialogLime">#282A2E</color>
|
<color name="dialogLime">#282A2E</color>
|
||||||
<color name="colorOnLime">#2C2D32</color>
|
<color name="colorOnLime">#2C2D32</color>
|
||||||
|
|
||||||
|
<!-- Strawberry Daiquiri Theme -->
|
||||||
|
<color name="colorAccentStrawberry">#ED4A65</color>
|
||||||
|
<color name="colorAccentStrawberryText">#b62e45</color>
|
||||||
|
|
||||||
|
<!-- Yotsuba Theme -->
|
||||||
|
<color name="colorAccentYotsuba">#FC8C5C</color>
|
||||||
|
<color name="colorAccentYotsubaText">#d35b27</color>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -610,6 +610,8 @@
|
|||||||
<string name="dark_blue">Dark Blue</string>
|
<string name="dark_blue">Dark Blue</string>
|
||||||
<string name="midnight_dusk">Midnight Dusk</string>
|
<string name="midnight_dusk">Midnight Dusk</string>
|
||||||
<string name="spring_blossom">Spring Blossom</string>
|
<string name="spring_blossom">Spring Blossom</string>
|
||||||
|
<string name="strawberry_daiquiri">Strawberry Daiquiri</string>
|
||||||
|
<string name="yotsuba">Yotsuba</string>
|
||||||
<string name="black_and_red">Black \'n\' Red</string>
|
<string name="black_and_red">Black \'n\' Red</string>
|
||||||
<string name="hot_pink">Hot Pink</string>
|
<string name="hot_pink">Hot Pink</string>
|
||||||
<string name="flat_lime">Flat Lime</string>
|
<string name="flat_lime">Flat Lime</string>
|
||||||
|
@ -84,6 +84,15 @@
|
|||||||
<item name="android:colorBackground">@color/backgroundDuskDawn</item>
|
<item name="android:colorBackground">@color/backgroundDuskDawn</item>
|
||||||
<item name="actionBarTintColor">@color/appBarTextDuskDawn</item>
|
<item name="actionBarTintColor">@color/appBarTextDuskDawn</item>
|
||||||
</style>
|
</style>
|
||||||
|
<style name="Theme.Tachiyomi.StrawberryDaiquiri">
|
||||||
|
<item name="colorAccent">@color/colorAccentStrawberry</item>
|
||||||
|
<item name="colorAccentText">@color/colorAccentStrawberryText</item>
|
||||||
|
</style>
|
||||||
|
<style name="Theme.Tachiyomi.Yotsuba">
|
||||||
|
<item name="colorAccent">@color/colorAccentYotsuba</item>
|
||||||
|
<item name="colorAccentText">@color/colorAccentYotsubaText</item>
|
||||||
|
</style>
|
||||||
|
<style name="Theme.Tachiyomi.Monet"/>
|
||||||
|
|
||||||
<!--===============-->
|
<!--===============-->
|
||||||
<!-- Launch Screen -->
|
<!-- Launch Screen -->
|
||||||
|
Loading…
Reference in New Issue
Block a user