From 20778a49860ce86e74f3861ea61b5e244771ea2d Mon Sep 17 00:00:00 2001 From: Lekshmi S Date: Tue, 2 Mar 2021 17:32:58 +0530 Subject: [PATCH 1/7] Added keyboardtype in default case. --- .../Atomic/Atoms/FormFields/TextFields/TextEntryField.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift index 6ff196c7..785c986d 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift @@ -350,7 +350,9 @@ import UIKit case .phone: textField.keyboardType = .phonePad - default: break + default: + textField.keyboardType = .default + break } // Override the preset keyboard set in type. From fae969fd1f0435f07daef88f019cdb87a52bad7a Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Fri, 5 Mar 2021 11:53:13 -0500 Subject: [PATCH 2/7] validator check --- MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift index cc410404..04eeed02 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift @@ -319,12 +319,14 @@ import UIKit model.updateUIDynamicError = { [weak self] in MVMCoreDispatchUtility.performBlock(onMainThread: { guard let self = self else { return } + let validState = model.isValid ?? false - self.updateValidation(validState) if !validState && model.shouldClearText { self.text = "" model.shouldClearText = false } + _ = FormValidator.validate(delegate: self.delegateObject?.formHolderDelegate) + self.updateValidation(validState) }) } From 80d184753171af45aa3c6d7680f1906ad18e2a3c Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Mon, 8 Mar 2021 10:38:21 -0500 Subject: [PATCH 3/7] revised --- .../Atoms/FormFields/TextFields/MdnEntryField.swift | 10 ++++++++++ .../Atoms/FormFields/TextFields/TextEntryField.swift | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift index fe2c483c..db3c28c4 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift @@ -147,6 +147,16 @@ import MVMCore MVMCoreNavigationHandler.shared()?.present(picker, animated: true) } + //-------------------------------------------------- + // MARK: - MoleculeViewProtocol + //-------------------------------------------------- + + public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { + super.set(with: model, delegateObject, additionalData) + + textField.keyboardType = .phonePad + } + //-------------------------------------------------- // MARK: - Contact Picker Delegate //-------------------------------------------------- diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift index 785c986d..76b70b80 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift @@ -352,7 +352,6 @@ import UIKit default: textField.keyboardType = .default - break } // Override the preset keyboard set in type. From e18152174c749a2d14b5e9ad63ecf3d6bd1cf056 Mon Sep 17 00:00:00 2001 From: Lekshmi S Date: Tue, 9 Mar 2021 16:07:07 +0530 Subject: [PATCH 4/7] Added isSecureTextEntry as false for number keyboard type. --- .../Atomic/Atoms/FormFields/TextFields/TextEntryField.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift index 76b70b80..536e3364 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift @@ -342,6 +342,7 @@ import UIKit textField.keyboardType = .numberPad case .number: + textField.isSecureTextEntry = false textField.keyboardType = .numberPad case .email: From 3395be059224cd8cd8cbcb4bf71cdaa3cc040e75 Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Tue, 9 Mar 2021 13:17:55 -0500 Subject: [PATCH 5/7] fix --- MVMCoreUI/BaseControllers/ViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift index ecb4089a..a2d82952 100644 --- a/MVMCoreUI/BaseControllers/ViewController.swift +++ b/MVMCoreUI/BaseControllers/ViewController.swift @@ -461,7 +461,7 @@ import UIKit open func handleOpenPage(for requestParameters: MVMCoreRequestParameters, actionInformation: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?) { addFormParams(requestParameters) requestParameters.parentPageType = loadObject?.pageJSON?.optionalStringForKey("parentPageType") - MVMCoreActionHandler.defaultHandleOpenPage(for: requestParameters, additionalData: additionalData, delegateObject: delegateObject()) + MVMCoreActionHandler.defaultHandleOpenPage(for: requestParameters, actionInformation: actionInformation, additionalData: additionalData, delegateObject: delegateObject()) } open func logAction(withActionInformation actionInformation: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?) { From 4f12ad2f67a05da5b1ef7f8fe862bfefa6a5890f Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Wed, 10 Mar 2021 12:24:50 -0500 Subject: [PATCH 6/7] undo label --- MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift | 3 --- 1 file changed, 3 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift b/MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift index 511fb4dc..7e902d435 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift @@ -624,9 +624,6 @@ public typealias ActionBlock = () -> () } else if !MVMCoreGetterUtility.fequal(a: Float(standardFontSize), b: 0.0), let sizeObject = sizeObject ?? MFStyler.sizeObjectGeneric(forCurrentDevice: standardFontSize) { font = font.updateSize(sizeObject.getValueBased(onSize: size)) } - - // Provide the label additional size information to help calculate its intrinsic content. - preferredMaxLayoutWidth = Styler.maxAvailableLayoutWidth(size: size) } @objc public func setFont(_ font: UIFont, scale: Bool) { From 4a997ad801ea0d853cca5d50350f2551e9b35115 Mon Sep 17 00:00:00 2001 From: Lekshmi S Date: Thu, 11 Mar 2021 16:23:20 +0530 Subject: [PATCH 7/7] Moved isSecureTextEntry as false to reset method. --- .../Atomic/Atoms/FormFields/TextFields/TextEntryField.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift index 536e3364..3d1b1534 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift @@ -200,6 +200,7 @@ import UIKit open override func reset() { super.reset() + textField.isSecureTextEntry = false textField.font = Styler.Font.RegularBodyLarge.getFont() } @@ -342,7 +343,6 @@ import UIKit textField.keyboardType = .numberPad case .number: - textField.isSecureTextEntry = false textField.keyboardType = .numberPad case .email: