diff --git a/MVMCoreUI/Atoms/Views/CircleProgressModel.swift b/MVMCoreUI/Atoms/Views/CircleProgressModel.swift index feb69083..e7224ca8 100644 --- a/MVMCoreUI/Atoms/Views/CircleProgressModel.swift +++ b/MVMCoreUI/Atoms/Views/CircleProgressModel.swift @@ -73,6 +73,8 @@ public class CircleProgressModel: MoleculeModelProtocol { self.colors = colors } backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) + updateSize() + updateStyle() } public func encode(to encoder: Encoder) throws { diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBarModel.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBarModel.swift index 759b47e2..e55d5199 100644 --- a/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBarModel.swift +++ b/MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBarModel.swift @@ -7,21 +7,18 @@ // import Foundation - 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? - init(leftLabel: LabelModel, rightLabel: LabelModel, progressBar: CircleProgressModel) { self.leftLabel = leftLabel self.rightLabel = rightLabel self.progressBar = progressBar } - private enum CodingKeys: String, CodingKey { + private enum CodingKeys: String,CodingKey { case moleculeName case leftLabel case rightLabel @@ -32,8 +29,6 @@ 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; } public func encode(to encoder: Encoder) throws { var container = encoder.container(keyedBy: CodingKeys.self)