rename to mergeWith and applyOn RNNNavigationOptions

lib/ios/RNNCommandsHandler.m

@@ -38,8 +38,8 @@
 -(void) setOptions:(NSString*)containerId options:(NSDictionary*)options {
 	[self assertReady];
 	RNNRootViewController* vc = [_store findContainerForId:containerId];
-	[vc.navigationOptions setOptionsDynamically:options];
-	[vc.navigationOptions apply:vc];
+	[vc.navigationOptions mergeWith:options];
+	[vc.navigationOptions applyOn:vc];
 }
 
 -(void) push:(NSString*)containerId layout:(NSDictionary*)layout {

lib/ios/RNNNavigationOptions.h

@@ -10,8 +10,8 @@
 
 -(instancetype)initWithDict:(NSDictionary *)navigationOptions;
 
--(void)apply:(UIViewController*)viewController;
--(void)setOptionsDynamically:(NSDictionary*)dynamicOptions;
+-(void)applyOn:(UIViewController*)viewController;
+-(void)mergeWith:(NSDictionary*)otherOptions;
 
 @end
 

lib/ios/RNNNavigationOptions.m

@@ -13,13 +13,13 @@
 	return self;
 }
 
--(void)setOptionsDynamically:(NSDictionary *)dynamicOptions {
-	for(id key in dynamicOptions) {
-		[self setValue:[dynamicOptions objectForKey:key] forKey:key];
+-(void)mergeWith:(NSDictionary *)otherOptions {
+	for (id key in otherOptions) {
+		[self setValue:[otherOptions objectForKey:key] forKey:key];
 	}
 }
 
--(void)apply:(UIViewController*)viewController{
+-(void)applyOn:(UIViewController*)viewController{
 	if (self.topBarBackgroundColor) {
 		UIColor* backgroundColor = [RCTConvert UIColor:self.topBarBackgroundColor];
 		viewController.navigationController.navigationBar.barTintColor = backgroundColor;

lib/ios/RNNRootViewController.m

@@ -46,7 +46,7 @@
 
 -(void)viewWillAppear:(BOOL)animated{
 	[super viewWillAppear:animated];
-	[self.navigationOptions apply:self];
+	[self.navigationOptions applyOn:self];
 }
 /**
  *	fix for #877, #878

lib/ios/RNNSideMenu/MMDrawerController/MMDrawerController.h

@@ -458,7 +458,7 @@ typedef void (^MMDrawerControllerDrawerVisualStateBlock)(MMDrawerController * dr
  
  This block is called when a gesture action has started.
  
- @param gestureCompletionBlock A block object to be called that allows the implementer be notified when a gesture action has started.
+ @param gestureStartBlock A block object to be called that allows the implementer be notified when a gesture action has started.
  */
 -(void)setGestureStartBlock:(void (^)(MMDrawerController *, UIGestureRecognizer *))gestureStartBlock;
 
@@ -477,4 +477,4 @@ typedef void (^MMDrawerControllerDrawerVisualStateBlock)(MMDrawerController * dr
  */
 -(void)setGestureShouldRecognizeTouchBlock:(BOOL(^)(MMDrawerController * drawerController, UIGestureRecognizer * gesture, UITouch * touch))gestureShouldRecognizeTouchBlock;
 
-@end
+@end

lib/ios/ReactNativeNavigationTests/RNNNavigationOptionsTest.m

@@ -27,7 +27,7 @@
 -(void)testChangeRNNNavigationOptionsDynamically{
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{@"topBarBackgroundColor" : @(0xff0000ff)}];
 	NSDictionary* dynamicOptions = @{@"topBarTextColor" : @(0xffff00ff), @"title" : @"hello"};
-    [options setOptionsDynamically:dynamicOptions];
+    [options mergeWith:dynamicOptions];
 	XCTAssertTrue([options.title isEqual:@"hello"]);
 	
 }
@@ -35,6 +35,6 @@
 -(void)testChangeRNNNavigationOptionsWithInvalidProperties{
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{@"topBarBackgroundColor" : @(0xff0000ff)}];
 	NSDictionary* dynamicOptions = @{@"titleeeee" : @"hello"};
-	XCTAssertThrows([options setOptionsDynamically:dynamicOptions]);
+	XCTAssertThrows([options mergeWith:dynamicOptions]);
 }
 @end