From d9b23e4a58fb64399a66edbf02700b4b0d09de96 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Wed, 15 Jul 2020 19:30:35 -0400 Subject: [PATCH] constraint change --- .../Order Tracker/OrderTracker.swift | 4 +--- .../VerticalCombinationViews/Order Tracker/Step.swift | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift index 89942752..076e77fe 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift @@ -42,7 +42,6 @@ open class OrderTracker: View { guard let stepModels = stepModels else { return } var anchor = topAnchor - var previousStep: Step? for stepModel in stepModels { @@ -56,11 +55,10 @@ open class OrderTracker: View { step.topAnchor.constraint(equalTo: anchor).isActive = true anchor = step.bottomAnchor - previousStep = step } bottomAnchor.constraint(equalTo: anchor).isActive = true - previousStep?.imageBottomConstraint?.constant = 0 + (subviews.last as? Step)?.heightConstraint?.isActive = false } func resetSteps() { diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift index 181fe1f1..1d53d81a 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift @@ -23,7 +23,7 @@ open class Step: View { // MARK: - Constraints //-------------------------------------------------- - public var imageBottomConstraint: NSLayoutConstraint? + public var heightConstraint: NSLayoutConstraint? //-------------------------------------------------- // MARK: - Computed Properties @@ -71,9 +71,9 @@ open class Step: View { bodyBottomConstraint.priority = .defaultHigh bodyBottomConstraint.isActive = true - let heightConstraint = heightAnchor.constraint(equalToConstant: 58) - heightConstraint.priority = .defaultLow - heightConstraint.isActive = true + heightConstraint = heightAnchor.constraint(equalToConstant: 58) + heightConstraint?.priority = .defaultLow + heightConstraint?.isActive = true } public override func reset() { @@ -83,7 +83,7 @@ open class Step: View { bodyTop.reset() bodyBottom.reset() stateImage.reset() - imageBottomConstraint?.constant = Padding.Ten + heightConstraint?.isActive = true } //------------------------------------------------------