From 4052bcf43a093ea523b78716b40c6ab35ae4623d Mon Sep 17 00:00:00 2001 From: gmbnt Date: Wed, 25 Mar 2020 11:21:23 +1100 Subject: [PATCH] Make multi device instructions clearer --- Signal/src/Loki/View Controllers/DeviceLinkingModal.swift | 4 ++-- Signal/src/Loki/View Controllers/LinkDeviceVC.swift | 4 ++-- Signal/translations/en.lproj/Localizable.strings | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Signal/src/Loki/View Controllers/DeviceLinkingModal.swift b/Signal/src/Loki/View Controllers/DeviceLinkingModal.swift index 79bdfa64f..4865ac877 100644 --- a/Signal/src/Loki/View Controllers/DeviceLinkingModal.swift +++ b/Signal/src/Loki/View Controllers/DeviceLinkingModal.swift @@ -42,7 +42,7 @@ final class DeviceLinkingModal : Modal, DeviceLinkingSessionDelegate { private lazy var subtitleLabel: UILabel = { let result = UILabel() - result.textColor = Colors.text.withAlphaComponent(Values.unimportantElementOpacity) + result.textColor = Colors.text result.font = .systemFont(ofSize: Values.smallFontSize) result.numberOfLines = 0 result.lineBreakMode = .byWordWrapping @@ -131,7 +131,7 @@ final class DeviceLinkingModal : Modal, DeviceLinkingSessionDelegate { }() subtitleLabel.text = { switch mode { - case .master: return NSLocalizedString("Open Session on your secondary device and tap \"Link to an existing account\"", comment: "") + case .master: return NSLocalizedString("Download Session on your other device and tap \"Link to an existing account\" at the bottom of the landing screen. If you have an existing account on your other device already you will have to delete that account first.", comment: "") case .slave: return NSLocalizedString("Please check that the words below match those shown on your other device", comment: "") } }() diff --git a/Signal/src/Loki/View Controllers/LinkDeviceVC.swift b/Signal/src/Loki/View Controllers/LinkDeviceVC.swift index 730a8f33c..5033cfe33 100644 --- a/Signal/src/Loki/View Controllers/LinkDeviceVC.swift +++ b/Signal/src/Loki/View Controllers/LinkDeviceVC.swift @@ -33,7 +33,7 @@ final class LinkDeviceVC : BaseVC, UIPageViewControllerDataSource, UIPageViewCon }() private lazy var scanQRCodeWrapperVC: ScanQRCodeWrapperVC = { - let message = NSLocalizedString("Link to your existing account by going into your in-app settings and clicking \"Devices\".", comment: "") + let message = NSLocalizedString("Navigate to \"Settings\" > \"Devices\" > \"Link a Device\" on your other device and then scan the QR code that comes up to start the linking process.", comment: "") let result = ScanQRCodeWrapperVC(message: message) result.delegate = self return result @@ -167,7 +167,7 @@ private final class EnterPublicKeyVC : UIViewController { let explanationLabel = UILabel() explanationLabel.textColor = Colors.text explanationLabel.font = .systemFont(ofSize: Values.smallFontSize) - explanationLabel.text = "Enter your Session ID to start the linking process." + explanationLabel.text = "Navigate to \"Settings\" > \"Devices\" > \"Link a Device\" on your other device and then enter your Session ID here to start the linking process." explanationLabel.numberOfLines = 0 explanationLabel.lineBreakMode = .byWordWrapping // Link button diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index e8284a5c9..0b1ed26ec 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -2768,7 +2768,7 @@ "Link to an existing account" = "Link to an existing account"; "Enter your public key" = "Enter your public key"; "Link to your existing account by going into your in-app settings and clicking \"Devices\"." = "Link to your existing account by going into your in-app settings and clicking \"Devices\"."; -"Open Session on your secondary device and tap \"Link to an existing account\"" = "Open Session on your secondary device and tap \"Link to an existing account\""; +"Download Session on your other device and tap \"Link to an existing account\" at the bottom of the landing screen. If you have an existing account on your other device already you will have to delete that account first." = "Download Session on your other device and tap \"Link to an existing account\" at the bottom of the landing screen. If you have an existing account on your other device already you will have to delete that account first."; "Group Settings" = "Group Settings"; "Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design." = "Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design."; "Enter the recovery phrase that was given to you when you signed up to restore your account." = "Enter the recovery phrase that was given to you when you signed up to restore your account.";