Finish implementing out-of-the-box fields

Author: IsaAliev

CodeInputView.xcodeproj/project.pbxproj

@@ -13,8 +13,9 @@
 		CE901F20205AF28000C688DD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CE901F1F205AF28000C688DD /* Assets.xcassets */; };
 		CE901F23205AF28000C688DD /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CE901F21205AF28000C688DD /* LaunchScreen.storyboard */; };
 		CE901F2B205AF32600C688DD /* CodeInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE901F2A205AF32600C688DD /* CodeInputView.swift */; };
-		CEBF4F4B2066881500D31600 /* CodeInputField.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEBF4F4A2066881500D31600 /* CodeInputField.swift */; };
+		CEBF4F4B2066881500D31600 /* LabelBasedInputField.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEBF4F4A2066881500D31600 /* LabelBasedInputField.swift */; };
 		CEBF4F4D2066A2AD00D31600 /* DotInputField.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEBF4F4C2066A2AD00D31600 /* DotInputField.swift */; };
+		CEBF4F4F2066EFEC00D31600 /* InputableField.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEBF4F4E2066EFEC00D31600 /* InputableField.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -26,8 +27,9 @@
 		CE901F22205AF28000C688DD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		CE901F24205AF28000C688DD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		CE901F2A205AF32600C688DD /* CodeInputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeInputView.swift; sourceTree = "<group>"; };
-		CEBF4F4A2066881500D31600 /* CodeInputField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeInputField.swift; sourceTree = "<group>"; };
+		CEBF4F4A2066881500D31600 /* LabelBasedInputField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelBasedInputField.swift; sourceTree = "<group>"; };
 		CEBF4F4C2066A2AD00D31600 /* DotInputField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DotInputField.swift; sourceTree = "<group>"; };
+		CEBF4F4E2066EFEC00D31600 /* InputableField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputableField.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -67,8 +69,9 @@
 				CE901F21205AF28000C688DD /* LaunchScreen.storyboard */,
 				CE901F24205AF28000C688DD /* Info.plist */,
 				CE901F2A205AF32600C688DD /* CodeInputView.swift */,
-				CEBF4F4A2066881500D31600 /* CodeInputField.swift */,
+				CEBF4F4A2066881500D31600 /* LabelBasedInputField.swift */,
 				CEBF4F4C2066A2AD00D31600 /* DotInputField.swift */,
+				CEBF4F4E2066EFEC00D31600 /* InputableField.swift */,
 			);
 			path = CodeInputView;
 			sourceTree = "<group>";
@@ -148,8 +151,9 @@
 				CE901F2B205AF32600C688DD /* CodeInputView.swift in Sources */,
 				CEBF4F4D2066A2AD00D31600 /* DotInputField.swift in Sources */,
 				CE901F1B205AF28000C688DD /* ViewController.swift in Sources */,
-				CEBF4F4B2066881500D31600 /* CodeInputField.swift in Sources */,
+				CEBF4F4B2066881500D31600 /* LabelBasedInputField.swift in Sources */,
 				CE901F19205AF28000C688DD /* AppDelegate.swift in Sources */,
+				CEBF4F4F2066EFEC00D31600 /* InputableField.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

CodeInputView/CodeInputField.swift

@@ -9,14 +9,7 @@
 import Foundation
 import UIKit
 
-protocol InputableField {
-    func deleteValue()
-    func setValue(_ newValue: String)
-    func getValue() -> String
-    func isEmpty() -> Bool
-}
-
-class CodeInputView<T: InputableField&UIView>: UIView, UIKeyInput {
+class CodeInputView<T: InputableField>: UIView, UIKeyInput {
     private var fields = [T]()
     private var currentIndex = 0
     var numberOfFields = 4 {
@@ -41,6 +34,8 @@ class CodeInputView<T: InputableField&UIView>: UIView, UIKeyInput {
 
     var keyboardType: UIKeyboardType = .numberPad
 
+    var onCodeDidEnter: ((String) -> ())?
+    
     private var sizeOfField: CGFloat {
         let frameWidth = frame.width
         let minBySides = min(frameWidth - horizontalMargins * 2, frame.height * 0.8)
@@ -114,6 +109,12 @@ class CodeInputView<T: InputableField&UIView>: UIView, UIKeyInput {
         })
     }
 
+    func clear() {
+        fields.forEach({ $0.deleteValue() })
+        updateCode()
+        currentIndex = 0
+    }
+    
     func insertText(_ text: String) {
         guard currentIndex < fields.count else {
             return
@@ -136,6 +137,9 @@ class CodeInputView<T: InputableField&UIView>: UIView, UIKeyInput {
 
     private func updateCode() {
         code = fields.reduce("", { $0 + $1.getValue() })
+        if code.count == numberOfFields {
+            onCodeDidEnter?(code)
+        }
     }
 }
 

CodeInputView/CodeInputView.swift

@@ -19,7 +19,7 @@ class DotInputField: UIView, InputableField {
 
     private var value: String?
     static var configuration: Configuration = Configuration()
-    
+
     var dotRect: CGRect {
         let size = DotInputField.configuration.dotSize
         return CGRect(x: (bounds.width - size) * 0.5,

CodeInputView/DotInputField.swift

@@ -0,0 +1,17 @@
+//
+//  InputableField.swift
+//  CodeInputView
+//
+//  Created by Isa Aliev on 24.03.18.
+//  Copyright © 2018 IA. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+protocol InputableField where Self: UIView {
+    func deleteValue()
+    func setValue(_ newValue: String)
+    func getValue() -> String
+    func isEmpty() -> Bool
+}

CodeInputView/InputableField.swift

@@ -0,0 +1,64 @@
+//
+//  LabelBasedInputField.swift
+//  CodeInputView
+//
+//  Created by Isa Aliev on 24.03.18.
+//  Copyright © 2018 IA. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+class LabelBasedInputField: UILabel, InputableField {
+    struct Configuration {
+        typealias AppearanceBlock = (UILabel) -> ()
+        
+        var onLayoutAppearanceBlock: AppearanceBlock?
+        var initialAppearanceBlock: AppearanceBlock?
+        var emptyAppearanceBlock: AppearanceBlock?
+        var filledAppearanceBlock: AppearanceBlock?
+    }
+
+    
+    private var value: String?
+    
+    static var configuration: LabelBasedInputField.Configuration? = LabelBasedInputField.Configuration()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        
+        LabelBasedInputField.configuration?.initialAppearanceBlock?(self)
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+    }
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        
+        LabelBasedInputField.configuration?.onLayoutAppearanceBlock?(self)
+    }
+    
+    func deleteValue() {
+        LabelBasedInputField.configuration?.initialAppearanceBlock?(self)
+        LabelBasedInputField.configuration?.emptyAppearanceBlock?(self)
+        value = ""
+        text = nil
+    }
+    
+    func setValue(_ newValue: String) {
+        LabelBasedInputField.configuration?.initialAppearanceBlock?(self)
+        LabelBasedInputField.configuration?.filledAppearanceBlock?(self)
+        value = newValue
+        text = newValue
+    }
+    
+    func getValue() -> String {
+        return value ?? ""
+    }
+    
+    func isEmpty() -> Bool {
+        return value == nil
+    }
+}

CodeInputView/LabelBasedInputField.swift

@@ -9,30 +9,33 @@
 import UIKit
 
 class ViewController: UIViewController {
-
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        CodeInputField.configuration.emptyStateBlock = { label in
-            label.backgroundColor = .gray
-            label.layer.cornerRadius = label.bounds.height / 2.0
-            label.layer.masksToBounds = true
-            label.textAlignment = .center
+        LabelBasedInputField.configuration?.initialAppearanceBlock = { field in
+            field.textAlignment = .center
+            field.backgroundColor = .white
+            field.textColor = .black
+            field.font = UIFont.systemFont(ofSize: 17.0, weight: .bold)
         }
 
-        CodeInputField.configuration.filledStateBlock = { label in
-            label.backgroundColor = .white
+        LabelBasedInputField.configuration?.onLayoutAppearanceBlock = { field in
+            field.layer.cornerRadius = field.bounds.height / 2
+            field.layer.masksToBounds = true
+            field.layer.borderWidth = 1.0
+            field.layer.borderColor = UIColor.black.cgColor
         }
 
-        
-        DotInputField.configuration.fillColor = .cyan
-        let c = CodeInputView<CodeInputField>()
-        c.frame = CGRect(x: 16.0, y: 200.0, width: 250.0, height: 100.0)
-        c.backgroundColor = .green
+        let c = CodeInputView<LabelBasedInputField>()
+        c.numberOfFields = 10
+        c.frame = CGRect(x: 0.0, y: 200.0, width: 375.0, height: 100.0)
         view.addSubview(c)
         c.becomeFirstResponder()
-                
-        // Do any additional setup after loading the view, typically from a nib.
+        
+        c.onCodeDidEnter = { code in
+            print(code)
+            c.clear()
+        }
     }
 }