npm
/
react-native-navigation
Volgen 11
Ster 0
Vork 0
Code Kwesties 0 Pull-aanvragen 0 Publicaties 0 Wiki Activiteit
Bladeren bron

e2e passed

Daniel Zlotin 8 jaren geleden
bovenliggende
b877b9fc90
commit
264359bc61
9 gewijzigde bestanden met toevoegingen van 178 en 174 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 18
    18
      ios/RNN.m
  2. 3
    3
      ios/RNNBridgeModule.m
  3. 34
    34
      ios/RNNControllerFactory.m
  4. 3
    3
      ios/RNNEventEmitter.m
  5. 64
    64
      ios/RNNSplashScreen.m
  6. 7
    7
      ios/ReactNativeNavigation.m
  7. 3
    0
      ios/ReactNativeNavigation.xcodeproj/project.pbxproj
  8. 29
    28
      playground/ios/playground.xcodeproj/project.pbxproj
  9. 17
    17
      playground/ios/playground/AppDelegate.m

+ 18
- 18
ios/RNN.m Bestand weergeven 

@@ -10,47 +10,47 @@
10 10
11 11 
 @implementation RNN
12 12 
 {
13 
-    RCTBridge* bridge;
13 
+	RCTBridge* bridge;
14 14 
 }
15 15
16 16 
 +(instancetype)instance
17 17 
 {
18 
-    static RNN *sharedInstance = nil;
19 
-    static dispatch_once_t onceToken = 0;
20 
-    dispatch_once(&onceToken,^{
21 
-        if (sharedInstance == nil)
22 
-        {
23 
-            sharedInstance = [[RNN alloc] init];
24 
-        }
25 
-    });
26 
-
27 
-    return sharedInstance;
18 
+	static RNN *sharedInstance = nil;
19 
+	static dispatch_once_t onceToken = 0;
20 
+	dispatch_once(&onceToken,^{
21 
+		if (sharedInstance == nil)
22 
+		{
23 
+			sharedInstance = [[RNN alloc] init];
24 
+		}
25 
+	});
26 
+
27 
+	return sharedInstance;
28 28 
 }
29 29
30 30 
 -(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions
31 31 
 {
32 
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onJavaScriptLoaded) name:RCTJavaScriptDidLoadNotification object:nil];
32 
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onJavaScriptLoaded) name:RCTJavaScriptDidLoadNotification object:nil];
33 33 
 #pragma GCC diagnostic push
34 34 
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
35 
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onJavaScriptDevReload) name:RCTReloadNotification object:nil];
35 
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onJavaScriptDevReload) name:RCTReloadNotification object:nil];
36 36 
 #pragma GCC diagnostic pop
37 
-    // this will load the JS bundle
38 
-    bridge = [[RCTBridge alloc] initWithBundleURL:jsCodeLocation moduleProvider:nil launchOptions:launchOptions];
37 
+	// this will load the JS bundle
38 
+	bridge = [[RCTBridge alloc] initWithBundleURL:jsCodeLocation moduleProvider:nil launchOptions:launchOptions];
39 39 
 }
40 40
41 41 
 -(void)onJavaScriptLoaded
42 42 
 {
43 
-    [RNNEventEmitter sendOnAppLaunched];
43 
+	[RNNEventEmitter sendOnAppLaunched];
44 44 
 }
45 45
46 46 
 -(void)onJavaScriptDevReload
47 47 
 {
48 
-    UIApplication.sharedApplication.delegate.window.rootViewController = nil;
48 
+	UIApplication.sharedApplication.delegate.window.rootViewController = nil;
49 49 
 }
50 50
51 51 
 -(RCTBridge *)bridge
52 52 
 {
53 
-    return bridge;
53 
+	return bridge;
54 54 
 }
55 55
56 56 
 @end

+ 3
- 3
ios/RNNBridgeModule.m Bestand weergeven 

@@ -9,13 +9,13 @@ RCT_EXPORT_MODULE();
9 9
10 10 
 - (dispatch_queue_t)methodQueue
11 11 
 {
12 
-    return dispatch_get_main_queue();
12 
+	return dispatch_get_main_queue();
13 13 
 }
14 14
15 15 
 RCT_EXPORT_METHOD(startApp:(NSDictionary*)layout)
16 16 
 {
17 
-    UIApplication.sharedApplication.delegate.window.rootViewController = [[RNNControllerFactory new] createRootViewController:layout];
18 
-    [UIApplication.sharedApplication.delegate.window makeKeyAndVisible];
17 
+	UIApplication.sharedApplication.delegate.window.rootViewController = [[RNNControllerFactory new] createRootViewController:layout];
18 
+	[UIApplication.sharedApplication.delegate.window makeKeyAndVisible];
19 19 
 }
20 20
21 21 
 @end

+ 34
- 34
ios/RNNControllerFactory.m Bestand weergeven 

@@ -8,52 +8,52 @@
8 8
9 9 
 -(UIViewController *)createRootViewController:(NSDictionary *)layout
10 10 
 {
11 
-    return [self fromTree:layout];
11 
+	return [self fromTree:layout];
12 12 
 }
13 13
14 14 
 -(UIViewController*)fromTree:(NSDictionary*)node
15 15 
 {
16 
-    NSString* nodeType = node[@"type"];
17 
-
18 
-    NSString* nodeId = node[@"id"];
19 
-    NSArray* children = node[@"children"];
20 
-    NSDictionary* data = node[@"data"];
21 
-
22 
-    if ([nodeType isEqualToString:@"Container"])
23 
-    {
24 
-        return [self createContainer:nodeId data:data];
25 
-    } else if([nodeType isEqualToString:@"ContainerStack"])
26 
-    {
27 
-        return [self createContainerStack:nodeId data:data children:children];
28 
-    }
29 
-
30 
-    @throw @"unknown container type";
16 
+	NSString* nodeType = node[@"type"];
17 
+
18 
+	NSString* nodeId = node[@"id"];
19 
+	NSArray* children = node[@"children"];
20 
+	NSDictionary* data = node[@"data"];
21 
+
22 
+	if ([nodeType isEqualToString:@"Container"])
23 
+	{
24 
+		return [self createContainer:nodeId data:data];
25 
+	} else if([nodeType isEqualToString:@"ContainerStack"])
26 
+	{
27 
+		return [self createContainerStack:nodeId data:data children:children];
28 
+	}
29 
+
30 
+	@throw @"unknown container type";
31 31 
 }
32 32
33 33 
 -(UIViewController*)createContainer:(NSString*)containerId data:(NSDictionary*)data
34 34 
 {
35 
-    NSString* containerName = data[@"name"];
36 
-
37 
-    RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:RNN.instance.bridge
38 
-                                                      moduleName:containerName
39 
-                                               initialProperties:@{@"containerId": containerId}];
40 
-
41 
-    UIViewController* controller = [UIViewController new];
42 
-    controller.view = reactView;
43 
-    return controller;
35 
+	NSString* containerName = data[@"name"];
36 
+
37 
+	RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:RNN.instance.bridge
38 
+													  moduleName:containerName
39 
+											   initialProperties:@{@"containerId": containerId}];
40 
+
41 
+	UIViewController* controller = [UIViewController new];
42 
+	controller.view = reactView;
43 
+	return controller;
44 44 
 }
45 45
46 46 
 -(UINavigationController*)createContainerStack:(NSString*)containerId data:(NSDictionary*)data children:(NSArray*)children
47 47 
 {
48 
-    UINavigationController* vc = [[UINavigationController alloc] init];
49 
-
50 
-    NSMutableArray* controllers = [NSMutableArray new];
51 
-    for (NSDictionary* node in children) {
52 
-        [controllers addObject:[self fromTree:node]];
53 
-    }
54 
-    [vc setViewControllers:controllers];
55 
-
56 
-    return vc;
48 
+	UINavigationController* vc = [[UINavigationController alloc] init];
49 
+
50 
+	NSMutableArray* controllers = [NSMutableArray new];
51 
+	for (NSDictionary* node in children) {
52 
+		[controllers addObject:[self fromTree:node]];
53 
+	}
54 
+	[vc setViewControllers:controllers];
55 
+
56 
+	return vc;
57 57 
 }
58 58
59 59 
 @end

+ 3
- 3
ios/RNNEventEmitter.m Bestand weergeven 

@@ -10,17 +10,17 @@ static NSString* const onAppLaunched = @"onAppLaunched";
10 10
11 11 
 -(NSArray<NSString *> *)supportedEvents
12 12 
 {
13 
-    return @[onAppLaunched];
13 
+	return @[onAppLaunched];
14 14 
 }
15 15
16 16 
 +(void)sendOnAppLaunched
17 17 
 {
18 
-    [RNNEventEmitter send:onAppLaunched body:nil];
18 
+	[RNNEventEmitter send:onAppLaunched body:nil];
19 19 
 }
20 20
21 21 
 +(void)send:(NSString *)eventName body:(id)body
22 22 
 {
23 
-    [[RNN.instance.bridge moduleForClass:[RNNEventEmitter class]] sendEventWithName:eventName body:body];
23 
+	[[RNN.instance.bridge moduleForClass:[RNNEventEmitter class]] sendEventWithName:eventName body:body];
24 24 
 }
25 25
26 26 
 @end

+ 64
- 64
ios/RNNSplashScreen.m Bestand weergeven 

@@ -6,70 +6,70 @@
6 6
7 7 
 +(void)show
8 8 
 {
9 
-    CGRect screenBounds = [UIScreen mainScreen].bounds;
10 
-    UIView *splashView = nil;
11 
-
12 
-    NSString* launchStoryBoard = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UILaunchStoryboardName"];
13 
-    if (launchStoryBoard != nil)
14 
-    {//load the splash from the storyboard that's defined in the info.plist as the LaunchScreen
15 
-        @try
16 
-        {
17 
-            splashView = [[NSBundle mainBundle] loadNibNamed:launchStoryBoard owner:self options:nil][0];
18 
-            if (splashView != nil)
19 
-            {
20 
-                splashView.frame = CGRectMake(0, 0, screenBounds.size.width, screenBounds.size.height);
21 
-            }
22 
-        }
23 
-        @catch(NSException *e)
24 
-        {
25 
-            splashView = nil;
26 
-        }
27 
-    }
28 
-    else
29 
-    {//load the splash from the DEfault image or from LaunchImage in the xcassets
30 
-        CGFloat screenHeight = screenBounds.size.height;
31 
-
32 
-        NSString* imageName = @"Default";
33 
-        if (screenHeight == 568)
34 
-            imageName = [imageName stringByAppendingString:@"-568h"];
35 
-        else if (screenHeight == 667)
36 
-            imageName = [imageName stringByAppendingString:@"-667h"];
37 
-        else if (screenHeight == 736)
38 
-            imageName = [imageName stringByAppendingString:@"-736h"];
39 
-
40 
-        //xcassets LaunchImage files
41 
-        UIImage *image = [UIImage imageNamed:imageName];
42 
-        if (image == nil)
43 
-        {
44 
-            imageName = @"LaunchImage";
45 
-
46 
-            if (screenHeight == 480)
47 
-                imageName = [imageName stringByAppendingString:@"-700"];
48 
-            if (screenHeight == 568)
49 
-                imageName = [imageName stringByAppendingString:@"-700-568h"];
50 
-            else if (screenHeight == 667)
51 
-                imageName = [imageName stringByAppendingString:@"-800-667h"];
52 
-            else if (screenHeight == 736)
53 
-                imageName = [imageName stringByAppendingString:@"-800-Portrait-736h"];
54 
-
55 
-            image = [UIImage imageNamed:imageName];
56 
-        }
57 
-
58 
-        if (image != nil)
59 
-        {
60 
-            splashView = [[UIImageView alloc] initWithImage:image];
61 
-        }
62 
-    }
63 
-
64 
-    if (splashView != nil)
65 
-    {
66 
-        UIViewController *splashVC = [[UIViewController alloc] init];
67 
-        splashVC.view = splashView;
68 
-
69 
-        id<UIApplicationDelegate> appDelegate = [UIApplication sharedApplication].delegate;
70 
-        appDelegate.window.rootViewController = splashVC;
71 
-        [appDelegate.window makeKeyAndVisible];
72 
-    }
9 
+	CGRect screenBounds = [UIScreen mainScreen].bounds;
10 
+	UIView *splashView = nil;
11 
+
12 
+	NSString* launchStoryBoard = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UILaunchStoryboardName"];
13 
+	if (launchStoryBoard != nil)
14 
+	{//load the splash from the storyboard that's defined in the info.plist as the LaunchScreen
15 
+		@try
16 
+		{
17 
+			splashView = [[NSBundle mainBundle] loadNibNamed:launchStoryBoard owner:self options:nil][0];
18 
+			if (splashView != nil)
19 
+			{
20 
+				splashView.frame = CGRectMake(0, 0, screenBounds.size.width, screenBounds.size.height);
21 
+			}
22 
+		}
23 
+		@catch(NSException *e)
24 
+		{
25 
+			splashView = nil;
26 
+		}
27 
+	}
28 
+	else
29 
+	{//load the splash from the DEfault image or from LaunchImage in the xcassets
30 
+		CGFloat screenHeight = screenBounds.size.height;
31 
+
32 
+		NSString* imageName = @"Default";
33 
+		if (screenHeight == 568)
34 
+			imageName = [imageName stringByAppendingString:@"-568h"];
35 
+		else if (screenHeight == 667)
36 
+			imageName = [imageName stringByAppendingString:@"-667h"];
37 
+		else if (screenHeight == 736)
38 
+			imageName = [imageName stringByAppendingString:@"-736h"];
39 
+
40 
+		//xcassets LaunchImage files
41 
+		UIImage *image = [UIImage imageNamed:imageName];
42 
+		if (image == nil)
43 
+		{
44 
+			imageName = @"LaunchImage";
45 
+
46 
+			if (screenHeight == 480)
47 
+				imageName = [imageName stringByAppendingString:@"-700"];
48 
+			if (screenHeight == 568)
49 
+				imageName = [imageName stringByAppendingString:@"-700-568h"];
50 
+			else if (screenHeight == 667)
51 
+				imageName = [imageName stringByAppendingString:@"-800-667h"];
52 
+			else if (screenHeight == 736)
53 
+				imageName = [imageName stringByAppendingString:@"-800-Portrait-736h"];
54 
+
55 
+			image = [UIImage imageNamed:imageName];
56 
+		}
57 
+
58 
+		if (image != nil)
59 
+		{
60 
+			splashView = [[UIImageView alloc] initWithImage:image];
61 
+		}
62 
+	}
63 
+
64 
+	if (splashView != nil)
65 
+	{
66 
+		UIViewController *splashVC = [[UIViewController alloc] init];
67 
+		splashVC.view = splashView;
68 
+
69 
+		id<UIApplicationDelegate> appDelegate = [UIApplication sharedApplication].delegate;
70 
+		appDelegate.window.rootViewController = splashVC;
71 
+		[appDelegate.window makeKeyAndVisible];
72 
+	}
73 73 
 }
74 74
75 75 
 @end

+ 7
- 7
ios/ReactNativeNavigation.m Bestand weergeven 

@@ -8,17 +8,17 @@
8 8
9 9 
 +(void)bootstrap:(NSURL *)jsCodeLocation
10 10 
 {
11 
-    [ReactNativeNavigation bootstrap:jsCodeLocation launchOptions:nil];
11 
+	[ReactNativeNavigation bootstrap:jsCodeLocation launchOptions:nil];
12 12 
 }
13 13
14 14 
 +(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions
15 15 
 {
16 
-    UIApplication.sharedApplication.delegate.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
17 
-    UIApplication.sharedApplication.delegate.window.backgroundColor = [UIColor whiteColor];
18 
-
19 
-    [RNNSplashScreen show];
20 
-
21 
-    [RNN.instance bootstrap:jsCodeLocation launchOptions:launchOptions];
16 
+	UIApplication.sharedApplication.delegate.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
17 
+	UIApplication.sharedApplication.delegate.window.backgroundColor = [UIColor whiteColor];
18 
+
19 
+	[RNNSplashScreen show];
20 
+
21 
+	[RNN.instance bootstrap:jsCodeLocation launchOptions:launchOptions];
22 22 
 }
23 23
24 24 
 @end

+ 3
- 0
ios/ReactNativeNavigation.xcodeproj/project.pbxproj Bestand weergeven 

@@ -94,6 +94,9 @@
94 94 
 				D8AFADBE1BEE6F3F00A4592D /* Products */,
95 95 
 			);
96 96 
 			sourceTree = "<group>";
97 
+			tabWidth = 4;
98 
+			usesTabs = 1;
99 
+			wrapsLines = 1;
97 100 
 		};
98 101 
 		D8AFADBE1BEE6F3F00A4592D /* Products */ = {
99 102 
 			isa = PBXGroup;

+ 29
- 28
playground/ios/playground.xcodeproj/project.pbxproj Bestand weergeven 

@@ -7,24 +7,24 @@
7 7 
 	objects = {
8 8
9 9 
 /* Begin PBXBuildFile section */
10 
-		00C302E51ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
11 
-		00C302E71ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
12 
-		00C302E81ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
13 
-		00C302E91ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
14 
-		00C302EA1ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
10 
+		00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
11 
+		00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
12 
+		00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
13 
+		00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
14 
+		00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
15 15 
 		00E356F31AD99517003FC87E /* playgroundTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* playgroundTests.m */; };
16 
-		133E29F31AD74F7200F7D852 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
17 
-		139105C61AF99C1200B5F7CC /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
18 
-		139FDEF61B0652A700C62182 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
16 
+		133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
17 
+		139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
18 
+		139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
19 19 
 		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
20 20 
 		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
21 21 
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
22 22 
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
23 
-		146834051AC3E58100842450 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
24 
-		2647D65F1DB175C200B23722 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
25 
-		7B9B39861DEB4091004A6281 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B9B39631DEB4076004A6281 /* libRCTAnimation.a */; };
26 
-		7BD721FF1E2E421E00724059 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
27 
-		832341BD1AAA6AB300B99B32 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
23 
+		146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
24 
+		2647D65F1DB175C200B23722 /* libReactNativeNavigation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
25 
+		7B9B39861DEB4091004A6281 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B9B39631DEB4076004A6281 /* libRCTAnimation.a */; };
26 
+		7BD721FF1E2E421E00724059 /* libReactNativeNavigation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
27 
+		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
28 28 
 /* End PBXBuildFile section */
29 29
30 30 
 /* Begin PBXContainerItemProxy section */
 
@@ -221,7 +221,7 @@
221 221 
 			isa = PBXFrameworksBuildPhase;
222 222 
 			buildActionMask = 2147483647;
223 223 
 			files = (
224 
-				7BD721FF1E2E421E00724059 /* ReferenceProxy in Frameworks */,
224 
+				7BD721FF1E2E421E00724059 /* libReactNativeNavigation.a in Frameworks */,
225 225 
 			);
226 226 
 			runOnlyForDeploymentPostprocessing = 0;
227 227 
 		};
 
@@ -229,18 +229,18 @@
229 229 
 			isa = PBXFrameworksBuildPhase;
230 230 
 			buildActionMask = 2147483647;
231 231 
 			files = (
232 
-				7B9B39861DEB4091004A6281 /* ReferenceProxy in Frameworks */,
233 
-				2647D65F1DB175C200B23722 /* ReferenceProxy in Frameworks */,
234 
-				146834051AC3E58100842450 /* ReferenceProxy in Frameworks */,
235 
-				00C302E51ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
236 
-				00C302E71ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
237 
-				00C302E81ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
238 
-				133E29F31AD74F7200F7D852 /* ReferenceProxy in Frameworks */,
239 
-				00C302E91ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
240 
-				139105C61AF99C1200B5F7CC /* ReferenceProxy in Frameworks */,
241 
-				832341BD1AAA6AB300B99B32 /* ReferenceProxy in Frameworks */,
242 
-				00C302EA1ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
243 
-				139FDEF61B0652A700C62182 /* ReferenceProxy in Frameworks */,
232 
+				7B9B39861DEB4091004A6281 /* libRCTAnimation.a in Frameworks */,
233 
+				2647D65F1DB175C200B23722 /* libReactNativeNavigation.a in Frameworks */,
234 
+				146834051AC3E58100842450 /* libReact.a in Frameworks */,
235 
+				00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
236 
+				00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
237 
+				00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */,
238 
+				133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */,
239 
+				00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */,
240 
+				139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */,
241 
+				832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
242 
+				00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
243 
+				139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
244 244 
 			);
245 245 
 			runOnlyForDeploymentPostprocessing = 0;
246 246 
 		};
 
@@ -408,9 +408,10 @@
408 408 
 				00E356EF1AD99517003FC87E /* playgroundTests */,
409 409 
 				83CBBA001A601CBA00E9B192 /* Products */,
410 410 
 			);
411 
-			indentWidth = 2;
411 
+			indentWidth = 4;
412 412 
 			sourceTree = "<group>";
413 
-			tabWidth = 2;
413 
+			tabWidth = 4;
414 
+			usesTabs = 1;
414 415 
 		};
415 416 
 		83CBBA001A601CBA00E9B192 /* Products */ = {
416 417 
 			isa = PBXGroup;

+ 17
- 17
playground/ios/playground/AppDelegate.m Bestand weergeven 

@@ -14,34 +14,34 @@
14 14
15 15 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
16 16 
 {
17 
-  NSURL *jsCodeLocation;
17 
+	NSURL *jsCodeLocation;
18 18 
 #ifdef DEBUG
19 
-  jsCodeLocation = [NSURL URLWithString:@"http://localhost:8081/index.ios.bundle?platform=ios&dev=true"];
19 
+	jsCodeLocation = [NSURL URLWithString:@"http://localhost:8081/index.ios.bundle?platform=ios&dev=true"];
20 20 
 #else
21 
-   jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
21 
+	jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
22 22 
 #endif
23 
-
24 
-
25 
-  // **********************************************
26 
-  // *** DON'T MISS: THIS IS HOW WE BOOTSTRAP *****
27 
-  // **********************************************
28 
-  [ReactNativeNavigation bootstrap:jsCodeLocation launchOptions:launchOptions];
29 
-
30 
-  /*
23 
+
24 
+
25 
+	// **********************************************
26 
+	// *** DON'T MISS: THIS IS HOW WE BOOTSTRAP *****
27 
+	// **********************************************
28 
+	[ReactNativeNavigation bootstrap:jsCodeLocation launchOptions:launchOptions];
29 
+
30 
+	/*
31 31 
   // original RN bootstrap - remove this part
32 32 
   RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
33 
-                                                      moduleName:@"com.example.WelcomeScreen"
34 
-                                               initialProperties:nil
35 
-                                                   launchOptions:launchOptions];
33 
+	 moduleName:@"com.example.WelcomeScreen"
34 
+	 initialProperties:nil
35 
+	 launchOptions:launchOptions];
36 36 
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
37 37 
   UIViewController *rootViewController = [UIViewController new];
38 38 
   rootViewController.view = rootView;
39 39 
   self.window.rootViewController = rootViewController;
40 40 
   [self.window makeKeyAndVisible];
41 41 
   */
42 
-
43 
-
44 
-  return YES;
42 
+
43 
+
44 
+	return YES;
45 45 
 }
46 46
47 47 
 @end