8082 Extract progress alert title and message logic

Author: joshheald

WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalBuiltInConfigurationProgress.swift

@@ -9,8 +9,6 @@ final class CardPresentModalBuiltInConfigurationProgress: CardPresentPaymentsMod
     let textMode: PaymentsModalTextMode = .fullInfo
     let actionsMode: PaymentsModalActionsMode
 
-    var topTitle: String
-
     var topSubtitle: String? = nil
 
     var progress: Float
@@ -21,7 +19,13 @@ final class CardPresentModalBuiltInConfigurationProgress: CardPresentPaymentsMod
 
     let auxiliaryButtonTitle: String? = nil
 
-    var bottomSubtitle: String? = nil
+    var titleComplete: String
+
+    var titleInProgress: String
+
+    var messageComplete: String?
+
+    var messageInProgress: String?
 
     var accessibilityLabel: String? {
         Localization.title
@@ -31,9 +35,10 @@ final class CardPresentModalBuiltInConfigurationProgress: CardPresentPaymentsMod
         self.progress = progress
         self.cancelAction = cancel
 
-        let isComplete = progress == 1
-        topTitle = isComplete ? Localization.titleComplete : Localization.title
-        bottomSubtitle = isComplete ? Localization.messageComplete : Localization.message
+        titleComplete = Localization.titleComplete
+        titleInProgress = Localization.title
+        messageComplete = Localization.messageComplete
+        messageInProgress = Localization.message
         actionsMode = cancel != nil ? .secondaryOnlyAction : .none
     }
 

WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalProgressDisplaying.swift

@@ -2,16 +2,33 @@ import UIKit
 
 protocol CardPresentModalProgressDisplaying: CardPresentPaymentsModalViewModel {
     var progress: Float { get }
+    var isComplete: Bool { get }
+    var titleComplete: String { get }
+    var titleInProgress: String { get }
+    var messageComplete: String? { get }
+    var messageInProgress: String? { get }
 }
 
 extension CardPresentModalProgressDisplaying {
     var image: UIImage {
         .softwareUpdateProgress(progress: CGFloat(progress))
     }
 
+    var isComplete: Bool {
+        progress == 1
+    }
+
+    var topTitle: String {
+        isComplete ? titleComplete : titleInProgress
+    }
+
     var bottomTitle: String? {
         String(format: CardPresentModalProgressDisplayingLocalization.percentComplete, 100 * progress)
     }
+
+    var bottomSubtitle: String? {
+        isComplete ? messageComplete : messageInProgress
+    }
 }
 
 fileprivate enum CardPresentModalProgressDisplayingLocalization {

WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalUpdateProgress.swift

@@ -9,8 +9,6 @@ final class CardPresentModalUpdateProgress: CardPresentPaymentsModalViewModel, C
     let textMode: PaymentsModalTextMode = .fullInfo
     let actionsMode: PaymentsModalActionsMode
 
-    var topTitle: String
-
     var topSubtitle: String? = nil
 
     var progress: Float
@@ -21,7 +19,13 @@ final class CardPresentModalUpdateProgress: CardPresentPaymentsModalViewModel, C
 
     let auxiliaryButtonTitle: String? = nil
 
-    var bottomSubtitle: String? = nil
+    var titleComplete: String
+
+    var titleInProgress: String
+
+    var messageComplete: String?
+
+    var messageInProgress: String?
 
     var accessibilityLabel: String? {
         Localization.title
@@ -30,13 +34,13 @@ final class CardPresentModalUpdateProgress: CardPresentPaymentsModalViewModel, C
     init(requiredUpdate: Bool, progress: Float, cancel: (() -> Void)?) {
         self.progress = progress
         self.cancelAction = cancel
+        actionsMode = cancel != nil ? .secondaryOnlyAction : .none
+        titleComplete = Localization.titleComplete
+        titleInProgress = Localization.title
 
-        let isComplete = progress == 1
-        topTitle = isComplete ? Localization.titleComplete : Localization.title
         if !isComplete {
-            bottomSubtitle = requiredUpdate ? Localization.messageRequired : Localization.messageOptional
+            messageInProgress = requiredUpdate ? Localization.messageRequired : Localization.messageOptional
         }
-        actionsMode = cancel != nil ? .secondaryOnlyAction : .none
     }
 
     func didTapPrimaryButton(in viewController: UIViewController?) {}