diff options
| author | Albin <albin@mullvad.net> | 2024-08-19 11:27:39 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-08-19 11:27:39 +0200 |
| commit | 58a811f70b0d9da7ad052ec98b25eff65ee4a1be (patch) | |
| tree | d3320e7b3f36b92c6da11bdd7bf43397871198e2 /android/app/src/main | |
| parent | ed5b060f39f8739673ca9470f1fea24abc729211 (diff) | |
| parent | b6f78500e1b6c358c8a21ffcaef9fd157f2c5731 (diff) | |
| download | mullvadvpn-58a811f70b0d9da7ad052ec98b25eff65ee4a1be.tar.xz mullvadvpn-58a811f70b0d9da7ad052ec98b25eff65ee4a1be.zip | |
Merge branch 'auto-connect-lockdown-mode-title-is-not-translated-droid-1257'
Diffstat (limited to 'android/app/src/main')
2 files changed, 11 insertions, 2 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/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 a372eab354..f5f24a635c 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() }, |