Use gradient color in ComposerAlertMolecule. Fixes #6192
This commit is contained in:
parent
cc0a9dc907
commit
de9987deea
3 changed files with 15 additions and 12 deletions
|
|
@ -115,7 +115,7 @@ private fun ViolationAlert(
|
||||||
},
|
},
|
||||||
submitText = stringResource(submitTextId),
|
submitText = stringResource(submitTextId),
|
||||||
onSubmitClick = onSubmitClick,
|
onSubmitClick = onSubmitClick,
|
||||||
level = if (isCritical) ComposerAlertLevel.Critical else ComposerAlertLevel.Default,
|
level = if (isCritical) ComposerAlertLevel.Critical else ComposerAlertLevel.Info,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,8 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import io.element.android.compound.theme.ElementTheme
|
import io.element.android.compound.theme.ElementTheme
|
||||||
import io.element.android.compound.tokens.generated.CompoundIcons
|
import io.element.android.compound.tokens.generated.CompoundIcons
|
||||||
|
import io.element.android.libraries.designsystem.colors.gradientCriticalColors
|
||||||
|
import io.element.android.libraries.designsystem.colors.gradientInfoColors
|
||||||
import io.element.android.libraries.designsystem.components.avatar.Avatar
|
import io.element.android.libraries.designsystem.components.avatar.Avatar
|
||||||
import io.element.android.libraries.designsystem.components.avatar.AvatarData
|
import io.element.android.libraries.designsystem.components.avatar.AvatarData
|
||||||
import io.element.android.libraries.designsystem.components.avatar.AvatarType
|
import io.element.android.libraries.designsystem.components.avatar.AvatarType
|
||||||
|
|
@ -38,6 +40,9 @@ import io.element.android.libraries.designsystem.theme.components.Icon
|
||||||
import io.element.android.libraries.designsystem.theme.components.Text
|
import io.element.android.libraries.designsystem.theme.components.Text
|
||||||
import io.element.android.libraries.ui.strings.CommonStrings
|
import io.element.android.libraries.ui.strings.CommonStrings
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ref: https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=2392-6721
|
||||||
|
*/
|
||||||
@Composable
|
@Composable
|
||||||
fun ComposerAlertMolecule(
|
fun ComposerAlertMolecule(
|
||||||
avatar: AvatarData?,
|
avatar: AvatarData?,
|
||||||
|
|
@ -57,12 +62,6 @@ fun ComposerAlertMolecule(
|
||||||
ComposerAlertLevel.Critical -> ElementTheme.colors.borderCriticalSubtle
|
ComposerAlertLevel.Critical -> ElementTheme.colors.borderCriticalSubtle
|
||||||
}
|
}
|
||||||
|
|
||||||
val startColor = when (level) {
|
|
||||||
ComposerAlertLevel.Default -> ElementTheme.colors.bgInfoSubtle
|
|
||||||
ComposerAlertLevel.Info -> ElementTheme.colors.bgInfoSubtle
|
|
||||||
ComposerAlertLevel.Critical -> ElementTheme.colors.bgCriticalSubtle
|
|
||||||
}
|
|
||||||
|
|
||||||
val textColor = when (level) {
|
val textColor = when (level) {
|
||||||
ComposerAlertLevel.Default -> ElementTheme.colors.textPrimary
|
ComposerAlertLevel.Default -> ElementTheme.colors.textPrimary
|
||||||
ComposerAlertLevel.Info -> ElementTheme.colors.textInfoPrimary
|
ComposerAlertLevel.Info -> ElementTheme.colors.textInfoPrimary
|
||||||
|
|
@ -75,12 +74,17 @@ fun ComposerAlertMolecule(
|
||||||
.height(1.dp)
|
.height(1.dp)
|
||||||
.background(lineColor)
|
.background(lineColor)
|
||||||
)
|
)
|
||||||
val brush = Brush.verticalGradient(
|
val gradientColors = when (level) {
|
||||||
listOf(startColor, ElementTheme.colors.bgCanvasDefault),
|
ComposerAlertLevel.Default -> listOf(
|
||||||
)
|
ElementTheme.colors.bgInfoSubtle,
|
||||||
|
ElementTheme.colors.bgInfoSubtle,
|
||||||
|
)
|
||||||
|
ComposerAlertLevel.Info -> gradientInfoColors()
|
||||||
|
ComposerAlertLevel.Critical -> gradientCriticalColors()
|
||||||
|
}
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.background(brush)
|
.background(Brush.verticalGradient(gradientColors))
|
||||||
.padding(start = 16.dp, end = 16.dp, top = 16.dp, bottom = 8.dp)
|
.padding(start = 16.dp, end = 16.dp, top = 16.dp, bottom = 8.dp)
|
||||||
) {
|
) {
|
||||||
Column(
|
Column(
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,6 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
|
||||||
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
|
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
|
||||||
import io.element.android.libraries.designsystem.theme.components.Icon
|
import io.element.android.libraries.designsystem.theme.components.Icon
|
||||||
import io.element.android.libraries.designsystem.theme.components.IconButton
|
import io.element.android.libraries.designsystem.theme.components.IconButton
|
||||||
import io.element.android.libraries.designsystem.utils.CommonDrawables
|
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
internal fun VoiceMessageRecorderButtonIcon(
|
internal fun VoiceMessageRecorderButtonIcon(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue