diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-08-16 09:43:14 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-08-19 11:22:31 +0200 |
| commit | b6f78500e1b6c358c8a21ffcaef9fd157f2c5731 (patch) | |
| tree | d3320e7b3f36b92c6da11bdd7bf43397871198e2 | |
| parent | 5d3477e58ad6959f2d4acc8baaeda4d4731b3529 (diff) | |
| download | mullvadvpn-b6f78500e1b6c358c8a21ffcaef9fd157f2c5731.tar.xz mullvadvpn-b6f78500e1b6c358c8a21ffcaef9fd157f2c5731.zip | |
Fix title in autoconnect guide
3 files changed, 19 insertions, 1 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt index a9db7e0e62..51ba207165 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt @@ -21,6 +21,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.LargeTopAppBar +import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MediumTopAppBar import androidx.compose.material3.Surface @@ -38,6 +39,7 @@ import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.LineBreak import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -276,7 +278,14 @@ fun MullvadLargeTopBar( scrollBehavior: TopAppBarScrollBehavior? = null ) { LargeTopAppBar( - title = { Text(text = title, maxLines = 2, overflow = TextOverflow.Ellipsis) }, + title = { + Text( + text = title, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + style = LocalTextStyle.current.copy(lineBreak = LineBreak.Heading) + ) + }, navigationIcon = navigationIcon, scrollBehavior = scrollBehavior, colors = 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 554eb6d421..51879c4a66 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 @@ -48,6 +48,12 @@ import net.mullvad.mullvadvpn.lib.theme.typeface.TypeScale private val MullvadTypography = Typography( headlineLarge = TextStyle(fontSize = TypeScale.TextHuge, fontWeight = FontWeight.Bold), + headlineMedium = + TextStyle( + fontWeight = FontWeight.Bold, + fontSize = TypeScale.TextHeadline, + lineHeight = TypeScale.HeadlineMediumLineHeight, + ), headlineSmall = TextStyle(fontSize = TypeScale.TextBig, fontWeight = FontWeight.Bold), bodySmall = TextStyle(fontSize = TypeScale.TextSmall), titleSmall = TextStyle(fontSize = TypeScale.TextMedium, fontWeight = FontWeight.SemiBold), 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 524461c07e..4e5492a630 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 @@ -12,9 +12,12 @@ import androidx.compose.ui.unit.sp */ internal object TypeScale { val TextHuge = 30.sp + val TextHeadline = 28.sp val TextBig = 24.sp val TextMediumPlus = 18.sp val TextMedium = 16.sp val TextSmall = 13.sp val TitleLarge = 22.sp + + val HeadlineMediumLineHeight = 36.0.sp } |