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

fill color

Browse Source
This commit is contained in:
Suresh, Kamlesh 2020-02-17 14:19:17 -05:00
parent cf4832bca7
commit 6de4fc4864
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MVMCoreUI/BaseClasses/Button.swift
View File

@ -88,13 +88,12 @@ public typealias ButtonAction = (Button) -> ()
// MARK:- ModelMoleculeViewProtocol // MARK:- ModelMoleculeViewProtocol
open func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { open func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
self.model = model self.model = model
if let backgroundColor = model?.backgroundColor {
self.backgroundColor = backgroundColor.uiColor
}
guard let model = model as? ButtonModelProtocol else { return } guard let model = model as? ButtonModelProtocol else { return }
isEnabled = model.enabled isEnabled = model.enabled
if let backgroundColor = (model as? MoleculeModelProtocol)?.backgroundColor {
self.backgroundColor = backgroundColor.uiColor
}
set(with: model.action, delegateObject: delegateObject, additionalData: additionalData) set(with: model.action, delegateObject: delegateObject, additionalData: additionalData)
} }

4
MVMCoreUI/Templates/IsaacLandingTemplate.swift
View File

@ -55,7 +55,7 @@ open class IsaacLandingTemplate: MoleculeListTemplate {
if let data = try? JSONSerialization.data(withJSONObject: buttonDict) { if let data = try? JSONSerialization.data(withJSONObject: buttonDict) {
let decoder = JSONDecoder() let decoder = JSONDecoder()
twoButtonModel.primaryButton = try? decoder.decode(ButtonModel.self, from: data) twoButtonModel.primaryButton = try? decoder.decode(ButtonModel.self, from: data)
twoButtonModel.primaryButton?.backgroundColor = Color(uiColor: UIColor.mfGet(forHex: primaryButtonBGColor)) twoButtonModel.primaryButton?.fillColor = Color(uiColor: UIColor.mfGet(forHex: primaryButtonBGColor))
twoButtonModel.primaryButton?.textColor = Color(uiColor: UIColor.mfGet(forHex: primaryButtonTextColor)) twoButtonModel.primaryButton?.textColor = Color(uiColor: UIColor.mfGet(forHex: primaryButtonTextColor))
} }
} }
@ -66,7 +66,7 @@ open class IsaacLandingTemplate: MoleculeListTemplate {
if let data = try? JSONSerialization.data(withJSONObject: buttonDict) { if let data = try? JSONSerialization.data(withJSONObject: buttonDict) {
let decoder = JSONDecoder() let decoder = JSONDecoder()
twoButtonModel.secondaryButton = try? decoder.decode(ButtonModel.self, from: data) twoButtonModel.secondaryButton = try? decoder.decode(ButtonModel.self, from: data)
twoButtonModel.secondaryButton?.backgroundColor = Color(uiColor: UIColor.mfGet(forHex: primaryButtonTextColor)) twoButtonModel.secondaryButton?.fillColor = Color(uiColor: UIColor.mfGet(forHex: primaryButtonTextColor))
twoButtonModel.secondaryButton?.textColor = Color(uiColor: UIColor.mfGet(forHex:primaryButtonBGColor)) twoButtonModel.secondaryButton?.textColor = Color(uiColor: UIColor.mfGet(forHex:primaryButtonBGColor))
} }
} }