Updated pod spec version and README for cocoa pods.

Changed README back for github.

Pod/Classes/SideMenuManager.swift

@@ -175,7 +175,7 @@ public class SideMenuManager {
         
         if forMenu != .Right {
             let leftScreenEdgeGestureRecognizer = UIScreenEdgePanGestureRecognizer()
-            leftScreenEdgeGestureRecognizer.addTarget(SideMenuTransition.self, action:#selector(SideMenuTransition.handlePresentMenuPan(_:)))
+            leftScreenEdgeGestureRecognizer.addTarget(SideMenuTransition.self, action:#selector(SideMenuTransition.handlePresentMenuLeftScreenEdge(_:)))
             leftScreenEdgeGestureRecognizer.edges = .Left
             leftScreenEdgeGestureRecognizer.cancelsTouchesInView = true
             toView.addGestureRecognizer(leftScreenEdgeGestureRecognizer)
@@ -184,7 +184,7 @@ public class SideMenuManager {
         
         if forMenu != .Left {
             let rightScreenEdgeGestureRecognizer = UIScreenEdgePanGestureRecognizer()
-            rightScreenEdgeGestureRecognizer.addTarget(SideMenuTransition.self, action:#selector(SideMenuTransition.handlePresentMenuPan(_:)))
+            rightScreenEdgeGestureRecognizer.addTarget(SideMenuTransition.self, action:#selector(SideMenuTransition.handlePresentMenuRightScreenEdge(_:)))
             rightScreenEdgeGestureRecognizer.edges = .Right
             rightScreenEdgeGestureRecognizer.cancelsTouchesInView = true
             toView.addGestureRecognizer(rightScreenEdgeGestureRecognizer)

Pod/Classes/SideMenuTransition.swift

@@ -13,6 +13,7 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
     private var presenting = false
     private var interactive = false
     private static weak var originalSuperview: UIView?
+    private static var switchMenus = false
     
     internal static let singleton = SideMenuTransition()
     internal static var presentDirection: UIRectEdge = .Left;
@@ -46,62 +47,75 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
         return viewController
     }
     
+    class func handlePresentMenuLeftScreenEdge(edge: UIScreenEdgePanGestureRecognizer) {
+        SideMenuTransition.presentDirection = .Left
+        handlePresentMenuPan(edge)
+    }
+    
+    class func handlePresentMenuRightScreenEdge(edge: UIScreenEdgePanGestureRecognizer) {
+        SideMenuTransition.presentDirection = .Right
+        handlePresentMenuPan(edge)
+    }
+    
     class func handlePresentMenuPan(pan: UIPanGestureRecognizer) {
         // how much distance have we panned in reference to the parent view?
-        if let view = viewControllerForPresentedMenu != nil ? viewControllerForPresentedMenu?.view : pan.view {
-            let transform = view.transform
-            view.transform = CGAffineTransformIdentity
-            let translation = pan.translationInView(pan.view!)
-            view.transform = transform
-            
-            // do some math to translate this to a percentage based value
-            if !singleton.interactive {
-                if translation.x == 0 {
-                    return // not sure which way the user is swiping yet, so do nothing
-                }
-                
-                if let edge = pan as? UIScreenEdgePanGestureRecognizer {
-                    SideMenuTransition.presentDirection = edge.edges == .Left ? .Left : .Right
-                } else {
-                    SideMenuTransition.presentDirection = translation.x > 0 ? .Left : .Right
-                }
-                
-                if let menuViewController: UINavigationController = SideMenuTransition.presentDirection == .Left ? SideMenuManager.menuLeftNavigationController : SideMenuManager.menuRightNavigationController {
-                    singleton.interactive = true
-                    if let visibleViewController = visibleViewController {
-                        visibleViewController.presentViewController(menuViewController, animated: true, completion: nil)
-                    }
-                }
+        guard let view = viewControllerForPresentedMenu != nil ? viewControllerForPresentedMenu?.view : pan.view else {
+            return
+        }
+        
+        let transform = view.transform
+        view.transform = CGAffineTransformIdentity
+        let translation = pan.translationInView(pan.view!)
+        view.transform = transform
+        
+        // do some math to translate this to a percentage based value
+        if !singleton.interactive {
+            if translation.x == 0 {
+                return // not sure which way the user is swiping yet, so do nothing
             }
             
-            let direction:CGFloat = SideMenuTransition.presentDirection == .Left ? 1 : -1
-            let distance = translation.x / SideMenuManager.menuWidth
-            // now lets deal with different states that the gesture recognizer sends
-            switch (pan.state) {
-            case .Began, .Changed:
-                if pan is UIScreenEdgePanGestureRecognizer {
-                    singleton.updateInteractiveTransition(min(distance * direction, 1))
-                } else if distance > 0 && SideMenuTransition.presentDirection == .Right && SideMenuManager.menuLeftNavigationController != nil {
-                    SideMenuTransition.presentDirection = .Left
-                    singleton.cancelInteractiveTransition()
-                    viewControllerForPresentedMenu?.presentViewController(SideMenuManager.menuLeftNavigationController!, animated: true, completion: nil)
-                } else if distance < 0 && SideMenuTransition.presentDirection == .Left && SideMenuManager.menuRightNavigationController != nil {
-                    SideMenuTransition.presentDirection = .Right
-                    singleton.cancelInteractiveTransition()
-                    viewControllerForPresentedMenu?.presentViewController(SideMenuManager.menuRightNavigationController!, animated: true, completion: nil)
-                } else {
-                    singleton.updateInteractiveTransition(min(distance * direction, 1))
-                }
-            default:
-                singleton.interactive = false
-                view.transform = CGAffineTransformIdentity
-                let velocity = pan.velocityInView(pan.view!).x * direction
-                view.transform = transform
-                if velocity >= 100 || velocity >= -50 && abs(distance) >= 0.5 {
-                    singleton.finishInteractiveTransition()
-                } else {
-                    singleton.cancelInteractiveTransition()
+            if !(pan is UIScreenEdgePanGestureRecognizer) {
+                SideMenuTransition.presentDirection = translation.x > 0 ? .Left : .Right
+            }
+            
+            if let menuViewController = SideMenuTransition.presentDirection == .Left ? SideMenuManager.menuLeftNavigationController : SideMenuManager.menuRightNavigationController,
+                visibleViewController = visibleViewController {
+                singleton.interactive = true
+                visibleViewController.presentViewController(menuViewController, animated: true, completion: nil)
+            }
+        }
+        
+        let direction: CGFloat = SideMenuTransition.presentDirection == .Left ? 1 : -1
+        let distance = translation.x / SideMenuManager.menuWidth
+        // now lets deal with different states that the gesture recognizer sends
+        switch (pan.state) {
+        case .Began, .Changed:
+            if pan is UIScreenEdgePanGestureRecognizer {
+                singleton.updateInteractiveTransition(min(distance * direction, 1))
+            } else if distance > 0 && SideMenuTransition.presentDirection == .Right && SideMenuManager.menuLeftNavigationController != nil {
+                SideMenuTransition.presentDirection = .Left
+                switchMenus = true
+                singleton.cancelInteractiveTransition()
+            } else if distance < 0 && SideMenuTransition.presentDirection == .Left && SideMenuManager.menuRightNavigationController != nil {
+                SideMenuTransition.presentDirection = .Right
+                switchMenus = true
+                singleton.cancelInteractiveTransition()
+            } else {
+                singleton.updateInteractiveTransition(min(distance * direction, 1))
+            }
+        default:
+            singleton.interactive = false
+            view.transform = CGAffineTransformIdentity
+            let velocity = pan.velocityInView(pan.view!).x * direction
+            view.transform = transform
+            if velocity >= 100 || velocity >= -50 && abs(distance) >= 0.5 {
+                // bug workaround: animation briefly resets after call to finishInteractiveTransition() but before animateTransition completion is called.
+                if NSProcessInfo().operatingSystemVersion.majorVersion == 8 {
+                    singleton.updateInteractiveTransition(0.9999)
                 }
+                singleton.finishInteractiveTransition()
+            } else {
+                singleton.cancelInteractiveTransition()
             }
         }
     }
@@ -122,9 +136,12 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
             singleton.interactive = false
             let velocity = pan.velocityInView(pan.view!).x * direction
             if velocity >= 100 || velocity >= -50 && distance >= 0.5 {
+                // bug workaround: animation briefly resets after call to finishInteractiveTransition() but before animateTransition completion is called.
+                if NSProcessInfo().operatingSystemVersion.majorVersion == 8 {
+                    singleton.updateInteractiveTransition(0.9999)
+                }
                 singleton.finishInteractiveTransition()
-            }
-            else {
+            } else {
                 singleton.cancelInteractiveTransition()
             }
         }
@@ -188,48 +205,50 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
     }
     
     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
+        }
+        
         let mainViewController = SideMenuTransition.viewControllerForPresentedMenu!
-        if let menuView = SideMenuTransition.presentDirection == .Left ? SideMenuManager.menuLeftNavigationController?.view : SideMenuManager.menuRightNavigationController?.view {
-            menuView.transform = CGAffineTransformIdentity
-            mainViewController.view.transform = CGAffineTransformIdentity
-            menuView.frame.size.width = SideMenuManager.menuWidth
-            menuView.frame.size.height = size.height
-            menuView.frame.origin.x = SideMenuTransition.presentDirection == .Left ? 0 : size.width - SideMenuManager.menuWidth
-            SideMenuTransition.statusBarView?.frame = UIApplication.sharedApplication().statusBarFrame
-            SideMenuTransition.statusBarView?.alpha = 1
+        menuView.transform = CGAffineTransformIdentity
+        mainViewController.view.transform = CGAffineTransformIdentity
+        menuView.frame.size.width = SideMenuManager.menuWidth
+        menuView.frame.size.height = size.height
+        menuView.frame.origin.x = SideMenuTransition.presentDirection == .Left ? 0 : size.width - SideMenuManager.menuWidth
+        SideMenuTransition.statusBarView?.frame = UIApplication.sharedApplication().statusBarFrame
+        SideMenuTransition.statusBarView?.alpha = 1
+        
+        switch SideMenuManager.menuPresentMode {
             
-            switch SideMenuManager.menuPresentMode {
-                
-            case .ViewSlideOut:
-                menuView.alpha = 1
-                let direction:CGFloat = SideMenuTransition.presentDirection == .Left ? 1 : -1
-                mainViewController.view.frame.origin.x = direction * (menuView.frame.width)
-                mainViewController.view.layer.shadowColor = SideMenuManager.menuShadowColor.CGColor
-                mainViewController.view.layer.shadowRadius = SideMenuManager.menuShadowRadius
-                mainViewController.view.layer.shadowOpacity = SideMenuManager.menuShadowOpacity
-                mainViewController.view.layer.shadowOffset = CGSizeMake(0, 0)
-                
-            case .ViewSlideInOut:
-                menuView.alpha = 1
-                menuView.layer.shadowColor = SideMenuManager.menuShadowColor.CGColor
-                menuView.layer.shadowRadius = SideMenuManager.menuShadowRadius
-                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.transform = CGAffineTransformMakeScale(SideMenuManager.menuAnimationTransformScaleFactor, SideMenuManager.menuAnimationTransformScaleFactor)
-                mainViewController.view.alpha = 1 - SideMenuManager.menuAnimationFadeStrength
-                
-            case .MenuSlideIn, .MenuDissolveIn:
-                menuView.alpha = 1
-                menuView.layer.shadowColor = SideMenuManager.menuShadowColor.CGColor
-                menuView.layer.shadowRadius = SideMenuManager.menuShadowRadius
-                menuView.layer.shadowOpacity = SideMenuManager.menuShadowOpacity
-                menuView.layer.shadowOffset = CGSizeMake(0, 0)
-                mainViewController.view.frame = CGRectMake(0, 0, size.width, size.height)
-                mainViewController.view.transform = CGAffineTransformMakeScale(SideMenuManager.menuAnimationTransformScaleFactor, SideMenuManager.menuAnimationTransformScaleFactor)
-                mainViewController.view.alpha = 1 - SideMenuManager.menuAnimationFadeStrength
-            }
+        case .ViewSlideOut:
+            menuView.alpha = 1
+            let direction:CGFloat = SideMenuTransition.presentDirection == .Left ? 1 : -1
+            mainViewController.view.frame.origin.x = direction * (menuView.frame.width)
+            mainViewController.view.layer.shadowColor = SideMenuManager.menuShadowColor.CGColor
+            mainViewController.view.layer.shadowRadius = SideMenuManager.menuShadowRadius
+            mainViewController.view.layer.shadowOpacity = SideMenuManager.menuShadowOpacity
+            mainViewController.view.layer.shadowOffset = CGSizeMake(0, 0)
+            
+        case .ViewSlideInOut:
+            menuView.alpha = 1
+            menuView.layer.shadowColor = SideMenuManager.menuShadowColor.CGColor
+            menuView.layer.shadowRadius = SideMenuManager.menuShadowRadius
+            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.transform = CGAffineTransformMakeScale(SideMenuManager.menuAnimationTransformScaleFactor, SideMenuManager.menuAnimationTransformScaleFactor)
+            mainViewController.view.alpha = 1 - SideMenuManager.menuAnimationFadeStrength
+            
+        case .MenuSlideIn, .MenuDissolveIn:
+            menuView.alpha = 1
+            menuView.layer.shadowColor = SideMenuManager.menuShadowColor.CGColor
+            menuView.layer.shadowRadius = SideMenuManager.menuShadowRadius
+            menuView.layer.shadowOpacity = SideMenuManager.menuShadowOpacity
+            menuView.layer.shadowOffset = CGSizeMake(0, 0)
+            mainViewController.view.frame = CGRectMake(0, 0, size.width, size.height)
+            mainViewController.view.transform = CGAffineTransformMakeScale(SideMenuManager.menuAnimationTransformScaleFactor, SideMenuManager.menuAnimationTransformScaleFactor)
+            mainViewController.view.alpha = 1 - SideMenuManager.menuAnimationFadeStrength
         }
     }
     
@@ -264,8 +283,6 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
     // animate a change from one viewcontroller to another
     internal func animateTransition(transitionContext: UIViewControllerContextTransitioning) {
         
-        let statusBarStyle = SideMenuTransition.visibleViewController?.preferredStatusBarStyle()
-        
         // get reference to our fromView, toView and the container view that we should perform the transition in
         let container = transitionContext.containerView()!
         if let menuBackgroundColor = SideMenuManager.menuAnimationBackgroundColor {
@@ -335,36 +352,44 @@ internal class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewC
                 SideMenuTransition.hideMenuStart()
             }
             }) { (finished) -> Void in
-                if SideMenuTransition.visibleViewController?.preferredStatusBarStyle() != statusBarStyle {
-                    print("Warning: do not change the status bar style while using custom transitions or you risk transitions not properly completing and locking up the UI. See http://www.openradar.me/21961293")
-                }
                 // tell our transitionContext object that we've finished animating
                 if transitionContext.transitionWasCancelled() {
+                    let viewControllerForPresentedMenu = SideMenuTransition.viewControllerForPresentedMenu
+                    
                     if self.presenting {
                         SideMenuTransition.hideMenuComplete()
                     } else {
                         SideMenuTransition.presentMenuComplete()
                     }
                     transitionContext.completeTransition(false)
-                } else {
-                    if self.presenting {
-                        SideMenuTransition.presentMenuComplete()
-                        transitionContext.completeTransition(true)
-                        switch SideMenuManager.menuPresentMode {
-                        case .ViewSlideOut:
-                            container.addSubview(topView)
-                        case .MenuSlideIn, .MenuDissolveIn, .ViewSlideInOut:
-                            container.insertSubview(topView, atIndex: 0)
-                        }
-                        if let statusBarView = SideMenuTransition.statusBarView {
-                            container.bringSubviewToFront(statusBarView)
-                        }
-                    } else {
-                        SideMenuTransition.hideMenuComplete()
-                        transitionContext.completeTransition(true)
-                        menuView.removeFromSuperview()
+                    
+                    if SideMenuTransition.switchMenus {
+                        SideMenuTransition.switchMenus = false
+                        viewControllerForPresentedMenu?.presentViewController(SideMenuTransition.presentDirection == .Left ? SideMenuManager.menuLeftNavigationController! : SideMenuManager.menuRightNavigationController!, animated: true, completion: nil)
                     }
+                    
+                    return
                 }
+                
+                if self.presenting {
+                    SideMenuTransition.presentMenuComplete()
+                    transitionContext.completeTransition(true)
+                    switch SideMenuManager.menuPresentMode {
+                    case .ViewSlideOut:
+                        container.addSubview(topView)
+                    case .MenuSlideIn, .MenuDissolveIn, .ViewSlideInOut:
+                        container.insertSubview(topView, atIndex: 0)
+                    }
+                    if let statusBarView = SideMenuTransition.statusBarView {
+                        container.bringSubviewToFront(statusBarView)
+                    }
+                    
+                    return
+                }
+                
+                SideMenuTransition.hideMenuComplete()
+                transitionContext.completeTransition(true)
+                menuView.removeFromSuperview()
         }
     }
     

README.md

@@ -3,24 +3,24 @@
 [![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.
 
 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] Three standard animation styles to choose from.
-- [x] Highly customizable without needing to write tons of custom code.
-- [x] Supports continuous swiping between each side menu in a single gesture.
-- [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.**
+* Three standard animation styles to choose from.
+* Highly customizable without needing to write tons of custom code.
+* Supports continuous swiping between each side menu in a single gesture.
+* 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!
 
-![](etc/Slide%20Out.gif)
-![](etc/Slide%20In.gif)
+![](etc/SlideOut.gif)
+![](etc/SlideIn.gif)
 ![](etc/Dissolve.gif)
-![](etc/In%20%2B%20Out.gif)
+![](etc/InOut.gif)
 
 ## Requirements
-- [x] iOS 8 or higher
+* iOS 8 or higher
 
 ## Installation
 

SideMenu.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "SideMenu"
-  s.version          = "1.0.4"
+  s.version          = "1.1.3"
   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.
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
                        DESC
 
   s.homepage         = "https://github.com/jonkykong/SideMenu"
-  s.screenshots      = [ "https://raw.githubusercontent.com/jonkykong/SideMenu/master/etc/Slide%20Out.gif", "https://raw.githubusercontent.com/jonkykong/SideMenu/master/etc/Slide%20In.gif", "https://raw.githubusercontent.com/jonkykong/SideMenu/master/etc/Dissolve.gif", "https://raw.githubusercontent.com/jonkykong/SideMenu/master/etc/In%20%2B%20Out.gif" ]
+  s.screenshots      = [ "https://raw.githubusercontent.com/jonkykong/SideMenu/master/etc/SlideOut.gif", "https://raw.githubusercontent.com/jonkykong/SideMenu/master/etc/SlideIn.gif", "https://raw.githubusercontent.com/jonkykong/SideMenu/master/etc/Dissolve.gif", "https://raw.githubusercontent.com/jonkykong/SideMenu/master/etc/InOut.gif" ]
   s.license          = 'MIT'
   s.author           = { "jonkykong" => "jonk@jonked.com" }
   s.source           = { :git => "https://github.com/jonkykong/SideMenu.git", :tag => s.version.to_s }