Merge pull request #1299 from utkarshdalal/remove-status-bar

Made layouts for appscreen and libraryscreen cutout/notch aware

Author: utkarshdalal

app/src/main/java/app/gamenative/ui/screen/library/LibraryAppScreen.kt

@@ -23,13 +23,20 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.relocation.BringIntoViewRequester
 import androidx.compose.foundation.relocation.bringIntoViewRequester
 import androidx.compose.foundation.rememberScrollState
@@ -739,12 +746,23 @@ internal fun AppScreenContent(
                         ),
                 )
 
-                // Back button (top left)
+                // Back button (top left).
+                // The hero image is intentionally drawn full-bleed through the status bar
+                // and any display cutout (notch / hole-punch / side cutout). The button
+                // itself, however, has to stay tappable, so it's pushed inwards by whichever
+                // is larger of the status bar inset or the cutout inset on each affected
+                // edge before the visual 16dp padding is applied.
                 ActionIconButton(
                     icon = Icons.AutoMirrored.Filled.ArrowBack,
                     contentDescription = stringResource(R.string.back),
                     onClick = onBack,
-                    modifier = Modifier.padding(16.dp),
+                    modifier = Modifier
+                        .windowInsetsPadding(
+                            WindowInsets.statusBars
+                                .union(WindowInsets.displayCutout)
+                                .only(WindowInsetsSides.Top + WindowInsetsSides.Horizontal),
+                        )
+                        .padding(16.dp),
                 )
 
                 // Bottom overlay with title and action bar

app/src/main/java/app/gamenative/ui/screen/library/LibraryScreen.kt

@@ -15,11 +15,16 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.displayCutoutPadding
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.union
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -459,17 +464,25 @@ private fun LibraryScreenContent(
     }
 
 
-    // Apply top padding differently for list vs game detail pages.
-    // On the game page we want to hide the top padding when the status bar is hidden.
-    val safePaddingModifier = if (selectedLibraryItem != null) {
-        // Detail (game) page: use actual status bar height when status bar is visible,
-        // or 0.dp when status bar is hidden
-        val topPadding = if (PrefManager.hideStatusBarWhenNotInGame) {
-            0.dp
-        } else {
-            WindowInsets.statusBars.asPaddingValues().calculateTopPadding()
-        }
-        Modifier.padding(top = topPadding)
+    // Padding for the library *list* view (tab bar, grid, search bar) so content
+    // never draws behind the display cutout. The window now opts in to
+    // LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES via Theme.Pluvia, so:
+    //   * Status bar visible (portrait):   statusBars insets already cover the top notch.
+    //   * Status bar hidden (portrait):    statusBars insets are 0; displayCutout supplies
+    //                                       the notch height so content isn't behind the notch.
+    //   * Landscape (cutout on a side):    statusBars is top-only; displayCutout supplies
+    //                                       the side inset so the tab bar isn't clipped.
+    // Bottom is intentionally excluded so scroll content can reach the bottom edge.
+    //
+    // The detail (game) page deliberately does NOT use this — the hero image is meant
+    // to bleed through the cutout, so AppScreenContent insets only the elements that
+    // need to stay tappable (e.g. the back button) instead.
+    val safePaddingModifier = if (selectedLibraryItem == null) {
+        Modifier.windowInsetsPadding(
+            WindowInsets.statusBars
+                .union(WindowInsets.displayCutout)
+                .only(WindowInsetsSides.Top + WindowInsetsSides.Horizontal),
+        )
     } else {
         Modifier
     }

app/src/main/res/values/themes.xml

@@ -5,5 +5,6 @@
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
 </resources>