KillerDogeEmpire
/
AquaStream
mirror of https://github.com/KillerDogeEmpire/AquaStream.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make the material you "less gray" 

and add secondary color option
This commit is contained in:
Cloudburst 2022-09-23 17:27:08 +02:00
parent c714b77687
commit af1f8c52ac
7 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
View File

@ -173,7 +173,6 @@ object CommonActivity {
val currentOverlayTheme =
when (settingsManager.getString(act.getString(R.string.primary_color_key), "Normal")) {
"Normal" -> R.style.OverlayPrimaryColorNormal
"Monet" -> R.style.OverlayPrimaryColorMonet
"CarnationPink" -> R.style.OverlayPrimaryColorCarnationPink
"DarkGreen" -> R.style.OverlayPrimaryColorDarkGreen
"Maroon" -> R.style.OverlayPrimaryColorMaroon
@ -188,6 +187,8 @@ object CommonActivity {
"Banana" -> R.style.OverlayPrimaryColorBanana
"Party" -> R.style.OverlayPrimaryColorParty
"Pink" -> R.style.OverlayPrimaryColorPink
"Monet" -> R.style.OverlayPrimaryColorMonet
"Monet2" -> R.style.OverlayPrimaryColorMonetTwo
else -> R.style.OverlayPrimaryColorNormal
}
act.theme.applyStyle(currentTheme, true)

7
app/src/main/res/values-es/array.xml
View File

@ -194,7 +194,6 @@
<string-array name="themes_overlay_names">
<item>Normal</item>
<item>Material You</item>
<item>Rosa clavel</item>
<item>Verde oscuro</item>
<item>Vino</item>
@ -210,10 +209,11 @@
<item>Banana</item>
<item>Fiesta</item>
<item>Dolor rosa</item>
<item>Material You</item>
<item>Material You (Secondary)</item>
</string-array>
<string-array name="themes_overlay_names_values">
<item>Normal</item>
<item>Monet</item>
<item>CarnationPink</item>
<item>DarkGreen</item>
<item>Maroon</item>
@ -229,8 +229,11 @@
<item>Banana</item>
<item>Party</item>
<item>Pink</item>
<item>Monet</item>
<item>Monet2</item>
</string-array>
<string-array name="themes_names">
<item>Oscuro</item>
<item>Gris</item>

7
app/src/main/res/values-pl/array.xml
View File

@ -203,7 +203,6 @@
<string-array name="themes_overlay_names">
<item>Normalny</item>
<item>Material You</item>
<item>Goździk różowy</item>
<item>Ciemnozielony</item>
<item>Kasztanowaty</item>
@ -219,10 +218,11 @@
<item>Bananowy</item>
<item>Łososiowy</item>
<item>Świnko peppowy</item>
<item>Material You</item>
<item>Material You (drugorzędny)</item>
</string-array>
<string-array name="themes_overlay_names_values">
<item>Normal</item>
<item>Monet</item>
<item>CarnationPink</item>
<item>DarkGreen</item>
<item>Maroon</item>
@ -238,8 +238,11 @@
<item>Banana</item>
<item>Party</item>
<item>Pink</item>
<item>Monet</item>
<item>Monet2</item>
</string-array>
<string-array name="themes_names">
<item>Ciemny</item>
<item>Szary</item>

7
app/src/main/res/values-tr/array.xml
View File

@ -194,7 +194,6 @@
<string-array name="themes_overlay_names">
<item>Normal</item>
<item>Material You</item>
<item>Karanfil Pembesi</item>
<item>Koyu Yeşil</item>
<item>Kestane</item>
@ -210,10 +209,11 @@
<item>Muz</item>
<item>Parti</item>
<item>Pembe</item>
<item>Material You</item>
<item>Material You (Secondary)</item>
</string-array>
<string-array name="themes_overlay_names_values">
<item>Normal</item>
<item>Monet</item>
<item>CarnationPink</item>
<item>DarkGreen</item>
<item>Maroon</item>
@ -229,8 +229,11 @@
<item>Banana</item>
<item>Party</item>
<item>Pink</item>
<item>Monet</item>
<item>Monet2</item>
</string-array>
<string-array name="themes_names">
<item>Koyu</item>
<item>Gri</item>

7
app/src/main/res/values-vi/array.xml
View File

@ -195,7 +195,6 @@
<string-array name="themes_overlay_names">
<item>Mặc định</item>
<item>Material You</item>
<item>Hồng nhạt</item>
<item>Xanh lam đậm</item>
<item>Nâu sẫm</item>
@ -211,10 +210,11 @@
<item>Vàng</item>
<item>Hồng</item>
<item>Hồng đậm</item>
<item>Material You</item>
<item>Material You (Secondary)</item>
</string-array>
<string-array name="themes_overlay_names_values">
<item>Normal</item>
<item>Monet</item>
<item>CarnationPink</item>
<item>DarkGreen</item>
<item>Maroon</item>
@ -230,8 +230,11 @@
<item>Banana</item>
<item>Party</item>
<item>Pink</item>
<item>Monet</item>
<item>Monet2</item>
</string-array>
<string-array name="themes_names">
<item>Tối</item>
<item>Xám</item>

6
app/src/main/res/values/array.xml
View File

@ -213,7 +213,6 @@
<string-array name="themes_overlay_names">
<item>Normal</item>
<item>Material You</item>
<item>Carnation Pink</item>
<item>Dark Green</item>
<item>Maroon</item>
@ -229,10 +228,11 @@
<item>Banana</item>
<item>Party</item>
<item>Pink Pain</item>
<item>Material You</item>
<item>Material You (Secondary)</item>
</string-array>
<string-array name="themes_overlay_names_values">
<item>Normal</item>
<item>Monet</item>
<item>CarnationPink</item>
<item>DarkGreen</item>
<item>Maroon</item>
@ -248,6 +248,8 @@
<item>Banana</item>
<item>Party</item>
<item>Pink</item>
<item>Monet</item>
<item>Monet2</item>
</string-array>
<string-array name="themes_names">

16
app/src/main/res/values/styles.xml
View File

@ -96,10 +96,10 @@
</style>
<style name="MonetMode">
<item name="primaryGrayBackground">@color/material_dynamic_neutral30</item>
<item name="primaryGrayBackground">@color/material_dynamic_neutral20</item>
<item name="primaryBlackBackground">@color/material_dynamic_neutral10</item>
<item name="iconGrayBackground">@color/material_dynamic_neutral30</item>
<item name="boxItemBackground">@color/material_dynamic_neutral30</item>
<item name="iconGrayBackground">@color/material_dynamic_neutral20</item>
<item name="boxItemBackground">@color/material_dynamic_neutral20</item>
<item name="textColor">@color/material_dynamic_neutral90</item>
<item name="grayTextColor">@color/material_dynamic_neutral60</item>
<item name="white">@color/material_dynamic_neutral90</item>
@ -125,6 +125,16 @@
<item name="android:colorAccent">@color/material_dynamic_primary30</item>
</style>
<style name="OverlayPrimaryColorMonetTwo">
<item name="colorPrimary">@color/material_dynamic_tertiary80</item>
<item name="android:colorPrimary">@color/material_dynamic_tertiary80</item>
<item name="colorPrimaryDark">@color/material_dynamic_tertiary30</item>
<item name="colorAccent">@color/material_dynamic_tertiary80</item>
<item name="colorOnPrimary">@color/material_dynamic_tertiary20</item>
<!-- Needed for leanback fuckery -->
<item name="android:colorAccent">@color/material_dynamic_tertiary30</item>
</style>
<style name="OverlayPrimaryColorBlue">
<item name="colorPrimary">@color/colorPrimaryBlue</item>
<item name="android:colorPrimary">@color/colorPrimaryBlue</item>