refactoring a bunch of ios stuff

lib/ios/RNNCommandsHandler.m

@@ -37,6 +37,7 @@
 
 -(void) setOptions:(NSString*)containerId options:(NSDictionary*)options {
 	[self assertReady];
+	
 	UIViewController* vc = [_store findContainerForId:containerId];
 	if([vc isKindOfClass:[RNNRootViewController class]]) {
 		RNNRootViewController* rootVc = (RNNRootViewController*)vc;
@@ -47,38 +48,45 @@
 
 -(void) push:(NSString*)containerId layout:(NSDictionary*)layout {
 	[self assertReady];
+	
 	UIViewController *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
 	[_navigationStackManager push:newVc onTop:containerId];
 }
 
 -(void) pop:(NSString*)containerId {
 	[self assertReady];
+	
 	[_navigationStackManager pop:containerId];
 }
 
 -(void) popTo:(NSString*)containerId {
 	[self assertReady];
+	
 	[_navigationStackManager popTo:containerId];
 }
 
 -(void) popToRoot:(NSString*)containerId {
 	[self assertReady];
+	
 	[_navigationStackManager popToRoot:containerId];
 }
 
 -(void) showModal:(NSDictionary*)layout {
 	[self assertReady];
+	
 	UIViewController *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
 	[_modalManager showModal:newVc];
 }
 
 -(void) dismissModal:(NSString*)containerId {
 	[self assertReady];
+	
 	[_modalManager dismissModal:containerId];
 }
 
 -(void) dismissAllModals {
 	[self assertReady];
+	
 	[_modalManager dismissAllModals];
 }
 
@@ -86,7 +94,10 @@
 
 -(void) assertReady {
 	if (!_store.isReadyToReceiveCommands) {
-		@throw [NSException exceptionWithName:@"BridgeNotLoadedError" reason:@"Bridge not yet loaded! Send commands after Navigation.events().onAppLaunched() has been called." userInfo:nil];
+		[[NSException exceptionWithName:@"BridgeNotLoadedError"
+								reason:@"Bridge not yet loaded! Send commands after Navigation.events().onAppLaunched() has been called."
+							  userInfo:nil]
+		 raise];
 	}
 }
 

lib/ios/RNNNavigationOptions.h

@@ -8,6 +8,7 @@
 @property (nonatomic, strong) NSNumber* statusBarHidden;
 @property (nonatomic, strong) NSString* title;
 
+-(instancetype)init;
 -(instancetype)initWithDict:(NSDictionary *)navigationOptions;
 
 -(void)applyOn:(UIViewController*)viewController;

lib/ios/RNNNavigationOptions.m

@@ -3,13 +3,17 @@
 
 @implementation RNNNavigationOptions
 
+-(instancetype)init {
+	return [self initWithDict:@{}];
+}
 
 -(instancetype)initWithDict:(NSDictionary *)navigationOptions {
-	self = [super init];
-	self.topBarBackgroundColor = [navigationOptions objectForKey:@"topBarBackgroundColor"];
-	self.statusBarHidden = [navigationOptions objectForKey:@"statusBarHidden"];
-	self.title = [navigationOptions objectForKey:@"title"];
-	self.topBarTextColor = [navigationOptions objectForKey:@"topBarTextColor"];
+	if(self = [super init]) {
+		self.topBarBackgroundColor = [navigationOptions objectForKey:@"topBarBackgroundColor"];
+		self.statusBarHidden = [navigationOptions objectForKey:@"statusBarHidden"];
+		self.title = [navigationOptions objectForKey:@"title"];
+		self.topBarTextColor = [navigationOptions objectForKey:@"topBarTextColor"];
+	}
 	return self;
 }
 

lib/ios/RNNRootViewController.m

@@ -13,7 +13,11 @@
 
 @implementation RNNRootViewController
 
--(instancetype)initWithName:(NSString*)name withOptions:(RNNNavigationOptions*)options withContainerId:(NSString*)containerId rootViewCreator:(id<RNNRootViewCreator>)creator eventEmitter:(RNNEventEmitter*)eventEmitter {
+-(instancetype)initWithName:(NSString*)name
+				withOptions:(RNNNavigationOptions*)options
+			withContainerId:(NSString*)containerId
+			rootViewCreator:(id<RNNRootViewCreator>)creator
+			   eventEmitter:(RNNEventEmitter*)eventEmitter {
 	self = [super init];
 	self.containerId = containerId;
 	self.containerName = name;
@@ -30,6 +34,11 @@
 	return self;
 }
 
+-(void)viewWillAppear:(BOOL)animated{
+	[super viewWillAppear:animated];
+	[self.navigationOptions applyOn:self];
+}
+
 - (BOOL)prefersStatusBarHidden {
 	return [self.navigationOptions.statusBarHidden boolValue]; // || self.navigationController.isNavigationBarHidden;
 }
@@ -44,10 +53,6 @@
 	[self.eventEmitter sendContainerStop:self.containerId];
 }
 
--(void)viewWillAppear:(BOOL)animated{
-	[super viewWillAppear:animated];
-	[self.navigationOptions applyOn:self];
-}
 /**
  *	fix for #877, #878
  */

lib/ios/ReactNativeNavigationTests/RNNCommandsHandlerTest.m

@@ -7,14 +7,8 @@
 
 @interface RNNCommandsHandlerTest : XCTestCase
 
-@property (nonatomic, strong) id<RNNRootViewCreator> creator;
-@property (nonatomic, strong) NSString* pageName;
-@property (nonatomic, strong) NSString* containerId;
-@property (nonatomic, strong) id emitter;
 @property (nonatomic, strong) RNNStore* store;
-@property (nonatomic, strong) RNNNavigationOptions* options;
-@property (nonatomic, strong) RNNRootViewController* viewController;
-@property (nonatomic, strong) RNNCommandsHandler* cmdHandler;
+@property (nonatomic, strong) RNNCommandsHandler* uut;
 
 @end
 
@@ -22,31 +16,21 @@
 
 - (void)setUp {
 	[super setUp];
-	self.creator = [[RNNTestRootViewCreator alloc] init];
-	self.pageName = @"somename";
-	self.containerId = @"cntId";
-	self.emitter = nil;
-	self.options = [[RNNNavigationOptions alloc] initWithDict:@{@"title" : @"static title"}];
-	self.store = [RNNStore new];
-	self.viewController = [[RNNRootViewController alloc] initWithName:self.pageName withOptions:self.options withContainerId:self.containerId rootViewCreator:self.creator eventEmitter:self.emitter];
-	[self.store setReadyToReceiveCommands:true];
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.viewController];
-	[self.store setContainer:self.viewController containerId:self.containerId];
-	self.cmdHandler = [[RNNCommandsHandler alloc] initWithStore:self.store controllerFactory:nil];
+	self.store = [[RNNStore alloc] init];
+	self.uut = [[RNNCommandsHandler alloc] initWithStore:self.store controllerFactory:nil];
 }
 
 
 - (void)testAssertReadyForEachMethodThrowsExceptoins {
-	RNNStore *store = [RNNStore new];
-	[store setReadyToReceiveCommands:NO];
-	RNNCommandsHandler *uut = [[RNNCommandsHandler alloc] initWithStore:store controllerFactory:nil];
-	
-	NSArray* methods = [self getPublicMethodNamesForObject:uut];
+	NSArray* methods = [self getPublicMethodNamesForObject:self.uut];
 	
 	for (NSString* methodName in methods) {
+		
+		__strong id uut = self.uut;
 		SEL s = NSSelectorFromString(methodName);
 		IMP imp = [uut methodForSelector:s];
 		void (*func)(id, SEL) = (void *)imp;
+		
 		XCTAssertThrowsSpecificNamed(func(uut,s), NSException, @"BridgeNotLoadedError");
 	}
 }
@@ -68,7 +52,7 @@
 		NSString *methodName = [NSString stringWithUTF8String:sel_getName(method_getName(mlist[i]))];
 		
 		// filter skippedMethods
-		if (![skipMethods containsObject:methodName]) {
+		if (methodName && ![skipMethods containsObject:methodName]) {
 			[result addObject:methodName];
 		}
 	}
@@ -76,22 +60,28 @@
 	return result;
 }
 
--(void)testDynamicTopBarBackgroundColor_validColor {
-	NSDictionary* dictFromJs = @{@"topBarBackgroundColor" :@(0xFFFF0000)};
-	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
-	[self.cmdHandler setOptions:self.containerId options:dictFromJs];
-	XCTAssertTrue([self.viewController.navigationController.navigationBar.barTintColor isEqual:expectedColor]);
-}
-
 -(void)testDynamicStylesMergeWithStaticStyles {
+	RNNNavigationOptions* initialOptions = [[RNNNavigationOptions alloc] init];
+	[initialOptions setTitle:@"the title"];
+	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithName:@"name"
+																withOptions:initialOptions
+															withContainerId:@"containerId"
+															rootViewCreator:[[RNNTestRootViewCreator alloc] init]
+															   eventEmitter:nil];
+	UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:vc];
+	[vc viewWillAppear:false];
+	XCTAssertTrue([vc.navigationItem.title isEqual:@"the title"]);
+	
+	[self.store setReadyToReceiveCommands:true];
+	[self.store setContainer:vc containerId:@"containerId"];
+	
 	NSDictionary* dictFromJs = @{@"topBarBackgroundColor" :@(0xFFFF0000)};
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
-	[self.cmdHandler setOptions:self.containerId options:dictFromJs];
-	XCTAssertTrue([self.viewController.navigationController.navigationBar.barTintColor isEqual:expectedColor]);
-	XCTAssertTrue([self.viewController.navigationItem.title isEqual:@"static title"]);
+	
+	[self.uut setOptions:@"containerId" options:dictFromJs];
+	
+	XCTAssertTrue([vc.navigationItem.title isEqual:@"the title"]);
+	XCTAssertTrue([nav.navigationBar.barTintColor isEqual:expectedColor]);
 }
 
-
-
-
 @end