From df50485de6fc7abe6272b09257951fddb8399eea Mon Sep 17 00:00:00 2001 From: AnirudhBhat Date: Thu, 5 Sep 2024 11:56:04 +0530 Subject: [PATCH 1/4] Remove elevation from WooPosButton --- .../woopos/common/composeui/component/WooPosButtons.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosButtons.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosButtons.kt index 3870699a89c..edeb65958f1 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosButtons.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosButtons.kt @@ -32,7 +32,14 @@ fun WooPosButton( enabled = enabled, modifier = modifier .fillMaxWidth() - .height(72.dp) + .height(72.dp), + elevation = ButtonDefaults.elevation( + defaultElevation = 0.dp, + pressedElevation = 0.dp, + disabledElevation = 0.dp, + hoveredElevation = 0.dp, + focusedElevation = 0.dp + ) ) { Text( text = text, From 7e16161fe905fd171df31b91e0d972f3ce7c11cd Mon Sep 17 00:00:00 2001 From: AnirudhBhat Date: Thu, 5 Sep 2024 11:56:28 +0530 Subject: [PATCH 2/4] Add proper tint color for product info icon color --- .../android/ui/woopos/home/products/WooPosProductsScreen.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/products/WooPosProductsScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/products/WooPosProductsScreen.kt index ca34bf7208a..165924b4246 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/products/WooPosProductsScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/products/WooPosProductsScreen.kt @@ -26,6 +26,7 @@ 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.ContentAlpha import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.Icon import androidx.compose.material.IconButton @@ -202,7 +203,7 @@ private fun ProductsToolbar( contentDescription = stringResource( id = R.string.woopos_banner_simple_products_info_content_description ), - tint = MaterialTheme.colors.primary, + tint = MaterialTheme.colors.onSurface.copy(ContentAlpha.high), ) } } From ca5cf1fe989043555577cb4a4fc0c5f36950c2dc Mon Sep 17 00:00:00 2001 From: AnirudhBhat Date: Thu, 5 Sep 2024 13:29:37 +0530 Subject: [PATCH 3/4] Hide the exit confirmation dialog before exiting the POS mode. --- .../component/WooPosExitConfirmationDialog.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosExitConfirmationDialog.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosExitConfirmationDialog.kt index de9bd06f6c9..446793a005e 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosExitConfirmationDialog.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosExitConfirmationDialog.kt @@ -14,6 +14,7 @@ import androidx.compose.material.Text import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Close import androidx.compose.runtime.Composable +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource @@ -23,6 +24,8 @@ import com.woocommerce.android.R import com.woocommerce.android.ui.woopos.common.composeui.WooPosPreview import com.woocommerce.android.ui.woopos.common.composeui.WooPosTheme import com.woocommerce.android.ui.woopos.common.composeui.toAdaptivePadding +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch @Composable fun WooPosExitConfirmationDialog( @@ -34,6 +37,7 @@ fun WooPosExitConfirmationDialog( onDismissRequest: () -> Unit, onExit: () -> Unit ) { + val scope = rememberCoroutineScope() WooPosDialogWrapper( modifier = modifier, isVisible = isVisible, @@ -64,7 +68,11 @@ fun WooPosExitConfirmationDialog( modifier = modifier .fillMaxWidth(), onClick = { - onExit() + scope.launch { + onDismissRequest() + delay(300) + onExit() + } }, text = dismissButtonText ) From d0d06c8b409fefbdc4687d19268b2fd9eb4855db Mon Sep 17 00:00:00 2001 From: AnirudhBhat Date: Thu, 12 Sep 2024 11:22:10 +0530 Subject: [PATCH 4/4] Remove unnecessary import and fix build failure --- .../ui/woopos/common/composeui/component/WooPosButtons.kt | 7 ------- .../ui/woopos/home/products/WooPosProductsScreen.kt | 1 - 2 files changed, 8 deletions(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosButtons.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosButtons.kt index c71d2b3b92f..c7e24c93e6c 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosButtons.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosButtons.kt @@ -30,13 +30,6 @@ fun WooPosButton( onClick = onClick, shape = RoundedCornerShape(8.dp), enabled = enabled, - elevation = ButtonDefaults.elevation( - defaultElevation = 0.dp, - pressedElevation = 0.dp, - focusedElevation = 0.dp, - hoveredElevation = 0.dp, - disabledElevation = 0.dp - ), modifier = modifier .fillMaxWidth() .height(72.dp), diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/products/WooPosProductsScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/products/WooPosProductsScreen.kt index 34f691d8086..2ec60fec263 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/products/WooPosProductsScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/products/WooPosProductsScreen.kt @@ -25,7 +25,6 @@ import androidx.compose.foundation.lazy.rememberLazyListState 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.ContentAlpha import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.Icon