Skip to content

Commit

Permalink
Make iOS 9 compatible again.
Browse files Browse the repository at this point in the history
  • Loading branch information
alloy committed Mar 6, 2020
1 parent 76f2f0f commit 16ca010
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion FlipperKit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Pod::Spec.new do |spec|
spec.source = { :git => 'https://github.com/facebook/Sonar.git',
:tag=> "v"+flipperkit_version }
spec.module_name = 'FlipperKit'
spec.platforms = { :ios => "10.0" }
spec.platforms = { :ios => "9.0" }
spec.default_subspecs = "Core"

# This subspec is necessary since FBDefines.h is imported as <FBDefines/FBDefines.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -222,14 +222,12 @@ - (NSArray*)validChildrenForNode:(UIView*)node {
nil];
}

- (NSDictionary<NSString*, SKNodeUpdateData>*)dataMutationsForNode:
(UIView*)node {
return @{
- (NSDictionary<NSString*, SKNodeUpdateData>*)dataMutationsForNode:(UIView*)node {
NSDictionary<NSString*, SKNodeUpdateData> *dataMutations = @{
// UIView
@"UIView.alpha" : ^(NSNumber* value){
node.alpha = [value floatValue];
}
,
},
@"UIView.backgroundColor": ^(NSNumber *value) {
node.backgroundColor = [UIColor fromSonarValue: value];
},
Expand Down Expand Up @@ -452,17 +450,21 @@ - (NSArray*)validChildrenForNode:(UIView*)node {
@"Accessibility.accessibilityTraits.UIAccessibilityTraitCausesPageTurn": ^(NSNumber *value) {
node.accessibilityTraits = AccessibilityTraitsToggle(node.accessibilityTraits, UIAccessibilityTraitCausesPageTurn, [value boolValue]);
},
@"Accessibility.accessibilityTraits.UIAccessibilityTraitTabBar": ^(NSNumber *value) {
node.accessibilityTraits = AccessibilityTraitsToggle(node.accessibilityTraits, UIAccessibilityTraitTabBar, [value boolValue]);
},
@"Accessibility.accessibilityViewIsModal": ^(NSNumber *value) {
node.accessibilityViewIsModal = [value boolValue];
},
@"Accessibility.shouldGroupAccessibilityChildren": ^(NSNumber *value) {
node.shouldGroupAccessibilityChildren = [value boolValue];
},
}
;
};
if (@available(iOS 10.0, *)) {
NSMutableDictionary<NSString*, SKNodeUpdateData> *latestDataMutations = [dataMutations mutableCopy];
latestDataMutations[@"Accessibility.accessibilityTraits.UIAccessibilityTraitTabBar"] = ^(NSNumber *value) {
node.accessibilityTraits = AccessibilityTraitsToggle(node.accessibilityTraits, UIAccessibilityTraitTabBar, [value boolValue]);
};
dataMutations = latestDataMutations;
}
return dataMutations;
}

- (NSArray<SKNamed<NSString*>*>*)attributesForNode:(UIView*)node {
Expand Down
2 changes: 1 addition & 1 deletion iOS/Sample/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source 'https://github.com/facebook/Sonar.git'
source 'https://github.com/CocoaPods/Specs'

target 'Sample' do
platform :ios, '10.0'
platform :ios, '9.0'
pod 'FlipperKit', :path => '../../FlipperKit.podspec'
pod 'FlipperKit/FlipperKitLayoutComponentKitSupport', :path => '../../FlipperKit.podspec'
pod 'FlipperKit/SKIOSNetworkPlugin', :path => '../../FlipperKit.podspec'
Expand Down

0 comments on commit 16ca010

Please sign in to comment.