BetterAndroid/FlexiUI
5
0
Fork 0
mirror of https://github.com/BetterAndroid/FlexiUI.git synced 2025-09-08 19:44:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: make initializer composable in AreaBox, Surface

Browse Source
This commit is contained in:
fankesyooni
2023-12-03 00:20:19 +08:00
parent 5b1ef1bc7e
commit 73651da66d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/AreaBox.kt
View File

@@ -66,7 +66,7 @@ data class AreaBoxStyle(
@Composable @Composable
fun AreaBox( fun AreaBox(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
initializer: Modifier.() -> Modifier = { Modifier }, initializer: @Composable Modifier.() -> Modifier = { Modifier },
color: Color = AreaBox.color, color: Color = AreaBox.color,
style: AreaBoxStyle = AreaBox.style, style: AreaBoxStyle = AreaBox.style,
contentAlignment: Alignment = Alignment.TopStart, contentAlignment: Alignment = Alignment.TopStart,
@@ -89,7 +89,7 @@ fun AreaBox(
@Composable @Composable
fun AreaRow( fun AreaRow(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
initializer: Modifier.() -> Modifier = { Modifier }, initializer: @Composable Modifier.() -> Modifier = { Modifier },
color: Color = AreaBox.color, color: Color = AreaBox.color,
style: AreaBoxStyle = AreaBox.style, style: AreaBoxStyle = AreaBox.style,
horizontalArrangement: Arrangement.Horizontal = Arrangement.Start, horizontalArrangement: Arrangement.Horizontal = Arrangement.Start,
@@ -112,7 +112,7 @@ fun AreaRow(
@Composable @Composable
fun AreaColumn( fun AreaColumn(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
initializer: Modifier.() -> Modifier = { Modifier }, initializer: @Composable Modifier.() -> Modifier = { Modifier },
color: Color = AreaBox.color, color: Color = AreaBox.color,
style: AreaBoxStyle = AreaBox.style, style: AreaBoxStyle = AreaBox.style,
verticalArrangement: Arrangement.Vertical = Arrangement.Top, verticalArrangement: Arrangement.Vertical = Arrangement.Top,
@@ -136,7 +136,7 @@ private fun Modifier.areaBox(
color: Color, color: Color,
style: AreaBoxStyle, style: AreaBoxStyle,
then: Modifier, then: Modifier,
initializer: Modifier.() -> Modifier initializer: @Composable Modifier.() -> Modifier
) = composed( ) = composed(
inspectorInfo = debugInspectorInfo { inspectorInfo = debugInspectorInfo {
name = "areaBox" name = "areaBox"

4
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Surface.kt
View File

@@ -49,7 +49,7 @@ data class SurfaceColors(
@Composable @Composable
fun Surface( fun Surface(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
initializer: Modifier.() -> Modifier = { Modifier }, initializer: @Composable Modifier.() -> Modifier = { Modifier },
colors: SurfaceColors = Surface.colors, colors: SurfaceColors = Surface.colors,
padding: PaddingValues = Surface.padding, padding: PaddingValues = Surface.padding,
content: @Composable BoxScope.() -> Unit content: @Composable BoxScope.() -> Unit
@@ -67,7 +67,7 @@ private fun Modifier.surface(
colors: SurfaceColors, colors: SurfaceColors,
padding: PaddingValues, padding: PaddingValues,
then: Modifier, then: Modifier,
initializer: Modifier.() -> Modifier initializer: @Composable Modifier.() -> Modifier
) = composed( ) = composed(
inspectorInfo = debugInspectorInfo { inspectorInfo = debugInspectorInfo {
name = "surface" name = "surface"