Added new primary colors for comfort (#653)

This commit is contained in:
Sir Aguacata 2023-10-10 13:18:34 -07:00 committed by GitHub
parent de6dfec452
commit 749d131099
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 66 additions and 0 deletions

View file

@ -302,12 +302,15 @@ object CommonActivity {
val currentOverlayTheme = val currentOverlayTheme =
when (settingsManager.getString(act.getString(R.string.primary_color_key), "Normal")) { when (settingsManager.getString(act.getString(R.string.primary_color_key), "Normal")) {
"Normal" -> R.style.OverlayPrimaryColorNormal "Normal" -> R.style.OverlayPrimaryColorNormal
"DandelionYellow" -> R.style.OverlayPrimaryColorDandelionYellow
"CarnationPink" -> R.style.OverlayPrimaryColorCarnationPink "CarnationPink" -> R.style.OverlayPrimaryColorCarnationPink
"Orange" -> R.style.OverlayPrimaryColorOrange
"DarkGreen" -> R.style.OverlayPrimaryColorDarkGreen "DarkGreen" -> R.style.OverlayPrimaryColorDarkGreen
"Maroon" -> R.style.OverlayPrimaryColorMaroon "Maroon" -> R.style.OverlayPrimaryColorMaroon
"NavyBlue" -> R.style.OverlayPrimaryColorNavyBlue "NavyBlue" -> R.style.OverlayPrimaryColorNavyBlue
"Grey" -> R.style.OverlayPrimaryColorGrey "Grey" -> R.style.OverlayPrimaryColorGrey
"White" -> R.style.OverlayPrimaryColorWhite "White" -> R.style.OverlayPrimaryColorWhite
"CoolBlue" -> R.style.OverlayPrimaryColorCoolBlue
"Brown" -> R.style.OverlayPrimaryColorBrown "Brown" -> R.style.OverlayPrimaryColorBrown
"Purple" -> R.style.OverlayPrimaryColorPurple "Purple" -> R.style.OverlayPrimaryColorPurple
"Green" -> R.style.OverlayPrimaryColorGreen "Green" -> R.style.OverlayPrimaryColorGreen

View file

@ -194,12 +194,15 @@
<string-array name="themes_overlay_names"> <string-array name="themes_overlay_names">
<item>Normal</item> <item>Normal</item>
<item>Diente de león amarilla</item>
<item>Rosa clavel</item> <item>Rosa clavel</item>
<item>Naranja</item>
<item>Verde oscuro</item> <item>Verde oscuro</item>
<item>Vino</item> <item>Vino</item>
<item>Azul marino</item> <item>Azul marino</item>
<item>Gris</item> <item>Gris</item>
<item>Blanco</item> <item>Blanco</item>
<item>Azul fresco</item>
<item>Marrón</item> <item>Marrón</item>
<item>Fresco</item> <item>Fresco</item>
<item>Fuego</item> <item>Fuego</item>
@ -214,12 +217,15 @@
</string-array> </string-array>
<string-array name="themes_overlay_names_values"> <string-array name="themes_overlay_names_values">
<item>Normal</item> <item>Normal</item>
<item>DandelionYellow</item>
<item>CarnationPink</item> <item>CarnationPink</item>
<item>Orange</item>
<item>DarkGreen</item> <item>DarkGreen</item>
<item>Maroon</item> <item>Maroon</item>
<item>NavyBlue</item> <item>NavyBlue</item>
<item>Grey</item> <item>Grey</item>
<item>White</item> <item>White</item>
<item>CoolBlue</item>
<item>Brown</item> <item>Brown</item>
<item>Blue</item> <item>Blue</item>
<item>Red</item> <item>Red</item>

View file

@ -203,12 +203,15 @@
<string-array name="themes_overlay_names"> <string-array name="themes_overlay_names">
<item>Normalny</item> <item>Normalny</item>
<item>Żółty mniszek lekarski</item>
<item>Goździk różowy</item> <item>Goździk różowy</item>
<item>Pomarańczowy</item>
<item>Ciemnozielony</item> <item>Ciemnozielony</item>
<item>Kasztanowaty</item> <item>Kasztanowaty</item>
<item>Ciemnoniebieski</item> <item>Ciemnoniebieski</item>
<item>Szary</item> <item>Szary</item>
<item>Biały</item> <item>Biały</item>
<item>Fajny niebieski</item>
<item>Brązowy</item> <item>Brązowy</item>
<item>Niebieski</item> <item>Niebieski</item>
<item>Czerwony</item> <item>Czerwony</item>
@ -223,12 +226,15 @@
</string-array> </string-array>
<string-array name="themes_overlay_names_values"> <string-array name="themes_overlay_names_values">
<item>Normal</item> <item>Normal</item>
<item>DandelionYellow</item>
<item>CarnationPink</item> <item>CarnationPink</item>
<item>Orange</item>
<item>DarkGreen</item> <item>DarkGreen</item>
<item>Maroon</item> <item>Maroon</item>
<item>NavyBlue</item> <item>NavyBlue</item>
<item>Grey</item> <item>Grey</item>
<item>White</item> <item>White</item>
<item>CoolBlue</item>
<item>Brown</item> <item>Brown</item>
<item>Blue</item> <item>Blue</item>
<item>Red</item> <item>Red</item>

View file

@ -229,12 +229,15 @@
<string-array name="themes_overlay_names"> <string-array name="themes_overlay_names">
<item>Normal</item> <item>Normal</item>
<item>Karahindiba sarı</item>
<item>Karanfil Pembesi</item> <item>Karanfil Pembesi</item>
<item>Turuncu</item>
<item>Koyu Yeşil</item> <item>Koyu Yeşil</item>
<item>Kestane</item> <item>Kestane</item>
<item>Lacivert</item> <item>Lacivert</item>
<item>Gri</item> <item>Gri</item>
<item>Beyaz</item> <item>Beyaz</item>
<item>Soğuk Mavi</item>
<item>Kahverengi</item> <item>Kahverengi</item>
<item>Soğuk</item> <item>Soğuk</item>
<item>Ateş</item> <item>Ateş</item>
@ -249,12 +252,15 @@
</string-array> </string-array>
<string-array name="themes_overlay_names_values"> <string-array name="themes_overlay_names_values">
<item>Normal</item> <item>Normal</item>
<item>DandelionYellow</item>
<item>CarnationPink</item> <item>CarnationPink</item>
<item>Orange</item>
<item>DarkGreen</item> <item>DarkGreen</item>
<item>Maroon</item> <item>Maroon</item>
<item>NavyBlue</item> <item>NavyBlue</item>
<item>Grey</item> <item>Grey</item>
<item>White</item> <item>White</item>
<item>CoolBlue</item>
<item>Brown</item> <item>Brown</item>
<item>Blue</item> <item>Blue</item>
<item>Red</item> <item>Red</item>

View file

@ -195,12 +195,15 @@
<string-array name="themes_overlay_names"> <string-array name="themes_overlay_names">
<item>Mặc định</item> <item>Mặc định</item>
<item>bồ công anh màu vàng</item>
<item>Hồng nhạt</item> <item>Hồng nhạt</item>
<item>Quả cam</item>
<item>Xanh lam đậm</item> <item>Xanh lam đậm</item>
<item>Nâu sẫm</item> <item>Nâu sẫm</item>
<item>Xanh lục</item> <item>Xanh lục</item>
<item>Xám</item> <item>Xám</item>
<item>Trắng</item> <item>Trắng</item>
<item>Màu xanh mát</item>
<item>Nâu</item> <item>Nâu</item>
<item>Xanh lục nhạt</item> <item>Xanh lục nhạt</item>
<item>Đỏ</item> <item>Đỏ</item>
@ -215,12 +218,15 @@
</string-array> </string-array>
<string-array name="themes_overlay_names_values"> <string-array name="themes_overlay_names_values">
<item>Normal</item> <item>Normal</item>
<item>DandelionYellow</item>
<item>CarnationPink</item> <item>CarnationPink</item>
<item>Orange</item>
<item>DarkGreen</item> <item>DarkGreen</item>
<item>Maroon</item> <item>Maroon</item>
<item>NavyBlue</item> <item>NavyBlue</item>
<item>Grey</item> <item>Grey</item>
<item>White</item> <item>White</item>
<item>CoolBlue</item>
<item>Brown</item> <item>Brown</item>
<item>Blue</item> <item>Blue</item>
<item>Red</item> <item>Red</item>

View file

@ -266,12 +266,15 @@
<string-array name="themes_overlay_names"> <string-array name="themes_overlay_names">
<item>Normal</item> <item>Normal</item>
<item>Dandelion Yellow</item>
<item>Carnation Pink</item> <item>Carnation Pink</item>
<item>Orange</item>
<item>Dark Green</item> <item>Dark Green</item>
<item>Maroon</item> <item>Maroon</item>
<item>Navy Blue</item> <item>Navy Blue</item>
<item>Grey</item> <item>Grey</item>
<item>White</item> <item>White</item>
<item>Cool Blue</item>
<item>Brown</item> <item>Brown</item>
<item>Cool</item> <item>Cool</item>
<item>Fire</item> <item>Fire</item>
@ -286,12 +289,15 @@
</string-array> </string-array>
<string-array name="themes_overlay_names_values"> <string-array name="themes_overlay_names_values">
<item>Normal</item> <item>Normal</item>
<item>DandelionYellow</item>
<item>CarnationPink</item> <item>CarnationPink</item>
<item>Orange</item>
<item>DarkGreen</item> <item>DarkGreen</item>
<item>Maroon</item> <item>Maroon</item>
<item>NavyBlue</item> <item>NavyBlue</item>
<item>Grey</item> <item>Grey</item>
<item>White</item> <item>White</item>
<item>CoolBlue</item>
<item>Brown</item> <item>Brown</item>
<item>Blue</item> <item>Blue</item>
<item>Red</item> <item>Red</item>

View file

@ -81,6 +81,9 @@
<color name="colorPrimaryGrey">#515151</color> <color name="colorPrimaryGrey">#515151</color>
<color name="colorPrimaryWhite">#FFFFFF</color> <color name="colorPrimaryWhite">#FFFFFF</color>
<color name="colorPrimaryBrown">#622C00</color> <color name="colorPrimaryBrown">#622C00</color>
<color name="colorPrimaryOrange">#CE8500</color>
<color name="colorPrimaryDandelionYellow">#F5BB00</color>
<color name="colorPrimaryCoolBlue">#408cac</color>
<color name="colorTestPass">#48E484</color> <color name="colorTestPass">#48E484</color>
<color name="colorTestFail">#ea596e</color> <color name="colorTestFail">#ea596e</color>

View file

@ -353,6 +353,36 @@
<item name="android:colorAccent">@color/colorPrimaryBrown</item> <item name="android:colorAccent">@color/colorPrimaryBrown</item>
</style> </style>
<style name="OverlayPrimaryColorOrange">
<item name="colorPrimary">@color/colorPrimaryOrange</item>
<item name="android:colorPrimary">@color/colorPrimaryOrange</item>
<item name="colorPrimaryDark">#A66B00</item>
<item name="colorAccent">#CE8500</item>
<item name="colorOnPrimary">@color/whiteText</item>
<!-- Needed for leanback fuckery -->
<item name="android:colorAccent">@color/colorPrimaryOrange</item>
</style>
<style name="OverlayPrimaryColorDandelionYellow">
<item name="colorPrimary">@color/colorPrimaryDandelionYellow</item>
<item name="android:colorPrimary">@color/colorPrimaryDandelionYellow</item>
<item name="colorPrimaryDark">#C49600</item>
<item name="colorAccent">#F5BB00</item>
<item name="colorOnPrimary">@color/whiteText</item>
<!-- Needed for leanback fuckery -->
<item name="android:colorAccent">@color/colorPrimaryDandelionYellow</item>
</style>
<style name="OverlayPrimaryColorCoolBlue">
<item name="colorPrimary">@color/colorPrimaryCoolBlue</item>
<item name="android:colorPrimary">@color/colorPrimaryCoolBlue</item>
<item name="colorPrimaryDark">#306981</item>
<item name="colorAccent">#51b0d7</item>
<item name="colorOnPrimary">@color/whiteText</item>
<!-- Needed for leanback fuckery -->
<item name="android:colorAccent">@color/colorPrimaryCoolBlue</item>
</style>
<style name="customRatingBar" parent="@style/Widget.AppCompat.RatingBar"> <style name="customRatingBar" parent="@style/Widget.AppCompat.RatingBar">
<item name="android:progressDrawable">@drawable/abc_ratingbar_indicator_material</item> <item name="android:progressDrawable">@drawable/abc_ratingbar_indicator_material</item>