manager: Update theme color scheme, fix style

* Remove redundant strings
* Bump MMRL

Co-authored-by: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com>
Co-authored-by: liaowenxuan <jby13147208050@163.com>
Signed-off-by: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com>

manager/app/src/main/java/com/sukisu/ultra/ui/screen/MoreSettings.kt

@@ -508,6 +508,7 @@ fun MoreSettingsScreen(navigator: DestinationsNavigator) {
 
     val cardColor = MaterialTheme.colorScheme.surfaceVariant
     val cardAlphaUse = CardConfig.cardAlpha
+    val isDarkTheme = isSystemInDarkTheme()
 
     Scaffold(
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
@@ -641,7 +642,6 @@ fun MoreSettingsScreen(navigator: DestinationsNavigator) {
                                     headlineContent = { Text(stringResource(R.string.theme_color)) },
                                     supportingContent = {
                                         val currentThemeName = when (ThemeConfig.currentTheme) {
-                                            is ThemeColors.Default -> stringResource(R.string.color_default)
                                             is ThemeColors.Green -> stringResource(R.string.color_green)
                                             is ThemeColors.Purple -> stringResource(R.string.color_purple)
                                             is ThemeColors.Orange -> stringResource(R.string.color_orange)
@@ -1108,9 +1108,9 @@ fun MoreSettingsScreen(navigator: DestinationsNavigator) {
                         val suSFS = getSuSFS()
                         val isSUS_SU = getSuSFSFeatures()
                         if (suSFS == "Supported" && isSUS_SU == "CONFIG_KSU_SUSFS_SUS_SU") {
-                            // 初始化时，默认启用
+                            // 默认启用
                             var isEnabled by rememberSaveable {
-                                mutableStateOf(true) // 默认启用
+                                mutableStateOf(true)
                             }
 
                             // 在启动时检查状态
@@ -1208,6 +1208,12 @@ fun MoreSettingsScreen(navigator: DestinationsNavigator) {
                                             ThemeConfig.forceDarkMode = null
                                             CardConfig.isUserLightModeEnabled = false
                                             CardConfig.isUserDarkModeEnabled = false
+                                            if (!CardConfig.isCustomAlphaSet) {
+                                                CardConfig.cardAlpha = 1f
+                                            }
+                                            if (!CardConfig.isCustomDimSet) {
+                                                CardConfig.cardDim = if (isDarkTheme) 0.5f else 0f
+                                            }
                                             CardConfig.save(context)
                                         }
                                     }
@@ -1285,7 +1291,6 @@ fun MoreSettingsScreen(navigator: DestinationsNavigator) {
                                 .fillMaxWidth()
                                 .clickable {
                                     context.saveThemeColors(when (theme) {
-                                        ThemeColors.Default -> "default"
                                         ThemeColors.Green -> "green"
                                         ThemeColors.Purple -> "purple"
                                         ThemeColors.Orange -> "orange"
@@ -1304,11 +1309,12 @@ fun MoreSettingsScreen(navigator: DestinationsNavigator) {
                                 onClick = null
                             )
                             Spacer(modifier = Modifier.width(12.dp))
+                            val isDark = isSystemInDarkTheme()
                             Box(
                                 modifier = Modifier
                                     .size(24.dp)
                                     .clip(CircleShape)
-                                    .background(theme.Primary)
+                                    .background(if (isDark) theme.primaryDark else theme.primaryLight)
                             )
                             Spacer(modifier = Modifier.width(12.dp))
                             Text(name)

manager/app/src/main/java/com/sukisu/ultra/ui/screen/Settings.kt

@@ -648,11 +648,6 @@ fun rememberUninstallDialog(onSelected: (UninstallType) -> Unit): DialogHandle {
         }
 
         var selectedOption by remember { mutableStateOf<UninstallType?>(null) }
-        val cardColor = if (!ThemeConfig.useDynamicColor) {
-            ThemeConfig.currentTheme.ButtonContrast
-        } else {
-            MaterialTheme.colorScheme.surfaceContainerHigh
-        }
 
         AlertDialog(
             onDismissRequest = {
@@ -781,7 +776,7 @@ fun rememberUninstallDialog(onSelected: (UninstallType) -> Unit): DialogHandle {
                     )
                 }
             },
-            containerColor = cardColor,
+            containerColor = MaterialTheme.colorScheme.secondaryContainer,
             shape = MaterialTheme.shapes.extraLarge,
             tonalElevation = 4.dp
         )

manager/app/src/main/java/com/sukisu/ultra/ui/theme/Color.kt

@@ -3,260 +3,602 @@ package com.sukisu.ultra.ui.theme
 import androidx.compose.ui.graphics.Color
 
 sealed class ThemeColors {
-    abstract val Primary: Color
+    // 浅色
-    abstract val Secondary: Color
+    abstract val primaryLight: Color
-    abstract val Tertiary: Color
+    abstract val onPrimaryLight: Color
-    abstract val OnPrimary: Color
+    abstract val primaryContainerLight: Color
-    abstract val OnSecondary: Color
+    abstract val onPrimaryContainerLight: Color
-    abstract val OnTertiary: Color
+    abstract val secondaryLight: Color
-    abstract val PrimaryContainer: Color
+    abstract val onSecondaryLight: Color
-    abstract val SecondaryContainer: Color
+    abstract val secondaryContainerLight: Color
-    abstract val TertiaryContainer: Color
+    abstract val onSecondaryContainerLight: Color
-    abstract val OnPrimaryContainer: Color
+    abstract val tertiaryLight: Color
-    abstract val OnSecondaryContainer: Color
+    abstract val onTertiaryLight: Color
-    abstract val OnTertiaryContainer: Color
+    abstract val tertiaryContainerLight: Color
-    abstract val ButtonContrast: Color
+    abstract val onTertiaryContainerLight: Color
-
+    abstract val errorLight: Color
-    // 表面颜色
+    abstract val onErrorLight: Color
-    abstract val Surface: Color
+    abstract val errorContainerLight: Color
-    abstract val SurfaceVariant: Color
+    abstract val onErrorContainerLight: Color
-    abstract val OnSurface: Color
+    abstract val backgroundLight: Color
-    abstract val OnSurfaceVariant: Color
+    abstract val onBackgroundLight: Color
-
+    abstract val surfaceLight: Color
-    // 错误状态颜色
+    abstract val onSurfaceLight: Color
-    abstract val Error: Color
+    abstract val surfaceVariantLight: Color
-    abstract val OnError: Color
+    abstract val onSurfaceVariantLight: Color
-    abstract val ErrorContainer: Color
+    abstract val outlineLight: Color
-    abstract val OnErrorContainer: Color
+    abstract val outlineVariantLight: Color
-
+    abstract val scrimLight: Color
-    // 边框和背景色
+    abstract val inverseSurfaceLight: Color
-    abstract val Outline: Color
+    abstract val inverseOnSurfaceLight: Color
-    abstract val OutlineVariant: Color
+    abstract val inversePrimaryLight: Color
-    abstract val Background: Color
+    abstract val surfaceDimLight: Color
-    abstract val OnBackground: Color
+    abstract val surfaceBrightLight: Color
+    abstract val surfaceContainerLowestLight: Color
+    abstract val surfaceContainerLowLight: Color
+    abstract val surfaceContainerLight: Color
+    abstract val surfaceContainerHighLight: Color
+    abstract val surfaceContainerHighestLight: Color
+    // 深色
+    abstract val primaryDark: Color
+    abstract val onPrimaryDark: Color
+    abstract val primaryContainerDark: Color
+    abstract val onPrimaryContainerDark: Color
+    abstract val secondaryDark: Color
+    abstract val onSecondaryDark: Color
+    abstract val secondaryContainerDark: Color
+    abstract val onSecondaryContainerDark: Color
+    abstract val tertiaryDark: Color
+    abstract val onTertiaryDark: Color
+    abstract val tertiaryContainerDark: Color
+    abstract val onTertiaryContainerDark: Color
+    abstract val errorDark: Color
+    abstract val onErrorDark: Color
+    abstract val errorContainerDark: Color
+    abstract val onErrorContainerDark: Color
+    abstract val backgroundDark: Color
+    abstract val onBackgroundDark: Color
+    abstract val surfaceDark: Color
+    abstract val onSurfaceDark: Color
+    abstract val surfaceVariantDark: Color
+    abstract val onSurfaceVariantDark: Color
+    abstract val outlineDark: Color
+    abstract val outlineVariantDark: Color
+    abstract val scrimDark: Color
+    abstract val inverseSurfaceDark: Color
+    abstract val inverseOnSurfaceDark: Color
+    abstract val inversePrimaryDark: Color
+    abstract val surfaceDimDark: Color
+    abstract val surfaceBrightDark: Color
+    abstract val surfaceContainerLowestDark: Color
+    abstract val surfaceContainerLowDark: Color
+    abstract val surfaceContainerDark: Color
+    abstract val surfaceContainerHighDark: Color
+    abstract val surfaceContainerHighestDark: Color
 
     // 默认主题 (蓝色)
     object Default : ThemeColors() {
-        override val Primary = Color(0xFF2196F3)
+        override val primaryLight = Color(0xFF415F91)
-        override val Secondary = Color(0xFF64B5F6)
+        override val onPrimaryLight = Color(0xFFFFFFFF)
-        override val Tertiary = Color(0xFF0D47A1)
+        override val primaryContainerLight = Color(0xFFD6E3FF)
-        override val OnPrimary = Color(0xFFFFFFFF)
+        override val onPrimaryContainerLight = Color(0xFF284777)
-        override val OnSecondary = Color(0xFFFFFFFF)
+        override val secondaryLight = Color(0xFF565F71)
-        override val OnTertiary = Color(0xFFFFFFFF)
+        override val onSecondaryLight = Color(0xFFFFFFFF)
-        override val PrimaryContainer = Color(0xFFD6EAFF)
+        override val secondaryContainerLight = Color(0xFFDAE2F9)
-        override val SecondaryContainer = Color(0xFFE3F2FD)
+        override val onSecondaryContainerLight = Color(0xFF3E4759)
-        override val TertiaryContainer = Color(0xFFCFD8DC)
+        override val tertiaryLight = Color(0xFF705575)
-        override val OnPrimaryContainer = Color(0xFF0A3049)
+        override val onTertiaryLight = Color(0xFFFFFFFF)
-        override val OnSecondaryContainer = Color(0xFF0D3C61)
+        override val tertiaryContainerLight = Color(0xFFFAD8FD)
-        override val OnTertiaryContainer = Color(0xFF071D41)
+        override val onTertiaryContainerLight = Color(0xFF573E5C)
-        override val ButtonContrast = Color(0xFF2196F3)
+        override val errorLight = Color(0xFFBA1A1A)
+        override val onErrorLight = Color(0xFFFFFFFF)
+        override val errorContainerLight = Color(0xFFFFDAD6)
+        override val onErrorContainerLight = Color(0xFF93000A)
+        override val backgroundLight = Color(0xFFF9F9FF)
+        override val onBackgroundLight = Color(0xFF191C20)
+        override val surfaceLight = Color(0xFFF9F9FF)
+        override val onSurfaceLight = Color(0xFF191C20)
+        override val surfaceVariantLight = Color(0xFFE0E2EC)
+        override val onSurfaceVariantLight = Color(0xFF44474E)
+        override val outlineLight = Color(0xFF74777F)
+        override val outlineVariantLight = Color(0xFFC4C6D0)
+        override val scrimLight = Color(0xFF000000)
+        override val inverseSurfaceLight = Color(0xFF2E3036)
+        override val inverseOnSurfaceLight = Color(0xFFF0F0F7)
+        override val inversePrimaryLight = Color(0xFFAAC7FF)
+        override val surfaceDimLight = Color(0xFFD9D9E0)
+        override val surfaceBrightLight = Color(0xFFF9F9FF)
+        override val surfaceContainerLowestLight = Color(0xFFFFFFFF)
+        override val surfaceContainerLowLight = Color(0xFFF3F3FA)
+        override val surfaceContainerLight = Color(0xFFEDEDF4)
+        override val surfaceContainerHighLight = Color(0xFFE7E8EE)
+        override val surfaceContainerHighestLight = Color(0xFFE2E2E9)
 
-        override val Surface = Color(0xFFF5F9FF)
+        override val primaryDark = Color(0xFFAAC7FF)
-        override val SurfaceVariant = Color(0xFFEDF5FE)
+        override val onPrimaryDark = Color(0xFF0A305F)
-        override val OnSurface = Color(0xFF1A1C1E)
+        override val primaryContainerDark = Color(0xFF284777)
-        override val OnSurfaceVariant = Color(0xFF42474E)
+        override val onPrimaryContainerDark = Color(0xFFD6E3FF)
-
+        override val secondaryDark = Color(0xFFBEC6DC)
-        override val Error = Color(0xFFB00020)
+        override val onSecondaryDark = Color(0xFF283141)
-        override val OnError = Color(0xFFFFFFFF)
+        override val secondaryContainerDark = Color(0xFF3E4759)
-        override val ErrorContainer = Color(0xFFFDE7E9)
+        override val onSecondaryContainerDark = Color(0xFFDAE2F9)
-        override val OnErrorContainer = Color(0xFF410008)
+        override val tertiaryDark = Color(0xFFDDBCE0)
-
+        override val onTertiaryDark = Color(0xFF3F2844)
-        override val Outline = Color(0xFFBAC3CF)
+        override val tertiaryContainerDark = Color(0xFF573E5C)
-        override val OutlineVariant = Color(0xFFDFE3EB)
+        override val onTertiaryContainerDark = Color(0xFFFAD8FD)
-        override val Background = Color(0xFFFAFCFF)
+        override val errorDark = Color(0xFFFFB4AB)
-        override val OnBackground = Color(0xFF1A1C1E)
+        override val onErrorDark = Color(0xFF690005)
+        override val errorContainerDark = Color(0xFF93000A)
+        override val onErrorContainerDark = Color(0xFFFFDAD6)
+        override val backgroundDark = Color(0xFF111318)
+        override val onBackgroundDark = Color(0xFFE2E2E9)
+        override val surfaceDark = Color(0xFF111318)
+        override val onSurfaceDark = Color(0xFFE2E2E9)
+        override val surfaceVariantDark = Color(0xFF44474E)
+        override val onSurfaceVariantDark = Color(0xFFC4C6D0)
+        override val outlineDark = Color(0xFF8E9099)
+        override val outlineVariantDark = Color(0xFF44474E)
+        override val scrimDark = Color(0xFF000000)
+        override val inverseSurfaceDark = Color(0xFFE2E2E9)
+        override val inverseOnSurfaceDark = Color(0xFF2E3036)
+        override val inversePrimaryDark = Color(0xFF415F91)
+        override val surfaceDimDark = Color(0xFF111318)
+        override val surfaceBrightDark = Color(0xFF37393E)
+        override val surfaceContainerLowestDark = Color(0xFF0C0E13)
+        override val surfaceContainerLowDark = Color(0xFF191C20)
+        override val surfaceContainerDark = Color(0xFF1D2024)
+        override val surfaceContainerHighDark = Color(0xFF282A2F)
+        override val surfaceContainerHighestDark = Color(0xFF33353A)
     }
 
     // 绿色主题
     object Green : ThemeColors() {
-        override val Primary = Color(0xFF43A047)
+        override val primaryLight = Color(0xFF4C662B)
-        override val Secondary = Color(0xFF66BB6A)
+        override val onPrimaryLight = Color(0xFFFFFFFF)
-        override val Tertiary = Color(0xFF1B5E20)
+        override val primaryContainerLight = Color(0xFFCDEDA3)
-        override val OnPrimary = Color(0xFFFFFFFF)
+        override val onPrimaryContainerLight = Color(0xFF354E16)
-        override val OnSecondary = Color(0xFFFFFFFF)
+        override val secondaryLight = Color(0xFF586249)
-        override val OnTertiary = Color(0xFFFFFFFF)
+        override val onSecondaryLight = Color(0xFFFFFFFF)
-        override val PrimaryContainer = Color(0xFFD8EFDB)
+        override val secondaryContainerLight = Color(0xFFDCE7C8)
-        override val SecondaryContainer = Color(0xFFE8F5E9)
+        override val onSecondaryContainerLight = Color(0xFF404A33)
-        override val TertiaryContainer = Color(0xFFB9F6CA)
+        override val tertiaryLight = Color(0xFF386663)
-        override val OnPrimaryContainer = Color(0xFF0A280D)
+        override val onTertiaryLight = Color(0xFFFFFFFF)
-        override val OnSecondaryContainer = Color(0xFF0E2912)
+        override val tertiaryContainerLight = Color(0xFFBCECE7)
-        override val OnTertiaryContainer = Color(0xFF051B07)
+        override val onTertiaryContainerLight = Color(0xFF1F4E4B)
-        override val ButtonContrast = Color(0xFF43A047)
+        override val errorLight = Color(0xFFBA1A1A)
+        override val onErrorLight = Color(0xFFFFFFFF)
+        override val errorContainerLight = Color(0xFFFFDAD6)
+        override val onErrorContainerLight = Color(0xFF93000A)
+        override val backgroundLight = Color(0xFFF9FAEF)
+        override val onBackgroundLight = Color(0xFF1A1C16)
+        override val surfaceLight = Color(0xFFF9FAEF)
+        override val onSurfaceLight = Color(0xFF1A1C16)
+        override val surfaceVariantLight = Color(0xFFE1E4D5)
+        override val onSurfaceVariantLight = Color(0xFF44483D)
+        override val outlineLight = Color(0xFF75796C)
+        override val outlineVariantLight = Color(0xFFC5C8BA)
+        override val scrimLight = Color(0xFF000000)
+        override val inverseSurfaceLight = Color(0xFF2F312A)
+        override val inverseOnSurfaceLight = Color(0xFFF1F2E6)
+        override val inversePrimaryLight = Color(0xFFB1D18A)
+        override val surfaceDimLight = Color(0xFFDADBD0)
+        override val surfaceBrightLight = Color(0xFFF9FAEF)
+        override val surfaceContainerLowestLight = Color(0xFFFFFFFF)
+        override val surfaceContainerLowLight = Color(0xFFF3F4E9)
+        override val surfaceContainerLight = Color(0xFFEEEFE3)
+        override val surfaceContainerHighLight = Color(0xFFE8E9DE)
+        override val surfaceContainerHighestLight = Color(0xFFE2E3D8)
 
-        override val Surface = Color(0xFFF6FBF6)
+        override val primaryDark = Color(0xFFB1D18A)
-        override val SurfaceVariant = Color(0xFFEDF7EE)
+        override val onPrimaryDark = Color(0xFF1F3701)
-        override val OnSurface = Color(0xFF191C19)
+        override val primaryContainerDark = Color(0xFF354E16)
-        override val OnSurfaceVariant = Color(0xFF414941)
+        override val onPrimaryContainerDark = Color(0xFFCDEDA3)
-
+        override val secondaryDark = Color(0xFFBFCBAD)
-        override val Error = Color(0xFFC62828)
+        override val onSecondaryDark = Color(0xFF2A331E)
-        override val OnError = Color(0xFFFFFFFF)
+        override val secondaryContainerDark = Color(0xFF404A33)
-        override val ErrorContainer = Color(0xFFF8D7DA)
+        override val onSecondaryContainerDark = Color(0xFFDCE7C8)
-        override val OnErrorContainer = Color(0xFF4A0808)
+        override val tertiaryDark = Color(0xFFA0D0CB)
-
+        override val onTertiaryDark = Color(0xFF003735)
-        override val Outline = Color(0xFFBDC9BF)
+        override val tertiaryContainerDark = Color(0xFF1F4E4B)
-        override val OutlineVariant = Color(0xFFDDE6DE)
+        override val onTertiaryContainerDark = Color(0xFFBCECE7)
-        override val Background = Color(0xFFFBFDFB)
+        override val errorDark = Color(0xFFFFB4AB)
-        override val OnBackground = Color(0xFF191C19)
+        override val onErrorDark = Color(0xFF690005)
+        override val errorContainerDark = Color(0xFF93000A)
+        override val onErrorContainerDark = Color(0xFFFFDAD6)
+        override val backgroundDark = Color(0xFF12140E)
+        override val onBackgroundDark = Color(0xFFE2E3D8)
+        override val surfaceDark = Color(0xFF12140E)
+        override val onSurfaceDark = Color(0xFFE2E3D8)
+        override val surfaceVariantDark = Color(0xFF44483D)
+        override val onSurfaceVariantDark = Color(0xFFC5C8BA)
+        override val outlineDark = Color(0xFF8F9285)
+        override val outlineVariantDark = Color(0xFF44483D)
+        override val scrimDark = Color(0xFF000000)
+        override val inverseSurfaceDark = Color(0xFFE2E3D8)
+        override val inverseOnSurfaceDark = Color(0xFF2F312A)
+        override val inversePrimaryDark = Color(0xFF4C662B)
+        override val surfaceDimDark = Color(0xFF12140E)
+        override val surfaceBrightDark = Color(0xFF383A32)
+        override val surfaceContainerLowestDark = Color(0xFF0C0F09)
+        override val surfaceContainerLowDark = Color(0xFF1A1C16)
+        override val surfaceContainerDark = Color(0xFF1E201A)
+        override val surfaceContainerHighDark = Color(0xFF282B24)
+        override val surfaceContainerHighestDark = Color(0xFF33362E)
     }
 
     // 紫色主题
     object Purple : ThemeColors() {
-        override val Primary = Color(0xFF9C27B0)
+        override val primaryLight = Color(0xFF7C4E7E)
-        override val Secondary = Color(0xFFBA68C8)
+        override val onPrimaryLight = Color(0xFFFFFFFF)
-        override val Tertiary = Color(0xFF6A1B9A)
+        override val primaryContainerLight = Color(0xFFFFD6FC)
-        override val OnPrimary = Color(0xFFFFFFFF)
+        override val onPrimaryContainerLight = Color(0xFF623765)
-        override val OnSecondary = Color(0xFFFFFFFF)
+        override val secondaryLight = Color(0xFF6C586B)
-        override val OnTertiary = Color(0xFFFFFFFF)
+        override val onSecondaryLight = Color(0xFFFFFFFF)
-        override val PrimaryContainer = Color(0xFFF3D8F8)
+        override val secondaryContainerLight = Color(0xFFF5DBF1)
-        override val SecondaryContainer = Color(0xFFF5E9F7)
+        override val onSecondaryContainerLight = Color(0xFF534152)
-        override val TertiaryContainer = Color(0xFFE1BEE7)
+        override val tertiaryLight = Color(0xFF825249)
-        override val OnPrimaryContainer = Color(0xFF2A0934)
+        override val onTertiaryLight = Color(0xFFFFFFFF)
-        override val OnSecondaryContainer = Color(0xFF3C0F50)
+        override val tertiaryContainerLight = Color(0xFFFFDAD4)
-        override val OnTertiaryContainer = Color(0xFF1D0830)
+        override val onTertiaryContainerLight = Color(0xFF673B33)
-        override val ButtonContrast = Color(0xFF9C27B0)
+        override val errorLight = Color(0xFFBA1A1A)
+        override val onErrorLight = Color(0xFFFFFFFF)
+        override val errorContainerLight = Color(0xFFFFDAD6)
+        override val onErrorContainerLight = Color(0xFF93000A)
+        override val backgroundLight = Color(0xFFFFF7FA)
+        override val onBackgroundLight = Color(0xFF1F1A1F)
+        override val surfaceLight = Color(0xFFFFF7FA)
+        override val onSurfaceLight = Color(0xFF1F1A1F)
+        override val surfaceVariantLight = Color(0xFFEDDFE8)
+        override val onSurfaceVariantLight = Color(0xFF4D444C)
+        override val outlineLight = Color(0xFF7F747C)
+        override val outlineVariantLight = Color(0xFFD0C3CC)
+        override val scrimLight = Color(0xFF000000)
+        override val inverseSurfaceLight = Color(0xFF352F34)
+        override val inverseOnSurfaceLight = Color(0xFFF9EEF4)
+        override val inversePrimaryLight = Color(0xFFECB4EC)
+        override val surfaceDimLight = Color(0xFFE2D7DE)
+        override val surfaceBrightLight = Color(0xFFFFF7FA)
+        override val surfaceContainerLowestLight = Color(0xFFFFFFFF)
+        override val surfaceContainerLowLight = Color(0xFFFCF0F7)
+        override val surfaceContainerLight = Color(0xFFF6EBF2)
+        override val surfaceContainerHighLight = Color(0xFFF0E5EC)
+        override val surfaceContainerHighestLight = Color(0xFFEBDFE6)
 
-        override val Surface = Color(0xFFFCF6FF)
+        override val primaryDark = Color(0xFFECB4EC)
-        override val SurfaceVariant = Color(0xFFF5EEFA)
+        override val onPrimaryDark = Color(0xFF49204D)
-        override val OnSurface = Color(0xFF1D1B1E)
+        override val primaryContainerDark = Color(0xFF623765)
-        override val OnSurfaceVariant = Color(0xFF49454E)
+        override val onPrimaryContainerDark = Color(0xFFFFD6FC)
-
+        override val secondaryDark = Color(0xFFD8BFD5)
-        override val Error = Color(0xFFD50000)
+        override val onSecondaryDark = Color(0xFF3B2B3B)
-        override val OnError = Color(0xFFFFFFFF)
+        override val secondaryContainerDark = Color(0xFF534152)
-        override val ErrorContainer = Color(0xFFFFDCD5)
+        override val onSecondaryContainerDark = Color(0xFFF5DBF1)
-        override val OnErrorContainer = Color(0xFF480000)
+        override val tertiaryDark = Color(0xFFF6B8AD)
-
+        override val onTertiaryDark = Color(0xFF4C251F)
-        override val Outline = Color(0xFFC9B9D0)
+        override val tertiaryContainerDark = Color(0xFF673B33)
-        override val OutlineVariant = Color(0xFFE8DAED)
+        override val onTertiaryContainerDark = Color(0xFFFFDAD4)
-        override val Background = Color(0xFFFFFBFF)
+        override val errorDark = Color(0xFFFFB4AB)
-        override val OnBackground = Color(0xFF1D1B1E)
+        override val onErrorDark = Color(0xFF690005)
+        override val errorContainerDark = Color(0xFF93000A)
+        override val onErrorContainerDark = Color(0xFFFFDAD6)
+        override val backgroundDark = Color(0xFF171216)
+        override val onBackgroundDark = Color(0xFFEBDFE6)
+        override val surfaceDark = Color(0xFF171216)
+        override val onSurfaceDark = Color(0xFFEBDFE6)
+        override val surfaceVariantDark = Color(0xFF4D444C)
+        override val onSurfaceVariantDark = Color(0xFFD0C3CC)
+        override val outlineDark = Color(0xFF998D96)
+        override val outlineVariantDark = Color(0xFF4D444C)
+        override val scrimDark = Color(0xFF000000)
+        override val inverseSurfaceDark = Color(0xFFEBDFE6)
+        override val inverseOnSurfaceDark = Color(0xFF352F34)
+        override val inversePrimaryDark = Color(0xFF7C4E7E)
+        override val surfaceDimDark = Color(0xFF171216)
+        override val surfaceBrightDark = Color(0xFF3E373D)
+        override val surfaceContainerLowestDark = Color(0xFF110D11)
+        override val surfaceContainerLowDark = Color(0xFF1F1A1F)
+        override val surfaceContainerDark = Color(0xFF231E23)
+        override val surfaceContainerHighDark = Color(0xFF2E282D)
+        override val surfaceContainerHighestDark = Color(0xFF393338)
     }
 
     // 橙色主题
     object Orange : ThemeColors() {
-        override val Primary = Color(0xFFFF9800)
+        override val primaryLight = Color(0xFF8B4F24)
-        override val Secondary = Color(0xFFFFB74D)
+        override val onPrimaryLight = Color(0xFFFFFFFF)
-        override val Tertiary = Color(0xFFE65100)
+        override val primaryContainerLight = Color(0xFFFFDCC7)
-        override val OnPrimary = Color(0xFFFFFFFF)
+        override val onPrimaryContainerLight = Color(0xFF6E390E)
-        override val OnSecondary = Color(0xFF000000)
+        override val secondaryLight = Color(0xFF755846)
-        override val OnTertiary = Color(0xFFFFFFFF)
+        override val onSecondaryLight = Color(0xFFFFFFFF)
-        override val PrimaryContainer = Color(0xFFFFECCC)
+        override val secondaryContainerLight = Color(0xFFFFDCC7)
-        override val SecondaryContainer = Color(0xFFFFF0D9)
+        override val onSecondaryContainerLight = Color(0xFF5B4130)
-        override val TertiaryContainer = Color(0xFFFFD180)
+        override val tertiaryLight = Color(0xFF865219)
-        override val OnPrimaryContainer = Color(0xFF351F00)
+        override val onTertiaryLight = Color(0xFFFFFFFF)
-        override val OnSecondaryContainer = Color(0xFF3D2800)
+        override val tertiaryContainerLight = Color(0xFFFFDCBF)
-        override val OnTertiaryContainer = Color(0xFF2E1500)
+        override val onTertiaryContainerLight = Color(0xFF6A3B01)
-        override val ButtonContrast = Color(0xFFFF9800)
+        override val errorLight = Color(0xFFBA1A1A)
+        override val onErrorLight = Color(0xFFFFFFFF)
+        override val errorContainerLight = Color(0xFFFFDAD6)
+        override val onErrorContainerLight = Color(0xFF93000A)
+        override val backgroundLight = Color(0xFFFFF8F5)
+        override val onBackgroundLight = Color(0xFF221A15)
+        override val surfaceLight = Color(0xFFFFF8F5)
+        override val onSurfaceLight = Color(0xFF221A15)
+        override val surfaceVariantLight = Color(0xFFF4DED3)
+        override val onSurfaceVariantLight = Color(0xFF52443C)
+        override val outlineLight = Color(0xFF84746A)
+        override val outlineVariantLight = Color(0xFFD7C3B8)
+        override val scrimLight = Color(0xFF000000)
+        override val inverseSurfaceLight = Color(0xFF382E29)
+        override val inverseOnSurfaceLight = Color(0xFFFFEDE5)
+        override val inversePrimaryLight = Color(0xFFFFB787)
+        override val surfaceDimLight = Color(0xFFE7D7CE)
+        override val surfaceBrightLight = Color(0xFFFFF8F5)
+        override val surfaceContainerLowestLight = Color(0xFFFFFFFF)
+        override val surfaceContainerLowLight = Color(0xFFFFF1EA)
+        override val surfaceContainerLight = Color(0xFFFCEBE2)
+        override val surfaceContainerHighLight = Color(0xFFF6E5DC)
+        override val surfaceContainerHighestLight = Color(0xFFF0DFD7)
 
-        override val Surface = Color(0xFFFFF8F3)
+        override val primaryDark = Color(0xFFFFB787)
-        override val SurfaceVariant = Color(0xFFFFF0E6)
+        override val onPrimaryDark = Color(0xFF502400)
-        override val OnSurface = Color(0xFF1F1B16)
+        override val primaryContainerDark = Color(0xFF6E390E)
-        override val OnSurfaceVariant = Color(0xFF4E4639)
+        override val onPrimaryContainerDark = Color(0xFFFFDCC7)
-
+        override val secondaryDark = Color(0xFFE5BFA8)
-        override val Error = Color(0xFFD32F2F)
+        override val onSecondaryDark = Color(0xFF422B1B)
-        override val OnError = Color(0xFFFFFFFF)
+        override val secondaryContainerDark = Color(0xFF5B4130)
-        override val ErrorContainer = Color(0xFFFFDBC8)
+        override val onSecondaryContainerDark = Color(0xFFFFDCC7)
-        override val OnErrorContainer = Color(0xFF490700)
+        override val tertiaryDark = Color(0xFFFDB876)
-
+        override val onTertiaryDark = Color(0xFF4B2800)
-        override val Outline = Color(0xFFD6C3AD)
+        override val tertiaryContainerDark = Color(0xFF6A3B01)
-        override val OutlineVariant = Color(0xFFEFDFCC)
+        override val onTertiaryContainerDark = Color(0xFFFFDCBF)
-        override val Background = Color(0xFFFFFBFF)
+        override val errorDark = Color(0xFFFFB4AB)
-        override val OnBackground = Color(0xFF1F1B16)
+        override val onErrorDark = Color(0xFF690005)
+        override val errorContainerDark = Color(0xFF93000A)
+        override val onErrorContainerDark = Color(0xFFFFDAD6)
+        override val backgroundDark = Color(0xFF19120D)
+        override val onBackgroundDark = Color(0xFFF0DFD7)
+        override val surfaceDark = Color(0xFF19120D)
+        override val onSurfaceDark = Color(0xFFF0DFD7)
+        override val surfaceVariantDark = Color(0xFF52443C)
+        override val onSurfaceVariantDark = Color(0xFFD7C3B8)
+        override val outlineDark = Color(0xFF9F8D83)
+        override val outlineVariantDark = Color(0xFF52443C)
+        override val scrimDark = Color(0xFF000000)
+        override val inverseSurfaceDark = Color(0xFFF0DFD7)
+        override val inverseOnSurfaceDark = Color(0xFF382E29)
+        override val inversePrimaryDark = Color(0xFF8B4F24)
+        override val surfaceDimDark = Color(0xFF19120D)
+        override val surfaceBrightDark = Color(0xFF413731)
+        override val surfaceContainerLowestDark = Color(0xFF140D08)
+        override val surfaceContainerLowDark = Color(0xFF221A15)
+        override val surfaceContainerDark = Color(0xFF261E19)
+        override val surfaceContainerHighDark = Color(0xFF312823)
+        override val surfaceContainerHighestDark = Color(0xFF3D332D)
     }
 
     // 粉色主题
     object Pink : ThemeColors() {
-        override val Primary = Color(0xFFE91E63)
+        override val primaryLight = Color(0xFF8C4A60)
-        override val Secondary = Color(0xFFF06292)
+        override val onPrimaryLight = Color(0xFFFFFFFF)
-        override val Tertiary = Color(0xFF880E4F)
+        override val primaryContainerLight = Color(0xFFFFD9E2)
-        override val OnPrimary = Color(0xFFFFFFFF)
+        override val onPrimaryContainerLight = Color(0xFF703348)
-        override val OnSecondary = Color(0xFFFFFFFF)
+        override val secondaryLight = Color(0xFF8B4A62)
-        override val OnTertiary = Color(0xFFFFFFFF)
+        override val onSecondaryLight = Color(0xFFFFFFFF)
-        override val PrimaryContainer = Color(0xFFFCE4EC)
+        override val secondaryContainerLight = Color(0xFFFFD9E3)
-        override val SecondaryContainer = Color(0xFFFCE4EC)
+        override val onSecondaryContainerLight = Color(0xFF6F334B)
-        override val TertiaryContainer = Color(0xFFF8BBD0)
+        override val tertiaryLight = Color(0xFF8B4A62)
-        override val OnPrimaryContainer = Color(0xFF3B0819)
+        override val onTertiaryLight = Color(0xFFFFFFFF)
-        override val OnSecondaryContainer = Color(0xFF3B0819)
+        override val tertiaryContainerLight = Color(0xFFFFD9E3)
-        override val OnTertiaryContainer = Color(0xFF2B0516)
+        override val onTertiaryContainerLight = Color(0xFF6F334B)
-        override val ButtonContrast = Color(0xFFE91E63)
+        override val errorLight = Color(0xFFBA1A1A)
+        override val onErrorLight = Color(0xFFFFFFFF)
+        override val errorContainerLight = Color(0xFFFFDAD6)
+        override val onErrorContainerLight = Color(0xFF93000A)
+        override val backgroundLight = Color(0xFFFFF8F8)
+        override val onBackgroundLight = Color(0xFF22191B)
+        override val surfaceLight = Color(0xFFFFF8F8)
+        override val onSurfaceLight = Color(0xFF22191B)
+        override val surfaceVariantLight = Color(0xFFF2DDE1)
+        override val onSurfaceVariantLight = Color(0xFF514346)
+        override val outlineLight = Color(0xFF837377)
+        override val outlineVariantLight = Color(0xFFD5C2C5)
+        override val scrimLight = Color(0xFF000000)
+        override val inverseSurfaceLight = Color(0xFF372E30)
+        override val inverseOnSurfaceLight = Color(0xFFFDEDEF)
+        override val inversePrimaryLight = Color(0xFFFFB1C7)
+        override val surfaceDimLight = Color(0xFFE6D6D9)
+        override val surfaceBrightLight = Color(0xFFFFF8F8)
+        override val surfaceContainerLowestLight = Color(0xFFFFFFFF)
+        override val surfaceContainerLowLight = Color(0xFFFFF0F2)
+        override val surfaceContainerLight = Color(0xFFFBEAED)
+        override val surfaceContainerHighLight = Color(0xFFF5E4E7)
+        override val surfaceContainerHighestLight = Color(0xFFEFDFE1)
 
-        override val Surface = Color(0xFFFFF7F9)
+        override val primaryDark = Color(0xFFFFB1C7)
-        override val SurfaceVariant = Color(0xFFFCEEF2)
+        override val onPrimaryDark = Color(0xFF541D32)
-        override val OnSurface = Color(0xFF201A1C)
+        override val primaryContainerDark = Color(0xFF703348)
-        override val OnSurfaceVariant = Color(0xFF534347)
+        override val onPrimaryContainerDark = Color(0xFFFFD9E2)
-
+        override val secondaryDark = Color(0xFFFFB0CB)
-        override val Error = Color(0xFFB71C1C)
+        override val onSecondaryDark = Color(0xFF541D34)
-        override val OnError = Color(0xFFFFFFFF)
+        override val secondaryContainerDark = Color(0xFF6F334B)
-        override val ErrorContainer = Color(0xFFFFDAD6)
+        override val onSecondaryContainerDark = Color(0xFFFFD9E3)
-        override val OnErrorContainer = Color(0xFF410002)
+        override val tertiaryDark = Color(0xFFFFB0CB)
-
+        override val onTertiaryDark = Color(0xFF541D34)
-        override val Outline = Color(0xFFD6BABF)
+        override val tertiaryContainerDark = Color(0xFF6F334B)
-        override val OutlineVariant = Color(0xFFEFDDE0)
+        override val onTertiaryContainerDark = Color(0xFFFFD9E3)
-        override val Background = Color(0xFFFFFBFF)
+        override val errorDark = Color(0xFFFFB4AB)
-        override val OnBackground = Color(0xFF201A1C)
+        override val onErrorDark = Color(0xFF690005)
+        override val errorContainerDark = Color(0xFF93000A)
+        override val onErrorContainerDark = Color(0xFFFFDAD6)
+        override val backgroundDark = Color(0xFF191113)
+        override val onBackgroundDark = Color(0xFFEFDFE1)
+        override val surfaceDark = Color(0xFF191113)
+        override val onSurfaceDark = Color(0xFFEFDFE1)
+        override val surfaceVariantDark = Color(0xFF514346)
+        override val onSurfaceVariantDark = Color(0xFFD5C2C5)
+        override val outlineDark = Color(0xFF9E8C90)
+        override val outlineVariantDark = Color(0xFF514346)
+        override val scrimDark = Color(0xFF000000)
+        override val inverseSurfaceDark = Color(0xFFEFDFE1)
+        override val inverseOnSurfaceDark = Color(0xFF372E30)
+        override val inversePrimaryDark = Color(0xFF8C4A60)
+        override val surfaceDimDark = Color(0xFF191113)
+        override val surfaceBrightDark = Color(0xFF413739)
+        override val surfaceContainerLowestDark = Color(0xFF140C0E)
+        override val surfaceContainerLowDark = Color(0xFF22191B)
+        override val surfaceContainerDark = Color(0xFF261D1F)
+        override val surfaceContainerHighDark = Color(0xFF31282A)
+        override val surfaceContainerHighestDark = Color(0xFF3C3234)
     }
 
     // 灰色主题
     object Gray : ThemeColors() {
-        override val Primary = Color(0xFF607D8B)
+        override val primaryLight = Color(0xFF5B5C5C)
-        override val Secondary = Color(0xFF90A4AE)
+        override val onPrimaryLight = Color(0xFFFFFFFF)
-        override val Tertiary = Color(0xFF455A64)
+        override val primaryContainerLight = Color(0xFF747474)
-        override val OnPrimary = Color(0xFFFFFFFF)
+        override val onPrimaryContainerLight = Color(0xFFFEFCFC)
-        override val OnSecondary = Color(0xFFFFFFFF)
+        override val secondaryLight = Color(0xFF5F5E5E)
-        override val OnTertiary = Color(0xFFFFFFFF)
+        override val onSecondaryLight = Color(0xFFFFFFFF)
-        override val PrimaryContainer = Color(0xFFECEFF1)
+        override val secondaryContainerLight = Color(0xFFE4E2E1)
-        override val SecondaryContainer = Color(0xFFECEFF1)
+        override val onSecondaryContainerLight = Color(0xFF656464)
-        override val TertiaryContainer = Color(0xFFCFD8DC)
+        override val tertiaryLight = Color(0xFF5E5B5D)
-        override val OnPrimaryContainer = Color(0xFF1A2327)
+        override val onTertiaryLight = Color(0xFFFFFFFF)
-        override val OnSecondaryContainer = Color(0xFF1A2327)
+        override val tertiaryContainerLight = Color(0xFF777375)
-        override val OnTertiaryContainer = Color(0xFF121A1D)
+        override val onTertiaryContainerLight = Color(0xFFFFFBFF)
-        override val ButtonContrast = Color(0xFF607D8B)
+        override val errorLight = Color(0xFFBA1A1A)
+        override val onErrorLight = Color(0xFFFFFFFF)
+        override val errorContainerLight = Color(0xFFFFDAD6)
+        override val onErrorContainerLight = Color(0xFF93000A)
+        override val backgroundLight = Color(0xFFFCF8F8)
+        override val onBackgroundLight = Color(0xFF1C1B1B)
+        override val surfaceLight = Color(0xFFFCF8F8)
+        override val onSurfaceLight = Color(0xFF1C1B1B)
+        override val surfaceVariantLight = Color(0xFFE0E3E3)
+        override val onSurfaceVariantLight = Color(0xFF444748)
+        override val outlineLight = Color(0xFF747878)
+        override val outlineVariantLight = Color(0xFFC4C7C7)
+        override val scrimLight = Color(0xFF000000)
+        override val inverseSurfaceLight = Color(0xFF313030)
+        override val inverseOnSurfaceLight = Color(0xFFF4F0EF)
+        override val inversePrimaryLight = Color(0xFFC7C6C6)
+        override val surfaceDimLight = Color(0xFFDDD9D8)
+        override val surfaceBrightLight = Color(0xFFFCF8F8)
+        override val surfaceContainerLowestLight = Color(0xFFFFFFFF)
+        override val surfaceContainerLowLight = Color(0xFFF7F3F2)
+        override val surfaceContainerLight = Color(0xFFF1EDEC)
+        override val surfaceContainerHighLight = Color(0xFFEBE7E7)
+        override val surfaceContainerHighestLight = Color(0xFFE5E2E1)
 
-        override val Surface = Color(0xFFF6F9FB)
+        override val primaryDark = Color(0xFFC7C6C6)
-        override val SurfaceVariant = Color(0xFFEEF2F4)
+        override val onPrimaryDark = Color(0xFF303031)
-        override val OnSurface = Color(0xFF191C1E)
+        override val primaryContainerDark = Color(0xFF919190)
-        override val OnSurfaceVariant = Color(0xFF41484D)
+        override val onPrimaryContainerDark = Color(0xFF161718)
-
+        override val secondaryDark = Color(0xFFC8C6C5)
-        override val Error = Color(0xFFC62828)
+        override val onSecondaryDark = Color(0xFF303030)
-        override val OnError = Color(0xFFFFFFFF)
+        override val secondaryContainerDark = Color(0xFF474746)
-        override val ErrorContainer = Color(0xFFFFDAD6)
+        override val onSecondaryContainerDark = Color(0xFFB7B5B4)
-        override val OnErrorContainer = Color(0xFF410002)
+        override val tertiaryDark = Color(0xFFCAC5C7)
-
+        override val onTertiaryDark = Color(0xFF323031)
-        override val Outline = Color(0xFFBDC1C4)
+        override val tertiaryContainerDark = Color(0xFF948F91)
-        override val OutlineVariant = Color(0xFFDDE1E3)
+        override val onTertiaryContainerDark = Color(0xFF181718)
-        override val Background = Color(0xFFFBFCFE)
+        override val errorDark = Color(0xFFFFB4AB)
-        override val OnBackground = Color(0xFF191C1E)
+        override val onErrorDark = Color(0xFF690005)
+        override val errorContainerDark = Color(0xFF93000A)
+        override val onErrorContainerDark = Color(0xFFFFDAD6)
+        override val backgroundDark = Color(0xFF141313)
+        override val onBackgroundDark = Color(0xFFE5E2E1)
+        override val surfaceDark = Color(0xFF141313)
+        override val onSurfaceDark = Color(0xFFE5E2E1)
+        override val surfaceVariantDark = Color(0xFF444748)
+        override val onSurfaceVariantDark = Color(0xFFC4C7C7)
+        override val outlineDark = Color(0xFF8E9192)
+        override val outlineVariantDark = Color(0xFF444748)
+        override val scrimDark = Color(0xFF000000)
+        override val inverseSurfaceDark = Color(0xFFE5E2E1)
+        override val inverseOnSurfaceDark = Color(0xFF313030)
+        override val inversePrimaryDark = Color(0xFF5E5E5E)
+        override val surfaceDimDark = Color(0xFF141313)
+        override val surfaceBrightDark = Color(0xFF3A3939)
+        override val surfaceContainerLowestDark = Color(0xFF0E0E0E)
+        override val surfaceContainerLowDark = Color(0xFF1C1B1B)
+        override val surfaceContainerDark = Color(0xFF201F1F)
+        override val surfaceContainerHighDark = Color(0xFF2A2A2A)
+        override val surfaceContainerHighestDark = Color(0xFF353434)
     }
 
     // 黄色主题
     object Yellow : ThemeColors() {
-        override val Primary = Color(0xFFFFC107)
+        override val primaryLight = Color(0xFF6D5E0F)
-        override val Secondary = Color(0xFFFFD54F)
+        override val onPrimaryLight = Color(0xFFFFFFFF)
-        override val Tertiary = Color(0xFFFF8F00)
+        override val primaryContainerLight = Color(0xFFF8E288)
-        override val OnPrimary = Color(0xFF000000)
+        override val onPrimaryContainerLight = Color(0xFF534600)
-        override val OnSecondary = Color(0xFF000000)
+        override val secondaryLight = Color(0xFF6D5E0F)
-        override val OnTertiary = Color(0xFFFFFFFF)
+        override val onSecondaryLight = Color(0xFFFFFFFF)
-        override val PrimaryContainer = Color(0xFFFFF8E1)
+        override val secondaryContainerLight = Color(0xFFF7E388)
-        override val SecondaryContainer = Color(0xFFFFF8E1)
+        override val onSecondaryContainerLight = Color(0xFF534600)
-        override val TertiaryContainer = Color(0xFFFFECB3)
+        override val tertiaryLight = Color(0xFF685F13)
-        override val OnPrimaryContainer = Color(0xFF332A00)
+        override val onTertiaryLight = Color(0xFFFFFFFF)
-        override val OnSecondaryContainer = Color(0xFF332A00)
+        override val tertiaryContainerLight = Color(0xFFF1E58A)
-        override val OnTertiaryContainer = Color(0xFF221200)
+        override val onTertiaryContainerLight = Color(0xFF4F4800)
-        override val ButtonContrast = Color(0xFFFFC107)
+        override val errorLight = Color(0xFFBA1A1A)
+        override val onErrorLight = Color(0xFFFFFFFF)
+        override val errorContainerLight = Color(0xFFFFDAD6)
+        override val onErrorContainerLight = Color(0xFF93000A)
+        override val backgroundLight = Color(0xFFFFF9ED)
+        override val onBackgroundLight = Color(0xFF1E1C13)
+        override val surfaceLight = Color(0xFFFFF9ED)
+        override val onSurfaceLight = Color(0xFF1E1C13)
+        override val surfaceVariantLight = Color(0xFFE9E2D0)
+        override val onSurfaceVariantLight = Color(0xFF4B4739)
+        override val outlineLight = Color(0xFF7C7768)
+        override val outlineVariantLight = Color(0xFFCDC6B4)
+        override val scrimLight = Color(0xFF000000)
+        override val inverseSurfaceLight = Color(0xFF333027)
+        override val inverseOnSurfaceLight = Color(0xFFF7F0E2)
+        override val inversePrimaryLight = Color(0xFFDAC66F)
+        override val surfaceDimLight = Color(0xFFE0D9CC)
+        override val surfaceBrightLight = Color(0xFFFFF9ED)
+        override val surfaceContainerLowestLight = Color(0xFFFFFFFF)
+        override val surfaceContainerLowLight = Color(0xFFFAF3E5)
+        override val surfaceContainerLight = Color(0xFFF4EDDF)
+        override val surfaceContainerHighLight = Color(0xFFEEE8DA)
+        override val surfaceContainerHighestLight = Color(0xFFE8E2D4)
 
-        override val Surface = Color(0xFFFFFAF3)
+        override val primaryDark = Color(0xFFDAC66F)
-        override val SurfaceVariant = Color(0xFFFFF7E6)
+        override val onPrimaryDark = Color(0xFF393000)
-        override val OnSurface = Color(0xFF1F1C17)
+        override val primaryContainerDark = Color(0xFF534600)
-        override val OnSurfaceVariant = Color(0xFF4E4A3C)
+        override val onPrimaryContainerDark = Color(0xFFF8E288)
-
+        override val secondaryDark = Color(0xFFDAC76F)
-        override val Error = Color(0xFFB71C1C)
+        override val onSecondaryDark = Color(0xFF393000)
-        override val OnError = Color(0xFFFFFFFF)
+        override val secondaryContainerDark = Color(0xFF534600)
-        override val ErrorContainer = Color(0xFFFFDAD6)
+        override val onSecondaryContainerDark = Color(0xFFF7E388)
-        override val OnErrorContainer = Color(0xFF410002)
+        override val tertiaryDark = Color(0xFFD4C871)
-
+        override val onTertiaryDark = Color(0xFF363100)
-        override val Outline = Color(0xFFD1C8AF)
+        override val tertiaryContainerDark = Color(0xFF4F4800)
-        override val OutlineVariant = Color(0xFFEEE8D7)
+        override val onTertiaryContainerDark = Color(0xFFF1E58A)
-        override val Background = Color(0xFFFFFCF8)
+        override val errorDark = Color(0xFFFFB4AB)
-        override val OnBackground = Color(0xFF1F1C17)
+        override val onErrorDark = Color(0xFF690005)
+        override val errorContainerDark = Color(0xFF93000A)
+        override val onErrorContainerDark = Color(0xFFFFDAD6)
+        override val backgroundDark = Color(0xFF15130B)
+        override val onBackgroundDark = Color(0xFFE8E2D4)
+        override val surfaceDark = Color(0xFF15130B)
+        override val onSurfaceDark = Color(0xFFE8E2D4)
+        override val surfaceVariantDark = Color(0xFF4B4739)
+        override val onSurfaceVariantDark = Color(0xFFCDC6B4)
+        override val outlineDark = Color(0xFF969080)
+        override val outlineVariantDark = Color(0xFF4B4739)
+        override val scrimDark = Color(0xFF000000)
+        override val inverseSurfaceDark = Color(0xFFE8E2D4)
+        override val inverseOnSurfaceDark = Color(0xFF333027)
+        override val inversePrimaryDark = Color(0xFF6D5E0F)
+        override val surfaceDimDark = Color(0xFF15130B)
+        override val surfaceBrightDark = Color(0xFF3C3930)
+        override val surfaceContainerLowestDark = Color(0xFF100E07)
+        override val surfaceContainerLowDark = Color(0xFF1E1C13)
+        override val surfaceContainerDark = Color(0xFF222017)
+        override val surfaceContainerHighDark = Color(0xFF2C2A21)
+        override val surfaceContainerHighestDark = Color(0xFF37352B)
     }
 
     companion object {

manager/app/src/main/java/com/sukisu/ultra/ui/theme/Theme.kt

@@ -311,30 +311,41 @@ private fun createDynamicLightColorScheme(context: Context) =
  */
 @Composable
 private fun createDarkColorScheme() = darkColorScheme(
-    primary = ThemeConfig.currentTheme.Primary.copy(alpha = 0.8f),
+    primary = ThemeConfig.currentTheme.primaryDark,
-    onPrimary = Color.White,
+    onPrimary = ThemeConfig.currentTheme.onPrimaryDark,
-    primaryContainer = ThemeConfig.currentTheme.PrimaryContainer.copy(alpha = 0.15f),
+    primaryContainer = ThemeConfig.currentTheme.primaryContainerDark,
-    onPrimaryContainer = Color.White,
+    onPrimaryContainer = ThemeConfig.currentTheme.onPrimaryContainerDark,
-    secondary = ThemeConfig.currentTheme.Secondary.copy(alpha = 0.8f),
+    secondary = ThemeConfig.currentTheme.secondaryDark,
-    onSecondary = Color.White,
+    onSecondary = ThemeConfig.currentTheme.onSecondaryDark,
-    secondaryContainer = ThemeConfig.currentTheme.SecondaryContainer.copy(alpha = 0.15f),
+    secondaryContainer = ThemeConfig.currentTheme.secondaryContainerDark,
-    onSecondaryContainer = Color.White,
+    onSecondaryContainer = ThemeConfig.currentTheme.onSecondaryContainerDark,
-    tertiary = ThemeConfig.currentTheme.Tertiary.copy(alpha = 0.8f),
+    tertiary = ThemeConfig.currentTheme.tertiaryDark,
-    onTertiary = Color.White,
+    onTertiary = ThemeConfig.currentTheme.onTertiaryDark,
-    tertiaryContainer = ThemeConfig.currentTheme.TertiaryContainer.copy(alpha = 0.15f),
+    tertiaryContainer = ThemeConfig.currentTheme.tertiaryContainerDark,
-    onTertiaryContainer = Color.White,
+    onTertiaryContainer = ThemeConfig.currentTheme.onTertiaryContainerDark,
+    error = ThemeConfig.currentTheme.errorDark,
+    onError = ThemeConfig.currentTheme.onErrorDark,
+    errorContainer = ThemeConfig.currentTheme.errorContainerDark,
+    onErrorContainer = ThemeConfig.currentTheme.onErrorContainerDark,
     background = Color.Transparent,
+    onBackground = ThemeConfig.currentTheme.onBackgroundDark,
     surface = Color.Transparent,
-    onBackground = Color.White,
+    onSurface = ThemeConfig.currentTheme.onSurfaceDark,
-    onSurface = Color.White,
+    surfaceVariant = ThemeConfig.currentTheme.surfaceVariantDark,
-    surfaceVariant = Color(0xFF2F2F2F),
+    onSurfaceVariant = ThemeConfig.currentTheme.onSurfaceVariantDark,
-    onSurfaceVariant = Color.White.copy(alpha = 0.7f),
+    outline = ThemeConfig.currentTheme.outlineDark,
-    outline = Color.White.copy(alpha = 0.12f),
+    outlineVariant = ThemeConfig.currentTheme.outlineVariantDark,
-    outlineVariant = Color.White.copy(alpha = 0.12f),
+    scrim = ThemeConfig.currentTheme.scrimDark,
-    error = ThemeConfig.currentTheme.Error,
+    inverseSurface = ThemeConfig.currentTheme.inverseSurfaceDark,
-    onError = ThemeConfig.currentTheme.OnError,
+    inverseOnSurface = ThemeConfig.currentTheme.inverseOnSurfaceDark,
-    errorContainer = ThemeConfig.currentTheme.ErrorContainer.copy(alpha = 0.15f),
+    inversePrimary = ThemeConfig.currentTheme.inversePrimaryDark,
-    onErrorContainer = Color.White
+    surfaceDim = ThemeConfig.currentTheme.surfaceDimDark,
+    surfaceBright = ThemeConfig.currentTheme.surfaceBrightDark,
+    surfaceContainerLowest = ThemeConfig.currentTheme.surfaceContainerLowestDark,
+    surfaceContainerLow = ThemeConfig.currentTheme.surfaceContainerLowDark,
+    surfaceContainer = ThemeConfig.currentTheme.surfaceContainerDark,
+    surfaceContainerHigh = ThemeConfig.currentTheme.surfaceContainerHighDark,
+    surfaceContainerHighest = ThemeConfig.currentTheme.surfaceContainerHighestDark,
 )
 
 /**
@@ -342,30 +353,41 @@ private fun createDarkColorScheme() = darkColorScheme(
  */
 @Composable
 private fun createLightColorScheme() = lightColorScheme(
-    primary = ThemeConfig.currentTheme.Primary,
+    primary = ThemeConfig.currentTheme.primaryLight,
-    onPrimary = ThemeConfig.currentTheme.OnPrimary,
+    onPrimary = ThemeConfig.currentTheme.onPrimaryLight,
-    primaryContainer = ThemeConfig.currentTheme.PrimaryContainer,
+    primaryContainer = ThemeConfig.currentTheme.primaryContainerLight,
-    onPrimaryContainer = ThemeConfig.currentTheme.OnPrimaryContainer,
+    onPrimaryContainer = ThemeConfig.currentTheme.onPrimaryContainerLight,
-    secondary = ThemeConfig.currentTheme.Secondary,
+    secondary = ThemeConfig.currentTheme.secondaryLight,
-    onSecondary = ThemeConfig.currentTheme.OnSecondary,
+    onSecondary = ThemeConfig.currentTheme.onSecondaryLight,
-    secondaryContainer = ThemeConfig.currentTheme.SecondaryContainer,
+    secondaryContainer = ThemeConfig.currentTheme.secondaryContainerLight,
-    onSecondaryContainer = ThemeConfig.currentTheme.OnSecondaryContainer,
+    onSecondaryContainer = ThemeConfig.currentTheme.onSecondaryContainerLight,
-    tertiary = ThemeConfig.currentTheme.Tertiary,
+    tertiary = ThemeConfig.currentTheme.tertiaryLight,
-    onTertiary = ThemeConfig.currentTheme.OnTertiary,
+    onTertiary = ThemeConfig.currentTheme.onTertiaryLight,
-    tertiaryContainer = ThemeConfig.currentTheme.TertiaryContainer,
+    tertiaryContainer = ThemeConfig.currentTheme.tertiaryContainerLight,
-    onTertiaryContainer = ThemeConfig.currentTheme.OnTertiaryContainer,
+    onTertiaryContainer = ThemeConfig.currentTheme.onTertiaryContainerLight,
+    error = ThemeConfig.currentTheme.errorLight,
+    onError = ThemeConfig.currentTheme.onErrorLight,
+    errorContainer = ThemeConfig.currentTheme.errorContainerLight,
+    onErrorContainer = ThemeConfig.currentTheme.onErrorContainerLight,
     background = Color.Transparent,
+    onBackground = ThemeConfig.currentTheme.onBackgroundLight,
     surface = Color.Transparent,
-    onBackground = Color.Black.copy(alpha = 0.87f),
+    onSurface = ThemeConfig.currentTheme.onSurfaceLight,
-    onSurface = Color.Black.copy(alpha = 0.87f),
+    surfaceVariant = ThemeConfig.currentTheme.surfaceVariantLight,
-    surfaceVariant = Color(0xFFF5F5F5),
+    onSurfaceVariant = ThemeConfig.currentTheme.onSurfaceVariantLight,
-    onSurfaceVariant = Color.Black.copy(alpha = 0.78f),
+    outline = ThemeConfig.currentTheme.outlineLight,
-    outline = Color.Black.copy(alpha = 0.12f),
+    outlineVariant = ThemeConfig.currentTheme.outlineVariantLight,
-    outlineVariant = Color.Black.copy(alpha = 0.12f),
+    scrim = ThemeConfig.currentTheme.scrimLight,
-    error = ThemeConfig.currentTheme.Error,
+    inverseSurface = ThemeConfig.currentTheme.inverseSurfaceLight,
-    onError = ThemeConfig.currentTheme.OnError,
+    inverseOnSurface = ThemeConfig.currentTheme.inverseOnSurfaceLight,
-    errorContainer = ThemeConfig.currentTheme.ErrorContainer,
+    inversePrimary = ThemeConfig.currentTheme.inversePrimaryLight,
-    onErrorContainer = ThemeConfig.currentTheme.OnErrorContainer
+    surfaceDim = ThemeConfig.currentTheme.surfaceDimLight,
+    surfaceBright = ThemeConfig.currentTheme.surfaceBrightLight,
+    surfaceContainerLowest = ThemeConfig.currentTheme.surfaceContainerLowestLight,
+    surfaceContainerLow = ThemeConfig.currentTheme.surfaceContainerLowLight,
+    surfaceContainer = ThemeConfig.currentTheme.surfaceContainerLight,
+    surfaceContainerHigh = ThemeConfig.currentTheme.surfaceContainerHighLight,
+    surfaceContainerHighest = ThemeConfig.currentTheme.surfaceContainerHighestLight,
 )
 
 /**

manager/app/src/main/res/values-ar/strings.xml

@@ -210,7 +210,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-az/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-bs/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-da/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-de/strings.xml

@@ -210,7 +210,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-es/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-et/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-fa/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-fil/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-fr/strings.xml

@@ -210,7 +210,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Rose</string>
     <string name="color_gray">Gris</string>
-    <string name="color_ivory">Ivoire</string>
     <string name="flash_option">Options du flash</string>
     <string name="flash_option_tip">Sélectionnez le fichier à installer</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-hi/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-hr/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-hu/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-it/strings.xml

@@ -210,7 +210,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-ja/strings.xml

@@ -210,7 +210,6 @@
     <string name="color_orange">オレンジ</string>
     <string name="color_pink">ピンク</string>
     <string name="color_gray">グレー</string>
-    <string name="color_ivory">アイボリー</string>
     <string name="flash_option">ブラシの設定</string>
     <string name="flash_option_tip">フラッシュするファイルを選択</string>
     <string name="horizon_kernel">AnyKernel3 をインストール</string>

manager/app/src/main/res/values-kn/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-ko/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-lt/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-lv/strings.xml

@@ -210,7 +210,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-mr/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-ms/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-nl/strings.xml

@@ -210,7 +210,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-pl/strings.xml

@@ -210,7 +210,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-pt/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-ro/strings.xml

@@ -210,7 +210,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-ru/strings.xml

@@ -210,7 +210,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-sl/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-th/strings.xml

@@ -210,7 +210,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-tr/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Turuncu</string>
     <string name="color_pink">Pembe</string>
     <string name="color_gray">Gri</string>
-    <string name="color_ivory">Fildişi</string>
     <string name="flash_option">Fırça Seçenekleri</string>
     <string name="flash_option_tip">Yazılacak dosyayı seçin</string>
     <string name="horizon_kernel">Anykernel3 yükle</string>

manager/app/src/main/res/values-uk/strings.xml

@@ -210,7 +210,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-vi/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Cam</string>
     <string name="color_pink">Hồng</string>
     <string name="color_gray">Xám</string>
-    <string name="color_ivory">Trắng ngà</string>
     <string name="flash_option">Tuỳ chọn Flash</string>
     <string name="flash_option_tip">Chọn tập tin cần Flash</string>
     <string name="horizon_kernel">Tệp Anykernel3</string>

manager/app/src/main/res/values-zh-rCN/strings.xml

@@ -208,7 +208,7 @@
     <string name="color_orange">橙色</string>
     <string name="color_pink">粉色</string>
     <string name="color_gray">高级灰</string>
-    <string name="color_ivory">象牙白</string>
+    <string name="color_yellow">黄色</string>
     <string name="flash_option">刷入选项</string>
     <string name="flash_option_tip">选择要刷入的文件</string>
     <string name="horizon_kernel">刷写 AnyKernel3 压缩包</string>
@@ -223,7 +223,6 @@
     <string name="batch_authorization">授权</string>
     <string name="batch_cancel_authorization">撤销</string>
     <string name="backup">备份</string>
-    <string name="color_yellow">黄色</string>
     <string name="kpm_title">内核模块</string>
     <string name="kpm_empty">暂无已安装的内核模块</string>
     <string name="kpm_version">版本</string>

manager/app/src/main/res/values-zh-rHK/strings.xml

@@ -210,7 +210,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values-zh-rTW/strings.xml

@@ -208,7 +208,6 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>

manager/app/src/main/res/values/strings.xml

@@ -210,7 +210,7 @@
     <string name="color_orange">Orange</string>
     <string name="color_pink">Pink</string>
     <string name="color_gray">Gray</string>
-    <string name="color_ivory">Ivory</string>
+    <string name="color_yellow">Yellow</string>
     <string name="flash_option">Brush Options</string>
     <string name="flash_option_tip">Select the file to be flashed</string>
     <string name="horizon_kernel">Install Anykernel3</string>
@@ -225,7 +225,6 @@
     <string name="batch_authorization">empower</string>
     <string name="batch_cancel_authorization">withdraw</string>
     <string name="backup">Backup</string>
-    <string name="color_yellow">Yellow</string>
     <string name="kpm_title">KPM</string>
     <string name="kpm_empty">No installed kernel modules at this time</string>
     <string name="kpm_version">Version</string>

manager/gradle/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
 agp = "8.10.0"
-kotlin = "2.1.10"
+kotlin = "2.1.20"
-ksp = "2.1.10-1.0.30"
+ksp = "2.1.20-2.0.0"
-compose-bom = "2025.04.01"
+compose-bom = "2025.05.01"
-lifecycle = "2.8.7"
+lifecycle = "2.9.0"
-navigation = "2.8.9"
+navigation = "2.9.0"
 activity-compose = "1.10.1"
 kotlinx-coroutines = "1.10.2"
 coil-compose = "2.7.0"
@@ -17,12 +17,11 @@ parcelablelist = "2.0.1"
 libsu = "6.0.0"
 apksign = "1.4"
 cmaker = "1.2"
-compose-material = "1.8.0"
+compose-material = "1.8.2"
 compose-material3 = "1.3.2"
-compose-ui = "1.8.0"
+compose-ui = "1.8.2"
-compose-foundation = "1.7.8"
+documentfile = "1.1.0"
-documentfile = "1.0.1"
+mmrl = "v33633"
-mmrl = "v33624"
 
 [plugins]
 agp-app = { id = "com.android.application", version.ref = "agp" }
@@ -40,7 +39,6 @@ lsplugin-cmaker = { id = "org.lsposed.lsplugin.cmaker", version.ref = "cmaker" }
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activity-compose" }
 
 androidx-foundation = { module = "androidx.compose.foundation:foundation" }
-androidx-material3 = { module = "androidx.compose.material3:material3" }
 androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" }
 
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
@@ -51,13 +49,11 @@ androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref
 androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "compose-ui" }
-androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose-foundation" }
 
 androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" }
 androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycle" }
 androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" }
 
-androidx-ui = { module = "androidx.compose.ui:ui" }
 androidx-webkit = { module = "androidx.webkit:webkit", version.ref = "webkit" }
 
 com-github-topjohnwu-libsu-core = { group = "com.github.topjohnwu.libsu", name = "core", version.ref = "libsu" }