Hanlde pan gesture conflicts

Author: lminhtm

LMSideBarController.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name             = "LMSideBarController"
-  s.version          = "1.0.1"
+  s.version          = "1.0.2"
   s.summary          = "LMSideBarController is a simple side bar controller inspired by Tappy"
   s.homepage         = "https://github.com/lminhtm/LMSideBarController"
   s.license          = 'MIT'

LMSideBarController/LMSideBarController.m

@@ -155,15 +155,15 @@ - (void)setMenuViewController:(UIViewController *)menuViewController forDirectio
     // Add the new one
     [self.menuViewControllers setObject:menuViewController forKey:@(direction)];
     if (direction == LMSideBarControllerDirectionLeft) {
-        [self setupViewController:menuViewController frame:CGRectMake(-self.view.bounds.size.width,
+        [self setupViewController:menuViewController frame:CGRectMake(-menuViewController.view.bounds.size.width,
                                                                       0,
-                                                                      self.view.bounds.size.width,
+                                                                      menuViewController.view.bounds.size.width,
                                                                       self.view.bounds.size.height)];
     }
     else {
         [self setupViewController:menuViewController frame:CGRectMake(self.view.bounds.size.width,
                                                                       0,
-                                                                      self.view.bounds.size.width,
+                                                                      menuViewController.view.bounds.size.width,
                                                                       self.view.bounds.size.height)];
     }
     menuViewController.view.hidden = YES;
@@ -323,6 +323,12 @@ - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
 {
     if ([gestureRecognizer isEqual:self.panGestureRecognizer])
     {
+        LMSideBarStyle *style = [self styleForDirection:_currentDirection];
+        BOOL shouldHandle = [style panGestureRecognizerShouldBegin:gestureRecognizer];
+        if (!shouldHandle) {
+            return NO;
+        }
+        
         CGPoint velocity = [(UIPanGestureRecognizer *)gestureRecognizer velocityInView:gestureRecognizer.view];
         BOOL horizontalPan = fabs(velocity.x) > fabs(velocity.y);
 
@@ -425,40 +431,30 @@ - (BOOL)shouldAutorotate
     return NO;
 }
 
-- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
 {
-    [super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
+    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
 
     // Update menu view frame
     UIViewController *leftMenuViewController = [self menuViewControllerForDirection:LMSideBarControllerDirectionLeft];
     if (leftMenuViewController) {
-        leftMenuViewController.view.frame = CGRectMake(-self.view.bounds.size.width,
+        leftMenuViewController.view.frame = CGRectMake(-leftMenuViewController.view.bounds.size.width,
                                                        0,
-                                                       self.view.bounds.size.width,
+                                                       leftMenuViewController.view.bounds.size.width,
                                                        self.view.bounds.size.height);
     }
 
     UIViewController *rightMenuViewController = [self menuViewControllerForDirection:LMSideBarControllerDirectionRight];
     if (rightMenuViewController) {
         rightMenuViewController.view.frame = CGRectMake(self.view.bounds.size.width,
                                                         0,
-                                                        self.view.bounds.size.width,
+                                                        rightMenuViewController.view.bounds.size.width,
                                                         self.view.bounds.size.height);
     }
 
     // Let current side bar style to handle rotation
     if (_currentStyle) {
-        [_currentStyle willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
-    }
-}
-
-- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
-{
-    [super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
-    
-    // Let current side bar style to handle rotation
-    if (_currentStyle) {
-        [_currentStyle didRotateFromInterfaceOrientation:fromInterfaceOrientation];
+        [_currentStyle viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
     }
 }
 

LMSideBarController/LMSideBarStyles/LMSideBarDepthStyle.m

@@ -210,6 +210,20 @@ - (void)hideMenuViewController:(BOOL)animated
     [self finishHiding:animated];
 }
 
+- (BOOL)panGestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
+{
+    CGPoint point = [gestureRecognizer locationInView:gestureRecognizer.view];
+    if (point.x < gestureRecognizer.view.bounds.size.width - self.menuWidth
+        && self.sideBarController.currentDirection == LMSideBarControllerDirectionRight) {
+        return YES;
+    }
+    if (point.x > self.menuWidth
+        && self.sideBarController.currentDirection == LMSideBarControllerDirectionLeft) {
+        return YES;
+    }
+    return NO;
+}
+
 - (void)handleTapGesture:(UITapGestureRecognizer *)tapGestureRecognizer
 {
     CGPoint touchLocation = [tapGestureRecognizer locationInView:tapGestureRecognizer.view];
@@ -313,7 +327,7 @@ - (void)handlePanGesture:(UIPanGestureRecognizer *)panGestureRecognizer
     }
 }
 
-- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
 {
     LMSideBarControllerDirection direction = self.sideBarController.currentDirection;
     LMSideBarControllerState state = self.sideBarController.currentState;

LMSideBarController/LMSideBarStyles/LMSideBarStyle.h

@@ -65,6 +65,11 @@
  */
 - (void)hideMenuViewController:(BOOL)animated;
 
+/**
+ Handle pan gesture
+ */
+- (BOOL)panGestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer;
+
 /**
  Handle tap gesture
 
@@ -82,11 +87,6 @@
 /**
  Handle rotation
  */
-- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration;
-
-/**
- Handle rotation
- */
-- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation;
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator;
 
 @end

LMSideBarController/LMSideBarStyles/LMSideBarStyle.m

@@ -25,22 +25,22 @@ - (void)hideMenuViewController:(BOOL)animated
     // For subclass
 }
 
-- (void)handleTapGesture:(UITapGestureRecognizer *)tapGestureRecognizer
+- (BOOL)panGestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
 {
-    // For subclass
+    return YES;
 }
 
-- (void)handlePanGesture:(UIPanGestureRecognizer *)panGestureRecognizer
+- (void)handleTapGesture:(UITapGestureRecognizer *)tapGestureRecognizer
 {
     // For subclass
 }
 
-- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+- (void)handlePanGesture:(UIPanGestureRecognizer *)panGestureRecognizer
 {
     // For subclass
 }
 
-- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
 {
     // For subclass
 }