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

refactor: merge padding to buttonPadding function in TextField

Browse Source
This commit is contained in:
fankesyooni
2023-11-19 00:15:36 +08:00
parent d86d23d499
commit fcaaf7a885
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/TextField.kt
View File

@@ -125,10 +125,6 @@ fun TextField(
focused || hovered -> style.borderInactive
else -> style.borderInactive
}.copy(animatedBorderWidth, SolidColor(animatedBorderColor))
val topPadding = style.topPadding.orElse() ?: style.padding
val startPadding = style.startPadding.orElse() ?: style.padding
val bottomPadding = style.bottomPadding.orElse() ?: style.padding
val endPadding = style.endPadding.orElse() ?: style.padding
Row(
modifier = Modifier.textField(
colors = colors,
@@ -140,16 +136,8 @@ fun TextField(
),
verticalAlignment = Alignment.CenterVertically
) {
header?.also { Box(modifier = Modifier.padding(start = startPadding)) { it() } }
Box(
modifier = Modifier.weight(1f, fill = false)
.padding(
top = topPadding,
start = startPadding,
bottom = bottomPadding,
end = endPadding
)
) {
header?.also { Box(modifier = Modifier.textFieldPadding(style, fitStart = true)) { it() } }
Box(modifier = Modifier.weight(1f, fill = false).textFieldPadding(style)) {
TextFieldStyle(colors) {
BasicTextField(
value = value,
@@ -177,7 +165,7 @@ fun TextField(
)
}
}
footer?.also { Box(modifier = Modifier.padding(end = endPadding)) { it() } }
footer?.also { Box(modifier = Modifier.textFieldPadding(style, fitEnd = true)) { it() } }
}
}
@@ -218,6 +206,22 @@ private fun Modifier.textField(
.borderOrNot(border, style.shape)
.then(modifier)
private fun Modifier.textFieldPadding(
style: TextFieldStyle,
fitStart: Boolean = false,
fitEnd: Boolean = false
) = when {
!fitStart && !fitEnd -> padding(
top = style.topPadding.orElse() ?: style.padding,
start = style.startPadding.orElse() ?: style.padding,
bottom = style.bottomPadding.orElse() ?: style.padding,
end = style.endPadding.orElse() ?: style.padding
)
fitStart -> padding(start = style.startPadding.orElse() ?: style.padding)
fitEnd -> padding(end = style.endPadding.orElse() ?: style.padding)
else -> this
}
object TextField {
val colors: TextFieldColors
@Composable