diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutTextSearchable/FKTextSearchable.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutTextSearchable/FKTextSearchable.h index 7ad1503e9..817cb709b 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutTextSearchable/FKTextSearchable.h +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutTextSearchable/FKTextSearchable.h @@ -5,14 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import - -#if TARGET_OS_IPHONE #import -#elif TARGET_OS_OSX -#import -#import -#endif @protocol FKTextSearchable diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitHighlightOverlay/SKHighlightOverlay.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitHighlightOverlay/SKHighlightOverlay.h index 1bf52fd10..aa0c1f8c0 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitHighlightOverlay/SKHighlightOverlay.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitHighlightOverlay/SKHighlightOverlay.h @@ -5,32 +5,14 @@ * LICENSE file in the root directory of this source tree. */ -#import - -#if TARGET_OS_IPHONE #import -#elif TARGET_OS_OSX -#import -#import -#import -#endif @interface SKHighlightOverlay : NSObject + (instancetype)sharedInstance; - -#if TARGET_OS_IPHONE - + (UIColor*)overlayColor; + - (void)mountInView:(UIView*)view withFrame:(CGRect)frame; - -#elif TARGET_OS_OSX - -+ (NSColor*)overlayColor; -- (void)mountInView:(NSView*)view withFrame:(CGRect)frame; - -#endif - - (void)unmount; @end diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitHighlightOverlay/SKHighlightOverlay.mm b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitHighlightOverlay/SKHighlightOverlay.mm index 65b9b0c33..e9e7d77fe 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitHighlightOverlay/SKHighlightOverlay.mm +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitHighlightOverlay/SKHighlightOverlay.mm @@ -31,8 +31,6 @@ return self; } -#if TARGET_OS_IPHONE - - (void)mountInView:(UIView*)view withFrame:(CGRect)frame { [CATransaction begin]; [CATransaction setValue:(id)kCFBooleanTrue @@ -42,25 +40,10 @@ [CATransaction commit]; } -#elif TARGET_OS_OSX - -- (void)mountInView:(NSView*)view withFrame:(CGRect)frame { - [CATransaction begin]; - [CATransaction setValue:(id)kCFBooleanTrue - forKey:kCATransactionDisableActions]; - _overlayLayer.frame = frame; - [view.layer addSublayer:_overlayLayer]; - [CATransaction commit]; -} - -#endif - - (void)unmount { [_overlayLayer removeFromSuperlayer]; } -#if TARGET_OS_IPHONE - + (UIColor*)overlayColor { return [UIColor colorWithRed:136.0 / 255.0 green:117.0 / 255.0 @@ -68,17 +51,6 @@ alpha:0.6]; } -#elif TARGET_OS_OSX - -+ (NSColor*)overlayColor { - return [NSColor colorWithRed:136.0 / 255.0 - green:117.0 / 255.0 - blue:197.0 / 255.0 - alpha:0.6]; -} - -#endif - @end #endif diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/NSCollectionView+SKInvalidation.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/NSCollectionView+SKInvalidation.h deleted file mode 100644 index 44e9441e5..000000000 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/NSCollectionView+SKInvalidation.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#if TARGET_OS_OSX - -#import - -#import - -FB_LINK_REQUIRE_CATEGORY(NSCollectionView_SKInvalidation) -@interface NSCollectionView (SKInvalidation) - -+ (void)enableInvalidations; - -@end - -#endif diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/NSCollectionView+SKInvalidation.mm b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/NSCollectionView+SKInvalidation.mm deleted file mode 100644 index a2ef94268..000000000 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/NSCollectionView+SKInvalidation.mm +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#if TARGET_OS_OSX -#if FB_SONARKIT_ENABLED - -#import "NSCollectionView+SKInvalidation.h" - -#import "SKInvalidation.h" -#import "SKSwizzle.h" - -FB_LINKABLE(NSCollectionView_SKInvalidation) -@implementation NSCollectionView (SKInvalidation) - -+ (void)enableInvalidations { -} - -@end - -#endif // FB_SONARKIT_ENABLED -#endif diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/NSColor+SKSonarValueCoder.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/NSColor+SKSonarValueCoder.h deleted file mode 100644 index 3e6811e78..000000000 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/NSColor+SKSonarValueCoder.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#if TARGET_OS_OSX - -#import - -#import - -#import "SKObject.h" - -FB_LINK_REQUIRE_CATEGORY(NSColor_SonarValueCoder) -@interface NSColor (SonarValueCoder) - -@end - -#endif diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/NSColor+SKSonarValueCoder.mm b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/NSColor+SKSonarValueCoder.mm deleted file mode 100644 index 39cdfa58d..000000000 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/NSColor+SKSonarValueCoder.mm +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#if TARGET_OS_OSX -#if FB_SONARKIT_ENABLED - -#import "NSColor+SKSonarValueCoder.h" - -FB_LINKABLE(NSColor_SonarValueCoder) -@implementation NSColor (SonarValueCoder) - -+ (instancetype)fromSonarValue:(NSNumber*)sonarValue { - NSUInteger intColor = [sonarValue integerValue]; - - CGFloat r, g, b, a; - - b = CGFloat(intColor & 0xFF) / 255; - g = CGFloat((intColor >> 8) & 0xFF) / 255; - r = CGFloat((intColor >> 16) & 0xFF) / 255; - a = CGFloat((intColor >> 24) & 0xFF) / 255; - - return [NSColor colorWithRed:r green:g blue:b alpha:a]; -} - -- (NSDictionary>*)sonarValue { - CGColorSpaceRef colorSpace = CGColorGetColorSpace([self CGColor]); - CGColorSpaceModel colorSpaceModel = CGColorSpaceGetModel(colorSpace); - - NSUInteger red, green, blue, alpha; - - switch (colorSpaceModel) { - case kCGColorSpaceModelUnknown: - case kCGColorSpaceModelRGB: { - CGFloat r, g, b, a; - [self getRed:&r green:&g blue:&b alpha:&a]; - - red = (NSUInteger)(r * 255) & 0xFF; - green = (NSUInteger)(g * 255) & 0xFF; - blue = (NSUInteger)(b * 255) & 0xFF; - alpha = (NSUInteger)(a * 255) & 0xFF; - } break; - - case kCGColorSpaceModelMonochrome: { - CGFloat a, w; - [self getWhite:&w alpha:&a]; - - red = green = blue = (NSUInteger)(w * 255) & 0xFF; - alpha = (NSUInteger)(a * 255) & 0xFF; - } break; - - default: - red = green = blue = alpha = 0; - } - - NSUInteger intColor = (alpha << 24) | (red << 16) | (green << 8) | blue; - return - @{@"__type__" : @"color", @"__mutable__" : @NO, @"value" : @(intColor)}; -} - -@end - -#endif // FB_SONARKIT_ENABLED -#endif diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/NSView+SKInvalidation.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/NSView+SKInvalidation.h deleted file mode 100644 index 21b0261f2..000000000 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/NSView+SKInvalidation.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#if TARGET_OS_OSX - -#import - -FB_LINK_REQUIRE_CATEGORY(NSView_SKInvalidation) -@interface NSView (SKInvalidation) - -+ (void)enableInvalidation; - -@end - -#endif diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/NSView+SKInvalidation.mm b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/NSView+SKInvalidation.mm deleted file mode 100644 index 4fd499b89..000000000 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/NSView+SKInvalidation.mm +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#if TARGET_OS_OSX -#if FB_SONARKIT_ENABLED - -#import -#import -#import "NSView+SKInvalidation.h" -#import "SKInvalidation.h" -#import "SKSwizzle.h" - -FB_LINKABLE(NSView_SKInvalidation) -@implementation NSView (SKInvalidation) - -+ (void)enableInvalidation { - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - swizzleMethods( - [self class], @selector(setHidden:), @selector(swizzle_setHidden:)); - swizzleMethods( - [self class], @selector(addSubview:), @selector(swizzle_addSubview:)); - swizzleMethods( - [self class], - @selector(removeFromSuperview), - @selector(swizzle_removeFromSuperview)); - }); -} - -- (void)swizzle_setHidden:(BOOL)hidden { - [self swizzle_setHidden:hidden]; - - id delegate = - [SKInvalidation sharedInstance].delegate; - if (delegate != nil) { - [delegate invalidateNode:self.superview]; - } -} - -- (void)swizzle_addSubview:(NSView*)view { - [self swizzle_addSubview:view]; - [[SKInvalidation sharedInstance].delegate invalidateNode:self]; -} - -- (void)swizzle_removeFromSuperview { - NSView* oldSuperview = self.superview; - // Be careful that we always call the swizzled implementation - // before any early returns or mischief below! - [self swizzle_removeFromSuperview]; - - if (oldSuperview) { - [[SKInvalidation sharedInstance].delegate invalidateNode:oldSuperview]; - } -} - -@end - -#endif // FB_SONARKIT_ENABLED -#endif diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKInvalidation.m b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKInvalidation.m index a25897392..05966f35c 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKInvalidation.m +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKInvalidation.m @@ -7,22 +7,12 @@ #if FB_SONARKIT_ENABLED -#import "SKInvalidation.h" - -#if TARGET_OS_IPHONE - #import + +#import "SKInvalidation.h" #import "UICollectionView+SKInvalidation.h" #import "UIView+SKInvalidation.h" -#elif TARGET_OS_OSX - -#import -#import "NSCollectionView+SKInvalidation.h" -#import "NSView+SKInvalidation.h" - -#endif - @implementation SKInvalidation + (instancetype)sharedInstance { @@ -39,7 +29,6 @@ + (void)enableInvalidations { static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ -#if TARGET_OS_IPHONE [UIView enableInvalidation]; [UICollectionView enableInvalidations]; @@ -54,13 +43,6 @@ selector:@selector(windowDidBecomeHidden:) name:UIWindowDidBecomeHiddenNotification object:nil]; - -#elif TARGET_OS_OSX - - [NSView enableInvalidation]; - [NSCollectionView enableInvalidations]; - -#endif }); } diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNodeDescriptor.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNodeDescriptor.h index f365ebe45..c32095c8b 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNodeDescriptor.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNodeDescriptor.h @@ -5,14 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import - -#if TARGET_OS_IPHONE #import -#elif TARGET_OS_OSX -#import -#import -#endif #import #import "SKNamed.h" diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKObject.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKObject.h index 79703dc78..78f7fef44 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKObject.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKObject.h @@ -5,14 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import - -#if TARGET_OS_IPHONE #import -#elif TARGET_OS_OSX -#import -#import -#endif @protocol SKSonarValueCoder @@ -27,11 +20,7 @@ class SKObject { SKObject(CGRect rect); SKObject(CGSize size); SKObject(CGPoint point); -#if TARGET_OS_IPHONE SKObject(UIEdgeInsets insets); -#elif TARGET_OS_OSX - SKObject(NSEdgeInsets insets); -#endif SKObject(CGAffineTransform transform); SKObject(id value); SKObject(id value); @@ -49,11 +38,7 @@ class SKMutableObject : public SKObject { SKMutableObject(CGRect rect) : SKObject(rect) {} SKMutableObject(CGSize size) : SKObject(size){}; SKMutableObject(CGPoint point) : SKObject(point){}; -#if TARGET_OS_IPHONE SKMutableObject(UIEdgeInsets insets) : SKObject(insets){}; -#elif TARGET_OS_OSX - SKMutableObject(NSEdgeInsets insets) : SKObject(insets){}; -#endif SKMutableObject(CGAffineTransform transform) : SKObject(transform){}; SKMutableObject(id value) : SKObject(value){}; SKMutableObject(id value) : SKObject(value){}; diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKObject.mm b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKObject.mm index 6fc17176d..710137a41 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKObject.mm +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKObject.mm @@ -21,8 +21,6 @@ SKObject::SKObject(CGPoint point) { _actual = @{@"x" : @(point.x), @"y" : @(point.y)}; } -#if TARGET_OS_IPHONE - SKObject::SKObject(UIEdgeInsets insets) { _actual = @{ @"top" : @(insets.top), @@ -32,19 +30,6 @@ SKObject::SKObject(UIEdgeInsets insets) { }; } -#elif TARGET_OS_OSX - -SKObject::SKObject(NSEdgeInsets insets) { - _actual = @{ - @"top" : @(insets.top), - @"bottom" : @(insets.bottom), - @"left" : @(insets.left), - @"right" : @(insets.right), - }; -} - -#endif - SKObject::SKObject(CGAffineTransform transform) { _actual = @{ @"a" : @(transform.a), diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListener.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListener.h index f53f9a987..a136a5029 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListener.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListener.h @@ -5,14 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import - -#if TARGET_OS_IPHONE #import -#elif TARGET_OS_OSX -#import -#import -#endif typedef void (^SKTapReceiver)(CGPoint touchPoint); diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListenerImpl.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListenerImpl.h index 7f91648e5..0dd285efa 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListenerImpl.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListenerImpl.h @@ -7,16 +7,7 @@ #import "SKTapListener.h" -#if TARGET_OS_IPHONE - @interface SKTapListenerImpl : NSObject -#elif TARGET_OS_OSX - -@interface SKTapListenerImpl - : NSObject - -#endif - @end diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListenerImpl.m b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListenerImpl.m index 473c12738..18e92e36d 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListenerImpl.m +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListenerImpl.m @@ -5,7 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -#include #if FB_SONARKIT_ENABLED #import "SKTapListenerImpl.h" @@ -16,14 +15,9 @@ @implementation SKTapListenerImpl { NSMutableArray* _receiversWaitingForInput; - -#if TARGET_OS_IPHONE UITapGestureRecognizer* _gestureRecognizer; + SKHiddenWindow* _overlayWindow; -#elif TARGET_OS_OSX - NSClickGestureRecognizer* _gestureRecognizer; - SKHiddenWindow* _overlayView; -#endif } @synthesize isMounted = _isMounted; @@ -32,7 +26,6 @@ if (self = [super init]) { _receiversWaitingForInput = [NSMutableArray new]; -#if TARGET_OS_IPHONE _gestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:nil]; _gestureRecognizer.delegate = self; @@ -45,21 +38,6 @@ _overlayWindow.backgroundColor = [SKHighlightOverlay overlayColor]; [_overlayWindow addGestureRecognizer:_gestureRecognizer]; - -#elif TARGET_OS_OSX - _gestureRecognizer = [[NSClickGestureRecognizer alloc] initWithTarget:self - action:nil]; - _gestureRecognizer.delegate = self; - - _isMounted = NO; - - _overlayView = [SKHiddenWindow new]; - - _overlayView.hidden = YES; - _overlayView.window.level = NSStatusWindowLevel; - _overlayView.window.backgroundColor = [SKHighlightOverlay overlayColor]; - [_overlayView addGestureRecognizer:_gestureRecognizer]; -#endif } return self; @@ -70,20 +48,10 @@ return; } -#if TARGET_OS_IPHONE [_overlayWindow setFrame:frame]; [_overlayWindow makeKeyAndVisible]; _overlayWindow.hidden = NO; [[UIApplication sharedApplication].delegate.window addSubview:_overlayWindow]; - -#elif TARGET_OS_OSX - _overlayView.hidden = NO; - [[NSApplication sharedApplication].mainWindow.contentView - addSubview:_overlayView]; - _overlayView.frame = frame; - _overlayView.needsDisplay = YES; -#endif - _isMounted = YES; } @@ -93,15 +61,8 @@ } [_receiversWaitingForInput removeAllObjects]; - -#if TARGET_OS_IPHONE [_overlayWindow removeFromSuperview]; _overlayWindow.hidden = YES; -#elif TARGET_OS_OSX - [_overlayView removeFromSuperview]; - _overlayView.hidden = YES; -#endif - _isMounted = NO; } @@ -109,7 +70,6 @@ [_receiversWaitingForInput addObject:receiver]; } -#if TARGET_OS_IPHONE - (BOOL)gestureRecognizer:(UIGestureRecognizer*)gestureRecognizer shouldReceiveTouch:(UITouch*)touch { if ([_receiversWaitingForInput count] == 0) { @@ -127,25 +87,6 @@ return NO; } -#elif TARGET_OS_OSX -- (BOOL)gestureRecognizer:(NSGestureRecognizer*)gestureRecognizer - shouldReceiveTouch:(NSTouch*)touch { - if ([_receiversWaitingForInput count] == 0) { - return YES; - } - if (@available(macOS 10.12.2, *)) { - CGPoint touchPoint = [touch locationInView:_overlayView]; - for (SKTapReceiver recv in _receiversWaitingForInput) { - recv(touchPoint); - } - } - - [_receiversWaitingForInput removeAllObjects]; - - return NO; -} -#endif - @end #endif diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTouch.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTouch.h index e7ac0b18f..21f677b70 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTouch.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTouch.h @@ -5,14 +5,8 @@ * LICENSE file in the root directory of this source tree. */ -#import -#if TARGET_OS_IPHONE -#import -#elif TARGET_OS_OSX -#import -#endif - #import +#import typedef void (^SKTouchFinishDelegate)(id currentNode); typedef void (^SKProcessFinishDelegate)(NSDictionary* tree); diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UICollectionView+SKInvalidation.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UICollectionView+SKInvalidation.h index 6beb5209e..c000864ff 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UICollectionView+SKInvalidation.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UICollectionView+SKInvalidation.h @@ -5,8 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -#if TARGET_OS_IPHONE - #import #import @@ -17,5 +15,3 @@ FB_LINK_REQUIRE_CATEGORY(UICollectionView_SKInvalidation) + (void)enableInvalidations; @end - -#endif diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UICollectionView+SKInvalidation.mm b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UICollectionView+SKInvalidation.mm index afe09fe1b..4c39ccb62 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UICollectionView+SKInvalidation.mm +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UICollectionView+SKInvalidation.mm @@ -5,7 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -#if TARGET_OS_IPHONE #if FB_SONARKIT_ENABLED #import "UICollectionView+SKInvalidation.h" @@ -37,5 +36,4 @@ FB_LINKABLE(UICollectionView_SKInvalidation) @end -#endif // FB_SONARKIT_ENABLED #endif diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIColor+SKSonarValueCoder.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIColor+SKSonarValueCoder.h index 3e56fac4c..ce237354c 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIColor+SKSonarValueCoder.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIColor+SKSonarValueCoder.h @@ -5,8 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -#if TARGET_OS_IPHONE - #import #import @@ -17,5 +15,3 @@ FB_LINK_REQUIRE_CATEGORY(UIColor_SonarValueCoder) @interface UIColor (SonarValueCoder) @end - -#endif diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIColor+SKSonarValueCoder.mm b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIColor+SKSonarValueCoder.mm index 177787b53..de5fffaf2 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIColor+SKSonarValueCoder.mm +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIColor+SKSonarValueCoder.mm @@ -5,7 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -#if TARGET_OS_IPHONE #if FB_SONARKIT_ENABLED #import "UIColor+SKSonarValueCoder.h" @@ -63,5 +62,4 @@ FB_LINKABLE(UIColor_SonarValueCoder) @end -#endif // FB_SONARKIT_ENABLED #endif diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIView+SKInvalidation.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIView+SKInvalidation.h index 84343adea..4697183ae 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIView+SKInvalidation.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIView+SKInvalidation.h @@ -5,8 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -#if TARGET_OS_IPHONE - #import FB_LINK_REQUIRE_CATEGORY(UIView_SKInvalidation) @@ -15,5 +13,3 @@ FB_LINK_REQUIRE_CATEGORY(UIView_SKInvalidation) + (void)enableInvalidation; @end - -#endif diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIView+SKInvalidation.mm b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIView+SKInvalidation.mm index 34e759c15..d9e0f9989 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIView+SKInvalidation.mm +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIView+SKInvalidation.mm @@ -5,7 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -#if TARGET_OS_IPHONE #if FB_SONARKIT_ENABLED #import @@ -116,5 +115,4 @@ FB_LINKABLE(UIView_SKInvalidation) @end -#endif // FB_SONARKIT_ENABLED #endif diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKHiddenWindow.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKHiddenWindow.h index 1a6851d07..877275dc1 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKHiddenWindow.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKHiddenWindow.h @@ -5,23 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import - -#if TARGET_OS_IPHONE #import -#elif TARGET_OS_OSX -#import -#import -#endif - -#if TARGET_OS_IPHONE @interface SKHiddenWindow : UIWindow @end - -#elif TARGET_OS_OSX - -@interface SKHiddenWindow : NSView -@end - -#endif