Implement layout options

lib/ios/RNNLayoutOptions.h

@@ -0,0 +1,10 @@
+#import "RNNOptions.h"
+
+@interface RNNLayoutOptions : RNNOptions
+
+@property (nonatomic, strong) NSNumber* screenBackgroundColor;
+@property (nonatomic, strong) id orientation;
+
+- (UIInterfaceOrientationMask)supportedOrientations;
+
+@end

lib/ios/RNNLayoutOptions.m

@@ -0,0 +1,40 @@
+#import "RNNLayoutOptions.h"
+#import <React/RCTConvert.h>
+
+@implementation RNNLayoutOptions
+
+- (void)applyOn:(UIViewController *)viewController {
+	if (self.screenBackgroundColor) {
+		UIColor* screenColor = [RCTConvert UIColor:self.screenBackgroundColor];
+		viewController.view.backgroundColor = screenColor;
+	}
+}
+
+- (UIInterfaceOrientationMask)supportedOrientations {
+	NSArray* orientationsArray = [self.orientation isKindOfClass:[NSString class]] ? @[self.orientation] : self.orientation;
+	NSUInteger supportedOrientationsMask = 0;
+	if (!orientationsArray || [self.orientation isEqual:@"default"]) {
+		return [[UIApplication sharedApplication] supportedInterfaceOrientationsForWindow:[[UIApplication sharedApplication] keyWindow]];
+	} else {
+		for (NSString* orientation in orientationsArray) {
+			if ([orientation isEqualToString:@"all"]) {
+				supportedOrientationsMask = UIInterfaceOrientationMaskAll;
+				break;
+			}
+			if ([orientation isEqualToString:@"landscape"]) {
+				supportedOrientationsMask = (supportedOrientationsMask | UIInterfaceOrientationMaskLandscape);
+			}
+			if ([orientation isEqualToString:@"portrait"]) {
+				supportedOrientationsMask = (supportedOrientationsMask | UIInterfaceOrientationMaskPortrait);
+			}
+			if ([orientation isEqualToString:@"upsideDown"]) {
+				supportedOrientationsMask = (supportedOrientationsMask | UIInterfaceOrientationMaskPortraitUpsideDown);
+			}
+		}
+	}
+	
+	return supportedOrientationsMask;
+}
+
+
+@end

lib/ios/RNNNavigationOptions.h

@@ -9,6 +9,7 @@
 #import "RNNAnimationOptions.h"
 #import "RNNTransitionsOptions.h"
 #import "RNNStatusBarOptions.h"
+#import "RNNLayoutOptions.h"
 
 extern const NSInteger BLUR_TOPBAR_TAG;
 extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
@@ -25,20 +26,16 @@ extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
 @property (nonatomic, strong) RNNAnimationOptions* customTransition;
 @property (nonatomic, strong) RNNTransitionsOptions* animations;
 @property (nonatomic, strong) RNNStatusBarOptions* statusBar;
+@property (nonatomic, strong) RNNLayoutOptions* layout;
 
-
-@property (nonatomic, strong) NSNumber* screenBackgroundColor;
 @property (nonatomic, strong) NSMutableDictionary* originalTopBarImages;
 @property (nonatomic, strong) NSString* backButtonTransition;
-@property (nonatomic, strong) id orientation;
 @property (nonatomic, strong) NSNumber* popGesture;
 @property (nonatomic, strong) NSDictionary* backgroundImage;
 @property (nonatomic, strong) NSDictionary* rootBackgroundImage;
 @property (nonatomic, strong) NSString* modalPresentationStyle;
 @property (nonatomic, strong) NSString* modalTransitionStyle;
 
-- (UIInterfaceOrientationMask)supportedOrientations;
-
 - (void)applyModalOptions:(UIViewController*)viewController;
 
 @end

lib/ios/RNNNavigationOptions.m

@@ -50,7 +50,7 @@ RCT_ENUM_CONVERTER(UIModalTransitionStyle,
 	[self.sideMenu applyOn:viewController];
 	[self.overlay applyOn:viewController];
 	[self.statusBar applyOn:viewController];
-	
+	[self.layout applyOn:viewController];
 	[self applyOtherOptionsOn:viewController];
 	
 	[viewController optionsUpdated];
@@ -61,11 +61,6 @@ RCT_ENUM_CONVERTER(UIModalTransitionStyle,
 		viewController.navigationController.interactivePopGestureRecognizer.enabled = [self.popGesture boolValue];
 	}
 	
-	if (self.screenBackgroundColor) {
-		UIColor* screenColor = [RCTConvert UIColor:self.screenBackgroundColor];
-		viewController.view.backgroundColor = screenColor;
-	}
-	
 	if (self.backgroundImage) {
 		UIImageView* backgroundImageView = (viewController.view.subviews.count > 0) ? viewController.view.subviews[0] : nil;
 		if (![backgroundImageView isKindOfClass:[UIImageView class]]) {
@@ -102,30 +97,5 @@ RCT_ENUM_CONVERTER(UIModalTransitionStyle,
     }
 }
 
-- (UIInterfaceOrientationMask)supportedOrientations {
-	NSArray* orientationsArray = [self.orientation isKindOfClass:[NSString class]] ? @[self.orientation] : self.orientation;
-	NSUInteger supportedOrientationsMask = 0;
-	if (!orientationsArray || [self.orientation isEqual:@"default"]) {
-		return [[UIApplication sharedApplication] supportedInterfaceOrientationsForWindow:[[UIApplication sharedApplication] keyWindow]];
-	} else {
-		for (NSString* orientation in orientationsArray) {
-			if ([orientation isEqualToString:@"all"]) {
-				supportedOrientationsMask = UIInterfaceOrientationMaskAll;
-				break;
-			}
-			if ([orientation isEqualToString:@"landscape"]) {
-				supportedOrientationsMask = (supportedOrientationsMask | UIInterfaceOrientationMaskLandscape);
-			}
-			if ([orientation isEqualToString:@"portrait"]) {
-				supportedOrientationsMask = (supportedOrientationsMask | UIInterfaceOrientationMaskPortrait);
-			}
-			if ([orientation isEqualToString:@"upsideDown"]) {
-				supportedOrientationsMask = (supportedOrientationsMask | UIInterfaceOrientationMaskPortraitUpsideDown);
-			}
-		}
-	}
-	
-	return supportedOrientationsMask;
-}
 
 @end

lib/ios/RNNRootViewController.m

@@ -163,6 +163,7 @@
 	} else if ([self.options.statusBar.hideWithTopBar boolValue]) {
 		return self.navigationController.isNavigationBarHidden;
 	}
+
 	return NO;
 }
 
@@ -175,7 +176,7 @@
 }
 
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
-	return self.options.supportedOrientations;
+	return self.options.layout.supportedOrientations;
 }
 
 - (BOOL)hidesBottomBarWhenPushed

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -73,6 +73,8 @@
 		50451D0A2042E20600695F00 /* RNNTransitionsOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50451D082042E20600695F00 /* RNNTransitionsOptions.m */; };
 		50451D0D2042F70900695F00 /* RNNTransition.h in Headers */ = {isa = PBXBuildFile; fileRef = 50451D0B2042F70900695F00 /* RNNTransition.h */; };
 		50451D0E2042F70900695F00 /* RNNTransition.m in Sources */ = {isa = PBXBuildFile; fileRef = 50451D0C2042F70900695F00 /* RNNTransition.m */; };
+		5048862D20BE976D000908DE /* RNNLayoutOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 5048862B20BE976D000908DE /* RNNLayoutOptions.h */; };
+		5048862E20BE976D000908DE /* RNNLayoutOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 5048862C20BE976D000908DE /* RNNLayoutOptions.m */; };
 		504AFE641FFE53070076E904 /* RNNOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 504AFE621FFE53070076E904 /* RNNOptions.h */; };
 		504AFE651FFE53070076E904 /* RNNOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 504AFE631FFE53070076E904 /* RNNOptions.m */; };
 		504AFE741FFFF0540076E904 /* RNNTopTabsOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 504AFE721FFFF0540076E904 /* RNNTopTabsOptions.h */; };
@@ -276,6 +278,8 @@
 		50451D082042E20600695F00 /* RNNTransitionsOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTransitionsOptions.m; sourceTree = "<group>"; };
 		50451D0B2042F70900695F00 /* RNNTransition.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTransition.h; sourceTree = "<group>"; };
 		50451D0C2042F70900695F00 /* RNNTransition.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTransition.m; sourceTree = "<group>"; };
+		5048862B20BE976D000908DE /* RNNLayoutOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNLayoutOptions.h; sourceTree = "<group>"; };
+		5048862C20BE976D000908DE /* RNNLayoutOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNLayoutOptions.m; sourceTree = "<group>"; };
 		504AFE621FFE53070076E904 /* RNNOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNOptions.h; sourceTree = "<group>"; };
 		504AFE631FFE53070076E904 /* RNNOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNOptions.m; sourceTree = "<group>"; };
 		504AFE721FFFF0540076E904 /* RNNTopTabsOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTopTabsOptions.h; sourceTree = "<group>"; };
@@ -525,6 +529,8 @@
 				50570B252061473D006A1B5C /* RNNTitleOptions.m */,
 				50C4A494206BDDBB00DB292E /* RNNSubtitleOptions.h */,
 				50C4A495206BDDBB00DB292E /* RNNSubtitleOptions.m */,
+				5048862B20BE976D000908DE /* RNNLayoutOptions.h */,
+				5048862C20BE976D000908DE /* RNNLayoutOptions.m */,
 				50BE951120B5A787004F5DF5 /* RNNStatusBarOptions.h */,
 				50BE951020B5A787004F5DF5 /* RNNStatusBarOptions.m */,
 				50EB4ED52068EBE000D6ED34 /* RNNBackgroundOptions.h */,
@@ -816,6 +822,7 @@
 				263905B91E4C6F440023D7D3 /* RCCDrawerController.h in Headers */,
 				263905B31E4C6F440023D7D3 /* MMDrawerVisualState.h in Headers */,
 				50451D092042E20600695F00 /* RNNTransitionsOptions.h in Headers */,
+				5048862D20BE976D000908DE /* RNNLayoutOptions.h in Headers */,
 				E8A5CD621F49114F00E89D0D /* RNNElement.h in Headers */,
 				50570B262061473D006A1B5C /* RNNTitleOptions.h in Headers */,
 				504AFE741FFFF0540076E904 /* RNNTopTabsOptions.h in Headers */,
@@ -946,6 +953,7 @@
 				263905B41E4C6F440023D7D3 /* MMDrawerVisualState.m in Sources */,
 				263905C51E4C6F440023D7D3 /* SidebarFacebookAnimation.m in Sources */,
 				50451D0E2042F70900695F00 /* RNNTransition.m in Sources */,
+				5048862E20BE976D000908DE /* RNNLayoutOptions.m in Sources */,
 				7BEF0D191E437684003E96B0 /* RNNRootViewController.m in Sources */,
 				50415CBB20553B8E00BB682E /* RNNScreenTransition.m in Sources */,
 				263905C31E4C6F440023D7D3 /* SidebarAnimation.m in Sources */,

lib/ios/ReactNativeNavigationTests/RNNRootViewControllerTest.m

@@ -131,7 +131,7 @@
 
 -(void)testScreenBackgroundColor_validColor{
 	NSNumber* inputColor = @(0xFFFF0000);
-	self.options.screenBackgroundColor = inputColor;
+	self.options.layout.screenBackgroundColor = inputColor;
 	[self.uut viewWillAppear:false];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 	XCTAssertTrue([self.uut.view.backgroundColor isEqual:expectedColor]);
@@ -283,7 +283,7 @@
 
 -(void)testOrientation_portrait {
 	NSArray* supportedOrientations = @[@"portrait"];
-	self.options.orientation = supportedOrientations;
+	self.options.layout.orientation = supportedOrientations;
 	__unused UINavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	UIInterfaceOrientationMask expectedOrientation = UIInterfaceOrientationMaskPortrait;
@@ -292,7 +292,7 @@
 
 -(void)testOrientation_portraitString {
 	NSString* supportedOrientation = @"portrait";
-	self.options.orientation = supportedOrientation;
+	self.options.layout.orientation = supportedOrientation;
 	__unused UINavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	UIInterfaceOrientationMask expectedOrientation = (UIInterfaceOrientationMaskPortrait);
@@ -301,7 +301,7 @@
 
 -(void)testOrientation_portraitAndLandscape {
 	NSArray* supportedOrientations = @[@"portrait", @"landscape"];
-	self.options.orientation = supportedOrientations;
+	self.options.layout.orientation = supportedOrientations;
 	__unused UINavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	UIInterfaceOrientationMask expectedOrientation = (UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskLandscape);
@@ -310,7 +310,7 @@
 
 -(void)testOrientation_all {
 	NSArray* supportedOrientations = @[@"all"];
-	self.options.orientation = supportedOrientations;
+	self.options.layout.orientation = supportedOrientations;
 	__unused UINavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	UIInterfaceOrientationMask expectedOrientation = UIInterfaceOrientationMaskAll;
@@ -319,7 +319,7 @@
 
 -(void)testOrientation_default {
 	NSString* supportedOrientations = @"default";
-	self.options.orientation = supportedOrientations;
+	self.options.layout.orientation = supportedOrientations;
 	__unused UINavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 	UIInterfaceOrientationMask expectedOrientation = [[UIApplication sharedApplication] supportedInterfaceOrientationsForWindow:[[UIApplication sharedApplication] keyWindow]];
@@ -329,7 +329,7 @@
 
 -(void)testOrientationTabsController_portrait {
 	NSArray* supportedOrientations = @[@"portrait"];
-	self.options.orientation = supportedOrientations;
+	self.options.layout.orientation = supportedOrientations;
 	__unused RNNTabBarController* vc = [[RNNTabBarController alloc] init];
 	NSMutableArray* controllers = [NSMutableArray new];
 	
@@ -343,7 +343,7 @@
 
 -(void)testOrientationTabsController_portraitAndLandscape {
 	NSArray* supportedOrientations = @[@"portrait", @"landscape"];
-	self.options.orientation = supportedOrientations;
+	self.options.layout.orientation = supportedOrientations;
 	__unused RNNTabBarController* vc = [[RNNTabBarController alloc] init];
 	NSMutableArray* controllers = [NSMutableArray new];
 	
@@ -357,7 +357,7 @@
 
 -(void)testOrientationTabsController_all {
 	NSArray* supportedOrientations = @[@"all"];
-	self.options.orientation = supportedOrientations;
+	self.options.layout.orientation = supportedOrientations;
 	__unused RNNTabBarController* vc = [[RNNTabBarController alloc] init];
 	NSMutableArray* controllers = [NSMutableArray new];