From cc3ec299dc4e950146b697d749bebaa7888e96d1 Mon Sep 17 00:00:00 2001 From: Doug Date: Wed, 30 Oct 2024 08:55:33 +0000 Subject: [PATCH 1/2] Update verify identity button title. --- ElementX/Resources/Localizations/en.lproj/Localizable.strings | 1 + ElementX/Sources/Generated/Strings.swift | 2 ++ .../RoomMemberDetailsScreenModels.swift | 4 ---- .../View/RoomMemberDetailsScreen.swift | 2 +- .../Screens/UserProfileScreen/UserProfileScreenModels.swift | 4 ---- .../Screens/UserProfileScreen/View/UserProfileScreen.swift | 2 +- .../test_roomMemberDetailsScreen-iPad-en-GB.Ignored-User.png | 4 ++-- .../test_roomMemberDetailsScreen-iPad-en-GB.Other-User.png | 4 ++-- .../test_roomMemberDetailsScreen-iPad-pseudo.Ignored-User.png | 4 ++-- .../test_roomMemberDetailsScreen-iPad-pseudo.Other-User.png | 4 ++-- ...t_roomMemberDetailsScreen-iPhone-16-en-GB.Ignored-User.png | 4 ++-- ...est_roomMemberDetailsScreen-iPhone-16-en-GB.Other-User.png | 4 ++-- ..._roomMemberDetailsScreen-iPhone-16-pseudo.Ignored-User.png | 4 ++-- ...st_roomMemberDetailsScreen-iPhone-16-pseudo.Other-User.png | 4 ++-- 14 files changed, 21 insertions(+), 26 deletions(-) diff --git a/ElementX/Resources/Localizations/en.lproj/Localizable.strings b/ElementX/Resources/Localizations/en.lproj/Localizable.strings index 65ee807bcd..e5a5651e2e 100644 --- a/ElementX/Resources/Localizations/en.lproj/Localizable.strings +++ b/ElementX/Resources/Localizations/en.lproj/Localizable.strings @@ -234,6 +234,7 @@ "common_verification_failed" = "Verification failed"; "common_verified" = "Verified"; "common_verify_device" = "Verify device"; +"common_verify_identity" = "Verify identity"; "common_video" = "Video"; "common_voice_message" = "Voice message"; "common_waiting" = "Waiting…"; diff --git a/ElementX/Sources/Generated/Strings.swift b/ElementX/Sources/Generated/Strings.swift index 6f23eda763..573a347c04 100644 --- a/ElementX/Sources/Generated/Strings.swift +++ b/ElementX/Sources/Generated/Strings.swift @@ -526,6 +526,8 @@ internal enum L10n { internal static var commonVerified: String { return L10n.tr("Localizable", "common_verified") } /// Verify device internal static var commonVerifyDevice: String { return L10n.tr("Localizable", "common_verify_device") } + /// Verify identity + internal static var commonVerifyIdentity: String { return L10n.tr("Localizable", "common_verify_identity") } /// Video internal static var commonVideo: String { return L10n.tr("Localizable", "common_video") } /// Voice message diff --git a/ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenModels.swift b/ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenModels.swift index e55252e65e..ad319e9212 100644 --- a/ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenModels.swift +++ b/ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenModels.swift @@ -30,10 +30,6 @@ struct RoomMemberDetailsScreenViewState: BindableState { var showVerificationSection: Bool { isVerified == false && !isOwnMemberDetails } - - var verifyButtonTitle: String { - L10n.screenRoomMemberDetailsVerifyButtonTitle(memberDetails?.name ?? "") - } } struct RoomMemberDetailsScreenViewStateBindings { diff --git a/ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift b/ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift index 0e7be2d2f8..c075c5618f 100644 --- a/ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift +++ b/ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift @@ -86,7 +86,7 @@ struct RoomMemberDetailsScreen: View { var verificationSection: some View { if context.viewState.showVerificationSection { Section { - ListRow(label: .default(title: context.viewState.verifyButtonTitle, + ListRow(label: .default(title: L10n.commonVerifyIdentity, description: L10n.screenRoomMemberDetailsVerifyButtonSubtitle, icon: \.lock), kind: .button { }) diff --git a/ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenModels.swift b/ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenModels.swift index ba3ffd6e4e..3497c33192 100644 --- a/ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenModels.swift +++ b/ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenModels.swift @@ -32,10 +32,6 @@ struct UserProfileScreenViewState: BindableState { var showVerificationSection: Bool { isVerified == false && !isOwnUser } - - var verifyButtonTitle: String { - L10n.screenRoomMemberDetailsVerifyButtonTitle(userProfile?.displayName ?? "") - } } struct UserProfileScreenViewStateBindings { diff --git a/ElementX/Sources/Screens/UserProfileScreen/View/UserProfileScreen.swift b/ElementX/Sources/Screens/UserProfileScreen/View/UserProfileScreen.swift index 075b53a51c..7e90f0fdde 100644 --- a/ElementX/Sources/Screens/UserProfileScreen/View/UserProfileScreen.swift +++ b/ElementX/Sources/Screens/UserProfileScreen/View/UserProfileScreen.swift @@ -83,7 +83,7 @@ struct UserProfileScreen: View { var verificationSection: some View { if context.viewState.showVerificationSection { Section { - ListRow(label: .default(title: context.viewState.verifyButtonTitle, + ListRow(label: .default(title: L10n.commonVerifyIdentity, description: L10n.screenRoomMemberDetailsVerifyButtonSubtitle, icon: \.lock), kind: .button { }) diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPad-en-GB.Ignored-User.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPad-en-GB.Ignored-User.png index d89dcfc938..5e66f972ed 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPad-en-GB.Ignored-User.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPad-en-GB.Ignored-User.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4a9d05d2aea48c83dd1f0891eccbdc2d99a9b38176971efd097597e69fda28f -size 121678 +oid sha256:1ec63ab41577f807b574db65d04cad3e7274d7b684ed5c922103f2d21e79190e +size 121087 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPad-en-GB.Other-User.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPad-en-GB.Other-User.png index c820c177a8..861380ad25 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPad-en-GB.Other-User.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPad-en-GB.Other-User.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f2806abf81f7d716dd4a740bde06ca6e7d488db513f42bcb70ca4ef8a5c2505 -size 120435 +oid sha256:c6c4bb8c600440bfca120792553a0aba22f0d2da96a402b6451b9850d40a5f85 +size 120759 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPad-pseudo.Ignored-User.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPad-pseudo.Ignored-User.png index 1775940a9a..9c665866e9 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPad-pseudo.Ignored-User.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPad-pseudo.Ignored-User.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9d5ad23bdf44dbe689d44c03ad2a6f12e993bcf6d8245d614b3d9e3b004b8b9 -size 127141 +oid sha256:c12ffa3f032de0f340ad726938cab004203baf478830ed862862e2ff8566c435 +size 125206 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPad-pseudo.Other-User.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPad-pseudo.Other-User.png index e2b6c81cd0..3db539ebed 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPad-pseudo.Other-User.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPad-pseudo.Other-User.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1dcb000d6d4caae5edbfef5e9007d327b72332708a98fc1df54a35622f8eb220 -size 125657 +oid sha256:4585da982eba8c37919fba2f006bbe2e37b206704691b61bcaf06e3ed7cb47a7 +size 124706 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPhone-16-en-GB.Ignored-User.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPhone-16-en-GB.Ignored-User.png index a2845556dd..9529799c6d 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPhone-16-en-GB.Ignored-User.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPhone-16-en-GB.Ignored-User.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:baa7127ec68c63490624fba7d6204063cdf950e941a55066291766e887c2281c -size 71929 +oid sha256:5fa4b9ddeef05139339a3e604e1567178cce02c3c03d19b309b2c9d8af441010 +size 71684 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPhone-16-en-GB.Other-User.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPhone-16-en-GB.Other-User.png index 858e2bfb03..498f55ea54 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPhone-16-en-GB.Other-User.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPhone-16-en-GB.Other-User.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de7639ceab51d7eb8306c7df3a9a6899c1e78a120e22358908f95f9791cb417f -size 70569 +oid sha256:dfde43627b92944423a6f1f2754fe5de95810aa2812576ec3225dcefb91e068e +size 70821 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPhone-16-pseudo.Ignored-User.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPhone-16-pseudo.Ignored-User.png index 5920bc5e6a..1b5f55b18d 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPhone-16-pseudo.Ignored-User.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPhone-16-pseudo.Ignored-User.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d624776c5e6a14ddb5c21e7349a9e2b29499d45137c4dbe906f3ad1014d9c6d2 -size 84082 +oid sha256:7bae3f0db0d77faae018f19ace01ce3cde202db0fad1a2bc4618de37eba08aa8 +size 83579 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPhone-16-pseudo.Other-User.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPhone-16-pseudo.Other-User.png index d1c0729d73..957491ce31 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPhone-16-pseudo.Other-User.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen-iPhone-16-pseudo.Other-User.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddcf366a4fea427cd38681cff49842d7f5bc73ebc218efbe7ea9bc5914ae7b62 -size 82982 +oid sha256:4fb14af69f8a5d606ab5375d35d04ce5da7fa8af581b439f61a18fdb7b10e448 +size 82951 From c49ac47519b3052562d961c2e5702abb5c5bef43 Mon Sep 17 00:00:00 2001 From: Doug Date: Wed, 30 Oct 2024 15:23:25 +0000 Subject: [PATCH 2/2] Update some missed snapshots. --- .../test_userProfileScreen-iPad-en-GB.Other-User.png | 4 ++-- .../test_userProfileScreen-iPad-pseudo.Other-User.png | 4 ++-- .../test_userProfileScreen-iPhone-16-en-GB.Other-User.png | 4 ++-- .../test_userProfileScreen-iPhone-16-pseudo.Other-User.png | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_userProfileScreen-iPad-en-GB.Other-User.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_userProfileScreen-iPad-en-GB.Other-User.png index 4ca05e10c7..2f09b831a4 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_userProfileScreen-iPad-en-GB.Other-User.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_userProfileScreen-iPad-en-GB.Other-User.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5995f233036158f3adaff3e86899e86ccace5c6b6991626c78e1514eb63c5d5 -size 115587 +oid sha256:94d690d16fdb9960e4da643bf30c63b9836ab15beac644e27ddd4bda28a01038 +size 114661 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_userProfileScreen-iPad-pseudo.Other-User.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_userProfileScreen-iPad-pseudo.Other-User.png index c750e0cb89..251c8f620d 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_userProfileScreen-iPad-pseudo.Other-User.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_userProfileScreen-iPad-pseudo.Other-User.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:207bad6ef21783ebcc7c8189af09c233d191b01ddf7dc2fd92d3bbd1df1dd2ae -size 120261 +oid sha256:c4eec79fbfc398d28032b5911b48b04a0ece228eeb77f24068437a0cfb8cb9da +size 118148 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_userProfileScreen-iPhone-16-en-GB.Other-User.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_userProfileScreen-iPhone-16-en-GB.Other-User.png index 892b09ce16..475c0e1713 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_userProfileScreen-iPhone-16-en-GB.Other-User.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_userProfileScreen-iPhone-16-en-GB.Other-User.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5bd27ed946027cecc6286c1b4a0212b92addba260e7a17a650bb1f8a00ac0df9 -size 65717 +oid sha256:7979a1a28cc4bbe57e4b45db8278bcc8ddd2618b40985e22e473c9c49c3fef6d +size 65179 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_userProfileScreen-iPhone-16-pseudo.Other-User.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_userProfileScreen-iPhone-16-pseudo.Other-User.png index 3b7dc05d9c..6badb1172d 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_userProfileScreen-iPhone-16-pseudo.Other-User.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_userProfileScreen-iPhone-16-pseudo.Other-User.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5dca5794cc839ed0d28f7868e044ef5aba075e5e44e0b3e43c9b70df7e642b8 -size 78100 +oid sha256:6b6ecdb7a7b7bcacf5c8aa3b0c083453fde5fa7ddd65c98e9d8ea33eb540cddc +size 77283