Rewrite Inset Handling

app/src/main/kotlin/com/imashnake/animite/features/MainActivity.kt

@@ -50,11 +50,6 @@ class MainActivity : ComponentActivity() {
 
         enableEdgeToEdge()
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            window.attributes.layoutInDisplayCutoutMode =
-                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
-        }
-
         setContent {
             AnimiteTheme {
                 MainScreen(

app/src/main/kotlin/com/imashnake/animite/features/home/HomeScreen.kt

@@ -16,13 +16,19 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.calculateEndPadding
+import androidx.compose.foundation.layout.calculateStartPadding
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.requiredWidth
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
@@ -53,6 +59,7 @@ import androidx.compose.ui.graphics.ShaderBrush
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -66,8 +73,8 @@ import com.imashnake.animite.api.anilist.sanitize.media.Media
 import com.imashnake.animite.api.anilist.sanitize.media.MediaList
 import com.imashnake.animite.api.anilist.type.MediaType
 import com.imashnake.animite.core.data.Resource
+import com.imashnake.animite.core.extensions.Paddings
 import com.imashnake.animite.core.extensions.bannerParallax
-import com.imashnake.animite.core.extensions.landscapeCutoutPadding
 import com.imashnake.animite.core.extensions.thenIf
 import com.imashnake.animite.core.ui.LocalPaddings
 import com.imashnake.animite.core.ui.MediaCard
@@ -93,7 +100,10 @@ fun HomeScreen(
     sharedTransitionScope: SharedTransitionScope,
     animatedVisibilityScope: AnimatedVisibilityScope,
     viewModel: HomeViewModel = hiltViewModel(),
+    contentWindowInsets: WindowInsets = WindowInsets.safeDrawing,
 ) {
+    val insetPaddingValues = contentWindowInsets.asPaddingValues()
+
     val homeMediaType = rememberSaveable { mutableStateOf(MediaType.ANIME) }
     viewModel.setMediaType(homeMediaType.value)
 
@@ -126,11 +136,7 @@ fun HomeScreen(
         rows.all { it is Resource.Success } -> {
             val scrollState = rememberScrollState()
             TranslucentStatusBarLayout(scrollState) {
-                Box(
-                    modifier = Modifier
-                        .verticalScroll(scrollState)
-                        .navigationBarsPadding()
-                ) {
+                Box(Modifier.verticalScroll(scrollState)) {
                     BannerLayout(
                         banner = { bannerModifier ->
                             Box {
@@ -143,29 +149,39 @@ fun HomeScreen(
                                 )
 
                                 Row(
-                                    modifier = bannerModifier.thenIf(shader != null) {
-                                        drawWithCache @SuppressLint("NewApi") {
-                                            shader!!.run {
-                                                setFloatUniform(
-                                                    "resolution",
-                                                    size.width,
-                                                    size.height
-                                                )
-                                                setFloatUniform("time", time.floatValue)
-                                                setColorUniform(
-                                                    "orb",
-                                                    Color(0xFF6C408D).toArgb()
-                                                )
-                                                setColorUniform(
-                                                    "bg",
-                                                    android.graphics.Color.TRANSPARENT
-                                                )
-                                                onDrawBehind {
-                                                    drawRect(ShaderBrush(this@run))
+                                    modifier = bannerModifier
+                                        .thenIf(shader != null) {
+                                            drawWithCache @SuppressLint("NewApi") {
+                                                shader!!.run {
+                                                    setFloatUniform(
+                                                        "resolution",
+                                                        size.width,
+                                                        size.height
+                                                    )
+                                                    setFloatUniform("time", time.floatValue)
+                                                    setColorUniform(
+                                                        "orb",
+                                                        Color(0xFF6C408D).toArgb()
+                                                    )
+                                                    setColorUniform(
+                                                        "bg",
+                                                        android.graphics.Color.TRANSPARENT
+                                                    )
+                                                    onDrawBehind {
+                                                        drawRect(ShaderBrush(this@run))
+                                                    }
                                                 }
                                             }
                                         }
-                                    },
+                                        .padding(
+                                            horizontal = LocalPaddings.current.large,
+                                            vertical = LocalPaddings.current.medium
+                                        )
+                                        .padding(
+                                            start = insetPaddingValues.calculateStartPadding(LocalLayoutDirection.current),
+                                            top = insetPaddingValues.calculateTopPadding(),
+                                            end = insetPaddingValues.calculateEndPadding(LocalLayoutDirection.current),
+                                        ),
                                     horizontalArrangement = Arrangement.SpaceBetween,
                                     verticalAlignment = Alignment.Bottom,
                                 ) {
@@ -177,22 +193,11 @@ fun HomeScreen(
                                         } ?: MaterialTheme.colorScheme.secondaryContainer,
                                         style = MaterialTheme.typography.displayMedium,
                                         modifier = Modifier
-                                            .padding(
-                                                start = LocalPaddings.current.large,
-                                                bottom = LocalPaddings.current.medium
-                                            )
-                                            .landscapeCutoutPadding()
                                             .weight(1f, fill = false),
                                         maxLines = 1
                                     )
 
                                     MediaTypeSelector(
-                                        modifier = Modifier
-                                            .padding(
-                                                end = LocalPaddings.current.large,
-                                                bottom = LocalPaddings.current.medium
-                                            )
-                                            .landscapeCutoutPadding(),
                                         selectedOption = homeMediaType,
                                         viewModel = viewModel
                                     )
@@ -210,58 +215,68 @@ fun HomeScreen(
                                         },
                                         label = "animate_home_row"
                                     ) { mediaList ->
-                                        if (mediaList.list.isNotEmpty())
+                                        if (mediaList.list.isNotEmpty()) {
                                             HomeRow(
-                                                list = mediaList.list,
+                                                items = mediaList.list,
                                                 type = mediaList.type,
                                                 onItemClicked = { media ->
                                                     onNavigateToMediaItem(
                                                         MediaPage(
                                                             id = media.id,
-                                                            // TODO: We can use the list's index instead.
                                                             source = mediaList.type.name,
                                                             mediaType = homeMediaType.value.rawValue,
                                                         )
                                                     )
                                                 },
                                                 sharedTransitionScope = sharedTransitionScope,
                                                 animatedVisibilityScope = animatedVisibilityScope,
-                                                modifier = Modifier.padding(
-                                                    vertical = LocalPaddings.current.large / 2
+                                                contentPadding = Paddings(
+                                                    horizontal = LocalPaddings.current.large,
+                                                    vertical = LocalPaddings.current.large / 2,
+                                                ) + Paddings(
+                                                    start = insetPaddingValues.calculateStartPadding(LocalLayoutDirection.current),
+                                                    end = insetPaddingValues.calculateEndPadding(LocalLayoutDirection.current),
                                                 )
                                             )
-                                        else
-                                            /* With this, AnimatedContent shrinks/expands the
-                                            `HomeRow` vertically. */
+                                        } else {
                                             Box(Modifier.fillMaxWidth())
+                                        }
                                     }
                                 }
                             }
                         },
-                        contentModifier = Modifier.padding(
-                            top = LocalPaddings.current.large / 2,
-                            bottom = LocalPaddings.current.large / 2 +
-                                    dimensionResource(navigationR.dimen.navigation_bar_height)
-                        ),
+                        contentModifier = Modifier
+                            .padding(
+                                top = LocalPaddings.current.large / 2,
+                                bottom = LocalPaddings.current.large / 2 +
+                                        dimensionResource(navigationR.dimen.navigation_bar_height)
+                            )
+                            .navigationBarsPadding(),
                         verticalArrangement = Arrangement.spacedBy(0.dp)
                     )
                 }
             }
         }
-        else -> ProgressIndicatorScreen()
+        else -> ProgressIndicatorScreen(Modifier.padding(insetPaddingValues))
     }
 }
 
 @Composable
 fun HomeRow(
-    list: List<Media.Small>,
+    items: List<Media.Small>,
     type: MediaList.Type,
     onItemClicked: (Media.Small) -> Unit,
     sharedTransitionScope: SharedTransitionScope,
     animatedVisibilityScope: AnimatedVisibilityScope,
     modifier: Modifier = Modifier,
+    contentPadding: PaddingValues = PaddingValues()
 ) {
-    MediaSmallRow(type.title, list, modifier) { media ->
+    MediaSmallRow(
+        title = type.title,
+        mediaList = items,
+        modifier = modifier,
+        contentPadding = contentPadding,
+    ) { media ->
         with(sharedTransitionScope) {
             MediaCard(
                 image = media.coverImage,

app/src/main/kotlin/com/imashnake/animite/features/searchbar/SearchFab.kt

@@ -36,7 +36,6 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.unit.dp
 import com.imashnake.animite.R
 
 /**

app/src/main/kotlin/com/imashnake/animite/features/searchbar/SearchFrontDrop.kt

@@ -7,21 +7,24 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.PaddingValues
 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.calculateEndPadding
+import androidx.compose.foundation.layout.calculateStartPadding
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imeNestedScroll
 import androidx.compose.foundation.layout.imePadding
-import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.MaterialTheme
@@ -35,6 +38,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
@@ -45,7 +49,7 @@ import com.imashnake.animite.R
 import com.imashnake.animite.api.anilist.sanitize.search.Search
 import com.imashnake.animite.api.anilist.type.MediaType
 import com.imashnake.animite.core.Constants
-import com.imashnake.animite.core.extensions.landscapeCutoutPadding
+import com.imashnake.animite.core.extensions.Paddings
 import com.imashnake.animite.core.ui.LocalPaddings
 import com.imashnake.animite.core.ui.MediaCard
 import com.imashnake.animite.core.R as coreR
@@ -60,19 +64,23 @@ import com.imashnake.animite.navigation.R as navigationR
  * @param modifier the [Modifier] to be applied to this Front Drop.
  * @param viewModel [SearchViewModel] instance.
  */
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun SearchFrontDrop(
     hasExtraPadding: Boolean,
     onItemClick: (Int, MediaType) -> Unit,
     modifier: Modifier = Modifier,
+    contentWindowInsets: WindowInsets = WindowInsets.safeDrawing,
     viewModel: SearchViewModel = viewModel()
 ) {
+    val insetPaddingValues = contentWindowInsets.asPaddingValues()
+
     val searchMediaType = MediaType.ANIME
     viewModel.setMediaType(searchMediaType)
     val searchList by viewModel.searchList.collectAsState()
 
     var isExpanded by rememberSaveable { mutableStateOf(false) }
-    val searchBarBottomPadding: Dp by animateDpAsState(
+    val searchBarBottomPadding by animateDpAsState(
         targetValue = if (hasExtraPadding) {
             dimensionResource(navigationR.dimen.navigation_bar_height)
         } else 0.dp,
@@ -95,10 +103,9 @@ fun SearchFrontDrop(
     searchList.data?.let {
         SearchList(
             searchList = it,
-            modifier = Modifier
-                // TODO: Add this back; https://issuetracker.google.com/issues/323708850.
-                //.imeNestedScroll()
-                .landscapeCutoutPadding(),
+            modifier = Modifier.imeNestedScroll(),
+            contentPadding = insetPaddingValues,
+            searchBarBottomPadding = searchBarBottomPadding,
             onItemClick = { id ->
                 isExpanded = false
                 viewModel.setQuery(null)
@@ -112,7 +119,11 @@ fun SearchFrontDrop(
         setExpanded = { isExpanded = it },
         onSearched = viewModel::setQuery,
         modifier = modifier
-            .landscapeCutoutPadding()
+            .padding(
+                start = insetPaddingValues.calculateStartPadding(LocalLayoutDirection.current),
+                top = insetPaddingValues.calculateTopPadding(),
+                end = insetPaddingValues.calculateEndPadding(LocalLayoutDirection.current)
+            )
             .padding(bottom = searchBarBottomPadding)
             .navigationBarsPadding()
             .consumeWindowInsets(PaddingValues(bottom = searchBarBottomPadding))
@@ -124,21 +135,26 @@ fun SearchFrontDrop(
 @Composable
 fun SearchList(
     searchList: List<Search>,
+    searchBarBottomPadding: Dp,
+    onItemClick: (Int) -> Unit,
     modifier: Modifier = Modifier,
-    onItemClick: (Int) -> Unit
+    contentPadding: PaddingValues = PaddingValues(),
 ) {
     LazyColumn(
-        modifier = modifier,
-        contentPadding = PaddingValues(
-            start = LocalPaddings.current.large,
-            end = LocalPaddings.current.large,
-            top = LocalPaddings.current.large
-                    + WindowInsets.statusBars.asPaddingValues().calculateTopPadding(),
-            bottom = dimensionResource(R.dimen.search_bar_height)
-                    + LocalPaddings.current.large
-                    + LocalPaddings.current.large
-                    + dimensionResource(navigationR.dimen.navigation_bar_height)
-                    + WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding()
+        modifier = modifier
+            .padding(bottom = searchBarBottomPadding)
+            .navigationBarsPadding()
+            .consumeWindowInsets(PaddingValues(bottom = searchBarBottomPadding))
+            .imePadding(),
+        contentPadding = Paddings(
+            all = LocalPaddings.current.large
+        ) + Paddings(
+            bottom = LocalPaddings.current.large +
+                    dimensionResource(R.dimen.search_bar_height)
+        ) + Paddings(
+            start = contentPadding.calculateStartPadding(LocalLayoutDirection.current),
+            top = contentPadding.calculateTopPadding(),
+            end = contentPadding.calculateEndPadding(LocalLayoutDirection.current),
         ),
         verticalArrangement = Arrangement.spacedBy(LocalPaddings.current.small)
     ) {