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

Apply gradient to focused Event.

Browse source
This commit is contained in:
Benoit Marty 2025-07-07 15:03:30 +02:00
parent b3af5509c7
commit 1782e6d30b
4 changed files with 46 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

37
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Gradient.kt
View file

@ -34,26 +34,33 @@ fun Modifier.backgroundVerticalGradient(
if (!isVisible) return this
return background(
brush = Brush.verticalGradient(
colorStops = buildList {
if (isEnterpriseBuild) {
// For enterprise builds, ensure that we are theming the gradient
add(0f to ElementTheme.colors.textActionAccent.copy(alpha = 0.5f))
add(0.75f to ElementTheme.colors.bgCanvasDefault)
add(1f to Color.Transparent)
} else {
add(0f to ElementTheme.colors.gradientSubtleStop1)
add(1 / 5f to ElementTheme.colors.gradientSubtleStop2)
add(2 / 5f to ElementTheme.colors.gradientSubtleStop3)
add(3 / 5f to ElementTheme.colors.gradientSubtleStop4)
add(4 / 5f to ElementTheme.colors.gradientSubtleStop5)
add(1f to ElementTheme.colors.gradientSubtleStop6)
}
}.toTypedArray(),
colorStops = subtleColorStops(isEnterpriseBuild),
),
alpha = 0.75f,
)
}
@Composable
fun subtleColorStops(
isEnterpriseBuild: Boolean = LocalBuildMeta.current.isEnterpriseBuild,
): Array<Pair<Float, Color>> {
return buildList {
if (isEnterpriseBuild) {
// For enterprise builds, ensure that we are theming the gradient
add(0f to ElementTheme.colors.textActionAccent.copy(alpha = 0.5f))
add(0.75f to ElementTheme.colors.bgCanvasDefault)
add(1f to Color.Transparent)
} else {
add(0f to ElementTheme.colors.gradientSubtleStop1)
add(1 / 5f to ElementTheme.colors.gradientSubtleStop2)
add(2 / 5f to ElementTheme.colors.gradientSubtleStop3)
add(3 / 5f to ElementTheme.colors.gradientSubtleStop4)
add(4 / 5f to ElementTheme.colors.gradientSubtleStop5)
add(1f to ElementTheme.colors.gradientSubtleStop6)
}
}.toTypedArray()
}
@PreviewsDayNight
@Composable
internal fun BackgroundVerticalGradientPreview() = ElementPreview {

5
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt
View file

@ -100,10 +100,6 @@ val SemanticColors.mentionPillBackground
val SemanticColors.bigCheckmarkBorderColor
get() = if (isLight) LightColorTokens.colorGray400 else DarkColorTokens.colorGray400
@OptIn(CoreColorToken::class)
val SemanticColors.highlightedMessageBackgroundColor
get() = if (isLight) LightColorTokens.colorGreen300 else DarkColorTokens.colorGreen300
// Badge colors
@OptIn(CoreColorToken::class)
@ -148,7 +144,6 @@ internal fun ColorAliasesPreview() = ElementPreview {
"temporaryColorBgSpecial" to ElementTheme.colors.temporaryColorBgSpecial,
"iconSuccessPrimaryBackground" to ElementTheme.colors.iconSuccessPrimaryBackground,
"bigCheckmarkBorderColor" to ElementTheme.colors.bigCheckmarkBorderColor,
"highlightedMessageBackgroundColor" to ElementTheme.colors.highlightedMessageBackgroundColor,
)
)
}