From 6dfdce109788f7da47d23e312416c6e81ca49e16 Mon Sep 17 00:00:00 2001
From: Sungyong An <sungyong.an@webtoonscorp.com>
Date: Mon, 30 Dec 2024 02:25:03 +0900
Subject: [PATCH] Fix edge-to-edge

---
 .../soup/movie/feature/search/impl/SearchScreen.kt     | 10 +++++++---
 .../movie/feature/settings/impl/SettingsNavGraph.kt    |  3 ---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/feature/search/impl/src/main/java/soup/movie/feature/search/impl/SearchScreen.kt b/feature/search/impl/src/main/java/soup/movie/feature/search/impl/SearchScreen.kt
index 71a12b31..29c6446b 100644
--- a/feature/search/impl/src/main/java/soup/movie/feature/search/impl/SearchScreen.kt
+++ b/feature/search/impl/src/main/java/soup/movie/feature/search/impl/SearchScreen.kt
@@ -16,13 +16,15 @@
 package soup.movie.feature.search.impl
 
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
@@ -32,6 +34,7 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -68,7 +71,6 @@ fun SearchScreen(
     val uiModel by viewModel.uiModel.collectAsState()
 
     Scaffold(
-        modifier = Modifier.systemBarsPadding(),
         topBar = {
             SearchTopBar(
                 upPress = upPress,
@@ -108,15 +110,17 @@ fun SearchScreen(
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun SearchTopBar(
     upPress: () -> Unit,
     query: String,
     onQueryChanged: (String) -> Unit,
     modifier: Modifier = Modifier,
+    windowInsets: WindowInsets = TopAppBarDefaults.windowInsets,
 ) {
     Surface(
-        modifier = modifier
+        modifier = modifier.windowInsetsPadding(windowInsets)
             .fillMaxWidth()
             .height(56.dp),
         color = MovieTheme.colorScheme.primary,
diff --git a/feature/settings/impl/src/main/java/soup/movie/feature/settings/impl/SettingsNavGraph.kt b/feature/settings/impl/src/main/java/soup/movie/feature/settings/impl/SettingsNavGraph.kt
index e41f7eb5..8b3b7ce0 100644
--- a/feature/settings/impl/src/main/java/soup/movie/feature/settings/impl/SettingsNavGraph.kt
+++ b/feature/settings/impl/src/main/java/soup/movie/feature/settings/impl/SettingsNavGraph.kt
@@ -15,9 +15,7 @@
  */
 package soup.movie.feature.settings.impl
 
-import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -49,7 +47,6 @@ fun SettingsNavGraph() {
         exitTransition = { materialSharedAxisZOut(forward = true) },
         popEnterTransition = { materialSharedAxisZIn(forward = false) },
         popExitTransition = { materialSharedAxisZOut(forward = false) },
-        modifier = Modifier.systemBarsPadding(),
     ) {
         composable<SettingsScreen.Home> {
             val viewModel = hiltViewModel<SettingsViewModel>()