diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/ui/OrderHistoryItemView.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/ui/OrderHistoryItemView.kt index 3e5cea32b7..b2b91c1882 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/ui/OrderHistoryItemView.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/ui/OrderHistoryItemView.kt @@ -31,9 +31,6 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.ColorFilter -import androidx.compose.ui.graphics.ColorMatrix -import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow @@ -55,7 +52,6 @@ import com.navi.pay.common.ui.ImageWithCircularBackground import com.navi.pay.tstore.list.model.network.OrderType import com.navi.pay.tstore.list.model.view.OrderHistoryEntity import com.navi.pay.tstore.list.model.view.OrderStatusOfView -import com.navi.pay.tstore.list.util.getFontColorForOrderHistoryList import com.navi.pay.tstore.list.util.getFormattedAmountColorForOrderHistoryList import com.navi.pay.tstore.list.util.getFormattedAmountForOrderHistoryList import com.navi.pay.tstore.list.util.getStatusImageForOrderHistoryList @@ -70,7 +66,6 @@ import com.navi.pay.utils.NAVI_UPI import com.navi.pay.utils.RESOURCE_DEFAULT_ID import com.navi.pay.utils.RUPEE_SYMBOL import com.navi.pay.utils.clickableDebounce -import com.navi.pay.utils.conditional import com.navi.pay.utils.contactInitials @Composable @@ -103,10 +98,7 @@ fun RenderOrderHistoryItemView( text = orderHistoryEntity.orderTitle, fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), - color = - getFontColorForOrderHistoryList( - status = orderHistoryEntity.orderStatusOfView - ), + color = NaviPayColor.textPrimary, fontSize = 14.sp, lineHeight = 22.sp, overflow = TextOverflow.Ellipsis, @@ -146,10 +138,7 @@ fun RenderOrderHistoryItemView( fontSize = 14.sp, lineHeight = 22.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), - color = - getFontColorForOrderHistoryList( - status = orderHistoryEntity.orderStatusOfView - ), + color = NaviPayColor.textPrimary, overflow = TextOverflow.Ellipsis, modifier = Modifier.widthIn(max = 200.dp), maxLines = 1, @@ -371,13 +360,7 @@ fun LeftImageIconOfListView(index: Int, orderHistoryEntity: OrderHistoryEntity) when { orderHistoryEntity.isOrderOfSelfTransferType -> { Image( - painter = - painterResource( - id = - if (orderHistoryEntity.orderStatusOfView == OrderStatusOfView.Failed) - R.drawable.ic_np_self_transfer_greyed - else R.drawable.ic_self_transfer_pay_again - ), + painter = painterResource(id = R.drawable.ic_self_transfer_pay_again), contentDescription = "", modifier = Modifier.size(40.dp), ) @@ -397,35 +380,18 @@ fun LeftImageIconOfListView(index: Int, orderHistoryEntity: OrderHistoryEntity) contentAlignment = Alignment.Center, ) { AsyncImage( - modifier = - Modifier.fillMaxSize().padding(6.dp).conditional( - orderHistoryEntity.orderStatusOfView == OrderStatusOfView.Failed - ) { - graphicsLayer(alpha = 0.75f) - }, + modifier = Modifier.fillMaxSize().padding(6.dp), model = orderHistoryEntity.otherUserIconUrl, contentDescription = "", fallback = painterResource(id = R.drawable.ic_np_mcc_untagged), placeholder = painterResource(id = R.drawable.ic_np_mcc_untagged), error = painterResource(id = R.drawable.ic_np_mcc_untagged), - colorFilter = - if (orderHistoryEntity.orderStatusOfView == OrderStatusOfView.Failed) { - ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0f) }) - } else { - null - }, ) if (orderHistoryEntity.isUpiGlobalTransaction) { ImageWithCircularBackground( modifier = - Modifier.align(Alignment.BottomEnd) - .offset(x = (4).dp, y = (4).dp) - .conditional( - orderHistoryEntity.orderStatusOfView == OrderStatusOfView.Failed - ) { - graphicsLayer(alpha = 0.75f) - }, + Modifier.align(Alignment.BottomEnd).offset(x = (4).dp, y = (4).dp), boxSize = 18.dp, imageUrl = null, imageSize = 16.dp, @@ -437,15 +403,7 @@ fun LeftImageIconOfListView(index: Int, orderHistoryEntity: OrderHistoryEntity) } } orderHistoryEntity.isCashLoanTransaction || orderHistoryEntity.isHomeLoanTransaction -> { - Box( - modifier = - Modifier.size(40.dp).conditional( - orderHistoryEntity.orderStatusOfView == OrderStatusOfView.Failed - ) { - graphicsLayer(alpha = 0.75f) - }, - contentAlignment = Alignment.Center, - ) { + Box(modifier = Modifier.size(40.dp), contentAlignment = Alignment.Center) { AsyncImage( modifier = Modifier.fillMaxSize(), model = @@ -455,26 +413,12 @@ fun LeftImageIconOfListView(index: Int, orderHistoryEntity: OrderHistoryEntity) fallback = painterResource(id = R.drawable.ic_add_bank), placeholder = painterResource(id = R.drawable.ic_add_bank), error = painterResource(id = R.drawable.ic_add_bank), - colorFilter = - if (orderHistoryEntity.orderStatusOfView == OrderStatusOfView.Failed) { - ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0f) }) - } else { - null - }, ) } } orderHistoryEntity.isGoldTransaction -> { - Box( - modifier = - Modifier.size(40.dp).conditional( - orderHistoryEntity.orderStatusOfView == OrderStatusOfView.Failed - ) { - graphicsLayer(alpha = 0.75f) - }, - contentAlignment = Alignment.Center, - ) { + Box(modifier = Modifier.size(40.dp), contentAlignment = Alignment.Center) { AsyncImage( modifier = Modifier.fillMaxSize(), model = NAVI_GOLD_LOGO_URL, @@ -482,12 +426,6 @@ fun LeftImageIconOfListView(index: Int, orderHistoryEntity: OrderHistoryEntity) fallback = painterResource(id = R.drawable.ic_add_bank), placeholder = painterResource(id = R.drawable.ic_add_bank), error = painterResource(id = R.drawable.ic_add_bank), - colorFilter = - if (orderHistoryEntity.orderStatusOfView == OrderStatusOfView.Failed) { - ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0f) }) - } else { - null - }, ) } } diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/util/OrderListViewPropertyUtil.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/util/OrderListViewPropertyUtil.kt index 533df4e0df..63e22180c1 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/util/OrderListViewPropertyUtil.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/util/OrderListViewPropertyUtil.kt @@ -26,13 +26,6 @@ fun getFormattedAmountColorForOrderHistoryList( orderType: String, ): Color { return when (status) { - OrderStatusOfView.CollectRequestExpired, - OrderStatusOfView.RequestMoneyExpired, - OrderStatusOfView.RequestMoneyDeclined, - OrderStatusOfView.CollectRequestDeclined, - OrderStatusOfView.Failed, - OrderStatusOfView.RequestMoneyFailed, - OrderStatusOfView.CollectRequestFailed -> NaviPayColor.textTertiary OrderStatusOfView.Credit -> if ( orderType == OrderType.CASH_LOAN_DISBURSAL.name || @@ -67,20 +60,6 @@ fun getFormattedAmountForOrderHistoryList(orderHistoryEntity: OrderHistoryEntity return "$amountPrefix $formattedAmount" } -fun getFontColorForOrderHistoryList(status: OrderStatusOfView): Color { - - return when (status) { - OrderStatusOfView.Failed, - OrderStatusOfView.RequestMoneyExpired, - OrderStatusOfView.CollectRequestExpired, - OrderStatusOfView.CollectRequestFailed, - OrderStatusOfView.RequestMoneyFailed -> NaviPayColor.textTertiary - else -> { - return NaviPayColor.textPrimary - } - } -} - fun getStatusImageForOrderHistoryList(status: OrderStatusOfView): Int { return when (status) { OrderStatusOfView.Failed, diff --git a/android/navi-pay/src/main/res/drawable/ic_np_self_transfer_greyed.xml b/android/navi-pay/src/main/res/drawable/ic_np_self_transfer_greyed.xml deleted file mode 100644 index e3154ea56c..0000000000 --- a/android/navi-pay/src/main/res/drawable/ic_np_self_transfer_greyed.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/android/navi-pay/src/test/kotlin/com/navi/pay/tstore/list/util/OrderListViewPropertyUtilTest.kt b/android/navi-pay/src/test/kotlin/com/navi/pay/tstore/list/util/OrderListViewPropertyUtilTest.kt index 9c1bbade6d..ce5dbb7002 100644 --- a/android/navi-pay/src/test/kotlin/com/navi/pay/tstore/list/util/OrderListViewPropertyUtilTest.kt +++ b/android/navi-pay/src/test/kotlin/com/navi/pay/tstore/list/util/OrderListViewPropertyUtilTest.kt @@ -151,13 +151,13 @@ class OrderListViewPropertyUtilTest { fun testGetFormattedAmountColorForOrderHistoryList() { val testCases = listOf( - OrderStatusOfView.CollectRequestExpired to NaviPayColor.textTertiary, - OrderStatusOfView.RequestMoneyExpired to NaviPayColor.textTertiary, - OrderStatusOfView.RequestMoneyDeclined to NaviPayColor.textTertiary, - OrderStatusOfView.CollectRequestDeclined to NaviPayColor.textTertiary, - OrderStatusOfView.Failed to NaviPayColor.textTertiary, - OrderStatusOfView.RequestMoneyFailed to NaviPayColor.textTertiary, - OrderStatusOfView.CollectRequestFailed to NaviPayColor.textTertiary, + OrderStatusOfView.CollectRequestExpired to NaviPayColor.textPrimary, + OrderStatusOfView.RequestMoneyExpired to NaviPayColor.textPrimary, + OrderStatusOfView.RequestMoneyDeclined to NaviPayColor.textPrimary, + OrderStatusOfView.CollectRequestDeclined to NaviPayColor.textPrimary, + OrderStatusOfView.Failed to NaviPayColor.textPrimary, + OrderStatusOfView.RequestMoneyFailed to NaviPayColor.textPrimary, + OrderStatusOfView.CollectRequestFailed to NaviPayColor.textPrimary, OrderStatusOfView.Credit to NaviPayColor.ctaPriority, OrderStatusOfView.Debit to NaviPayColor.textPrimary, OrderStatusOfView.Pending to NaviPayColor.textPrimary,