Move the TopAppBarScaffold composable to the ext package and add a modifier parameter

Author: ShreckYe

compose-multiplatform-material/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material/TopAppBarScaffold.androidxCommon.kt renamed to compose-multiplatform-material/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material/ext/TopAppBarScaffold.androidxCommon.kt

@@ -1,10 +1,13 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material.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.ui.Modifier
 
 actual class NavigationIconScope private constructor() {
     @Composable
@@ -34,13 +37,15 @@ actual class TopAppBarActionsScope(val rowScope: RowScope) {
 @Composable
 actual fun TopAppBarScaffold(
     title: @Composable () -> Unit,
+    topAppBarModifier: Modifier,
     navigationIcon: @Composable (NavigationIconScope.() -> Unit)?,
     actions: @Composable TopAppBarActionsScope.() -> Unit,
     content: @Composable () -> Unit
 ) =
     Scaffold(topBar = {
         TopAppBar(
-            title = title,
-            navigationIcon = navigationIcon?.let { { NavigationIconScope.instance.it() } },
-            actions = { TopAppBarActionsScope(this).actions() })
+            title,
+            topAppBarModifier.platformModifier,
+            navigationIcon?.let { { NavigationIconScope.instance.it() } },
+            { TopAppBarActionsScope(this).actions() })
     }) { content() }

compose-multiplatform-material/src/commonMain/kotlin/com/huanshankeji/compose/material/TopAppBarScaffold.kt renamed to compose-multiplatform-material/src/commonMain/kotlin/com/huanshankeji/compose/material/ext/TopAppBarScaffold.kt

@@ -1,7 +1,8 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material.ext
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.material.icons.Icon
+import com.huanshankeji.compose.ui.Modifier
 
 expect class NavigationIconScope {
     @Composable
@@ -22,6 +23,7 @@ expect class TopAppBarActionsScope {
 @Composable
 expect fun TopAppBarScaffold(
     title: @Composable () -> Unit,
+    topAppBarModifier: Modifier = Modifier,
     navigationIcon: @Composable (NavigationIconScope.() -> Unit)? = null,
     actions: @Composable TopAppBarActionsScope.() -> Unit = {},
     content: @Composable () -> Unit

compose-multiplatform-material/src/jsMain/kotlin/com/huanshankeji/compose/material/TopAppBarScaffold.js.kt renamed to compose-multiplatform-material/src/jsMain/kotlin/com/huanshankeji/compose/material/ext/TopAppBarScaffold.js.kt

@@ -1,7 +1,10 @@
-package com.huanshankeji.compose.material
+package com.huanshankeji.compose.material.ext
 
 import androidx.compose.runtime.Composable
+import com.huanshankeji.compose.material.contentDescription
 import com.huanshankeji.compose.material.icons.Icon
+import com.huanshankeji.compose.ui.Modifier
+import com.varabyte.kobweb.compose.ui.toAttrs
 import dev.petuska.kmdc.top.app.bar.*
 import dev.petuska.kmdcx.icons.mdcIcon
 import org.jetbrains.compose.web.dom.Text
@@ -35,12 +38,13 @@ actual class TopAppBarActionsScope(val mdcTopAppBarSectionScope: MDCTopAppBarSec
 @Composable
 actual fun TopAppBarScaffold(
     title: @Composable () -> Unit,
+    topAppBarModifier: Modifier,
     navigationIcon: @Composable (NavigationIconScope.() -> Unit)?,
     actions: @Composable TopAppBarActionsScope.() -> Unit,
     content: @Composable () -> Unit
 ) =
     MDCTopAppBar {
-        TopAppBar {
+        TopAppBar(topAppBarModifier.platformModifier.toAttrs()) {
             Row {
                 Section(align = MDCTopAppBarSectionAlign.Start) {
                     navigationIcon?.let { NavigationIconScope(this@Section).it() }

demo/src/commonMain/kotlin/com/huanshankeji/compose/material/demo/App.kt

@@ -18,6 +18,7 @@ import com.huanshankeji.compose.layout.size
 import com.huanshankeji.compose.layout.width
 import com.huanshankeji.compose.material.*
 import com.huanshankeji.compose.material.ext.IconButton
+import com.huanshankeji.compose.material.ext.TopAppBarScaffold
 import com.huanshankeji.compose.material.icons.Icons
 import com.huanshankeji.compose.material.icons.filled.Add
 import com.huanshankeji.compose.material.icons.filled.Menu
@@ -32,9 +33,9 @@ import com.huanshankeji.compose.material.ext.Button as ExtButton
 fun App() {
     TopAppBarScaffold({
         Text("Compose Multiplatform Material demo")
-    }, {
+    }, navigationIcon = {
         MaterialIconNavButton({}, Icons.Default.Menu, "menu")
-    }, {
+    }, actions = {
         MaterialIconActionButton({}, Icons.Default.Search, "search")
     }) {
         /*