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

Review comment fixes

Browse Source
This commit is contained in:
Prateek Arora 2020-02-20 13:42:17 +05:30
parent c97c3fe734
commit 8093568559
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI.xcodeproj/project.pbxproj
View File

@ -890,8 +890,8 @@
C7192E7C23C301750050C2A0 /* HeadLineBodyCaretLinkImage.swift */, C7192E7C23C301750050C2A0 /* HeadLineBodyCaretLinkImage.swift */,
D2E2A99923D8D6B4000B42E6 /* HeadlineBodyButtonModel.swift */, D2E2A99923D8D6B4000B42E6 /* HeadlineBodyButtonModel.swift */,
0A7BAD73232A8DC700FB8E22 /* HeadlineBodyButton.swift */, 0A7BAD73232A8DC700FB8E22 /* HeadlineBodyButton.swift */,
C7F8012023E8303200396FBD /* ListRVWheel.swift */,
C7F8012223E846C300396FBD /* ListRVWheelModel.swift */, C7F8012223E846C300396FBD /* ListRVWheelModel.swift */,
C7F8012023E8303200396FBD /* ListRVWheel.swift */,
); );
path = VerticalCombinationViews; path = VerticalCombinationViews;
sourceTree = "<group>"; sourceTree = "<group>";

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

@ -55,9 +55,11 @@ public class CircleProgressModel: MoleculeModelProtocol {
if let style = try typeContainer.decodeIfPresent(GraphStyle.self, forKey: .style) { if let style = try typeContainer.decodeIfPresent(GraphStyle.self, forKey: .style) {
self.style = style self.style = style
} }
updateStyle()
if let size = try typeContainer.decodeIfPresent(GraphSize.self, forKey: .size) { if let size = try typeContainer.decodeIfPresent(GraphSize.self, forKey: .size) {
self.size = size self.size = size
} }
updateSize()
if let diameter = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .diameter) { if let diameter = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .diameter) {
self.diameter = diameter self.diameter = diameter
} }
@ -74,8 +76,6 @@ 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 {

2
MVMCoreUI/Molecules/VerticalCombinationViews/ListRVWheelModel.swift
View File

@ -35,6 +35,6 @@ public class ListRVWheelModel:MoleculeModelProtocol {
try container.encode(ListRVWheelModel.identifier, forKey: .moleculeName) try container.encode(ListRVWheelModel.identifier, forKey: .moleculeName)
try container.encode(leftLabel, forKey: .leftLabel) try container.encode(leftLabel, forKey: .leftLabel)
try container.encode(rightLabel, forKey: .rightLabel) try container.encode(rightLabel, forKey: .rightLabel)
try container.encodeIfPresent(wheel, forKey: .wheel) try container.encode(wheel, forKey: .wheel)
} }
} }