Skip to content

Edge to edge fix #3616

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
domonkosadam merged 4 commits into from
Apr 22, 2026
Merged

Edge to edge fix #3616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2f5f16
Edge to edge fix
domonkosadam Apr 1, 2026
84aa95d
Merge branch 'master' into Edge-to-edge-fix
domonkosadam Apr 22, 2026
4ada9dc
Fix horizontal padding handling
domonkosadam Apr 22, 2026
259935f
Trigger CI
domonkosadam Apr 22, 2026
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
7 changes: 5 additions & 2 deletions ...rc/main/java/com/instructure/horizon/horizonui/organisms/scaffolds/CollapsableScaffold.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@ package com.instructure.horizon.horizonui.organisms.scaffolds
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.WindowInsetsSides
import androidx.compose.foundation.layout.add
import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.ime
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.only
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.FabPosition
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -122,7 +125,7 @@ private fun CollapsableHeaderScreenContent(
}
}
) {
headerContent(statusBarWindowInsets.asPaddingValues())
headerContent(statusBarWindowInsets.add(navigationBarWindowInsets.only(WindowInsetsSides.Horizontal)).asPaddingValues())
}
val headerHeight = max(
with(density) { statusBarWindowInsets.getTop(density).toDp() },
Expand Down Expand Up @@ -259,7 +262,7 @@ private fun CollapsableScaffoldContent(
}
}
) {
topBar(statusBarWindowInsets.asPaddingValues())
topBar(statusBarWindowInsets.add(navigationBarWindowInsets.only(WindowInsetsSides.Horizontal)).asPaddingValues())
}
},
bottomBar = {
Expand Down
8 changes: 3 additions & 5 deletions ...src/main/java/com/instructure/horizon/horizonui/organisms/scaffolds/EdgeToEdgeScaffold.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@
package com.instructure.horizon.horizonui.organisms.scaffolds

import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.add
import androidx.compose.foundation.layout.ime
import androidx.compose.foundation.layout.union
import androidx.compose.foundation.layout.imePadding
import androidx.compose.material3.FabPosition
import androidx.compose.material3.Scaffold
import androidx.compose.material3.contentColorFor
Expand Down Expand Up @@ -52,15 +50,15 @@ fun EdgeToEdgeScaffold(
navigationBarAlpha = navigationBarAlpha
) { statusBarWindowInsets, navigationBarWindowInsets ->
Scaffold(
modifier = modifier,
modifier = modifier.imePadding(),
topBar = topBar,
bottomBar = bottomBar,
snackbarHost = snackbarHost,
floatingActionButton = floatingActionButton,
floatingActionButtonPosition = floatingActionButtonPosition,
containerColor = containerColor,
contentColor = contentColor,
contentWindowInsets = statusBarWindowInsets.union(navigationBarWindowInsets).union(WindowInsets.ime),
contentWindowInsets = statusBarWindowInsets.add(navigationBarWindowInsets),
content = content
)
}
Expand Down
7 changes: 2 additions & 5 deletions libs/horizon/src/main/java/com/instructure/horizon/util/HorizonEdgeToEdgeHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import androidx.compose.foundation.layout.only
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.safeDrawing
import androidx.compose.foundation.layout.statusBars
import androidx.compose.foundation.layout.union
import androidx.compose.foundation.layout.windowInsetsBottomHeight
import androidx.compose.foundation.layout.windowInsetsEndWidth
import androidx.compose.foundation.layout.windowInsetsStartWidth
Expand Down Expand Up @@ -60,11 +59,9 @@ fun HorizonEdgeToEdgeSystemBars(
content: @Composable (statusBarWindowInsets: WindowInsets, navigationBarWindowInsets: WindowInsets) -> Unit
) {
val statusBarWindowsInsets = if (statusBarColor != null) {
WindowInsets.statusBars.union(
WindowInsets.navigationBars.only(WindowInsetsSides.Horizontal)
)
WindowInsets.statusBars
} else {
WindowInsets.navigationBars.only(WindowInsetsSides.Horizontal)
WindowInsets.zeroScreenInsets
}

val navigationBarWindowsInsets = if (navigationBarColor != null) {
Expand Down
Loading