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

trailingContent and supportingContent should be null if there is nothing to display.

Browse source
This commit is contained in:
Benoit Marty 2024-05-27 17:33:29 +02:00
parent 8339a6f1f3
commit ea93579b23
1 changed files with 36 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceText.kt
View file

@ -82,22 +82,27 @@ fun PreferenceText(
color = tintColor ?: enabled.toEnabledColor(),
)
},
supportingContent = {
if (subtitle != null) {
supportingContent = if (subtitle != null) {
{
Text(
style = ElementTheme.typography.fontBodyMdRegular,
text = subtitle,
color = tintColor ?: enabled.toSecondaryEnabledColor(),
)
}
} else if (subtitleAnnotated != null) {
{
Text(
style = ElementTheme.typography.fontBodyMdRegular,
text = subtitleAnnotated,
color = tintColor ?: enabled.toSecondaryEnabledColor(),
)
}
} else {
null
},
trailingContent = ListItemContent.Custom {
trailingContent = if (currentValue != null || loadingCurrentValue || showEndBadge) {
ListItemContent.Custom {
Row(
verticalAlignment = Alignment.CenterVertically,
) {
@ -123,7 +128,10 @@ fun PreferenceText(
)
}
}
},
}
} else {
null
}
)
}