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

Merge branch 'develop' into feature/kevin

Browse Source 
# Conflicts:
#	MVMCoreUI/Atoms/Buttons/CaretButton.swift
This commit is contained in:
Christiano, Kevin 2019-04-03 13:33:34 -04:00
commit 4477647658
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
MVMCoreUI/Atoms/Buttons/CaretButton.swift
View File

@ -52,7 +52,7 @@ open class CaretButton: MFCustomButton {
public func setEnabled(_ enabled: Bool) { public func setEnabled(_ enabled: Bool) {
super.isEnabled = enabled super.isEnabled = enabled
changeCaretColor() changeCaretColor()
} }
@ -109,34 +109,25 @@ open class CaretButton: MFCustomButton {
@objc open override func setAsMolecule() { @objc open override func setAsMolecule() {
backgroundColor = .clear backgroundColor = .clear
setTitleColor(enabledColor, for: .normal)
setTitleColor(disabledColor, for: .disabled)
} }
@objc override open func setWithJSON(_ json: [AnyHashable: Any]?, delegate: NSObject?, additionalData: [AnyHashable: Any]?) { @objc override open func setWithJSON(_ json: [AnyHashable: Any]?, delegate: NSObject?, additionalData: [AnyHashable: Any]?) {
setWithActionMap(json, delegate: delegate as? (MVMCoreActionDelegateProtocol & NSObjectProtocol), additionalData: additionalData)
guard let jsonDictionary = json else { return }
if let backgroundColorHex = jsonDictionary[KeyBackgroundColor] as? String { guard let dictionary = json else { return }
if let backgroundColorHex = dictionary[KeyBackgroundColor] as? String {
backgroundColor = UIColor.mfGet(forHex: backgroundColorHex) backgroundColor = UIColor.mfGet(forHex: backgroundColorHex)
} }
if let enableColorHex = jsonDictionary["enabledColor"] as? String { if let enabledColorHex = dictionary["enabledColor"] as? String {
enabledColor = UIColor.mfGet(forHex: enableColorHex) enabledColor = UIColor.mfGet(forHex: enabledColorHex)
} }
if let disabledColorHex = jsonDictionary["disabledColor"] as? String { if let disabledColorHex = dictionary["disabledColor"] as? String {
disabledColor = UIColor.mfGet(forHex: disabledColorHex) disabledColor = UIColor.mfGet(forHex: disabledColorHex)
} }
if let caretViewHeight = jsonDictionary["caretViewHeight"] as? NSNumber {
rightViewHeight = caretViewHeight
}
if let caretViewWidth = jsonDictionary["caretViewWidth"] as? NSNumber {
rightViewWidth = caretViewWidth
}
if let buttonText = jsonDictionary["buttonText"] as? String {
setTitle(buttonText, for: .normal)
}
} }
} }