From af1f8c52ac6413f3293b486d550cd28cb45a51a0 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Fri, 23 Sep 2022 17:27:08 +0200
Subject: [PATCH] make the material you "less gray" and add secondary color
option
---
.../com/lagradost/cloudstream3/CommonActivity.kt | 3 ++-
app/src/main/res/values-es/array.xml | 7 +++++--
app/src/main/res/values-pl/array.xml | 7 +++++--
app/src/main/res/values-tr/array.xml | 7 +++++--
app/src/main/res/values-vi/array.xml | 7 +++++--
app/src/main/res/values/array.xml | 6 ++++--
app/src/main/res/values/styles.xml | 16 +++++++++++++---
7 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index 6bd41f39..b229775c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -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)
diff --git a/app/src/main/res/values-es/array.xml b/app/src/main/res/values-es/array.xml
index 47e747fd..ae986642 100644
--- a/app/src/main/res/values-es/array.xml
+++ b/app/src/main/res/values-es/array.xml
@@ -194,7 +194,6 @@
- Normal
- - Material You
- Rosa clavel
- Verde oscuro
- Vino
@@ -210,10 +209,11 @@
- Banana
- Fiesta
- Dolor rosa
+ - Material You
+ - Material You (Secondary)
- Normal
- - Monet
- CarnationPink
- DarkGreen
- Maroon
@@ -229,8 +229,11 @@
- Banana
- Party
- Pink
+ - Monet
+ - Monet2
+
- Oscuro
- Gris
diff --git a/app/src/main/res/values-pl/array.xml b/app/src/main/res/values-pl/array.xml
index abf5b582..3fe30d95 100644
--- a/app/src/main/res/values-pl/array.xml
+++ b/app/src/main/res/values-pl/array.xml
@@ -203,7 +203,6 @@
- Normalny
- - Material You
- Goździk różowy
- Ciemnozielony
- Kasztanowaty
@@ -219,10 +218,11 @@
- Bananowy
- Łososiowy
- Świnko peppowy
+ - Material You
+ - Material You (drugorzędny)
- Normal
- - Monet
- CarnationPink
- DarkGreen
- Maroon
@@ -238,8 +238,11 @@
- Banana
- Party
- Pink
+ - Monet
+ - Monet2
+
- Ciemny
- Szary
diff --git a/app/src/main/res/values-tr/array.xml b/app/src/main/res/values-tr/array.xml
index e5bb2be2..dbb17d36 100644
--- a/app/src/main/res/values-tr/array.xml
+++ b/app/src/main/res/values-tr/array.xml
@@ -194,7 +194,6 @@
- Normal
- - Material You
- Karanfil Pembesi
- Koyu Yeşil
- Kestane
@@ -210,10 +209,11 @@
- Muz
- Parti
- Pembe
+ - Material You
+ - Material You (Secondary)
- Normal
- - Monet
- CarnationPink
- DarkGreen
- Maroon
@@ -229,8 +229,11 @@
- Banana
- Party
- Pink
+ - Monet
+ - Monet2
+
- Koyu
- Gri
diff --git a/app/src/main/res/values-vi/array.xml b/app/src/main/res/values-vi/array.xml
index dbdc7a0d..5fee2d29 100644
--- a/app/src/main/res/values-vi/array.xml
+++ b/app/src/main/res/values-vi/array.xml
@@ -195,7 +195,6 @@
- Mặc định
- - Material You
- Hồng nhạt
- Xanh lam đậm
- Nâu sẫm
@@ -211,10 +210,11 @@
- Vàng
- Hồng
- Hồng đậm
+ - Material You
+ - Material You (Secondary)
- Normal
- - Monet
- CarnationPink
- DarkGreen
- Maroon
@@ -230,8 +230,11 @@
- Banana
- Party
- Pink
+ - Monet
+ - Monet2
+
- Tối
- Xám
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
index df97a741..fedc4219 100644
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@@ -213,7 +213,6 @@
- Normal
- - Material You
- Carnation Pink
- Dark Green
- Maroon
@@ -229,10 +228,11 @@
- Banana
- Party
- Pink Pain
+ - Material You
+ - Material You (Secondary)
- Normal
- - Monet
- CarnationPink
- DarkGreen
- Maroon
@@ -248,6 +248,8 @@
- Banana
- Party
- Pink
+ - Monet
+ - Monet2
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 26c6b36c..9840cb80 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -96,10 +96,10 @@
+
+