[WCiOS17] Address deprecations on account and auth flows trait updates (#16427)

Author: iamgabrielma

WooCommerce/Classes/Authentication/Navigation Exceptions/RoleErrorViewController.swift

@@ -61,6 +61,7 @@ class RoleErrorViewController: UIViewController {
         super.viewDidLoad()
 
         configureViews()
+        observeTraitChanges()
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -95,6 +96,21 @@ class RoleErrorViewController: UIViewController {
         configureLinkButton()
         configurePrimaryActionButton()
         configureSecondaryActionButton()
+
+        // Set initial image visibility based on vertical size class
+        imageView.isHidden = traitCollection.verticalSizeClass == .compact
+    }
+
+    private func observeTraitChanges() {
+        // Image visibility depends on vertical size class only
+        registerForTraitChanges([UITraitVerticalSizeClass.self]) { (self: Self, _) in
+            self.imageView.isHidden = self.traitCollection.verticalSizeClass == .compact
+        }
+
+        // Appearance updates only when dark/light mode changes
+        registerForTraitChanges([UITraitUserInterfaceStyle.self]) { (self: Self, _) in
+            self.updateViewAppearances()
+        }
     }
 
     func configureDescriptionLabel() {
@@ -128,24 +144,9 @@ class RoleErrorViewController: UIViewController {
         }
     }
 
-    // MARK: Trait Change Adjustments
-
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-
-        // hide image in compact height sizes (e.g. landscape iphones).
-        // with limited space, text description should have higher priority.
-        imageView.isHidden = traitCollection.verticalSizeClass == .compact
-
-        // handle dynamic color appearance changes.
-        if let previousTrait = previousTraitCollection,
-           previousTrait.hasDifferentColorAppearance(comparedTo: traitCollection) {
-            updateViewAppearances()
-        }
-    }
 
     /// update views that can adjust to color appearance changes.
-    /// this method is called when color appearance changes are detected in `traitCollectionDidChange`.
+    /// this method is called when color appearance changes are detected via trait change registration.
     private func updateViewAppearances() {
         // illustrations
         imageView.image = viewModel.image

WooCommerce/Classes/Authentication/Navigation Exceptions/ULAccountMismatchViewController.swift

@@ -62,13 +62,15 @@ final class ULAccountMismatchViewController: UIViewController {
         configureSecondaryButon()
 
         setUnifiedMargins(forWidth: view.frame.width)
+        observeTraitChanges()
 
         viewModel.viewDidLoad(self)
     }
 
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        setUnifiedMargins(forWidth: view.frame.width)
+    private func observeTraitChanges() {
+        registerForTraitChanges([UITraitHorizontalSizeClass.self, UITraitVerticalSizeClass.self]) { (self: Self, _) in
+            self.setUnifiedMargins(forWidth: self.view.frame.width)
+        }
     }
 
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {

WooCommerce/Classes/Authentication/Navigation Exceptions/ULErrorViewController.swift

@@ -72,6 +72,7 @@ final class ULErrorViewController: UIViewController {
         configureButtonLabels()
 
         setUnifiedMargins(forWidth: view.frame.width)
+        observeTraitChanges()
 
         viewModel.viewDidLoad(self)
     }
@@ -81,9 +82,10 @@ final class ULErrorViewController: UIViewController {
         viewDidAppearSubject.send()
     }
 
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        setUnifiedMargins(forWidth: view.frame.width)
+    private func observeTraitChanges() {
+        registerForTraitChanges([UITraitHorizontalSizeClass.self, UITraitVerticalSizeClass.self]) { (self: Self, _) in
+            self.setUnifiedMargins(forWidth: self.view.frame.width)
+        }
     }
 
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {

WooCommerce/Classes/ViewRelated/Dashboard/Settings/Privacy/PrivacySettingsViewController.swift

@@ -501,9 +501,13 @@ private enum Row: CaseIterable {
 }
 
 extension PrivacySettingsViewController: UITextViewDelegate {
-    func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
-        presentURL(URL)
-        trackURLPresentation(URL)
-        return false
+    func textView(_ textView: UITextView, primaryActionFor textItem: UITextItem, defaultAction: UIAction) -> UIAction? {
+        if case .link(let url) = textItem.content {
+            presentURL(url)
+            trackURLPresentation(url)
+            // Prevent default action
+            return nil
+        }
+        return defaultAction
     }
 }

WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewController.swift

@@ -562,10 +562,13 @@ private extension SettingsViewController {
 //
 extension SettingsViewController: UITextViewDelegate {
 
-    func textView(_ textView: UITextView, shouldInteractWith URL: URL,
-                  in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
-        weAreHiringWasPressed(url: URL)
-        return false
+    func textView(_ textView: UITextView, primaryActionFor textItem: UITextItem, defaultAction: UIAction) -> UIAction? {
+        if case .link(let url) = textItem.content {
+            weAreHiringWasPressed(url: url)
+            // Prevent default action
+            return nil
+        }
+        return defaultAction
     }
 }
 

WooCommerce/Classes/ViewRelated/FilterTabBar/FilterTabBar.swift

@@ -518,23 +518,23 @@ private class TabBarButton: UIButton {
         super.init(frame: frame)
 
         setFont()
+        observeTraitChanges()
     }
 
     required init?(coder: NSCoder) {
         super.init(coder: coder)
 
         setFont()
+        observeTraitChanges()
     }
 
     private func setFont() {
         titleLabel?.applySubheadlineStyle()
     }
 
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-
-        if previousTraitCollection?.preferredContentSizeCategory != traitCollection.preferredContentSizeCategory {
-            setFont()
+    private func observeTraitChanges() {
+        registerForTraitChanges([UITraitPreferredContentSizeCategory.self]) { (self: Self, _) in
+            self.setFont()
         }
     }
 }

WooCommerce/Classes/ViewRelated/MainTabBarController.swift

@@ -231,6 +231,13 @@ final class MainTabBarController: UITabBarController {
         startListeningToHubMenuTabBadgeUpdates()
 
         fixTabBarTraitCollectionOnIpadForiOS18()
+        observeTraitChanges()
+    }
+
+    private func observeTraitChanges() {
+        registerForTraitChanges([UITraitHorizontalSizeClass.self, UITraitVerticalSizeClass.self]) { (self: Self, _) in
+            self.fixTabBarTraitCollectionOnIpadForiOS18()
+        }
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -310,12 +317,6 @@ final class MainTabBarController: UITabBarController {
 
     // MARK: - iPadOS 18 tabs support
 
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-         super.traitCollectionDidChange(previousTraitCollection)
-         fixTabBarTraitCollectionOnIpadForiOS18()
-     }
-
-
     /// Force a previous bottom tab bar design on iPadOS 18 when built with Xcode 16
     ///
     /// Override a trait collection for the tab bar controller to be compact to show the same tab layout as on iPhone

WooCommerce/Classes/ViewRelated/ReusableViews/SwiftUI Components/AttributedText.swift

@@ -123,9 +123,13 @@ private struct TextViewWrapper: UIViewRepresentable {
     final class Coordinator: NSObject, UITextViewDelegate {
         var openURL: ((URL) -> Void)?
 
-        func textView(_: UITextView, shouldInteractWith URL: URL, in _: NSRange, interaction _: UITextItemInteraction) -> Bool {
-            openURL?(URL)
-            return false
+        func textView(_ textView: UITextView, primaryActionFor textItem: UITextItem, defaultAction: UIAction) -> UIAction? {
+            if case .link(let url) = textItem.content {
+                openURL?(url)
+                // Prevent default action
+                return nil
+            }
+            return defaultAction
         }
     }
 

WooCommerce/Classes/ViewRelated/ReusableViews/TextViewTableViewCell.swift

@@ -118,12 +118,16 @@ final class TextViewTableViewCell: UITableViewCell {
 }
 
 extension TextViewTableViewCell: UITextViewDelegate {
-    func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
-        if let onLinkTapped {
-            onLinkTapped(URL)
-            return false
+    func textView(_ textView: UITextView, primaryActionFor textItem: UITextItem, defaultAction: UIAction) -> UIAction? {
+        if case .link(let url) = textItem.content {
+            if let onLinkTapped {
+                onLinkTapped(url)
+                // Prevent default action
+                return nil
+            }
         }
-        return true
+        // Allow default behavior
+        return defaultAction
     }
 }
 

WooCommerce/Classes/ViewRelated/Survey/SurveySubmittedViewController.swift

@@ -67,6 +67,13 @@ final class SurveySubmittedViewController: UIViewController, SurveySubmittedView
         applyStyleToComponents()
         applyLocalizedTextsToComponents()
         configureStackViewsAxis()
+        observeTraitChanges()
+    }
+
+    private func observeTraitChanges() {
+        registerForTraitChanges([UITraitPreferredContentSizeCategory.self]) { (self: Self, _) in
+            self.configureStackViewsAxis()
+        }
     }
 
     @IBAction private func contactUsButtonTapped(_ sender: Any) {
@@ -118,15 +125,6 @@ private extension SurveySubmittedViewController {
     }
 }
 
-// MARK: Accessibility handling
-//
-extension SurveySubmittedViewController {
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        configureStackViewsAxis()
-    }
-}
-
 // MARK: Constants
 //
 private extension SurveySubmittedViewController {