removed RNN

ios/RNN.h

@@ -1,11 +0,0 @@
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-@interface RNN : NSObject
-
-+(instancetype)sharedInstance;
-
--(void)bootstrap:(NSURL*)jsCodeLocation launchOptions:(NSDictionary*)launchOptions;
-
-@end

ios/RNN.m

@@ -1,101 +0,0 @@
-
-#import "RNN.h"
-#import <React/RCTBridge.h>
-
-#import "RNNEventEmitter.h"
-#import "RNNSplashScreen.h"
-#import "RNNBridgeModule.h"
-#import "RNNRootViewCreator.h"
-#import "RNNReactRootViewCreator.h"
-
-@interface RNN() <RCTBridgeDelegate>
-
-@end
-
-@implementation RNN {
-	NSURL* _jsCodeLocation;
-	NSDictionary* _launchOptions;
-	RNNStore* _store;
-	RCTBridge* _bridge;
-}
-
-+(instancetype) sharedInstance {
-	static RNN *instance = nil;
-	static dispatch_once_t onceToken = 0;
-	dispatch_once(&onceToken,^{
-		if (instance == nil)
-		{
-			instance = [[RNN alloc] init];
-		}
-	});
-	
-	return instance;
-}
-
-# pragma mark public
-
--(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions {
-	_jsCodeLocation = jsCodeLocation;
-	_launchOptions = launchOptions;
-	_store = [RNNStore new];
-
-	[RNNSplashScreen show];
-	
-	[self registerForJsEvents];
-	
-	[self createBridgeLoadJsThenInitDependencyGraph];
-}
-
-# pragma mark - RCTBridgeDelegate
-
--(NSURL *)sourceURLForBridge:(RCTBridge *)bridge {
-	return _jsCodeLocation;
-}
-
--(NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge {
-	RNNEventEmitter *eventEmitter = [[RNNEventEmitter alloc] init];
-	
-	id<RNNRootViewCreator> rootViewCreator = [[RNNReactRootViewCreator alloc] initWithBridge:bridge];
-	RNNControllerFactory *controllerFactory = [[RNNControllerFactory alloc] initWithRootViewCreator:rootViewCreator store:_store eventEmitter:eventEmitter];
-	RNNCommandsHandler *commandsHandler = [[RNNCommandsHandler alloc] initWithStore:_store controllerFactory:controllerFactory];
-	RNNBridgeModule *bridgeModule = [[RNNBridgeModule alloc] initWithCommandsHandler:commandsHandler];
-	
-	return @[bridgeModule,eventEmitter];
-}
-
-# pragma mark - js events
-
--(void)onJavaScriptWillLoad {
-	[_store clean];
-	[self resetRootViewControllerOnlyOnJSDevReload];
-}
-
--(void)onJavaScriptLoaded {
-	[_store setReadyToReceiveCommands:true];
-	[[_bridge moduleForClass:[RNNEventEmitter class]] sendOnAppLaunched];
-}
-
-# pragma mark - private
-
--(void)createBridgeLoadJsThenInitDependencyGraph {
-	_bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:_launchOptions];
-}
-
--(void)registerForJsEvents {
-	[[NSNotificationCenter defaultCenter] addObserver:self
-											 selector:@selector(onJavaScriptLoaded)
-												 name:RCTJavaScriptDidLoadNotification
-											   object:nil];
-	[[NSNotificationCenter defaultCenter] addObserver:self
-											 selector:@selector(onJavaScriptWillLoad)
-												 name:RCTJavaScriptWillStartLoadingNotification
-											   object:nil];
-}
-
--(void)resetRootViewControllerOnlyOnJSDevReload {
-	if(![UIApplication.sharedApplication.delegate.window.rootViewController isKindOfClass:[RNNSplashScreen class]]) {
-		UIApplication.sharedApplication.delegate.window.rootViewController = nil;
-	}
-}
-
-@end

ios/RNNReactRootViewCreator.m

@@ -1,6 +1,5 @@
 
 #import "RNNReactRootViewCreator.h"
-#import "RNN.h"
 #import <React/RCTRootView.h>
 
 @implementation RNNReactRootViewCreator {

ios/RNNRootViewController.m

@@ -1,7 +1,6 @@
 
 #import "RNNRootViewController.h"
 #import <React/RCTRootView.h>
-#import "RNN.h"
 
 @interface RNNRootViewController()
 @property NSString* containerId;
@@ -33,5 +32,4 @@
 	[self.eventEmitter sendContainerStop:self.containerId];
 }
 
-
 @end

ios/ReactNativeNavigation.h

@@ -4,8 +4,6 @@
 
 @interface ReactNativeNavigation : NSObject
 
-+(void)bootstrap:(NSURL*)jsCodeLocation;
-
 +(void)bootstrap:(NSURL*)jsCodeLocation launchOptions:(NSDictionary *)launchOptions;
 
 @end

ios/ReactNativeNavigation.m

@@ -1,15 +1,111 @@
 
 #import "ReactNativeNavigation.h"
-#import "RNN.h"
+ 
+#import <React/RCTBridge.h>
 
-@implementation ReactNativeNavigation
+#import "RNNEventEmitter.h"
+#import "RNNSplashScreen.h"
+#import "RNNBridgeModule.h"
+#import "RNNRootViewCreator.h"
+#import "RNNReactRootViewCreator.h"
 
-+(void)bootstrap:(NSURL *)jsCodeLocation {
-	[ReactNativeNavigation bootstrap:jsCodeLocation launchOptions:nil];
+@interface ReactNativeNavigation() <RCTBridgeDelegate>
+
+@end
+
+@implementation ReactNativeNavigation {
+	NSURL* _jsCodeLocation;
+	NSDictionary* _launchOptions;
+	RNNStore* _store;
+	RCTBridge* _bridge;
 }
 
+# pragma mark - public API
+
 +(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions {
-	[[RNN sharedInstance] bootstrap:jsCodeLocation launchOptions:launchOptions];
+	[[ReactNativeNavigation sharedInstance] bootstrap:jsCodeLocation launchOptions:launchOptions];
+}
+
+# pragma mark - instance
+
++(instancetype) sharedInstance {
+	static ReactNativeNavigation *instance = nil;
+	static dispatch_once_t onceToken = 0;
+	dispatch_once(&onceToken,^{
+		if (instance == nil) {
+			instance = [[ReactNativeNavigation alloc] init];
+		}
+	});
+	
+	return instance;
+}
+
+-(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions {
+	_jsCodeLocation = jsCodeLocation;
+	_launchOptions = launchOptions;
+	_store = [RNNStore new];
+	
+	[RNNSplashScreen show];
+	
+	[self registerForJsEvents];
+	
+	[self createBridgeLoadJsAndThenInitDependencyGraph];
+}
+
+# pragma mark - RCTBridgeDelegate
+
+-(NSURL *)sourceURLForBridge:(RCTBridge *)bridge {
+	return _jsCodeLocation;
+}
+
+/**
+ * here we initialize all of our dependency graph
+ */
+-(NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge {
+	RNNEventEmitter *eventEmitter = [[RNNEventEmitter alloc] init];
+	
+	id<RNNRootViewCreator> rootViewCreator = [[RNNReactRootViewCreator alloc] initWithBridge:bridge];
+	RNNControllerFactory *controllerFactory = [[RNNControllerFactory alloc] initWithRootViewCreator:rootViewCreator store:_store eventEmitter:eventEmitter];
+	RNNCommandsHandler *commandsHandler = [[RNNCommandsHandler alloc] initWithStore:_store controllerFactory:controllerFactory];
+	RNNBridgeModule *bridgeModule = [[RNNBridgeModule alloc] initWithCommandsHandler:commandsHandler];
+	
+	return @[bridgeModule,eventEmitter];
 }
 
+# pragma mark - js events
+
+-(void)onJavaScriptWillLoad {
+	[_store clean];
+	[self resetRootViewControllerOnlyOnJSDevReload];
+}
+
+-(void)onJavaScriptLoaded {
+	[_store setReadyToReceiveCommands:true];
+	[[_bridge moduleForClass:[RNNEventEmitter class]] sendOnAppLaunched];
+}
+
+# pragma mark - private
+
+-(void)createBridgeLoadJsAndThenInitDependencyGraph {
+	_bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:_launchOptions];
+}
+
+-(void)registerForJsEvents {
+	[[NSNotificationCenter defaultCenter] addObserver:self
+											 selector:@selector(onJavaScriptLoaded)
+												 name:RCTJavaScriptDidLoadNotification
+											   object:nil];
+	[[NSNotificationCenter defaultCenter] addObserver:self
+											 selector:@selector(onJavaScriptWillLoad)
+												 name:RCTJavaScriptWillStartLoadingNotification
+											   object:nil];
+}
+
+-(void)resetRootViewControllerOnlyOnJSDevReload {
+	if(![UIApplication.sharedApplication.delegate.window.rootViewController isKindOfClass:[RNNSplashScreen class]]) {
+		UIApplication.sharedApplication.delegate.window.rootViewController = nil;
+	}
+}
+
+
 @end

ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -56,7 +56,6 @@
 		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 */; };
 		7B1126A91E2D2B6C00F9B03B /* RNNControllerFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BC9346C1E26886E00EFA125 /* RNNControllerFactory.h */; };
@@ -65,7 +64,6 @@
 		7BA500751E2544B9001B9E1B /* ReactNativeNavigation.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BA500741E2544B9001B9E1B /* ReactNativeNavigation.m */; };
 		7BA500781E254908001B9E1B /* RNNSplashScreen.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BA500771E254908001B9E1B /* RNNSplashScreen.m */; };
 		7BBFE5441E25330E002A6182 /* RNNBridgeModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BBFE5431E25330E002A6182 /* RNNBridgeModule.m */; };
-		7BBFE5611E253F97002A6182 /* RNN.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BBFE5601E253F97002A6182 /* RNN.m */; };
 		7BC9346E1E26886E00EFA125 /* RNNControllerFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BC9346D1E26886E00EFA125 /* RNNControllerFactory.m */; };
 		7BEF0D181E437684003E96B0 /* RNNRootViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BEF0D161E437684003E96B0 /* RNNRootViewController.h */; };
 		7BEF0D191E437684003E96B0 /* RNNRootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BEF0D171E437684003E96B0 /* RNNRootViewController.m */; };
@@ -143,8 +141,6 @@
 		7BA500771E254908001B9E1B /* RNNSplashScreen.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNSplashScreen.m; sourceTree = "<group>"; };
 		7BBFE5421E25330E002A6182 /* RNNBridgeModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNBridgeModule.h; sourceTree = "<group>"; };
 		7BBFE5431E25330E002A6182 /* RNNBridgeModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNBridgeModule.m; sourceTree = "<group>"; };
-		7BBFE55F1E253F97002A6182 /* RNN.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNN.h; sourceTree = "<group>"; };
-		7BBFE5601E253F97002A6182 /* RNN.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNN.m; sourceTree = "<group>"; };
 		7BC9346C1E26886E00EFA125 /* RNNControllerFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNControllerFactory.h; sourceTree = "<group>"; };
 		7BC9346D1E26886E00EFA125 /* RNNControllerFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNControllerFactory.m; sourceTree = "<group>"; };
 		7BEF0D161E437684003E96B0 /* RNNRootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNRootViewController.h; sourceTree = "<group>"; };
@@ -272,8 +268,6 @@
 			children = (
 				7BA500731E2544B9001B9E1B /* ReactNativeNavigation.h */,
 				7BA500741E2544B9001B9E1B /* ReactNativeNavigation.m */,
-				7BBFE55F1E253F97002A6182 /* RNN.h */,
-				7BBFE5601E253F97002A6182 /* RNN.m */,
 				268692801E5054F800E2C612 /* RNNStore.h */,
 				268692811E5054F800E2C612 /* RNNStore.m */,
 				7B4928061E70415400555040 /* RNNCommandsHandler.h */,
@@ -318,7 +312,6 @@
 				263905C61E4C6F440023D7D3 /* SidebarFeedlyAnimation.h in Headers */,
 				7B1126A31E2D2B6C00F9B03B /* RNNSplashScreen.h in Headers */,
 				261F0E641E6EC94900989DE2 /* RNNModalManager.h in Headers */,
-				7B1126A51E2D2B6C00F9B03B /* RNN.h in Headers */,
 				263905C01E4C6F440023D7D3 /* SidebarAirbnbAnimation.h in Headers */,
 				263905E61E4CAC950023D7D3 /* RNNSideMenuChildVC.h in Headers */,
 				263905C41E4C6F440023D7D3 /* SidebarFacebookAnimation.h in Headers */,
@@ -422,7 +415,6 @@
 				263905CF1E4C6F440023D7D3 /* TheSidebarController.m in Sources */,
 				263905AF1E4C6F440023D7D3 /* MMDrawerBarButtonItem.m in Sources */,
 				7B4928091E70415400555040 /* RNNCommandsHandler.m in Sources */,
-				7BBFE5611E253F97002A6182 /* RNN.m in Sources */,
 				268692831E5054F800E2C612 /* RNNStore.m in Sources */,
 				7BC9346E1E26886E00EFA125 /* RNNControllerFactory.m in Sources */,
 				263905B61E4C6F440023D7D3 /* MMExampleDrawerVisualStateManager.m in Sources */,

playground/ios/playgroundTests/RNNModalManagerTest.m

@@ -17,7 +17,6 @@
 	[modalManager dismissAllModals];
 	
 	XCTAssertTrue([[store pendingModalIdsToDismiss] count] == 0);
-	
 }
 
 @end