Make Preference icon optional
This commit is contained in:
parent
92694718ce
commit
a7536f649c
@ -4,6 +4,7 @@ import androidx.compose.foundation.clickable
|
|||||||
import androidx.compose.foundation.layout.*
|
import androidx.compose.foundation.layout.*
|
||||||
import androidx.compose.material.Icon
|
import androidx.compose.material.Icon
|
||||||
import androidx.compose.material.MaterialTheme
|
import androidx.compose.material.MaterialTheme
|
||||||
|
import androidx.compose.material.Surface
|
||||||
import androidx.compose.material.Text
|
import androidx.compose.material.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
@ -13,43 +14,56 @@ import androidx.compose.ui.unit.dp
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun Preference(
|
fun Preference(
|
||||||
icon: ImageVector,
|
icon: ImageVector?,
|
||||||
title: String,
|
title: String,
|
||||||
summary: String? = null,
|
summary: String? = null,
|
||||||
onClick: () -> Unit = {},
|
onClick: () -> Unit = {},
|
||||||
controls: @Composable (() -> Unit)? = null
|
controls: @Composable (() -> Unit)? = null
|
||||||
) {
|
) {
|
||||||
Row(
|
Surface(
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
modifier = Modifier.fillMaxWidth(),
|
||||||
modifier = Modifier
|
elevation = 0.dp
|
||||||
.fillMaxWidth()
|
|
||||||
.clickable(onClick = onClick)
|
|
||||||
.padding(horizontal = 16.dp, vertical = 16.dp),
|
|
||||||
) {
|
) {
|
||||||
Icon(
|
Row(
|
||||||
imageVector = icon,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
contentDescription = null,
|
modifier = Modifier
|
||||||
modifier = Modifier.padding(end = 24.dp),
|
.fillMaxWidth()
|
||||||
tint = MaterialTheme.colors.primary
|
.clickable(onClick = onClick)
|
||||||
)
|
.padding(horizontal = 16.dp, vertical = 16.dp),
|
||||||
Column(
|
|
||||||
modifier = Modifier.weight(1f)
|
|
||||||
) {
|
) {
|
||||||
Text(text = title, style = MaterialTheme.typography.subtitle2)
|
|
||||||
if (summary != null) {
|
|
||||||
Text(
|
|
||||||
text = summary,
|
|
||||||
style = MaterialTheme.typography.body1,
|
|
||||||
modifier = Modifier.padding(top = 1.dp)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (controls != null) {
|
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier.padding(start = 24.dp)
|
modifier = Modifier.width(56.dp),
|
||||||
|
contentAlignment = Alignment.CenterStart
|
||||||
) {
|
) {
|
||||||
controls()
|
if (icon != null) {
|
||||||
|
Icon(
|
||||||
|
modifier = Modifier.padding(start = 4.dp),
|
||||||
|
imageVector = icon,
|
||||||
|
contentDescription = null,
|
||||||
|
tint = MaterialTheme.colors.primary
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Column(
|
||||||
|
modifier = Modifier.weight(1f)
|
||||||
|
) {
|
||||||
|
Text(text = title, style = MaterialTheme.typography.subtitle2)
|
||||||
|
if (summary != null) {
|
||||||
|
Text(
|
||||||
|
text = summary,
|
||||||
|
style = MaterialTheme.typography.body1,
|
||||||
|
modifier = Modifier.padding(top = 1.dp)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (controls != null) {
|
||||||
|
Box(
|
||||||
|
modifier = Modifier.padding(start = 24.dp)
|
||||||
|
) {
|
||||||
|
controls()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user