[WCiOS17] Update card readers modals to new traits API (#16332)

Author: iamgabrielma

WooCommerce/Classes/ViewRelated/CardPresentPayments/CardPresentPaymentsModalViewController.swift

@@ -52,6 +52,7 @@ final class CardPresentPaymentsModalViewController: UIViewController, CardReader
         setButtonsActions()
         styleContent()
         populateContent()
+        observeTraitChanges()
     }
 
     func setViewModel(_ newViewModel: CardPresentPaymentsModalViewModel) {
@@ -62,13 +63,18 @@ final class CardPresentPaymentsModalViewController: UIViewController, CardReader
         }
     }
 
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        resetHeightAndWidth()
+    private func observeTraitChanges() {
+        let traits: [UITrait] = [
+            UITraitVerticalSizeClass.self,
+            UITraitHorizontalSizeClass.self
+        ]
+        registerForTraitChanges(traits) { (self: Self, _) in
+            self.resetHeightAndWidth()
+        }
     }
 
     private func resetHeightAndWidth() {
-        if traitCollection.containsTraits(in: UITraitCollection(verticalSizeClass: .compact)) {
+        if traitCollection.verticalSizeClass == .compact {
             primaryActionButtonsStackView.axis = .horizontal
             primaryActionButtonsStackView.distribution = .fillProportionally
 
@@ -92,7 +98,7 @@ final class CardPresentPaymentsModalViewController: UIViewController, CardReader
     }
 
     private func updateImageAndLoadingVisibility() {
-        if traitCollection.containsTraits(in: UITraitCollection(verticalSizeClass: .compact)) {
+        if traitCollection.verticalSizeClass == .compact {
             imageView.isHidden = true
             loadingView?.isHidden = true
         } else {

WooCommerce/Classes/ViewRelated/CardPresentPayments/SeveralReadersFoundViewController.swift

@@ -36,21 +36,18 @@ final class SeveralReadersFoundViewController: UIViewController, UITableViewDele
         configureTable()
         updateViewMargins()
         updateViewAppearances()
+        observeTraitChanges()
     }
 
-    /// Update constraints that vary by size class
-    ///
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-
-        /// Handle size class and orientation
-        ///
-        updateViewMargins()
-
-        /// Handle changes to Light / Dark Appearance
-        ///
-        if let previousTraits = previousTraitCollection, previousTraits.hasDifferentColorAppearance(comparedTo: traitCollection) {
-            updateViewAppearances()
+    private func observeTraitChanges() {
+        let traits: [UITrait] = [
+            UITraitVerticalSizeClass.self,
+            UITraitHorizontalSizeClass.self,
+            UITraitUserInterfaceStyle.self
+        ]
+        registerForTraitChanges(traits) { (self: Self, _) in
+            self.updateViewMargins()
+            self.updateViewAppearances()
         }
     }