From e2712f6b0a32401cbd5dd95b74f04f516b154c7d Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Tue, 6 Aug 2024 15:03:11 +0100 Subject: [PATCH] Finalise strings/icons for EncryptionAuthenticity. (#3121) --- .../Resources/Localizations/en.lproj/Localizable.strings | 2 +- ElementX/Sources/Generated/Strings.swift | 2 +- .../RoomScreen/View/ItemMenu/TimelineItemMenu.swift | 5 +++++ .../TimelineItemContent/EncryptionAuthenticity.swift | 8 ++++---- ...BubbledStylerView-iPad-en-GB.Encryption-Indicators.png | 4 ++-- ...ubbledStylerView-iPad-pseudo.Encryption-Indicators.png | 4 ++-- ...edStylerView-iPhone-15-en-GB.Encryption-Indicators.png | 4 ++-- ...dStylerView-iPhone-15-pseudo.Encryption-Indicators.png | 4 ++-- .../test_timelineItemMenu-iPad-en-GB.Unencrypted.png | 4 ++-- .../test_timelineItemMenu-iPad-en-GB.Unsigned.png | 3 +++ .../test_timelineItemMenu-iPad-pseudo.Unencrypted.png | 4 ++-- .../test_timelineItemMenu-iPad-pseudo.Unsigned.png | 3 +++ .../test_timelineItemMenu-iPhone-15-en-GB.Unencrypted.png | 4 ++-- .../test_timelineItemMenu-iPhone-15-en-GB.Unsigned.png | 3 +++ ...test_timelineItemMenu-iPhone-15-pseudo.Unencrypted.png | 4 ++-- .../test_timelineItemMenu-iPhone-15-pseudo.Unsigned.png | 3 +++ .../test_timelineItemSendInfoLabel-iPad-en-GB.1.png | 4 ++-- .../test_timelineItemSendInfoLabel-iPad-pseudo.1.png | 4 ++-- .../test_timelineItemSendInfoLabel-iPhone-15-en-GB.1.png | 4 ++-- .../test_timelineItemSendInfoLabel-iPhone-15-pseudo.1.png | 4 ++-- 20 files changed, 47 insertions(+), 30 deletions(-) create mode 100644 PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPad-en-GB.Unsigned.png create mode 100644 PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPad-pseudo.Unsigned.png create mode 100644 PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPhone-15-en-GB.Unsigned.png create mode 100644 PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPhone-15-pseudo.Unsigned.png diff --git a/ElementX/Resources/Localizations/en.lproj/Localizable.strings b/ElementX/Resources/Localizations/en.lproj/Localizable.strings index fe2d2b929..5157ad00b 100644 --- a/ElementX/Resources/Localizations/en.lproj/Localizable.strings +++ b/ElementX/Resources/Localizations/en.lproj/Localizable.strings @@ -256,7 +256,7 @@ "error_some_messages_have_not_been_sent" = "Some messages have not been sent"; "error_unknown" = "Sorry, an error occurred"; "event_shield_reason_authenticity_not_guaranteed" = "The authenticity of this encrypted message can't be guaranteed on this device."; -"event_shield_reason_sent_in_clear" = "Sent in clear."; +"event_shield_reason_sent_in_clear" = "Not encrypted."; "event_shield_reason_unknown_device" = "Encrypted by an unknown or deleted device."; "event_shield_reason_unsigned_device" = "Encrypted by a device not verified by its owner."; "event_shield_reason_unverified_identity" = "Encrypted by an unverified user."; diff --git a/ElementX/Sources/Generated/Strings.swift b/ElementX/Sources/Generated/Strings.swift index e798ad261..c2e27aba2 100644 --- a/ElementX/Sources/Generated/Strings.swift +++ b/ElementX/Sources/Generated/Strings.swift @@ -570,7 +570,7 @@ internal enum L10n { internal static var errorUnknown: String { return L10n.tr("Localizable", "error_unknown") } /// The authenticity of this encrypted message can't be guaranteed on this device. internal static var eventShieldReasonAuthenticityNotGuaranteed: String { return L10n.tr("Localizable", "event_shield_reason_authenticity_not_guaranteed") } - /// Sent in clear. + /// Not encrypted. internal static var eventShieldReasonSentInClear: String { return L10n.tr("Localizable", "event_shield_reason_sent_in_clear") } /// Encrypted by an unknown or deleted device. internal static var eventShieldReasonUnknownDevice: String { return L10n.tr("Localizable", "event_shield_reason_unknown_device") } diff --git a/ElementX/Sources/Screens/RoomScreen/View/ItemMenu/TimelineItemMenu.swift b/ElementX/Sources/Screens/RoomScreen/View/ItemMenu/TimelineItemMenu.swift index 13cc9ef4b..1f007a43a 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/ItemMenu/TimelineItemMenu.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/ItemMenu/TimelineItemMenu.swift @@ -194,6 +194,7 @@ struct TimelineItemMenu_Previews: PreviewProvider, TestablePreview { static let viewModel = RoomScreenViewModel.mock static let (item, actions) = makeItem() static let (backupItem, _) = makeItem(authenticity: .notGuaranteed(color: .gray)) + static let (unsignedItem, _) = makeItem(authenticity: .unsignedDevice(color: .red)) static let (unencryptedItem, _) = makeItem(authenticity: .sentInClear(color: .red)) static var previews: some View { @@ -210,6 +211,10 @@ struct TimelineItemMenu_Previews: PreviewProvider, TestablePreview { .environmentObject(viewModel.context) .previewDisplayName("Authenticity not guaranteed") + TimelineItemMenu(item: unsignedItem, actions: actions) + .environmentObject(viewModel.context) + .previewDisplayName("Unsigned") + TimelineItemMenu(item: unencryptedItem, actions: actions) .environmentObject(viewModel.context) .previewDisplayName("Unencrypted") diff --git a/ElementX/Sources/Services/Timeline/TimelineItemContent/EncryptionAuthenticity.swift b/ElementX/Sources/Services/Timeline/TimelineItemContent/EncryptionAuthenticity.swift index 6966e1760..78df4fbd5 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItemContent/EncryptionAuthenticity.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItemContent/EncryptionAuthenticity.swift @@ -57,10 +57,10 @@ enum EncryptionAuthenticity: Hashable { } var icon: KeyPath { - // TODO: Should sentInClear have a dedicated icon??? - switch color { - case .red: \.error - case .gray: \.info + switch self { + case .notGuaranteed: \.info + case .unknownDevice, .unsignedDevice, .unverifiedIdentity: \.helpSolid + case .sentInClear: \.lockOff } } } diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView-iPad-en-GB.Encryption-Indicators.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView-iPad-en-GB.Encryption-Indicators.png index 84a226e84..b1737febd 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView-iPad-en-GB.Encryption-Indicators.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView-iPad-en-GB.Encryption-Indicators.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8ef2a2f846c6906a4cef21d909c3cf6b989a13b488a7d0ee530c4b29b1617c1 -size 438499 +oid sha256:91293e02a282b89e52d98d10c0ed042e107f58cd661455652c3a50a1295ac9a6 +size 438937 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView-iPad-pseudo.Encryption-Indicators.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView-iPad-pseudo.Encryption-Indicators.png index 7a168fef7..d2899ca01 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView-iPad-pseudo.Encryption-Indicators.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView-iPad-pseudo.Encryption-Indicators.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6274dbd83240ee4197699683c66b2f0e7b22490b5d4d904aa92f653eb7bc5847 -size 440632 +oid sha256:d15d0a6e23b80979c7f0025316673e7f20b1b7de6efdf700fb5fc2aebd33a1e2 +size 441049 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView-iPhone-15-en-GB.Encryption-Indicators.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView-iPhone-15-en-GB.Encryption-Indicators.png index 4d558b495..c655b3c0a 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView-iPhone-15-en-GB.Encryption-Indicators.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView-iPhone-15-en-GB.Encryption-Indicators.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07184e8192f4e80a0fb9fda161d0966c30858f17dacf43843f36bfc6a5c807de -size 343391 +oid sha256:a5a5711cb02a63320e78b0001d014ef7342ab0b6df128af23c836239656cae3b +size 343702 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView-iPhone-15-pseudo.Encryption-Indicators.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView-iPhone-15-pseudo.Encryption-Indicators.png index 9d424a30b..c427dc3f5 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView-iPhone-15-pseudo.Encryption-Indicators.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView-iPhone-15-pseudo.Encryption-Indicators.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4571579a42406d66a4a61d91b79b6809e376dc95910a6e07d582f23fa99ac15f -size 344668 +oid sha256:8c8c1c59dd74c9d11e0496583ec9348d1fc7d1eb6504b975eda2e597b3d0fa8f +size 344963 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPad-en-GB.Unencrypted.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPad-en-GB.Unencrypted.png index a11577283..4d52e876c 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPad-en-GB.Unencrypted.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPad-en-GB.Unencrypted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6418fe1b15eb9f94ef1e4f1329508788d1df9616b24760a26ec7c0317d75546 -size 131913 +oid sha256:856395860c1c673ada6ecd4bc1e279fe38d37d6038c4e7cffe6aa885433960d7 +size 132971 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPad-en-GB.Unsigned.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPad-en-GB.Unsigned.png new file mode 100644 index 000000000..f8699c61c --- /dev/null +++ b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPad-en-GB.Unsigned.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16b0210687ba4e03042cdf79b50bc06e2a866699561228007a6758f03a02a79f +size 136665 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPad-pseudo.Unencrypted.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPad-pseudo.Unencrypted.png index 71899d564..3ef346898 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPad-pseudo.Unencrypted.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPad-pseudo.Unencrypted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfce5e379a6235cd954ae464fea78a419bb210b799b1df5a21cdc172e4233e3e -size 134505 +oid sha256:f4b4d87745ede48f63c635a517b0b53333248093a12b007f9cb63103eec708f6 +size 137003 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPad-pseudo.Unsigned.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPad-pseudo.Unsigned.png new file mode 100644 index 000000000..d9e0cc4ee --- /dev/null +++ b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPad-pseudo.Unsigned.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d12e1350b1e5a6ec8477feb15fb74e3492fcda98e5802d368110b9289f135475 +size 142260 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPhone-15-en-GB.Unencrypted.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPhone-15-en-GB.Unencrypted.png index 925fafd8f..1fa9b5b07 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPhone-15-en-GB.Unencrypted.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPhone-15-en-GB.Unencrypted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73da91674825a74fd803055253153543cf8b6985a670a46521897dd06db47851 -size 83950 +oid sha256:2c14641b3b0bc6d14fefe09eb2e94c273beadd4fb638fd91e13839cb45291dc7 +size 84586 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPhone-15-en-GB.Unsigned.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPhone-15-en-GB.Unsigned.png new file mode 100644 index 000000000..2aaedd1c4 --- /dev/null +++ b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPhone-15-en-GB.Unsigned.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:616fc70da47bf61a23cfcaf22928139913dbddab00769dcd2bb3da01a7afc30a +size 87485 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPhone-15-pseudo.Unencrypted.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPhone-15-pseudo.Unencrypted.png index 4012e9ab2..844b5fcbd 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPhone-15-pseudo.Unencrypted.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPhone-15-pseudo.Unencrypted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7532e6e65ed00921a92b7d6c431485907f7b26bbf193ea3ecc75848566f660ec -size 89746 +oid sha256:f77a276e429a2d601cd474e547e3a0923b8b432121b1bb7e12a1eaa593d0d4b6 +size 92034 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPhone-15-pseudo.Unsigned.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPhone-15-pseudo.Unsigned.png new file mode 100644 index 000000000..80b26b3d4 --- /dev/null +++ b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu-iPhone-15-pseudo.Unsigned.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d3cddc2a7fc71a390be380caf341c638ec43950cb7196ecda6ebd58069de750 +size 99561 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPad-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPad-en-GB.1.png index 9e6ed9a52..13eb1f861 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPad-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPad-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:897afefdd96515ac7269c760ebe56cbeaff0834f023caf384365439ae0838b8d -size 81737 +oid sha256:927b14d401572b4b4393dfe06c8e044888d0682a1d71b2a554b958e0ec0116be +size 81861 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPad-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPad-pseudo.1.png index 9e6ed9a52..13eb1f861 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPad-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPad-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:897afefdd96515ac7269c760ebe56cbeaff0834f023caf384365439ae0838b8d -size 81737 +oid sha256:927b14d401572b4b4393dfe06c8e044888d0682a1d71b2a554b958e0ec0116be +size 81861 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPhone-15-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPhone-15-en-GB.1.png index db7609162..ef6d0654e 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPhone-15-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPhone-15-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82cb8d10fb5922d8fd6a69cae52509f5b493ba95c626f90df2ba3dec23ed5317 -size 39063 +oid sha256:c83bae6f66905ff811d79688da3c6b2c191fadce4cfb1528dd24ad8bfeeeea84 +size 39044 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPhone-15-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPhone-15-pseudo.1.png index db7609162..ef6d0654e 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPhone-15-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPhone-15-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82cb8d10fb5922d8fd6a69cae52509f5b493ba95c626f90df2ba3dec23ed5317 -size 39063 +oid sha256:c83bae6f66905ff811d79688da3c6b2c191fadce4cfb1528dd24ad8bfeeeea84 +size 39044