From 5dcc13236bf0db7f7a601e8a5ffa401d4762c491 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 7 Mar 2025 17:32:03 +0100 Subject: [PATCH] GradientFloatingActionButton use textActionAccent for enterprise build. --- .../button/GradientFloatingActionButton.kt | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/GradientFloatingActionButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/GradientFloatingActionButton.kt index e693b6ad64..8d9954d9d5 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/GradientFloatingActionButton.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/GradientFloatingActionButton.kt @@ -36,10 +36,12 @@ import androidx.compose.ui.graphics.Shape import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.unit.dp import io.element.android.compound.annotations.CoreColorToken +import io.element.android.compound.theme.ElementTheme import io.element.android.compound.tokens.generated.CompoundIcons import io.element.android.compound.tokens.generated.internal.LightColorTokens import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.PreviewsDayNight +import io.element.android.libraries.designsystem.theme.LocalIsEnterpriseBuild import io.element.android.libraries.designsystem.theme.components.Icon @OptIn(CoreColorToken::class) @@ -50,6 +52,16 @@ fun GradientFloatingActionButton( shape: Shape = RoundedCornerShape(25), content: @Composable () -> Unit, ) { + val color1 = if (LocalIsEnterpriseBuild.current) { + ElementTheme.colors.textActionAccent + } else { + LightColorTokens.colorGreen700 + } + val color2 = if (LocalIsEnterpriseBuild.current) { + ElementTheme.colors.textActionAccent + } else { + LightColorTokens.colorBlue900 + } val linearShaderBrush = remember { object : ShaderBrush() { override fun createShader(size: Size): Shader { @@ -57,8 +69,8 @@ fun GradientFloatingActionButton( from = Offset(size.width, size.height), to = Offset(size.width, 0f), colors = listOf( - LightColorTokens.colorBlue900, - LightColorTokens.colorGreen700, + color2, + color1, ), ) } @@ -71,8 +83,8 @@ fun GradientFloatingActionButton( center = size.center, radius = size.width / 2, colors = listOf( - LightColorTokens.colorGreen700, - LightColorTokens.colorBlue900, + color1, + color2, ) ) }