From 2194908ee58935e0540bfd1cae1d52b1c012dc6c Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Wed, 9 Oct 2024 17:54:01 +0100 Subject: [PATCH] Add a subtitle to the QR login instructions. (#3386) --- .../Localizations/en.lproj/Localizable.strings | 1 + ElementX/Sources/Generated/Strings.swift | 2 ++ .../View/QRCodeLoginScreen.swift | 15 +++++++++++---- .../test_qRCodeLoginScreen-iPad-en-GB.Initial.png | 4 ++-- ...test_qRCodeLoginScreen-iPad-pseudo.Initial.png | 4 ++-- ..._qRCodeLoginScreen-iPhone-16-en-GB.Initial.png | 4 ++-- ...qRCodeLoginScreen-iPhone-16-pseudo.Initial.png | 4 ++-- 7 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ElementX/Resources/Localizations/en.lproj/Localizable.strings b/ElementX/Resources/Localizations/en.lproj/Localizable.strings index f2bc97b9a..6416ef7e1 100644 --- a/ElementX/Resources/Localizations/en.lproj/Localizable.strings +++ b/ElementX/Resources/Localizations/en.lproj/Localizable.strings @@ -588,6 +588,7 @@ "screen_qr_code_login_initial_state_item_3" = "Select %1$@"; "screen_qr_code_login_initial_state_item_3_action" = "“Link new device”"; "screen_qr_code_login_initial_state_item_4" = "Scan the QR code with this device"; +"screen_qr_code_login_initial_state_subtitle" = "Only available if your account provider supports it."; "screen_qr_code_login_initial_state_title" = "Open %1$@ on another device to get the QR code"; "screen_qr_code_login_invalid_scan_state_description" = "Use the QR code shown on the other device."; "screen_qr_code_login_invalid_scan_state_subtitle" = "Wrong QR code"; diff --git a/ElementX/Sources/Generated/Strings.swift b/ElementX/Sources/Generated/Strings.swift index 36f6866c7..f09ba5be4 100644 --- a/ElementX/Sources/Generated/Strings.swift +++ b/ElementX/Sources/Generated/Strings.swift @@ -1395,6 +1395,8 @@ internal enum L10n { internal static var screenQrCodeLoginInitialStateItem3Action: String { return L10n.tr("Localizable", "screen_qr_code_login_initial_state_item_3_action") } /// Scan the QR code with this device internal static var screenQrCodeLoginInitialStateItem4: String { return L10n.tr("Localizable", "screen_qr_code_login_initial_state_item_4") } + /// Only available if your account provider supports it. + internal static var screenQrCodeLoginInitialStateSubtitle: String { return L10n.tr("Localizable", "screen_qr_code_login_initial_state_subtitle") } /// Open %1$@ on another device to get the QR code internal static func screenQrCodeLoginInitialStateTitle(_ p1: Any) -> String { return L10n.tr("Localizable", "screen_qr_code_login_initial_state_title", String(describing: p1)) diff --git a/ElementX/Sources/Screens/QRCodeLoginScreen/View/QRCodeLoginScreen.swift b/ElementX/Sources/Screens/QRCodeLoginScreen/View/QRCodeLoginScreen.swift index a0a9a0b66..e0349cab9 100644 --- a/ElementX/Sources/Screens/QRCodeLoginScreen/View/QRCodeLoginScreen.swift +++ b/ElementX/Sources/Screens/QRCodeLoginScreen/View/QRCodeLoginScreen.swift @@ -43,10 +43,17 @@ struct QRCodeLoginScreen: View { VStack(spacing: 16) { HeroImage(icon: \.computer, style: .subtle) - Text(L10n.screenQrCodeLoginInitialStateTitle(InfoPlistReader.main.productionAppName)) - .foregroundColor(.compound.textPrimary) - .font(.compound.headingMDBold) - .multilineTextAlignment(.center) + VStack(spacing: 8) { + Text(L10n.screenQrCodeLoginInitialStateTitle(InfoPlistReader.main.productionAppName)) + .foregroundColor(.compound.textPrimary) + .font(.compound.headingMDBold) + .multilineTextAlignment(.center) + + Text(L10n.screenQrCodeLoginInitialStateSubtitle) + .font(.compound.bodyMD) + .multilineTextAlignment(.center) + .foregroundColor(.compound.textSecondary) + } } .padding(.horizontal, 24) diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPad-en-GB.Initial.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPad-en-GB.Initial.png index 9c48c5454..c0721c920 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPad-en-GB.Initial.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPad-en-GB.Initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5943061bd68ad5618e722cf2f6d58535e7af0095a480973c80e6dcf9d9b77959 -size 135762 +oid sha256:8eede65da7fcb800583f0f73a595cadecdb233f3185f7e272797b63e39f25df8 +size 146499 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPad-pseudo.Initial.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPad-pseudo.Initial.png index 02795455d..a810311f2 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPad-pseudo.Initial.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPad-pseudo.Initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0ec013121390539a9155f4e56685332054dd5b941ff28690f7846ae76c4cb75 -size 163822 +oid sha256:695b6d2b5859fb05242e2c6450f69d5997f113ddd0346c12df21bb11d2447f96 +size 180110 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPhone-16-en-GB.Initial.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPhone-16-en-GB.Initial.png index 8125801fb..dd30f177e 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPhone-16-en-GB.Initial.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPhone-16-en-GB.Initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c418665989dab2f2a2ccc3ccce1293dc2da665f2bf14a34f931da866e4cc11db -size 83528 +oid sha256:bf8cc70bb5b9a1a79ca0743de1ff11521aa1ae81af1730a6d4988f77e14fe38c +size 92959 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPhone-16-pseudo.Initial.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPhone-16-pseudo.Initial.png index eee39bbea..5d6b91504 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPhone-16-pseudo.Initial.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPhone-16-pseudo.Initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73f83bfca996f596775273e3ee56558e093674e98ba37ce0006c04c82d1a5b0d -size 116625 +oid sha256:b9334283a4a16c6809f6e692e77aa989ccce35a72eac319e5e28497f2e81fef4 +size 133735