diff options
| author | David Göransson <david.goransson90@gmail.com> | 2023-10-04 14:56:35 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-10-06 17:34:38 +0200 |
| commit | fc95a2f3098e728aa4e39a8451782ead200303de (patch) | |
| tree | 7e05c3600022ba0ef85ac62588819376f5a2c667 /android/lib | |
| parent | 7cc6fc383ef5def605ab9e0cca0e08e14f76df3b (diff) | |
| download | mullvadvpn-fc95a2f3098e728aa4e39a8451782ead200303de.tar.xz mullvadvpn-fc95a2f3098e728aa4e39a8451782ead200303de.zip | |
Remove remaining uses of old topbar
Diffstat (limited to 'android/lib')
| -rw-r--r-- | android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt | 3 | ||||
| -rw-r--r-- | android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/typeface/TypeScale.kt | 1 |
2 files changed, 2 insertions, 2 deletions
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 8480e1c520..9ab3fc1e0f 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 @@ -15,7 +15,6 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import net.mullvad.mullvadvpn.lib.theme.dimensions.Dimensions import net.mullvad.mullvadvpn.lib.theme.dimensions.defaultDimensions import net.mullvad.mullvadvpn.lib.theme.typeface.TypeScale @@ -30,7 +29,7 @@ private val MullvadTypography = bodyMedium = TextStyle(fontSize = TypeScale.TextMediumPlus, fontWeight = FontWeight.Bold), titleMedium = TextStyle(fontSize = TypeScale.TextMediumPlus, fontWeight = FontWeight.SemiBold), - titleLarge = TextStyle(fontSize = 22.sp, fontFamily = FontFamily.SansSerif), + titleLarge = TextStyle(fontSize = TypeScale.TitleLarge, fontFamily = FontFamily.SansSerif), labelMedium = TextStyle(fontSize = TypeScale.TextSmall, fontWeight = FontWeight.SemiBold), labelLarge = TextStyle( diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/typeface/TypeScale.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/typeface/TypeScale.kt index 09ee7cafde..524461c07e 100644 --- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/typeface/TypeScale.kt +++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/typeface/TypeScale.kt @@ -16,4 +16,5 @@ internal object TypeScale { val TextMediumPlus = 18.sp val TextMedium = 16.sp val TextSmall = 13.sp + val TitleLarge = 22.sp } |