Tweak the session verification icons and copy.

2026-11-02 03:06:37 +00:00 · 2024-11-07 16:20:52 +02:00
parent 814eff28dd
commit b9409e5310
50 changed files with 121 additions and 125 deletions
@@ -5,7 +5,8 @@
 // Please see LICENSE in the repository root for full details.
 //

-import Foundation
+import Compound
+import SwiftUI

 enum SessionVerificationScreenViewModelAction {
    case finished
@@ -26,32 +27,32 @@ struct SessionVerificationScreenViewState: BindableState {
    let flow: SessionVerificationScreenFlow
    var verificationState: SessionVerificationScreenStateMachine.State
    
-    var headerImageName: String {
+    var headerIcon: (keyPath: KeyPath<CompoundIcons, Image>, style: BigIcon.Style) {
        switch verificationState {
        case .initial:
-            return "lock"
+            return (\.devices, .defaultSolid)
        case .acceptingVerificationRequest:
-            return "hourglass"
+            return (\.devices, .defaultSolid)
        case .requestingVerification:
-            return "hourglass"
+            return (\.devices, .defaultSolid)
        case .verificationRequestAccepted:
-            return "face.smiling"
+            return (\.reaction, .defaultSolid)
        case .startingSasVerification:
-            return "hourglass"
+            return (\.devices, .defaultSolid)
        case .sasVerificationStarted:
-            return "hourglass"
+            return (\.devices, .defaultSolid)
        case .cancelling:
-            return "hourglass"
-        case .acceptingChallenge:
-            return "hourglass"
-        case .decliningChallenge:
-            return "hourglass"
+            return (\.lockSolid, .defaultSolid)
        case .showingChallenge:
-            return "face.smiling"
+            return (\.reaction, .defaultSolid)
+        case .acceptingChallenge:
+            return (\.reaction, .defaultSolid)
+        case .decliningChallenge:
+            return (\.reaction, .defaultSolid)
        case .verified:
-            return "checkmark.shield"
+            return (\.checkCircleSolid, .successSolid)
        case .cancelled:
-            return "exclamationmark.shield"
+            return (\.infoSolid, .alertSolid)
        }
    }
    
@@ -60,12 +61,12 @@ struct SessionVerificationScreenViewState: BindableState {
        case .initial:
            switch flow {
            case .initiator:
-                return L10n.screenSessionVerificationOpenExistingSessionTitle
+                return L10n.screenSessionVerificationUseAnotherDeviceTitle
            case .responder:
                return L10n.screenSessionVerificationRequestTitle
            }
        case .acceptingVerificationRequest:
-            return L10n.screenSessionVerificationRequestTitle
+            return L10n.screenSessionVerificationWaitingAnotherDeviceTitle
        case .requestingVerification:
            return L10n.screenSessionVerificationWaitingToAcceptTitle
        case .verificationRequestAccepted:
@@ -98,12 +99,12 @@ struct SessionVerificationScreenViewState: BindableState {
        case .initial:
            switch flow {
            case .initiator:
-                return L10n.screenSessionVerificationOpenExistingSessionSubtitle
+                return L10n.screenSessionVerificationUseAnotherDeviceSubtitle
            case .responder:
                return L10n.screenSessionVerificationRequestSubtitle
            }
        case .acceptingVerificationRequest:
-            return L10n.screenSessionVerificationRequestSubtitle
+            return L10n.screenSessionVerificationWaitingAnotherDeviceSubtitle
        case .requestingVerification:
            return L10n.screenSessionVerificationWaitingToAcceptSubtitle
        case .verificationRequestAccepted:
@@ -31,15 +31,10 @@ struct SessionVerificationScreen: View {
    @ViewBuilder
    private var screenHeader: some View {
        VStack(spacing: 0) {
-            if context.viewState.verificationState == .initial {
-                BigIcon(icon: \.lockSolid)
-                    .padding(.bottom, 16)
-            } else {
-                Image(systemName: context.viewState.headerImageName)
-                    .bigIcon()
-                    .padding(.bottom, 16)
-            }
-
+            BigIcon(icon: context.viewState.headerIcon.keyPath,
+                    style: context.viewState.headerIcon.style)
+                .padding(.bottom, 16)
+            
            Text(context.viewState.title ?? "")
                .font(.compound.headingMDBold)
                .multilineTextAlignment(.center)
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78da542fab77c7138034ee29b3985d0b6198cb79600ec22679a9aa8cf6b7de7b
-size 161895
+oid sha256:093952c8bbb20d47d49770aba04081684d057a5b5f149055e90e78677a2a59ec
+size 162220
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1e631e093fcbae1de84ecf012e2dad0feace858d4825f839adc9feae8d497ef
-size 96902
+oid sha256:d34314c93b65050cf9a196b831aea3255d836a4f064602757924c10725e6a50d
+size 98778
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e2aacff101d124325e3966e44c22fa02ef1a307c23a723d6622d4ee64412c21
-size 95267
+oid sha256:ebb7355183ca0262339abe03c1fb3254f1cdc4ac2745070eaf48f508d4c4e036
+size 93905
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78da542fab77c7138034ee29b3985d0b6198cb79600ec22679a9aa8cf6b7de7b
-size 161895
+oid sha256:093952c8bbb20d47d49770aba04081684d057a5b5f149055e90e78677a2a59ec
+size 162220
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7da5f266ee5cfcf31a53a3edd37e6077e9cc5266bdc02009eb69743d69c98d83
-size 95443
+oid sha256:b6dbcd72f3590b7479092b3424eb4fa1cde31d145fc64674fea45952b466676e
+size 100849
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de6d5e5d95b4fee23d4b0a7fb771752ac426c6bf81499b9c6e3a357a10d2c2f8
-size 125144
+oid sha256:544b7532106675cab7af24c26b8e4fec538f3db9d954dbb01d43c165e9404f94
+size 124983
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c17fe42adcc844769eebfef93482366a692ed8e8d7cd1bd098106e4435e25e92
-size 92605
+oid sha256:20e5b35491a6c586a4724dbffc5f90f119953663005eb8e7eb614c32540fa04f
+size 91690
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b6b0a9b619f1dc6f02399aa4976c3dc19796d987e2a41ed37e5c2a449c85c11d
-size 98780
+oid sha256:0ec30edbbc01c05deafe947f7c3f334fc4482aff926adf68d7a9d2e71bf3bc7d
+size 97729
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:356ec08a1adbca9186d746bb84c3597ec1f7e324bcc975186b9233ee3d3813d5
-size 72478
+oid sha256:84dab505b5ded1fba821d93c460239fc3b8ba156b3f261f9391c36227c65062d
+size 71434
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8741e91150e57869e2f8d94a13360e57b4d243e9054711d2335a514e5d9029b
-size 165427
+oid sha256:552fd0224f27cade91fe607c87648c2aab28c46fcfe5f7ee0a065689e768af17
+size 164748
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:356ec08a1adbca9186d746bb84c3597ec1f7e324bcc975186b9233ee3d3813d5
-size 72478
+oid sha256:84dab505b5ded1fba821d93c460239fc3b8ba156b3f261f9391c36227c65062d
+size 71434
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:635a1ce925fbb458b9fe414d6621f78d42d1c00c8ac55c9136b7aa4bbe5315b5
-size 94303
+oid sha256:fc01d5d81d68e878a344b3989a78cdfbd1f6b34f4785eab85255564133bc88b9
+size 93000
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28e89a7b00f5b07cc1ebef0034a38d2bfebdce8d8e924c20252877d8f4643d44
-size 180153
+oid sha256:e196922c62442c910c38dc097bb2a0b7529079a0aa002bfeec3a673925f6dcc4
+size 180582
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55e04390c635595b18a60905e2ebffef065d27a88023484cd1a25e9a683ea378
-size 108580
+oid sha256:5ae01c6fc18e49c952ad0202540abbdd959bb01264e6c682b835a93c3254a21f
+size 118334
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2c313669307a1f85aef0d367a1284685eee2ed0f07b4b0fcedfa3728f27b869f
-size 108998
+oid sha256:e1717005a937f2599fbf77cb20af768dac84ec548b4fa06fbbc36ced53152cf5
+size 107553
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28e89a7b00f5b07cc1ebef0034a38d2bfebdce8d8e924c20252877d8f4643d44
-size 180153
+oid sha256:e196922c62442c910c38dc097bb2a0b7529079a0aa002bfeec3a673925f6dcc4
+size 180582
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2145bd9b612e25b80915d4d5a125026bdb800f505c4fbb7908438da715e79fa5
-size 106608
+oid sha256:28d003928602f6669539a1ddc6a467a29171dc97b46bdc455ed2da34179feb6d
+size 121565
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bad67fb36d792965b12fe728fae7c9664d4b8031c554117162fadd4b74502045
-size 146678
+oid sha256:9ba093b11028e7ff672fc7fdfa3d0df629fa463893e2e7191e6a022100b5fff8
+size 146508
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34e080a55f1ba530db20813f64a561439ef668094fb83742ea94f25984385069
-size 102546
+oid sha256:7797d60ba9745e8b2e372988a329aa95663751ccd2d1e94710d9161e42d22078
+size 101777
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa39a6dc77a211f757f20bdfa63ef04bfd79dd3d3b69a5bb8e3d9fc454a18e06
-size 111330
+oid sha256:d0eff524cd9d12cd7bf2a8e8984b2629a202a1d876cec64e9e80204e6a0aef13
+size 110488
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21a964833655bb12bbbb2ae486961cad6f3046bd3c2c6a2127c99821b14e0dcd
-size 72175
+oid sha256:2547e9244d4b77e2f9f14a76e6953de43854b2714a747081cc96b07619fb5263
+size 71096
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f25fc8b1b70ac00f2eb1cf5b6e55c4c3b5e509b3ed2e03458c99c36fa5abb30d
-size 184353
+oid sha256:06e13d43f8de2d1c6571bff27260a5e4998e74c163b95536bfcaa63dd8d0e09d
+size 183174
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21a964833655bb12bbbb2ae486961cad6f3046bd3c2c6a2127c99821b14e0dcd
-size 72175
+oid sha256:2547e9244d4b77e2f9f14a76e6953de43854b2714a747081cc96b07619fb5263
+size 71096
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c148a7440eb8cba1f937f385949dd60b2aeec5f5e61725d768c524599d27a5e
-size 110794
+oid sha256:e0046de699cf2116f045f2c3962f2a1321b1fcd4052daae58f5fd0f63c381f96
+size 109433
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d039980194a63eb87c15b4179b6132cb98cd4b9c069a90483cc2761d771c7c6
-size 112841
+oid sha256:c103377195f66d616a0494c3a8875e57267ce2b4e40c3f4b8ec8decd4a86f6f7
+size 113100
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8df3040ac64296541ce088a3c89d173874981fb413ec12168d4e6c976364c4a
-size 54304
+oid sha256:59787c26b565686c7df1be3abd74df657b8b1dd57045ba322991492d19a03073
+size 58033
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3eee192ba2ba7f7a04dc6b30ebd453ff037fd93cbdbc5f7385749f598718d2c
-size 52650
+oid sha256:0ca50f8fef275d6de9455d7e9bb54e09ae3f3f3118ac99f07d89b19d40e97d53
+size 51690
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d039980194a63eb87c15b4179b6132cb98cd4b9c069a90483cc2761d771c7c6
-size 112841
+oid sha256:c103377195f66d616a0494c3a8875e57267ce2b4e40c3f4b8ec8decd4a86f6f7
+size 113100
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b6f32135cf4cfcbd8fd2414e45c88eff842789c4f5a72128ba76e969c0c25ed
-size 53430
+oid sha256:0a7497a191de63a335dc9c202f329774a9fc19e58f03a8229366a5988f251b30
+size 57944
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b4ab3956d6cdaab31410c633ad87f68b95992ed7f2f1fdcfe47d264833d925a
-size 76508
+oid sha256:80978072d73aeb5da1e0770e43c90d4b520e9033869a0bdef0e7d2f18726cf5b
+size 76338
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc443e3c292fc373eeabd6c6194e62b30bdb3aaf62be51c4c6a00f24eecd2701
-size 50313
+oid sha256:24ca5f4be0cb99d102fafeb8fa48ca45abb46ec0463641b4382c4f2cd6c08a31
+size 49827
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c24f2aeb174dbaad526a45ea0aadc4a88e96af5acee0395dce735437f33fed37
-size 56314
+oid sha256:fae4c9c5121b82e082366b1d7ae71276831a7d40df94d138329c3c134769bc5a
+size 55510
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6f9ffc43e63a49254324af496f8aadda255e84f5ec97aae0f1a05542c8c1a5b
-size 32123
+oid sha256:1e16a425e3fb0c4946932d50e94fa103dee23bc4366f68c66d813fb790242174
+size 31094
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0c95e9f0f51109b8fef6f771a8fe27bcd33eac2e244eefbcad2f223c8228fc2
-size 115566
+oid sha256:f300ea23a0ec87222c5126d1849c6790e2b3f34e98b49a266a990866862d453c
+size 115248
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6f9ffc43e63a49254324af496f8aadda255e84f5ec97aae0f1a05542c8c1a5b
-size 32123
+oid sha256:1e16a425e3fb0c4946932d50e94fa103dee23bc4366f68c66d813fb790242174
+size 31094
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9fff8ecc6a113ae1e4ede8a1e599972f47e80bd057b22145f361e8927354d59
-size 51657
+oid sha256:00819f8614a1ad24c40a10052132b25cdb5202459d94bc10485c903a6348dd84
+size 50419
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:251fc57d77b23ca84e5b659dfb3cf51effba91e496566447dd5d5956f19eb81a
-size 134250
+oid sha256:560c79a382fc2e7154e764b49eeb443d771fd28c47d3a77f04d705c45d4064a0
+size 134554
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:61faed09ca05772707dc737fe7c9fbe7c59ddd5852b607f7df13a43071d1e82c
-size 74935
+oid sha256:1e7835d5c27384b6fef3f9d6fc675f4d960124d1bc525857222955b61a389a4b
+size 82012
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4cb1087bf68fc7dc34b5c26653ee7ddf3859f2f1de22df1513c1d7b944d68feb
-size 71714
+oid sha256:f0c91675d682e16d63f46de2470009d7f1de83e327a91b49d59fd9f363d98d6c
+size 70566
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:251fc57d77b23ca84e5b659dfb3cf51effba91e496566447dd5d5956f19eb81a
-size 134250
+oid sha256:560c79a382fc2e7154e764b49eeb443d771fd28c47d3a77f04d705c45d4064a0
+size 134554
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:897ebea0b95135d24dbaf686e4fb6d39bd45057adc514ada77508fddd9a4c985
-size 70591
+oid sha256:08ecdf5643eef846297fc94ceb7051c3df4fdeb4f012bf9cdd9ab509a4f51b33
+size 81918
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a7ffbb91030a6ba3d0e064bd6cbaaa0f109915cc4f04ceced27b0185b6a541f
-size 101933
+oid sha256:74f3e11279a27cae1ee631f1ecd9a1caad06413afbc96ca5449250c37b9c0b8e
+size 101758
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dfc36dd990bf345a9fa23bd388414745f4724bf342586d120c65efafca228e35
-size 60837
+oid sha256:60a6a9afa852e0bedbea1290a5b15a0de6692ed2f98b549ab7806a263c253f49
+size 60139
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c40c972bb56a40bbb70725248eee5ff642e9cced47e1b794128f1c2468309a84
-size 79541
+oid sha256:82ce8b845e4da08a1128dbbd2b5329dded3db3b66889c19ef040e74deb0438a1
+size 78555
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1cd1abe33be884130a8475ada0aab30cadd3ce7b1262e316bd0b4552aacead14
-size 33085
+oid sha256:c4436735155f7c4fc8e89c4e1763870ce160d02bf33ed0be7de8f1a7290469d8
+size 32044
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:91e8118f1315c91e4c4968fd6662253f0da5785dbf54a1c32aeb1b91a1785de9
-size 134584
+oid sha256:2fb9b38b661e439fad8e4180f0e4d8881ccbfe3bf7f9aa9ecb0261c6e8781cb0
+size 133881
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1cd1abe33be884130a8475ada0aab30cadd3ce7b1262e316bd0b4552aacead14
-size 33085
+oid sha256:c4436735155f7c4fc8e89c4e1763870ce160d02bf33ed0be7de8f1a7290469d8
+size 32044
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1590c8d73b8f24da7bc06e741b024bf6c4013670cc9f95fadd931157929591c
-size 71663
+oid sha256:3bdff6ad83674283dcfabb0076ba73d8f7ac4491325d0e6b1490b0d16400c11a
+size 70573