From 3dabba57df7a63da41cbf6e0e49b01fc22dd3bfa Mon Sep 17 00:00:00 2001 From: "Bruce, Matt R" Date: Mon, 21 Mar 2022 13:13:40 +0000 Subject: [PATCH 1/3] Fixed Crash on securetext in TextEntryField --- .../Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift | 4 ++++ .../Atomic/Atoms/FormFields/TextFields/TextEntryField.swift | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift index a0de9d1f..2e098ad9 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift @@ -249,6 +249,10 @@ import UIKit //-------------------------------------------------- // 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) { diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift index 89e17169..d081b717 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift @@ -84,7 +84,7 @@ import UIKit textField.accessibilityValue = nil } - if textField.isSecureTextEntry { + if !textField.isSecureTextEntry { showErrorView(error) } @@ -294,8 +294,7 @@ import UIKit resignFirstResponder() } - private func showErrorView(_ show: Bool) { - + open func showErrorView(_ show: Bool) { if show { entryFieldContainer.addSubview(errorImage) From bf70c6b15b4cae3f494e931bb97231795f4d9eeb Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Wed, 23 Mar 2022 11:29:44 -0400 Subject: [PATCH 2/3] Fixes subnav titles for legacy controllers. --- MVMCoreUI/Managers/SubNav/SubNavManagerController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift b/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift index c33d0238..ae733fa6 100644 --- a/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift +++ b/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift @@ -208,7 +208,7 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol, } /// Handles when the controller has committed to be changed. - private func commitTo(controller: UIViewController) { + open func commitTo(controller: UIViewController) { guard let index = index, index != tabs.selectedIndex else { return } viewController = controller From b498c4fb0f252167d7030e536918b65260d8e5e6 Mon Sep 17 00:00:00 2001 From: Nandhini Rajendran Date: Mon, 28 Mar 2022 20:56:24 +0530 Subject: [PATCH 3/3] Fix for entryField --- .../Item Dropdown/ItemDropdownEntryFieldModel.swift | 2 +- MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/ItemDropdownEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/ItemDropdownEntryFieldModel.swift index 02fa342e..75d2c887 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/ItemDropdownEntryFieldModel.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/ItemDropdownEntryFieldModel.swift @@ -58,6 +58,6 @@ try super.encode(to: encoder) var container = encoder.container(keyedBy: CodingKeys.self) try container.encode(options, forKey: .options) - try container.encodeIfPresent(options, forKey: .selectedIndex) + try container.encodeIfPresent(selectedIndex, forKey: .selectedIndex) } } diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift index 4b84e8a1..c583638c 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift @@ -286,6 +286,7 @@ import UIKit entryFieldContainer.disableAllBorders = false feedbackLabel.text = nil entryFieldContainer.reset() + entryFieldModel?.updateUI = nil } open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {