[Breaking] Status bar options (#3245)

* refactored status bar options iOS

* [Breaking] Pull StatusBar styles to separate object

lib/android/app/src/main/java/com/reactnativenavigation/parse/Options.java

@@ -36,7 +36,7 @@ public class Options {
         result.animations = AnimationsOptions.parse(json.optJSONObject("animations"));
         result.screenBackgroundColor = ColorParser.parse(json, "screenBackgroundColor");
         result.modal = ModalOptions.parse(json);
-        result.statusBar = StatusBarOptions.parse(json);
+        result.statusBar = StatusBarOptions.parse(json.optJSONObject("statusBar"));
 
         return result.withDefaultOptions(defaultOptions);
     }

lib/android/app/src/main/java/com/reactnativenavigation/parse/StatusBarOptions.java

@@ -39,8 +39,8 @@ public class StatusBarOptions {
         StatusBarOptions result = new StatusBarOptions();
         if (json == null) return result;
 
-        result.backgroundColor = ColorParser.parse(json, "statusBarBackgroundColor");
-        result.textColorScheme = TextColorScheme.fromString(json.optString("statusBarStyle"));
+        result.backgroundColor = ColorParser.parse(json, "backgroundColor");
+        result.textColorScheme = TextColorScheme.fromString(json.optString("style"));
 
         return result;
     }

lib/ios/RNNNavigationOptions.h

@@ -8,8 +8,8 @@
 #import "RNNOverlayOptions.h"
 #import "RNNAnimationOptions.h"
 #import "RNNTransitionsOptions.h"
+#import "RNNStatusBarOptions.h"
 
-extern const NSInteger BLUR_STATUS_TAG;
 extern const NSInteger BLUR_TOPBAR_TAG;
 extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
 
@@ -24,16 +24,13 @@ extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
 @property (nonatomic, strong) RNNOverlayOptions* overlay;
 @property (nonatomic, strong) RNNAnimationOptions* customTransition;
 @property (nonatomic, strong) RNNTransitionsOptions* animations;
+@property (nonatomic, strong) RNNStatusBarOptions* statusBar;
 
 
-@property (nonatomic, strong) NSNumber* statusBarHidden;
 @property (nonatomic, strong) NSNumber* screenBackgroundColor;
 @property (nonatomic, strong) NSMutableDictionary* originalTopBarImages;
 @property (nonatomic, strong) NSString* backButtonTransition;
 @property (nonatomic, strong) id orientation;
-@property (nonatomic, strong) NSNumber* statusBarBlur;
-@property (nonatomic, strong) NSNumber* statusBarHideWithTopBar;
-@property (nonatomic, strong) NSString* statusBarStyle;
 @property (nonatomic, strong) NSNumber* popGesture;
 @property (nonatomic, strong) NSDictionary* backgroundImage;
 @property (nonatomic, strong) NSDictionary* rootBackgroundImage;

lib/ios/RNNNavigationOptions.m

@@ -48,6 +48,8 @@ RCT_ENUM_CONVERTER(UIModalTransitionStyle,
 	[self.bottomTab applyOn:viewController];
 	[self.sideMenu applyOn:viewController];
 	[self.overlay applyOn:viewController];
+	[self.statusBar applyOn:viewController];
+	
 	[self applyOtherOptionsOn:viewController];
 	
 	[viewController optionsUpdated];
@@ -63,22 +65,6 @@ RCT_ENUM_CONVERTER(UIModalTransitionStyle,
 		viewController.view.backgroundColor = screenColor;
 	}
 	
-	if (self.statusBarBlur) {
-		UIView* curBlurView = [viewController.view viewWithTag:BLUR_STATUS_TAG];
-		if ([self.statusBarBlur boolValue]) {
-			if (!curBlurView) {
-				UIVisualEffectView *blur = [[UIVisualEffectView alloc] initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
-				blur.frame = [[UIApplication sharedApplication] statusBarFrame];
-				blur.tag = BLUR_STATUS_TAG;
-				[viewController.view insertSubview:blur atIndex:0];
-			}
-		} else {
-			if (curBlurView) {
-				[curBlurView removeFromSuperview];
-			}
-		}
-	}
-	
 	if (self.backgroundImage) {
 		UIImageView* backgroundImageView = (viewController.view.subviews.count > 0) ? viewController.view.subviews[0] : nil;
 		if (![backgroundImageView isKindOfClass:[UIImageView class]]) {
@@ -102,10 +88,6 @@ RCT_ENUM_CONVERTER(UIModalTransitionStyle,
 		backgroundImageView.image = [self.rootBackgroundImage isKindOfClass:[UIImage class]] ? (UIImage*)self.rootBackgroundImage : [RCTConvert UIImage:self.rootBackgroundImage];
 		[backgroundImageView setContentMode:UIViewContentModeScaleAspectFill];
 	}
-	
-	if (self.statusBarStyle) {
-		[viewController setNeedsStatusBarAppearanceUpdate];
-	}
     
     [self applyModalOptions:viewController];
 }

lib/ios/RNNRootViewController.m

@@ -158,16 +158,16 @@
 }
 
 - (BOOL)prefersStatusBarHidden {
-	if ([self.options.statusBarHidden boolValue]) {
+	if ([self.options.statusBar.hidden boolValue]) {
 		return YES;
-	} else if ([self.options.statusBarHideWithTopBar boolValue]) {
+	} else if ([self.options.statusBar.hideWithTopBar boolValue]) {
 		return self.navigationController.isNavigationBarHidden;
 	}
 	return NO;
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle {
-	if (self.options.statusBarStyle && [self.options.statusBarStyle isEqualToString:@"light"]) {
+	if (self.options.statusBar.style && [self.options.statusBar.style isEqualToString:@"light"]) {
 		return UIStatusBarStyleLightContent;
 	} else {
 		return UIStatusBarStyleDefault;

lib/ios/RNNStatusBarOptions.h

@@ -0,0 +1,12 @@
+#import "RNNOptions.h"
+
+extern const NSInteger BLUR_STATUS_TAG;
+
+@interface RNNStatusBarOptions : RNNOptions
+
+@property (nonatomic, strong) NSNumber* blur;
+@property (nonatomic, strong) NSNumber* hideWithTopBar;
+@property (nonatomic, strong) NSString* style;
+@property (nonatomic, strong) NSNumber* hidden;
+
+@end

lib/ios/RNNStatusBarOptions.m

@@ -0,0 +1,27 @@
+#import "RNNStatusBarOptions.h"
+
+@implementation RNNStatusBarOptions
+
+- (void)applyOn:(UIViewController *)viewController {
+	if (self.blur) {
+		UIView* curBlurView = [viewController.view viewWithTag:BLUR_STATUS_TAG];
+		if ([self.blur boolValue]) {
+			if (!curBlurView) {
+				UIVisualEffectView *blur = [[UIVisualEffectView alloc] initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
+				blur.frame = [[UIApplication sharedApplication] statusBarFrame];
+				blur.tag = BLUR_STATUS_TAG;
+				[viewController.view insertSubview:blur atIndex:0];
+			}
+		} else {
+			if (curBlurView) {
+				[curBlurView removeFromSuperview];
+			}
+		}
+	}
+	
+	if (self.style) {
+		[viewController setNeedsStatusBarAppearanceUpdate];
+	}
+}
+
+@end

playground/src/screens/OptionsScreen.js

@@ -16,8 +16,10 @@ const FAB = 'fab';
 class OptionsScreen extends Component {
   static get options() {
     return {
-      statusBarBackgroundColor: '#EDEDED',
-      statusBarStyle: 'dark',
+      statusBar: {
+        style: 'dark',
+        backgroundColor: '#EDEDED'
+      },
       topBar: {
         title: {
           text: 'Static Title',

playground/src/screens/TopBarBackground.js

@@ -44,7 +44,7 @@ const styles = StyleSheet.create({
   container: {
     flex: 1,
     flexDirection: 'row',
-    backgroundColor: '#e0e0e0',
+    backgroundColor: '#EDEDED',
     flexWrap: 'wrap'
   },
   dot: {