From 4a5856f07183dcee9ffefb8254af61a7f323b594 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Tue, 14 Jul 2020 16:14:37 -0400
Subject: [PATCH] making yupdates

---
 .../Order Tracker/OrderTracker.swift          | 26 +++++++------------
 .../Order Tracker/Step.swift                  | 10 +++----
 .../Order Tracker/StepModel.swift             |  2 +-
 MVMCoreUI/BaseClasses/ImageView.swift         |  1 +
 4 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift
index 9963ea37..93aa7c23 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift	
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift	
@@ -41,9 +41,10 @@ open class OrderTracker: View {
         
         guard let stepModels = stepModels else { return }
         
+        var anchor = topAnchor
         var previousStep: Step?
         
-        for (i, stepModel) in stepModels.enumerated() {
+        for stepModel in stepModels {
             
             let step = Step()
             step.set(with: stepModel, delegateObject, additionalData)
@@ -52,21 +53,14 @@ open class OrderTracker: View {
             
             step.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
             trailingAnchor.constraint(equalTo: step.trailingAnchor).isActive = true
+            step.topAnchor.constraint(equalTo: anchor).isActive = true
             
-            if i == 0 {
-                step.topAnchor.constraint(equalTo: topAnchor).isActive = true
-                
-            } else if let previousStep = previousStep {
-                step.topAnchor.constraint(equalTo: previousStep.bottomAnchor).isActive = true
-            }
-            
-            if i == stepModels.count - 1 {
-                bottomAnchor.constraint(equalTo: step.bottomAnchor).isActive = true
-                step.imageBottomConstraint?.constant = 0
-            }
-            
+            anchor = step.bottomAnchor
             previousStep = step
         }
+        
+        bottomAnchor.constraint(equalTo: anchor).isActive = true
+        previousStep?.imageBottomConstraint?.constant = 0
     }
     
     func resetSteps() {
@@ -90,10 +84,9 @@ open class OrderTracker: View {
             else { return }
         
         context.setLineWidth(1)
-        let firstRect = convert(firstStep.stateImage.frame, from: firstStep.stateImage)
         let imageDimension = firstStep.stateImage.bounds.height
         let halfDimension = imageDimension / 2
-        let startPoint = CGPoint(x: halfDimension, y: firstRect.size.height - halfDimension)
+        let startPoint = CGPoint(x: halfDimension, y: halfDimension)
         let defaultGrey: UIColor = .mvmCoolGray3
         context.move(to: startPoint)
         
@@ -117,9 +110,8 @@ open class OrderTracker: View {
                 break
             }
             
-            let nextPoint = CGPoint(x: halfDimension, y: relativeRect.origin.y + halfDimension)
             lineColor = (step.state?.color() ?? defaultGrey).cgColor
-            context.move(to: nextPoint)
+            context.move(to: point)
         }
     }
     
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift
index 6414609b..1770c44a 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift	
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift	
@@ -20,7 +20,7 @@ open class Step: View {
     public var stateImage = ImageView()
     
     //--------------------------------------------------
-    // MARK: - Computed Properties
+    // MARK: - Constraints
     //--------------------------------------------------
     
     public var imageBottomConstraint: NSLayoutConstraint?
@@ -77,10 +77,10 @@ open class Step: View {
     public override func reset() {
         super.reset()
         
-        headline.text = ""
-        bodyTop.text = ""
-        bodyBottom.text = ""
-        stateImage.image = nil
+        headline.reset()
+        bodyTop.reset()
+        bodyBottom.reset()
+        stateImage.reset()
         imageBottomConstraint?.constant = Padding.Ten
     }
     
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/StepModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/StepModel.swift
index 3fa25d22..f4661945 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/StepModel.swift	
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/StepModel.swift	
@@ -87,7 +87,7 @@ open class StepModel: MoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
-        try container.encodeIfPresent(headline, forKey: .headline)
+        try container.encode(headline, forKey: .headline)
         try container.encodeIfPresent(bodyTop, forKey: .bodyTop)
         try container.encodeIfPresent(bodyBottom, forKey: .bodyBottom)
     }
diff --git a/MVMCoreUI/BaseClasses/ImageView.swift b/MVMCoreUI/BaseClasses/ImageView.swift
index 66e5aacb..2acfc5ae 100644
--- a/MVMCoreUI/BaseClasses/ImageView.swift
+++ b/MVMCoreUI/BaseClasses/ImageView.swift
@@ -59,6 +59,7 @@ open class ImageView: UIImageView, MoleculeViewProtocol {
     }
     
     open func reset() {
+        image = nil
         backgroundColor = .clear
     }