Merge pull request #39 from 3lvis/fix/importing-framework

Fix importing framework
3lvis · Oct 23, 2017 · 550997d · 550997d
2 parents 5062339 + e429656
commit 550997d
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 79 deletions.
diff --git a/Custom/Controller.swift b/Custom/Controller.swift
@@ -12,7 +12,7 @@ class Controller: UIViewController {
         textField.placeholder = "Email"
 
         var validation = Validation()
-        validation.required = true
+        validation.minimumLength = 1
         validation.format = "[\\w._%+-]+@[\\w.-]+\\.\\w{2,}"
         let inputValidator = InputValidator(validation: validation)
         textField.inputValidator = inputValidator
@@ -32,7 +32,6 @@ class Controller: UIViewController {
         var validation = Validation()
         validation.maximumLength = "1234 5678 1234 5678".characters.count
         validation.minimumLength = "1234 5678 1234 5678".characters.count
-        validation.required = true
         let characterSet = NSMutableCharacterSet.decimalDigit()
         characterSet.addCharacters(in: " ")
         validation.characterSet = characterSet as CharacterSet
@@ -53,7 +52,7 @@ class Controller: UIViewController {
         textField.placeholder = "Expiration Date (MM/YY)"
 
         var validation = Validation()
-        validation.required = true
+        validation.minimumLength = 1
         let inputValidator = CardExpirationDateInputValidator(validation: validation)
         textField.inputValidator = inputValidator
 
@@ -115,7 +114,7 @@ class Controller: UIViewController {
         view.addSubview(payButton)
     }
 
-    func payAction() {
+    @objc func payAction() {
         let validEmail = emailField.validate()
         let validCardNumber = cardNumberField.validate()
         let validCardExpirationDate = cardExpirationDateField.validate()

diff --git a/Demo.xcodeproj/project.pbxproj b/Demo.xcodeproj/project.pbxproj
diff --git a/Native/Controller.swift b/Native/Controller.swift
@@ -49,7 +49,7 @@ class Controller: UITableViewController {
         }
     }
 
-    func done() {
+    @objc func done() {
         let alertController = UIAlertController(title: "The payment details are valid", message: nil, preferredStyle: .alert)
         let dismissAction = UIAlertAction(title: "Dismiss", style: .default, handler: nil)
         alertController.addAction(dismissAction)

diff --git a/Native/Field.swift b/Native/Field.swift
@@ -25,15 +25,15 @@ struct Field {
         items.append(Field(type: .header, title: "Cardholder"))
 
         var requiredValidation = Validation()
-        requiredValidation.required = true
+        requiredValidation.minimumLength = 1
         let requiredInputValidator = InputValidator(validation: requiredValidation)
 
         let emailField: Field = {
             var field = Field(type: .field, title: "Email")
             field.inputType = .email
 
             var validation = Validation()
-            validation.required = true
+            validation.minimumLength = 1
             validation.format = "[\\w._%+-]+@[\\w.-]+\\.\\w{2,}"
             field.inputValidator = InputValidator(validation: validation)
 
@@ -59,7 +59,6 @@ struct Field {
             var validation = Validation()
             validation.minimumLength = "1234 5678 1234 5678".characters.count
             validation.maximumLength = "1234 5678 1234 5678".characters.count
-            validation.required = true
             let characterSet = NSMutableCharacterSet.decimalDigit()
             characterSet.addCharacters(in: " ")
             validation.characterSet = characterSet as CharacterSet
@@ -75,7 +74,7 @@ struct Field {
             field.formatter = CardExpirationDateFormatter()
             field.inputType = .integer
             var validation = Validation()
-            validation.required = true
+            validation.minimumLength = 1
             let inputValidator = CardExpirationDateInputValidator(validation: validation)
             field.inputValidator = inputValidator
 

diff --git a/Tests/FormatterTests/CardExpirationDateFormatterTests.swift b/Tests/FormatterTests/CardExpirationDateFormatterTests.swift
@@ -1,4 +1,5 @@
 import XCTest
+import FormTextField
 
 class CardExpirationDateFormatterTests: XCTestCase {
     func testFormatString() {

diff --git a/Tests/FormatterTests/CardNumberFormatterTests.swift b/Tests/FormatterTests/CardNumberFormatterTests.swift
@@ -1,4 +1,5 @@
 import XCTest
+import FormTextField
 
 class CardNumberFormatterTests: XCTestCase {
     func testFormatString() {

diff --git a/Tests/InputValidatorTests/CardExpirationDateInputValidatorTests.swift b/Tests/InputValidatorTests/CardExpirationDateInputValidatorTests.swift
@@ -1,5 +1,6 @@
 import XCTest
 import Foundation
+import FormTextField
 
 class CardExpirationDateInputValidatorTests: XCTestCase {
     func testCardExpirationDate() {

diff --git a/Tests/InputValidatorTests/DecimalInputValidatorTests.swift b/Tests/InputValidatorTests/DecimalInputValidatorTests.swift
@@ -1,4 +1,5 @@
 import XCTest
+import FormTextField
 
 class DecimalInputValidatorTests: XCTestCase {
     func testDecimal() {

diff --git a/Tests/InputValidatorTests/InputValidatableTests.swift b/Tests/InputValidatorTests/InputValidatableTests.swift
@@ -1,5 +1,6 @@
 import XCTest
 import Foundation
+import FormTextField
 
 class InputValidatableTests: XCTestCase {
     func testComposedStringStrings() {

diff --git a/Tests/InputValidatorTests/RequiredInputValidatorTests.swift b/Tests/InputValidatorTests/RequiredInputValidatorTests.swift
@@ -1,5 +1,6 @@
 import XCTest
 import Foundation
+import FormTextField
 
 class RequiredInputValidatorTests: XCTestCase {
     func testValidation() {

diff --git a/Tests/Tests.swift b/Tests/Tests.swift
diff --git a/Tests/ValidationTests/ValidationTests.swift b/Tests/ValidationTests/ValidationTests.swift
@@ -1,5 +1,6 @@
 import UIKit
 import XCTest
+import FormTextField
 
 class ValidationTests: XCTestCase {
     func testEmptyValidation() {