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

Merge branch 'feature/swiftified_textField' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/swiftified_textField

Browse Source
This commit is contained in:
Kevin G Christiano 2019-11-18 15:41:10 -05:00
commit 871ca090a0
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Atoms/TextFields/DateDropdownEntryField.swift
View File

@ -126,5 +126,7 @@ extension DateDropdownEntryField {
super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData) super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
guard let dictionary = json, !dictionary.isEmpty else { return } guard let dictionary = json, !dictionary.isEmpty else { return }
} }
} }

12
MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
View File

@ -306,10 +306,10 @@ import UIKit
return enabledTextFields return enabledTextFields
} }
}
//--------------------------------------------------
// MARK: - Text Field Delegate // MARK: - TextField Delegate
//-------------------------------------------------- extension DigitEntryField {
@objc public func textFieldShouldReturn(_ textField: UITextField) -> Bool { @objc public func textFieldShouldReturn(_ textField: UITextField) -> Bool {
@ -381,10 +381,6 @@ import UIKit
return uiTextFieldDelegate?.textFieldShouldClear?(textField) ?? true return uiTextFieldDelegate?.textFieldShouldClear?(textField) ?? true
} }
//--------------------------------------------------
// MARK: - Passed Along TextField delegate
//--------------------------------------------------
@objc public func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool { @objc public func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool {
return uiTextFieldDelegate?.textFieldShouldBeginEditing?(textField) ?? true return uiTextFieldDelegate?.textFieldShouldBeginEditing?(textField) ?? true

14
MVMCoreUI/Atoms/TextFields/ItemDropdownEntryField.swift
View File

@ -42,10 +42,20 @@ open class ItemDropdownEntryField: DropdownEntryField {
// MARK: - Initializer // MARK: - Initializer
//-------------------------------------------------- //--------------------------------------------------
public convenience init() {
self.init(frame: .zero)
setup()
}
public convenience init(pickerData: [String]) { public convenience init(pickerData: [String]) {
self.init(frame: .zero) self.init(frame: .zero)
self.pickerData = pickerData self.pickerData = pickerData
setup()
}
private func setup() {
pickerView = MVMCoreUICommonViewsUtility.addPicker(to: textField, delegate: self) pickerView = MVMCoreUICommonViewsUtility.addPicker(to: textField, delegate: self)
textField.hideBlinkingCaret = true textField.hideBlinkingCaret = true
uiTextFieldDelegate = self uiTextFieldDelegate = self
@ -102,6 +112,10 @@ extension ItemDropdownEntryField {
super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData) super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
guard let dictionary = json, !dictionary.isEmpty else { return } guard let dictionary = json, !dictionary.isEmpty else { return }
if let options = dictionary["options"] as? [String] {
pickerData = options
}
} }
} }