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

Remove ComposerAlertLevel.Default (not in the design).

Browse source
This commit is contained in:
Benoit Marty 2026-03-02 13:56:08 +01:00
parent 08b91071d2
commit 217c3a2b08
2 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/ComposerAlertMolecule.kt
View file

@ -49,7 +49,7 @@ fun ComposerAlertMolecule(
content: AnnotatedString, content: AnnotatedString,
onSubmitClick: () -> Unit, onSubmitClick: () -> Unit,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
level: ComposerAlertLevel = ComposerAlertLevel.Default, level: ComposerAlertLevel = ComposerAlertLevel.Info,
showIcon: Boolean = false, showIcon: Boolean = false,
submitText: String = stringResource(CommonStrings.action_ok), submitText: String = stringResource(CommonStrings.action_ok),
) { ) {
@ -57,14 +57,12 @@ fun ComposerAlertMolecule(
modifier.fillMaxWidth() modifier.fillMaxWidth()
) { ) {
val lineColor = when (level) { val lineColor = when (level) {
ComposerAlertLevel.Default -> ElementTheme.colors.borderInfoSubtle
ComposerAlertLevel.Info -> ElementTheme.colors.borderInfoSubtle ComposerAlertLevel.Info -> ElementTheme.colors.borderInfoSubtle
ComposerAlertLevel.Critical -> ElementTheme.colors.borderCriticalSubtle ComposerAlertLevel.Critical -> ElementTheme.colors.borderCriticalSubtle
} }
val textColor = when (level) { val textColor = when (level) {
ComposerAlertLevel.Default -> ElementTheme.colors.textPrimary ComposerAlertLevel.Info -> ElementTheme.colors.textPrimary
ComposerAlertLevel.Info -> ElementTheme.colors.textInfoPrimary
ComposerAlertLevel.Critical -> ElementTheme.colors.textCriticalPrimary ComposerAlertLevel.Critical -> ElementTheme.colors.textCriticalPrimary
} }
@ -75,10 +73,6 @@ fun ComposerAlertMolecule(
.background(lineColor) .background(lineColor)
) )
val gradientColors = when (level) { val gradientColors = when (level) {
ComposerAlertLevel.Default -> listOf(
ElementTheme.colors.bgInfoSubtle,
ElementTheme.colors.bgInfoSubtle,
)
ComposerAlertLevel.Info -> gradientInfoColors() ComposerAlertLevel.Info -> gradientInfoColors()
ComposerAlertLevel.Critical -> gradientCriticalColors() ComposerAlertLevel.Critical -> gradientCriticalColors()
} }
@ -100,12 +94,10 @@ fun ComposerAlertMolecule(
) )
} else if (showIcon) { } else if (showIcon) {
val icon = when (level) { val icon = when (level) {
ComposerAlertLevel.Default -> CompoundIcons.Info()
ComposerAlertLevel.Info -> CompoundIcons.Info() ComposerAlertLevel.Info -> CompoundIcons.Info()
ComposerAlertLevel.Critical -> CompoundIcons.Error() ComposerAlertLevel.Critical -> CompoundIcons.Error()
} }
val iconTint = when (level) { val iconTint = when (level) {
ComposerAlertLevel.Default -> ElementTheme.colors.iconPrimary
ComposerAlertLevel.Info -> ElementTheme.colors.iconInfoPrimary ComposerAlertLevel.Info -> ElementTheme.colors.iconInfoPrimary
ComposerAlertLevel.Critical -> ElementTheme.colors.iconCriticalPrimary ComposerAlertLevel.Critical -> ElementTheme.colors.iconCriticalPrimary
} }
@ -135,7 +127,6 @@ fun ComposerAlertMolecule(
} }
enum class ComposerAlertLevel { enum class ComposerAlertLevel {
Default,
Info, Info,
Critical Critical
} }

1
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/ComposerAlertMoleculeParamsProvider.kt
View file

@ -21,7 +21,6 @@ internal data class ComposerAlertMoleculeParams(
internal class ComposerAlertMoleculeParamsProvider : PreviewParameterProvider<ComposerAlertMoleculeParams> { internal class ComposerAlertMoleculeParamsProvider : PreviewParameterProvider<ComposerAlertMoleculeParams> {
private val allLevels = sequenceOf( private val allLevels = sequenceOf(
ComposerAlertLevel.Default,
ComposerAlertLevel.Info, ComposerAlertLevel.Info,
ComposerAlertLevel.Critical ComposerAlertLevel.Critical
) )