Update to Swift 3 finalized syntax

Author: bcylin

Example/Example/AppDelegate.swift

@@ -31,7 +31,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
   var window: UIWindow?
 
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
     window = UIWindow(frame: UIScreen.main.bounds)
     window?.backgroundColor = UIColor.white
     window?.rootViewController = UINavigationController(rootViewController: ExampleViewController())

Example/Example/CustomizedTokenField.swift

@@ -60,7 +60,7 @@ extension ICTokenField {
     textField.font = UIFont.boldSystemFont(ofSize: 14)
 
     attributedPlaceholder = NSAttributedString(
-      string: String(self.dynamicType),
+      string: String(describing: type(of: self)),
       attributes: [
         NSForegroundColorAttributeName: UIColor.white.withAlphaComponent(0.5),
         NSFontAttributeName: UIFont.boldSystemFont(ofSize: 14)

Example/Example/CustomizedTokenViewController.swift

@@ -38,7 +38,7 @@ class CustomizedTokenViewController: UIViewController, ICTokenFieldDelegate {
     super.loadView()
     view.backgroundColor = UIColor.white
     textView.text = "[\n\n]";
-    textView.font = UIFont.preferredFont(forTextStyle: UIFontTextStyleSubheadline)
+    textView.font = UIFont.preferredFont(forTextStyle: .subheadline)
     textView.frame = view.bounds.insetBy(dx: 10, dy: 10)
     textView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
     view.addSubview(textView)
@@ -95,7 +95,7 @@ class CustomizedTokenViewController: UIViewController, ICTokenFieldDelegate {
 
   // MARK: - UIResponder Callbacks
 
-  @objc private func dismiss(_ sender: UIBarButtonItem) {
+  @objc fileprivate func dismiss(_ sender: UIBarButtonItem) {
     presentingViewController?.dismiss(animated: true, completion: nil)
   }
 

Example/Example/ExampleViewController.swift

@@ -54,7 +54,7 @@ class ExampleViewController: UITableViewController {
 
   override func loadView() {
     super.loadView()
-    tableView.register(ExampleCell.self, forCellReuseIdentifier: NSStringFromClass(ExampleCell.self))
+    tableView.register(ExampleCell.self, forCellReuseIdentifier: String(describing: ExampleCell.self))
     tableView.tableFooterView = flipButton
     tableView.tableFooterView?.isUserInteractionEnabled = true
   }
@@ -83,23 +83,24 @@ class ExampleViewController: UITableViewController {
   }
 
   override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-    let cell = tableView.dequeueReusableCell(withIdentifier: NSStringFromClass(ExampleCell.self), for: indexPath)
-    switch types[(indexPath as NSIndexPath).section] {
+    let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: ExampleCell.self), for: indexPath)
+
+    switch types[indexPath.section] {
     case let type as ICKeyboardDismissTextField.Type:
       let textField = type.init()
       textField.leftViewMode = .always
       textField.leftView = UIView(frame: CGRect(x: 0, y: 0, width: 15, height: 15))
-      textField.placeholder = String(type)
+      textField.placeholder = String(describing: type)
       (cell as? ExampleCell)?.showcase = textField
 
     case let type as CustomizedTokenField.Type:
-      cell.textLabel?.text = String(type)
+      cell.textLabel?.text = String(describing: type)
       cell.accessoryType = .disclosureIndicator
 
     case let type as ICTokenField.Type:
       let container = UIView(frame: cell.bounds)
       let tokenField = type.init()
-      tokenField.placeholder = String(type)
+      tokenField.placeholder = String(describing: type)
       tokenField.frame = container.bounds.insetBy(dx: 5, dy: 0)
       tokenField.autoresizingMask = [.flexibleWidth, .flexibleHeight]
       container.addSubview(tokenField)
@@ -114,18 +115,18 @@ class ExampleViewController: UITableViewController {
   // MARK: - UITableViewDelegate
 
   override func tableView(_ tableView: UITableView, shouldHighlightRowAt indexPath: IndexPath) -> Bool {
-    return types[(indexPath as NSIndexPath).section] == CustomizedTokenField.self
+    return types[indexPath.section] == CustomizedTokenField.self
   }
 
   override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-    if types[(indexPath as NSIndexPath).section] == CustomizedTokenField.self {
+    if types[indexPath.section] == CustomizedTokenField.self {
       present(UINavigationController(rootViewController: CustomizedTokenViewController()), animated: true, completion: nil)
     }
   }
 
   // MARK: - UIResponder Callbacks
 
-  @objc private func showStoryboard(_ sender: UIButton) {
+  @objc fileprivate func showStoryboard(_ sender: UIButton) {
     if let controller = UIStoryboard(name: "Main", bundle: Bundle.main).instantiateInitialViewController() {
       controller.modalTransitionStyle = .flipHorizontal
       present(controller, animated: true, completion: nil)

Source/KeyboardDismissTextField/ICKeyboardDismissAccessoryView.swift

@@ -40,7 +40,7 @@ public class ICKeyboardDismissAccessoryView: UIView {
   /// The button to dismiss keyboard.
   public private(set) lazy var dismissButton: UIButton = {
     let _button = UIButton()
-    let resources = Bundle(for: self.dynamicType)
+    let resources = Bundle(for: type(of: self))
     let icon = UIImage(named: "icook-iphone-button-hide-keyboard", in: resources, compatibleWith: nil)
     _button.setImage(icon, for: UIControlState())
     _button.backgroundColor = Constants.ButtonColor
@@ -86,7 +86,7 @@ public class ICKeyboardDismissAccessoryView: UIView {
 
   // MARK: - NSKeyValueCoding
 
-  public override func setValue(_ value: AnyObject?, forUndefinedKey key: String) {
+  public override func setValue(_ value: Any?, forKey key: String) {
     if let color = value as? UIColor, key == "buttonColor" {
       buttonColor = color
     }

Source/KeyboardDismissTextField/ICKeyboardDismissTextField.swift

@@ -62,7 +62,7 @@ public class ICKeyboardDismissTextField: UITextField {
     return super.becomeFirstResponder()
   }
 
-  @objc private func dismiss(_ sender: UIButton) {
+  @objc fileprivate func dismiss(_ sender: UIButton) {
     resignFirstResponder()
     UIView.animate(withDuration: 0.3) {
       self.keyboardAccessoryView.alpha = 0

Source/TokenField/ICInsetLabel.swift

@@ -42,7 +42,7 @@ class ICInsetLabel: UILabel {
     self.cornerRadius = cornerRadius
 
     switch cornerRadius {
-    case .constant(let radius) where radius > 0:
+    case let .constant(radius) where radius > 0:
       layer.cornerRadius = radius
       fallthrough
     case .dynamic:

Source/TokenField/ICTokenField.swift

@@ -245,7 +245,7 @@ public class ICTokenField: UIView, UITextFieldDelegate, ICBackspaceTextFieldDele
 
   // MARK: - NSKeyValueCoding
 
-  public override func setValue(_ value: AnyObject?, forUndefinedKey key: String) {
+  public override func setValue(_ value: Any?, forKey key: String) {
     switch value {
     case let image as UIImage? where key == "icon":
       icon = image
@@ -282,16 +282,15 @@ public class ICTokenField: UIView, UITextFieldDelegate, ICBackspaceTextFieldDele
     _ = removeHighlightedToken()  // as user starts typing when a token is focused
     inputTextField.showsCursor = true
 
-    guard
-      let input = textField.text,
-      let text: NSString = (input as NSString).replacingCharacters(in: range, with: string)
-    else {
+    guard let input = textField.text else {
       return true
     }
 
-    for delimiter in delimiters as [NSString] {
-      let index = text.length - delimiter.length
-      if 0 < index && text.substring(from: index) == delimiter {
+    let text = (input as NSString).replacingCharacters(in: range, with: string)
+
+    for delimiter in delimiters {
+      if text.hasSuffix(delimiter) {
+        let index = text.index(text.endIndex, offsetBy: -delimiter.characters.count)
         let newToken = text.substring(to: index)
         textField.text = nil
 
@@ -336,12 +335,12 @@ public class ICTokenField: UIView, UITextFieldDelegate, ICBackspaceTextFieldDele
 
   // MARK: - UIResponder Callbacks
 
-  @objc private func togglePlaceholderIfNeeded(_ sender: UITextField? = nil) {
+  @objc fileprivate func togglePlaceholderIfNeeded(_ sender: UITextField? = nil) {
     let showsPlaceholder = tokens.isEmpty && (inputTextField.text?.isEmpty ?? true)
     placeholderLabel.isHidden = !showsPlaceholder
   }
 
-  @objc private func handleTapGesture(_ sender: UITapGestureRecognizer) {
+  @objc fileprivate func handleTapGesture(_ sender: UITapGestureRecognizer) {
     if !isFirstResponder {
       inputTextField.becomeFirstResponder()
     }