diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBar.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBar.swift index a636aa05..9dba7558 100644 --- a/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBar.swift +++ b/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBar.swift @@ -51,8 +51,9 @@ import Foundation leftLabel.bottomAnchor.constraint(equalTo: container.bottomAnchor), leftLabel.widthAnchor.constraint(lessThanOrEqualToConstant: leftLabelWidthConstant) ]) - + let rightLabelTrailing = rightLabel.trailingAnchor.constraint(equalTo: container.trailingAnchor) + rightLabelTrailing.priority = .defaultHigh NSLayoutConstraint.activate([ rightLabelTrailing, rightLabel.leadingAnchor.constraint(greaterThanOrEqualTo : progressBar.trailingAnchor, constant: rightLabelLeadingAnchorConstant), @@ -60,8 +61,6 @@ import Foundation rightLabel.bottomAnchor.constraint(equalTo: container.bottomAnchor), rightLabel.widthAnchor.constraint(lessThanOrEqualToConstant: rightLabelWidthConstant) ]) - rightLabelTrailing.priority = .defaultHigh - NSLayoutConstraint.activate([ progressBar.trailingAnchor.constraint(equalTo: container.trailingAnchor, constant:progressBarTrailingConstant), progressBar.topAnchor.constraint(equalTo: container.topAnchor), diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBarModel.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBarModel.swift index 557a5364..759b47e2 100644 --- a/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBarModel.swift +++ b/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBarModel.swift @@ -12,9 +12,9 @@ public class LabelsWithCircleProgressBarModel:MoleculeModelProtocol { public var backgroundColor: Color? public static var identifier: String = "labelsWithCircleProgressBar" - public var leftLabel: LabelModel - public var rightLabel: LabelModel - public var progressBar : CircleProgressModel + public var leftLabel: LabelModel? + public var rightLabel: LabelModel? + public var progressBar : CircleProgressModel? init(leftLabel: LabelModel, rightLabel: LabelModel, progressBar: CircleProgressModel) { self.leftLabel = leftLabel @@ -32,8 +32,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; + progressBar?.size = .small; + progressBar?.style = .unlimited; } public func encode(to encoder: Encoder) throws { var container = encoder.container(keyedBy: CodingKeys.self)