react-native-navigation 7.23.1-snapshot.412 → 7.23.1-snapshot.440

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'
@@ -190,12 +190,12 @@ dependencies {
     implementation 'com.facebook.react:react-native:+'
 
     // tests
-    testImplementation 'junit:junit:4.12'
-    testImplementation "org.robolectric:robolectric:4.4"
-    testImplementation 'org.assertj:assertj-core:3.8.0'
-    testImplementation 'com.squareup.assertj:assertj-android:1.1.1'
-    testImplementation 'org.mockito:mockito-core:3.4.0'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation "org.robolectric:robolectric:4.7.2"
+    testImplementation 'org.assertj:assertj-core:3.11.1'
+    testImplementation 'org.mockito:mockito-core:4.0.0'
+    testImplementation 'com.squareup.assertj:assertj-android:1.2.0'
     testImplementation 'org.mockito:mockito-inline:3.4.0'
-    testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
+    testImplementation "org.mockito.kotlin:mockito-kotlin:4.0.0"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
 }

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

@@ -6,10 +6,40 @@ import com.reactnativenavigation.options.parsers.BoolParser
 import org.json.JSONObject
 
 
+sealed class HwBackBottomTabsBehaviour {
+    object Undefined : HwBackBottomTabsBehaviour() {
+        override fun hasValue(): Boolean = false
+    }
+
+    object Exit : HwBackBottomTabsBehaviour()
+    object PrevSelection : HwBackBottomTabsBehaviour()
+    object JumpToFirst : HwBackBottomTabsBehaviour()
+
+    open fun hasValue(): Boolean = true
+
+    companion object {
+        private const val BEHAVIOUR_EXIT = "exit"
+        private const val BEHAVIOUR_PREV = "previous"
+        private const val BEHAVIOUR_FIRST = "first"
+        fun fromString(behaviour: String?): HwBackBottomTabsBehaviour {
+            return when (behaviour) {
+                BEHAVIOUR_PREV -> PrevSelection
+                BEHAVIOUR_FIRST -> JumpToFirst
+                BEHAVIOUR_EXIT -> Exit
+                else -> Undefined
+            }
+        }
+    }
+}
+
 open class HardwareBackButtonOptions(json: JSONObject? = null) {
 
-    @JvmField var dismissModalOnPress: Bool = NullBool()
-    @JvmField var popStackOnPress: Bool = NullBool()
+    @JvmField
+    var dismissModalOnPress: Bool = NullBool()
+
+    @JvmField
+    var popStackOnPress: Bool = NullBool()
+    var bottomTabOnPress: HwBackBottomTabsBehaviour = HwBackBottomTabsBehaviour.Undefined
 
     init {
         parse(json)
@@ -18,16 +48,19 @@ open class HardwareBackButtonOptions(json: JSONObject? = null) {
     fun mergeWith(other: HardwareBackButtonOptions) {
         if (other.dismissModalOnPress.hasValue()) dismissModalOnPress = other.dismissModalOnPress
         if (other.popStackOnPress.hasValue()) popStackOnPress = other.popStackOnPress
+        if (other.bottomTabOnPress.hasValue()) bottomTabOnPress = other.bottomTabOnPress
     }
 
     fun mergeWithDefault(defaultOptions: HardwareBackButtonOptions) {
         if (!dismissModalOnPress.hasValue()) dismissModalOnPress = defaultOptions.dismissModalOnPress
         if (!popStackOnPress.hasValue()) popStackOnPress = defaultOptions.popStackOnPress
+        if (!bottomTabOnPress.hasValue()) bottomTabOnPress = defaultOptions.bottomTabOnPress
     }
 
     private fun parse(json: JSONObject?) {
         json ?: return
         dismissModalOnPress = BoolParser.parse(json, "dismissModalOnPress")
         popStackOnPress = BoolParser.parse(json, "popStackOnPress")
+        bottomTabOnPress = HwBackBottomTabsBehaviour.fromString(json.optString("bottomTabsOnPress"))
     }
 }

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/bottomtabs/BottomTabsController.java

@@ -13,6 +13,7 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem;
 import com.reactnativenavigation.options.BottomTabOptions;
+import com.reactnativenavigation.options.HwBackBottomTabsBehaviour;
 import com.reactnativenavigation.options.Options;
 import com.reactnativenavigation.react.CommandListener;
 import com.reactnativenavigation.react.CommandListenerAdapter;
@@ -29,6 +30,8 @@ import com.reactnativenavigation.views.bottomtabs.BottomTabsContainer;
 import com.reactnativenavigation.views.bottomtabs.BottomTabsLayout;
 
 import java.util.Collection;
+import java.util.Deque;
+import java.util.LinkedList;
 import java.util.List;
 
 import static com.reactnativenavigation.utils.CollectionUtils.forEach;
@@ -39,6 +42,7 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
 
     private BottomTabsContainer bottomTabsContainer;
     private BottomTabs bottomTabs;
+    private final Deque<Integer> selectionStack;
     private final List<ViewController<?>> tabs;
     private final EventEmitter eventEmitter;
     private final ImageLoader imageLoader;
@@ -66,6 +70,7 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
         this.presenter = bottomTabsPresenter;
         this.tabPresenter = bottomTabPresenter;
         forEach(tabs, tab -> tab.setParentController(this));
+        selectionStack = new LinkedList<>();
     }
 
     @Override
@@ -156,7 +161,27 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
 
     @Override
     public boolean handleBack(CommandListener listener) {
-        return !tabs.isEmpty() && tabs.get(bottomTabs.getCurrentItem()).handleBack(listener);
+        final boolean childBack = !tabs.isEmpty() && tabs.get(bottomTabs.getCurrentItem()).handleBack(listener);
+        final Options options = resolveCurrentOptions();
+        if (!childBack) {
+            if (options.hardwareBack.getBottomTabOnPress() instanceof HwBackBottomTabsBehaviour.PrevSelection) {
+                if (!selectionStack.isEmpty()) {
+                    final int prevSelectedTabIndex = selectionStack.poll();
+                    selectTab(prevSelectedTabIndex, false);
+                    return true;
+                }
+            } else if (options.hardwareBack.getBottomTabOnPress() instanceof HwBackBottomTabsBehaviour.JumpToFirst) {
+                if (getSelectedIndex() != 0) {
+                    selectTab(0, false);
+                    return true;
+                } else {
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        }
+        return childBack;
     }
 
     @Override
@@ -203,7 +228,7 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
         });
     }
 
-    int getSelectedIndex() {
+    public int getSelectedIndex() {
         return bottomTabs.getCurrentItem();
     }
 
@@ -239,6 +264,12 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
 
     @Override
     public void selectTab(final int newIndex) {
+        final boolean enableSelectionHistory = resolveCurrentOptions().hardwareBack.getBottomTabOnPress() instanceof HwBackBottomTabsBehaviour.PrevSelection;
+        selectTab(newIndex, enableSelectionHistory);
+    }
+
+    private void selectTab(int newIndex, boolean enableSelectionHistory) {
+        saveTabSelection(newIndex, enableSelectionHistory);
         tabsAttacher.onTabSelected(tabs.get(newIndex));
         getCurrentView().setVisibility(View.INVISIBLE);
         bottomTabs.setCurrentItem(newIndex, false);
@@ -246,6 +277,15 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
         getCurrentChild().onViewDidAppear();
     }
 
+    private void saveTabSelection(int newIndex, boolean enableSelectionHistory) {
+        if (enableSelectionHistory) {
+            if (selectionStack.isEmpty()
+                    || selectionStack.peek() != newIndex
+                    || bottomTabs.getCurrentItem() != newIndex)
+                selectionStack.offerFirst(bottomTabs.getCurrentItem());
+        }
+    }
+
     @NonNull
     private ViewGroup getCurrentView() {
         return tabs.get(bottomTabs.getCurrentItem()).getView();

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));
     }