Skip to content

Commit

Permalink
refactor: Remove 'F' suffix from gesture recognizer interfaces
Browse files Browse the repository at this point in the history
  • Loading branch information
kkafar committed Mar 31, 2022
1 parent c759d63 commit a8019a8
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions ios/RNSScreenStackComponentView.mm
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ @interface RNSScreenStackComponentView () <
@end

#if !TARGET_OS_TV
@interface RNSScreenEdgeGestureRecognizerF : UIScreenEdgePanGestureRecognizer
@interface RNSScreenEdgeGestureRecognizer : UIScreenEdgePanGestureRecognizer
@end

@implementation RNSScreenEdgeGestureRecognizerF
@implementation RNSScreenEdgeGestureRecognizer
@end

@interface RNSPanGestureRecognizerF : UIPanGestureRecognizer
@interface RNSPanGestureRecognizer : UIPanGestureRecognizer
@end

@implementation RNSPanGestureRecognizerF
@implementation RNSPanGestureRecognizer
@end
#endif

Expand Down Expand Up @@ -319,18 +319,18 @@ - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
if (topScreen.fullScreenSwipeEnabled) {
// we want only `RNSPanGestureRecognizer` to be able to recognize when
// `fullScreenSwipeEnabled` is set
if ([gestureRecognizer isKindOfClass:[RNSPanGestureRecognizerF class]]) {
if ([gestureRecognizer isKindOfClass:[RNSPanGestureRecognizer class]]) {
_isFullWidthSwiping = YES;
[self cancelTouchesInParent];
return YES;
}
return NO;
}

if ([gestureRecognizer isKindOfClass:[RNSScreenEdgeGestureRecognizerF class]]) {
if ([gestureRecognizer isKindOfClass:[RNSScreenEdgeGestureRecognizer class]]) {
// it should only recognize with `customAnimationOnSwipe` set
return NO;
} else if ([gestureRecognizer isKindOfClass:[RNSPanGestureRecognizerF class]]) {
} else if ([gestureRecognizer isKindOfClass:[RNSPanGestureRecognizer class]]) {
// it should only recognize with `fullScreenSwipeEnabled` set
return NO;
}
Expand All @@ -345,19 +345,19 @@ - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
- (void)setupGestureHandlers
{
// gesture recognizers for custom stack animations
RNSScreenEdgeGestureRecognizerF *leftEdgeSwipeGestureRecognizer =
[[RNSScreenEdgeGestureRecognizerF alloc] initWithTarget:self action:@selector(handleSwipe:)];
RNSScreenEdgeGestureRecognizer *leftEdgeSwipeGestureRecognizer =
[[RNSScreenEdgeGestureRecognizer alloc] initWithTarget:self action:@selector(handleSwipe:)];
leftEdgeSwipeGestureRecognizer.edges = UIRectEdgeLeft;
leftEdgeSwipeGestureRecognizer.delegate = self;
[self addGestureRecognizer:leftEdgeSwipeGestureRecognizer];

RNSScreenEdgeGestureRecognizerF *rightEdgeSwipeGestureRecognizer =
[[RNSScreenEdgeGestureRecognizerF alloc] initWithTarget:self action:@selector(handleSwipe:)];
RNSScreenEdgeGestureRecognizer *rightEdgeSwipeGestureRecognizer =
[[RNSScreenEdgeGestureRecognizer alloc] initWithTarget:self action:@selector(handleSwipe:)];
rightEdgeSwipeGestureRecognizer.edges = UIRectEdgeRight;
rightEdgeSwipeGestureRecognizer.delegate = self;

// gesture recognizer for full width swipe gesture
RNSPanGestureRecognizerF *panRecognizer = [[RNSPanGestureRecognizerF alloc] initWithTarget:self
RNSPanGestureRecognizer *panRecognizer = [[RNSPanGestureRecognizer alloc] initWithTarget:self
action:@selector(handleSwipe:)];
panRecognizer.delegate = self;
[self addGestureRecognizer:panRecognizer];
Expand Down

0 comments on commit a8019a8

Please sign in to comment.