Support for Swift 3.0-b1

Author: raulriera

TextFieldEffects/TextFieldEffects.xcodeproj/project.pbxproj

@@ -9,7 +9,7 @@
 /* Begin PBXBuildFile section */
 11E69DA71B27B1A90025D54E /* AkiraTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11E69DA61B27B1A90025D54E /* AkiraTextField.swift */; };
 4C42C7711AB20C97009BE2A0 /* TextFieldEffects.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB3B6CE1AA8DEA7000AFA56 /* TextFieldEffects.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-4C8036EB1B90A88E00218FAE /* ExampleTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8036EA1B90A88E00218FAE /* ExampleTableViewController.swift */; settings = {ASSET_TAGS = (); }; };
+4C8036EB1B90A88E00218FAE /* ExampleTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8036EA1B90A88E00218FAE /* ExampleTableViewController.swift */; };
 4CB3B6D31AA8DEA7000AFA56 /* TextFieldEffects.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CB3B6D21AA8DEA7000AFA56 /* TextFieldEffects.h */; settings = {ATTRIBUTES = (Public, ); }; };
 4CB3B6EF1AA8DEC3000AFA56 /* HoshiTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB3B6E71AA8DEC3000AFA56 /* HoshiTextField.swift */; };
 4CB3B6F01AA8DEC3000AFA56 /* IsaoTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB3B6E81AA8DEC3000AFA56 /* IsaoTextField.swift */; };
@@ -24,7 +24,7 @@
 4CBF76771A71AF7700073B6A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4CBF76751A71AF7700073B6A /* Main.storyboard */; };
 4CBF76791A71AF7700073B6A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4CBF76781A71AF7700073B6A /* Images.xcassets */; };
 4CBF767C1A71AF7700073B6A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CBF767A1A71AF7700073B6A /* LaunchScreen.xib */; };
-DF983ABB1BBD1F4100BCC4C7 /* YoshikoTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF983ABA1BBD1F4100BCC4C7 /* YoshikoTextField.swift */; settings = {ASSET_TAGS = (); }; };
+DF983ABB1BBD1F4100BCC4C7 /* YoshikoTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF983ABA1BBD1F4100BCC4C7 /* YoshikoTextField.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -222,9 +222,11 @@
 TargetAttributes = {
 4CB3B6CD1AA8DEA7000AFA56 = {
 CreatedOnToolsVersion = 6.2;
+LastSwiftMigration = 0800;
 };
 4CBF766C1A71AF7700073B6A = {
 CreatedOnToolsVersion = 6.1.1;
+LastSwiftMigration = 0800;
 };
 };
 };
@@ -343,6 +345,7 @@
 PRODUCT_NAME = "$(TARGET_NAME)";
 SKIP_INSTALL = YES;
 SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+SWIFT_VERSION = 3.0;
 };
 name = Debug;
 };
@@ -361,6 +364,7 @@
 PRODUCT_BUNDLE_IDENTIFIER = "com.raulriera.$(PRODUCT_NAME:rfc1034identifier)";
 PRODUCT_NAME = "$(TARGET_NAME)";
 SKIP_INSTALL = YES;
+SWIFT_VERSION = 3.0;
 };
 name = Release;
 };
@@ -463,6 +467,7 @@
 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 PRODUCT_BUNDLE_IDENTIFIER = "com.raulriera.$(PRODUCT_NAME:rfc1034identifier)";
 PRODUCT_NAME = "$(TARGET_NAME)";
+SWIFT_VERSION = 3.0;
 };
 name = Debug;
 };
@@ -475,6 +480,7 @@
 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 PRODUCT_BUNDLE_IDENTIFIER = "com.raulriera.$(PRODUCT_NAME:rfc1034identifier)";
 PRODUCT_NAME = "$(TARGET_NAME)";
+SWIFT_VERSION = 3.0;
 };
 name = Release;
 };

TextFieldEffects/TextFieldEffects/AkiraTextField.swift

@@ -34,7 +34,7 @@ import UIKit
 
  This property applies a color to the complete placeholder string. The default value for this property is a black color.
  */
- @IBInspectable dynamic public var placeholderColor: UIColor = .blackColor() {
+ @IBInspectable dynamic public var placeholderColor: UIColor = .black() {
  didSet {
  updatePlaceholder()
  }
@@ -65,7 +65,7 @@ import UIKit
 
  // MARK: TextFieldEffects
 
- override public func drawViewsForRect(rect: CGRect) {
+ override public func drawViewsForRect(_ rect: CGRect) {
  updateBorder()
  updatePlaceholder()
 
@@ -74,27 +74,27 @@ import UIKit
  }
 
  override public func animateViewsForTextEntry() {
- UIView.animateWithDuration(0.3, animations: {
+ UIView.animate(withDuration: 0.3, animations: {
  self.updateBorder()
  self.updatePlaceholder()
  }, completion: { _ in
- self.animationCompletionHandler?(type: .TextEntry)
+ self.animationCompletionHandler?(type: .textEntry)
  })
  }
 
  override public func animateViewsForTextDisplay() {
- UIView.animateWithDuration(0.3, animations: {
+ UIView.animate(withDuration: 0.3, animations: {
  self.updateBorder()
  self.updatePlaceholder()
  }, completion: { _ in
- self.animationCompletionHandler?(type: .TextDisplay)
+ self.animationCompletionHandler?(type: .textDisplay)
  })
  }
 
  // MARK: Private
 
  private func updatePlaceholder() {
- placeholderLabel.frame = placeholderRectForBounds(bounds)
+ placeholderLabel.frame = placeholderRect(forBounds: bounds)
  placeholderLabel.text = placeholder
  placeholderLabel.font = placeholderFontFromFont(font!)
  placeholderLabel.textColor = placeholderColor
@@ -104,10 +104,10 @@ import UIKit
  private func updateBorder() {
  borderLayer.frame = rectForBounds(bounds)
  borderLayer.borderWidth = (isFirstResponder() || text!.isNotEmpty) ? borderSize.active : borderSize.inactive
- borderLayer.borderColor = borderColor?.CGColor
+ borderLayer.borderColor = borderColor?.cgColor
  }
 
- private func placeholderFontFromFont(font: UIFont) -> UIFont! {
+ private func placeholderFontFromFont(_ font: UIFont) -> UIFont! {
  let smallerFont = UIFont(name: font.fontName, size: font.pointSize * placeholderFontScale)
  return smallerFont
  }
@@ -116,26 +116,26 @@ import UIKit
  return placeHolderInsets.y + placeholderFontFromFont(font!).lineHeight;
  }
 
- private func rectForBounds(bounds: CGRect) -> CGRect {
+ private func rectForBounds(_ bounds: CGRect) -> CGRect {
  return CGRect(x: bounds.origin.x, y: bounds.origin.y + placeholderHeight, width: bounds.size.width, height: bounds.size.height - placeholderHeight)
  }
 
  // MARK: - Overrides
 
- public override func placeholderRectForBounds(bounds: CGRect) -> CGRect {
+ public override func placeholderRect(forBounds bounds: CGRect) -> CGRect {
  if isFirstResponder() || text!.isNotEmpty {
- return CGRectMake(placeHolderInsets.x, placeHolderInsets.y, bounds.width, placeholderHeight)
+ return CGRect(x: placeHolderInsets.x, y: placeHolderInsets.y, width: bounds.width, height: placeholderHeight)
  } else {
- return textRectForBounds(bounds)
+ return textRect(forBounds: bounds)
  }
  }
 
- public override func editingRectForBounds(bounds: CGRect) -> CGRect {
- return textRectForBounds(bounds)
+ public override func editingRect(forBounds bounds: CGRect) -> CGRect {
+ return textRect(forBounds: bounds)
  }
 
- override public func textRectForBounds(bounds: CGRect) -> CGRect {
- return CGRectOffset(bounds, textFieldInsets.x, textFieldInsets.y + placeholderHeight/2)
+ override public func textRect(forBounds bounds: CGRect) -> CGRect {
+ return bounds.offsetBy(dx: textFieldInsets.x, dy: textFieldInsets.y + placeholderHeight/2)
  }
 }
 

TextFieldEffects/TextFieldEffects/HoshiTextField.swift

@@ -40,7 +40,7 @@ import UIKit
 
  This property applies a color to the complete placeholder string. The default value for this property is a black color.
  */
- @IBInspectable dynamic public var placeholderColor: UIColor = .blackColor() {
+ @IBInspectable dynamic public var placeholderColor: UIColor = .black() {
  didSet {
  updatePlaceholder()
  }
@@ -75,14 +75,14 @@ import UIKit
  private let textFieldInsets = CGPoint(x: 0, y: 12)
  private let inactiveBorderLayer = CALayer()
  private let activeBorderLayer = CALayer() 
- private var activePlaceholderPoint: CGPoint = CGPointZero
+ private var activePlaceholderPoint: CGPoint = CGPoint.zero
 
  // MARK: - TextFieldsEffects
 
- override public func drawViewsForRect(rect: CGRect) {
- let frame = CGRect(origin: CGPointZero, size: CGSize(width: rect.size.width, height: rect.size.height))
+ override public func drawViewsForRect(_ rect: CGRect) {
+ let frame = CGRect(origin: CGPoint.zero, size: CGSize(width: rect.size.width, height: rect.size.height))
 
- placeholderLabel.frame = CGRectInset(frame, placeholderInsets.x, placeholderInsets.y)
+ placeholderLabel.frame = frame.insetBy(dx: placeholderInsets.x, dy: placeholderInsets.y)
  placeholderLabel.font = placeholderFontFromFont(font!)
 
  updateBorder()
@@ -95,18 +95,18 @@ import UIKit
 
  override public func animateViewsForTextEntry() {
  if text!.isEmpty {
- UIView.animateWithDuration(0.3, delay: 0.0, usingSpringWithDamping: 0.8, initialSpringVelocity: 1.0, options: .BeginFromCurrentState, animations: ({
+ UIView.animate(withDuration: 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: { _ in
- self.animationCompletionHandler?(type: .TextEntry)
+ self.animationCompletionHandler?(type: .textEntry)
  })
  }
 
  layoutPlaceholderInTextRect()
  placeholderLabel.frame.origin = activePlaceholderPoint
 
- UIView.animateWithDuration(0.2, animations: {
+ UIView.animate(withDuration: 0.2, animations: {
  self.placeholderLabel.alpha = 0.5
  })
 
@@ -115,25 +115,25 @@ import UIKit
 
  override public func animateViewsForTextDisplay() {
  if text!.isEmpty {
- UIView.animateWithDuration(0.35, delay: 0.0, usingSpringWithDamping: 0.8, initialSpringVelocity: 2.0, options: UIViewAnimationOptions.BeginFromCurrentState, animations: ({
+ UIView.animate(withDuration: 0.35, delay: 0.0, usingSpringWithDamping: 0.8, initialSpringVelocity: 2.0, options: UIViewAnimationOptions.beginFromCurrentState, animations: ({
  self.layoutPlaceholderInTextRect()
  self.placeholderLabel.alpha = 1
  }), completion: { _ in
- self.animationCompletionHandler?(type: .TextDisplay)
+ self.animationCompletionHandler?(type: .textDisplay)
  })
 
- self.activeBorderLayer.frame = self.rectForBorder(self.borderThickness.active, isFilled: false)
+ activeBorderLayer.frame = self.rectForBorder(self.borderThickness.active, isFilled: false)
  }
  }
 
  // MARK: - Private
 
  private func updateBorder() {
  inactiveBorderLayer.frame = rectForBorder(borderThickness.inactive, isFilled: true)
- inactiveBorderLayer.backgroundColor = borderInactiveColor?.CGColor
+ inactiveBorderLayer.backgroundColor = borderInactiveColor?.cgColor
 
  activeBorderLayer.frame = rectForBorder(borderThickness.active, isFilled: false)
- activeBorderLayer.backgroundColor = borderActiveColor?.CGColor
+ activeBorderLayer.backgroundColor = borderActiveColor?.cgColor
  }
 
  private func updatePlaceholder() {
@@ -147,26 +147,26 @@ import UIKit
  }
  }
 
- private func placeholderFontFromFont(font: UIFont) -> UIFont! {
+ private func placeholderFontFromFont(_ font: UIFont) -> UIFont! {
  let smallerFont = UIFont(name: font.fontName, size: font.pointSize * placeholderFontScale)
  return smallerFont
  }
 
- private func rectForBorder(thickness: CGFloat, isFilled: Bool) -> CGRect {
+ private func rectForBorder(_ thickness: CGFloat, isFilled: Bool) -> CGRect {
  if isFilled {
- return CGRect(origin: CGPoint(x: 0, y: CGRectGetHeight(frame)-thickness), size: CGSize(width: CGRectGetWidth(frame), height: thickness))
+ return CGRect(origin: CGPoint(x: 0, y: frame.height-thickness), size: CGSize(width: frame.width, height: thickness))
  } else {
- return CGRect(origin: CGPoint(x: 0, y: CGRectGetHeight(frame)-thickness), size: CGSize(width: 0, height: thickness))
+ return CGRect(origin: CGPoint(x: 0, y: frame.height-thickness), size: CGSize(width: 0, height: thickness))
  }
  }
 
  private func layoutPlaceholderInTextRect() { 
- let textRect = textRectForBounds(bounds)
+ let textRect = self.textRect(forBounds: bounds)
  var originX = textRect.origin.x
  switch self.textAlignment {
- case .Center:
+ case .center:
  originX += textRect.size.width/2 - placeholderLabel.bounds.width/2
- case .Right:
+ case .right:
  originX += textRect.size.width - placeholderLabel.bounds.width
  default:
  break
@@ -179,12 +179,12 @@ import UIKit
 
  // MARK: - Overrides
 
- override public func editingRectForBounds(bounds: CGRect) -> CGRect {
- return CGRectOffset(bounds, textFieldInsets.x, textFieldInsets.y)
+ override public func editingRect(forBounds bounds: CGRect) -> CGRect {
+ return bounds.offsetBy(dx: textFieldInsets.x, dy: textFieldInsets.y)
  }
 
- override public func textRectForBounds(bounds: CGRect) -> CGRect {
- return CGRectOffset(bounds, textFieldInsets.x, textFieldInsets.y)
+ override public func textRect(forBounds bounds: CGRect) -> CGRect {
+ return bounds.offsetBy(dx: textFieldInsets.x, dy: textFieldInsets.y)
  }
 
-}
+}

TextFieldEffects/TextFieldEffects/IsaoTextField.swift

@@ -66,10 +66,10 @@ import UIKit
 
  // MARK: - TextFieldsEffects
 
- override public func drawViewsForRect(rect: CGRect) {
- let frame = CGRect(origin: CGPointZero, size: CGSize(width: rect.size.width, height: rect.size.height))
+ override public func drawViewsForRect(_ rect: CGRect) {
+ let frame = CGRect(origin: CGPoint.zero, size: CGSize(width: rect.size.width, height: rect.size.height))
 
- placeholderLabel.frame = CGRectInset(frame, placeholderInsets.x, placeholderInsets.y)
+ placeholderLabel.frame = frame.insetBy(dx: placeholderInsets.x, dy: placeholderInsets.y)
  placeholderLabel.font = placeholderFontFromFont(font!)
 
  updateBorder()
@@ -97,7 +97,7 @@ import UIKit
 
  private func updateBorder() {
  borderLayer.frame = rectForBorder(frame)
- borderLayer.backgroundColor = isFirstResponder() ? activeColor?.CGColor : inactiveColor?.CGColor
+ borderLayer.backgroundColor = isFirstResponder() ? activeColor?.cgColor : inactiveColor?.cgColor
  }
 
  private func updatePlaceholder() {
@@ -111,12 +111,12 @@ import UIKit
  }
  }
 
- private func placeholderFontFromFont(font: UIFont) -> UIFont! {
+ private func placeholderFontFromFont(_ font: UIFont) -> UIFont! {
  let smallerFont = UIFont(name: font.fontName, size: font.pointSize * placeholderFontScale)
  return smallerFont
  }
 
- private func rectForBorder(bounds: CGRect) -> CGRect {
+ private func rectForBorder(_ bounds: CGRect) -> CGRect {
  var newRect:CGRect
 
  if isFirstResponder() {
@@ -129,12 +129,12 @@ import UIKit
  }
 
  private func layoutPlaceholderInTextRect() {
- let textRect = textRectForBounds(bounds)
+ let textRect = self.textRect(forBounds: bounds)
  var originX = textRect.origin.x
  switch textAlignment {
- case .Center:
+ case .center:
  originX += textRect.size.width/2 - placeholderLabel.bounds.width/2
- case .Right:
+ case .right:
  originX += textRect.size.width - placeholderLabel.bounds.width
  default:
  break
@@ -143,38 +143,38 @@ import UIKit
  width: placeholderLabel.frame.size.width, height: placeholderLabel.frame.size.height)
  }
 
- private func performPlacerholderAnimationWithColor(color: UIColor) {
+ private func performPlacerholderAnimationWithColor(_ color: UIColor) {
 
  let yOffset: CGFloat = 4
 
- UIView.animateWithDuration(0.15, animations: {
- self.placeholderLabel.transform = CGAffineTransformMakeTranslation(0, -yOffset)
+ UIView.animate(withDuration: 0.15, animations: {
+ self.placeholderLabel.transform = CGAffineTransform(translationX: 0, y: -yOffset)
  self.placeholderLabel.alpha = 0
  }) { _ in
- self.placeholderLabel.transform = CGAffineTransformIdentity
- self.placeholderLabel.transform = CGAffineTransformMakeTranslation(0, yOffset)
+ self.placeholderLabel.transform = CGAffineTransform.identity
+ self.placeholderLabel.transform = CGAffineTransform(translationX: 0, y: yOffset)
 
- UIView.animateWithDuration(0.15, animations: {
+ UIView.animate(withDuration: 0.15, animations: {
  self.placeholderLabel.textColor = color
- self.placeholderLabel.transform = CGAffineTransformIdentity
+ self.placeholderLabel.transform = CGAffineTransform.identity
  self.placeholderLabel.alpha = 1
  }) { _ in
- self.animationCompletionHandler?(type: self.isFirstResponder() ? .TextEntry : .TextDisplay)
+ self.animationCompletionHandler?(type: self.isFirstResponder() ? .textEntry : .textDisplay)
  }
  }
  }
 
  // MARK: - Overrides
 
- override public func editingRectForBounds(bounds: CGRect) -> CGRect {
+ override public func editingRect(forBounds bounds: CGRect) -> CGRect {
  let newBounds = CGRect(x: 0, y: 0, width: bounds.size.width, height: bounds.size.height - font!.lineHeight + textFieldInsets.y)
- return CGRectInset(newBounds, textFieldInsets.x, 0)
+ return newBounds.insetBy(dx: textFieldInsets.x, dy: 0)
  }
 
- override public func textRectForBounds(bounds: CGRect) -> CGRect {
+ override public func textRect(forBounds bounds: CGRect) -> CGRect {
  let newBounds = CGRect(x: 0, y: 0, width: bounds.size.width, height: bounds.size.height - font!.lineHeight + textFieldInsets.y)
 
- return CGRectInset(newBounds, textFieldInsets.x, 0)
+ return newBounds.insetBy(dx: textFieldInsets.x, dy: 0)
  }
 
 }