From 9f239f49f7c53919a78ea3fa3246ccbe406fa402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20G=C3=B6ransson?= Date: Tue, 24 Oct 2023 13:41:21 +0200 Subject: [PATCH] Update privacy strings --- .../compose/screen/PrivacyDisclaimerScreen.kt | 21 ++++++++++++++----- .../mullvadvpn/compose/util/UnitConversion.kt | 11 ++++++++++ .../resource/src/main/res/values/strings.xml | 3 ++- gui/locales/messages.pot | 9 +++++--- 4 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/UnitConversion.kt diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt index f78b54f9897f..e21cc71773c3 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt @@ -4,10 +4,12 @@ import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.text.ClickableText import androidx.compose.material3.MaterialTheme @@ -30,6 +32,7 @@ import androidx.constraintlayout.compose.Dimension import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.button.PrimaryButton import net.mullvad.mullvadvpn.compose.component.ScaffoldWithTopBar +import net.mullvad.mullvadvpn.compose.util.toDp import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.lib.theme.Dimens @@ -73,22 +76,30 @@ fun PrivacyDisclaimerScreen( ) { Text( text = stringResource(id = R.string.privacy_disclaimer_title), - fontSize = 24.sp, - color = Color.White, + style = MaterialTheme.typography.headlineSmall, + color = MaterialTheme.colorScheme.onBackground, fontWeight = FontWeight.Bold ) Text( - text = stringResource(id = R.string.privacy_disclaimer_body), + text = stringResource(id = R.string.privacy_disclaimer_body_first_paragraph), fontSize = 14.sp, - color = Color.White, + color = MaterialTheme.colorScheme.onBackground, modifier = Modifier.padding(top = 10.dp) ) + Spacer(modifier = Modifier.size(20.sp.toDp())) + + Text( + text = stringResource(id = R.string.privacy_disclaimer_body_second_paragraph), + fontSize = 14.sp, + color = MaterialTheme.colorScheme.onBackground, + ) + Row(modifier = Modifier.padding(top = 10.dp)) { ClickableText( text = AnnotatedString(stringResource(id = R.string.privacy_policy_label)), - onClick = { onPrivacyPolicyLinkClicked.invoke() }, + onClick = { onPrivacyPolicyLinkClicked() }, style = TextStyle( fontSize = 12.sp, diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/UnitConversion.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/UnitConversion.kt new file mode 100644 index 000000000000..4deb2f5c3a42 --- /dev/null +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/UnitConversion.kt @@ -0,0 +1,11 @@ +package net.mullvad.mullvadvpn.compose.util + +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.TextUnit + +@Composable +fun TextUnit.toDp(): Dp { + return with(LocalDensity.current) { this@toDp.toDp() } +} diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml index 033d3b946393..201bb25a628e 100644 --- a/android/lib/resource/src/main/res/values/strings.xml +++ b/android/lib/resource/src/main/res/values/strings.xml @@ -162,7 +162,8 @@ %s. For more details see the info button in Account.]]> Agree and continue Privacy - To make sure that you have the most secure version and to inform you of any issues with the current version that is running, the app performs version checks automatically. This sends the app version and Android system version to Mullvad servers. Mullvad keeps counters on number of used app versions and Android versions. The data is never stored or used in any way that can identify you.\n\nIf the split tunneling feature is used, then the app queries your system for a list of all installed applications. This list is only retrieved in the split tunneling view. The list of installed applications is never sent from the device. + To make sure that you have the most secure version and to inform you of any issues with the current version that is running, the app performs version checks automatically. This sends the app version and Android system version to Mullvad servers. Mullvad keeps counters on number of used app versions and Android versions. The data is never stored or used in any way that can identify you. + If the split tunneling feature is used, then the app queries your system for a list of all installed applications. This list is only retrieved in the split tunneling view. The list of installed applications is never sent from the device. Submit Remove Enter MTU diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot index 2b8e1ba6990c..fe38c49b291a 100644 --- a/gui/locales/messages.pot +++ b/gui/locales/messages.pot @@ -1789,9 +1789,6 @@ msgstr "" msgid "This might cause issues on certain websites, services, and apps." msgstr "" -msgid "To make sure that you have the most secure version and to inform you of any issues with the current version that is running, the app performs version checks automatically. This sends the app version and Android system version to Mullvad servers. Mullvad keeps counters on number of used app versions and Android versions. The data is never stored or used in any way that can identify you.\\n\\nIf the split tunneling feature is used, then the app queries your system for a list of all installed applications. This list is only retrieved in the split tunneling view. The list of installed applications is never sent from the device." -msgstr "" - msgid "Toggle VPN" msgstr "" @@ -1902,3 +1899,9 @@ msgid "an hour ago" msgid_plural "%d hours ago" msgstr[0] "" msgstr[1] "" + +msgid "If the split tunneling feature is used, then the app queries your system for a list of all installed applications. This list is only retrieved in the split tunneling view. The list of installed applications is never sent from the device." +msgstr "" + +msgid "To make sure that you have the most secure version and to inform you of any issues with the current version that is running, the app performs version checks automatically. This sends the app version and Android system version to Mullvad servers. Mullvad keeps counters on number of used app versions and Android versions. The data is never stored or used in any way that can identify you." +msgstr ""