From eea58c44f030c84c5ae4ed85ef50694ce3d79544 Mon Sep 17 00:00:00 2001 From: Sk Niyaj Ali Date: Wed, 31 Jul 2024 05:16:29 +0530 Subject: [PATCH] Release/version 1.0.0.alpha.5 (#1002) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Release Version-1.0.0-alpha.5 Bug Fix: Fixed HomeScreen Bug - Close #997 * Fix: Fixed bug on AddEditCartOrderScreen - Close #982 * Enhancement - Delivery Partner Details Screen - Close #1000 * Feat: Bug Fix & Enhancement - Close #999 - Close #982 * 🤖 Updates screenshots * Refactor - Update Order List UI in Address Screen - Updated background color of grouped orders. - Removed unnecessary Surface from ListOfOrders. - Added background color parameter to ListOfOrders. - Removed extra space and divider between orders in ListOfOrders. - Close #1001 --------- Co-authored-by: niyajali --- .../niyaj/address/components/GroupedOrders.kt | 5 +- .../niyaj/address/components/ListOfOrders.kt | 105 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/feature/address/src/main/java/com/niyaj/address/components/GroupedOrders.kt b/feature/address/src/main/java/com/niyaj/address/components/GroupedOrders.kt index 1dbe4681..bc285aa3 100644 --- a/feature/address/src/main/java/com/niyaj/address/components/GroupedOrders.kt +++ b/feature/address/src/main/java/com/niyaj/address/components/GroupedOrders.kt @@ -50,12 +50,13 @@ import com.niyaj.ui.utils.DevicePreviews @Composable internal fun GroupedOrders( + modifier: Modifier = Modifier, customerPhone: String, orderDetails: List, onClickOrder: (Int) -> Unit, ) = trace("Address::GroupedOrders") { Column( - modifier = Modifier + modifier = modifier .fillMaxWidth(), ) { Row( @@ -117,7 +118,7 @@ private fun GroupedOrderDetails( FlowRow( modifier = modifier .fillMaxWidth() - .background(MaterialTheme.colorScheme.tertiaryContainer) + .background(MaterialTheme.colorScheme.surfaceContainerLow) .padding(horizontal = SpaceSmall), horizontalArrangement = Arrangement.spacedBy(SpaceSmall, Alignment.Start), verticalArrangement = Arrangement.Center, diff --git a/feature/address/src/main/java/com/niyaj/address/components/ListOfOrders.kt b/feature/address/src/main/java/com/niyaj/address/components/ListOfOrders.kt index 4b7ee97e..5d5893d9 100644 --- a/feature/address/src/main/java/com/niyaj/address/components/ListOfOrders.kt +++ b/feature/address/src/main/java/com/niyaj/address/components/ListOfOrders.kt @@ -32,6 +32,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.key import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.util.trace @@ -48,74 +49,72 @@ import com.niyaj.ui.utils.DevicePreviews @Composable internal fun ListOfOrders( - modifier: Modifier = Modifier, orderSize: Int, orderDetails: List, onClickOrder: (Int) -> Unit, + modifier: Modifier = Modifier, + backgroundColor: Color = MaterialTheme.colorScheme.background, ) = trace("Address::ListOfOrder") { - Surface(modifier) { - Column( - modifier = Modifier - .fillMaxWidth(), - ) { - orderDetails.forEachIndexed { index, order -> - key(order.orderId) { - Surface( + Column( + modifier = modifier + .fillMaxWidth(), + ) { + orderDetails.forEachIndexed { index, order -> + key(order.orderId) { + Surface( + modifier = Modifier + .fillMaxWidth(), + color = backgroundColor, + onClick = { + onClickOrder(order.orderId) + }, + ) { + Row( modifier = Modifier - .fillMaxWidth(), - onClick = { - onClickOrder(order.orderId) - }, + .fillMaxWidth() + .padding(SpaceSmall), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, ) { - Row( - modifier = Modifier - .fillMaxWidth() - .padding(SpaceSmall), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.SpaceBetween, - ) { - IconWithText( - text = "${order.orderId}", - icon = PoposIcons.Tag, - tintColor = MaterialTheme.colorScheme.tertiary, - isTitle = true, - ) - - Column { - Text( - text = order.customerPhone, - textAlign = TextAlign.Start, - ) - - order.customerName?.let { - Spacer( - modifier = Modifier.height( - SpaceMini, - ), - ) - Text(text = it) - } - } + IconWithText( + text = "${order.orderId}", + icon = PoposIcons.Tag, + tintColor = MaterialTheme.colorScheme.tertiary, + isTitle = true, + ) + Column { Text( - text = order.totalPrice.toRupee, + text = order.customerPhone, textAlign = TextAlign.Start, - fontWeight = FontWeight.SemiBold, ) - Text( - text = order.updatedAt.toTime, - textAlign = TextAlign.End, - ) + order.customerName?.let { + Spacer( + modifier = Modifier.height( + SpaceMini, + ), + ) + Text(text = it) + } } + + Text( + text = order.totalPrice.toRupee, + textAlign = TextAlign.Start, + fontWeight = FontWeight.SemiBold, + ) + + Text( + text = order.updatedAt.toTime, + textAlign = TextAlign.End, + ) } } + } - if (index != orderSize - 1) { - Spacer(modifier = Modifier.height(SpaceMini)) - HorizontalDivider(modifier = Modifier.fillMaxWidth()) - Spacer(modifier = Modifier.height(SpaceMini)) - } + if (index != orderSize - 1) { + HorizontalDivider(modifier = Modifier.fillMaxWidth()) } } }