Set correct screen style after pop and when screen is first displayed

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

@@ -30,16 +30,22 @@ public abstract class Screen extends RelativeLayout {
     private final LeftButtonOnClickListener leftButtonOnClickListener;
     private VisibilityAnimator topBarVisibilityAnimator;
     private ScreenAnimator screenAnimator;
+    private final StyleParams styleParams;
 
     public Screen(AppCompatActivity activity, ScreenParams screenParams, LeftButtonOnClickListener leftButtonOnClickListener) {
         super(activity);
         this.activity = activity;
         this.screenParams = screenParams;
+        styleParams = screenParams.styleParams;
         this.leftButtonOnClickListener = leftButtonOnClickListener;
-
         screenAnimator = new ScreenAnimator(this);
         createViews();
-        setStyle(screenParams.styleParams);
+    }
+
+    public void setStyle() {
+        setStatusBarColor(styleParams.statusBarColor);
+        setNavigationBarColor(styleParams.navigationBarColor);
+        topBar.setStyle(styleParams);
     }
 
     private void createViews() {
@@ -83,12 +89,6 @@ public abstract class Screen extends RelativeLayout {
         });
     }
 
-    private void setStyle(StyleParams styleParams) {
-        setStatusBarColor(styleParams.statusBarColor);
-        setNavigationBarColor(styleParams.navigationBarColor);
-        topBar.setStyle(styleParams);
-    }
-
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     private void setStatusBarColor(StyleParams.Color statusBarColor) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
@@ -166,6 +166,7 @@ public abstract class Screen extends RelativeLayout {
     }
 
     public void show(boolean animated, Runnable onAnimationEnd) {
+        setStyle();
         screenAnimator.show(animated, onAnimationEnd);
     }
 

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

@@ -115,6 +115,7 @@ public class ScreenStack {
 
     private void swapScreens(boolean animated, final Screen toRemove, Screen previous, OnScreenPop onScreenPop) {
         readdPrevious(previous);
+        previous.setStyle();
         toRemove.hide(animated, new Runnable() {
             @Override
             public void run() {
@@ -215,6 +216,7 @@ public class ScreenStack {
 
     public void show() {
         isStackVisible = true;
+        stack.peek().setStyle();
         stack.peek().setVisibility(View.VISIBLE);
     }