From b758c0d5147cd4a87131a2107e67164a5d275f01 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Wed, 8 Jul 2020 13:10:19 -0400 Subject: [PATCH] well functioning --- .../Order Tracker/OrderTracker.swift | 7 +++++-- .../VerticalCombinationViews/Order Tracker/Step.swift | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift index 9709d1b9..9b5dcb7c 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift @@ -92,16 +92,19 @@ open class OrderTracker: View { let startPoint = CGPoint(x: imageDimension / 2, y: firstRect.size.height - 1) context.move(to: startPoint) + var lineColor = (firstStep.state?.color() ?? .mvmCoolGray3).cgColor + for step in steps.dropFirst() { - context.setStrokeColor((step.state?.color() ?? .mvmCoolGray3).cgColor) + context.setStrokeColor(lineColor) let relativeOrigin = convert(step.stateImage.frame, from: step.stateImage) - let point = CGPoint(x: imageDimension / 2, y: relativeOrigin.origin.y) + let point = CGPoint(x: imageDimension / 2, y: relativeOrigin.origin.y + 1) context.addLine(to: point) context.strokePath() let nextPoint = CGPoint(x: imageDimension / 2, y: relativeOrigin.origin.y + imageDimension) + lineColor = (step.state?.color() ?? .mvmCoolGray3).cgColor context.move(to: nextPoint) } } diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift index af11dfa7..3f6db73b 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift @@ -49,6 +49,7 @@ open class Step: View { addSubview(bodyTop) addSubview(bodyBottom) + stateImage.contentMode = .scaleToFill stateImage.topAnchor.constraint(equalTo: topAnchor).isActive = true stateImage.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true stateImage.heightAnchor.constraint(equalToConstant: 18).isActive = true