From a5b85bfdad02637158b393a081e5f2d7a7415122 Mon Sep 17 00:00:00 2001
From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com>
Date: Sun, 1 Jun 2025 21:56:56 +0800
Subject: [PATCH] manager: Update theme color display in MoreSettings screen
 and adjust title style

---
 .../sukisu/ultra/ui/screen/MoreSettings.kt    | 46 +++++++++++++++----
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/MoreSettings.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/MoreSettings.kt
index a6e5e012..5e44ad37 100644
--- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/MoreSettings.kt
+++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/MoreSettings.kt
@@ -561,14 +561,42 @@ fun MoreSettingsScreen() {
                         },
                         onClick = { showThemeColorDialog = true },
                         trailingContent = {
-                            Row {
-                                themeColorOptions.take(4).forEach { (_, theme) ->
-                                    ColorCircle(
-                                        color = if (isDarkTheme) theme.primaryDark else theme.primaryLight,
-                                        isSelected = ThemeConfig.currentTheme::class == theme::class,
-                                        modifier = Modifier.padding(horizontal = 2.dp)
-                                    )
-                                }
+                            Row(
+                                verticalAlignment = Alignment.CenterVertically,
+                                modifier = Modifier.padding(start = 8.dp)
+                            ) {
+                                // 显示当前主题的三种主题色调
+                                val theme = ThemeConfig.currentTheme
+                                val isDark = isSystemInDarkTheme()
+
+                                // Primary color
+                                ColorCircle(
+                                    color = if (isDark) theme.primaryDark else theme.primaryLight,
+                                    isSelected = false,
+                                    modifier = Modifier.padding(horizontal = 2.dp)
+                                )
+
+                                // Secondary color
+                                ColorCircle(
+                                    color = if (isDark) theme.secondaryDark else theme.secondaryLight,
+                                    isSelected = false,
+                                    modifier = Modifier.padding(horizontal = 2.dp)
+                                )
+
+                                // Tertiary color
+                                ColorCircle(
+                                    color = if (isDark) theme.tertiaryDark else theme.tertiaryLight,
+                                    isSelected = false,
+                                    modifier = Modifier.padding(horizontal = 2.dp)
+                                )
+
+                                Spacer(modifier = Modifier.width(8.dp))
+
+                                Icon(
+                                    Icons.AutoMirrored.Filled.NavigateNext,
+                                    contentDescription = null,
+                                    tint = MaterialTheme.colorScheme.onSurfaceVariant
+                                )
                             }
                         }
                     )
@@ -1188,7 +1216,7 @@ fun SettingsCard(
                 }
                 Text(
                     text = title,
-                    style = MaterialTheme.typography.titleLarge,
+                    style = MaterialTheme.typography.titleMedium,
                 )
             }
             content()