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

fixes

Browse Source
This commit is contained in:
Suresh, Kamlesh 2020-01-23 14:46:32 -05:00
parent 5d23b8329f
commit 31c148de97
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Atoms/Buttons/Link.swift
View File

@ -82,7 +82,7 @@ extension Link {
// MARK: - MVMCoreUIViewConstrainingProtocol // MARK: - MVMCoreUIViewConstrainingProtocol
extension Link: MVMCoreUIViewConstrainingProtocol { extension Link: MVMCoreUIViewConstrainingProtocol {
public func alignment() -> UIStackView.Alignment { public func horizontalAlignment() -> UIStackView.Alignment {
return .leading return .leading
} }
} }

8
MVMCoreUI/Atoms/Views/LineModel.swift
View File

@ -43,7 +43,9 @@ import UIKit
public static var identifier: String = "line" public static var identifier: String = "line"
public var type: Style = .standard public var type: Style = .standard
public var frequency: Frequency? = .allExceptTop public var frequency: Frequency? = .allExceptTop
public var color: Color?
//TODO: use color insted of backgroundColor. Needs server changes
// public var color: Color?
public var backgroundColor: Color? public var backgroundColor: Color?
public init(type: Style) { public init(type: Style) {
@ -66,7 +68,7 @@ import UIKit
if let frequency = try typeContainer.decodeIfPresent(Frequency.self, forKey: .frequency) { if let frequency = try typeContainer.decodeIfPresent(Frequency.self, forKey: .frequency) {
self.frequency = frequency self.frequency = frequency
} }
color = try typeContainer.decodeIfPresent(Color.self, forKey: .color) backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
} }
public func encode(to encoder: Encoder) throws { public func encode(to encoder: Encoder) throws {
@ -74,6 +76,6 @@ import UIKit
try container.encode(moleculeName, forKey: .moleculeName) try container.encode(moleculeName, forKey: .moleculeName)
try container.encode(type, forKey: .type) try container.encode(type, forKey: .type)
try container.encodeIfPresent(frequency, forKey: .frequency) try container.encodeIfPresent(frequency, forKey: .frequency)
try container.encodeIfPresent(color, forKey: .color) try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
} }
} }

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

@ -9,7 +9,7 @@
import Foundation import Foundation
@objcMembers public class ProgressBarModel: MoleculeModelProtocol { @objcMembers public class ProgressBarModel: MoleculeModelProtocol {
public static var identifier: String = "progressbar" public static var identifier: String = "progressBar"
@Percent public var percent: CGFloat @Percent public var percent: CGFloat
public var progressColor: Color = Color(uiColor: .mfCerulean()) public var progressColor: Color = Color(uiColor: .mfCerulean())
public var backgroundColor: Color? = Color(uiColor: .mfLightSilver()) public var backgroundColor: Color? = Color(uiColor: .mfLightSilver())