ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-07 04:48:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a subtitle to the QR login instructions. (#3386)

Browse Source
This commit is contained in:
Doug
2024-10-09 17:54:01 +01:00
committed by GitHub
parent 5c2b107022
commit 2194908ee5
7 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Resources/Localizations/en.lproj/Localizable.strings
+1
View File
@@ -588,6 +588,7 @@
"screen_qr_code_login_initial_state_item_3" = "Select %1$@"; "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_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_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_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_description" = "Use the QR code shown on the other device.";
"screen_qr_code_login_invalid_scan_state_subtitle" = "Wrong QR code"; "screen_qr_code_login_invalid_scan_state_subtitle" = "Wrong QR code";
ElementX/Sources/Generated/Strings.swift
+2
View File
@@ -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") } 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 /// Scan the QR code with this device
internal static var screenQrCodeLoginInitialStateItem4: String { return L10n.tr("Localizable", "screen_qr_code_login_initial_state_item_4") } 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 /// Open %1$@ on another device to get the QR code
internal static func screenQrCodeLoginInitialStateTitle(_ p1: Any) -> String { internal static func screenQrCodeLoginInitialStateTitle(_ p1: Any) -> String {
return L10n.tr("Localizable", "screen_qr_code_login_initial_state_title", String(describing: p1)) return L10n.tr("Localizable", "screen_qr_code_login_initial_state_title", String(describing: p1))
ElementX/Sources/Screens/QRCodeLoginScreen/View/QRCodeLoginScreen.swift
+11 -4
View File
@@ -43,10 +43,17 @@ struct QRCodeLoginScreen: View {
VStack(spacing: 16) { VStack(spacing: 16) {
HeroImage(icon: \.computer, style: .subtle) HeroImage(icon: \.computer, style: .subtle)
Text(L10n.screenQrCodeLoginInitialStateTitle(InfoPlistReader.main.productionAppName)) VStack(spacing: 8) {
.foregroundColor(.compound.textPrimary) Text(L10n.screenQrCodeLoginInitialStateTitle(InfoPlistReader.main.productionAppName))
.font(.compound.headingMDBold) .foregroundColor(.compound.textPrimary)
.multilineTextAlignment(.center) .font(.compound.headingMDBold)
.multilineTextAlignment(.center)
Text(L10n.screenQrCodeLoginInitialStateSubtitle)
.font(.compound.bodyMD)
.multilineTextAlignment(.center)
.foregroundColor(.compound.textSecondary)
}
} }
.padding(.horizontal, 24) .padding(.horizontal, 24)
PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPad-en-GB.Initial.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:5943061bd68ad5618e722cf2f6d58535e7af0095a480973c80e6dcf9d9b77959 oid sha256:8eede65da7fcb800583f0f73a595cadecdb233f3185f7e272797b63e39f25df8
size 135762 size 146499
PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPad-pseudo.Initial.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:d0ec013121390539a9155f4e56685332054dd5b941ff28690f7846ae76c4cb75 oid sha256:695b6d2b5859fb05242e2c6450f69d5997f113ddd0346c12df21bb11d2447f96
size 163822 size 180110
PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPhone-16-en-GB.Initial.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:c418665989dab2f2a2ccc3ccce1293dc2da665f2bf14a34f931da866e4cc11db oid sha256:bf8cc70bb5b9a1a79ca0743de1ff11521aa1ae81af1730a6d4988f77e14fe38c
size 83528 size 92959
PreviewTests/Sources/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPhone-16-pseudo.Initial.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:73f83bfca996f596775273e3ee56558e093674e98ba37ce0006c04c82d1a5b0d oid sha256:b9334283a4a16c6809f6e692e77aa989ccce35a72eac319e5e28497f2e81fef4
size 116625 size 133735