mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-04 20:01:55 +00:00
Use typography instead of materialTypography.
This commit is contained in:
committed by
Benoit Marty
parent
5551f4e039
commit
31d5aa7a33
+2
-2
@@ -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,
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
|
|||||||
+1
-1
@@ -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,
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
|
|||||||
+2
-2
@@ -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,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -76,7 +76,7 @@ fun TextFieldDialog(
|
|||||||
item {
|
item {
|
||||||
Text(
|
Text(
|
||||||
text = content,
|
text = content,
|
||||||
style = ElementTheme.materialTypography.bodyMedium,
|
style = ElementTheme.typography.fontBodyMdRegular,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -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,
|
||||||
|
|||||||
+2
-2
@@ -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()
|
||||||
|
|||||||
Reference in New Issue
Block a user