From ccae9e393a5e3890814b5462f5b88fdc8ed3994f Mon Sep 17 00:00:00 2001 From: malinajirka Date: Sat, 3 May 2025 08:29:28 +0200 Subject: [PATCH 1/3] Remove unnecessary Box in ProductInfo --- .../android/ui/woopos/home/items/WooPosItemsList.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt index a1ccbeb7475..36adcd9eccd 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt @@ -223,9 +223,7 @@ fun WooPosProductCard( Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value)) - Box(modifier = Modifier.weight(1f)) { - ProductInfo(item) - } + ProductInfo(modifier = Modifier.weight(1f), item = item) if (item is Product.Variable) { Image( @@ -242,9 +240,9 @@ fun WooPosProductCard( } @Composable -private fun ProductInfo(item: Product) { +private fun ProductInfo(modifier: Modifier, item: Product) { Column( - modifier = Modifier + modifier = modifier .fillMaxHeight() .padding( top = WooPosSpacing.Medium.value, From 654f279dc28a6a3f491af4a2460cc62d012ced76 Mon Sep 17 00:00:00 2001 From: malinajirka Date: Sat, 3 May 2025 08:30:06 +0200 Subject: [PATCH 2/3] Update variable product chevron --- .../android/ui/woopos/home/items/WooPosItemsList.kt | 4 ++-- WooCommerce/src/main/res/drawable/ic_chevron.xml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt index 36adcd9eccd..da60ea791b9 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt @@ -228,8 +228,8 @@ fun WooPosProductCard( if (item is Product.Variable) { Image( modifier = Modifier - .size(32.dp) - .padding(end = WooPosSpacing.XLarge.value), + .padding(end = WooPosSpacing.XLarge.value) + .size(32.dp), imageVector = ImageVector.vectorResource(id = R.drawable.ic_chevron), contentDescription = null, colorFilter = ColorFilter.tint(WooPosTheme.colors.onSurfaceVariantHighest), diff --git a/WooCommerce/src/main/res/drawable/ic_chevron.xml b/WooCommerce/src/main/res/drawable/ic_chevron.xml index 2b9e0230014..17a9d3a6f38 100644 --- a/WooCommerce/src/main/res/drawable/ic_chevron.xml +++ b/WooCommerce/src/main/res/drawable/ic_chevron.xml @@ -1,9 +1,9 @@ + android:width="15dp" + android:height="28dp" + android:viewportWidth="15" + android:viewportHeight="28"> From 4e40dc0b10538bec55b463b003ecabc3fe85b4b1 Mon Sep 17 00:00:00 2001 From: malinajirka Date: Mon, 5 May 2025 07:26:41 +0200 Subject: [PATCH 3/3] Fix detekt issues --- .../woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt index da60ea791b9..d50f5c21776 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt @@ -223,7 +223,7 @@ fun WooPosProductCard( Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value)) - ProductInfo(modifier = Modifier.weight(1f), item = item) + ProductInfo(modifier = Modifier.weight(1f), item = item) if (item is Product.Variable) { Image(