From 099f30808face331567f8ed5e3d0d96a12b372e1 Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 15 Oct 2019 11:03:47 -0400 Subject: [PATCH 1/3] Extends the onboarding into the safe-area insets and fixes the animation to match. --- .../Browser/Onboarding/OnboardingAdsCountdownView.swift | 6 ++---- .../Browser/Onboarding/OnboardingNavigationController.swift | 2 +- .../Browser/Onboarding/OnboardingRewardsAgreementView.swift | 6 ++---- .../Frontend/Browser/Onboarding/OnboardingRewardsView.swift | 6 ++---- .../Frontend/Browser/Onboarding/OnboardingShieldsView.swift | 6 ++---- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/Client/Frontend/Browser/Onboarding/OnboardingAdsCountdownView.swift b/Client/Frontend/Browser/Onboarding/OnboardingAdsCountdownView.swift index 7a0c8bbda..d5d893611 100644 --- a/Client/Frontend/Browser/Onboarding/OnboardingAdsCountdownView.swift +++ b/Client/Frontend/Browser/Onboarding/OnboardingAdsCountdownView.swift @@ -110,14 +110,12 @@ extension OnboardingAdsCountdownViewController { addSubview(imageView) addSubview(mainStackView) mainStackView.snp.makeConstraints { - $0.leading.equalTo(self.safeArea.leading) - $0.trailing.equalTo(self.safeArea.trailing) - $0.bottom.equalTo(self.safeArea.bottom) + $0.leading.trailing.bottom.equalToSuperview() } descriptionView.addSubview(descriptionStackView) descriptionStackView.snp.makeConstraints { - $0.edges.equalToSuperview().inset(UX.descriptionContentInset) + $0.edges.equalTo(descriptionView.safeArea.edges).inset(UX.descriptionContentInset) } mainStackView.addArrangedSubview(descriptionView) diff --git a/Client/Frontend/Browser/Onboarding/OnboardingNavigationController.swift b/Client/Frontend/Browser/Onboarding/OnboardingNavigationController.swift index 13a263645..03fda8975 100644 --- a/Client/Frontend/Browser/Onboarding/OnboardingNavigationController.swift +++ b/Client/Frontend/Browser/Onboarding/OnboardingNavigationController.swift @@ -241,7 +241,7 @@ class CustomAnimator: NSObject, UIViewControllerAnimatedTransitioning { tDetails?.alpha = 0.0 tDetailsContent?.alpha = 0.0 - let inset = UIApplication.shared.keyWindow?.safeAreaInsets.bottom ?? 0.0 + let inset: CGFloat = 0.0 var fDetailsFrame = (fDetails?.bounds ?? .zero) fDetailsFrame.origin.y = (container.frame.height - container.frame.origin.y) - fDetailsFrame.height fDetailsFrame = fDetailsFrame.offsetBy(dx: 0.0, dy: -inset) diff --git a/Client/Frontend/Browser/Onboarding/OnboardingRewardsAgreementView.swift b/Client/Frontend/Browser/Onboarding/OnboardingRewardsAgreementView.swift index 714fd5f8b..1029c7061 100644 --- a/Client/Frontend/Browser/Onboarding/OnboardingRewardsAgreementView.swift +++ b/Client/Frontend/Browser/Onboarding/OnboardingRewardsAgreementView.swift @@ -155,14 +155,12 @@ extension OnboardingRewardsAgreementViewController { addSubview(imageView) addSubview(mainStackView) mainStackView.snp.makeConstraints { - $0.leading.equalTo(self.safeArea.leading) - $0.trailing.equalTo(self.safeArea.trailing) - $0.bottom.equalTo(self.safeArea.bottom) + $0.leading.trailing.bottom.equalToSuperview() } descriptionView.addSubview(descriptionStackView) descriptionStackView.snp.makeConstraints { - $0.edges.equalToSuperview().inset(UX.descriptionContentInset) + $0.edges.equalTo(descriptionView.safeArea.edges).inset(UX.descriptionContentInset) } mainStackView.addArrangedSubview(descriptionView) diff --git a/Client/Frontend/Browser/Onboarding/OnboardingRewardsView.swift b/Client/Frontend/Browser/Onboarding/OnboardingRewardsView.swift index 351906373..3f014410a 100644 --- a/Client/Frontend/Browser/Onboarding/OnboardingRewardsView.swift +++ b/Client/Frontend/Browser/Onboarding/OnboardingRewardsView.swift @@ -80,14 +80,12 @@ extension OnboardingRewardsViewController { addSubview(imageView) addSubview(mainStackView) mainStackView.snp.makeConstraints { - $0.leading.equalTo(self.safeArea.leading) - $0.trailing.equalTo(self.safeArea.trailing) - $0.bottom.equalTo(self.safeArea.bottom) + $0.leading.trailing.bottom.equalToSuperview() } descriptionView.addSubview(descriptionStackView) descriptionStackView.snp.makeConstraints { - $0.edges.equalToSuperview().inset(UX.descriptionContentInset) + $0.edges.equalTo(descriptionView.safeArea.edges).inset(UX.descriptionContentInset) } mainStackView.addArrangedSubview(descriptionView) diff --git a/Client/Frontend/Browser/Onboarding/OnboardingShieldsView.swift b/Client/Frontend/Browser/Onboarding/OnboardingShieldsView.swift index 61b19d5c0..d2a1015d1 100644 --- a/Client/Frontend/Browser/Onboarding/OnboardingShieldsView.swift +++ b/Client/Frontend/Browser/Onboarding/OnboardingShieldsView.swift @@ -84,14 +84,12 @@ extension OnboardingShieldsViewController { addSubview(imageView) addSubview(mainStackView) mainStackView.snp.makeConstraints { - $0.leading.equalTo(self.safeArea.leading) - $0.trailing.equalTo(self.safeArea.trailing) - $0.bottom.equalTo(self.safeArea.bottom) + $0.leading.trailing.bottom.equalToSuperview() } descriptionView.addSubview(descriptionStackView) descriptionStackView.snp.makeConstraints { - $0.edges.equalToSuperview().inset(UX.descriptionContentInset) + $0.edges.equalTo(descriptionView.safeArea.edges).inset(UX.descriptionContentInset) } mainStackView.addArrangedSubview(descriptionView) From 6fded8aa7907e404c604c22fc93b3b6adb629bd5 Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 15 Oct 2019 16:30:43 -0400 Subject: [PATCH 2/3] Changed text to `Turn On` instead of `Join`. --- .../Frontend/Browser/Onboarding/OnboardingRewardsView.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Client/Frontend/Browser/Onboarding/OnboardingRewardsView.swift b/Client/Frontend/Browser/Onboarding/OnboardingRewardsView.swift index 3f014410a..663971a9d 100644 --- a/Client/Frontend/Browser/Onboarding/OnboardingRewardsView.swift +++ b/Client/Frontend/Browser/Onboarding/OnboardingRewardsView.swift @@ -19,8 +19,8 @@ extension OnboardingRewardsViewController { class View: UIView { - let continueButton = CommonViews.primaryButton(text: Strings.OBJoinButton).then { - $0.accessibilityIdentifier = "OnboardingRewardsViewController.OBJoinButton" + let continueButton = CommonViews.primaryButton(text: Strings.OBTurnOnButton).then { + $0.accessibilityIdentifier = "OnboardingRewardsViewController.OBTurnOnButton" } let skipButton = CommonViews.secondaryButton().then { From 6d88bdb1d6f9fc0ded22d7fd5899f23e9665272b Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 15 Oct 2019 16:31:38 -0400 Subject: [PATCH 3/3] Fixed conflict. --- .../Frontend/Browser/Onboarding/OnboardingRewardsView.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Client/Frontend/Browser/Onboarding/OnboardingRewardsView.swift b/Client/Frontend/Browser/Onboarding/OnboardingRewardsView.swift index 663971a9d..3f014410a 100644 --- a/Client/Frontend/Browser/Onboarding/OnboardingRewardsView.swift +++ b/Client/Frontend/Browser/Onboarding/OnboardingRewardsView.swift @@ -19,8 +19,8 @@ extension OnboardingRewardsViewController { class View: UIView { - let continueButton = CommonViews.primaryButton(text: Strings.OBTurnOnButton).then { - $0.accessibilityIdentifier = "OnboardingRewardsViewController.OBTurnOnButton" + let continueButton = CommonViews.primaryButton(text: Strings.OBJoinButton).then { + $0.accessibilityIdentifier = "OnboardingRewardsViewController.OBJoinButton" } let skipButton = CommonViews.secondaryButton().then {