From 5d3477e58ad6959f2d4acc8baaeda4d4731b3529 Mon Sep 17 00:00:00 2001 From: Jonatan Rhodin Date: Thu, 15 Aug 2024 16:27:17 +0200 Subject: [PATCH 1/2] Remove two line title that was not translated --- .../compose/screen/AutoConnectAndLockdownModeScreen.kt | 2 +- android/lib/resource/src/main/res/values/strings.xml | 1 - gui/locales/messages.pot | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt index a372eab354be..f5f24a635c2c 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt @@ -84,7 +84,7 @@ fun AutoConnectAndLockdownMode(navigator: DestinationsNavigator) { fun AutoConnectAndLockdownModeScreen(onBackClick: () -> Unit = {}) { val context = LocalContext.current ScaffoldWithLargeTopBarAndButton( - appBarTitle = stringResource(id = R.string.auto_connect_and_lockdown_mode_two_lines), + appBarTitle = stringResource(id = R.string.auto_connect_and_lockdown_mode), navigationIcon = { NavigateBackIconButton(onNavigateBack = onBackClick) }, buttonTitle = stringResource(id = R.string.go_to_vpn_settings), onButtonClick = { context.openVpnSettings() }, diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml index c5b884b745a7..ef6b0bce7afe 100644 --- a/android/lib/resource/src/main/res/values/strings.xml +++ b/android/lib/resource/src/main/res/values/strings.xml @@ -74,7 +74,6 @@ Allows access to other devices on the same network for sharing, printing etc. Auto-connect Auto-connect & Lockdown mode - Auto-connect & \nLockdown mode Makes sure the device is always on the VPN tunnel. Go to VPN settings There is no VPN settings on your device diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot index 85d289b38d4b..76223176d523 100644 --- a/gui/locales/messages.pot +++ b/gui/locales/messages.pot @@ -2192,9 +2192,6 @@ msgstr "" msgid "Auto-connect & Lockdown mode" msgstr "" -msgid "Auto-connect & \\nLockdown mode" -msgstr "" - msgid "Auto-connect (legacy)" msgstr "" From b6f78500e1b6c358c8a21ffcaef9fd157f2c5731 Mon Sep 17 00:00:00 2001 From: Jonatan Rhodin Date: Fri, 16 Aug 2024 09:43:14 +0200 Subject: [PATCH 2/2] Fix title in autoconnect guide --- .../mullvad/mullvadvpn/compose/component/TopBar.kt | 11 ++++++++++- .../kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt | 6 ++++++ .../mullvadvpn/lib/theme/typeface/TypeScale.kt | 3 +++ 3 files changed, 19 insertions(+), 1 deletion(-) 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 a9db7e0e6253..51ba20716515 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 554eb6d4217b..51879c4a663c 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 524461c07e8c..4e5492a63095 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 }