1

Author: YuKongA

README.md

@@ -27,7 +27,7 @@ kotlin {
 @Composable
 fun App() {
    MiuixTheme(
-        colorScheme = if (isSystemInDarkTheme()) darkColorScheme() else lightColorScheme()
+        colors = if (isSystemInDarkTheme()) darkColorScheme() else lightColorScheme()
     ) {
        // Other content...
     }

composeApp/src/commonMain/kotlin/ui/Theme.kt

@@ -13,7 +13,7 @@ fun AppTheme(
 ) {
     val darkTheme = isSystemInDarkTheme()
     return MiuixTheme(
-        colorScheme = when (colorMode) {
+        colors = when (colorMode) {
             1 -> lightColorScheme()
             2 -> darkColorScheme()
             else -> if (darkTheme) darkColorScheme() else lightColorScheme()

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

@@ -30,6 +30,7 @@ import top.yukonga.miuix.kmp.utils.SmoothRoundedCornerShape
  * @param enabled Whether the [Button] is enabled.
  * @param submit Whether the [Button] is a submit button.
  * @param cornerRadius The corner radius of the [Button].
+ * @param minHeight The minimum height of the [Button].
  */
 @Composable
 fun Button(

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

@@ -43,7 +43,7 @@ import androidx.compose.ui.graphics.Color
  * @param surface The surface color.
  * @param onSurface The color of the text on surface color.
  * @param surfaceVariant The variant color of the surface color.
- * @param onSurfaceSecondary The color of the dialog summary on surface variant color.
+ * @param onSurfaceSecondary The color of the text on surface secondary color.
  * @param onSurfaceVariantSummary The color of the summary on surface variant color.
  * @param onSurfaceVariantActions The color of the actions on surface variant color.
  * @param disabledOnSurface The color of the text on disabled surface color.

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

@@ -10,43 +10,27 @@ import top.yukonga.miuix.kmp.utils.MiuixIndication
 /**
  * The default theme that provides color and text styles for the Miuix components.
  *
- * @param colorScheme The color scheme for the Miuix components.
+ * @param colors The color scheme for the Miuix components.
  * @param textStyles The text styles for the Miuix components.
  * @param content The content of the Miuix theme.
  */
 @Composable
 fun MiuixTheme(
-    colorScheme: Colors = MiuixTheme.colorScheme,
+    colors: Colors = MiuixTheme.colorScheme,
     textStyles: TextStyles = MiuixTheme.textStyles,
     content: @Composable () -> Unit
 ) {
-    val miuixColors = remember { colorScheme.copy() }.apply { updateColorsFrom(colorScheme) }
-    val miuixTextStyles = remember(colorScheme.onBackground) {
-        defaultTextStyles(
-            main = textStyles.main.copy(color = colorScheme.onBackground),
-            title = textStyles.title.copy(color = colorScheme.onBackground),
-            paragraph = textStyles.paragraph.copy(color = colorScheme.onBackground),
-            body1 = textStyles.body1.copy(color = colorScheme.onBackground),
-            body2 = textStyles.body2.copy(color = colorScheme.onBackground),
-            button = textStyles.button.copy(color = colorScheme.onBackground),
-            footnote1 = textStyles.footnote1.copy(color = colorScheme.onBackground),
-            footnote2 = textStyles.footnote2.copy(color = colorScheme.onBackground),
-            headline1 = textStyles.headline1.copy(color = colorScheme.onBackground),
-            headline2 = textStyles.headline2.copy(color = colorScheme.onBackground),
-            subtitle = textStyles.subtitle.copy(color = colorScheme.onBackground),
-            title1 = textStyles.title1.copy(color = colorScheme.onBackground),
-            title2 = textStyles.title2.copy(color = colorScheme.onBackground),
-            title3 = textStyles.title3.copy(color = colorScheme.onBackground),
-            title4 = textStyles.title4.copy(color = colorScheme.onBackground)
-        )
+    val miuixColors = remember { colors.copy() }.apply {
+        updateColorsFrom(colors)
     }
-    val miuixRipple = remember(colorScheme.onBackground) {
-        MiuixIndication(backgroundColor = colorScheme.onBackground)
+    val miuixTextStyles = remember { textStyles }
+    val miuixIndication = remember(colors.onBackground) {
+        MiuixIndication(backgroundColor = colors.onBackground)
     }
     CompositionLocalProvider(
         LocalColors provides miuixColors,
         LocalTextStyles provides miuixTextStyles,
-        LocalIndication provides miuixRipple
+        LocalIndication provides miuixIndication
     ) {
         content()
     }