Updated Podspec and README for Cocoapods.

Convert to Swift 2.3 syntax

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -365,6 +365,11 @@
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0720;
+				TargetAttributes = {
+					92B1C7A9E8122442B031A44C1CA691AF = {
+						LastSwiftMigration = 0800;
+					};
+				};
 			};
 			buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -644,6 +649,7 @@
 				PRODUCT_NAME = SideMenu;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 2.3;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -705,6 +711,7 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 2.3;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";

Example/SideMenu/Main.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="yAA-s6-Bam">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="yAA-s6-Bam">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>

Pod/Classes/SideMenuManager.swift

@@ -16,17 +16,20 @@
     SideMenuManager.menuAddScreenEdgePanGesturesToPresent(toView: self.navigationController!.view)
 */
 
-public class SideMenuManager {
+public class SideMenuManager : NSObject {
     
-    public enum MenuPresentMode {
+    @objc public enum MenuPresentMode : Int {
         case MenuSlideIn
         case ViewSlideOut
         case ViewSlideInOut
         case MenuDissolveIn
     }
-
-    private static var originalLeftMenuBackgroundColor: UIColor?
-    private static var originalRightMenuBackgroundColor: UIColor?
+    
+    // Bounds which has been allocated for the app on the whole device screen
+    internal static var appScreenRect: CGRect {
+        let appWindowRect = UIApplication.sharedApplication().keyWindow?.bounds ?? UIWindow().bounds
+        return appWindowRect
+    }
 
     /**
      The presentation mode of the menu.
@@ -46,7 +49,7 @@ public class SideMenuManager {
     public static var menuAllowPopIfPossible = false
     
     /// Width of the menu when presented on screen, showing the existing view controller in the remaining space. Default is 75% of the screen width.
-    public static var menuWidth: CGFloat = max(round(min(UIScreen.mainScreen().bounds.width, UIScreen.mainScreen().bounds.height) * 0.75), 240)
+    public static var menuWidth: CGFloat = max(round(min((appScreenRect.width), (appScreenRect.height)) * 0.75), 240)
     
     /// Duration of the animation when the menu is presented without gestures. Default is 0.35 seconds.
     public static var menuAnimationPresentDuration = 0.35
@@ -78,13 +81,19 @@ public class SideMenuManager {
     /// The right menu swipe to dismiss gesture.
     public static weak var menuRightSwipeToDismissGesture: UIPanGestureRecognizer?
     
+    /// Enable or disable gestures that would swipe to present or dismiss the menu. Default is true.
+    public static var menuEnableSwipeGestures: Bool = true
+    
+    /// Enable or disable interaction with the presenting view controller while the menu is displayed. Enabling may make it difficult to dismiss the menu or cause exceptions if the user tries to present and already presented menu. Default is false.
+    public static var menuPresentingViewControllerUserInteractionEnabled: Bool = false
+    
     /// The strength of the parallax effect on the existing view controller. Does not apply to `menuPresentMode` when set to `ViewSlideOut`. Default is 0.
     public static var menuParallaxStrength: Int = 0
     
     /// Draws the `menuAnimationBackgroundColor` behind the status bar. Default is true.
     public static var menuFadeStatusBar = true
     
-    /// - Warning: Deprecated. Use `menuAnimationTransformScaleFactor` instead.
+    /// -Warning: Deprecated. Use `menuAnimationTransformScaleFactor` instead.
     @available(*, deprecated, renamed="menuAnimationTransformScaleFactor")
     public static var menuAnimationShrinkStrength: CGFloat {
         get {
@@ -96,7 +105,7 @@ public class SideMenuManager {
     }
     
     // prevent instantiation
-    private init() {}
+    private override init() {}
     
     /**
      The blur effect style of the menu if the menu's root view controller is a UITableViewController or UICollectionViewController.
@@ -105,119 +114,120 @@ public class SideMenuManager {
      */
     public static var menuBlurEffectStyle: UIBlurEffectStyle? {
         didSet {
-            updateMenuBlurIfNecessary()
+            if oldValue != menuBlurEffectStyle {
+                updateMenuBlurIfNecessary()
+            }
         }
     }
     
     /// The left menu.
     public static var menuLeftNavigationController: UISideMenuNavigationController? {
         willSet {
-            if menuLeftNavigationController != nil {
-                let originalBlurEffectStyle = menuBlurEffectStyle
-                menuBlurEffectStyle = nil
-                updateMenuBlurIfNecessary()
-                menuBlurEffectStyle = originalBlurEffectStyle
+            if menuLeftNavigationController?.presentingViewController == nil {
+                removeMenuBlurForMenu(menuLeftNavigationController)
             }
         }
         didSet {
-            if let menuLeftNavigationController = menuLeftNavigationController {
-                let exitPanGesture = UIPanGestureRecognizer()
-                exitPanGesture.addTarget(SideMenuTransition.self, action:#selector(SideMenuTransition.handleHideMenuPan(_:)))
-                menuLeftNavigationController.view.addGestureRecognizer(exitPanGesture)
-                menuLeftNavigationController.transitioningDelegate = SideMenuTransition.singleton
-                menuLeftNavigationController.modalPresentationStyle = .OverFullScreen
-                if !menuLeftNavigationController.leftSide {
-                    menuLeftNavigationController.leftSide = true
-                }
-                menuLeftSwipeToDismissGesture = exitPanGesture
-                updateMenuBlurIfNecessary()
+            guard oldValue?.presentingViewController == nil else {
+                print("SideMenu Warning: menuLeftNavigationController cannot be modified while it's presented.")
+                menuLeftNavigationController = oldValue
+                return
             }
+            setupNavigationController(menuLeftNavigationController, leftSide: true)
         }
     }
     
     /// The right menu.
     public static var menuRightNavigationController: UISideMenuNavigationController? {
         willSet {
-            if menuRightNavigationController != nil {
-                let originalBlurEffectStyle = menuBlurEffectStyle
-                menuBlurEffectStyle = nil
-                updateMenuBlurIfNecessary()
-                menuBlurEffectStyle = originalBlurEffectStyle
+            if menuRightNavigationController?.presentingViewController == nil {
+                removeMenuBlurForMenu(menuRightNavigationController)
             }
         }
         didSet {
-            if let menuRightNavigationController = menuRightNavigationController {
-                let exitPanGesture = UIPanGestureRecognizer()
-                exitPanGesture.addTarget(SideMenuTransition.self, action:#selector(SideMenuTransition.handleHideMenuPan(_:)))
-                menuRightNavigationController.view.addGestureRecognizer(exitPanGesture)
-                menuRightNavigationController.transitioningDelegate = SideMenuTransition.singleton
-                menuRightNavigationController.modalPresentationStyle = .OverFullScreen
-                if menuRightNavigationController.leftSide {
-                    menuRightNavigationController.leftSide = false
-                }
-                menuRightSwipeToDismissGesture = exitPanGesture
-                updateMenuBlurIfNecessary()
+            guard oldValue?.presentingViewController == nil else {
+                print("SideMenu Warning: menuRightNavigationController cannot be modified while it's presented.")
+                menuRightNavigationController = oldValue
+                return
             }
+            setupNavigationController(menuRightNavigationController, leftSide: false)
         }
     }
     
+    private class func setupNavigationController(forMenu: UISideMenuNavigationController?, leftSide: Bool) {
+        guard let forMenu = forMenu else {
+            return
+        }
+        
+        let exitPanGesture = UIPanGestureRecognizer()
+        exitPanGesture.addTarget(SideMenuTransition.self, action:#selector(SideMenuTransition.handleHideMenuPan(_:)))
+        forMenu.view.addGestureRecognizer(exitPanGesture)
+        forMenu.transitioningDelegate = SideMenuTransition.singleton
+        forMenu.modalPresentationStyle = .OverFullScreen
+        forMenu.leftSide = leftSide
+        if leftSide {
+            menuLeftSwipeToDismissGesture = exitPanGesture
+        } else {
+            menuRightSwipeToDismissGesture = exitPanGesture
+        }
+        updateMenuBlurIfNecessary()
+    }
+    
     private class func updateMenuBlurIfNecessary() {
-        if let menuLeftNavigationController = menuLeftNavigationController, let view = menuLeftNavigationController.visibleViewController?.view {
-            if !UIAccessibilityIsReduceTransparencyEnabled() && menuBlurEffectStyle != nil {
-                if originalLeftMenuBackgroundColor == nil {
-                    originalLeftMenuBackgroundColor = view.backgroundColor
-                }
-                setupMenuBlurForMenu(menuLeftNavigationController)
-            } else if originalLeftMenuBackgroundColor != nil {
-                removeMenuBlurForMenu(menuLeftNavigationController)
-                view.backgroundColor = originalLeftMenuBackgroundColor!
-                originalLeftMenuBackgroundColor = nil
+        let menuBlurBlock = { (forMenu: UISideMenuNavigationController?) in
+            if let forMenu = forMenu {
+                setupMenuBlurForMenu(forMenu)
             }
         }
         
-        if let menuRightNavigationController = menuRightNavigationController, let view = menuRightNavigationController.visibleViewController?.view {
-            if !UIAccessibilityIsReduceTransparencyEnabled() && menuBlurEffectStyle != nil {
-                if originalRightMenuBackgroundColor == nil {
-                    originalRightMenuBackgroundColor = view.backgroundColor
-                }
-                setupMenuBlurForMenu(menuRightNavigationController)
-            } else if originalRightMenuBackgroundColor != nil {
-                removeMenuBlurForMenu(menuRightNavigationController)
-                view.backgroundColor = originalRightMenuBackgroundColor!
-                originalRightMenuBackgroundColor = nil
-            }
-        }
+        menuBlurBlock(menuLeftNavigationController)
+        menuBlurBlock(menuRightNavigationController)
     }
     
-    private class func setupMenuBlurForMenu(forMenu: UINavigationController) {
+    private class func setupMenuBlurForMenu(forMenu: UISideMenuNavigationController?) {
         removeMenuBlurForMenu(forMenu)
+        
+        guard let forMenu = forMenu,
+            menuBlurEffectStyle = menuBlurEffectStyle,
+            view = forMenu.visibleViewController?.view
+            where !UIAccessibilityIsReduceTransparencyEnabled() else {
+            return
+        }
+        
+        if forMenu.originalMenuBackgroundColor == nil {
+            forMenu.originalMenuBackgroundColor = view.backgroundColor
+        }
+        
+        let blurEffect = UIBlurEffect(style: menuBlurEffectStyle)
+        let blurView = UIVisualEffectView(effect: blurEffect)
+        view.backgroundColor = UIColor.clearColor()
         if let tableViewController = forMenu.visibleViewController as? UITableViewController {
-            tableViewController.tableView.backgroundColor = UIColor.clearColor()
-            
-            let blurEffect = UIBlurEffect(style: menuBlurEffectStyle!)
-            tableViewController.tableView.backgroundView = UIVisualEffectView(effect: blurEffect)
+            tableViewController.tableView.backgroundView = blurView
             tableViewController.tableView.separatorEffect = UIVibrancyEffect(forBlurEffect: blurEffect)
             tableViewController.tableView.reloadData()
-        } else if let viewController = forMenu.visibleViewController {
-            viewController.view.backgroundColor = UIColor.clearColor()
-            
-            let blurView = UIVisualEffectView(effect: UIBlurEffect(style: menuBlurEffectStyle!))
+        } else {
             blurView.autoresizingMask = [.FlexibleHeight, .FlexibleWidth]
-            blurView.frame = viewController.view.bounds
-            
-            viewController.view.insertSubview(blurView, atIndex: 0)
+            blurView.frame = view.bounds
+            view.insertSubview(blurView, atIndex: 0)
         }
     }
     
-    private class func removeMenuBlurForMenu(forMenu: UINavigationController) {
+    private class func removeMenuBlurForMenu(forMenu: UISideMenuNavigationController?) {
+        guard let forMenu = forMenu,
+            originalMenuBackgroundColor = forMenu.originalMenuBackgroundColor,
+            view = forMenu.visibleViewController?.view else {
+            return
+        }
+        
+        view.backgroundColor = originalMenuBackgroundColor
+        forMenu.originalMenuBackgroundColor = nil
+        
         if let tableViewController = forMenu.visibleViewController as? UITableViewController {
             tableViewController.tableView.backgroundView = nil
             tableViewController.tableView.separatorEffect = nil
             tableViewController.tableView.reloadData()
-        } else if let viewController = forMenu.visibleViewController {
-            if let blurView = viewController.view.subviews[0] as? UIVisualEffectView {
-                blurView.removeFromSuperview()
-            }
+        } else if let blurView = view.subviews[0] as? UIVisualEffectView {
+            blurView.removeFromSuperview()
         }
     }
     
@@ -230,7 +240,6 @@ public class SideMenuManager {
      - Returns: The array of screen edge gestures added to `toView`.
      */
     public class func menuAddScreenEdgePanGesturesToPresent(toView toView: UIView, forMenu:UIRectEdge? = nil) -> [UIScreenEdgePanGestureRecognizer] {
-        
         var array = [UIScreenEdgePanGestureRecognizer]()
         
         if forMenu != .Right {

Pod/Classes/SideMenuTransition.swift

@@ -17,7 +17,7 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
     
     internal static let singleton = SideMenuTransition()
     internal static var presentDirection: UIRectEdge = .Left;
-    internal static weak var tapView: UIView!
+    internal static weak var tapView: UIView?
     internal static weak var statusBarView: UIView?
     
     // prevent instantiation
@@ -58,6 +58,10 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
     }
     
     class func handlePresentMenuPan(pan: UIPanGestureRecognizer) {
+        if !SideMenuManager.menuEnableSwipeGestures {
+            return
+        }
+        
         // how much distance have we panned in reference to the parent view?
         guard let view = viewControllerForPresentedMenu != nil ? viewControllerForPresentedMenu?.view : pan.view else {
             return
@@ -121,6 +125,10 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
     }
     
     class func handleHideMenuPan(pan: UIPanGestureRecognizer) {
+        if !SideMenuManager.menuEnableSwipeGestures {
+            return
+        }
+        
         let translation = pan.translationInView(pan.view!)
         let direction:CGFloat = SideMenuTransition.presentDirection == .Left ? -1 : 1
         let distance = translation.x / SideMenuManager.menuWidth * direction
@@ -153,13 +161,13 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
     
     internal class func hideMenuStart() {
         NSNotificationCenter.defaultCenter().removeObserver(SideMenuTransition.singleton)
-        
-        let mainViewController = SideMenuTransition.viewControllerForPresentedMenu!
-        let menuView = SideMenuTransition.presentDirection == .Left ? SideMenuManager.menuLeftNavigationController!.view : SideMenuManager.menuRightNavigationController!.view
+        guard let mainViewController = SideMenuTransition.viewControllerForPresentedMenu,
+            let menuView = SideMenuTransition.presentDirection == .Left ? SideMenuManager.menuLeftNavigationController?.view : SideMenuManager.menuRightNavigationController?.view else {return}
+      
         menuView.transform = CGAffineTransformIdentity
         mainViewController.view.transform = CGAffineTransformIdentity
         mainViewController.view.alpha = 1
-        SideMenuTransition.tapView.frame = CGRectMake(0, 0, mainViewController.view.frame.width, mainViewController.view.frame.height)
+        SideMenuTransition.tapView?.frame = CGRectMake(0, 0, mainViewController.view.frame.width, mainViewController.view.frame.height)
         menuView.frame.origin.y = 0
         menuView.frame.size.width = SideMenuManager.menuWidth
         menuView.frame.size.height = mainViewController.view.frame.height
@@ -191,9 +199,12 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
     }
     
     internal class func hideMenuComplete() {
-        let mainViewController = SideMenuTransition.viewControllerForPresentedMenu!
-        let menuView = SideMenuTransition.presentDirection == .Left ? SideMenuManager.menuLeftNavigationController!.view : SideMenuManager.menuRightNavigationController!.view
-        SideMenuTransition.tapView.removeFromSuperview()
+        guard let mainViewController = SideMenuTransition.viewControllerForPresentedMenu,
+            let menuView = SideMenuTransition.presentDirection == .Left ? SideMenuManager.menuLeftNavigationController?.view : SideMenuManager.menuRightNavigationController?.view else {
+                return
+        }
+
+        SideMenuTransition.tapView?.removeFromSuperview()
         SideMenuTransition.statusBarView?.removeFromSuperview()
         mainViewController.view.motionEffects.removeAll()
         mainViewController.view.layer.shadowOpacity = 0
@@ -204,12 +215,12 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
         originalSuperview?.addSubview(mainViewController.view)
     }
     
-    internal class func presentMenuStart(forSize size: CGSize = UIScreen.mainScreen().bounds.size) {
-        guard let menuView = SideMenuTransition.presentDirection == .Left ? SideMenuManager.menuLeftNavigationController?.view : SideMenuManager.menuRightNavigationController?.view else {
-            return
+    internal class func presentMenuStart(forSize size: CGSize = SideMenuManager.appScreenRect.size) {
+        guard let menuView = SideMenuTransition.presentDirection == .Left ? SideMenuManager.menuLeftNavigationController?.view : SideMenuManager.menuRightNavigationController?.view,
+            mainViewController = SideMenuTransition.viewControllerForPresentedMenu else {
+                return
         }
         
-        let mainViewController = SideMenuTransition.viewControllerForPresentedMenu!
         menuView.transform = CGAffineTransformIdentity
         mainViewController.view.transform = CGAffineTransformIdentity
         menuView.frame.size.width = SideMenuManager.menuWidth
@@ -236,7 +247,7 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
             menuView.layer.shadowOpacity = SideMenuManager.menuShadowOpacity
             menuView.layer.shadowOffset = CGSizeMake(0, 0)
             let direction:CGFloat = SideMenuTransition.presentDirection == .Left ? 1 : -1
-            mainViewController.view.frame.origin.x = direction * (menuView.frame.width)
+            mainViewController.view.frame = CGRect(x: direction * (menuView.frame.width), y: 0, width: size.width, height: size.height)
             mainViewController.view.transform = CGAffineTransformMakeScale(SideMenuManager.menuAnimationTransformScaleFactor, SideMenuManager.menuAnimationTransformScaleFactor)
             mainViewController.view.alpha = 1 - SideMenuManager.menuAnimationFadeStrength
             
@@ -254,8 +265,10 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
     
     internal class func presentMenuComplete() {
         NSNotificationCenter.defaultCenter().addObserver(SideMenuTransition.singleton, selector:#selector(SideMenuTransition.applicationDidEnterBackgroundNotification), name: UIApplicationDidEnterBackgroundNotification, object: nil)
-        
-        let mainViewController = SideMenuTransition.viewControllerForPresentedMenu!
+        guard let mainViewController = SideMenuTransition.viewControllerForPresentedMenu else {
+            return
+        }
+      
         switch SideMenuManager.menuPresentMode {
         case .MenuSlideIn, .MenuDissolveIn, .ViewSlideInOut:
             if SideMenuManager.menuParallaxStrength != 0 {
@@ -284,7 +297,7 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
     internal func animateTransition(transitionContext: UIViewControllerContextTransitioning) {
         
         // get reference to our fromView, toView and the container view that we should perform the transition in
-        let container = transitionContext.containerView()!
+        let container = transitionContext.containerView()
         if let menuBackgroundColor = SideMenuManager.menuAnimationBackgroundColor {
             container.backgroundColor = menuBackgroundColor
         }
@@ -302,15 +315,18 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
         
         // prepare menu items to slide in
         if presenting {
-            let tapView = UIView()
-            tapView.autoresizingMask = [.FlexibleHeight, .FlexibleWidth]
-            let exitPanGesture = UIPanGestureRecognizer()
-            exitPanGesture.addTarget(SideMenuTransition.self, action:#selector(SideMenuTransition.handleHideMenuPan(_:)))
-            let exitTapGesture = UITapGestureRecognizer()
-            exitTapGesture.addTarget(SideMenuTransition.self, action: #selector(SideMenuTransition.handleHideMenuTap(_:)))
-            tapView.addGestureRecognizer(exitPanGesture)
-            tapView.addGestureRecognizer(exitTapGesture)
-            SideMenuTransition.tapView = tapView
+            var tapView: UIView?
+            if !SideMenuManager.menuPresentingViewControllerUserInteractionEnabled {
+                tapView = UIView()
+                tapView!.autoresizingMask = [.FlexibleHeight, .FlexibleWidth]
+                let exitPanGesture = UIPanGestureRecognizer()
+                exitPanGesture.addTarget(SideMenuTransition.self, action:#selector(SideMenuTransition.handleHideMenuPan(_:)))
+                let exitTapGesture = UITapGestureRecognizer()
+                exitTapGesture.addTarget(SideMenuTransition.self, action: #selector(SideMenuTransition.handleHideMenuTap(_:)))
+                tapView!.addGestureRecognizer(exitPanGesture)
+                tapView!.addGestureRecognizer(exitTapGesture)
+                SideMenuTransition.tapView = tapView
+            }
             
             SideMenuTransition.originalSuperview = topView.superview
             
@@ -319,10 +335,14 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
             case .ViewSlideOut:
                 container.addSubview(menuView)
                 container.addSubview(topView)
-                topView.addSubview(tapView)
+                if let tapView = tapView {
+                    topView.addSubview(tapView)
+                }
             case .MenuSlideIn, .MenuDissolveIn, .ViewSlideInOut:
                 container.addSubview(topView)
-                container.addSubview(tapView)
+                if let tapView = tapView {
+                    container.addSubview(tapView)
+                }
                 container.addSubview(menuView)
             }
             
@@ -347,10 +367,10 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
         UIView.animateWithDuration(duration, delay: 0, options: options, animations: { () -> Void in
             if self.presenting {
                 SideMenuTransition.presentMenuStart() // onstage items: slide in
-            }
-            else {
+            } else {
                 SideMenuTransition.hideMenuStart()
             }
+            menuView.userInteractionEnabled = false
             }) { (finished) -> Void in
                 // tell our transitionContext object that we've finished animating
                 if transitionContext.transitionWasCancelled() {
@@ -361,6 +381,8 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
                     } else {
                         SideMenuTransition.presentMenuComplete()
                     }
+                    menuView.userInteractionEnabled = true
+                    
                     transitionContext.completeTransition(false)
                     
                     if SideMenuTransition.switchMenus {
@@ -373,6 +395,7 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
                 
                 if self.presenting {
                     SideMenuTransition.presentMenuComplete()
+                    menuView.userInteractionEnabled = true
                     transitionContext.completeTransition(true)
                     switch SideMenuManager.menuPresentMode {
                     case .ViewSlideOut:

Pod/Classes/UISideMenuNavigationController.swift

@@ -9,6 +9,8 @@ import UIKit
 
 public class UISideMenuNavigationController: UINavigationController {
     
+    internal var originalMenuBackgroundColor: UIColor?
+    
     public override func awakeFromNib() {
         super.awakeFromNib()
         
@@ -21,7 +23,7 @@ public class UISideMenuNavigationController: UINavigationController {
     /// Whether the menu appears on the right or left side of the screen. Right is the default.
     @IBInspectable public var leftSide:Bool = false {
         didSet {
-            if isViewLoaded() { // suppress warnings
+            if isViewLoaded() && oldValue != leftSide { // suppress warnings
                 didSetSide()
             }
         }
@@ -64,7 +66,11 @@ public class UISideMenuNavigationController: UINavigationController {
                 case .ViewSlideOut, .ViewSlideInOut:
                     mainView.superview?.insertSubview(view, belowSubview: mainView)
                 case .MenuSlideIn, .MenuDissolveIn:
-                    mainView.superview?.insertSubview(view, aboveSubview: SideMenuTransition.tapView)
+                    if let tapView = SideMenuTransition.tapView {
+                        mainView.superview?.insertSubview(view, aboveSubview: tapView)
+                    } else {
+                        mainView.superview?.insertSubview(view, aboveSubview: mainView)
+                    }
                 }
             }
         }
@@ -113,44 +119,49 @@ public class UISideMenuNavigationController: UINavigationController {
     }
     
     override public func pushViewController(viewController: UIViewController, animated: Bool) {
-        if let menuViewController: UINavigationController = SideMenuTransition.presentDirection == .Left ? SideMenuManager.menuLeftNavigationController : SideMenuManager.menuRightNavigationController {
-            if let presentingViewController = menuViewController.presentingViewController as? UINavigationController {
-                
-                // to avoid overlapping dismiss & pop/push calls, create a transaction block where the menu
-                // is dismissed after showing the appropriate screen
-                CATransaction.begin()
-                CATransaction.setCompletionBlock( { () -> Void in
-                    self.dismissViewControllerAnimated(true, completion: nil)
-                    self.visibleViewController?.viewWillAppear(false) // Hack: force selection to get cleared on UITableViewControllers when reappearing using custom transitions
-                })
-                
-                UIView.animateWithDuration(SideMenuManager.menuAnimationDismissDuration, animations: { () -> Void in
-                    SideMenuTransition.hideMenuStart()
-                })
-                
-                if SideMenuManager.menuAllowPopIfPossible {
-                    for subViewController in presentingViewController.viewControllers {
-                        if subViewController.dynamicType == viewController.dynamicType {
-                            presentingViewController.popToViewController(subViewController, animated: animated)
-                            CATransaction.commit()
-                            return
-                        }
-                    }
+        guard viewControllers.count > 0 else {
+            // NOTE: pushViewController is called by init(rootViewController: UIViewController)
+            // so we must perform the normal super method in this case.
+            super.pushViewController(viewController, animated: true)
+            return
+        }
+        
+        guard let presentingViewController = presentingViewController as? UINavigationController else {
+            presentViewController(viewController, animated: animated, completion: nil)
+            print("SideMenu Warning: cannot push a ViewController from a ViewController without a NavigationController. It will be presented it instead.")
+            return
+        }
+        
+        // to avoid overlapping dismiss & pop/push calls, create a transaction block where the menu
+        // is dismissed after showing the appropriate screen
+        CATransaction.begin()
+        CATransaction.setCompletionBlock( { () -> Void in
+            self.dismissViewControllerAnimated(true, completion: nil)
+            self.visibleViewController?.viewWillAppear(false) // Hack: force selection to get cleared on UITableViewControllers when reappearing using custom transitions
+        })
+        
+        UIView.animateWithDuration(SideMenuManager.menuAnimationDismissDuration, animations: { () -> Void in
+            SideMenuTransition.hideMenuStart()
+        })
+        
+        if SideMenuManager.menuAllowPopIfPossible {
+            for subViewController in presentingViewController.viewControllers {
+                if subViewController.dynamicType == viewController.dynamicType {
+                    presentingViewController.popToViewController(subViewController, animated: animated)
+                    CATransaction.commit()
+                    return
                 }
-                if !SideMenuManager.menuAllowPushOfSameClassTwice {
-                    if presentingViewController.viewControllers.last?.dynamicType == viewController.dynamicType {
-                        CATransaction.commit()
-                        return
-                    }
-                }
-                
-                presentingViewController.pushViewController(viewController, animated: animated)
-                CATransaction.commit()
-            } else {
-                menuViewController.presentViewController(viewController, animated: animated, completion: nil)
-                print("Warning: attempted to push a ViewController from a ViewController that doesn't have a NavigationController. It will be presented it instead.")
             }
         }
+        if !SideMenuManager.menuAllowPushOfSameClassTwice {
+            if presentingViewController.viewControllers.last?.dynamicType == viewController.dynamicType {
+                CATransaction.commit()
+                return
+            }
+        }
+        
+        presentingViewController.pushViewController(viewController, animated: animated)
+        CATransaction.commit()
     }
 }
 

README.md

@@ -3,15 +3,17 @@
 [![License](https://img.shields.io/cocoapods/l/SideMenu.svg?style=flat)](http://cocoapods.org/pods/SideMenu)
 [![Platform](https://img.shields.io/cocoapods/p/SideMenu.svg?style=flat)](http://cocoapods.org/pods/SideMenu)
 
-### If you like SideMenu, give it a ★ at the top right of this page.
+**If you like SideMenu, give it a ★ at the top right of its [GitHub](https://github.com/jonkykong/SideMenu) page.**
+
+## Overview
 
 SideMenu is a simple and versatile side menu control written in Swift.
-- [x] **It can be implemented in storyboard without a single line of [code](#code-less-storyboard-implementation).**
-- [x] Four standard animation styles to choose from (even parallax if you want to get weird).
-- [x] Highly customizable without needing to write tons of custom code.
-- [x] Supports continuous swiping between side menus on boths sides in a single gesture.
-- [x] Global menu configuration. Set-up once and be done for all screens.
-- [x] Menus can be presented and dismissed the same as any other View Controller since this control uses custom transitions.
+* **It can be implemented in storyboard without a single line of [code](#code-less-storyboard-implementation).**
+* Four standard animation styles to choose from (even parallax if you want to get weird).
+* Highly customizable without needing to write tons of custom code.
+* Supports continuous swiping between side menus on boths sides in a single gesture.
+* Global menu configuration. Set-up once and be done for all screens.
+* Menus can be presented and dismissed the same as any other View Controller since this control uses custom transitions.
 
 Check out the example project or this [interactive demo](https://appetize.io/app/64a9v3e6b8c6f53zvn5pnny80m) to see it in action!
 
@@ -21,7 +23,7 @@ Check out the example project or this [interactive demo](https://appetize.io/app
 ![](etc/InOut.gif)
 
 ## Requirements
-- [x] iOS 8 or higher
+* iOS 8 or higher
 
 ## Installation
 
@@ -41,6 +43,9 @@ platform :ios, '8.0'
 use_frameworks!
 
 pod 'SideMenu'
+
+# For Swift 3, use:
+# pod 'SideMenu', :git => 'https://github.com/jonkykong/SideMenu.git', :branch => 'swift3'
 ```
 
 Then, run the following command:
@@ -92,32 +97,79 @@ That's it.
 ### Customization
 Just type `SideMenuManager.menu...` and code completion will show you everything you can customize (defaults are shown below for reference):
 ``` swift
-menuPresentMode:MenuPresentMode = .ViewSlideOut
-menuAllowPushOfSameClassTwice = true
-menuAllowPopIfPossible = false
-menuWidth: CGFloat = max(round(min(UIScreen.mainScreen().bounds.width, UIScreen.mainScreen().bounds.height) * 0.75), 240)
-menuAnimationPresentDuration = 0.35
-menuAnimationDismissDuration = 0.35
-menuAnimationFadeStrength: CGFloat = 0
-menuAnimationTransformScaleFactor: CGFloat = 1
-menuAnimationBackgroundColor: UIColor? = nil
-menuShadowOpacity: Float = 0.5
-menuShadowColor = UIColor.blackColor()
-menuShadowRadius: CGFloat = 5
-menuLeftSwipeToDismissGesture: UIPanGestureRecognizer?
-menuRightSwipeToDismissGesture: UIPanGestureRecognizer?
-menuParallaxStrength: Int = 0
-menuFadeStatusBar = true
-menuBlurEffectStyle: UIBlurEffectStyle? = nil // Note: if you want cells in a UITableViewController menu to look good, make them a subclass of UITableViewVibrantCell!
-menuLeftNavigationController: UILeftMenuNavigationController? = nil
-menuRightNavigationController: UIRightMenuNavigationController? = nil
-menuAddScreenEdgePanGesturesToPresent(toView toView: UIView, forMenu:UIRectEdge? = nil) -> [UIScreenEdgePanGestureRecognizer]
-menuAddPanGestureToPresent(toView toView: UIView) -> UIPanGestureRecognizer
+/**
+The presentation mode of the menu.
+
+There are four modes in MenuPresentMode:
+- MenuSlideIn: Menu slides in over of the existing view.
+- ViewSlideOut: The existing view slides out to reveal the menu.
+- ViewSlideInOut: The existing view slides out while the menu slides in.
+- MenuDissolveIn: The menu dissolves in over the existing view controller.
+*/
+public static var menuPresentMode: MenuPresentMode = .ViewSlideOut
+
+/// Prevents the same view controller (or a view controller of the same class) from being pushed more than once. Defaults to true.
+public static var menuAllowPushOfSameClassTwice = true
+
+/// Pops to any view controller already in the navigation stack instead of the view controller being pushed if they share the same class. Defaults to false.
+public static var menuAllowPopIfPossible = false
+
+/// Width of the menu when presented on screen, showing the existing view controller in the remaining space. Default is 75% of the screen width.
+public static var menuWidth: CGFloat = max(round(min((appScreenRect.width), (appScreenRect.height)) * 0.75), 240)
+
+/// Duration of the animation when the menu is presented without gestures. Default is 0.35 seconds.
+public static var menuAnimationPresentDuration = 0.35
+
+/// Duration of the animation when the menu is dismissed without gestures. Default is 0.35 seconds.
+public static var menuAnimationDismissDuration = 0.35
+
+/// Amount to fade the existing view controller when the menu is presented. Default is 0 for no fade. Set to 1 to fade completely.
+public static var menuAnimationFadeStrength: CGFloat = 0
+
+/// The amount to scale the existing view controller or the menu view controller depending on the `menuPresentMode`. Default is 1 for no scaling. Less than 1 will shrink, greater than 1 will grow.
+public static var menuAnimationTransformScaleFactor: CGFloat = 1
+
+/// The background color behind menu animations. Depending on the animation settings this may not be visible. If `menuFadeStatusBar` is true, this color is used to fade it. Default is black.
+public static var menuAnimationBackgroundColor: UIColor?
+
+/// The shadow opacity around the menu view controller or existing view controller depending on the `menuPresentMode`. Default is 0.5 for 50% opacity.
+public static var menuShadowOpacity: Float = 0.5
+
+/// The shadow color around the menu view controller or existing view controller depending on the `menuPresentMode`. Default is black.
+public static var menuShadowColor = UIColor.blackColor()
+
+/// The radius of the shadow around the menu view controller or existing view controller depending on the `menuPresentMode`. Default is 5.
+public static var menuShadowRadius: CGFloat = 5
+
+/// The left menu swipe to dismiss gesture.
+public static weak var menuLeftSwipeToDismissGesture: UIPanGestureRecognizer?
+
+/// The right menu swipe to dismiss gesture.
+public static weak var menuRightSwipeToDismissGesture: UIPanGestureRecognizer?
+
+/// Enable or disable gestures that would swipe to present or dismiss the menu. Default is true.
+public static var menuEnableSwipeGestures: Bool = true
+
+/// Enable or disable interaction with the presenting view controller while the menu is displayed. Enabling may make it difficult to dismiss the menu or cause exceptions if the user tries to present and already presented menu. Default is false.
+public static var menuPresentingViewControllerUserInteractionEnabled: Bool = false
+
+/// The strength of the parallax effect on the existing view controller. Does not apply to `menuPresentMode` when set to `ViewSlideOut`. Default is 0.
+public static var menuParallaxStrength: Int = 0
+
+/// Draws the `menuAnimationBackgroundColor` behind the status bar. Default is true.
+public static var menuFadeStatusBar = true
 ```
 
 ## Known Issues
 Don't try to change the status bar appearance when presenting a menu. When used with quick gestures/animations, it causes the presentation animation to not complete properly and locks the UI. See [radar 21961293](http://www.openradar.me/21961293) for more information.
 
+## About Me
+My name is Jon Kent and I'm a freelance iOS designer, developer, and mobile strategist. I love coffee and play the drums. **Hire me!**
+
+🌎 Web: [http://jonkent.me](http://jonkent.me)
+
+✉️ Email: [contact@jonkent.me](mailto:contact@jonkent.me) **_IMPORTANT: If you're having a problem implementing SideMenu, please open an [issue](https://github.com/jonkykong/SideMenu/issues) instead of emailing me. Thanks!_**
+
 ## License
 
 SideMenu is available under the MIT license. See the LICENSE file for more info.

SideMenu.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "SideMenu"
-  s.version          = "1.1.5"
+  s.version          = "1.2.1"
   s.summary          = "Simple side menu control for iOS in Swift inspired by Facebook. Right and Left sides. No coding required."
 
 # This description is used to generate tags and improve search results.