react-native-navigation 7.23.1-snapshot.421 → 7.23.1-snapshot.434

package/lib/android/app/build.gradle

@@ -172,13 +172,13 @@ allprojects { p ->
 }
 
 dependencies {
-    implementation "androidx.core:core-ktx:1.3.2"
+    implementation "androidx.core:core-ktx:1.6.0"
     implementation "org.jetbrains.kotlin:$kotlinStdlib:$kotlinVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesCore"
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.annotation:annotation:1.2.0'
     implementation 'com.google.android.material:material:1.2.0-alpha03'
 
     implementation 'com.github.wix-playground:ahbottomnavigation:3.3.0'

package/lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -23,7 +23,7 @@ import com.reactnativenavigation.options.parsers.TypefaceLoader;
 import com.reactnativenavigation.react.events.EventEmitter;
 import com.reactnativenavigation.utils.LaunchArgsParser;
 import com.reactnativenavigation.utils.Now;
-import com.reactnativenavigation.utils.StatusBarUtils;
+import com.reactnativenavigation.utils.SystemUiUtils;
 import com.reactnativenavigation.utils.UiThread;
 import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
@@ -34,6 +34,8 @@ import java.util.Objects;
 
 import static com.reactnativenavigation.utils.UiUtils.pxToDp;
 
+import android.app.Activity;
+
 public class NavigationModule extends ReactContextBaseJavaModule {
     private static final String NAME = "RNNBridgeModule";
 
@@ -88,10 +90,11 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 
     private WritableMap createNavigationConstantsMap() {
         ReactApplicationContext ctx = getReactApplicationContext();
+        final Activity currentActivity = ctx.getCurrentActivity();
         WritableMap constants = Arguments.createMap();
         constants.putString(Constants.BACK_BUTTON_JS_KEY, Constants.BACK_BUTTON_ID);
         constants.putDouble(Constants.BOTTOM_TABS_HEIGHT_KEY, pxToDp(ctx, UiUtils.getBottomTabsHeight(ctx)));
-        constants.putDouble(Constants.STATUS_BAR_HEIGHT_KEY, pxToDp(ctx, StatusBarUtils.getStatusBarHeight(ctx)));
+        constants.putDouble(Constants.STATUS_BAR_HEIGHT_KEY, pxToDp(ctx, SystemUiUtils.getStatusBarHeight(currentActivity)));
         constants.putDouble(Constants.TOP_BAR_HEIGHT_KEY, pxToDp(ctx, UiUtils.getTopBarHeight(ctx)));
         return constants;
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/react/modal/ModalFrameLayout.kt

@@ -2,7 +2,7 @@ package com.reactnativenavigation.react.modal
 
 import android.widget.FrameLayout
 import com.facebook.react.bridge.ReactContext
-import com.reactnativenavigation.utils.StatusBarUtils
+import com.reactnativenavigation.utils.SystemUiUtils
 
 class ModalFrameLayout(context: ReactContext) : FrameLayout(context) {
     val modalContentLayout = ModalContentLayout(context)
@@ -11,9 +11,9 @@ class ModalFrameLayout(context: ReactContext) : FrameLayout(context) {
         addView(modalContentLayout, MarginLayoutParams(MarginLayoutParams.WRAP_CONTENT, MarginLayoutParams.WRAP_CONTENT)
             .apply {
                 val translucent = context.currentActivity?.window?.let {
-                    StatusBarUtils.isTranslucent(it)
+                    SystemUiUtils.isTranslucent(it)
                 } ?: false
-                topMargin = if (translucent) 0 else StatusBarUtils.getStatusBarHeight(context)
+                topMargin = if (translucent) 0 else SystemUiUtils.getStatusBarHeight(context.currentActivity)
             })
     }
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/react/modal/ModalViewManager.kt

@@ -1,5 +1,6 @@
 package com.reactnativenavigation.react.modal
 
+import android.app.Activity
 import android.content.Context
 import android.graphics.Point
 import android.view.WindowManager
@@ -21,7 +22,7 @@ import com.reactnativenavigation.options.parseTransitionAnimationOptions
 import com.reactnativenavigation.options.parsers.JSONParser
 import com.reactnativenavigation.react.CommandListener
 import com.reactnativenavigation.react.CommandListenerAdapter
-import com.reactnativenavigation.utils.StatusBarUtils
+import com.reactnativenavigation.utils.SystemUiUtils
 import com.reactnativenavigation.viewcontrollers.navigator.Navigator
 
 private const val MODAL_MANAGER_NAME = "RNNModalViewManager"
@@ -107,18 +108,18 @@ class ModalViewManager(val reactContext: ReactContext) : ViewGroupManager<ModalH
     }
 }
 
-private fun getModalHostSize(context: Context): Point {
+private fun getModalHostSize(activity: Activity): Point {
     val MIN_POINT = Point()
     val MAX_POINT = Point()
     val SIZE_POINT = Point()
-    val wm = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+    val wm = activity.getSystemService(Context.WINDOW_SERVICE) as WindowManager
     val display = Assertions.assertNotNull(wm).defaultDisplay
     // getCurrentSizeRange will return the min and max width and height that the window can be
     display.getCurrentSizeRange(MIN_POINT, MAX_POINT)
     // getSize will return the dimensions of the screen in its current orientation
     display.getSize(SIZE_POINT)
     val attrs = intArrayOf(android.R.attr.windowFullscreen)
-    val theme = context.theme
+    val theme = activity.theme
     val ta = theme.obtainStyledAttributes(attrs)
     val windowFullscreen = ta.getBoolean(0, false)
 
@@ -126,7 +127,7 @@ private fun getModalHostSize(context: Context): Point {
     // because Display.getCurrentSizeRange doesn't include it.
     var statusBarHeight = 0
     if (windowFullscreen) {
-        statusBarHeight = StatusBarUtils.getStatusBarHeight(context)
+        statusBarHeight = SystemUiUtils.getStatusBarHeight(activity)
     }
     return if (SIZE_POINT.x < SIZE_POINT.y) {
         // If we are vertical the width value comes from min width and height comes from max height
@@ -140,8 +141,10 @@ private fun getModalHostSize(context: Context): Point {
 private class ModalHostShadowNode : LayoutShadowNode() {
     override fun addChildAt(child: ReactShadowNodeImpl, i: Int) {
         super.addChildAt(child, i)
-        val modalSize = getModalHostSize(themedContext)
-        child.setStyleWidth(modalSize.x.toFloat())
-        child.setStyleHeight(modalSize.y.toFloat())
+        themedContext?.currentActivity?.let {
+            val modalSize = getModalHostSize(it)
+            child.setStyleWidth(modalSize.x.toFloat())
+            child.setStyleHeight(modalSize.y.toFloat())
+        }
     }
 }

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

@@ -0,0 +1,168 @@
+package com.reactnativenavigation.utils
+
+import android.app.Activity
+import android.graphics.Color
+import android.graphics.Rect
+import android.os.Build
+import android.view.View
+import android.view.Window
+import androidx.annotation.ColorInt
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
+import kotlin.math.abs
+import kotlin.math.ceil
+
+
+object SystemUiUtils {
+    private const val STATUS_BAR_HEIGHT_M = 24
+    private const val STATUS_BAR_HEIGHT_L = 25
+    private const val STATUS_BAR_HEIGHT_TRANSLUCENCY = 0.65f
+    private var statusBarHeight = -1
+    var navigationBarDefaultColor = -1
+        private set
+
+
+    @JvmStatic
+    fun getStatusBarHeight(activity: Activity?): Int {
+        val res = if (statusBarHeight > 0) {
+            statusBarHeight
+        } else {
+            statusBarHeight = activity?.let {
+                val rectangle = Rect()
+                val window: Window = activity.window
+                window.decorView.getWindowVisibleDisplayFrame(rectangle)
+                val statusBarHeight: Int = rectangle.top
+                val contentView = window.findViewById<View>(Window.ID_ANDROID_CONTENT)
+                contentView?.let {
+                    val contentViewTop = contentView.top
+                    abs(contentViewTop - statusBarHeight)
+                }
+            } ?: if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) STATUS_BAR_HEIGHT_M else STATUS_BAR_HEIGHT_L
+            statusBarHeight
+        }
+        return res
+    }
+
+    @JvmStatic
+    fun saveStatusBarHeight(height: Int) {
+        statusBarHeight = height
+    }
+
+
+    @JvmStatic
+    fun getStatusBarHeightDp(activity: Activity?): Int {
+        return UiUtils.pxToDp(activity, getStatusBarHeight(activity).toFloat())
+            .toInt()
+    }
+
+    @JvmStatic
+    fun hideNavigationBar(window: Window?, view: View) {
+        window?.let {
+            WindowCompat.setDecorFitsSystemWindows(window, false)
+            WindowInsetsControllerCompat(window, view).let { controller ->
+                controller.hide(WindowInsetsCompat.Type.navigationBars())
+                controller.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+            }
+        }
+    }
+
+    @JvmStatic
+    fun showNavigationBar(window: Window?, view: View) {
+        window?.let {
+            WindowCompat.setDecorFitsSystemWindows(window, true)
+            WindowInsetsControllerCompat(window, view).show(WindowInsetsCompat.Type.navigationBars())
+        }
+    }
+
+    @JvmStatic
+    fun setStatusBarColorScheme(window: Window?, view: View, isDark: Boolean) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return
+
+        window?.let {
+            WindowInsetsControllerCompat(window, view).isAppearanceLightStatusBars = isDark
+           // Workaround: on devices with api 30 status bar icons flickers or get hidden when removing view
+            //turns out it is a bug on such devices, fixed by using system flags until it is fixed.
+            var flags = view.systemUiVisibility
+            flags = if (isDark) {
+                flags or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+            } else {
+                flags and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv()
+            }
+
+            view.systemUiVisibility = flags
+        }
+    }
+
+    @JvmStatic
+    fun setStatusBarTranslucent(window: Window?) {
+        window?.let {
+            setStatusBarColor(window, window.statusBarColor, true)
+        }
+    }
+
+    @JvmStatic
+    fun isTranslucent(window: Window?): Boolean {
+        return window?.let {
+            Color.alpha(it.statusBarColor) < 255
+        } ?: false
+    }
+
+    @JvmStatic
+    fun clearStatusBarTranslucency(window: Window?) {
+        window?.let {
+            setStatusBarColor(it, it.statusBarColor, false)
+        }
+    }
+
+    @JvmStatic
+    fun setStatusBarColor(
+        window: Window?,
+        @ColorInt color: Int,
+        translucent: Boolean
+    ) {
+        val opaqueColor = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            Color.BLACK
+        }else{
+            val alpha = if (translucent) STATUS_BAR_HEIGHT_TRANSLUCENCY else 1f
+            val red: Int = Color.red(color)
+            val green: Int = Color.green(color)
+            val blue: Int = Color.blue(color)
+            Color.argb(ceil(alpha * 255).toInt(), red, green, blue)
+        }
+        window?.statusBarColor = opaqueColor
+    }
+
+    @JvmStatic
+    fun hideStatusBar(window: Window?, view: View) {
+        window?.let {
+            WindowCompat.setDecorFitsSystemWindows(window, false)
+            WindowInsetsControllerCompat(window, view).let { controller ->
+                controller.hide(WindowInsetsCompat.Type.statusBars())
+                controller.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+            }
+        }
+    }
+
+    @JvmStatic
+    fun showStatusBar(window: Window?, view: View) {
+        window?.let {
+            WindowCompat.setDecorFitsSystemWindows(window, true)
+            WindowInsetsControllerCompat(window, view).show(WindowInsetsCompat.Type.statusBars())
+        }
+    }
+
+    @JvmStatic
+    fun setNavigationBarBackgroundColor(window: Window?, color: Int, lightColor: Boolean) {
+        window?.let {
+            if (navigationBarDefaultColor == -1) {
+                navigationBarDefaultColor = window.navigationBarColor
+            }
+            WindowInsetsControllerCompat(window, window.decorView).let { controller ->
+                controller.isAppearanceLightNavigationBars = lightColor
+            }
+            window.navigationBarColor = color
+        }
+    }
+
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/child/ChildController.java

@@ -2,12 +2,16 @@ package com.reactnativenavigation.viewcontrollers.child;
 
 import android.app.Activity;
 import android.content.res.Configuration;
+import android.os.Build;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowInsets;
 
 import com.reactnativenavigation.options.Options;
+import com.reactnativenavigation.utils.LogKt;
+import com.reactnativenavigation.viewcontrollers.parent.ParentController;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
-import com.reactnativenavigation.utils.StatusBarUtils;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.NoOpYellowBoxDelegate;
 import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
@@ -15,7 +19,9 @@ import com.reactnativenavigation.viewcontrollers.viewcontroller.overlay.ViewCont
 import com.reactnativenavigation.views.component.Component;
 
 import androidx.annotation.CallSuper;
+import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsCompat;
 
 public abstract class ChildController<T extends ViewGroup> extends ViewController<T> {
@@ -61,7 +67,7 @@ public abstract class ChildController<T extends ViewGroup> extends ViewControlle
     }
 
     public void onViewBroughtToFront() {
-        presenter.onViewBroughtToFront(resolveCurrentOptions());
+        presenter.onViewBroughtToFront(this, resolveCurrentOptions());
     }
 
     @Override
@@ -73,7 +79,7 @@ public abstract class ChildController<T extends ViewGroup> extends ViewControlle
     @Override
     public void mergeOptions(Options options) {
         if (options == Options.EMPTY) return;
-        if (isViewShown()) presenter.mergeOptions(getView(), options);
+        if (isViewShown()) presenter.mergeOptions(this, options);
         super.mergeOptions(options);
         performOnParentController(parentController -> parentController.mergeChildOptions(options, this));
     }
@@ -93,23 +99,13 @@ public abstract class ChildController<T extends ViewGroup> extends ViewControlle
                 getView().getParent() != null;
     }
 
-    private WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat insets) {
-        StatusBarUtils.saveStatusBarHeight(insets.getSystemWindowInsetTop());
-        return applyWindowInsets(findController(view), insets);
-    }
-
-    protected WindowInsetsCompat applyWindowInsets(ViewController<?> view, WindowInsetsCompat insets) {
-        return insets.replaceSystemWindowInsets(
-                insets.getSystemWindowInsetLeft(),
-                0,
-                insets.getSystemWindowInsetRight(),
-                insets.getSystemWindowInsetBottom()
-        );
+    protected WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat insets) {
+       return insets;
     }
 
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        presenter.onConfigurationChanged(this,options);
+        presenter.onConfigurationChanged(this, options);
     }
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/component/ComponentViewController.java

@@ -4,10 +4,11 @@ import android.app.Activity;
 import android.content.res.Configuration;
 import android.view.View;
 
+import com.reactnativenavigation.utils.LogKt;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ScrollEventListener;
 import com.reactnativenavigation.options.Options;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
-import com.reactnativenavigation.utils.StatusBarUtils;
+import com.reactnativenavigation.utils.SystemUiUtils;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ReactViewCreator;
 import com.reactnativenavigation.viewcontrollers.child.ChildController;
 import com.reactnativenavigation.viewcontrollers.child.ChildControllersRegistry;
@@ -127,8 +128,9 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
 
     @Override
     public int getTopInset() {
-        int statusBarInset = resolveCurrentOptions(presenter.defaultOptions).statusBar.isHiddenOrDrawBehind() ? 0 : StatusBarUtils.getStatusBarHeight(getActivity());
-        return statusBarInset + perform(getParentController(), 0, p -> p.getTopInset(this));
+        int statusBarInset = resolveCurrentOptions(presenter.defaultOptions).statusBar.isHiddenOrDrawBehind() ? 0 : SystemUiUtils.getStatusBarHeight(getActivity());
+        final Integer perform = perform(getParentController(), 0, p -> p.getTopInset(this));
+        return statusBarInset + perform;
     }
 
     @Override
@@ -137,14 +139,19 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
     }
 
     @Override
-    protected WindowInsetsCompat applyWindowInsets(ViewController<?> view, WindowInsetsCompat insets) {
-        final WindowInsetsCompat.Builder builder = new WindowInsetsCompat.Builder();
-        final WindowInsetsCompat finalInsets = builder.setSystemWindowInsets(Insets.of(insets.getSystemWindowInsetLeft(),
-                Math.max(insets.getSystemWindowInsetTop() - getTopInset(), 0),
-                insets.getSystemWindowInsetRight(),
-                Math.max(insets.getSystemWindowInsetBottom() - getBottomInset(), 0))).build();
-        ViewCompat.onApplyWindowInsets(view.getView(), finalInsets);
-        return finalInsets;
+    protected WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat insets) {
+        ViewController<?> viewController = findController(view);
+        if (viewController == null || viewController.getView() == null) return insets;
+        final Insets keyboardInsets = insets.getInsets( WindowInsetsCompat.Type.ime());
+        final Insets systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars() );
+        final int visibleNavBar = resolveCurrentOptions(presenter.defaultOptions).navigationBar.isVisible.isTrueOrUndefined()?1:0;
+        final WindowInsetsCompat finalInsets = new WindowInsetsCompat.Builder().setInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.ime(),
+                Insets.of(systemBarsInsets.left,
+                        0,
+                        systemBarsInsets.right,
+                        Math.max(visibleNavBar*systemBarsInsets.bottom,keyboardInsets.bottom))
+        ).build();
+        return ViewCompat.onApplyWindowInsets(viewController.getView(), finalInsets);
     }
 
     @Override

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/externalcomponent/ExternalComponentViewController.java

@@ -10,7 +10,7 @@ import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
 import com.reactnativenavigation.react.events.ComponentType;
 import com.reactnativenavigation.react.events.EventEmitter;
 import com.reactnativenavigation.utils.CoordinatorLayoutUtils;
-import com.reactnativenavigation.utils.StatusBarUtils;
+import com.reactnativenavigation.utils.SystemUiUtils;
 import com.reactnativenavigation.viewcontrollers.child.ChildController;
 import com.reactnativenavigation.viewcontrollers.child.ChildControllersRegistry;
 import com.reactnativenavigation.views.BehaviourDelegate;
@@ -72,7 +72,7 @@ public class ExternalComponentViewController extends ChildController<ExternalCom
 
     @Override
     public int getTopInset() {
-        int statusBarInset = resolveCurrentOptions().statusBar.drawBehind.isTrue() ? 0 : StatusBarUtils.getStatusBarHeight(getActivity());
+        int statusBarInset = resolveCurrentOptions().statusBar.drawBehind.isTrue() ? 0 : SystemUiUtils.getStatusBarHeight(getActivity());
         return statusBarInset + perform(getParentController(), 0, p -> p.getTopInset(this));
     }
 

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

@@ -36,7 +36,7 @@ import com.reactnativenavigation.options.parsers.TypefaceLoader;
 import com.reactnativenavigation.utils.CollectionUtils;
 import com.reactnativenavigation.utils.ObjectUtils;
 import com.reactnativenavigation.utils.RenderChecker;
-import com.reactnativenavigation.utils.StatusBarUtils;
+import com.reactnativenavigation.utils.SystemUiUtils;
 import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.viewcontrollers.bottomtabs.BottomTabsController;
 import com.reactnativenavigation.viewcontrollers.stack.topbar.TopBarBackgroundViewController;
@@ -244,24 +244,38 @@ public class StackPresenter {
 
     private void applyStatusBarDrawBehindOptions(TopBarOptions topBarOptions, Options withDefault) {
         if (withDefault.statusBar.visible.isTrueOrUndefined() && withDefault.statusBar.drawBehind.isTrue()) {
-            topBar.setTopPadding(StatusBarUtils.getStatusBarHeight(activity));
-            topBar.setHeight(topBarOptions.height.get(UiUtils.getTopBarHeightDp(activity)) + StatusBarUtils.getStatusBarHeightDp(activity));
+            topBar.setTopPadding(SystemUiUtils.getStatusBarHeight(activity));
+            topBar.setHeight(topBarOptions.height.get(UiUtils.getTopBarHeightDp(activity)) + SystemUiUtils.getStatusBarHeightDp(activity));
+
         } else {
             topBar.setTopPadding(0);
             topBar.setHeight(topBarOptions.height.get(UiUtils.getTopBarHeightDp(activity)));
         }
     }
-
-    private void mergeStatusBarDrawBehindOptions(TopBarOptions topBarOptions, Options toMerge) {
-        if (toMerge.statusBar.drawBehind.hasValue()) {
-            if (toMerge.statusBar.visible.isTrueOrUndefined() && toMerge.statusBar.drawBehind.isTrue()) {
-                topBar.setTopPadding(StatusBarUtils.getStatusBarHeight(activity));
-                topBar.setHeight(topBarOptions.height.get(UiUtils.getTopBarHeightDp(activity)) + StatusBarUtils.getStatusBarHeightDp(activity));
-            } else {
-                topBar.setTopPadding(0);
-                topBar.setHeight(topBarOptions.height.get(UiUtils.getTopBarHeightDp(activity)));
+    
+    private void mergeStatusBarDrawBehindOptions(TopBarOptions topBarOptions, Options childOptions) {
+        if(childOptions.statusBar.visible.isTrueOrUndefined()){
+            if (childOptions.statusBar.drawBehind.hasValue()) {
+                if (childOptions.statusBar.drawBehind.isTrue()) {
+                    topBar.setTopPadding(SystemUiUtils.getStatusBarHeight(activity));
+                    topBar.setHeight(topBarOptions.height.get(UiUtils.getTopBarHeightDp(activity)) + SystemUiUtils.getStatusBarHeightDp(activity));
+                } else {
+                    topBar.setTopPadding(0);
+                    topBar.setHeight(topBarOptions.height.get(UiUtils.getTopBarHeightDp(activity)));
+                }
+            }
+        }else{
+            if (childOptions.statusBar.drawBehind.hasValue()) {
+                if (childOptions.statusBar.drawBehind.isFalseOrUndefined()) {
+                    topBar.setTopPadding(SystemUiUtils.getStatusBarHeight(activity));
+                    topBar.setHeight(topBarOptions.height.get(UiUtils.getTopBarHeightDp(activity)) + SystemUiUtils.getStatusBarHeightDp(activity));
+                } else {
+                    topBar.setTopPadding(0);
+                    topBar.setHeight(topBarOptions.height.get(UiUtils.getTopBarHeightDp(activity)));
+                }
             }
         }
+
     }
 
     @Nullable
@@ -351,7 +365,6 @@ public class StackPresenter {
                 perform(bottomTabsController, null, btc -> btc.getSetStackRootAnimation(appearingOptions))
         );
     }
-
     public void mergeChildOptions(Options toMerge, Options resolvedOptions, StackController stack, ViewController<?> child) {
         TopBarOptions topBar = toMerge.copy().topBar.mergeWithDefault(resolvedOptions.topBar).mergeWithDefault(defaultOptions.topBar);
         mergeOrientation(toMerge.layout.orientation);
@@ -485,16 +498,18 @@ public class StackPresenter {
         return result;
     }
 
-    private void mergeTopBarOptions(TopBarOptions resolveOptions, Options options, StackController stack, ViewController<?> child) {
-        TopBarOptions topBarOptions = options.topBar;
+    private void mergeTopBarOptions(TopBarOptions resolveOptions, Options toMerge, StackController stack,
+                                    ViewController<?> child) {
+        TopBarOptions topBarOptions = toMerge.topBar;
         final View component = child.getView();
-        if (options.layout.direction.hasValue()) topBar.setLayoutDirection(options.layout.direction);
+        if (toMerge.layout.direction.hasValue()) topBar.setLayoutDirection(toMerge.layout.direction);
         if (topBarOptions.height.hasValue()) topBar.setHeight(topBarOptions.height.get());
         if (topBarOptions.elevation.hasValue()) topBar.setElevation(topBarOptions.elevation.get());
         if (topBarOptions.topMargin.hasValue() && topBar.getLayoutParams() instanceof MarginLayoutParams) {
             ((MarginLayoutParams) topBar.getLayoutParams()).topMargin = UiUtils.dpToPx(activity, topBarOptions.topMargin.get());
         }
-        mergeStatusBarDrawBehindOptions(resolveOptions, options);
+        Options childOptions = stack.resolveChildOptions(child).mergeWith(toMerge).withDefaultOptions(defaultOptions);
+        mergeStatusBarDrawBehindOptions(resolveOptions, childOptions);
         if (topBarOptions.title.height.hasValue()) topBar.setTitleHeight(topBarOptions.title.height.get());
         if (topBarOptions.title.topMargin.hasValue()) topBar.setTitleTopMargin(topBarOptions.title.topMargin.get());
 
@@ -652,7 +667,7 @@ public class StackPresenter {
     private int getTopBarTopMargin(StackController stack, ViewController<?> child) {
         Options withDefault = stack.resolveChildOptions(child).withDefaultOptions(defaultOptions);
         int topMargin = UiUtils.dpToPx(activity, withDefault.topBar.topMargin.get(0));
-        int statusBarInset = withDefault.statusBar.visible.isTrueOrUndefined() && !withDefault.statusBar.drawBehind.isTrue() ? StatusBarUtils.getStatusBarHeight(child.getActivity()) : 0;
+        int statusBarInset = withDefault.statusBar.visible.isTrueOrUndefined() && !withDefault.statusBar.drawBehind.isTrue() ? SystemUiUtils.getStatusBarHeight(child.getActivity()) : 0;
         return topMargin + statusBarInset;
     }
 

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

@@ -10,47 +10,52 @@ import android.view.View;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.view.Window;
 
+import androidx.core.content.ContextCompat;
+
 import com.reactnativenavigation.options.NavigationBarOptions;
 import com.reactnativenavigation.options.Options;
 import com.reactnativenavigation.options.OrientationOptions;
 import com.reactnativenavigation.options.StatusBarOptions;
 import com.reactnativenavigation.options.StatusBarOptions.TextColorScheme;
 import com.reactnativenavigation.options.params.Bool;
-import com.reactnativenavigation.utils.StatusBarUtils;
+import com.reactnativenavigation.utils.SystemUiUtils;
 import com.reactnativenavigation.viewcontrollers.parent.ParentController;
 import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
 
-import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
-
 public class Presenter {
     private final Activity activity;
     private Options defaultOptions;
-
     public Presenter(Activity activity, Options defaultOptions) {
         this.activity = activity;
         this.defaultOptions = defaultOptions;
+
     }
 
     public void setDefaultOptions(Options defaultOptions) {
         this.defaultOptions = defaultOptions;
     }
 
-    public void mergeOptions(View view, Options options) {
-        mergeStatusBarOptions(view, options.statusBar);
-        mergeNavigationBarOptions(options.navigationBar);
+    public Options getDefaultOptions() {
+        return defaultOptions;
+    }
+
+    public void mergeOptions(ViewController<?> viewController, Options options) {
+        final Options withDefaults =  viewController.resolveCurrentOptions().copy().mergeWith(options).withDefaultOptions(defaultOptions);
+        mergeStatusBarOptions(viewController.getView(), withDefaults.statusBar);
+        mergeNavigationBarOptions(withDefaults.navigationBar);
     }
 
     public void applyOptions(ViewController view, Options options) {
         Options withDefaultOptions = options.copy().withDefaultOptions(defaultOptions);
         applyOrientation(withDefaultOptions.layout.orientation);
         applyViewOptions(view, withDefaultOptions);
-        applyStatusBarOptions(withDefaultOptions);
+        applyStatusBarOptions(view, withDefaultOptions);
         applyNavigationBarOptions(withDefaultOptions.navigationBar);
     }
 
-    public void onViewBroughtToFront(Options options) {
+    public void onViewBroughtToFront(ViewController<?> viewController, Options options) {
         Options withDefaultOptions = options.copy().withDefaultOptions(defaultOptions);
-        applyStatusBarOptions(withDefaultOptions);
+        applyStatusBarOptions(viewController, withDefaultOptions);
     }
 
     private void applyOrientation(OrientationOptions options) {
@@ -73,7 +78,7 @@ public class Presenter {
             if (view instanceof Navigator) return;
 
             LayerDrawable ld = new LayerDrawable(new Drawable[]{new ColorDrawable(options.layout.backgroundColor.get())});
-            int top = view.resolveCurrentOptions().statusBar.drawBehind.isTrue() ? 0 : StatusBarUtils.getStatusBarHeight(view.getActivity());
+            int top = view.resolveCurrentOptions().statusBar.drawBehind.isTrue() ? 0 : SystemUiUtils.getStatusBarHeight(view.getActivity());
             if (!(view instanceof ParentController)) {
                 MarginLayoutParams lp = (MarginLayoutParams) view.getView().getLayoutParams();
                 if (lp.topMargin != 0) top = 0;
@@ -83,37 +88,37 @@ public class Presenter {
         }
     }
 
-    private void applyStatusBarOptions(Options options) {
+    private void applyStatusBarOptions(ViewController viewController, Options options) {
         StatusBarOptions statusBar = options.copy().withDefaultOptions(defaultOptions).statusBar;
         setStatusBarBackgroundColor(statusBar);
         setTextColorScheme(statusBar);
         setTranslucent(statusBar);
-        setStatusBarVisible(statusBar.visible);
+        setStatusBarVisible(viewController, statusBar.visible);
     }
 
     private void setTranslucent(StatusBarOptions options) {
         Window window = activity.getWindow();
         if (options.translucent.isTrue()) {
-            window.setFlags(FLAG_TRANSLUCENT_STATUS, FLAG_TRANSLUCENT_STATUS);
-        } else if (StatusBarUtils.isTranslucent(window)) {
-            window.clearFlags(FLAG_TRANSLUCENT_STATUS);
+            SystemUiUtils.setStatusBarTranslucent(window);
+        } else if (SystemUiUtils.isTranslucent(window)) {
+            SystemUiUtils.clearStatusBarTranslucency(window);
         }
     }
 
-    private void setStatusBarVisible(Bool visible) {
-        View decorView = activity.getWindow().getDecorView();
-        int flags = decorView.getSystemUiVisibility();
+    private void setStatusBarVisible(ViewController viewController, Bool visible) {
+        final View view = viewController.view != null ? viewController.view : activity.getWindow().getDecorView();
         if (visible.isFalse()) {
-            flags |= View.SYSTEM_UI_FLAG_FULLSCREEN;
+            SystemUiUtils.hideStatusBar(activity.getWindow(), view);
         } else {
-            flags &= ~View.SYSTEM_UI_FLAG_FULLSCREEN;
+            SystemUiUtils.showStatusBar(activity.getWindow(), view);
         }
-        decorView.setSystemUiVisibility(flags);
     }
 
     private void setStatusBarBackgroundColor(StatusBarOptions statusBar) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && statusBar.backgroundColor.canApplyValue()) {
-            activity.getWindow().setStatusBarColor(getStatusBarBackgroundColor(statusBar));
+        if (statusBar.backgroundColor.canApplyValue()) {
+            final int statusBarBackgroundColor = getStatusBarBackgroundColor(statusBar);
+            SystemUiUtils.setStatusBarColor(activity.getWindow(), statusBarBackgroundColor,
+                    statusBar.translucent.isTrue());
         }
     }
 
@@ -133,20 +138,11 @@ public class Presenter {
     }
 
     private void setTextColorScheme(StatusBarOptions statusBar) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return;
-
         final View view = activity.getWindow().getDecorView();
         //View.post is a Workaround, added to solve internal Samsung 
         //Android 9 issues. For more info see https://github.com/wix/react-native-navigation/pull/7231
-        view.post(()->{
-            int flags = view.getSystemUiVisibility();
-            if (isDarkTextColorScheme(statusBar)) {
-                flags |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
-            } else {
-                flags &= ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
-            }
-
-            view.setSystemUiVisibility(flags);
+        view.post(() -> {
+            SystemUiUtils.setStatusBarColorScheme(activity.getWindow(), view, isDarkTextColorScheme(statusBar));
         });
     }
 
@@ -154,12 +150,14 @@ public class Presenter {
         mergeStatusBarBackgroundColor(statusBar);
         mergeTextColorScheme(statusBar);
         mergeTranslucent(statusBar);
-        mergeStatusBarVisible(view, statusBar.visible, statusBar.drawBehind);
+        mergeStatusBarVisible(view, statusBar.visible);
     }
 
     private void mergeStatusBarBackgroundColor(StatusBarOptions statusBar) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && statusBar.backgroundColor.hasValue()) {
-            activity.getWindow().setStatusBarColor(getStatusBarBackgroundColor(statusBar));
+        if (statusBar.backgroundColor.hasValue()) {
+            final int statusBarBackgroundColor = getStatusBarBackgroundColor(statusBar);
+            SystemUiUtils.setStatusBarColor(activity.getWindow(), statusBarBackgroundColor,
+                    statusBar.translucent.isTrue());
         }
     }
 
@@ -171,22 +169,19 @@ public class Presenter {
     private void mergeTranslucent(StatusBarOptions options) {
         Window window = activity.getWindow();
         if (options.translucent.isTrue()) {
-            window.setFlags(FLAG_TRANSLUCENT_STATUS, FLAG_TRANSLUCENT_STATUS);
-        } else if (options.translucent.isFalse() && StatusBarUtils.isTranslucent(window)) {
-            window.clearFlags(FLAG_TRANSLUCENT_STATUS);
+            SystemUiUtils.setStatusBarTranslucent(window);
+        } else if (options.translucent.isFalse() && SystemUiUtils.isTranslucent(window)) {
+            SystemUiUtils.clearStatusBarTranslucency(window);
         }
     }
 
-    private void mergeStatusBarVisible(View view, Bool visible, Bool drawBehind) {
+    private void mergeStatusBarVisible(View view, Bool visible) {
         if (visible.hasValue()) {
-            int flags = view.getSystemUiVisibility();
             if (visible.isTrue()) {
-                flags &= ~View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN & ~View.SYSTEM_UI_FLAG_FULLSCREEN;
+                SystemUiUtils.showStatusBar(activity.getWindow(), view);
             } else {
-                flags |= View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_FULLSCREEN;
+                SystemUiUtils.hideStatusBar(activity.getWindow(), view);
             }
-            if (flags != view.getSystemUiVisibility()) view.requestLayout();
-            view.setSystemUiVisibility(flags);
         }
     }
 
@@ -206,36 +201,22 @@ public class Presenter {
 
     private void applyNavigationBarVisibility(NavigationBarOptions options) {
         View decorView = activity.getWindow().getDecorView();
-        int flags = decorView.getSystemUiVisibility();
-        boolean defaultVisibility = (flags & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) == 0;
-        int hideNavigationBarFlags = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
-        if (options.isVisible.get(defaultVisibility)) {
-            flags &= ~hideNavigationBarFlags;
+        if (options.isVisible.isTrueOrUndefined()) {
+            SystemUiUtils.showNavigationBar(activity.getWindow(), decorView);
         } else {
-            flags |= hideNavigationBarFlags;
+            SystemUiUtils.hideNavigationBar(activity.getWindow(), decorView);
         }
-        decorView.setSystemUiVisibility(flags);
     }
 
     private void setNavigationBarBackgroundColor(NavigationBarOptions navigationBar) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && navigationBar.backgroundColor.canApplyValue()) {
-            int defaultColor = activity.getWindow().getNavigationBarColor();
-            int color = navigationBar.backgroundColor.get(defaultColor);
-            activity.getWindow().setNavigationBarColor(color);
-            setNavigationBarButtonsColor(color);
-        }
-    }
+         int navigationBarDefaultColor = SystemUiUtils.INSTANCE.getNavigationBarDefaultColor();
+         navigationBarDefaultColor = navigationBarDefaultColor==-1?Color.BLACK:navigationBarDefaultColor;
+        if (navigationBar.backgroundColor.canApplyValue()) {
+            int color = navigationBar.backgroundColor.get(navigationBarDefaultColor);
+            SystemUiUtils.setNavigationBarBackgroundColor(activity.getWindow(), color, isColorLight(color));
+        }else{
+            SystemUiUtils.setNavigationBarBackgroundColor(activity.getWindow(), navigationBarDefaultColor, isColorLight(navigationBarDefaultColor));
 
-    private void setNavigationBarButtonsColor(int color) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            View decorView = activity.getWindow().getDecorView();
-            int flags = decorView.getSystemUiVisibility();
-            if (isColorLight(color)) {
-                flags |= View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
-            } else {
-                flags &= ~View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
-            }
-            decorView.setSystemUiVisibility(flags);
         }
     }
 

package/lib/android/app/src/main/java/com/reactnativenavigation/views/component/ComponentLayout.java

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.view.MotionEvent;
 import android.view.ViewGroup;
+import android.view.WindowInsets;
 
 import com.reactnativenavigation.options.ButtonOptions;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ScrollEventListener;
@@ -99,6 +100,7 @@ public class ComponentLayout extends CoordinatorLayout implements ReactComponent
         reactView.sendOnNavigationButtonPressed(button.id);
     }
 
+
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
         return touchDelegate.onInterceptTouchEvent(ev);

package/lib/android/app/src/main/java/com/reactnativenavigation/views/element/animators/ReactImageMatrixAnimator.kt

@@ -13,7 +13,6 @@ import com.reactnativenavigation.options.SharedElementTransitionOptions
 import com.reactnativenavigation.utils.ViewUtils
 import kotlin.math.max
 import kotlin.math.roundToInt
-import android.animation.TypeEvaluator
 
 class ReactImageMatrixAnimator(from: View, to: View) : PropertyAnimatorCreator<ReactImageView>(from, to) {
     override fun shouldAnimateProperty(fromChild: ReactImageView, toChild: ReactImageView): Boolean {
@@ -39,7 +38,7 @@ class ReactImageMatrixAnimator(from: View, to: View) : PropertyAnimatorCreator<R
 
             to.layoutParams.width = max(from.width, to.width)
             to.layoutParams.height = max(from.height, to.height)
-            return ObjectAnimator.ofObject(TypeEvaluator<Float> { fraction: Float, _: Any, _: Any ->
+            return ObjectAnimator.ofObject({ fraction: Float, _: Any, _: Any ->
                 hierarchy.actualImageScaleType?.let {
                     (hierarchy.actualImageScaleType as? InterpolatingScaleType)?.let {
                         it.value = fraction
@@ -47,7 +46,7 @@ class ReactImageMatrixAnimator(from: View, to: View) : PropertyAnimatorCreator<R
                     }
                 }
                 null
-            }, 0, 1)
+            }, 0f, 1f)
         }
     }
 

package/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/topbar/TopBar.java

@@ -47,7 +47,7 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
 @SuppressLint("ViewConstructor")
 public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAwareView {
-    public final static int  DEFAULT_TITLE_COLOR = Color.BLACK;
+    public final static int DEFAULT_TITLE_COLOR = Color.BLACK;
     public final static int DEFAULT_SUBTITLE_COLOR = Color.GRAY;
 
     private final TopBarCollapseBehavior collapsingBehavior;
@@ -75,7 +75,6 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
 
     private void createLayout() {
         setId(CompatUtils.generateViewId());
-        setFitsSystemWindows(true);
         topTabs = createTopTabs();
         border = createBorder();
         LinearLayout content = createContentLayout();

package/lib/android/app/src/test/java/com/reactnativenavigation/BaseTest.java

@@ -21,7 +21,7 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
 import com.reactnativenavigation.options.params.Bool;
 import com.reactnativenavigation.utils.Functions;
-import com.reactnativenavigation.utils.StatusBarUtils;
+import com.reactnativenavigation.utils.SystemUiUtils;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 
@@ -59,15 +59,16 @@ public abstract class BaseTest {
         when(res.getColor(ArgumentMatchers.anyInt(),any())).thenReturn(0x00000);
     }
 
-    public void mockStatusBarUtils(int statusBarHeight,int statusBarHeightDp, Functions.Func block) {
-        try (MockedStatic<StatusBarUtils> theMock = Mockito.mockStatic(StatusBarUtils.class)) {
+
+    public void mockSystemUiUtils(int statusBarHeight, int statusBarHeightDp, Functions.Func1<MockedStatic<SystemUiUtils>> mockedBlock) {
+        try (MockedStatic<SystemUiUtils> theMock = Mockito.mockStatic(SystemUiUtils.class)) {
             theMock.when(() -> {
-                StatusBarUtils.getStatusBarHeight(any());
+                SystemUiUtils.getStatusBarHeight(any());
             }).thenReturn(statusBarHeight);
             theMock.when(() -> {
-                StatusBarUtils.getStatusBarHeightDp(any());
+                SystemUiUtils.getStatusBarHeightDp(any());
             }).thenReturn(statusBarHeightDp);
-            block.run();
+            mockedBlock.run(theMock);
         }
     }
 

package/lib/android/app/src/test/java/com/reactnativenavigation/presentation/PresenterTest.java

@@ -1,41 +1,56 @@
 package com.reactnativenavigation.presentation;
 
 import android.app.Activity;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.options.Options;
 import com.reactnativenavigation.options.params.Bool;
+import com.reactnativenavigation.utils.SystemUiUtils;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
+import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
 public class PresenterTest extends BaseTest {
     private Presenter uut;
     private Activity activity;
+    private ViewController<ViewGroup> controller;
 
     @Override
     public void beforeEach() {
         super.beforeEach();
         activity = newActivity();
+        controller = mock(ViewController.class);
         uut = new Presenter(activity, Options.EMPTY);
     }
 
     @Test
-    public void mergeStatusBarVisible_requestLayout() {
-        ViewGroup spy = Mockito.spy(new FrameLayout(activity));
-        Options options = new Options();
-        options.statusBar.visible = new Bool(false);
+    public void mergeStatusBarVisible_callsShowHide() {
+        mockSystemUiUtils(1,1,(mockedStatic)->{
+            ViewGroup spy = Mockito.spy(new FrameLayout(activity));
+            Mockito.when(controller.getView()).thenReturn(spy);
+            Mockito.when(controller.resolveCurrentOptions()).thenReturn(Options.EMPTY);
+            Options options = new Options();
+            options.statusBar.visible = new Bool(false);
+            uut.mergeOptions(controller, options);
+            mockedStatic.verify(
+                    ()-> SystemUiUtils.hideStatusBar(any(),eq(spy)),times(1));
+
+            options.statusBar.visible = new Bool(true);
+            uut.mergeOptions(controller, options);
+            mockedStatic.verify(
+                    ()-> SystemUiUtils.showStatusBar(any(),eq(spy)),times(1));
+        });
 
-        uut.mergeOptions(spy, options);
-        verify(spy).requestLayout();
-
-        // requested only if needed
-        uut.mergeOptions(spy, options);
-        verify(spy).requestLayout();
     }
 }

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsControllerTest.java

@@ -24,7 +24,7 @@ import com.reactnativenavigation.react.CommandListenerAdapter;
 import com.reactnativenavigation.react.events.EventEmitter;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.OptionHelper;
-import com.reactnativenavigation.utils.StatusBarUtils;
+import com.reactnativenavigation.utils.SystemUiUtils;
 import com.reactnativenavigation.viewcontrollers.bottomtabs.attacher.BottomTabsAttacher;
 import com.reactnativenavigation.viewcontrollers.child.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.fakes.FakeParentController;
@@ -87,7 +87,7 @@ public class BottomTabsControllerTest extends BaseTest {
         childRegistry = new ChildControllersRegistry();
         eventEmitter = Mockito.mock(EventEmitter.class);
         prepareViewsForTests();
-        StatusBarUtils.saveStatusBarHeight(63);
+        SystemUiUtils.saveStatusBarHeight(63);
     }
 
     @Test
@@ -184,6 +184,9 @@ public class BottomTabsControllerTest extends BaseTest {
     @Test
     public void applyChildOptions_bottomTabsOptionsAreClearedAfterApply() {
         ParentController<?> parent = Mockito.mock(ParentController.class);
+        Mockito.when(parent.resolveChildOptions(uut)).thenReturn(Options.EMPTY);
+        Mockito.when(parent.resolveChildOptions(child1)).thenReturn(Options.EMPTY);
+
         uut.setParentController(parent);
 
         child1.options.bottomTabsOptions.backgroundColor = new ThemeColour(new Colour(Color.RED));
@@ -506,6 +509,6 @@ public class BottomTabsControllerTest extends BaseTest {
     }
 
     private int getStatusBarHeight() {
-        return StatusBarUtils.getStatusBarHeight(activity);
+        return SystemUiUtils.getStatusBarHeight(activity);
     }
 }

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/child/ChildControllerTest.java

@@ -32,6 +32,7 @@ public class ChildControllerTest extends BaseTest {
             }
         };
         ParentController<?> parent = Mockito.mock(ParentController.class);
+        Mockito.when(parent.resolveChildOptions(uut)).thenReturn(Options.EMPTY);
         uut.setParentController(parent);
     }
 
@@ -55,7 +56,7 @@ public class ChildControllerTest extends BaseTest {
 
         Options options = new Options();
         uut.mergeOptions(options);
-        verify(presenter).mergeOptions(uut.getView(), options);
+        verify(presenter).mergeOptions(uut, options);
     }
 
     @Test

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/component/ComponentViewControllerTest.java

@@ -11,7 +11,7 @@ import com.reactnativenavigation.mocks.TestComponentLayout;
 import com.reactnativenavigation.mocks.TestReactView;
 import com.reactnativenavigation.options.Options;
 import com.reactnativenavigation.options.params.Bool;
-import com.reactnativenavigation.utils.StatusBarUtils;
+import com.reactnativenavigation.utils.SystemUiUtils;
 import com.reactnativenavigation.views.component.ComponentLayout;
 
 import org.assertj.core.api.Java6Assertions;
@@ -31,7 +31,7 @@ public class ComponentViewControllerTest extends BaseTest {
     public void beforeEach() {
         super.beforeEach();
         activity = newActivity();
-        StatusBarUtils.saveStatusBarHeight(63);
+        SystemUiUtils.saveStatusBarHeight(63);
         view = Mockito.spy(new TestComponentLayout(activity, new TestReactView(activity)));
         parent = TestUtils.newStackController(activity).build();
         Presenter presenter = new Presenter(activity, new Options());
@@ -156,13 +156,13 @@ public class ComponentViewControllerTest extends BaseTest {
     public void getTopInset_returnsStatusBarHeight() {
         //noinspection ConstantConditions
         uut.setParentController(null);
-        Java6Assertions.assertThat(uut.getTopInset()).isEqualTo(StatusBarUtils.getStatusBarHeight(activity));
+        Java6Assertions.assertThat(uut.getTopInset()).isEqualTo(SystemUiUtils.getStatusBarHeight(activity));
     }
 
     @Test
     public void getTopInset_resolveWithParent() {
         Java6Assertions
-                .assertThat(uut.getTopInset()).isEqualTo(StatusBarUtils.getStatusBarHeight(activity) + parent.getTopInset(uut));
+                .assertThat(uut.getTopInset()).isEqualTo(SystemUiUtils.getStatusBarHeight(activity) + parent.getTopInset(uut));
     }
 
     @Test

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/parent/ParentControllerTest.java

@@ -264,6 +264,8 @@ public class ParentControllerTest extends BaseTest {
     @Test
     public void getTopInsetForChild() {
         ParentController<?> parent = Mockito.mock(ParentController.class);
+        Mockito.when(parent.resolveChildOptions(uut)).thenReturn(Options.EMPTY);
+
         when(parent.getTopInset(any())).thenReturn(123);
         uut.setParentController(parent);
 
@@ -280,6 +282,8 @@ public class ParentControllerTest extends BaseTest {
     @Test
     public void getBottomInsetForChild() {
         ParentController<?> parent = Mockito.mock(ParentController.class);
+        Mockito.when(parent.resolveChildOptions(uut)).thenReturn(Options.EMPTY);
+
         when(parent.getBottomInset(any())).thenReturn(123);
         uut.setParentController(parent);
 

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuControllerTest.java

@@ -2,6 +2,7 @@ package com.reactnativenavigation.viewcontrollers.sidemenu;
 
 import android.app.Activity;
 import android.content.res.Resources;
+import android.graphics.Path;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
@@ -55,6 +56,7 @@ public class SideMenuControllerTest extends BaseTest {
 
     @Override
     public void beforeEach() {
+        super.beforeEach();
         activity = createActivity();
 
         childRegistry = new ChildControllersRegistry();
@@ -72,6 +74,7 @@ public class SideMenuControllerTest extends BaseTest {
         };
         uut.setCenterController(center);
         parent = mock(ParentController.class);
+        Mockito.when(parent.resolveChildOptions(uut)).thenReturn(Options.EMPTY);
         uut.setParentController(parent);
     }
 
@@ -118,12 +121,12 @@ public class SideMenuControllerTest extends BaseTest {
 
     @Test
     public void onViewAppeared() {
-        ViewController<?> left = spy(this.left);
+        ViewController left = spy(this.left);
         ViewGroup leftView = spy(left.getView());
         when(left.findController(leftView)).thenReturn(left);
         Mockito.doReturn(leftView).when(left).getView();
 
-        ViewController<?> right = spy(this.right);
+        ViewController right = spy(this.right);
         ViewGroup rightView = spy(right.getView());
         when(right.findController(rightView)).thenReturn(right);
         Mockito.doReturn(rightView).when(right).getView();
@@ -369,6 +372,7 @@ public class SideMenuControllerTest extends BaseTest {
     @Test
     public void onMeasureChild_topInsetsAreApplied() {
         setLeftRight(spy(left), spy(right));
+        idleMainLooper();
         uut.applyTopInset();
         forEach(uut.getChildControllers(), c -> verify(c).applyTopInset());
     }

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackControllerTest.kt

@@ -61,7 +61,7 @@ class StackControllerTest : BaseTest() {
         eventEmitter = mock()
         backButtonHelper = spy(BackButtonHelper())
         activity = newActivity()
-        StatusBarUtils.saveStatusBarHeight(63)
+        SystemUiUtils.saveStatusBarHeight(63)
         animator = spy(StackAnimator(activity))
         childRegistry = ChildControllersRegistry()
         presenter = spy(StackPresenter(
@@ -1089,7 +1089,7 @@ class StackControllerTest : BaseTest() {
         disablePushAnimation(child1)
         uut.push(child1, CommandListenerAdapter())
         ShadowLooper.idleMainLooper()
-        assertThat(ViewUtils.topMargin(uut.topBar)).isEqualTo(StatusBarUtils.getStatusBarHeight(activity))
+        assertThat(ViewUtils.topMargin(uut.topBar)).isEqualTo(SystemUiUtils.getStatusBarHeight(activity))
     }
 
     @Test

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackPresenterTest.kt

@@ -945,7 +945,7 @@ class StackPresenterTest : BaseTest() {
             statusBar.drawBehind = Bool(true)
         }
         Mockito.`when`(child.resolveCurrentOptions()).thenReturn(options)
-        mockStatusBarUtils(statusBarHeight, statusBarHeightDp) {
+        mockSystemUiUtils(statusBarHeight, statusBarHeightDp) {
             uut.applyChildOptions(Options.EMPTY.copy().apply {
                 topBar.height = Number(topBarHeightDp)
             }, parent, child)
@@ -961,7 +961,7 @@ class StackPresenterTest : BaseTest() {
         val statusBarHeightDp = 20
         val topBarHeightDp = 100
 
-        mockStatusBarUtils(statusBarHeight, statusBarHeightDp) {
+        mockSystemUiUtils(statusBarHeight, statusBarHeightDp) {
             uut.mergeChildOptions(Options.EMPTY.copy().apply {
                 topBar.height = Number(topBarHeightDp)
                 statusBar.drawBehind = Bool(true)
@@ -978,7 +978,7 @@ class StackPresenterTest : BaseTest() {
         val statusBarHeightDp = 20
         val topBarHeightDp = 100
 
-        mockStatusBarUtils(statusBarHeight, statusBarHeightDp) {
+        mockSystemUiUtils(statusBarHeight, statusBarHeightDp) {
             uut.mergeChildOptions(Options.EMPTY.copy().apply {
                 topBar.height = Number(topBarHeightDp)
                 statusBar.drawBehind = Bool(false)

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/viewcontroller/ViewControllerTest.java

@@ -31,6 +31,7 @@ import org.robolectric.Shadows;
 import java.lang.reflect.Field;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -51,7 +52,9 @@ public class ViewControllerTest extends BaseTest {
         activity = newActivity();
         childRegistry = new ChildControllersRegistry();
         uut = new SimpleViewController(activity, childRegistry, "uut", new Options());
-        uut.setParentController(mock(ParentController.class));
+        final ParentController<?> parent = mock(ParentController.class);
+        uut.setParentController(parent);
+        Mockito.when(parent.resolveChildOptions(any())).thenReturn(Options.EMPTY);
     }
 
     @Test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.23.1-snapshot.421",
+  "version": "7.23.1-snapshot.434",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,
@@ -102,7 +102,7 @@
     "metro-react-native-babel-preset": "0.66.2",
     "prettier": "2.1.2",
     "react": "17.0.2",
-    "react-native": "0.66.2",
+    "react-native": "0.66.3",
     "react-native-fast-image": "^8.3.4",
     "react-native-gesture-handler": "^1.6.1",
     "react-native-reanimated": "2.3.0-beta.2",

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

@@ -1,39 +0,0 @@
-package com.reactnativenavigation.utils
-
-import android.content.Context
-import android.os.Build
-import android.view.Window
-import android.view.WindowManager
-
-object StatusBarUtils {
-    private const val STATUS_BAR_HEIGHT_M = 24
-    private const val STATUS_BAR_HEIGHT_L = 25
-    private var statusBarHeight = -1
-    @JvmStatic
-    fun saveStatusBarHeight(height: Int) {
-        statusBarHeight = height
-    }
-    @JvmStatic
-    fun getStatusBarHeight(context: Context): Int {
-        if (statusBarHeight > 0) {
-            return statusBarHeight
-        }
-        val resources = context.resources
-        val resourceId = resources.getIdentifier("status_bar_height", "dimen", "android")
-        statusBarHeight = if (resourceId > 0) resources.getDimensionPixelSize(resourceId) else UiUtils.dpToPx(
-            context,
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) STATUS_BAR_HEIGHT_M else STATUS_BAR_HEIGHT_L
-        )
-        return statusBarHeight
-    }
-    @JvmStatic
-    fun getStatusBarHeightDp(context: Context): Int {
-        return UiUtils.pxToDp(context, getStatusBarHeight(context).toFloat())
-            .toInt()
-    }
-    @JvmStatic
-    fun isTranslucent(window: Window): Boolean {
-        val lp = window.attributes
-        return lp != null && lp.flags and WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS == WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
-    }
-}