Update due to swift 3 guidelines

Author: serejahh

MenuExample/Controller/ContentViewController.swift

@@ -7,10 +7,10 @@
 import UIKit
 
 class ContentViewController: UIViewController {
+    
     var type: ContentType = .Music
 
-    @IBOutlet
-    weak var imageView: UIImageView!
+    @IBOutlet weak var imageView: UIImageView!
 
     override func viewDidLoad() {
         super.viewDidLoad()

MenuExample/Controller/MenuViewController.swift

@@ -8,11 +8,13 @@ import UIKit
 import SideMenu
 
 protocol MenuViewControllerDelegate: class {
-    func menu(_ menu: MenuViewController, didSelectItemAtIndex index: Int, atPoint point: CGPoint)
+    
+    func menu(_ menu: MenuViewController, didSelectItemAt index: Int, at point: CGPoint)
     func menuDidCancel(_ menu: MenuViewController)
 }
 
 class MenuViewController: UITableViewController {
+    
     weak var delegate: MenuViewControllerDelegate?
     var selectedItem = 0
 
@@ -22,25 +24,25 @@ class MenuViewController: UITableViewController {
         let indexPath = IndexPath(row: selectedItem, section: 0)
         tableView.selectRow(at: indexPath, animated: false, scrollPosition: .none)
     }
-    
 }
 
 extension MenuViewController {
-    @IBAction
-    fileprivate func dismissMenu() {
+    
+    @IBAction fileprivate func dismissMenu() {
         delegate?.menuDidCancel(self)
     }
 }
 
 //MARK: Menu protocol
-extension  MenuViewController: Menu {
+extension MenuViewController: Menu {
+    
     var menuItems: [UIView] {
         return [tableView.tableHeaderView!] + tableView.visibleCells
     }
 }
 
-// MARK: - UITableViewDelegate
 extension MenuViewController {
+    
     override func tableView(_ tableView: UITableView, willSelectRowAt indexPath: IndexPath) -> IndexPath? {
         return indexPath == tableView.indexPathForSelectedRow ? nil : indexPath
     }
@@ -49,6 +51,6 @@ extension MenuViewController {
         let rect = tableView.rectForRow(at: indexPath)
         var point = CGPoint(x: rect.midX, y: rect.midY)
         point = tableView.convert(point, to: nil)
-        delegate?.menu(self, didSelectItemAtIndex: (indexPath as NSIndexPath).row, atPoint:point)
+        delegate?.menu(self, didSelectItemAt: indexPath.row, at: point)
     }
 }

MenuExample/Controller/ViewController.swift

@@ -8,38 +8,42 @@ import UIKit
 import SideMenu
 
 class ViewController: UIViewController {
+    
     fileprivate var selectedIndex = 0
     fileprivate var transitionPoint: CGPoint!
     fileprivate var contentType: ContentType = .Music
     fileprivate var navigator: UINavigationController!
+    
     lazy fileprivate var menuAnimator : MenuTransitionAnimator! = MenuTransitionAnimator(mode: .presentation, shouldPassEventsOutsideMenu: false) { [unowned self] in
         self.dismiss(animated: true, completion: nil)
     }
+    
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         switch (segue.identifier, segue.destination) {
-            case (.some("presentMenu"), let menu as MenuViewController):
-                menu.selectedItem = selectedIndex
-                menu.delegate = self
-                menu.transitioningDelegate = self
-                menu.modalPresentationStyle = .custom
-            case (.some("embedNavigator"), let navigator as UINavigationController):
-                self.navigator = navigator
-                self.navigator.delegate = self
-            default:
-                super.prepare(for: segue, sender: sender)
+        case (.some("presentMenu"), let menu as MenuViewController):
+            menu.selectedItem = selectedIndex
+            menu.delegate = self
+            menu.transitioningDelegate = self
+            menu.modalPresentationStyle = .custom
+        case (.some("embedNavigator"), let navigator as UINavigationController):
+            self.navigator = navigator
+            self.navigator.delegate = self
+        default:
+            super.prepare(for: segue, sender: sender)
         }
     }
 }
 
 extension ViewController: MenuViewControllerDelegate {
-    func menu(_: MenuViewController, didSelectItemAtIndex index: Int, atPoint point: CGPoint) {
+    
+    func menu(_: MenuViewController, didSelectItemAt index: Int, at point: CGPoint) {
         contentType = !contentType
         transitionPoint = point
         selectedIndex = index
 
         let content = storyboard!.instantiateViewController(withIdentifier: "Content") as! ContentViewController
         content.type = contentType
-        self.navigator.setViewControllers([content], animated: true)
+        navigator.setViewControllers([content], animated: true)
 
         DispatchQueue.main.async {
             self.dismiss(animated: true, completion: nil)
@@ -52,6 +56,7 @@ extension ViewController: MenuViewControllerDelegate {
 }
 
 extension ViewController: UINavigationControllerDelegate {
+    
     func navigationController(_: UINavigationController, animationControllerFor _: UINavigationControllerOperation,
         from _: UIViewController, to _: UIViewController) -> UIViewControllerAnimatedTransitioning? {
 
@@ -63,6 +68,7 @@ extension ViewController: UINavigationControllerDelegate {
 }
 
 extension ViewController: UIViewControllerTransitioningDelegate {
+    
     func animationController(forPresented presented: UIViewController, presenting _: UIViewController,
         source _: UIViewController) -> UIViewControllerAnimatedTransitioning? {
             return menuAnimator
@@ -71,5 +77,4 @@ extension ViewController: UIViewControllerTransitioningDelegate {
     func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
         return MenuTransitionAnimator(mode: .dismissal)
     }
-
 }

MenuExample/Extension/UITableViewCell.swift

@@ -7,8 +7,8 @@
 import UIKit
 
 extension UITableViewCell {
-    @IBInspectable
-    var normalBackgroundColor: UIColor? {
+    
+    @IBInspectable var normalBackgroundColor: UIColor? {
         get {
             return backgroundView?.backgroundColor
         }
@@ -19,8 +19,7 @@ extension UITableViewCell {
         }
     }
 
-    @IBInspectable
-    var selectedBackgroundColor: UIColor? {
+    @IBInspectable var selectedBackgroundColor: UIColor? {
         get {
             return selectedBackgroundView?.backgroundColor
         }

MenuExample/Misc/AnimationDelegate.swift

@@ -7,6 +7,7 @@
 import QuartzCore
 
 class AnimationDelegate: NSObject, CAAnimationDelegate {
+    
     fileprivate let completion: () -> Void
 
     init(completion: @escaping () -> Void) {

MenuExample/Misc/AppDelegate.swift

@@ -8,6 +8,7 @@ import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
+    
     var window: UIWindow?
 }
 

MenuExample/Misc/CircularRevealAnimator.swift

@@ -12,13 +12,14 @@ private func SquareAroundCircle(_ center: CGPoint, radius: CGFloat) -> CGRect {
 }
 
 class CircularRevealAnimator {
-    var completion: () -> Void = {}
+    
+    var completion: (() -> Void)?
 
     fileprivate let layer: CALayer
     fileprivate let mask: CAShapeLayer
     fileprivate let animation: CABasicAnimation
 
-    var duration: CFTimeInterval {
+    var duration: TimeInterval {
         get { return animation.duration }
         set(value) { animation.duration = value }
     }
@@ -42,7 +43,7 @@ class CircularRevealAnimator {
         animation.toValue = endPath
         animation.delegate = AnimationDelegate {
             layer.mask = nil
-            self.completion()
+            self.completion?()
             self.animation.delegate = nil
         }
     }

MenuExample/Misc/CircularRevealTransitionAnimator.swift

@@ -7,6 +7,7 @@
 import UIKit
 
 class CircularRevealTransitionAnimator: NSObject {
+    
     fileprivate let duration = 0.5
     fileprivate let center: CGPoint
 
@@ -16,6 +17,7 @@ class CircularRevealTransitionAnimator: NSObject {
 }
 
 extension CircularRevealTransitionAnimator: UIViewControllerAnimatedTransitioning {
+    
     func animateTransition(using context: UIViewControllerContextTransitioning) {
         let frame = context.finalFrame(for: context.viewController(forKey: UITransitionContextViewControllerKey.to)!)
 

MenuExample/Model/ContentType.swift

@@ -18,4 +18,4 @@ prefix func ! (value: ContentType) -> ContentType {
         case .Films:
             return .Music
     }
-}
+}

SideMenu/Menu.swift

@@ -6,8 +6,8 @@
 
 import UIKit
 
-@objc
-public protocol Menu {
+@objc public protocol Menu {
+    
     var menuItems: [UIView] {get}
 }