From e44dcb8c5afce9fb32beaf45759a73d039008dd5 Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Thu, 6 Feb 2025 19:56:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(settings):=20=E5=9C=A8=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E8=89=B2=E6=9D=BF=E6=B2=A1=E7=94=A8=E8=B7=9F=E9=9A=8F=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=AE=BE=E7=BD=AE=E5=88=87=E6=8D=A2=E6=B7=B1=E8=89=B2?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/pages/settings/components/palette/PaletteItem.kt   | 3 ++-
 .../ui/pages/settings/components/palette/PalettePicker.kt | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/palette/PaletteItem.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/palette/PaletteItem.kt
index f60529c..9228b6b 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/palette/PaletteItem.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/palette/PaletteItem.kt
@@ -36,6 +36,7 @@ import cn.super12138.todo.utils.VibrationUtils
 
 @Composable
 fun PaletteItem(
+    isDark: Boolean,
     paletteStyle: PaletteStyle,
     contrastLevel: ContrastLevel,
     selected: Boolean,
@@ -63,7 +64,7 @@ fun PaletteItem(
                 } else {
                     Color(0xFF0061A4)
                 },
-                isDark = isSystemInDarkTheme(),
+                isDark = isDark,
                 contrastLevel = contrastLevel.value.toDouble(),
                 style = paletteStyle
             )
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/palette/PalettePicker.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/palette/PalettePicker.kt
index 73bfb09..424b381 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/palette/PalettePicker.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/palette/PalettePicker.kt
@@ -1,5 +1,6 @@
 package cn.super12138.todo.ui.pages.settings.components.palette
 
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
@@ -12,12 +13,14 @@ import androidx.compose.ui.unit.dp
 import cn.super12138.todo.R
 import cn.super12138.todo.constants.Constants
 import cn.super12138.todo.logic.model.ContrastLevel
+import cn.super12138.todo.logic.model.DarkMode
 import cn.super12138.todo.ui.pages.settings.components.RowSettingsItem
 import cn.super12138.todo.ui.pages.settings.state.rememberPrefIntState
 import cn.super12138.todo.ui.theme.PaletteStyle
 
 @Composable
 fun PalettePicker(
+    isDarkMode: DarkMode,
     contrastLevel: ContrastLevel,
     onPaletteChange: (paletteStyle: PaletteStyle) -> Unit,
     modifier: Modifier = Modifier
@@ -38,6 +41,11 @@ fun PalettePicker(
     ) {
         items(items = paletteOptions, key = { it.id }) { paletteStyle ->
             PaletteItem(
+                isDark = when (isDarkMode) {
+                    DarkMode.FollowSystem -> isSystemInDarkTheme()
+                    DarkMode.Light -> false
+                    DarkMode.Dark -> true
+                },
                 paletteStyle = paletteStyle,
                 selected = PaletteStyle.fromId(paletteState) == paletteStyle,
                 contrastLevel = contrastLevel,