refactored RNN

ios/RNN.m

@@ -5,6 +5,7 @@
 #import "RNNEventEmitter.h"
 #import "RNNSplashScreen.h"
 #import "RNNBridgeModule.h"
+#import "RNNRootViewCreator.h"
 #import "RNNReactRootViewCreator.h"
 
 @interface RNN() <RCTBridgeDelegate>
@@ -12,9 +13,10 @@
 @end
 
 @implementation RNN {
-	NSURL *_jsCodeLocation;
-	RCTBridge *_bridge;
-	RNNStore *_store;
+	NSURL* _jsCodeLocation;
+	NSDictionary* _launchOptions;
+	RNNStore* _store;
+	RCTBridge* _bridge;
 }
 
 +(instancetype) sharedInstance {
@@ -34,16 +36,14 @@
 
 -(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions {
 	_jsCodeLocation = jsCodeLocation;
-	
-	UIApplication.sharedApplication.delegate.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-	UIApplication.sharedApplication.delegate.window.backgroundColor = [UIColor whiteColor];
-	
+	_launchOptions = launchOptions;
+	_store = [RNNStore new];
+
 	[RNNSplashScreen show];
 	
 	[self registerForJsEvents];
 	
-	// this will load the JS bundle
-	_bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+	[self createBridgeLoadJsThenInitDependencyGraph];
 }
 
 # pragma mark - RCTBridgeDelegate
@@ -52,29 +52,35 @@
 	return _jsCodeLocation;
 }
 
--(void)onJavaScriptWillLoad {
-	_store = [RNNStore new];
-	[self resetRootViewControllerOnlyOnJSDevReload];
-}
-
 -(NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge {
 	RNNEventEmitter *eventEmitter = [[RNNEventEmitter alloc] init];
 	
-	RNNControllerFactory *controllerFactory = [[RNNControllerFactory alloc] initWithRootViewCreator:[[RNNReactRootViewCreator alloc]initWithBridge:bridge] store:_store eventEmitter:eventEmitter];
-	RNNCommandsHandler *commandsHandler = [[RNNCommandsHandler alloc]initWithStore:_store controllerFactory:controllerFactory];
-	
+	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.isReadyToReceiveCommands = YES;
+	[_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)
@@ -92,5 +98,4 @@
 	}
 }
 
-
 @end

ios/RNNModalManager.m

@@ -17,14 +17,14 @@
 }
 
 -(void)dismissModal:(NSString *)containerId {
-	[_store.modalsToDismissArray addObject:containerId];
+	[[_store pendingModalIdsToDismiss] addObject:containerId];
 	[self removePendingNextModalIfOnTop];
 }
 
 -(void)dismissAllModals {
 	UIViewController *root = UIApplication.sharedApplication.delegate.window.rootViewController;
 	[root dismissViewControllerAnimated:YES completion:nil];
-	[_store.modalsToDismissArray removeAllObjects];
+	[[_store pendingModalIdsToDismiss] removeAllObjects];
 }
 
 
@@ -32,7 +32,7 @@
 
 
 -(void)removePendingNextModalIfOnTop {
-	NSString *containerId = [_store.modalsToDismissArray lastObject];
+	NSString *containerId = [[_store pendingModalIdsToDismiss] lastObject];
 	
 	UIViewController *modalToDismiss = [_store findContainerForId:containerId];
 	
@@ -42,7 +42,7 @@
 	
 	if (modalToDismiss == [self topPresentedVC]) {
 		[modalToDismiss dismissViewControllerAnimated:YES completion:^{
-			[_store.modalsToDismissArray removeObject:containerId];
+			[[_store pendingModalIdsToDismiss] removeObject:containerId];
 			[self removePendingNextModalIfOnTop];
 		}];
 	}

ios/RNNSplashScreen.m

@@ -4,14 +4,16 @@
 
 @implementation RNNSplashScreen
 
-+(void)show
-{
++(void)show {
+	
+	UIApplication.sharedApplication.delegate.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+	UIApplication.sharedApplication.delegate.window.backgroundColor = [UIColor whiteColor];
+	
 	CGRect screenBounds = [UIScreen mainScreen].bounds;
 	UIView *splashView = nil;
 	
 	NSString* launchStoryBoard = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UILaunchStoryboardName"];
-	if (launchStoryBoard != nil)
-	{//load the splash from the storyboard that's defined in the info.plist as the LaunchScreen
+	if (launchStoryBoard != nil) {//load the splash from the storyboard that's defined in the info.plist as the LaunchScreen
 		@try
 		{
 			splashView = [[NSBundle mainBundle] loadNibNamed:launchStoryBoard owner:self options:nil][0];
@@ -25,8 +27,7 @@
 			splashView = nil;
 		}
 	}
-	else
-	{//load the splash from the DEfault image or from LaunchImage in the xcassets
+	else {//load the splash from the DEfault image or from LaunchImage in the xcassets
 		CGFloat screenHeight = screenBounds.size.height;
 		
 		NSString* imageName = @"Default";
@@ -39,8 +40,7 @@
 		
 		//xcassets LaunchImage files
 		UIImage *image = [UIImage imageNamed:imageName];
-		if (image == nil)
-		{
+		if (image == nil) {
 			imageName = @"LaunchImage";
 			
 			if (screenHeight == 480)
@@ -55,14 +55,12 @@
 			image = [UIImage imageNamed:imageName];
 		}
 		
-		if (image != nil)
-		{
+		if (image != nil) {
 			splashView = [[UIImageView alloc] initWithImage:image];
 		}
 	}
 	
-	if (splashView != nil)
-	{
+	if (splashView != nil) {
 		RNNSplashScreen *splashVC = [[RNNSplashScreen alloc] init];
 		splashVC.view = splashView;
 		

ios/RNNStore.h

@@ -4,11 +4,15 @@
 
 @interface RNNStore : NSObject
 
-@property (nonatomic, strong) NSMutableArray *modalsToDismissArray;
-@property (atomic) BOOL isReadyToReceiveCommands;
+-(UIViewController*) findContainerForId:(NSString*)containerId;
+-(void) setContainer:(UIViewController*)viewController containerId:(NSString*)containerId;
+-(void) removeContainer:(NSString*)containerId;
 
-- (UIViewController*)findContainerForId:(NSString*)containerId;
-- (void)setContainer:(UIViewController*)viewController containerId:(NSString*)containerId;
-- (void)removeContainer:(NSString*)containerId;
+-(void) setReadyToReceiveCommands:(BOOL)isReady;
+-(BOOL) isReadyToReceiveCommands;
+
+-(NSMutableArray*) pendingModalIdsToDismiss;
+
+-(void) clean;
 
 @end

ios/RNNStore.m

@@ -7,12 +7,15 @@
 
 @implementation RNNStore {
 	NSMapTable* _containerStore;
+	NSMutableArray* _pendingModalIdsToDismiss;
+	BOOL _isReadyToReceiveCommands;
 }
 
 -(instancetype)init {
 	self = [super init];
+	_isReadyToReceiveCommands = false;
 	_containerStore = [NSMapTable strongToWeakObjectsMapTable];
-	self.modalsToDismissArray = [NSMutableArray new];
+	_pendingModalIdsToDismiss = [NSMutableArray new];
 	return self;
 }
 
@@ -33,5 +36,22 @@
 	[_containerStore removeObjectForKey:containerId];
 }
 
+-(void)setReadyToReceiveCommands:(BOOL)isReady {
+	_isReadyToReceiveCommands = isReady;
+}
+
+-(BOOL)isReadyToReceiveCommands {
+	return _isReadyToReceiveCommands;
+}
+
+-(NSMutableArray *)pendingModalIdsToDismiss {
+	return _pendingModalIdsToDismiss;
+}
+
+-(void)clean {
+	_isReadyToReceiveCommands = false;
+	[_pendingModalIdsToDismiss removeAllObjects];
+	[_containerStore removeAllObjects];
+}
 
 @end

playground/ios/playgroundTests/RNNModalManagerTest.m

@@ -9,14 +9,14 @@
 
 - (void)testDismissAllModalsCleansPendingModalsToDismiss {
 	RNNStore *store = [RNNStore new];
-	[store.modalsToDismissArray addObject:@"modal_id_1"];
-	[store.modalsToDismissArray addObject:@"modal_id_2"];
-	[store.modalsToDismissArray addObject:@"modal_id_3"];
+	[[store pendingModalIdsToDismiss] addObject:@"modal_id_1"];
+	[[store pendingModalIdsToDismiss] addObject:@"modal_id_2"];
+	[[store pendingModalIdsToDismiss] addObject:@"modal_id_3"];
 	
 	RNNModalManager *modalManager = [[RNNModalManager alloc] initWithStore:store];
 	[modalManager dismissAllModals];
 	
-	XCTAssertTrue([store.modalsToDismissArray count] == 0);
+	XCTAssertTrue([[store pendingModalIdsToDismiss] count] == 0);
 	
 }