From d852649f4c26be494468a635f7f59b7c2d3f890e Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Fri, 21 Mar 2025 22:52:24 +0800
Subject: [PATCH] =?UTF-8?q?refactor(settings):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                                        | 2 +-
 .../super12138/todo/ui/pages/settings/SettingsAppearance.kt | 6 +++---
 .../components/{ => appearance}/contrast/ContrastPicker.kt  | 2 +-
 .../components/{ => appearance}/darkmode/DarkModeItem.kt    | 2 +-
 .../components/{ => appearance}/darkmode/DarkModePicker.kt  | 2 +-
 .../components/{ => appearance}/palette/PaletteItem.kt      | 2 +-
 .../components/{ => appearance}/palette/PalettePicker.kt    | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/{ => appearance}/contrast/ContrastPicker.kt (97%)
 rename app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/{ => appearance}/darkmode/DarkModeItem.kt (97%)
 rename app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/{ => appearance}/darkmode/DarkModePicker.kt (97%)
 rename app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/{ => appearance}/palette/PaletteItem.kt (98%)
 rename app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/{ => appearance}/palette/PalettePicker.kt (96%)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 699782c..6fc78f3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -34,7 +34,7 @@ android {
         applicationId = "cn.super12138.todo"
         minSdk = 24
         targetSdk = 36
-        versionCode = 590
+        versionCode = 603
         versionName = "2.1.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAppearance.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAppearance.kt
index f8423dc..0730f59 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAppearance.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAppearance.kt
@@ -17,9 +17,9 @@ import cn.super12138.todo.R
 import cn.super12138.todo.constants.Constants
 import cn.super12138.todo.ui.components.LargeTopAppBarScaffold
 import cn.super12138.todo.ui.pages.settings.components.SwitchSettingsItem
-import cn.super12138.todo.ui.pages.settings.components.contrast.ContrastPicker
-import cn.super12138.todo.ui.pages.settings.components.darkmode.DarkModePicker
-import cn.super12138.todo.ui.pages.settings.components.palette.PalettePicker
+import cn.super12138.todo.ui.pages.settings.components.appearance.contrast.ContrastPicker
+import cn.super12138.todo.ui.pages.settings.components.appearance.darkmode.DarkModePicker
+import cn.super12138.todo.ui.pages.settings.components.appearance.palette.PalettePicker
 import cn.super12138.todo.ui.viewmodels.MainViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/contrast/ContrastPicker.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/appearance/contrast/ContrastPicker.kt
similarity index 97%
rename from app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/contrast/ContrastPicker.kt
rename to app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/appearance/contrast/ContrastPicker.kt
index ad31ab9..498b3ff 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/contrast/ContrastPicker.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/appearance/contrast/ContrastPicker.kt
@@ -1,4 +1,4 @@
-package cn.super12138.todo.ui.pages.settings.components.contrast
+package cn.super12138.todo.ui.pages.settings.components.appearance.contrast
 
 import android.view.HapticFeedbackConstants
 import androidx.compose.foundation.layout.Arrangement
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/darkmode/DarkModeItem.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/appearance/darkmode/DarkModeItem.kt
similarity index 97%
rename from app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/darkmode/DarkModeItem.kt
rename to app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/appearance/darkmode/DarkModeItem.kt
index ed0c766..bd1d8da 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/darkmode/DarkModeItem.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/appearance/darkmode/DarkModeItem.kt
@@ -1,4 +1,4 @@
-package cn.super12138.todo.ui.pages.settings.components.darkmode
+package cn.super12138.todo.ui.pages.settings.components.appearance.darkmode
 
 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.foundation.background
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/darkmode/DarkModePicker.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/appearance/darkmode/DarkModePicker.kt
similarity index 97%
rename from app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/darkmode/DarkModePicker.kt
rename to app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/appearance/darkmode/DarkModePicker.kt
index a78de22..9025742 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/darkmode/DarkModePicker.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/appearance/darkmode/DarkModePicker.kt
@@ -1,4 +1,4 @@
-package cn.super12138.todo.ui.pages.settings.components.darkmode
+package cn.super12138.todo.ui.pages.settings.components.appearance.darkmode
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
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/appearance/palette/PaletteItem.kt
similarity index 98%
rename from app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/palette/PaletteItem.kt
rename to app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/appearance/palette/PaletteItem.kt
index 5be24dd..859d7fb 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/appearance/palette/PaletteItem.kt
@@ -1,4 +1,4 @@
-package cn.super12138.todo.ui.pages.settings.components.palette
+package cn.super12138.todo.ui.pages.settings.components.appearance.palette
 
 import android.os.Build
 import androidx.compose.animation.core.animateDpAsState
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/appearance/palette/PalettePicker.kt
similarity index 96%
rename from app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/palette/PalettePicker.kt
rename to app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/appearance/palette/PalettePicker.kt
index a5b558d..d2a14dd 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/appearance/palette/PalettePicker.kt
@@ -1,4 +1,4 @@
-package cn.super12138.todo.ui.pages.settings.components.palette
+package cn.super12138.todo.ui.pages.settings.components.appearance.palette
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement