library:Sync colors to OS2 design & Added "Disabled" status color to "Switch" (#12)

Author: Voemp

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Button.kt

@@ -82,7 +82,7 @@ private fun getButtonColor(enabled: Boolean, submit: Boolean): Color {
     return if (enabled) {
         if (submit) MiuixTheme.colorScheme.primary else MiuixTheme.colorScheme.secondary
     } else {
-        if (submit) MiuixTheme.colorScheme.submitDisabledBg else MiuixTheme.colorScheme.disabledBg
+        if (submit) MiuixTheme.colorScheme.disabledPrimary else MiuixTheme.colorScheme.disabledSecondary
     }
 }
 
@@ -91,6 +91,6 @@ private fun getTextColor(enabled: Boolean, submit: Boolean): Color {
     return if (enabled) {
         if (submit) Color.White else MiuixTheme.colorScheme.onBackground
     } else {
-        if (submit) MiuixTheme.colorScheme.submitButtonDisabledText else MiuixTheme.colorScheme.buttonDisableText
+        if (submit) MiuixTheme.colorScheme.onDisabledPrimary else MiuixTheme.colorScheme.onDisabledSecondary
     }
 }

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Checkbox.kt

@@ -57,7 +57,7 @@ fun Checkbox(
     val isChecked by rememberUpdatedState(checked)
     var isPressed by remember { mutableStateOf(false) }
     val backgroundColor by animateColorAsState(if (isChecked) MiuixTheme.colorScheme.primary else MiuixTheme.colorScheme.secondary)
-    val disabledBackgroundColor by rememberUpdatedState(if (isChecked) MiuixTheme.colorScheme.submitDisabledBg else MiuixTheme.colorScheme.disabledBg)
+    val disabledBackgroundColor by rememberUpdatedState(if (isChecked) MiuixTheme.colorScheme.disabledPrimary else MiuixTheme.colorScheme.disabledSecondary)
     val checkboxSize by animateDpAsState(if (isPressed) 20.dp else 22.dp)
     val checkmarkColor by animateColorAsState(if (checked) Color.White else backgroundColor)
     val rotationAngle by animateFloatAsState(if (checked) 0f else 25f, animationSpec = tween(durationMillis = 200))

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/SearchBar.kt

@@ -163,7 +163,7 @@ fun InputField(
             Box(
                 modifier = Modifier
                     .background(
-                        color = MiuixTheme.colorScheme.textFieldBg,
+                        color = MiuixTheme.colorScheme.searchBarBg,
                         shape = SquircleShape(50.dp)
                     )
             ) {
@@ -182,7 +182,7 @@ fun InputField(
                     ) {
                         Text(
                             text = if (!(query.isNotEmpty() || expanded)) label else "",
-                            color = MiuixTheme.colorScheme.textFieldSub
+                            color = MiuixTheme.colorScheme.searchBarSub
                         )
 
                         innerTextField()

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Slider.kt

@@ -67,8 +67,8 @@ fun Slider(
             (round(newValue * factor) / factor).coerceIn(minValue, maxValue)
         }
     }
-    val color = rememberUpdatedState(if (enabled) MiuixTheme.colorScheme.primary else MiuixTheme.colorScheme.submitDisabledBg)
-    val backgroundColor = rememberUpdatedState(if (enabled) MiuixTheme.colorScheme.secondary else MiuixTheme.colorScheme.disabledBg)
+    val color = rememberUpdatedState(if (enabled) MiuixTheme.colorScheme.primary else MiuixTheme.colorScheme.disabledPrimary)
+    val backgroundColor = rememberUpdatedState(if (enabled) MiuixTheme.colorScheme.secondary else MiuixTheme.colorScheme.disabledSecondary)
 
     Box(
         modifier = if (enabled) {

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Switch.kt

@@ -83,7 +83,11 @@ fun Switch(
         animationSpec = tween(durationMillis = 200)
     )
     val disabledBackgroundColor by rememberUpdatedState(
-        if (isChecked) MiuixTheme.colorScheme.submitDisabledBg else MiuixTheme.colorScheme.disabledBg
+        if (isChecked) MiuixTheme.colorScheme.disabledPrimary else MiuixTheme.colorScheme.disabledSecondary
+    )
+    val thumbColor = Color.White
+    val disabledThumbColor by rememberUpdatedState(
+        if (isChecked) MiuixTheme.colorScheme.onDisabledPrimary else MiuixTheme.colorScheme.onDisabledSecondary
     )
     val toggleableModifier = remember(onCheckedChange, isChecked, enabled) {
         if (onCheckedChange != null) {
@@ -172,7 +176,7 @@ fun Switch(
                 .padding(start = thumbOffset)
                 .align(Alignment.CenterStart)
                 .size(thumbSize)
-                .background(Color.White, shape = SquircleShape(100.dp))
+                .background(if (enabled) thumbColor else disabledThumbColor, shape = SquircleShape(100.dp))
         )
     }
 }

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/theme/MiuixColor.kt

@@ -20,10 +20,10 @@ import androidx.compose.ui.graphics.Color
  * @param dropdownSelect The color of the selected item in the dropdown.
  * @param textFieldBg The background color of the text field.
  * @param textFieldSub The color of the sub text field.
- * @param disabledBg The background color of the disabled button.
- * @param submitDisabledBg The background color of the disabled submit button.
- * @param buttonDisableText The text color of the disabled button.
- * @param submitButtonDisabledText The text color of the disabled submit button.
+ * @param disabledSecondary The background color of the disabled button.
+ * @param disabledPrimary The background color of the disabled submit button.
+ * @param onDisabledSecondary The text color of the disabled button.
+ * @param onDisabledPrimary The text color of the disabled submit button.
  * @param smallTitle The color of the small title.
  */
 @Stable
@@ -37,12 +37,14 @@ class MiuixColor(
     secondary: Color,
     dropdownBackground: Color,
     dropdownSelect: Color,
+    searchBarBg: Color,
+    searchBarSub: Color,
     textFieldBg: Color,
     textFieldSub: Color,
-    disabledBg: Color,
-    submitDisabledBg: Color,
-    buttonDisableText: Color,
-    submitButtonDisabledText: Color,
+    disabledPrimary: Color,
+    disabledSecondary: Color,
+    onDisabledPrimary: Color,
+    onDisabledSecondary: Color,
     smallTitle: Color
 ) {
     val primary by mutableStateOf(primary, structuralEqualityPolicy())
@@ -54,49 +56,55 @@ class MiuixColor(
     val secondary by mutableStateOf(secondary, structuralEqualityPolicy())
     val dropdownBackground by mutableStateOf(dropdownBackground, structuralEqualityPolicy())
     val dropdownSelect by mutableStateOf(dropdownSelect, structuralEqualityPolicy())
+    val searchBarBg by mutableStateOf(searchBarBg, structuralEqualityPolicy())
+    val searchBarSub by mutableStateOf(searchBarSub, structuralEqualityPolicy())
     val textFieldBg by mutableStateOf(textFieldBg, structuralEqualityPolicy())
     val textFieldSub by mutableStateOf(textFieldSub, structuralEqualityPolicy())
-    val disabledBg by mutableStateOf(submitDisabledBg, structuralEqualityPolicy())
-    val submitDisabledBg by mutableStateOf(disabledBg, structuralEqualityPolicy())
-    val buttonDisableText by mutableStateOf(buttonDisableText, structuralEqualityPolicy())
-    val submitButtonDisabledText by mutableStateOf(submitButtonDisabledText, structuralEqualityPolicy())
+    val disabledPrimary by mutableStateOf(disabledPrimary, structuralEqualityPolicy())
+    val disabledSecondary by mutableStateOf(disabledSecondary, structuralEqualityPolicy())
+    val onDisabledPrimary by mutableStateOf(onDisabledPrimary, structuralEqualityPolicy())
+    val onDisabledSecondary by mutableStateOf(onDisabledSecondary, structuralEqualityPolicy())
     val smallTitle by mutableStateOf(smallTitle, structuralEqualityPolicy())
 }
 
 fun lightColorScheme() = MiuixColor(
     primary = Color(0xFF3482FF),
     onPrimary = Color.Black,
     primaryContainer = Color.White,
-    background = Color(0xFFF5F5F5),
+    background = Color(0xFFF7F7F7),
     onBackground = Color.Black,
-    subTextBase = Color(0xFF999999),
+    subTextBase = Color(0xFF666666),
     secondary = Color(0xFFE6E6E6),
     dropdownBackground = Color(0xFFFFFFFF),
     dropdownSelect = Color(0xFFEAF2FF),
+    searchBarBg = Color(0xFFEDEDED),
+    searchBarSub = Color(0xFFA5A5A5),
     textFieldBg = Color(0xFFF0F0F0),
     textFieldSub = Color(0xFFA8A8A8),
-    disabledBg = Color(0xFFC2D9FF),
-    submitDisabledBg = Color(0xFFEEEEEC),
-    buttonDisableText = Color.LightGray,
-    submitButtonDisabledText = Color(0xFFFFFFFF),
-    smallTitle = Color(0xFF8F96B2)
+    disabledPrimary = Color(0xFFC2D9FF),
+    disabledSecondary = Color(0xFFF2F2F2),
+    onDisabledPrimary = Color(0xFFEDF4FF),
+    onDisabledSecondary = Color(0xFFFCFCFC),
+    smallTitle = Color(0xFF8C93B0)
 )
 
 fun darkColorScheme() = MiuixColor(
     primary = Color(0xFF277AF7),
     onPrimary = Color.White,
-    primaryContainer = Color(0xFF1F1F1F),
-    background = Color.Black,
-    onBackground = Color.White,
-    subTextBase = Color(0xFF666666),
-    secondary = Color(0xFF333333),
-    dropdownBackground = Color(0xFF242424),
-    dropdownSelect = Color(0xFF23334E),
-    textFieldBg = Color(0xFF363636),
-    textFieldSub = Color(0xFF727272),
-    disabledBg = Color(0xFF253E64),
-    submitDisabledBg = Color(0xFF222223),
-    buttonDisableText = Color(0xFF666666),
-    submitButtonDisabledText = Color(0xFF677893),
+    primaryContainer = Color(0xFF242424),
+    background = Color(0xFF101010),
+    onBackground = Color(0xFFE9E9E9),
+    subTextBase = Color(0xFF929292),
+    secondary = Color(0xFF505050),
+    dropdownBackground = Color(0xFF2C2C2C),
+    dropdownSelect = Color(0xFF2B3B54),
+    searchBarBg = Color(0xFF2D2D2D),
+    searchBarSub = Color(0xFF6C6C6C),
+    textFieldBg = Color(0xFF2C2C2C),
+    textFieldSub = Color(0xFF6C6C6C),
+    disabledPrimary = Color(0xFF253E64),
+    disabledSecondary = Color(0xFF404040),
+    onDisabledPrimary = Color(0xFF677993),
+    onDisabledSecondary = Color(0xFF707070),
     smallTitle = Color(0xFF787E96)
 )