mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-11-20 04:29:18 +01:00
add Yin Yang Theme
Co-Authored-By: Riztard Lanthorn <16263232+Riztard@users.noreply.github.com>
This commit is contained in:
parent
248d57600c
commit
0ebdbe174f
@ -43,6 +43,16 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
|
|||||||
AppCompatDelegate.MODE_NIGHT_NO,
|
AppCompatDelegate.MODE_NIGHT_NO,
|
||||||
R.string.yotsuba
|
R.string.yotsuba
|
||||||
),
|
),
|
||||||
|
YANG(
|
||||||
|
R.style.Theme_Tachiyomi_YinYang,
|
||||||
|
AppCompatDelegate.MODE_NIGHT_NO,
|
||||||
|
R.string.yang
|
||||||
|
),
|
||||||
|
YIN(
|
||||||
|
R.style.Theme_Tachiyomi_YinYang,
|
||||||
|
AppCompatDelegate.MODE_NIGHT_YES,
|
||||||
|
R.string.yin
|
||||||
|
),
|
||||||
LIGHT_BLUE(
|
LIGHT_BLUE(
|
||||||
R.style.Theme_Tachiyomi_AllBlue,
|
R.style.Theme_Tachiyomi_AllBlue,
|
||||||
AppCompatDelegate.MODE_NIGHT_NO,
|
AppCompatDelegate.MODE_NIGHT_NO,
|
||||||
@ -142,6 +152,7 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
|
|||||||
@ColorInt
|
@ColorInt
|
||||||
val lightAccent: Int = Color.parseColor(
|
val lightAccent: Int = Color.parseColor(
|
||||||
when (styleRes) {
|
when (styleRes) {
|
||||||
|
R.style.Theme_Tachiyomi_YinYang -> "#000000"
|
||||||
R.style.Theme_Tachiyomi_MidnightDusk -> "#c43c97"
|
R.style.Theme_Tachiyomi_MidnightDusk -> "#c43c97"
|
||||||
R.style.Theme_Tachiyomi_StrawberryDaiquiri -> "#ED4A65"
|
R.style.Theme_Tachiyomi_StrawberryDaiquiri -> "#ED4A65"
|
||||||
R.style.Theme_Tachiyomi_Yotsuba -> "#dc6d3d"
|
R.style.Theme_Tachiyomi_Yotsuba -> "#dc6d3d"
|
||||||
@ -153,6 +164,7 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
|
|||||||
@ColorInt
|
@ColorInt
|
||||||
val darkAccent: Int = Color.parseColor(
|
val darkAccent: Int = Color.parseColor(
|
||||||
when (styleRes) {
|
when (styleRes) {
|
||||||
|
R.style.Theme_Tachiyomi_YinYang -> "#FFFFFF"
|
||||||
R.style.Theme_Tachiyomi_MidnightDusk -> "#F02475"
|
R.style.Theme_Tachiyomi_MidnightDusk -> "#F02475"
|
||||||
R.style.Theme_Tachiyomi_ChocolateStrawberries -> "#AA2200"
|
R.style.Theme_Tachiyomi_ChocolateStrawberries -> "#AA2200"
|
||||||
R.style.Theme_Tachiyomi_FlatLime -> "#4AF88A"
|
R.style.Theme_Tachiyomi_FlatLime -> "#4AF88A"
|
||||||
|
@ -187,7 +187,7 @@
|
|||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/checkbox"
|
android:id="@+id/checkbox"
|
||||||
android:background="@drawable/oval"
|
android:background="@drawable/oval"
|
||||||
android:backgroundTint="@android:color/white"
|
android:backgroundTint="?colorOnAccent"
|
||||||
android:layout_width="20dp"
|
android:layout_width="20dp"
|
||||||
android:layout_height="20dp"
|
android:layout_height="20dp"
|
||||||
android:contentDescription="@string/select_all"
|
android:contentDescription="@string/select_all"
|
||||||
|
@ -33,4 +33,8 @@
|
|||||||
<color name="textPrimaryDuskDawn">@color/md_white_1000</color>
|
<color name="textPrimaryDuskDawn">@color/md_white_1000</color>
|
||||||
<color name="appBarTextDuskDawn">@color/md_white_1000</color>
|
<color name="appBarTextDuskDawn">@color/md_white_1000</color>
|
||||||
|
|
||||||
|
<!-- Yin Yang Theme -->
|
||||||
|
<color name="colorAccentYinyang">#FFFFFF</color>
|
||||||
|
<color name="colorAccentYinyangText">#999999</color>
|
||||||
|
<color name="colorOnAccentYinyang">@color/md_black_1000</color>
|
||||||
</resources>
|
</resources>
|
@ -99,4 +99,9 @@
|
|||||||
<!-- Yotsuba Theme -->
|
<!-- Yotsuba Theme -->
|
||||||
<color name="colorAccentYotsuba">#dc6d3d</color>
|
<color name="colorAccentYotsuba">#dc6d3d</color>
|
||||||
<color name="colorAccentYotsubaText">#9f431c</color>
|
<color name="colorAccentYotsubaText">#9f431c</color>
|
||||||
|
|
||||||
|
<!-- Yin Yang Theme -->
|
||||||
|
<color name="colorAccentYinyang">#000000</color>
|
||||||
|
<color name="colorAccentYinyangText">#777777</color>
|
||||||
|
<color name="colorOnAccentYinyang">@color/md_white_1000</color>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -620,6 +620,8 @@
|
|||||||
<string name="spring_blossom">Spring Blossom</string>
|
<string name="spring_blossom">Spring Blossom</string>
|
||||||
<string name="strawberry_daiquiri">Strawberry Daiquiri</string>
|
<string name="strawberry_daiquiri">Strawberry Daiquiri</string>
|
||||||
<string name="yotsuba">Yotsuba</string>
|
<string name="yotsuba">Yotsuba</string>
|
||||||
|
<string name="yin">Yin</string>
|
||||||
|
<string name="yang">Yang</string>
|
||||||
<string name="chocolate_strawberries">Chocolate Strawberries</string>
|
<string name="chocolate_strawberries">Chocolate Strawberries</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>
|
||||||
|
@ -99,6 +99,13 @@
|
|||||||
<item name="colorAccent">@color/colorAccentYotsuba</item>
|
<item name="colorAccent">@color/colorAccentYotsuba</item>
|
||||||
<item name="colorAccentText">@color/colorAccentYotsubaText</item>
|
<item name="colorAccentText">@color/colorAccentYotsubaText</item>
|
||||||
</style>
|
</style>
|
||||||
|
<!--== Yin Yang theme ==-->
|
||||||
|
<style name="Theme.Tachiyomi.YinYang">
|
||||||
|
<!-- Theme colors -->
|
||||||
|
<item name="colorAccent">@color/colorAccentYinyang</item>
|
||||||
|
<item name="colorAccentText">@color/colorAccentYinyangText</item>
|
||||||
|
<item name="colorOnAccent">@color/colorOnAccentYinyang</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<!--===============-->
|
<!--===============-->
|
||||||
<!-- Launch Screen -->
|
<!-- Launch Screen -->
|
||||||
|
Loading…
Reference in New Issue
Block a user