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

NTP-11293 | Sidharth Bamba | Remove diwali scratch card bbps (#13521)

Browse Source
This commit is contained in:
Sidharth Bamba
2024-11-14 19:51:37 +05:30
committed by GitHub
parent 3ef2bab1bf
commit b9112bcf18
4 changed files with 11 additions and 1549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/PayBillViewModel.kt
View File

@@ -83,7 +83,6 @@ import com.navi.common.network.models.RepoResult
import com.navi.common.network.models.isSuccessWithData
import com.navi.common.upi.SUCCESS
import com.navi.common.usecase.LitmusExperimentsUseCase
import com.navi.common.utils.Constants.LITMUS_EXPERIMENT_NAVIPAY_REWARD_DIWALI_ANIMATION
import com.navi.common.utils.TemporaryStorageHelper
import com.navi.common.utils.toJsonObject
import com.navi.payment.nativepayment.utils.getDiscountAdjustedAmount
@@ -164,10 +163,6 @@ constructor(
private val isRewardsAnimationExperimentationEnabled =
_isRewardsAnimationExperimentationEnabled.asStateFlow()
private val _isDiwaliAnimationExperimentationEnabled = MutableStateFlow(false)
private val isDiwaliAnimationExperimentationEnabled =
_isDiwaliAnimationExperimentationEnabled.asStateFlow()
private val _shouldAutoFocusOnAmount = MutableStateFlow(false)
val shouldAutoFocusOnAmount = _shouldAutoFocusOnAmount.asStateFlow()
@@ -845,7 +840,7 @@ constructor(
)
billOrderModel?.toJsonObject()?.let { tStoreOrderHandler.insertOrderToTStoreDb(it) }
if (status == SUCCESS) {
if (isDiwaliAnimationExperimentationEnabled.value) {
if (isRewardsAnimationExperimentationEnabled.value) {
_goToNextScreen.emit(
Pair(
BbpsPostPaymentScreenV2Destination(
@@ -854,23 +849,6 @@ constructor(
isSourcePaymentSummary = true,
isRootScreen = isRootScreen,
orderReferenceId = orderReferenceId,
isDiwaliThemeEnabled = true,
source = NaviBbpsScreen.NAVI_BBPS_PAY_BILL_SCREEN.name,
initialSource = initialSource
),
second = true
)
)
} else if (isRewardsAnimationExperimentationEnabled.value) {
_goToNextScreen.emit(
Pair(
BbpsPostPaymentScreenV2Destination(
billTransactionItemEntity = billTransactionItemEntity,
myBillEntity = myBillEntity,
isSourcePaymentSummary = true,
isRootScreen = isRootScreen,
orderReferenceId = orderReferenceId,
isDiwaliThemeEnabled = false,
source = NaviBbpsScreen.NAVI_BBPS_PAY_BILL_SCREEN.name,
initialSource = initialSource
),
@@ -1164,13 +1142,5 @@ constructor(
?.isEnabled
.orFalse()
}
_isDiwaliAnimationExperimentationEnabled.update {
litmusExperimentsUseCase
.execute(experimentName = LITMUS_EXPERIMENT_NAVIPAY_REWARD_DIWALI_ANIMATION)
?.variant
?.enabled
.orFalse()
}
}
}

40
android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsPostPaymentScreenV2.kt
View File

@@ -174,7 +174,6 @@ fun BbpsPostPaymentScreenV2(
source: String,
orderReferenceId: String,
initialSource: String,
isDiwaliThemeEnabled: Boolean = false,
naviBbpsAnalytics: NaviBbpsAnalytics.PostPaymentScreen =
NaviBbpsAnalytics.INSTANCE.PostPaymentScreen()
) {
@@ -480,7 +479,6 @@ fun BbpsPostPaymentScreenV2(
scratchCardBottomMovementAnimationDuration =
bbpsTransactionDetailsViewModel
.scratchCardBottomMovementAnimationDuration,
isDiwaliThemeEnabled = isDiwaliThemeEnabled
)
}
}
@@ -496,8 +494,7 @@ fun BbpsPostPaymentScreenV2(
.scratchCardBottomMovementAnimationDuration,
smallScratchCardOnLandVisibilityAnimationDuration =
bbpsTransactionDetailsViewModel
.smallScratchCardOnLandVisibilityAnimationDuration,
isDiwaliThemeEnabled = isDiwaliThemeEnabled
.smallScratchCardOnLandVisibilityAnimationDuration
)
}
}
@@ -541,8 +538,7 @@ fun SharedTransitionScope.RenderPostPaymentScreenV2(
isRewardsEntryPointVisible: Boolean,
scratchCardRotationAnimationDuration: Int,
rewardsBottomStripeSectionAnimationDuration: Int,
scratchCardBottomMovementAnimationDuration: Int,
isDiwaliThemeEnabled: Boolean
scratchCardBottomMovementAnimationDuration: Int
) {
val scrollState = rememberScrollState()
@@ -670,8 +666,7 @@ fun SharedTransitionScope.RenderPostPaymentScreenV2(
rewardsBottomStripeSectionAnimationDuration =
rewardsBottomStripeSectionAnimationDuration,
scratchCardBottomMovementAnimationDuration =
scratchCardBottomMovementAnimationDuration,
isDiwaliThemeEnable = isDiwaliThemeEnabled
scratchCardBottomMovementAnimationDuration
)
}
)
@@ -1082,8 +1077,7 @@ private fun SharedTransitionScope.BottomBarSection(
isRewardsEntryPointVisible: Boolean,
scratchCardRotationAnimationDuration: Int,
rewardsBottomStripeSectionAnimationDuration: Int,
scratchCardBottomMovementAnimationDuration: Int,
isDiwaliThemeEnable: Boolean
scratchCardBottomMovementAnimationDuration: Int
) {
Column(modifier = Modifier.padding(top = 16.dp)) {
if (isRewardsEntryPointVisible) {
@@ -1097,8 +1091,7 @@ private fun SharedTransitionScope.BottomBarSection(
rewardsBottomStripeSectionAnimationDuration =
rewardsBottomStripeSectionAnimationDuration,
scratchCardBottomMovementAnimationDuration =
scratchCardBottomMovementAnimationDuration,
isDiwaliThemeEnable = isDiwaliThemeEnable
scratchCardBottomMovementAnimationDuration
)
}
Spacer(modifier = Modifier.height(16.dp))
@@ -1552,8 +1545,7 @@ private fun SharedTransitionScope.ScratchCardOnLandSection(
animateContextScope: AnimatedContentScope,
scratchCardSizeAnimationDuration: Int,
scratchCardBottomMovementAnimationDuration: Int,
smallScratchCardOnLandVisibilityAnimationDuration: Int,
isDiwaliThemeEnabled: Boolean
smallScratchCardOnLandVisibilityAnimationDuration: Int
) {
var isScratchCardFullyVisible by remember { mutableStateOf(false) }
LaunchedEffect(Unit) { isScratchCardFullyVisible = true }
@@ -1584,10 +1576,7 @@ private fun SharedTransitionScope.ScratchCardOnLandSection(
horizontalAlignment = Alignment.CenterHorizontally
) {
Image(
painter =
if (isDiwaliThemeEnabled)
painterResource(id = CommonR.drawable.ic_np_bbps_scratch_card_with_coin_diwali)
else painterResource(id = CommonR.drawable.ic_np_scratch_card_with_coin),
painter = painterResource(id = CommonR.drawable.ic_np_scratch_card_with_coin),
contentDescription = "",
modifier =
Modifier.alpha(alpha)
@@ -1866,8 +1855,7 @@ private fun SharedTransitionScope.RewardsBottomBarWithStripSection(
onRewardsCtaClicked: () -> Unit,
scratchCardRotationAnimationDuration: Int,
rewardsBottomStripeSectionAnimationDuration: Int,
scratchCardBottomMovementAnimationDuration: Int,
isDiwaliThemeEnable: Boolean
scratchCardBottomMovementAnimationDuration: Int
) {
val colorStops = remember {
arrayOf(
@@ -1969,20 +1957,12 @@ private fun SharedTransitionScope.RewardsBottomBarWithStripSection(
)
) {
Image(
painter =
if (isDiwaliThemeEnable)
painterResource(id = CommonR.drawable.ic_np_bbps_scratch_stripe_diwali)
else painterResource(id = CommonR.drawable.ic_np_scratch_stripe),
painter = painterResource(id = CommonR.drawable.ic_np_scratch_stripe),
contentDescription = EMPTY,
)
}
Image(
painter =
if (isDiwaliThemeEnable)
painterResource(
id = CommonR.drawable.ic_np_bbps_scratch_card_with_coin_diwali
)
else painterResource(id = CommonR.drawable.ic_np_scratch_card_with_coin),
painter = painterResource(id = CommonR.drawable.ic_np_scratch_card_with_coin),
contentDescription = EMPTY,
modifier =
Modifier.padding(start = 20.dp, bottom = 8.dp)

1385
android/navi-common/src/main/res/drawable/ic_np_bbps_scratch_card_with_coin_diwali.xml
View File

File diff suppressed because one or more lines are too long

103
android/navi-common/src/main/res/drawable/ic_np_bbps_scratch_stripe_diwali.xml
View File

@@ -1,103 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="78dp"
android:height="54dp"
android:viewportWidth="78"
android:viewportHeight="54">
<group>
<clip-path
android:pathData="M0,0h78v54h-78z"/>
<path
android:pathData="M12.417,19.956C12.43,17.395 9.552,14.995 9.552,14.995C9.552,14.995 7.664,18.236 8.552,20.638C8.829,21.367 9.363,21.903 9.929,22.194C10.426,22.446 11.16,22.342 11.6,21.962C12.197,21.445 12.459,20.772 12.417,19.961L12.417,19.956Z"
android:fillColor="#FDB102"/>
<path
android:pathData="M11.74,20.622C11.747,19.083 10.019,17.644 10.019,17.644C10.019,17.644 8.886,19.587 9.42,21.031C9.586,21.468 9.905,21.79 10.244,21.966C10.541,22.119 10.982,22.054 11.246,21.827C11.606,21.515 11.763,21.114 11.736,20.627L11.74,20.622Z"
android:fillColor="#FDF406"/>
<path
android:pathData="M11.296,21.057C11.301,20.154 10.286,19.309 10.286,19.309C10.286,19.309 9.622,20.45 9.935,21.297C10.032,21.554 10.219,21.743 10.418,21.846C10.593,21.936 10.852,21.898 11.007,21.764C11.218,21.581 11.31,21.346 11.294,21.06L11.296,21.057Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M10.842,22.75C10.842,22.75 10.605,21.621 10.61,21.003"
android:strokeLineJoin="round"
android:strokeWidth="0.241354"
android:fillColor="#00000000"
android:strokeColor="#2A2B2B"
android:strokeLineCap="round"/>
<path
android:pathData="M23.449,22.352C23.285,26.623 20.166,30.355 15.781,31.128C11.396,31.901 7.207,29.471 5.581,25.524L14.434,23.181L23.45,22.356L23.449,22.352Z"
android:fillColor="#FFB400"/>
<path
android:pathData="M21.046,22.576C20.709,26.677 17.649,30.201 13.403,30.95C13.026,31.016 12.651,31.059 12.279,31.079C13.399,31.312 14.583,31.34 15.781,31.128C20.164,30.355 23.283,26.625 23.449,22.356L23.449,22.352L23.449,22.356L21.046,22.576Z"
android:strokeAlpha="0.5"
android:fillColor="#C17004"
android:fillAlpha="0.5"/>
<path
android:pathData="M10.996,30.714C8.582,29.835 6.589,27.971 5.581,25.524L6.576,25.246C7.036,27.074 8.775,29.669 10.996,30.714Z"
android:strokeAlpha="0.8"
android:fillColor="#FEE7AF"
android:fillAlpha="0.8"/>
<path
android:pathData="M23.446,22.335C23.355,21.823 19.282,22.114 14.349,22.985C9.414,23.855 5.49,25.011 5.58,25.524C5.627,25.786 6.724,25.804 8.455,25.672C9.272,25.608 10.101,24.177 11.154,24.038C12.207,23.899 13.474,25.049 14.671,24.838C19.605,23.968 23.532,22.848 23.441,22.336L23.446,22.335Z"
android:fillColor="#B25C05"/>
<path
android:pathData="M11.159,24.037C12.208,23.899 13.48,25.048 14.677,24.837C19.012,24.072 22.57,23.115 23.311,22.545C22.521,22.237 18.811,22.549 14.41,23.325C10.009,24.101 6.436,25.098 5.793,25.668C6.19,25.784 7.142,25.768 8.464,25.67C9.281,25.607 10.111,24.176 11.163,24.037L11.159,24.037Z"
android:fillColor="#8C4401"/>
<path
android:pathData="M23.445,22.378C23.429,22.888 23.362,23.394 23.258,23.881C23.258,23.881 17.092,26.485 11.082,24.156C11.082,24.156 9.363,25.837 6.138,26.647C5.91,26.264 5.753,25.945 5.581,25.524C5.581,25.524 6.9,25.122 7.736,24.734C8.802,24.237 10.02,23.499 10.79,22.475C10.79,22.475 11.922,23.189 13.971,23.571C15.451,23.842 17.406,23.882 19.779,23.468C21.066,23.241 23.35,22.652 23.445,22.378Z"
android:fillColor="#D86D01"/>
<path
android:pathData="M23.322,23.551C20.964,24.264 15.696,25.456 11.005,23.689C11.005,23.689 9.256,25.399 5.966,26.345C6.019,26.443 6.076,26.542 6.138,26.646C9.363,25.837 11.082,24.156 11.082,24.156C17.092,26.485 23.258,23.881 23.258,23.881C23.281,23.772 23.303,23.662 23.322,23.551Z"
android:fillColor="#8C4401"/>
<path
android:pathData="M66.78,25.589C65.934,22.3 68.859,18.283 68.859,18.283C68.859,18.283 72.334,21.839 71.969,25.215C71.85,26.241 71.337,27.104 70.702,27.661C70.145,28.146 69.168,28.25 68.479,27.904C67.543,27.432 66.989,26.652 66.78,25.595L66.78,25.589Z"
android:fillColor="#FDB102"/>
<path
android:pathData="M67.866,26.226C67.358,24.25 69.115,21.84 69.115,21.84C69.115,21.84 71.2,23.973 70.981,26.002C70.909,26.617 70.603,27.134 70.224,27.47C69.891,27.763 69.303,27.822 68.89,27.615C68.327,27.331 67.995,26.866 67.872,26.231L67.866,26.226Z"
android:fillColor="#FDF406"/>
<path
android:pathData="M68.576,26.642C68.278,25.482 69.31,24.068 69.31,24.068C69.31,24.068 70.533,25.319 70.405,26.51C70.362,26.872 70.183,27.175 69.96,27.372C69.765,27.545 69.42,27.579 69.177,27.458C68.847,27.291 68.652,27.018 68.58,26.645L68.576,26.642Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M69.708,28.671C69.708,28.671 69.647,27.143 69.441,26.35"
android:strokeLineJoin="round"
android:strokeWidth="0.320014"
android:fillColor="#00000000"
android:strokeColor="#2A2B2B"
android:strokeLineCap="round"/>
<path
android:pathData="M53.369,32.238C54.961,37.678 60.18,41.467 66.068,41.042C71.957,40.618 76.557,36.137 77.37,30.536L65.228,30.388L53.369,32.244L53.369,32.238Z"
android:fillColor="#FFB400"/>
<path
android:pathData="M56.53,31.749C58.291,36.913 63.366,40.454 69.068,40.043C69.574,40.006 70.071,39.94 70.557,39.845C69.191,40.507 67.677,40.926 66.068,41.042C60.182,41.467 54.965,37.68 53.37,32.244L53.369,32.244L53.369,32.238L53.37,32.244L56.53,31.749Z"
android:strokeAlpha="0.5"
android:fillColor="#C17004"
android:fillAlpha="0.5"/>
<path
android:pathData="M72.087,38.961C74.907,37.05 76.866,34.008 77.37,30.535L76.001,30.5C76.001,33 74.605,36.9 72.087,38.961Z"
android:strokeAlpha="0.8"
android:fillColor="#FEE7AF"
android:fillAlpha="0.8"/>
<path
android:pathData="M53.368,32.216C53.318,31.528 58.65,30.585 65.275,30.108C71.901,29.63 77.322,29.848 77.371,30.536C77.396,30.888 75.991,31.266 73.723,31.656C72.652,31.838 71.123,30.267 69.724,30.429C68.325,30.59 67.067,32.479 65.46,32.595C58.834,33.072 53.423,32.904 53.374,32.216L53.368,32.216Z"
android:fillColor="#B25C05"/>
<path
android:pathData="M69.717,30.429C68.324,30.591 67.06,32.479 65.453,32.595C59.631,33.015 54.746,32.936 53.61,32.442C54.525,31.79 59.397,30.991 65.307,30.565C71.217,30.139 76.133,30.265 77.145,30.79C76.672,31.067 75.443,31.355 73.711,31.657C72.64,31.839 71.111,30.268 69.712,30.43L69.717,30.429Z"
android:fillColor="#8C4401"/>
<path
android:pathData="M53.383,32.271C53.568,32.921 53.818,33.55 54.11,34.143C54.11,34.143 62.881,35.497 69.855,30.558C69.855,30.558 72.609,32.162 77.018,32.16C77.187,31.595 77.287,31.134 77.371,30.536C77.371,30.536 75.544,30.446 74.344,30.217C72.813,29.924 71.008,29.368 69.687,28.302C69.687,28.302 68.463,29.585 65.951,30.739C64.136,31.567 61.635,32.251 58.449,32.486C56.721,32.611 53.594,32.593 53.383,32.271Z"
android:fillColor="#D86D01"/>
<path
android:pathData="M53.92,33.739C57.184,33.894 64.343,33.722 69.804,29.932C69.804,29.932 72.605,31.564 77.142,31.716C77.105,31.86 77.064,32.006 77.018,32.16C72.609,32.162 69.855,30.557 69.855,30.557C62.881,35.497 54.11,34.143 54.11,34.143C54.044,34.01 53.981,33.875 53.92,33.739Z"
android:fillColor="#8C4401"/>
<path
android:pathData="M65.365,30.101C65.335,30.104 65.305,30.106 65.275,30.108C58.649,30.586 53.318,31.528 53.368,32.216L53.373,32.216C53.374,32.225 53.375,32.234 53.378,32.242L53.37,32.243L53.369,32.238L53.369,32.244L53.37,32.243C54.736,36.903 58.764,40.35 63.593,40.973L65.365,30.101Z"
android:strokeAlpha="0.7"
android:fillColor="#1F002A"
android:fillAlpha="0.7"/>
<path
android:pathData="M18.238,5.37C18.372,5.396 18.372,5.604 18.238,5.63C16.429,5.975 15.975,6.429 15.63,8.238C15.604,8.372 15.396,8.372 15.37,8.238C15.025,6.429 14.571,5.975 12.762,5.63C12.628,5.604 12.628,5.396 12.762,5.37C14.571,5.025 15.025,4.571 15.37,2.762C15.396,2.628 15.604,2.628 15.63,2.762C15.975,4.571 16.429,5.025 18.238,5.37Z"
android:fillColor="#FFB400"/>
<path
android:pathData="M76.75,43.772C76.973,43.822 76.973,44.182 76.75,44.232C75.129,44.594 74.602,45.121 74.239,46.74C74.189,46.963 73.83,46.963 73.78,46.74C73.417,45.121 72.89,44.594 71.269,44.232C71.046,44.182 71.046,43.822 71.269,43.772C72.89,43.41 73.417,42.883 73.78,41.264C73.83,41.041 74.189,41.041 74.239,41.264C74.602,42.883 75.129,43.41 76.75,43.772Z"
android:fillColor="#FFB400"/>
</group>
</vector>