commands handler refactor

ios/RNNCommandsHandler.m

@@ -7,12 +7,16 @@
 @implementation RNNCommandsHandler {
 	RNNControllerFactory *_controllerFactory;
 	RNNStore *_store;
+	RNNNavigationStackManager* _navigationStackManager;
+	RNNModalManager* _modalManager;
 }
 
 -(instancetype) initWithStore:(RNNStore*)store controllerFactory:(RNNControllerFactory*)controllerFactory {
 	self = [super init];
 	_store = store;
 	_controllerFactory = controllerFactory;
+	_navigationStackManager = [[RNNNavigationStackManager alloc] initWithStore:_store];
+	_modalManager = [[RNNModalManager alloc] initWithStore:_store];
 	return self;
 }
 
@@ -28,42 +32,29 @@
 
 -(void) push:(NSString*)containerId layout:(NSDictionary*)layout {
 	[self assertReady];
-	
 	UIViewController *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
-	
-	// find on who to push
-	UIViewController *vc = [_store findContainerForId:containerId];
-	
-	// do the actual pushing
-	[[[RNNNavigationStackManager alloc] initWithStore:_store] push:newVc onTop:vc animated:YES];
+	[_navigationStackManager push:newVc onTop:containerId];
 }
 
 -(void) pop:(NSString*)containerId {
 	[self assertReady];
-	
-	// find who to pop
-	UIViewController *vc = [_store findContainerForId:containerId];
-	
-	// do the popping
-	[[[RNNNavigationStackManager alloc] initWithStore:_store] pop:vc animated:YES];
-	[_store removeContainer:containerId];
+	[_navigationStackManager pop:containerId];
 }
 
 -(void) showModal:(NSDictionary*)layout {
 	[self assertReady];
-	
 	UIViewController *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
-	[[[RNNModalManager alloc] initWithStore:_store] showModal:newVc];
+	[_modalManager showModal:newVc];
 }
 
 -(void) dismissModal:(NSString*)containerId {
 	[self assertReady];
-	[[[RNNModalManager alloc] initWithStore:_store] dismissModal:containerId];
+	[_modalManager dismissModal:containerId];
 }
 
 -(void) dismissAllModals {
 	[self assertReady];
-	[[[RNNModalManager alloc] initWithStore:_store] dismissAllModals];
+	[_modalManager dismissAllModals];
 }
 
 #pragma mark - private

ios/RNNNavigationStackManager.h

@@ -6,7 +6,7 @@
 
 -(instancetype)initWithStore:(RNNStore*)store;
 
--(void)push:(UIViewController*)newTop onTop:(UIViewController*)currentTop animated:(BOOL)animated;
--(void)pop:(UIViewController*)vc animated:(BOOL)animated;
+-(void)push:(UIViewController*)newTop onTop:(NSString*)containerId;
+-(void)pop:(NSString*)containerId;
 
 @end

ios/RNNNavigationStackManager.m

@@ -4,31 +4,28 @@
 	RNNStore *_store;
 }
 
-
 -(instancetype)initWithStore:(RNNStore*)store {
 	self = [super init];
 	_store = store;
 	return self;
 }
 
--(void)push:(UIViewController*)newTop onTop:(UIViewController*)currentTop animated:(BOOL)animated{
-	
-	[[currentTop navigationController] pushViewController:newTop animated:animated];
+-(void)push:(UIViewController *)newTop onTop:(NSString *)containerId {
+	UIViewController *vc = [_store findContainerForId:containerId];
+	[[vc navigationController] pushViewController:newTop animated:true];
 }
 
-
--(void)pop:(UIViewController*)vc animated:(BOOL)animated{
-	
-	if([[vc navigationController] topViewController] == vc ) {
-		[[vc navigationController] popViewControllerAnimated:animated];
-	}
-	else {
-		NSMutableArray * vcs = [vc navigationController].viewControllers.mutableCopy;
+-(void)pop:(NSString *)containerId {
+	UIViewController* vc = [_store findContainerForId:containerId];
+	UINavigationController* nvc = [vc navigationController];
+	if ([nvc topViewController] == vc) {
+		[nvc popViewControllerAnimated:true];
+	} else {
+		NSMutableArray * vcs = nvc.viewControllers.mutableCopy;
 		[vcs removeObject:vc];
-		[[vc navigationController] setViewControllers:vcs animated:animated];
+		[nvc setViewControllers:vcs animated:true];
 	}
+	[_store removeContainer:containerId];
 }
 
-
-
 @end