varnitgoyal95/super-app
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

NTP-7428 | Sidharth Bamba | dx-gy fixes (#13063)

Browse Source
This commit is contained in:
Sidharth Bamba
2024-10-14 12:38:06 +05:30
committed by GitHub
parent 2e26228398
commit 5db8a3f420
5 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/customerinput/ui/CustomerDataInputScreen.kt
View File

@@ -239,7 +239,13 @@ fun CustomerDataInputScreen(
onHelpCtaClicked = customerDataInputViewModel::onHelpCtaClicked
)
if (billCategoryEntity.categoryId != CATEGORY_ID_CREDIT_CARD) {
rewardsNudgeDetailEntity?.let { RewardsNudgeWithBg(nudgeDetailEntity = it) }
rewardsNudgeDetailEntity?.let {
RewardsNudgeWithBg(
imageResId = R.drawable.ic_reward_nudge_percentage_white,
nudgeDetailEntity = it
)
Spacer(modifier = Modifier.height(16.dp))
}
}
}
},

48
android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/PayBillScreen.kt
View File

@@ -331,7 +331,7 @@ fun PayBillScreen(
Modifier.fillMaxSize()
.verticalScroll(state = scrollState)
.background(NaviBbpsColor.textWhite)
.padding(bottom = 120.dp)
.padding(bottom = 120.dp, start = 16.dp, end = 16.dp)
) {
when (isBillLoading) {
true ->
@@ -396,13 +396,7 @@ fun PayBillScreen(
}
else -> {
AmountTextField(
modifier =
Modifier.fillMaxWidth()
.padding(
top = 32.dp,
start = 16.dp,
end = 16.dp
),
modifier = Modifier.fillMaxWidth().padding(top = 32.dp),
isReadOnly = isAmountReadOnly,
focusManager = focusManager,
errorTextMessage =
@@ -432,10 +426,7 @@ fun PayBillScreen(
RewardBurnCalloutBanner(
coinUtilisationProperties =
coinUtilisationProperties,
categoryId = billCategoryEntity.categoryId,
modifier =
Modifier.fillMaxWidth()
.padding(horizontal = 16.dp)
categoryId = billCategoryEntity.categoryId
)
}
}
@@ -484,6 +475,7 @@ fun PayBillScreen(
)
}
}
Spacer(modifier = Modifier.height(32.dp))
Spacer(modifier = Modifier.weight(1f))
}
}
@@ -497,11 +489,15 @@ fun PayBillScreen(
)
Column(modifier = Modifier.align(Alignment.BottomCenter).fillMaxWidth()) {
Image(
painter = painterResource(id = R.drawable.white_gradient_for_rewards),
painter =
painterResource(
id =
if (isCreditCardV2Enabled)
R.drawable.white_gradient_cc_rewards
else R.drawable.white_gradient_for_rewards
),
contentDescription = "",
modifier =
Modifier.fillMaxWidth()
.height(if (isCreditCardV2Enabled) 16.dp else 80.dp),
modifier = Modifier.fillMaxWidth(),
contentScale = ContentScale.FillWidth,
)
@@ -513,6 +509,7 @@ fun PayBillScreen(
rewardsNudgeDetailEntity?.let {
CoinUtilisationBottomNudgeWithAnimation(it)
}
LoaderRoundedButton(
modifier =
Modifier.fillMaxWidth()
@@ -560,7 +557,6 @@ fun RenderPayBillPrepaidBox(
Column(
modifier =
Modifier.fillMaxWidth()
.padding(16.dp)
.background(color = NaviBbpsColor.bgAlt, shape = RoundedCornerShape(10.dp))
.padding(top = 16.dp, start = 16.dp, end = 16.dp)
) {
@@ -599,7 +595,6 @@ fun RenderPayBillPrepaidBox(
Column(
modifier =
Modifier.fillMaxWidth()
.padding(16.dp)
.background(color = NaviBbpsColor.bgAlt, shape = RoundedCornerShape(10.dp))
.padding(16.dp)
) {
@@ -620,12 +615,11 @@ fun RenderPayBillPrepaidBox(
Column(
modifier =
Modifier.padding(16.dp)
.border(
width = 1.dp,
color = NaviBbpsColor.bgAlt2,
shape = RoundedCornerShape(4.dp)
)
Modifier.border(
width = 1.dp,
color = NaviBbpsColor.bgAlt2,
shape = RoundedCornerShape(4.dp)
)
) {
Row(
modifier =
@@ -680,8 +674,7 @@ fun RenderPayBillBox(
if (payBillScreenState.billDetailsEntity.isDisplayableBillDetailsAvailable) {
Column(
modifier =
Modifier.padding(horizontal = 16.dp)
.fillMaxWidth()
Modifier.fillMaxWidth()
.background(color = NaviBbpsColor.bgAlt, shape = RoundedCornerShape(10.dp))
.padding(top = 16.dp, start = 16.dp, end = 16.dp)
) {
@@ -746,7 +739,6 @@ fun RenderPayBillBox(
Column(
modifier =
Modifier.fillMaxWidth()
.padding(horizontal = 16.dp)
.background(color = NaviBbpsColor.bgAlt, shape = RoundedCornerShape(10.dp))
.padding(16.dp)
) {
@@ -785,7 +777,6 @@ fun BillHistorySection(
Row(
modifier =
Modifier.fillMaxWidth()
.padding(16.dp)
.border(
width = 1.dp,
color =
@@ -882,7 +873,6 @@ fun RenderPayBillDthStickySnackbar() {
Row(
modifier =
Modifier.fillMaxWidth()
.padding(16.dp)
.background(color = NaviBbpsColor.bgAlt2, shape = RoundedCornerShape(4.dp))
.padding(16.dp)
) {

2
android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/RenderCreditCardPayBillScreen.kt
View File

@@ -116,7 +116,7 @@ fun RenderCreditCardPayBillScreen(
}
}
Column(modifier = Modifier.fillMaxSize().padding(horizontal = 16.dp)) {
Column(modifier = Modifier.fillMaxSize()) {
NaviText(
text = stringResource(id = R.string.bbps_credit_card_bill),
fontSize = 24.sp,

21
android/navi-bbps/src/main/res/drawable/white_gradient_cc_rewards.xml Normal file
View File

@@ -0,0 +1,21 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="360dp"
android:height="24dp"
android:viewportWidth="360"
android:viewportHeight="24">
<path
android:pathData="M0,0h360v24h-360z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="180"
android:startY="0"
android:endX="180"
android:endY="24"
android:type="linear">
<item android:offset="0" android:color="#00FFFFFF"/>
<item android:offset="0.54" android:color="#FFFFFFFF"/>
</gradient>
</aapt:attr>
</path>
</vector>

6
android/navi-bbps/src/main/res/drawable/white_gradient_for_rewards.xml
View File

@@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="360dp"
android:height="80dp"
android:height="54dp"
android:viewportWidth="360"
android:viewportHeight="80">
android:viewportHeight="54">
<path
android:pathData="M0,0h360v80h-360z">
<aapt:attr name="android:fillColor">
@@ -11,7 +11,7 @@
android:startX="180"
android:startY="0"
android:endX="180"
android:endY="80"
android:endY="54"
android:type="linear">
<item android:offset="0" android:color="#00FFFFFF"/>
<item android:offset="0.48" android:color="#FFFFFFFF"/>