From 78318680525972f1f392ef6a647fbedb482f0b69 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Thu, 29 Aug 2024 15:05:28 +0300 Subject: [PATCH] Tweak the EncryptionReset root screen copy. --- .../Resources/Localizations/en.lproj/Localizable.strings | 6 +++--- ElementX/Sources/Generated/Strings.swift | 8 ++++---- .../View/EncryptionResetScreen.swift | 7 +------ .../test_encryptionResetScreen-iPad-en-GB.1.png | 4 ++-- .../test_encryptionResetScreen-iPad-pseudo.1.png | 4 ++-- .../test_encryptionResetScreen-iPhone-15-en-GB.1.png | 4 ++-- .../test_encryptionResetScreen-iPhone-15-pseudo.1.png | 4 ++-- .../test_identityConfirmationScreen-iPad-en-GB.1.png | 4 ++-- .../test_identityConfirmationScreen-iPad-pseudo.1.png | 4 ++-- .../test_identityConfirmationScreen-iPhone-15-en-GB.1.png | 4 ++-- ...test_identityConfirmationScreen-iPhone-15-pseudo.1.png | 4 ++-- 11 files changed, 24 insertions(+), 29 deletions(-) diff --git a/ElementX/Resources/Localizations/en.lproj/Localizable.strings b/ElementX/Resources/Localizations/en.lproj/Localizable.strings index 1b48f4d1b2..1e09cf1d47 100644 --- a/ElementX/Resources/Localizations/en.lproj/Localizable.strings +++ b/ElementX/Resources/Localizations/en.lproj/Localizable.strings @@ -441,16 +441,16 @@ "screen_edit_profile_error_title" = "Unable to update profile"; "screen_edit_profile_title" = "Edit profile"; "screen_edit_profile_updating_details" = "Updating profile…"; +"screen_encryption_reset_action_continue_reset" = "Continue reset"; "screen_encryption_reset_bullet_1" = "Your account details, contacts, preferences, and chat list will be kept"; "screen_encryption_reset_bullet_2" = "You will lose your existing message history"; "screen_encryption_reset_bullet_3" = "You will need to verify all your existing devices and contacts again"; "screen_encryption_reset_footer" = "Only reset your identity if you don’t have access to another signed-in device and you’ve lost your recovery key."; -"screen_encryption_reset_subtitle" = "If you’re not signed in to any other devices and you’ve lost your recovery key, then you’ll need to reset your identity to continue using the app. "; -"screen_encryption_reset_title" = "Reset your identity in case you can’t confirm another way"; +"screen_encryption_reset_title" = "Can't confirm? You’ll need to reset your identity."; "screen_identity_confirmation_cannot_confirm" = "Can't confirm?"; "screen_identity_confirmation_create_new_recovery_key" = "Create a new recovery key"; "screen_identity_confirmation_subtitle" = "Verify this device to set up secure messaging."; -"screen_identity_confirmation_title" = "Confirm that it's you"; +"screen_identity_confirmation_title" = "Confirm your identity"; "screen_identity_confirmation_use_another_device" = "Use another device"; "screen_identity_confirmation_use_recovery_key" = "Use recovery key"; "screen_identity_confirmed_subtitle" = "Now you can read or send messages securely, and anyone you chat with can also trust this device."; diff --git a/ElementX/Sources/Generated/Strings.swift b/ElementX/Sources/Generated/Strings.swift index 1d37387dd3..38e9742112 100644 --- a/ElementX/Sources/Generated/Strings.swift +++ b/ElementX/Sources/Generated/Strings.swift @@ -1057,6 +1057,8 @@ internal enum L10n { internal static var screenEditProfileTitle: String { return L10n.tr("Localizable", "screen_edit_profile_title") } /// Updating profile… internal static var screenEditProfileUpdatingDetails: String { return L10n.tr("Localizable", "screen_edit_profile_updating_details") } + /// Continue reset + internal static var screenEncryptionResetActionContinueReset: String { return L10n.tr("Localizable", "screen_encryption_reset_action_continue_reset") } /// Your account details, contacts, preferences, and chat list will be kept internal static var screenEncryptionResetBullet1: String { return L10n.tr("Localizable", "screen_encryption_reset_bullet_1") } /// You will lose your existing message history @@ -1065,9 +1067,7 @@ internal enum L10n { internal static var screenEncryptionResetBullet3: String { return L10n.tr("Localizable", "screen_encryption_reset_bullet_3") } /// Only reset your identity if you don’t have access to another signed-in device and you’ve lost your recovery key. internal static var screenEncryptionResetFooter: String { return L10n.tr("Localizable", "screen_encryption_reset_footer") } - /// If you’re not signed in to any other devices and you’ve lost your recovery key, then you’ll need to reset your identity to continue using the app. - internal static var screenEncryptionResetSubtitle: String { return L10n.tr("Localizable", "screen_encryption_reset_subtitle") } - /// Reset your identity in case you can’t confirm another way + /// Can't confirm? You’ll need to reset your identity. internal static var screenEncryptionResetTitle: String { return L10n.tr("Localizable", "screen_encryption_reset_title") } /// Can't confirm? internal static var screenIdentityConfirmationCannotConfirm: String { return L10n.tr("Localizable", "screen_identity_confirmation_cannot_confirm") } @@ -1075,7 +1075,7 @@ internal enum L10n { internal static var screenIdentityConfirmationCreateNewRecoveryKey: String { return L10n.tr("Localizable", "screen_identity_confirmation_create_new_recovery_key") } /// Verify this device to set up secure messaging. internal static var screenIdentityConfirmationSubtitle: String { return L10n.tr("Localizable", "screen_identity_confirmation_subtitle") } - /// Confirm that it's you + /// Confirm your identity internal static var screenIdentityConfirmationTitle: String { return L10n.tr("Localizable", "screen_identity_confirmation_title") } /// Use another device internal static var screenIdentityConfirmationUseAnotherDevice: String { return L10n.tr("Localizable", "screen_identity_confirmation_use_another_device") } diff --git a/ElementX/Sources/Screens/EncryptionReset/EncryptionResetScreen/View/EncryptionResetScreen.swift b/ElementX/Sources/Screens/EncryptionReset/EncryptionResetScreen/View/EncryptionResetScreen.swift index 24924359d0..cb9118286a 100644 --- a/ElementX/Sources/Screens/EncryptionReset/EncryptionResetScreen/View/EncryptionResetScreen.swift +++ b/ElementX/Sources/Screens/EncryptionReset/EncryptionResetScreen/View/EncryptionResetScreen.swift @@ -24,7 +24,7 @@ struct EncryptionResetScreen: View { FullscreenDialog { mainContent } bottomContent: { - Button(L10n.actionContinue, role: .destructive) { + Button(L10n.screenEncryptionResetActionContinueReset, role: .destructive) { context.send(viewAction: .reset) } .buttonStyle(.compound(.primary)) @@ -55,11 +55,6 @@ struct EncryptionResetScreen: View { .font(.compound.headingMDBold) .multilineTextAlignment(.center) .foregroundColor(.compound.textPrimary) - - Text(L10n.screenEncryptionResetSubtitle) - .font(.compound.bodyMD) - .multilineTextAlignment(.center) - .foregroundColor(.compound.textSecondary) } } diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_encryptionResetScreen-iPad-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_encryptionResetScreen-iPad-en-GB.1.png index 50304ac0c8..557f85e8b6 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_encryptionResetScreen-iPad-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_encryptionResetScreen-iPad-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e125593fee18c805f9a4e44737266b17fb7673160a1da100b5b9379e6e3cb50b -size 168133 +oid sha256:3185d3a2f1a44121a595c274d6d50c6dbed41a7aa502a82be37af0c0e2bbde99 +size 150566 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_encryptionResetScreen-iPad-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_encryptionResetScreen-iPad-pseudo.1.png index f5aeaabd7c..ddfeff4c12 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_encryptionResetScreen-iPad-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_encryptionResetScreen-iPad-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:434146f53746a7a1bffd6483f3eb47e79bf38b1cbce86de68921391c42ac6817 -size 238287 +oid sha256:1b01b28265a38f36aaffb3064b4379cb2f241bf04643a509070039e14636a023 +size 203739 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_encryptionResetScreen-iPhone-15-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_encryptionResetScreen-iPhone-15-en-GB.1.png index bdc484c599..e967ef99ee 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_encryptionResetScreen-iPhone-15-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_encryptionResetScreen-iPhone-15-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:315e9644456d7221df9953dc73ec9158fb2eaa0427898155c5d79066ba7ee0ee -size 124373 +oid sha256:c158d6914bbd77b6a473a3042ad9f7ca5be135afc83277542962532311b77023 +size 104899 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_encryptionResetScreen-iPhone-15-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_encryptionResetScreen-iPhone-15-pseudo.1.png index f086b7cce8..6a82c27e1a 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_encryptionResetScreen-iPhone-15-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_encryptionResetScreen-iPhone-15-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93549b9921c66b937a191ff6e6dccd49f76cafb7f1e62053d1c2b4fa53d5f7b1 -size 164940 +oid sha256:c6738f263f313d058b3af80f5d6dd6b752500fe56e3650eda820ebcfb183798a +size 157963 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPad-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPad-en-GB.1.png index 3531ce245a..7df40c88d3 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPad-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPad-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4a84aba9177f2aabd5ac0a277abc49e39ef9d24c66e09eced3f9d811a51c839 -size 112052 +oid sha256:11676a141f88b69165293328dcb11734d074f7fd7b2c9349def060e08f72f931 +size 111843 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPad-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPad-pseudo.1.png index f4676f5326..ef69156125 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPad-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPad-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7424e467fdbf85f3536a32703fcaadb1ef55464f53cf0ab3d2fc8c4edf57f9f -size 126931 +oid sha256:36986064f20673b2a485c2eccef8502030e5e681cdaadd483518b7dc5e1095b1 +size 127209 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPhone-15-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPhone-15-en-GB.1.png index 4ce196dd66..ba383dfaf5 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPhone-15-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPhone-15-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9bf6f00287b731049979d42cdfc44d46ba58e612329b17dea34bdc7815c458ab -size 67095 +oid sha256:cfd45923268bc5e7755b17597290cf39451fa92abe4b514164d19fc21f934be5 +size 67005 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPhone-15-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPhone-15-pseudo.1.png index d072c34a61..f3434c808d 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPhone-15-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPhone-15-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49f7af683e4a2b10351bb4edf8b4692934e2bc47ee4c726c6d6230bfa6e7f034 -size 84897 +oid sha256:75c432bd34524fe3bc496b6b3306010bfdf4b51b00bcbd990286a01da8f5d9a0 +size 85907