Fix compatibility with TV (software-mansion#475)

This is a fix for software-mansion#448. `ifndef TARGET_OS_TV` is not proper check since `TARGET_OS_TV` is defined, but set to `NO` https://github.com/kmagiera/react-native-gesture-handler/pull/475/files#diff-18049faae8f7be012debf7181b7ee576L24 Also, it seems to unwanted change. This code is no compilable.
PicnicSupermarket · Feb 28, 2019 · cb33bc9 · cb33bc9
1 parent c9f7c46
commit cb33bc9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/ios/Handlers/RNFlingHandler.m b/ios/Handlers/RNFlingHandler.m
@@ -21,7 +21,7 @@ - (void)configure:(NSDictionary *)config
         recognizer.direction = [RCTConvert NSInteger:prop];
     }
 
-#ifndef TARGET_OS_TV
+#if !TARGET_OS_TV
     prop = config[@"numberOfPointers"];
     if (prop != nil) {
         recognizer.numberOfTouchesRequired = [RCTConvert NSInteger:prop];

diff --git a/ios/Handlers/RNForceTouchHandler.m b/ios/Handlers/RNForceTouchHandler.m
@@ -76,7 +76,7 @@ - (BOOL)shouldFail {
 
 - (void)performFeedbackIfRequired
 {
-#ifndef TARGET_OS_TV
+#if !TARGET_OS_TV
   if (_feedbackOnActivation) {
     if (@available(iOS 10.0, *)) {
       [[[UIImpactFeedbackGenerator alloc] initWithStyle:(UIImpactFeedbackStyleMedium)] impactOccurred];

diff --git a/ios/Handlers/RNPanHandler.m b/ios/Handlers/RNPanHandler.m
@@ -54,7 +54,7 @@ - (id)initWithGestureHandler:(RNGestureHandler*)gestureHandler
     _failOffsetYStart = NAN;
     _failOffsetYEnd = NAN;
     _hasCustomActivationCriteria = NO;
-#ifndef TARGET_OS_TV
+#if !TARGET_OS_TV
     _realMinimumNumberOfTouches = self.minimumNumberOfTouches;
 #endif
   }
@@ -68,7 +68,7 @@ - (void)setMinimumNumberOfTouches:(NSUInteger)minimumNumberOfTouches
 
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
 {
-#ifndef TARGET_OS_TV
+#if !TARGET_OS_TV
   if (_hasCustomActivationCriteria) {
     // We use "minimumNumberOfTouches" property to prevent pan handler from recognizing
     // the gesture too early before we are sure that all criteria (e.g. minimum distance
@@ -102,7 +102,7 @@ - (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
     }
   }
   if (_hasCustomActivationCriteria && self.state == UIGestureRecognizerStatePossible && [self shouldActivateUnderCustomCriteria]) {
-#ifndef TARGET_OS_TV
+#if !TARGET_OS_TV
     super.minimumNumberOfTouches = _realMinimumNumberOfTouches;
     if ([self numberOfTouches] >= _realMinimumNumberOfTouches) {
       self.state = UIGestureRecognizerStateBegan;
@@ -206,7 +206,7 @@ - (void)configure:(NSDictionary *)config
   APPLY_FLOAT_PROP(failOffsetYStart);
   APPLY_FLOAT_PROP(failOffsetYEnd);
 
-#ifndef TARGET_OS_TV
+#if !TARGET_OS_TV
   APPLY_NAMED_INT_PROP(minimumNumberOfTouches, @"minPointers");
   APPLY_NAMED_INT_PROP(maximumNumberOfTouches, @"maxPointers");
 #endif

diff --git a/ios/Handlers/RNPinchHandler.m b/ios/Handlers/RNPinchHandler.m
@@ -13,14 +13,14 @@ @implementation RNPinchGestureHandler
 - (instancetype)initWithTag:(NSNumber *)tag
 {
     if ((self = [super initWithTag:tag])) {
-#ifndef TARGET_OS_TV
+#if !TARGET_OS_TV
         _recognizer = [[UIPinchGestureRecognizer alloc] initWithTarget:self action:@selector(handleGesture:)];
 #endif
     }
     return self;
 }
 
-#ifndef TARGET_OS_TV
+#if !TARGET_OS_TV
 - (RNGestureHandlerEventExtraData *)eventExtraData:(UIPinchGestureRecognizer *)recognizer
 {
     return [RNGestureHandlerEventExtraData

diff --git a/ios/Handlers/RNRotationHandler.m b/ios/Handlers/RNRotationHandler.m
@@ -13,15 +13,14 @@ @implementation RNRotationGestureHandler
 - (instancetype)initWithTag:(NSNumber *)tag
 {
     if ((self = [super initWithTag:tag])) {
-        #ifndef TARGET_OS_TV
+        #if !TARGET_OS_TV
         _recognizer = [[UIRotationGestureRecognizer alloc] initWithTarget:self action:@selector(handleGesture:)];
         #endif
     }
     return self;
 }
 
-#ifndef TARGET_OS_TV
-_recognizer = [[UIRotation
+#if !TARGET_OS_TV
 - (RNGestureHandlerEventExtraData *)eventExtraData:(UIRotationGestureRecognizer *)recognizer
 {
     return [RNGestureHandlerEventExtraData