Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add FXIOS-10568 [ToS] Firefox iOS: Show Onboarding Links in Modal Browser #23311

Merged
merged 3 commits into from
Nov 25, 2024
Merged

Add FXIOS-10568 [ToS] Firefox iOS: Show Onboarding Links in Modal Browser #23311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db5fb85
FXIOS-10568 Firefox iOS: Show Onboarding Links in Modal Browser
dicarobinho Nov 22, 2024
b788be1
Refactored some code
dicarobinho Nov 25, 2024
577d60c
Merge branch 'main' into afarcasanu/fxios_10568_show_onboarding_links…
dicarobinho Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions firefox-ios/Client/Application/AccessibilityIdentifiers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@ public struct AccessibilityIdentifiers {
static let privacyNoticeAgreement = "TermsOfService.PrivacyNoticeAgreement"
static let manageDataCollectionAgreement = "TermsOfService.ManageDataCollectionAgreement"
static let agreeAndContinueButton = "TermsOfService.AgreeAndContinueButton"
static let doneButton = "TermsOfService.DoneButton"
}

struct Upgrade {
Expand Down
64 changes: 62 additions & 2 deletions firefox-ios/Client/Frontend/Onboarding/Views/TermsOfServiceViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ import Shared
import UIKit
import ComponentLibrary

enum LinkType: Int {
case termsOfService
case privacyNotice
case manage
}

class TermsOfServiceViewController: UIViewController,
Themeable {
struct UX {
Expand Down Expand Up @@ -87,20 +93,23 @@ class TermsOfServiceViewController: UIViewController,
let termsOfServiceAgreement = String(format: .Onboarding.TermsOfService.TermsOfServiceAgreement, termsOfServiceLink)
setupAgreementTextView(with: termsOfServiceAgreement,
linkTitle: termsOfServiceLink,
linkType: .termsOfService,
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,
linkType: .privacyNotice,
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,
linkType: .manage,
and: AccessibilityIdentifiers.TermsOfService.manageDataCollectionAgreement)
}

Expand Down Expand Up @@ -156,8 +165,7 @@ class TermsOfServiceViewController: UIViewController,
])
}

// TODO: FXIOS-10347 Firefox iOS: Manage Privacy Preferences during Onboarding
private func setupAgreementTextView(with title: String, linkTitle: String, and a11yId: String) {
private func setupAgreementTextView(with title: String, linkTitle: String, linkType: LinkType, and a11yId: String) {
let agreementLabel: UILabel = .build()
agreementLabel.accessibilityIdentifier = a11yId
agreementLabel.numberOfLines = 0
Expand All @@ -176,10 +184,62 @@ class TermsOfServiceViewController: UIViewController,
value: themeManager.getCurrentTheme(for: windowUUID).colors.textAccent,
range: linkedText)

agreementLabel.isUserInteractionEnabled = true

switch linkType {
case .termsOfService:
let gesture = UITapGestureRecognizer(target: self, action: #selector(presentTermsOfService))
agreementLabel.addGestureRecognizer(gesture)
case .privacyNotice:
let gesture = UITapGestureRecognizer(target: self, action: #selector(presentPrivacyNotice))
agreementLabel.addGestureRecognizer(gesture)
case .manage:
let gesture = UITapGestureRecognizer(target: self, action: #selector(presentManagePreferences))
agreementLabel.addGestureRecognizer(gesture)
}

agreementLabel.attributedText = linkedAgreementDescription
agreementContent.addArrangedSubview(agreementLabel)
}

private func presentLink(with url: URL?) {
guard let url else { return }
let presentLinkVC = PrivacyPolicyViewController(url: url, windowUUID: windowUUID)
let buttonItem = UIBarButtonItem(
title: .SettingsSearchDoneButton,
style: .plain,
target: self,
action: #selector(dismissPresentedLinkVC))
buttonItem.accessibilityIdentifier = AccessibilityIdentifiers.TermsOfService.doneButton

presentLinkVC.navigationItem.rightBarButtonItem = buttonItem
let controller = DismissableNavigationViewController(rootViewController: presentLinkVC)
present(controller, animated: true)
}

// MARK: - Button actions
@objc
private func presentTermsOfService(_ gesture: UIGestureRecognizer) {
// TODO: FXIOS-10638 Firefox iOS: Use the correct Terms of Service and Privacy Notice URLs in ToSViewController
presentLink(with: nil)
}

@objc
private func presentPrivacyNotice(_ gesture: UIGestureRecognizer) {
// TODO: FXIOS-10638 Firefox iOS: Use the correct Terms of Service and Privacy Notice URLs in ToSViewController
presentLink(with: nil)
}

@objc
private func presentManagePreferences(_ gesture: UIGestureRecognizer) {
// TODO: FXIOS-10347 Firefox iOS: Manage Privacy Preferences during Onboarding
}

@objc
private func dismissPresentedLinkVC() {
dismiss(animated: true, completion: nil)
}

// MARK: - Themable
func applyTheme() {
let theme = themeManager.getCurrentTheme(for: windowUUID)
Expand Down