Move Text into the material package and add BasicText

huanshankeji · Dec 9, 2022 · 8539226 · 8539226
1 parent 2cea7ae
commit 8539226
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 5 deletions.
diff --git a/...in/com/huanshankeji/compose/Components.kt → ...lin/com/huanshankeji/compose/BasicText.kt b/...in/com/huanshankeji/compose/Components.kt → ...lin/com/huanshankeji/compose/BasicText.kt
@@ -3,4 +3,4 @@ package com.huanshankeji.compose
 import androidx.compose.runtime.Composable
 
 @Composable
-expect fun Text(text: String)
+expect fun BasicText(text: String)
diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/BasicText.kt b/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/BasicText.kt
@@ -0,0 +1,8 @@
+package com.huanshankeji.compose
+
+import androidx.compose.runtime.Composable
+import org.jetbrains.compose.web.dom.Text
+
+@Composable
+actual fun BasicText(text: String) =
+    Text(text)
diff --git a/...n/kotlin/com/huanshankeji/compose/Text.kt → ...lin/com/huanshankeji/compose/BasicText.kt b/...n/kotlin/com/huanshankeji/compose/Text.kt → ...lin/com/huanshankeji/compose/BasicText.kt
@@ -3,5 +3,5 @@ package com.huanshankeji.compose
 import androidx.compose.runtime.Composable
 
 @Composable
-actual fun Text(text: String) =
-    org.jetbrains.compose.web.dom.Text(text)
+actual fun BasicText(text: String) =
+    androidx.compose.foundation.text.BasicText(text)
diff --git a/...se-multiplatform-material/src/commonMain/kotlin/com/huanshankeji/compose/material/Text.kt b/...se-multiplatform-material/src/commonMain/kotlin/com/huanshankeji/compose/material/Text.kt
@@ -0,0 +1,6 @@
+package com.huanshankeji.compose.material
+
+import androidx.compose.runtime.Composable
+
+@Composable
+expect fun Text(text: String)
diff --git a/compose-multiplatform-material/src/jsMain/kotlin/com/huanshankeji/compose/material/Text.kt b/compose-multiplatform-material/src/jsMain/kotlin/com/huanshankeji/compose/material/Text.kt
@@ -0,0 +1,8 @@
+package com.huanshankeji.compose.material
+
+import androidx.compose.runtime.Composable
+import com.huanshankeji.compose.BasicText
+
+@Composable
+actual fun Text(text: String) =
+    BasicText(text)
diff --git a/...in/com/huanshankeji/compose/Components.kt → ...com/huanshankeji/compose/material/Text.kt b/...in/com/huanshankeji/compose/Components.kt → ...com/huanshankeji/compose/material/Text.kt
@@ -1,4 +1,4 @@
-package com.huanshankeji.compose
+package com.huanshankeji.compose.material
 
 import androidx.compose.runtime.Composable
 

diff --git a/demo/src/commonMain/kotlin/com/huanshankeji/compose/material/demo/Composables.kt b/demo/src/commonMain/kotlin/com/huanshankeji/compose/material/demo/Composables.kt
@@ -1,10 +1,11 @@
 package com.huanshankeji.compose.material.demo
 
 import androidx.compose.runtime.*
-import com.huanshankeji.compose.Text
+import com.huanshankeji.compose.BasicText
 import com.huanshankeji.compose.layout.Box
 import com.huanshankeji.compose.material.Button
 import com.huanshankeji.compose.material.Card
+import com.huanshankeji.compose.material.Text
 import com.huanshankeji.compose.material.TopAppBarScaffold
 import com.huanshankeji.compose.material.icon.MaterialIcons
 import com.huanshankeji.compose.ui.unit.dpOrPx
@@ -24,6 +25,9 @@ fun App() {
                     padding(16.dpOrPx)
                 }
             }) {
+                BasicText("basic text")
+                Text("Material text")
+
                 var count by remember { mutableStateOf(0) }
                 Button({ count++ }) {
                     Label(count.toString())