summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2023-06-07 10:33:52 +0200
committerAlbin <albin@mullvad.net>2023-06-07 10:33:52 +0200
commitfcd2fdd499fff080ec7430322a88bcbe403b8cfe (patch)
tree09b98919081655d76bfeb76f1101bd18dd27daac
parentdb697a39e381712affbb21f6924403427fe97238 (diff)
parent86fbcc1cde7440676e3b5b22805e83f3557540c2 (diff)
downloadmullvadvpn-fcd2fdd499fff080ec7430322a88bcbe403b8cfe.tar.xz
mullvadvpn-fcd2fdd499fff080ec7430322a88bcbe403b8cfe.zip
Merge remote-tracking branch 'mullmat/main'
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Type.kt33
1 files changed, 33 insertions, 0 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Type.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Type.kt
new file mode 100644
index 0000000000..160b133172
--- /dev/null
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Type.kt
@@ -0,0 +1,33 @@
+package net.mullvad.mullvadvpn.compose.theme
+
+import androidx.compose.material3.Typography
+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.sp
+
+internal val MullvadMaterial3Typography =
+ Typography(
+ displayLarge = TextStyle(fontFamily = FontFamily.SansSerif),
+ displayMedium = TextStyle(fontFamily = FontFamily.SansSerif),
+ displaySmall = TextStyle(fontFamily = FontFamily.SansSerif),
+ headlineLarge = TextStyle(fontFamily = FontFamily.SansSerif, fontWeight = FontWeight.Black),
+ headlineMedium = TextStyle(fontFamily = FontFamily.SansSerif),
+ headlineSmall = TextStyle(fontFamily = FontFamily.SansSerif, fontWeight = FontWeight.Black),
+ titleLarge = TextStyle(fontFamily = FontFamily.SansSerif, fontWeight = FontWeight.Black),
+ titleMedium = TextStyle(fontFamily = FontFamily.SansSerif),
+ titleSmall = TextStyle(fontFamily = FontFamily.SansSerif),
+ bodyLarge = TextStyle(fontFamily = FontFamily.SansSerif),
+ bodyMedium = TextStyle(fontFamily = FontFamily.SansSerif, fontWeight = FontWeight.SemiBold),
+ bodySmall = TextStyle(fontFamily = FontFamily.SansSerif, fontWeight = FontWeight.SemiBold),
+ labelLarge =
+ TextStyle(
+ fontFamily = FontFamily.SansSerif,
+ fontWeight = FontWeight.SemiBold,
+ fontSize = 18.sp,
+ lineHeight = 23.sp
+ ),
+ labelMedium =
+ TextStyle(fontFamily = FontFamily.SansSerif, fontWeight = FontWeight.SemiBold),
+ labelSmall = TextStyle(fontFamily = FontFamily.SansSerif, fontWeight = FontWeight.SemiBold)
+ )