fix: Show auto theme option from API 24 to API 28 (#297)

* fix: Show auto theme option from API 24 to API 28 * fix: Lint error
XayahSuSuSu · Aug 28, 2024 · 08fd9cb · 08fd9cb
1 parent d7e1e38
commit 08fd9cb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 33 deletions.
diff --git a/source/core/model/src/main/kotlin/com/xayah/core/model/util/ModelUtil.kt b/source/core/model/src/main/kotlin/com/xayah/core/model/util/ModelUtil.kt
@@ -63,7 +63,7 @@ fun SelectionType.Companion.of(name: String?): SelectionType =
     runCatching { SelectionType.valueOf(name!!.uppercase()) }.getOrDefault(SelectionType.DEFAULT)
 
 fun ThemeType.Companion.of(name: String?): ThemeType =
-    runCatching { ThemeType.valueOf(name!!.uppercase()) }.getOrDefault(if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) ThemeType.AUTO else ThemeType.LIGHT_THEME)
+    runCatching { ThemeType.valueOf(name!!.uppercase()) }.getOrDefault(ThemeType.AUTO)
 
 fun SmbAuthMode.Companion.indexOf(index: Int): SmbAuthMode = when (index) {
     1 -> SmbAuthMode.GUEST

diff --git a/source/feature/main/settings/src/main/kotlin/com/xayah/feature/main/settings/Item.kt b/source/feature/main/settings/src/main/kotlin/com/xayah/feature/main/settings/Item.kt
@@ -22,38 +22,23 @@ fun DarkThemeSelectable() {
     val context = LocalContext.current
     val dialogState = LocalSlotScope.current!!.dialogSlot
     val items = remember {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            listOf(
-                DialogRadioItem(
-                    enum = ThemeType.AUTO,
-                    title = context.getString(R.string.theme_auto),
-                    desc = context.getString(R.string.theme_auto_desc),
-                ),
-                DialogRadioItem(
-                    enum = ThemeType.LIGHT_THEME,
-                    title = context.getString(R.string.theme_light),
-                    desc = context.getString(R.string.theme_light_desc),
-                ),
-                DialogRadioItem(
-                    enum = ThemeType.DARK_THEME,
-                    title = context.getString(R.string.theme_dark),
-                    desc = context.getString(R.string.theme_dark_desc),
-                ),
-            )
-        } else {
-            listOf(
-                DialogRadioItem(
-                    enum = ThemeType.LIGHT_THEME,
-                    title = context.getString(R.string.theme_light),
-                    desc = context.getString(R.string.theme_light_desc),
-                ),
-                DialogRadioItem(
-                    enum = ThemeType.DARK_THEME,
-                    title = context.getString(R.string.theme_dark),
-                    desc = context.getString(R.string.theme_dark_desc),
-                ),
-            )
-        }
+        listOf(
+            DialogRadioItem(
+                enum = ThemeType.AUTO,
+                title = context.getString(R.string.theme_auto),
+                desc = context.getString(R.string.theme_auto_desc),
+            ),
+            DialogRadioItem(
+                enum = ThemeType.LIGHT_THEME,
+                title = context.getString(R.string.theme_light),
+                desc = context.getString(R.string.theme_light_desc),
+            ),
+            DialogRadioItem(
+                enum = ThemeType.DARK_THEME,
+                title = context.getString(R.string.theme_dark),
+                desc = context.getString(R.string.theme_dark_desc),
+            ),
+        )
     }
     val currentType by observeCurrentTheme()
     val currentIndex by remember(currentType) { mutableIntStateOf(items.indexOfFirst { it.enum == currentType }) }