From c714b77687c6c3751ef84ea864cafbae4c568080 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Fri, 23 Sep 2022 16:32:38 +0200
Subject: [PATCH 1/3] add "material you" theme

---
 .../lagradost/cloudstream3/CommonActivity.kt  |  2 ++
 app/src/main/res/values-es/array.xml          | 17 ++++------------
 app/src/main/res/values-pl/array.xml          |  4 ++++
 app/src/main/res/values-tr/array.xml          | 17 ++++------------
 app/src/main/res/values-vi/array.xml          | 16 ++++-----------
 app/src/main/res/values/array.xml             |  4 ++++
 app/src/main/res/values/styles.xml            | 20 +++++++++++++++++++
 7 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index 49143498..6bd41f39 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -166,12 +166,14 @@ object CommonActivity {
                 "Light" -> R.style.LightMode
                 "Amoled" -> R.style.AmoledMode
                 "AmoledLight" -> R.style.AmoledModeLight
+                "Monet" -> R.style.MonetMode
                 else -> R.style.AppTheme
             }
 
         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
diff --git a/app/src/main/res/values-es/array.xml b/app/src/main/res/values-es/array.xml
index 658ba7ae..47e747fd 100644
--- a/app/src/main/res/values-es/array.xml
+++ b/app/src/main/res/values-es/array.xml
@@ -14,19 +14,6 @@
         <item>@id/cast_button_type_forward_30_seconds</item>
     </array>
 
-    <array name="media_type_pref">
-        <item>Todos</item>
-        <item>Películas y TV</item>
-        <item>Anime</item>
-        <item>Documental</item>
-    </array>
-    <array name="media_type_pref_values">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </array>
-
     <array name="limit_title_rez_pref_names">
         <item>@string/resolution_and_title</item>
         <item>@string/title</item>
@@ -207,6 +194,7 @@
 
     <string-array name="themes_overlay_names">
         <item>Normal</item>
+        <item>Material You</item>
         <item>Rosa clavel</item>
         <item>Verde oscuro</item>
         <item>Vino</item>
@@ -225,6 +213,7 @@
     </string-array>
     <string-array name="themes_overlay_names_values">
         <item>Normal</item>
+        <item>Monet</item>
         <item>CarnationPink</item>
         <item>DarkGreen</item>
         <item>Maroon</item>
@@ -247,12 +236,14 @@
         <item>Gris</item>
         <item>Amoled</item>
         <item>Destello</item>
+        <item>Material You</item>
     </string-array>
     <string-array name="themes_names_values">
         <item>AmoledLight</item>
         <item>Black</item>
         <item>Amoled</item>
         <item>Light</item>
+        <item>Monet</item>
     </string-array>
 
     <!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266-->
diff --git a/app/src/main/res/values-pl/array.xml b/app/src/main/res/values-pl/array.xml
index c40b7f87..abf5b582 100644
--- a/app/src/main/res/values-pl/array.xml
+++ b/app/src/main/res/values-pl/array.xml
@@ -203,6 +203,7 @@
 
     <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>
@@ -221,6 +222,7 @@
     </string-array>
     <string-array name="themes_overlay_names_values">
         <item>Normal</item>
+        <item>Monet</item>
         <item>CarnationPink</item>
         <item>DarkGreen</item>
         <item>Maroon</item>
@@ -243,12 +245,14 @@
         <item>Szary</item>
         <item>Amoled</item>
         <item>Flashbang</item>
+        <item>Material You</item>
     </string-array>
     <string-array name="themes_names_values">
         <item>AmoledLight</item>
         <item>Black</item>
         <item>Amoled</item>
         <item>Light</item>
+        <item>Monet</item>
     </string-array>
 
     <!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266-->
diff --git a/app/src/main/res/values-tr/array.xml b/app/src/main/res/values-tr/array.xml
index ec9acd0e..e5bb2be2 100644
--- a/app/src/main/res/values-tr/array.xml
+++ b/app/src/main/res/values-tr/array.xml
@@ -14,19 +14,6 @@
         <item>@id/cast_button_type_forward_30_seconds</item>
     </array>
 
-    <array name="media_type_pref">
-        <item>Hepsi</item>
-        <item>Film ve Dizi</item>
-        <item>Anime</item>
-        <item>Belgesel</item>
-    </array>
-    <array name="media_type_pref_values">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </array>
-
     <array name="limit_title_rez_pref_names">
         <item>@string/resolution_and_title</item>
         <item>@string/title</item>
@@ -207,6 +194,7 @@
 
     <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>
@@ -225,6 +213,7 @@
     </string-array>
     <string-array name="themes_overlay_names_values">
         <item>Normal</item>
+        <item>Monet</item>
         <item>CarnationPink</item>
         <item>DarkGreen</item>
         <item>Maroon</item>
@@ -247,12 +236,14 @@
         <item>Gri</item>
         <item>Amoled</item>
         <item>Flaş Bombası</item>
+        <item>Material You</item>
     </string-array>
     <string-array name="themes_names_values">
         <item>AmoledLight</item>
         <item>Black</item>
         <item>Amoled</item>
         <item>Light</item>
+        <item>Monet</item>
     </string-array>
 
     <!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266-->
diff --git a/app/src/main/res/values-vi/array.xml b/app/src/main/res/values-vi/array.xml
index 5e70223b..dbdc7a0d 100644
--- a/app/src/main/res/values-vi/array.xml
+++ b/app/src/main/res/values-vi/array.xml
@@ -14,18 +14,6 @@
         <item>@id/cast_button_type_forward_30_seconds</item>
     </array>
 
-    <array name="media_type_pref">
-        <item>Tất cả</item>
-        <item>Phim lẻ và Phim bộ</item>
-        <item>Anime</item>
-        <item>Phim tài liệu</item>
-    </array>
-    <array name="media_type_pref_values">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </array>
 
     <array name="limit_title_rez_pref_names">
         <item>@string/resolution_and_title</item>
@@ -207,6 +195,7 @@
 
     <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>
@@ -225,6 +214,7 @@
     </string-array>
     <string-array name="themes_overlay_names_values">
         <item>Normal</item>
+        <item>Monet</item>
         <item>CarnationPink</item>
         <item>DarkGreen</item>
         <item>Maroon</item>
@@ -247,12 +237,14 @@
         <item>Xám</item>
         <item>Amoled</item>
         <item>Sáng</item>
+        <item>Material You</item>
     </string-array>
     <string-array name="themes_names_values">
         <item>AmoledLight</item>
         <item>Black</item>
         <item>Amoled</item>
         <item>Light</item>
+        <item>Monet</item>
     </string-array>
 
     <!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266-->
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
index 13d4f2dc..df97a741 100644
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@@ -213,6 +213,7 @@
 
     <string-array name="themes_overlay_names">
         <item>Normal</item>
+        <item>Material You</item>
         <item>Carnation Pink</item>
         <item>Dark Green</item>
         <item>Maroon</item>
@@ -231,6 +232,7 @@
     </string-array>
     <string-array name="themes_overlay_names_values">
         <item>Normal</item>
+        <item>Monet</item>
         <item>CarnationPink</item>
         <item>DarkGreen</item>
         <item>Maroon</item>
@@ -253,12 +255,14 @@
         <item>Gray</item>
         <item>Amoled</item>
         <item>Flashbang</item>
+        <item>Material You</item>
     </string-array>
     <string-array name="themes_names_values">
         <item>AmoledLight</item>
         <item>Black</item>
         <item>Amoled</item>
         <item>Light</item>
+        <item>Monet</item>
     </string-array>
 
     <string-array name="extension_statuses">
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2fb9b5b4..26c6b36c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -95,6 +95,16 @@
         <item name="white">#000</item>
     </style>
 
+    <style name="MonetMode">
+        <item name="primaryGrayBackground">@color/material_dynamic_neutral30</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="textColor">@color/material_dynamic_neutral90</item>
+        <item name="grayTextColor">@color/material_dynamic_neutral60</item>
+        <item name="white">@color/material_dynamic_neutral90</item>
+    </style>
+
     <style name="OverlayPrimaryColorNormal">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="android:colorPrimary">@color/colorPrimary</item>
@@ -105,6 +115,16 @@
         <item name="android:colorAccent">@color/colorAccent</item>
     </style>
 
+    <style name="OverlayPrimaryColorMonet">
+        <item name="colorPrimary">@color/material_dynamic_primary80</item>
+        <item name="android:colorPrimary">@color/material_dynamic_primary80</item>
+        <item name="colorPrimaryDark">@color/material_dynamic_primary30</item>
+        <item name="colorAccent">@color/material_dynamic_primary80</item>
+        <item name="colorOnPrimary">@color/material_dynamic_primary20</item>
+        <!-- Needed for leanback fuckery -->
+        <item name="android:colorAccent">@color/material_dynamic_primary30</item>
+    </style>
+
     <style name="OverlayPrimaryColorBlue">
         <item name="colorPrimary">@color/colorPrimaryBlue</item>
         <item name="android:colorPrimary">@color/colorPrimaryBlue</item>

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 2/3] 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 @@
 
     <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>
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 @@
 
     <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>
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 @@
 
     <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>
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 @@
 
     <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>
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 @@
 
     <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">
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 @@
     </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>

From 91258095a9c9e7398dd30ea3d8351930fdfebe41 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Fri, 23 Sep 2022 19:09:16 +0200
Subject: [PATCH 3/3] [hotfix] fix material you theme crashing on a11

---
 .../lagradost/cloudstream3/CommonActivity.kt  |  9 +++--
 .../cloudstream3/ui/settings/SettingsUI.kt    | 33 ++++++++++++++++---
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index b229775c..8f22c01a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -166,7 +166,8 @@ object CommonActivity {
                 "Light" -> R.style.LightMode
                 "Amoled" -> R.style.AmoledMode
                 "AmoledLight" -> R.style.AmoledModeLight
-                "Monet" -> R.style.MonetMode
+                "Monet" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
+                        R.style.MonetMode else R.style.AppTheme
                 else -> R.style.AppTheme
             }
 
@@ -187,8 +188,10 @@ object CommonActivity {
                 "Banana" -> R.style.OverlayPrimaryColorBanana
                 "Party" -> R.style.OverlayPrimaryColorParty
                 "Pink" -> R.style.OverlayPrimaryColorPink
-                "Monet" -> R.style.OverlayPrimaryColorMonet
-                "Monet2" -> R.style.OverlayPrimaryColorMonetTwo
+                "Monet" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
+                    R.style.OverlayPrimaryColorMonet else R.style.OverlayPrimaryColorNormal
+                "Monet2" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
+                    R.style.OverlayPrimaryColorMonetTwo else R.style.OverlayPrimaryColorNormal
                 else -> R.style.OverlayPrimaryColorNormal
             }
         act.theme.applyStyle(currentTheme, true)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
index 9ad3ee8f..e2fd24ca 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.ui.settings
 
+import android.os.Build
 import android.os.Bundle
 import android.view.View
 import androidx.preference.PreferenceFragmentCompat
@@ -83,8 +84,20 @@ class SettingsUI : PreferenceFragmentCompat() {
         }
 
         getPref(R.string.app_theme_key)?.setOnPreferenceClickListener {
-            val prefNames = resources.getStringArray(R.array.themes_names)
-            val prefValues = resources.getStringArray(R.array.themes_names_values)
+            val prefNames = resources.getStringArray(R.array.themes_names).toMutableList()
+            val prefValues = resources.getStringArray(R.array.themes_names_values).toMutableList()
+
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { // remove monet on android 11 and less
+                val toRemove = prefValues
+                    .mapIndexed { idx, s -> if (s.startsWith("Monet")) idx else null }
+                    .filterNotNull()
+                var offset = 0
+                toRemove.forEach { idx ->
+                    prefNames.removeAt(idx - offset)
+                    prefValues.removeAt(idx - offset)
+                    offset += 1
+                }
+            }
 
             val currentLayout =
                 settingsManager.getString(getString(R.string.app_theme_key), prefValues.first())
@@ -107,8 +120,20 @@ class SettingsUI : PreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
         getPref(R.string.primary_color_key)?.setOnPreferenceClickListener {
-            val prefNames = resources.getStringArray(R.array.themes_overlay_names)
-            val prefValues = resources.getStringArray(R.array.themes_overlay_names_values)
+            val prefNames = resources.getStringArray(R.array.themes_overlay_names).toMutableList()
+            val prefValues = resources.getStringArray(R.array.themes_overlay_names_values).toMutableList()
+
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { // remove monet on android 11 and less
+                val toRemove = prefValues
+                    .mapIndexed { idx, s -> if (s.startsWith("Monet")) idx else null }
+                    .filterNotNull()
+                var offset = 0
+                toRemove.forEach { idx ->
+                    prefNames.removeAt(idx - offset)
+                    prefValues.removeAt(idx - offset)
+                    offset += 1
+                }
+            }
 
             val currentLayout =
                 settingsManager.getString(getString(R.string.primary_color_key), prefValues.first())