From c81fd244098a9a566c4aee24d3439f2c4e34bf4f Mon Sep 17 00:00:00 2001 From: LagradOst <11805592+LagradOst@users.noreply.github.com> Date: Sat, 9 Apr 2022 23:07:52 +0200 Subject: [PATCH] new primary colors --- .../lagradost/cloudstream3/CommonActivity.kt | 8 ++- .../ui/settings/SettingsFragment.kt | 2 +- app/src/main/res/values/array.xml | 14 ++++ app/src/main/res/values/colors.xml | 8 +++ app/src/main/res/values/styles.xml | 70 +++++++++++++++++++ 5 files changed, 100 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt index 4ea8991a..fbef0db7 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt @@ -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 diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt index d0958d12..381bfa4d 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt @@ -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), diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml index b3d83f47..8cd09501 100644 --- a/app/src/main/res/values/array.xml +++ b/app/src/main/res/values/array.xml @@ -185,6 +185,13 @@ Normal + Carnation Pink + Dark Green + Maroon + Navy Blue + Grey + White + Brown Cool Fire Burple @@ -196,6 +203,13 @@ Normal + CarnationPink + DarkGreen + Maroon + NavyBlue + Grey + White + Brown Blue Red Purple diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index bbe2cc92..4a9a9cd1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -63,4 +63,12 @@ #E4D448 #ea596e #ff1493 + + #BD5DA5 + #004500 + #451010 + #000080 + #515151 + #FFFFFF + #622C00 \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f6a68274..c043126b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -175,6 +175,76 @@ @color/colorPrimaryPink + + + + + + + + + + + + + +