Rename the Material 2 module's name and package to material2 explicitly

ShreckYe · ShreckYe · commit cd7fdf316a3b · 2024-05-08T22:28:15.000+08:00
Resolve #21
diff --git a/compose-multiplatform-material2/build.gradle.kts b/compose-multiplatform-material2/build.gradle.kts
diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Button.androidxCommon.kt b/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Button.androidxCommon.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.foundation.layout.RowScope
diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Card.androidxCommon.kt b/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Card.androidxCommon.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Checkbox.androidxCommon.kt b/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Checkbox.androidxCommon.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Divider.androidxCommon.kt b/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Divider.androidxCommon.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Icon.androidxCommon.kt b/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Icon.androidxCommon.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.material.icons.Icon
diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/IconButton.androidxCommon.kt b/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/IconButton.androidxCommon.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Switch.androidxCommon.kt b/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Switch.androidxCommon.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Text.androidxCommon.kt b/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Text.androidxCommon.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/Button.androidxCommon.kt b/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/Button.androidxCommon.kt
@@ -1,10 +1,10 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.material.OutlinedButton
 import androidx.compose.material.TextButton
 import androidx.compose.runtime.Composable
-import com.huanshankeji.compose.material.ext.ButtonType.*
+import com.huanshankeji.compose.material2.ext.ButtonType.*
 import com.huanshankeji.compose.ui.Modifier
 
 @Suppress("NAME_SHADOWING")
diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.androidxCommon.kt b/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.androidxCommon.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.selection.selectable
diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/Switch.androidxCommon.kt b/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/Switch.androidxCommon.kt
@@ -1,9 +1,9 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.foundation.layout.Row
-import com.huanshankeji.compose.material.Switch
+import com.huanshankeji.compose.material2.Switch
 import com.huanshankeji.compose.ui.Modifier
 
 @Composable
diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/Text.androidxCommon.kt b/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/Text.androidxCommon.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/TextField.androidxCommon.kt b/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/TextField.androidxCommon.kt
@@ -1,12 +1,12 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.foundation.text.KeyboardActions
 import com.huanshankeji.compose.foundation.text.KeyboardOptions
 import com.huanshankeji.compose.foundation.text.toPlatformValue
-import com.huanshankeji.compose.material.Icon
-import com.huanshankeji.compose.material.Text
 import com.huanshankeji.compose.material.icons.Icon
+import com.huanshankeji.compose.material2.Icon
+import com.huanshankeji.compose.material2.Text
 import com.huanshankeji.compose.ui.Modifier
 
 @Composable
diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/TopAppBarScaffold.androidxCommon.kt b/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/TopAppBarScaffold.androidxCommon.kt
@@ -1,12 +1,12 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.material.Scaffold
 import androidx.compose.material.TopAppBar
 import androidx.compose.runtime.Composable
-import com.huanshankeji.compose.material.Icon
-import com.huanshankeji.compose.material.IconButton
 import com.huanshankeji.compose.material.icons.Icon
+import com.huanshankeji.compose.material2.Icon
+import com.huanshankeji.compose.material2.IconButton
 import com.huanshankeji.compose.ui.Modifier
 
 actual class NavigationIconScope private constructor() {
diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/lazy/ext/LazyDsl.androidxCommon.kt b/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/lazy/ext/LazyDsl.androidxCommon.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material.lazy.ext
+package com.huanshankeji.compose.material2.lazy.ext
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.material.ExperimentalMaterialApi
diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Button.kt b/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Button.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.foundation.layout.RowScope
diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Card.kt b/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Card.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Checkbox.kt b/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Checkbox.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Divider.kt b/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Divider.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Icon.kt b/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Icon.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.material.icons.Icon
diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/IconButton.kt b/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/IconButton.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Switch.kt b/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Switch.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Text.kt b/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Text.kt
@@ -1,7 +1,7 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
-import com.huanshankeji.compose.material.ext.InlineText
+import com.huanshankeji.compose.material2.ext.InlineText
 import com.huanshankeji.compose.ui.Modifier
 
 /**
diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Button.kt b/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Button.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/IconButton.kt b/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/IconButton.kt
@@ -1,8 +1,8 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.runtime.Composable
-import com.huanshankeji.compose.material.Icon
 import com.huanshankeji.compose.material.icons.Icon
+import com.huanshankeji.compose.material2.Icon
 import com.huanshankeji.compose.ui.Modifier
 
 @Composable
@@ -12,4 +12,4 @@ fun IconButton(
     icon: Icon,
     contentDescription: String?
 ) =
-    com.huanshankeji.compose.material.IconButton(onClick, modifier) { Icon(icon, contentDescription) }
+    com.huanshankeji.compose.material2.IconButton(onClick, modifier) { Icon(icon, contentDescription) }
diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.kt b/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Switch.kt b/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Switch.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Text.kt b/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Text.kt
@@ -1,7 +1,7 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.runtime.Composable
-import com.huanshankeji.compose.material.Text
+import com.huanshankeji.compose.material2.Text
 import com.huanshankeji.compose.ui.Modifier
 
 /**
diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/TextField.kt b/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/TextField.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.foundation.text.KeyboardActions
diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/TopAppBarScaffold.kt b/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/TopAppBarScaffold.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.material.icons.Icon
diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/lazy/ext/LazyDsl.kt b/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/lazy/ext/LazyDsl.kt
@@ -1,7 +1,7 @@
-package com.huanshankeji.compose.material.lazy.ext
+package com.huanshankeji.compose.material2.lazy.ext
 
 import androidx.compose.runtime.Composable
-import com.huanshankeji.compose.material.ext.InlineText
+import com.huanshankeji.compose.material2.ext.InlineText
 import com.huanshankeji.compose.ui.Modifier
 
 expect class ListScope {
diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Button.js.kt b/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Button.js.kt
@@ -1,10 +1,10 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.foundation.layout.Row
 import com.huanshankeji.compose.foundation.layout.RowScope
-import com.huanshankeji.compose.material.ext.ButtonType
-import com.huanshankeji.compose.material.ext.toMDCButtonType
+import com.huanshankeji.compose.material2.ext.ButtonType
+import com.huanshankeji.compose.material2.ext.toMDCButtonType
 import com.huanshankeji.compose.ui.Modifier
 import com.varabyte.kobweb.compose.ui.toAttrs
 import dev.petuska.kmdc.button.MDCButton
diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Card.js.kt b/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Card.js.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Checkbox.js.kt b/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Checkbox.js.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Divider.js.kt b/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Divider.js.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Icon.js.kt b/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Icon.js.kt
@@ -1,9 +1,9 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.contentDescription
 import com.huanshankeji.compose.material.icons.Icon
-import com.huanshankeji.compose.material.icons.toMDCIcon
+import com.huanshankeji.compose.material2.icons.toMDCIcon
 import com.huanshankeji.compose.ui.Modifier
 import com.varabyte.kobweb.compose.ui.toAttrs
 import dev.petuska.kmdcx.icons.MDCIconSpan
diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/IconButton.js.kt b/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/IconButton.js.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Switch.js.kt b/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Switch.js.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Text.js.kt b/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Text.js.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material2
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.foundation.text.BasicText
diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Button.js.kt b/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Button.js.kt
@@ -1,8 +1,8 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.runtime.Composable
-import com.huanshankeji.compose.material.CommonButton
-import com.huanshankeji.compose.material.ext.ButtonType.*
+import com.huanshankeji.compose.material2.CommonButton
+import com.huanshankeji.compose.material2.ext.ButtonType.*
 import com.huanshankeji.compose.ui.Modifier
 import dev.petuska.kmdc.button.Label
 import dev.petuska.kmdc.button.MDCButtonScope
diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.js.kt b/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.js.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Switch.js.kt b/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Switch.js.kt
@@ -1,7 +1,7 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.runtime.Composable
-import com.huanshankeji.compose.material.CommonSwitch
+import com.huanshankeji.compose.material2.CommonSwitch
 import com.huanshankeji.compose.ui.Modifier
 
 @Composable
diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Text.js.kt b/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Text.js.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.runtime.Composable
 import org.jetbrains.compose.web.dom.Text
diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/TextField.js.kt b/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/TextField.js.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.foundation.text.KeyboardActions
diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/TopAppBarScaffold.js.kt b/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/TopAppBarScaffold.js.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material.ext
+package com.huanshankeji.compose.material2.ext
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.contentDescription
diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/icons/IconsMdc.kt b/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/icons/IconsMdc.kt
@@ -1,5 +1,6 @@
-package com.huanshankeji.compose.material.icons
+package com.huanshankeji.compose.material2.icons
 
+import com.huanshankeji.compose.material.icons.Icon
 import dev.petuska.kmdcx.icons.MDCIcon
 
 val mdcIconMap = MDCIcon.entries.associateBy { it.type }
diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/lazy/ext/LazyDsl.js.kt b/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/lazy/ext/LazyDsl.js.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose.material.lazy.ext
+package com.huanshankeji.compose.material2.lazy.ext
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.foundation.verticalScrollPlatformModifier
diff --git a/demo/build.gradle.kts b/demo/build.gradle.kts
@@ -46,7 +46,7 @@ kotlin {
         commonMain {
             dependencies {
                 implementation(compose.runtime)
-                implementation(project(":compose-multiplatform-material"))
+                implementation(project(":compose-multiplatform-material2"))
                 implementation(project(":compose-multiplatform-material3"))
             }
         }
diff --git a/demo/src/commonMain/kotlin/com/huanshankeji/compose/material/demo/Material2.kt b/demo/src/commonMain/kotlin/com/huanshankeji/compose/material/demo/Material2.kt
@@ -14,19 +14,19 @@ import com.huanshankeji.compose.foundation.text.input.KeyboardType
 import com.huanshankeji.compose.layout.height
 import com.huanshankeji.compose.layout.padding
 import com.huanshankeji.compose.layout.width
-import com.huanshankeji.compose.material.*
-import com.huanshankeji.compose.material.ext.*
 import com.huanshankeji.compose.material.icons.Icons
 import com.huanshankeji.compose.material.icons.filled.Add
 import com.huanshankeji.compose.material.icons.filled.Menu
 import com.huanshankeji.compose.material.icons.filled.Search
-import com.huanshankeji.compose.material.lazy.ext.List
-import com.huanshankeji.compose.material.lazy.ext.ListItemComponents
-import com.huanshankeji.compose.material.lazy.ext.conventionalItem
-import com.huanshankeji.compose.material.lazy.ext.conventionalItems
+import com.huanshankeji.compose.material2.*
+import com.huanshankeji.compose.material2.ext.*
+import com.huanshankeji.compose.material2.lazy.ext.List
+import com.huanshankeji.compose.material2.lazy.ext.ListItemComponents
+import com.huanshankeji.compose.material2.lazy.ext.conventionalItem
+import com.huanshankeji.compose.material2.lazy.ext.conventionalItems
 import com.huanshankeji.compose.ui.Modifier
 import com.huanshankeji.compose.ui.graphics.Color
-import com.huanshankeji.compose.material.ext.Button as ExtButton
+import com.huanshankeji.compose.material2.ext.Button as ExtButton
 
 @Composable
 fun Material2() {
diff --git a/settings.gradle.kts b/settings.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.huanshankeji.compose.material`
	`1`	`+package com.huanshankeji.compose.material2`
`2`	`2`
`3`	`3`	`import androidx.compose.runtime.Composable`
`4`	`4`	`import com.huanshankeji.compose.foundation.layout.RowScope`