change back findContainerForId to return UIViewController

lib/ios/RNNCommandsHandler.m

@@ -37,9 +37,12 @@
 
 -(void) setOptions:(NSString*)containerId options:(NSDictionary*)options {
 	[self assertReady];
-	RNNRootViewController* vc = [_store findContainerForId:containerId];
-	[vc.navigationOptions mergeWith:options];
-	[vc.navigationOptions applyOn:vc];
+	UIViewController* vc = [_store findContainerForId:containerId];
+	if([vc isKindOfClass:[RNNRootViewController class]]) {
+		RNNRootViewController* rootVc = (RNNRootViewController*)vc;
+		[rootVc.navigationOptions mergeWith:options];
+		[rootVc.navigationOptions applyOn:vc];
+	}
 }
 
 -(void) push:(NSString*)containerId layout:(NSDictionary*)layout {

lib/ios/RNNModalManager.m

@@ -34,7 +34,7 @@
 -(void)removePendingNextModalIfOnTop {
 	NSString *containerId = [[_store pendingModalIdsToDismiss] lastObject];
 	
-	RNNRootViewController *modalToDismiss = [_store findContainerForId:containerId];
+	UIViewController *modalToDismiss = [_store findContainerForId:containerId];
 	
 	if(!modalToDismiss) {
 		return;

lib/ios/RNNNavigationStackManager.m

@@ -12,12 +12,12 @@
 }
 
 -(void)push:(UIViewController *)newTop onTop:(NSString *)containerId {
-	RNNRootViewController *vc = [_store findContainerForId:containerId];
+	UIViewController *vc = [_store findContainerForId:containerId];
 	[[vc navigationController] pushViewController:newTop animated:YES];
 }
 
 -(void)pop:(NSString *)containerId {
-	RNNRootViewController* vc = [_store findContainerForId:containerId];
+	UIViewController* vc = [_store findContainerForId:containerId];
 	UINavigationController* nvc = [vc navigationController];
 	if ([nvc topViewController] == vc) {
 		[nvc popViewControllerAnimated:YES];
@@ -30,7 +30,7 @@
 }
 
 -(void)popTo:(NSString*)containerId {
-	RNNRootViewController *vc = [_store findContainerForId:containerId];
+	UIViewController *vc = [_store findContainerForId:containerId];
 	
 	if (vc) {
 		UINavigationController *nvc = [vc navigationController];
@@ -42,7 +42,7 @@
 }
 
 -(void) popToRoot:(NSString*)containerId {
-	RNNRootViewController* vc = [_store findContainerForId:containerId];
+	UIViewController* vc = [_store findContainerForId:containerId];
 	UINavigationController* nvc = [vc navigationController];
 	NSArray* poppedVCs = [nvc popToRootViewControllerAnimated:YES];
 	[self removePopedViewControllers:poppedVCs];

lib/ios/RNNStore.h

@@ -5,7 +5,7 @@
 
 @interface RNNStore : NSObject
 
--(RNNRootViewController*) findContainerForId:(NSString*)containerId;
+-(UIViewController*) findContainerForId:(NSString*)containerId;
 -(void) setContainer:(UIViewController*)viewController containerId:(NSString*)containerId;
 -(void) removeContainer:(NSString*)containerId;
 -(void) removeContainerByViewControllerInstance:(UIViewController*)containerInstance;

lib/ios/RNNStore.m

@@ -19,12 +19,12 @@
 	return self;
 }
 
--(RNNRootViewController *)findContainerForId:(NSString *)containerId {
+-(UIViewController *)findContainerForId:(NSString *)containerId {
 	return [_containerStore objectForKey:containerId];
 }
 
 - (void)setContainer:(UIViewController*)viewController containerId:(NSString*)containerId {
-	RNNRootViewController *existingVewController = [self findContainerForId:containerId];
+	UIViewController *existingVewController = [self findContainerForId:containerId];
 	if (existingVewController) {
 		@throw [NSException exceptionWithName:@"MultipleContainerId" reason:[@"Container id already exists " stringByAppendingString:containerId] userInfo:nil];
 	}

lib/ios/ReactNativeNavigationTests/RNNNavigationOptionsTest.m

@@ -28,8 +28,7 @@
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{@"topBarBackgroundColor" : @(0xff0000ff)}];
 	NSDictionary* dynamicOptions = @{@"topBarTextColor" : @(0xffff00ff), @"title" : @"hello"};
     [options mergeWith:dynamicOptions];
-	XCTAssertTrue([options.title isEqual:@"hello"]);
-	
+	XCTAssertTrue([options.title isEqual:@"hello"]);	
 }
 
 -(void)testChangeRNNNavigationOptionsWithInvalidProperties{