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

default

Browse Source
This commit is contained in:
Kevin G Christiano 2020-06-19 11:17:02 -04:00
parent 572968f193
commit 77c6396034
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MVMCoreUI/Atomic/Atoms/Views/LoadingSpinner.swift
View File

@ -20,8 +20,6 @@ open class LoadingSpinner: View {
public var speed: Float = 1.5 public var speed: Float = 1.5
public var defaultDimension: CGFloat = 40
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Constraints // MARK: - Constraints
//-------------------------------------------------- //--------------------------------------------------
@ -198,7 +196,7 @@ open class LoadingSpinner: View {
strokeColor = model.strokeColor.uiColor strokeColor = model.strokeColor.uiColor
lineWidth = model.lineWidth lineWidth = model.lineWidth
pinWidthAndHeight(diameter: model.diameter ?? defaultDimension) pinWidthAndHeight(diameter: model.diameter)
} }
open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? { open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {

7
MVMCoreUI/Atomic/Atoms/Views/LoadingSpinnerModel.swift
View File

@ -18,7 +18,7 @@ open class LoadingSpinnerModel: MoleculeModelProtocol {
public static var identifier: String = "loadingSpinner" public static var identifier: String = "loadingSpinner"
public var strokeColor = Color(uiColor: .mvmBlack) public var strokeColor = Color(uiColor: .mvmBlack)
public var lineWidth: CGFloat = 3 public var lineWidth: CGFloat = 3
public var diameter: CGFloat? public var diameter: CGFloat = 40
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Keys // MARK: - Keys
@ -40,7 +40,10 @@ open class LoadingSpinnerModel: MoleculeModelProtocol {
let typeContainer = try decoder.container(keyedBy: CodingKeys.self) let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
diameter = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .diameter)
if let diameter = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .diameter) {
self.diameter = diameter
}
if let strokeColor = try typeContainer.decodeIfPresent(Color.self, forKey: .strokeColor) { if let strokeColor = try typeContainer.decodeIfPresent(Color.self, forKey: .strokeColor) {
self.strokeColor = strokeColor self.strokeColor = strokeColor