Skip to content

add api for simultaneously gesture recognize block #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add api for simultaneously gesture recognize block #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion MMDrawerController/MMDrawerController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ typedef void (^MMDrawerControllerDrawerVisualStateBlock)(MMDrawerController * dr

@param gestureCompletionBlock A block object to be called that allows the implementer be notified when a gesture action has been completed.
*/
-(void)setGestureCompletionBlock:(void(^)(MMDrawerController * drawerController, UIGestureRecognizer * gesture))gestureCompletionBlock;
-(void)setGestureCompletionBlock:(void(^)(MMDrawerController * drawerController, UIGestureRecognizer * gesture)) gestureCompletionBlock;

///---------------------------------------
/// @name Custom Gesture Handler
Expand All @@ -452,4 +452,6 @@ typedef void (^MMDrawerControllerDrawerVisualStateBlock)(MMDrawerController * dr
*/
-(void)setGestureShouldRecognizeTouchBlock:(BOOL(^)(MMDrawerController * drawerController, UIGestureRecognizer * gesture, UITouch * touch))gestureShouldRecognizeTouchBlock;

-(void)setGestureShouldSimultaneouslyRecognizeBlock:(BOOL(^)(MMDrawerController * drawerController, UIGestureRecognizer * gesture, UIGestureRecognizer * otherGesture))gestureShouldSimultaneouslyRecognizeBlock;

@end
17 changes: 17 additions & 0 deletions MMDrawerController/MMDrawerController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
CGFloat const MMDrawerOvershootPercentage = 0.1f;

typedef BOOL (^MMDrawerGestureShouldRecognizeTouchBlock)(MMDrawerController * drawerController, UIGestureRecognizer * gesture, UITouch * touch);

typedef BOOL (^MMDrawerShouldSimultaneouslyRecognizeGestureBlock)(MMDrawerController * drawerController, UIGestureRecognizer * gesture, UIGestureRecognizer * otherGesture);

typedef void (^MMDrawerGestureCompletionBlock)(MMDrawerController * drawerController, UIGestureRecognizer * gesture);

static CAKeyframeAnimation * bounceKeyFrameAnimationForDistanceOnView(CGFloat distance, UIView * view) {
Expand Down Expand Up @@ -135,6 +138,7 @@ @interface MMDrawerController () <UIGestureRecognizerDelegate>{
@property (nonatomic, assign) CGRect startingPanRect;
@property (nonatomic, copy) MMDrawerControllerDrawerVisualStateBlock drawerVisualState;
@property (nonatomic, copy) MMDrawerGestureShouldRecognizeTouchBlock gestureShouldRecognizeTouch;
@property (nonatomic, copy) MMDrawerShouldSimultaneouslyRecognizeGestureBlock shouldSimultaneouslyRecognizeGesture;
@property (nonatomic, copy) MMDrawerGestureCompletionBlock gestureCompletion;
@property (nonatomic, assign, getter = isAnimatingDrawer) BOOL animatingDrawer;

Expand Down Expand Up @@ -685,6 +689,11 @@ -(void)setGestureShouldRecognizeTouchBlock:(BOOL (^)(MMDrawerController *, UIGes
[self setGestureShouldRecognizeTouch:gestureShouldRecognizeTouchBlock];
}


-(void)setGestureShouldSimultaneouslyRecognizeBlock:(BOOL(^)(MMDrawerController * drawerController, UIGestureRecognizer * gesture, UIGestureRecognizer * otherGesture))gestureShouldSimultaneouslyRecognizeBlock {
[self setShouldSimultaneouslyRecognizeGesture:gestureShouldSimultaneouslyRecognizeBlock];
}

#pragma mark - Setting the Gesture Completion Block
-(void)setGestureCompletionBlock:(void (^)(MMDrawerController *, UIGestureRecognizer *))gestureCompletionBlock{
[self setGestureCompletion:gestureCompletionBlock];
Expand Down Expand Up @@ -1374,6 +1383,14 @@ -(BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveT
}
}

- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer {
if (self.shouldSimultaneouslyRecognizeGesture) {
return self.shouldSimultaneouslyRecognizeGesture(self, gestureRecognizer, otherGestureRecognizer);
}
return NO;
}


#pragma mark Gesture Recogizner Delegate Helpers
-(MMCloseDrawerGestureMode)possibleCloseGestureModesForGestureRecognizer:(UIGestureRecognizer*)gestureRecognizer withTouch:(UITouch*)touch{
CGPoint point = [touch locationInView:self.childControllerContainerView];
Expand Down