From a6a0cb083f8b7755b4017a970ef974a674806820 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 14 Jan 2025 11:29:21 +0100 Subject: [PATCH] change(design) : use ElementTheme.typography.fontBodyLgMedium for all button text. --- .../libraries/designsystem/theme/components/Button.kt | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Button.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Button.kt index 3997cc2840..4a198379ca 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Button.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Button.kt @@ -27,7 +27,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.ButtonColors import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.LocalContentColor -import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable import androidx.compose.runtime.remember @@ -202,14 +201,6 @@ private fun ButtonInternal( ButtonStyle.Text -> null } - val textStyle = when (size) { - ButtonSize.Small, - ButtonSize.Medium, - ButtonSize.MediumLowPadding -> MaterialTheme.typography.labelLarge - ButtonSize.Large, - ButtonSize.LargeLowPadding -> ElementTheme.typography.fontBodyLgMedium - } - androidx.compose.material3.Button( onClick = { if (!showProgress) { @@ -248,7 +239,7 @@ private fun ButtonInternal( } Text( text = text, - style = textStyle, + style = ElementTheme.typography.fontBodyLgMedium, maxLines = 1, overflow = TextOverflow.Ellipsis, )