diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-02-04 08:42:45 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-02-05 08:23:42 +0100 |
| commit | 8e2d293b96421f56f98c088cfee6bb27fe64b19a (patch) | |
| tree | 3e4399e80fe52223ded8f5a1df27f21c5ff7bd1d /android/app/src | |
| parent | bec591796a9b7fb9594243db5702fafc71d7e4cc (diff) | |
| download | mullvadvpn-8e2d293b96421f56f98c088cfee6bb27fe64b19a.tar.xz mullvadvpn-8e2d293b96421f56f98c088cfee6bb27fe64b19a.zip | |
Move daita data usage warning to the first page
Diffstat (limited to 'android/app/src')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DaitaScreen.kt | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DaitaScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DaitaScreen.kt index 60d8d7e861..8c8228b046 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DaitaScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DaitaScreen.kt @@ -207,22 +207,17 @@ private enum class DaitaPages( FIRST( image = R.drawable.daita_illustration_1, textFirstParagraph = + @Composable { stringResource(R.string.daita_description_slide_1_first_paragraph) }, + textSecondParagraph = @Composable { stringResource( - R.string.daita_description_slide_1_first_paragraph, + R.string.daita_description_slide_1_second_paragraph, stringResource(id = R.string.daita), stringResource(id = R.string.daita_full), ) }, - textSecondParagraph = - @Composable { stringResource(R.string.daita_description_slide_1_second_paragraph) }, textThirdParagraph = - @Composable { - stringResource( - R.string.daita_description_slide_1_third_paragraph, - stringResource(id = R.string.daita), - ) - }, + @Composable { stringResource(R.string.daita_description_slide_1_third_paragraph) }, ), SECOND( image = R.drawable.daita_illustration_2, @@ -237,9 +232,6 @@ private enum class DaitaPages( @Composable { stringResource( R.string.daita_description_slide_2_second_paragraph, - // Duplicated argument to keep compatibility with our common string template - // (messages.pot) while also keeping lint happy. - stringResource(id = R.string.daita), stringResource(id = R.string.daita), ) }, @@ -247,6 +239,9 @@ private enum class DaitaPages( @Composable { stringResource( R.string.daita_description_slide_2_third_paragraph, + // Duplicated argument to keep compatibility with our common string template + // (messages.pot) while also keeping lint happy. + stringResource(id = R.string.daita), stringResource(id = R.string.daita), ) }, |