refactoring

ios/RNN.h

@@ -6,8 +6,6 @@
 
 @interface RNN : NSObject
 
-+(id<UIApplicationDelegate>)appDelegate;
-
 +(instancetype)instance;
 
 -(void)init:(NSURL*)jsCodeLocation launchOptions:(NSDictionary*)launchOptions;

ios/RNN.m

@@ -8,7 +8,8 @@
 
 @end
 
-@implementation RNN {
+@implementation RNN
+{
     RCTBridge* bridge;
 }
 
@@ -26,21 +27,16 @@
     return sharedInstance;
 }
 
-+(id<UIApplicationDelegate>)appDelegate
-{
-    return UIApplication.sharedApplication.delegate;
-}
-
 -(void)init:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions
 {
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onBridgeFinishedLoading) name:RCTJavaScriptDidLoadNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onJavaScriptLoaded) name:RCTJavaScriptDidLoadNotification object:nil];
     // this will load the JS bundle
     bridge = [[RCTBridge alloc] initWithBundleURL:jsCodeLocation moduleProvider:nil launchOptions:launchOptions];
 }
 
--(void)onBridgeFinishedLoading
+-(void)onJavaScriptLoaded
 {
-    [[bridge moduleForClass:[RNNEventEmitter class]] sendEventWithName:RNNEventOnAppLaunched body:nil];
+    [RNNEventEmitter sendOnAppLaunched];
 }
 
 -(RCTBridge *)bridge

ios/RNNAssert.h

@@ -1,6 +0,0 @@
-
-#import <Foundation/Foundation.h>
-
-@interface RNNAssert : NSObject
-
-@end

ios/RNNAssert.m

@@ -1,6 +0,0 @@
-
-#import "RNNAssert.h"
-
-@implementation RNNAssert
-
-@end

ios/RNNBridgeModule.m

@@ -14,8 +14,8 @@ RCT_EXPORT_MODULE(NativeNavigation);
 
 RCT_EXPORT_METHOD(startApp:(NSDictionary*)layout)
 {
-    RNN.appDelegate.window.rootViewController = [RNNControllerFactory createRootViewController:layout];
-    [RNN.appDelegate.window makeKeyAndVisible];
+    UIApplication.sharedApplication.delegate.window.rootViewController = [RNNControllerFactory createRootViewController:layout];
+    [UIApplication.sharedApplication.delegate.window makeKeyAndVisible];
 }
 
 @end

ios/RNNEventEmitter.h

@@ -4,8 +4,8 @@
 #import "RCTEventEmitter.h"
 #import "RCTBridgeModule.h"
 
-extern NSString* const RNNEventOnAppLaunched;
-
 @interface RNNEventEmitter : RCTEventEmitter <RCTBridgeModule>
 
++(void)sendOnAppLaunched;
+
 @end

ios/RNNEventEmitter.m

@@ -1,15 +1,26 @@
 
 #import "RNNEventEmitter.h"
+#import "RNN.h"
 
 @implementation RNNEventEmitter
 
 RCT_EXPORT_MODULE();
 
-NSString* const RNNEventOnAppLaunched = @"onAppLaunched";
+static NSString* const onAppLaunched = @"onAppLaunched";
 
 -(NSArray<NSString *> *)supportedEvents
 {
-    return @[RNNEventOnAppLaunched];
+    return @[onAppLaunched];
+}
+
++(void)sendOnAppLaunched
+{
+    [RNNEventEmitter send:onAppLaunched body:nil];
+}
+
++(void)send:(NSString *)eventName body:(id)body
+{
+    [[RNN.instance.bridge moduleForClass:[RNNEventEmitter class]] sendEventWithName:eventName body:body];
 }
 
 @end

ios/ReactNativeNavigation.m

@@ -1,5 +1,6 @@
 
 #import "ReactNativeNavigation.h"
+
 #import "RNNSplashScreen.h"
 #import "RNN.h"
 
@@ -12,8 +13,8 @@
 
 +(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions
 {
-    RNN.appDelegate.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    RNN.appDelegate.window.backgroundColor = [UIColor whiteColor];
+    UIApplication.sharedApplication.delegate.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+    UIApplication.sharedApplication.delegate.window.backgroundColor = [UIColor whiteColor];
     
     [RNNSplashScreen show];
     

ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -7,14 +7,12 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		7B11269D1E2D1D4800F9B03B /* RNNAssert.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B11269C1E2D1D4800F9B03B /* RNNAssert.m */; };
 		7B1126A01E2D263F00F9B03B /* RNNEventEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B11269F1E2D263F00F9B03B /* RNNEventEmitter.m */; };
 		7B1126A31E2D2B6C00F9B03B /* RNNSplashScreen.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BA500761E254908001B9E1B /* RNNSplashScreen.h */; };
 		7B1126A41E2D2B6C00F9B03B /* ReactNativeNavigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BA500731E2544B9001B9E1B /* ReactNativeNavigation.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7B1126A51E2D2B6C00F9B03B /* RNN.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BBFE55F1E253F97002A6182 /* RNN.h */; };
 		7B1126A61E2D2B6C00F9B03B /* RNNBridgeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BBFE5421E25330E002A6182 /* RNNBridgeModule.h */; };
 		7B1126A71E2D2B6C00F9B03B /* RNNEventEmitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B11269E1E2D263F00F9B03B /* RNNEventEmitter.h */; };
-		7B1126A81E2D2B6C00F9B03B /* RNNAssert.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B11269B1E2D1D4800F9B03B /* RNNAssert.h */; };
 		7B1126A91E2D2B6C00F9B03B /* RNNControllerFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BC9346C1E26886E00EFA125 /* RNNControllerFactory.h */; };
 		7BA500751E2544B9001B9E1B /* ReactNativeNavigation.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BA500741E2544B9001B9E1B /* ReactNativeNavigation.m */; };
 		7BA500781E254908001B9E1B /* RNNSplashScreen.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BA500771E254908001B9E1B /* RNNSplashScreen.m */; };
@@ -36,8 +34,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		7B11269B1E2D1D4800F9B03B /* RNNAssert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNAssert.h; sourceTree = "<group>"; };
-		7B11269C1E2D1D4800F9B03B /* RNNAssert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNAssert.m; sourceTree = "<group>"; };
 		7B11269E1E2D263F00F9B03B /* RNNEventEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNEventEmitter.h; sourceTree = "<group>"; };
 		7B11269F1E2D263F00F9B03B /* RNNEventEmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNEventEmitter.m; sourceTree = "<group>"; };
 		7BA500731E2544B9001B9E1B /* ReactNativeNavigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReactNativeNavigation.h; sourceTree = "<group>"; };
@@ -69,26 +65,32 @@
 			children = (
 				7BA500761E254908001B9E1B /* RNNSplashScreen.h */,
 				7BA500771E254908001B9E1B /* RNNSplashScreen.m */,
+				7BC9346C1E26886E00EFA125 /* RNNControllerFactory.h */,
+				7BC9346D1E26886E00EFA125 /* RNNControllerFactory.m */,
 			);
 			name = Controllers;
 			sourceTree = "<group>";
 		};
+		7BD721F31E2D3AA100724059 /* Bridge */ = {
+			isa = PBXGroup;
+			children = (
+				7BBFE5421E25330E002A6182 /* RNNBridgeModule.h */,
+				7BBFE5431E25330E002A6182 /* RNNBridgeModule.m */,
+				7B11269E1E2D263F00F9B03B /* RNNEventEmitter.h */,
+				7B11269F1E2D263F00F9B03B /* RNNEventEmitter.m */,
+			);
+			name = Bridge;
+			sourceTree = "<group>";
+		};
 		D8AFADB41BEE6F3F00A4592D = {
 			isa = PBXGroup;
 			children = (
-				7B1E4C4B1E2D173700C3A525 /* Controllers */,
 				7BA500731E2544B9001B9E1B /* ReactNativeNavigation.h */,
 				7BA500741E2544B9001B9E1B /* ReactNativeNavigation.m */,
+				7BD721F31E2D3AA100724059 /* Bridge */,
+				7B1E4C4B1E2D173700C3A525 /* Controllers */,
 				7BBFE55F1E253F97002A6182 /* RNN.h */,
 				7BBFE5601E253F97002A6182 /* RNN.m */,
-				7BBFE5421E25330E002A6182 /* RNNBridgeModule.h */,
-				7BBFE5431E25330E002A6182 /* RNNBridgeModule.m */,
-				7B11269E1E2D263F00F9B03B /* RNNEventEmitter.h */,
-				7B11269F1E2D263F00F9B03B /* RNNEventEmitter.m */,
-				7B11269B1E2D1D4800F9B03B /* RNNAssert.h */,
-				7B11269C1E2D1D4800F9B03B /* RNNAssert.m */,
-				7BC9346C1E26886E00EFA125 /* RNNControllerFactory.h */,
-				7BC9346D1E26886E00EFA125 /* RNNControllerFactory.m */,
 				D8AFADBE1BEE6F3F00A4592D /* Products */,
 			);
 			sourceTree = "<group>";
@@ -113,7 +115,6 @@
 				7B1126A51E2D2B6C00F9B03B /* RNN.h in Headers */,
 				7B1126A61E2D2B6C00F9B03B /* RNNBridgeModule.h in Headers */,
 				7B1126A71E2D2B6C00F9B03B /* RNNEventEmitter.h in Headers */,
-				7B1126A81E2D2B6C00F9B03B /* RNNAssert.h in Headers */,
 				7B1126A91E2D2B6C00F9B03B /* RNNControllerFactory.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -176,7 +177,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				7B1126A01E2D263F00F9B03B /* RNNEventEmitter.m in Sources */,
-				7B11269D1E2D1D4800F9B03B /* RNNAssert.m in Sources */,
 				7BA500751E2544B9001B9E1B /* ReactNativeNavigation.m in Sources */,
 				7BBFE5441E25330E002A6182 /* RNNBridgeModule.m in Sources */,
 				7BA500781E254908001B9E1B /* RNNSplashScreen.m in Sources */,

playground/ios/playground.xcodeproj/project.pbxproj

@@ -21,10 +21,8 @@
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
-		2636F1CD1E11309B007ABB09 /* RNNViewControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2636F1CC1E11309B007ABB09 /* RNNViewControllerTests.m */; };
 		2647D65F1DB175C200B23722 /* libReactNativeNavigation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
 		7B9B39861DEB4091004A6281 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B9B39631DEB4076004A6281 /* libRCTAnimation.a */; };
-		7BC934871E268CF600EFA125 /* RNNControllerFactoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BC934861E268CF600EFA125 /* RNNControllerFactoryTest.m */; };
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
 /* End PBXBuildFile section */
 
@@ -204,11 +202,9 @@
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
-		2636F1CC1E11309B007ABB09 /* RNNViewControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNViewControllerTests.m; sourceTree = "<group>"; };
 		2647D6591DB175B300B23722 /* ReactNativeNavigation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeNavigation.xcodeproj; path = "../node_modules/react-native-navigation/ios/ReactNativeNavigation.xcodeproj"; sourceTree = "<group>"; };
 		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
 		7B9B395C1DEB4076004A6281 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
-		7BC934861E268CF600EFA125 /* RNNControllerFactoryTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNControllerFactoryTest.m; sourceTree = "<group>"; };
 		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -288,8 +284,6 @@
 			isa = PBXGroup;
 			children = (
 				00E356F21AD99517003FC87E /* playgroundTests.m */,
-				2636F1CC1E11309B007ABB09 /* RNNViewControllerTests.m */,
-				7BC934861E268CF600EFA125 /* RNNControllerFactoryTest.m */,
 				00E356F01AD99517003FC87E /* Supporting Files */,
 			);
 			path = playgroundTests;
@@ -745,8 +739,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				00E356F31AD99517003FC87E /* playgroundTests.m in Sources */,
-				2636F1CD1E11309B007ABB09 /* RNNViewControllerTests.m in Sources */,
-				7BC934871E268CF600EFA125 /* RNNControllerFactoryTest.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

playground/ios/playgroundTests/RNNControllerFactoryTest.m

@@ -1,32 +0,0 @@
-
-#import <XCTest/XCTest.h>
-#import "RNNControllerFactory.h"
-#import "RCTRootView.h"
-
-@interface RNNControllerFactoryTest : XCTestCase
-
-@end
-
-@implementation RNNControllerFactoryTest
-
-- (void)setUp {
-    [super setUp];
-    // Put setup code here. This method is called before the invocation of each test method in the class.
-}
-
-- (void)tearDown {
-    [super tearDown];
-}
-
-- (void)testExample {
-  NSDictionary* layout = @{
-                           @"container": @{
-                               @"name": @"myName",
-                               @"id": @"my-id"
-                               }
-                           };
-  UIViewController* rootViewController = [RNNControllerFactory createRootViewController:layout];
-  XCTAssert([((RCTRootView*)rootViewController.view).moduleName isEqualToString:@"myName"]);
-}
-
-@end

playground/ios/playgroundTests/RNNViewControllerTests.m

@@ -1,114 +0,0 @@
-////
-////  RNNViewControllerTests.m
-////
-////  Created by Ran Greenberg on 26/12/2016.
-////  Copyright © 2016 Facebook. All rights reserved.
-////
-//
-//#import <XCTest/XCTest.h>
-//#import "RCCManager.h"
-//#import "RNNViewController.h"
-//#import "MMDrawerController.h"
-//
-//#define COMMAND_SINGLE_SCREEN_APP               @"singleScreenApp"
-//#define COMMAND_TAB_BASED_APP                   @"tabBasedApp"
-//#define COMMAND_SINGLE_WITH_LEFT_SIDE_MENU      @"singleWithLeftSideMenu"
-//#define COMMAND_SINGLE_WITH_RIGHT_SIDE_MENU     @"singleWithRightSideMenu"
-//#define COMMAND_SINGLE_WITH_BOTH_SIDE_MENU      @"singleWithBothMenus"
-//#define COMMAND_TAB_BASED_WITH_SIDE_MENT        @"tabBasedWithSideMenu"
-//
-//
-//@interface RNNViewControllerTests : XCTestCase
-//@property (nonatomic, strong) RCTBridge *bridge;
-//@property (nonatomic, strong) NSDictionary *jsonCommands;
-//@end
-//
-//@implementation RNNViewControllerTests
-//
-//- (void)setUp {
-//  [super setUp];
-//  // Put setup code here. This method is called before the invocation of each test method in the class.
-//  self.bridge = [[RCCManager sharedInstance] getBridge];
-//  self.jsonCommands = [self loadCommandsJsonAsDictionary];
-//}
-//
-//- (void)tearDown {
-//  // Put teardown code here. This method is called after the invocation of each test method in the class.
-//  self.bridge = nil;
-//  self.jsonCommands = nil;
-//  [super tearDown];
-//}
-//
-//-(NSDictionary*)loadCommandsJsonAsDictionary {
-//  NSString *filePath = [[NSBundle mainBundle] pathForResource:@"commands" ofType:@"json"];
-//  NSData *data = [NSData dataWithContentsOfFile:filePath];
-//  NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:nil];
-//  return json;
-//}
-//
-//- (void)testWrongSyntax {
-//  
-//  NSDictionary *layout = @{@"key": @"com.example.FirstTabScreen"};
-//  id vc = [RNNViewController controllerWithLayout:layout bridge:self.bridge];
-//  XCTAssertNil(vc);
-//}
-//
-//-(void)testSingleScreenApp {
-//  id vc = [RNNViewController controllerWithLayout:self.jsonCommands[COMMAND_SINGLE_SCREEN_APP] bridge:self.bridge];
-//  XCTAssertTrue([vc isKindOfClass:[UINavigationController class]]);
-//}
-//
-//-(void)testTabBasedApp {
-//  id vc = [RNNViewController controllerWithLayout:self.jsonCommands[COMMAND_TAB_BASED_APP] bridge:self.bridge];
-//  XCTAssertTrue([vc isKindOfClass:[UITabBarController class]]);
-//  UITabBarController *tabsController = (UITabBarController*)vc;
-//  for (id tab in tabsController.viewControllers) {
-//    XCTAssertTrue([tab isKindOfClass:[UINavigationController class]]);
-//  }
-//}
-//
-//-(void)testSingleWithLeftSideMenu {
-//  id vc = [RNNViewController controllerWithLayout:self.jsonCommands[COMMAND_SINGLE_WITH_LEFT_SIDE_MENU] bridge:self.bridge];
-//  XCTAssertTrue([vc isKindOfClass:[MMDrawerController class]]);
-//  MMDrawerController *sideMenuLeft = (MMDrawerController*)vc;
-//  XCTAssertNotNil(sideMenuLeft.leftDrawerViewController);
-//  XCTAssertNotNil(sideMenuLeft.centerViewController);
-//  XCTAssertNil(sideMenuLeft.rightDrawerViewController);
-//}
-//
-//-(void)testSingleWithRightSideMenu {
-//  id vc = [RNNViewController controllerWithLayout:self.jsonCommands[COMMAND_SINGLE_WITH_RIGHT_SIDE_MENU] bridge:self.bridge];
-//  XCTAssertTrue([vc isKindOfClass:[MMDrawerController class]]);
-//  MMDrawerController *sideMenuRight = (MMDrawerController*)vc;
-//  XCTAssertNil(sideMenuRight.leftDrawerViewController);
-//  XCTAssertNotNil(sideMenuRight.centerViewController);
-//  XCTAssertNotNil(sideMenuRight.rightDrawerViewController);
-//
-//}
-//
-//-(void)testSingleWithBothSideMenu {
-//  id vc = [RNNViewController controllerWithLayout:self.jsonCommands[COMMAND_SINGLE_WITH_BOTH_SIDE_MENU] bridge:self.bridge];
-//  XCTAssertTrue([vc isKindOfClass:[MMDrawerController class]]);
-//  MMDrawerController *sideMenuBoth = (MMDrawerController*)vc;
-//  XCTAssertNotNil(sideMenuBoth.leftDrawerViewController);
-//  XCTAssertNotNil(sideMenuBoth.centerViewController);
-//  XCTAssertNotNil(sideMenuBoth.rightDrawerViewController);
-//}
-//
-//-(void)testTabBasedWithBothSideMenu {
-//  id vc = [RNNViewController controllerWithLayout:self.jsonCommands[COMMAND_TAB_BASED_WITH_SIDE_MENT] bridge:self.bridge];
-//  XCTAssertTrue([vc isKindOfClass:[MMDrawerController class]]);
-//  MMDrawerController *sideMenuBothWithTabs = (MMDrawerController*)vc;
-//  XCTAssertNotNil(sideMenuBothWithTabs.leftDrawerViewController);
-//  XCTAssertNotNil(sideMenuBothWithTabs.centerViewController);
-//  XCTAssertNotNil(sideMenuBothWithTabs.rightDrawerViewController);
-//  XCTAssertTrue([sideMenuBothWithTabs.centerViewController isKindOfClass:[UITabBarController class]]);
-//}
-////- (void)testPerformanceExample {
-////  // This is an example of a performance test case.
-////  [self measureBlock:^{
-////    // Put the code you want to measure the time of here.
-////  }];
-////}
-//
-//@end