development: added border color, border width, and updated text inset merge

Sources/iOS/Material+Motion.swift

@@ -546,6 +546,8 @@ extension MotionAnimator {
             snapshotAnimations.append(Motion.position(to: to.motionPosition))
             snapshotAnimations.append(Motion.position(to: to.motionPosition))
             snapshotAnimations.append(Motion.transform(transform: to.motionTransform))
             snapshotAnimations.append(Motion.transform(transform: to.motionTransform))
             snapshotAnimations.append(Motion.background(color: to.backgroundColor ?? .clear))
             snapshotAnimations.append(Motion.background(color: to.backgroundColor ?? .clear))
+            snapshotAnimations.append(Motion.border(color: to.borderColor ?? .clear))
+            snapshotAnimations.append(Motion.border(width: to.borderWidth))
             
             
             if let path = to.layer.shadowPath {
             if let path = to.layer.shadowPath {
                 let shadowPath = Motion.shadow(path: path)
                 let shadowPath = Motion.shadow(path: path)

Sources/iOS/Material+MotionAnimation.swift

@@ -33,6 +33,8 @@ import UIKit
 public enum MotionAnimationKeyPath: String {
 public enum MotionAnimationKeyPath: String {
     case backgroundColor
     case backgroundColor
     case barTintColor
     case barTintColor
+    case borderColor
+    case borderWidth
     case cornerRadius
     case cornerRadius
     case transform
     case transform
     case rotation  = "transform.rotation"
     case rotation  = "transform.rotation"
@@ -66,6 +68,8 @@ public enum MotionAnimation {
     case custom(CABasicAnimation)
     case custom(CABasicAnimation)
     case backgroundColor(UIColor)
     case backgroundColor(UIColor)
     case barTintColor(UIColor)
     case barTintColor(UIColor)
+    case borderColor(UIColor)
+    case borderWidth(CGFloat)
     case cornerRadius(CGFloat)
     case cornerRadius(CGFloat)
     case transform(CATransform3D)
     case transform(CATransform3D)
     case rotationAngle(CGFloat)
     case rotationAngle(CGFloat)
@@ -264,6 +268,10 @@ extension CALayer {
                     a.append(Motion.background(color: color))
                     a.append(Motion.background(color: color))
                 case let .barTintColor(color):
                 case let .barTintColor(color):
                     a.append(Motion.barTint(color: color))
                     a.append(Motion.barTint(color: color))
+                case let .borderColor(color):
+                    a.append(Motion.border(color: color))
+                case let .borderWidth(width):
+                    a.append(Motion.border(width: width))
                 case let .cornerRadius(radius):
                 case let .cornerRadius(radius):
                     a.append(Motion.corner(radius: radius))
                     a.append(Motion.corner(radius: radius))
                 case let .transform(transform):
                 case let .transform(transform):
@@ -478,6 +486,28 @@ extension Motion {
     }
     }
     
     
     /**
     /**
+     Creates a CABasicAnimation for the borderColor key path.
+     - Parameter color: A UIColor.
+     - Returns: A CABasicAnimation.
+     */
+    public static func border(color: UIColor) -> CABasicAnimation {
+        let animation = CABasicAnimation(keyPath: .borderColor)
+        animation.toValue = color.cgColor
+        return animation
+    }
+    
+    /**
+     Creates a CABasicAnimation for the borderWidth key path.
+     - Parameter width: A CGFloat.
+     - Returns: A CABasicAnimation.
+     */
+    public static func border(width: CGFloat) -> CABasicAnimation {
+        let animation = CABasicAnimation(keyPath: .borderWidth)
+        animation.toValue = width
+        return animation
+    }
+    
+    /**
      Creates a CABasicAnimation for the cornerRadius key path.
      Creates a CABasicAnimation for the cornerRadius key path.
      - Parameter radius: A CGFloat.
      - Parameter radius: A CGFloat.
      - Returns: A CABasicAnimation.
      - Returns: A CABasicAnimation.

Sources/iOS/TextField.swift

@@ -387,10 +387,10 @@ open class TextField: UITextField {
         return super.becomeFirstResponder()
         return super.becomeFirstResponder()
     }
     }
     
     
+    /// EdgeInsets for text.
     open var textInset: CGFloat = 0
     open var textInset: CGFloat = 0
     
     
     open override func textRect(forBounds bounds: CGRect) -> CGRect {
     open override func textRect(forBounds bounds: CGRect) -> CGRect {
-        
         return bounds.insetBy(dx: textInset, dy: 0)
         return bounds.insetBy(dx: textInset, dy: 0)
     }
     }