Refactor ReactNativeNavigation class into a developer-controllable class (#2480)

This allows developers more control over how the app is launched, in a backwards-compatible way.

lib/ios/RNNBridgeManager.h

+#import <Foundation/Foundation.h>
+#import <React/RCTBridge.h>
+
+@interface RNNBridgeManager : NSObject <RCTBridgeDelegate>
+
+- (instancetype)initWithJsCodeLocation:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions;
+
+@property (readonly, nonatomic, strong) RCTBridge *bridge;
+
+@end

lib/ios/RNNBridgeManager.m

+#import "RNNBridgeManager.h"
+
+#import <React/RCTBridge.h>
+#import <React/RCTUIManager.h>
+
+#import "RNNEventEmitter.h"
+#import "RNNSplashScreen.h"
+#import "RNNBridgeModule.h"
+#import "RNNRootViewCreator.h"
+#import "RNNReactRootViewCreator.h"
+
+@interface RNNBridgeManager() <RCTBridgeDelegate>
+
+@property (nonatomic, strong, readwrite) RCTBridge *bridge;
+
+@end
+
+@implementation RNNBridgeManager {
+	NSURL* _jsCodeLocation;
+	NSDictionary* _launchOptions;
+	RCTBridge* _bridge;
+
+	RNNStore* _store;
+
+	RNNCommandsHandler* _commandsHandler;
+}
+
+- (instancetype)initWithJsCodeLocation:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions {
+	if (self = [super init]) {
+		_jsCodeLocation = jsCodeLocation;
+		_launchOptions = launchOptions;
+		
+		_store = [RNNStore new];
+		_bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:_launchOptions];
+
+		[[NSNotificationCenter defaultCenter] addObserver:self
+												 selector:@selector(onJavaScriptLoaded)
+													 name:RCTJavaScriptDidLoadNotification
+												   object:nil];
+		[[NSNotificationCenter defaultCenter] addObserver:self
+												 selector:@selector(onJavaScriptWillLoad)
+													 name:RCTJavaScriptWillStartLoadingNotification
+												   object:nil];
+		[[NSNotificationCenter defaultCenter] addObserver:self
+												 selector:@selector(onBridgeWillReload)
+													 name:RCTBridgeWillReloadNotification
+												   object:nil];
+	}
+	return self;
+}
+
+# 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 andBridge:bridge];
+	_commandsHandler = [[RNNCommandsHandler alloc] initWithStore:_store controllerFactory:controllerFactory];
+	RNNBridgeModule *bridgeModule = [[RNNBridgeModule alloc] initWithCommandsHandler:_commandsHandler];
+
+	return @[bridgeModule,eventEmitter];
+}
+
+# pragma mark - JavaScript & Bridge Notifications
+
+- (void)onJavaScriptWillLoad {
+	[_store clean];
+}
+
+- (void)onJavaScriptLoaded {
+	[_store setReadyToReceiveCommands:true];
+	[[_bridge moduleForClass:[RNNEventEmitter class]] sendOnAppLaunched];
+}
+
+- (void)onBridgeWillReload {
+	UIApplication.sharedApplication.delegate.window.rootViewController =  nil;
+}
+
+@end
+

lib/ios/ReactNativeNavigation.h

-
 #import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
 
 @interface ReactNativeNavigation : NSObject
 

lib/ios/ReactNativeNavigation.m

-
 #import "ReactNativeNavigation.h"
 
+#import <UIKit/UIKit.h>
 #import <React/RCTBridge.h>
 #import <React/RCTUIManager.h>
 
-#import "RNNEventEmitter.h"
+#import "RNNBridgeManager.h"
 #import "RNNSplashScreen.h"
-#import "RNNBridgeModule.h"
-#import "RNNRootViewCreator.h"
-#import "RNNReactRootViewCreator.h"
 
-@interface ReactNativeNavigation() <RCTBridgeDelegate>
+@interface ReactNativeNavigation()
+
+@property (nonatomic, strong) RNNBridgeManager *bridgeManager;
 
 @end
 
-@implementation ReactNativeNavigation {
-	NSURL* _jsCodeLocation;
-	NSDictionary* _launchOptions;
-	RCTBridge* _bridge;
-	
-	RNNStore* _store;
-	
-	RNNCommandsHandler* _commandsHandler;
-}
+@implementation ReactNativeNavigation
 
 # pragma mark - public API
 
 
 # pragma mark - instance
 
-+(instancetype) sharedInstance {
++ (instancetype) sharedInstance {
 	static ReactNativeNavigation *instance = nil;
 	static dispatch_once_t onceToken = 0;
 	dispatch_once(&onceToken,^{
 }
 
 -(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions {
-	_jsCodeLocation = jsCodeLocation;
-	_launchOptions = launchOptions;
-	_store = [RNNStore new];
-	
+	self.bridgeManager = [[RNNBridgeManager alloc] initWithJsCodeLocation:jsCodeLocation launchOptions:launchOptions];
 	[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 andBridge:bridge];
-	_commandsHandler = [[RNNCommandsHandler alloc] initWithStore:_store controllerFactory:controllerFactory];
-	RNNBridgeModule *bridgeModule = [[RNNBridgeModule alloc] initWithCommandsHandler:_commandsHandler];
-	
-	return @[bridgeModule,eventEmitter];
-}
-
-# pragma mark - js events
-
--(void)onJavaScriptWillLoad {
-	[_store clean];
-}
-
--(void)onJavaScriptLoaded {
-	[_store setReadyToReceiveCommands:true];
-	[[_bridge moduleForClass:[RNNEventEmitter class]] sendOnAppLaunched];
-}
-
--(void)onBridgeWillReload {
-	UIApplication.sharedApplication.delegate.window.rootViewController =  nil;
-}
-
-# 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];
-	[[NSNotificationCenter defaultCenter] addObserver:self
-											 selector:@selector(onBridgeWillReload)
-												 name:RCTBridgeWillReloadNotification
-											   object:nil];
 }
 
 @end

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

 		268692831E5054F800E2C612 /* RNNStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 268692811E5054F800E2C612 /* RNNStore.m */; };
 		26916C981E4B9E7700D13680 /* RNNReactRootViewCreator.h in Headers */ = {isa = PBXBuildFile; fileRef = 26916C961E4B9E7700D13680 /* RNNReactRootViewCreator.h */; };
 		26916C991E4B9E7700D13680 /* RNNReactRootViewCreator.m in Sources */ = {isa = PBXBuildFile; fileRef = 26916C971E4B9E7700D13680 /* RNNReactRootViewCreator.m */; };
+		2DCD9195200014A900EDC75D /* RNNBridgeManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DCD9193200014A900EDC75D /* RNNBridgeManager.h */; };
+		2DCD9196200014A900EDC75D /* RNNBridgeManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DCD9194200014A900EDC75D /* RNNBridgeManager.m */; };
 		504AFE641FFE53070076E904 /* RNNOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 504AFE621FFE53070076E904 /* RNNOptions.h */; };
 		504AFE651FFE53070076E904 /* RNNOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 504AFE631FFE53070076E904 /* RNNOptions.m */; };
 		504AFE741FFFF0540076E904 /* RNNTopTabsOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 504AFE721FFFF0540076E904 /* RNNTopTabsOptions.h */; };
 		26916C941E4B9CCC00D13680 /* RNNRootViewCreator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNRootViewCreator.h; sourceTree = "<group>"; };
 		26916C961E4B9E7700D13680 /* RNNReactRootViewCreator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNReactRootViewCreator.h; sourceTree = "<group>"; };
 		26916C971E4B9E7700D13680 /* RNNReactRootViewCreator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNReactRootViewCreator.m; sourceTree = "<group>"; };
+		2DCD9193200014A900EDC75D /* RNNBridgeManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNBridgeManager.h; sourceTree = "<group>"; };
+		2DCD9194200014A900EDC75D /* RNNBridgeManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNBridgeManager.m; sourceTree = "<group>"; };
 		504AFE621FFE53070076E904 /* RNNOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNOptions.h; sourceTree = "<group>"; };
 		504AFE631FFE53070076E904 /* RNNOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNOptions.m; sourceTree = "<group>"; };
 		504AFE721FFFF0540076E904 /* RNNTopTabsOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTopTabsOptions.h; sourceTree = "<group>"; };
 				214545271F4DC7ED006E8DA1 /* Helpers */,
 				7BA500731E2544B9001B9E1B /* ReactNativeNavigation.h */,
 				7BA500741E2544B9001B9E1B /* ReactNativeNavigation.m */,
+				2DCD9193200014A900EDC75D /* RNNBridgeManager.h */,
+				2DCD9194200014A900EDC75D /* RNNBridgeManager.m */,
 				268692801E5054F800E2C612 /* RNNStore.h */,
 				268692811E5054F800E2C612 /* RNNStore.m */,
 				7B4928061E70415400555040 /* RNNCommandsHandler.h */,
 				E8A5CD621F49114F00E89D0D /* RNNElement.h in Headers */,
 				504AFE741FFFF0540076E904 /* RNNTopTabsOptions.h in Headers */,
 				E8E5182E1F83A48B000467AC /* RNNTransitionStateHolder.h in Headers */,
+				2DCD9195200014A900EDC75D /* RNNBridgeManager.h in Headers */,
 				7B1126A91E2D2B6C00F9B03B /* RNNControllerFactory.h in Headers */,
 				263905D61E4C94970023D7D3 /* RNNSideMenuController.h in Headers */,
 				263905C81E4C6F440023D7D3 /* SidebarFlipboardAnimation.h in Headers */,
 				50F5DFC21F407A8C001A00BC /* RNNTabBarController.m in Sources */,
 				263905BC1E4C6F440023D7D3 /* RCCDrawerHelper.m in Sources */,
 				2145452A1F4DC85F006E8DA1 /* RCTHelpers.m in Sources */,
+				2DCD9196200014A900EDC75D /* RNNBridgeManager.m in Sources */,
 				263905C11E4C6F440023D7D3 /* SidebarAirbnbAnimation.m in Sources */,
 				263905D71E4C94970023D7D3 /* RNNSideMenuController.m in Sources */,
 				507F43CA1FF4F9CC00D9425B /* RNNTopTabOptions.m in Sources */,