Merge pull request #5 from ahmetsina/development

Removed manually added SwiftValidator files. SwiftValidatorNew pod added.

Author: sonifex

ALFormInput.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'ALFormInput'
-  s.version          = '0.1.0'
+  s.version          = '0.1.1'
   s.summary          = 'Commonly used form inputs in our projects'
 
   s.homepage         = 'https://github.com/applogistdev/ALFormInput'
@@ -22,4 +22,5 @@ Pod::Spec.new do |s|
   s.frameworks = 'UIKit'
   s.dependency 'SkyFloatingLabelTextField', '~> 3.0'
   s.dependency 'PhoneNumberKit', '~> 3.1'
+  s.dependency 'SwiftValidatorNew', '~> 4.2.0'
 end

ALFormInput/Classes/ALValidatableConfig.swift

@@ -1,5 +1,5 @@
 //
-//  File.swift
+//  ALValidatableConfig.swift
 //  
 //
 //  Created by AppLogist on 10.04.2020.

ALFormInput/Classes/ALValidatableTextField.swift

@@ -1,7 +1,15 @@
+//
+//  ALValidatableTextFieldT.swift
+//  ALFormInput
+//
+//  Created by AppLogist on 10.04.2020.
+//  Copyright © 2020 AppLogist. All rights reserved.
+//
 
 import UIKit
 import SkyFloatingLabelTextField
 import PhoneNumberKit
+import SwiftValidatorNew
 
 public class ALValidatableTextField: SkyFloatingLabelTextField {
 
@@ -246,14 +254,14 @@ extension ALValidatableTextField: UITextFieldDelegate {
 extension ALValidatableTextField {
 
     override open func textRect(forBounds bounds: CGRect) -> CGRect {
-        paddingNeeded ? bounds.inset(by: padding ?? .zero) : super.textRect(forBounds: bounds)
+        paddingNeeded ? bounds.insetBy(dx: padding?.top ?? 0, dy: padding?.bottom ?? 0) : super.textRect(forBounds: bounds)
     }
 
     override open func placeholderRect(forBounds bounds: CGRect) -> CGRect {
-        paddingNeeded ? bounds.inset(by: padding ?? .zero) : super.textRect(forBounds: bounds)
+        paddingNeeded ? bounds.insetBy(dx: padding?.top ?? 0, dy: padding?.bottom ?? 0) : super.textRect(forBounds: bounds)
     }
 
     override open func editingRect(forBounds bounds: CGRect) -> CGRect {
-        paddingNeeded ? bounds.inset(by: padding ?? .zero) : super.textRect(forBounds: bounds)
+        paddingNeeded ? bounds.insetBy(dx: padding?.top ?? 0, dy: padding?.bottom ?? 0) : super.textRect(forBounds: bounds)
     }
 }

ALFormInput/Classes/ALValidatableTextFieldType.swift

@@ -1,12 +1,13 @@
 //
 //  ALValidatableTextFieldType.swift
-//  ALTextFields
+//  ALFormInput
 //
 //  Created by AppLogist on 10.04.2020.
 //  Copyright © 2020 AppLogist. All rights reserved.
 //
 
 import UIKit
+import SwiftValidatorNew
 
 public enum ALValidatableTextFieldType: String {
     case email = "Email"
@@ -21,25 +22,39 @@ public enum ALValidatableTextFieldType: String {
     case optional
 
 
+    private var emailRule : EmailRule {
+        EmailRule(message: "Geçersiz E-Posta Adresi")
+    }
+    
+    private var requiredRule: RequiredRule {
+        RequiredRule(message: "Bu alan zorunludur")
+    }
+    
+    private func minLengthRule(_ length: Int) -> MinLengthRule {
+        MinLengthRule(length: length, message: "En %ld karakter olmalıdır")
+    }
+    
+    private func exactLengthRule(_ length: Int) -> ExactLengthRule {
+        ExactLengthRule(length: length, message: "%ld karakter olmalıdır")
+    }
+    
     public var rules : [Rule] {
         switch self {
             case .email:
-                return [RequiredRule(), EmailRule()]
+                return [requiredRule, emailRule]
             case .password:
-                return [RequiredRule(), PasswordRule()]
-            case .name:
-                return [RequiredRule(), MinLengthRule(length:3)]
-            case .surname:
-                return [RequiredRule(), MinLengthRule(length:3)]
+                return [requiredRule, PasswordRule()]
+            case .name, .surname:
+                return [requiredRule, minLengthRule(3)]
             case .phoneNumber:
-                return [RequiredRule(), CustomPhoneNumberRule()]
+                return [requiredRule, CustomPhoneNumberRule()]
             case .creditCardNumber:
-                return [RequiredRule(),
+                return [requiredRule,
                         CardNumberRule(),
                         ReplacedExactLengthRule(length: 16, willRemoveString: " ")]
             case .tcIdentityNo:
-                return [RequiredRule(),
-                        ExactLengthRule(length: 11),
+                return [requiredRule,
+                        exactLengthRule(11),
                         TCIdentityRule()]
             default:
                 return []

ALFormInput/Classes/Extensions/AL+UITextField.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 private var __maxLengths = [UITextField: Int]()
-extension UITextField {
+public extension UITextField {
     @IBInspectable var maxLength: Int {
         get {
             guard let l = __maxLengths[self] else {

ALFormInput/Classes/ValidatorRules/CardExpiryMonthRule.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2020 AppLogist. All rights reserved.
 //
 
-import Foundation
+import SwiftValidatorNew
 /**
  `CardNumberRule` is a subclass of Rule that defines how a credit card number is validated.
  */

ALFormInput/Classes/ValidatorRules/CardExpiryYearRule.swift

@@ -5,10 +5,8 @@
 //  Created by AppLogist on 13.04.2020.
 //  Copyright © 2020 AppLogist. All rights reserved.
 //
-
-import Foundation
 import PhoneNumberKit
-
+import SwiftValidatorNew
 public class CustomPhoneNumberRule: Rule {
 
 

ALFormInput/Classes/ValidatorRules/CardNumberRule.swift

@@ -5,8 +5,7 @@
 //  Copyright (c) 2014 Byron Mackay. All rights reserved.
 //
 
-import Foundation
-
+import SwiftValidatorNew
 /**
  `PhoneNumberRule` is a subclass of Rule that defines how a phone number is validated.
  */