removed the singleton

ios/RNN.h

@@ -2,17 +2,9 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-#import "RNNEventEmitter.h"
-#import <React/RCTBridge.h>
-#import "RNNStore.h"
-
 @interface RNN : NSObject
 
-@property (readonly) RCTBridge* bridge;
-@property (readonly) RNNEventEmitter* eventEmitter;
-@property (readonly) RNNStore *store;
-
-+(instancetype)instance;
++(instancetype)sharedInstance;
 
 -(void)bootstrap:(NSURL*)jsCodeLocation launchOptions:(NSDictionary*)launchOptions;
 

ios/RNN.m

@@ -1,43 +1,37 @@
 
 #import "RNN.h"
-#import "RNNEventEmitter.h"
-
 #import <React/RCTBridge.h>
-#import "RNNSplashScreen.h"
 
+#import "RNNEventEmitter.h"
+#import "RNNSplashScreen.h"
 #import "RNNBridgeModule.h"
 #import "RNNReactRootViewCreator.h"
 
 @interface RNN() <RCTBridgeDelegate>
 
 @property NSURL* jsCodeLocation;
-@property (readwrite) RCTBridge* bridge;
-@property (readwrite) RNNEventEmitter* eventEmitter;
-
-@property (readwrite) RNNStore *store;
+@property RCTBridge* bridge;
+@property RNNEventEmitter* eventEmitter;
+@property RNNStore *store;
 
 @end
 
 @implementation RNN
 
-
-# pragma mark public
-
-
-+(instancetype)instance
-{
-	static RNN *sharedInstance = nil;
++(instancetype) sharedInstance {
+	static RNN *instance = nil;
 	static dispatch_once_t onceToken = 0;
 	dispatch_once(&onceToken,^{
-		if (sharedInstance == nil)
+		if (instance == nil)
 		{
-			sharedInstance = [[RNN alloc] init];
+			instance = [[RNN alloc] init];
 		}
 	});
 	
-	return sharedInstance;
+	return instance;
 }
 
+# pragma mark public
 
 -(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions {
 	self.jsCodeLocation = jsCodeLocation;
@@ -63,7 +57,7 @@
 -(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];
+	RNNCommandsHandler* commandsHandler = [[RNNCommandsHandler alloc]initWithStore:self.store controllerFactory:controllerFactory];
 	
 	RNNBridgeModule* bridgeModule = [[RNNBridgeModule alloc] initWithCommandsHandler:commandsHandler];
 	return @[bridgeModule];

ios/RNNReactRootViewCreator.m

@@ -1,10 +1,3 @@
-//
-//  RNNReactRootViewCreator.m
-//  ReactNativeNavigation
-//
-//  Created by Ran Greenberg on 08/02/2017.
-//  Copyright © 2017 Wix. All rights reserved.
-//
 
 #import "RNNReactRootViewCreator.h"
 #import "RNN.h"
@@ -12,8 +5,7 @@
 
 @implementation RNNReactRootViewCreator
 
- - (UIView*)createRootView:(NSString*)name rootViewId:(NSString*)rootViewId
-{
+- (UIView*)createRootView:(NSString*)name rootViewId:(NSString*)rootViewId{
 	if (!rootViewId) {
 		@throw [NSException exceptionWithName:@"MissingViewId" reason:@"Missing view id" userInfo:nil];
 	}

ios/RNNStore.m

@@ -20,12 +20,9 @@
 
 -(UIViewController *)findContainerForId:(NSString *)containerId {
 	return [self.containerStore objectForKey:containerId];
-	
 }
 
-
 - (void)setContainer:(UIViewController*)viewController containerId:(NSString*)containerId {
-
 	UIViewController *existingVewController = [self findContainerForId:containerId];
 	if (existingVewController) {
 		@throw [NSException exceptionWithName:@"MultipleContainerId" reason:[@"Container id already exists " stringByAppendingString:containerId] userInfo:nil];
@@ -34,7 +31,6 @@
 	[self.containerStore setObject:viewController forKey:containerId];
 }
 
-
 - (void)removeContainer:(NSString*)containerId {
 	[self.containerStore removeObjectForKey:containerId];
 }

ios/ReactNativeNavigation.m

@@ -1,6 +1,5 @@
 
 #import "ReactNativeNavigation.h"
-
 #import "RNN.h"
 
 @implementation ReactNativeNavigation
@@ -10,7 +9,7 @@
 }
 
 +(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions {
-	[[RNN instance] bootstrap:jsCodeLocation launchOptions:launchOptions];
+	[[RNN sharedInstance] bootstrap:jsCodeLocation launchOptions:launchOptions];
 }
 
 @end