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

UseLet

Browse source
This commit is contained in:
Benoit Marty 2024-05-28 00:14:23 +02:00
parent b32cebf2c0
commit a96351643e
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCheckbox.kt
View file

@ -61,16 +61,14 @@ fun PreferenceCheckbox(
color = enabled.toEnabledColor(), color = enabled.toEnabledColor(),
) )
}, },
supportingContent = if (supportingText != null) { supportingContent = supportingText?.let {
{ {
Text( Text(
style = ElementTheme.typography.fontBodyMdRegular, style = ElementTheme.typography.fontBodyMdRegular,
text = supportingText, text = it,
color = enabled.toSecondaryEnabledColor(), color = enabled.toSecondaryEnabledColor(),
) )
} }
} else {
null
}, },
trailingContent = ListItemContent.Checkbox( trailingContent = ListItemContent.Checkbox(
checked = isChecked, checked = isChecked,

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

@ -90,16 +90,16 @@ fun PreferenceText(
color = tintColor ?: enabled.toSecondaryEnabledColor(), color = tintColor ?: enabled.toSecondaryEnabledColor(),
) )
} }
} else if (subtitleAnnotated != null) {
{
Text(
style = ElementTheme.typography.fontBodyMdRegular,
text = subtitleAnnotated,
color = tintColor ?: enabled.toSecondaryEnabledColor(),
)
}
} else { } else {
null subtitleAnnotated?.let {
{
Text(
style = ElementTheme.typography.fontBodyMdRegular,
text = it,
color = tintColor ?: enabled.toSecondaryEnabledColor(),
)
}
}
}, },
trailingContent = if (currentValue != null || loadingCurrentValue || showEndBadge) { trailingContent = if (currentValue != null || loadingCurrentValue || showEndBadge) {
ListItemContent.Custom { ListItemContent.Custom {