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

change(design) : use ElementTheme.typography.fontBodyLgMedium for all button text.

Browse source
This commit is contained in:
ganfra 2025-01-14 11:29:21 +01:00
parent c7dbc7ad6c
commit a6a0cb083f
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Button.kt
View file

@ -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,
)