Fix window insets to avoid overlapping display cutouts and system bars #1006
Conversation
| .asPaddingValues() | ||
| .calculateEndPadding(layoutDirection), | ||
| ), | ||
| modifier = Modifier.fillMaxSize(), |
| @@ -131,6 +133,11 @@ fun EventMapScreen( | |||
| AnimatedTextTopAppBar( | |||
| title = stringResource(EventMapRes.string.eventmap), | |||
| scrollBehavior = scrollBehavior, | |||
| windowInsets = WindowInsets( | |||
| left = contentPadding.calculateLeftPadding(layoutDirection), | |||
There was a problem hiding this comment.
Thank you for the amazing PR! I'll merge it regardless. However, could you explain why the window insets of each screen's AnimatedTextTopAppBar are different?
There was a problem hiding this comment.
@takahirom
I gave this window insets to avoid display cutouts and system bars, since default value TopAppBarDefaults.windowInsets only avoids system bars.
There was a problem hiding this comment.
Thanks for your explain. How about making a function like this? And can you resolve the conflict with the main branch?
windowInsets = AnimatedTextTopAppBarDefaults.windowInsets(contentPadding),object AnimatedTextTopAppBarDefaults {
@Composable
fun windowInsets(contentPadding: PaddingValues): WindowInsets {
val layoutDirection = LocalLayoutDirection.current
return WindowInsets(
left = contentPadding.calculateLeftPadding(layoutDirection),
top = contentPadding.calculateTopPadding(),
right = contentPadding.calculateRightPadding(layoutDirection),
)
}
}There was a problem hiding this comment.
Yes of course!
There was a problem hiding this comment.
@takahirom
I realized I didn't need to use content padding for window insets of top app bars.
I'll make default windowInsets like below for each top app bars instead.
object HogeTopAppBarDefaults {
val windowInsets = WindowInsets.displayCutout.union(WindowInsets.systemBars).only(
WindowInsetsSides.Horizontal + WindowInsetsSides.Top,
)
}
…_screen_padding # Conflicts: # feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched/contributors/ContributorsScreen.kt # feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/MainScreen.kt # feature/sponsors/src/commonMain/kotlin/io/github/droidkaigi/confsched/sponsors/SponsorsScreen.kt # feature/staff/src/commonMain/kotlin/io/github/droidkaigi/confsched/staff/StaffScreen.kt
github-actions
bot
temporarily deployed
to
deploygate-distribution
![TimetableItemDetailScreenTest.runTest[TimetableItemDetailScreen - when server is operational - when launch - it should be appropriately accessible]_compare.png](https://github.com/DroidKaigi/conference-app-2024/blob/companion_fix/landscape_3_button_navigation_screen_padding/./screenshot-diff-reports/feature/sessions/build/outputs/roborazzi/TimetableItemDetailScreenTest.runTest%5BTimetableItemDetailScreen%20-%20when%20server%20is%20operational%20-%20when%20launch%20-%20it%20should%20be%20appropriately%20accessible%5D_compare.png){kind=link}
|
Detekt check failed. Please run |
github-actions
bot
temporarily deployed
to
deploygate-distribution
github-actions
bot
temporarily deployed
to
deploygate-distribution
|
@norihirosunada Sorry for keeping you disturbed, but could you resolve the conflict? 🙇 |
…_screen_padding # Conflicts: # feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/MainScreen.kt
github-actions
bot
temporarily deployed
to
deploygate-distribution
|
@takahirom |
|
Let's merge! (Sorry, I've just released. I'm not sure if I can release this by time) |
|
Anyway Thank you for your contribution! |
Issue
Overview (Required)
Screenshot (Optional if screenshot test is present or unrelated to UI)