Refactor FXIOS-15063 [Terms of use] Refactor navigation bar from Terms of Use links VC (#32443)

* Refactor FXIOS-15063 Refactor navigation bar from Terms of Use links VC

* Fixed warning

* Refactor FXIOS-15063 Refactor navigation bar from Terms of Use links VC

* Refactor FXIOS-15063 Refactor navigation bar from Terms of Use links VC

* Update firefox-ios/Shared/Strings.swift

Co-authored-by: lmarceau <lmarceau@mozilla.com>

* Apply suggestions from code review

Co-authored-by: lmarceau <lmarceau@mozilla.com>

---------

Co-authored-by: lmarceau <lmarceau@mozilla.com>

Author: rilury

firefox-ios/Client/Coordinators/Browser/BrowserCoordinator.swift

@@ -1081,8 +1081,9 @@ final class BrowserCoordinator: BaseCoordinator,
             windowUUID: windowUUID,
             themeManager: themeManager
         )
-        linkVC.modalPresentationStyle = .pageSheet
-        router.present(linkVC, animated: true)
+        let navController = UINavigationController(rootViewController: linkVC)
+        navController.modalPresentationStyle = .pageSheet
+        router.present(navController, animated: true)
     }
 
     func showCertificatesFromErrorPage(errorPageURL: URL, originalURL: URL, title: String) {

firefox-ios/Client/Frontend/Browser/TermsOfUse/TermsOfUseCoordinator.swift

@@ -102,9 +102,10 @@ final class TermsOfUseCoordinator: BaseCoordinator, TermsOfUseCoordinatorDelegat
             themeManager: themeManager,
             notificationCenter: notificationCenter
         )
-        linkVC.modalPresentationStyle = .pageSheet
-        linkVC.modalTransitionStyle = .coverVertical
-        presentedVC?.present(linkVC, animated: true)
+        let navController = UINavigationController(rootViewController: linkVC)
+        navController.modalPresentationStyle = .pageSheet
+        navController.modalTransitionStyle = .coverVertical
+        presentedVC?.present(navController, animated: true)
     }
 
     func shouldShowTermsOfUse(context: TriggerContext = .appLaunch) -> Bool {

firefox-ios/Client/Frontend/Browser/TermsOfUse/View/TermsOfUseLinkViewController.swift

@@ -14,10 +14,7 @@ final class TermsOfUseLinkViewController: UIViewController,
     weak var coordinator: TermsOfUseCoordinatorDelegate?
 
     private struct UX {
-        static let headerHeight: CGFloat = 44
-        static let backButtonLeading: CGFloat = 8
         static let progressBarHeight: CGFloat = 2
-        static let backArrowImage = UIImage(imageLiteralResourceName: StandardImageIdentifiers.Large.chevronLeft)
     }
 
     private let url: URL
@@ -35,22 +32,6 @@ final class TermsOfUseLinkViewController: UIViewController,
         bar.isHidden = true
     }
 
-    private lazy var header: UIView = .build { view in
-        view.backgroundColor = self.currentTheme().colors.layer1
-    }
-
-    private lazy var backButton: UIButton = .build { button in
-        button.setImage(UX.backArrowImage.withRenderingMode(.alwaysTemplate), for: .normal)
-        button.titleLabel?.adjustsFontForContentSizeCategory = true
-        button.adjustsImageSizeForAccessibilityContentSizeCategory = true
-        button.imageView?.contentMode = .scaleAspectFit
-        button.titleLabel?.adjustsFontSizeToFitWidth = true
-        button.setTitle(TermsOfUse.BackButton, for: .normal)
-        button.setTitleColor(self.currentTheme().colors.actionPrimary, for: .normal)
-        button.tintColor = self.currentTheme().colors.actionPrimary
-        button.addTarget(self, action: #selector(self.closeTapped), for: .touchUpInside)
-    }
-
     private lazy var webView: WKWebView = {
         let config = WKWebViewConfiguration()
         config.setURLSchemeHandler(InternalSchemeHandler(shouldUseOldErrorPage: true), forURLScheme: InternalURL.scheme)
@@ -89,35 +70,33 @@ final class TermsOfUseLinkViewController: UIViewController,
     }
 
     private func setupViews() {
-        view.addSubview(header)
-        header.addSubview(backButton)
+        navigationItem.rightBarButtonItem = UIBarButtonItem(
+            title: TermsOfUse.CloseButton,
+            style: .plain,
+            target: self,
+            action: #selector(closeTapped)
+        )
+
+        view.addSubview(progressBar)
         view.addSubview(webView)
-        header.addSubview(progressBar)
 
         NSLayoutConstraint.activate([
-            header.topAnchor.constraint(equalTo: view.topAnchor),
-            header.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-            header.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-            header.heightAnchor.constraint(equalToConstant: UX.headerHeight),
-
-            backButton.leadingAnchor.constraint(equalTo: header.leadingAnchor, constant: UX.backButtonLeading),
-            backButton.centerYAnchor.constraint(equalTo: header.centerYAnchor),
-
-            progressBar.leadingAnchor.constraint(equalTo: header.leadingAnchor),
-            progressBar.trailingAnchor.constraint(equalTo: header.trailingAnchor),
-            progressBar.bottomAnchor.constraint(equalTo: header.bottomAnchor),
+            progressBar.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor),
+            progressBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            progressBar.trailingAnchor.constraint(equalTo: view.trailingAnchor),
             progressBar.heightAnchor.constraint(equalToConstant: UX.progressBarHeight),
 
-            webView.topAnchor.constraint(equalTo: header.bottomAnchor),
+            webView.topAnchor.constraint(equalTo: progressBar.bottomAnchor),
             webView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
             webView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
             webView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
         ])
     }
 
     func applyTheme() {
-        view.backgroundColor = currentTheme().colors.layer1
-        applyProgressBarTheme(theme: currentTheme())
+        let theme = currentTheme()
+        view.backgroundColor = theme.colors.layer1
+        applyProgressBarTheme(theme: theme)
     }
 
     @objc private func closeTapped() {

firefox-ios/firefox-ios-tests/Tests/ClientTests/Coordinators/BrowserCoordinatorTests.swift

@@ -618,7 +618,10 @@ final class BrowserCoordinatorTests: XCTestCase, FeatureFlaggable, StoreTestUtil
 
         subject.showPrivacyNoticeLink(url: url)
 
-        XCTAssertNotNil(mockRouter.presentedViewController as? TermsOfUseLinkViewController)
+        let navController = mockRouter.presentedViewController as? UINavigationController
+        let termsOfUseLinkVC = navController?.viewControllers.first as? TermsOfUseLinkViewController
+
+        XCTAssertNotNil(termsOfUseLinkVC)
         XCTAssertEqual(mockRouter.presentCalled, 1)
     }