diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/common/settingscreen/ui/QRCard.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/common/settingscreen/ui/QRCard.kt index 33479e3fbf..cd6399bc88 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/common/settingscreen/ui/QRCard.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/common/settingscreen/ui/QRCard.kt @@ -38,6 +38,7 @@ import com.navi.common.extensions.conditional import com.navi.design.font.FontWeightEnum import com.navi.design.theme.getFontWeight import com.navi.design.theme.ttComposeFontFamily +import com.navi.naviwidgets.R as WidgetsR import com.navi.naviwidgets.extensions.NaviText import com.navi.pay.R import com.navi.pay.common.settingscreen.model.CardType @@ -173,7 +174,7 @@ fun QROnboardedView( ) { SecondaryRoundedButtonWithTextAndImage( text = stringResource(id = R.string.share), - icon = com.navi.naviwidgets.R.drawable.share_icon_svg, + icon = WidgetsR.drawable.share_icon_svg, modifier = Modifier.clip(RoundedCornerShape(4.dp)) .clickableDebounce { onSelected.invoke(SettingAction.Share(qrDetails)) } @@ -185,7 +186,7 @@ fun QROnboardedView( Spacer(modifier = Modifier.width(12.dp)) SecondaryRoundedButtonWithTextAndImage( text = stringResource(id = R.string.download), - icon = com.navi.naviwidgets.R.drawable.download_down_arrow_svg, + icon = WidgetsR.drawable.download_down_arrow_svg, modifier = Modifier.clip(RoundedCornerShape(4.dp)) .clickableDebounce { onSelected.invoke(SettingAction.Download(qrDetails)) } diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/upiid/ui/UPIIdInputScreen.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/upiid/ui/UPIIdInputScreen.kt index ebf4544408..b821faee5f 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/upiid/ui/UPIIdInputScreen.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/upiid/ui/UPIIdInputScreen.kt @@ -58,6 +58,7 @@ import com.navi.common.utils.EMPTY import com.navi.design.font.FontWeightEnum import com.navi.design.theme.getFontWeight import com.navi.design.theme.ttComposeFontFamily +import com.navi.naviwidgets.R as WidgetsR import com.navi.naviwidgets.extensions.NaviText import com.navi.pay.R import com.navi.pay.analytics.NaviPayAnalytics @@ -251,9 +252,7 @@ fun RenderUPIIdInputScreen( Image( painter = painterResource( - id = - com.navi.naviwidgets.R.drawable - .small_cross_purple + id = WidgetsR.drawable.small_cross_purple ), contentDescription = null, modifier = Modifier.size(24.dp) diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/lite/ui/UpiLiteLoadingStates.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/lite/ui/UpiLiteLoadingStates.kt index c859464fe7..fc9749afd1 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/lite/ui/UpiLiteLoadingStates.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/lite/ui/UpiLiteLoadingStates.kt @@ -18,6 +18,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.navi.design.font.FontWeightEnum +import com.navi.naviwidgets.R as WidgetsR import com.navi.pay.R import com.navi.pay.common.ui.EmptyDataScreen import com.navi.pay.common.ui.FullScreenLottie @@ -156,7 +157,7 @@ fun UpiLiteLoadingStates( } UpiLiteUiState.UPILITE_NOT_SUPPORTED -> { EmptyDataScreen( - iconResId = com.navi.naviwidgets.R.drawable.ic_dog_with_red_alert, + iconResId = WidgetsR.drawable.ic_dog_with_red_alert, title = stringResource(id = R.string.upi_lite_not_supported) ) } diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/mandate/ui/ModifyMandateScreen.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/mandate/ui/ModifyMandateScreen.kt index 585e5b91fd..7f5187718b 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/mandate/ui/ModifyMandateScreen.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/mandate/ui/ModifyMandateScreen.kt @@ -55,6 +55,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.navi.common.R as CommonR import com.navi.common.utils.CurrencyMaskTransformation import com.navi.common.utils.navigateUp import com.navi.design.font.FontWeightEnum @@ -442,7 +443,7 @@ fun ModifyMandateBottomSheetContent( when (bottomSheetType) { ModifyMandateBottomSheetType.ModifyMandateConfirmationBottomSheet -> { BottomSheetContentWithIconHeaderPrimarySecondaryButtonCtaLoader( - iconId = com.navi.common.R.drawable.ic_purple_exclamation, + iconId = CommonR.drawable.ic_purple_exclamation, iconSize = 24.dp, header = stringResource(R.string.np_please_note), description = diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/savedbeneficiary/ui/SavedBeneficiaryScreen.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/savedbeneficiary/ui/SavedBeneficiaryScreen.kt index 6d534ea5ad..d1fc8fb97e 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/savedbeneficiary/ui/SavedBeneficiaryScreen.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/savedbeneficiary/ui/SavedBeneficiaryScreen.kt @@ -65,6 +65,7 @@ import com.navi.design.font.FontWeightEnum import com.navi.design.theme.getFontWeight import com.navi.design.theme.ttComposeFontFamily import com.navi.design.utils.NoRippleIndicationSource +import com.navi.naviwidgets.R as WidgetsR import com.navi.naviwidgets.extensions.NaviText import com.navi.pay.R import com.navi.pay.analytics.NaviPayAnalytics @@ -629,7 +630,7 @@ private fun RenderSavedBeneficiarySearchScreen( isTrailingIconEnabled = searchQuery.isNotEmpty(), onTrailingIconClicked = onSearchBarClearQueryClicked, warningErrorInfoState = warningErrorInfoState.isErrorState, - trailingIconId = com.navi.naviwidgets.R.drawable.small_cross_purple, + trailingIconId = WidgetsR.drawable.small_cross_purple, ) LaunchedEffect(Unit) { diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/onboardingV2/viewmodel/NaviPayOnboardingViewModel.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/onboardingV2/viewmodel/NaviPayOnboardingViewModel.kt index 8c906ffbe1..1bec3abd2d 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/onboardingV2/viewmodel/NaviPayOnboardingViewModel.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/onboardingV2/viewmodel/NaviPayOnboardingViewModel.kt @@ -257,9 +257,9 @@ constructor( softUpgrade = true, hardUpgrade = false, expectedAppVersionCode = 0, - downloadableUrl = com.navi.base.utils.EMPTY, - verificationHash = com.navi.base.utils.EMPTY, - updateType = com.navi.base.utils.EMPTY, + downloadableUrl = EMPTY, + verificationHash = EMPTY, + updateType = EMPTY, title = naviPayDefaultConfig.config.appUpgradeTitle, description = naviPayDefaultConfig.config.appUpgradeDescription, ) @@ -800,11 +800,10 @@ constructor( deviceFingerPrint = "", provider = NetworkProvider( - ssid = - selectedSimInfo.value?.subscriptionId ?: com.navi.base.utils.EMPTY, + ssid = selectedSimInfo.value?.subscriptionId ?: EMPTY, phoneNumber = "$INDIA_COUNTRY_CODE_WITHOUT_PLUS$userPhoneNumber", simSlot = selectedSimInfo.value?.simSlotIndex.toString(), - name = selectedSimInfo.value?.carrierName ?: com.navi.base.utils.EMPTY + name = selectedSimInfo.value?.carrierName ?: EMPTY ), deviceId = onboardingDeviceData.deviceId, packageName = onboardingDeviceData.packageName @@ -841,11 +840,10 @@ constructor( packageName = onboardingDeviceData.packageName, provider = NetworkProvider( - ssid = - selectedSimInfo.value?.subscriptionId ?: com.navi.base.utils.EMPTY, + ssid = selectedSimInfo.value?.subscriptionId ?: EMPTY, phoneNumber = "$INDIA_COUNTRY_CODE_WITHOUT_PLUS$userPhoneNumber", simSlot = selectedSimInfo.value?.simSlotIndex.toString(), - name = selectedSimInfo.value?.carrierName ?: com.navi.base.utils.EMPTY + name = selectedSimInfo.value?.carrierName ?: EMPTY ) ) @@ -1054,10 +1052,10 @@ constructor( packageName = packageName, provider = NetworkProvider( - ssid = selectedSimInfo.value?.subscriptionId ?: com.navi.base.utils.EMPTY, + ssid = selectedSimInfo.value?.subscriptionId ?: EMPTY, phoneNumber = "$INDIA_COUNTRY_CODE_WITHOUT_PLUS$userPhoneNumber", simSlot = selectedSimInfo.value?.simSlotIndex.toString(), - name = selectedSimInfo.value?.carrierName ?: com.navi.base.utils.EMPTY + name = selectedSimInfo.value?.carrierName ?: EMPTY ) ) deviceInfoProvider.saveDeviceData(deviceData = deviceData!!) diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/common/PaymentStatusSection.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/common/PaymentStatusSection.kt index bdb8377cbf..481f70041f 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/common/PaymentStatusSection.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/common/PaymentStatusSection.kt @@ -33,6 +33,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.navi.base.utils.EMPTY +import com.navi.common.R as CommonR import com.navi.common.ui.compose.EquilateralTriangle import com.navi.common.utils.CommonUtils.capitalizeMeridiem import com.navi.design.font.FontWeightEnum @@ -242,7 +243,7 @@ private fun CoinDiscountBanner(availableCoinsDiscount: String?, coinsSavedMessag ) Spacer(modifier = Modifier.width(4.dp)) Image( - painter = painterResource(id = com.navi.common.R.drawable.ic_np_coin), + painter = painterResource(id = CommonR.drawable.ic_np_coin), contentDescription = EMPTY, modifier = Modifier.size(16.dp).align(Alignment.CenterVertically) ) diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/common/ShowMoreLessButton.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/common/ShowMoreLessButton.kt index 30a1b6c4f5..d22574a696 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/common/ShowMoreLessButton.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/common/ShowMoreLessButton.kt @@ -23,11 +23,12 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.navi.common.R +import com.navi.common.R as CommonR import com.navi.design.font.FontWeightEnum import com.navi.design.theme.getFontWeight import com.navi.design.theme.ttComposeFontFamily import com.navi.naviwidgets.extensions.NaviText +import com.navi.pay.R import com.navi.pay.common.theme.color.NaviPayColor import com.navi.pay.common.ui.DashedHorizontalDivider import com.navi.pay.utils.clickableDebounce @@ -57,8 +58,8 @@ fun ShowMoreLessButton(isTransactionDetailsVisible: Boolean, onClick: () -> Unit text = stringResource( id = - if (isTransactionDetailsVisible) com.navi.pay.R.string.np_show_less - else com.navi.pay.R.string.np_show_more + if (isTransactionDetailsVisible) R.string.np_show_less + else R.string.np_show_more ), fontFamily = ttComposeFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), @@ -70,7 +71,7 @@ fun ShowMoreLessButton(isTransactionDetailsVisible: Boolean, onClick: () -> Unit Image( modifier = Modifier.rotate(if (isTransactionDetailsVisible) 180f else 0f), - painter = painterResource(id = R.drawable.ic_chevron_down), + painter = painterResource(id = CommonR.drawable.ic_chevron_down), contentDescription = "" ) } diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/upi/NaviPayOrderDetailsSummarySection.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/upi/NaviPayOrderDetailsSummarySection.kt index c452e86058..beb6f0e759 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/upi/NaviPayOrderDetailsSummarySection.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/upi/NaviPayOrderDetailsSummarySection.kt @@ -514,7 +514,7 @@ fun ColumnScope.KeyValueSections( Spacer(modifier = Modifier.width(8.dp)) Image( - painter = painterResource(id = com.navi.common.R.drawable.ic_chevron_down), + painter = painterResource(id = CommonR.drawable.ic_chevron_down), contentDescription = EMPTY, modifier = Modifier.rotate(if (isTransactionDetailsVisible) 180f else 0f), ) 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 e5a7fa5c31..bceb8241e2 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 @@ -33,6 +33,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.AsyncImage +import com.navi.common.R as CommonR import com.navi.design.font.FontWeightEnum import com.navi.design.theme.getFontWeight import com.navi.design.theme.ttComposeFontFamily @@ -246,7 +247,7 @@ fun RenderOrderHistoryItemView( ) Spacer(modifier = Modifier.width(2.dp)) Image( - painter = painterResource(id = com.navi.common.R.drawable.ic_np_coin), + painter = painterResource(id = CommonR.drawable.ic_np_coin), contentDescription = "", modifier = Modifier.size(16.dp) )