From 70a130ca9ead2d07238d7598056d230ec1f4be8e Mon Sep 17 00:00:00 2001 From: Sidharth Bamba Date: Tue, 5 Sep 2023 10:55:02 +0530 Subject: [PATCH] Upi logos Co-authored-by: Shaurya Rehan --- .../ui/CollectRequestsScreen.kt | 11 ++++- .../common/sendmoney/ui/SendMoneySection.kt | 48 +++++++++++++++---- 2 files changed, 48 insertions(+), 11 deletions(-) diff --git a/navi-pay/src/main/kotlin/com/navi/pay/management/collectrequest/ui/CollectRequestsScreen.kt b/navi-pay/src/main/kotlin/com/navi/pay/management/collectrequest/ui/CollectRequestsScreen.kt index aecff1d835..2fb070e880 100644 --- a/navi-pay/src/main/kotlin/com/navi/pay/management/collectrequest/ui/CollectRequestsScreen.kt +++ b/navi-pay/src/main/kotlin/com/navi/pay/management/collectrequest/ui/CollectRequestsScreen.kt @@ -17,6 +17,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.runtime.Composable @@ -38,6 +39,7 @@ import com.navi.pay.R import com.navi.pay.analytics.NaviPayAnalytics import com.navi.pay.common.ui.EmptyDataScreen import com.navi.pay.common.ui.NaviPayHeader +import com.navi.pay.common.ui.NaviPaySponsorView import com.navi.pay.common.utils.ErrorEventHandler import com.navi.pay.common.utils.NaviPayNotificationHandler import com.navi.pay.common.utils.SnackBarPredefinedConfig @@ -185,7 +187,7 @@ fun CollectRequestsMainScreen( Spacer(modifier = Modifier.height(8.dp)) LazyColumn( modifier = Modifier - .fillMaxSize() + .weight(1f) .padding(horizontal = 16.dp), contentPadding = PaddingValues(vertical = 16.dp), verticalArrangement = Arrangement.spacedBy(space = 16.dp) @@ -197,15 +199,22 @@ fun CollectRequestsMainScreen( ) } } + NaviPaySponsorView( + modifier = Modifier + .fillMaxWidth() + .padding(top = 16.dp, bottom = 32.dp) + ) } else { EmptyDataScreen( iconResId = R.drawable.ic_empty_pending_request, message = stringResource(id = R.string.no_pending_request) ) } + } CollectRequestUIState.Loading -> CollectRequestsShimmer() } + } } diff --git a/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneySection.kt b/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneySection.kt index f5af69f004..dce3d7aece 100644 --- a/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneySection.kt +++ b/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneySection.kt @@ -54,6 +54,7 @@ import com.navi.pay.analytics.NaviPayAnalytics import com.navi.pay.common.model.view.SnackbarState import com.navi.pay.common.theme.color.NaviPayColor import com.navi.pay.common.ui.ImageWithBackground +import com.navi.pay.common.ui.NaviPaySponsorView import com.navi.pay.common.ui.PayeeDetailsView import com.navi.pay.common.ui.ThemeRoundedButton import com.navi.pay.common.utils.SnackBarPredefinedConfig @@ -255,20 +256,20 @@ fun SendMoneySection( closeSheet = closeSheet ) } else { - ThemeRoundedButton( + PayButtonWithSponsorView( modifier = Modifier .constrainAs(doneButton) { - start.linkTo(parent.start, 16.dp) - end.linkTo(parent.end, 16.dp) - bottom.linkTo(parent.bottom, 32.dp) - width = Dimension.fillToConstraints + start.linkTo(parent.start) + end.linkTo(parent.end) + bottom.linkTo(parent.bottom) } .layoutId(doneButton), - enabled = isPayButtonEnabled && isSelectedAccountEligible == true, - text = payButtonText, - ) { - onPayButtonClick("DefaultPayButton") - } + isPayButtonEnabled = isPayButtonEnabled, + onPayButtonClick = onPayButtonClick, + payButtonText = payButtonText, + isSelectedAccountEligible = isSelectedAccountEligible + + ) } } } @@ -511,4 +512,31 @@ private fun NoAccountLinkedView(modifier: Modifier) { thickness = 1.dp ) } +} + +@Composable +private fun PayButtonWithSponsorView( + modifier: Modifier, + isPayButtonEnabled: Boolean, + onPayButtonClick: (String) -> Unit, + payButtonText: String, + isSelectedAccountEligible: Boolean? +) { + Column( + modifier = modifier + .fillMaxWidth() + .padding(horizontal = 16.dp, vertical = 16.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + NaviPaySponsorView(modifier = Modifier) + Spacer(modifier = Modifier.height(12.dp)) + ThemeRoundedButton( + modifier = Modifier + .fillMaxWidth(), + enabled = isPayButtonEnabled && isSelectedAccountEligible == true, + text = payButtonText + ) { + onPayButtonClick("DefaultPayButton") + } + } } \ No newline at end of file