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

more merge fixes

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2019-05-29 10:13:48 -04:00
parent 119a9e8c0f
commit 341aef0184
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MVMCoreUI/Molecules/Switch.swift
View File

@ -35,11 +35,11 @@ import UIKit
mvmSwitch.updateView(size) mvmSwitch.updateView(size)
} }
open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) { open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData) super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
isRequired = json?[KeyRequired] as? Bool ?? false isRequired = json?[KeyRequired] as? Bool ?? false
self.delegateObject = delegateObject self.delegateObject = delegateObject
if let delegateObject = delegateObject as? MVMCoreUIDelegateObject { if let delegateObject = delegateObject {
FormValidator.setupValidation(molecule: self, delegate: delegateObject.formValidationProtocol) FormValidator.setupValidation(molecule: self, delegate: delegateObject.formValidationProtocol)
} }
if let onColorString = json?.optionalStringForKey("onTintColor") { if let onColorString = json?.optionalStringForKey("onTintColor") {

2
MVMCoreUI/Molecules/SwitchLineItem.swift
View File

@ -45,7 +45,7 @@ import UIKit
mfTextButton.updateView(size) mfTextButton.updateView(size)
} }
open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) { open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData) super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
mvmSwitch.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData) mvmSwitch.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
label.setWithJSON(json?.optionalDictionaryForKey("label"), delegateObject: delegateObject, additionalData: additionalData) label.setWithJSON(json?.optionalDictionaryForKey("label"), delegateObject: delegateObject, additionalData: additionalData)

3
MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
View File

@ -35,8 +35,7 @@
@"caretButton": CaretButton.class, @"caretButton": CaretButton.class,
@"textField": MFTextField.class, @"textField": MFTextField.class,
@"checkbox": MVMCoreUICheckBox.class, @"checkbox": MVMCoreUICheckBox.class,
@"listItem": MoleculeTableViewCell.class @"listItem": MoleculeTableViewCell.class,
@"checkbox": MVMCoreUICheckBox.class,
@"switchLineItem": SwitchLineItem.class, @"switchLineItem": SwitchLineItem.class,
@"switch": Switch.class @"switch": Switch.class
} mutableCopy]; } mutableCopy];