Add tests for window insets padding

Author: svastven

compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/layout/WindowInsetsPaddingTest.kt

@@ -25,6 +25,8 @@ import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.systemGesturesPadding
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material.Text
@@ -36,6 +38,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
@@ -47,13 +50,16 @@ import androidx.compose.ui.unit.DpRect
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.toDpRect
+import androidx.compose.ui.viewinterop.UIKitView
+import androidx.compose.ui.window.ComposeUIView
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.useContents
 import org.jetbrains.skiko.OS
 import org.jetbrains.skiko.OSVersion
 import org.jetbrains.skiko.available
+import platform.UIKit.UIColor
 import platform.UIKit.UIDevice
 import platform.UIKit.UIInterfaceOrientationMaskLandscapeLeft
 import platform.UIKit.UIInterfaceOrientationMaskLandscapeRight
@@ -164,6 +170,98 @@ class WindowInsetsPaddingTest {
 
         assertEquals(false, recomposed.value)
     }
+
+    @OptIn(ExperimentalForeignApi::class)
+    @Test
+    fun testWindowInsetsPaddingAppliedToNonFullscreenContent() = runUIKitInstrumentedTest {
+        var innerBoxRect = DpRectZero()
+        var outerBoxRect = DpRectZero()
+
+        setContent {
+            Box(modifier = Modifier.background(Color.Red).fillMaxSize()) {
+                Box(
+                    modifier = Modifier
+                        .align(Alignment.Center)
+                        .background(Color.Blue)
+                        .size(200.dp, 200.dp)
+                        .onGloballyPositioned {
+                            outerBoxRect = it.boundsInWindow().toDpRect(density)
+                        },
+                ) {
+                    Box(modifier = Modifier
+                        .windowInsetsPadding(WindowInsets.statusBars)
+                        .background(Color.Green)
+                        .fillMaxSize()
+                        .onGloballyPositioned {
+                            innerBoxRect = it.boundsInWindow().toDpRect(density)
+                        }
+                    )
+                }
+            }
+        }
+
+        // WindowInsets.statusBars should only represent the insets at the top in portrait orientation
+        val topSafeAreaInsetsDp = viewController.view.safeAreaInsets.useContents { top }.dp
+
+        assertEquals(
+            DpRect(
+                left = outerBoxRect.left,
+                top = outerBoxRect.top + topSafeAreaInsetsDp,
+                right = outerBoxRect.right,
+                bottom = outerBoxRect.bottom
+            ),
+            innerBoxRect
+        )
+    }
+
+    @OptIn(ExperimentalForeignApi::class)
+    @Test
+    fun testWindowInsetsPaddingAppliedToNonFullscreenComposeUIViewContent() = runUIKitInstrumentedTest {
+        var innerBoxRect = DpRectZero()
+        var outerBoxRect = DpRectZero()
+
+        setContent {
+            Box(modifier = Modifier.background(Color.Red).fillMaxSize()) {
+                UIKitView(
+                    factory = {
+                        ComposeUIView(
+                            configure = { opaque = false }
+                        ) {
+                            Box(modifier = Modifier
+                                .windowInsetsPadding(WindowInsets.statusBars)
+                                .background(Color.Green)
+                                .fillMaxSize()
+                                .onGloballyPositioned {
+                                    innerBoxRect = it.boundsInWindow().toDpRect(density)
+                                }
+                            )
+                        }.apply {
+                            backgroundColor = UIColor.blueColor
+                        }
+                    },
+                    modifier = Modifier
+                        .align(Alignment.Center)
+                        .size(200.dp, 200.dp)
+                        .onGloballyPositioned {
+                            outerBoxRect = it.boundsInWindow().toDpRect(density)
+                        }
+                )
+            }
+        }
+
+        // WindowInsets.statusBars should only represent the insets at the top in portrait orientation
+        val topSafeAreaInsetsDp = viewController.view.safeAreaInsets.useContents { top }.dp
+
+        assertEquals(
+            DpRect(
+                left = outerBoxRect.left,
+                top = outerBoxRect.top + topSafeAreaInsetsDp,
+                right = outerBoxRect.right,
+                bottom = outerBoxRect.bottom
+            ),
+            innerBoxRect
+        )
+    }
 }
 
 @Composable

compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/test/UIKitInstrumentedTest.kt

@@ -43,7 +43,7 @@ import androidx.compose.ui.unit.asDpOffset
 import androidx.compose.ui.unit.asDpRect
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.lerp
-import androidx.compose.ui.unit.toOffset
+import androidx.compose.ui.unit.size
 import androidx.compose.ui.window.KeyboardVisibilityListener
 import androidx.compose.ui.window.MetalRedrawer
 import kotlin.coroutines.cancellation.CancellationException
@@ -212,8 +212,9 @@ internal class UIKitInstrumentedTest(
     val appDelegate = MockAppDelegate()
     val keyboardHeight: Dp get() =
         KeyboardVisibilityListener.keyboardFrame.useContents { size.height.dp }
-    val screenSize: DpSize get() = screen.bounds().useContents { DpSize(size.width.dp, size.height.dp) }
-    val safeDrawingRect: DpRect get() = screen.bounds().asDpRect().let { rect ->
+    val screenBounds: DpRect get() = screen.bounds().asDpRect()
+    val screenSize: DpSize get() = screenBounds.size
+    val safeDrawingRect: DpRect get() = screenBounds.let { rect ->
         viewController.view.safeAreaInsets.useContents {
             DpRect(
                 left = rect.left + Dp(this.left.toFloat()),