adds UITapGestureRecognizer and implements UIGestureRecognizerDelegate to disable gesture recognizers on the fly based on master view state

OliverLetterer · OliverLetterer · commit 4a53ae4e8eab · 2011-10-17T07:26:57.000+02:00
diff --git a/CTSplitViewController/CTSplitViewController.h b/CTSplitViewController/CTSplitViewController.h
@@ -45,7 +45,7 @@ typedef NSInteger CTSplitViewControllerVisibleMasterViewOrientations;
  @class         CTSplitViewController
  @abstract      parent view controller that mimics the behaviour of a UISplitViewController but with additional features.
  */
-@interface CTSplitViewController : UIViewController {
+@interface CTSplitViewController : UIViewController <UIGestureRecognizerDelegate> {
 @private
     id<CTSplitViewControllerDelegate> __unsafe_unretained _delegate;
     
@@ -55,6 +55,7 @@ typedef NSInteger CTSplitViewControllerVisibleMasterViewOrientations;
     
     UISwipeGestureRecognizer *_leftSwipeGestureRecognizer;
     UISwipeGestureRecognizer *_rightSwipeGestureRecognizer;
+    UITapGestureRecognizer *_tapGestureRecognizer;
     
     CTSplitViewControllerVisibleMasterViewOrientations _supportedMasterViewOrientations;
 }
@@ -73,6 +74,7 @@ typedef NSInteger CTSplitViewControllerVisibleMasterViewOrientations;
 
 @property (nonatomic, readonly) UISwipeGestureRecognizer *leftSwipeGestureRecognizer;
 @property (nonatomic, readonly) UISwipeGestureRecognizer *rightSwipeGestureRecognizer;
+@property (nonatomic, readonly) UITapGestureRecognizer *tapGestureRecognizer;
 
 @property (nonatomic, assign) CTSplitViewControllerVisibleMasterViewOrientations supportedMasterViewOrientations;
 
diff --git a/CTSplitViewController/CTSplitViewController.m b/CTSplitViewController/CTSplitViewController.m
@@ -67,6 +67,7 @@ - (void)_showMasterViewControllerAnimated:(BOOL)animated;
 
 - (void)_rightSwipeGestureRecognized:(UISwipeGestureRecognizer *)recognizer;
 - (void)_leftSwipeGestureRecognized:(UISwipeGestureRecognizer *)recognizer;
+- (void)_tapGestureRecognized:(UITapGestureRecognizer *)recognizer;
 
 - (void)_morphMasterViewInAnimated:(BOOL)animated;
 - (void)_morphMasterViewOutAnimated:(BOOL)animated;
@@ -84,7 +85,7 @@ - (void)_masterViewWillAppearAndInvalidateBarButtonItem;
 
 
 @implementation CTSplitViewController
-@synthesize delegate=_delegate, viewControllers=_viewControllers, leftSwipeGestureRecognizer=_leftSwipeGestureRecognizer, rightSwipeGestureRecognizer=_rightSwipeGestureRecognizer, supportedMasterViewOrientations=_supportedMasterViewOrientations;
+@synthesize delegate=_delegate, viewControllers=_viewControllers, leftSwipeGestureRecognizer=_leftSwipeGestureRecognizer, rightSwipeGestureRecognizer=_rightSwipeGestureRecognizer, tapGestureRecognizer=_tapGestureRecognizer, supportedMasterViewOrientations=_supportedMasterViewOrientations;
 
 #pragma mark - setters and getters
 
@@ -240,11 +241,19 @@ - (void)loadView {
     
     _rightSwipeGestureRecognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(_rightSwipeGestureRecognized:)];
     _rightSwipeGestureRecognizer.direction = UISwipeGestureRecognizerDirectionRight;
+    _rightSwipeGestureRecognizer.delegate = self;
     [self.view addGestureRecognizer:_rightSwipeGestureRecognizer];
     
     _leftSwipeGestureRecognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(_leftSwipeGestureRecognized:)];
     _leftSwipeGestureRecognizer.direction = UISwipeGestureRecognizerDirectionLeft;
+    _leftSwipeGestureRecognizer.delegate = self;
     [self.view addGestureRecognizer:_leftSwipeGestureRecognizer];
+    
+    _tapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_tapGestureRecognized:)];
+    _tapGestureRecognizer.numberOfTapsRequired = 1;
+    _tapGestureRecognizer.numberOfTouchesRequired = 1;
+    _tapGestureRecognizer.delegate = self;
+    [self.view addGestureRecognizer:_tapGestureRecognizer];
 }
 
 - (void)viewDidLoad
@@ -263,6 +272,7 @@ - (void)viewDidUnload
     _detailsView = nil;
     _rightSwipeGestureRecognizer = nil;
     _leftSwipeGestureRecognizer = nil;
+    _tapGestureRecognizer = nil;
 }
 
 #pragma mark - rotation support
@@ -291,15 +301,9 @@ - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceO
         _masterView.state = CTSplitViewControllerMasterViewStateVisible;
         _masterView.frame = self.visibleMasterFrame;
         _detailsView.frame = self.visibleMasterDetailsFrame;
-        
-        _leftSwipeGestureRecognizer.enabled = NO;
-        _rightSwipeGestureRecognizer.enabled = NO;
     } else {
         [self _unloadMasterView];
         _detailsView.frame = self.hiddenMasterDetailsFrame;
-        
-        _leftSwipeGestureRecognizer.enabled = YES;
-        _rightSwipeGestureRecognizer.enabled = YES;
     }
 }
 
@@ -361,6 +365,21 @@ - (BOOL)automaticallyForwardAppearanceAndRotationMethodsToChildViewControllers
     return NO;
 }
 
+#pragma mark - UIGestureRecognizerDelegate
+
+- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
+{
+    if (gestureRecognizer == _tapGestureRecognizer) {
+        return _masterView.state == CTSplitViewControllerMasterViewStateMorphedIn;
+    } else if (gestureRecognizer == _leftSwipeGestureRecognizer) {
+        return _masterView.state == CTSplitViewControllerMasterViewStateMorphedIn;
+    } else if (gestureRecognizer == _rightSwipeGestureRecognizer) {
+        return ![self _isMasterViewControllerVisibleInInterfaceOrientation:self.interfaceOrientation] && _masterView.state != CTSplitViewControllerMasterViewStateMorphedIn;
+    }
+    
+    return YES;
+}
+
 #pragma mark - private implementation ()
 
 - (void)_removeViewControllers
@@ -419,9 +438,6 @@ - (void)_hideMasterViewControllerAnimated:(BOOL)animated
     void(^completionBlock)(BOOL finished) = ^(BOOL finished) {
         [self.masterViewController viewDidDisappear:animated];
         [self _unloadMasterView];
-        
-        _leftSwipeGestureRecognizer.enabled = YES;
-        _rightSwipeGestureRecognizer.enabled = YES;
     };
     
     
@@ -525,6 +541,12 @@ - (void)_leftSwipeGestureRecognized:(UISwipeGestureRecognizer *)recognizer
     }
 }
 
+- (void)_tapGestureRecognized:(UITapGestureRecognizer *)recognizer
+{
+    NSLog(@"Wow, recognized");
+#warning implement
+}
+
 - (void)_morphMasterViewInAnimated:(BOOL)animated
 {
     if (!self.isMasterViewLoaded) {
