From ec526b388b9ffceeb8e37ebf147af02793811dbc Mon Sep 17 00:00:00 2001 From: Rooney Date: Fri, 12 Jul 2024 15:13:35 -0400 Subject: [PATCH 1/9] Resolve merge conflicts --- .../woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt | 4 +--- .../android/ui/woopos/home/cart/WooPosCartScreen.kt | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt index 64ef22bd31f7..4c25939c9da1 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt @@ -146,12 +146,10 @@ private fun WooPosHomeScreen( ) Spacer(modifier = Modifier.width(16.dp.toAdaptivePadding())) } - Row(modifier = Modifier.width(cartWidthDp)) { - Spacer(modifier = Modifier.width(24.dp.toAdaptivePadding())) Row( modifier = Modifier.width(cartWidthDp).background(MaterialTheme.colors.surface) ) { - Spacer(modifier = Modifier.width(24.dp)) + Spacer(modifier = Modifier.width(24.dp.toAdaptivePadding())) Box { WooPosHomeScreenCart( modifier = Modifier diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt index fc6a18559a84..b83858890308 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt @@ -73,10 +73,8 @@ private fun WooPosCartScreen( modifier = modifier ) { Box( - Modifier.padding(24.dp.toAdaptivePadding()) Modifier - .padding(24.dp).background(MaterialTheme.colors.surface) - + .padding(24.dp.toAdaptivePadding()).background(MaterialTheme.colors.surface) ) { Column { CartToolbar( From 6380fe13d05b5e188d4c7010d564bcd589637bb7 Mon Sep 17 00:00:00 2001 From: Rooney Date: Fri, 12 Jul 2024 16:25:26 -0400 Subject: [PATCH 2/9] Adjust padding --- .../android/ui/woopos/home/cart/WooPosCartScreen.kt | 2 +- .../android/ui/woopos/home/totals/WooPosTotalsScreen.kt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt index b83858890308..7acdc739cf15 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt @@ -74,7 +74,7 @@ private fun WooPosCartScreen( ) { Box( Modifier - .padding(24.dp.toAdaptivePadding()).background(MaterialTheme.colors.surface) + .padding(16.dp.toAdaptivePadding()).background(MaterialTheme.colors.surface) ) { Column { CartToolbar( diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt index faa7026bce4c..5c8083e679a8 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt @@ -54,6 +54,9 @@ private fun WooPosTotalsScreen( ) { when (state) { is WooPosTotalsState.Totals -> { + Modifier + .padding(8.dp.toAdaptivePadding()) + .background(MaterialTheme.colors.surface) TotalsLoaded( state = state, onUIEvent = onUIEvent From d01519f834a9af6ca60b13d0f99c8e846e063f67 Mon Sep 17 00:00:00 2001 From: Rooney Date: Fri, 12 Jul 2024 16:39:25 -0400 Subject: [PATCH 3/9] Fix incorrect conflict merge --- .../android/ui/woopos/home/cart/WooPosCartScreen.kt | 7 ++----- .../android/ui/woopos/home/totals/WooPosTotalsScreen.kt | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt index d7a4eb580400..dcfaa2d5ed1e 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt @@ -70,11 +70,8 @@ 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(16.dp.toAdaptivePadding()).background(MaterialTheme.colors.surface) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt index b896bc1f377e..734537e6a1b0 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt @@ -50,11 +50,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 -> { From 828f920aab4b44b60452b14ed06eb3df85afcd97 Mon Sep 17 00:00:00 2001 From: Rooney Date: Fri, 12 Jul 2024 16:55:04 -0400 Subject: [PATCH 4/9] Reduce padding further --- .../woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt index dcfaa2d5ed1e..3123d0a9437c 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt @@ -74,7 +74,7 @@ private fun WooPosCartScreen( modifier = modifier ) { Box( - Modifier.padding(16.dp.toAdaptivePadding()).background(MaterialTheme.colors.surface) + Modifier.padding(8.dp.toAdaptivePadding()).background(MaterialTheme.colors.surface) ) { Column { CartToolbar( From 546f6594c6bb068bd7e4478e991e2739fac3d1aa Mon Sep 17 00:00:00 2001 From: Rooney Date: Fri, 12 Jul 2024 16:55:25 -0400 Subject: [PATCH 5/9] Detekt --- .../woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt index 3123d0a9437c..9739356f1855 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt @@ -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 From 7d74ca53b579c12c09b29a25bcb8d3c914e3016b Mon Sep 17 00:00:00 2001 From: Rooney Date: Fri, 12 Jul 2024 17:13:42 -0400 Subject: [PATCH 6/9] Fix margin between products and the cart a bit too small. --- .../com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt index b980531e247e..d0d7f86eeef8 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt @@ -141,7 +141,7 @@ 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())) From 4b912adbcabf4166446187c572199ca2193ccdf0 Mon Sep 17 00:00:00 2001 From: Rooney Date: Fri, 12 Jul 2024 17:14:06 -0400 Subject: [PATCH 7/9] Detekt --- .../woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt index d0d7f86eeef8..da22dbaf4ac9 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt @@ -147,8 +147,10 @@ private fun WooPosHomeScreen( Spacer(modifier = Modifier.width(16.dp.toAdaptivePadding())) } Row( - modifier = Modifier.width(cartWidthDp).background(MaterialTheme.colors.surface) - ) { + modifier = Modifier + .width(cartWidthDp) + .background(MaterialTheme.colors.surface) + ) { Spacer(modifier = Modifier.width(24.dp.toAdaptivePadding())) Box { WooPosHomeScreenCart( From 42bc87a7625d476dbaf259c9e2a339b64c0503d5 Mon Sep 17 00:00:00 2001 From: Rooney Date: Fri, 12 Jul 2024 17:18:11 -0400 Subject: [PATCH 8/9] Not needed --- .../android/ui/woopos/home/totals/WooPosTotalsScreen.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt index 734537e6a1b0..e5898ce3ee2f 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt @@ -55,9 +55,6 @@ private fun WooPosTotalsScreen( ) { when (state) { is WooPosTotalsState.Totals -> { - Modifier - .padding(8.dp.toAdaptivePadding()) - .background(MaterialTheme.colors.surface) TotalsLoaded( state = state, onUIEvent = onUIEvent From b950f049e36b989ca7a846ea31ee488145b53e61 Mon Sep 17 00:00:00 2001 From: Rooney Date: Fri, 12 Jul 2024 17:18:26 -0400 Subject: [PATCH 9/9] Detekt --- .../android/ui/woopos/home/totals/WooPosTotalsScreen.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt index e5898ce3ee2f..faa7026bce4c 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt @@ -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