Skip to content

Commit 74e84ba

Browse files
nicklockwoodnicklockwood
committed
Unforked RKNavigator, RKScrollView and RKView
1 parent 378e59b commit 74e84ba

14 files changed

Lines changed: 416 additions & 138 deletions

File tree

‎Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
134180011AA9153C003F314A /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13417FEF1AA914B8003F314A /* libRCTText.a */; };
1313
134180021AA9153C003F314A /* libReactKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13417FFF1AA91531003F314A /* libReactKit.a */; };
1414
1341802C1AA9178B003F314A /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1341802B1AA91779003F314A /* libRCTNetwork.a */; };
15+
134454601AAFCABD003F0779 /* libRCTAdSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1344545A1AAFCAAE003F0779 /* libRCTAdSupport.a */; };
1516
134A8A2A1AACED7A00945AAE /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 134A8A251AACED6A00945AAE /* libRCTGeolocation.a */; };
1617
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
1718
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
1819
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
1920
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
20-
832C81C71AAF73C5007FA2F7 /* libRCTAdSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832C81A61AAF6EFF007FA2F7 /* libRCTAdSupport.a */; };
2121
/* End PBXBuildFile section */
2222

2323
/* Begin PBXContainerItemProxy section */
@@ -56,20 +56,20 @@
5656
remoteGlobalIDString = 58B511DB1A9E6C8500147676;
5757
remoteInfo = RCTNetwork;
5858
};
59+
134454591AAFCAAE003F0779 /* PBXContainerItemProxy */ = {
60+
isa = PBXContainerItemProxy;
61+
containerPortal = 134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */;
62+
proxyType = 2;
63+
remoteGlobalIDString = 832C81801AAF6DEF007FA2F7;
64+
remoteInfo = RCTAdSupport;
65+
};
5966
134A8A241AACED6A00945AAE /* PBXContainerItemProxy */ = {
6067
isa = PBXContainerItemProxy;
6168
containerPortal = 134A8A201AACED6A00945AAE /* RCTGeolocation.xcodeproj */;
6269
proxyType = 2;
6370
remoteGlobalIDString = 134814201AA4EA6300B7C361;
6471
remoteInfo = RCTGeolocation;
6572
};
66-
832C81A51AAF6EFF007FA2F7 /* PBXContainerItemProxy */ = {
67-
isa = PBXContainerItemProxy;
68-
containerPortal = 832C81A11AAF6EFE007FA2F7 /* RCTAdSupport.xcodeproj */;
69-
proxyType = 2;
70-
remoteGlobalIDString = 832C81801AAF6DEF007FA2F7;
71-
remoteInfo = RCTAdSupport;
72-
};
7373
/* End PBXContainerItemProxy section */
7474

7575
/* Begin PBXFileReference section */
@@ -80,6 +80,7 @@
8080
13417FEA1AA914B8003F314A /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../../Libraries/Text/RCTText.xcodeproj; sourceTree = "<group>"; };
8181
13417FFA1AA91531003F314A /* ReactKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactKit.xcodeproj; path = ../../ReactKit/ReactKit.xcodeproj; sourceTree = "<group>"; };
8282
134180261AA91779003F314A /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = ../../Libraries/Network/RCTNetwork.xcodeproj; sourceTree = "<group>"; };
83+
134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAdSupport.xcodeproj; path = ../../Libraries/AdSupport/RCTAdSupport.xcodeproj; sourceTree = "<group>"; };
8384
134A8A201AACED6A00945AAE /* RCTGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGeolocation.xcodeproj; path = ../../Libraries/Geolocation/RCTGeolocation.xcodeproj; sourceTree = "<group>"; };
8485
13B07F961A680F5B00A75B9A /* UIExplorer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UIExplorer.app; sourceTree = BUILT_PRODUCTS_DIR; };
8586
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -88,7 +89,6 @@
8889
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
8990
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9091
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
91-
832C81A11AAF6EFE007FA2F7 /* RCTAdSupport.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAdSupport.xcodeproj; path = ../../Libraries/AdSupport/RCTAdSupport.xcodeproj; sourceTree = "<group>"; };
9292
/* End PBXFileReference section */
9393

9494
/* Begin PBXFrameworksBuildPhase section */
@@ -103,7 +103,7 @@
103103
isa = PBXFrameworksBuildPhase;
104104
buildActionMask = 2147483647;
105105
files = (
106-
832C81C71AAF73C5007FA2F7 /* libRCTAdSupport.a in Frameworks */,
106+
134454601AAFCABD003F0779 /* libRCTAdSupport.a in Frameworks */,
107107
134A8A2A1AACED7A00945AAE /* libRCTGeolocation.a in Frameworks */,
108108
1341802C1AA9178B003F314A /* libRCTNetwork.a in Frameworks */,
109109
134180011AA9153C003F314A /* libRCTText.a in Frameworks */,
@@ -136,7 +136,7 @@
136136
isa = PBXGroup;
137137
children = (
138138
13417FFA1AA91531003F314A /* ReactKit.xcodeproj */,
139-
832C81A11AAF6EFE007FA2F7 /* RCTAdSupport.xcodeproj */,
139+
134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */,
140140
134A8A201AACED6A00945AAE /* RCTGeolocation.xcodeproj */,
141141
13417FE31AA91428003F314A /* RCTImage.xcodeproj */,
142142
134180261AA91779003F314A /* RCTNetwork.xcodeproj */,
@@ -177,6 +177,14 @@
177177
name = Products;
178178
sourceTree = "<group>";
179179
};
180+
134454561AAFCAAE003F0779 /* Products */ = {
181+
isa = PBXGroup;
182+
children = (
183+
1344545A1AAFCAAE003F0779 /* libRCTAdSupport.a */,
184+
);
185+
name = Products;
186+
sourceTree = "<group>";
187+
};
180188
134A8A211AACED6A00945AAE /* Products */ = {
181189
isa = PBXGroup;
182190
children = (
@@ -198,14 +206,6 @@
198206
name = UIExplorer;
199207
sourceTree = "<group>";
200208
};
201-
832C81A21AAF6EFE007FA2F7 /* Products */ = {
202-
isa = PBXGroup;
203-
children = (
204-
832C81A61AAF6EFF007FA2F7 /* libRCTAdSupport.a */,
205-
);
206-
name = Products;
207-
sourceTree = "<group>";
208-
};
209209
83CBB9F61A601CBA00E9B192 = {
210210
isa = PBXGroup;
211211
children = (
@@ -291,8 +291,8 @@
291291
projectDirPath = "";
292292
projectReferences = (
293293
{
294-
ProductGroup = 832C81A21AAF6EFE007FA2F7 /* Products */;
295-
ProjectRef = 832C81A11AAF6EFE007FA2F7 /* RCTAdSupport.xcodeproj */;
294+
ProductGroup = 134454561AAFCAAE003F0779 /* Products */;
295+
ProjectRef = 134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */;
296296
},
297297
{
298298
ProductGroup = 134A8A211AACED6A00945AAE /* Products */;
@@ -352,18 +352,18 @@
352352
remoteRef = 1341802A1AA91779003F314A /* PBXContainerItemProxy */;
353353
sourceTree = BUILT_PRODUCTS_DIR;
354354
};
355-
134A8A251AACED6A00945AAE /* libRCTGeolocation.a */ = {
355+
1344545A1AAFCAAE003F0779 /* libRCTAdSupport.a */ = {
356356
isa = PBXReferenceProxy;
357357
fileType = archive.ar;
358-
path = libRCTGeolocation.a;
359-
remoteRef = 134A8A241AACED6A00945AAE /* PBXContainerItemProxy */;
358+
path = libRCTAdSupport.a;
359+
remoteRef = 134454591AAFCAAE003F0779 /* PBXContainerItemProxy */;
360360
sourceTree = BUILT_PRODUCTS_DIR;
361361
};
362-
832C81A61AAF6EFF007FA2F7 /* libRCTAdSupport.a */ = {
362+
134A8A251AACED6A00945AAE /* libRCTGeolocation.a */ = {
363363
isa = PBXReferenceProxy;
364364
fileType = archive.ar;
365-
path = libRCTAdSupport.a;
366-
remoteRef = 832C81A51AAF6EFF007FA2F7 /* PBXContainerItemProxy */;
365+
path = libRCTGeolocation.a;
366+
remoteRef = 134A8A241AACED6A00945AAE /* PBXContainerItemProxy */;
367367
sourceTree = BUILT_PRODUCTS_DIR;
368368
};
369369
/* End PBXReferenceProxy section */

‎Libraries/AdSupport/RCTAdSupport.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// Copyright 2004-present Facebook. All Rights Reserved.
22

3+
#import <AdSupport/ASIdentifierManager.h>
4+
35
#import "RCTBridgeModule.h"
46

57
@interface RCTAdSupport : NSObject <RCTBridgeModule>

‎Libraries/AdSupport/RCTAdSupport.m‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
#import "RCTAdSupport.h"
44

5-
#import <AdSupport/ASIdentifierManager.h>
6-
75
@implementation RCTAdSupport
86

97
- (void)getAdvertisingId:(RCTResponseSenderBlock)callback withErrorCallback:(RCTResponseSenderBlock)errorCallback

‎ReactKit/Base/RCTConvert.h‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
+ (float)float:(id)json;
2020
+ (int)int:(id)json;
2121

22+
+ (NSInteger)NSInteger:(id)json;
23+
+ (NSUInteger)NSUInteger:(id)json;
24+
2225
+ (NSArray *)NSArray:(id)json;
2326
+ (NSDictionary *)NSDictionary:(id)json;
2427
+ (NSString *)NSString:(id)json;
2528
+ (NSNumber *)NSNumber:(id)json;
26-
+ (NSInteger)NSInteger:(id)json;
27-
+ (NSUInteger)NSUInteger:(id)json;
2829

2930
+ (NSURL *)NSURL:(id)json;
3031
+ (NSURLRequest *)NSURLRequest:(id)json;
@@ -57,6 +58,11 @@
5758
+ (UIFont *)UIFont:(UIFont *)font withFamily:(id)json;
5859
+ (UIFont *)UIFont:(UIFont *)font withFamily:(id)json size:(id)json weight:(id)json;
5960

61+
+ (NSArray *)NSStringArray:(id)json;
62+
+ (NSArray *)NSNumberArray:(id)json;
63+
+ (NSArray *)UIColorArray:(id)json;
64+
+ (NSArray *)CGColorArray:(id)json;
65+
6066
+ (BOOL)css_overflow:(id)json;
6167
+ (css_flex_direction_t)css_flex_direction_t:(id)json;
6268
+ (css_justify_t)css_justify_t:(id)json;

0 commit comments

Comments
 (0)