Edge2edge android

android/build.gradle

@@ -130,6 +130,7 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"
 
     implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.activity:activity:1.9.0'
     implementation 'androidx.annotation:annotation:1.2.0'
     implementation 'com.google.android.material:material:1.2.0-alpha03'
 

android/src/main/java/com/reactnativenavigation/NavigationActivity.java

@@ -7,6 +7,7 @@
 import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.ViewGroup;
 
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.PermissionAwareActivity;
@@ -17,10 +18,12 @@
 import com.reactnativenavigation.react.JsDevReloadHandler;
 import com.reactnativenavigation.react.ReactGateway;
 import com.reactnativenavigation.react.CommandListenerAdapter;
+import com.reactnativenavigation.utils.SystemUiUtils;
 import com.reactnativenavigation.viewcontrollers.child.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.modal.ModalStack;
 import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
 
+import androidx.activity.EdgeToEdge;
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -36,6 +39,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        enableEdgeToEdge();
         super.onCreate(savedInstanceState);
         if (isFinishing()) {
             return;
@@ -63,7 +67,9 @@ public void onConfigurationChanged(@NonNull Configuration newConfig) {
     @Override
     public void onPostCreate(@Nullable Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
-        navigator.setContentLayout(findViewById(android.R.id.content));
+        ViewGroup contentLayout = findViewById(android.R.id.content);
+        navigator.setContentLayout(contentLayout);
+        SystemUiUtils.setupSystemBarBackgrounds(this, contentLayout);
     }
 
     @Override
@@ -88,6 +94,7 @@ protected void onPause() {
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        SystemUiUtils.tearDown();
         if (navigator != null) {
             navigator.destroy();
         }
@@ -146,6 +153,25 @@ public void onReload() {
         navigator.destroyViews();
     }
 
+    /**
+     * Enables edge-to-edge display only if the app theme sets
+     * {@code windowOptOutEdgeToEdgeEnforcement} to {@code false} (API 35+).
+     * By default, edge-to-edge is not enabled. Override to customize.
+     * Called at the start of onCreate, before super.onCreate.
+     */
+    protected void enableEdgeToEdge() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+            android.content.res.TypedArray a = getTheme().obtainStyledAttributes(
+                    new int[]{android.R.attr.windowOptOutEdgeToEdgeEnforcement});
+            boolean optOut = a.getBoolean(0, true);
+            a.recycle();
+            if (!optOut) {
+                EdgeToEdge.enable(this);
+                SystemUiUtils.activateEdgeToEdge();
+            }
+        }
+    }
+
     protected void addDefaultSplashLayout() {
         View view = new View(this);
         setContentView(view);

android/src/main/java/com/reactnativenavigation/react/modal/ModalHostLayout.kt

@@ -34,8 +34,8 @@ open class ModalHostLayout(reactContext: ThemedReactContext) : ViewGroup(reactCo
     }
 
     @TargetApi(23)
-    override fun dispatchProvideStructure(structure: ViewStructure) {
-        mHostView.dispatchProvideStructure(structure)
+    override fun dispatchProvideStructure(structure: ViewStructure?) {
+        structure?.let { mHostView.dispatchProvideStructure(it) }
     }
 
     override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {}

android/src/main/java/com/reactnativenavigation/utils/ReactTypefaceUtils.java

@@ -18,9 +18,8 @@
 import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.common.ReactConstants;
 import com.facebook.react.views.text.ReactFontManager;
-import com.facebook.react.views.text.ReactTextShadowNode;
+import com.facebook.react.common.ReactConstants;
 import java.util.ArrayList;
 import java.util.List;