Support for animation completion blocks

Author: raulriera

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 1.2
+ * Swift 2.2 support
+ * Support for animation completion blocks
+
 ## Version 1.1.1
  * Fixes bug #57 in Yoshiko
 

TextFieldEffects.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
  #
 
  s.name = "TextFieldEffects"
- s.version = "1.1.1"
+ s.version = "1.2"
  s.summary = "Custom drop in UITextFields effects."
 
  s.description = <<-DESC

TextFieldEffects/TextFieldEffects/AkiraTextField.swift

@@ -13,7 +13,7 @@ import UIKit
  */
 @IBDesignable public class AkiraTextField : TextFieldEffects {
 
- private let borderSize : (active: CGFloat, inactive: CGFloat) = (1, 2)
+ private let borderSize: (active: CGFloat, inactive: CGFloat) = (1, 2)
  private let borderLayer = CALayer()
  private let textFieldInsets = CGPoint(x: 6, y: 0)
  private let placeHolderInsets = CGPoint(x: 6, y: 0)
@@ -77,13 +77,17 @@ import UIKit
  UIView.animateWithDuration(0.3, animations: {
  self.updateBorder()
  self.updatePlaceholder()
+ }, completion: { _ in
+ self.animationCompletionHandler?(type: .TextEntry)
  })
  }
 
  override public func animateViewsForTextDisplay() {
  UIView.animateWithDuration(0.3, animations: {
  self.updateBorder()
  self.updatePlaceholder()
+ }, completion: { _ in
+ self.animationCompletionHandler?(type: .TextDisplay)
  })
  }
 

TextFieldEffects/TextFieldEffects/HoshiTextField.swift

@@ -98,7 +98,9 @@ import UIKit
  UIView.animateWithDuration(0.3, delay: 0.0, usingSpringWithDamping: 0.8, initialSpringVelocity: 1.0, options: .BeginFromCurrentState, animations: ({
  self.placeholderLabel.frame.origin = CGPoint(x: 10, y: self.placeholderLabel.frame.origin.y)
  self.placeholderLabel.alpha = 0
- }), completion:nil)
+ }), completion: { _ in
+ self.animationCompletionHandler?(type: .TextEntry)
+ })
  }
 
  layoutPlaceholderInTextRect()
@@ -108,15 +110,17 @@ import UIKit
  self.placeholderLabel.alpha = 0.5
  })
 
- activeBorderLayer.frame = self.rectForBorder(self.borderThickness.active, isFilled: true)
+ activeBorderLayer.frame = rectForBorder(borderThickness.active, isFilled: true)
  }
 
  override public func animateViewsForTextDisplay() {
  if text!.isEmpty {
  UIView.animateWithDuration(0.35, delay: 0.0, usingSpringWithDamping: 0.8, initialSpringVelocity: 2.0, options: UIViewAnimationOptions.BeginFromCurrentState, animations: ({
  self.layoutPlaceholderInTextRect()
  self.placeholderLabel.alpha = 1
- }), completion: nil)
+ }), completion: { _ in
+ self.animationCompletionHandler?(type: .TextDisplay)
+ })
 
  self.activeBorderLayer.frame = self.rectForBorder(self.borderThickness.active, isFilled: false)
  }

TextFieldEffects/TextFieldEffects/IsaoTextField.swift

@@ -150,15 +150,17 @@ import UIKit
  UIView.animateWithDuration(0.15, animations: {
  self.placeholderLabel.transform = CGAffineTransformMakeTranslation(0, -yOffset)
  self.placeholderLabel.alpha = 0
- }) { (completed) in
+ }) { _ in
  self.placeholderLabel.transform = CGAffineTransformIdentity
  self.placeholderLabel.transform = CGAffineTransformMakeTranslation(0, yOffset)
 
  UIView.animateWithDuration(0.15, animations: {
  self.placeholderLabel.textColor = color
  self.placeholderLabel.transform = CGAffineTransformIdentity
  self.placeholderLabel.alpha = 1
- })
+ }) { _ in
+ self.animationCompletionHandler?(type: self.isFirstResponder() ? .TextEntry : .TextDisplay)
+ }
  }
  }
 

TextFieldEffects/TextFieldEffects/JiroTextField.swift

@@ -87,15 +87,19 @@ import UIKit
  self.placeholderLabel.frame.origin = CGPoint(x: self.placeholderInsets.x, y: self.borderLayer.frame.origin.y - self.placeholderLabel.bounds.height)
  self.borderLayer.frame = self.rectForBorder(self.borderThickness, isFilled: true)
 
- }), completion:nil)
+ }), completion: { _ in
+ self.animationCompletionHandler?(type: .TextEntry)
+ })
  }
 
  override public func animateViewsForTextDisplay() {
  if text!.isEmpty {
  UIView.animateWithDuration(0.35, delay: 0.0, usingSpringWithDamping: 0.8, initialSpringVelocity: 2.0, options: .BeginFromCurrentState, animations: ({
  self.layoutPlaceholderInTextRect()
  self.placeholderLabel.alpha = 1
- }), completion: nil)
+ }), completion: { _ in
+ self.animationCompletionHandler?(type: .TextDisplay)
+ })
 
  borderLayer.frame = rectForBorder(borderThickness, isFilled: false)
  }

TextFieldEffects/TextFieldEffects/KaedeTextField.swift

@@ -90,7 +90,9 @@ import UIKit
 
  UIView.animateWithDuration(0.45, delay: 0.0, usingSpringWithDamping: 0.8, initialSpringVelocity: 1.5, options: .BeginFromCurrentState, animations: ({
  self.foregroundView.frame.origin = CGPoint(x: self.frame.size.width * 0.6, y: 0)
- }), completion: nil)
+ }), completion: { _ in
+ self.animationCompletionHandler?(type: .TextEntry)
+ })
  }
 
  override public func animateViewsForTextDisplay() {
@@ -101,7 +103,9 @@ import UIKit
 
  UIView.animateWithDuration(0.3, delay: 0.0, usingSpringWithDamping: 1.0, initialSpringVelocity: 2.0, options: .BeginFromCurrentState, animations: ({
  self.foregroundView.frame.origin = CGPointZero
- }), completion: nil)
+ }), completion: { _ in
+ self.animationCompletionHandler?(type: .TextDisplay)
+ })
  }
  }
 

TextFieldEffects/TextFieldEffects/MadokaTextField.swift

@@ -88,7 +88,9 @@ import UIKit
  let scale = CGAffineTransformMakeScale(0.9, 0.9)
 
  self.placeholderLabel.transform = CGAffineTransformConcat(translate, scale)
- })
+ }) { _ in
+ self.animationCompletionHandler?(type: .TextEntry)
+ }
  }
 
  override public func animateViewsForTextDisplay() {
@@ -97,7 +99,9 @@ import UIKit
 
  UIView.animateWithDuration(0.3, animations: {
  self.placeholderLabel.transform = CGAffineTransformIdentity
- })
+ }) { _ in
+ self.animationCompletionHandler?(type: .TextDisplay)
+ }
  }
  }
 

TextFieldEffects/TextFieldEffects/MinoruTextField.swift

@@ -85,6 +85,8 @@ import UIKit
  borderLayer.shadowColor = textColor?.CGColor
  borderLayer.shadowOpacity = 0.5
  borderLayer.shadowRadius = 1
+ 
+ animationCompletionHandler?(type: .TextEntry)
  }
 
  override public func animateViewsForTextDisplay() {
@@ -94,6 +96,8 @@ import UIKit
  borderLayer.shadowColor = nil
  borderLayer.shadowOpacity = 0
  borderLayer.shadowRadius = 0
+ 
+ animationCompletionHandler?(type: .TextDisplay)
  }
 
  // MARK: - Private

TextFieldEffects/TextFieldEffects/TextFieldsEffects.swift

@@ -22,6 +22,22 @@ A TextFieldEffects object is a control that displays editable text and contains
 */
 public class TextFieldEffects : UITextField {
 
+ /**
+ The type of animatino a TextFieldEffect can perform.
+ 
+ - TextEntry: animation that takes effect when the textfield has focus.
+ - TextDisplay: animation that takes effect when the textfield loses focus.
+ */
+ public enum AnimationType: Int {
+ case TextEntry
+ case TextDisplay
+ }
+ 
+ /**
+ Closure executed when an animation has been completed.
+ */
+ public typealias AnimationCompletionHandler = (type: AnimationType)->()
+ 
  /**
  UILabel that holds all the placeholder information
  */
@@ -41,6 +57,11 @@ public class TextFieldEffects : UITextField {
  fatalError("\(#function) must be overridden")
  }
 
+ /**
+ The animation completion handler is the best place to be notified when the text field animation has ended.
+ */
+ public var animationCompletionHandler: AnimationCompletionHandler?
+ 
  /**
  Draws the receiver’s image within the passed-in rectangle.
 
@@ -78,9 +99,9 @@ public class TextFieldEffects : UITextField {
 
  override public func willMoveToSuperview(newSuperview: UIView!) {
  if newSuperview != nil {
- NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(TextFieldEffects.textFieldDidEndEditing), name:UITextFieldTextDidEndEditingNotification, object: self)
+ NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(textFieldDidEndEditing), name: UITextFieldTextDidEndEditingNotification, object: self)
 
- NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(TextFieldEffects.textFieldDidBeginEditing), name:UITextFieldTextDidBeginEditingNotification, object: self)
+ NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(textFieldDidBeginEditing), name: UITextFieldTextDidBeginEditingNotification, object: self)
  } else {
  NSNotificationCenter.defaultCenter().removeObserver(self)
  }