refactor

ios/RNN.m

@@ -9,14 +9,16 @@
 
 @interface RNN() <RCTBridgeDelegate>
 
-@property NSURL* jsCodeLocation;
-@property RCTBridge* bridge;
-@property RNNEventEmitter* eventEmitter;
-@property RNNStore *store;
+
 
 @end
 
-@implementation RNN
+@implementation RNN {
+	NSURL *_jsCodeLocation;
+	RCTBridge *_bridge;
+	RNNEventEmitter *_eventEmitter;
+	RNNStore *_store;
+}
 
 +(instancetype) sharedInstance {
 	static RNN *instance = nil;
@@ -34,8 +36,8 @@
 # pragma mark public
 
 -(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions {
-	self.jsCodeLocation = jsCodeLocation;
-	self.eventEmitter = [RNNEventEmitter new];
+	_jsCodeLocation = jsCodeLocation;
+	_eventEmitter = [RNNEventEmitter new];
 	
 	UIApplication.sharedApplication.delegate.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
 	UIApplication.sharedApplication.delegate.window.backgroundColor = [UIColor whiteColor];
@@ -45,40 +47,42 @@
 	[self registerForJsEvents];
 	
 	// this will load the JS bundle
-	self.bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+	_bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
 }
 
 # pragma mark - RCTBridgeDelegate
 
 -(NSURL *)sourceURLForBridge:(RCTBridge *)bridge {
-	return self.jsCodeLocation;
+	return _jsCodeLocation;
 }
 
 -(NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge {
 	
-	RNNControllerFactory *controllerFactory = [[RNNControllerFactory alloc] initWithRootViewCreator:[RNNReactRootViewCreator new] store:self.store];
-	RNNCommandsHandler* commandsHandler = [[RNNCommandsHandler alloc]initWithStore:self.store controllerFactory:controllerFactory];
+	RNNControllerFactory *controllerFactory = [[RNNControllerFactory alloc] initWithRootViewCreator:[RNNReactRootViewCreator new] store:_store];
+	RNNCommandsHandler *commandsHandler = [[RNNCommandsHandler alloc]initWithStore:_store controllerFactory:controllerFactory];
+	
+	RNNBridgeModule *bridgeModule = [[RNNBridgeModule alloc] initWithCommandsHandler:commandsHandler];
+	RNNEventEmitter *eventEmitter = [[RNNEventEmitter alloc] initWithBridge:bridge];
 	
-	RNNBridgeModule* bridgeModule = [[RNNBridgeModule alloc] initWithCommandsHandler:commandsHandler];
-	return @[bridgeModule];
+	return @[bridgeModule,eventEmitter];
 }
 
 # pragma mark - private
 
 -(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];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onJavaScriptLoaded) name:RCTJavaScriptDidLoadNotification object:_bridge];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onJavaScriptWillLoad) name:RCTJavaScriptWillStartLoadingNotification	object:_bridge];
 }
 
 
 -(void)onJavaScriptWillLoad {
-	self.store = [RNNStore new];
+	_store = [RNNStore new];
 	[self resetRootViewControllerOnlyOnJSDevReload];
 }
 
 -(void)onJavaScriptLoaded {
-	self.store.isReadyToReceiveCommands = true;
-	[self.eventEmitter sendOnAppLaunched];
+	_store.isReadyToReceiveCommands = true;
+	[_eventEmitter sendOnAppLaunched];
 }
 
 -(void)resetRootViewControllerOnlyOnJSDevReload {

ios/RNNEventEmitter.h

@@ -6,6 +6,8 @@
 
 @interface RNNEventEmitter : RCTEventEmitter <RCTBridgeModule>
 
+-(instancetype)initWithBridge:(RCTBridge*)bridge;
+
 -(void)sendOnAppLaunched;
 
 -(void)sendContainerStart:(NSString*)containerId;

ios/RNNEventEmitter.m

@@ -1,8 +1,8 @@
-
 #import "RNNEventEmitter.h"
-#import "RNN.h"
 
-@implementation RNNEventEmitter
+@implementation RNNEventEmitter {
+	RCTBridge *_bridge;
+}
 
 RCT_EXPORT_MODULE();
 
@@ -10,6 +10,14 @@ static NSString* const onAppLaunched	= @"RNN.appLaunched";
 static NSString* const containerStart	= @"RNN.containerStart";
 static NSString* const containerStop	= @"RNN.containerStop";
 
+-(instancetype)initWithBridge:(RCTBridge*)bridge {
+	self = [super init];
+	
+	_bridge = bridge;
+	
+	return self;
+}
+
 -(NSArray<NSString *> *)supportedEvents
 {
 	return @[onAppLaunched, containerStart, containerStop];
@@ -36,7 +44,7 @@ static NSString* const containerStop	= @"RNN.containerStop";
 
 -(void)send:(NSString *)eventName body:(id)body
 {
-	[[[RNN instance].bridge moduleForClass:[RNNEventEmitter class]] sendEventWithName:eventName body:body];
+	[[_bridge moduleForClass:[RNNEventEmitter class]] sendEventWithName:eventName body:body];
 }
 
 @end

ios/RNNReactRootViewCreator.h

@@ -1,14 +1,8 @@
-//
-//  RNNReactRootViewCreator.h
-//  ReactNativeNavigation
-//
-//  Created by Ran Greenberg on 08/02/2017.
-//  Copyright © 2017 Wix. All rights reserved.
-//
-
 #import <Foundation/Foundation.h>
 #import "RNNRootViewCreator.h"
 
+#import <React/RCTBridge.h>
+
 @interface RNNReactRootViewCreator : NSObject <RNNRootViewCreator>
 
 @end

ios/RNNReactRootViewCreator.m

@@ -3,14 +3,29 @@
 #import "RNN.h"
 #import <React/RCTRootView.h>
 
+@interface RNNReactRootViewCreator ()
+
+@property RCTBridge *bridge;
+
+@end
+
 @implementation RNNReactRootViewCreator
 
-- (UIView*)createRootView:(NSString*)name rootViewId:(NSString*)rootViewId{
+-(instancetype)initWithBridge:(RCTBridge*)bridge {
+	self = [super init];
+	
+	self.bridge = bridge;
+	
+	return self;
+	
+}
+
+- (UIView*)createRootView:(NSString*)name rootViewId:(NSString*)rootViewId {
 	if (!rootViewId) {
 		@throw [NSException exceptionWithName:@"MissingViewId" reason:@"Missing view id" userInfo:nil];
 	}
 	
-	UIView *view = [[RCTRootView alloc] initWithBridge:[RNN instance].bridge
+	UIView *view = [[RCTRootView alloc] initWithBridge:self.bridge
 										 moduleName:name
 								  initialProperties:@{@"id": rootViewId}];
 	return view;

ios/RNNRootViewController.h

@@ -3,9 +3,12 @@
 #import <UIKit/UIKit.h>
 #import "RNNLayoutNode.h"
 #import "RNNRootViewCreator.h"
+#import "RNNEventEmitter.h"
 
 @interface RNNRootViewController : UIViewController
 
--(instancetype)initWithNode:(RNNLayoutNode*)node rootViewCreator:(id<RNNRootViewCreator>)creator;
+-(instancetype)initWithNode:(RNNLayoutNode*)node
+			rootViewCreator:(id<RNNRootViewCreator>)creator
+			   eventEmitter:(RNNEventEmitter*)eventEmitter;
 
 @end

ios/RNNRootViewController.m

@@ -6,15 +6,16 @@
 @interface RNNRootViewController()
 @property NSString* containerId;
 @property NSString* containerName;
+@property RNNEventEmitter *eventEmitter;
 @end
 
 @implementation RNNRootViewController
 
--(instancetype)initWithNode:(RNNLayoutNode*)node rootViewCreator:(id<RNNRootViewCreator>)creator
-{
+-(instancetype)initWithNode:(RNNLayoutNode*)node rootViewCreator:(id<RNNRootViewCreator>)creator eventEmitter:(RNNEventEmitter*)eventEmitter {
 	self = [super init];
 	self.containerId = node.nodeId;
 	self.containerName = node.data[@"name"];
+	self.eventEmitter = eventEmitter;
 	
 	self.view = [creator createRootView:self.containerName rootViewId:self.containerId];
 	return self;
@@ -23,13 +24,13 @@
 -(void)viewDidAppear:(BOOL)animated
 {
 	[super viewDidAppear:animated];
-	[[RNN instance].eventEmitter sendContainerStart:self.containerId];
+	[self.eventEmitter sendContainerStart:self.containerId];
 }
 
 -(void)viewDidDisappear:(BOOL)animated
 {
 	[super viewDidDisappear:animated];
-	[[RNN instance].eventEmitter sendContainerStop:self.containerId];
+	[self.eventEmitter sendContainerStop:self.containerId];
 }