From 7912c338ab0227aae88d6cf61469273e87d75688 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 13:47:50 -0500 Subject: [PATCH 1/7] Update onboarding splash copy. Update onboarding splash copy. --- Signal/translations/en.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 799bd1eba..2e181fddc 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; From 14c5c21180d4131b2e05a9a8cbab6f48a8fa0ef1 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 14:02:43 -0500 Subject: [PATCH 2/7] Fix size of "empty home view" image. --- Signal/src/ViewControllers/HomeView/HomeViewController.m | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 96125433d..e57947ac7 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -378,7 +378,10 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { emptyInboxImageView.layer.minificationFilter = kCAFilterTrilinear; emptyInboxImageView.layer.magnificationFilter = kCAFilterTrilinear; [emptyInboxImageView autoPinToAspectRatioWithSize:emptyInboxImageView.image.size]; - + CGSize screenSize = UIScreen.mainScreen.bounds.size; + CGFloat emptyInboxImageSize = MIN(screenSize.width, screenSize.height) * 0.65f; + [emptyInboxImageView autoSetDimension:ALDimensionWidth toSize:emptyInboxImageSize]; + UILabel *emptyInboxLabel = [UILabel new]; emptyInboxLabel.text = NSLocalizedString(@"INBOX_VIEW_EMPTY_INBOX", @"Message shown in the home view when the inbox is empty."); From 2112f04abb4acb35ea87e4ce08ad14f7e29f50dc Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 14:42:21 -0500 Subject: [PATCH 3/7] Fix layout of "first conversation" prompt. --- Signal/src/ViewControllers/HomeView/HomeViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index e57947ac7..48ac417d3 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -447,7 +447,7 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { }; [layerView addSubview:label]; - [label ows_autoPinToSuperviewMargins]; + [label autoPinEdgesToSuperviewMargins]; layerView.userInteractionEnabled = YES; [layerView From e992ff3bcfd2d612ad3d211707998bbf3e266662 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 15:28:29 -0500 Subject: [PATCH 4/7] Fix glitch in presentation animations for onboarding views. --- .../Registration/OnboardingBaseViewController.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift index ee9f380b0..08abd7391 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift @@ -86,6 +86,8 @@ public class OnboardingBaseViewController: OWSViewController { } else { owsFailDebug("Missing or invalid navigationController") } + + view.layoutSubviews() } public override func viewDidAppear(_ animated: Bool) { From 4fac50be6c90ae2d5763fbdbccc7e6462e94588b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 15:28:48 -0500 Subject: [PATCH 5/7] Remove spurious error in onboarding verification process. --- .../OnboardingVerificationViewController.swift | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift index e43d9f2e3..3c16921f2 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift @@ -437,6 +437,8 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController } } + // MARK: - View Lifecycle + public override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) @@ -491,7 +493,7 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController Logger.info("") guard onboardingCodeView.isComplete else { - self.setHasInvalidCode(true) + self.setHasInvalidCode(false) return } @@ -499,7 +501,12 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController onboardingController.update(verificationCode: onboardingCodeView.verificationCode) + // Temporarily hide the "resend link" button during the verification attempt. + codeStateLink?.layer.opacity = 0.05 + onboardingController.tryToVerify(fromViewController: self, completion: { (outcome) in + self.codeStateLink?.layer.opacity = 1 + if outcome == .invalidVerificationCode { self.setHasInvalidCode(true) } From d006f4a298e117b06f85c1254efe1bb79bdcf961 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 15:34:36 -0500 Subject: [PATCH 6/7] Improve cramped layouts in onboarding views. --- .../Registration/Onboarding2FAViewController.swift | 3 +-- .../Registration/OnboardingVerificationViewController.swift | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift b/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift index 0918bd78e..3f6bd3672 100644 --- a/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift +++ b/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift @@ -73,7 +73,6 @@ public class Onboarding2FAViewController: OnboardingBaseViewController { explanationLabel1, UIView.spacer(withHeight: 10), explanationLabel2, - topSpacer, pinTextField, UIView.spacer(withHeight: 10), @@ -85,7 +84,7 @@ public class Onboarding2FAViewController: OnboardingBaseViewController { ]) stackView.axis = .vertical stackView.alignment = .fill - stackView.layoutMargins = UIEdgeInsets(top: 20, left: 32, bottom: 20, right: 32) + stackView.layoutMargins = UIEdgeInsets(top: 16, left: 16, bottom: 16, right: 16) stackView.isLayoutMarginsRelativeArrangement = true view.addSubview(stackView) stackView.autoPinWidthToSuperview() diff --git a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift index 3c16921f2..4388cfea4 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift @@ -318,7 +318,7 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController ]) stackView.axis = .vertical stackView.alignment = .fill - stackView.layoutMargins = UIEdgeInsets(top: 32, left: 32, bottom: 32, right: 32) + stackView.layoutMargins = UIEdgeInsets(top: 16, left: 16, bottom: 16, right: 16) stackView.isLayoutMarginsRelativeArrangement = true view.addSubview(stackView) stackView.autoPinWidthToSuperview() From 70a163f3fa00ba28716617d75c0f3b7b690874f6 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 16:17:26 -0500 Subject: [PATCH 7/7] Respond to CR. --- .../Registration/OnboardingBaseViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift index 08abd7391..a1594d3ec 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift @@ -87,7 +87,7 @@ public class OnboardingBaseViewController: OWSViewController { owsFailDebug("Missing or invalid navigationController") } - view.layoutSubviews() + view.layoutIfNeeded() } public override func viewDidAppear(_ animated: Bool) {