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

Merge branch 'develop' into 'feature/develop_mvp_3'

Browse Source 
Develop

See merge request BPHV_MIPS/mvm_core_ui!832
This commit is contained in:
Pfeil, Scott Robert 2022-04-01 15:49:27 +00:00
commit aa6558a716
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift
View File

@ -249,6 +249,10 @@ import UIKit
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Methods // MARK: - Methods
//-------------------------------------------------- //--------------------------------------------------
public override func showErrorView(_ show: Bool) {
//do nothing since you should show the error view
//within a digitEntryField
}
@objc public func setAsSecureTextEntry(_ secureEntry: Bool) { @objc public func setAsSecureTextEntry(_ secureEntry: Bool) {

2
MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/ItemDropdownEntryFieldModel.swift
View File

@ -58,6 +58,6 @@
try super.encode(to: encoder) try super.encode(to: encoder)
var container = encoder.container(keyedBy: CodingKeys.self) var container = encoder.container(keyedBy: CodingKeys.self)
try container.encode(options, forKey: .options) try container.encode(options, forKey: .options)
try container.encodeIfPresent(options, forKey: .selectedIndex) try container.encodeIfPresent(selectedIndex, forKey: .selectedIndex)
} }
} }

1
MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift
View File

@ -286,6 +286,7 @@ import UIKit
entryFieldContainer.disableAllBorders = false entryFieldContainer.disableAllBorders = false
feedbackLabel.text = nil feedbackLabel.text = nil
entryFieldContainer.reset() entryFieldContainer.reset()
entryFieldModel?.updateUI = nil
} }
open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {

5
MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
View File

@ -84,7 +84,7 @@ import UIKit
textField.accessibilityValue = nil textField.accessibilityValue = nil
} }
if textField.isSecureTextEntry { if !textField.isSecureTextEntry {
showErrorView(error) showErrorView(error)
} }
@ -294,8 +294,7 @@ import UIKit
resignFirstResponder() resignFirstResponder()
} }
private func showErrorView(_ show: Bool) { open func showErrorView(_ show: Bool) {
if show { if show {
entryFieldContainer.addSubview(errorImage) entryFieldContainer.addSubview(errorImage)

2
MVMCoreUI/Managers/SubNav/SubNavManagerController.swift
View File

@ -223,7 +223,7 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol,
} }
/// Handles when the controller has committed to be changed. /// Handles when the controller has committed to be changed.
private func commitTo(controller: UIViewController) { open func commitTo(controller: UIViewController) {
guard let index = index, guard let index = index,
index != tabs.selectedIndex else { return } index != tabs.selectedIndex else { return }
viewController = controller viewController = controller