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

Use typography instead of materialTypography.

Browse source
This commit is contained in:
Benoit Marty 2025-12-19 16:10:25 +01:00 • committed by Benoit Marty
parent 650f041ae6
commit 4402585a52
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewView.kt
View file

@ -231,7 +231,7 @@ private fun ImageOptimizationSelector(state: MediaOptimizationSelectorState) {
Text( Text(
modifier = Modifier.weight(1f).align(Alignment.CenterVertically), modifier = Modifier.weight(1f).align(Alignment.CenterVertically),
text = stringResource(R.string.screen_media_upload_preview_optimize_image_quality_title), text = stringResource(R.string.screen_media_upload_preview_optimize_image_quality_title),
style = ElementTheme.materialTypography.bodyLarge, style = ElementTheme.typography.fontBodyLgRegular,
) )
Switch( Switch(
modifier = Modifier.height(32.dp), modifier = Modifier.height(32.dp),
@ -337,7 +337,7 @@ private fun VideoQualitySelectorDialog(
supportingContent = { supportingContent = {
Text( Text(
text = preset.subtitle(), text = preset.subtitle(),
style = ElementTheme.materialTypography.bodyMedium, style = ElementTheme.typography.fontBodyMdRegular,
color = ElementTheme.colors.textSecondary, color = ElementTheme.colors.textSecondary,
) )
}, },

2
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt
View file

@ -234,7 +234,7 @@ private fun VideoQualitySelectorDialog(
supportingContent = { supportingContent = {
Text( Text(
text = subtitle, text = subtitle,
style = ElementTheme.materialTypography.bodyMedium, style = ElementTheme.typography.fontBodyMdRegular,
color = ElementTheme.colors.textSecondary, color = ElementTheme.colors.textSecondary,
) )
}, },

4
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialogWithDoNotShowAgain.kt
View file

@ -57,14 +57,14 @@ fun ErrorDialogWithDoNotShowAgain(
Column { Column {
Text( Text(
text = content, text = content,
style = ElementTheme.materialTypography.bodyMedium, style = ElementTheme.typography.fontBodyMdRegular,
) )
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(8.dp))
Row(verticalAlignment = Alignment.CenterVertically) { Row(verticalAlignment = Alignment.CenterVertically) {
Checkbox(checked = doNotShowAgain, onCheckedChange = { doNotShowAgain = it }) Checkbox(checked = doNotShowAgain, onCheckedChange = { doNotShowAgain = it })
Text( Text(
text = stringResource(id = CommonStrings.common_do_not_show_this_again), text = stringResource(id = CommonStrings.common_do_not_show_this_again),
style = ElementTheme.materialTypography.bodyMedium, style = ElementTheme.typography.fontBodyMdRegular,
) )
} }
} }

2
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/TextFieldDialog.kt
View file

@ -76,7 +76,7 @@ fun TextFieldDialog(
item { item {
Text( Text(
text = content, text = content,
style = ElementTheme.materialTypography.bodyMedium, style = ElementTheme.typography.fontBodyMdRegular,
) )
} }
} }

2
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/AlertDialogContent.kt
View file

@ -65,7 +65,7 @@ internal fun SimpleAlertDialogContent(
content = { content = {
Text( Text(
text = content, text = content,
style = ElementTheme.materialTypography.bodyMedium, style = ElementTheme.typography.fontBodyMdRegular,
) )
}, },
submitText = submitText, submitText = submitText,

4
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt
View file

@ -114,7 +114,7 @@ fun ListItem(
val decoratedHeadlineContent: @Composable () -> Unit = { val decoratedHeadlineContent: @Composable () -> Unit = {
CompositionLocalProvider( CompositionLocalProvider(
LocalTextStyle provides ElementTheme.materialTypography.bodyLarge, LocalTextStyle provides ElementTheme.typography.fontBodyLgRegular,
LocalContentColor provides headlineColor, LocalContentColor provides headlineColor,
) { ) {
headlineContent() headlineContent()
@ -123,7 +123,7 @@ fun ListItem(
val decoratedSupportingContent: (@Composable () -> Unit)? = supportingContent?.let { content -> val decoratedSupportingContent: (@Composable () -> Unit)? = supportingContent?.let { content ->
{ {
CompositionLocalProvider( CompositionLocalProvider(
LocalTextStyle provides ElementTheme.materialTypography.bodyMedium, LocalTextStyle provides ElementTheme.typography.fontBodyMdRegular,
LocalContentColor provides supportingColor, LocalContentColor provides supportingColor,
) { ) {
content() content()