wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add optionToStringTransformation to TextFieldOutlinedSelect

Browse source
This commit is contained in:
Wolf-Martell Montwé 2023-05-25 15:47:42 +02:00
parent 30fc509f66
commit 961476c113
No known key found for this signature in database
GPG key ID: 6D45B21512ACBF72
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/textfield/TextFieldOutlinedSelect.kt
View file

@ -25,6 +25,7 @@ fun <T> TextFieldOutlinedSelect(
selectedOption: T,
onValueChange: (T) -> Unit,
modifier: Modifier = Modifier,
optionToStringTransformation: (T) -> String = { it.toString() },
label: String? = null,
isEnabled: Boolean = true,
isReadOnly: Boolean = false,
@ -34,10 +35,11 @@ fun <T> TextFieldOutlinedSelect(
TextFieldDropDownWrapper(
isReadOnlyOrDisabled = isReadOnly || !isEnabled,
options = options,
optionToStringTransformation = optionToStringTransformation,
onValueChange = onValueChange,
) { expanded ->
MaterialOutlinedTextField(
value = selectedOption.toString(),
value = optionToStringTransformation(selectedOption),
onValueChange = { },
modifier = Modifier
.fillMaxWidth()
@ -69,6 +71,7 @@ private fun selectTrailingIcon(
private fun <T> TextFieldDropDownWrapper(
isReadOnlyOrDisabled: Boolean,
options: ImmutableList<T>,
optionToStringTransformation: (T) -> String,
onValueChange: (T) -> Unit,
content: @Composable (expanded: Boolean) -> Unit,
) {
@ -77,6 +80,7 @@ private fun <T> TextFieldDropDownWrapper(
} else {
DropDownMenu(
options = options,
optionToStringTransformation = optionToStringTransformation,
onValueChange = onValueChange,
content = content,
)
@ -88,6 +92,7 @@ private fun <T> TextFieldDropDownWrapper(
private fun <T> DropDownMenu(
options: ImmutableList<T>,
onValueChange: (T) -> Unit,
optionToStringTransformation: (T) -> String,
content: @Composable (expanded: Boolean) -> Unit,
) {
var expanded = remember { mutableStateOf(false) }
@ -113,7 +118,7 @@ private fun <T> DropDownMenu(
expanded.value = false
},
) {
Text(text = option.toString())
Text(text = optionToStringTransformation(option))
}
}
}

2
core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/molecule/input/SelectInput.kt
View file

@ -18,6 +18,7 @@ fun <T> SelectInput(
selectedOption: T,
onOptionChange: (T) -> Unit,
modifier: Modifier = Modifier,
optionToStringTransformation: (T) -> String = { it.toString() },
label: String? = null,
contentPadding: PaddingValues = inputContentPadding(),
) {
@ -32,6 +33,7 @@ fun <T> SelectInput(
selectedOption = selectedOption,
onValueChange = onOptionChange,
modifier = Modifier.fillMaxWidth(),
optionToStringTransformation = optionToStringTransformation,
label = label,
)
}