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

Change TextFieldOutlinedSelect to highlight selected option in bold

Browse source
This commit is contained in:
Wolf-Martell Montwé 2023-11-17 14:34:28 +01:00
parent 0393f23e34
commit db19e9cc7d
No known key found for this signature in database
GPG key ID: 6D45B21512ACBF72
1 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,11 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.withStyle
import androidx.compose.ui.tooling.preview.Preview
import app.k9mail.core.ui.compose.designsystem.atom.Icon
import app.k9mail.core.ui.compose.theme.Icons
@ -35,7 +40,9 @@ fun <T> TextFieldOutlinedSelect(
TextFieldDropDownWrapper(
isReadOnlyOrDisabled = isReadOnly || !isEnabled,
options = options,
optionToStringTransformation = optionToStringTransformation,
optionToAnnotatedStringTransformation = { option ->
transformOptionWithSelectionHighlight(option, optionToStringTransformation(option), selectedOption)
},
onValueChange = onValueChange,
) { expanded ->
MaterialOutlinedTextField(
@ -57,6 +64,22 @@ fun <T> TextFieldOutlinedSelect(
}
}
private fun <T> transformOptionWithSelectionHighlight(
option: T,
optionString: String,
selectedOption: T,
): AnnotatedString {
return buildAnnotatedString {
if (option == selectedOption) {
withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
append(optionString)
}
} else {
append(optionString)
}
}
}
private fun selectTrailingIcon(
isExpanded: Boolean,
): @Composable () -> Unit {
@ -71,7 +94,7 @@ private fun selectTrailingIcon(
private fun <T> TextFieldDropDownWrapper(
isReadOnlyOrDisabled: Boolean,
options: ImmutableList<T>,
optionToStringTransformation: (T) -> String,
optionToAnnotatedStringTransformation: (T) -> AnnotatedString,
onValueChange: (T) -> Unit,
content: @Composable (expanded: Boolean) -> Unit,
) {
@ -80,7 +103,7 @@ private fun <T> TextFieldDropDownWrapper(
} else {
DropDownMenu(
options = options,
optionToStringTransformation = optionToStringTransformation,
optionToAnnotatedStringTransformation = optionToAnnotatedStringTransformation,
onValueChange = onValueChange,
content = content,
)
@ -92,7 +115,7 @@ private fun <T> TextFieldDropDownWrapper(
private fun <T> DropDownMenu(
options: ImmutableList<T>,
onValueChange: (T) -> Unit,
optionToStringTransformation: (T) -> String,
optionToAnnotatedStringTransformation: (T) -> AnnotatedString,
content: @Composable (expanded: Boolean) -> Unit,
) {
var expanded = remember { mutableStateOf(false) }
@ -118,7 +141,9 @@ private fun <T> DropDownMenu(
expanded.value = false
},
) {
Text(text = optionToStringTransformation(option))
Text(
text = optionToAnnotatedStringTransformation(option),
)
}
}
}