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

new primary colors

This commit is contained in:
LagradOst 2022-04-09 23:07:52 +02:00
parent 977d66c2e9
commit c81fd24409
5 changed files with 100 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,7 +159,13 @@ object CommonActivity {
val currentOverlayTheme =
when (settingsManager.getString(act.getString(R.string.primary_color_key), "Normal")) {
"Normal" -> R.style.OverlayPrimaryColorNormal
"Blue" -> R.style.OverlayPrimaryColorBlue
"CarnationPink" -> R.style.OverlayPrimaryColorCarnationPink
"DarkGreen" -> R.style.OverlayPrimaryColorDarkGreen
"Maroon" -> R.style.OverlayPrimaryColorMaroon
"NavyBlue" -> R.style.OverlayPrimaryColorNavyBlue
"Grey" -> R.style.OverlayPrimaryColorGrey
"White" -> R.style.OverlayPrimaryColorWhite
"Brown" -> R.style.OverlayPrimaryColorBrown
"Purple" -> R.style.OverlayPrimaryColorPurple
"Green" -> R.style.OverlayPrimaryColorGreen
"GreenApple" -> R.style.OverlayPrimaryColorGreenApple

2
app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
View File

@ -542,7 +542,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
val currentLayout =
settingsManager.getString(getString(R.string.primary_color_key), prefValues.first())
activity?.showBottomDialog(
activity?.showDialog(
prefNames.toList(),
prefValues.indexOf(currentLayout),
getString(R.string.primary_color_settings),

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

@ -185,6 +185,13 @@
<string-array name="themes_overlay_names">
<item>Normal</item>
<item>Carnation Pink</item>
<item>Dark Green</item>
<item>Maroon</item>
<item>Navy Blue</item>
<item>Grey</item>
<item>White</item>
<item>Brown</item>
<item>Cool</item>
<item>Fire</item>
<item>Burple</item>
@ -196,6 +203,13 @@
</string-array>
<string-array name="themes_overlay_names_values">
<item>Normal</item>
<item>CarnationPink</item>
<item>DarkGreen</item>
<item>Maroon</item>
<item>NavyBlue</item>
<item>Grey</item>
<item>White</item>
<item>Brown</item>
<item>Blue</item>
<item>Red</item>
<item>Purple</item>

8
app/src/main/res/values/colors.xml
View File

@ -63,4 +63,12 @@
<color name="colorPrimaryBanana">#E4D448</color>
<color name="colorPrimaryParty">#ea596e</color>
<color name="colorPrimaryPink">#ff1493</color>
<color name="colorPrimaryCarnationPink">#BD5DA5</color>
<color name="colorPrimaryDarkGreen">#004500</color>
<color name="colorPrimaryMaroon">#451010</color>
<color name="colorPrimaryNavyBlue">#000080</color>
<color name="colorPrimaryGrey">#515151</color>
<color name="colorPrimaryWhite">#FFFFFF</color>
<color name="colorPrimaryBrown">#622C00</color>
</resources>

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

@ -175,6 +175,76 @@
<item name="android:colorAccent">@color/colorPrimaryPink</item>
</style>
<style name="OverlayPrimaryColorCarnationPink">
<item name="colorPrimary">@color/colorPrimaryCarnationPink</item>
<item name="android:colorPrimary">@color/colorPrimaryCarnationPink</item>
<item name="colorPrimaryDark">#83366f</item>
<item name="colorAccent">#BD5DA5</item>
<item name="colorOnPrimary">#BD5DA5</item>
<!-- Needed for leanback fuckery -->
<item name="android:colorAccent">@color/colorPrimaryCarnationPink</item>
</style>
<style name="OverlayPrimaryColorMaroon">
<item name="colorPrimary">@color/colorPrimaryMaroon</item>
<item name="android:colorPrimary">@color/colorPrimaryMaroon</item>
<item name="colorPrimaryDark">#370C0C</item>
<item name="colorAccent">#451010</item>
<item name="colorOnPrimary">#451010</item>
<!-- Needed for leanback fuckery -->
<item name="android:colorAccent">@color/colorPrimaryMaroon</item>
</style>
<style name="OverlayPrimaryColorDarkGreen">
<item name="colorPrimary">@color/colorPrimaryDarkGreen</item>
<item name="android:colorPrimary">@color/colorPrimaryDarkGreen</item>
<item name="colorPrimaryDark">#003d00</item>
<item name="colorAccent">#004500</item>
<item name="colorOnPrimary">#004500</item>
<!-- Needed for leanback fuckery -->
<item name="android:colorAccent">@color/colorPrimaryDarkGreen</item>
</style>
<style name="OverlayPrimaryColorNavyBlue">
<item name="colorPrimary">@color/colorPrimaryNavyBlue</item>
<item name="android:colorPrimary">@color/colorPrimaryNavyBlue</item>
<item name="colorPrimaryDark">#000073</item>
<item name="colorAccent">#000080</item>
<item name="colorOnPrimary">#000080</item>
<!-- Needed for leanback fuckery -->
<item name="android:colorAccent">@color/colorPrimaryNavyBlue</item>
</style>
<style name="OverlayPrimaryColorGrey">
<item name="colorPrimary">@color/colorPrimaryGrey</item>
<item name="android:colorPrimary">@color/colorPrimaryGrey</item>
<item name="colorPrimaryDark">#484848</item>
<item name="colorAccent">#515151</item>
<item name="colorOnPrimary">#515151</item>
<!-- Needed for leanback fuckery -->
<item name="android:colorAccent">@color/colorPrimaryGrey</item>
</style>
<style name="OverlayPrimaryColorWhite">
<item name="colorPrimary">@color/colorPrimaryWhite</item>
<item name="android:colorPrimary">@color/colorPrimaryWhite</item>
<item name="colorPrimaryDark">#CCCCCC</item>
<item name="colorAccent">#FFFFFF</item>
<item name="colorOnPrimary">#FFFFFF</item>
<!-- Needed for leanback fuckery -->
<item name="android:colorAccent">@color/colorPrimaryWhite</item>
</style>
<style name="OverlayPrimaryColorBrown">
<item name="colorPrimary">@color/colorPrimaryBrown</item>
<item name="android:colorPrimary">@color/colorPrimaryBrown</item>
<item name="colorPrimaryDark">#582700</item>
<item name="colorAccent">#622C00</item>
<item name="colorOnPrimary">#622C00</item>
<!-- Needed for leanback fuckery -->
<item name="android:colorAccent">@color/colorPrimaryBrown</item>
</style>
<style name="customRatingBar" parent="@style/Widget.AppCompat.RatingBar">
<item name="android:progressDrawable">@drawable/abc_ratingbar_indicator_material</item>