updated inputs ordering handling and added validation types handling

Author: leloupnicolas

iOSFormUtils/Form.swift

@@ -11,11 +11,30 @@ import Foundation
 // MARK: Protocols
 
 /// Delegate protocol to handle form submitting
-public protocol ValidatedFormKeyboardDelegate {
+public protocol FormDelegate {
   /**
    Triggered when the keybiard return key is touched on the last field.
    */
   func goReturnKeyTouched()
+  
+  /*
+   Returns the first input of a form
+   
+   - Parameter form: The form
+   
+   - Return: The first input.
+   */
+  func getFirstInput(form: Form) -> FormInput
+  
+  /*
+   Returns the following input of a form input
+   
+   - Parameter form: The form
+   - Parameter currentInput: The current input
+   
+   - Return: If the current input is the last one, nil. If not, the following input.
+   */
+  func getNextInput(form: Form, currentInput: FormInput) -> FormInput?
 }
 
 // MARK: Class
@@ -32,7 +51,10 @@ public class Form: UIScrollView {
   var keyboardViewHeight: CGFloat = 216
 
   /// The stored delegate
-  public var keyboardDelegate: ValidatedFormKeyboardDelegate!
+  public var formDelegate: FormDelegate!
+  
+  /// The current input which has been focused
+  private var currentInput: FormInput!
 
   /// The form inputs
   public var inputs: [FormInput] = [] {
@@ -80,6 +102,16 @@ public class Form: UIScrollView {
       name: tfReturnedNotifName,
       object: nil
     )
+    
+    NSNotificationCenter.defaultCenter().addObserver(
+      self,
+      selector: #selector(Form.textFieldBecameFirstResponder(_:)),
+      name: tfBecameFirstResponderNotifName,
+      object: nil
+    )
+    if let _ = formDelegate {
+      currentInput = formDelegate.getFirstInput(self)
+    }
   }
 
   /**
@@ -137,15 +169,15 @@ public class Form: UIScrollView {
    */
   func textFieldReturnedFired(notification: NSNotification) {
     if let textfield = notification.object as? FormInput {
-      if let index: Int = indexForInput(textfield) {
-        if isLastInput(textfield) {
-          textfield.stopEditing()
-          resetScrollingZone()
-          if let _ = keyboardDelegate {
-            keyboardDelegate.goReturnKeyTouched()
-          }
-        } else {
-          inputs[index + 1].becomeFirstResponder()
+      if isLastInput(textfield) {
+        textfield.stopEditing()
+        resetScrollingZone()
+        if let _ = formDelegate {
+          formDelegate.goReturnKeyTouched()
+        }
+      } else {
+        if let _ = formDelegate {
+          formDelegate.getNextInput(self, currentInput: currentInput)?.becomeFirstResponder()
         }
       }
     }
@@ -167,21 +199,29 @@ public class Form: UIScrollView {
   }
 
   /**
-   Checks if the given input is the last one.
+   Stores the current textfield.
 
-   - Parameter input: the input to compare
+   - Parameter notification: the received notification
    */
-  private func isLastInput(input: FormInput) -> Bool {
-    return input == inputs.last
+  func textFieldBecameFirstResponder(notification: NSNotification) {
+    if let textfield = notification.object as? FormInput {
+      currentInput = textfield
+    }
   }
 
   /**
-   Gives the index of a given input
+   Checks if the given input is the last one.
 
-   - Parameter input: the input to get the index.
+   - Parameter input: the input to compare
    */
-  private func indexForInput(input: FormInput) -> Int? {
-    return inputs.indexOf(input)
+  private func isLastInput(input: FormInput) -> Bool {
+    if let _ = formDelegate {
+      if let nextInput: FormInput = formDelegate.getNextInput(self, currentInput: currentInput) {
+        return false
+      }
+    }
+    
+    return true
   }
 }
 

iOSFormUtils/FormInput.swift

@@ -33,7 +33,7 @@ public class FormInput: UITextField {
   private var inputAccessory: UIView!
   private var validationHandler: ValidatedFormInput!
   var validationDelegate: ValidatedFormInputDelegate!
-  var validationType = ValidatedFormInputType.NoValidation
+  public var validationDataSource: ValidatedFormInputDataSource!
 
   // MARK: Superclass overrides
   override init(frame: CGRect) {

iOSFormUtils/ValidatedFormInput.swift

@@ -18,7 +18,7 @@ import Foundation
  - Phone: For french phone numbers
  - Date: For basic dd/mm/yyy format
  */
-enum ValidatedFormInputType: String {
+public enum ValidatedFormInputType: String {
   case NoValidation, NotBlank, Email, ZipCode, Phone, Date
 }
 
@@ -51,45 +51,59 @@ protocol ValidatedFormInputDelegate {
   func didExitErrorMode(input: ValidatedFormInput)
 }
 
+/// Data Source protocol for validated form
+public protocol ValidatedFormInputDataSource {
+  /**
+   Gives a validation type for an input.
+   
+   - Parameter input: The input
+   */
+  func validationTypeForInput(input: ValidatedFormInput) -> ValidatedFormInputType
+}
+
 // MARK: Extensions
 extension FormInput: ValidatedFormInput {
   public func validateFormat() -> Bool {
-    switch validationType {
-    case .NotBlank :
-      if (0 < self.text!.characters.count) {
+    if let dataSource = validationDataSource {
+      switch validationDataSource.validationTypeForInput(self) {
+      case .NotBlank :
+        if (0 < self.text!.characters.count) {
+          return true
+        }
+      case .Email :
+        let emailValidator: NSPredicate = NSPredicate(format: "SELF MATCHES %@", "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,4}")
+        if (emailValidator.evaluateWithObject(self.text)) {
+          return true;
+        }
+      case .ZipCode :
+        let zipCodeValidator: NSPredicate = NSPredicate(format: "SELF MATCHES %@", "((0[1-9])|([1-8][0-9])|(9[0-8])|(2A)|(2B))[0-9]{3}")
+        if (zipCodeValidator.evaluateWithObject(self.text)) {
+          return true;
+        }
+      case .Date :
+        let dateFormatter = NSDateFormatter()
+        dateFormatter.dateFormat = "dd/MM/YYYY"
+        if let _ = dateFormatter.dateFromString(self.text!) {
+          return true
+        }
+      case .Phone :
+        let phoneValidator: NSPredicate = NSPredicate(format: "SELF MATCHES %@", "(0[1-9]([-. ]?[0-9]{2}){4})")
+        if (phoneValidator.evaluateWithObject(self.text)) {
+          return true;
+        }
+      case .NoValidation :
         return true
-      }
-    case .Email :
-      let emailValidator: NSPredicate = NSPredicate(format: "SELF MATCHES %@", "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,4}")
-      if (emailValidator.evaluateWithObject(self.text)) {
-        return true;
-      }
-    case .ZipCode :
-      let zipCodeValidator: NSPredicate = NSPredicate(format: "SELF MATCHES %@", "((0[1-9])|([1-8][0-9])|(9[0-8])|(2A)|(2B))[0-9]{3}")
-      if (zipCodeValidator.evaluateWithObject(self.text)) {
-        return true;
-      }
-    case .Date :
-      let dateFormatter = NSDateFormatter()
-      dateFormatter.dateFormat = "dd/MM/YYYY"
-      if let _ = dateFormatter.dateFromString(self.text!) {
+      default :
         return true
       }
-    case .Phone :
-      let phoneValidator: NSPredicate = NSPredicate(format: "SELF MATCHES %@", "(0[1-9]([-. ]?[0-9]{2}){4})")
-      if (phoneValidator.evaluateWithObject(self.text)) {
-        return true;
+      
+      if let _ = validationDelegate {
+        validationDelegate.didEnterErrorMode(self, errorType: validationDataSource.validationTypeForInput(self).rawValue)
       }
-    case .NoValidation :
-      return true
-    default :
-      return true
-    }
-    
-    if let _ = validationDelegate {
-      validationDelegate.didEnterErrorMode(self, errorType: validationType.rawValue)
+      
+      return false
     }
 
-    return false
+    return true
   }
 }