Added some convenient method when the center controller is also a container view controlller like UITabBarController + correction of a bug when the bar button is a UIButton

Author: ipodishima

PPRevealSideViewController/.DS_Store

@@ -367,6 +367,12 @@ typedef NSUInteger PPRevealSideOptions;
  */
 - (void) preloadViewController:(UIViewController*)controller forSide:(PPRevealSideDirection)direction withOffset:(CGFloat)offset;
 
+/**
+ Remove the controller for a direction. This a convenient method when you use for example a Container view controller like Tab bar controller. When you switch from tabs, you probably want some tabs not to have side controllers. In that case, unload in view will disappear of the tab's controller, then preload on view will appear.
+ @param direction The direction for which to unload the controller
+ */
+- (void) unloadViewControllerForSide:(PPRevealSideDirection)direction;
+
 /**
  Change the offset for a direction. Not animated.
  @param offset The offset
@@ -394,7 +400,10 @@ typedef NSUInteger PPRevealSideOptions;
  @param option The option to reset
  */
 - (void) resetOption:(PPRevealSideOptions)option;
-
+/**
+ Update the view with gestures. Should be called for example when used with controllerForGesturesOnPPRevealSideViewController delegate method when using a container controller as the root. For example with a UITabBarController, call this method when the selected controller has been updated
+ */
+- (void) updateViewWhichHandleGestures;
 @end
 
 /**
@@ -481,6 +490,13 @@ typedef NSUInteger PPRevealSideOptions;
 */
 - (PPRevealSideDirection)pprevealSideViewController:(PPRevealSideViewController*)controller directionsAllowedForPanningOnView:(UIView*)view;
 
+/**
+ Implement this method if you have for example a container as the rootViewController (like UITabBarController). If you do not implement this method, the gestures are added to the RootViewController (the center view controller)
+ 
+ @param controller The reveal side view controller
+ @return the controller in which we will add gestures
+*/
+- (UIViewController*) controllerForGesturesOnPPRevealSideViewController:(PPRevealSideViewController*)controller;
 @end
 
 /**

PPRevealSideViewController/PPRevealSideviewController/PPRevealSideViewController.h

@@ -15,6 +15,7 @@ - (void) setRootViewController:(UIViewController*)controller;
 - (void) handleShadows;
 - (void) informDelegateWithOptionalSelector:(SEL)selector withParam:(id)param;
 - (void) popViewControllerWithNewCenterController:(UIViewController *)centerController animated:(BOOL)animated andPresentNewController:(UIViewController*)controllerToPush withDirection:(PPRevealSideDirection)direction andOffset:(CGFloat)offset;
+- (void) addGesturesToCenterController;
 - (void) addPanGestureToController:(UIViewController*)controller;
 - (void) addTapGestureToController:(UIViewController*)controller;
 - (void) addGesturesToController:(UIViewController*)controller;
@@ -424,6 +425,13 @@ - (void) preloadViewController:(UIViewController*)controller forSide:(PPRevealSi
     [_viewControllersOffsets setObject:[NSNumber numberWithFloat:offset] forKey:[NSNumber numberWithInt:direction]];
 }
 
+- (void) unloadViewControllerForSide:(PPRevealSideDirection)direction
+{
+    NSNumber *key = [NSNumber numberWithInt:direction];
+    UIViewController *controller = [_viewControllers objectForKey:key];
+    [controller.view removeFromSuperview];
+    [_viewControllers removeObjectForKey:key];
+}
 
 - (void) changeOffset:(CGFloat)offset forDirection:(PPRevealSideDirection)direction {
     [self changeOffset:offset forDirection:direction animated:NO];
@@ -481,21 +489,21 @@ - (void) resetOption:(PPRevealSideOptions)option {
 - (void) setPanInteractionsWhenClosed:(PPRevealSideInteractions)panInteractionsWhenClosed {
     [self willChangeValueForKey:@"panInteractionsWhenClosed"];
     _panInteractionsWhenClosed = panInteractionsWhenClosed;
-    [self addGesturesToController:_rootViewController];
+    [self addGesturesToCenterController];
     [self didChangeValueForKey:@"panInteractionsWhenClosed"];
 }
 
 - (void) setPanInteractionsWhenOpened:(PPRevealSideInteractions)panInteractionsWhenOpened {
     [self willChangeValueForKey:@"panInteractionsWhenOpened"];
     _panInteractionsWhenOpened = panInteractionsWhenOpened;
-    [self addGesturesToController:_rootViewController];
+    [self addGesturesToCenterController];
     [self didChangeValueForKey:@"panInteractionsWhenOpened"];
 }
 
 - (void) setTapInteractionsWhenOpened:(PPRevealSideInteractions)tapInteractionsWhenOpened {
     [self willChangeValueForKey:@"tapInteractionsWhenOpened"];
     _tapInteractionsWhenOpened = tapInteractionsWhenOpened;
-    [self addGesturesToController:_rootViewController];
+    [self addGesturesToCenterController];
     [self didChangeValueForKey:@"tapInteractionsWhenOpened"];
 }
 
@@ -527,7 +535,7 @@ - (void) setRootViewController:(UIViewController *)controller {
         [self.view addSubview:_rootViewController.view];
         if ([[[UIDevice currentDevice] systemVersion] floatValue] < 5.0) [_rootViewController viewDidAppear:NO];
 
-        [self addGesturesToController:_rootViewController];
+        [self addGesturesToCenterController];
 
         [self didChangeValueForKey:@"rootViewController"];
     }
@@ -562,7 +570,7 @@ - (void) informDelegateWithOptionalSelector:(SEL)selector withParam:(id)param {
     if (selector == @selector(pprevealSideViewController:didPushController:)
         ||
         selector == @selector(pprevealSideViewController:didPopToController:)) {
-        [self addGesturesToController:_rootViewController];
+        [self addGesturesToCenterController];
     }
 }
 
@@ -579,21 +587,31 @@ - (void) resizeCurrentView {
     }
 }
 
+- (UIViewController*) getControllerForGestures
+{
+    UIViewController *controllerForGestures = _rootViewController;
+    if ([self.delegate respondsToSelector:@selector(controllerForGesturesOnPPRevealSideViewController:)]) {
+        UIViewController *specialController = [self.delegate controllerForGesturesOnPPRevealSideViewController:self];
+        if (specialController) controllerForGestures = specialController;
+    }
+    return controllerForGestures;
+}
+
 - (void) addPanGestureToController:(UIViewController*)controller {
 
     BOOL isClosed = ([self getSideToClose] == PPRevealSideDirectionNone) ? YES : NO;
     PPRevealSideInteractions interactions = isClosed ? _panInteractionsWhenClosed : _panInteractionsWhenOpened;
-
-    if (interactions & PPRevealSideInteractionNavigationBar && ([_rootViewController isKindOfClass:[UINavigationController class]] || _rootViewController.navigationController)) {
+    
+    if (interactions & PPRevealSideInteractionNavigationBar && ([controller isKindOfClass:[UINavigationController class]] || controller.navigationController)) {
         UIPanGestureRecognizer* panGesture = [[UIPanGestureRecognizer alloc] initWithTarget:self
                                                                                      action:@selector(gestureRecognizerDidPan:)];
         panGesture.cancelsTouchesInView = YES;
         panGesture.delegate = self;
         UINavigationController *nav;
-        if ([_rootViewController isKindOfClass:[UINavigationController class]])
-            nav = (UINavigationController*)_rootViewController;
+        if ([controller isKindOfClass:[UINavigationController class]])
+            nav = (UINavigationController*)controller;
             else
-                nav = _rootViewController.navigationController;
+                nav = controller.navigationController;
 
         [nav.navigationBar addGestureRecognizer:panGesture];
         [_gestures addObject:panGesture];
@@ -605,14 +623,14 @@ - (void) addPanGestureToController:(UIViewController*)controller {
         panGesture.cancelsTouchesInView = YES;
         panGesture.delegate = self;
         UIViewController *c;
-        if ([_rootViewController isKindOfClass:[UINavigationController class]]) {
-            c = [((UINavigationController*)_rootViewController).viewControllers lastObject];
+        if ([controller isKindOfClass:[UINavigationController class]]) {
+            c = [((UINavigationController*)controller).viewControllers lastObject];
         }
         else
-            if (_rootViewController.navigationController)
-                c = [_rootViewController.navigationController.viewControllers lastObject];
+            if (controller.navigationController)
+                c = [controller.navigationController.viewControllers lastObject];
             else
-                c = _rootViewController;
+                c = controller;
 
         [c.view addGestureRecognizer:panGesture];
         [_gestures addObject:panGesture];
@@ -629,17 +647,16 @@ - (void) addTapGestureToController:(UIViewController *)controller {
         return; 
     }
 
-    
-    if (_tapInteractionsWhenOpened & PPRevealSideInteractionNavigationBar && ([_rootViewController isKindOfClass:[UINavigationController class]] || _rootViewController.navigationController)) {
+    if (_tapInteractionsWhenOpened & PPRevealSideInteractionNavigationBar && ([controller isKindOfClass:[UINavigationController class]] || controller.navigationController)) {
         UITapGestureRecognizer* tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self
                                                                                      action:@selector(gestureRecognizerDidTap:)];
         tapGesture.cancelsTouchesInView = YES;
         tapGesture.delegate = self;
         UINavigationController *nav;
-        if ([_rootViewController isKindOfClass:[UINavigationController class]])
-            nav = (UINavigationController*)_rootViewController;
+        if ([controller isKindOfClass:[UINavigationController class]])
+            nav = (UINavigationController*)controller;
         else
-            nav = _rootViewController.navigationController;
+            nav = controller.navigationController;
 
         [nav.navigationBar addGestureRecognizer:tapGesture];
         [_gestures addObject:tapGesture];
@@ -652,14 +669,14 @@ - (void) addTapGestureToController:(UIViewController *)controller {
         tapGesture.cancelsTouchesInView = YES;
         tapGesture.delegate = self;
         UIViewController *c;
-        if ([_rootViewController isKindOfClass:[UINavigationController class]]) {
-            c = [((UINavigationController*)_rootViewController).viewControllers lastObject];
+        if ([controller isKindOfClass:[UINavigationController class]]) {
+            c = [((UINavigationController*)controller).viewControllers lastObject];
         }
         else
-            if (_rootViewController.navigationController)
-                c = [_rootViewController.navigationController.viewControllers lastObject];
+            if (controller.navigationController)
+                c = [controller.navigationController.viewControllers lastObject];
             else
-                c = _rootViewController;
+                c = controller;
 
         [c.view addGestureRecognizer:tapGesture];
         [_gestures addObject:tapGesture];
@@ -673,6 +690,11 @@ - (void) addGesturesToController:(UIViewController*)controller {
     [self addTapGestureToController:controller];
 }
 
+- (void) addGesturesToCenterController 
+{
+    [self addGesturesToController:[self getControllerForGestures]];
+}
+
 - (void) removeAllPanGestures {
     NSMutableArray *array = [NSMutableArray arrayWithArray:_gestures];
     for (UIGestureRecognizer* panGest in array) {
@@ -700,6 +722,11 @@ - (void) removeAllGestures {
     [_gestures removeAllObjects];
 }
 
+- (void) updateViewWhichHandleGestures
+{
+    [self addGesturesToCenterController];
+}
+
 #pragma mark Closed Controllers 
 
 - (BOOL) isLeftControllerClosed {
@@ -846,10 +873,10 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceive
     else _wasClosed = NO;
 
     BOOL hasExceptionTouch = NO;
-    if ([touch.view isKindOfClass:[UIControl class]]) {
-        if (![touch.view isKindOfClass:NSClassFromString(@"UINavigationButton")]) hasExceptionTouch = YES;
-    }
-    
+//    if ([touch.view isKindOfClass:[UIControl class]]) {
+//        if (![touch.view isKindOfClass:NSClassFromString(@"UINavigationButton")]) hasExceptionTouch = YES;
+//    }
+
     BOOL hasExceptionDelegate = NO;
     if ([self.delegate respondsToSelector:@selector(pprevealSideViewController:shouldDeactivateGesture:forView:)])
         hasExceptionDelegate = [self.delegate pprevealSideViewController:self