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

refactor: use Spacer replace Box when a small size was used

Browse Source
This commit is contained in:
fankesyooni
2023-12-01 14:42:01 +08:00
parent f99d5467b0
commit 78619a0f6b
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/CheckBox.kt
View File

@@ -33,8 +33,9 @@ import androidx.compose.foundation.interaction.collectIsPressedAsState
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable
@@ -123,7 +124,7 @@ fun CheckBox(
} }
content?.also { content -> content?.also { content ->
Row(modifier = Modifier.clickable(enabled = enabled) { onCheckedChange(!checked) }) { Row(modifier = Modifier.clickable(enabled = enabled) { onCheckedChange(!checked) }) {
Box(modifier = Modifier.width(style.contentSpacing)) Spacer(modifier = Modifier.padding(end = style.contentSpacing))
content() content()
} }
} }

5
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/RadioButton.kt
View File

@@ -34,8 +34,9 @@ import androidx.compose.foundation.interaction.collectIsPressedAsState
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable
import androidx.compose.runtime.ReadOnlyComposable import androidx.compose.runtime.ReadOnlyComposable
@@ -118,7 +119,7 @@ fun RadioButton(
} }
content?.also { content -> content?.also { content ->
Row(modifier = Modifier.clickable(enabled = enabled, onClick = onClick)) { Row(modifier = Modifier.clickable(enabled = enabled, onClick = onClick)) {
Box(modifier = Modifier.width(style.contentSpacing)) Spacer(modifier = Modifier.padding(end = style.contentSpacing))
content() content()
} }
} }

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

@@ -36,10 +36,10 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable
import androidx.compose.runtime.ReadOnlyComposable import androidx.compose.runtime.ReadOnlyComposable
@@ -187,7 +187,7 @@ fun Switch(
content?.also { content -> content?.also { content ->
Row(modifier = Modifier.clickable(enabled = enabled) { onCheckedChange(!checked) }) { Row(modifier = Modifier.clickable(enabled = enabled) { onCheckedChange(!checked) }) {
content() content()
Box(modifier = Modifier.width(style.contentSpacing)) Spacer(modifier = Modifier.padding(start = style.contentSpacing))
} }
} }
Track { Thumb() } Track { Thumb() }