Fix UnittoListItem size

This commit is contained in:
Sad Ellie 2023-09-21 13:25:16 +03:00
parent 9f864ea108
commit 93ca31a955

View File

@ -34,6 +34,7 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ProvideTextStyle import androidx.compose.material3.ProvideTextStyle
import androidx.compose.material3.RadioButton
import androidx.compose.material3.Switch import androidx.compose.material3.Switch
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -58,8 +59,8 @@ fun UnittoListItem(
Row( Row(
modifier = modifier modifier = modifier
.background(MaterialTheme.colorScheme.surface) .background(MaterialTheme.colorScheme.surface)
.heightIn(min = 56.dp) .padding(start = 16.dp, end = 24.dp)
.padding(top = 14.dp, bottom = 14.dp, start = 16.dp, end = 24.dp), .heightIn(min = if (supportingContent == null) 56.dp else 72.dp),
horizontalArrangement = Arrangement.spacedBy(16.dp), horizontalArrangement = Arrangement.spacedBy(16.dp),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
@ -70,7 +71,7 @@ fun UnittoListItem(
) )
} }
Column(Modifier.weight(1f)) { Column(Modifier.weight(1f).padding(vertical = 8.dp)) {
ProvideTextStyle( ProvideTextStyle(
color = MaterialTheme.colorScheme.onSurface, color = MaterialTheme.colorScheme.onSurface,
textStyle = MaterialTheme.typography.bodyLarge, textStyle = MaterialTheme.typography.bodyLarge,
@ -161,6 +162,7 @@ private fun ProvideColor(
@Preview @Preview
@Composable @Composable
fun PreviewUnittoListItem1() { fun PreviewUnittoListItem1() {
Column {
UnittoListItem( UnittoListItem(
modifier = Modifier, modifier = Modifier,
headlineContent = { Text("Headline") }, headlineContent = { Text("Headline") },
@ -172,11 +174,15 @@ fun PreviewUnittoListItem1() {
) )
}, },
) )
}
@Preview UnittoListItem(
@Composable modifier = Modifier,
private fun PreviewUnittoListItem2() { headlineContent = { Text("Headline") },
leadingContent = {
RadioButton(selected = false, onClick = {})
},
)
UnittoListItem( UnittoListItem(
icon = Icons.Default.Home, icon = Icons.Default.Home,
headlineText = "Text text", headlineText = "Text text",
@ -185,11 +191,7 @@ private fun PreviewUnittoListItem2() {
trailing = {}, trailing = {},
iconDescription = "" iconDescription = ""
) )
}
@Preview
@Composable
private fun PreviewUnittoListItem3() {
UnittoListItem( UnittoListItem(
icon = Icons.Default.Home, icon = Icons.Default.Home,
headlineText = "Text text", headlineText = "Text text",
@ -200,3 +202,4 @@ private fun PreviewUnittoListItem3() {
switchState = true, switchState = true,
) )
} }
}