fix(android): use insets propagated through hierarchy in CustomToolbar

android/src/main/java/com/swmansion/rnscreens/CustomToolbar.kt

@@ -7,6 +7,7 @@ import android.view.Choreographer
 import android.view.WindowInsets
 import android.view.WindowManager
 import androidx.appcompat.widget.Toolbar
+import androidx.core.graphics.Insets
 import androidx.core.view.WindowInsetsCompat
 import com.facebook.react.modules.core.ReactChoreographer
 import com.facebook.react.uimanager.ThemedReactContext
@@ -81,9 +82,8 @@ open class CustomToolbar(
         }
     }
 
-    override fun onApplyWindowInsets(insets: WindowInsets?): WindowInsets? {
-        val unhandledInsets = super.onApplyWindowInsets(insets)
-
+    fun applyWindowInsets(insets: WindowInsets?): WindowInsets? {
+        println("CustomToolbar this=$this")
         // There are few UI modes we could be running in
         //
         // 1. legacy non edge-to-edge mode,
@@ -95,17 +95,10 @@ open class CustomToolbar(
         // We use rootWindowInsets in lieu of insets or unhandledInsets here,
         // because cutout sometimes (only in certain scenarios, e.g. with headerLeft view present)
         // happen to be Insets.ZERO and is not reliable.
-        val rootWindowInsets = rootWindowInsets
         val cutoutInsets =
-            resolveInsetsOrZero(WindowInsetsCompat.Type.displayCutout(), rootWindowInsets)
+            resolveInsetsOrZero(WindowInsetsCompat.Type.displayCutout(), insets)
         val systemBarInsets =
-            resolveInsetsOrZero(WindowInsetsCompat.Type.systemBars(), rootWindowInsets)
-        val statusBarInsetsStable =
-            resolveInsetsOrZero(
-                WindowInsetsCompat.Type.systemBars(),
-                rootWindowInsets,
-                ignoreVisibility = true,
-            )
+            resolveInsetsOrZero(WindowInsetsCompat.Type.systemBars(), insets)
 
         // This seems to work fine in all tested configurations, because cutout & system bars overlap
         // only in portrait mode & top inset is controlled separately, therefore we don't count
@@ -124,7 +117,7 @@ open class CustomToolbar(
         val verticalInsets =
             InsetsCompat.of(
                 0,
-                max(cutoutInsets.top, if (shouldApplyTopInset) statusBarInsetsStable.top else 0),
+                max(cutoutInsets.top, if (shouldApplyTopInset) systemBarInsets.top else 0),
                 0,
                 max(cutoutInsets.bottom, 0),
             )
@@ -141,7 +134,28 @@ open class CustomToolbar(
             )
         }
 
-        return unhandledInsets
+        return insets?.let {
+            WindowInsetsCompat
+                .Builder(WindowInsetsCompat.toWindowInsetsCompat(insets))
+                .setInsets(
+                    WindowInsetsCompat.Type.systemBars(),
+                    Insets.of(
+                        systemBarInsets.left - lastInsets.left,
+                        systemBarInsets.top - lastInsets.top,
+                        systemBarInsets.right - lastInsets.right,
+                        systemBarInsets.bottom - lastInsets.bottom,
+                    ),
+                ).setInsets(
+                    WindowInsetsCompat.Type.displayCutout(),
+                    Insets.of(
+                        cutoutInsets.left - lastInsets.left,
+                        cutoutInsets.top - lastInsets.top,
+                        cutoutInsets.right - lastInsets.right,
+                        cutoutInsets.bottom - lastInsets.bottom,
+                    ),
+                ).build()
+                .toWindowInsets()
+        }
     }
 
     override fun onLayout(

android/src/main/java/com/swmansion/rnscreens/ScreenStackFragment.kt

@@ -13,6 +13,7 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowInsets
 import android.view.animation.Animation
 import android.widget.LinearLayout
 import androidx.appcompat.widget.Toolbar
@@ -126,6 +127,10 @@ class ScreenStackFragment :
         }
     }
 
+    fun hasToolbar() = toolbar !== null
+
+    fun applyInsetsOnToolbar(insets: WindowInsets?) = (this.toolbar as CustomToolbar?)?.applyWindowInsets(insets);
+
     override fun onContainerUpdate() {
         super.onContainerUpdate()
         screen.headerConfig?.onUpdate()

android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderConfig.kt

@@ -374,6 +374,8 @@ class ScreenStackHeaderConfig(
         this.title = title
     }
 
+    fun getTitle() = title
+
     fun setTitleFontFamily(titleFontFamily: String?) {
         this.titleFontFamily = titleFontFamily
     }

android/src/main/java/com/swmansion/rnscreens/stack/views/ScreensCoordinatorLayout.kt

@@ -23,7 +23,17 @@ internal class ScreensCoordinatorLayout(
         PointerEventsBoxNoneImpl(),
     )
 
-    override fun onApplyWindowInsets(insets: WindowInsets?): WindowInsets = super.onApplyWindowInsets(insets)
+    override fun onApplyWindowInsets(insets: WindowInsets?): WindowInsets? {
+        println("SCL name=${fragment.screen.headerConfig?.getTitle()} inset pre = ${insets}")
+        if (fragment.hasToolbar()) {
+            val after = fragment.applyInsetsOnToolbar(insets)
+            println("SCL inset post = ${after}")
+            return after
+        }
+
+        println("SCL default")
+        return super.onApplyWindowInsets(insets)
+    }
 
     private val animationListener: Animation.AnimationListener =
         object : Animation.AnimationListener {