refactor RNNBridgeModule into commandsHandler

ios/RNNBridgeModule.m

@@ -1,78 +1,39 @@
 #import "RNNBridgeModule.h"
 
-#import "RNN.h"
-#import "RNNControllerFactory.h"
-#import "RNNReactRootViewCreator.h"
-#import "RNNStore.h"
-#import "RNNModalManager.h"
-#import "RNNNavigationStackManager.h"
+#import "RNNCommandsHandler.h"
 
 @implementation RNNBridgeModule
 
 RCT_EXPORT_MODULE();
 
-- (dispatch_queue_t)methodQueue
-{
+- (dispatch_queue_t)methodQueue {
 	return dispatch_get_main_queue();
 }
 
 #pragma mark - JS interface
 
-RCT_EXPORT_METHOD(setRoot:(NSDictionary*)layout)
-{
-	[self assertReady];
-	RNNControllerFactory *factory = [[RNNControllerFactory alloc] initWithRootViewCreator:[RNNReactRootViewCreator new] store:[RNN instance].store];
-	UIViewController *vc = [factory createLayoutAndSaveToStore:layout];
-	
-	UIApplication.sharedApplication.delegate.window.rootViewController = vc;
-	[UIApplication.sharedApplication.delegate.window makeKeyAndVisible];
+RCT_EXPORT_METHOD(setRoot:(NSDictionary*)layout) {
+	[[RNNCommandsHandler new] setRoot:layout];
 }
 
-RCT_EXPORT_METHOD(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];
-}
-
-RCT_EXPORT_METHOD(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];
+RCT_EXPORT_METHOD(push:(NSString*)containerId layout:(NSDictionary*)layout) {
+	[[RNNCommandsHandler new] push:containerId layout:layout];
 }
 
-RCT_EXPORT_METHOD(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];
+RCT_EXPORT_METHOD(pop:(NSString*)containerId) {
+	[[RNNCommandsHandler new] pop:containerId];
 }
 
-RCT_EXPORT_METHOD(dismissModal:(NSString*)containerId)
-{
-	[self assertReady];
-	[[[RNNModalManager alloc] initWithStore:[RNN instance].store] dismissModal:containerId];
+RCT_EXPORT_METHOD(showModal:(NSDictionary*)layout) {
+	[[RNNCommandsHandler new] showModal:layout];
 }
 
-RCT_EXPORT_METHOD(dismissAllModals)
-{
-	[self assertReady];
-	[[[RNNModalManager alloc] initWithStore:[RNN instance].store] dismissAllModals];
+RCT_EXPORT_METHOD(dismissModal:(NSString*)containerId) {
+	[[RNNCommandsHandler new] dismissModal:containerId];
 }
 
-#pragma mark - private
-
-- (void)assertReady
-{
-	if (![RNN instance].isReadyToReceiveCommands) {
-		@throw [NSException exceptionWithName:@"BridgeNotLoadedError" reason:@"Bridge not yet loaded! Send commands after Navigation.events().onAppLaunched() has been called." userInfo:nil];
-	}
+RCT_EXPORT_METHOD(dismissAllModals) {
+	[[RNNCommandsHandler new] dismissAllModals];
 }
 
 @end

ios/RNNCommandsHandler.h

@@ -0,0 +1,19 @@
+
+
+#import <Foundation/Foundation.h>
+
+@interface RNNCommandsHandler : NSObject
+
+-(void) setRoot:(NSDictionary*)layout;
+
+-(void) push:(NSString*)containerId layout:(NSDictionary*)layout;
+
+-(void) pop:(NSString*)containerId;
+
+-(void) showModal:(NSDictionary*)layout;
+
+-(void) dismissModal:(NSString*)containerId;
+
+-(void) dismissAllModals;
+
+@end

ios/RNNCommandsHandler.m

@@ -0,0 +1,66 @@
+
+#import "RNNCommandsHandler.h"
+
+
+#import "RNN.h"
+#import "RNNControllerFactory.h"
+#import "RNNReactRootViewCreator.h"
+#import "RNNStore.h"
+#import "RNNModalManager.h"
+#import "RNNNavigationStackManager.h"
+
+@implementation RNNCommandsHandler
+
+#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];
+	
+	UIApplication.sharedApplication.delegate.window.rootViewController = vc;
+	[UIApplication.sharedApplication.delegate.window makeKeyAndVisible];
+}
+
+-(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];
+}
+
+-(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];
+}
+
+-(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];
+}
+
+-(void) dismissModal:(NSString*)containerId {
+	[self assertReady];
+	[[[RNNModalManager alloc] initWithStore:[RNN instance].store] dismissModal:containerId];
+}
+
+-(void) dismissAllModals {
+	[self assertReady];
+	[[[RNNModalManager alloc] initWithStore:[RNN instance].store] dismissAllModals];
+}
+
+#pragma mark - private
+
+- (void)assertReady {
+	if (![RNN instance].isReadyToReceiveCommands) {
+		@throw [NSException exceptionWithName:@"BridgeNotLoadedError" reason:@"Bridge not yet loaded! Send commands after Navigation.events().onAppLaunched() has been called." userInfo:nil];
+	}
+}
+
+@end

ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -60,6 +60,8 @@
 		7B1126A61E2D2B6C00F9B03B /* RNNBridgeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BBFE5421E25330E002A6182 /* RNNBridgeModule.h */; };
 		7B1126A71E2D2B6C00F9B03B /* RNNEventEmitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B11269E1E2D263F00F9B03B /* RNNEventEmitter.h */; };
 		7B1126A91E2D2B6C00F9B03B /* RNNControllerFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BC9346C1E26886E00EFA125 /* RNNControllerFactory.h */; };
+		7B4928081E70415400555040 /* RNNCommandsHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B4928061E70415400555040 /* RNNCommandsHandler.h */; };
+		7B4928091E70415400555040 /* RNNCommandsHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B4928071E70415400555040 /* RNNCommandsHandler.m */; };
 		7BA500751E2544B9001B9E1B /* ReactNativeNavigation.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BA500741E2544B9001B9E1B /* ReactNativeNavigation.m */; };
 		7BA500781E254908001B9E1B /* RNNSplashScreen.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BA500771E254908001B9E1B /* RNNSplashScreen.m */; };
 		7BBFE5441E25330E002A6182 /* RNNBridgeModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BBFE5431E25330E002A6182 /* RNNBridgeModule.m */; };
@@ -133,6 +135,8 @@
 		26916C971E4B9E7700D13680 /* RNNReactRootViewCreator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNReactRootViewCreator.m; sourceTree = "<group>"; };
 		7B11269E1E2D263F00F9B03B /* RNNEventEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNEventEmitter.h; sourceTree = "<group>"; };
 		7B11269F1E2D263F00F9B03B /* RNNEventEmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNEventEmitter.m; sourceTree = "<group>"; };
+		7B4928061E70415400555040 /* RNNCommandsHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNCommandsHandler.h; sourceTree = "<group>"; };
+		7B4928071E70415400555040 /* RNNCommandsHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNCommandsHandler.m; sourceTree = "<group>"; };
 		7BA500731E2544B9001B9E1B /* ReactNativeNavigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReactNativeNavigation.h; sourceTree = "<group>"; };
 		7BA500741E2544B9001B9E1B /* ReactNativeNavigation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReactNativeNavigation.m; sourceTree = "<group>"; };
 		7BA500761E254908001B9E1B /* RNNSplashScreen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNSplashScreen.h; sourceTree = "<group>"; };
@@ -272,6 +276,8 @@
 				7BBFE5601E253F97002A6182 /* RNN.m */,
 				268692801E5054F800E2C612 /* RNNStore.h */,
 				268692811E5054F800E2C612 /* RNNStore.m */,
+				7B4928061E70415400555040 /* RNNCommandsHandler.h */,
+				7B4928071E70415400555040 /* RNNCommandsHandler.m */,
 				7BD721F31E2D3AA100724059 /* Bridge */,
 				7B1E4C4B1E2D173700C3A525 /* Controllers */,
 				263905881E4C6F440023D7D3 /* RNNSideMenu */,
@@ -304,6 +310,7 @@
 				263905B71E4C6F440023D7D3 /* UIViewController+MMDrawerController.h in Headers */,
 				263905BB1E4C6F440023D7D3 /* RCCDrawerHelper.h in Headers */,
 				263905CC1E4C6F440023D7D3 /* SidebarWunderlistAnimation.h in Headers */,
+				7B4928081E70415400555040 /* RNNCommandsHandler.h in Headers */,
 				263905AE1E4C6F440023D7D3 /* MMDrawerBarButtonItem.h in Headers */,
 				263905BD1E4C6F440023D7D3 /* RCCDrawerProtocol.h in Headers */,
 				263905C21E4C6F440023D7D3 /* SidebarAnimation.h in Headers */,
@@ -414,6 +421,7 @@
 				263905CD1E4C6F440023D7D3 /* SidebarWunderlistAnimation.m in Sources */,
 				263905CF1E4C6F440023D7D3 /* TheSidebarController.m in Sources */,
 				263905AF1E4C6F440023D7D3 /* MMDrawerBarButtonItem.m in Sources */,
+				7B4928091E70415400555040 /* RNNCommandsHandler.m in Sources */,
 				7BBFE5611E253F97002A6182 /* RNN.m in Sources */,
 				268692831E5054F800E2C612 /* RNNStore.m in Sources */,
 				7BC9346E1E26886E00EFA125 /* RNNControllerFactory.m in Sources */,