8355 Hide IPP image and progress views in landscape

In the past, we hid the image when the IPP payment flow was used in landscape.

With the addition of the progress view in #8079 c: 83f1d4c  we added another place where the image view could be shown or hidden (as the progress view replaces the image.)

That introduced a bug where images would be shown in landscape, breaking the rest of the IPP layout.

This commit moves all the `isHidden` changes to the `resetHeightAndWidth`, which is responsible for whether and which view should be shown.

Author: joshheald

WooCommerce/Classes/ViewRelated/CardPresentPayments/CardPresentPaymentsModalViewController.swift

@@ -71,23 +71,39 @@ final class CardPresentPaymentsModalViewController: UIViewController, CardReader
     private func resetHeightAndWidth() {
         if traitCollection.containsTraits(in: UITraitCollection(verticalSizeClass: .compact)) {
             primaryActionButtonsStackView.axis = .horizontal
-            imageView.isHidden = true
 
             mainStackView.distribution = .fillProportionally
             heightConstraint.constant = Constants.modalWidth
             widthConstraint.constant = Constants.modalHeight
         } else {
             primaryActionButtonsStackView.axis = .vertical
-            imageView.isHidden = false
+
             mainStackView.distribution = .fill
             heightConstraint.constant = Constants.modalHeight
             widthConstraint.constant = Constants.modalWidth
         }
 
+        updateImageAndLoadingVisibility()
+
         heightConstraint.priority = .required
         widthConstraint.priority = .required
         configureSpacer()
     }
+
+    private func updateImageAndLoadingVisibility() {
+        if traitCollection.containsTraits(in: UITraitCollection(verticalSizeClass: .compact)) {
+            imageView.isHidden = true
+            loadingView?.isHidden = true
+        } else {
+            if viewModel.showLoadingIndicator {
+                imageView.isHidden = true
+                loadingView?.isHidden = false
+            } else {
+                imageView.isHidden = false
+                loadingView?.isHidden = true
+            }
+        }
+    }
 }
 
 
@@ -202,8 +218,6 @@ private extension CardPresentPaymentsModalViewController {
 
         configureImageView()
 
-        configureLoadingIndicator()
-
         if shouldShowActionButtons() {
             configureActionButtonsView()
             styleActionButtons()
@@ -214,6 +228,8 @@ private extension CardPresentPaymentsModalViewController {
         if shouldShowBottomLabels() {
             configureBottomLabels()
         }
+
+        resetHeightAndWidth()
     }
 
     func configureTopTitle() {
@@ -248,11 +264,6 @@ private extension CardPresentPaymentsModalViewController {
 
     func configureImageView() {
         imageView.image = viewModel.image
-        imageView.isHidden = viewModel.showLoadingIndicator
-    }
-
-    func configureLoadingIndicator() {
-        loadingView?.isHidden = !viewModel.showLoadingIndicator
     }
 
     func setButtonsActions() {