Merge pull request #13 from TouchInstinct/feature/swift4.2

Fixed for Swift4.2

.swift-version

@@ -0,0 +1 @@
+4.0

CHANGELOG.md

@@ -0,0 +1,5 @@
+# Changelog
+
+## 0.2.0
+
+- **Fix**: date setting after picker presented.

Example/UIAnimatedTextField.xcodeproj/project.pbxproj

@@ -12,7 +12,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		12D59B30305289F1A0BAB148 /* UIAnimatedTextField.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = UIAnimatedTextField.podspec; path = ../UIAnimatedTextField.podspec; sourceTree = "<group>"; };
+		12D59B30305289F1A0BAB148 /* UIAnimatedTextField.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = UIAnimatedTextField.podspec; path = ../UIAnimatedTextField.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		3023902FA98A29EAE27CE743 /* Pods_UIAnimatedTextField_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_UIAnimatedTextField_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		305D07AC233331112B594740 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
 		3EE19024E4B841DD8F1FEA61 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
@@ -110,7 +110,6 @@
 				607FACE21AFB9204008FA782 /* Frameworks */,
 				607FACE31AFB9204008FA782 /* Resources */,
 				4EB68626CEDBCD2943AF13ED /* [CP] Embed Pods Frameworks */,
-				AFE96432D6D5B8E3FF680C55 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -128,12 +127,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						LastSwiftMigration = 0820;
+						LastSwiftMigration = 0910;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
 				};
@@ -173,43 +172,34 @@
 			files = (
 			);
 			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-UIAnimatedTextField_Tests/Pods-UIAnimatedTextField_Tests-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/UIAnimatedTextField/UIAnimatedTextField.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/UIAnimatedTextField.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-UIAnimatedTextField_Tests/Pods-UIAnimatedTextField_Tests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		AFE96432D6D5B8E3FF680C55 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-UIAnimatedTextField_Tests/Pods-UIAnimatedTextField_Tests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		D458C72BE72F89E2185E2C11 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-UIAnimatedTextField_Tests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -234,14 +224,22 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -281,14 +279,22 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -326,7 +332,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -339,7 +346,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

Example/UIAnimatedTextField.xcodeproj/xcshareddata/xcschemes/UIAnimatedTextField-Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/UIAnimatedTextField.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

UIAnimatedTextField.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'UIAnimatedTextField'
-  s.version          = '0.1.13'
+  s.version          = '0.3.0'
   s.summary          = 'UITextField with animated placeholder'
   s.description      = <<-DESC
                         This custom control can be used as a replacement for UITextField. It comes with 5 different text types: simple, password, url, tappable, date.

UIAnimatedTextField/Source/EditableTextField.swift

@@ -24,9 +24,32 @@
 
 import Foundation
 
-public class EditableTextField: UITextField {
+public enum EditableActionType {
+    case selectAll
+    case select
+    case cut
+    case copy
+    case paste
 
-    var getType: (() -> TextType?)?
+    public static let allActions: [EditableActionType] = [.selectAll, .select, .cut, .paste, .copy]
+}
+
+open class EditableTextField: UITextField {
+
+    /// Actions, that will be disabled for this textField.
+    /// By default no actions are disabled.
+    open var disabledActions: [EditableActionType] = []
+
+    /// Allows to disable moving cursor for user
+    open var pinCursorToEnd: Bool = false
+
+    open var getType: (() -> TextType?)?
+
+    // MARK: - Private
+
+    private var disabledSelectors: [Selector] {
+        return disabledActions.map { selector(from: $0) }
+    }
 
     private let menuSelectors = [
         #selector(selectAll(_:)),
@@ -36,7 +59,13 @@ public class EditableTextField: UITextField {
         #selector(paste(_:))
     ]
 
-    override public func canPerformAction(_ action: Selector, withSender sender: Any?) -> Bool {
+    // MARK: - Overriden
+    
+    override open func canPerformAction(_ action: Selector, withSender sender: Any?) -> Bool {
+        if disabledSelectors.contains(action) {
+            return false
+        }
+
         guard let type = getType?() else {
             return super.canPerformAction(action, withSender: sender)
         }
@@ -50,7 +79,7 @@ public class EditableTextField: UITextField {
         return super.canPerformAction(action, withSender: sender)
     }
     
-    override public func caretRect(for position: UITextPosition) -> CGRect {
+    override open func caretRect(for position: UITextPosition) -> CGRect {
         guard let type = getType?() else {
             return super.caretRect(for: position)
         }
@@ -62,4 +91,32 @@ public class EditableTextField: UITextField {
         return super.caretRect(for: position)
     }
 
+    override open func closestPosition(to point: CGPoint) -> UITextPosition? {
+        if pinCursorToEnd {
+            return endOfDocument
+        }
+
+        return super.closestPosition(to: point)
+    }
+    
+}
+
+// MARK: - Private extensions
+
+private extension UITextField {
+
+    func selector(from actionTyoe: EditableActionType) -> Selector {
+        switch actionTyoe {
+        case .selectAll:
+            return #selector(selectAll(_:))
+        case .select:
+            return #selector(select(_:))
+        case .cut:
+            return #selector(cut(_:))
+        case .copy:
+            return #selector(copy(_:))
+        case .paste:
+            return #selector(paste(_:))
+        }
+    }
 }

UIAnimatedTextField/Source/UIAnimatedTextField.swift

@@ -194,14 +194,21 @@ open class UIAnimatedTextField: UIView {
         }
     }
 
-    public dynamic var selectedDate: Date?
+    @objc public dynamic var selectedDate: Date?
     public var dateFormat: String = Constants.defaultDateFormat
+
     public var doneTitle: String = Constants.done {
         didSet {
             textField.inputAccessoryView = getDateInputAccessoryView()
         }
     }
 
+    public var doneTitleColor: UIColor = .black {
+        didSet {
+            textField.inputAccessoryView = getDateInputAccessoryView()
+        }
+    }
+
     // MARK: - Static Properties
 
     static public let animationDuration: TimeInterval = 0.3
@@ -216,7 +223,7 @@ open class UIAnimatedTextField: UIView {
     private var state: AnimatedTextFieldState {
         var state: AnimatedTextFieldState = .placeholder
 
-        if textField.text?.characters.count ?? 0 > 0 || textField.isFirstResponder {
+        if textField.text?.count ?? 0 > 0 || textField.isFirstResponder {
             state = .text
         }
 
@@ -342,8 +349,13 @@ open class UIAnimatedTextField: UIView {
                     return
                 }
 
+                if strongSelf.isLeftTextAlignment {
                     strongSelf.placeholderLabel.transform = strongSelf.placeholderLabelTransform(state: state)
                     strongSelf.placeholderLabel.frame = strongSelf.placeholderLabelFrame(state: state)
+                } else {
+                    strongSelf.placeholderLabel.frame = strongSelf.placeholderLabelFrame(state: state)
+                    strongSelf.placeholderLabel.transform = strongSelf.placeholderLabelTransform(state: state)
+                }
 
                 switch state {
                 case .placeholder:
@@ -418,7 +430,7 @@ open class UIAnimatedTextField: UIView {
         datePicker.timeZone = TimeZone(secondsFromGMT: 0)
         datePicker.datePickerMode = .date
         datePicker.backgroundColor = UIColor.white
-        datePicker.setDate(currentDate, animated: true)
+        datePicker.setDate(selectedDate ?? currentDate, animated: true)
         datePicker.maximumDate = currentDate
         datePicker.addTarget(self, action: #selector(datePickerValueChanged(_:)), for: .valueChanged)
 
@@ -441,12 +453,12 @@ open class UIAnimatedTextField: UIView {
                                        target: self,
                                        action: #selector(datePickerDoneAction))
         let attributes = [
-            NSForegroundColorAttributeName: UIColor.black
+            NSAttributedString.Key.foregroundColor: doneTitleColor
         ]
 
         doneItem.setTitleTextAttributes(attributes, for: .normal)
 
-        toolbar.items = [spacerItem, doneItem]
+        toolbar.setItems([spacerItem, doneItem], animated: false)
 
         return toolbar
     }
@@ -484,7 +496,7 @@ extension UIAnimatedTextField: UITextFieldDelegate {
     }
 
     open func textFieldDidBeginEditing(_ textField: UITextField) {
-        if textField.text?.characters.count ?? 0 == 0 {
+        if textField.text?.count ?? 0 == 0 {
             setState(toState: .text, duration: UIAnimatedTextField.animationDuration)
         }
 
@@ -508,7 +520,7 @@ extension UIAnimatedTextField: UITextFieldDelegate {
     }
 
     open func textFieldDidEndEditing(_ textField: UITextField) {
-        if textField.text?.characters.count ?? 0 == 0 {
+        if textField.text?.count ?? 0 == 0 {
             setState(toState: .placeholder, duration: UIAnimatedTextField.animationDuration)
         }