Merge pull request #979 from artemisia-absynthium/development

Change TextField's visibility icon behaviour in order to match more Android EditText's one

Sources/Assets.xcassets/ic_visibility_off_white.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_visibility_off_white.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_visibility_off_white@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_visibility_off_white@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Sources/iOS/Icon.swift

@@ -95,6 +95,7 @@ public struct Icon {
     public static let starHalf = Icon.icon("ic_star_half_white")
     public static let starHalf = Icon.icon("ic_star_half_white")
     public static let videocam = Icon.icon("ic_videocam_white")
     public static let videocam = Icon.icon("ic_videocam_white")
     public static let visibility = Icon.icon("ic_visibility_white")
     public static let visibility = Icon.icon("ic_visibility_white")
+    public static let visibilityOff = Icon.icon("ic_visibility_off_white")
     public static let work = Icon.icon("ic_work_white")
     public static let work = Icon.icon("ic_work_white")
     
     
 	/// CosmicMind icons.
 	/// CosmicMind icons.

Sources/iOS/TextField.swift

@@ -350,9 +350,9 @@ open class TextField: UITextField {
                 return
                 return
             }
             }
 
 
-            visibilityIconButton = IconButton(image: Icon.visibility, tintColor: placeholderNormalColor.withAlphaComponent(isSecureTextEntry ? 0.38 : 0.54))
+            visibilityIconButton = isSecureTextEntry ? IconButton(image: Icon.visibility, tintColor: placeholderNormalColor.withAlphaComponent(0.54)) : IconButton(image: Icon.visibilityOff, tintColor: placeholderNormalColor.withAlphaComponent(0.54))
             visibilityIconButton!.contentEdgeInsetsPreset = .none
             visibilityIconButton!.contentEdgeInsetsPreset = .none
-            visibilityIconButton!.pulseAnimation = .none
+            visibilityIconButton!.pulseAnimation = .centerRadialBeyondBounds
             isSecureTextEntry = true
             isSecureTextEntry = true
             clearButtonMode = .never
             clearButtonMode = .never
             rightViewMode = .whileEditing
             rightViewMode = .whileEditing
@@ -643,12 +643,13 @@ fileprivate extension TextField {
     func handleVisibilityIconButton() {
     func handleVisibilityIconButton() {
         isSecureTextEntry = !isSecureTextEntry
         isSecureTextEntry = !isSecureTextEntry
 
 
-        if !isSecureTextEntry {
-            super.font = nil
-            font = placeholderLabel.font
-        }
-
-        visibilityIconButton?.tintColor = visibilityIconButton?.tintColor.withAlphaComponent(isSecureTextEntry ? 0.38 : 0.54)
+        UIView.transition(with: (visibilityIconButton?.imageView)!,
+                          duration: 0.3,
+                          options: .transitionCrossDissolve,
+                          animations: {
+                            self.visibilityIconButton?.image = self.isSecureTextEntry ? Icon.visibilityOff?.tint(with: self.placeholderNormalColor.withAlphaComponent(0.54)) : Icon.visibility?.tint(with: self.placeholderNormalColor.withAlphaComponent(0.54))
+        },
+                          completion: nil)
     }
     }
 }
 }