From 96d533780f1e43869a008e1567342c4f26dfe230 Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Mon, 13 Jan 2020 21:25:24 -0500 Subject: [PATCH] update multi progress to match color --- MVMCoreUI/Atoms/Views/MultiProgress.swift | 2 +- MVMCoreUI/Atoms/Views/MultiProgressModel.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MultiProgress.swift b/MVMCoreUI/Atoms/Views/MultiProgress.swift index e5978c9c..38945134 100644 --- a/MVMCoreUI/Atoms/Views/MultiProgress.swift +++ b/MVMCoreUI/Atoms/Views/MultiProgress.swift @@ -30,7 +30,7 @@ import UIKit let view = UIView(frame: .zero) view.translatesAutoresizingMaskIntoConstraints = false addSubview(view) - view.backgroundColor = progressObject.color.uiColor + view.backgroundColor = progressObject.progressColor.uiColor view.widthAnchor.constraint(equalTo: widthAnchor, multiplier: progressObject.progress).isActive = true view.leadingAnchor.constraint(equalTo: previous?.trailingAnchor ?? leadingAnchor).isActive = true previous = view diff --git a/MVMCoreUI/Atoms/Views/MultiProgressModel.swift b/MVMCoreUI/Atoms/Views/MultiProgressModel.swift index b0251ff6..497fc9d5 100644 --- a/MVMCoreUI/Atoms/Views/MultiProgressModel.swift +++ b/MVMCoreUI/Atoms/Views/MultiProgressModel.swift @@ -10,11 +10,11 @@ import Foundation @objcMembers public class SingleProgressBarModel: Codable { @Percent var progress: CGFloat - var color: Color + var progressColor: Color init(_ progress: CGFloat, color: Color) { self.progress = progress - self.color = color + self.progressColor = color } }