Merge pull request #4145 from element-hq/feature/fga/design_button_text_style

change(design) : use ElementTheme.typography.fontBodyLgMedium
This commit is contained in:
ganfra
2025-01-14 15:39:14 +01:00
committed by GitHub
326 changed files with 651 additions and 660 deletions

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

Some files were not shown because too many files have changed in this diff Show More