Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4581 from element-hq/feature/fga/advanced_settings_theme_rework

Browse source 
change (preferences) : use PreferenceDropdown for appearance
This commit is contained in:
ganfra 2025-04-14 15:19:48 +02:00 • committed by GitHub
commit 34b9348fa5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 222 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceDropdown.kt
View file

@ -99,9 +99,10 @@ fun <T : DropdownOption> PreferenceDropdown(
*/
interface DropdownOption {
/**
* The text to display for this option.
* Returns the text to be displayed for this option.
*/
val text: String
@Composable
fun getText(): String
}
@Composable
@ -123,7 +124,7 @@ private fun <T : DropdownOption> DropdownTrailingContent(
verticalAlignment = Alignment.CenterVertically,
) {
Text(
text = selectedOption?.text.orEmpty(),
text = selectedOption?.getText().orEmpty(),
maxLines = 1,
style = ElementTheme.typography.fontBodyMdRegular,
color = ElementTheme.colors.textSecondary,
@ -139,7 +140,7 @@ private fun <T : DropdownOption> DropdownTrailingContent(
DropdownMenuItem(
text = {
Text(
text = option.text,
text = option.getText(),
style = ElementTheme.typography.fontBodyMdRegular
)
},
@ -158,13 +159,16 @@ private fun <T : DropdownOption> DropdownTrailingContent(
internal fun PreferenceDropdownPreview() = ElementThemedPreview {
val options = listOf(
object : DropdownOption {
override val text = "Option 1"
@Composable
override fun getText(): String = "Option 1"
},
object : DropdownOption {
override val text = "Option 2"
@Composable
override fun getText(): String = "Option 2"
},
object : DropdownOption {
override val text = "Option 3"
@Composable
override fun getText(): String = "Option 3"
},
).toImmutableList()