Convert to Swift 3.0

Author: kitasuke

Example/PagingMenuControllerDemo.xcodeproj/project.pbxproj

@@ -422,9 +422,11 @@
 					};
 					EC7BA3F61B524BB4007FB8A5 = {
 						CreatedOnToolsVersion = 6.4;
+						LastSwiftMigration = 0800;
 					};
 					EC7BA40A1B524BB4007FB8A5 = {
 						CreatedOnToolsVersion = 6.4;
+						LastSwiftMigration = 0800;
 						TestTargetID = EC7BA3F61B524BB4007FB8A5;
 					};
 					EC96215C1C5B4F1700DA6EE6 = {
@@ -902,6 +904,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yusuke.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -916,6 +919,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yusuke.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -937,6 +941,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yusuke.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PagingMenuControllerDemo2.app/PagingMenuControllerDemo2";
 			};
 			name = Debug;
@@ -954,6 +959,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yusuke.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PagingMenuControllerDemo2.app/PagingMenuControllerDemo2";
 			};
 			name = Release;

Example/PagingMenuControllerDemo2/AppDelegate.swift

@@ -13,10 +13,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: Any]?) -> Bool {
         // Override point for customization after application launch.
 
-        window = UIWindow(frame: UIScreen.mainScreen().bounds)
+        window = UIWindow(frame: UIScreen.main.bounds)
         let viewController = RootViewControoler()
         let navigationController = UINavigationController(rootViewController: viewController)
         window?.rootViewController = navigationController
@@ -25,25 +25,25 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         return true
     }
 
-    func applicationWillResignActive(application: UIApplication) {
+    func applicationWillResignActive(_ application: UIApplication) {
         // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
         // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
     }
 
-    func applicationDidEnterBackground(application: UIApplication) {
+    func applicationDidEnterBackground(_ application: UIApplication) {
         // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
         // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
     }
 
-    func applicationWillEnterForeground(application: UIApplication) {
+    func applicationWillEnterForeground(_ application: UIApplication) {
         // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
     }
 
-    func applicationDidBecomeActive(application: UIApplication) {
+    func applicationDidBecomeActive(_ application: UIApplication) {
         // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
     }
 
-    func applicationWillTerminate(application: UIApplication) {
+    func applicationWillTerminate(_ application: UIApplication) {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
 

Example/PagingMenuControllerDemo2/RootViewControoler.swift

@@ -10,17 +10,17 @@ import UIKit
 import PagingMenuController
 
 private struct PagingMenuOptions: PagingMenuControllerCustomizable {
-    private var componentType: ComponentType {
+    fileprivate var componentType: ComponentType {
         return .All(menuOptions: MenuOptions(), pagingControllers: pagingControllers)
     }
 
-    private var pagingControllers: [UIViewController] {
+    fileprivate var pagingControllers: [UIViewController] {
         let viewController1 = ViewController1()
         let viewController2 = ViewController2()
         return [viewController1, viewController2]
     }
 
-    private struct MenuOptions: MenuViewCustomizable {
+    fileprivate struct MenuOptions: MenuViewCustomizable {
         var displayMode: MenuDisplayMode {
             return .SegmentedControl
         }
@@ -29,12 +29,12 @@ private struct PagingMenuOptions: PagingMenuControllerCustomizable {
         }
     }
 
-    private struct MenuItem1: MenuItemViewCustomizable {
+    fileprivate struct MenuItem1: MenuItemViewCustomizable {
         var displayMode: MenuItemDisplayMode {
             return .Text(title: MenuItemText(text: "First Menu"))
         }
     }
-    private struct MenuItem2: MenuItemViewCustomizable {
+    fileprivate struct MenuItem2: MenuItemViewCustomizable {
         var displayMode: MenuItemDisplayMode {
             return .Text(title: MenuItemText(text: "Second Menu"))
         }
@@ -45,7 +45,7 @@ class RootViewControoler: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         // Do any additional setup after loading the view, typically from a nib.
-        view.backgroundColor = UIColor.whiteColor()
+        view.backgroundColor = UIColor.white
 
         let options = PagingMenuOptions()
         let pagingMenuController = PagingMenuController(options: options)
@@ -56,4 +56,4 @@ class RootViewControoler: UIViewController {
         view.addSubview(pagingMenuController.view)
         pagingMenuController.didMoveToParentViewController(self)
     }
-}
+}

Example/PagingMenuControllerDemo2/ViewController1.swift

@@ -13,13 +13,13 @@ class ViewController1: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        view.backgroundColor = UIColor.lightGrayColor()
+        view.backgroundColor = UIColor.lightGray
 
-        let textLabel = UILabel(frame: CGRectMake(0, 0, 200, 30))
+        let textLabel = UILabel(frame: CGRect(x: 0, y: 0, width: 200, height: 30))
         textLabel.center = view.center
-        textLabel.textAlignment = .Center
-        textLabel.font = UIFont.systemFontOfSize(24)
+        textLabel.textAlignment = .center
+        textLabel.font = UIFont.systemFont(ofSize: 24)
         textLabel.text = "View Controller 1"
         view.addSubview(textLabel)
     }
-}
+}

Example/PagingMenuControllerDemo2/ViewController2.swift

@@ -13,12 +13,12 @@ class ViewController2: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        view.backgroundColor = UIColor.lightGrayColor()
+        view.backgroundColor = UIColor.lightGray
 
-        let textLabel = UILabel(frame: CGRectMake(0, 0, 200, 30))
+        let textLabel = UILabel(frame: CGRect(x: 0, y: 0, width: 200, height: 30))
         textLabel.center = view.center
-        textLabel.textAlignment = .Center
-        textLabel.font = UIFont.systemFontOfSize(24)
+        textLabel.textAlignment = .center
+        textLabel.font = UIFont.systemFont(ofSize: 24)
         textLabel.text = "View Controller 2"
         view.addSubview(textLabel)
     }

Example/PagingMenuControllerDemo2Tests/PagingMenuControllerDemo2Tests.swift

@@ -28,7 +28,7 @@ class PagingMenuControllerDemo2Tests: XCTestCase {
 
     func testPerformanceExample() {
         // This is an example of a performance test case.
-        self.measureBlock() {
+        self.measure() {
             // Put the code you want to measure the time of here.
         }
     }

Pod/Classes/MenuItemView.swift

@@ -8,25 +8,25 @@
 
 import UIKit
 
-public class MenuItemView: UIView {
-    lazy public var titleLabel: UILabel = self.initLabel()
-    lazy public var descriptionLabel: UILabel = self.initLabel()
-    lazy public var menuImageView: UIImageView = {
+open class MenuItemView: UIView {
+    lazy open var titleLabel: UILabel = self.initLabel()
+    lazy open var descriptionLabel: UILabel = self.initLabel()
+    lazy open var menuImageView: UIImageView = {
         $0.isUserInteractionEnabled = true
         $0.translatesAutoresizingMaskIntoConstraints = false
         return $0
     }(UIImageView(frame: .zero))
-    public private(set) var customView: UIView? {
+    open fileprivate(set) var customView: UIView? {
         didSet {
             guard let customView = customView else { return }
 
             addSubview(customView)
         }
     }
-    public internal(set) var selected: Bool = false {
+    open internal(set) var selected: Bool = false {
         didSet {
             if case .roundRect = menuOptions.focusMode {
-                backgroundColor = UIColor.clear()
+                backgroundColor = UIColor.clear
             } else {
                 backgroundColor = selected ? menuOptions.selectedBackgroundColor : menuOptions.backgroundColor
             }
@@ -51,18 +51,18 @@ public class MenuItemView: UIView {
             }
         }
     }
-    lazy public private(set) var dividerImageView: UIImageView? = { [unowned self] in
+    lazy open fileprivate(set) var dividerImageView: UIImageView? = { [unowned self] in
         guard let image = self.menuOptions.dividerImage else { return nil }
         let imageView = UIImageView(image: image)
         imageView.translatesAutoresizingMaskIntoConstraints = false
         return imageView
     }()
 
-    private var menuOptions: MenuViewCustomizable!
-    private var menuItemOptions: MenuItemViewCustomizable!
-    private var widthConstraint: NSLayoutConstraint!
-    private var descriptionWidthConstraint: NSLayoutConstraint!
-    private var horizontalMargin: CGFloat {
+    fileprivate var menuOptions: MenuViewCustomizable!
+    fileprivate var menuItemOptions: MenuItemViewCustomizable!
+    fileprivate var widthConstraint: NSLayoutConstraint!
+    fileprivate var descriptionWidthConstraint: NSLayoutConstraint!
+    fileprivate var horizontalMargin: CGFloat {
         switch menuOptions.displayMode {
         case .segmentedControl: return 0.0
         default: return menuItemOptions.horizontalMargin
@@ -101,15 +101,15 @@ public class MenuItemView: UIView {
         }
     }
 
-    private func commonInit(_ setupContentView: () -> Void) {
+    fileprivate func commonInit(_ setupContentView: () -> Void) {
         setupView()
         setupContentView()
 
         setupDivider()
         layoutDivider()
     }
 
-    private func initLabel() -> UILabel {
+    fileprivate func initLabel() -> UILabel {
         let label = UILabel(frame: .zero)
         label.numberOfLines = 1
         label.textAlignment = .center
@@ -142,51 +142,51 @@ public class MenuItemView: UIView {
 
     // MARK: - Constructor
 
-    private func setupView() {
+    fileprivate func setupView() {
         if case .roundRect = menuOptions.focusMode {
-            backgroundColor = UIColor.clear()
+            backgroundColor = UIColor.clear
         } else {
             backgroundColor = menuOptions.backgroundColor
         }
         translatesAutoresizingMaskIntoConstraints = false
     }
 
-    private func setupTitleLabel(_ text: MenuItemText) {
+    fileprivate func setupTitleLabel(_ text: MenuItemText) {
         setupLabel(titleLabel, text: text)
     }
 
-    private func setupMultilineLabel(_ text: MenuItemText, description: MenuItemText) {
+    fileprivate func setupMultilineLabel(_ text: MenuItemText, description: MenuItemText) {
         setupLabel(titleLabel, text: text)
         setupLabel(descriptionLabel, text: description)
     }
 
-    private func setupLabel(_ label: UILabel, text: MenuItemText) {
+    fileprivate func setupLabel(_ label: UILabel, text: MenuItemText) {
         label.text = text.text
         updateLabel(label, text: text)
         addSubview(label)
     }
 
-    private func updateLabel(_ label: UILabel, text: MenuItemText) {
+    fileprivate func updateLabel(_ label: UILabel, text: MenuItemText) {
         label.textColor = selected ? text.selectedColor : text.color
         label.font = selected ? text.selectedFont : text.font
     }
 
-    private func setupImageView(_ image: UIImage) {
+    fileprivate func setupImageView(_ image: UIImage) {
         menuImageView.image = image
         addSubview(menuImageView)
     }
 
-    private func setupCustomView(_ view: UIView) {
+    fileprivate func setupCustomView(_ view: UIView) {
         customView = view
     }
 
-    private func setupDivider() {
+    fileprivate func setupDivider() {
         guard let dividerImageView = dividerImageView else { return }
 
         addSubview(dividerImageView)
     }
 
-    private func layoutMultiLineLabel() {
+    fileprivate func layoutMultiLineLabel() {
         let titleLabelSize = calculateLabelSize(titleLabel, maxWidth: maxWindowSize)
         let descriptionLabelSize = calculateLabelSize(descriptionLabel, maxWidth: maxWindowSize)
         let verticalMargin = max(menuOptions.height - (titleLabelSize.height + descriptionLabelSize.height), 0) / 2
@@ -202,7 +202,7 @@ public class MenuItemView: UIView {
         NSLayoutConstraint.activate(horizontalConstraints + verticalConstraints + descriptionHorizontalConstraints + [widthConstraint, descriptionWidthConstraint])
     }
 
-    private func layoutLabel() {
+    fileprivate func layoutLabel() {
         let viewsDictionary = ["label": titleLabel]
         let labelSize = calculateLabelSize(titleLabel, maxWidth: maxWindowSize)
 
@@ -214,13 +214,13 @@ public class MenuItemView: UIView {
 
     }
 
-    private func layoutImageView() {
+    fileprivate func layoutImageView() {
         guard let image = menuImageView.image else { return }
 
         let width: CGFloat
         switch menuOptions.displayMode {
         case .segmentedControl:
-            width = UIApplication.shared().keyWindow!.bounds.size.width / CGFloat(menuOptions.itemsOptions.count)
+            width = UIApplication.shared.keyWindow!.bounds.size.width / CGFloat(menuOptions.itemsOptions.count)
         default:
             width = image.size.width + horizontalMargin * 2
         }
@@ -236,7 +236,7 @@ public class MenuItemView: UIView {
             ])
     }
 
-    private func layoutCustomView() {
+    fileprivate func layoutCustomView() {
         guard let customView = customView else { return }
 
         widthConstraint = NSLayoutConstraint(item: self, attribute: .width, relatedBy: .equal, toItem: nil, attribute: .width, multiplier: 1.0, constant: customView.frame.width)
@@ -250,7 +250,7 @@ public class MenuItemView: UIView {
             ])
     }
 
-    private func layoutDivider() {
+    fileprivate func layoutDivider() {
         guard let dividerImageView = dividerImageView else { return }
 
         let centerYConstraint = NSLayoutConstraint(item: dividerImageView, attribute: .centerY, relatedBy: .equal, toItem: self, attribute: .centerY, multiplier: 1.0, constant: 1.0)
@@ -307,7 +307,7 @@ extension MenuItemView: LabelSizeCalculatable {
         return CGSize(width: itemWidth + horizontalMargin * 2, height: itemHeight)
     }
 
-    private var maxWindowSize: CGFloat {
-        return UIApplication.shared().keyWindow?.bounds.width ?? UIScreen.main().bounds.width
+    fileprivate var maxWindowSize: CGFloat {
+        return UIApplication.shared.keyWindow?.bounds.width ?? UIScreen.main.bounds.width
     }
 }