From 9ebc7ad3a1895552dfb9f10415ba0d647ada7d9f Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Wed, 8 Jul 2020 12:04:12 -0400 Subject: [PATCH] constraining --- .../Order Tracker/OrderTracker.swift | 2 +- .../VerticalCombinationViews/Order Tracker/Step.swift | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift index 15bd4cfa..1b8e3c11 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift @@ -53,7 +53,7 @@ open class OrderTracker: View { if i == 0 { step.topAnchor.constraint(equalTo: topAnchor).isActive = true - } else if let previousStep = previousStep{ + } else if let previousStep = previousStep { step.topAnchor.constraint(equalTo: previousStep.bottomAnchor).isActive = true } diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift index de08f4a9..5a296f02 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift @@ -51,7 +51,7 @@ open class Step: View { stateImage.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true stateImage.heightAnchor.constraint(equalToConstant: 18).isActive = true stateImage.widthAnchor.constraint(equalToConstant: 18).isActive = true - bottomAnchor.constraint(greaterThanOrEqualTo: stateImage.bottomAnchor, constant: Padding.Five).isActive = true + bottomAnchor.constraint(greaterThanOrEqualTo: stateImage.bottomAnchor, constant: Padding.Ten).isActive = true headline.topAnchor.constraint(equalTo: topAnchor).isActive = true headline.leadingAnchor.constraint(equalTo: stateImage.trailingAnchor, constant: Padding.Four).isActive = true @@ -64,7 +64,9 @@ open class Step: View { bodyBottom.topAnchor.constraint(equalTo: bodyTop.bottomAnchor).isActive = true bodyBottom.leadingAnchor.constraint(equalTo: stateImage.trailingAnchor, constant: Padding.Four).isActive = true trailingAnchor.constraint(equalTo: bodyBottom.trailingAnchor).isActive = true - bottomAnchor.constraint(greaterThanOrEqualTo: bodyBottom.bottomAnchor).isActive = true + let bodyBottomConstraint = bottomAnchor.constraint(greaterThanOrEqualTo: bodyBottom.bottomAnchor) + bodyBottomConstraint.priority = .defaultHigh + bodyBottomConstraint.isActive = true } public override func reset() {