Set modal status bar style in constructor (#2103)

Since status bar style was applied when the screen was created, this caused a noticeable
artifact in status bar color.

android/app/src/main/java/com/reactnativenavigation/controllers/Modal.java

@@ -19,10 +19,12 @@ import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.Orientation;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.SlidingOverlayParams;
+import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.params.parsers.ModalAnimationFactory;
 import com.reactnativenavigation.screens.NavigationType;
+import com.reactnativenavigation.utils.StatusBar;
 
 import java.util.List;
 
@@ -112,6 +114,14 @@ class Modal extends Dialog implements DialogInterface.OnDismissListener, ScreenS
         this.screenParams = screenParams;
         createContent();
         setAnimation(screenParams);
+        setStatusBarStyle(screenParams.styleParams);
+    }
+
+    private void setStatusBarStyle(StyleParams styleParams) {
+        Window window = getWindow();
+        if (window == null) return;
+        StatusBar.setColor(window, styleParams.statusBarColor);
+        StatusBar.setTextColorScheme(window.getDecorView(), styleParams.statusBarTextColorScheme);
     }
 
     public AppCompatActivity getActivity() {

android/app/src/main/java/com/reactnativenavigation/screens/Screen.java

@@ -7,9 +7,7 @@ import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.view.View;
 import android.view.Window;
-import android.view.WindowManager;
 import android.widget.RelativeLayout;
 
 import com.facebook.react.bridge.Callback;
@@ -30,6 +28,7 @@ import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.params.parsers.StyleParamsParser;
+import com.reactnativenavigation.utils.StatusBar;
 import com.reactnativenavigation.views.ContentView;
 import com.reactnativenavigation.views.LeftButtonOnClickListener;
 import com.reactnativenavigation.views.TopBar;
@@ -170,44 +169,16 @@ public abstract class Screen extends RelativeLayout implements Subscriber {
         addView(topBar, new LayoutParams(MATCH_PARENT, WRAP_CONTENT));
     }
 
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     private void setStatusBarColor(StyleParams.Color statusBarColor) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
-
-        final Window window = ((NavigationActivity) activity).getScreenWindow();
-        if (statusBarColor.hasColor()) {
-            window.setStatusBarColor(statusBarColor.getColor());
-        } else {
-            window.setStatusBarColor(Color.BLACK);
-        }
+        StatusBar.setColor(((NavigationActivity) activity).getScreenWindow(), statusBarColor);
     }
 
     private void setStatusBarHidden(boolean statusBarHidden) {
-        final Window window = ((NavigationActivity) activity).getScreenWindow();
-        if (statusBarHidden) {
-            window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        } else {
-            window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        }
+        StatusBar.setHidden(((NavigationActivity) activity).getScreenWindow(), statusBarHidden);
     }
 
-    @TargetApi(Build.VERSION_CODES.M)
     private void setStatusBarTextColorScheme(StatusBarTextColorScheme textColorScheme) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return;
-        if (StatusBarTextColorScheme.Dark.equals(textColorScheme)) {
-            int flags = getSystemUiVisibility();
-            flags |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
-            setSystemUiVisibility(flags);
-        } else {
-            clearLightStatusBar();
-        }
-    }
-
-    public void clearLightStatusBar() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return;
-        int flags = getSystemUiVisibility();
-        flags &= ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
-        setSystemUiVisibility(flags);
+        StatusBar.setTextColorScheme(this, textColorScheme);
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)

android/app/src/main/java/com/reactnativenavigation/utils/StatusBar.java

@@ -0,0 +1,51 @@
+package com.reactnativenavigation.utils;
+
+import android.annotation.TargetApi;
+import android.graphics.Color;
+import android.os.Build;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+
+import com.reactnativenavigation.params.StatusBarTextColorScheme;
+import com.reactnativenavigation.params.StyleParams;
+
+public class StatusBar {
+
+    public static void setHidden(Window window, boolean statusBarHidden) {
+        if (statusBarHidden) {
+            window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        } else {
+            window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public static void setColor(Window window, StyleParams.Color statusBarColor) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
+        if (statusBarColor.hasColor()) {
+            window.setStatusBarColor(statusBarColor.getColor());
+        } else {
+            window.setStatusBarColor(Color.BLACK);
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.M)
+    public static void setTextColorScheme(View view, StatusBarTextColorScheme textColorScheme) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return;
+        if (StatusBarTextColorScheme.Dark.equals(textColorScheme)) {
+            int flags = view.getSystemUiVisibility();
+            flags |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
+            view.setSystemUiVisibility(flags);
+        } else {
+            clearLightStatusBar(view);
+        }
+    }
+
+    private static void clearLightStatusBar(View view) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return;
+        int flags = view.getSystemUiVisibility();
+        flags &= ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
+        view.setSystemUiVisibility(flags);
+    }
+}