library: Sync ColorScheme to OS2 (#30)

Author: Voemp

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

@@ -6,15 +6,13 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.role
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import top.yukonga.miuix.kmp.theme.MiuixTheme
-import top.yukonga.miuix.kmp.utils.SmoothRoundedCornerShape
 
 /**
  * A [FloatingActionButton] component with Miuix style.

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

@@ -120,7 +120,7 @@ fun InputField(
     onExpandedChange: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
-    insideMargin: DpSize = DpSize(14.dp, 14.dp),
+    insideMargin: DpSize = DpSize(12.dp, 12.dp),
     leadingIcon: @Composable (() -> Unit)? = null,
     trailingIcon: @Composable (() -> Unit)? = null,
     interactionSource: MutableInteractionSource? = null,

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

@@ -304,9 +304,9 @@ fun lightColorScheme(
     onPrimaryVariant: Color = Color(0xFFAECDFF),
     disabledPrimary: Color = Color(0xFFC2D9FF),
     disabledOnPrimary: Color = Color(0xFFEDF4FF),
-    disabledPrimaryButton: Color = Color(0xFFEBF1FD),
-    disabledOnPrimaryButton: Color = Color(0xFFFAFAFF),
-    disabledPrimarySlider: Color = Color(0xFFB4D1FF),
+    disabledPrimaryButton: Color = Color(0xFFC2D9FF),
+    disabledOnPrimaryButton: Color = Color(0xFFFFFFFF),
+    disabledPrimarySlider: Color = Color(0xFFB3D0FF),
     primaryContainer: Color = Color(0xFF5D9BFF),
     onPrimaryContainer: Color = Color.White,
     secondary: Color = Color(0xFFE6E6E6),
@@ -315,15 +315,15 @@ fun lightColorScheme(
     onSecondaryVariant: Color = Color(0xFF303030),
     disabledSecondary: Color = Color(0xFFF2F2F2),
     disabledOnSecondary: Color = Color(0xFFFCFCFC),
-    disabledSecondaryVariant: Color = Color(0xFFF5F5F5),
+    disabledSecondaryVariant: Color = Color(0xFFF2F2F2),
     disabledOnSecondaryVariant: Color = Color(0xFFB2B2B2),
     secondaryContainer: Color = Color(0xFFF0F0F0),
     onSecondaryContainer: Color = Color(0xFFA9A9A9),
     secondaryContainerVariant: Color = Color(0xFFF0F0F0),
-    onSecondaryContainerVariant: Color = Color(0xFFA9A9A9),
-    tertiaryContainer: Color = Color(0xFFEBF3FF),
+    onSecondaryContainerVariant: Color = Color(0xFFA8A8A8),
+    tertiaryContainer: Color = Color(0xFFEAF2FF),
     onTertiaryContainer: Color = Color(0xFF3482FF),
-    tertiaryContainerVariant: Color = Color(0xFFEBF3FF),
+    tertiaryContainerVariant: Color = Color(0xFFEAF2FF),
     background: Color = Color(0xFFF7F7F7),
     onBackground: Color = Color.Black,
     onBackgroundVariant: Color = Color(0xFF8C93B0),
@@ -339,8 +339,8 @@ fun lightColorScheme(
     surfaceContainer: Color = Color(0xFFF9F9F9),
     onSurfaceContainer: Color = Color(0xFF323232),
     onSurfaceContainerVariant: Color = Color(0xFF959595),
-    surfaceContainerHigh: Color = Color(0xFFEDEDED),
-    onSurfaceContainerHigh: Color = Color(0xFFA5A5A5),
+    surfaceContainerHigh: Color = Color(0xFFE8E8E8),
+    onSurfaceContainerHigh: Color = Color(0xFFA2A2A2),
     surfaceContainerHighest: Color = Color(0xFFE8E8E8),
     onSurfaceContainerHighest: Color = Color.Black,
     windowDimming: Color = Color.Black.copy(alpha = 0.3f),
@@ -400,32 +400,32 @@ fun darkColorScheme(
     onPrimaryVariant: Color = Color(0xFF99C7F1),
     disabledPrimary: Color = Color(0xFF253E64),
     disabledOnPrimary: Color = Color(0xFF677993),
-    disabledPrimaryButton: Color = Color(0xFF1E2B43),
-    disabledOnPrimaryButton: Color = Color(0xFF505A6E),
-    disabledPrimarySlider: Color = Color(0xFF435C81),
+    disabledPrimaryButton: Color = Color(0xFF253E64),
+    disabledOnPrimaryButton: Color = Color(0xFF677893),
+    disabledPrimarySlider: Color = Color(0xFF445D82),
     primaryContainer: Color = Color(0xFF338FE4),
     onPrimaryContainer: Color = Color.White,
-    secondary: Color = Color(0xFF4F4F4F),
+    secondary: Color = Color(0xFF505050),
     onSecondary: Color = Color.White,
-    secondaryVariant: Color = Color(0xFF3A3A3A),
-    onSecondaryVariant: Color = Color(0xFFAAAAAA),
-    disabledSecondary: Color = Color(0xFF3F3F3F),
+    secondaryVariant: Color = Color(0xFF434343),
+    onSecondaryVariant: Color = Color(0xFFD9D9D9),
+    disabledSecondary: Color = Color(0xFF404040),
     disabledOnSecondary: Color = Color(0xFF707070),
-    disabledSecondaryVariant: Color = Color(0xFF434343),
-    disabledOnSecondaryVariant: Color = Color(0xFF646464),
-    secondaryContainer: Color = Color(0xFF2C2C2C),
-    onSecondaryContainer: Color = Color(0xFF5D5D5D),
+    disabledSecondaryVariant: Color = Color(0xFF404040),
+    disabledOnSecondaryVariant: Color = Color(0xFF707170),
+    secondaryContainer: Color = Color(0xFF434343),
+    onSecondaryContainer: Color = Color(0xFF7C7C7C),
     secondaryContainerVariant: Color = Color(0xFF4F4F4F),
     onSecondaryContainerVariant: Color = Color(0xFF959595),
     tertiaryContainer: Color = Color(0xFF2B3B54),
     onTertiaryContainer: Color = Color(0xFF277AF7),
-    tertiaryContainerVariant: Color = Color(0xFF4F4F4F),
-    background: Color = Color(0xFF101010),
-    onBackground: Color = Color(0xFFE8E8E8),
+    tertiaryContainerVariant: Color = Color(0xFF505050),
+    background: Color = Color.Black,
+    onBackground: Color = Color(0xFFF2F2F2),
     onBackgroundVariant: Color = Color(0xFF787E96),
     surface: Color = Color(0xFF242424),
     onSurface: Color = Color(0xE6FFFFFF),
-    surfaceVariant: Color = Color(0xFF181818),
+    surfaceVariant: Color = Color(0xFF242424),
     onSurfaceSecondary: Color = Color(0xCCFFFFFF),
     onSurfaceVariantSummary: Color = Color(0x80FFFFFF),
     onSurfaceVariantActions: Color = Color(0x66FFFFFF),
@@ -435,8 +435,8 @@ fun darkColorScheme(
     surfaceContainer: Color = Color(0xFF161616),
     onSurfaceContainer: Color = Color(0xFFD0D0D0),
     onSurfaceContainerVariant: Color = Color(0xFF737373),
-    surfaceContainerHigh: Color = Color(0xFF2D2D2D),
-    onSurfaceContainerHigh: Color = Color(0xFF6C6C6C),
+    surfaceContainerHigh: Color = Color(0xFF242424),
+    onSurfaceContainerHigh: Color = Color(0xFF666666),
     surfaceContainerHighest: Color = Color(0xFF2D2D2D),
     onSurfaceContainerHighest: Color = Color(0xFFE9E9E9),
     windowDimming: Color = Color.Black.copy(alpha = 0.6f),

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/utils/MiuixIndication.kt

@@ -22,6 +22,8 @@ import androidx.compose.ui.node.DelegatableNode
 import androidx.compose.ui.node.DrawModifierNode
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import top.yukonga.miuix.kmp.utils.HoldDownInteraction.Hold
+import top.yukonga.miuix.kmp.utils.HoldDownInteraction.Release
 
 /**
  * Miuix default [Indication] that draws a rectangular overlay when pressed.