From 97cf39eaeedbad590b74eae48a0b9419787f8051 Mon Sep 17 00:00:00 2001
From: "Suresh, Kamlesh" <kamlesh.suresh@verizonwireless.com>
Date: Wed, 4 Mar 2020 15:17:45 -0500
Subject: [PATCH] textfield enhancement

---
 MVMCoreUI/Atoms/TextFields/TextEntryField.swift   | 15 ++++++---------
 MVMCoreUI/Atoms/Views/Toggle.swift                |  4 +++-
 MVMCoreUI/BaseControllers/MFViewController.m      |  4 ++--
 .../FormUIHelpers/New/Rules/RulesProtocol.swift   | 10 +++-------
 MVMCoreUI/Legacy/Views/MFTextField.m              |  3 +--
 5 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/MVMCoreUI/Atoms/TextFields/TextEntryField.swift b/MVMCoreUI/Atoms/TextFields/TextEntryField.swift
index 870d669a..49fb0953 100644
--- a/MVMCoreUI/Atoms/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/TextEntryField.swift
@@ -45,7 +45,7 @@ import UIKit
     private var observingForChange: Bool = false
     
     /// Validate on each entry in the textField. Default: false
-    public var validateEachCharacter: Bool = false
+    public var validateEachCharacter: Bool = true
     
     /// Validate when user resigns editing. Default: true
     public var validateWhenDoneEditing: Bool = true
@@ -233,18 +233,17 @@ import UIKit
     }
 
     @objc public func updateValidation(_ isValid: Bool) {
+        let previousValidity = self.isValid
         self.isValid = isValid
-        if isValid {
-            showError = false
-            observingTextFieldDelegate?.isValid?(textfield: self)
 
-        } else {
+        if previousValidity && !isValid {
             showError = true
             observingTextFieldDelegate?.isInvalid?(textfield: self)
+        } else if (!previousValidity && isValid) {
+            showError = false
+            observingTextFieldDelegate?.isValid?(textfield: self)
         }
     }
-
-
     /// Executes on UITextField.textDidBeginEditingNotification
     @objc func startEditing() {
         
@@ -254,9 +253,7 @@ import UIKit
     
     /// Executes on UITextField.textDidChangeNotification (each character entry)
     @objc func valueChanged() {
-        
         guard validateEachCharacter else { return }
-        
         validateTextField()
     }
     
diff --git a/MVMCoreUI/Atoms/Views/Toggle.swift b/MVMCoreUI/Atoms/Views/Toggle.swift
index d6082292..7e45c567 100644
--- a/MVMCoreUI/Atoms/Views/Toggle.swift
+++ b/MVMCoreUI/Atoms/Views/Toggle.swift
@@ -100,7 +100,8 @@ public typealias ActionBlockConfirmation = () -> (Bool)
                 knobView.backgroundColor = isOn ? knobTintColor?.on : knobTintColor?.off
                 self.constrainKnob()
             }
-            
+
+            (model as? ToggleModel)?.state = isOn
             FormValidator.validate(delegate: delegateObject?.formHolderDelegate)
             accessibilityValue = isOn ? MVMCoreUIUtility.hardcodedString(withKey: "AccOn") : MVMCoreUIUtility.hardcodedString(withKey: "AccOff")
             setNeedsLayout()
@@ -339,6 +340,7 @@ public typealias ActionBlockConfirmation = () -> (Bool)
             return
         }
 
+        self.model = model
         self.delegateObject = delegateObject
         let toggleModelJSON = toggleModel.toJSON()
 
diff --git a/MVMCoreUI/BaseControllers/MFViewController.m b/MVMCoreUI/BaseControllers/MFViewController.m
index d15a1b9e..fef3b860 100644
--- a/MVMCoreUI/BaseControllers/MFViewController.m
+++ b/MVMCoreUI/BaseControllers/MFViewController.m
@@ -468,7 +468,7 @@
     
     // Since we have new data, build stuff for the screen and update the ui once the screen is done laying out.
     [self newDataBuildAndUpdate];
-    
+        
     self.needToupdateUIOnScreenSizeChanges = YES;
     
     if (UIAccessibilityIsVoiceOverRunning()) {
@@ -479,12 +479,12 @@
         [self setupIntroAnimations];
     }
 
-    [self startValidation];
 }
 
 - (void)newDataBuildAndUpdate {
     [MVMCoreDispatchUtility performBlockOnMainThread:^{
         [self newDataBuildScreen];
+        [self startValidation];
         self.needToUpdateUI = YES;
         [self.view setNeedsLayout];
     }];
diff --git a/MVMCoreUI/FormUIHelpers/New/Rules/RulesProtocol.swift b/MVMCoreUI/FormUIHelpers/New/Rules/RulesProtocol.swift
index 97485d66..536bf468 100644
--- a/MVMCoreUI/FormUIHelpers/New/Rules/RulesProtocol.swift
+++ b/MVMCoreUI/FormUIHelpers/New/Rules/RulesProtocol.swift
@@ -41,13 +41,9 @@ public extension RulesProtocol {
             guard let formField = formValidator.formField(for: formKey) else {
                 continue
             }
-            valid = valid && isValid(formField)
-            if !valid {
-                setValid(formField, valid)
-                break
-            } else {
-                 setValid(formField, valid)
-            }
+            let fieldValidity = isValid(formField)
+            setValid(formField, fieldValidity)
+            valid = valid && fieldValidity
         }
         return valid
     }
diff --git a/MVMCoreUI/Legacy/Views/MFTextField.m b/MVMCoreUI/Legacy/Views/MFTextField.m
index 4ad018a4..081f9fe8 100644
--- a/MVMCoreUI/Legacy/Views/MFTextField.m
+++ b/MVMCoreUI/Legacy/Views/MFTextField.m
@@ -560,8 +560,7 @@
 - (void)setWithJSON:(NSDictionary *)json delegateObject:(MVMCoreUIDelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
     [super setWithJSON:json delegateObject:delegateObject additionalData:additionalData];
     if ([delegateObject isKindOfClass:[MVMCoreUIDelegateObject class]]) {
-        [self setWithMap:json];
-        self.mfTextFieldDelegate = delegateObject.uiTextFieldDelegate;
+        [self setWithMap:json];        
         self.uiTextFieldDelegate = delegateObject.uiTextFieldDelegate;
         [MVMCoreUICommonViewsUtility addDismissToolbar:self.textField delegate:self.uiTextFieldDelegate];
     }