Skip to content

Commit 03666bb

Browse files
VoempYuKongA
authored andcommitted
library: Sync ColorScheme to OS2 (#30)
1 parent 7b81c73 commit 03666bb

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ fun InputField(
120120
onExpandedChange: (Boolean) -> Unit,
121121
modifier: Modifier = Modifier,
122122
enabled: Boolean = true,
123-
insideMargin: DpSize = DpSize(14.dp, 14.dp),
123+
insideMargin: DpSize = DpSize(12.dp, 12.dp),
124124
leadingIcon: @Composable (() -> Unit)? = null,
125125
trailingIcon: @Composable (() -> Unit)? = null,
126126
interactionSource: MutableInteractionSource? = null,

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

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,9 @@ fun lightColorScheme(
304304
onPrimaryVariant: Color = Color(0xFFAECDFF),
305305
disabledPrimary: Color = Color(0xFFC2D9FF),
306306
disabledOnPrimary: Color = Color(0xFFEDF4FF),
307-
disabledPrimaryButton: Color = Color(0xFFEBF1FD),
308-
disabledOnPrimaryButton: Color = Color(0xFFFAFAFF),
309-
disabledPrimarySlider: Color = Color(0xFFB4D1FF),
307+
disabledPrimaryButton: Color = Color(0xFFC2D9FF),
308+
disabledOnPrimaryButton: Color = Color(0xFFFFFFFF),
309+
disabledPrimarySlider: Color = Color(0xFFB3D0FF),
310310
primaryContainer: Color = Color(0xFF5D9BFF),
311311
onPrimaryContainer: Color = Color.White,
312312
secondary: Color = Color(0xFFE6E6E6),
@@ -315,15 +315,15 @@ fun lightColorScheme(
315315
onSecondaryVariant: Color = Color(0xFF303030),
316316
disabledSecondary: Color = Color(0xFFF2F2F2),
317317
disabledOnSecondary: Color = Color(0xFFFCFCFC),
318-
disabledSecondaryVariant: Color = Color(0xFFF5F5F5),
318+
disabledSecondaryVariant: Color = Color(0xFFF2F2F2),
319319
disabledOnSecondaryVariant: Color = Color(0xFFB2B2B2),
320320
secondaryContainer: Color = Color(0xFFF0F0F0),
321321
onSecondaryContainer: Color = Color(0xFFA9A9A9),
322322
secondaryContainerVariant: Color = Color(0xFFF0F0F0),
323-
onSecondaryContainerVariant: Color = Color(0xFFA9A9A9),
324-
tertiaryContainer: Color = Color(0xFFEBF3FF),
323+
onSecondaryContainerVariant: Color = Color(0xFFA8A8A8),
324+
tertiaryContainer: Color = Color(0xFFEAF2FF),
325325
onTertiaryContainer: Color = Color(0xFF3482FF),
326-
tertiaryContainerVariant: Color = Color(0xFFEBF3FF),
326+
tertiaryContainerVariant: Color = Color(0xFFEAF2FF),
327327
background: Color = Color(0xFFF7F7F7),
328328
onBackground: Color = Color.Black,
329329
onBackgroundVariant: Color = Color(0xFF8C93B0),
@@ -339,8 +339,8 @@ fun lightColorScheme(
339339
surfaceContainer: Color = Color(0xFFF9F9F9),
340340
onSurfaceContainer: Color = Color(0xFF323232),
341341
onSurfaceContainerVariant: Color = Color(0xFF959595),
342-
surfaceContainerHigh: Color = Color(0xFFEDEDED),
343-
onSurfaceContainerHigh: Color = Color(0xFFA5A5A5),
342+
surfaceContainerHigh: Color = Color(0xFFE8E8E8),
343+
onSurfaceContainerHigh: Color = Color(0xFFA2A2A2),
344344
surfaceContainerHighest: Color = Color(0xFFE8E8E8),
345345
onSurfaceContainerHighest: Color = Color.Black,
346346
windowDimming: Color = Color.Black.copy(alpha = 0.3f),
@@ -400,32 +400,32 @@ fun darkColorScheme(
400400
onPrimaryVariant: Color = Color(0xFF99C7F1),
401401
disabledPrimary: Color = Color(0xFF253E64),
402402
disabledOnPrimary: Color = Color(0xFF677993),
403-
disabledPrimaryButton: Color = Color(0xFF1E2B43),
404-
disabledOnPrimaryButton: Color = Color(0xFF505A6E),
405-
disabledPrimarySlider: Color = Color(0xFF435C81),
403+
disabledPrimaryButton: Color = Color(0xFF253E64),
404+
disabledOnPrimaryButton: Color = Color(0xFF677893),
405+
disabledPrimarySlider: Color = Color(0xFF445D82),
406406
primaryContainer: Color = Color(0xFF338FE4),
407407
onPrimaryContainer: Color = Color.White,
408-
secondary: Color = Color(0xFF4F4F4F),
408+
secondary: Color = Color(0xFF505050),
409409
onSecondary: Color = Color.White,
410-
secondaryVariant: Color = Color(0xFF3A3A3A),
411-
onSecondaryVariant: Color = Color(0xFFAAAAAA),
412-
disabledSecondary: Color = Color(0xFF3F3F3F),
410+
secondaryVariant: Color = Color(0xFF434343),
411+
onSecondaryVariant: Color = Color(0xFFD9D9D9),
412+
disabledSecondary: Color = Color(0xFF404040),
413413
disabledOnSecondary: Color = Color(0xFF707070),
414-
disabledSecondaryVariant: Color = Color(0xFF434343),
415-
disabledOnSecondaryVariant: Color = Color(0xFF646464),
416-
secondaryContainer: Color = Color(0xFF2C2C2C),
417-
onSecondaryContainer: Color = Color(0xFF5D5D5D),
414+
disabledSecondaryVariant: Color = Color(0xFF404040),
415+
disabledOnSecondaryVariant: Color = Color(0xFF707170),
416+
secondaryContainer: Color = Color(0xFF434343),
417+
onSecondaryContainer: Color = Color(0xFF7C7C7C),
418418
secondaryContainerVariant: Color = Color(0xFF4F4F4F),
419419
onSecondaryContainerVariant: Color = Color(0xFF959595),
420420
tertiaryContainer: Color = Color(0xFF2B3B54),
421421
onTertiaryContainer: Color = Color(0xFF277AF7),
422-
tertiaryContainerVariant: Color = Color(0xFF4F4F4F),
423-
background: Color = Color(0xFF101010),
424-
onBackground: Color = Color(0xFFE8E8E8),
422+
tertiaryContainerVariant: Color = Color(0xFF505050),
423+
background: Color = Color(0xFF000000),
424+
onBackground: Color = Color(0xFFF2F2F2),
425425
onBackgroundVariant: Color = Color(0xFF787E96),
426426
surface: Color = Color(0xFF242424),
427427
onSurface: Color = Color(0xE6FFFFFF),
428-
surfaceVariant: Color = Color(0xFF181818),
428+
surfaceVariant: Color = Color(0xFF242424),
429429
onSurfaceSecondary: Color = Color(0xCCFFFFFF),
430430
onSurfaceVariantSummary: Color = Color(0x80FFFFFF),
431431
onSurfaceVariantActions: Color = Color(0x66FFFFFF),
@@ -435,8 +435,8 @@ fun darkColorScheme(
435435
surfaceContainer: Color = Color(0xFF161616),
436436
onSurfaceContainer: Color = Color(0xFFD0D0D0),
437437
onSurfaceContainerVariant: Color = Color(0xFF737373),
438-
surfaceContainerHigh: Color = Color(0xFF2D2D2D),
439-
onSurfaceContainerHigh: Color = Color(0xFF6C6C6C),
438+
surfaceContainerHigh: Color = Color(0xFF242424),
439+
onSurfaceContainerHigh: Color = Color(0xFF666666),
440440
surfaceContainerHighest: Color = Color(0xFF2D2D2D),
441441
onSurfaceContainerHighest: Color = Color(0xFFE9E9E9),
442442
windowDimming: Color = Color.Black.copy(alpha = 0.6f),

0 commit comments

Comments
 (0)