Skip to content

Fix edge-to-edge #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fornewid merged 1 commit into from
Dec 30, 2024
+7 −6
Merged

Fix edge-to-edge #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions feature/search/impl/src/main/java/soup/movie/feature/search/impl/SearchScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -68,7 +71,6 @@ fun SearchScreen(
val uiModel by viewModel.uiModel.collectAsState()

Scaffold(
modifier = Modifier.systemBarsPadding(),
topBar = {
SearchTopBar(
upPress = upPress,
Expand Down Expand Up @@ -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,
Expand Down
3 changes: 0 additions & 3 deletions feature/settings/impl/src/main/java/soup/movie/feature/settings/impl/SettingsNavGraph.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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>()
Expand Down
Loading