diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-02-06 14:32:01 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-02-06 14:32:01 +0100 |
| commit | d5ff4cd33db419e07ef44dfcb253a3c1927022c8 (patch) | |
| tree | a4de26e8e1b5cb3237266a149aadb06bb98efe25 | |
| parent | d24737222c2e7bd0d3a38067c39c521d13dd622f (diff) | |
| parent | fef907dd170b14111d52a558d3566f3ee978478a (diff) | |
| download | mullvadvpn-d5ff4cd33db419e07ef44dfcb253a3c1927022c8.tar.xz mullvadvpn-d5ff4cd33db419e07ef44dfcb253a3c1927022c8.zip | |
Merge branch 'change-snackbar-font-droid-918'
4 files changed, 3 insertions, 4 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/MullvadButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/MullvadButton.kt index 3a7df2b841..bbe22c9b11 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/MullvadButton.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/MullvadButton.kt @@ -190,7 +190,7 @@ private fun BaseButton( Text( text = text, textAlign = TextAlign.Center, - style = MaterialTheme.typography.bodyMedium, + style = MaterialTheme.typography.titleMedium, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f), diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/MullvadSegmentedButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/MullvadSegmentedButton.kt index f67e7228af..18ad113a26 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/MullvadSegmentedButton.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/MullvadSegmentedButton.kt @@ -54,7 +54,7 @@ private fun SingleChoiceSegmentedButtonRowScope.MullvadSegmentedButton( Text( text = text, textAlign = TextAlign.Center, - style = MaterialTheme.typography.bodyMedium, + style = MaterialTheme.typography.titleMedium, maxLines = 1, overflow = TextOverflow.Ellipsis, ) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/NavigationComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/NavigationComposeCell.kt index ece54c9102..b05b0f2cbe 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/NavigationComposeCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/NavigationComposeCell.kt @@ -136,7 +136,7 @@ internal fun NavigationCellBody( verticalAlignment = Alignment.CenterVertically, modifier = modifier.wrapContentWidth().wrapContentHeight(), ) { - Text(text = content, style = MaterialTheme.typography.bodyMedium, color = textColor) + Text(text = content, style = MaterialTheme.typography.titleMedium, color = textColor) Spacer(modifier = Modifier.width(Dimens.sideMargin)) if (isExternalLink) { DefaultExternalLinkView(content, tint = contentColor) diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt index f38602bf16..9eb0aae4b2 100644 --- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt +++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt @@ -38,7 +38,6 @@ private val MullvadTypography = headlineSmall = TextStyle(fontSize = TypeScale.TextBig, fontWeight = FontWeight.Bold), bodySmall = TextStyle(fontSize = TypeScale.TextSmall), titleSmall = TextStyle(fontSize = TypeScale.TextMedium, fontWeight = FontWeight.SemiBold), - bodyMedium = TextStyle(fontSize = TypeScale.TextMediumPlus, fontWeight = FontWeight.Bold), titleMedium = TextStyle(fontSize = TypeScale.TextMediumPlus, fontWeight = FontWeight.SemiBold), titleLarge = TextStyle(fontSize = TypeScale.TitleLarge, fontFamily = FontFamily.SansSerif), |