Skip to content

[Woo POS] Fix status bar height handling in Orders Loading and Order Details screen #15023

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

Open
wants to merge 6 commits into
base: trunk
Choose a base branch
from
+50 −28
Open

[Woo POS] Fix status bar height handling in Orders Loading and Order Details screen #15023

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ba47b40
Update layout/spacing in WooPosOrdersLoadingState
samiuelson Nov 26, 2025
7c01df7
Update WooPosOrdersDetails layout with status bar padding and toolbar…
samiuelson Nov 26, 2025
bc88530
Rename WooPosOrdersLoadingState to WooPosOrdersLoadingScreen
samiuelson Nov 26, 2025
11b9108
Satisfy detekt's complaints
samiuelson Nov 26, 2025
671c8c7
Apply statusBarsPadding to the main Box in WooPosOrdersScreen and rem…
samiuelson Nov 27, 2025
92be6f7
Fix status bar insets in WooPos Orders screens
samiuelson Nov 27, 2025
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 WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersDetails.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
Expand Down Expand Up @@ -49,11 +50,13 @@ fun WooPosOrderDetails(
.padding(
start = WooPosSpacing.Medium.value,
end = WooPosSpacing.Medium.value,
top = WooPosSpacing.XLarge.value,
bottom = WooPosSpacing.XLarge.value
)
) {
Row {
Row(
modifier = Modifier.heightIn(min = WOO_POS_ORDERS_TOOLBAR_HEIGHT),
verticalAlignment = Alignment.CenterVertically
) {
WooPosText(
text = details.number,
style = WooPosTypography.Heading,
Expand Down
10 changes: 5 additions & 5 deletions ...woopos/orders/WooPosOrdersLoadingState.kt → ...oopos/orders/WooPosOrdersLoadingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,21 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosThe
import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography

@Composable
fun WooPosOrdersLoadingState() {
fun WooPosOrdersLoadingScreen() {
Row(modifier = Modifier.fillMaxSize()) {
WooPosOrdersListLoadingPane(
modifier = Modifier
.weight(0.3f)
.fillMaxHeight()
.background(MaterialTheme.colorScheme.surfaceBright)
.padding(top = WOO_POS_ORDERS_TOOLBAR_HEIGHT)
.padding(top = WooPosSpacing.XLarge.value)
)

OrderDetailsLoadingPane(
modifier = Modifier
.weight(0.7f)
.fillMaxHeight()
.background(MaterialTheme.colorScheme.surface)
.padding(top = WooPosSpacing.Large.value)
)
}
}
Expand Down Expand Up @@ -127,14 +125,16 @@ private fun OrderDetailsLoadingPane(modifier: Modifier = Modifier) {
Column(
modifier = modifier
.fillMaxSize()
.padding(WooPosSpacing.Medium.value)
.padding(horizontal = WooPosSpacing.Medium.value)
) {
Row(
modifier = Modifier
.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween
) {
Column {
Spacer(modifier = Modifier.height(WooPosSpacing.Small.value))

WooPosShimmerText(
text = "Order #123",
style = WooPosTypography.Heading.style,
Expand Down Expand Up @@ -301,6 +301,6 @@ private fun TotalLoadingItem() {
@Composable
fun WooPosOrdersLoadingStatePreview() {
WooPosTheme {
WooPosOrdersLoadingState()
WooPosOrdersLoadingScreen()
}
}
12 changes: 7 additions & 5 deletions WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,11 @@ private fun WooPosOrdersScreen(
) {
BackHandler { onBackClicked() }

Box(modifier = Modifier.fillMaxSize()) {
Box(
modifier = Modifier
.fillMaxSize()
.statusBarsPadding()
) {
when (state) {
is WooPosOrdersState.Content -> OrdersContent(
state = state,
Expand All @@ -152,7 +156,7 @@ private fun WooPosOrdersScreen(
onRetryClicked = onOrdersLoadingErrorRetryButtonClicked
)

is WooPosOrdersState.Loading -> WooPosOrdersLoadingState()
is WooPosOrdersState.Loading -> WooPosOrdersLoadingScreen()
}

if (state.searchInputState is WooPosSearchInputState.Closed) {
Expand Down Expand Up @@ -234,9 +238,7 @@ private fun OrdersListPane(
state = state.searchInputState,
searchIconBackgroundColor = MaterialTheme.colorScheme.surface,
onEvent = onSearchEvent,
modifier = Modifier
.statusBarsPadding()
.align(Alignment.CenterEnd)
modifier = Modifier.align(Alignment.CenterEnd)
)
}

Expand Down