Skip to content

[Woo POS] Small updates to checkout screen per M2 Design #11892

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
backwardstruck merged 13 commits into from
Jul 15, 2024
Merged

[Woo POS] Small updates to checkout screen per M2 Design #11892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
62dc92f
Merge branch 'trunk' into 11861-woo-pos-add-compose-card-under-cart-a…
backwardstruck Jul 12, 2024
ec526b3
Resolve merge conflicts
backwardstruck Jul 12, 2024
6380fe1
Adjust padding
backwardstruck Jul 12, 2024
f98b030
Merge branch 'trunk' into 11861-woo-pos-add-compose-card-under-cart-a…
backwardstruck Jul 12, 2024
d01519f
Fix incorrect conflict merge
backwardstruck Jul 12, 2024
828f920
Reduce padding further
backwardstruck Jul 12, 2024
546f659
Detekt
backwardstruck Jul 12, 2024
7d74ca5
Fix margin between products and the cart a bit too small.
backwardstruck Jul 12, 2024
4b912ad
Detekt
backwardstruck Jul 12, 2024
42bc87a
Not needed
backwardstruck Jul 12, 2024
b950f04
Detekt
backwardstruck Jul 12, 2024
cbf4362
Merge branch 'trunk' into 11861-woo-pos-add-compose-card-under-cart-a…
backwardstruck Jul 14, 2024
cc8dc7c
Merge branch 'trunk' into 11861-woo-pos-add-compose-card-under-cart-a…
kidinov Jul 15, 2024
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
8 changes: 6 additions & 2 deletions WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,16 @@ private fun WooPosHomeScreen(
Spacer(modifier = Modifier.width(40.dp.toAdaptivePadding()))
WooPosHomeScreenProducts(
modifier = Modifier
.width(productsWidthDp - 56.dp.toAdaptivePadding())
.width(productsWidthDp - 80.dp.toAdaptivePadding())
.padding(top = 36.dp.toAdaptivePadding())
)
Spacer(modifier = Modifier.width(16.dp.toAdaptivePadding()))
}
Row(modifier = Modifier.width(cartWidthDp)) {
Row(
modifier = Modifier
.width(cartWidthDp)
.background(MaterialTheme.colors.surface)
) {
Spacer(modifier = Modifier.width(24.dp.toAdaptivePadding()))
Box {
WooPosHomeScreenCart(
Expand Down
10 changes: 3 additions & 7 deletions WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Card
import androidx.compose.material.Icon
import androidx.compose.material.IconButton
import androidx.compose.material.MaterialTheme
Expand Down Expand Up @@ -70,14 +69,11 @@ private fun WooPosCartScreen(
state: WooPosCartState,
onUIEvent: (WooPosCartUIEvent) -> Unit
) {
Card(
modifier = modifier,
shape = RoundedCornerShape(16.dp),
backgroundColor = MaterialTheme.colors.surface,
elevation = 4.dp
Column(
modifier = modifier
) {
Box(
Modifier.padding(24.dp.toAdaptivePadding())
Modifier.padding(8.dp.toAdaptivePadding()).background(MaterialTheme.colors.surface)
) {
Column {
CartToolbar(
Expand Down
8 changes: 2 additions & 6 deletions ...merce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.Card
import androidx.compose.material.Divider
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
Expand Down Expand Up @@ -50,11 +49,8 @@ private fun WooPosTotalsScreen(
state: WooPosTotalsState,
onUIEvent: (WooPosTotalsUIEvent) -> Unit
) {
Card(
modifier = modifier,
shape = RoundedCornerShape(16.dp),
backgroundColor = MaterialTheme.colors.surface,
elevation = 4.dp
Column(
modifier = modifier
) {
when (state) {
is WooPosTotalsState.Totals -> {
Expand Down