diff options
| author | Albin <albin@mullvad.net> | 2023-10-06 22:53:58 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-10-06 22:53:58 +0200 |
| commit | c1f9e782da8d8cd5731fe43017f056b184f126c9 (patch) | |
| tree | 6548308aa794a079b2b36b5e96a6b17e7a8e8002 /android/lib | |
| parent | 7256c138ebc59463bfa0771f7c3093bac36a8f09 (diff) | |
| parent | 7e28f789dadaa07950101058330757769a76e70d (diff) | |
| download | mullvadvpn-c1f9e782da8d8cd5731fe43017f056b184f126c9.tar.xz mullvadvpn-c1f9e782da8d8cd5731fe43017f056b184f126c9.zip | |
Merge branch 'evaluate-replacing-collapsing-toolbar-droid-272'
Diffstat (limited to 'android/lib')
| -rw-r--r-- | android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt | 2 | ||||
| -rw-r--r-- | android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/typeface/TypeScale.kt | 1 |
2 files changed, 3 insertions, 0 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 adaedc618e..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 @@ -11,6 +11,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.TextStyle +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 @@ -28,6 +29,7 @@ private val MullvadTypography = bodyMedium = TextStyle(fontSize = TypeScale.TextMediumPlus, fontWeight = FontWeight.Bold), titleMedium = TextStyle(fontSize = TypeScale.TextMediumPlus, fontWeight = FontWeight.SemiBold), + 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 } |