From 749d131099f8ec92f88d7a359f5f059a40c586a3 Mon Sep 17 00:00:00 2001
From: Sir Aguacata <87155550+KillerDogeEmpire@users.noreply.github.com>
Date: Tue, 10 Oct 2023 13:18:34 -0700
Subject: [PATCH] Added new primary colors for comfort (#653)
---
.../lagradost/cloudstream3/CommonActivity.kt | 3 ++
app/src/main/res/values-es/array.xml | 6 ++++
app/src/main/res/values-pl/array.xml | 6 ++++
app/src/main/res/values-tr/array.xml | 6 ++++
app/src/main/res/values-vi/array.xml | 6 ++++
app/src/main/res/values/array.xml | 6 ++++
app/src/main/res/values/colors.xml | 3 ++
app/src/main/res/values/styles.xml | 30 +++++++++++++++++++
8 files changed, 66 insertions(+)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index 16a438b3..759f99d4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -302,12 +302,15 @@ object CommonActivity {
val currentOverlayTheme =
when (settingsManager.getString(act.getString(R.string.primary_color_key), "Normal")) {
"Normal" -> R.style.OverlayPrimaryColorNormal
+ "DandelionYellow" -> R.style.OverlayPrimaryColorDandelionYellow
"CarnationPink" -> R.style.OverlayPrimaryColorCarnationPink
+ "Orange" -> R.style.OverlayPrimaryColorOrange
"DarkGreen" -> R.style.OverlayPrimaryColorDarkGreen
"Maroon" -> R.style.OverlayPrimaryColorMaroon
"NavyBlue" -> R.style.OverlayPrimaryColorNavyBlue
"Grey" -> R.style.OverlayPrimaryColorGrey
"White" -> R.style.OverlayPrimaryColorWhite
+ "CoolBlue" -> R.style.OverlayPrimaryColorCoolBlue
"Brown" -> R.style.OverlayPrimaryColorBrown
"Purple" -> R.style.OverlayPrimaryColorPurple
"Green" -> R.style.OverlayPrimaryColorGreen
diff --git a/app/src/main/res/values-es/array.xml b/app/src/main/res/values-es/array.xml
index d1e5be2f..47df8e70 100644
--- a/app/src/main/res/values-es/array.xml
+++ b/app/src/main/res/values-es/array.xml
@@ -194,12 +194,15 @@
- Normal
+ - Diente de león amarilla
- Rosa clavel
+ - Naranja
- Verde oscuro
- Vino
- Azul marino
- Gris
- Blanco
+ - Azul fresco
- Marrón
- Fresco
- Fuego
@@ -214,12 +217,15 @@
- Normal
+ - DandelionYellow
- CarnationPink
+ - Orange
- DarkGreen
- Maroon
- NavyBlue
- Grey
- White
+ - CoolBlue
- Brown
- Blue
- Red
diff --git a/app/src/main/res/values-pl/array.xml b/app/src/main/res/values-pl/array.xml
index 30b6f4a1..8384187f 100644
--- a/app/src/main/res/values-pl/array.xml
+++ b/app/src/main/res/values-pl/array.xml
@@ -203,12 +203,15 @@
- Normalny
+ - Żółty mniszek lekarski
- Goździk różowy
+ - Pomarańczowy
- Ciemnozielony
- Kasztanowaty
- Ciemnoniebieski
- Szary
- Biały
+ - Fajny niebieski
- Brązowy
- Niebieski
- Czerwony
@@ -223,12 +226,15 @@
- Normal
+ - DandelionYellow
- CarnationPink
+ - Orange
- DarkGreen
- Maroon
- NavyBlue
- Grey
- White
+ - CoolBlue
- Brown
- Blue
- Red
diff --git a/app/src/main/res/values-tr/array.xml b/app/src/main/res/values-tr/array.xml
index dca01736..d14a3e2a 100644
--- a/app/src/main/res/values-tr/array.xml
+++ b/app/src/main/res/values-tr/array.xml
@@ -229,12 +229,15 @@
- Normal
+ - Karahindiba sarı
- Karanfil Pembesi
+ - Turuncu
- Koyu Yeşil
- Kestane
- Lacivert
- Gri
- Beyaz
+ - Soğuk Mavi
- Kahverengi
- Soğuk
- Ateş
@@ -249,12 +252,15 @@
- Normal
+ - DandelionYellow
- CarnationPink
+ - Orange
- DarkGreen
- Maroon
- NavyBlue
- Grey
- White
+ - CoolBlue
- Brown
- Blue
- Red
diff --git a/app/src/main/res/values-vi/array.xml b/app/src/main/res/values-vi/array.xml
index a5145c9e..d32f37ce 100644
--- a/app/src/main/res/values-vi/array.xml
+++ b/app/src/main/res/values-vi/array.xml
@@ -195,12 +195,15 @@
- Mặc định
+ - bồ công anh màu vàng
- Hồng nhạt
+ - Quả cam
- Xanh lam đậm
- Nâu sẫm
- Xanh lục
- Xám
- Trắng
+ - Màu xanh mát
- Nâu
- Xanh lục nhạt
- Đỏ
@@ -215,12 +218,15 @@
- Normal
+ - DandelionYellow
- CarnationPink
+ - Orange
- DarkGreen
- Maroon
- NavyBlue
- Grey
- White
+ - CoolBlue
- Brown
- Blue
- Red
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
index b8f0cbf8..e38dd5c9 100644
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@@ -266,12 +266,15 @@
- Normal
+ - Dandelion Yellow
- Carnation Pink
+ - Orange
- Dark Green
- Maroon
- Navy Blue
- Grey
- White
+ - Cool Blue
- Brown
- Cool
- Fire
@@ -286,12 +289,15 @@
- Normal
+ - DandelionYellow
- CarnationPink
+ - Orange
- DarkGreen
- Maroon
- NavyBlue
- Grey
- White
+ - CoolBlue
- Brown
- Blue
- Red
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d9258c40..c2c84d0d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -81,6 +81,9 @@
#515151
#FFFFFF
#622C00
+ #CE8500
+ #F5BB00
+ #408cac
#48E484
#ea596e
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c047c749..2fa4eb41 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -353,6 +353,36 @@
- @color/colorPrimaryBrown
+
+
+
+
+
+