-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add FXIOS-10606 [ToS] Firefox iOS: ToS Card in Onboarding - UI Creati…
…on Only (#23275) * FXIOS-10606 Firefox iOS: ToS Card in Onboarding - UI Creation Only * Fixed a SwiftLint warning * Refactored some code Fixed the theme change issue * Removed notificationCenter from init * Updating the theme via Themeable instead of Notifiable * Refactored some code
- Loading branch information
1 parent
6e0d6ac
commit 3c37c34
Showing
5 changed files
with
250 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
191 changes: 191 additions & 0 deletions
191
firefox-ios/Client/Frontend/Onboarding/Views/TermsOfServiceViewController.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,191 @@ | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/ | ||
|
|
||
| import Common | ||
| import Shared | ||
| import UIKit | ||
| import ComponentLibrary | ||
|
|
||
| class TermsOfServiceViewController: UIViewController, | ||
| Themeable { | ||
| struct UX { | ||
| static let horizontalMargin: CGFloat = 24 | ||
| static let logoIconSize: CGFloat = 160 | ||
| static let margin: CGFloat = 20 | ||
| static let agreementContentSpacing: CGFloat = 15 | ||
| static let distanceBetweenViews = 2 * margin | ||
| } | ||
|
|
||
| // MARK: - Properties | ||
| var windowUUID: WindowUUID | ||
| var themeManager: ThemeManager | ||
| var themeObserver: (any NSObjectProtocol)? | ||
| var currentWindowUUID: UUID? { windowUUID } | ||
| var notificationCenter: NotificationProtocol | ||
|
|
||
| // MARK: - UI elements | ||
| private lazy var contentScrollView: UIScrollView = .build() | ||
|
|
||
| private lazy var contentView: UIView = .build() | ||
|
|
||
| private lazy var titleLabel: UILabel = .build { label in | ||
| label.text = String(format: .Onboarding.TermsOfService.Title, AppName.shortName.rawValue) | ||
| label.font = FXFontStyles.Regular.title1.scaledFont() | ||
| label.textAlignment = .center | ||
| label.numberOfLines = 0 | ||
| label.adjustsFontForContentSizeCategory = true | ||
| label.accessibilityIdentifier = AccessibilityIdentifiers.TermsOfService.title | ||
| } | ||
|
|
||
| private lazy var logoImage: UIImageView = .build { logoImage in | ||
| logoImage.image = UIImage(named: ImageIdentifiers.logo) | ||
| logoImage.accessibilityIdentifier = AccessibilityIdentifiers.TermsOfService.logo | ||
| } | ||
|
|
||
| private lazy var confirmationButton: PrimaryRoundedButton = .build { [weak self] button in | ||
| let viewModel = PrimaryRoundedButtonViewModel( | ||
| title: .Onboarding.TermsOfService.AgreementButtonTitle, | ||
| a11yIdentifier: AccessibilityIdentifiers.TermsOfService.agreeAndContinueButton) | ||
| button.configure(viewModel: viewModel) | ||
| } | ||
|
|
||
| private lazy var agreementContent: UIStackView = .build { stackView in | ||
| stackView.axis = .vertical | ||
| stackView.spacing = UX.agreementContentSpacing | ||
| } | ||
|
|
||
| // MARK: - Initializers | ||
| init( | ||
| windowUUID: WindowUUID, | ||
| themeManager: ThemeManager = AppContainer.shared.resolve(), | ||
| notificationCenter: NotificationProtocol = NotificationCenter.default | ||
| ) { | ||
| self.windowUUID = windowUUID | ||
| self.themeManager = themeManager | ||
| self.notificationCenter = notificationCenter | ||
| super.init(nibName: nil, bundle: nil) | ||
|
|
||
| setupLayout() | ||
| applyTheme() | ||
| } | ||
|
|
||
| required init?(coder: NSCoder) { | ||
| fatalError("init(coder:) has not been implemented") | ||
| } | ||
|
|
||
| // MARK: - View cycles | ||
| override func viewDidLoad() { | ||
| super.viewDidLoad() | ||
| listenForThemeChange(view) | ||
| } | ||
|
|
||
| // MARK: - View setup | ||
| private func configure() { | ||
| agreementContent.removeAllArrangedViews() | ||
| let termsOfServiceLink = String(format: .Onboarding.TermsOfService.TermsOfServiceLink, AppName.shortName.rawValue) | ||
| let termsOfServiceAgreement = String(format: .Onboarding.TermsOfService.TermsOfServiceAgreement, termsOfServiceLink) | ||
| setupAgreementTextView(with: termsOfServiceAgreement, | ||
| linkTitle: termsOfServiceLink, | ||
| and: AccessibilityIdentifiers.TermsOfService.termsOfServiceAgreement) | ||
|
|
||
| let privacyNoticeLink = String.Onboarding.TermsOfService.PrivacyNoticeLink | ||
| let privacyNoticeText = String.Onboarding.TermsOfService.PrivacyNoticeAgreement | ||
| let privacyAgreement = String(format: privacyNoticeText, AppName.shortName.rawValue, privacyNoticeLink) | ||
| setupAgreementTextView(with: privacyAgreement, | ||
| linkTitle: privacyNoticeLink, | ||
| and: AccessibilityIdentifiers.TermsOfService.privacyNoticeAgreement) | ||
|
|
||
| let manageLink = String.Onboarding.TermsOfService.ManageLink | ||
| let manageText = String.Onboarding.TermsOfService.ManagePreferenceAgreement | ||
| let manageAgreement = String(format: manageText, AppName.shortName.rawValue, manageLink) | ||
| setupAgreementTextView(with: manageAgreement, | ||
| linkTitle: manageLink, | ||
| and: AccessibilityIdentifiers.TermsOfService.manageDataCollectionAgreement) | ||
| } | ||
|
|
||
| private func setupLayout() { | ||
| view.addSubview(contentScrollView) | ||
| contentScrollView.addSubview(contentView) | ||
| contentView.addSubview(titleLabel) | ||
| contentView.addSubview(logoImage) | ||
| contentView.addSubview(confirmationButton) | ||
| contentView.addSubview(agreementContent) | ||
|
|
||
| let topMargin = view.frame.size.height / 3 - UX.logoIconSize - UX.margin | ||
|
|
||
| NSLayoutConstraint.activate([ | ||
| contentScrollView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor), | ||
| contentScrollView.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor), | ||
| contentScrollView.leadingAnchor.constraint(equalTo: view.leadingAnchor), | ||
| contentScrollView.trailingAnchor.constraint(equalTo: view.trailingAnchor), | ||
|
|
||
| contentView.topAnchor.constraint(equalTo: contentScrollView.topAnchor), | ||
| contentView.bottomAnchor.constraint(equalTo: contentScrollView.bottomAnchor), | ||
| contentView.leadingAnchor.constraint(equalTo: contentScrollView.leadingAnchor), | ||
| contentView.trailingAnchor.constraint(equalTo: contentScrollView.trailingAnchor), | ||
| contentView.widthAnchor.constraint(equalTo: contentScrollView.frameLayoutGuide.widthAnchor), | ||
| contentView.heightAnchor.constraint(equalTo: contentScrollView.heightAnchor).priority(.defaultLow), | ||
|
|
||
| logoImage.centerXAnchor.constraint(equalTo: contentView.centerXAnchor), | ||
| logoImage.heightAnchor.constraint(equalToConstant: UX.logoIconSize), | ||
| logoImage.widthAnchor.constraint(equalToConstant: UX.logoIconSize), | ||
| logoImage.topAnchor.constraint(equalTo: contentView.topAnchor, constant: topMargin), | ||
|
|
||
| titleLabel.topAnchor.constraint(equalTo: logoImage.bottomAnchor, constant: UX.margin), | ||
| titleLabel.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: UX.horizontalMargin), | ||
| titleLabel.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -UX.horizontalMargin), | ||
|
|
||
| agreementContent.topAnchor.constraint( | ||
| greaterThanOrEqualTo: titleLabel.bottomAnchor, | ||
| constant: UX.distanceBetweenViews | ||
| ), | ||
| agreementContent.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: UX.horizontalMargin), | ||
| agreementContent.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -UX.horizontalMargin), | ||
|
|
||
| confirmationButton.topAnchor.constraint( | ||
| equalTo: agreementContent.bottomAnchor, | ||
| constant: UX.distanceBetweenViews | ||
| ), | ||
| confirmationButton.bottomAnchor.constraint( | ||
| equalTo: contentView.bottomAnchor, | ||
| constant: -UX.distanceBetweenViews | ||
| ), | ||
| confirmationButton.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: UX.horizontalMargin), | ||
| confirmationButton.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -UX.horizontalMargin) | ||
| ]) | ||
| } | ||
|
|
||
| // TODO: FXIOS-10347 Firefox iOS: Manage Privacy Preferences during Onboarding | ||
| private func setupAgreementTextView(with title: String, linkTitle: String, and a11yId: String) { | ||
| let agreementLabel: UILabel = .build() | ||
| agreementLabel.accessibilityIdentifier = a11yId | ||
| agreementLabel.numberOfLines = 0 | ||
| agreementLabel.textAlignment = .center | ||
| agreementLabel.adjustsFontForContentSizeCategory = true | ||
|
|
||
| let linkedAgreementDescription = NSMutableAttributedString(string: title) | ||
| let linkedText = (title as NSString).range(of: linkTitle) | ||
| linkedAgreementDescription.addAttribute(.font, | ||
| value: FXFontStyles.Regular.caption1.scaledFont(), | ||
| range: NSRange(location: 0, length: title.count)) | ||
| linkedAgreementDescription.addAttribute(.foregroundColor, | ||
| value: themeManager.getCurrentTheme(for: windowUUID).colors.textSecondary, | ||
| range: NSRange(location: 0, length: title.count)) | ||
| linkedAgreementDescription.addAttribute(.foregroundColor, | ||
| value: themeManager.getCurrentTheme(for: windowUUID).colors.textAccent, | ||
| range: linkedText) | ||
|
|
||
| agreementLabel.attributedText = linkedAgreementDescription | ||
| agreementContent.addArrangedSubview(agreementLabel) | ||
| } | ||
|
|
||
| // MARK: - Themable | ||
| func applyTheme() { | ||
| let theme = themeManager.getCurrentTheme(for: windowUUID) | ||
| view.backgroundColor = theme.colors.layer2 | ||
| titleLabel.textColor = theme.colors.textPrimary | ||
| confirmationButton.applyTheme(theme: theme) | ||
| configure() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters