ios native refactor to remove the singleton hell step 1

ios/RNN.h

@@ -8,7 +8,6 @@
 
 @interface RNN : NSObject
 
-@property (readonly) BOOL isReadyToReceiveCommands;
 @property (readonly) RCTBridge* bridge;
 @property (readonly) RNNEventEmitter* eventEmitter;
 @property (readonly) RNNStore *store;

ios/RNN.m

@@ -5,10 +5,13 @@
 #import <React/RCTBridge.h>
 #import "RNNSplashScreen.h"
 
-@interface RNN()
+#import "RNNBridgeModule.h"
+#import "RNNReactRootViewCreator.h"
 
+@interface RNN() <RCTBridgeDelegate>
+
+@property NSURL* jsCodeLocation;
 @property (readwrite) RCTBridge* bridge;
-@property (readwrite) BOOL isReadyToReceiveCommands;
 @property (readwrite) RNNEventEmitter* eventEmitter;
 
 @property (readwrite) RNNStore *store;
@@ -36,8 +39,8 @@
 }
 
 
--(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions
-{
+-(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions {
+	self.jsCodeLocation = jsCodeLocation;
 	self.eventEmitter = [RNNEventEmitter new];
 	
 	UIApplication.sharedApplication.delegate.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
@@ -46,34 +49,44 @@
 	[RNNSplashScreen show];
 	
 	[self registerForJsEvents];
+	
 	// this will load the JS bundle
-	self.bridge = [[RCTBridge alloc] initWithBundleURL:jsCodeLocation moduleProvider:nil launchOptions:launchOptions];
+	self.bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
 }
 
+# pragma mark - RCTBridgeDelegate
 
-# pragma mark private
-
+-(NSURL *)sourceURLForBridge:(RCTBridge *)bridge {
+	return self.jsCodeLocation;
+}
 
--(void)registerForJsEvents
-{
-	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onJavaScriptLoaded) name:RCTJavaScriptDidLoadNotification object:self.bridge];
-	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onJavaScriptWillLoad) name:RCTJavaScriptWillStartLoadingNotification	object:self.bridge];
+-(NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge {
+	
+	RNNControllerFactory *controllerFactory = [[RNNControllerFactory alloc] initWithRootViewCreator:[RNNReactRootViewCreator new] store:self.store];
+	RNNCommandsHandler* commandsHandler = [[RNNCommandsHandler alloc]initWithStore:[RNN instance].store controllerFactory:controllerFactory];
+	
+	RNNBridgeModule* bridgeModule = [[RNNBridgeModule alloc] initWithCommandsHandler:commandsHandler];
+	return @[bridgeModule];
 }
 
+# pragma mark - private
 
--(void)onJavaScriptLoaded
-{
-	self.isReadyToReceiveCommands = true;
-	[self.eventEmitter sendOnAppLaunched];
+-(void)registerForJsEvents {
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onJavaScriptLoaded) name:RCTJavaScriptDidLoadNotification object:self.bridge];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onJavaScriptWillLoad) name:RCTJavaScriptWillStartLoadingNotification	object:self.bridge];
 }
 
 
--(void)onJavaScriptWillLoad
-{
+-(void)onJavaScriptWillLoad {
 	self.store = [RNNStore new];
 	[self resetRootViewControllerOnlyOnJSDevReload];
 }
 
+-(void)onJavaScriptLoaded {
+	self.store.isReadyToReceiveCommands = true;
+	[self.eventEmitter sendOnAppLaunched];
+}
+
 -(void)resetRootViewControllerOnlyOnJSDevReload {
 	if(![UIApplication.sharedApplication.delegate.window.rootViewController isKindOfClass:[RNNSplashScreen class]]) {
 		UIApplication.sharedApplication.delegate.window.rootViewController = nil;

ios/RNNBridgeModule.h

@@ -3,6 +3,10 @@
 
 #import <React/RCTBridgeModule.h>
 
+#import "RNNCommandsHandler.h"
+
 @interface RNNBridgeModule : NSObject <RCTBridgeModule>
 
+-(instancetype)initWithCommandsHandler:(RNNCommandsHandler*)commandsHandler;
+
 @end

ios/RNNBridgeModule.m

@@ -1,6 +1,8 @@
 #import "RNNBridgeModule.h"
 
-#import "RNNCommandsHandler.h"
+@interface RNNBridgeModule ()
+@property RNNCommandsHandler* commandsHandler;
+@end
 
 @implementation RNNBridgeModule
 
@@ -10,30 +12,36 @@ RCT_EXPORT_MODULE();
 	return dispatch_get_main_queue();
 }
 
+-(instancetype)initWithCommandsHandler:(RNNCommandsHandler *)commandsHandler {
+	self = [super init];
+	self.commandsHandler = commandsHandler;
+	return self;
+}
+
 #pragma mark - JS interface
 
 RCT_EXPORT_METHOD(setRoot:(NSDictionary*)layout) {
-	[[RNNCommandsHandler new] setRoot:layout];
+	[self.commandsHandler setRoot:layout];
 }
 
 RCT_EXPORT_METHOD(push:(NSString*)containerId layout:(NSDictionary*)layout) {
-	[[RNNCommandsHandler new] push:containerId layout:layout];
+	[self.commandsHandler push:containerId layout:layout];
 }
 
 RCT_EXPORT_METHOD(pop:(NSString*)containerId) {
-	[[RNNCommandsHandler new] pop:containerId];
+	[self.commandsHandler pop:containerId];
 }
 
 RCT_EXPORT_METHOD(showModal:(NSDictionary*)layout) {
-	[[RNNCommandsHandler new] showModal:layout];
+	[self.commandsHandler showModal:layout];
 }
 
 RCT_EXPORT_METHOD(dismissModal:(NSString*)containerId) {
-	[[RNNCommandsHandler new] dismissModal:containerId];
+	[self.commandsHandler dismissModal:containerId];
 }
 
 RCT_EXPORT_METHOD(dismissAllModals) {
-	[[RNNCommandsHandler new] dismissAllModals];
+	[self.commandsHandler dismissAllModals];
 }
 
 @end

ios/RNNCommandsHandler.h

@@ -1,9 +1,13 @@
-
-
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+#import "RNNControllerFactory.h"
+#import "RNNStore.h"
 
 @interface RNNCommandsHandler : NSObject
 
+-(instancetype) initWithStore:(RNNStore*)store controllerFactory:(RNNControllerFactory*)controllerFactory;
+
 -(void) setRoot:(NSDictionary*)layout;
 
 -(void) push:(NSString*)containerId layout:(NSDictionary*)layout;

ios/RNNCommandsHandler.m

@@ -1,22 +1,28 @@
 
 #import "RNNCommandsHandler.h"
 
-
-#import "RNN.h"
-#import "RNNControllerFactory.h"
-#import "RNNReactRootViewCreator.h"
-#import "RNNStore.h"
 #import "RNNModalManager.h"
 #import "RNNNavigationStackManager.h"
 
+@interface RNNCommandsHandler ()
+@property RNNControllerFactory *controllerFactory;
+@property RNNStore *store;
+@end
+
 @implementation RNNCommandsHandler
 
+-(instancetype) initWithStore:(RNNStore*)store controllerFactory:(RNNControllerFactory*)controllerFactory {
+	self = [super init];
+	self.store = store;
+	self.controllerFactory = controllerFactory;
+	return self;
+}
+
 #pragma mark - public
 
 -(void) setRoot:(NSDictionary*)layout {
 	[self assertReady];
-	RNNControllerFactory *factory = [[RNNControllerFactory alloc] initWithRootViewCreator:[RNNReactRootViewCreator new] store:[RNN instance].store];
-	UIViewController *vc = [factory createLayoutAndSaveToStore:layout];
+	UIViewController *vc = [self.controllerFactory createLayoutAndSaveToStore:layout];
 	
 	UIApplication.sharedApplication.delegate.window.rootViewController = vc;
 	[UIApplication.sharedApplication.delegate.window makeKeyAndVisible];
@@ -24,41 +30,48 @@
 
 -(void) push:(NSString*)containerId layout:(NSDictionary*)layout {
 	[self assertReady];
-	RNNControllerFactory *factory = [[RNNControllerFactory alloc] initWithRootViewCreator:[RNNReactRootViewCreator new] store:[RNN instance].store];
-	UIViewController *newVc = [factory createLayoutAndSaveToStore:layout];
-	UIViewController *vc = [[RNN instance].store findContainerForId:containerId];
 	
-	[[[RNNNavigationStackManager alloc] initWithStore:[RNN instance].store] push:newVc onTop:vc animated:YES];
+	UIViewController *newVc = [self.controllerFactory createLayoutAndSaveToStore:layout];
+	
+	// find on who to push
+	UIViewController *vc = [self.store findContainerForId:containerId];
+	
+	// do the actual pushing
+	[[[RNNNavigationStackManager alloc] initWithStore:self.store] push:newVc onTop:vc animated:YES];
 }
 
 -(void) pop:(NSString*)containerId {
 	[self assertReady];
-	UIViewController *vc = [[RNN instance].store findContainerForId:containerId];
-	[[[RNNNavigationStackManager alloc] initWithStore:[RNN instance].store] pop:vc animated:YES];
-	[[RNN instance].store removeContainer:containerId];
+	
+	// find who to pop
+	UIViewController *vc = [self.store findContainerForId:containerId];
+	
+	// do the popping
+	[[[RNNNavigationStackManager alloc] initWithStore:self.store] pop:vc animated:YES];
+	[self.store removeContainer:containerId];
 }
 
 -(void) showModal:(NSDictionary*)layout {
 	[self assertReady];
-	RNNControllerFactory *factory = [[RNNControllerFactory alloc] initWithRootViewCreator:[RNNReactRootViewCreator new] store:[RNN instance].store];
-	UIViewController *newVc = [factory createLayoutAndSaveToStore:layout];
-	[[[RNNModalManager alloc] initWithStore:[RNN instance].store] showModal:newVc];
+	
+	UIViewController *newVc = [self.controllerFactory createLayoutAndSaveToStore:layout];
+	[[[RNNModalManager alloc] initWithStore:self.store] showModal:newVc];
 }
 
 -(void) dismissModal:(NSString*)containerId {
 	[self assertReady];
-	[[[RNNModalManager alloc] initWithStore:[RNN instance].store] dismissModal:containerId];
+	[[[RNNModalManager alloc] initWithStore:self.store] dismissModal:containerId];
 }
 
 -(void) dismissAllModals {
 	[self assertReady];
-	[[[RNNModalManager alloc] initWithStore:[RNN instance].store] dismissAllModals];
+	[[[RNNModalManager alloc] initWithStore:self.store] dismissAllModals];
 }
 
 #pragma mark - private
 
-- (void)assertReady {
-	if (![RNN instance].isReadyToReceiveCommands) {
+-(void) assertReady {
+	if (!self.store.isReadyToReceiveCommands) {
 		@throw [NSException exceptionWithName:@"BridgeNotLoadedError" reason:@"Bridge not yet loaded! Send commands after Navigation.events().onAppLaunched() has been called." userInfo:nil];
 	}
 }

ios/RNNControllerFactory.m

@@ -25,15 +25,13 @@
 	return self;
 }
 
-- (UIViewController*)createLayoutAndSaveToStore:(NSDictionary*)layout
-{
+- (UIViewController*)createLayoutAndSaveToStore:(NSDictionary*)layout {
 	return [self fromTree:layout];
 }
 
 # pragma mark private
 
-- (UIViewController*)fromTree:(NSDictionary*)json
-{
+- (UIViewController*)fromTree:(NSDictionary*)json {
 	RNNLayoutNode* node = [RNNLayoutNode create:json];
 	
 	UIViewController* result;
@@ -74,13 +72,11 @@
 	return result;
 }
 
-- (RNNRootViewController*)createContainer:(RNNLayoutNode*)node
-{
+- (RNNRootViewController*)createContainer:(RNNLayoutNode*)node {
 	return [[RNNRootViewController alloc] initWithNode:node rootViewCreator:self.creator];
 }
 
-- (UINavigationController*)createContainerStack:(RNNLayoutNode*)node
-{
+- (UINavigationController*)createContainerStack:(RNNLayoutNode*)node {
 	UINavigationController* vc = [[UINavigationController alloc] init];
 	
 	NSMutableArray* controllers = [NSMutableArray new];
@@ -92,8 +88,7 @@
 	return vc;
 }
 
--(UITabBarController*)createTabs:(RNNLayoutNode*)node
-{
+-(UITabBarController*)createTabs:(RNNLayoutNode*)node {
 	UITabBarController* vc = [[UITabBarController alloc] init];
 	
 	NSMutableArray* controllers = [NSMutableArray new];
@@ -109,8 +104,7 @@
 	return vc;
 }
 
-- (UIViewController*)createSideMenu:(RNNLayoutNode*)node
-{
+- (UIViewController*)createSideMenu:(RNNLayoutNode*)node {
 	NSMutableArray* childrenVCs = [NSMutableArray new];
 	
 	

ios/RNNStore.h

@@ -6,6 +6,7 @@
 @interface RNNStore : NSObject
 
 @property NSMutableArray *modalsToDismissArray;
+@property BOOL isReadyToReceiveCommands;
 
 - (UIViewController*)findContainerForId:(NSString*)containerId;
 - (void)setContainer:(UIViewController*)viewController containerId:(NSString*)containerId;

ios/RNNStore.m

@@ -5,7 +5,6 @@
 
 @property NSMapTable *containerStore;
 
-
 @end
 
 @implementation RNNStore

ios/ReactNativeNavigation.m

@@ -5,13 +5,11 @@
 
 @implementation ReactNativeNavigation
 
-+(void)bootstrap:(NSURL *)jsCodeLocation
-{
++(void)bootstrap:(NSURL *)jsCodeLocation {
 	[ReactNativeNavigation bootstrap:jsCodeLocation launchOptions:nil];
 }
 
-+(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions
-{	
++(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions {
 	[[RNN instance] bootstrap:jsCodeLocation launchOptions:launchOptions];
 }
 

playground/scripts/unit.ios.js

@@ -9,7 +9,7 @@ function testProject() {
             test
             -scheme "playground"
             -project playground.xcodeproj
-            -destination 'platform=iOS Simulator,name=iPhone SE'
+            -destination 'platform=iOS Simulator,name=iPhone 7'
             `;
 
   // if (hasXcpretty()) {