Updated pod spec and README for cocoa pods.

* pr/47:
  fix #44

Pod/Classes/SideMenuManager.swift

@@ -24,9 +24,6 @@ public class SideMenuManager {
         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 {
@@ -111,119 +108,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()
         }
     }
     
@@ -236,7 +234,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

@@ -347,10 +347,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 +361,8 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
                     } else {
                         SideMenuTransition.presentMenuComplete()
                     }
+                    menuView.userInteractionEnabled = true
+                    
                     transitionContext.completeTransition(false)
                     
                     if SideMenuTransition.switchMenus {
@@ -373,6 +375,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()
             }
         }
@@ -113,44 +115,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

@@ -4,7 +4,7 @@
 [![Platform](https://img.shields.io/cocoapods/p/SideMenu.svg?style=flat)](http://cocoapods.org/pods/SideMenu)
 
 ## Shameless Requests First
-**1. ### If you like SideMenu, give it a ★ at the top right of its [GitHub](https://github.com/jonkykong/SideMenu) page.**
+**1. If you like SideMenu, give it a ★ at the top right of its [GitHub](https://github.com/jonkykong/SideMenu) page.**
 
 **2. I need an invite to Dribbble to share SideMenu. Invite me: https://dribbble.com/jonkykong**
 

SideMenu.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "SideMenu"
-  s.version          = "1.1.6"
+  s.version          = "1.1.8"
   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.