From aaa7e976b89d8932d9ac0d9dbef8aec49ecde242 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 7 Jul 2025 15:18:26 +0200 Subject: [PATCH] SuperButton --- .../components/button/SuperButton.kt | 28 ++++++------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/SuperButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/SuperButton.kt index a53955afc2..932158f281 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/SuperButton.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/SuperButton.kt @@ -36,10 +36,7 @@ import androidx.compose.ui.graphics.ShaderBrush 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.internal.DarkColorTokens -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.LocalBuildMeta @@ -47,7 +44,6 @@ import io.element.android.libraries.designsystem.theme.components.ButtonSize import io.element.android.libraries.designsystem.theme.components.HorizontalDivider import io.element.android.libraries.designsystem.theme.components.lowHorizontalPaddingValue -@OptIn(CoreColorToken::class) @Composable fun SuperButton( onClick: () -> Unit, @@ -66,34 +62,26 @@ fun SuperButton( ButtonSize.Small -> PaddingValues(horizontal = 16.dp, vertical = 5.dp) } } - val isLightTheme = ElementTheme.isLightTheme val colors = if (LocalBuildMeta.current.isEnterpriseBuild) { listOf( ElementTheme.colors.textActionAccent, ElementTheme.colors.textActionAccent, ) } else { - remember(isLightTheme) { - if (isLightTheme) { - listOf( - LightColorTokens.colorBlue900, - LightColorTokens.colorGreen1100, - ) - } else { - listOf( - DarkColorTokens.colorBlue900, - DarkColorTokens.colorGreen1100, - ) - } - } + listOf( + ElementTheme.colors.gradientActionStop1, + ElementTheme.colors.gradientActionStop2, + ElementTheme.colors.gradientActionStop3, + ElementTheme.colors.gradientActionStop4, + ) } val shaderBrush = remember(colors) { object : ShaderBrush() { override fun createShader(size: Size): Shader { return LinearGradientShader( - from = Offset(0f, size.height), - to = Offset(size.width, 0f), + from = Offset(0f, 0f), + to = Offset(0f, size.height), colors = colors, ) }