mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes as per Review comments

Browse Source
This commit is contained in:
Prateek Arora 2020-02-07 13:48:35 +05:30
parent 21c749489c
commit 7572bf0214
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Atoms/Views/CircleProgressModel.swift
View File

@ -73,6 +73,8 @@ public class CircleProgressModel: MoleculeModelProtocol {
self.colors = colors self.colors = colors
} }
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
updateSize()
updateStyle()
} }
public func encode(to encoder: Encoder) throws { public func encode(to encoder: Encoder) throws {

7
MVMCoreUI/Molecules/VerticalCombinationViews/LabelsWithCircleProgressBarModel.swift
View File

@ -7,21 +7,18 @@
// //
import Foundation import Foundation
public class LabelsWithCircleProgressBarModel:MoleculeModelProtocol { public class LabelsWithCircleProgressBarModel:MoleculeModelProtocol {
public var backgroundColor: Color? public var backgroundColor: Color?
public static var identifier: String = "labelsWithCircleProgressBar" public static var identifier: String = "labelsWithCircleProgressBar"
public var leftLabel: LabelModel? public var leftLabel: LabelModel?
public var rightLabel: LabelModel? public var rightLabel: LabelModel?
public var progressBar : CircleProgressModel? public var progressBar : CircleProgressModel?
init(leftLabel: LabelModel, rightLabel: LabelModel, progressBar: CircleProgressModel) { init(leftLabel: LabelModel, rightLabel: LabelModel, progressBar: CircleProgressModel) {
self.leftLabel = leftLabel self.leftLabel = leftLabel
self.rightLabel = rightLabel self.rightLabel = rightLabel
self.progressBar = progressBar self.progressBar = progressBar
} }
private enum CodingKeys: String, CodingKey { private enum CodingKeys: String,CodingKey {
case moleculeName case moleculeName
case leftLabel case leftLabel
case rightLabel case rightLabel
@ -32,8 +29,6 @@ public class LabelsWithCircleProgressBarModel:MoleculeModelProtocol {
leftLabel = try typeContainer.decode(LabelModel.self, forKey: .leftLabel) leftLabel = try typeContainer.decode(LabelModel.self, forKey: .leftLabel)
rightLabel = try typeContainer.decode(LabelModel.self, forKey: .rightLabel) rightLabel = try typeContainer.decode(LabelModel.self, forKey: .rightLabel)
progressBar = try typeContainer.decode(CircleProgressModel.self, forKey: .progressBar) progressBar = try typeContainer.decode(CircleProgressModel.self, forKey: .progressBar)
progressBar?.size = .small;
progressBar?.style = .unlimited;
} }
public func encode(to encoder: Encoder) throws { public func encode(to encoder: Encoder) throws {
var container = encoder.container(keyedBy: CodingKeys.self) var container = encoder.container(keyedBy: CodingKeys.self)