diff options
| author | David Göransson <david.goransson90@gmail.com> | 2023-10-03 15:00:33 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-10-06 17:34:38 +0200 |
| commit | 7cc6fc383ef5def605ab9e0cca0e08e14f76df3b (patch) | |
| tree | 47bdec6199644bb285d6807895d630363bfa9c02 /android/lib/theme/src | |
| parent | 7256c138ebc59463bfa0771f7c3093bac36a8f09 (diff) | |
| download | mullvadvpn-7cc6fc383ef5def605ab9e0cca0e08e14f76df3b.tar.xz mullvadvpn-7cc6fc383ef5def605ab9e0cca0e08e14f76df3b.zip | |
Replace old topbar with Material3
Diffstat (limited to 'android/lib/theme/src')
| -rw-r--r-- | android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt | 3 |
1 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..8480e1c520 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,9 +11,11 @@ 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 +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 @@ -28,6 +30,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), labelMedium = TextStyle(fontSize = TypeScale.TextSmall, fontWeight = FontWeight.SemiBold), labelLarge = TextStyle( |