react-native-navigation 8.3.0 → 8.3.1

package/lib/android/app/src/androidTest/java/com/reactnativenavigation/TestUtils.java

@@ -43,10 +43,13 @@ public class TestUtils {
                 .setId("stack" + CompatUtils.generateViewId())
                 .setChildRegistry(new ChildControllersRegistry())
                 .setTopBarController(topBarController)
-                .setStackPresenter(new StackPresenter(activity, new TitleBarReactViewCreatorMock(),
-                        new TopBarBackgroundViewCreatorMock(), new TitleBarButtonCreatorMock(),
+                .setStackPresenter(new StackPresenter(activity,
+                        new TitleBarReactViewCreatorMock(),
+                        new TitleBarButtonCreatorMock(),
+                        topBarController,
                         new IconResolver(activity, new ImageLoader()), new TypefaceLoaderMock(), new RenderChecker(),
-                        new Options()))
+                        new Options(),
+                        new TopBarBackgroundViewCreatorMock()))
                 .setInitialOptions(new Options());
     }
 

package/lib/android/app/src/main/java/com/reactnativenavigation/options/LayoutFactory.java

@@ -186,21 +186,22 @@ public class LayoutFactory {
 	}
 
 	private ViewController<?> createStack(LayoutNode node) {
+		final TopBarController topBarController = new TopBarController();
 		return new StackControllerBuilder(activity, eventEmitter)
 				.setChildren(createChildren(node.children))
 				.setChildRegistry(childRegistry)
-				.setTopBarController(new TopBarController())
+				.setTopBarController(topBarController)
 				.setId(node.id)
 				.setInitialOptions(parseOptions(node.getOptions()))
 				.setStackPresenter(new StackPresenter(activity,
 						new TitleBarReactViewCreator(),
-						new TopBarBackgroundViewCreator(),
 						new TitleBarButtonCreator(),
+						topBarController,
 						new IconResolver(activity, new ImageLoader()),
 						new TypefaceLoader(activity),
 						new RenderChecker(),
-						defaultOptions
-				))
+						defaultOptions,
+						new TopBarBackgroundViewCreator()))
 				.setPresenter(new Presenter(activity, defaultOptions))
 				.build();
 	}

package/lib/android/app/src/main/java/com/reactnativenavigation/utils/SystemUiUtils.kt

@@ -12,7 +12,6 @@ import androidx.core.view.WindowInsetsControllerCompat
 import kotlin.math.abs
 import kotlin.math.ceil
 
-
 object SystemUiUtils {
     private const val STATUS_BAR_HEIGHT_M = 24
     internal const val STATUS_BAR_HEIGHT_TRANSLUCENCY = 0.65f
@@ -20,7 +19,6 @@ object SystemUiUtils {
     var navigationBarDefaultColor = -1
         private set
 
-
     @JvmStatic
     fun getStatusBarHeight(activity: Activity?): Int {
         val res = if (statusBarHeight > 0) {
@@ -167,4 +165,4 @@ object SystemUiUtils {
         }
     }
 
-}
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackController.java

@@ -439,7 +439,7 @@ public class StackController extends ParentController<StackLayout> {
     @Override
     public StackLayout createView() {
         StackLayout stackLayout = new StackLayout(getActivity(), topBarController, getId());
-        presenter.bindView(topBarController, getBottomTabsController());
+        presenter.bindView(getBottomTabsController());
         addInitialChild(stackLayout);
         return stackLayout;
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackPresenter.java

@@ -89,15 +89,17 @@ public class StackPresenter {
     private final TypefaceLoader typefaceLoader;
 
     public StackPresenter(Activity activity,
-            TitleBarReactViewCreator titleViewCreator,
-            TopBarBackgroundViewCreator topBarBackgroundViewCreator,
-            TitleBarButtonCreator buttonCreator,
-            IconResolver iconResolver,
-            TypefaceLoader typefaceLoader,
-            RenderChecker renderChecker,
-            Options defaultOptions) {
+                          TitleBarReactViewCreator titleViewCreator,
+                          TitleBarButtonCreator buttonCreator,
+                          TopBarController topBarController,
+                          IconResolver iconResolver,
+                          TypefaceLoader typefaceLoader,
+                          RenderChecker renderChecker,
+                          Options defaultOptions,
+                          TopBarBackgroundViewCreator topBarBackgroundViewCreator) {
         this.activity = activity;
         this.titleViewCreator = titleViewCreator;
+        this.topBarController = topBarController;
         this.topBarBackgroundViewCreator = topBarBackgroundViewCreator;
         this.buttonCreator = buttonCreator;
         this.iconResolver = iconResolver;
@@ -118,8 +120,7 @@ public class StackPresenter {
         return defaultOptions;
     }
 
-    public void bindView(TopBarController topBarController, @Nullable BottomTabsController bottomTabsController) {
-        this.topBarController = topBarController;
+    public void bindView(@Nullable BottomTabsController bottomTabsController) {
         this.bottomTabsController = bottomTabsController;
         topBar = topBarController.getView();
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/statusbar/StatusBarPresenter.kt

@@ -120,7 +120,8 @@ class StatusBarPresenter private constructor(
 
     private fun setStatusBarVisible(viewController: ViewController<*>, visible: Bool) {
         val window = window.get() ?: return
-        val view = if (viewController.view != null) viewController.view else window.decorView
+        val view = viewController.peekView() ?: window.decorView
+
         if (visible.isFalse) {
             hideStatusBar(window, view)
         } else {

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/viewcontroller/ViewController.java

@@ -254,6 +254,11 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
         if (view.getParent() == null) parent.addView(view, index);
     }
 
+    @Nullable
+    public T peekView() {
+        return view;
+    }
+
     public String getId() {
         return id;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "8.3.0",
+  "version": "8.3.1",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,