Fixes large title - #4192 (#4200)

lib/ios/RNNNavigationController.m

@@ -72,7 +72,7 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 		UIViewController *controller = self.viewControllers[self.viewControllers.count - 2];
 		if ([controller isKindOfClass:[RNNRootViewController class]]) {
 			RNNRootViewController *rnnController = (RNNRootViewController *)controller;
-			[self.presenter applyOptions:rnnController.options];
+			[self setTopBarBackgroundColor:[rnnController.options.topBar.background.color getWithDefaultValue:nil]];
 		}
 	}
 	
@@ -129,6 +129,8 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 			self.navigationBar.shadowImage = self.originalTopBarImages[@"shadowImage"] ? self.originalTopBarImages[@"shadowImage"] : self.navigationBar.shadowImage;
 			self.originalTopBarImages = nil;
 		}
+		
+		self.navigationBar.barTintColor = nil;
 	}
 }
 

lib/ios/RNNSideMenuPresenter.m

@@ -19,7 +19,7 @@
 	[sideMenuController setAnimationVelocityLeft:[options.sideMenu.left.animationVelocity getWithDefaultValue:840.0f]];
 	[sideMenuController setAnimationVelocityRight:[options.sideMenu.right.animationVelocity getWithDefaultValue:840.0f]];
 	
-	[sideMenuController setAnimationType:[options.sideMenu.animationType getWithDefaultValue:@"door"]];
+	[sideMenuController setAnimationType:[options.sideMenu.animationType getWithDefaultValue:nil]];
 
 	if (options.sideMenu.left.width.hasValue) {
 		[sideMenuController side:MMDrawerSideLeft width:options.sideMenu.left.width.get];

lib/ios/RNNViewControllerPresenter.m

@@ -17,10 +17,8 @@
 	
 	UIViewController* viewController = self.bindedViewController;
 	[viewController rnn_setBackgroundImage:[options.backgroundImage getWithDefaultValue:nil]];
-	[viewController rnn_setDrawBehindTopBar:[options.topBar.drawBehind getWithDefaultValue:NO]];
 	[viewController rnn_setNavigationItemTitle:[options.topBar.title.text getWithDefaultValue:nil]];
 	[viewController rnn_setTopBarPrefersLargeTitle:[options.topBar.largeTitle.visible getWithDefaultValue:NO]];
-	[viewController rnn_setDrawBehindTabBar:[options.bottomTabs.drawBehind getWithDefaultValue:NO] || ![options.bottomTabs.visible getWithDefaultValue:YES]];
 	[viewController rnn_setTabBarItemBadgeColor:[options.bottomTab.badgeColor getWithDefaultValue:nil]];
 	[viewController rnn_setStatusBarBlur:[options.statusBar.blur getWithDefaultValue:NO]];
 	[viewController rnn_setStatusBarStyle:[options.statusBar.style getWithDefaultValue:@"default"] animated:[options.statusBar.animate getWithDefaultValue:YES]];
@@ -47,6 +45,8 @@
 	UIViewController* viewController = self.bindedViewController;
 	[viewController rnn_setModalPresentationStyle:[RCTConvert UIModalPresentationStyle:[options.modalPresentationStyle getWithDefaultValue:@"fullScreen"]]];
 	[viewController rnn_setModalTransitionStyle:[RCTConvert UIModalTransitionStyle:[options.modalTransitionStyle getWithDefaultValue:@"coverVertical"]]];
+	[viewController rnn_setDrawBehindTopBar:[options.topBar.drawBehind getWithDefaultValue:NO]];
+	[viewController rnn_setDrawBehindTabBar:[options.bottomTabs.drawBehind getWithDefaultValue:NO] || ![options.bottomTabs.visible getWithDefaultValue:YES]];
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {

lib/ios/ReactNativeNavigationTests/RNNRootViewControllerTest.m

@@ -546,34 +546,6 @@
 //	XCTAssertTrue([[(UIImageView*)self.uut.view.subviews[0] image] isEqual:backgroundImage]);
 //}
 
--(void)testTopBarDrawUnder_true {
-	self.options.topBar.drawBehind = [[Bool alloc] initWithValue:@(1)];
-	[self.uut viewWillAppear:false];
-
-	XCTAssertTrue(self.uut.edgesForExtendedLayout & UIRectEdgeTop);
-}
-
--(void)testTopBarDrawUnder_false {
-	self.options.topBar.drawBehind = [[Bool alloc] initWithValue:@(0)];
-	[self.uut viewWillAppear:false];
-
-	XCTAssertFalse(self.uut.edgesForExtendedLayout & UIRectEdgeTop);
-}
-
--(void)testBottomTabsDrawUnder_true {
-	self.options.bottomTabs.drawBehind = [[Bool alloc] initWithValue:@(1)];
-	[self.uut viewWillAppear:false];
-
-	XCTAssertTrue(self.uut.edgesForExtendedLayout & UIRectEdgeBottom);
-}
-
--(void)testBottomTabsDrawUnder_false {
-	self.options.bottomTabs.drawBehind = [[Bool alloc] initWithValue:@(0)];
-	[self.uut viewWillAppear:false];
-
-	XCTAssertFalse(self.uut.edgesForExtendedLayout & UIRectEdgeBottom);
-}
-
 #pragma mark BottomTabs
 
 

lib/ios/ReactNativeNavigationTests/RNNSideMenuPresenterTest.m

@@ -30,7 +30,7 @@
 	[[self.bindedViewController expect] setAnimationVelocityRight:840.0f];
 	[[self.bindedViewController reject] side:MMDrawerSideLeft width:0];
 	[[self.bindedViewController reject] side:MMDrawerSideRight width:0];
-  [[self.bindedViewController expect] setAnimationType:@"door"];
+  	[[self.bindedViewController expect] setAnimationType:nil];
     
 	[self.uut applyOptions:self.options];
 

lib/ios/ReactNativeNavigationTests/RNNViewControllerPresenterTest.m

@@ -21,9 +21,9 @@
 	self.options = [[RNNNavigationOptions alloc] initEmptyOptions];
 }
 
-- (void)testApplyOptions_backgroundImageDefaultNil {
+- (void)testApplyOptions_backgroundImageDefaultNilShouldNotAddSubview {
 	[self.uut applyOptions:self.options];
-	XCTAssertNil(((UIImageView *)self.bindedViewController.view.subviews[0]).image);
+	XCTAssertTrue((self.bindedViewController.view.subviews.count) == 0);
 }
 
 - (void)testApplyOptions_topBarPrefersLargeTitleDefaultFalse {
@@ -55,7 +55,7 @@
 - (void)testApplyOptions_drawBehindTabBarTrueWhenVisibleFalse {
 	self.options.bottomTabs.visible = [[Bool alloc] initWithValue:@(0)];
 	[[(id)self.bindedViewController expect] rnn_setDrawBehindTabBar:YES];
-	[self.uut applyOptions:self.options];
+	[self.uut applyOptionsOnInit:self.options];
 	[(id)self.bindedViewController verify];
 }
 
@@ -85,4 +85,36 @@
 	[(id)self.bindedViewController verify];
 }
 
+-(void)testApplyOptionsOnInit_TopBarDrawUnder_true {
+    self.options.topBar.drawBehind = [[Bool alloc] initWithValue:@(1)];
+    
+    [[(id)self.bindedViewController expect] rnn_setDrawBehindTopBar:YES];
+    [self.uut applyOptionsOnInit:self.options];
+    [(id)self.bindedViewController verify];
+}
+
+-(void)testApplyOptionsOnInit_TopBarDrawUnder_false {
+    self.options.topBar.drawBehind = [[Bool alloc] initWithValue:@(0)];
+    
+    [[(id)self.bindedViewController expect] rnn_setDrawBehindTopBar:NO];
+    [self.uut applyOptionsOnInit:self.options];
+    [(id)self.bindedViewController verify];
+}
+
+-(void)testApplyOptionsOnInit_BottomTabsDrawUnder_true {
+    self.options.bottomTabs.drawBehind = [[Bool alloc] initWithValue:@(1)];
+    
+    [[(id)self.bindedViewController expect] rnn_setDrawBehindTabBar:YES];
+    [self.uut applyOptionsOnInit:self.options];
+    [(id)self.bindedViewController verify];
+}
+
+-(void)testApplyOptionsOnInit_BottomTabsDrawUnder_false {
+    self.options.bottomTabs.drawBehind = [[Bool alloc] initWithValue:@(0)];
+    
+    [[(id)self.bindedViewController expect] rnn_setDrawBehindTabBar:NO];
+    [self.uut applyOptionsOnInit:self.options];
+    [(id)self.bindedViewController verify];
+}
+
 @end

lib/ios/ReactNativeNavigationTests/UIViewController+RNNOptionsTest.m

@@ -71,6 +71,23 @@
 	XCTAssertEqual([self.uut edgesForExtendedLayout], expectedRectEdge);
 }
 
+- (void)testSetBackgroundImageShouldNotAddViewIfImageNil {
+	NSUInteger subviewsCount = [[[self.uut view] subviews] count];
+	[self.uut rnn_setBackgroundImage:nil];
+	XCTAssertEqual([[[self.uut view] subviews] count], subviewsCount);
+}
+
+- (void)testSetBackgroundImageShouldAddUIImageViewSubview {
+	NSUInteger subviewsCount = [[[self.uut view] subviews] count];
+	[self.uut rnn_setBackgroundImage:[UIImage new]];
+	XCTAssertEqual([[[self.uut view] subviews] count], subviewsCount+1);
+}
 
+- (void)testSetBackgroundImageShouldAddUIImageViewSubviewWithImage {
+	UIImage* image = [UIImage new];
+	[self.uut rnn_setBackgroundImage:image];
+	UIImageView* imageView = [[[self.uut view] subviews] firstObject];
+	XCTAssertEqual(imageView.image, image);
+}
 
 @end

lib/ios/UIViewController+RNNOptions.m

@@ -5,15 +5,17 @@ const NSInteger BLUR_STATUS_TAG = 78264801;
 @implementation UIViewController (RNNOptions)
 
 - (void)rnn_setBackgroundImage:(UIImage *)backgroundImage {
-	UIImageView* backgroundImageView = (self.view.subviews.count > 0) ? self.view.subviews[0] : nil;
-	if (![backgroundImageView isKindOfClass:[UIImageView class]]) {
-		backgroundImageView = [[UIImageView alloc] initWithFrame:self.view.bounds];
-		[self.view insertSubview:backgroundImageView atIndex:0];
+	if (backgroundImage) {
+		UIImageView* backgroundImageView = (self.view.subviews.count > 0) ? self.view.subviews[0] : nil;
+		if (![backgroundImageView isKindOfClass:[UIImageView class]]) {
+			backgroundImageView = [[UIImageView alloc] initWithFrame:self.view.bounds];
+			[self.view insertSubview:backgroundImageView atIndex:0];
+		}
+		
+		backgroundImageView.layer.masksToBounds = YES;
+		backgroundImageView.image = backgroundImage;
+		[backgroundImageView setContentMode:UIViewContentModeScaleAspectFill];
 	}
-	
-	backgroundImageView.layer.masksToBounds = YES;
-	backgroundImageView.image = backgroundImage;
-	[backgroundImageView setContentMode:UIViewContentModeScaleAspectFill];
 }
 
 - (void)rnn_setModalPresentationStyle:(UIModalPresentationStyle)modalPresentationStyle {