From d56335d1036c3aa33ba8a7050303aeaa5ff94e3c Mon Sep 17 00:00:00 2001 From: Prateek Arora Date: Thu, 6 Feb 2020 16:59:42 +0530 Subject: [PATCH] Progress bar molecule changes --- .../LabelsWithCircleProgressBar.swift | 5 ++--- .../LabelsWithCircleProgressBarModel.swift | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBar.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBar.swift index 016403c8..f1913627 100644 --- a/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBar.swift +++ b/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBar.swift @@ -14,8 +14,7 @@ import Foundation let rightLabel = Label(frame: .zero) let leftLabelWidthConstant : CGFloat = 151.0 let rightLabelWidthConstant : CGFloat = 84.0 - let progressBarTrailingConstant : CGFloat = -92.0 - let progressBarLeadingConstant : CGFloat = 195.0 + let progressBarTrailingConstant : CGFloat = -100.0 // MARK: - MVMCoreViewProtocol open override func updateView(_ size: CGFloat) { super.updateView(size) @@ -43,7 +42,7 @@ import Foundation leftLabel.widthAnchor.constraint(lessThanOrEqualToConstant: leftLabelWidthConstant) ]) - let rightLabelTrailing = rightLabel.trailingAnchor.constraint(equalTo: container.trailingAnchor, constant:-PaddingHorizontalBetweenRelatedItems) + let rightLabelTrailing = rightLabel.trailingAnchor.constraint(equalTo: container.trailingAnchor, constant:0) NSLayoutConstraint.activate([ rightLabelTrailing, rightLabel.leadingAnchor.constraint(greaterThanOrEqualTo : progressBar.trailingAnchor), diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBarModel.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBarModel.swift index 9d4af2b6..9d7e6c02 100644 --- a/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBarModel.swift +++ b/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBarModel.swift @@ -36,6 +36,8 @@ public class LabelsWithCircleProgressBarModel:MoleculeModelProtocol { leftLabel = try typeContainer.decode(LabelModel.self, forKey: .leftLabel) rightLabel = try typeContainer.decode(LabelModel.self, forKey: .rightLabel) progressBar = try typeContainer.decode(CircleProgressModel.self, forKey: .progressBar) + progressBar.size = .small; + progressBar.style = .unlimited; }