Merge pull request #12546 from woocommerce/issue/12527-ui-changes-on-…

…exit-pos-dialog [Woo POS] Fixes for UI Changes on Exit POS Dialog and Product Info Icon Color Update
woocommerce · Sep 12, 2024 · 99dc105 · 99dc105
2 parents 96a11a0 + d0d06c8
commit 99dc105
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/...main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosButtons.kt b/...main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosButtons.kt
@@ -30,16 +30,16 @@ fun WooPosButton(
         onClick = onClick,
         shape = RoundedCornerShape(8.dp),
         enabled = enabled,
+        modifier = modifier
+            .fillMaxWidth()
+            .height(72.dp),
         elevation = ButtonDefaults.elevation(
             defaultElevation = 0.dp,
             pressedElevation = 0.dp,
-            focusedElevation = 0.dp,
+            disabledElevation = 0.dp,
             hoveredElevation = 0.dp,
-            disabledElevation = 0.dp
-        ),
-        modifier = modifier
-            .fillMaxWidth()
-            .height(72.dp)
+            focusedElevation = 0.dp
+        )
     ) {
         Text(
             text = text,

diff --git a/.../woocommerce/android/ui/woopos/common/composeui/component/WooPosExitConfirmationDialog.kt b/.../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
                 )

diff --git a/...e/src/main/kotlin/com/woocommerce/android/ui/woopos/home/products/WooPosProductsScreen.kt b/...e/src/main/kotlin/com/woocommerce/android/ui/woopos/home/products/WooPosProductsScreen.kt
@@ -25,6 +25,7 @@ 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.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),
                         )
                     }
                 }