diff --git a/.github/workflows/metrics_logger.yml b/.github/workflows/metrics_logger.yml index 2285d9cc3e..8296d63aab 100644 --- a/.github/workflows/metrics_logger.yml +++ b/.github/workflows/metrics_logger.yml @@ -73,4 +73,8 @@ jobs: echo "Input value: ${{ matrix.build_type }}" timestamp=$(($(date +%s) * 1000)) && echo "{\"events\":[{\"attributes\":{\"$build_time_key\":\"${{ steps.build_apk.outputs.BUILD_TIME }}\",\"$apk_size_key\":\"${{ steps.apk_size.outputs.APK_SIZE }}\"},\"event_name\":\"app_dev_exp_metrics\",\"timestamp\":$timestamp}]}" - timestamp=$(($(date +%s) * 1000)) && curl -X POST -H "Content-Type: application/json" -d "{\"events\":[{\"attributes\":{\"$build_time_key\":\"${{ steps.build_apk.outputs.BUILD_TIME }}\",\"$apk_size_key\":\"${{ steps.apk_size.outputs.APK_SIZE }}\"},\"event_name\":\"app_dev_exp_metrics\",\"timestamp\":$timestamp}]}" https://janus.prod.navi-tech.in/events/json \ No newline at end of file + timestamp=$(($(date +%s) * 1000)) && curl -X POST -H "Content-Type: application/json" -d "{\"events\":[{\"attributes\":{\"$build_time_key\":\"${{ steps.build_apk.outputs.BUILD_TIME }}\",\"$apk_size_key\":\"${{ steps.apk_size.outputs.APK_SIZE }}\"},\"event_name\":\"app_dev_exp_metrics\",\"timestamp\":$timestamp}]}" https://janus.prod.navi-tech.in/events/json + - name: Run UI tests + if: matrix.build_type == 'freshDebug' + run: | + ./gradlew :app:connectedQaDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.package=com.navi.ap --stacktrace \ No newline at end of file diff --git a/CODEOWNERS b/CODEOWNERS index d7c8074ad0..0d2e35ed1e 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -9,7 +9,7 @@ /navi-amc/ @navi-android/leads @navi-android/amc-codeowners /navi-gold/ @navi-android/leads @navi-android/dg-codeowners /navi-rr/ @navi-android/leads @navi-android/rr-codeowners -/navi-ap/ @navi-android/leads @navi-android/ap-codeowners +/application-platform/ @navi-android/leads @navi-android/ap-codeowners /navi-chat/ @navi-android/leads @navi-android/crm-codeowners CODEOWNERS @navi-android/critical-codeowners Dockerfile @navi-android/critical-codeowners diff --git a/app/src/main/java/com/naviapp/account_aggregator/AccountAggregatorActivity.kt b/app/src/main/java/com/naviapp/account_aggregator/AccountAggregatorActivity.kt index cbc8128deb..a827074440 100644 --- a/app/src/main/java/com/naviapp/account_aggregator/AccountAggregatorActivity.kt +++ b/app/src/main/java/com/naviapp/account_aggregator/AccountAggregatorActivity.kt @@ -7,6 +7,8 @@ package com.naviapp.account_aggregator +import com.navi.insurance.R as InsuranceR +import com.navi.design.R as DesignR import android.annotation.SuppressLint import android.os.Bundle import android.text.TextUtils @@ -157,7 +159,7 @@ class AccountAggregatorActivity : BaseActivity() { binding.progressLayout.setBackgroundColor( ContextCompat.getColor( this@AccountAggregatorActivity, - R.color.white + DesignR.color.white ) ) binding.title.setTextFieldData( @@ -165,7 +167,7 @@ class AccountAggregatorActivity : BaseActivity() { text = getString(R.string.redirecting_to_account_aggregator), size = DEFAULT_TEXT_SIZE, font = FontWeightEnum.TT_MEDIUM.name, - textColor = getString(R.color.naviBlackText) + textColor = getString(InsuranceR.color.naviBlackText) ) ) } @@ -192,7 +194,7 @@ class AccountAggregatorActivity : BaseActivity() { binding.progressLayout.setBackgroundColor( ContextCompat.getColor( this@AccountAggregatorActivity, - R.color.cta_purple_color + DesignR.color.cta_purple_color ) ) binding.title.setTextFieldData( @@ -200,7 +202,7 @@ class AccountAggregatorActivity : BaseActivity() { text = getString(R.string.verifying_bank_statement), size = DEFAULT_TEXT_SIZE, font = FontWeightEnum.TT_MEDIUM.name, - textColor = getString(R.color.white) + textColor = getString(DesignR.color.white) ) ) } diff --git a/app/src/main/java/com/naviapp/appupdate/activities/UpdateAppActivity.kt b/app/src/main/java/com/naviapp/appupdate/activities/UpdateAppActivity.kt index 4abfd79c2a..7a66bdeb43 100644 --- a/app/src/main/java/com/naviapp/appupdate/activities/UpdateAppActivity.kt +++ b/app/src/main/java/com/naviapp/appupdate/activities/UpdateAppActivity.kt @@ -7,6 +7,8 @@ package com.naviapp.appupdate.activities +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.content.Intent import android.net.Uri import android.os.Bundle @@ -58,8 +60,8 @@ class UpdateAppActivity : BaseActivity(), View.OnClickListener { setTextSize(textSize = resources.getInteger(R.integer.font_small)) setTitleFont(font = FontWeightEnum.TT_SEMI_BOLD) setViewBg( - cornerRadiusId = R.integer.integer_4, - bgColor = R.color.dark_purple, + cornerRadiusId = WidgetsR.integer.integer_4, + bgColor = DesignR.color.dark_purple, elevation = 0F, ) } diff --git a/app/src/main/java/com/naviapp/common/adapter/CheckBoxAdapter.kt b/app/src/main/java/com/naviapp/common/adapter/CheckBoxAdapter.kt index 5d2b9c5f14..9a876cffd2 100644 --- a/app/src/main/java/com/naviapp/common/adapter/CheckBoxAdapter.kt +++ b/app/src/main/java/com/naviapp/common/adapter/CheckBoxAdapter.kt @@ -7,6 +7,7 @@ package com.naviapp.common.adapter +import com.navi.common.R as CommonR import android.content.Context import android.view.LayoutInflater import android.view.View @@ -59,11 +60,11 @@ class CheckBoxAdapter( viewHolder = view.tag as CheckboxViewHolder } if (data.isChecked) { - view.setBackgroundResource(R.drawable.bg_rounded_white_red_border_8) + view.setBackgroundResource(CommonR.drawable.bg_rounded_white_red_border_8) viewHolder.checkbox.isChecked = true - TextViewCompat.setTextAppearance(viewHolder.title, R.style.AgreementFontStyle) + TextViewCompat.setTextAppearance(viewHolder.title, CommonR.style.AgreementFontStyle) } else { - view.setBackgroundResource(R.drawable.bg_rounded_white_grey_border_8) + view.setBackgroundResource(CommonR.drawable.bg_rounded_white_grey_border_8) viewHolder.checkbox.isChecked = false TextViewCompat.setTextAppearance(viewHolder.title, R.style.DescriptionFontStyle) } diff --git a/app/src/main/java/com/naviapp/common/adapter/NpsGridAdapter.kt b/app/src/main/java/com/naviapp/common/adapter/NpsGridAdapter.kt index 966494261b..74ae41b854 100644 --- a/app/src/main/java/com/naviapp/common/adapter/NpsGridAdapter.kt +++ b/app/src/main/java/com/naviapp/common/adapter/NpsGridAdapter.kt @@ -7,6 +7,7 @@ package com.naviapp.common.adapter +import com.navi.common.R as CommonR import android.content.Context import android.view.LayoutInflater import android.view.View @@ -68,7 +69,7 @@ class NpsGridAdapter( R.color.red ) ) - TextViewCompat.setTextAppearance(viewHolder.title, R.style.AgreementFontStyle) + TextViewCompat.setTextAppearance(viewHolder.title, CommonR.style.AgreementFontStyle) } else { view.setBackgroundResource(R.drawable.grey_fill_background) viewHolder.tick.setColorFilter( @@ -89,7 +90,7 @@ class NpsGridAdapter( R.color.red ) ) - TextViewCompat.setTextAppearance(viewHolder.title, R.style.AgreementFontStyle) + TextViewCompat.setTextAppearance(viewHolder.title, CommonR.style.AgreementFontStyle) } else { view.setBackgroundResource(R.drawable.grey_fill_background) viewHolder.tick.setColorFilter( @@ -114,4 +115,4 @@ class NpsGridAdapter( var title = binding.title } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/common/adapter/OptionSelectAdapter.kt b/app/src/main/java/com/naviapp/common/adapter/OptionSelectAdapter.kt index c0e9e59318..8a9bd3489a 100644 --- a/app/src/main/java/com/naviapp/common/adapter/OptionSelectAdapter.kt +++ b/app/src/main/java/com/naviapp/common/adapter/OptionSelectAdapter.kt @@ -7,6 +7,7 @@ package com.naviapp.common.adapter +import com.navi.design.R as DesignR import android.annotation.SuppressLint import android.view.LayoutInflater import android.view.View @@ -36,7 +37,7 @@ class OptionSelectAdapter(val items: ArrayList, val listener: Option holder.binding.tickIv.visibility = View.VISIBLE } else { holder.binding.cardRow.setBackgroundResource( - R.drawable.rounded_rectange_white_border_8dp_radius + DesignR.drawable.rounded_rectange_white_border_8dp_radius ) holder.binding.tickIv.visibility = View.GONE } diff --git a/app/src/main/java/com/naviapp/common/customview/ActionButtonViewWithShimmerV2.kt b/app/src/main/java/com/naviapp/common/customview/ActionButtonViewWithShimmerV2.kt index 2aad77fcdb..e35f7d581f 100644 --- a/app/src/main/java/com/naviapp/common/customview/ActionButtonViewWithShimmerV2.kt +++ b/app/src/main/java/com/naviapp/common/customview/ActionButtonViewWithShimmerV2.kt @@ -7,6 +7,7 @@ package com.naviapp.common.customview +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.util.AttributeSet import android.view.Gravity @@ -185,7 +186,7 @@ class ActionButtonViewWithShimmerV2 @JvmOverloads constructor( footer?.nextCtaAnimation?.lottieFieldData ) } ?: run { - binding.lottieView.setAnimation(R.raw.cta_chevron) + binding.lottieView.setAnimation(WidgetsR.raw.cta_chevron) binding.lottieView.playAnimation() } } else { diff --git a/app/src/main/java/com/naviapp/common/customview/ActionButtonWithHeaderView.kt b/app/src/main/java/com/naviapp/common/customview/ActionButtonWithHeaderView.kt index 212e37b374..d959808546 100644 --- a/app/src/main/java/com/naviapp/common/customview/ActionButtonWithHeaderView.kt +++ b/app/src/main/java/com/naviapp/common/customview/ActionButtonWithHeaderView.kt @@ -1,5 +1,7 @@ package com.naviapp.common.customview +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR import android.app.Activity import android.content.Context import android.graphics.PorterDuff @@ -44,7 +46,7 @@ class ActionButtonWithHeaderView @JvmOverloads constructor( titleColor: Int? = R.color.white, iconId: Int? = null, iconColor: Int = R.color.white, - headerIcon: Int? = R.drawable.ic_security_checked_green_svg, + headerIcon: Int? = CommonR.drawable.ic_security_checked_green_svg, headerText: String? = context.getString(R.string.your_data_is_safe), headerTextColor: Int? = null ) { @@ -133,9 +135,9 @@ class ActionButtonWithHeaderView @JvmOverloads constructor( fun setState(isEnabled: Boolean) { this.isEnabled = isEnabled if (isEnabled) { - setABVBackgroundColor(R.color.active_button_color) + setABVBackgroundColor(DesignR.color.active_button_color) } else { - setABVBackgroundColor(R.color.disabled_button_color) + setABVBackgroundColor(DesignR.color.disabled_button_color) } } @@ -202,4 +204,4 @@ class ActionButtonWithHeaderView @JvmOverloads constructor( ContextCompat.getColor(context, R.color.shadow_color) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/common/customview/ActionCardBannerWithPaddingView.kt b/app/src/main/java/com/naviapp/common/customview/ActionCardBannerWithPaddingView.kt index 0ab2263b7b..c2105367d6 100644 --- a/app/src/main/java/com/naviapp/common/customview/ActionCardBannerWithPaddingView.kt +++ b/app/src/main/java/com/naviapp/common/customview/ActionCardBannerWithPaddingView.kt @@ -7,6 +7,7 @@ package com.naviapp.common.customview +import com.navi.insurance.R as InsuranceR import android.content.Context import android.graphics.Color import android.os.Build @@ -47,7 +48,7 @@ class ActionCardBannerWithPaddingView( if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { outlineSpotShadowColor = ContextCompat.getColor(context, R.color.shadow_color) outlineAmbientShadowColor = ContextCompat.getColor(context, R.color.shadow_color) - elevation = resources.getDimension(R.dimen.dp_4) + elevation = resources.getDimension(InsuranceR.dimen.dp_4) } } @@ -68,8 +69,8 @@ class ActionCardBannerWithPaddingView( } widgetBody?.borderColor?.let { binding.cardViewBanner.background = getNaviDrawable( - cornerRadius = resources.getDimension(R.dimen.dp_4).toInt(), - strokeWidth = resources.getDimension(R.dimen.dp_1).toInt(), + cornerRadius = resources.getDimension(InsuranceR.dimen.dp_4).toInt(), + strokeWidth = resources.getDimension(InsuranceR.dimen.dp_1).toInt(), strokeColor = it.parseColorSafe() ) } @@ -97,7 +98,7 @@ class ActionCardBannerWithPaddingView( if (additionalData?.widgetValidationRequired == true && data?.widgetBody?.errorState?.valuePrefill == false) { data?.widgetBody?.errorState?.let { binding.cardViewBanner.background = getNaviDrawable( - cornerRadius = resources.getDimension(R.dimen.dp_4).toInt(), + cornerRadius = resources.getDimension(InsuranceR.dimen.dp_4).toInt(), strokeWidth = resources.getDimension(R.dimen.layout_dp_1).toInt(), strokeColor = it.errorColor.parseColorSafe(), backgroundColor = data?.widgetBody?.bgColor.parseColorSafe() diff --git a/app/src/main/java/com/naviapp/common/customview/AnimatedTagView.kt b/app/src/main/java/com/naviapp/common/customview/AnimatedTagView.kt index 54e6bf64de..7beb80c0fd 100644 --- a/app/src/main/java/com/naviapp/common/customview/AnimatedTagView.kt +++ b/app/src/main/java/com/naviapp/common/customview/AnimatedTagView.kt @@ -1,5 +1,6 @@ package com.naviapp.common.customview +import com.navi.common.R as CommonR import android.content.Context import android.graphics.PorterDuff import android.graphics.PorterDuffColorFilter @@ -40,7 +41,7 @@ class AnimatedTagView(context: Context?, attrs: AttributeSet?) : LinearLayout(co binding.parentView.background = getNaviDrawable( backgroundColor = cardDataV2.title.backgroundColor.parseColorSafe(), - cornerRadius = if (cardDataV2.radius != null) dpToPx(cardDataV2.radius).toInt() else resources.getDimension(com.navi.common.R.dimen.layout_dp_100).toInt() + cornerRadius = if (cardDataV2.radius != null) dpToPx(cardDataV2.radius).toInt() else resources.getDimension(CommonR.dimen.layout_dp_100).toInt() ) } @@ -83,4 +84,4 @@ class AnimatedTagView(context: Context?, attrs: AttributeSet?) : LinearLayout(co const val JSON_EXTENSION = ".json" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/common/customview/BannerWithIconAndTitleView.kt b/app/src/main/java/com/naviapp/common/customview/BannerWithIconAndTitleView.kt index 0dfb566fff..b788d5cf45 100644 --- a/app/src/main/java/com/naviapp/common/customview/BannerWithIconAndTitleView.kt +++ b/app/src/main/java/com/naviapp/common/customview/BannerWithIconAndTitleView.kt @@ -6,6 +6,7 @@ package com.naviapp.common.customview +import com.navi.design.R as DesignR import android.animation.ValueAnimator import android.content.Context import android.util.AttributeSet @@ -40,7 +41,7 @@ class BannerWithIconAndTitleView @JvmOverloads constructor( cornerRadius = resources.getDimension(R.dimen.layout_dp_8).toInt(), backgroundColor = ResourcesCompat.getColor( resources, - R.color.view_background_color_six, + DesignR.color.view_background_color_six, null ) ) @@ -99,4 +100,4 @@ class BannerWithIconAndTitleView @JvmOverloads constructor( scaleAnimator = null } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/common/customview/BaseDialog.kt b/app/src/main/java/com/naviapp/common/customview/BaseDialog.kt index d4ca92ad2b..34bd8cc340 100644 --- a/app/src/main/java/com/naviapp/common/customview/BaseDialog.kt +++ b/app/src/main/java/com/naviapp/common/customview/BaseDialog.kt @@ -15,7 +15,7 @@ import com.naviapp.R abstract class BaseDialog( context: Context, - dialogStyle: Int = R.style.Theme_AppCompat_Dialog_Alert + dialogStyle: Int = androidx.appcompat.R.style.Theme_AppCompat_Dialog_Alert ) : Dialog(context, dialogStyle) { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/naviapp/common/customview/BenefitLineItemView.kt b/app/src/main/java/com/naviapp/common/customview/BenefitLineItemView.kt index 7df06433b5..f8e3dcb5ff 100644 --- a/app/src/main/java/com/naviapp/common/customview/BenefitLineItemView.kt +++ b/app/src/main/java/com/naviapp/common/customview/BenefitLineItemView.kt @@ -6,6 +6,8 @@ package com.naviapp.common.customview +import com.navi.chat.R as ChatR + import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -35,7 +37,7 @@ class BenefitLineItemView @JvmOverloads constructor( background = getNaviDrawable( cornerRadius = resources.getDimension(R.dimen.layout_dp_12).toInt(), strokeWidth = resources.getDimension(R.dimen.layout_dp_1).toInt(), - strokeColor = ResourcesCompat.getColor(resources, R.color.divider_color, null) + strokeColor = ResourcesCompat.getColor(resources, ChatR.color.divider_color, null) ) } @@ -63,4 +65,4 @@ class BenefitLineItemView @JvmOverloads constructor( } }.root } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/common/customview/BoxWithIconView.kt b/app/src/main/java/com/naviapp/common/customview/BoxWithIconView.kt index 174b957854..90bd5fa361 100644 --- a/app/src/main/java/com/naviapp/common/customview/BoxWithIconView.kt +++ b/app/src/main/java/com/naviapp/common/customview/BoxWithIconView.kt @@ -7,6 +7,7 @@ package com.naviapp.common.customview +import com.navi.design.R as DesignR import android.content.Context import android.os.Build import android.util.AttributeSet @@ -88,7 +89,7 @@ class BoxWithIconView @JvmOverloads constructor( binding.titleTv.setTextColor( ResourcesCompat.getColor( resources, - R.color.grey_charcoal, + DesignR.color.grey_charcoal, null ) ) @@ -111,10 +112,10 @@ class BoxWithIconView @JvmOverloads constructor( binding.titleTv.setTextColor( ResourcesCompat.getColor( resources, - R.color.grey_charcoal, + DesignR.color.grey_charcoal, null ) ) IconUtils.updateIcon(unselectedIconCode, binding.iconImv) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/common/customview/CapsuleView.kt b/app/src/main/java/com/naviapp/common/customview/CapsuleView.kt index 0c883b6fe0..d2d1fea88a 100644 --- a/app/src/main/java/com/naviapp/common/customview/CapsuleView.kt +++ b/app/src/main/java/com/naviapp/common/customview/CapsuleView.kt @@ -7,6 +7,7 @@ package com.naviapp.common.customview +import com.navi.insurance.R as InsuranceR import android.content.Context import android.graphics.drawable.GradientDrawable import android.util.AttributeSet @@ -31,7 +32,7 @@ class CapsuleView(context: Context, attrs: AttributeSet?) : ConstraintLayout(con title?.let { binding.textTv.text = it } - setCornerRadius(R.color.dusky_pink, R.color.gray_medium_40) + setCornerRadius(com.digitap.dtokyc.R.color.dusky_pink, R.color.gray_medium_40) } private fun setCornerRadius(boxColor: Int, boundaryColor: Int) { @@ -39,7 +40,7 @@ class CapsuleView(context: Context, attrs: AttributeSet?) : ConstraintLayout(con val indexList = arrayListOf(0, 1, 2, 3, 4, 5, 6, 7) val radii = FloatArray(8) indexList.forEach { - radii[it] = resources.getDimension(R.dimen.dp_6) + radii[it] = resources.getDimension(InsuranceR.dimen.dp_6) } gradientDrawable.cornerRadii = radii gradientDrawable.setColor(resources.getColor(boxColor)) @@ -52,6 +53,6 @@ class CapsuleView(context: Context, attrs: AttributeSet?) : ConstraintLayout(con } fun deSelectCapsuleBoxView() { - setCornerRadius(R.color.dusky_pink, R.color.gray_medium_40) + setCornerRadius(com.digitap.dtokyc.R.color.dusky_pink, R.color.gray_medium_40) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/common/customview/ColorBoxView.kt b/app/src/main/java/com/naviapp/common/customview/ColorBoxView.kt index 804e5aaaa1..6587833ea9 100644 --- a/app/src/main/java/com/naviapp/common/customview/ColorBoxView.kt +++ b/app/src/main/java/com/naviapp/common/customview/ColorBoxView.kt @@ -7,6 +7,7 @@ package com.naviapp.common.customview +import com.navi.insurance.R as InsuranceR import android.content.Context import android.graphics.Color import android.graphics.drawable.GradientDrawable @@ -48,7 +49,7 @@ class ColorBoxView(context: Context, attrs: AttributeSet?, width: Int) : val gradientDrawable = GradientDrawable() val radii = FloatArray(8) indexList.forEach { - radii[it] = resources.getDimension(R.dimen.dp_8) + radii[it] = resources.getDimension(InsuranceR.dimen.dp_8) } gradientDrawable.cornerRadii = radii if (onClick) { diff --git a/app/src/main/java/com/naviapp/common/customview/ConsentDetailView.kt b/app/src/main/java/com/naviapp/common/customview/ConsentDetailView.kt index 51568b9137..ac7bd5963d 100644 --- a/app/src/main/java/com/naviapp/common/customview/ConsentDetailView.kt +++ b/app/src/main/java/com/naviapp/common/customview/ConsentDetailView.kt @@ -7,6 +7,8 @@ package com.naviapp.common.customview +import com.navi.insurance.R as InsuranceR +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -27,7 +29,7 @@ class ConsentDetailView(context: Context, attrs: AttributeSet?) : ConstraintLayo init { val inflater = LayoutInflater.from(context) binding = DataBindingUtil.inflate(inflater, R.layout.layout_consent_details, this, true) - binding.detailsWrapper.setCornerRadius(resources.getDimensionPixelSize(R.dimen._4dp)) + binding.detailsWrapper.setCornerRadius(resources.getDimensionPixelSize(com.navi.amc.R.dimen._4dp)) setExpanded(false) binding.clickerView.setOnClickListener { setExpanded(!isExpanded) @@ -51,10 +53,10 @@ class ConsentDetailView(context: Context, attrs: AttributeSet?) : ConstraintLayo fun setExpanded(isExpanded: Boolean) { if (isExpanded) { binding.detailsWrapper.visibility = View.VISIBLE - binding.arrowIv.setImageResource(R.drawable.arrow_up) + binding.arrowIv.setImageResource(DesignR.drawable.arrow_up) } else { binding.detailsWrapper.visibility = View.GONE - binding.arrowIv.setImageResource(R.drawable.arrow_down_without_tail) + binding.arrowIv.setImageResource(InsuranceR.drawable.arrow_down_without_tail) } this.isExpanded = isExpanded } diff --git a/app/src/main/java/com/naviapp/common/customview/DescExpandableCardView.kt b/app/src/main/java/com/naviapp/common/customview/DescExpandableCardView.kt index 29b1abf888..f93d797690 100644 --- a/app/src/main/java/com/naviapp/common/customview/DescExpandableCardView.kt +++ b/app/src/main/java/com/naviapp/common/customview/DescExpandableCardView.kt @@ -7,6 +7,7 @@ package com.naviapp.common.customview +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -79,7 +80,7 @@ constructor(context: Context, attrs: AttributeSet? = null) : CardView(context, a private fun getIconIdFromIcon(icon: String?): Int? { return when (icon) { - ICON_DOWN_ARROW_GREY -> R.drawable.ic_down_arrow_grey_svg + ICON_DOWN_ARROW_GREY -> WidgetsR.drawable.ic_down_arrow_grey_svg ICON_UP_ARROW_MAGENTA -> R.drawable.ic_up_arrow_magenta else -> null } diff --git a/app/src/main/java/com/naviapp/common/customview/EmiTableView.kt b/app/src/main/java/com/naviapp/common/customview/EmiTableView.kt index e989509920..d35f2e6cbf 100644 --- a/app/src/main/java/com/naviapp/common/customview/EmiTableView.kt +++ b/app/src/main/java/com/naviapp/common/customview/EmiTableView.kt @@ -7,6 +7,7 @@ package com.naviapp.common.customview +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -93,7 +94,7 @@ class EmiTableView @JvmOverloads constructor( private fun initUI() { binding.headerSectionLl.background = getNaviDrawable( strokeWidth = resources.getDimension(R.dimen.layout_dp_1).toInt(), - strokeColor = ResourcesCompat.getColor(resources, R.color.light_white_gray, null), + strokeColor = ResourcesCompat.getColor(resources, DesignR.color.light_white_gray, null), backgroundColor = ResourcesCompat.getColor( resources, R.color.view_background_color_seven, null ), @@ -105,10 +106,10 @@ class EmiTableView @JvmOverloads constructor( binding.rootItem.background = getNaviDrawable( cornerRadius = resources.getDimension(R.dimen.layout_dp_8).toInt(), strokeWidth = resources.getDimension(R.dimen.layout_dp_1).toInt(), - strokeColor = ResourcesCompat.getColor(resources, R.color.light_white_gray, null), + strokeColor = ResourcesCompat.getColor(resources, DesignR.color.light_white_gray, null), ) val layoutParams = binding.recyclerView.layoutParams as? ConstraintLayout.LayoutParams layoutParams?.matchConstraintMaxHeight = (getScreenHeight() * 0.45).toInt() binding.recyclerView.layoutParams = layoutParams } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/common/customview/FooterView.kt b/app/src/main/java/com/naviapp/common/customview/FooterView.kt index b474397c7f..f86803090f 100644 --- a/app/src/main/java/com/naviapp/common/customview/FooterView.kt +++ b/app/src/main/java/com/naviapp/common/customview/FooterView.kt @@ -7,6 +7,7 @@ package com.naviapp.common.customview +import com.navi.design.R as DesignR import android.content.Context import android.content.res.ColorStateList import android.util.AttributeSet @@ -118,10 +119,10 @@ class FooterView(context: Context, attrs: AttributeSet?) : ConstraintLayout(cont fun enableNextButton(enabled: Boolean) { binding.nextView.isEnabled = enabled if (enabled) { - binding.nextView.setViewBg(bgColor = R.color.active_button_color) + binding.nextView.setViewBg(bgColor = DesignR.color.active_button_color) binding.nextView.tag = NextButtonTag.ENABLED } else { - binding.nextView.setViewBg(bgColor = R.color.disabled_button_color) + binding.nextView.setViewBg(bgColor = DesignR.color.disabled_button_color) binding.nextView.tag = NextButtonTag.DISABLED } } @@ -129,10 +130,10 @@ class FooterView(context: Context, attrs: AttributeSet?) : ConstraintLayout(cont // Just changes the colour and tag but you can still listen to the click fun changeNextButtonBackground(enabled: Boolean) { if (enabled) { - binding.nextView.setViewBg(bgColor = R.color.active_button_color) + binding.nextView.setViewBg(bgColor = DesignR.color.active_button_color) binding.nextView.tag = NextButtonTag.ENABLED } else { - binding.nextView.setViewBg(bgColor = R.color.disabled_button_color) + binding.nextView.setViewBg(bgColor = DesignR.color.disabled_button_color) binding.nextView.tag = NextButtonTag.DISABLED } } diff --git a/app/src/main/java/com/naviapp/common/customview/FooterViewV2.kt b/app/src/main/java/com/naviapp/common/customview/FooterViewV2.kt index 5e1adff51a..d8ef29e3ad 100644 --- a/app/src/main/java/com/naviapp/common/customview/FooterViewV2.kt +++ b/app/src/main/java/com/naviapp/common/customview/FooterViewV2.kt @@ -7,6 +7,7 @@ package com.naviapp.common.customview +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -75,7 +76,7 @@ class FooterViewV2 @JvmOverloads constructor(context: Context?, attrs: Attribute binding.prevBtn.background = getNaviDrawable( backgroundColor = - ResourcesCompat.getColor(resources, R.color.view_background_color_six, null), + ResourcesCompat.getColor(resources, DesignR.color.view_background_color_six, null), cornerRadius = resources.getDimension(R.dimen.layout_dp_24).toInt() ) @@ -148,7 +149,7 @@ class FooterViewV2 @JvmOverloads constructor(context: Context?, attrs: Attribute backgroundColor = ResourcesCompat.getColor( resources, - R.color.view_background_color_six, + DesignR.color.view_background_color_six, null ), cornerRadius = resources.getDimension(R.dimen.layout_dp_24).toInt() diff --git a/app/src/main/java/com/naviapp/common/customview/FooterViewWithText.kt b/app/src/main/java/com/naviapp/common/customview/FooterViewWithText.kt index de4d333643..04e1a5fae5 100644 --- a/app/src/main/java/com/naviapp/common/customview/FooterViewWithText.kt +++ b/app/src/main/java/com/naviapp/common/customview/FooterViewWithText.kt @@ -7,6 +7,7 @@ package com.naviapp.common.customview +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Typeface import android.text.SpannableString @@ -107,10 +108,10 @@ class FooterViewWithText(context: Context, attrs: AttributeSet?) : fun enableNextButton(enabled: Boolean) { binding.nextView.isEnabled = enabled if (enabled) { - binding.nextView.setViewBg(bgColor = R.color.active_button_color) + binding.nextView.setViewBg(bgColor = DesignR.color.active_button_color) binding.nextView.tag = NextButtonTag.ENABLED } else { - binding.nextView.setViewBg(bgColor = R.color.disabled_button_color) + binding.nextView.setViewBg(bgColor = DesignR.color.disabled_button_color) binding.nextView.tag = NextButtonTag.DISABLED } } diff --git a/app/src/main/java/com/naviapp/common/customview/HeaderWithProgress.kt b/app/src/main/java/com/naviapp/common/customview/HeaderWithProgress.kt index d604f2f553..dc9bd3a4a7 100644 --- a/app/src/main/java/com/naviapp/common/customview/HeaderWithProgress.kt +++ b/app/src/main/java/com/naviapp/common/customview/HeaderWithProgress.kt @@ -7,6 +7,7 @@ package com.naviapp.common.customview +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -59,7 +60,7 @@ class HeaderWithProgress @JvmOverloads constructor(context: Context, attr: Attri binding.formTagView.setText( it.tagText, R.drawable.bg_grey_rounded_12, - R.style.Small_Bold_DeepBlueGray, + WidgetsR.style.Small_Bold_DeepBlueGray, R.color.colorDeepBlueGray, false ) diff --git a/app/src/main/java/com/naviapp/common/customview/HorizontalLabelsView.kt b/app/src/main/java/com/naviapp/common/customview/HorizontalLabelsView.kt index d25c2dbfb5..5a11fa79cd 100644 --- a/app/src/main/java/com/naviapp/common/customview/HorizontalLabelsView.kt +++ b/app/src/main/java/com/naviapp/common/customview/HorizontalLabelsView.kt @@ -7,6 +7,7 @@ package com.naviapp.common.customview +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.widget.LinearLayout @@ -70,7 +71,7 @@ class HorizontalLabelsView(context: Context?, attrs: AttributeSet? = null) : ctaTextView.setTextColor( ContextCompat.getColor( context, - R.color.disabled_button_color + DesignR.color.disabled_button_color ) ) ctaTextView.setOnClickListener(null) @@ -97,7 +98,7 @@ class HorizontalLabelsView(context: Context?, attrs: AttributeSet? = null) : separatorTextView.setTextColor( ContextCompat.getColor( context, - R.color.grey_text + com.digitap.dtokyc.R.color.grey_text ) ) val separatorParams = LayoutParams( @@ -119,4 +120,4 @@ class HorizontalLabelsView(context: Context?, attrs: AttributeSet? = null) : interface ActionLabelListener { fun onActionLabelTap(actionLabel: ActionLabel) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/common/customview/IconTextCustomView.kt b/app/src/main/java/com/naviapp/common/customview/IconTextCustomView.kt index 0c4199e608..63caed6815 100644 --- a/app/src/main/java/com/naviapp/common/customview/IconTextCustomView.kt +++ b/app/src/main/java/com/naviapp/common/customview/IconTextCustomView.kt @@ -7,6 +7,7 @@ package com.naviapp.common.customview +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -59,10 +60,10 @@ class IconTextCustomView(context: Context, attrs: AttributeSet?) : LinearLayout( ICON_DOT -> R.drawable.ic_dot ICON_TICK -> R.drawable.ic_tick_small ICON_GREEN_TICK -> R.drawable.ic_green_tick_svg - ICON_SELECT_LOAN -> R.drawable.ic_select_loan - ICON_PROFILE_WITH_TICK -> R.drawable.ic_profile_tick - ICON_MATH_OPERATORS -> R.drawable.ic_math_operators - ICON_UPLOAD_STATEMENT -> R.drawable.ic_upload_statement + ICON_SELECT_LOAN -> DesignR.drawable.ic_select_loan + ICON_PROFILE_WITH_TICK -> DesignR.drawable.ic_profile_tick + ICON_MATH_OPERATORS -> DesignR.drawable.ic_math_operators + ICON_UPLOAD_STATEMENT -> DesignR.drawable.ic_upload_statement else -> iconCode?.let { IconUtils.getIconResourceId(it) } ?: -1 } if (resourceId == -1) binding.iconIv.visibility = View.GONE diff --git a/app/src/main/java/com/naviapp/common/customview/InputWithLabelAndErrorWithValidationView.kt b/app/src/main/java/com/naviapp/common/customview/InputWithLabelAndErrorWithValidationView.kt index 1c4c110fe7..20dc398edb 100644 --- a/app/src/main/java/com/naviapp/common/customview/InputWithLabelAndErrorWithValidationView.kt +++ b/app/src/main/java/com/naviapp/common/customview/InputWithLabelAndErrorWithValidationView.kt @@ -7,6 +7,7 @@ package com.naviapp.common.customview +import com.navi.design.R as DesignR import android.content.Context import android.text.Editable import android.text.InputType @@ -316,7 +317,7 @@ class InputWithLabelAndErrorWithValidationView @JvmOverloads constructor( strokeColor = if (widgetData?.successText?.successStrokeColor != null) widgetData?.successText?.successStrokeColor.parseColorSafe() else ResourcesCompat.getColor( resources, - R.color.successColor, + DesignR.color.successColor, null ), backgroundColor = widgetData?.bgColor?.parseColorSafe( diff --git a/app/src/main/java/com/naviapp/common/customview/NewProgressHeader.kt b/app/src/main/java/com/naviapp/common/customview/NewProgressHeader.kt index 90db8ea0f0..44fc9d3930 100644 --- a/app/src/main/java/com/naviapp/common/customview/NewProgressHeader.kt +++ b/app/src/main/java/com/naviapp/common/customview/NewProgressHeader.kt @@ -7,6 +7,7 @@ package com.naviapp.common.customview +import com.navi.common.R as CommonR import android.content.Context import android.os.Build import android.util.AttributeSet @@ -130,7 +131,7 @@ class NewProgressHeader(context: Context, attrs: AttributeSet?) : ConstraintLayo fun updateDefaultTheme() { showHelpIcon() - updateHeader(IconUtils.ICON_UP_ARROW, R.style.TitleFontStyle2, false, -90F) + updateHeader(IconUtils.ICON_UP_ARROW, CommonR.style.TitleFontStyle2, false, -90F) } fun showProgress() { diff --git a/app/src/main/java/com/naviapp/common/customview/OfferImprovementCardView.kt b/app/src/main/java/com/naviapp/common/customview/OfferImprovementCardView.kt index 23cf1fbca0..337081d42e 100644 --- a/app/src/main/java/com/naviapp/common/customview/OfferImprovementCardView.kt +++ b/app/src/main/java/com/naviapp/common/customview/OfferImprovementCardView.kt @@ -1,5 +1,6 @@ package com.naviapp.common.customview +import com.navi.insurance.R as InsuranceR import android.content.Context import android.graphics.Color import android.graphics.drawable.GradientDrawable @@ -69,7 +70,7 @@ class OfferImprovementCardView(context: Context, attrs: AttributeSet? = null) : val indexList = arrayListOf(0, 1, 2, 3, 4, 5, 6, 7) val radii = FloatArray(8) indexList.forEach { - radii[it] = resources.getDimension(R.dimen.dp_8) + radii[it] = resources.getDimension(InsuranceR.dimen.dp_8) } gradientDrawable.cornerRadii = radii gradientDrawable.setColor(Color.parseColor(color)) @@ -77,4 +78,4 @@ class OfferImprovementCardView(context: Context, attrs: AttributeSet? = null) : binding.innerRootView.background = gradientDrawable } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/common/customview/OptionSelectBottomsheet.kt b/app/src/main/java/com/naviapp/common/customview/OptionSelectBottomsheet.kt index 07c74fdf83..f1bb9e3db3 100644 --- a/app/src/main/java/com/naviapp/common/customview/OptionSelectBottomsheet.kt +++ b/app/src/main/java/com/naviapp/common/customview/OptionSelectBottomsheet.kt @@ -36,8 +36,8 @@ class OptionSelectBottomsheet : BaseBottomSheet(), OptionSelectorListener { } private fun setActionButton() { - binding.actionBtn.setProperties(title = resources.getString(R.string.continue_)) - binding.actionBtn.setButtonHeight(resources.getDimension(R.dimen.dp_48)) + binding.actionBtn.setProperties(title = resources.getString(com.navi.amc.R.string.continue_)) + binding.actionBtn.setButtonHeight(resources.getDimension(com.navi.amc.R.dimen.dp_48)) } override fun onItemSelected(cta: ActionData) { diff --git a/app/src/main/java/com/naviapp/common/customview/OtpInputView.kt b/app/src/main/java/com/naviapp/common/customview/OtpInputView.kt index 7cd1b1680c..7f9133bd25 100644 --- a/app/src/main/java/com/naviapp/common/customview/OtpInputView.kt +++ b/app/src/main/java/com/naviapp/common/customview/OtpInputView.kt @@ -7,6 +7,8 @@ package com.naviapp.common.customview +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.content.Context import android.content.Intent import android.graphics.Typeface @@ -60,7 +62,7 @@ class OtpInputView(context: Context, attributeSet: AttributeSet) : number: String? = null, resendOtp: (() -> Unit)? = null, showTermsAndConditions: Boolean = false, - titleStyle: Int = R.style.TextFontStyle + titleStyle: Int = WidgetsR.style.TextFontStyle ) { binding.otp.hideCutCopyMenuPopUp() title?.let { @@ -158,7 +160,7 @@ class OtpInputView(context: Context, attributeSet: AttributeSet) : (millisUntilFinished / Constants.MILLISECONDS_PER_SECOND) % Constants.SECONDS_PER_MINUTE binding.timer.text = - String.format(context.getString(R.string.time_format), minutes, seconds) + String.format(context.getString(DesignR.string.time_format), minutes, seconds) } override fun onFinish() { diff --git a/app/src/main/java/com/naviapp/common/customview/PanOptionViewV2.kt b/app/src/main/java/com/naviapp/common/customview/PanOptionViewV2.kt index 5096c1f883..fbf8a24186 100644 --- a/app/src/main/java/com/naviapp/common/customview/PanOptionViewV2.kt +++ b/app/src/main/java/com/naviapp/common/customview/PanOptionViewV2.kt @@ -7,6 +7,7 @@ package com.naviapp.common.customview +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -41,7 +42,7 @@ class PanOptionViewV2(context: Context, attrs: AttributeSet) : LinearLayout(cont binding.root.background = ResourcesCompat.getDrawable( context.resources, - R.drawable.bg_border_rounded_red_radius8_back_red3, + WidgetsR.drawable.bg_border_rounded_red_radius8_back_red3, null ) binding.tick.visibility = View.VISIBLE @@ -49,7 +50,7 @@ class PanOptionViewV2(context: Context, attrs: AttributeSet) : LinearLayout(cont binding.root.background = ResourcesCompat.getDrawable( context.resources, - R.drawable.bg_border_rounded_descriptionfive_radius8_back_white, + WidgetsR.drawable.bg_border_rounded_descriptionfive_radius8_back_white, null ) binding.tick.visibility = View.GONE diff --git a/app/src/main/java/com/naviapp/common/customview/RadioCustomView.kt b/app/src/main/java/com/naviapp/common/customview/RadioCustomView.kt index 67d4d4a569..3719f2743d 100644 --- a/app/src/main/java/com/naviapp/common/customview/RadioCustomView.kt +++ b/app/src/main/java/com/naviapp/common/customview/RadioCustomView.kt @@ -7,6 +7,7 @@ package com.naviapp.common.customview +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -37,7 +38,7 @@ class RadioCustomView(context: Context, attrs: AttributeSet? = null) : description: String? = null, checked: Boolean? = null, enabled: Boolean? = null, - selectorRadioButton: Int? = R.drawable.radiobutton_selector, + selectorRadioButton: Int? = WidgetsR.drawable.radiobutton_selector, styleDescription: Int? = R.style.TextDescExtraSmallFontStyleOne, showDivider: Boolean = false, styledTitle: StyledTextWithIconCode? = null, diff --git a/app/src/main/java/com/naviapp/common/customview/RadioOptionView.kt b/app/src/main/java/com/naviapp/common/customview/RadioOptionView.kt index cfd37bbc66..d179e9625b 100644 --- a/app/src/main/java/com/naviapp/common/customview/RadioOptionView.kt +++ b/app/src/main/java/com/naviapp/common/customview/RadioOptionView.kt @@ -31,7 +31,7 @@ class RadioOptionView(context: Context, attrs: AttributeSet) : binding.root.setOnClickListener(this) binding.checkedIv.setOnClickListener(this) binding.actionBtnCv.setOnClickListener(this) - binding.parentView.setCornerRadius(resources.getDimensionPixelSize(R.dimen._6dp)) + binding.parentView.setCornerRadius(resources.getDimensionPixelSize(com.navi.amc.R.dimen._6dp)) } fun setProperties( diff --git a/app/src/main/java/com/naviapp/common/customview/StatusIndicatorWithEditView.kt b/app/src/main/java/com/naviapp/common/customview/StatusIndicatorWithEditView.kt index 7e40c78a03..aac27a94be 100644 --- a/app/src/main/java/com/naviapp/common/customview/StatusIndicatorWithEditView.kt +++ b/app/src/main/java/com/naviapp/common/customview/StatusIndicatorWithEditView.kt @@ -6,6 +6,7 @@ package com.naviapp.common.customview +import com.navi.common.R as CommonR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -53,7 +54,7 @@ class StatusIndicatorWithEditView(context: Context, attrs: AttributeSet) : Status.COMPLETE -> { binding.indexTv.visibility = View.GONE binding.statusIv.visibility = View.VISIBLE - binding.statusIv.setImageResource(R.drawable.ic_tick_svg) + binding.statusIv.setImageResource(CommonR.drawable.ic_tick_svg) if (data.isNullOrBlank().not()) { binding.editTv.visibility = View.VISIBLE binding.descriptionTv.visibility = View.VISIBLE @@ -111,4 +112,4 @@ class StatusIndicatorWithEditView(context: Context, attrs: AttributeSet) : COMPLETE, ERROR } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/common/customview/TextIconViewWithTick.kt b/app/src/main/java/com/naviapp/common/customview/TextIconViewWithTick.kt index b0b3997518..6cd8a3d1e1 100644 --- a/app/src/main/java/com/naviapp/common/customview/TextIconViewWithTick.kt +++ b/app/src/main/java/com/naviapp/common/customview/TextIconViewWithTick.kt @@ -6,6 +6,7 @@ package com.naviapp.common.customview +import com.navi.design.R as DesignR import android.content.Context import android.graphics.PorterDuff import android.util.AttributeSet @@ -44,7 +45,7 @@ class TextIconViewWithTick(context: Context?, attrs: AttributeSet?) : LinearLayo binding.root.setOnClickListener(null) binding.statusIv.clearColorFilter() binding.root.setBackgroundResource(R.drawable.bg_rounded_12_rect_gray) - binding.statusIv.setImageResource(R.drawable.ic_green_tick) + binding.statusIv.setImageResource(DesignR.drawable.ic_green_tick) } else { binding.root.setOnClickListener { clickListener?.onCtaClicked(CtaData()) @@ -64,4 +65,4 @@ class TextIconViewWithTick(context: Context?, attrs: AttributeSet?) : LinearLayo fun setListener(clickListener: CtaListener?) { this.clickListener = clickListener } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/common/fragment/CommonBottomSheet.kt b/app/src/main/java/com/naviapp/common/fragment/CommonBottomSheet.kt index 84939cb8b4..3b67428352 100644 --- a/app/src/main/java/com/naviapp/common/fragment/CommonBottomSheet.kt +++ b/app/src/main/java/com/naviapp/common/fragment/CommonBottomSheet.kt @@ -7,6 +7,8 @@ package com.naviapp.common.fragment +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR import android.os.Bundle import android.view.View import android.view.ViewStub @@ -51,7 +53,7 @@ class CommonBottomSheet : BaseBottomSheet() { null, R.color.black, null, - R.color.gray + DesignR.color.gray ), iconCode: String? = null, primaryButtonMessage: String? = null, @@ -130,7 +132,7 @@ class CommonBottomSheet : BaseBottomSheet() { ) { val iconTextStyle = arguments?.getParcelable(keyStyle) val ctaData = arguments?.getParcelable(keyCta) - val buttonText = ctaData?.title ?: resources.getString(R.string.okay) + val buttonText = ctaData?.title ?: resources.getString(CommonR.string.okay) button.setProperties(buttonText, iconTextStyle?.textColor) button.setViewBg(bgColor = iconTextStyle?.bgColor) button.setOnClickListener { @@ -166,4 +168,4 @@ class CommonBottomSheet : BaseBottomSheet() { override val screenName: String get() = arguments?.getString(KEY_SCREEN_NAME) ?: NaviAnalytics.COMMON_BOTTOM_SHEET -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/common/fragment/CommonListBottomSheet.kt b/app/src/main/java/com/naviapp/common/fragment/CommonListBottomSheet.kt index ee3b719069..08e88daf86 100644 --- a/app/src/main/java/com/naviapp/common/fragment/CommonListBottomSheet.kt +++ b/app/src/main/java/com/naviapp/common/fragment/CommonListBottomSheet.kt @@ -7,6 +7,7 @@ package com.naviapp.common.fragment +import com.navi.common.R as CommonR import android.os.Bundle import android.view.View import android.view.ViewStub @@ -64,7 +65,7 @@ class CommonListBottomSheet : BaseBottomSheet() { IconUtils.updateIcon(it, binding.iconIv) } val ctaData = arguments?.getParcelable(KEY_CTA) - val buttonText = ctaData?.title ?: resources.getString(R.string.okay) + val buttonText = ctaData?.title ?: resources.getString(CommonR.string.okay) binding.actionButton.setProperties(buttonText) binding.actionButton.setOnClickListener { ctaData?.url?.let { @@ -78,4 +79,4 @@ class CommonListBottomSheet : BaseBottomSheet() { override val screenName: String get() = arguments?.getString(KEY_SCREEN_NAME) ?: NaviAnalytics.COMMON_BOTTOM_SHEET_LIST -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/common/fragment/DashboardPolicyBenefitBottomSheet.kt b/app/src/main/java/com/naviapp/common/fragment/DashboardPolicyBenefitBottomSheet.kt index c3f30e4042..daf00545c0 100644 --- a/app/src/main/java/com/naviapp/common/fragment/DashboardPolicyBenefitBottomSheet.kt +++ b/app/src/main/java/com/naviapp/common/fragment/DashboardPolicyBenefitBottomSheet.kt @@ -6,7 +6,9 @@ */ package com.naviapp.common.fragment -/* + +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR/* * * * Copyright © 2022 by Navi Technologies Private Limited * * All rights reserved. Strictly confidential @@ -58,7 +60,7 @@ class DashboardPolicyBenefitBottomSheet : BaseBottomSheet(), DashboardRadioButto cornerRadiusId = R.integer.value_110, elevation = resources.getDimension(R.dimen.layout_dp_0), ) - binding.btnContinue.setStateABV(false, R.color.disabled_button_color) + binding.btnContinue.setStateABV(false, DesignR.color.disabled_button_color) binding.btnContinue.setOnClickListener { selectedPolicyBenefitData?.let { response?.actionData?.metaData?.clickedData?.eventName?.let { it1 -> @@ -98,7 +100,7 @@ class DashboardPolicyBenefitBottomSheet : BaseBottomSheet(), DashboardRadioButto } private fun showUI() { - binding.apply { tvTitle.text = resources.getString(R.string.select_policy) } + binding.apply { tvTitle.text = resources.getString(CommonR.string.select_policy) } } fun setPolicyBenefitListener( diff --git a/app/src/main/java/com/naviapp/common/fragment/DashboardPolicyBenefitRetryBottomSheet.kt b/app/src/main/java/com/naviapp/common/fragment/DashboardPolicyBenefitRetryBottomSheet.kt index 5a90027461..e6fe586e5e 100644 --- a/app/src/main/java/com/naviapp/common/fragment/DashboardPolicyBenefitRetryBottomSheet.kt +++ b/app/src/main/java/com/naviapp/common/fragment/DashboardPolicyBenefitRetryBottomSheet.kt @@ -7,6 +7,8 @@ package com.naviapp.common.fragment +import com.navi.chat.R as ChatR + import android.view.View import android.view.ViewStub import androidx.databinding.DataBindingUtil @@ -30,7 +32,7 @@ class DashboardPolicyBenefitRetryBottomSheet : BaseBottomSheet(), View.OnClickLi binding.tvPrimaryAction.setOnClickListener(this) binding.tvSecondaryAction.setOnClickListener(this) binding.tvPrimaryAction.setText(resources.getString(R.string.retry)) - binding.tvSecondaryAction.setText(resources.getString(R.string.cancel)) + binding.tvSecondaryAction.setText(resources.getString(ChatR.string.cancel)) } override fun onClick(v: View?) { diff --git a/app/src/main/java/com/naviapp/common/fragment/DialogBoxWithSpinnerView.kt b/app/src/main/java/com/naviapp/common/fragment/DialogBoxWithSpinnerView.kt index bc5b3afaea..e23fbfd73c 100644 --- a/app/src/main/java/com/naviapp/common/fragment/DialogBoxWithSpinnerView.kt +++ b/app/src/main/java/com/naviapp/common/fragment/DialogBoxWithSpinnerView.kt @@ -7,6 +7,7 @@ package com.naviapp.common.fragment +import com.navi.design.R as DesignR import android.content.res.ColorStateList import android.os.Bundle import android.view.View @@ -66,7 +67,7 @@ class DialogBoxWithSpinnerView : BaseDialogBox() { binding.primaryActionTv.backgroundTintList = ColorStateList.valueOf( ContextCompat.getColor( requireContext(), - R.color.disabled_button_color + DesignR.color.disabled_button_color ) ) binding.primaryActionTv.text = ctaData.title @@ -156,14 +157,14 @@ class DialogBoxWithSpinnerView : BaseDialogBox() { binding.primaryActionTv.backgroundTintList = ColorStateList.valueOf( ContextCompat.getColor( requireContext(), - R.color.disabled_button_color + DesignR.color.disabled_button_color ) ) } else { binding.primaryActionTv.backgroundTintList = ColorStateList.valueOf( ContextCompat.getColor( requireContext(), - R.color.active_button_color + DesignR.color.active_button_color ) ) eventName?.let { diff --git a/app/src/main/java/com/naviapp/common/fragment/DownLoadPopupFragment.kt b/app/src/main/java/com/naviapp/common/fragment/DownLoadPopupFragment.kt index 0171ad0df5..13ec8de4c5 100644 --- a/app/src/main/java/com/naviapp/common/fragment/DownLoadPopupFragment.kt +++ b/app/src/main/java/com/naviapp/common/fragment/DownLoadPopupFragment.kt @@ -7,6 +7,8 @@ package com.naviapp.common.fragment +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR import MigrationData import android.app.Dialog import android.os.Bundle @@ -27,7 +29,7 @@ import com.naviapp.databinding.DownloadPopupFragmentBinding class DownLoadPopupFragment : BaseDialogFragment( R.layout.download_popup_fragment, - R.style.FullScreenWithStatusBar + CommonR.style.FullScreenWithStatusBar ) { private val widgetNaviAnalyticsEventTracker = NaviAnalytics.naviAnalytics.Widget() @@ -48,7 +50,7 @@ class DownLoadPopupFragment : BaseDialogFragment( data?.actionData?.bgColor?.let { actionButton.background = getNaviDrawable( backgroundColor = it.parseColorSafe(), - cornerRadius = resources.getDimension(com.navi.naviwidgets.R.dimen.dp_24) + cornerRadius = resources.getDimension(DesignR.dimen.dp_24) .toInt(), ) } diff --git a/app/src/main/java/com/naviapp/common/fragment/InfoBottomSheetV3.kt b/app/src/main/java/com/naviapp/common/fragment/InfoBottomSheetV3.kt index 54db6c9db0..ab65b3abdf 100644 --- a/app/src/main/java/com/naviapp/common/fragment/InfoBottomSheetV3.kt +++ b/app/src/main/java/com/naviapp/common/fragment/InfoBottomSheetV3.kt @@ -7,6 +7,9 @@ package com.naviapp.common.fragment +import com.navi.insurance.R as InsuranceR +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.content.ActivityNotFoundException import android.content.Context import android.net.Uri @@ -77,12 +80,12 @@ class InfoBottomSheetV3 : BaseBottomSheet() { this.descriptions?.forEachIndexed { _, textFieldData -> val itemView = getDescriptionsItem(textFieldData, context) itemView.setLineSpacing( - resources.getDimension(com.navi.naviwidgets.R.dimen.dp_1), + resources.getDimension(InsuranceR.dimen.dp_1), 1.0f ) itemView.setPadding( 0, - resources.getDimension(com.navi.naviwidgets.R.dimen.dp_16).toInt(), + resources.getDimension(DesignR.dimen.dp_16).toInt(), 0, 0 ) @@ -99,7 +102,7 @@ class InfoBottomSheetV3 : BaseBottomSheet() { binding.tvMessage.setTextFieldData(it.message) it.bgColor?.takeIf { isValidHexColor(it) }?.let { binding.messageContainer.background = getNaviDrawable( - cornerRadius = resources.getDimension(R.dimen.dp_8).toInt(), + cornerRadius = resources.getDimension(InsuranceR.dimen.dp_8).toInt(), backgroundColor = it.parseColorSafe() ) } @@ -124,7 +127,7 @@ class InfoBottomSheetV3 : BaseBottomSheet() { binding.horizontalFooterContainer.setVisibilityState(View.VISIBLE) data?.primaryAction?.bgColor?.takeIf { isValidHexColor(it) }?.let { binding.horizontalPrimaryAction.background = getNaviDrawable( - cornerRadius = resources.getDimension(R.dimen.dp_32).toInt(), + cornerRadius = resources.getDimension(InsuranceR.dimen.dp_32).toInt(), backgroundColor = it.parseColorSafe() ) } @@ -133,7 +136,7 @@ class InfoBottomSheetV3 : BaseBottomSheet() { } data?.secondaryAction?.bgColor?.takeIf { isValidHexColor(it) }?.let { binding.horizontalSecondaryAction.background = getNaviDrawable( - cornerRadius = resources.getDimension(R.dimen.dp_32).toInt(), + cornerRadius = resources.getDimension(InsuranceR.dimen.dp_32).toInt(), backgroundColor = it.parseColorSafe() ) } @@ -171,7 +174,7 @@ class InfoBottomSheetV3 : BaseBottomSheet() { val layoutLeftRightTextBinding: LayoutLeftRightTextBinding = DataBindingUtil.inflate( LayoutInflater.from(context), - com.navi.naviwidgets.R.layout.layout_left_right_text, + WidgetsR.layout.layout_left_right_text, null, false ) @@ -181,7 +184,7 @@ class InfoBottomSheetV3 : BaseBottomSheet() { } layoutLeftRightTextBinding.rootLayout.setPadding( 0, - resources.getDimension(com.navi.naviwidgets.R.dimen.dp_16).toInt(), + resources.getDimension(DesignR.dimen.dp_16).toInt(), 0, 0 ) diff --git a/app/src/main/java/com/naviapp/common/fragment/NetPromoterScoreFragment.kt b/app/src/main/java/com/naviapp/common/fragment/NetPromoterScoreFragment.kt index d574ee0c99..dad86695d2 100644 --- a/app/src/main/java/com/naviapp/common/fragment/NetPromoterScoreFragment.kt +++ b/app/src/main/java/com/naviapp/common/fragment/NetPromoterScoreFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.common.fragment +import com.navi.common.R as CommonR import android.content.Context import android.os.Bundle import android.view.Gravity @@ -37,7 +38,7 @@ import com.naviapp.utils.* class NetPromoterScoreFragment : BaseDialogFragment( R.layout.layout_net_promoter_score, - R.style.FullScreenDialogFragment + CommonR.style.FullScreenDialogFragment ), ReasonClickListener { var response: NetPromoterScoreResponse? = null @@ -228,4 +229,3 @@ class NetPromoterScoreFragment : BaseDialogFragment( R.layout.offer_dialog, - R.style.FullScreenDialogFragment + CommonR.style.FullScreenDialogFragment ) { var response: OfferDetailsResponse? = null private val naviAnalyticsEventTracker = NaviAnalytics.naviAnalytics.TopUpLoanIntro() @@ -93,4 +94,4 @@ class OfferDialogFragment : BaseDialogFragment( this.response = response } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/common/fragment/OtpBottomSheet.kt b/app/src/main/java/com/naviapp/common/fragment/OtpBottomSheet.kt index 602e0d015f..2778b8adb4 100644 --- a/app/src/main/java/com/naviapp/common/fragment/OtpBottomSheet.kt +++ b/app/src/main/java/com/naviapp/common/fragment/OtpBottomSheet.kt @@ -7,6 +7,7 @@ package com.naviapp.common.fragment +import com.navi.design.R as DesignR import android.content.Intent import android.content.IntentFilter import android.graphics.Typeface @@ -350,7 +351,7 @@ open class OtpBottomSheet(val otpTypeEnum: OtpTypeEnum = OtpTypeEnum.BOX_TYPE) : Constants.SECONDS_PER_MINUTE if (isAdded) binding.countdownTimerTv.text = - String.format(getString(R.string.time_format), minutes, seconds) + String.format(getString(DesignR.string.time_format), minutes, seconds) } override fun onFinish() { diff --git a/app/src/main/java/com/naviapp/common/fragment/PtpErrorFragment.kt b/app/src/main/java/com/naviapp/common/fragment/PtpErrorFragment.kt index 946e2bd30f..c5ebd48d4f 100644 --- a/app/src/main/java/com/naviapp/common/fragment/PtpErrorFragment.kt +++ b/app/src/main/java/com/naviapp/common/fragment/PtpErrorFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.common.fragment +import com.navi.common.R as CommonR import android.content.Context import android.os.Bundle import android.view.View @@ -23,7 +24,7 @@ import com.naviapp.utils.IconUtils class PtpErrorFragment : BaseDialogFragment( R.layout.ptp_error_layout, - R.style.FullScreenDialogFragment + CommonR.style.FullScreenDialogFragment ) { var response: GenericErrorResponse? = null diff --git a/app/src/main/java/com/naviapp/common/fragment/PtpFragment.kt b/app/src/main/java/com/naviapp/common/fragment/PtpFragment.kt index d41a42bfbc..09b9bebffd 100644 --- a/app/src/main/java/com/naviapp/common/fragment/PtpFragment.kt +++ b/app/src/main/java/com/naviapp/common/fragment/PtpFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.common.fragment +import com.navi.common.R as CommonR import android.content.Context import android.graphics.Color import android.graphics.Typeface @@ -40,7 +41,7 @@ import com.naviapp.registration.viewmodel.RegistrationVM import com.naviapp.utils.IconUtils class PtpFragment : - BaseDialogFragment(R.layout.ptp_layout, R.style.FullScreenDialogFragment), + BaseDialogFragment(R.layout.ptp_layout, CommonR.style.FullScreenDialogFragment), OfferChangeListener { var response: PtpDetailsResponse? = null diff --git a/app/src/main/java/com/naviapp/common/fragment/RadioButtonBottomSheet.kt b/app/src/main/java/com/naviapp/common/fragment/RadioButtonBottomSheet.kt index a84e37d707..89395f5e72 100644 --- a/app/src/main/java/com/naviapp/common/fragment/RadioButtonBottomSheet.kt +++ b/app/src/main/java/com/naviapp/common/fragment/RadioButtonBottomSheet.kt @@ -28,7 +28,7 @@ class RadioButtonBottomSheet : BaseBottomSheet(),EmiDateSelectListener { binding = DataBindingUtil.getBinding(viewStub.inflate())!! binding.emiDetailsData = arguments?.getParcelable(EMI_DATES_DATA) binding.listener = this - binding.actionBtn.setProperties(resources.getString(R.string.confirm)) + binding.actionBtn.setProperties(resources.getString(com.navi.pay.R.string.confirm)) binding.actionBtn.setOnClickListener { selectedEmiData?.let{ listener?.onDateSelect(it) diff --git a/app/src/main/java/com/naviapp/common/fragment/YearSelectionDialog.kt b/app/src/main/java/com/naviapp/common/fragment/YearSelectionDialog.kt index 1db56f941c..6d77af1da0 100644 --- a/app/src/main/java/com/naviapp/common/fragment/YearSelectionDialog.kt +++ b/app/src/main/java/com/naviapp/common/fragment/YearSelectionDialog.kt @@ -7,6 +7,7 @@ package com.naviapp.common.fragment +import com.navi.common.R as CommonR import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable @@ -60,7 +61,7 @@ class YearSelectionDialog( } private fun initConfirmButton() { - binding.abvConfirm.setProperties(mContext.getString(R.string.ok)) + binding.abvConfirm.setProperties(mContext.getString(CommonR.string.ok)) binding.abvConfirm.setOnClickListener { yearSelectionDetails?.get(selectedIndex) ?.let { selectedYear -> yearSelectionListener?.confirmButtonClick(selectedYear) } @@ -99,4 +100,4 @@ class YearSelectionDialog( ) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/common/navigator/NaviDeepLinkNavigator.kt b/app/src/main/java/com/naviapp/common/navigator/NaviDeepLinkNavigator.kt index 9fb7df3f2e..b5f488a3a2 100644 --- a/app/src/main/java/com/naviapp/common/navigator/NaviDeepLinkNavigator.kt +++ b/app/src/main/java/com/naviapp/common/navigator/NaviDeepLinkNavigator.kt @@ -7,6 +7,7 @@ package com.naviapp.common.navigator +import com.navi.naviwidgets.R as WidgetsR import android.app.Activity import android.content.Context import android.content.Intent @@ -778,7 +779,7 @@ object NaviDeepLinkNavigator : DeepLinkListener { val bitmap = BitmapFactory.decodeResource( it1.resources, - R.drawable.ic_home_app_share_banner + WidgetsR.drawable.ic_home_app_share_banner ) bitmap.compress( Bitmap.CompressFormat.JPEG, diff --git a/app/src/main/java/com/naviapp/common/viewholders/DashboardPolicyBenefitVH.kt b/app/src/main/java/com/naviapp/common/viewholders/DashboardPolicyBenefitVH.kt index 119e72a9e1..c699c9cb23 100644 --- a/app/src/main/java/com/naviapp/common/viewholders/DashboardPolicyBenefitVH.kt +++ b/app/src/main/java/com/naviapp/common/viewholders/DashboardPolicyBenefitVH.kt @@ -7,6 +7,8 @@ package com.naviapp.common.viewholders +import com.navi.insurance.R as InsuranceR +import com.navi.common.R as CommonR import androidx.core.content.ContextCompat import androidx.core.view.isVisible import androidx.databinding.ViewDataBinding @@ -36,20 +38,20 @@ class DashboardPolicyBenefitVH(private val viewBinding: ViewDataBinding) : viewBinding.apply { tvPolicyNumber.text = String.format( - viewBinding.root.context.getString(R.string.policy_number), + viewBinding.root.context.getString(InsuranceR.string.policy_number), model.policyId ) tvPolicySumInsured.text = String.format( - itemView.context.getString(R.string.policy_sum_insured), + itemView.context.getString(InsuranceR.string.policy_sum_insured), decimalFormat.format(model.sumInsured) ) model.numberOfMembersInsured?.let { tvPolicyTotalInsured.text = String.format( itemView.context.getString( - if (it > 1) R.string.policy_members_total_insured - else R.string.policy_member_total_insured + if (it > 1) InsuranceR.string.policy_members_total_insured + else InsuranceR.string.policy_member_total_insured ), model.numberOfMembersInsured ) @@ -71,7 +73,7 @@ class DashboardPolicyBenefitVH(private val viewBinding: ViewDataBinding) : clParent.background = ContextCompat.getDrawable( itemView.context, - R.drawable.rounded_rectangle_grey_border_8dp_radius + InsuranceR.drawable.rounded_rectangle_grey_border_8dp_radius ) } clickHandle(active = true) @@ -79,7 +81,7 @@ class DashboardPolicyBenefitVH(private val viewBinding: ViewDataBinding) : clParent.background = ContextCompat.getDrawable( itemView.context, - R.drawable.rounded_rectangle_grey_border_8dp_radius + InsuranceR.drawable.rounded_rectangle_grey_border_8dp_radius ) clickHandle(active = false) } @@ -98,7 +100,7 @@ class DashboardPolicyBenefitVH(private val viewBinding: ViewDataBinding) : if (active) { ContextCompat.getDrawable( itemView.context, - R.drawable.radio_button_selector_grey + CommonR.drawable.radio_button_selector_grey ) } else { ContextCompat.getDrawable( diff --git a/app/src/main/java/com/naviapp/crosssell/ui/TaxDocumentsActivity.kt b/app/src/main/java/com/naviapp/crosssell/ui/TaxDocumentsActivity.kt index a41bd25886..5f3f6d7440 100644 --- a/app/src/main/java/com/naviapp/crosssell/ui/TaxDocumentsActivity.kt +++ b/app/src/main/java/com/naviapp/crosssell/ui/TaxDocumentsActivity.kt @@ -7,6 +7,8 @@ package com.naviapp.crosssell.ui +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.os.Bundle import android.view.View import android.widget.TextView @@ -170,7 +172,7 @@ class TaxDocumentsActivity : BaseActivity(), TaxDocumentsListener { setTextColor( ContextCompat.getColor( this@TaxDocumentsActivity, - R.color.ctaPrimaryColor + DesignR.color.ctaPrimaryColor ) ) setFontStyle(FontWeightEnum.TT_SEMI_BOLD) @@ -188,13 +190,13 @@ class TaxDocumentsActivity : BaseActivity(), TaxDocumentsListener { setTextColor( ContextCompat.getColor( this@TaxDocumentsActivity, - R.color.color_6B6B6B + com.navi.homeloan.R.color.color_6B6B6B ) ) setFontStyle(FontWeightEnum.TT_REGULAR) background = AppCompatResources.getDrawable( this@TaxDocumentsActivity, - R.drawable.rounded_rectangle_grey_24dp_radius + WidgetsR.drawable.rounded_rectangle_grey_24dp_radius ) } } diff --git a/app/src/main/java/com/naviapp/crosssell/ui/TaxDocumentsPreviewFragment.kt b/app/src/main/java/com/naviapp/crosssell/ui/TaxDocumentsPreviewFragment.kt index 73042c45ea..99769b5d60 100644 --- a/app/src/main/java/com/naviapp/crosssell/ui/TaxDocumentsPreviewFragment.kt +++ b/app/src/main/java/com/naviapp/crosssell/ui/TaxDocumentsPreviewFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.crosssell.ui +import com.navi.insurance.R as InsuranceR import android.Manifest import android.net.Uri import android.os.Bundle @@ -50,10 +51,10 @@ class TaxDocumentPreviewFragment : BaseFragment() { Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE ), - title = getString(R.string.read_permission_title), - description = getString(R.string.read_permission_description), - primaryBtnText = getString(R.string.permission_go_to_settings_text), - secondaryBtnText = getString(R.string.cancel_text) + title = getString(InsuranceR.string.read_permission_title), + description = getString(InsuranceR.string.read_permission_description), + primaryBtnText = getString(InsuranceR.string.permission_go_to_settings_text), + secondaryBtnText = getString(InsuranceR.string.cancel_text) ) ) safelyShowBottomSheet(permissionBottomSheet, PermissionBottomSheet.TAG) diff --git a/app/src/main/java/com/naviapp/crosssell/ui/TaxSavingsKnowMoreFragment.kt b/app/src/main/java/com/naviapp/crosssell/ui/TaxSavingsKnowMoreFragment.kt index 6b5040223e..6149e3144a 100644 --- a/app/src/main/java/com/naviapp/crosssell/ui/TaxSavingsKnowMoreFragment.kt +++ b/app/src/main/java/com/naviapp/crosssell/ui/TaxSavingsKnowMoreFragment.kt @@ -7,6 +7,8 @@ package com.naviapp.crosssell.ui +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR import android.content.Context import android.os.Bundle import android.view.LayoutInflater @@ -124,7 +126,7 @@ class TaxSavingsKnowMoreFragment : BaseFragment(), BackListener { private fun selectButton(button: NaviTextView) { button.apply { changeFontStyle(FontWeightEnum.TT_SEMI_BOLD) - setTextColor(ContextCompat.getColor(requireContext(), R.color.ctaPrimaryColor)) + setTextColor(ContextCompat.getColor(requireContext(), DesignR.color.ctaPrimaryColor)) background = context?.let { AppCompatResources.getDrawable(it, R.drawable.rounded_rectangle_orange_border_24dp) } @@ -134,7 +136,7 @@ class TaxSavingsKnowMoreFragment : BaseFragment(), BackListener { private fun deSelectButton(button: NaviTextView) { button.apply { changeFontStyle(FontWeightEnum.TT_REGULAR) - setTextColor(ContextCompat.getColor(requireContext(), R.color.color_6B6B6B)) + setTextColor(ContextCompat.getColor(requireContext(), com.navi.homeloan.R.color.color_6B6B6B)) background = context?.let { AppCompatResources.getDrawable(it, R.drawable.rounded_rectangle_grey_border_24dp) } @@ -154,7 +156,7 @@ class TaxSavingsKnowMoreFragment : BaseFragment(), BackListener { activity?.setStatusBarColor(R.color.colorDeepBlueGray) binding.apply { appBar.outlineProvider = null - header.closeIv.setImageResource(R.drawable.ic_arrow_left_white) + header.closeIv.setImageResource(CommonR.drawable.ic_arrow_left_white) header.textView.text = getString(R.string.tax_savings_appbar_title) } } @@ -209,7 +211,7 @@ class TaxSavingsKnowMoreFragment : BaseFragment(), BackListener { appBar.outlineProvider = null appBar.background = context?.let { AppCompatResources.getDrawable(it, R.color.transparent) } - header.closeIv.setImageResource(R.drawable.ic_arrow_left_white) + header.closeIv.setImageResource(CommonR.drawable.ic_arrow_left_white) } activity?.setStatusBarColor(R.color.colorDeepBlueGray) } diff --git a/app/src/main/java/com/naviapp/crosssell/ui/TaxSavingsOnBoardingFragment.kt b/app/src/main/java/com/naviapp/crosssell/ui/TaxSavingsOnBoardingFragment.kt index bc4b231784..807a42929b 100644 --- a/app/src/main/java/com/naviapp/crosssell/ui/TaxSavingsOnBoardingFragment.kt +++ b/app/src/main/java/com/naviapp/crosssell/ui/TaxSavingsOnBoardingFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.crosssell.ui +import com.navi.common.R as CommonR import android.content.Context import android.os.Bundle import android.os.Handler @@ -63,7 +64,7 @@ class TaxSavingsOnBoardingFragment : BaseFragment(), BackListener { binding.taxSavingsOnboardingAnimation.setAnimation(R.raw.tax_savings_onboarding_lottie) if (arguments?.getBoolean(Constants.IS_COMING_FROM_KNOW_MORE) == true) { binding.apply { - closeIv.setImageResource(R.drawable.ic_arrow_left_white) + closeIv.setImageResource(CommonR.drawable.ic_arrow_left_white) skipTv.visibility = View.GONE getStartedButton.visibility = View.GONE } diff --git a/app/src/main/java/com/naviapp/csat/CSATAdapter.kt b/app/src/main/java/com/naviapp/csat/CSATAdapter.kt index 4de1ddee3f..157af10541 100644 --- a/app/src/main/java/com/naviapp/csat/CSATAdapter.kt +++ b/app/src/main/java/com/naviapp/csat/CSATAdapter.kt @@ -7,6 +7,7 @@ package com.naviapp.csat +import com.navi.common.R as CommonR import android.content.Context import android.graphics.Color import android.view.LayoutInflater @@ -65,7 +66,7 @@ class CSATAdapter( viewHolder.title.setTextFieldData(data.title) if (data.isChecked) { - view.setBackgroundResource(R.drawable.bg_rounded_white_red_border_8) + view.setBackgroundResource(CommonR.drawable.bg_rounded_white_red_border_8) viewHolder.checkbox.isChecked = true state?.selected?.textColor?.let { textColor -> if (isValidHexColor(textColor)) { @@ -75,7 +76,7 @@ class CSATAdapter( viewHolder.title.setTextColor(ContextCompat.getColor(context, R.color.charcol_gray)) } } else { - view.setBackgroundResource(R.drawable.bg_rounded_white_grey_border_8) + view.setBackgroundResource(CommonR.drawable.bg_rounded_white_grey_border_8) viewHolder.checkbox.isChecked = false state?.unSelected?.textColor?.let { textColor -> if (isValidHexColor(textColor)) { diff --git a/app/src/main/java/com/naviapp/csat/CsatBottomSheet.kt b/app/src/main/java/com/naviapp/csat/CsatBottomSheet.kt index 1c57642ecb..7415472329 100644 --- a/app/src/main/java/com/naviapp/csat/CsatBottomSheet.kt +++ b/app/src/main/java/com/naviapp/csat/CsatBottomSheet.kt @@ -7,6 +7,7 @@ package com.naviapp.csat +import com.navi.insurance.R as InsuranceR import android.content.DialogInterface import android.os.Bundle import android.os.Handler @@ -99,10 +100,10 @@ class CsatBottomSheet : BaseBottomSheet(), OthersInputBoxListener { getString(R.string.check_internet_connection_and_try_again) } context?.let { - binding.tryAgainBtn.setText(getString(R.string.try_again)) + binding.tryAgainBtn.setText(getString(com.navi.amc.R.string.try_again)) binding.tryAgainBtn.background = getNaviDrawable( backgroundColor = ContextCompat.getColor(it, R.color.outrageous_orange), - cornerRadius = resources.getDimension(com.navi.naviwidgets.R.dimen.dp_32) + cornerRadius = resources.getDimension(InsuranceR.dimen.dp_32) .toInt() ) } diff --git a/app/src/main/java/com/naviapp/custom_payments/fragments/PaymentFooterBottomSheet.kt b/app/src/main/java/com/naviapp/custom_payments/fragments/PaymentFooterBottomSheet.kt index 40842412ac..7c5d0a583b 100644 --- a/app/src/main/java/com/naviapp/custom_payments/fragments/PaymentFooterBottomSheet.kt +++ b/app/src/main/java/com/naviapp/custom_payments/fragments/PaymentFooterBottomSheet.kt @@ -7,6 +7,7 @@ package com.naviapp.custom_payments.fragments +import com.navi.naviwidgets.R as WidgetsR import android.os.Bundle import android.view.ViewGroup import android.view.ViewStub @@ -71,7 +72,7 @@ class PaymentFooterBottomSheet() : BaseBottomSheet(), WidgetCallback { private fun updateContainer(naviWidget: NaviWidget, container: ViewGroup) { viewLifecycleOwner.lifecycleScope.launch { - val layoutBinding = container.replaceLayout(R.layout.layout_payment_footer) + val layoutBinding = container.replaceLayout(WidgetsR.layout.layout_payment_footer) (layoutBinding?.root as? BaseNaviWidgetLayout)?.updateLayout( layoutBinding, naviWidget, diff --git a/app/src/main/java/com/naviapp/custom_payments/fragments/TermsAndConditionsBottomSheet.kt b/app/src/main/java/com/naviapp/custom_payments/fragments/TermsAndConditionsBottomSheet.kt index b0a1d834a0..54b71c5106 100644 --- a/app/src/main/java/com/naviapp/custom_payments/fragments/TermsAndConditionsBottomSheet.kt +++ b/app/src/main/java/com/naviapp/custom_payments/fragments/TermsAndConditionsBottomSheet.kt @@ -7,6 +7,7 @@ package com.naviapp.custom_payments.fragments +import com.navi.common.R as CommonR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -48,7 +49,7 @@ class TermsAndConditionsBottomSheet : BaseBottomSheet() { } binding.btnTv.text = it.footer?.primaryAction?.title binding.btnTv.setProperties( - it.footer?.primaryAction?.title ?: this.getString(R.string.okay), + it.footer?.primaryAction?.title ?: this.getString(CommonR.string.okay), ) binding.btnTv.setOnClickListener { NaviAnalytics.naviAnalytics diff --git a/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/details/fragments/DetailsFragment.kt b/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/details/fragments/DetailsFragment.kt index 784e093346..3942fd0395 100644 --- a/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/details/fragments/DetailsFragment.kt +++ b/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/details/fragments/DetailsFragment.kt @@ -7,6 +7,8 @@ package com.naviapp.dashboard.loanapplicationdetails.details.fragments +import com.navi.insurance.R as InsuranceR +import com.navi.design.R as DesignR import android.app.Activity import android.content.Context import android.os.Bundle @@ -220,7 +222,7 @@ class DetailsFragment : BaseFragment(), View.OnClickListener, WidgetCallback { loanApplicationDetails?.emiInfo?.let { binding.emiInfoView.root.visibility = View.VISIBLE binding.emiInfoView.root.updateLayout(binding.emiInfoView, it, this) - binding.emiInfoView.root.setBackground(resources.getDimension(R.dimen.dp_10)) + binding.emiInfoView.root.setBackground(resources.getDimension(InsuranceR.dimen.dp_10)) val eventName = if (loanApplicationDetails?.loanType == Constants.TYPE_HOME_LOAN) NaviAnalytics.HL_VIEWDETAILS_LANDS @@ -237,9 +239,9 @@ class DetailsFragment : BaseFragment(), View.OnClickListener, WidgetCallback { binding.repoRateView.rootLayout.setProperties(it, this, binding.repoRateView) binding.repoRateView.rootLayout.background = getNaviDrawable( - cornerRadius = resources.getDimension(R.dimen.dp_10).toInt(), + cornerRadius = resources.getDimension(InsuranceR.dimen.dp_10).toInt(), backgroundColor = - ResourcesCompat.getColor(resources, R.color.grey_alabaster, null) + ResourcesCompat.getColor(resources, DesignR.color.grey_alabaster, null) ) } diff --git a/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/DocumentPickerBottomSheet.kt b/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/DocumentPickerBottomSheet.kt index 9186b2663c..d8421b48d8 100644 --- a/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/DocumentPickerBottomSheet.kt +++ b/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/DocumentPickerBottomSheet.kt @@ -7,6 +7,7 @@ package com.naviapp.dashboard.loanapplicationdetails.tranche_disbursal +import com.navi.insurance.R as InsuranceR import android.Manifest import android.app.Activity import android.content.Intent @@ -102,7 +103,7 @@ class HlDocumentPickerBottomSheet : BaseBottomSheet() { Toast.makeText( context, String.format( - getString(com.navi.insurance.R.string.maximum_upload_text), + getString(InsuranceR.string.maximum_upload_text), min(defaultMaxUploadSize, maxUploadCount) ), Toast.LENGTH_LONG diff --git a/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/InstallmentDetailsFragment.kt b/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/InstallmentDetailsFragment.kt index 1c5662ddea..530df9cb0c 100644 --- a/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/InstallmentDetailsFragment.kt +++ b/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/InstallmentDetailsFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.dashboard.loanapplicationdetails.tranche_disbursal +import com.navi.insurance.R as InsuranceR import android.animation.Animator import android.content.Context import android.os.Bundle @@ -169,7 +170,7 @@ class InstallmentDetailsFragment : LendingBaseFragment(), WidgetCallback { hideLoader() Toast.makeText( context, - getString(R.string.oops_something_went_wrong), + getString(InsuranceR.string.oops_something_went_wrong), Toast.LENGTH_SHORT ) .show() diff --git a/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/OwnContributionProofFragment.kt b/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/OwnContributionProofFragment.kt index ae17d90668..d046fe9f64 100644 --- a/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/OwnContributionProofFragment.kt +++ b/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/OwnContributionProofFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.dashboard.loanapplicationdetails.tranche_disbursal +import com.navi.design.R as DesignR import android.content.Context import android.os.Bundle import android.view.KeyEvent @@ -287,7 +288,7 @@ class OwnContributionProofFragment : binding.amountStatusText.isVisible = if (binding.amountValue.text?.length.orZero() > 0) { binding.amountStatusText.setTextColor( - ContextCompat.getColor(requireContext(), R.color.naviSuccessGreen) + ContextCompat.getColor(requireContext(), DesignR.color.naviSuccessGreen) ) binding.amountStatusText.text = numberToWords(amount) binding.amountStatusText.typeface = @@ -385,7 +386,7 @@ class OwnContributionProofFragment : binding.amountStatusText.isVisible = true binding.amountStatusText.text = errorText binding.amountStatusText.setTextColor( - ContextCompat.getColor(requireContext(), R.color.criticalColor) + ContextCompat.getColor(requireContext(), DesignR.color.criticalColor) ) binding.amountStatusText.typeface = ResourcesCompat.getFont(requireContext(), getFontStyle(FontWeightEnum.TT_REGULAR)) diff --git a/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/RequestInstallmentFragment.kt b/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/RequestInstallmentFragment.kt index f182d494d8..fcc609543f 100644 --- a/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/RequestInstallmentFragment.kt +++ b/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/RequestInstallmentFragment.kt @@ -7,6 +7,8 @@ package com.naviapp.dashboard.loanapplicationdetails.tranche_disbursal +import com.navi.insurance.R as InsuranceR +import com.navi.design.R as DesignR import android.animation.Animator import android.app.DatePickerDialog import android.os.Bundle @@ -183,7 +185,7 @@ class RequestInstallmentFragment : (activity as? BaseActivity)?.hideLoader() Toast.makeText( context, - getString(R.string.oops_something_went_wrong), + getString(InsuranceR.string.oops_something_went_wrong), Toast.LENGTH_SHORT ) .show() @@ -346,7 +348,7 @@ class RequestInstallmentFragment : binding.amountStatusText.isVisible = if (binding.amountValue.text?.length.orZero() > 0) { binding.amountStatusText.setTextColor( - ContextCompat.getColor(requireContext(), R.color.naviSuccessGreen) + ContextCompat.getColor(requireContext(), DesignR.color.naviSuccessGreen) ) binding.amountStatusText.text = numberToWords(amount) binding.amountStatusText.typeface = @@ -456,7 +458,7 @@ class RequestInstallmentFragment : binding.amountStatusText.isVisible = true binding.amountStatusText.text = errorText binding.amountStatusText.setTextColor( - ContextCompat.getColor(requireContext(), R.color.criticalColor) + ContextCompat.getColor(requireContext(), DesignR.color.criticalColor) ) binding.amountStatusText.typeface = ResourcesCompat.getFont(requireContext(), getFontStyle(FontWeightEnum.TT_REGULAR)) diff --git a/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/RequestInstallmentFragmentV2.kt b/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/RequestInstallmentFragmentV2.kt index dd29e0dbbd..c31109e392 100644 --- a/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/RequestInstallmentFragmentV2.kt +++ b/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/RequestInstallmentFragmentV2.kt @@ -7,6 +7,7 @@ package com.naviapp.dashboard.loanapplicationdetails.tranche_disbursal +import com.navi.design.R as DesignR import android.app.DatePickerDialog import android.content.Context import android.os.Bundle @@ -358,7 +359,7 @@ open class RequestInstallmentFragmentV2 : binding.amountStatusText.isVisible = if (binding.amountValue.text?.length.orZero() > 0) { binding.amountStatusText.setTextColor( - ContextCompat.getColor(requireContext(), R.color.naviSuccessGreen) + ContextCompat.getColor(requireContext(), DesignR.color.naviSuccessGreen) ) binding.amountStatusText.text = numberToWords(amount) binding.amountStatusText.typeface = @@ -456,7 +457,7 @@ open class RequestInstallmentFragmentV2 : installmentTimeMills?.let { binding.installmentStatusText.text = timestampToddMMMMYYYY(it) binding.installmentStatusText.setTextColor( - ContextCompat.getColor(requireContext(), R.color.naviSuccessGreen) + ContextCompat.getColor(requireContext(), DesignR.color.naviSuccessGreen) ) binding.installmentStatusText.setCompoundDrawablesWithIntrinsicBounds( null, @@ -508,7 +509,7 @@ open class RequestInstallmentFragmentV2 : binding.amountStatusText.isVisible = true binding.amountStatusText.text = errorText binding.amountStatusText.setTextColor( - ContextCompat.getColor(requireContext(), R.color.criticalColor) + ContextCompat.getColor(requireContext(), DesignR.color.criticalColor) ) binding.amountStatusText.typeface = ResourcesCompat.getFont(requireContext(), getFontStyle(FontWeightEnum.TT_REGULAR)) @@ -530,7 +531,7 @@ open class RequestInstallmentFragmentV2 : binding.installmentStatusText.isVisible = true binding.installmentStatusText.text = errorText binding.installmentStatusText.setTextColor( - ContextCompat.getColor(requireContext(), R.color.criticalColor) + ContextCompat.getColor(requireContext(), DesignR.color.criticalColor) ) binding.installmentStatusText.typeface = ResourcesCompat.getFont(requireContext(), getFontStyle(FontWeightEnum.TT_REGULAR)) diff --git a/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/UploadedDocsAdapter.kt b/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/UploadedDocsAdapter.kt index 9b5fd89981..9629537fad 100644 --- a/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/UploadedDocsAdapter.kt +++ b/app/src/main/java/com/naviapp/dashboard/loanapplicationdetails/tranche_disbursal/UploadedDocsAdapter.kt @@ -7,6 +7,7 @@ package com.naviapp.dashboard.loanapplicationdetails.tranche_disbursal +import com.navi.common.R as CommonR import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater @@ -176,7 +177,7 @@ class UploadedDocsAdapter( binding.removeDocumentButton.isVisible = false binding.warningIcon.isVisible = true binding.warningText.isVisible = true - binding.warningText.text = context.getString(R.string.file_too_large) + binding.warningText.text = context.getString(CommonR.string.file_too_large) } } } diff --git a/app/src/main/java/com/naviapp/dashboard/menu/customersupport/activities/AboutUsActivity.kt b/app/src/main/java/com/naviapp/dashboard/menu/customersupport/activities/AboutUsActivity.kt index 682e297d7f..c340f72b6d 100644 --- a/app/src/main/java/com/naviapp/dashboard/menu/customersupport/activities/AboutUsActivity.kt +++ b/app/src/main/java/com/naviapp/dashboard/menu/customersupport/activities/AboutUsActivity.kt @@ -7,6 +7,7 @@ package com.naviapp.dashboard.menu.customersupport.activities +import com.navi.insurance.R as InsuranceR import android.os.Bundle import androidx.activity.compose.setContent import androidx.compose.foundation.Image @@ -61,14 +62,14 @@ class AboutUsActivity : BaseActivity() { Modifier .fillMaxSize() .padding( - start = dimensionResource(id = R.dimen.dp_30), - end = dimensionResource(id = R.dimen.dp_30), - bottom = dimensionResource(id = R.dimen.dp_20) + start = dimensionResource(id = com.navi.amc.R.dimen.dp_30), + end = dimensionResource(id = com.navi.amc.R.dimen.dp_30), + bottom = dimensionResource(id = com.navi.amc.R.dimen.dp_20) ) ) { val (backIv, aboutUsTv, bodyTv, logoIv, copyrightTv) = createRefs() Image( - painter = painterResource(id = R.drawable.ic_back_arrow_with_tail), + painter = painterResource(id = InsuranceR.drawable.ic_back_arrow_with_tail), contentDescription = null, modifier = Modifier diff --git a/app/src/main/java/com/naviapp/dashboard/menu/customersupport/screens/CoLendingCommonView.kt b/app/src/main/java/com/naviapp/dashboard/menu/customersupport/screens/CoLendingCommonView.kt index c759764bdc..43fa4bdfe1 100644 --- a/app/src/main/java/com/naviapp/dashboard/menu/customersupport/screens/CoLendingCommonView.kt +++ b/app/src/main/java/com/naviapp/dashboard/menu/customersupport/screens/CoLendingCommonView.kt @@ -1,5 +1,6 @@ package com.naviapp.dashboard.menu.customersupport.screens +import com.navi.naviwidgets.R as WidgetsR import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -66,9 +67,9 @@ fun NaviLoadingScreen() { @Composable fun NaviErrorScreen( - title: String = stringResource(id = R.string.error_screen_title), - subtitle: String = stringResource(id = R.string.error_screen_subtitle), - errorImage: Int = R.drawable.ic_something_went_wrong + title: String = stringResource(id = com.navi.rr.R.string.error_screen_title), + subtitle: String = stringResource(id = com.navi.rr.R.string.error_screen_subtitle), + errorImage: Int = WidgetsR.drawable.ic_something_went_wrong ) { Column( Modifier @@ -162,4 +163,4 @@ fun BackButton(onBackPress: () -> Unit) { contentDescription = "back_arrow" ) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/dashboard/menu/loans/activity/AllLoanDetailsActivity.kt b/app/src/main/java/com/naviapp/dashboard/menu/loans/activity/AllLoanDetailsActivity.kt index 4907954fa5..da6e8f0152 100644 --- a/app/src/main/java/com/naviapp/dashboard/menu/loans/activity/AllLoanDetailsActivity.kt +++ b/app/src/main/java/com/naviapp/dashboard/menu/loans/activity/AllLoanDetailsActivity.kt @@ -7,6 +7,7 @@ package com.naviapp.dashboard.menu.loans.activity +import com.navi.common.R as CommonR import android.content.Intent import android.os.Bundle import android.view.View @@ -131,8 +132,8 @@ class AllLoanDetailsActivity : BaseActivity(), View.OnClickListener, MenuItemCli intent.putExtra(LoanApplicationDetailActivity.OPEN_TAB, DetailsFragment.TAG) startActivity(intent) overridePendingTransition( - R.anim.activity_slide_in_right, + CommonR.anim.activity_slide_in_right, R.anim.activity_close_scale ) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/dashboard/menu/loans/fragment/LoanDetailsFragment.kt b/app/src/main/java/com/naviapp/dashboard/menu/loans/fragment/LoanDetailsFragment.kt index 20881a6a27..1d2a8f0941 100644 --- a/app/src/main/java/com/naviapp/dashboard/menu/loans/fragment/LoanDetailsFragment.kt +++ b/app/src/main/java/com/naviapp/dashboard/menu/loans/fragment/LoanDetailsFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.dashboard.menu.loans.fragment +import com.navi.common.R as CommonR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -38,7 +39,7 @@ class LoanDetailsFragment : BaseFragment(), MenuItemClickListener { private fun initUI(id: String?, loanDetailsData: List) { binding.loanDetailsRv.adapter = AllLoanDetailsAdapter(this, id, loanDetailsData) binding.loanDetailsRv.addItemDecoration( - TopMarginItemDecoration(resources.getDimension(R.dimen.container_padding)) + TopMarginItemDecoration(resources.getDimension(CommonR.dimen.container_padding)) ) } diff --git a/app/src/main/java/com/naviapp/dashboard/menu/notificationsettings/DisableNotificationsFragment.kt b/app/src/main/java/com/naviapp/dashboard/menu/notificationsettings/DisableNotificationsFragment.kt index 3f1e603364..76c6c6d608 100644 --- a/app/src/main/java/com/naviapp/dashboard/menu/notificationsettings/DisableNotificationsFragment.kt +++ b/app/src/main/java/com/naviapp/dashboard/menu/notificationsettings/DisableNotificationsFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.dashboard.menu.notificationsettings +import com.navi.design.R as DesignR import android.view.View import android.view.ViewStub import androidx.databinding.DataBindingUtil @@ -36,7 +37,7 @@ class DisableNotificationsFragment : BaseBottomSheet(), View.OnClickListener { private fun initUI() { binding.noBtn.setProperties(getString(R.string.no)) binding.yesBtn.setProperties(getString(R.string.yes), R.color.title_color_one) - binding.yesBtn.setViewBg(bgColor = R.color.view_background_color_six, elevation = 0f) + binding.yesBtn.setViewBg(bgColor = DesignR.color.view_background_color_six, elevation = 0f) } override val screenName: String diff --git a/app/src/main/java/com/naviapp/dashboard/views/fragment/ShareAppFragment.kt b/app/src/main/java/com/naviapp/dashboard/views/fragment/ShareAppFragment.kt index 0fb082647c..e5d00b1327 100644 --- a/app/src/main/java/com/naviapp/dashboard/views/fragment/ShareAppFragment.kt +++ b/app/src/main/java/com/naviapp/dashboard/views/fragment/ShareAppFragment.kt @@ -55,7 +55,7 @@ class ShareAppFragment : BaseBottomSheet() { } binding.skipBtn.setProperties(title = getString(R.string.skip)) binding.skipBtn.setABVBackgroundColor(R.color.footer_back_dark_gray) - binding.skipBtn.setTitleColor(R.color.color_4D4D4D) + binding.skipBtn.setTitleColor(com.navi.amc.R.color.color_4D4D4D) binding.nextBtn.setTextGravity(Gravity.CENTER) binding.nextBtn.removeOutlineSpotShadowColor() binding.skipBtn.removeOutlineSpotShadowColor() diff --git a/app/src/main/java/com/naviapp/dynamicdelivery/activity/DynamicDeliveryActivity.kt b/app/src/main/java/com/naviapp/dynamicdelivery/activity/DynamicDeliveryActivity.kt index c0f633dfb4..9d1a9e05b8 100644 --- a/app/src/main/java/com/naviapp/dynamicdelivery/activity/DynamicDeliveryActivity.kt +++ b/app/src/main/java/com/naviapp/dynamicdelivery/activity/DynamicDeliveryActivity.kt @@ -7,6 +7,7 @@ package com.naviapp.dynamicdelivery.activity +import com.navi.design.R as DesignR import android.content.Intent import android.os.Bundle import android.view.View.GONE @@ -132,7 +133,7 @@ class DynamicDeliveryActivity : BaseActivity() { binding.apply { rootItem.setBackgroundColor( - ContextCompat.getColor(this@DynamicDeliveryActivity, R.color.color_3C0050) + ContextCompat.getColor(this@DynamicDeliveryActivity, DesignR.color.color_3C0050) ) bottomIv.setVisibilityState(VISIBLE) @@ -199,7 +200,7 @@ class DynamicDeliveryActivity : BaseActivity() { binding.apply { rootItem.setBackgroundColor( - ContextCompat.getColor(this@DynamicDeliveryActivity, R.color.color_3C0050) + ContextCompat.getColor(this@DynamicDeliveryActivity, DesignR.color.color_3C0050) ) bottomIv.setVisibilityState(VISIBLE) diff --git a/app/src/main/java/com/naviapp/dynamicdelivery/viewmodel/DynamicDeliveryVM.kt b/app/src/main/java/com/naviapp/dynamicdelivery/viewmodel/DynamicDeliveryVM.kt index 9da4e8573e..38362fd3f9 100644 --- a/app/src/main/java/com/naviapp/dynamicdelivery/viewmodel/DynamicDeliveryVM.kt +++ b/app/src/main/java/com/naviapp/dynamicdelivery/viewmodel/DynamicDeliveryVM.kt @@ -7,6 +7,7 @@ package com.naviapp.dynamicdelivery.viewmodel +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.content.Intent import android.net.Uri @@ -166,7 +167,7 @@ class DynamicDeliveryVM(private val manager: SplitInstallManager) : BaseVM() { FirebaseRemoteConfigHelper.getString(PL_SHORTCUT_DYNAMIC_DEEPLINK), label = label, shortcutId = NAVI_PL_SHORTCUT_ID, - shortcutIcon = R.drawable.ic_pl_shortcut + shortcutIcon = WidgetsR.drawable.ic_pl_shortcut ) } Constants.HL_DYNAMIC_MODULE_NAME -> { diff --git a/app/src/main/java/com/naviapp/home/activity/NewDashboardActivity.kt b/app/src/main/java/com/naviapp/home/activity/NewDashboardActivity.kt index 2025285e43..d26b142152 100644 --- a/app/src/main/java/com/naviapp/home/activity/NewDashboardActivity.kt +++ b/app/src/main/java/com/naviapp/home/activity/NewDashboardActivity.kt @@ -7,6 +7,8 @@ package com.naviapp.home.activity +import com.navi.insurance.R as InsuranceR +import com.navi.common.R as CommonR import android.animation.ObjectAnimator import android.annotation.SuppressLint import android.app.Activity @@ -792,7 +794,7 @@ class NewDashboardActivity : ?: run { Toast.makeText( this, - getString(com.navi.insurance.R.string.something_went_wrong), + getString(InsuranceR.string.something_went_wrong), Toast.LENGTH_SHORT ) .show() @@ -1373,7 +1375,7 @@ class NewDashboardActivity : (this as? Snackbar.SnackbarLayout)?.apply { setPadding( dpToPxInInt(resources.getInteger(R.integer.value_20)), - resources.getInteger(R.integer.zero), + resources.getInteger(InsuranceR.integer.zero), dpToPxInInt(resources.getInteger(R.integer.value_20)), dpToPxInInt(resources.getInteger(R.integer.value_20)) ) @@ -1386,7 +1388,7 @@ class NewDashboardActivity : inAppUpdateVM.appUpdateSnackBarView() addView( appSnackBarBinding.root, - resources.getInteger(com.navi.common.R.integer.zero) + resources.getInteger(CommonR.integer.zero) ) } } diff --git a/app/src/main/java/com/naviapp/home/activity/StoryActivity.kt b/app/src/main/java/com/naviapp/home/activity/StoryActivity.kt index f881097660..bd78760b29 100644 --- a/app/src/main/java/com/naviapp/home/activity/StoryActivity.kt +++ b/app/src/main/java/com/naviapp/home/activity/StoryActivity.kt @@ -7,6 +7,7 @@ package com.naviapp.home.activity +import com.navi.common.R as CommonR import android.annotation.SuppressLint import android.graphics.drawable.Drawable import android.os.Bundle @@ -72,7 +73,7 @@ class StoryActivity() : BaseActivity(), StoriesProgressView.StoriesListener { dialogDismissClicked = { handleDeepLink() }, showFullScreenError = true ) - overridePendingTransition(R.anim.activity_slide_in_right, R.anim.nothing) + overridePendingTransition(CommonR.anim.activity_slide_in_right, R.anim.nothing) TemporaryStorageHelper.updateSingleItem(TemporaryStorageHelper.STORY) } @@ -150,7 +151,7 @@ class StoryActivity() : BaseActivity(), StoriesProgressView.StoriesListener { } else { onBackPressed() } - overridePendingTransition(0, R.anim.activity_slide_out_right) + overridePendingTransition(0, CommonR.anim.activity_slide_out_right) } } @@ -388,7 +389,7 @@ class StoryActivity() : BaseActivity(), StoriesProgressView.StoriesListener { override fun onComplete() { naviAnalyticsEventTracker.onExitStories() - Handler().post { overridePendingTransition(0, R.anim.activity_slide_out_right) } + Handler().post { overridePendingTransition(0, CommonR.anim.activity_slide_out_right) } if (shouldNavigateToHome) { NaviDeepLinkNavigator.navigate(this, CtaData(url = HOME), finish = true) } else { diff --git a/app/src/main/java/com/naviapp/home/dashboard/ui/ChecklistWithIconBottomSheet.kt b/app/src/main/java/com/naviapp/home/dashboard/ui/ChecklistWithIconBottomSheet.kt index 29e15e8e80..6623568547 100644 --- a/app/src/main/java/com/naviapp/home/dashboard/ui/ChecklistWithIconBottomSheet.kt +++ b/app/src/main/java/com/naviapp/home/dashboard/ui/ChecklistWithIconBottomSheet.kt @@ -1,5 +1,6 @@ package com.naviapp.home.dashboard.ui +import com.navi.naviwidgets.R as WidgetsR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -30,7 +31,7 @@ class ChecklistWithIconBottomSheet : BaseBottomSheet() { private lateinit var binding: ChecklistWithIconLayoutBinding override fun setContainerView(viewStub: ViewStub) { - viewStub.layoutResource = R.layout.checklist_with_icon_layout + viewStub.layoutResource = WidgetsR.layout.checklist_with_icon_layout binding = DataBindingUtil.getBinding(viewStub.inflate())!! val bundle = if(arguments?.isEmpty == true) Bundle() else requireArguments() bundle.getParcelable(CTA_DATA)?.let { ctaData -> @@ -67,7 +68,7 @@ class ChecklistWithIconBottomSheet : BaseBottomSheet() { private fun getTextWithLeftIconLayoutBinding(): TextWithLeftIconLayoutBinding { return DataBindingUtil.inflate( LayoutInflater.from(context), - R.layout.text_with_left_icon_layout, + WidgetsR.layout.text_with_left_icon_layout, binding.itemsLl, false ) @@ -107,4 +108,4 @@ class ChecklistWithIconBottomSheet : BaseBottomSheet() { } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/home/dashboard/ui/ClosedLoansFragment.kt b/app/src/main/java/com/naviapp/home/dashboard/ui/ClosedLoansFragment.kt index 596dfe74b6..584bd22c55 100644 --- a/app/src/main/java/com/naviapp/home/dashboard/ui/ClosedLoansFragment.kt +++ b/app/src/main/java/com/naviapp/home/dashboard/ui/ClosedLoansFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.home.dashboard.ui +import com.navi.design.R as DesignR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -131,7 +132,7 @@ class ClosedLoansFragment : BaseFragment() { it.customView ?.findViewById(R.id.tvTabName) ?.setTextColor( - ContextCompat.getColor(requireContext(), R.color.title_text_red_color) + ContextCompat.getColor(requireContext(), DesignR.color.title_text_red_color) ) it.customView ?.findViewById(R.id.tvTabName) diff --git a/app/src/main/java/com/naviapp/home/dashboard/ui/DashboardFragment.kt b/app/src/main/java/com/naviapp/home/dashboard/ui/DashboardFragment.kt index 339bf7fb2c..f8b33fe8ba 100644 --- a/app/src/main/java/com/naviapp/home/dashboard/ui/DashboardFragment.kt +++ b/app/src/main/java/com/naviapp/home/dashboard/ui/DashboardFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.home.dashboard.ui +import com.navi.design.R as DesignR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -204,7 +205,7 @@ class DashboardFragment : PaymentBaseFragment() { it.customView ?.findViewById(R.id.tvTabName) ?.setTextColor( - ContextCompat.getColor(requireContext(), R.color.title_text_red_color) + ContextCompat.getColor(requireContext(), DesignR.color.title_text_red_color) ) it.customView ?.findViewById(R.id.tvTabName) diff --git a/app/src/main/java/com/naviapp/home/dashboard/ui/GridOptionsBottomSheet.kt b/app/src/main/java/com/naviapp/home/dashboard/ui/GridOptionsBottomSheet.kt index 31c516598e..d0807fd786 100644 --- a/app/src/main/java/com/naviapp/home/dashboard/ui/GridOptionsBottomSheet.kt +++ b/app/src/main/java/com/naviapp/home/dashboard/ui/GridOptionsBottomSheet.kt @@ -7,6 +7,7 @@ package com.naviapp.home.dashboard.ui +import com.navi.design.R as DesignR import android.os.Bundle import android.view.ViewStub import androidx.core.content.ContextCompat @@ -27,7 +28,7 @@ class GridOptionsBottomSheet : BaseBottomSheet() { private lateinit var binding: GridOptionBottomsheetLayoutBinding private lateinit var onOptionClick: (action: ActionData) -> Unit override fun setContainerView(viewStub: ViewStub) { - setBackgroundTint(ContextCompat.getColor(requireContext(), R.color.grey_alabaster)) + setBackgroundTint(ContextCompat.getColor(requireContext(), DesignR.color.grey_alabaster)) viewStub.layoutResource = R.layout.grid_option_bottomsheet_layout binding = DataBindingUtil.getBinding(viewStub.inflate())!! setPadding(0, 0, 0, 0) diff --git a/app/src/main/java/com/naviapp/home/dashboard/ui/InvestmentsFragment.kt b/app/src/main/java/com/naviapp/home/dashboard/ui/InvestmentsFragment.kt index 9050635a70..bea4cc1d0e 100644 --- a/app/src/main/java/com/naviapp/home/dashboard/ui/InvestmentsFragment.kt +++ b/app/src/main/java/com/naviapp/home/dashboard/ui/InvestmentsFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.home.dashboard.ui +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.graphics.Rect import android.os.Bundle @@ -222,11 +223,11 @@ class InvestmentsFragment() : BaseFragment(), WidgetCallback { ) { super.getItemOffsets(outRect, view, parent, state) parent.findContainingViewHolder(view)?.itemViewType?.let { itemViewType -> - if (itemViewType == com.navi.amc.R.layout.layout_list_overlapping_header) { + if (itemViewType == WidgetsR.layout.layout_list_overlapping_header) { outRect.set(0, 0, 0, (-1 * dpToPx(50).toInt())) - } else if (itemViewType == com.navi.naviwidgets.R.layout.image_header_layout && viewModel.containsHomeProductWidget()) { + } else if (itemViewType == WidgetsR.layout.image_header_layout && viewModel.containsHomeProductWidget()) { outRect.set(0, 0, 0, (-1 * dpToPx(80).toInt())) - } else if (itemViewType == com.navi.naviwidgets.R.layout.image_header_layout) { + } else if (itemViewType == WidgetsR.layout.image_header_layout) { outRect.set(0, 0, 0, (-1 * dpToPx(45).toInt())) } } diff --git a/app/src/main/java/com/naviapp/home/dashboard/ui/LeftRightTextListBottomSheet.kt b/app/src/main/java/com/naviapp/home/dashboard/ui/LeftRightTextListBottomSheet.kt index c96d0e5d10..cf9285b9c3 100644 --- a/app/src/main/java/com/naviapp/home/dashboard/ui/LeftRightTextListBottomSheet.kt +++ b/app/src/main/java/com/naviapp/home/dashboard/ui/LeftRightTextListBottomSheet.kt @@ -1,5 +1,6 @@ package com.naviapp.home.dashboard.ui +import com.navi.naviwidgets.R as WidgetsR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -27,7 +28,7 @@ class LeftRightTextListBottomSheet : BaseBottomSheet() { private lateinit var binding: LeftRightTextListWithButtonBinding override fun setContainerView(viewStub: ViewStub) { - viewStub.layoutResource = R.layout.left_right_text_list_with_button + viewStub.layoutResource = WidgetsR.layout.left_right_text_list_with_button binding = DataBindingUtil.getBinding(viewStub.inflate())!! val bundle = if(arguments?.isEmpty == true) Bundle() else requireArguments() bundle.getParcelable(CTA_DATA)?.let { ctaData -> @@ -66,7 +67,7 @@ class LeftRightTextListBottomSheet : BaseBottomSheet() { private fun getLayoutLeftRightTextBinding(): LayoutLeftRightTextSingleLineBinding { return DataBindingUtil.inflate( LayoutInflater.from(context), - R.layout.layout_left_right_text_single_line, + WidgetsR.layout.layout_left_right_text_single_line, binding.itemsLl, false ) @@ -115,4 +116,4 @@ class LeftRightTextListBottomSheet : BaseBottomSheet() { } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/manager/WorkManager.kt b/app/src/main/java/com/naviapp/manager/WorkManager.kt index 22f5f246b5..c66a15df3b 100644 --- a/app/src/main/java/com/naviapp/manager/WorkManager.kt +++ b/app/src/main/java/com/naviapp/manager/WorkManager.kt @@ -7,6 +7,7 @@ package com.naviapp.manager +import com.navi.common.R as CommonR import androidx.work.ExistingPeriodicWorkPolicy import androidx.work.PeriodicWorkRequest import androidx.work.WorkManager @@ -27,10 +28,10 @@ class WorkManager { private val exceptionHandler = CoroutineExceptionHandler { _, exception -> when (workerType) { UserContactWorker.NAME -> { - Exception(NaviApplication.instance.applicationContext.getString(R.string.network_error_contact)).log() + Exception(NaviApplication.instance.applicationContext.getString(CommonR.string.network_error_contact)).log() } UserSmsWorker.NAME -> { - Exception(NaviApplication.instance.applicationContext.getString(R.string.network_error_sms)).log() + Exception(NaviApplication.instance.applicationContext.getString(CommonR.string.network_error_sms)).log() } } } @@ -51,14 +52,14 @@ class WorkManager { } catch (e: Exception) { when (workerName) { UserContactWorker.NAME -> { - Exception(NaviApplication.instance.applicationContext.getString(R.string.network_error_contact)).log() + Exception(NaviApplication.instance.applicationContext.getString(CommonR.string.network_error_contact)).log() } UserSmsWorker.NAME -> { - Exception(NaviApplication.instance.applicationContext.getString(R.string.network_error_sms)).log() + Exception(NaviApplication.instance.applicationContext.getString(CommonR.string.network_error_sms)).log() } } } } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/manager/workers/UserContactWorker.kt b/app/src/main/java/com/naviapp/manager/workers/UserContactWorker.kt index 029597ad2e..56975cacd0 100644 --- a/app/src/main/java/com/naviapp/manager/workers/UserContactWorker.kt +++ b/app/src/main/java/com/naviapp/manager/workers/UserContactWorker.kt @@ -7,6 +7,7 @@ package com.naviapp.manager.workers +import com.navi.common.R as CommonR import android.content.Context import androidx.work.CoroutineWorker import androidx.work.WorkerParameters @@ -23,7 +24,7 @@ class UserContactWorker(context: Context, workerParameters: WorkerParameters) : ContactsUtil.readContacts(applicationContext) Result.success() } catch (e: Exception) { - Exception(NaviApplication.instance.applicationContext.getString(R.string.network_error_contact)).log() + Exception(NaviApplication.instance.applicationContext.getString(CommonR.string.network_error_contact)).log() Result.retry() } } diff --git a/app/src/main/java/com/naviapp/manager/workers/UserSmsWorker.kt b/app/src/main/java/com/naviapp/manager/workers/UserSmsWorker.kt index b4b1d74366..e9e79dc3d7 100644 --- a/app/src/main/java/com/naviapp/manager/workers/UserSmsWorker.kt +++ b/app/src/main/java/com/naviapp/manager/workers/UserSmsWorker.kt @@ -7,6 +7,7 @@ package com.naviapp.manager.workers +import com.navi.common.R as CommonR import android.content.Context import androidx.work.CoroutineWorker import androidx.work.WorkerParameters @@ -23,7 +24,7 @@ class UserSmsWorker(context: Context, workerParameters: WorkerParameters) : SmsUtil.readSms(applicationContext) Result.success() } catch (e: Exception) { - Exception(NaviApplication.instance.applicationContext.getString(R.string.network_error_sms)).log() + Exception(NaviApplication.instance.applicationContext.getString(CommonR.string.network_error_sms)).log() Result.retry() } } diff --git a/app/src/main/java/com/naviapp/network/retrofit/ResponseCallback.kt b/app/src/main/java/com/naviapp/network/retrofit/ResponseCallback.kt index 5beafcbb1f..95561acbeb 100644 --- a/app/src/main/java/com/naviapp/network/retrofit/ResponseCallback.kt +++ b/app/src/main/java/com/naviapp/network/retrofit/ResponseCallback.kt @@ -7,6 +7,7 @@ package com.naviapp.network.retrofit +import com.navi.common.R as CommonR import com.google.firebase.crashlytics.FirebaseCrashlytics import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -186,7 +187,7 @@ abstract class ResponseCallback { val isRestartNeeded = fetchNewKeyFromFirebaseAndRestart() NaviTrackEvent.trackEvent(eventName = "Restart needed: $isRestartNeeded") if (isRestartNeeded.not()) { - errorMessage.message = CommonLibManager.application.getString(com.navi.common.R.string.something_went_wrong) + errorMessage.message = CommonLibManager.application.getString(CommonR.string.something_went_wrong) errorMessage.statusCode = ApiConstants.API_CODE_SSL_HANDSHAKE_EXCEPTION } } else { diff --git a/app/src/main/java/com/naviapp/payment/activities/NaviPaymentActivity.kt b/app/src/main/java/com/naviapp/payment/activities/NaviPaymentActivity.kt index 91e49e3474..a339aeb123 100644 --- a/app/src/main/java/com/naviapp/payment/activities/NaviPaymentActivity.kt +++ b/app/src/main/java/com/naviapp/payment/activities/NaviPaymentActivity.kt @@ -6,6 +6,7 @@ package com.naviapp.payment.activities +import com.navi.insurance.R as InsuranceR import android.os.Bundle import androidx.core.view.isVisible import androidx.databinding.DataBindingUtil @@ -141,7 +142,7 @@ class NaviPaymentActivity : DashboardBaseActivity(), FragmentInteractionListener } if (screen == PART_PRE_PAYMENT_PAGE) { binding.topHeaderLay.toolbarHeading.isVisible = true - binding.topHeaderLay.toolbarHeading.text = getString(R.string.pre_payment) + binding.topHeaderLay.toolbarHeading.text = getString(InsuranceR.string.pre_payment) } if (isFinishing) return supportFragmentManager.beginTransaction().run { @@ -191,4 +192,4 @@ class NaviPaymentActivity : DashboardBaseActivity(), FragmentInteractionListener get() = NaviAnalytics.PAYMENT_ACTIVITY override val moduleName: ModuleNameV2 get() = getLendingModuleNameFromWidgetId(intent?.getStringExtra(WIDGET_ID)) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/payment/fragments/PartPrePaymentFragment.kt b/app/src/main/java/com/naviapp/payment/fragments/PartPrePaymentFragment.kt index d7716465b3..13f1eebf19 100644 --- a/app/src/main/java/com/naviapp/payment/fragments/PartPrePaymentFragment.kt +++ b/app/src/main/java/com/naviapp/payment/fragments/PartPrePaymentFragment.kt @@ -213,7 +213,7 @@ class PartPrePaymentFragment : PaymentBaseFragment(), View.OnKeyListener { ) binding.paymentBtn.setViewBg(null, R.color.pay_now_active_color) binding.confirmBtn.setProperties( - title = resources.getString(R.string.confirm), + title = resources.getString(com.navi.pay.R.string.confirm), iconId = R.drawable.ic_right_arrow_svg ) binding.confirmBtn.setViewBg(null, R.color.pay_now_active_color) diff --git a/app/src/main/java/com/naviapp/payment/fragments/PaymentFragment.kt b/app/src/main/java/com/naviapp/payment/fragments/PaymentFragment.kt index 8369fe4849..945d41c75c 100644 --- a/app/src/main/java/com/naviapp/payment/fragments/PaymentFragment.kt +++ b/app/src/main/java/com/naviapp/payment/fragments/PaymentFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.payment.fragments +import com.navi.insurance.R as InsuranceR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -130,7 +131,7 @@ class PaymentFragment : PaymentBaseFragment() { binding.goCustomPayTv.setProperties( message, R.color.error_red, - R.drawable.arrow_right, + InsuranceR.drawable.arrow_right, R.color.error_red ) binding.goCustomPayTv.setTextSize(16) diff --git a/app/src/main/java/com/naviapp/payment/fragments/PrecloseLoanBottomSheet.kt b/app/src/main/java/com/naviapp/payment/fragments/PrecloseLoanBottomSheet.kt index 3689a0ffc5..39bec2aa8b 100644 --- a/app/src/main/java/com/naviapp/payment/fragments/PrecloseLoanBottomSheet.kt +++ b/app/src/main/java/com/naviapp/payment/fragments/PrecloseLoanBottomSheet.kt @@ -7,6 +7,7 @@ package com.naviapp.payment.fragments +import com.navi.common.R as CommonR import android.content.Context import android.content.DialogInterface import android.os.Bundle @@ -66,7 +67,7 @@ class PrecloseLoanBottomSheet : BaseBottomSheet() { binding.btnOkay.setViewBg(null, R.color.pay_now_active_color) context?.apply { binding.btnOkay.setProperties( - this.getString(R.string.okay), + this.getString(CommonR.string.okay), R.color.white ) } @@ -171,4 +172,4 @@ class PrecloseLoanBottomSheet : BaseBottomSheet() { arguments = bundle } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/payment/fragments/TermsAndConditionsBottomSheet.kt b/app/src/main/java/com/naviapp/payment/fragments/TermsAndConditionsBottomSheet.kt index 5954ec3885..2a637ed9fc 100644 --- a/app/src/main/java/com/naviapp/payment/fragments/TermsAndConditionsBottomSheet.kt +++ b/app/src/main/java/com/naviapp/payment/fragments/TermsAndConditionsBottomSheet.kt @@ -7,6 +7,8 @@ package com.naviapp.payment.fragments +import com.navi.insurance.R as InsuranceR +import com.navi.common.R as CommonR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -46,7 +48,7 @@ class TermsAndConditionsBottomSheet : BaseBottomSheet() { binding.btnOkay.setViewBg(null, R.color.pay_now_active_color) context?.apply { binding.btnOkay.setProperties( - it.footer?.primaryButton?.title?.text ?: this.getString(R.string.okay), + it.footer?.primaryButton?.title?.text ?: this.getString(CommonR.string.okay), R.color.white ) } @@ -64,7 +66,7 @@ class TermsAndConditionsBottomSheet : BaseBottomSheet() { private fun getTncItemView(title: String?): View { val itemViewBinding = DataBindingUtil.inflate( LayoutInflater.from(context), - com.navi.insurance.R.layout.terms_conditions_item, + InsuranceR.layout.terms_conditions_item, binding.llContents, false ) @@ -88,4 +90,4 @@ class TermsAndConditionsBottomSheet : BaseBottomSheet() { arguments = bundle } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/payment/views/PartPrePaymentReviewView.kt b/app/src/main/java/com/naviapp/payment/views/PartPrePaymentReviewView.kt index 682babcd6f..666f968c18 100644 --- a/app/src/main/java/com/naviapp/payment/views/PartPrePaymentReviewView.kt +++ b/app/src/main/java/com/naviapp/payment/views/PartPrePaymentReviewView.kt @@ -6,6 +6,7 @@ */ package com.naviapp.payment.views +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -78,7 +79,7 @@ class PartPrePaymentReviewView @JvmOverloads constructor( isFooterLoading = false setViewAllVisibility(showFooter) binding.footerText.text = context.getString(R.string.view_all) - binding.footerText.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_down_small, 0) + binding.footerText.setCompoundDrawablesWithIntrinsicBounds(0, 0, DesignR.drawable.ic_arrow_down_small, 0) binding.loaderIcon.isVisible = false items?.forEach { binding.tableLayout.addView(getItemRow(it)) @@ -139,4 +140,4 @@ class PartPrePaymentReviewView @JvmOverloads constructor( fun onFooterClick(widgetId: String, page: Int, pageSize: Int) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/payment/views/TransactionHistoryView.kt b/app/src/main/java/com/naviapp/payment/views/TransactionHistoryView.kt index 458ce25c1e..8a3d048c4e 100644 --- a/app/src/main/java/com/naviapp/payment/views/TransactionHistoryView.kt +++ b/app/src/main/java/com/naviapp/payment/views/TransactionHistoryView.kt @@ -6,6 +6,7 @@ package com.naviapp.payment.views +import com.navi.common.R as CommonR import android.content.Context import android.text.TextUtils import android.util.AttributeSet @@ -49,7 +50,7 @@ class TransactionHistoryView @JvmOverloads constructor( binding.data = transactionBinder if (TextUtils.equals(FirebaseStatusType.SUCCESS, data.status)) { binding.statusTv.setCompoundDrawablesWithIntrinsicBounds( - R.drawable.ic_tick_svg, + CommonR.drawable.ic_tick_svg, 0, 0, 0 @@ -63,4 +64,4 @@ class TransactionHistoryView @JvmOverloads constructor( ) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/payment_behaviour/fragments/PaymentBehaviourFragment.kt b/app/src/main/java/com/naviapp/payment_behaviour/fragments/PaymentBehaviourFragment.kt index 39f374e8c8..2af2087372 100644 --- a/app/src/main/java/com/naviapp/payment_behaviour/fragments/PaymentBehaviourFragment.kt +++ b/app/src/main/java/com/naviapp/payment_behaviour/fragments/PaymentBehaviourFragment.kt @@ -7,6 +7,8 @@ package com.naviapp.payment_behaviour.fragments +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.animation.Animator import android.animation.ValueAnimator import android.graphics.Color @@ -328,14 +330,14 @@ class PaymentBehaviourFragment : PartPrePaymentBaseFragment(), WidgetCallback, naviWidget.animatedLoaderWithTextWidgetData?.percentage?.let { val endValue = it.toFloat() val duration = - resources.getInteger(com.navi.naviwidgets.R.integer.integer_3000) + resources.getInteger(DesignR.integer.integer_3000) .toLong() val valueAnimator = ValueAnimator.ofFloat(0f, endValue) valueAnimator.duration = duration valueAnimator.addUpdateListener { animation -> val progress = animation.animatedValue as Float layoutBinding.loaderText.text = - getString(com.navi.naviwidgets.R.string.percentage_text, progress.toInt()) + getString(WidgetsR.string.percentage_text, progress.toInt()) } valueAnimator.addListener(percentageAnimatorListener()) valueAnimator.doOnEnd { @@ -393,7 +395,7 @@ class PaymentBehaviourFragment : PartPrePaymentBaseFragment(), WidgetCallback, } } ) - val mediaPlayer = MediaPlayer.create(context, R.raw.positive_reinforcement_confetti_sound) + val mediaPlayer = MediaPlayer.create(context, WidgetsR.raw.positive_reinforcement_confetti_sound) mediaPlayer.start() layoutBinding.lottieView.playAnimation() } @@ -402,7 +404,7 @@ class PaymentBehaviourFragment : PartPrePaymentBaseFragment(), WidgetCallback, val mediaPlayer = MediaPlayer.create( context, - com.navi.naviwidgets.R.raw.positive_reinforcement_meter_sound + WidgetsR.raw.positive_reinforcement_meter_sound ) override fun onAnimationStart(animation: Animator) { diff --git a/app/src/main/java/com/naviapp/permission/activities/PermissionActivity.kt b/app/src/main/java/com/naviapp/permission/activities/PermissionActivity.kt index 9b21808971..ca0455bf83 100644 --- a/app/src/main/java/com/naviapp/permission/activities/PermissionActivity.kt +++ b/app/src/main/java/com/naviapp/permission/activities/PermissionActivity.kt @@ -7,6 +7,7 @@ package com.naviapp.permission.activities +import com.navi.design.R as DesignR import android.Manifest import android.content.Intent import android.content.pm.PackageManager @@ -207,7 +208,7 @@ class PermissionActivity : binding.permissionTileRv.adapter = permissionAdapter permissionAdapter.updatePermissionTiles(permissionTiles) binding.permissionDeniedLayout.setTitle(getString(R.string.all_mandatory_permissions)) - binding.permissionDeniedLayout.setBgColor(R.color.view_background_color_six) + binding.permissionDeniedLayout.setBgColor(DesignR.color.view_background_color_six) binding.permissionDeniedLayout.setCallback { naviAnalyticsEventTracker.onAllPermissionMandatoryClicked() openNativePermissionPage() diff --git a/app/src/main/java/com/naviapp/permission/adapters/PermissionAdapter.kt b/app/src/main/java/com/naviapp/permission/adapters/PermissionAdapter.kt index 6bf3deaa89..a025b1abea 100644 --- a/app/src/main/java/com/naviapp/permission/adapters/PermissionAdapter.kt +++ b/app/src/main/java/com/naviapp/permission/adapters/PermissionAdapter.kt @@ -7,6 +7,7 @@ package com.naviapp.permission.adapters +import com.navi.common.R as CommonR import android.content.Context import android.content.pm.PackageManager import android.content.res.ColorStateList @@ -68,7 +69,7 @@ class PermissionAdapter : RecyclerView.Adapter { ResourcesCompat.getDrawable( binding.root.context.resources, - R.drawable.ic_tick_svg, + CommonR.drawable.ic_tick_svg, null ) ?.let { permissionTile.icon = it } diff --git a/app/src/main/java/com/naviapp/permission/utils/PermissionUtil.kt b/app/src/main/java/com/naviapp/permission/utils/PermissionUtil.kt index 6e749ca3d2..c0bda227d3 100644 --- a/app/src/main/java/com/naviapp/permission/utils/PermissionUtil.kt +++ b/app/src/main/java/com/naviapp/permission/utils/PermissionUtil.kt @@ -7,6 +7,7 @@ package com.naviapp.permission.utils +import com.navi.common.R as CommonR import android.Manifest import android.content.Context import android.content.Intent @@ -116,7 +117,7 @@ fun getAlternatePermissionTilesV2(): List { PermissionTile( ResourcesCompat.getDrawable( application.resources, - R.drawable.ic_message_permission, + CommonR.drawable.ic_message_permission, null ), application.getString(R.string.sms), @@ -164,7 +165,7 @@ fun getAlternatePermissionTilesV2WithoutFineLocation(): List { PermissionTile( ResourcesCompat.getDrawable( application.resources, - R.drawable.ic_message_permission, + CommonR.drawable.ic_message_permission, null ), application.getString(R.string.sms), diff --git a/app/src/main/java/com/naviapp/personalloan/getloan/activities/BankAccountVerificationLoaderActivity.kt b/app/src/main/java/com/naviapp/personalloan/getloan/activities/BankAccountVerificationLoaderActivity.kt index 535c0e909e..68c42d2118 100644 --- a/app/src/main/java/com/naviapp/personalloan/getloan/activities/BankAccountVerificationLoaderActivity.kt +++ b/app/src/main/java/com/naviapp/personalloan/getloan/activities/BankAccountVerificationLoaderActivity.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloan.getloan.activities +import com.navi.design.R as DesignR import android.app.Activity import android.content.Intent import android.os.Bundle @@ -114,7 +115,7 @@ class BankAccountVerificationLoaderActivity : binding.actionBtn.visibility = View.VISIBLE binding.noteTv.visibility = View.GONE binding.goBackBtn.setProperties(getString(R.string.go_back), titleColor = R.color.black) - binding.goBackBtn.setViewBg(bgColor = R.color.gray) + binding.goBackBtn.setViewBg(bgColor = DesignR.color.gray) binding.goBackBtn.visibility = View.VISIBLE cancelTimer() loadTimeEventTracker.onLoadingCompleted(NaviAnalytics.PL_PENNY_DROP_LOAD_TIME) diff --git a/app/src/main/java/com/naviapp/personalloan/getloan/bankdetails/fragments/BankDetailsFragment.kt b/app/src/main/java/com/naviapp/personalloan/getloan/bankdetails/fragments/BankDetailsFragment.kt index 7de788850d..da58b1a47c 100644 --- a/app/src/main/java/com/naviapp/personalloan/getloan/bankdetails/fragments/BankDetailsFragment.kt +++ b/app/src/main/java/com/naviapp/personalloan/getloan/bankdetails/fragments/BankDetailsFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloan.getloan.bankdetails.fragments +import com.navi.design.R as DesignR import android.app.Activity import android.content.Context import android.content.Intent @@ -214,7 +215,7 @@ class BankDetailsFragment : this.title.orElse(getString(R.string.go_back)), titleColor = R.color.title_color_one ) - binding.goBackBtn.setViewBg(bgColor = R.color.view_background_color_six) + binding.goBackBtn.setViewBg(bgColor = DesignR.color.view_background_color_six) binding.goBackBtn.setOnClickListener { if (this.url == CtaType.GO_BACK.name) { headerInteractionListener?.onBackPressed() diff --git a/app/src/main/java/com/naviapp/personalloan/getloan/bankdetails/fragments/PennyDropFailureBottomSheet.kt b/app/src/main/java/com/naviapp/personalloan/getloan/bankdetails/fragments/PennyDropFailureBottomSheet.kt index 4c022aeeee..1950ec51bf 100644 --- a/app/src/main/java/com/naviapp/personalloan/getloan/bankdetails/fragments/PennyDropFailureBottomSheet.kt +++ b/app/src/main/java/com/naviapp/personalloan/getloan/bankdetails/fragments/PennyDropFailureBottomSheet.kt @@ -1,5 +1,6 @@ package com.naviapp.personalloan.getloan.bankdetails.fragments +import com.navi.common.R as CommonR import android.os.Bundle import android.view.View import android.view.ViewStub @@ -29,7 +30,7 @@ class PennyDropFailureBottomSheet : BaseBottomSheet(), View.OnClickListener { private fun initUI() { binding.secondaryButton.setViewBg(cornerRadiusId = R.integer.value_8, bgDrawable = context?.let { ContextCompat.getDrawable( - it, R.drawable.bg_red_rounded_border_8 + it, CommonR.drawable.bg_red_rounded_border_8 ) }) binding.secondaryButton.setOnClickListener(this) @@ -73,4 +74,4 @@ class PennyDropFailureBottomSheet : BaseBottomSheet(), View.OnClickListener { } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/personalloan/getloan/bankdetails/fragments/accountaggregator/AccountAggregatorFragment.kt b/app/src/main/java/com/naviapp/personalloan/getloan/bankdetails/fragments/accountaggregator/AccountAggregatorFragment.kt index 99f439517e..38ad201a4a 100644 --- a/app/src/main/java/com/naviapp/personalloan/getloan/bankdetails/fragments/accountaggregator/AccountAggregatorFragment.kt +++ b/app/src/main/java/com/naviapp/personalloan/getloan/bankdetails/fragments/accountaggregator/AccountAggregatorFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloan.getloan.bankdetails.fragments.accountaggregator +import com.navi.design.R as DesignR import android.app.Activity import android.content.BroadcastReceiver import android.content.Context @@ -481,7 +482,7 @@ class AccountAggregatorFragment : title = getString(R.string.skip), titleColor = R.color.black ) - binding.skipLinkBtn.setViewBg(bgColor = R.color.gray) + binding.skipLinkBtn.setViewBg(bgColor = DesignR.color.gray) sharedVM.sessionIdData.observe(viewLifecycleOwner) { hideLoader() diff --git a/app/src/main/java/com/naviapp/personalloan/getloan/bankdetailsautodebit/view/fragments/BankDetailsAutoDebitFragment.kt b/app/src/main/java/com/naviapp/personalloan/getloan/bankdetailsautodebit/view/fragments/BankDetailsAutoDebitFragment.kt index 8512005593..f63f0a6784 100644 --- a/app/src/main/java/com/naviapp/personalloan/getloan/bankdetailsautodebit/view/fragments/BankDetailsAutoDebitFragment.kt +++ b/app/src/main/java/com/naviapp/personalloan/getloan/bankdetailsautodebit/view/fragments/BankDetailsAutoDebitFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloan.getloan.bankdetailsautodebit.view.fragments +import com.navi.common.R as CommonR import android.app.Activity import android.app.Activity.RESULT_OK import android.content.Context @@ -375,7 +376,7 @@ class BankDetailsAutoDebitFragment : binding.footerView.setProperties( disbursementDetailsResponse?.footer?.backCta, CtaData( - title = resources.getString(R.string.setup_auto_debit), + title = resources.getString(CommonR.string.setup_auto_debit), url = Constants.SETUP_AUTO_DEBIT ), this diff --git a/app/src/main/java/com/naviapp/personalloan/getloan/common/view/KycPanView.kt b/app/src/main/java/com/naviapp/personalloan/getloan/common/view/KycPanView.kt index 4926b3f4ef..4d92954b25 100644 --- a/app/src/main/java/com/naviapp/personalloan/getloan/common/view/KycPanView.kt +++ b/app/src/main/java/com/naviapp/personalloan/getloan/common/view/KycPanView.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloan.getloan.common.view +import com.navi.common.R as CommonR import android.content.Context import android.util.AttributeSet @@ -43,7 +44,7 @@ class KycPanView(context: Context, attrs: AttributeSet) : LinearLayout(context, this.status = status when (status) { Status.COMPLETE -> { - binding.statusIv.setImageResource(R.drawable.ic_tick_svg) + binding.statusIv.setImageResource(CommonR.drawable.ic_tick_svg) binding.errorTv.visibility = View.GONE binding.stateCv.visibility = View.INVISIBLE binding.indexTv.visibility = View.GONE @@ -69,4 +70,4 @@ class KycPanView(context: Context, attrs: AttributeSet) : LinearLayout(context, COMPLETE, ERROR } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/personalloan/getloan/common/view/StatusIndicatorView.kt b/app/src/main/java/com/naviapp/personalloan/getloan/common/view/StatusIndicatorView.kt index 9d5d284a1f..1504d43b29 100644 --- a/app/src/main/java/com/naviapp/personalloan/getloan/common/view/StatusIndicatorView.kt +++ b/app/src/main/java/com/naviapp/personalloan/getloan/common/view/StatusIndicatorView.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloan.getloan.common.view +import com.navi.common.R as CommonR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -47,7 +48,7 @@ class StatusIndicatorView(context: Context, attrs: AttributeSet) : LinearLayout( this.status = status when (status) { Status.COMPLETE, Status.VKYC_PENDING -> { - binding.statusIv.setImageResource(R.drawable.ic_tick_svg) + binding.statusIv.setImageResource(CommonR.drawable.ic_tick_svg) listener?.onStatusComplete() } Status.ERROR -> { @@ -67,4 +68,4 @@ class StatusIndicatorView(context: Context, attrs: AttributeSet) : LinearLayout( ERROR, VKYC_PENDING } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/personalloan/getloan/creditAssignment/fragments/CreditAssignmentFragment.kt b/app/src/main/java/com/naviapp/personalloan/getloan/creditAssignment/fragments/CreditAssignmentFragment.kt index 7a7db7e1e2..4da200c2e2 100644 --- a/app/src/main/java/com/naviapp/personalloan/getloan/creditAssignment/fragments/CreditAssignmentFragment.kt +++ b/app/src/main/java/com/naviapp/personalloan/getloan/creditAssignment/fragments/CreditAssignmentFragment.kt @@ -7,6 +7,8 @@ package com.naviapp.personalloan.getloan.creditAssignment.fragments +import com.navi.insurance.R as InsuranceR +import com.navi.design.R as DesignR import android.os.Bundle import android.os.CountDownTimer import android.text.Editable @@ -148,7 +150,7 @@ class CreditAssignmentFragment : BaseFragment(), binding.buttonCard.setCardBackgroundColor( ContextCompat.getColor( context, - R.color.view_background_color_six + DesignR.color.view_background_color_six ) ) binding.continueButton.isClickable = false @@ -414,11 +416,11 @@ class CreditAssignmentFragment : BaseFragment(), val dividerParams = LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, - resources.getDimensionPixelSize(R.dimen.dp_1) + resources.getDimensionPixelSize(InsuranceR.dimen.dp_1) ) dividerParams.setMargins( 0, - resources.getDimensionPixelSize(R.dimen.dp_14), + resources.getDimensionPixelSize(InsuranceR.dimen.dp_14), 0, 0 ) @@ -446,7 +448,7 @@ class CreditAssignmentFragment : BaseFragment(), ) rowParams.setMargins( 0, - resources.getDimensionPixelSize(R.dimen.dp_14), + resources.getDimensionPixelSize(InsuranceR.dimen.dp_14), 0, 0 ) @@ -700,4 +702,4 @@ class CreditAssignmentFragment : BaseFragment(), override fun launchPermissionRequest() { permissionReqLauncher.launch(PERMISSIONS) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/personalloan/getloan/creditAssignment/fragments/SelectContactsFragment.kt b/app/src/main/java/com/naviapp/personalloan/getloan/creditAssignment/fragments/SelectContactsFragment.kt index c5763fe503..d824cba0bb 100644 --- a/app/src/main/java/com/naviapp/personalloan/getloan/creditAssignment/fragments/SelectContactsFragment.kt +++ b/app/src/main/java/com/naviapp/personalloan/getloan/creditAssignment/fragments/SelectContactsFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloan.getloan.creditAssignment.fragments +import com.navi.insurance.R as InsuranceR import android.content.Context import android.database.Cursor import android.graphics.Color @@ -341,9 +342,9 @@ class SelectContactsFragment : BaseFragment(), ContactListUpdateListener { } private fun getGridItemWidth(): Int { - val gridWidth = getScreenWidth() - resources.getDimensionPixelSize(R.dimen.dp_30) + val gridWidth = getScreenWidth() - resources.getDimensionPixelSize(com.navi.amc.R.dimen.dp_30) gridRowItemCount = - min(maxGridRowItems, (gridWidth / resources.getDimensionPixelSize(R.dimen.dp_54))) + min(maxGridRowItems, (gridWidth / resources.getDimensionPixelSize(InsuranceR.dimen.dp_54))) return (gridWidth / gridRowItemCount) } diff --git a/app/src/main/java/com/naviapp/personalloan/getloan/emi/common/commonview/EmiDateChangeBottomSheet.kt b/app/src/main/java/com/naviapp/personalloan/getloan/emi/common/commonview/EmiDateChangeBottomSheet.kt index 14c5df5c41..be82580350 100644 --- a/app/src/main/java/com/naviapp/personalloan/getloan/emi/common/commonview/EmiDateChangeBottomSheet.kt +++ b/app/src/main/java/com/naviapp/personalloan/getloan/emi/common/commonview/EmiDateChangeBottomSheet.kt @@ -7,6 +7,8 @@ package com.naviapp.personalloan.getloan.emi.common.commonview +import com.navi.insurance.R as InsuranceR +import com.navi.design.R as DesignR import android.content.Context import android.os.Bundle import android.view.View @@ -70,12 +72,12 @@ class EmiDateChangeBottomSheet : BaseBottomSheet() { it.descriptions?.forEachIndexed { _, textFieldData -> val itemView = context?.let { context -> getTextViewItem(textFieldData, context) } itemView?.setLineSpacing( - resources.getDimension(com.navi.naviwidgets.R.dimen.dp_1), + resources.getDimension(InsuranceR.dimen.dp_1), 1.0f ) itemView?.setPadding( 0, - resources.getDimension(com.navi.naviwidgets.R.dimen.dp_16).toInt(), + resources.getDimension(DesignR.dimen.dp_16).toInt(), 0, 0 ) diff --git a/app/src/main/java/com/naviapp/personalloan/getloan/emi/fragments/EMIDateChangeFragment.kt b/app/src/main/java/com/naviapp/personalloan/getloan/emi/fragments/EMIDateChangeFragment.kt index 62bfea41a9..a1affa193c 100644 --- a/app/src/main/java/com/naviapp/personalloan/getloan/emi/fragments/EMIDateChangeFragment.kt +++ b/app/src/main/java/com/naviapp/personalloan/getloan/emi/fragments/EMIDateChangeFragment.kt @@ -7,6 +7,8 @@ package com.naviapp.personalloan.getloan.emi.fragments +import com.navi.insurance.R as InsuranceR +import com.navi.design.R as DesignR import android.animation.Animator import android.content.Context import android.os.Bundle @@ -226,12 +228,12 @@ class EMIDateChangeFragment : PaymentBaseFragment(), FooterInteractionListener { binding.reasonLayout.visibility = View.VISIBLE binding.plainTextInput.background = getNaviDrawable( - strokeWidth = resources.getDimension(com.navi.naviwidgets.R.dimen.dp_1).toInt(), - cornerRadius = resources.getDimension(com.navi.naviwidgets.R.dimen.dp_8).toInt(), + strokeWidth = resources.getDimension(InsuranceR.dimen.dp_1).toInt(), + cornerRadius = resources.getDimension(InsuranceR.dimen.dp_8).toInt(), strokeColor = ResourcesCompat.getColor( resources, - com.navi.naviwidgets.R.color.border_dark_grey_color, + DesignR.color.border_dark_grey_color, null ) ) @@ -246,7 +248,7 @@ class EMIDateChangeFragment : PaymentBaseFragment(), FooterInteractionListener { binding.errorText.visibility = View.VISIBLE context?.let { binding.errorText.setTextColor( - ContextCompat.getColor(it, R.color.description_grey_color_seven) + ContextCompat.getColor(it, DesignR.color.description_grey_color_seven) ) binding.errorText.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null) } @@ -260,7 +262,7 @@ class EMIDateChangeFragment : PaymentBaseFragment(), FooterInteractionListener { binding.errorText.visibility = View.VISIBLE context?.let { binding.errorText.setTextColor( - ContextCompat.getColor(it, R.color.description_grey_color_seven) + ContextCompat.getColor(it, DesignR.color.description_grey_color_seven) ) binding.errorText.setCompoundDrawablesWithIntrinsicBounds( null, @@ -272,13 +274,13 @@ class EMIDateChangeFragment : PaymentBaseFragment(), FooterInteractionListener { } binding.plainTextInput.background = getNaviDrawable( - strokeWidth = resources.getDimension(com.navi.naviwidgets.R.dimen.dp_1).toInt(), + strokeWidth = resources.getDimension(InsuranceR.dimen.dp_1).toInt(), cornerRadius = - resources.getDimension(com.navi.naviwidgets.R.dimen.dp_8).toInt(), + resources.getDimension(InsuranceR.dimen.dp_8).toInt(), strokeColor = ResourcesCompat.getColor( resources, - com.navi.naviwidgets.R.color.border_dark_grey_color, + DesignR.color.border_dark_grey_color, null ) ) @@ -425,13 +427,13 @@ class EMIDateChangeFragment : PaymentBaseFragment(), FooterInteractionListener { binding.plainTextInput.background = getNaviDrawable( strokeWidth = - resources.getDimension(com.navi.naviwidgets.R.dimen.dp_1).toInt(), + resources.getDimension(InsuranceR.dimen.dp_1).toInt(), cornerRadius = - resources.getDimension(com.navi.naviwidgets.R.dimen.dp_8).toInt(), + resources.getDimension(InsuranceR.dimen.dp_8).toInt(), strokeColor = ResourcesCompat.getColor( resources, - com.navi.naviwidgets.R.color.outrageous_orange, + DesignR.color.outrageous_orange, null ) ) diff --git a/app/src/main/java/com/naviapp/personalloan/getloan/helper/DigioKycVerificationHelper.kt b/app/src/main/java/com/naviapp/personalloan/getloan/helper/DigioKycVerificationHelper.kt index 58bf7a05bf..498ff64b21 100644 --- a/app/src/main/java/com/naviapp/personalloan/getloan/helper/DigioKycVerificationHelper.kt +++ b/app/src/main/java/com/naviapp/personalloan/getloan/helper/DigioKycVerificationHelper.kt @@ -1,5 +1,6 @@ package com.naviapp.personalloan.getloan.helper +import com.navi.design.R as DesignR import android.app.Activity import androidx.appcompat.app.AppCompatActivity import com.navi.common.enach.ProviderType @@ -56,7 +57,7 @@ class DigioKycVerificationHelper(private val moduleName: String = ModuleNameV2.P private fun getDigioConfig(): DigioConfig { val config = DigioConfig() val digioTheme = DigioTheme() - digioTheme.primaryColor = R.color.ctaPrimaryColor + digioTheme.primaryColor = DesignR.color.ctaPrimaryColor config.theme = digioTheme if (BuildConfig.FLAVOR == PROD) { config.environment = DigioEnvironment.PRODUCTION @@ -89,4 +90,4 @@ class DigioKycVerificationHelper(private val moduleName: String = ModuleNameV2.P companion object { const val PL_DIGIO_KYC = "PL_DIGIO_KYC" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/common/GstVerificationView.kt b/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/common/GstVerificationView.kt index 462f083eaf..eee6842914 100644 --- a/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/common/GstVerificationView.kt +++ b/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/common/GstVerificationView.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloan.getloan.loandetails.common +import com.navi.naviwidgets.R as WidgetsR import android.animation.LayoutTransition import android.content.Context import android.os.CountDownTimer @@ -80,7 +81,7 @@ class GstVerificationView @JvmOverloads constructor( label = gstDetails.userNameFieldTitle hintText = gstDetails.userNameFieldPlaceHolder infoIcon = ResourcesCompat.getDrawable( - resources, R.drawable.ic_grey_white_info_icon, null + resources, WidgetsR.drawable.ic_grey_white_info_icon, null ) } binding.inputOtp.apply { @@ -275,4 +276,4 @@ class GstVerificationView @JvmOverloads constructor( INFO_BTN_CLICKED("INFO_BTN_CLICKED"), RESEND_OTP_CLICKED("RESEND_OTP_CLICKED") } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/common/LabeledInputTextWithButton.kt b/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/common/LabeledInputTextWithButton.kt index da5ac7ad09..8bddc6b03b 100644 --- a/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/common/LabeledInputTextWithButton.kt +++ b/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/common/LabeledInputTextWithButton.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloan.getloan.loandetails.common +import com.navi.design.R as DesignR import android.content.Context import android.graphics.drawable.Drawable import android.text.InputType @@ -51,7 +52,7 @@ constructor(context: Context?, attrs: AttributeSet? = null) : LinearLayout(conte getNaviDrawable( cornerRadius = resources.getDimension(R.dimen.layout_dp_8).toInt(), strokeWidth = resources.getDimension(R.dimen.layout_dp_1).toInt(), - strokeColor = ResourcesCompat.getColor(resources, R.color.black_10, null) + strokeColor = ResourcesCompat.getColor(resources, DesignR.color.black_10, null) ) inputEdt.hideCutCopyMenuPopUp() diff --git a/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/fragments/EmiCalendarFragment.kt b/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/fragments/EmiCalendarFragment.kt index 2d6aa317eb..c37049eb1a 100644 --- a/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/fragments/EmiCalendarFragment.kt +++ b/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/fragments/EmiCalendarFragment.kt @@ -139,7 +139,7 @@ class EmiCalendarFragment : BaseBottomSheet(), View.OnClickListener, EmiStartDat binding.emiHeader.columnTwoTv.text = emiDetail.emiInstallmentsHeader?.getOrNull(1)?.value binding.emiHeader.columnThreeTv.text = emiDetail.emiInstallmentsHeader?.getOrNull(2)?.value if (isEmiEditable) { - binding.confirmEmiStartDateBtn.setProperties(resources.getString(R.string.confirm)) + binding.confirmEmiStartDateBtn.setProperties(resources.getString(com.navi.pay.R.string.confirm)) emiDetail.emiStartDates?.let { emiStartDateList -> if (binding.emiStartDateRv.adapter == null) { val adapter = EmiStartDateAdapter(emiStartDateList, this) diff --git a/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/fragments/InfoBottomSheetWithIcon.kt b/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/fragments/InfoBottomSheetWithIcon.kt index 0da5c41045..574e486b8e 100644 --- a/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/fragments/InfoBottomSheetWithIcon.kt +++ b/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/fragments/InfoBottomSheetWithIcon.kt @@ -6,6 +6,7 @@ package com.naviapp.personalloan.getloan.loandetails.fragments +import com.navi.insurance.R as InsuranceR import android.os.Bundle import android.view.Gravity import android.view.ViewStub @@ -49,7 +50,7 @@ class InfoBottomSheetWithIcon : BaseBottomSheet() { arguments?.getString(BTN_TITLE)?.let { binding.actionBtn.setProperties(title = it) } ?: kotlin.run { - binding.actionBtn.setProperties(title = getString(R.string.i_understand)) + binding.actionBtn.setProperties(title = getString(InsuranceR.string.i_understand)) } binding.actionBtn.setTextGravity(Gravity.CENTER) @@ -83,4 +84,4 @@ class InfoBottomSheetWithIcon : BaseBottomSheet() { } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/personalloan/getloan/moratorium/MoratoriumConsentFragment.kt b/app/src/main/java/com/naviapp/personalloan/getloan/moratorium/MoratoriumConsentFragment.kt index c374d71026..916ba04d39 100644 --- a/app/src/main/java/com/naviapp/personalloan/getloan/moratorium/MoratoriumConsentFragment.kt +++ b/app/src/main/java/com/naviapp/personalloan/getloan/moratorium/MoratoriumConsentFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloan.getloan.moratorium +import com.navi.design.R as DesignR import android.os.Bundle import android.view.View import android.view.ViewStub @@ -43,7 +44,7 @@ class MoratoriumConsentFragment : BaseBottomSheet(), View.OnClickListener { } private fun initUI() { - binding.confirmBtn.setProperties(getString(R.string.confirm)) + binding.confirmBtn.setProperties(getString(com.navi.pay.R.string.confirm)) binding.moratoriumMessageTv.text = offer?.moratoriumConfig?.message binding.moratoriumConsentCb.text = getString( R.string.i_agree_to_not_availing_the_moratorium, @@ -57,7 +58,7 @@ class MoratoriumConsentFragment : BaseBottomSheet(), View.OnClickListener { if (isChecked) eventTracker.onCheckConsent() binding.confirmBtn.setStateABV( isChecked, - if (isChecked) R.color.red else R.color.disabled_button_color + if (isChecked) R.color.red else DesignR.color.disabled_button_color ) } diff --git a/app/src/main/java/com/naviapp/personalloan/insurance/activity/InsuranceDetailActivity.kt b/app/src/main/java/com/naviapp/personalloan/insurance/activity/InsuranceDetailActivity.kt index 92310c1ad9..19eb972087 100644 --- a/app/src/main/java/com/naviapp/personalloan/insurance/activity/InsuranceDetailActivity.kt +++ b/app/src/main/java/com/naviapp/personalloan/insurance/activity/InsuranceDetailActivity.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloan.insurance.activity +import com.navi.common.R as CommonR import android.os.Bundle import android.view.View import androidx.databinding.DataBindingUtil @@ -57,7 +58,7 @@ class InsuranceDetailActivity : BaseActivity(), View.OnClickListener { binding.insuranceDetailsRv.adapter = InsuranceGenericAdapter(it as List) binding.insuranceDetailsRv.addItemDecoration( - TopMarginItemDecoration(resources.getDimension(R.dimen.container_padding)) + TopMarginItemDecoration(resources.getDimension(CommonR.dimen.container_padding)) ) } } diff --git a/app/src/main/java/com/naviapp/personalloan/insurance/common/customview/TakeInsuranceCardView.kt b/app/src/main/java/com/naviapp/personalloan/insurance/common/customview/TakeInsuranceCardView.kt index afcded6265..f8dbff8c96 100644 --- a/app/src/main/java/com/naviapp/personalloan/insurance/common/customview/TakeInsuranceCardView.kt +++ b/app/src/main/java/com/naviapp/personalloan/insurance/common/customview/TakeInsuranceCardView.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloan.insurance.common.customview +import com.navi.common.R as CommonR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -88,7 +89,7 @@ class TakeInsuranceCardView(context: Context, attrs: AttributeSet?) : ctas.items?.let { ctaList -> ctaList.forEachIndexed { index, ctaData -> val ctaTextView = TextView(context) - TextViewCompat.setTextAppearance(ctaTextView, R.style.AgreementFontStyle) + TextViewCompat.setTextAppearance(ctaTextView, CommonR.style.AgreementFontStyle) ctaTextView.text = ctaData.title ctaTextView.tag = ctaData ctaTextView.setTextColor(ContextCompat.getColor(context, R.color.red)) @@ -110,7 +111,7 @@ class TakeInsuranceCardView(context: Context, attrs: AttributeSet?) : val separatorTextView = TextView(context) separatorTextView.text = getSeparatorText(ctas.separator) separatorTextView.setTextColor( - ContextCompat.getColor(context, R.color.grey_text) + ContextCompat.getColor(context, com.digitap.dtokyc.R.color.grey_text) ) val separatorParams = LinearLayout.LayoutParams( diff --git a/app/src/main/java/com/naviapp/personalloan/useridentification/viewmodels/EligibilityShareVM.kt b/app/src/main/java/com/naviapp/personalloan/useridentification/viewmodels/EligibilityShareVM.kt index 0eaf31cb62..970fb1dcd2 100644 --- a/app/src/main/java/com/naviapp/personalloan/useridentification/viewmodels/EligibilityShareVM.kt +++ b/app/src/main/java/com/naviapp/personalloan/useridentification/viewmodels/EligibilityShareVM.kt @@ -6,6 +6,7 @@ package com.naviapp.personalloan.useridentification.viewmodels +import com.navi.common.R as CommonR import android.content.pm.PackageManager import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -58,7 +59,7 @@ class EligibilityShareVM(private val userDataRepository: UserDataRepository = Us if (response.error == null && response.errors.isNullOrEmpty()) { NaviTrackEvent.trackEventOnClickStream("PL_Installed_Packages_Sent") } else { - Exception(NaviApplication.instance.applicationContext.getString(R.string.network_error_installed_app) + UNDERSCORE + response.error?.statusCode).log() + Exception(NaviApplication.instance.applicationContext.getString(CommonR.string.network_error_installed_app) + UNDERSCORE + response.error?.statusCode).log() NaviTrackEvent.trackEventOnClickStream( "PL_Installed_Packages_Failed", mapOf(Pair("reason", response.statusCode.toString())) @@ -73,4 +74,4 @@ class EligibilityShareVM(private val userDataRepository: UserDataRepository = Us } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/personalloanrevamp/bankDetailsPostKyc/activity/BankDetailsLoaderPostKycActivity.kt b/app/src/main/java/com/naviapp/personalloanrevamp/bankDetailsPostKyc/activity/BankDetailsLoaderPostKycActivity.kt index 3fadbe1d3a..5f37fcdac1 100644 --- a/app/src/main/java/com/naviapp/personalloanrevamp/bankDetailsPostKyc/activity/BankDetailsLoaderPostKycActivity.kt +++ b/app/src/main/java/com/naviapp/personalloanrevamp/bankDetailsPostKyc/activity/BankDetailsLoaderPostKycActivity.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloanrevamp.bankDetailsPostKyc.activity +import com.navi.naviwidgets.R as WidgetsR import android.animation.ObjectAnimator import android.app.Activity import android.content.Intent @@ -536,7 +537,7 @@ class BankDetailsLoaderPostKycActivity : BaseActivity() { viewModel.fetchUnifiedProgress( intent.extras?.getString(Constants.LOAN_APPLICATION_ID).orEmpty() ) - binding.ivCoinLottieView.setAnimation(R.raw.coin_to_tick) + binding.ivCoinLottieView.setAnimation(WidgetsR.raw.coin_to_tick) when (it.details?.status) { BankAccountVerificationLoaderActivity.PENNY_DROP_FAILURE -> diff --git a/app/src/main/java/com/naviapp/personalloanrevamp/bankDetailsPostKyc/fragment/BankDetailsPostKycFragment.kt b/app/src/main/java/com/naviapp/personalloanrevamp/bankDetailsPostKyc/fragment/BankDetailsPostKycFragment.kt index c4d9325cce..47880dc515 100644 --- a/app/src/main/java/com/naviapp/personalloanrevamp/bankDetailsPostKyc/fragment/BankDetailsPostKycFragment.kt +++ b/app/src/main/java/com/naviapp/personalloanrevamp/bankDetailsPostKyc/fragment/BankDetailsPostKycFragment.kt @@ -7,6 +7,8 @@ package com.naviapp.personalloanrevamp.bankDetailsPostKyc.fragment +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR import android.app.Activity import android.content.Context @@ -257,7 +259,7 @@ class BankDetailsPostKycFragment : BaseFragment(), View.OnClickListener, Integer.toHexString( ContextCompat.getColor( requireContext(), - R.color.successColor + DesignR.color.successColor ) ) }", @@ -273,7 +275,7 @@ class BankDetailsPostKycFragment : BaseFragment(), View.OnClickListener, Integer.toHexString( ContextCompat.getColor( requireContext(), - R.color.successColor + DesignR.color.successColor ) ) }" @@ -302,7 +304,7 @@ class BankDetailsPostKycFragment : BaseFragment(), View.OnClickListener, Integer.toHexString( ContextCompat.getColor( requireContext(), - R.color.errorColor + DesignR.color.errorColor ) ) }", @@ -318,7 +320,7 @@ class BankDetailsPostKycFragment : BaseFragment(), View.OnClickListener, Integer.toHexString( ContextCompat.getColor( requireContext(), - R.color.errorColor + DesignR.color.errorColor ) ) }" @@ -415,7 +417,7 @@ class BankDetailsPostKycFragment : BaseFragment(), View.OnClickListener, Margin( startDp = resources.getDimension(R.dimen.layout_dp_16), endDp = resources.getDimension(R.dimen.layout_dp_16), - bottomDp = resources.getDimension(R.dimen.layout_dp_142) + bottomDp = resources.getDimension(CommonR.dimen.layout_dp_142) ) ) view?.updateLayoutParams { diff --git a/app/src/main/java/com/naviapp/personalloanrevamp/common/customview/SingleImageWidgetView.kt b/app/src/main/java/com/naviapp/personalloanrevamp/common/customview/SingleImageWidgetView.kt index 1de1f1e979..e4211a4689 100644 --- a/app/src/main/java/com/naviapp/personalloanrevamp/common/customview/SingleImageWidgetView.kt +++ b/app/src/main/java/com/naviapp/personalloanrevamp/common/customview/SingleImageWidgetView.kt @@ -7,6 +7,8 @@ package com.naviapp.personalloanrevamp.common.customview +import com.navi.insurance.R as InsuranceR +import com.navi.design.R as DesignR import android.annotation.SuppressLint import android.content.Context import android.graphics.drawable.Drawable @@ -49,7 +51,7 @@ class SingleImageWidgetView(context: Context, attrs: AttributeSet? = null) : init { layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT) - elevation = resources.getDimension(R.dimen.dp_0) + elevation = resources.getDimension(InsuranceR.dimen.dp_0) } fun setProperties( @@ -73,7 +75,7 @@ class SingleImageWidgetView(context: Context, attrs: AttributeSet? = null) : setCornerRadius( dpToPxInInt( - it.cornerRadius ?: resources.getDimension(R.dimen.dp_12).toInt() + it.cornerRadius ?: resources.getDimension(DesignR.dimen.dp_12).toInt() ) ) diff --git a/app/src/main/java/com/naviapp/personalloanrevamp/common/customview/TextIconViewWithTickV2.kt b/app/src/main/java/com/naviapp/personalloanrevamp/common/customview/TextIconViewWithTickV2.kt index aa576fd29c..9cf3e4eb91 100644 --- a/app/src/main/java/com/naviapp/personalloanrevamp/common/customview/TextIconViewWithTickV2.kt +++ b/app/src/main/java/com/naviapp/personalloanrevamp/common/customview/TextIconViewWithTickV2.kt @@ -1,5 +1,7 @@ package com.naviapp.personalloanrevamp.common.customview +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR /* * @@ -55,7 +57,7 @@ class TextIconViewWithTickV2(context: Context?, attrs: AttributeSet?) : if (it) { binding.rootItem.setOnClickListener(null) binding.statusIv.clearColorFilter() - binding.statusIv.setImageResource(R.drawable.ic_tick_svg) + binding.statusIv.setImageResource(CommonR.drawable.ic_tick_svg) } else { binding.root.setOnClickListener { clickListener?.onCtaClicked(CtaData()) @@ -63,7 +65,7 @@ class TextIconViewWithTickV2(context: Context?, attrs: AttributeSet?) : binding.statusIv.setColorFilter( ContextCompat.getColor( context, - R.color.descriptionColor4 + DesignR.color.descriptionColor4 ), PorterDuff.Mode.SRC_IN ) binding.statusIv.setImageResource(R.drawable.ic_arrow_right_svg) @@ -74,4 +76,4 @@ class TextIconViewWithTickV2(context: Context?, attrs: AttributeSet?) : fun setListener(clickListener: CtaListener?) { this.clickListener = clickListener } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/personalloanrevamp/customview/EmiMethodSelectorV2SkipMandate.kt b/app/src/main/java/com/naviapp/personalloanrevamp/customview/EmiMethodSelectorV2SkipMandate.kt index f13e9390dc..2cc7586645 100644 --- a/app/src/main/java/com/naviapp/personalloanrevamp/customview/EmiMethodSelectorV2SkipMandate.kt +++ b/app/src/main/java/com/naviapp/personalloanrevamp/customview/EmiMethodSelectorV2SkipMandate.kt @@ -1,5 +1,6 @@ package com.naviapp.personalloanrevamp.customview +import com.navi.insurance.R as InsuranceR import android.annotation.SuppressLint import android.content.Context import android.util.AttributeSet @@ -44,7 +45,7 @@ class EmiMethodSelectorV2SkipMandate @JvmOverloads constructor( ).apply { autoPayCl.background = getNaviDrawable( cornerRadius = resources.getDimension(R.dimen.layout_dp_8).toInt(), - strokeColor = ResourcesCompat.getColor(resources, R.color.zircon_grey, null), + strokeColor = ResourcesCompat.getColor(resources, InsuranceR.color.zircon_grey, null), strokeWidth = resources.getDimension(R.dimen.layout_dp_1).toInt() ) primaryTv.text = skipOptionData?.title @@ -103,4 +104,4 @@ class EmiMethodSelectorV2SkipMandate @JvmOverloads constructor( } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/activities/BankAccountVerificationLoaderV2Activity.kt b/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/activities/BankAccountVerificationLoaderV2Activity.kt index e931c7612e..cbf3621fdb 100644 --- a/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/activities/BankAccountVerificationLoaderV2Activity.kt +++ b/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/activities/BankAccountVerificationLoaderV2Activity.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloanrevamp.getloanRevamp.activities +import com.navi.common.R as CommonR import android.app.Activity import android.content.Intent import android.os.Bundle @@ -523,10 +524,10 @@ class BankAccountVerificationLoaderV2Activity : NO_INTERNET -> { setUpRetryBankAccountVerificationScreen( title = - resources.getString(com.navi.common.R.string.no_internet_connection), + resources.getString(CommonR.string.no_internet_connection), subtitle = resources.getString( - com.navi.common.R.string.check_internet_connectivity_and_try_again + CommonR.string.check_internet_connectivity_and_try_again ), iconCode = IconUtils.ICON_NO_INTERNET_CONNECTION ) diff --git a/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/customview/EmiTableV2View.kt b/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/customview/EmiTableV2View.kt index 4019d26d92..4d1e375d80 100644 --- a/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/customview/EmiTableV2View.kt +++ b/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/customview/EmiTableV2View.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloanrevamp.getloanRevamp.customview +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -159,7 +160,7 @@ class EmiTableV2View @JvmOverloads constructor( binding.rootItem.background = getNaviDrawable( cornerRadius = resources.getDimension(R.dimen.layout_dp_8).toInt(), strokeWidth = resources.getDimension(R.dimen.layout_dp_1).toInt(), - strokeColor = ResourcesCompat.getColor(resources, R.color.light_white_gray, null), + strokeColor = ResourcesCompat.getColor(resources, DesignR.color.light_white_gray, null), ) val layoutParams = binding.recyclerView.layoutParams as? ConstraintLayout.LayoutParams layoutParams?.matchConstraintMaxHeight = (getScreenHeight() * 0.45).toInt() diff --git a/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/customview/GstRadioListView.kt b/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/customview/GstRadioListView.kt index ae7297111a..832c1cf19a 100644 --- a/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/customview/GstRadioListView.kt +++ b/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/customview/GstRadioListView.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloanrevamp.getloanRevamp.customview +import com.navi.design.R as DesignR import android.content.Context import android.os.Build import android.util.AttributeSet @@ -85,7 +86,7 @@ class GstRadioListView @JvmOverloads constructor(context: Context, attrs: Attrib cornerRadius = resources.getDimension(R.dimen.layout_dp_8).toInt(), strokeWidth = resources.getDimension(R.dimen.layout_dp_1).toInt(), strokeColor = - ResourcesCompat.getColor(resources, R.color.border_dark_grey_color, null) + ResourcesCompat.getColor(resources, DesignR.color.border_dark_grey_color, null) ) } } diff --git a/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/customview/OfferUpgradeCardV2View.kt b/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/customview/OfferUpgradeCardV2View.kt index a0b1fdfcf4..fe3259402a 100644 --- a/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/customview/OfferUpgradeCardV2View.kt +++ b/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/customview/OfferUpgradeCardV2View.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloanrevamp.getloanRevamp.customview +import com.navi.common.R as CommonR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -48,7 +49,7 @@ class OfferUpgradeCardV2View(context: Context, attrs: AttributeSet? = null) : Margin(startDp = 0.0f, topDp = 20.0f, endDp = 18.0f, bottomDp = 0.0f) ) binding.pgvShimmer.layoutParams.height = - resources.getDimension(R.dimen.layout_dp_96).toInt() + resources.getDimension(CommonR.dimen.layout_dp_96).toInt() } binding.offerUpgraderCardV2Cl.post { moveViewWithDistance( diff --git a/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/fragments/BankDetailsAutoDebitV2Fragment.kt b/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/fragments/BankDetailsAutoDebitV2Fragment.kt index f432a4928a..9ba9d2fb89 100644 --- a/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/fragments/BankDetailsAutoDebitV2Fragment.kt +++ b/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/fragments/BankDetailsAutoDebitV2Fragment.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloanrevamp.getloanRevamp.fragments +import com.navi.naviwidgets.R as WidgetsR import android.annotation.SuppressLint import android.content.Context import android.content.Intent @@ -709,7 +710,7 @@ class BankDetailsAutoDebitV2Fragment : Glide.with(requireActivity()) .load(imageUrl) .placeholder( - context?.applicationContext?.getDrawable(com.navi.naviwidgets.R.drawable.widget_image_placeholder) + context?.applicationContext?.getDrawable(WidgetsR.drawable.widget_image_placeholder) ).diskCacheStrategy(DiskCacheStrategy.DATA) .listener( object : RequestListener { diff --git a/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/fragments/BankDetailsV2Fragment.kt b/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/fragments/BankDetailsV2Fragment.kt index 915babed2b..887a69b60a 100644 --- a/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/fragments/BankDetailsV2Fragment.kt +++ b/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/fragments/BankDetailsV2Fragment.kt @@ -7,6 +7,9 @@ package com.naviapp.personalloanrevamp.getloanRevamp.fragments +import com.navi.common.R as CommonR +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.app.Activity import android.content.Context import android.content.Intent @@ -218,11 +221,11 @@ class BankDetailsV2Fragment : ) binding.ifscLt.setHintTextStyle( - textColorId = R.color.dim_grey, + textColorId = DesignR.color.dim_grey, fontId = getFontStyle(FontWeightEnum.TT_REGULAR), ) binding.bankAccountNumberLt.setHintTextStyle( - textColorId = R.color.dim_grey, + textColorId = DesignR.color.dim_grey, fontId = getFontStyle(FontWeightEnum.TT_REGULAR), ) @@ -254,7 +257,7 @@ class BankDetailsV2Fragment : binding.bankNameSearch.enableSearchBoxView() binding.bankNameSearch.setInputTextColorId( textColorId = R.color.title_color_four, - hintColorId = R.color.dim_grey, + hintColorId = DesignR.color.dim_grey, ) binding.bankNameSearch.setOnSearchListener( object : SearchV2Field.SearchFieldListener { @@ -545,8 +548,8 @@ class BankDetailsV2Fragment : binding.ifscLt.setSuccessText( branchName, successStyle = R.style.NaviSansSemiBoldExtraSmall, - successIconRes = R.drawable.ic_info_solid_green, - backgroundRes = R.drawable.bg_green_border_rounded_8 + successIconRes = CommonR.drawable.ic_info_solid_green, + backgroundRes = CommonR.drawable.bg_green_border_rounded_8 ) binding.ifscLt.binding.errorIcon.setPadding(Padding(1.5f, 1.5f, 1.5f, 1.5f)) } @@ -555,7 +558,7 @@ class BankDetailsV2Fragment : binding.ifscLt.setIfscErrorText( errorMessage, errorStyle = R.style.NaviSansSemiBoldExtraSmall, - successIconRes = R.drawable.ic_line_error_svg, + successIconRes = WidgetsR.drawable.ic_line_error_svg, backgroundRes = R.drawable.bg_error_red_border_rounded_8, ) binding.ifscLt.binding.errorIcon.setPadding(Padding(1.5f, 1.5f, 1.5f, 1.5f)) @@ -1020,7 +1023,7 @@ class BankDetailsV2Fragment : text, R.style.NaviSansSemiBoldExtraSmall, R.color.error_red, - R.drawable.ic_line_error_svg, + WidgetsR.drawable.ic_line_error_svg, R.drawable.bg_error_red_border_rounded_8, ) binding.ifscLt.binding.errorIcon.setPadding(Padding(1f, 1f, 1f, 1f)) diff --git a/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/fragments/PennyDropFailureV2BottomSheet.kt b/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/fragments/PennyDropFailureV2BottomSheet.kt index 526ffd7d64..029e7a0240 100644 --- a/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/fragments/PennyDropFailureV2BottomSheet.kt +++ b/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/fragments/PennyDropFailureV2BottomSheet.kt @@ -1,5 +1,6 @@ package com.naviapp.personalloanrevamp.getloanRevamp.fragments +import com.navi.design.R as DesignR import android.os.Bundle import android.view.View import android.view.ViewStub @@ -35,7 +36,7 @@ class PennyDropFailureV2BottomSheet : BaseBottomSheet(), View.OnClickListener { binding.binder = it it.secondaryCta?.title?.let { title -> binding.secondaryButton.setProperties( - title, R.color.outrageous_orange,backgroundColor = R.color.view_background_color_six) + title, R.color.outrageous_orange,backgroundColor = DesignR.color.view_background_color_six) } it.primaryCta?.title?.let { title -> binding.primaryAbv.setProperties( @@ -71,4 +72,4 @@ class PennyDropFailureV2BottomSheet : BaseBottomSheet(), View.OnClickListener { } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/naviapp/personalloanrevamp/useridentificationv2/activities/PlMandatePermissionActivity.kt b/app/src/main/java/com/naviapp/personalloanrevamp/useridentificationv2/activities/PlMandatePermissionActivity.kt index c91b3be523..d95d53ea7d 100644 --- a/app/src/main/java/com/naviapp/personalloanrevamp/useridentificationv2/activities/PlMandatePermissionActivity.kt +++ b/app/src/main/java/com/naviapp/personalloanrevamp/useridentificationv2/activities/PlMandatePermissionActivity.kt @@ -1,5 +1,6 @@ package com.naviapp.personalloanrevamp.useridentificationv2.activities +import com.navi.naviwidgets.R as WidgetsR /* * * * Copyright © 2022-2023 by Navi Technologies Limited @@ -148,7 +149,7 @@ class PlMandatePermissionActivity : WifiTrackerBaseActivity(), View.OnClickListe binding.footerView.footerButton.text = footerData.nextCta?.title ?: EMPTY binding.footerView.dividerDashLine.setVisibilityState(View.GONE) binding.footerView.footerRoot.background = null - val leftDrawable = ContextCompat.getDrawable(this, R.drawable.ic_security_svg) + val leftDrawable = ContextCompat.getDrawable(this, WidgetsR.drawable.ic_security_svg) binding.footerView.title.setCompoundDrawablesWithIntrinsicBounds( leftDrawable, null, diff --git a/app/src/main/java/com/naviapp/registration/LoginFragment.kt b/app/src/main/java/com/naviapp/registration/LoginFragment.kt index ee84bb1fce..b82a71b236 100644 --- a/app/src/main/java/com/naviapp/registration/LoginFragment.kt +++ b/app/src/main/java/com/naviapp/registration/LoginFragment.kt @@ -7,6 +7,7 @@ package com.naviapp.registration +import com.navi.design.R as DesignR import android.content.Context import android.content.Intent import android.net.Uri @@ -265,13 +266,13 @@ class LoginFragment : BaseFragment(), View.OnClickListener { } binding.tvNewNoCalls.isVisible = isNoCallDisclaimerEnabled context?.let { - binding.verifyNumberTv.setTextColor(ContextCompat.getColor(it, R.color.dark_gray)) - binding.countryCodeText.setTextColor(ContextCompat.getColor(it, R.color.dark_gray)) - binding.phoneEdit.setTextColor(ContextCompat.getColor(it, R.color.dark_gray)) + binding.verifyNumberTv.setTextColor(ContextCompat.getColor(it, DesignR.color.dark_gray)) + binding.countryCodeText.setTextColor(ContextCompat.getColor(it, DesignR.color.dark_gray)) + binding.phoneEdit.setTextColor(ContextCompat.getColor(it, DesignR.color.dark_gray)) binding.termsConditionsTv.setTextColor( ContextCompat.getColor( it, - R.color.color_6B6B6B + com.navi.homeloan.R.color.color_6B6B6B ) ) binding.termsConditionsTv.setTextColor( @@ -312,7 +313,7 @@ class LoginFragment : BaseFragment(), View.OnClickListener { cornerRadius = resources.getDimension(R.dimen.layout_dp_4).toInt(), backgroundColor = ContextCompat.getColor( it, - R.color.color_1F002A + DesignR.color.color_1F002A ) ) } @@ -323,7 +324,7 @@ class LoginFragment : BaseFragment(), View.OnClickListener { cornerRadius = resources.getDimension(R.dimen.layout_dp_4).toInt(), backgroundColor = ContextCompat.getColor( it, - R.color.color_1F002A_opacity_56 + DesignR.color.color_1F002A_opacity_56 ) ) } diff --git a/app/src/main/java/com/naviapp/registration/LoginFragmentV2.kt b/app/src/main/java/com/naviapp/registration/LoginFragmentV2.kt index bb8a4914b0..2d15151ca6 100644 --- a/app/src/main/java/com/naviapp/registration/LoginFragmentV2.kt +++ b/app/src/main/java/com/naviapp/registration/LoginFragmentV2.kt @@ -7,6 +7,7 @@ package com.naviapp.registration +import com.navi.design.R as DesignR import android.content.Context import android.content.Intent import android.net.Uri @@ -274,7 +275,7 @@ class LoginFragmentV2 : BaseFragment(), View.OnClickListener { cornerRadius = resources.getDimension(R.dimen.layout_dp_32).toInt(), backgroundColor = ContextCompat.getColor( it, - R.color.outrageous_orange_opacity_56 + DesignR.color.outrageous_orange_opacity_56 ) ) } diff --git a/app/src/main/java/com/naviapp/registration/OtpFragment.kt b/app/src/main/java/com/naviapp/registration/OtpFragment.kt index ada80e9474..720c63725a 100644 --- a/app/src/main/java/com/naviapp/registration/OtpFragment.kt +++ b/app/src/main/java/com/naviapp/registration/OtpFragment.kt @@ -7,6 +7,8 @@ package com.naviapp.registration +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.content.Context import android.os.Bundle import android.os.CountDownTimer @@ -172,7 +174,7 @@ class OtpFragment : BaseFragment(), View.OnClickListener { cornerRadius = resources.getDimension(R.dimen.layout_dp_4).toInt(), backgroundColor = ContextCompat.getColor( it, - R.color.color_1F002A_opacity_56 + DesignR.color.color_1F002A_opacity_56 ) ) } @@ -195,7 +197,7 @@ class OtpFragment : BaseFragment(), View.OnClickListener { cornerRadius = resources.getDimension(R.dimen.layout_dp_4).toInt(), backgroundColor = ContextCompat.getColor( it, - R.color.color_1F002A + DesignR.color.color_1F002A ) ) } @@ -206,7 +208,7 @@ class OtpFragment : BaseFragment(), View.OnClickListener { cornerRadius = resources.getDimension(R.dimen.layout_dp_4).toInt(), backgroundColor = ContextCompat.getColor( it, - R.color.color_1F002A_opacity_56 + DesignR.color.color_1F002A_opacity_56 ) ) } @@ -250,41 +252,41 @@ class OtpFragment : BaseFragment(), View.OnClickListener { binding.enterOtpHeadingTv.setTextColor( ContextCompat.getColor( it, - R.color.dark_gray + DesignR.color.dark_gray ) ) binding.enterOtpTv.setTextColor( ContextCompat.getColor( it, - R.color.color_6B6B6B + com.navi.homeloan.R.color.color_6B6B6B ) ) binding.editNumberTv.setTextColor( ContextCompat.getColor( it, - R.color.dark_gray + DesignR.color.dark_gray ) ) binding.resendOtpTv.setTextColor( ContextCompat.getColor( it, - R.color.dark_gray + DesignR.color.dark_gray ) ) binding.otpOncallTv.setTextColor( ContextCompat.getColor( it, - R.color.dark_gray + DesignR.color.dark_gray ) ) binding.resendOtpTv.setCompoundDrawablesWithIntrinsicBounds( - R.drawable.ic_resend_new_theme, + WidgetsR.drawable.ic_resend_new_theme, 0, 0, 0, ) binding.otpOncallTv.setCompoundDrawablesWithIntrinsicBounds( - R.drawable.ic_call_new_theme, + WidgetsR.drawable.ic_call_new_theme, 0, 0, 0, @@ -312,7 +314,7 @@ class OtpFragment : BaseFragment(), View.OnClickListener { (millisUntilFinished / MILLISECONDS_PER_SECOND) % SECONDS_PER_MINUTE if (isAdded) binding.countdownTimerTv.text = - String.format(getString(R.string.time_format), minutes, seconds) + String.format(getString(DesignR.string.time_format), minutes, seconds) } override fun onFinish() { diff --git a/app/src/main/java/com/naviapp/registration/OtpFragmentV2.kt b/app/src/main/java/com/naviapp/registration/OtpFragmentV2.kt index e19ff24c10..3f0015b9a6 100644 --- a/app/src/main/java/com/naviapp/registration/OtpFragmentV2.kt +++ b/app/src/main/java/com/naviapp/registration/OtpFragmentV2.kt @@ -7,6 +7,7 @@ package com.naviapp.registration +import com.navi.design.R as DesignR import android.content.Context import android.os.Bundle import android.os.CountDownTimer @@ -182,7 +183,7 @@ class OtpFragmentV2 : BaseFragment(), View.OnClickListener { binding.verifyOtpBtn.background = getNaviDrawable( cornerRadius = resources.getDimension(R.dimen.layout_dp_32).toInt(), backgroundColor = ContextCompat.getColor( - it, R.color.outrageous_orange_opacity_56 + it, DesignR.color.outrageous_orange_opacity_56 ) ) } @@ -217,7 +218,7 @@ class OtpFragmentV2 : BaseFragment(), View.OnClickListener { binding.verifyOtpBtn.background = getNaviDrawable( cornerRadius = resources.getDimension(R.dimen.layout_dp_32).toInt(), backgroundColor = ContextCompat.getColor( - it, R.color.outrageous_orange_opacity_56 + it, DesignR.color.outrageous_orange_opacity_56 ) ) } @@ -251,7 +252,7 @@ class OtpFragmentV2 : BaseFragment(), View.OnClickListener { if (isAdded) binding.resendOtpTv.text = resources.getString(R.string.resend_in).plus(" ").plus( String.format( - getString(R.string.time_format), minutes, seconds + getString(DesignR.string.time_format), minutes, seconds ) ) } diff --git a/app/src/main/java/com/naviapp/registration/WhatsAppLoginFragment.kt b/app/src/main/java/com/naviapp/registration/WhatsAppLoginFragment.kt index 48395b306c..0baa69dc23 100644 --- a/app/src/main/java/com/naviapp/registration/WhatsAppLoginFragment.kt +++ b/app/src/main/java/com/naviapp/registration/WhatsAppLoginFragment.kt @@ -7,6 +7,9 @@ package com.naviapp.registration +import com.navi.insurance.R as InsuranceR +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.content.Context import android.content.Intent import android.net.Uri @@ -159,19 +162,19 @@ class WhatsAppLoginFragment : BaseFragment(), View.OnClickListener { cornerRadius = resources.getDimension(R.dimen.layout_dp_4).toInt(), backgroundColor = ContextCompat.getColor( it, - R.color.color_E4FFED + DesignR.color.color_E4FFED ), strokeColor = ContextCompat.getColor( it, - R.color.priorityColor + DesignR.color.priorityColor ), - strokeWidth = resources.getDimension(com.navi.naviwidgets.R.dimen.dp_1).toInt() + strokeWidth = resources.getDimension(InsuranceR.dimen.dp_1).toInt() ) binding.errorLayout.background = getNaviDrawable( cornerRadius = resources.getDimension(R.dimen.layout_dp_16).toInt(), backgroundColor = ContextCompat.getColor( it, - R.color.bannerColor + DesignR.color.bannerColor ) ) } @@ -192,8 +195,8 @@ class WhatsAppLoginFragment : BaseFragment(), View.OnClickListener { context?.let { binding.conditionsCb.buttonDrawable = ContextCompat.getDrawable(it, R.drawable.ic_purple_checkbox) - binding.loginBtn.setTextColor(ContextCompat.getColor(it, R.color.color_1F002A)) - binding.nextIcon.setImageDrawable(ContextCompat.getDrawable(it, R.drawable.ic_whatsapp_right_arrow)) + binding.loginBtn.setTextColor(ContextCompat.getColor(it, DesignR.color.color_1F002A)) + binding.nextIcon.setImageDrawable(ContextCompat.getDrawable(it, WidgetsR.drawable.ic_whatsapp_right_arrow)) binding.termsConditionsTv.setTextColor(ContextCompat.getColor(it, R.color.description_color_seven)) binding.termsConditionsTv.setLinkTextColor(ContextCompat.getColor(it, R.color.description_color_seven)) } diff --git a/app/src/main/java/com/naviapp/registration/helper/TrueCallerHelper.kt b/app/src/main/java/com/naviapp/registration/helper/TrueCallerHelper.kt index bcf010acd8..84a4197a52 100644 --- a/app/src/main/java/com/naviapp/registration/helper/TrueCallerHelper.kt +++ b/app/src/main/java/com/naviapp/registration/helper/TrueCallerHelper.kt @@ -7,6 +7,7 @@ package com.naviapp.registration.helper +import com.navi.design.R as DesignR import android.content.Context import com.navi.base.utils.orFalse import com.navi.common.utils.log @@ -28,7 +29,7 @@ object TrueCallerHelper { try { val trueScope = TruecallerSdkScope.Builder(context, tcCallBack) .consentMode(TruecallerSdkScope.CONSENT_MODE_BOTTOMSHEET) - .buttonColor(context.resources.getColor(R.color.color_1F002A)) + .buttonColor(context.resources.getColor(DesignR.color.color_1F002A)) .buttonTextColor(context.resources.getColor(R.color.white)) // .privacyPolicyUrl("https://navi-tnc-privacy-policy-resources.s3.ap-south-1.amazonaws.com/privacy_policy/index.html") //.termsOfServiceUrl("https://navi-tnc-privacy-policy-resources.s3.ap-south-1.amazonaws.com/privacy_policy/index.html") diff --git a/app/src/main/java/com/naviapp/registration/viewmodel/UploadUserDataUseCase.kt b/app/src/main/java/com/naviapp/registration/viewmodel/UploadUserDataUseCase.kt index ed541d4cc1..e745fa1352 100644 --- a/app/src/main/java/com/naviapp/registration/viewmodel/UploadUserDataUseCase.kt +++ b/app/src/main/java/com/naviapp/registration/viewmodel/UploadUserDataUseCase.kt @@ -7,6 +7,7 @@ package com.naviapp.registration.viewmodel +import com.navi.common.R as CommonR import android.annotation.SuppressLint import android.content.pm.PackageManager import com.navi.analytics.utils.NaviTrackEvent @@ -55,7 +56,7 @@ constructor(private val userDataRepository: UserDataRepository) { } else { Exception( NaviApplication.instance.applicationContext.getString( - R.string.network_error_installed_app + CommonR.string.network_error_installed_app ) + Constants.UNDERSCORE + response.error?.statusCode ) .log() diff --git a/app/src/main/java/com/naviapp/utils/AnimationUtils.kt b/app/src/main/java/com/naviapp/utils/AnimationUtils.kt index f7d14bd34d..3ee4b206c5 100644 --- a/app/src/main/java/com/naviapp/utils/AnimationUtils.kt +++ b/app/src/main/java/com/naviapp/utils/AnimationUtils.kt @@ -7,6 +7,7 @@ package com.naviapp.utils +import com.navi.common.R as CommonR import android.animation.AnimatorSet import android.animation.ObjectAnimator import android.animation.ValueAnimator @@ -94,7 +95,7 @@ fun View.toggleAnimatedVisibility( translateY?.let { animation.translationY(height.toFloat()) } animation.alpha(0f) animation.withEndAction { this.isVisible = isVisible } - animation.duration = resources.getInteger(R.integer.anim_dur).toLong() + animation.duration = resources.getInteger(CommonR.integer.anim_dur).toLong() animation.start() } } diff --git a/app/src/main/java/com/naviapp/utils/BindingAdapterUtil.kt b/app/src/main/java/com/naviapp/utils/BindingAdapterUtil.kt index dce9290f30..a0ec8aaaa4 100644 --- a/app/src/main/java/com/naviapp/utils/BindingAdapterUtil.kt +++ b/app/src/main/java/com/naviapp/utils/BindingAdapterUtil.kt @@ -561,7 +561,7 @@ object BindingAdapterUtil { if (isButton) { view.setPadding(dpToPx(14), dpToPx(10), dpToPx(14), dpToPx(10)) - view.setBackgroundResource(R.drawable.bg_rectangle_unselected) + view.setBackgroundResource(com.navi.amc.R.drawable.bg_rectangle_unselected) view.setTextColor(ContextCompat.getColor(view.context, R.color.red_color_2)) } else { view.setPadding(0, 0, 0, 0) diff --git a/app/src/main/java/com/naviapp/utils/BottomBarUtils.kt b/app/src/main/java/com/naviapp/utils/BottomBarUtils.kt index 4743c6f6e3..401404061e 100644 --- a/app/src/main/java/com/naviapp/utils/BottomBarUtils.kt +++ b/app/src/main/java/com/naviapp/utils/BottomBarUtils.kt @@ -7,6 +7,7 @@ package com.naviapp.utils +import com.navi.design.R as DesignR import android.animation.Animator import android.content.Context import android.graphics.Bitmap @@ -75,8 +76,8 @@ object BottomBarUtils { .into( object : CustomTarget( - context.resources.getDimensionPixelSize(R.dimen.dp_28), - context.resources.getDimensionPixelSize(R.dimen.dp_28) + context.resources.getDimensionPixelSize(com.navi.amc.R.dimen.dp_28), + context.resources.getDimensionPixelSize(com.navi.amc.R.dimen.dp_28) ) { override fun onResourceReady( resource: Bitmap, @@ -120,12 +121,12 @@ object BottomBarUtils { try { PorterDuffColorFilter( unselectedIconColorCode?.parseColor() - ?: ContextCompat.getColor(context, R.color.descriptionPrimaryColor), + ?: ContextCompat.getColor(context, DesignR.color.descriptionPrimaryColor), PorterDuff.Mode.SRC_IN ) } catch (e: Exception) { PorterDuffColorFilter( - ContextCompat.getColor(context, R.color.descriptionPrimaryColor), + ContextCompat.getColor(context, DesignR.color.descriptionPrimaryColor), PorterDuff.Mode.SRC_IN ) } diff --git a/app/src/main/java/com/naviapp/utils/ContactsUtil.kt b/app/src/main/java/com/naviapp/utils/ContactsUtil.kt index 71505ed9f8..cde79583a2 100644 --- a/app/src/main/java/com/naviapp/utils/ContactsUtil.kt +++ b/app/src/main/java/com/naviapp/utils/ContactsUtil.kt @@ -7,6 +7,7 @@ package com.naviapp.utils +import com.navi.common.R as CommonR import android.content.Context import android.database.Cursor import android.net.Uri @@ -101,7 +102,7 @@ object ContactsUtil { val response = UserDataRepository().postContacts(request) analyticsTrackerContactUpload.contactUploadEndTime(pageNumber) response.error?.let { - Exception(NaviApplication.instance.applicationContext.getString(R.string.network_error_contact) + UNDERSCORE + it.statusCode).log() + Exception(NaviApplication.instance.applicationContext.getString(CommonR.string.network_error_contact) + UNDERSCORE + it.statusCode).log() analyticsTrackerContactUpload.onContactUploadFailure( totalPages, pageNumber, diff --git a/app/src/main/java/com/naviapp/utils/IconUtils.kt b/app/src/main/java/com/naviapp/utils/IconUtils.kt index 81e281a971..c599276cdc 100644 --- a/app/src/main/java/com/naviapp/utils/IconUtils.kt +++ b/app/src/main/java/com/naviapp/utils/IconUtils.kt @@ -7,6 +7,10 @@ package com.naviapp.utils +import com.navi.insurance.R as InsuranceR +import com.navi.common.R as CommonR +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.widget.ImageView import com.naviapp.R import com.naviapp.models.response.ImageDetail @@ -336,7 +340,7 @@ object IconUtils { ICON_BULB_GLOWING -> R.drawable.ic_bulb_glowing_svg ICON_GPS_MAP -> R.drawable.ic_gps_svg LOAN_AGREEMENT -> R.drawable.ic_home_loan_sign - TICK -> R.drawable.ic_tick_svg + TICK -> CommonR.drawable.ic_tick_svg DOCUMENT_ERROR -> R.drawable.ic_document_error ICON_REPAYMENT -> R.drawable.ic_re_payment DOCUMENT_SIGNATURE -> R.drawable.ic_document_signature @@ -344,7 +348,7 @@ object IconUtils { ICON_HOME_LOAN_CARD -> R.drawable.ic_home_loan_svg ICON_PERSONAL_LOAN_CARD -> R.drawable.ic_personal_loan_svg ICON_INDUSTRY -> R.drawable.ic_industry_svg - ICON_INFO -> R.drawable.ic_info + ICON_INFO -> InsuranceR.drawable.ic_info ICON_PROPERTY_PURCHASE -> R.drawable.ic_property_value_svg ICON_LOAN_AMOUNT -> R.drawable.ic_loan_amount_svg ICON_NAME -> R.drawable.ic_name_svg @@ -361,7 +365,7 @@ object IconUtils { ICON_EMI -> R.drawable.ic_calendar_emi ICON_COVID -> R.drawable.ic_corona_virus ICON_TIMER -> R.drawable.ic_timer - ICON_BACK_ARROW -> R.drawable.ic_back_arrow_svg + ICON_BACK_ARROW -> CommonR.drawable.ic_back_arrow_svg ICON_CONFETTI_LEFT_SIDED -> R.drawable.ic_confetti_left_sided_svg ICON_RUPEE_RED_ROUND -> R.drawable.ic_rupee_red_round_svg ICON_RUPEE_WHITE_ROUND -> R.drawable.ic_rupee_white_round_svg @@ -393,7 +397,7 @@ object IconUtils { ICON_CLOCK -> R.drawable.ic_dark_clock_svg ICON_STOPWATCH_FILLED -> R.drawable.ic_stopwatch_filled ICON_UP_ARROW -> R.drawable.ic_home_up_arrow_svg - ICON_CAMERA -> R.drawable.vkyc_camera_svg + ICON_CAMERA -> com.navi.vkyc.R.drawable.vkyc_camera_svg COUPLE_INVEST_COIN_ICON -> R.drawable.ic_couple_money EMAIL_LOAN_ICON -> R.drawable.ic_loan_email EMAIL_MF_ICON -> R.drawable.ic_mf_email @@ -406,7 +410,7 @@ object IconUtils { VERIFICATION_ERROR_ICON -> R.drawable.ic_verification_fail LIGHTNING_RECOMMENDED -> R.drawable.ic_recommended_lightning LIGHTNING -> R.drawable.ic_lightning - ICON_WARNING -> R.drawable.ic_error_circle_svg + ICON_WARNING -> WidgetsR.drawable.ic_error_circle_svg OFFER_UPGRADE_MONEY_ICON -> R.drawable.ic_red_ribbon_money_svg ICON_TIMER_BLUE -> R.drawable.ic_timer_icon COIN_HOME_LOAN -> R.drawable.ic_coin_home_loan @@ -418,7 +422,7 @@ object IconUtils { BILL_ICON -> R.drawable.bill_icon STETHOSCOPE_ICON -> R.drawable.stethoscope BONUS_ICON -> R.drawable.bonus - SUCCESS_ICON -> R.drawable.success_tick + SUCCESS_ICON -> InsuranceR.drawable.success_tick ICON_RED_ALERT -> R.drawable.ic_alert_svg ICON_CHRONOMETER -> R.drawable.ic_chronometer_svg ALERT_YELLOW_ICON -> R.drawable.ic_alert_yellow_svg @@ -466,8 +470,8 @@ object IconUtils { ICON_DOWN_RED -> R.drawable.ic_down_arrow_red ICON_FLASH_RED -> R.drawable.ic_flash_red ICON_FLASH_WHITE -> R.drawable.ic_flash_white - ICON_OFFER_LEFT -> R.drawable.ic_offer_left_icon - ICON_OFFER_RIGHT -> R.drawable.ic_offer_right_icon + ICON_OFFER_LEFT -> WidgetsR.drawable.ic_offer_left_icon + ICON_OFFER_RIGHT -> WidgetsR.drawable.ic_offer_right_icon ICON_INFO_DEEP_BLUE -> R.drawable.ic_info_deep_blue_svg ICON_HL_NET_BANKING_ENABLED -> R.drawable.ic_net_banking ICON_HL_NET_BANKING -> R.drawable.ic_netbanking_disabled @@ -475,30 +479,30 @@ object IconUtils { ICON_GREEN_SUCCESS -> R.drawable.ic_green_success MOBILE_WITH_RUPEE -> R.drawable.ic_phone_with_rupee NEXT_ARROW -> R.drawable.ic_arrow_next - OVERLAPPED_TICK -> R.drawable.ic_overlapped_tick + OVERLAPPED_TICK -> DesignR.drawable.ic_overlapped_tick INFO_ICON -> R.drawable.ic_info_grey_svg ICON_DAILY_OFFER -> R.drawable.ic_daily_offer ICON_DAILY_OFFER_CARD -> R.drawable.ic_daily_offer_card - ICON_GREY_WHITE_INFO -> R.drawable.ic_grey_white_info_icon + ICON_GREY_WHITE_INFO -> WidgetsR.drawable.ic_grey_white_info_icon ICON_RELOAD -> R.drawable.ic_reload MONEY_SACK -> R.drawable.ic_money_sack CIRCULAR_CURVE_GREEN_TICK -> R.drawable.ic_circular_curved_green_tick - ERROR_RED_INFO_ICON -> R.drawable.ic_error_circle_svg + ERROR_RED_INFO_ICON -> WidgetsR.drawable.ic_error_circle_svg ICON_RED_GST -> R.drawable.ic_gst_red APP_SHARE_ICON -> R.drawable.ic_share_bottom_sheet_icon ICON_RIGHT_ARROW_SOLID_RED -> R.drawable.ic_right_arrow_solid_red ICON_ADD_COAPPLICANT_RED_PLUS -> R.drawable.ic_add_co_applicant_red_plus_svg ADD_CO_APPLICANT_GREY -> R.drawable.ic_add_co_applicant_grey_svg PROFILE_ERROR_ICON -> R.drawable.ic_profile_error - ICON_CROSS_BLACK -> R.drawable.ic_rounded_cross + ICON_CROSS_BLACK -> WidgetsR.drawable.ic_rounded_cross ICON_BACK_ARROW_BLACK -> R.drawable.ic_back_arrow_black - ICON_SALARIED_UNSELECTED -> R.drawable.ic_salaried_unselected - ICON_SALARIED_SELECTED -> R.drawable.ic_salaried_selected - ICON_SELF_EMPLOYED_UNSELECTED -> R.drawable.ic_others_unselected - ICON_SELF_EMPLOYED_SELECTED -> R.drawable.ic_others_selected - ICON_OTHERS_UNSELECTED -> R.drawable.ic_others_employment_unselected - ICON_OTHERS_SELECTED -> R.drawable.ic_others_employment_selected - ICON_INFO_DARK -> R.drawable.ic_info + ICON_SALARIED_UNSELECTED -> WidgetsR.drawable.ic_salaried_unselected + ICON_SALARIED_SELECTED -> WidgetsR.drawable.ic_salaried_selected + ICON_SELF_EMPLOYED_UNSELECTED -> WidgetsR.drawable.ic_others_unselected + ICON_SELF_EMPLOYED_SELECTED -> WidgetsR.drawable.ic_others_selected + ICON_OTHERS_UNSELECTED -> WidgetsR.drawable.ic_others_employment_unselected + ICON_OTHERS_SELECTED -> WidgetsR.drawable.ic_others_employment_selected + ICON_INFO_DARK -> InsuranceR.drawable.ic_info ICON_UPLOAD -> R.drawable.ic_upload_deepblue ICON_GREEN_TICK_CIRCLE -> R.drawable.ic_green_tick_small ICON_BULB_BLACK_GLOW -> R.drawable.ic_bulb_black_glow_svg @@ -511,14 +515,14 @@ object IconUtils { ICON_WORK_SUITCASE -> R.drawable.ic_suitcase_work ICON_EMP_BANK -> R.drawable.ic_employee_bank ICON_EMP_VERIFY -> R.drawable.ic_verify - ICON_MESSAGE_PERMISSION -> R.drawable.ic_message_permission + ICON_MESSAGE_PERMISSION -> CommonR.drawable.ic_message_permission ICON_CONTACTS_PERMISSION -> R.drawable.ic_contact_permission ICON_LOCATION_PERMISSION -> R.drawable.ic_location_permission ICON_DEVICE_PERMISSION -> R.drawable.ic_phone - ICON_ALERT_GREEN -> R.drawable.ic_line_success_svg + ICON_ALERT_GREEN -> WidgetsR.drawable.ic_line_success_svg ICON_ALERT_BLACK -> R.drawable.ic_alert_black - ICON_ALERT_SOLID_RED -> R.drawable.ic_line_error_svg - ICON_ALERT_RED_BORDERED -> R.drawable.ic_alert_red_v2 + ICON_ALERT_SOLID_RED -> WidgetsR.drawable.ic_line_error_svg + ICON_ALERT_RED_BORDERED -> CommonR.drawable.ic_alert_red_v2 ICON_ALERT_SOLID_BLACK -> R.drawable.ic_alert_solid_black FAQ -> R.drawable.ic_help_svg SEND_EMAIL -> R.drawable.ic_send_email_icon_svg @@ -526,13 +530,13 @@ object IconUtils { ICON_VERIFICATION_ERROR_RED -> R.drawable.ic_penny_drop_failure ICON_ALERT_RED -> R.drawable.ic_alert_red_white_border ICON_ALERT_YELLOW -> R.drawable.ic_alert_yellow_white_border - INVALID_CITY_ICON -> R.drawable.ic_city_error + INVALID_CITY_ICON -> WidgetsR.drawable.ic_city_error ICON_INFO_BORDERED_BLACK -> R.drawable.ic_info_bordered_black ICON_INFO_BORDERED_YELLOW -> R.drawable.ic_info_bordered_yellow ICON_EMI_CALENDAR -> R.drawable.ic_emi_date ICON_CALCULATOR -> R.drawable.ic_calculator ICON_TENURE -> R.drawable.ic_emi_tenure - ORANGE_RIGHT_ARROW -> R.drawable.right_arrow_with_background_svg + ORANGE_RIGHT_ARROW -> WidgetsR.drawable.right_arrow_with_background_svg NO_HATS -> R.drawable.ic_hat_svg NO_GLASSES -> R.drawable.ic_glasses_svg SELFIE_CAMERA -> R.drawable.ic_selfie_icon_kyc @@ -549,8 +553,8 @@ object IconUtils { ICON_SUPPORT_CHAT -> R.drawable.ic_chat_menu ICON_FAQ -> R.drawable.ic_faq_menu NET_BANKING_ORANGE -> R.drawable.ic_net_banking_orange - ACCOUNT_TYPE_ORANGE -> R.drawable.ic_account_type_orange - VERIFY_OTP_ORANGE -> R.drawable.ic_verify_otp_orange + ACCOUNT_TYPE_ORANGE -> WidgetsR.drawable.ic_account_type_orange + VERIFY_OTP_ORANGE -> WidgetsR.drawable.ic_verify_otp_orange ICON_BENEFITS_ORANGE -> R.drawable.ic_benefits_orange ICON_SAFETY_ORANGE -> R.drawable.ic_safety_orange ICON_VERIFIED_LOCKER -> R.drawable.ic_verified_locker @@ -558,7 +562,7 @@ object IconUtils { ICON_SEARCH_OUTLINED -> R.drawable.ic_search_icon ICON_RIGHT_ARROW_WITH_GREY_BG -> R.drawable.ic_right_arrow_grey_bg SOFT_REJECT_ICON -> R.drawable.ic_soft_reject_icon - ICON_SECURITY -> R.drawable.ic_security_checked_green_svg + ICON_SECURITY -> CommonR.drawable.ic_security_checked_green_svg ICON_ACCOUNT_BANK -> R.drawable.ic_account_bank ICON_ACCOUNT_VERIFIED -> R.drawable.ic_acc_verified ICON_BANK_ACCOUNT -> R.drawable.ic_auto_pay_bank @@ -577,24 +581,24 @@ object IconUtils { ICON_GROUP_MONEY_BAG -> R.drawable.ic_group_money_bag ICON_PENNY_DROP_FAILED -> R.drawable.ic_bank_penny_drop_failed ICON_SOME_THING_WENT_WRONG_DOG -> R.drawable.ic_bank_penny_drop_failed - ICON_IFSC_SUCCESS -> R.drawable.ic_info_solid_green + ICON_IFSC_SUCCESS -> CommonR.drawable.ic_info_solid_green ICON_PDF -> R.drawable.ic_pdf ICON_DOWNLOAD_RED -> R.drawable.ic_download_red ICON_DOWN_BLACK -> R.drawable.ic_down_arrow_black ICON_ARROW_FORWARD_BLACK -> R.drawable.ic_arrow_forward_black ICON_DARK_BLUE_INFO -> R.drawable.ic_dark_blue_info - OUTLINED_INFO_ICON_BLACK -> R.drawable.ic_info_icon_black + OUTLINED_INFO_ICON_BLACK -> DesignR.drawable.ic_info_icon_black CALENDAR_WITH_TIME -> R.drawable.calendar_with_time ICON_SUCCESS -> R.drawable.ic_success_icon - ICON_NO_INTERNET_CONNECTION -> R.drawable.ic_new_no_internet - DOCUMENT_WITH_INFO_ICON -> R.drawable.document_with_info + ICON_NO_INTERNET_CONNECTION -> WidgetsR.drawable.ic_new_no_internet + DOCUMENT_WITH_INFO_ICON -> DesignR.drawable.document_with_info ICON_STAR_FILLED_FF5732 -> R.drawable.ic_star_filled_ff5732 ICON_STAR_FILLED_6B6B6B -> R.drawable.ic_star_filled_6b6b6b ICON_STAR_FILLED_22CD80 -> R.drawable.ic_star_filled_22cd80 ICON_CROSS_WHITE -> R.drawable.ic_cross_white ICON_HIDDEN_CHARGES -> R.drawable.ic_hidden_charges ICON_INFO_6B6B6B -> R.drawable.ic_info_6b6b6b - ICON_CHECK_MARK_GREEN_MEDIUM -> R.drawable.ic_check_green_48 + ICON_CHECK_MARK_GREEN_MEDIUM -> WidgetsR.drawable.ic_check_green_48 ICON_CALCULATOR_GREEN -> R.drawable.ic_calculator_green ICON_EMI_CALENDAR_GREEN -> R.drawable.ic_emi_calendar_green ICON_TENURE_GREEN -> R.drawable.ic_tenure_green @@ -602,7 +606,7 @@ object IconUtils { ICON_REWARD_WORKS -> R.drawable.ic_reward_works ICON_HOME -> R.drawable.ic_home ICON_PENDING -> R.drawable.ic_pending_icon - ICON_INFO_DARK_PURPLE -> R.drawable.ic_info_icon_dark_purple_svg + ICON_INFO_DARK_PURPLE -> WidgetsR.drawable.ic_info_icon_dark_purple_svg ICON_PDF_PURPLE -> R.drawable.ic_pdf_purple ICON_RIGHT_WHITE_ARROW_BLACK_BG -> R.drawable.ic_white_right_arrow_black_bg YELLOW_ALERT_ICON -> R.drawable.ic_yellow_alert diff --git a/app/src/main/java/com/naviapp/utils/SmsUtil.kt b/app/src/main/java/com/naviapp/utils/SmsUtil.kt index 747864e94a..9498dbf7bd 100644 --- a/app/src/main/java/com/naviapp/utils/SmsUtil.kt +++ b/app/src/main/java/com/naviapp/utils/SmsUtil.kt @@ -7,6 +7,7 @@ package com.naviapp.utils +import com.navi.common.R as CommonR import android.Manifest import android.content.Context import android.database.Cursor @@ -108,7 +109,7 @@ object SmsUtil { val response = UserDataRepository().postSms(request) analyticsTrackerSmsUpload.smsUploadEndTime(pageNumber , retryCount) response.error?.let { - Exception(NaviApplication.instance.applicationContext.getString(R.string.network_error_installed_app) + UNDERSCORE + it.statusCode).log() + Exception(NaviApplication.instance.applicationContext.getString(CommonR.string.network_error_installed_app) + UNDERSCORE + it.statusCode).log() analyticsTrackerSmsUpload.onSmsUploadFailure( totalPages, pageNumber, diff --git a/app/src/test/java/com/naviapp/personalloan/getloan/utils/FaqsUtilKtTest.kt b/app/src/test/java/com/naviapp/personalloan/getloan/utils/FaqsUtilKtTest.kt index 7530e0cfcb..92d2c65258 100644 --- a/app/src/test/java/com/naviapp/personalloan/getloan/utils/FaqsUtilKtTest.kt +++ b/app/src/test/java/com/naviapp/personalloan/getloan/utils/FaqsUtilKtTest.kt @@ -7,6 +7,7 @@ package com.naviapp.personalloan.getloan.utils +import com.navi.common.R as CommonR import android.content.Context import com.navi.common.utils.bankDetailsAutoDebitFaqs import com.navi.common.utils.bankDetailsFaqs @@ -27,29 +28,29 @@ class FaqsUtilKtTest { @Test fun testLoanDetailsFaqs() { val context = mockk() - every { context.getString(R.string.loan_details) } returns "Loan Details" - every { context.getString(R.string.what_is_moratorium) } returns "What is moratorium?" - every { context.getString(R.string.moratorium_is_the_period_of_time) } returns "Moratorium is the period of time during which payment of an EMI on the loan taken is not mandatory." - every { context.getString(R.string.is_the_moratorium_available) } returns "Is the moratorium available?" - every { context.getString(R.string.navi_will_not_be_able_to_extend_moratorium) } returns "No. Navi will not be able to extend the moratorium. EMIs will be scheduled as per the EMI calendar." - every { context.getString(R.string.can_i_change_loan_amount) } returns "Can I change the loan amount?" - every { context.getString(R.string.you_can_select_loan_amount) } returns "Yes. You can select loan amount of your choice with the help of loan amount slider interaction." - every { context.getString(R.string.can_i_change_emi) } returns "Can I change the EMI?" - every { context.getString(R.string.you_can_select_emi) } returns "Yes. You can select EMI amount of your choice with the help of EMI amount slider interaction." - every { context.getString(R.string.can_i_change_tenure) } returns "Can I change the tenure of the loan?" - every { context.getString(R.string.you_can_change_emi) } returns "Yes. As you change your EMI amount, the tenure automatically changes." - every { context.getString(R.string.can_i_pre_close) } returns "Can I pre-close the loan?" - every { context.getString(R.string.you_can_pre_close) } returns "Yes. You can pre-close the loan anytime you want." - every { context.getString(R.string.time_for_loan_disbursal) } returns "How much time will it take for loan disbursal?" - every { context.getString(R.string.loan_disbursal_is_instant) } returns "The loan disbursal is instant and you will receive the money within minutes after you enter your bank details." - every { context.getString(R.string.loan_amount_and_interest_rates_determined) } returns "How are my loan amount and interest rates determined?" - every { context.getString(R.string.calculated_by_internal_algorithms) } returns "Your loan amount is calculated by our internal algorithms and depends on a variety of factors. We take into account your credit history, employment status and financial profile to arrive at a loan amount." - every { context.getString(R.string.loan_for_remaining_amount) } returns "Can I get loan for remaining amount later if I choose to not take the full loan amount now?" - every { context.getString(R.string.repay_the_existing_loan) } returns "You would be required to repay the existing borrowed amount and you may avail the rest of the amount in the future. Kindly note this is subject to our policies and may change at our sole discretion." - every { context.getString(R.string.why_is_processing_fee_charged) } returns "Why is processing fees charged, and how is it calculated?" - every { context.getString(R.string.variety_of_fixed_costs_associated) } returns "There are a variety of fixed costs associated with processing a loan digitally and the processing fee enables us to give you a seamless, fast and convenient experience. We arrive at an appropriate processing fee after taking into account these costs." - every { context.getString(R.string.why_is_gst_charged) } returns "Why is GST being charged?" - every { context.getString(R.string.gst_of_18_of_processing_fee) } returns "As per Government guidelines, GST of 18% of processing fees is charged." + every { context.getString(CommonR.string.loan_details) } returns "Loan Details" + every { context.getString(CommonR.string.what_is_moratorium) } returns "What is moratorium?" + every { context.getString(CommonR.string.moratorium_is_the_period_of_time) } returns "Moratorium is the period of time during which payment of an EMI on the loan taken is not mandatory." + every { context.getString(CommonR.string.is_the_moratorium_available) } returns "Is the moratorium available?" + every { context.getString(CommonR.string.navi_will_not_be_able_to_extend_moratorium) } returns "No. Navi will not be able to extend the moratorium. EMIs will be scheduled as per the EMI calendar." + every { context.getString(CommonR.string.can_i_change_loan_amount) } returns "Can I change the loan amount?" + every { context.getString(CommonR.string.you_can_select_loan_amount) } returns "Yes. You can select loan amount of your choice with the help of loan amount slider interaction." + every { context.getString(CommonR.string.can_i_change_emi) } returns "Can I change the EMI?" + every { context.getString(CommonR.string.you_can_select_emi) } returns "Yes. You can select EMI amount of your choice with the help of EMI amount slider interaction." + every { context.getString(CommonR.string.can_i_change_tenure) } returns "Can I change the tenure of the loan?" + every { context.getString(CommonR.string.you_can_change_emi) } returns "Yes. As you change your EMI amount, the tenure automatically changes." + every { context.getString(CommonR.string.can_i_pre_close) } returns "Can I pre-close the loan?" + every { context.getString(CommonR.string.you_can_pre_close) } returns "Yes. You can pre-close the loan anytime you want." + every { context.getString(CommonR.string.time_for_loan_disbursal) } returns "How much time will it take for loan disbursal?" + every { context.getString(CommonR.string.loan_disbursal_is_instant) } returns "The loan disbursal is instant and you will receive the money within minutes after you enter your bank details." + every { context.getString(CommonR.string.loan_amount_and_interest_rates_determined) } returns "How are my loan amount and interest rates determined?" + every { context.getString(CommonR.string.calculated_by_internal_algorithms) } returns "Your loan amount is calculated by our internal algorithms and depends on a variety of factors. We take into account your credit history, employment status and financial profile to arrive at a loan amount." + every { context.getString(CommonR.string.loan_for_remaining_amount) } returns "Can I get loan for remaining amount later if I choose to not take the full loan amount now?" + every { context.getString(CommonR.string.repay_the_existing_loan) } returns "You would be required to repay the existing borrowed amount and you may avail the rest of the amount in the future. Kindly note this is subject to our policies and may change at our sole discretion." + every { context.getString(CommonR.string.why_is_processing_fee_charged) } returns "Why is processing fees charged, and how is it calculated?" + every { context.getString(CommonR.string.variety_of_fixed_costs_associated) } returns "There are a variety of fixed costs associated with processing a loan digitally and the processing fee enables us to give you a seamless, fast and convenient experience. We arrive at an appropriate processing fee after taking into account these costs." + every { context.getString(CommonR.string.why_is_gst_charged) } returns "Why is GST being charged?" + every { context.getString(CommonR.string.gst_of_18_of_processing_fee) } returns "As per Government guidelines, GST of 18% of processing fees is charged." val faqContents = listOf( FaqContent( "What is moratorium?", @@ -107,21 +108,21 @@ class FaqsUtilKtTest { @Test fun testKycFaqs() { val context = mockk() - every { context.getString(R.string.kyc) } returns "KYC" - every { context.getString(R.string.reason_for_kyc_rejection) } returns "What is the reason for KYC rejection. What should I do?" - every { context.getString(R.string.name_or_selfie_mismatch) } returns "This happens when your Name and/or Selfie do not match with the provided Aadhaar document. For help, please write to us at: help@navi.com" - every { context.getString(R.string.aadhaar_not_linked_to_mobile) } returns "What should I do if my Aadhaar is not linked with mobile number?" - every { context.getString(R.string.upload_image_of_aadhaar) } returns "You can also upload image of Aadhaar Card as an option. Else, you can get mobile number linked at your nearest Aadhaar Seva Kendra." - every { context.getString(R.string.do_not_have_an_aadhaar) } returns "What if I do not have an Aadhaar Card?" - every { context.getString(R.string.completing_kyc_offline) } returns "You can complete your KYC offline." - every { context.getString(R.string.how_to_complete_kyc_offline) } returns "How do I Complete my KYC offline?" - every { context.getString(R.string.complete_kyc_offline_detail) } returns "In order to complete the offline KYC process, you will need to visit our offices. Please write to us at help@navi.com to set up an appointment and for details on steps to be taken and documents that may be submitted in order to complete your KYC process offline." - every { context.getString(R.string.do_not_have_current_address_proof) } returns "What should I do if I do not have current address proof?" - every { context.getString(R.string.proceed_without_attaching_proof) } returns "You can still proceed without attaching proof of your current address. It is optional." - every { context.getString(R.string.reason_am_not_getting_aadhaar_otp) } returns "What is the reason I am not getting Aadhaar OTP?" - every { context.getString(R.string.make_sure_aadhaar_is_linked) } returns "Make sure your Aadhaar is linked to your mobile number. If they are linked, this might happen due to technical issue with the Unique Identification Authority of India (UIDAI). You can retry after some time or you can also upload Aadhaar Card photo as an option." - every { context.getString(R.string.aadhaar_details_safe) } returns "Are my Aadhaar details safe with Navi?" - every { context.getString(R.string.do_not_store_aadhaar) } returns "Absolutely. We do not store your Aadhaar number. It is only used for verification done by the UIDAI." + every { context.getString(CommonR.string.kyc) } returns "KYC" + every { context.getString(CommonR.string.reason_for_kyc_rejection) } returns "What is the reason for KYC rejection. What should I do?" + every { context.getString(CommonR.string.name_or_selfie_mismatch) } returns "This happens when your Name and/or Selfie do not match with the provided Aadhaar document. For help, please write to us at: help@navi.com" + every { context.getString(CommonR.string.aadhaar_not_linked_to_mobile) } returns "What should I do if my Aadhaar is not linked with mobile number?" + every { context.getString(CommonR.string.upload_image_of_aadhaar) } returns "You can also upload image of Aadhaar Card as an option. Else, you can get mobile number linked at your nearest Aadhaar Seva Kendra." + every { context.getString(CommonR.string.do_not_have_an_aadhaar) } returns "What if I do not have an Aadhaar Card?" + every { context.getString(CommonR.string.completing_kyc_offline) } returns "You can complete your KYC offline." + every { context.getString(CommonR.string.how_to_complete_kyc_offline) } returns "How do I Complete my KYC offline?" + every { context.getString(CommonR.string.complete_kyc_offline_detail) } returns "In order to complete the offline KYC process, you will need to visit our offices. Please write to us at help@navi.com to set up an appointment and for details on steps to be taken and documents that may be submitted in order to complete your KYC process offline." + every { context.getString(CommonR.string.do_not_have_current_address_proof) } returns "What should I do if I do not have current address proof?" + every { context.getString(CommonR.string.proceed_without_attaching_proof) } returns "You can still proceed without attaching proof of your current address. It is optional." + every { context.getString(CommonR.string.reason_am_not_getting_aadhaar_otp) } returns "What is the reason I am not getting Aadhaar OTP?" + every { context.getString(CommonR.string.make_sure_aadhaar_is_linked) } returns "Make sure your Aadhaar is linked to your mobile number. If they are linked, this might happen due to technical issue with the Unique Identification Authority of India (UIDAI). You can retry after some time or you can also upload Aadhaar Card photo as an option." + every { context.getString(CommonR.string.aadhaar_details_safe) } returns "Are my Aadhaar details safe with Navi?" + every { context.getString(CommonR.string.do_not_store_aadhaar) } returns "Absolutely. We do not store your Aadhaar number. It is only used for verification done by the UIDAI." val faqContents = listOf( FaqContent( "What is the reason for KYC rejection. What should I do?", @@ -162,17 +163,17 @@ class FaqsUtilKtTest { @Test fun testBankDetailsFaqs() { val context = mockk() - every { context.getString(R.string.bank_verification) } returns "Bank Verification" - every { context.getString(R.string.bank_not_supported) } returns "Why is my bank not supported?" - every { context.getString(R.string.emandate_governed_by_npci_are_supported) } returns "Banks which support eMandate governed by the National Payments Corporation of India (NPCI) are supported. eMandate is a convenient way for you to pay your EMIs on time directly from your bank account. If your bank is not supported, please select another bank." - every { context.getString(R.string.find_ifsc_code) } returns "Where do I find IFSC code?" - every { context.getString(R.string.address_of_bank_accounts_branch) } returns "You can search the IFSC code with the address of your bank account\\'s branch. Alternatively you can find the IFSC code on your bank\\'s cheque book, passbook or netbanking login." - every { context.getString(R.string.bank_verification_required) } returns "Why is bank verification required?" - every { context.getString(R.string.ensure_loan_amount_goes_to_right_account) } returns "To ensure that the loan amount goes to the right bank account, we verify by sending Re 1 to your bank account." - every { context.getString(R.string.use_someone_else_bank_account) } returns "Can I use someone else\\'s bank account for disbursal?" - every { context.getString(R.string.disbursed_only_to_your_account) } returns "No. Loan is disbursed only to your bank account." - every { context.getString(R.string.bank_verification_fail) } returns "Why did my bank verification fail? What should I do?" - every { context.getString(R.string.details_do_not_match_with_registered_account) } returns "This happens when details provided by you like your name, bank account number do not match exactly with those registered with the bank. For help, please write to us at: help@navi.com" + every { context.getString(CommonR.string.bank_verification) } returns "Bank Verification" + every { context.getString(CommonR.string.bank_not_supported) } returns "Why is my bank not supported?" + every { context.getString(CommonR.string.emandate_governed_by_npci_are_supported) } returns "Banks which support eMandate governed by the National Payments Corporation of India (NPCI) are supported. eMandate is a convenient way for you to pay your EMIs on time directly from your bank account. If your bank is not supported, please select another bank." + every { context.getString(CommonR.string.find_ifsc_code) } returns "Where do I find IFSC code?" + every { context.getString(CommonR.string.address_of_bank_accounts_branch) } returns "You can search the IFSC code with the address of your bank account\\'s branch. Alternatively you can find the IFSC code on your bank\\'s cheque book, passbook or netbanking login." + every { context.getString(CommonR.string.bank_verification_required) } returns "Why is bank verification required?" + every { context.getString(CommonR.string.ensure_loan_amount_goes_to_right_account) } returns "To ensure that the loan amount goes to the right bank account, we verify by sending Re 1 to your bank account." + every { context.getString(CommonR.string.use_someone_else_bank_account) } returns "Can I use someone else\\'s bank account for disbursal?" + every { context.getString(CommonR.string.disbursed_only_to_your_account) } returns "No. Loan is disbursed only to your bank account." + every { context.getString(CommonR.string.bank_verification_fail) } returns "Why did my bank verification fail? What should I do?" + every { context.getString(CommonR.string.details_do_not_match_with_registered_account) } returns "This happens when details provided by you like your name, bank account number do not match exactly with those registered with the bank. For help, please write to us at: help@navi.com" val faqContents = listOf( FaqContent( "Why is my bank not supported?", @@ -207,35 +208,35 @@ class FaqsUtilKtTest { @Test fun testBankDetailsAutoDebitFaqs() { val context = mockk() - every { context.getString(R.string.setup_auto_debit) } returns "Setup Auto-Debit" - every { context.getString(R.string.what_is_auto_debit) } returns "What is Auto-debit?" - every { context.getString(R.string.emis_paid_directly_from_bank_account) } returns "Auto-debit is a convenient way by which your EMIs are paid directly from your bank account without the need for you to pay them manually. This eliminates the hassles of reminders and late penalty charges." - every { context.getString(R.string.what_is_emandate) } returns "What is eMandate? What is the difference between Auto-debit and eMandate?" - every { context.getString(R.string.ways_to_register_for_auto_debit) } returns "eMandate is one of the multiple ways to register for Auto-debit. It is an electronic authorization given by you to the bank to allow debit of EMIs from your bank account. eMandates eliminates the need for you to fill physical printed forms and thus makes the disbursal instant." - every { context.getString(R.string.why_setup_auto_debit) } returns "Why do I need to set-up Auto-debit if I my bank account was already verified?" - every { context.getString(R.string.pay_emis_on_time_directly_from_bank_account) } returns "Both are different things. Bank verification is done to ensure that we transfer the money only to your bank account. Auto-debit is done to provide you the convenience of paying EMIs on time directly from your bank account every time so that you avoid late payment fees." - every { context.getString(R.string.how_to_setup_auto_debit) } returns "How to set up Auto-debit?" - every { context.getString(R.string.verify_emandate_with_bank) } returns "It is very simple. Once you start the auto-debit setup, you will be redirected to your bank\\'s website where you can verify the eMandate with your netbanking/debit card details." - every { context.getString(R.string.why_netbanking_debit_card_details) } returns "Why are my netbanking/debit card details required?" - every { context.getString(R.string.to_verify_emandate) } returns "For you to verify the eMandate, your bank requires your approval which is done using netbanking or debit card." + every { context.getString(CommonR.string.setup_auto_debit) } returns "Setup Auto-Debit" + every { context.getString(CommonR.string.what_is_auto_debit) } returns "What is Auto-debit?" + every { context.getString(CommonR.string.emis_paid_directly_from_bank_account) } returns "Auto-debit is a convenient way by which your EMIs are paid directly from your bank account without the need for you to pay them manually. This eliminates the hassles of reminders and late penalty charges." + every { context.getString(CommonR.string.what_is_emandate) } returns "What is eMandate? What is the difference between Auto-debit and eMandate?" + every { context.getString(CommonR.string.ways_to_register_for_auto_debit) } returns "eMandate is one of the multiple ways to register for Auto-debit. It is an electronic authorization given by you to the bank to allow debit of EMIs from your bank account. eMandates eliminates the need for you to fill physical printed forms and thus makes the disbursal instant." + every { context.getString(CommonR.string.why_setup_auto_debit) } returns "Why do I need to set-up Auto-debit if I my bank account was already verified?" + every { context.getString(CommonR.string.pay_emis_on_time_directly_from_bank_account) } returns "Both are different things. Bank verification is done to ensure that we transfer the money only to your bank account. Auto-debit is done to provide you the convenience of paying EMIs on time directly from your bank account every time so that you avoid late payment fees." + every { context.getString(CommonR.string.how_to_setup_auto_debit) } returns "How to set up Auto-debit?" + every { context.getString(CommonR.string.verify_emandate_with_bank) } returns "It is very simple. Once you start the auto-debit setup, you will be redirected to your bank\\'s website where you can verify the eMandate with your netbanking/debit card details." + every { context.getString(CommonR.string.why_netbanking_debit_card_details) } returns "Why are my netbanking/debit card details required?" + every { context.getString(CommonR.string.to_verify_emandate) } returns "For you to verify the eMandate, your bank requires your approval which is done using netbanking or debit card." - every { context.getString(R.string.are_netbanking_card_details_safe) } returns "Are my netbanking, debit card details safe?" - every { context.getString(R.string.we_do_not_store_netbanking_card_details) } returns "Absolutely. We do not store your netbanking login or debit card details. You enter your details directly on the bank\\'s website." - every { context.getString(R.string.why_debit_card_option_not_available) } returns "Why is debit card option not available?" - every { context.getString(R.string.options_decided_by_your_bank) } returns "Netbanking/Debit Card options are decided by your bank. If you don\\'t find debit card option, please use netbanking. You can also change the bank if you are not able to complete the setup." - every { context.getString(R.string.dont_remember_password) } returns "What should I do if I don\\'t remember my net banking username and password?" - every { context.getString(R.string.can_use_debit_card_option) } returns "You can use debit card option if your bank supports it. Else, you can change the bank and try the setup with the other bank." - every { context.getString(R.string.why_auto_debit_setup_failed) } returns "Why did my Auto-debit setup fail?" - every { context.getString(R.string.decided_by_bank) } returns "The success/failure of auto-debit is decided by the bank. Most common reasons are due to non-maintenance of sufficient bank balance, incorrect login details, or some technical issues. In case of failure, you can always try later or you can also add a new bank account and setup auto-debit with it." - every { context.getString(R.string.charges_for_auto_debit) } returns "Are there any charges for Auto-debit setup?" - every { context.getString(R.string.we_do_not_charge_you) } returns "We do not charge you anything for auto-debit. However, your bank might charge you a small eMandate registration fees (depends on the bank)." + every { context.getString(CommonR.string.are_netbanking_card_details_safe) } returns "Are my netbanking, debit card details safe?" + every { context.getString(CommonR.string.we_do_not_store_netbanking_card_details) } returns "Absolutely. We do not store your netbanking login or debit card details. You enter your details directly on the bank\\'s website." + every { context.getString(CommonR.string.why_debit_card_option_not_available) } returns "Why is debit card option not available?" + every { context.getString(CommonR.string.options_decided_by_your_bank) } returns "Netbanking/Debit Card options are decided by your bank. If you don\\'t find debit card option, please use netbanking. You can also change the bank if you are not able to complete the setup." + every { context.getString(CommonR.string.dont_remember_password) } returns "What should I do if I don\\'t remember my net banking username and password?" + every { context.getString(CommonR.string.can_use_debit_card_option) } returns "You can use debit card option if your bank supports it. Else, you can change the bank and try the setup with the other bank." + every { context.getString(CommonR.string.why_auto_debit_setup_failed) } returns "Why did my Auto-debit setup fail?" + every { context.getString(CommonR.string.decided_by_bank) } returns "The success/failure of auto-debit is decided by the bank. Most common reasons are due to non-maintenance of sufficient bank balance, incorrect login details, or some technical issues. In case of failure, you can always try later or you can also add a new bank account and setup auto-debit with it." + every { context.getString(CommonR.string.charges_for_auto_debit) } returns "Are there any charges for Auto-debit setup?" + every { context.getString(CommonR.string.we_do_not_charge_you) } returns "We do not charge you anything for auto-debit. However, your bank might charge you a small eMandate registration fees (depends on the bank)." - every { context.getString(R.string.can_i_change_bank_account) } returns "Can I change my bank account if my auto-debit set up fails?" - every { context.getString(R.string.you_can_use_change_bank_option) } returns "Yes. You can use the \\'Change Bank\\' option to add a new bank." - every { context.getString(R.string.change_bank_after_auto_debit_success) } returns "Can I change the bank after my Auto-debit is successfully registered?" - every { context.getString(R.string.no_period) } returns "No." - every { context.getString(R.string.use_separate_bank_accounts) } returns "Can I use separate bank accounts for verification and auto-debit?" - every { context.getString(R.string.same_bank_account_has_to_be_used) } returns "No. Same bank account has to be used for both." + every { context.getString(CommonR.string.can_i_change_bank_account) } returns "Can I change my bank account if my auto-debit set up fails?" + every { context.getString(CommonR.string.you_can_use_change_bank_option) } returns "Yes. You can use the \\'Change Bank\\' option to add a new bank." + every { context.getString(CommonR.string.change_bank_after_auto_debit_success) } returns "Can I change the bank after my Auto-debit is successfully registered?" + every { context.getString(CommonR.string.no_period) } returns "No." + every { context.getString(CommonR.string.use_separate_bank_accounts) } returns "Can I use separate bank accounts for verification and auto-debit?" + every { context.getString(CommonR.string.same_bank_account_has_to_be_used) } returns "No. Same bank account has to be used for both." val faqContents = listOf( FaqContent( @@ -301,13 +302,13 @@ class FaqsUtilKtTest { @Test fun testGetLoanFaqs() { val context = mockk() - every { context.getString(R.string.get_loan) } returns "Get Loan" - every { context.getString(R.string.check_my_loan_details) } returns "How do I check my loan details like EMI, due date etc after getting the loan?" - every { context.getString(R.string.available_in_loan_details_section) } returns "All loan related details are available in the \\'Loan Details\\' section after you get the loan." - every { context.getString(R.string.agreement_be_sent_to_me) } returns "Will the loan agreement be sent to me?" - every { context.getString(R.string.sending_loan_agreement_on_whatsapp) } returns "Yes. We will be sending the loan agreement to you on WhatsApp. You can also download the agreement from the \\'Loan Details\\' section on the app." - every { context.getString(R.string.reminders_for_emi) } returns "Will I get reminders for EMI payment?" - every { context.getString(R.string.timely_reminders_for_payments) } returns "Yes. We will send you timely reminders for payments." + every { context.getString(CommonR.string.get_loan) } returns "Get Loan" + every { context.getString(CommonR.string.check_my_loan_details) } returns "How do I check my loan details like EMI, due date etc after getting the loan?" + every { context.getString(CommonR.string.available_in_loan_details_section) } returns "All loan related details are available in the \\'Loan Details\\' section after you get the loan." + every { context.getString(CommonR.string.agreement_be_sent_to_me) } returns "Will the loan agreement be sent to me?" + every { context.getString(CommonR.string.sending_loan_agreement_on_whatsapp) } returns "Yes. We will be sending the loan agreement to you on WhatsApp. You can also download the agreement from the \\'Loan Details\\' section on the app." + every { context.getString(CommonR.string.reminders_for_emi) } returns "Will I get reminders for EMI payment?" + every { context.getString(CommonR.string.timely_reminders_for_payments) } returns "Yes. We will send you timely reminders for payments." val faqContents = listOf( FaqContent("How do I check my loan details like EMI, due date etc after getting the loan?","All loan related details are available in the \\'Loan Details\\' section after you get the loan."), diff --git a/application-platform/app/src/main/java/com/applicationplatform/NaviSDKHelper.kt b/application-platform/app/src/main/java/com/applicationplatform/NaviSDKHelper.kt index 4e834638ad..438c0169ee 100644 --- a/application-platform/app/src/main/java/com/applicationplatform/NaviSDKHelper.kt +++ b/application-platform/app/src/main/java/com/applicationplatform/NaviSDKHelper.kt @@ -164,7 +164,6 @@ object NaviSDKHelper { private fun setupAnalyticsData(naviApplication: MainApplication) { setDeviceIdIfUserNotLoggedIn() setSessionId(naviApplication) - getAlfredCruiseInfo() CommonUtils.getUserLocation()?.let { userLocation -> userLocation.latitude?.toDoubleOrNull()?.let { latitude -> userLocation.longitude?.toDoubleOrNull()?.let { longitude -> @@ -174,16 +173,6 @@ object NaviSDKHelper { } } - private fun getAlfredCruiseInfo() { - CoroutineScope(Dispatchers.IO).launch { - try { - AlfredManager.getCruiseConfig(cruiseApiSuccessful = {}) - } catch (e: Exception) { - e.log() - } - } - } - fun setUserId(id: String) { // DeeplinkManager.setCustomerId(id) NaviTrackEvent.setUserId(id) diff --git a/application-platform/navi-ap/src/main/kotlin/com/navi/ap/utils/helper/BottomsheetHelper.kt b/application-platform/navi-ap/src/main/kotlin/com/navi/ap/utils/helper/BottomsheetHelper.kt index d2062fdb2c..14049670bd 100644 --- a/application-platform/navi-ap/src/main/kotlin/com/navi/ap/utils/helper/BottomsheetHelper.kt +++ b/application-platform/navi-ap/src/main/kotlin/com/navi/ap/utils/helper/BottomsheetHelper.kt @@ -1,5 +1,6 @@ package com.navi.ap.utils.helper +import com.navi.naviwidgets.R as WidgetsR import com.navi.ap.common.models.ScreenType import com.navi.ap.network.model.getHideBottomSheetAction import com.navi.ap.network.model.getHideBottomSheetAndRetryGetNextScreen @@ -19,7 +20,7 @@ object BottomSheetHelper { CommonLibManager.application.getString( R.string.taking_longer_time_desc ), - ctaTitle = CommonLibManager.application.getString(com.navi.naviwidgets.R.string.continue_text), + ctaTitle = CommonLibManager.application.getString(WidgetsR.string.continue_text), ctaAction = getHideBottomSheetAndRetryGetNextScreen(), isCancellable = false ) @@ -37,4 +38,4 @@ object BottomSheetHelper { ctaAction = getHideBottomSheetAction() ) } -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index 488cdc1bad..b54809816f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,5 +24,5 @@ org.gradle.daemon=true org.gradle.parallel=true org.gradle.caching=true android.defaults.buildfeatures.buildconfig=true -android.nonTransitiveRClass=false -android.nonFinalResIds=false +android.nonTransitiveRClass=true +android.nonFinalResIds=false \ No newline at end of file diff --git a/navi-amc/src/main/java/com/navi/amc/common/activity/AmcBaseActivity.kt b/navi-amc/src/main/java/com/navi/amc/common/activity/AmcBaseActivity.kt index 39286f7a7f..15d0883210 100644 --- a/navi-amc/src/main/java/com/navi/amc/common/activity/AmcBaseActivity.kt +++ b/navi-amc/src/main/java/com/navi/amc/common/activity/AmcBaseActivity.kt @@ -1,5 +1,6 @@ package com.navi.amc.common.activity -/* + +import com.navi.common.R as CommonR/* * * * Copyright © 2022 by Navi Technologies Private Limited * * All rights reserved. Strictly confidential @@ -47,7 +48,7 @@ abstract class AmcBaseActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - overridePendingTransition(R.anim.parallax_slide_in_right, R.anim.parallax_slide_out_left) + overridePendingTransition(CommonR.anim.parallax_slide_in_right, CommonR.anim.parallax_slide_out_left) } protected fun openHelpBottomSheet(helpBottomSheetData: HelpBottomSheetData?) { @@ -103,6 +104,6 @@ abstract class AmcBaseActivity : BaseActivity() { override fun finish() { super.finish() - overridePendingTransition(R.anim.parallax_slide_in_left, R.anim.parallax_slide_out_right) + overridePendingTransition(CommonR.anim.parallax_slide_in_left, CommonR.anim.parallax_slide_out_right) } -} \ No newline at end of file +} diff --git a/navi-amc/src/main/java/com/navi/amc/common/fragment/AmcOptionChooserBottomSheet.kt b/navi-amc/src/main/java/com/navi/amc/common/fragment/AmcOptionChooserBottomSheet.kt index c0f3667ef2..99d5e5ee1e 100644 --- a/navi-amc/src/main/java/com/navi/amc/common/fragment/AmcOptionChooserBottomSheet.kt +++ b/navi-amc/src/main/java/com/navi/amc/common/fragment/AmcOptionChooserBottomSheet.kt @@ -1,5 +1,6 @@ package com.navi.amc.common.fragment +import com.navi.design.R as DesignR import android.os.Bundle import android.view.ViewGroup import android.view.ViewStub @@ -72,7 +73,7 @@ class AmcOptionChooserBottomSheet : BaseBottomSheet() { DividerItemDecorator( ResourcesCompat.getDrawable( resources, - com.navi.naviwidgets.R.drawable.divider, + DesignR.drawable.divider, null ) ) @@ -91,4 +92,4 @@ class AmcOptionChooserBottomSheet : BaseBottomSheet() { } } } -} \ No newline at end of file +} diff --git a/navi-amc/src/main/java/com/navi/amc/common/fragment/NudgeBottomSheet.kt b/navi-amc/src/main/java/com/navi/amc/common/fragment/NudgeBottomSheet.kt index 3e7d6299e1..b093b7d10c 100644 --- a/navi-amc/src/main/java/com/navi/amc/common/fragment/NudgeBottomSheet.kt +++ b/navi-amc/src/main/java/com/navi/amc/common/fragment/NudgeBottomSheet.kt @@ -1,5 +1,6 @@ package com.navi.amc.common.fragment +import com.navi.design.R as DesignR import android.os.Bundle import android.view.ViewStub import androidx.databinding.DataBindingUtil @@ -43,7 +44,7 @@ class NudgeBottomSheet : BaseBottomSheet(), FooterInteractionListener { subtitle.setSpannableString(data.container?.subtitle) icon.showWhenDataIsAvailable(data.container?.lottieFileName) root.background = getNaviDrawable( - cornerRadius = resources.getDimension(R.dimen.dp_4).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_4).toInt(), gradientColors = getGradientColors(data.container?.gradient), gradientOrientation = GradientOrientation.LEFT_RIGHT, strokeColor = data.container?.strokeColor.parseColorSafe(), @@ -83,4 +84,4 @@ class NudgeBottomSheet : BaseBottomSheet(), FooterInteractionListener { } } } -} \ No newline at end of file +} diff --git a/navi-amc/src/main/java/com/navi/amc/common/fragment/OtpFragment.kt b/navi-amc/src/main/java/com/navi/amc/common/fragment/OtpFragment.kt index 6bd78e1d75..bff00bffc1 100644 --- a/navi-amc/src/main/java/com/navi/amc/common/fragment/OtpFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/common/fragment/OtpFragment.kt @@ -6,6 +6,8 @@ package com.navi.amc.common.fragment +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.content.Context import android.content.IntentFilter import android.os.Bundle @@ -162,7 +164,7 @@ class OtpFragment : AmcBaseFragment(), View.OnClickListener { binding.countdownTv.setSpannableString(response?.content?.regenerateOtpText) binding.resendOtpTv.setSpannableString(response?.content?.resendOtpText) binding.resendOtpTv.setCompoundDrawablesWithIntrinsicBounds( - R.drawable.ic_resend_new_theme, + WidgetsR.drawable.ic_resend_new_theme, 0, 0, 0, @@ -194,7 +196,7 @@ class OtpFragment : AmcBaseFragment(), View.OnClickListener { hideLoader() fireOtpVerificationResultEvent(false) binding.otpLayout.clear() - binding.enterCorrectOtpTv.setText(getString(R.string.enter_correct_otp)) + binding.enterCorrectOtpTv.setText(getString(DesignR.string.enter_correct_otp)) binding.enterCorrectOtpTv.visibility = View.VISIBLE } } @@ -446,7 +448,7 @@ class OtpFragment : AmcBaseFragment(), View.OnClickListener { val minutes = (millisUntilFinished / MILLISECONDS_PER_SECOND) / SECONDS_PER_MINUTE val seconds = (millisUntilFinished / MILLISECONDS_PER_SECOND) % SECONDS_PER_MINUTE if (isAdded) binding.countdownTimerTv.text = - String.format(getString(R.string.time_format), minutes, seconds) + String.format(getString(DesignR.string.time_format), minutes, seconds) } override fun onFinish() { @@ -498,7 +500,7 @@ class OtpFragment : AmcBaseFragment(), View.OnClickListener { ) } else { binding.otpLayout.setBoxBg(true) - binding.enterCorrectOtpTv.setText(getString(R.string.enter_valid_otp)) + binding.enterCorrectOtpTv.setText(getString(DesignR.string.enter_valid_otp)) binding.enterCorrectOtpTv.visibility = View.VISIBLE } } @@ -555,4 +557,4 @@ class OtpFragment : AmcBaseFragment(), View.OnClickListener { } } } -} \ No newline at end of file +} diff --git a/navi-amc/src/main/java/com/navi/amc/common/fragment/PennyDropOptionsFragment.kt b/navi-amc/src/main/java/com/navi/amc/common/fragment/PennyDropOptionsFragment.kt index fbc1afff0a..18ecaa1e40 100644 --- a/navi-amc/src/main/java/com/navi/amc/common/fragment/PennyDropOptionsFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/common/fragment/PennyDropOptionsFragment.kt @@ -1,5 +1,6 @@ package com.navi.amc.common.fragment +import com.navi.naviwidgets.R as WidgetsR import android.app.Activity import android.content.Context import android.content.Intent @@ -121,7 +122,7 @@ class PennyDropOptionsFragment() : AmcBaseFragment() { } val itemDecorator = DividerItemDecoration(context, DividerItemDecoration.VERTICAL) context?.let { - ContextCompat.getDrawable(it, R.drawable.empty_space_divider)?.let { drawable -> + ContextCompat.getDrawable(it, WidgetsR.drawable.empty_space_divider)?.let { drawable -> itemDecorator.setDrawable(drawable) } } diff --git a/navi-amc/src/main/java/com/navi/amc/common/fragment/RewardsDialogFragment.kt b/navi-amc/src/main/java/com/navi/amc/common/fragment/RewardsDialogFragment.kt index a5cac501f7..ba0e61a03c 100644 --- a/navi-amc/src/main/java/com/navi/amc/common/fragment/RewardsDialogFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/common/fragment/RewardsDialogFragment.kt @@ -7,6 +7,7 @@ package com.navi.amc.common.fragment +import com.navi.common.R as CommonR import android.os.Bundle import android.view.View import androidx.core.view.isVisible @@ -22,7 +23,7 @@ import com.navi.naviwidgets.extensions.showWhenDataIsAvailable class RewardsDialogFragment() : BaseDialogFragment( R.layout.reward_layout, - styleId = R.style.FullScreenReward + styleId = CommonR.style.FullScreenReward ) { private var listener: RewardDialogCancelListener? = null diff --git a/navi-amc/src/main/java/com/navi/amc/common/view/EmptyProductView.kt b/navi-amc/src/main/java/com/navi/amc/common/view/EmptyProductView.kt index 7fe0ef7203..4b35877a6f 100644 --- a/navi-amc/src/main/java/com/navi/amc/common/view/EmptyProductView.kt +++ b/navi-amc/src/main/java/com/navi/amc/common/view/EmptyProductView.kt @@ -1,5 +1,6 @@ package com.navi.amc.common.view +import com.navi.design.R as DesignR import android.content.Context import android.graphics.drawable.LayerDrawable import android.util.AttributeSet @@ -40,7 +41,7 @@ class EmptyProductView(context: Context, attributeSet: AttributeSet? = null) : getNaviDrawable( shape = DrawableShape.RECTANGLE, backgroundColor = data.header?.bgColor?.parseColorSafe(), - strokeColor = context.resources.getColor(R.color.border_grey_color), + strokeColor = context.resources.getColor(DesignR.color.border_grey_color), strokeWidth = dpToPxInInt(1), radii = CornerRadius( leftTop = dpToPx(4), @@ -58,4 +59,4 @@ class EmptyProductView(context: Context, attributeSet: AttributeSet? = null) : } } } -} \ No newline at end of file +} diff --git a/navi-amc/src/main/java/com/navi/amc/common/view/FooterView.kt b/navi-amc/src/main/java/com/navi/amc/common/view/FooterView.kt index 7cbe6d3733..71507b0916 100644 --- a/navi-amc/src/main/java/com/navi/amc/common/view/FooterView.kt +++ b/navi-amc/src/main/java/com/navi/amc/common/view/FooterView.kt @@ -7,6 +7,8 @@ package com.navi.amc.common.view +import com.navi.common.R as CommonR +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -117,10 +119,10 @@ class FooterView(context: Context, attrs: AttributeSet?) : ConstraintLayout(cont fun enableNextButton(enabled: Boolean) { binding.nextCta.isEnabled = enabled if (enabled) { - binding.nextCta.setBackgroundResource(R.drawable.bg_cta_primary_amc) + binding.nextCta.setBackgroundResource(WidgetsR.drawable.bg_cta_primary_amc) binding.nextCta.tag = NextButtonTag.ENABLED } else { - binding.nextCta.setBackgroundResource(R.drawable.bg_cta_disable_primary_amc) + binding.nextCta.setBackgroundResource(CommonR.drawable.bg_cta_disable_primary_amc) binding.nextCta.tag = NextButtonTag.DISABLED } } @@ -145,9 +147,9 @@ class FooterView(context: Context, attrs: AttributeSet?) : ConstraintLayout(cont } fun changeNextButtonBackground(enabled: Boolean) { if (enabled) { - binding.nextCta.setBackgroundResource(R.drawable.bg_cta_primary_amc) + binding.nextCta.setBackgroundResource(WidgetsR.drawable.bg_cta_primary_amc) } else { - binding.nextCta.setBackgroundResource(R.drawable.bg_cta_disable_primary_amc) + binding.nextCta.setBackgroundResource(CommonR.drawable.bg_cta_disable_primary_amc) } } @@ -168,4 +170,4 @@ class FooterView(context: Context, attrs: AttributeSet?) : ConstraintLayout(cont private fun action(actionData: ActionData?){ footerInteractionListener?.onFooterNoteClicked(actionData) } -} \ No newline at end of file +} diff --git a/navi-amc/src/main/java/com/navi/amc/common/view/StatusTimeLineView.kt b/navi-amc/src/main/java/com/navi/amc/common/view/StatusTimeLineView.kt index b9c5ac3847..3bebc2509b 100644 --- a/navi-amc/src/main/java/com/navi/amc/common/view/StatusTimeLineView.kt +++ b/navi-amc/src/main/java/com/navi/amc/common/view/StatusTimeLineView.kt @@ -1,5 +1,6 @@ package com.navi.amc.common.view +import com.navi.design.R as DesignR import android.content.Context import android.graphics.drawable.LayerDrawable import android.os.CountDownTimer @@ -117,7 +118,7 @@ class StatusTimeLineView(context: Context, attributeSet: AttributeSet? = null) : } timer?.start() val footerBg = getNaviDrawable( - strokeColor = ContextCompat.getColor(context, R.color.border_dark_grey_color), + strokeColor = ContextCompat.getColor(context, DesignR.color.border_dark_grey_color), strokeWidth = dpToPxInInt(1), backgroundColor = it.bgColor.parseColorSafe(), radii = CornerRadius( @@ -145,4 +146,4 @@ class StatusTimeLineView(context: Context, attributeSet: AttributeSet? = null) : binding.footerTv.isVisible = false } } -} \ No newline at end of file +} diff --git a/navi-amc/src/main/java/com/navi/amc/common/view/SwitchView.kt b/navi-amc/src/main/java/com/navi/amc/common/view/SwitchView.kt index 596c216451..61d010036f 100644 --- a/navi-amc/src/main/java/com/navi/amc/common/view/SwitchView.kt +++ b/navi-amc/src/main/java/com/navi/amc/common/view/SwitchView.kt @@ -7,6 +7,7 @@ package com.navi.amc.common.view +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -75,19 +76,19 @@ class SwitchView(context: Context, attributeSet: AttributeSet? = null) : fun leftChecked() { binding.left.background = ColorUtils.getPurpleRoundedDrawable(context) - binding.left.setStyle(com.navi.design.R.style.ButtonTextStyle) + binding.left.setStyle(DesignR.style.ButtonTextStyle) binding.left.changeFontStyle(FontWeightEnum.TT_SEMI_BOLD) binding.right.background = null - binding.right.setStyle(com.navi.design.R.style.Body7TextStyle) + binding.right.setStyle(DesignR.style.Body7TextStyle) binding.right.changeFontStyle(FontWeightEnum.TT_MEDIUM) } fun rightChecked() { binding.right.background = ColorUtils.getPurpleRoundedDrawable(context) - binding.right.setStyle(com.navi.design.R.style.ButtonTextStyle) + binding.right.setStyle(DesignR.style.ButtonTextStyle) binding.right.changeFontStyle(FontWeightEnum.TT_SEMI_BOLD) binding.left.background = null - binding.left.setStyle(com.navi.design.R.style.Body7TextStyle) + binding.left.setStyle(DesignR.style.Body7TextStyle) binding.left.changeFontStyle(FontWeightEnum.TT_MEDIUM) } diff --git a/navi-amc/src/main/java/com/navi/amc/digio/kyc/DigioKycVerificationHelper.kt b/navi-amc/src/main/java/com/navi/amc/digio/kyc/DigioKycVerificationHelper.kt index bb20158336..cd65e1ad21 100644 --- a/navi-amc/src/main/java/com/navi/amc/digio/kyc/DigioKycVerificationHelper.kt +++ b/navi-amc/src/main/java/com/navi/amc/digio/kyc/DigioKycVerificationHelper.kt @@ -6,6 +6,7 @@ package com.navi.amc.digio.kyc +import com.navi.design.R as DesignR import `in`.digio.sdk.gateway.enums.DigioEnvironment import `in`.digio.sdk.gateway.model.DigioConfig import `in`.digio.sdk.gateway.model.DigioTheme @@ -45,7 +46,7 @@ class DigioKycVerificationHelper(private val moduleName: String = ModuleNameV2.A try { val config = DigioConfig() val digioTheme = DigioTheme() - digioTheme.primaryColor = R.color.ctaPrimaryColor + digioTheme.primaryColor = DesignR.color.ctaPrimaryColor config.theme = digioTheme if (AMCManager.flavor == PROD) { config.environment = DigioEnvironment.PRODUCTION @@ -85,4 +86,4 @@ class DigioKycVerificationHelper(private val moduleName: String = ModuleNameV2.A e.log() } } -} \ No newline at end of file +} diff --git a/navi-amc/src/main/java/com/navi/amc/fundbuy/activities/FundBuyActivity.kt b/navi-amc/src/main/java/com/navi/amc/fundbuy/activities/FundBuyActivity.kt index 54630bc2c9..ae3d486b33 100644 --- a/navi-amc/src/main/java/com/navi/amc/fundbuy/activities/FundBuyActivity.kt +++ b/navi-amc/src/main/java/com/navi/amc/fundbuy/activities/FundBuyActivity.kt @@ -7,6 +7,7 @@ package com.navi.amc.fundbuy.activities +import com.navi.common.R as CommonR import android.app.Activity import android.content.Intent import android.os.Bundle @@ -222,10 +223,10 @@ class FundBuyActivity : BasePaymentActivity(), fragmentTransaction.apply { addToBackStack(currentScreenTag) setCustomAnimations( - R.anim.parallax_slide_in_right, - R.anim.parallax_slide_out_left, - R.anim.parallax_slide_in_left, - R.anim.parallax_slide_out_right + CommonR.anim.parallax_slide_in_right, + CommonR.anim.parallax_slide_out_left, + CommonR.anim.parallax_slide_in_left, + CommonR.anim.parallax_slide_out_right ) replace(R.id.container, fragment, currentScreenTag) commit() diff --git a/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundDetailsFragmentV2.kt b/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundDetailsFragmentV2.kt index d4a3518ce3..5a446ffb5a 100644 --- a/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundDetailsFragmentV2.kt +++ b/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundDetailsFragmentV2.kt @@ -7,6 +7,7 @@ package com.navi.amc.fundbuy.fragments +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Rect import android.net.Uri @@ -524,11 +525,11 @@ class FundDetailsFragmentV2 : AmcBaseFragment(), FooterInteractionListener { TransitionManager.beginDelayedTransition(parent, transition) if (isCollapse) { - binding.root.setBackgroundResource(R.color.backgroundPrimaryColor) + binding.root.setBackgroundResource(DesignR.color.backgroundPrimaryColor) binding.chevronIv.animate(R.anim.reverse_half_rotate_anim) binding.sectionContainer.isVisible = false } else { - binding.root.setBackgroundResource(R.color.grey_alabaster) + binding.root.setBackgroundResource(DesignR.color.grey_alabaster) binding.chevronIv.animate(R.anim.half_rotate_anim) binding.sectionContainer.isVisible = true } diff --git a/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragment.kt b/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragment.kt index c4181566e7..70424332f0 100644 --- a/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragment.kt @@ -7,6 +7,7 @@ package com.navi.amc.fundbuy.fragments +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.os.Bundle import android.view.View @@ -121,7 +122,7 @@ class FundListingFragment : AmcBaseFragment() { adapter = adapter val itemDecorator = DividerItemDecoration(context, DividerItemDecoration.VERTICAL) context?.let { - ContextCompat.getDrawable(it, R.drawable.empty_space_divider)?.let { drawable -> + ContextCompat.getDrawable(it, WidgetsR.drawable.empty_space_divider)?.let { drawable -> itemDecorator.setDrawable(drawable) } } diff --git a/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragmentV2.kt b/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragmentV2.kt index 823533374a..534f0957b9 100644 --- a/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragmentV2.kt +++ b/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragmentV2.kt @@ -7,6 +7,7 @@ package com.navi.amc.fundbuy.fragments +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.graphics.Rect import android.os.Bundle @@ -174,11 +175,11 @@ class FundListingFragmentV2 : AmcBaseFragment(), WidgetCallback { ) { super.getItemOffsets(outRect, view, parent, state) parent.findContainingViewHolder(view)?.itemViewType?.let { itemViewType -> - if (itemViewType == R.layout.layout_list_overlapping_header) { + if (itemViewType == WidgetsR.layout.layout_list_overlapping_header) { outRect.set(0, 0, 0, (-1 * dpToPx(45).toInt())) - } else if (itemViewType == com.navi.naviwidgets.R.layout.image_header_layout && viewModel.containsHomeProductWidget()) { + } else if (itemViewType == WidgetsR.layout.image_header_layout && viewModel.containsHomeProductWidget()) { outRect.set(0, 0, 0, (-1 * dpToPx(54).toInt())) - } else if (itemViewType == com.navi.naviwidgets.R.layout.image_header_layout) { + } else if (itemViewType == WidgetsR.layout.image_header_layout) { outRect.set(0, 0, 0, (-1 * dpToPx(45).toInt())) } } @@ -205,7 +206,7 @@ class FundListingFragmentV2 : AmcBaseFragment(), WidgetCallback { navigateToNextScreen(it.nextCta) } binding.footer.root.isVisible = - (binding.rvProducts.findViewById(R.id.home_card) == null) + (binding.rvProducts.findViewById(WidgetsR.id.home_card) == null) && viewModel.containsHomeProductWidget() && (viewModel.fundListDataV2.value?.footer != null) } ?: run { binding.footer.root.isVisible = false } if (arguments?.getString(Constant.FUND_CATEGORY) diff --git a/navi-amc/src/main/java/com/navi/amc/fundbuy/views/FundDetailView.kt b/navi-amc/src/main/java/com/navi/amc/fundbuy/views/FundDetailView.kt index 221810a375..e860ce931a 100644 --- a/navi-amc/src/main/java/com/navi/amc/fundbuy/views/FundDetailView.kt +++ b/navi-amc/src/main/java/com/navi/amc/fundbuy/views/FundDetailView.kt @@ -1,5 +1,6 @@ package com.navi.amc.fundbuy.views +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -23,9 +24,9 @@ class FundDetailView(context: Context, attributeSet: AttributeSet? = null) : dividerDrawable = ContextCompat.getDrawable(context, R.drawable.divider_32) showDividers = SHOW_DIVIDER_MIDDLE setPadding( - resources.getDimension(R.dimen.dp_16).toInt(), + resources.getDimension(DesignR.dimen.dp_16).toInt(), 0, - resources.getDimension(R.dimen.dp_16).toInt(), + resources.getDimension(DesignR.dimen.dp_16).toInt(), 0 ) } @@ -56,4 +57,4 @@ class FundDetailView(context: Context, attributeSet: AttributeSet? = null) : addView(binding.root) } } -} \ No newline at end of file +} diff --git a/navi-amc/src/main/java/com/navi/amc/fundbuy/views/HorizontalChipGroupView.kt b/navi-amc/src/main/java/com/navi/amc/fundbuy/views/HorizontalChipGroupView.kt index 2be82f8809..df7191c9be 100644 --- a/navi-amc/src/main/java/com/navi/amc/fundbuy/views/HorizontalChipGroupView.kt +++ b/navi-amc/src/main/java/com/navi/amc/fundbuy/views/HorizontalChipGroupView.kt @@ -1,5 +1,6 @@ package com.navi.amc.fundbuy.views +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -40,8 +41,8 @@ class HorizontalChipGroupView(context: Context, attributeSet: AttributeSet? = nu title.setSpannableString(data.title) icon.setColorFilter(data.borderColor.parseColorSafe()) root.background = getNaviDrawable( - cornerRadius = resources.getDimension(R.dimen.dp_4).toInt(), - strokeWidth = resources.getDimension(R.dimen.dp_1).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_4).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), strokeColor = data.borderColor.parseColorSafe() ) root.setOnClickListener { @@ -52,4 +53,4 @@ class HorizontalChipGroupView(context: Context, attributeSet: AttributeSet? = nu binding.group.addView(childBinding.root, binding.group.childCount) } } -} \ No newline at end of file +} diff --git a/navi-amc/src/main/java/com/navi/amc/fundbuy/views/ListItemProgressView.kt b/navi-amc/src/main/java/com/navi/amc/fundbuy/views/ListItemProgressView.kt index f16ac18714..4bcdb58884 100644 --- a/navi-amc/src/main/java/com/navi/amc/fundbuy/views/ListItemProgressView.kt +++ b/navi-amc/src/main/java/com/navi/amc/fundbuy/views/ListItemProgressView.kt @@ -1,5 +1,6 @@ package com.navi.amc.fundbuy.views +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -50,7 +51,7 @@ class ListItemProgressView(context: Context, attributeSet: AttributeSet? = null) text.setTextColor(data.action?.titleColor.parseColorSafe()) root.background = getNaviDrawable( backgroundColor = data.action?.bgColor.parseColorSafe(), - cornerRadius = resources.getDimension(R.dimen.dp_4).toInt() + cornerRadius = resources.getDimension(DesignR.dimen.dp_4).toInt() ) } button.root.setOnClickListener { @@ -86,4 +87,4 @@ class ListItemProgressView(context: Context, attributeSet: AttributeSet? = null) fun setListExpandListener(expandListener: ((Boolean) -> Unit)?) { this.expandListener = expandListener } -} \ No newline at end of file +} diff --git a/navi-amc/src/main/java/com/navi/amc/kyc/activity/KycOnboardActivity.kt b/navi-amc/src/main/java/com/navi/amc/kyc/activity/KycOnboardActivity.kt index dcfa5bbe2c..c552e85356 100644 --- a/navi-amc/src/main/java/com/navi/amc/kyc/activity/KycOnboardActivity.kt +++ b/navi-amc/src/main/java/com/navi/amc/kyc/activity/KycOnboardActivity.kt @@ -6,7 +6,8 @@ */ package com.navi.amc.kyc.activity -/* + +import com.navi.design.R as DesignR/* * * * Copyright © 2022 by Navi Technologies Private Limited * * All rights reserved. Strictly confidential @@ -49,7 +50,7 @@ class KycOnboardActivity : AmcBaseActivity(), View.OnClickListener { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) binding = DataBindingUtil.setContentView(this, R.layout.activity_kyc_onboard) - setStatusBarColor(R.color.grey_alabaster) + setStatusBarColor(DesignR.color.grey_alabaster) super.setContentView(binding.root) initError(viewModel, showNewDesignSystemFragment = true) initListeners() diff --git a/navi-amc/src/main/java/com/navi/amc/kyc/fragment/KycVerificationOptionsFragment.kt b/navi-amc/src/main/java/com/navi/amc/kyc/fragment/KycVerificationOptionsFragment.kt index ca4880cfee..4df2481f7f 100644 --- a/navi-amc/src/main/java/com/navi/amc/kyc/fragment/KycVerificationOptionsFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/kyc/fragment/KycVerificationOptionsFragment.kt @@ -7,6 +7,7 @@ package com.navi.amc.kyc.fragment +import com.navi.naviwidgets.R as WidgetsR import android.app.Activity import android.content.Context import android.os.Bundle @@ -192,7 +193,7 @@ class KycVerificationOptionsFragment() : AmcBaseFragment(), OKYCListener { } val itemDecorator = DividerItemDecoration(context, DividerItemDecoration.VERTICAL) context?.let { - ContextCompat.getDrawable(it, R.drawable.empty_space_divider)?.let { drawable -> + ContextCompat.getDrawable(it, WidgetsR.drawable.empty_space_divider)?.let { drawable -> itemDecorator.setDrawable(drawable) } } diff --git a/navi-amc/src/main/java/com/navi/amc/kyc/fragment/PermissionFragment.kt b/navi-amc/src/main/java/com/navi/amc/kyc/fragment/PermissionFragment.kt index ceb70c14f9..2199e5784d 100644 --- a/navi-amc/src/main/java/com/navi/amc/kyc/fragment/PermissionFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/kyc/fragment/PermissionFragment.kt @@ -7,6 +7,7 @@ package com.navi.amc.kyc.fragment +import com.navi.common.R as CommonR import android.Manifest import android.content.Context import android.content.Intent @@ -83,11 +84,11 @@ class PermissionFragment: AmcBaseFragment(), FooterInteractionListener, Permissi layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) adapter = permissionAdapter addItemDecoration( - TopMarginItemDecoration(resources.getDimension(R.dimen.layout_dp_24)) + TopMarginItemDecoration(resources.getDimension(CommonR.dimen.layout_dp_24)) ) } permissionAdapter.updatePermissionTiles(permissionTiles) - binding.permissionDeniedView.setCornerRadius(resources.getDimension(R.dimen.layout_dp_8)) + binding.permissionDeniedView.setCornerRadius(resources.getDimension(CommonR.dimen.layout_dp_8)) binding.permissionDeniedView.setCallback { openNativePermissionPage() } diff --git a/navi-amc/src/main/java/com/navi/amc/kyc/fragment/SignatureFragment.kt b/navi-amc/src/main/java/com/navi/amc/kyc/fragment/SignatureFragment.kt index 15dfab935e..70d9899441 100644 --- a/navi-amc/src/main/java/com/navi/amc/kyc/fragment/SignatureFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/kyc/fragment/SignatureFragment.kt @@ -7,6 +7,7 @@ package com.navi.amc.kyc.fragment +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.graphics.Bitmap import android.os.Bundle @@ -213,14 +214,14 @@ class SignatureFragment : AmcBaseFragment(), FooterInteractionListener { if (isError) { binding.signaturePad.background = ResourcesCompat.getDrawable( context.resources, - R.drawable.error_rectangle_bg, + WidgetsR.drawable.error_rectangle_bg, null ) binding.errorTv.visibility = View.VISIBLE } else { binding.signaturePad.background = ResourcesCompat.getDrawable( context.resources, - R.drawable.default_rectangle_bg, + WidgetsR.drawable.default_rectangle_bg, null ) binding.errorTv.visibility = View.INVISIBLE @@ -241,4 +242,4 @@ class SignatureFragment : AmcBaseFragment(), FooterInteractionListener { bitmapImage.compress(Bitmap.CompressFormat.JPEG, 70, outputStream) viewModel.postData(outputStream.toByteArray()) } -} \ No newline at end of file +} diff --git a/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/MyInvestmentsFragment.kt b/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/MyInvestmentsFragment.kt index 9a6bd0bd8f..2d26b2ca7a 100644 --- a/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/MyInvestmentsFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/MyInvestmentsFragment.kt @@ -7,6 +7,7 @@ package com.navi.amc.portfolio.fragments +import com.navi.design.R as DesignR import android.content.Context import android.os.Bundle import android.view.View @@ -124,7 +125,7 @@ class MyInvestmentsFragment() : AmcBaseFragment() { it.customView ?.findViewById(R.id.tvTabName) ?.setTextColor( - ContextCompat.getColor(requireContext(), R.color.color_1F002A) + ContextCompat.getColor(requireContext(), DesignR.color.color_1F002A) ) it.customView ?.findViewById(R.id.tvTabName) @@ -137,7 +138,7 @@ class MyInvestmentsFragment() : AmcBaseFragment() { tab?.let { it.customView ?.findViewById(R.id.tvTabName) - ?.setTextColor(ContextCompat.getColor(requireContext(), R.color.unSelectedTab)) + ?.setTextColor(ContextCompat.getColor(requireContext(), DesignR.color.unSelectedTab)) it.customView ?.findViewById(R.id.tvTabName) ?.setFontStyle(FontWeightEnum.NAVI_BOLD) diff --git a/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/OrdersFragment.kt b/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/OrdersFragment.kt index 8b725ac7d6..b505e0f847 100644 --- a/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/OrdersFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/OrdersFragment.kt @@ -7,6 +7,7 @@ package com.navi.amc.portfolio.fragments +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.graphics.drawable.LayerDrawable @@ -222,7 +223,7 @@ class OrdersFragment : AmcBaseFragment() { } binding.orderSummaryCard.summaryCard.background = getNaviDrawable( backgroundColor = it.bgColor.parseColorSafe(), - strokeColor = context?.resources?.getColor(R.color.border_grey_color), + strokeColor = context?.resources?.getColor(DesignR.color.border_grey_color), strokeWidth = dpToPxInInt(1), cornerRadius = dpToPxInInt(4) ) @@ -264,7 +265,7 @@ class OrdersFragment : AmcBaseFragment() { timer?.start() val drawable = getNaviDrawable( backgroundColor = it.bgColor.parseColorSafe(), - strokeColor = context?.resources?.getColor(R.color.border_grey_color), + strokeColor = context?.resources?.getColor(DesignR.color.border_grey_color), strokeWidth = dpToPxInInt(1), radii = CornerRadius( leftBottom = dpToPx(4), diff --git a/navi-amc/src/main/java/com/navi/amc/utils/ColorUtils.kt b/navi-amc/src/main/java/com/navi/amc/utils/ColorUtils.kt index ebbc9adf2e..cce41e403f 100644 --- a/navi-amc/src/main/java/com/navi/amc/utils/ColorUtils.kt +++ b/navi-amc/src/main/java/com/navi/amc/utils/ColorUtils.kt @@ -7,6 +7,7 @@ package com.navi.amc.utils +import com.navi.design.R as DesignR import android.content.Context import androidx.core.content.ContextCompat import com.navi.design.R @@ -43,7 +44,7 @@ object ColorUtils { cornerRadius = dpToPx(4).toInt(), strokeWidth = dpToPx(1).toInt(), strokeColor = context?.let { it -> ContextCompat.getColor( - it, com.navi.amc.R.color.border_dark_grey_color + it, DesignR.color.border_dark_grey_color ) }, gradientColors = gradientColor, @@ -63,7 +64,7 @@ object ColorUtils { strokeColor = context?.let { ContextCompat.getColor( it, - com.navi.amc.R.color.linkColor + DesignR.color.linkColor ) }, cornerRadius = dpToPx(12).toInt(), @@ -74,7 +75,7 @@ object ColorUtils { strokeColor = context?.let { ContextCompat.getColor( it, - com.navi.amc.R.color.color_1F002A + DesignR.color.color_1F002A ) }, cornerRadius = dpToPx(4).toInt(), @@ -85,7 +86,7 @@ object ColorUtils { strokeColor = context?.let { ContextCompat.getColor( it, - com.navi.amc.R.color.backgroundColor4 + DesignR.color.backgroundColor4 ) }, cornerRadius = dpToPx(4).toInt(), @@ -96,7 +97,7 @@ object ColorUtils { strokeColor = ContextCompat.getColor( context, - com.navi.amc.R.color.border_dark_grey_color + DesignR.color.border_dark_grey_color ), cornerRadius = dpToPx(4).toInt(), strokeWidth = dpToPx(1).toInt(), diff --git a/navi-amc/src/main/java/com/navi/amc/utils/ViewUtils.kt b/navi-amc/src/main/java/com/navi/amc/utils/ViewUtils.kt index cb4cec8642..7ba2e368fc 100644 --- a/navi-amc/src/main/java/com/navi/amc/utils/ViewUtils.kt +++ b/navi-amc/src/main/java/com/navi/amc/utils/ViewUtils.kt @@ -1,5 +1,6 @@ package com.navi.amc.utils +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.content.res.ColorStateList import android.graphics.Bitmap @@ -129,7 +130,7 @@ fun createChipBg(data: FundDuration, context: Context): ColorStateList { } else { ColorStateList.valueOf( ContextCompat.getColor( - context, R.color.chip_bg + context, WidgetsR.color.chip_bg ) ) } diff --git a/navi-chat/src/main/java/com/navi/chat/base/ChatBaseActivity.kt b/navi-chat/src/main/java/com/navi/chat/base/ChatBaseActivity.kt index f54027f556..389572ef83 100644 --- a/navi-chat/src/main/java/com/navi/chat/base/ChatBaseActivity.kt +++ b/navi-chat/src/main/java/com/navi/chat/base/ChatBaseActivity.kt @@ -7,6 +7,7 @@ package com.navi.chat.base +import com.navi.common.R as CommonR import android.view.MotionEvent import android.view.View import androidx.appcompat.app.AppCompatActivity @@ -49,7 +50,7 @@ abstract class ChatBaseActivity : AppCompatActivity(), LoaderState, ErrorState { } loader = null loader = - NaviChatLoader.getInstance(title = message, styleId = R.style.ChatDialogFragmentStyle) + NaviChatLoader.getInstance(title = message, styleId = CommonR.style.ChatDialogFragmentStyle) loader?.isCancelable = false loader?.apply { ft.add(this, TAG) @@ -133,7 +134,7 @@ abstract class ChatBaseActivity : AppCompatActivity(), LoaderState, ErrorState { isShimmerEffect = false, shimmerLayoutLayout = null, onAnimationEnd = onAnimationEnd, - styleId = com.navi.common.R.style.DialogFragmentStyleV2 + styleId = CommonR.style.DialogFragmentStyleV2 ) } ?: run { NaviChatLoader.getInstance(message) } diff --git a/navi-chat/src/main/java/com/navi/chat/common/fragment/BaseBottomSheet.kt b/navi-chat/src/main/java/com/navi/chat/common/fragment/BaseBottomSheet.kt index 4e293a599a..273864cc2b 100644 --- a/navi-chat/src/main/java/com/navi/chat/common/fragment/BaseBottomSheet.kt +++ b/navi-chat/src/main/java/com/navi/chat/common/fragment/BaseBottomSheet.kt @@ -7,6 +7,7 @@ package com.navi.chat.common.fragment +import com.navi.common.R as CommonR import android.content.Context import android.content.DialogInterface import android.os.Bundle @@ -63,7 +64,7 @@ abstract class BaseBottomSheet : NaviAnalyticsBaseBottomSheet() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setStyle(STYLE_NORMAL, R.style.SheetDialog) + setStyle(STYLE_NORMAL, CommonR.style.SheetDialog) if (screenName.isNotBlank()) NaviTrackEvent.startScreen(screenName) } diff --git a/navi-chat/src/main/java/com/navi/chat/ui/activities/SupportScreenActivity.kt b/navi-chat/src/main/java/com/navi/chat/ui/activities/SupportScreenActivity.kt index 88b60b3457..bc4c186e04 100644 --- a/navi-chat/src/main/java/com/navi/chat/ui/activities/SupportScreenActivity.kt +++ b/navi-chat/src/main/java/com/navi/chat/ui/activities/SupportScreenActivity.kt @@ -1,5 +1,6 @@ package com.navi.chat.ui.activities +import com.navi.design.R as DesignR import android.os.Bundle import android.view.View import android.widget.TextView @@ -326,7 +327,7 @@ class SupportScreenActivity : BaseActivity(), HeaderInteractionListener, NewBott setTextColor( ContextCompat.getColor( this@SupportScreenActivity, - R.color.white + DesignR.color.white ) ) setFontStyle(FontWeightEnum.TT_MEDIUM) @@ -337,7 +338,7 @@ class SupportScreenActivity : BaseActivity(), HeaderInteractionListener, NewBott ), backgroundColor = ContextCompat.getColor( this@SupportScreenActivity, - com.navi.naviwidgets.R.color.color_1F002A + DesignR.color.color_1F002A ) ) } @@ -350,7 +351,7 @@ class SupportScreenActivity : BaseActivity(), HeaderInteractionListener, NewBott setTextColor( ContextCompat.getColor( this@SupportScreenActivity, - R.color.textSecondaryColor + DesignR.color.textSecondaryColor ) ) setFontStyle(FontWeightEnum.TT_REGULAR) @@ -361,7 +362,7 @@ class SupportScreenActivity : BaseActivity(), HeaderInteractionListener, NewBott ), backgroundColor = ContextCompat.getColor( this@SupportScreenActivity, - com.navi.naviwidgets.R.color.container_bg_color + DesignR.color.container_bg_color ) ) } @@ -371,4 +372,4 @@ class SupportScreenActivity : BaseActivity(), HeaderInteractionListener, NewBott companion object { const val KEY_SCREEN_NAME = "SCREEN_NAME" } -} \ No newline at end of file +} diff --git a/navi-chat/src/main/java/com/navi/chat/ui/dialog/NaviChatLoader.kt b/navi-chat/src/main/java/com/navi/chat/ui/dialog/NaviChatLoader.kt index f5d9a74132..008b8f6634 100644 --- a/navi-chat/src/main/java/com/navi/chat/ui/dialog/NaviChatLoader.kt +++ b/navi-chat/src/main/java/com/navi/chat/ui/dialog/NaviChatLoader.kt @@ -7,6 +7,7 @@ package com.navi.chat.ui.dialog +import com.navi.common.R as CommonR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -19,7 +20,7 @@ import com.navi.common.ui.dialog.BaseDialogFragment import com.navi.naviwidgets.extensions.showWhenDataIsAvailable import com.navi.naviwidgets.models.LottieFieldData -class NaviChatLoader(@StyleRes style: Int = R.style.DialogFragmentStyle) : +class NaviChatLoader(@StyleRes style: Int = CommonR.style.DialogFragmentStyle) : BaseDialogFragment(R.layout.navi_chat_loader, style) { private var onAnimationEnd: (() -> Unit)? = null @@ -50,7 +51,7 @@ class NaviChatLoader(@StyleRes style: Int = R.style.DialogFragmentStyle) : private fun getShimmerView(): View { val layoutId = arguments?.getInt(SHIMMER_LAYOUT_ID, 0) ?: 0 return LayoutInflater.from(context) - .inflate(if (layoutId == 0) R.layout.common_shimmer_placeholder else layoutId, null) + .inflate(if (layoutId == 0) CommonR.layout.common_shimmer_placeholder else layoutId, null) } private fun showAnimation( @@ -85,7 +86,7 @@ class NaviChatLoader(@StyleRes style: Int = R.style.DialogFragmentStyle) : isShimmerEffect: Boolean = false, shimmerLayoutLayout: Int? = null, onAnimationEnd: (() -> Unit)? = null, - @StyleRes styleId: Int = R.style.DialogFragmentStyle + @StyleRes styleId: Int = CommonR.style.DialogFragmentStyle ): NaviChatLoader { return NaviChatLoader(style = styleId).apply { arguments = diff --git a/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatCsatFragment.kt b/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatCsatFragment.kt index 67305701d9..3357f8d670 100644 --- a/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatCsatFragment.kt +++ b/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatCsatFragment.kt @@ -7,6 +7,7 @@ package com.navi.chat.ui.fragments +import com.navi.common.R as CommonR import android.app.Activity import android.content.Context import android.os.Bundle @@ -65,7 +66,7 @@ class NaviChatCsatFragment : BaseBottomSheet(), View.OnClickListener, override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setStyle(STYLE_NORMAL, R.style.SheetDialog) + setStyle(STYLE_NORMAL, CommonR.style.SheetDialog) } override fun setContainerView(viewStub: ViewStub) { @@ -232,7 +233,7 @@ class NaviChatCsatFragment : BaseBottomSheet(), View.OnClickListener, if (primaryBtn.title.isNotNullAndNotEmpty()) { binding.btnPrimary.text = primaryBtn.title } else { - binding.btnPrimary.text = context?.getString(R.string.submit_text) + binding.btnPrimary.text = context?.getString(CommonR.string.submit_text) } } ?: run { binding.btnPrimary.visibility = View.GONE } @@ -240,7 +241,7 @@ class NaviChatCsatFragment : BaseBottomSheet(), View.OnClickListener, if (secondaryBtn.title.isNotNullAndNotEmpty()) { binding.btnSecondary.text = secondaryBtn.title } else { - binding.btnSecondary.text = context?.getString(R.string.skip_text) + binding.btnSecondary.text = context?.getString(CommonR.string.skip_text) } } ?: run { binding.btnSecondary.visibility = View.GONE } } ?: run { @@ -339,7 +340,7 @@ class NaviChatCsatFragment : BaseBottomSheet(), View.OnClickListener, override fun freeTextState(state: Boolean, hintText: String?, questionId: String?) { binding.root.post { binding.feedback.isVisible = state - binding.etFeedback.hint = context?.getString(R.string.tell_us) + binding.etFeedback.hint = context?.getString(CommonR.string.tell_us) } if (state) { selectedCsatFreeWidgetQuestionId = questionId diff --git a/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatErrorFragment.kt b/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatErrorFragment.kt index 7e3fa5db91..0aabf31448 100644 --- a/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatErrorFragment.kt +++ b/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatErrorFragment.kt @@ -7,6 +7,7 @@ package com.navi.chat.ui.fragments +import com.navi.common.R as CommonR import android.app.Dialog import android.os.Bundle import android.view.View @@ -22,7 +23,7 @@ import com.navi.naviwidgets.utils.NaviWidgetIconUtils.ICON_CHAT_ERROR class NaviChatErrorFragment : BaseDialogFragment( R.layout.fragment_navi_chat_error, - R.style.FullScreenDialogFragment + CommonR.style.FullScreenDialogFragment ) { override val screenName: String = TAG private var genericErrorResponse: GenericErrorResponse? = null @@ -68,7 +69,7 @@ class NaviChatErrorFragment : tvMessage.showWhenDataIsAvailable(showText = genericErrorResponse?.message) btnRetry.showWhenDataIsAvailable( showText = genericErrorResponse?.actions?.get(0)?.title - ?: requireContext().getString(R.string.retry_label) + ?: requireContext().getString(CommonR.string.retry_label) ) btnRetry.setOnClickListener(this@NaviChatErrorFragment) } diff --git a/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatFragment.kt b/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatFragment.kt index addc36ccb5..428d0b8364 100644 --- a/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatFragment.kt +++ b/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatFragment.kt @@ -7,6 +7,7 @@ package com.navi.chat.ui.fragments +import com.navi.design.R as DesignR import android.Manifest import android.content.pm.PackageManager import android.os.Build @@ -1472,7 +1473,7 @@ class NaviChatFragment : ChatBaseFragment(), WidgetCallback, MessageOperation, T activity?.let { binding.tvCharLimitCounter.setTextColor( ContextCompat.getColor( - it, R.color.errorColor + it, DesignR.color.errorColor ) ) } diff --git a/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatResolutionStatusFragment.kt b/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatResolutionStatusFragment.kt index 7a8873b356..77f25ee9ab 100644 --- a/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatResolutionStatusFragment.kt +++ b/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatResolutionStatusFragment.kt @@ -7,6 +7,8 @@ package com.navi.chat.ui.fragments +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -37,7 +39,7 @@ class NaviChatResolutionStatusFragment : BottomSheetDialogFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setStyle(STYLE_NORMAL, R.style.SheetDialog) + setStyle(STYLE_NORMAL, CommonR.style.SheetDialog) } override fun onCreateView( @@ -136,14 +138,14 @@ class NaviChatResolutionStatusFragment : BottomSheetDialogFragment() { ) { when (imageUrl) { NaviWidgetIconUtils.THUMBS_UP -> { - textView.setTextColor(ContextCompat.getColor(requireContext(), R.color.dark_green)) + textView.setTextColor(ContextCompat.getColor(requireContext(), DesignR.color.dark_green)) imageView.setImageResource(R.drawable.ic_yes_selected_chat_resolution) } NaviWidgetIconUtils.THUMBS_DOWN -> { textView.setTextColor( ContextCompat.getColor( requireContext(), - R.color.textLinkCtaColor + DesignR.color.textLinkCtaColor ) ) imageView.setImageResource(R.drawable.ic_no_selected_chat_resolution) diff --git a/navi-chat/src/main/java/com/navi/chat/viewholder/TicketViewVH.kt b/navi-chat/src/main/java/com/navi/chat/viewholder/TicketViewVH.kt index 992514766a..19e157e9dd 100644 --- a/navi-chat/src/main/java/com/navi/chat/viewholder/TicketViewVH.kt +++ b/navi-chat/src/main/java/com/navi/chat/viewholder/TicketViewVH.kt @@ -1,5 +1,6 @@ package com.navi.chat.viewholder +import com.navi.design.R as DesignR import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.navi.base.model.ActionData @@ -63,7 +64,7 @@ class TicketViewVH(private val binding: ItemTicketViewBinding) leftBottom = dpToPx(16), rightBottom = dpToPx(16), leftTop = dpToPx(16), rightTop = dpToPx(16)), backgroundColor = ticketDetails.cardBgColor.parseColorSafe(), - strokeColor = ContextCompat.getColor(binding.root.context, R.color.border_grey_color), + strokeColor = ContextCompat.getColor(binding.root.context, DesignR.color.border_grey_color), strokeWidth = dpToPxInInt(1) ) @@ -78,4 +79,4 @@ class TicketViewVH(private val binding: ItemTicketViewBinding) } } } -} \ No newline at end of file +} diff --git a/navi-chat/src/main/java/com/navi/chat/viewmodels/AttachmentPickerViewModel.kt b/navi-chat/src/main/java/com/navi/chat/viewmodels/AttachmentPickerViewModel.kt index dbcaa379d3..a7b39e91b9 100644 --- a/navi-chat/src/main/java/com/navi/chat/viewmodels/AttachmentPickerViewModel.kt +++ b/navi-chat/src/main/java/com/navi/chat/viewmodels/AttachmentPickerViewModel.kt @@ -7,6 +7,7 @@ package com.navi.chat.viewmodels +import com.navi.common.R as CommonR import android.annotation.SuppressLint import android.app.Application import android.content.Intent @@ -63,7 +64,7 @@ class AttachmentPickerViewModel(application: Application) : AndroidViewModel(app _selectedFileSharedFlow.emit(selectedFileData) Timber.d("selectedFile data $selectedFileData") } else { - showErrorToast(context.getString(R.string.unsupported_file_prompt)) + showErrorToast(context.getString(CommonR.string.unsupported_file_prompt)) } } diff --git a/navi-common/src/main/java/com/navi/common/csat/CsatAdapter.kt b/navi-common/src/main/java/com/navi/common/csat/CsatAdapter.kt index 04454ed0ab..c8f82954f1 100644 --- a/navi-common/src/main/java/com/navi/common/csat/CsatAdapter.kt +++ b/navi-common/src/main/java/com/navi/common/csat/CsatAdapter.kt @@ -7,6 +7,7 @@ package com.navi.common.csat +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.graphics.Color import android.view.LayoutInflater @@ -68,7 +69,7 @@ class CsatAdapter( if(enableBlackCta == true) { viewHolder.checkbox.buttonDrawable = ContextCompat.getDrawable(context, - com.navi.naviwidgets.R.drawable.radio_button_tint_selector_black) + WidgetsR.drawable.radio_button_tint_selector_black) } viewHolder.title.setTextFieldData(data.title) if (data.isChecked) { diff --git a/navi-common/src/main/java/com/navi/common/csat/CsatBottomSheet.kt b/navi-common/src/main/java/com/navi/common/csat/CsatBottomSheet.kt index 35c90e6f9a..94e6d09bfb 100644 --- a/navi-common/src/main/java/com/navi/common/csat/CsatBottomSheet.kt +++ b/navi-common/src/main/java/com/navi/common/csat/CsatBottomSheet.kt @@ -7,6 +7,7 @@ package com.navi.common.csat +import com.navi.design.R as DesignR import android.content.DialogInterface import android.os.Bundle import android.os.Handler @@ -127,8 +128,8 @@ class CsatBottomSheet : BaseBottomSheet(), OthersInputBoxListener { ) } else { binding.tryAgainBtn.background = getNaviDrawable( - backgroundColor = ContextCompat.getColor(it, com.navi.design.R.color.outrageous_orange), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_32) + backgroundColor = ContextCompat.getColor(it, DesignR.color.outrageous_orange), + cornerRadius = resources.getDimension(DesignR.dimen.dp_32) .toInt() ) } diff --git a/navi-common/src/main/java/com/navi/common/customview/ActionButtonV2View.kt b/navi-common/src/main/java/com/navi/common/customview/ActionButtonV2View.kt index 8a5d243504..b2d9948b6a 100644 --- a/navi-common/src/main/java/com/navi/common/customview/ActionButtonV2View.kt +++ b/navi-common/src/main/java/com/navi/common/customview/ActionButtonV2View.kt @@ -7,6 +7,7 @@ package com.navi.common.customview +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -36,8 +37,8 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 fun setProperties( title: String? = null, - titleColor: Int? = com.navi.design.R.color.white, - backgroundColor: Int? = com.navi.design.R.color.outrageous_orange + titleColor: Int? = DesignR.color.white, + backgroundColor: Int? = DesignR.color.outrageous_orange ) { binding.actionTv.text = title titleColor?.let { binding.actionTv.setTextColor(ContextCompat.getColor(context, it)) } @@ -53,9 +54,9 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 fun setState(isEnabled: Boolean) { this.isEnabled = isEnabled if (isEnabled) { - setABVBackgroundColor(com.navi.design.R.color.outrageous_orange) + setABVBackgroundColor(DesignR.color.outrageous_orange) } else { - setABVBackgroundColor(com.navi.design.R.color.disabled_button_color) + setABVBackgroundColor(DesignR.color.disabled_button_color) } } diff --git a/navi-common/src/main/java/com/navi/common/customview/ActionButtonView.kt b/navi-common/src/main/java/com/navi/common/customview/ActionButtonView.kt index c566b900d0..fd13ee29bf 100644 --- a/navi-common/src/main/java/com/navi/common/customview/ActionButtonView.kt +++ b/navi-common/src/main/java/com/navi/common/customview/ActionButtonView.kt @@ -7,6 +7,7 @@ package com.navi.common.customview +import com.navi.design.R as DesignR import android.app.Activity import android.content.Context import android.graphics.PorterDuff @@ -48,7 +49,7 @@ class ActionButtonView @JvmOverloads constructor( } fun setTheme() { - setABVBackgroundColor(com.navi.design.R.color.color_1F002A) + setABVBackgroundColor(DesignR.color.color_1F002A) binding.actionButtonViewLay.radius = dpToPx(4) binding.actionButtonViewLay.cardElevation = 0F binding.actionButtonViewLay.elevation = 0F @@ -56,9 +57,9 @@ class ActionButtonView @JvmOverloads constructor( fun setProperties( title: String, - titleColor: Int? = com.navi.design.R.color.white, + titleColor: Int? = DesignR.color.white, iconId: Int? = null, - iconColor: Int = com.navi.design.R.color.white + iconColor: Int = DesignR.color.white ) { setTitle(title, titleColor) iconId?.let { @@ -126,17 +127,17 @@ class ActionButtonView @JvmOverloads constructor( fun setState(isEnabled: Boolean) { this.isEnabled = isEnabled if (isEnabled) { - setABVBackgroundColor(com.navi.design.R.color.active_button_color) + setABVBackgroundColor(DesignR.color.active_button_color) } else { - setABVBackgroundColor(com.navi.design.R.color.disabled_button_color) + setABVBackgroundColor(DesignR.color.disabled_button_color) } } fun setStateWithOrangeColor(isEnabled: Boolean) { this.isEnabled = isEnabled if (isEnabled) { - setABVBackgroundColor(com.navi.design.R.color.title_text_red_color) + setABVBackgroundColor(DesignR.color.title_text_red_color) } else { - setABVBackgroundColor(com.navi.design.R.color.disabled_button_color) + setABVBackgroundColor(DesignR.color.disabled_button_color) } } @@ -184,7 +185,7 @@ class ActionButtonView @JvmOverloads constructor( fun setPropertiesWithCentreTextAndIcon( title: String, - titleColor: Int? = com.navi.design.R.color.white, + titleColor: Int? = DesignR.color.white, iconId: Int? = null ) { setTitle(title, titleColor) @@ -216,7 +217,7 @@ class ActionButtonView @JvmOverloads constructor( fun removeOutlineSpotShadowColor() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { binding.actionButtonViewLay.outlineSpotShadowColor = - ContextCompat.getColor(context, com.navi.design.R.color.shadow_color) + ContextCompat.getColor(context, DesignR.color.shadow_color) } } diff --git a/navi-common/src/main/java/com/navi/common/customview/BoxInputGroup.kt b/navi-common/src/main/java/com/navi/common/customview/BoxInputGroup.kt index 7cb514eb2d..a73d0e4ab5 100644 --- a/navi-common/src/main/java/com/navi/common/customview/BoxInputGroup.kt +++ b/navi-common/src/main/java/com/navi/common/customview/BoxInputGroup.kt @@ -7,6 +7,7 @@ package com.navi.common.customview +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.text.Editable import android.text.TextWatcher @@ -172,7 +173,7 @@ class BoxInputGroup(context: Context, attributeSet: AttributeSet? = null) : it.background = ResourcesCompat.getDrawable( context.resources, - com.navi.naviwidgets.R.drawable.error_rectangle_bg, + WidgetsR.drawable.error_rectangle_bg, null ) } @@ -181,7 +182,7 @@ class BoxInputGroup(context: Context, attributeSet: AttributeSet? = null) : it.background = ResourcesCompat.getDrawable( context.resources, - com.navi.naviwidgets.R.drawable.default_rectangle_bg, + WidgetsR.drawable.default_rectangle_bg, null ) } diff --git a/navi-common/src/main/java/com/navi/common/customview/CircularSmoothProgressView.kt b/navi-common/src/main/java/com/navi/common/customview/CircularSmoothProgressView.kt index f3d1728712..dde0d70c23 100644 --- a/navi-common/src/main/java/com/navi/common/customview/CircularSmoothProgressView.kt +++ b/navi-common/src/main/java/com/navi/common/customview/CircularSmoothProgressView.kt @@ -7,6 +7,7 @@ package com.navi.common.customview +import com.navi.design.R as DesignR import android.content.Context import android.content.res.TypedArray import android.graphics.Canvas @@ -61,7 +62,7 @@ class CircularSmoothProgressView(context: Context, attrs: AttributeSet) : View(c Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE strokeWidth = strokeWidthFromAttributeSet - color = ContextCompat.getColor(context, com.navi.design.R.color.light_outrageous_orange) + color = ContextCompat.getColor(context, DesignR.color.light_outrageous_orange) } private val rect = RectF() diff --git a/navi-common/src/main/java/com/navi/common/customview/HeaderView.kt b/navi-common/src/main/java/com/navi/common/customview/HeaderView.kt index e552c54309..55dcef079a 100644 --- a/navi-common/src/main/java/com/navi/common/customview/HeaderView.kt +++ b/navi-common/src/main/java/com/navi/common/customview/HeaderView.kt @@ -7,6 +7,7 @@ package com.navi.common.customview +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -72,7 +73,7 @@ class HeaderView(context: Context, attrs: AttributeSet?) : ConstraintLayout(cont } fun clearHeaderBackground() { - binding.root.setBackgroundColor(ContextCompat.getColor(context, com.navi.design.R.color.white)) + binding.root.setBackgroundColor(ContextCompat.getColor(context, DesignR.color.white)) } fun updateHeaderTitleVisibility(isVisible: Boolean) { diff --git a/navi-common/src/main/java/com/navi/common/customview/SearchItemField.kt b/navi-common/src/main/java/com/navi/common/customview/SearchItemField.kt index 9a40c02e33..e9e7f206a6 100644 --- a/navi-common/src/main/java/com/navi/common/customview/SearchItemField.kt +++ b/navi-common/src/main/java/com/navi/common/customview/SearchItemField.kt @@ -7,6 +7,7 @@ package com.navi.common.customview +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.text.Editable import android.text.InputFilter @@ -147,7 +148,7 @@ class SearchItemField(context: Context, attrs: AttributeSet) : binding.errorTv.text = errorText binding.errorTv.visibility = View.VISIBLE binding.searchHolderRl.background = - ContextCompat.getDrawable(context, com.navi.naviwidgets.R.drawable.bg_border_red_rounded_8) + ContextCompat.getDrawable(context, WidgetsR.drawable.bg_border_red_rounded_8) } ?: run { binding.errorTv.visibility = View.GONE diff --git a/navi-common/src/main/java/com/navi/common/image/GlideUtil.kt b/navi-common/src/main/java/com/navi/common/image/GlideUtil.kt index 89ba272981..55c279bd56 100644 --- a/navi-common/src/main/java/com/navi/common/image/GlideUtil.kt +++ b/navi-common/src/main/java/com/navi/common/image/GlideUtil.kt @@ -7,6 +7,7 @@ package com.navi.common.image +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.graphics.drawable.Drawable import android.widget.ImageView @@ -30,7 +31,7 @@ fun loadUrlIntoImageView( view: ImageView, isCacheNeeded: Boolean = true, imagePlaceholder: Drawable? = - ResourcesCompat.getDrawable(context.resources, com.navi.naviwidgets.R.drawable.widget_image_placeholder, null) + ResourcesCompat.getDrawable(context.resources, WidgetsR.drawable.widget_image_placeholder, null) ) { try { if (isCacheNeeded) diff --git a/navi-common/src/main/java/com/navi/common/pushnotification/TimerNotificationRenderer.kt b/navi-common/src/main/java/com/navi/common/pushnotification/TimerNotificationRenderer.kt index bd21470031..6421a47a5e 100644 --- a/navi-common/src/main/java/com/navi/common/pushnotification/TimerNotificationRenderer.kt +++ b/navi-common/src/main/java/com/navi/common/pushnotification/TimerNotificationRenderer.kt @@ -7,6 +7,7 @@ package com.navi.common.pushnotification +import com.navi.naviwidgets.R as WidgetsR import android.app.Notification import android.app.NotificationChannel import android.app.NotificationManager @@ -162,7 +163,7 @@ object TimerNotificationRenderer { } val notificationBuilder = NotificationCompat.Builder(context, channelId) - val smallIcon = bundle.getString(NotificationConstants.SMALL_ICON)?.toInt() ?: com.navi.naviwidgets.R.drawable.ic_new_navi_logo + val smallIcon = bundle.getString(NotificationConstants.SMALL_ICON)?.toInt() ?: WidgetsR.drawable.ic_new_navi_logo setNotificationBuilderBasics(context, notificationBuilder, contentViewTimerCollapsed, contentViewTimer, title, smallIcon, bundle) diff --git a/navi-common/src/main/java/com/navi/common/ui/fragment/ActionErrorFragment.kt b/navi-common/src/main/java/com/navi/common/ui/fragment/ActionErrorFragment.kt index 7a4fb45cad..f3d6e88667 100644 --- a/navi-common/src/main/java/com/navi/common/ui/fragment/ActionErrorFragment.kt +++ b/navi-common/src/main/java/com/navi/common/ui/fragment/ActionErrorFragment.kt @@ -7,6 +7,8 @@ package com.navi.common.ui.fragment +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.os.Bundle import android.view.View import android.view.ViewStub @@ -120,7 +122,7 @@ class ActionErrorFragment : BaseBottomSheet() { if (it == HL_NO_BANK_DISCOVERED) { binding.secondaryAbv.setProperties( title = error?.actions?.getOrNull(1)?.title.orEmpty(), - titleColor = com.navi.design.R.color.red + titleColor = DesignR.color.red ) binding.secondaryAbv.setABVBackgroundColor(R.drawable.bg_red_rounded_border_8) } @@ -128,9 +130,9 @@ class ActionErrorFragment : BaseBottomSheet() { ?: run { binding.secondaryAbv.setProperties( title = error?.actions?.getOrNull(1)?.title.orEmpty(), - titleColor = com.navi.design.R.color.black + titleColor = DesignR.color.black ) - binding.secondaryAbv.setViewBg(bgColor = com.navi.design.R.color.gray) + binding.secondaryAbv.setViewBg(bgColor = DesignR.color.gray) } binding.secondaryAbv.setOnClickListener(secondaryAction) } @@ -169,17 +171,17 @@ class ActionErrorFragment : BaseBottomSheet() { private fun getErrorIcon(): Int { return when (error?.assetDetails?.icon) { - USER_ERROR_ICON -> com.navi.naviwidgets.R.drawable.ic_user_error_svg - WIFI_ERROR_ICON -> com.navi.naviwidgets.R.drawable.ic_wifi_disconnected_svg - USER_SELFIE_ERROR_ICON -> com.navi.naviwidgets.R.drawable.ic_user_selfie_error_svg - DOCUMENT_ERROR_ICON -> com.navi.naviwidgets.R.drawable.ic_document_error_svg - BANK_ERROR_ICON -> com.navi.naviwidgets.R.drawable.ic_bank_error_svg - PROFILE_ERROR_ICON -> com.navi.naviwidgets.R.drawable.ic_profile_error_svg - OTP_ON_CALL_ERROR_ICON -> com.navi.naviwidgets.R.drawable.ic_otp_call_error_svg - INVALID_PAN -> com.navi.naviwidgets.R.drawable.ic_pan_error - INVALID_CITY_ICON -> com.navi.naviwidgets.R.drawable.ic_city_error - ICON_ERROR_YELLOW -> com.navi.naviwidgets.R.drawable.ic_error_circle_yellow_svg - else -> com.navi.naviwidgets.R.drawable.ic_error_circle_svg + USER_ERROR_ICON -> WidgetsR.drawable.ic_user_error_svg + WIFI_ERROR_ICON -> WidgetsR.drawable.ic_wifi_disconnected_svg + USER_SELFIE_ERROR_ICON -> WidgetsR.drawable.ic_user_selfie_error_svg + DOCUMENT_ERROR_ICON -> WidgetsR.drawable.ic_document_error_svg + BANK_ERROR_ICON -> WidgetsR.drawable.ic_bank_error_svg + PROFILE_ERROR_ICON -> WidgetsR.drawable.ic_profile_error_svg + OTP_ON_CALL_ERROR_ICON -> WidgetsR.drawable.ic_otp_call_error_svg + INVALID_PAN -> WidgetsR.drawable.ic_pan_error + INVALID_CITY_ICON -> WidgetsR.drawable.ic_city_error + ICON_ERROR_YELLOW -> WidgetsR.drawable.ic_error_circle_yellow_svg + else -> WidgetsR.drawable.ic_error_circle_svg } } diff --git a/navi-common/src/main/java/com/navi/common/ui/fragment/ActionWarningFragment.kt b/navi-common/src/main/java/com/navi/common/ui/fragment/ActionWarningFragment.kt index 4b1f35442e..264dc0c2cf 100644 --- a/navi-common/src/main/java/com/navi/common/ui/fragment/ActionWarningFragment.kt +++ b/navi-common/src/main/java/com/navi/common/ui/fragment/ActionWarningFragment.kt @@ -7,6 +7,8 @@ package com.navi.common.ui.fragment +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.os.Bundle import android.view.View import android.view.ViewStub @@ -57,11 +59,11 @@ class ActionWarningFragment : BaseBottomSheet(), View.OnClickListener { warningTag?.let { when (it) { ApiErrorTagType.HL_PROFILE_DETAILS_UPLOAD.value -> { - binding.iconIv.setImageResource(com.navi.naviwidgets.R.drawable.ic_co_applicant_svg) + binding.iconIv.setImageResource(WidgetsR.drawable.ic_co_applicant_svg) binding.iconIv.visibility = View.VISIBLE } ApiErrorTagType.EPFO.value -> { - binding.iconIv.setImageResource(com.navi.naviwidgets.R.drawable.ic_error_circle_svg) + binding.iconIv.setImageResource(WidgetsR.drawable.ic_error_circle_svg) binding.iconIv.visibility = View.VISIBLE } } @@ -78,7 +80,7 @@ class ActionWarningFragment : BaseBottomSheet(), View.OnClickListener { private fun getTipImage(it: Tip) = when (it.icon) { - else -> com.navi.naviwidgets.R.drawable.ic_tip_svg + else -> WidgetsR.drawable.ic_tip_svg } private fun setMessage() { @@ -108,15 +110,15 @@ class ActionWarningFragment : BaseBottomSheet(), View.OnClickListener { action.title?.let { binding.primaryAbv.apply { visibility = View.VISIBLE - setButtonHeight(height = resources.getDimension(com.navi.design.R.dimen.dp_48)) + setButtonHeight(height = resources.getDimension(DesignR.dimen.dp_48)) setProperties( title = it, - titleColor = com.navi.design.R.color.white, + titleColor = DesignR.color.white, ) setTitleFont(font = FontWeightEnum.TT_SEMI_BOLD) setViewBg( - cornerRadiusId = com.navi.naviwidgets.R.integer.integer_4, - bgColor = com.navi.design.R.color.dark_purple, + cornerRadiusId = WidgetsR.integer.integer_4, + bgColor = DesignR.color.dark_purple, elevation = 0F, ) } @@ -126,15 +128,15 @@ class ActionWarningFragment : BaseBottomSheet(), View.OnClickListener { action.title?.let { binding.secondaryAbv.apply { visibility = View.VISIBLE - setButtonHeight(height = resources.getDimension(com.navi.design.R.dimen.dp_48)) + setButtonHeight(height = resources.getDimension(DesignR.dimen.dp_48)) setProperties( title = it, - titleColor = com.navi.design.R.color.dark_purple, + titleColor = DesignR.color.dark_purple, ) setTitleFont(font = FontWeightEnum.TT_SEMI_BOLD) setViewBg( - cornerRadiusId = com.navi.naviwidgets.R.integer.integer_4, - bgColor = com.navi.design.R.color.view_background_color_six, + cornerRadiusId = WidgetsR.integer.integer_4, + bgColor = DesignR.color.view_background_color_six, elevation = 0F, ) } diff --git a/navi-common/src/main/java/com/navi/common/ui/fragment/FeedbackFragment.kt b/navi-common/src/main/java/com/navi/common/ui/fragment/FeedbackFragment.kt index defe9861d7..d132032cb3 100644 --- a/navi-common/src/main/java/com/navi/common/ui/fragment/FeedbackFragment.kt +++ b/navi-common/src/main/java/com/navi/common/ui/fragment/FeedbackFragment.kt @@ -7,6 +7,7 @@ package com.navi.common.ui.fragment +import com.navi.design.R as DesignR import android.content.Context import android.os.Bundle import android.os.Handler @@ -62,13 +63,13 @@ class FeedbackFragment : BaseBottomSheet(), View.OnClickListener { private fun initUi() { binding.feedbackDetailLay.closeAbv.setProperties( getString(R.string.close), - com.navi.design.R.color.title_color_one + DesignR.color.title_color_one ) - binding.feedbackDetailLay.closeAbv.setViewBg(bgColor = com.navi.design.R.color.gray) + binding.feedbackDetailLay.closeAbv.setViewBg(bgColor = DesignR.color.gray) binding.feedbackDetailLay.submitAbv.setProperties( getString(R.string.submit), - com.navi.design.R.color.white + DesignR.color.white ) submitButtonState() @@ -205,7 +206,7 @@ class FeedbackFragment : BaseBottomSheet(), View.OnClickListener { private fun submitButtonState() { if (isOptionSelected) { - binding.feedbackDetailLay.submitAbv.setViewBg(bgColor = com.navi.design.R.color.active_button_color) + binding.feedbackDetailLay.submitAbv.setViewBg(bgColor = DesignR.color.active_button_color) } } diff --git a/navi-common/src/main/java/com/navi/common/ui/fragment/FullScreenErrorDialog.kt b/navi-common/src/main/java/com/navi/common/ui/fragment/FullScreenErrorDialog.kt index d04fb8bfc5..c9a5127ef2 100644 --- a/navi-common/src/main/java/com/navi/common/ui/fragment/FullScreenErrorDialog.kt +++ b/navi-common/src/main/java/com/navi/common/ui/fragment/FullScreenErrorDialog.kt @@ -7,6 +7,7 @@ package com.navi.common.ui.fragment +import com.navi.naviwidgets.R as WidgetsR import android.app.Dialog import android.os.Bundle import android.view.View @@ -103,9 +104,9 @@ class FullScreenErrorDialog : private fun getErrorIcon(): Int { return when (error?.assetDetails?.icon) { - ActionErrorFragment.WIFI_ERROR_ICON -> com.navi.naviwidgets.R.drawable.ic_new_no_internet - ActionErrorFragment.PAGE_LOAD_FAILED -> com.navi.naviwidgets.R.drawable.ic_page_load_failed - else -> com.navi.naviwidgets.R.drawable.ic_new_generic_error + ActionErrorFragment.WIFI_ERROR_ICON -> WidgetsR.drawable.ic_new_no_internet + ActionErrorFragment.PAGE_LOAD_FAILED -> WidgetsR.drawable.ic_page_load_failed + else -> WidgetsR.drawable.ic_new_generic_error } } diff --git a/navi-common/src/main/java/com/navi/common/ui/fragment/HorizontalActionErrorFragment.kt b/navi-common/src/main/java/com/navi/common/ui/fragment/HorizontalActionErrorFragment.kt index dff8b1c932..41ec6286a5 100644 --- a/navi-common/src/main/java/com/navi/common/ui/fragment/HorizontalActionErrorFragment.kt +++ b/navi-common/src/main/java/com/navi/common/ui/fragment/HorizontalActionErrorFragment.kt @@ -7,6 +7,7 @@ package com.navi.common.ui.fragment +import com.navi.naviwidgets.R as WidgetsR import android.os.Bundle import android.view.View import android.view.ViewStub @@ -182,11 +183,11 @@ class HorizontalActionErrorFragment : BaseBottomSheet() { private fun getErrorIcon(): Int { return when (error?.assetDetails?.icon) { - WIFI_ERROR_ICON -> R.drawable.ic_wifi_disconnected_svg - ICON_INFO_SIMPLE -> R.drawable.ic_info_icon_svg - INFO_ICON_PURPLE -> R.drawable.info_icon_purple - ICON_ERROR_SMALL -> R.drawable.ic_small_error_circle_svg - else -> R.drawable.ic_small_error_circle_svg + WIFI_ERROR_ICON -> WidgetsR.drawable.ic_wifi_disconnected_svg + ICON_INFO_SIMPLE -> WidgetsR.drawable.ic_info_icon_svg + INFO_ICON_PURPLE -> WidgetsR.drawable.info_icon_purple + ICON_ERROR_SMALL -> WidgetsR.drawable.ic_small_error_circle_svg + else -> WidgetsR.drawable.ic_small_error_circle_svg } } diff --git a/navi-common/src/main/java/com/navi/common/ui/fragment/NewActionErrorFragment.kt b/navi-common/src/main/java/com/navi/common/ui/fragment/NewActionErrorFragment.kt index 294b53d6c3..e5d59b3ac6 100644 --- a/navi-common/src/main/java/com/navi/common/ui/fragment/NewActionErrorFragment.kt +++ b/navi-common/src/main/java/com/navi/common/ui/fragment/NewActionErrorFragment.kt @@ -7,6 +7,7 @@ package com.navi.common.ui.fragment +import com.navi.naviwidgets.R as WidgetsR import android.os.Bundle import android.view.View import android.view.ViewStub @@ -190,10 +191,10 @@ class NewActionErrorFragment : BaseBottomSheet() { private fun getErrorIcon(): Int { return when (error?.assetDetails?.icon) { - WIFI_ERROR_ICON -> com.navi.naviwidgets.R.drawable.ic_wifi_disconnected_svg - ICON_INFO_SIMPLE -> com.navi.naviwidgets.R.drawable.ic_info_icon_svg - ICON_ERROR_SMALL -> com.navi.naviwidgets.R.drawable.ic_small_error_circle_svg - else -> com.navi.naviwidgets.R.drawable.ic_small_error_circle_svg + WIFI_ERROR_ICON -> WidgetsR.drawable.ic_wifi_disconnected_svg + ICON_INFO_SIMPLE -> WidgetsR.drawable.ic_info_icon_svg + ICON_ERROR_SMALL -> WidgetsR.drawable.ic_small_error_circle_svg + else -> WidgetsR.drawable.ic_small_error_circle_svg } } diff --git a/navi-design/src/test/java/com/navi/design/utils/ExtKtTest.kt b/navi-design/src/test/java/com/navi/design/utils/ExtKtTest.kt index 1529950f77..735260ba47 100644 --- a/navi-design/src/test/java/com/navi/design/utils/ExtKtTest.kt +++ b/navi-design/src/test/java/com/navi/design/utils/ExtKtTest.kt @@ -7,6 +7,7 @@ package com.navi.design.utils +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.view.View @@ -34,7 +35,7 @@ class ExtKtTest { mockkStatic(ContextCompat::class) mockkStatic(Color::class) val context = mockk() - every { ContextCompat.getColor(context, com.navi.design.R.color.outrageous_orange) } returns 1001 + every { ContextCompat.getColor(context, DesignR.color.outrageous_orange) } returns 1001 every { Color.parseColor("#000000") } returns 1000 assertEquals(1000, "#000000".parseColorSafe(context = context)) assertEquals(1000, "000000".parseColorSafe(context = context)) diff --git a/navi-design/src/test/java/com/navi/design/utils/FontUtilsKtTest.kt b/navi-design/src/test/java/com/navi/design/utils/FontUtilsKtTest.kt index 98242765ef..1527c7d44f 100644 --- a/navi-design/src/test/java/com/navi/design/utils/FontUtilsKtTest.kt +++ b/navi-design/src/test/java/com/navi/design/utils/FontUtilsKtTest.kt @@ -7,11 +7,12 @@ package com.navi.design.utils +import com.navi.design.R as DesignR import com.navi.base.utils.EMPTY -import com.navi.design.R.font.tt_bold -import com.navi.design.R.font.tt_medium -import com.navi.design.R.font.tt_regular -import com.navi.design.R.font.tt_semi_bold +import DesignR.font.tt_bold +import DesignR.font.tt_medium +import DesignR.font.tt_regular +import DesignR.font.tt_semi_bold import com.navi.design.font.FontWeightEnum import org.junit.Assert.assertEquals import org.junit.Test diff --git a/navi-design/src/test/java/com/navi/design/utils/UtilsKtTest.kt b/navi-design/src/test/java/com/navi/design/utils/UtilsKtTest.kt index 7a71b2f795..933412803c 100644 --- a/navi-design/src/test/java/com/navi/design/utils/UtilsKtTest.kt +++ b/navi-design/src/test/java/com/navi/design/utils/UtilsKtTest.kt @@ -7,6 +7,7 @@ package com.navi.design.utils +import com.navi.design.R as DesignR import org.junit.Assert.* @@ -17,24 +18,24 @@ class UtilsKtTest { @Test fun testGetStyle() { - assertEquals(com.navi.design.R.style.DisplayTextStyle, getStyle("DisplayTextStyle")) - assertEquals(com.navi.design.R.style.Header1TextStyle, getStyle("Header1TextStyle")) - assertEquals(com.navi.design.R.style.DescriptionTextStyle, getStyle("DescriptionTextStyle")) - assertEquals(com.navi.design.R.style.OfferTextStyle, getStyle("OfferTextStyle")) - assertEquals(com.navi.design.R.style.BulletTextStyle, getStyle("BulletTextStyle")) - assertEquals(com.navi.design.R.style.DarkHighlightTextStyle, getStyle("DarkHighlightTextStyle")) - assertEquals(com.navi.design.R.style.Title3TextStyle, getStyle("Title3TextStyle")) - assertEquals(com.navi.design.R.style.SubTitle5TextStyle, getStyle("SubTitle5TextStyle")) - assertEquals(com.navi.design.R.style.Title5TextStyle, getStyle("Title5TextStyle")) - assertEquals(com.navi.design.R.style.Title5BoldTextStyle, getStyle("Title5BoldTextStyle")) + assertEquals(DesignR.style.DisplayTextStyle, getStyle("DisplayTextStyle")) + assertEquals(DesignR.style.Header1TextStyle, getStyle("Header1TextStyle")) + assertEquals(DesignR.style.DescriptionTextStyle, getStyle("DescriptionTextStyle")) + assertEquals(DesignR.style.OfferTextStyle, getStyle("OfferTextStyle")) + assertEquals(DesignR.style.BulletTextStyle, getStyle("BulletTextStyle")) + assertEquals(DesignR.style.DarkHighlightTextStyle, getStyle("DarkHighlightTextStyle")) + assertEquals(DesignR.style.Title3TextStyle, getStyle("Title3TextStyle")) + assertEquals(DesignR.style.SubTitle5TextStyle, getStyle("SubTitle5TextStyle")) + assertEquals(DesignR.style.Title5TextStyle, getStyle("Title5TextStyle")) + assertEquals(DesignR.style.Title5BoldTextStyle, getStyle("Title5BoldTextStyle")) assertEquals(null, getStyle("NotDefinedTextStyle")) } @Test fun testGetStyle1() { - assertEquals(com.navi.design.R.style.DisplayTextStyle, getStyle(0)) - assertEquals(com.navi.design.R.style.Header1TextStyle, getStyle(1)) + assertEquals(DesignR.style.DisplayTextStyle, getStyle(0)) + assertEquals(DesignR.style.Header1TextStyle, getStyle(1)) assertEquals(null, getStyle(-1)) } diff --git a/navi-gold/src/main/java/com/navi/gold/adapter/PdRpdOptionsAdapter.kt b/navi-gold/src/main/java/com/navi/gold/adapter/PdRpdOptionsAdapter.kt index 18007ac950..afa491379f 100644 --- a/navi-gold/src/main/java/com/navi/gold/adapter/PdRpdOptionsAdapter.kt +++ b/navi-gold/src/main/java/com/navi/gold/adapter/PdRpdOptionsAdapter.kt @@ -8,13 +8,15 @@ import androidx.recyclerview.widget.RecyclerView import com.navi.base.utils.isValidIndex import com.navi.base.utils.orFalse import com.navi.design.utils.CornerRadius +import com.navi.design.utils.dpToPx import com.navi.design.utils.dpToPxInInt import com.navi.design.utils.getNaviDrawable +import com.navi.design.utils.parseColorSafe import com.navi.design.utils.setSpannableString import com.navi.gold.R import com.navi.gold.databinding.PdRpdOptionBinding import com.navi.naviwidgets.extensions.showWhenDataIsAvailable - +import com.navi.design.R as DesignR class PdRpdOptionsAdapter( private val items: List, val listener: ((PennyDropOption) -> Unit)? = null @@ -84,7 +86,7 @@ class PdRpdOptionsAdapter( private fun getDarkGreyBorder8StrokeDrawable(context: Context) = getNaviDrawable( cornerRadius = dpToPxInInt(8), strokeColor = ContextCompat.getColor( context, - R.color.color_dark_gray + DesignR.color.color_dark_gray ), strokeWidth = dpToPxInInt(1) ) diff --git a/navi-gold/src/main/java/com/navi/gold/ui/BlockerDetailsFragment.kt b/navi-gold/src/main/java/com/navi/gold/ui/BlockerDetailsFragment.kt index b8ae923f90..d24aa5119b 100644 --- a/navi-gold/src/main/java/com/navi/gold/ui/BlockerDetailsFragment.kt +++ b/navi-gold/src/main/java/com/navi/gold/ui/BlockerDetailsFragment.kt @@ -7,6 +7,7 @@ package com.navi.gold.ui +import com.navi.design.R as DesignR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -72,7 +73,7 @@ class BlockerDetailsFragment : BaseFragment(), WidgetCallback { data.actionData?.bgColor?.let { actionButton.background = getNaviDrawable( backgroundColor = it.parseColorSafe(), - cornerRadius = resources.getDimension(com.navi.naviwidgets.R.dimen.dp_24) + cornerRadius = resources.getDimension(DesignR.dimen.dp_24) .toInt(), ) } diff --git a/navi-gold/src/main/java/com/navi/gold/ui/CommonFooterView.kt b/navi-gold/src/main/java/com/navi/gold/ui/CommonFooterView.kt index dc1efd1674..db08c0f881 100644 --- a/navi-gold/src/main/java/com/navi/gold/ui/CommonFooterView.kt +++ b/navi-gold/src/main/java/com/navi/gold/ui/CommonFooterView.kt @@ -7,6 +7,8 @@ package com.navi.gold.ui +import com.navi.common.R as CommonR +import com.navi.naviwidgets.R as WidgetsR import com.navi.common.model.ActionFooter import android.content.Context import android.util.AttributeSet @@ -78,10 +80,10 @@ class CommonFooterView(context: Context, attrs: AttributeSet?) : ConstraintLayou fun enableNextButton(enabled: Boolean) { binding.nextCta.isEnabled = enabled if (enabled) { - binding.nextCta.setBackgroundResource(R.drawable.bg_cta_primary_amc) + binding.nextCta.setBackgroundResource(WidgetsR.drawable.bg_cta_primary_amc) binding.nextCta.tag = NextButtonTag.ENABLED } else { - binding.nextCta.setBackgroundResource(R.drawable.bg_cta_disable_primary_amc) + binding.nextCta.setBackgroundResource(CommonR.drawable.bg_cta_disable_primary_amc) binding.nextCta.tag = NextButtonTag.DISABLED } } @@ -103,9 +105,9 @@ class CommonFooterView(context: Context, attrs: AttributeSet?) : ConstraintLayou fun changeNextButtonBackground(enabled: Boolean) { if (enabled) { - binding.nextCta.setBackgroundResource(R.drawable.bg_cta_primary_amc) + binding.nextCta.setBackgroundResource(WidgetsR.drawable.bg_cta_primary_amc) } else { - binding.nextCta.setBackgroundResource(R.drawable.bg_cta_disable_primary_amc) + binding.nextCta.setBackgroundResource(CommonR.drawable.bg_cta_disable_primary_amc) } } diff --git a/navi-gold/src/main/java/com/navi/gold/ui/CommonPermissionFragment.kt b/navi-gold/src/main/java/com/navi/gold/ui/CommonPermissionFragment.kt index e7dd3c84e3..14760fa538 100644 --- a/navi-gold/src/main/java/com/navi/gold/ui/CommonPermissionFragment.kt +++ b/navi-gold/src/main/java/com/navi/gold/ui/CommonPermissionFragment.kt @@ -7,6 +7,7 @@ package com.navi.gold.ui +import com.navi.common.R as CommonR import android.Manifest import android.content.Context import android.content.Intent @@ -117,11 +118,11 @@ class CommonPermissionFragment : BaseFragment(), CommonFooterInteractionListener layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) adapter = permissionAdapter addItemDecoration( - TopMarginItemDecoration(resources.getDimension(R.dimen.layout_dp_24)) + TopMarginItemDecoration(resources.getDimension(CommonR.dimen.layout_dp_24)) ) } permissionAdapter.updatePermissionTiles(permissionTiles) - binding.permissionDeniedView.setCornerRadius(resources.getDimension(R.dimen.layout_dp_8)) + binding.permissionDeniedView.setCornerRadius(resources.getDimension(CommonR.dimen.layout_dp_8)) binding.permissionDeniedView.setCallback { openNativePermissionPage() } diff --git a/navi-gold/src/main/java/com/navi/gold/ui/DigitalGoldTransactionActivity.kt b/navi-gold/src/main/java/com/navi/gold/ui/DigitalGoldTransactionActivity.kt index 574405efc8..e94a0d810e 100644 --- a/navi-gold/src/main/java/com/navi/gold/ui/DigitalGoldTransactionActivity.kt +++ b/navi-gold/src/main/java/com/navi/gold/ui/DigitalGoldTransactionActivity.kt @@ -7,6 +7,7 @@ package com.navi.gold.ui +import com.navi.naviwidgets.R as WidgetsR import android.graphics.Color import android.net.Uri import android.os.Bundle @@ -221,7 +222,7 @@ class DigitalGoldTransactionActivity : BaseActivity(), WidgetCallback, CsatCompl binding.rvToastGoldItems.visibility = View.VISIBLE AnimationUtils.loadAnimation( this@DigitalGoldTransactionActivity, - com.navi.naviwidgets.R.anim.slide_in_bottom + WidgetsR.anim.slide_in_bottom ) ?.let { anim -> binding.rvToastGoldItems.startAnimation(anim) } } diff --git a/navi-gold/src/main/java/com/navi/gold/ui/PdRpdOptionsActivity.kt b/navi-gold/src/main/java/com/navi/gold/ui/PdRpdOptionsActivity.kt index b25f64533d..c80451e9ea 100644 --- a/navi-gold/src/main/java/com/navi/gold/ui/PdRpdOptionsActivity.kt +++ b/navi-gold/src/main/java/com/navi/gold/ui/PdRpdOptionsActivity.kt @@ -1,5 +1,6 @@ package com.navi.gold.ui +import com.navi.common.R as CommonR import android.content.Intent import android.os.Bundle import androidx.activity.viewModels @@ -156,10 +157,10 @@ class PdRpdOptionsActivity : BaseActivity(), FragmentInterchangeListener, fragmentTransaction.addToBackStack(currentScreenTag) } fragmentTransaction.setCustomAnimations( - R.anim.parallax_slide_in_right, - R.anim.parallax_slide_out_left, - R.anim.parallax_slide_in_left, - R.anim.parallax_slide_out_right + CommonR.anim.parallax_slide_in_right, + CommonR.anim.parallax_slide_out_left, + CommonR.anim.parallax_slide_in_left, + CommonR.anim.parallax_slide_out_right ) fragmentTransaction.replace(R.id.flLoadFragment, fragment, currentScreenTag) fragmentTransaction.commit() @@ -170,4 +171,4 @@ class PdRpdOptionsActivity : BaseActivity(), FragmentInterchangeListener, override val screenName: String = DIGITAL_GOLD_PD_RPD_OPTION_ACTIVITY override val moduleName: ModuleNameV2 = ModuleNameV2.COMMON -} \ No newline at end of file +} diff --git a/navi-gold/src/main/java/com/navi/gold/ui/PennyDropOptionsFragment.kt b/navi-gold/src/main/java/com/navi/gold/ui/PennyDropOptionsFragment.kt index 893bbf42c2..0f8268e03a 100644 --- a/navi-gold/src/main/java/com/navi/gold/ui/PennyDropOptionsFragment.kt +++ b/navi-gold/src/main/java/com/navi/gold/ui/PennyDropOptionsFragment.kt @@ -1,5 +1,6 @@ package com.navi.gold.ui +import com.navi.naviwidgets.R as WidgetsR import PdRpdOptionsAdapter import RewardsData import android.app.Activity @@ -222,7 +223,7 @@ class PennyDropOptionsFragment : BaseFragment(), WidgetCallback, NewBottomSheetL } val itemDecorator = DividerItemDecoration(context, DividerItemDecoration.VERTICAL) context?.let { - ContextCompat.getDrawable(it, R.drawable.empty_space_divider)?.let { drawable -> + ContextCompat.getDrawable(it, WidgetsR.drawable.empty_space_divider)?.let { drawable -> itemDecorator.setDrawable(drawable) } } @@ -444,4 +445,4 @@ class PennyDropOptionsFragment : BaseFragment(), WidgetCallback, NewBottomSheetL override val screenName: String = DIGITAL_GOLD_PD_RPD_OPTION_SCREEN -} \ No newline at end of file +} diff --git a/navi-gold/src/main/java/com/navi/gold/util/AnimationUtil.kt b/navi-gold/src/main/java/com/navi/gold/util/AnimationUtil.kt index b61763f45c..8f2e206c5f 100644 --- a/navi-gold/src/main/java/com/navi/gold/util/AnimationUtil.kt +++ b/navi-gold/src/main/java/com/navi/gold/util/AnimationUtil.kt @@ -1,5 +1,6 @@ package com.navi.gold.util +import com.navi.common.R as CommonR import android.app.Activity import com.navi.common.R @@ -11,7 +12,7 @@ fun Activity.startEnterAnimation() { fun Activity.startExitAnimation() { this.overridePendingTransition( - com.navi.gold.R.anim.parallax_slide_in_left, - com.navi.gold.R.anim.parallax_slide_out_right + CommonR.anim.parallax_slide_in_left, + CommonR.anim.parallax_slide_out_right ) -} \ No newline at end of file +} diff --git a/navi-gold/src/main/java/com/navi/gold/view/FooterView.kt b/navi-gold/src/main/java/com/navi/gold/view/FooterView.kt index 8cb7f2aa9f..9dc27b0d9d 100644 --- a/navi-gold/src/main/java/com/navi/gold/view/FooterView.kt +++ b/navi-gold/src/main/java/com/navi/gold/view/FooterView.kt @@ -1,5 +1,7 @@ package com.navi.gold.view +import com.navi.common.R as CommonR +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -83,19 +85,19 @@ class FooterView(context: Context, attrs: AttributeSet?) : ConstraintLayout(cont fun enableNextButton(enabled: Boolean) { binding.nextCta.isEnabled = enabled if (enabled) { - binding.nextCta.setBackgroundResource(R.drawable.bg_cta_primary_amc) + binding.nextCta.setBackgroundResource(WidgetsR.drawable.bg_cta_primary_amc) binding.nextCta.tag = NextButtonTag.ENABLED } else { - binding.nextCta.setBackgroundResource(R.drawable.bg_cta_disable_primary_amc) + binding.nextCta.setBackgroundResource(CommonR.drawable.bg_cta_disable_primary_amc) binding.nextCta.tag = NextButtonTag.DISABLED } } fun changeNextButtonBackground(enabled: Boolean) { if (enabled) { - binding.nextCta.setBackgroundResource(R.drawable.bg_cta_primary_amc) + binding.nextCta.setBackgroundResource(WidgetsR.drawable.bg_cta_primary_amc) } else { - binding.nextCta.setBackgroundResource(R.drawable.bg_cta_disable_primary_amc) + binding.nextCta.setBackgroundResource(CommonR.drawable.bg_cta_disable_primary_amc) } } @@ -118,4 +120,4 @@ class FooterView(context: Context, attrs: AttributeSet?) : ConstraintLayout(cont ENABLED, DISABLED } -} \ No newline at end of file +} diff --git a/navi-hl/src/main/java/com/navi/homeloan/common/customview/ConsentDetailView.kt b/navi-hl/src/main/java/com/navi/homeloan/common/customview/ConsentDetailView.kt index c806667653..be680383e1 100644 --- a/navi-hl/src/main/java/com/navi/homeloan/common/customview/ConsentDetailView.kt +++ b/navi-hl/src/main/java/com/navi/homeloan/common/customview/ConsentDetailView.kt @@ -7,6 +7,9 @@ package com.navi.homeloan.common.customview +import com.navi.common.R as CommonR +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -28,7 +31,7 @@ class ConsentDetailView(context: Context, attrs: AttributeSet?) : ConstraintLayo init { val inflater = LayoutInflater.from(context) binding = DataBindingUtil.inflate(inflater, R.layout.hl_view_consent_detail, this, true) - binding.detailsWrapper.setCornerRadius(resources.getDimensionPixelSize(R.dimen.layout_dp_4)) + binding.detailsWrapper.setCornerRadius(resources.getDimensionPixelSize(CommonR.dimen.layout_dp_4)) setExpanded(false) binding.clickerView.setOnClickListener { setExpanded(!isExpanded) } } @@ -53,10 +56,10 @@ class ConsentDetailView(context: Context, attrs: AttributeSet?) : ConstraintLayo fun setExpanded(isExpanded: Boolean) { if (isExpanded) { binding.detailsWrapper.visibility = View.VISIBLE - binding.arrowIv.setImageResource(R.drawable.ic_arrow_rise) + binding.arrowIv.setImageResource(DesignR.drawable.ic_arrow_rise) } else { binding.detailsWrapper.visibility = View.GONE - binding.arrowIv.setImageResource(R.drawable.arrow_down) + binding.arrowIv.setImageResource(WidgetsR.drawable.arrow_down) } this.isExpanded = isExpanded } diff --git a/navi-hl/src/main/java/com/navi/homeloan/common/customview/OtpInputView.kt b/navi-hl/src/main/java/com/navi/homeloan/common/customview/OtpInputView.kt index a1a1419d4c..473a70f4fc 100644 --- a/navi-hl/src/main/java/com/navi/homeloan/common/customview/OtpInputView.kt +++ b/navi-hl/src/main/java/com/navi/homeloan/common/customview/OtpInputView.kt @@ -7,6 +7,7 @@ package com.navi.homeloan.common.customview +import com.navi.design.R as DesignR import android.content.Context import android.os.CountDownTimer import android.text.Editable @@ -110,7 +111,7 @@ class OtpInputView(context: Context, attributeSet: AttributeSet) : (millisUntilFinished / MILLISECONDS_PER_SECOND) % SECONDS_PER_MINUTE binding.timer.text = String.format( - context.getString(com.navi.design.R.string.time_format), + context.getString(DesignR.string.time_format), minutes, seconds ) diff --git a/navi-hl/src/main/java/com/navi/homeloan/common/utils/HLIconUtils.kt b/navi-hl/src/main/java/com/navi/homeloan/common/utils/HLIconUtils.kt index 848d8f72f9..9624c79085 100644 --- a/navi-hl/src/main/java/com/navi/homeloan/common/utils/HLIconUtils.kt +++ b/navi-hl/src/main/java/com/navi/homeloan/common/utils/HLIconUtils.kt @@ -7,6 +7,8 @@ package com.navi.homeloan.common.utils +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.widget.ImageView import androidx.annotation.Keep import com.bumptech.glide.Glide @@ -55,23 +57,23 @@ object HLIconUtils { ICON_ARROW_CROSS_BLUE -> R.drawable.ic_hl_blue_cross_svg ICON_RED_BORDER_ALERT -> R.drawable.ic_hl_red_border_alert_svg ICON_BLUE_BORDER_ALERT -> R.drawable.ic_hl_blue_border_alert_svg - ICON_SMALL_YELLOW_BULB -> R.drawable.ic_small_yellow_bulb_svg - ICON_INFO_SIMPLE -> R.drawable.ic_info_icon_svg - OUTLINED_INFO_ICON_BLACK -> R.drawable.ic_info_icon_black + ICON_SMALL_YELLOW_BULB -> WidgetsR.drawable.ic_small_yellow_bulb_svg + ICON_INFO_SIMPLE -> WidgetsR.drawable.ic_info_icon_svg + OUTLINED_INFO_ICON_BLACK -> DesignR.drawable.ic_info_icon_black ICON_HL_SMALL_RED_WHITE_BG_RIGHT_ARROW -> - R.drawable.ic_hl_small_circle_right_arrow_white_bg_svg - INVALID_CITY_ICON -> R.drawable.ic_city_error + WidgetsR.drawable.ic_hl_small_circle_right_arrow_white_bg_svg + INVALID_CITY_ICON -> WidgetsR.drawable.ic_city_error ICON_LARGE_PURPLE_ALERT_WITH_DOG -> R.drawable.ic_hl_large_purple_alert_with_dog_svg ICON_HL_GREY_LOCK -> R.drawable.ic_hl_grey_lock_svg - ICON_HL_HELP_FAQ -> R.drawable.ic_hl_help_faq_svg - ICON_HL_HELP_CHAT -> R.drawable.ic_hl_help_chat_svg - ICON_HL_HELP_EMAIL -> R.drawable.ic_hl_help_email_svg - ICON_HL_HELP_CALL -> R.drawable.ic_hl_help_call - ICON_RED_BORDER_DOWNLOAD -> R.drawable.ic_red_border_download_svg - ICON_HL_RED_TICK_SMALL -> R.drawable.ic_red_tick_small + ICON_HL_HELP_FAQ -> WidgetsR.drawable.ic_hl_help_faq_svg + ICON_HL_HELP_CHAT -> WidgetsR.drawable.ic_hl_help_chat_svg + ICON_HL_HELP_EMAIL -> WidgetsR.drawable.ic_hl_help_email_svg + ICON_HL_HELP_CALL -> WidgetsR.drawable.ic_hl_help_call + ICON_RED_BORDER_DOWNLOAD -> WidgetsR.drawable.ic_red_border_download_svg + ICON_HL_RED_TICK_SMALL -> WidgetsR.drawable.ic_red_tick_small ICON_ARROW_DOWN_RED -> R.drawable.ic_hl_arrow_down_red ICON_GREY_DARK_INFO -> R.drawable.ic_hl_grey_dark_info_12 - ICON_HL_INFO_FILLED_SIMPLE -> R.drawable.ic_info_dark + ICON_HL_INFO_FILLED_SIMPLE -> WidgetsR.drawable.ic_info_dark ICON_HL_ERROR_INFO_RED -> R.drawable.ic_hl_error_info_red OUTLINED_INFO_ICON_BLACK_LARGE -> R.drawable.ic_hl_info_icon_black_32 else -> -1 diff --git a/navi-insurance/src/main/java/com/navi/insurance/claim/IconUtil.kt b/navi-insurance/src/main/java/com/navi/insurance/claim/IconUtil.kt index 10ba6a460d..486f9a77e3 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/claim/IconUtil.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/claim/IconUtil.kt @@ -7,18 +7,20 @@ package com.navi.insurance.claim +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import com.navi.insurance.R object IconUtil { fun getIconDrawableResource(iconCode: String?, defaultValue: Int = 0): Int { return when (iconCode) { - "RIGHT_ARROW_ICON" -> R.drawable.ic_arrow_forward_24dp + "RIGHT_ARROW_ICON" -> DesignR.drawable.ic_arrow_forward_24dp "NAVI_ICON" -> R.drawable.ic_navi_logo "LEFT_ARROW_ICON" -> R.drawable.ic_arrow_backward_24dp "LEFT_ARROW_ICON_BLACK" -> R.drawable.ic_back_arrow_with_tail "LEFT_ARROW_WITH_PADDING" -> R.drawable.ic_back_arrow_with_padding - "CALL_ICON" -> R.drawable.call_black_icon + "CALL_ICON" -> DesignR.drawable.call_black_icon "CALL_ICON_BLUE" -> R.drawable.call_icon "CIRCULAR_FILLED_CALL_ICON" -> R.drawable.ic_call_blue "GRADIENT_TICK" -> R.drawable.ic_gradient_tick @@ -43,7 +45,7 @@ object IconUtil { "DOC_ICON" -> R.drawable.ic_document_grey "DOCUMENT_SEARCH_ICON" -> R.drawable.ic_no_content "EXCLAMATION_MARK" -> R.drawable.ic_exclamation_mark - "ERROR_ICON" -> R.drawable.ic_error + "ERROR_ICON" -> DesignR.drawable.ic_error "DOT_ICON" -> R.drawable.ic_bullet_point_6_dp "ROUND_MEMBER_ICON" -> R.drawable.ic_circular_filled_person "BANK_ACCOUNT_ICON" -> R.drawable.ic_bank @@ -66,7 +68,7 @@ object IconUtil { "BLACK_HELP_ICON" -> R.drawable.gi_ic_help_black "RED_TEXT_HELP_ICON" -> R.drawable.ic_purple_text_help_icon "PURPLE_TEXT_HELP_ICON" -> R.drawable.ic_purple_text_help_icon - "CROSS_ICON" -> R.drawable.ic_close_cross + "CROSS_ICON" -> WidgetsR.drawable.ic_close_cross "TICK_MARK_ICON" -> R.drawable.gi_ic_check_circle_green "CIRCULAR_FILLED_PLUS_ICON" -> R.drawable.ic_circular_filled_plus "VIEW_DOCUMENT_ICON" -> R.drawable.ic_view_doc diff --git a/navi-insurance/src/main/java/com/navi/insurance/claim/bank/ui/BankDetailsFormFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/claim/bank/ui/BankDetailsFormFragment.kt index ea3b51dd97..793cdd30c3 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/claim/bank/ui/BankDetailsFormFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/claim/bank/ui/BankDetailsFormFragment.kt @@ -7,6 +7,7 @@ package com.navi.insurance.claim.bank.ui +import com.navi.design.R as DesignR import android.os.Bundle import android.text.Editable import android.text.InputFilter @@ -174,7 +175,7 @@ class BankDetailsFormFragment : GiBaseFragment(), TextWatcher { binding.ifscLocation.text = getString(R.string.locating_ifsc_code) } binding.ifscLocation.setTextColor( - ContextCompat.getColor(requireContext(), R.color.naviGrey) + ContextCompat.getColor(requireContext(), DesignR.color.naviGrey) ) } is FetchLocationIfscState.Success -> { @@ -185,7 +186,7 @@ class BankDetailsFormFragment : GiBaseFragment(), TextWatcher { it.data?.name ) binding.ifscLocation.setTextColor( - ContextCompat.getColor(requireContext(), R.color.naviGrey) + ContextCompat.getColor(requireContext(), DesignR.color.naviGrey) ) } is FetchLocationIfscState.Failure -> { diff --git a/navi-insurance/src/main/java/com/navi/insurance/claim/chat/NaviChatFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/claim/chat/NaviChatFragment.kt index 02b8333887..e860ad1fbb 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/claim/chat/NaviChatFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/claim/chat/NaviChatFragment.kt @@ -7,6 +7,7 @@ package com.navi.insurance.claim.chat +import com.navi.common.R as CommonR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -175,7 +176,7 @@ class NaviChatFragment : binding.progressBar.isVisible = false Toast.makeText( context, - getString(R.string.policy_benefit_error_description_text), + getString(CommonR.string.policy_benefit_error_description_text), Toast.LENGTH_LONG ) .show() diff --git a/navi-insurance/src/main/java/com/navi/insurance/claim/document/adapters/UploadedDocumentsAdapter.kt b/navi-insurance/src/main/java/com/navi/insurance/claim/document/adapters/UploadedDocumentsAdapter.kt index 02b4f77e69..9e32891837 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/claim/document/adapters/UploadedDocumentsAdapter.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/claim/document/adapters/UploadedDocumentsAdapter.kt @@ -1,5 +1,7 @@ package com.navi.insurance.claim.document.adapters +import com.navi.common.R as CommonR +import com.navi.naviwidgets.R as WidgetsR import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater @@ -176,7 +178,7 @@ class UploadedDocumentViewHolder( .into(binding.documentPreviewImage) } else -> { - binding.documentPreviewImage.setImageResource(R.drawable.widget_image_placeholder) + binding.documentPreviewImage.setImageResource(WidgetsR.drawable.widget_image_placeholder) } } @@ -194,7 +196,7 @@ class UploadedDocumentViewHolder( !(uploadStatus?.showUploadButton.orFalse() || uploadStatus?.showProgress.orFalse() || uploadStatus?.selectedFileData?.isLargeFile.orFalse()) || uploadStatus?.errorMessage != null || uploadStatus?.selectedFileData?.isLargeFile.orFalse() - binding.warningText.text = binding.root.context.resources.getString(R.string.file_too_large) + binding.warningText.text = binding.root.context.resources.getString(CommonR.string.file_too_large) binding.warningText.isVisible = uploadStatus?.selectedFileData?.isLargeFile.orFalse() binding.upload.isVisible = uploadStatus?.showUploadButton.orFalse() @@ -208,7 +210,8 @@ class UploadedDocumentViewHolder( type = NaviActionType.OPEN_SNACKBAR.value, actionOwnerType = ActionOwnerType.FRAGMENT, data = SnackbarActionData( - message = uploadStatus?.errorMessage ?: binding.root.context.resources.getString(R.string.file_too_large_10mb_limit), + message = uploadStatus?.errorMessage ?: binding.root.context.resources.getString( + CommonR.string.file_too_large_10mb_limit), show = true ) ) @@ -292,4 +295,4 @@ class AddDocumentItemViewHolder( } } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/DocumentUploadByCategoryFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/DocumentUploadByCategoryFragment.kt index e900366e89..f8b59c0352 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/DocumentUploadByCategoryFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/DocumentUploadByCategoryFragment.kt @@ -7,6 +7,7 @@ package com.navi.insurance.claim.document.ui +import com.navi.common.R as CommonR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -647,7 +648,7 @@ class DocumentUploadByCategoryFragment : documentUploadVM.updateSnackbarVisibleState(false) }, snackBarConfig = SnackBarConfig( - iconResId = R.drawable.cross_black, + iconResId = CommonR.drawable.cross_black, title = snackbarActionDataState.value?.message.orEmpty() ) ) diff --git a/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/TabbedMediatorNestedScrollView.kt b/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/TabbedMediatorNestedScrollView.kt index 1f780ffe70..4caf2db6bb 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/TabbedMediatorNestedScrollView.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/TabbedMediatorNestedScrollView.kt @@ -7,6 +7,7 @@ package com.navi.insurance.claim.document.ui +import com.navi.design.R as DesignR import android.graphics.Rect import android.view.ViewGroup import android.widget.TextView @@ -130,7 +131,7 @@ class TabbedMediatorNestedScrollView( ) (tab.customView as? TextView)?.apply { - setTextColor(ContextCompat.getColor(context, R.color.blueberry)) + setTextColor(ContextCompat.getColor(context, DesignR.color.blueberry)) this.typeface = typeFace } insuranceAnalyticsHandler.sendEvent(tabDataList[position].analyticsEvent) @@ -144,7 +145,7 @@ class TabbedMediatorNestedScrollView( ) (tab.customView as? TextView)?.apply { - setTextColor(ContextCompat.getColor(context, R.color.naviGrey)) + setTextColor(ContextCompat.getColor(context, DesignR.color.naviGrey)) this.typeface = typeFace } } diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/GiBaseFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/common/GiBaseFragment.kt index e796947b30..6317f7dc7d 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/GiBaseFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/GiBaseFragment.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common +import com.navi.common.R as CommonR import android.os.Bundle import android.view.View import android.widget.Toast @@ -58,7 +59,7 @@ abstract class GiBaseFragment : BaseFragment(), ActionHandler.ActionOwner { if ( !tryHandleError( err, - actionMessage = resources.getString(R.string.retry_label), + actionMessage = resources.getString(CommonR.string.retry_label), actionCallback = getRetryAction(err), containerId = (activity as? GiBaseActivity)?.getContainerId() ) diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/DobInputWidget.kt b/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/DobInputWidget.kt index 1b6dc83e82..a3e44e281f 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/DobInputWidget.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/DobInputWidget.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.custom_view +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.core.content.ContextCompat @@ -99,7 +100,7 @@ class DobInputWidget @JvmOverloads constructor(context: Context, attrs: Attribut private fun updateDate() { this.binding ?.rightText - ?.setTextColor(ContextCompat.getColor(context, R.color.titleSecondaryColor)) + ?.setTextColor(ContextCompat.getColor(context, DesignR.color.titleSecondaryColor)) selectedDate?.let { dateInMs -> val fromFormat = SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH) val toFormat = SimpleDateFormat("dd MMM, yyyy", Locale.ENGLISH) diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/FixedLabelInputTextLayout.kt b/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/FixedLabelInputTextLayout.kt index 765830714d..28bbb0cf76 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/FixedLabelInputTextLayout.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/FixedLabelInputTextLayout.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.custom_view +import com.navi.design.R as DesignR import android.content.Context import android.text.TextUtils import android.util.AttributeSet @@ -39,7 +40,7 @@ class FixedLabelInputTextLayout( if (hasFocus) { binding.nameEt.background = ContextCompat.getDrawable(context, R.drawable.rounded_rect_dark_grey_border_8dp_radius) } else { - binding.nameEt.background = ContextCompat.getDrawable(context, R.drawable.rounded_rectangle_white_border_8dp_radius) + binding.nameEt.background = ContextCompat.getDrawable(context, DesignR.drawable.rounded_rectangle_white_border_8dp_radius) } } @@ -89,4 +90,4 @@ class FixedLabelInputTextLayout( } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/PolicyStatusCardView.kt b/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/PolicyStatusCardView.kt index da80bf5b79..1377bb41fd 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/PolicyStatusCardView.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/PolicyStatusCardView.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.custom_view +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -97,7 +98,7 @@ class PolicyStatusCardView( actionImg.isVisible = showActionIcon actionBtn.background = ResourcesCompat.getDrawable( resources, - R.drawable.rounded_rectangle_8dp_white_bg, null + DesignR.drawable.rounded_rectangle_8dp_white_bg, null ) } } @@ -160,4 +161,4 @@ class PolicyStatusCardView( isVisible = false } } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/RadioButtonWithTwoTextView.kt b/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/RadioButtonWithTwoTextView.kt index f39f4774a5..21e4a711f0 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/RadioButtonWithTwoTextView.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/RadioButtonWithTwoTextView.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.custom_view +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -40,7 +41,7 @@ class RadioButtonWithTwoTextView(context: Context, attrs: AttributeSet?) : data.subtitle?.let { binding.subtitle.setTextFieldData(data.subtitle) } - binding.parentView.setBackgroundResource(R.drawable.bg_rounded_8_gray_border) + binding.parentView.setBackgroundResource(WidgetsR.drawable.bg_rounded_8_gray_border) if (setMargin) { binding.listMargin.visibility = View.VISIBLE } @@ -58,7 +59,7 @@ class RadioButtonWithTwoTextView(context: Context, attrs: AttributeSet?) : binding.parentView.setBackgroundResource(R.drawable.bg_rounded_8_orange_border) } else { binding.radioBtn.isChecked = false - binding.parentView.setBackgroundResource(R.drawable.bg_rounded_8_gray_border) + binding.parentView.setBackgroundResource(WidgetsR.drawable.bg_rounded_8_gray_border) } } } diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/TextDisplayLayout.kt b/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/TextDisplayLayout.kt index db7c8beb4e..498e403b03 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/TextDisplayLayout.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/custom_view/TextDisplayLayout.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.custom_view +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.graphics.Color import android.graphics.Rect @@ -89,7 +90,7 @@ class TextDisplayLayout @JvmOverloads constructor(context: Context, attrs: Attri val imageSpan = ImageSpan( context, - R.drawable.ic_info_dark_grey, + WidgetsR.drawable.ic_info_dark_grey, DynamicDrawableSpan.ALIGN_BASELINE ) val finalText = "$it " diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/factory/FormViewHolderRegistry.kt b/navi-insurance/src/main/java/com/navi/insurance/common/factory/FormViewHolderRegistry.kt index 3ebb576c6d..2d7e793dfc 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/factory/FormViewHolderRegistry.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/factory/FormViewHolderRegistry.kt @@ -27,7 +27,7 @@ import com.navi.insurance.formbase.views.* import com.navi.insurance.formbase.views.MemberDetailInputWidget import com.navi.naviwidgets.databinding.TextWithBackgroundWidgetLayoutBinding import com.navi.insurance.formbase.views.TabWithPickerWidgetLayout - +import com.navi.naviwidgets.R as WidgetsR /* * * * Copyright © 2022 by Navi Technologies Private Limited @@ -305,7 +305,7 @@ class FormViewHolderRegistry { TextWithBackgroundWidgetLayoutBinding >( LayoutInflater.from(context), - R.layout.text_with_background_widget_layout, + WidgetsR.layout.text_with_background_widget_layout, this, true ), diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/factory/InsuranceViewHolderRegistry.kt b/navi-insurance/src/main/java/com/navi/insurance/common/factory/InsuranceViewHolderRegistry.kt index ff0a7aa970..24c26bd3d8 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/factory/InsuranceViewHolderRegistry.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/factory/InsuranceViewHolderRegistry.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.factory +import com.navi.naviwidgets.R as WidgetsR import androidx.databinding.ViewDataBinding import com.navi.insurance.R import com.navi.insurance.common.models.* @@ -40,7 +41,7 @@ class InsuranceViewHolderRegistry : InsuranceViewHolderFac private val CARD_WITH_TITLE_AND_SUB_TITLE = R.layout.card_with_title_and_subtitle private val NAVI_BANNER_WIDGET = R.layout.layout_navi_banner_widget // Incase unknown/un-registered widget comes we need to handle that - private val GENERIC_WIDGET = R.layout.dummy_content_view + private val GENERIC_WIDGET = WidgetsR.layout.dummy_content_view } @@ -104,4 +105,4 @@ class InsuranceViewHolderRegistry : InsuranceViewHolderFac GENERIC_WIDGET -> UnknownVH(parent) // Incase unknown widget comes we need to handle that else -> UnknownVH(parent) } as InsuranceBaseViewHolder -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/fragment/AmountSelectionBottomSheet.kt b/navi-insurance/src/main/java/com/navi/insurance/common/fragment/AmountSelectionBottomSheet.kt index ff0c5572a4..949e9669af 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/fragment/AmountSelectionBottomSheet.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/fragment/AmountSelectionBottomSheet.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.fragment +import com.navi.design.R as DesignR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -104,12 +105,12 @@ class AmountSelectionBottomSheet : BaseBottomSheet() { pillTv.setTextColor( ContextCompat.getColor( context, - R.color.blueberry + DesignR.color.blueberry ) ) pillTv.background = getNaviDrawable( cornerRadius = resources.getDimensionPixelSize(R.dimen.dp_18), - strokeColor = ContextCompat.getColor(context, R.color.blueberry), + strokeColor = ContextCompat.getColor(context, DesignR.color.blueberry), strokeWidth = resources.getDimensionPixelSize(R.dimen.dp_1), backgroundColor = ContextCompat.getColor(context, R.color.white) ) @@ -123,7 +124,7 @@ class AmountSelectionBottomSheet : BaseBottomSheet() { ) pillTv.background = getNaviDrawable( cornerRadius = resources.getDimensionPixelSize(R.dimen.dp_18), - backgroundColor = ContextCompat.getColor(context, R.color.naviBorderLightGrey) + backgroundColor = ContextCompat.getColor(context, DesignR.color.naviBorderLightGrey) ) } } @@ -174,4 +175,4 @@ class AmountSelectionBottomSheet : BaseBottomSheet() { } } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/fragment/AutoPaySetUpBottomSheet.kt b/navi-insurance/src/main/java/com/navi/insurance/common/fragment/AutoPaySetUpBottomSheet.kt index 5373599454..e46e956378 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/fragment/AutoPaySetUpBottomSheet.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/fragment/AutoPaySetUpBottomSheet.kt @@ -158,7 +158,7 @@ class AutoPaySetUpBottomSheet : BaseBottomSheet() { dialog?.window?.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND) } if (it.handleCrossTouch.orFalse()) { - dialog?.window?.decorView?.findViewById(R.id.touch_outside) + dialog?.window?.decorView?.findViewById(com.google.android.material.R.id.touch_outside) ?.setOnTouchListener { v, event -> onTouchEvent(event, it.closeBottomSheetCta) } diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/fragment/AutopaySetupBackBottomSheet.kt b/navi-insurance/src/main/java/com/navi/insurance/common/fragment/AutopaySetupBackBottomSheet.kt index 9d86376e1e..3d0e729746 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/fragment/AutopaySetupBackBottomSheet.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/fragment/AutopaySetupBackBottomSheet.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.fragment +import com.navi.design.R as DesignR import android.view.ViewStub import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.res.ResourcesCompat @@ -84,7 +85,7 @@ class AutopaySetupBackBottomSheet : BaseBottomSheet() { binding.header.background = getNaviDrawable( backgroundColor = ResourcesCompat.getColor( resources, - R.color.noticeOrangeColor, + DesignR.color.noticeOrangeColor, null ), radii = CornerRadius( @@ -176,4 +177,4 @@ class AutopaySetupBackBottomSheet : BaseBottomSheet() { companion object { const val TAG = InsuranceAnalyticsConstants.AUTOPAY_SETUP_BACK_BOTTOM_SHEET } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/fragment/GiSurveyBottomSheet.kt b/navi-insurance/src/main/java/com/navi/insurance/common/fragment/GiSurveyBottomSheet.kt index dfc4e681d2..dcf5236eaa 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/fragment/GiSurveyBottomSheet.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/fragment/GiSurveyBottomSheet.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.fragment +import com.navi.design.R as DesignR import android.content.DialogInterface import android.os.Bundle import android.view.LayoutInflater @@ -314,11 +315,11 @@ class GiSurveyBottomSheet : BaseBottomSheet() { context?.let { context -> if (selectedState) { val pillTv = pillView.findViewById(R.id.pill_btn) - pillTv.setTextColor(ContextCompat.getColor(context, R.color.blueberry)) + pillTv.setTextColor(ContextCompat.getColor(context, DesignR.color.blueberry)) pillTv.background = getNaviDrawable( cornerRadius = resources.getDimensionPixelSize(R.dimen.dp_18), - strokeColor = ContextCompat.getColor(context, R.color.blueberry), + strokeColor = ContextCompat.getColor(context, DesignR.color.blueberry), strokeWidth = resources.getDimensionPixelSize(R.dimen.dp_1), backgroundColor = ContextCompat.getColor(context, R.color.white) ) @@ -329,7 +330,7 @@ class GiSurveyBottomSheet : BaseBottomSheet() { getNaviDrawable( cornerRadius = resources.getDimensionPixelSize(R.dimen.dp_18), backgroundColor = - ContextCompat.getColor(context, R.color.naviBorderLightGrey) + ContextCompat.getColor(context, DesignR.color.naviBorderLightGrey) ) } surveyFeedbackItemList.forEach { diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/fragment/HeaderLineTextBottomSheet.kt b/navi-insurance/src/main/java/com/navi/insurance/common/fragment/HeaderLineTextBottomSheet.kt index 362d808dcd..8dd3e2d728 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/fragment/HeaderLineTextBottomSheet.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/fragment/HeaderLineTextBottomSheet.kt @@ -1,5 +1,6 @@ package com.navi.insurance.common.fragment +import com.navi.naviwidgets.R as WidgetsR import android.graphics.Color import android.view.LayoutInflater import android.view.View @@ -150,7 +151,7 @@ class HeaderLineTextBottomSheet : BaseBottomSheet() { val viewBinding = DataBindingUtil.inflate( LayoutInflater.from(context), - R.layout.layout_left_right_text, + WidgetsR.layout.layout_left_right_text, binding.itemsLl, false ) diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/fragment/IncentiviseAutopayFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/common/fragment/IncentiviseAutopayFragment.kt index 1ea501abc0..7aa5713de1 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/fragment/IncentiviseAutopayFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/fragment/IncentiviseAutopayFragment.kt @@ -1,5 +1,6 @@ package com.navi.insurance.common.fragment +import com.navi.naviwidgets.R as WidgetsR import android.content.Intent import android.graphics.Color import android.net.Uri @@ -416,7 +417,7 @@ class IncentiviseAutopayFragment : GiBaseFragment(), WidgetCallback { .height(180.dp) ) { view -> with(view) { - setAnimation(R.raw.calendar_reward_lottie) + setAnimation(WidgetsR.raw.calendar_reward_lottie) playAnimation() repeatCount = LottieDrawable.INFINITE } @@ -553,4 +554,4 @@ class IncentiviseAutopayFragment : GiBaseFragment(), WidgetCallback { override fun onBackPressed(): Boolean = false -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/fragment/InfoBottomSheet.kt b/navi-insurance/src/main/java/com/navi/insurance/common/fragment/InfoBottomSheet.kt index 64247aee9e..3b783a76dd 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/fragment/InfoBottomSheet.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/fragment/InfoBottomSheet.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.fragment +import com.navi.design.R as DesignR import android.os.Bundle import android.text.Spannable import android.text.SpannableString @@ -50,7 +51,7 @@ class InfoBottomSheet : BaseBottomSheet() { ForegroundColorSpan( ContextCompat.getColor( binding.note.context, - R.color.naviGrey + DesignR.color.naviGrey ) ), notePrefix.length, spannableString.length - 1, Spannable.SPAN_INCLUSIVE_INCLUSIVE ) @@ -90,4 +91,4 @@ class InfoBottomSheet : BaseBottomSheet() { } } } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/fragment/LandingPageInfoFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/common/fragment/LandingPageInfoFragment.kt index 7683d6b835..42600ec08e 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/fragment/LandingPageInfoFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/fragment/LandingPageInfoFragment.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.fragment +import com.navi.naviwidgets.R as WidgetsR import android.app.Activity import android.content.Context import android.content.Intent @@ -250,7 +251,7 @@ class LandingPageInfoFragment : GiBaseFragment(), WidgetCallback { } binding.landingPageFooter.footerCtaTitle.text = if (arguments?.getString(keyPreQuoteExists) == TRUE) { - getString(R.string.continue_text) + getString(WidgetsR.string.continue_text) } else { getString(R.string.buy_health_insurance) } diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/util/Base64Helper.kt b/navi-insurance/src/main/java/com/navi/insurance/common/util/Base64Helper.kt index dd80dcc0ef..d120c41b50 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/util/Base64Helper.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/util/Base64Helper.kt @@ -1,5 +1,6 @@ package com.navi.insurance.common.util +import com.navi.naviwidgets.R as WidgetsR import android.util.Base64 import android.widget.ImageView import com.bumptech.glide.Glide @@ -29,11 +30,11 @@ constructor( .asBitmap().load(Base64.decode(base64, Base64.DEFAULT)) withContext(dispatcherProvider.main) { - builder.placeholder(R.drawable.widget_image_placeholder) + builder.placeholder(WidgetsR.drawable.widget_image_placeholder) .error(R.drawable.ic_error_large) .into(imageView) } } } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/viewholder/PolicyBenefitVH.kt b/navi-insurance/src/main/java/com/navi/insurance/common/viewholder/PolicyBenefitVH.kt index b92a6737ab..467ef505d5 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/viewholder/PolicyBenefitVH.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/viewholder/PolicyBenefitVH.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.viewholder +import com.navi.design.R as DesignR import android.view.View import androidx.annotation.ColorRes import androidx.annotation.DrawableRes @@ -82,7 +83,7 @@ class PolicyBenefitVH(private val viewBinding: ViewDataBinding) : setExtras( string = R.string.benefit_policy_error_text, drawable = R.drawable.bottom_rounded_grey_bg, - color = R.color.alert_red + color = DesignR.color.alert_red ) } } @@ -98,7 +99,7 @@ class PolicyBenefitVH(private val viewBinding: ViewDataBinding) : } else { clParent.background = ContextCompat.getDrawable( itemView.context, - R.drawable.rounded_rectangle_grey_border + DesignR.drawable.rounded_rectangle_grey_border ) } } @@ -158,4 +159,4 @@ class PolicyBenefitVH(private val viewBinding: ViewDataBinding) : } } } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/BannerInfoWidget.kt b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/BannerInfoWidget.kt index 6bbc323f95..e744ffcc0c 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/BannerInfoWidget.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/BannerInfoWidget.kt @@ -1,5 +1,7 @@ package com.navi.insurance.common.widgets +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.graphics.drawable.GradientDrawable @@ -36,7 +38,7 @@ class BannerInfoWidget(context: Context, attrs: AttributeSet?) : elevation = resources.getDimension(R.dimen.dp_6) radius = resources.getDimension(R.dimen.dp_16) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { - outlineSpotShadowColor = ContextCompat.getColor(context, R.color.shadow_color) + outlineSpotShadowColor = ContextCompat.getColor(context, DesignR.color.shadow_color) } useCompatPadding = true } @@ -61,7 +63,7 @@ class BannerInfoWidget(context: Context, attrs: AttributeSet?) : Color.parseColor(gradient.endGradientColor) ) gradientDrawable.orientation = getOrientation(gradient.orientation) - gradientDrawable.cornerRadius = resources.getDimension(R.dimen.layout_dp_8) + gradientDrawable.cornerRadius = resources.getDimension(CommonR.dimen.layout_dp_8) binding.rootLayout.background = gradientDrawable } @@ -72,4 +74,4 @@ class BannerInfoWidget(context: Context, attrs: AttributeSet?) : binding.actionTv.setData(buttonViewData = this.actionButton, ctaDataCallback = callback) } } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/ExpandableListWidget.kt b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/ExpandableListWidget.kt index 0c80ec099d..2d660af4d0 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/ExpandableListWidget.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/ExpandableListWidget.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.widgets +import com.navi.common.R as CommonR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -270,14 +271,14 @@ class ExpandableListWidget @JvmOverloads constructor( ) { val promptTextView = TextView(context) promptTextView.setData(textViewData, callback) - promptTextView.setPadding(context.resources.getDimensionPixelSize(R.dimen.layout_dp_16)) + promptTextView.setPadding(context.resources.getDimensionPixelSize(CommonR.dimen.layout_dp_16)) val params = LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT) params.setMargins(0, resources.getDimensionPixelSize(R.dimen.dp_16), 0, 0) promptTextView.layoutParams = params promptTextView.background = getNaviDrawable( - cornerRadius = context.resources.getDimensionPixelSize(R.dimen.layout_dp_8), + cornerRadius = context.resources.getDimensionPixelSize(CommonR.dimen.layout_dp_8), backgroundColor = ContextCompat.getColor( context, R.color.snowy_mint_translucent @@ -285,4 +286,4 @@ class ExpandableListWidget @JvmOverloads constructor( ) binding.expandableLl.addView(promptTextView) } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/FooterWithLeftRightButtonView.kt b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/FooterWithLeftRightButtonView.kt index 2f036b94d0..4ea3fe001a 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/FooterWithLeftRightButtonView.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/FooterWithLeftRightButtonView.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.widgets +import com.navi.design.R as DesignR import android.content.Context import android.content.res.ColorStateList import android.graphics.Color @@ -156,7 +157,7 @@ constructor(context: Context, attrs: AttributeSet? = null) : BaseNaviWidgetView( } if(offerTagData?.showRoundedCorners == true) { - this.binding?.footer?.background = ResourcesCompat.getDrawable(resources, R.drawable.top_rounded_white_bg, null) + this.binding?.footer?.background = ResourcesCompat.getDrawable(resources, DesignR.drawable.top_rounded_white_bg, null) } } diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/FooterWithSlideUpAnimationLayout.kt b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/FooterWithSlideUpAnimationLayout.kt index 59d78945a9..e066a6d51e 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/FooterWithSlideUpAnimationLayout.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/FooterWithSlideUpAnimationLayout.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.widgets +import com.navi.insurance.R as InsuranceR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -58,12 +59,12 @@ constructor(context: Context, attrs: AttributeSet? = null) : BaseNaviWidgetView( private fun initUi(footerWithTwoButtonData: FooterWithSlideUpAnimation?) { if (footerWithTwoButtonData?.offerDetails.isNotNull()) { binding?.offerCard?.isVisible = true - binding?.root?.translationY = resources.getDimensionPixelSize(R.dimen.dp_80).toFloat() + binding?.root?.translationY = resources.getDimensionPixelSize(InsuranceR.dimen.dp_80).toFloat() binding?.offerCard?.background = footerWithTwoButtonData?.offerDetails?.gradient?.let { getGradientDrawable( context, it, - resources.getDimension(R.dimen.dp_4).toInt() + resources.getDimension(InsuranceR.dimen.dp_4).toInt() ) } CoroutineScope(Dispatchers.Main).launch { @@ -88,7 +89,7 @@ constructor(context: Context, attrs: AttributeSet? = null) : BaseNaviWidgetView( if (footerWithTwoButtonData?.bannerData.isNotNull()) { binding?.banner?.bannerLayout?.isVisible = true - binding?.root?.translationY = resources.getDimensionPixelSize(R.dimen.dp_80).toFloat() + binding?.root?.translationY = resources.getDimensionPixelSize(InsuranceR.dimen.dp_80).toFloat() binding?.banner?.bannerLayout?.background = getNaviDrawable( backgroundColor = Color.parseColor(footerWithTwoButtonData?.bannerData?.bgColor?.backgroundColor), radii = CornerRadius( diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/NaviWidgetViewDataExt.kt b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/NaviWidgetViewDataExt.kt index 1711b991ed..a2342ca1c4 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/NaviWidgetViewDataExt.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/NaviWidgetViewDataExt.kt @@ -7,6 +7,8 @@ package com.navi.insurance.common.widgets +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR import android.graphics.Color import android.graphics.drawable.GradientDrawable import android.os.Build @@ -182,7 +184,7 @@ private fun TextView.setColorPalette(colorPalette: ColorPalette) { Color.parseColor(gradient.endGradientColor) ) gradientDrawable.orientation = getOrientation(gradient.orientation) - gradientDrawable.cornerRadius = resources.getDimension(R.dimen.layout_dp_8) + gradientDrawable.cornerRadius = resources.getDimension(CommonR.dimen.layout_dp_8) background = gradientDrawable } @@ -307,10 +309,10 @@ fun TabLayout.addTextTab(text: String?, isSelected: Boolean) { setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(R.dimen.sp_14)) if (isSelected) { typeface = ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.TT_MEDIUM)) - setTextColor(ContextCompat.getColor(context, R.color.blueberry)) + setTextColor(ContextCompat.getColor(context, DesignR.color.blueberry)) } else { typeface = ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.TT_REGULAR)) - setTextColor(ContextCompat.getColor(context, R.color.naviGrey)) + setTextColor(ContextCompat.getColor(context, DesignR.color.naviGrey)) } } addTab(newTab().setCustomView(tabTextView)) diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/PickerWidget.kt b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/PickerWidget.kt index ff44526074..261a3b938e 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/PickerWidget.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/PickerWidget.kt @@ -1,5 +1,7 @@ package com.navi.insurance.common.widgets +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.graphics.drawable.GradientDrawable @@ -49,11 +51,11 @@ class PickerWidget @JvmOverloads constructor( val widgetDrawable = GradientDrawable() widgetDrawable.shape = GradientDrawable.RECTANGLE widgetDrawable.setColor(Color.WHITE) - widgetDrawable.cornerRadius = resources.getDimension(R.dimen.layout_dp_8) + widgetDrawable.cornerRadius = resources.getDimension(CommonR.dimen.layout_dp_8) context?.run { widgetDrawable.setStroke( resources.getDimension(R.dimen.dp_1).toInt(), - ContextCompat.getColor(this, R.color.chinese_white) + ContextCompat.getColor(this, DesignR.color.chinese_white) ) } return widgetDrawable @@ -93,4 +95,4 @@ class PickerWidget @JvmOverloads constructor( } return null } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/PillButtonItemView.kt b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/PillButtonItemView.kt index 67dd66c820..004c92f221 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/PillButtonItemView.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/PillButtonItemView.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -51,7 +52,7 @@ class PillButtonItemView( ) { if (isSelected == true) { TextViewCompat.setTextAppearance(binding.pillBtn, R.style.SmallTextFontStyle) - binding.pillBtn.setTextColor(ContextCompat.getColor(context, R.color.blueberry)) + binding.pillBtn.setTextColor(ContextCompat.getColor(context, DesignR.color.blueberry)) binding.pillBtn.background = ContextCompat.getDrawable(context, R.drawable.orange_pill_background) } else { @@ -69,4 +70,4 @@ class PillButtonItemView( binding.root.layoutParams?.width = currentItemWidth.toInt() } } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/ReviewImageGridAdapter.kt b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/ReviewImageGridAdapter.kt index ed89e5ebe3..eddf4896b7 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/ReviewImageGridAdapter.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/ReviewImageGridAdapter.kt @@ -1,5 +1,6 @@ package com.navi.insurance.common.widgets +import com.navi.naviwidgets.R as WidgetsR import android.annotation.SuppressLint import android.view.LayoutInflater import android.view.ViewGroup @@ -74,7 +75,7 @@ class ReviewImageGridAdapter( base64Helper.decodeBase64ToBitmap(uploadedDocData.thumbnailUrl, binding.documentPreviewImage) } } ?: run { - binding.documentPreviewImage.setImageResource(R.drawable.widget_image_placeholder) + binding.documentPreviewImage.setImageResource(WidgetsR.drawable.widget_image_placeholder) } binding.root.addOnMultipleClicksHandler { @@ -82,4 +83,4 @@ class ReviewImageGridAdapter( } } } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/SectionItemsWithSliderSelectorWidget.kt b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/SectionItemsWithSliderSelectorWidget.kt index 33f671443a..de37af8a7c 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/SectionItemsWithSliderSelectorWidget.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/SectionItemsWithSliderSelectorWidget.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -254,7 +255,7 @@ constructor(context: Context, attrs: AttributeSet? = null) : FormBaseWidgetView( setEditButtonSetOnClickListener() } else{ - binding?.rightText?.setTextColor(ContextCompat.getColor(context, R.color.description_colour_seven)) + binding?.rightText?.setTextColor(ContextCompat.getColor(context, DesignR.color.description_colour_seven)) binding?.rightText?.setOnClickListener(null) } } diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/SectionWithItemsWidgetV2.kt b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/SectionWithItemsWidgetV2.kt index 0290ee2936..a0c13b8c0c 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/SectionWithItemsWidgetV2.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/SectionWithItemsWidgetV2.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -163,7 +164,7 @@ class SectionWithItemsWidgetV2 @JvmOverloads constructor( setRightTextOnClickListener() } else{ - binding?.rightText?.setTextColor(ContextCompat.getColor(context, R.color.description_colour_seven)) + binding?.rightText?.setTextColor(ContextCompat.getColor(context, DesignR.color.description_colour_seven)) binding?.rightText?.setOnClickListener(null) } } diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/SelectionWithPillGridItemView.kt b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/SelectionWithPillGridItemView.kt index 89caacd66b..c2dcc3393a 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/SelectionWithPillGridItemView.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/SelectionWithPillGridItemView.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.widgets +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -68,21 +69,21 @@ class SelectionWithPillGridItemView( pillData?.let { binding.pillGrid.visibility = View.VISIBLE } - binding.selectorImage.setImageResource(R.drawable.radio_button_checked_blue) + binding.selectorImage.setImageResource(WidgetsR.drawable.radio_button_checked_blue) if (isMinimumOsVersionM()) { - binding.title.setTextAppearance(R.style.MediumTextFontBoldStyle) + binding.title.setTextAppearance(WidgetsR.style.MediumTextFontBoldStyle) } else { - binding.title.setTextAppearance(context, R.style.MediumTextFontBoldStyle) + binding.title.setTextAppearance(context, WidgetsR.style.MediumTextFontBoldStyle) } } private fun setRadioUnselected(binding: SelectionWithPillGridItemBinding) { binding.pillGrid.visibility = View.GONE - binding.selectorImage.setImageResource(R.drawable.radio_button_unchecked_grey) + binding.selectorImage.setImageResource(WidgetsR.drawable.radio_button_unchecked_grey) if (isMinimumOsVersionM()) { - binding.title.setTextAppearance(R.style.MediumTextFontStyle) + binding.title.setTextAppearance(WidgetsR.style.MediumTextFontStyle) } else { - binding.title.setTextAppearance(context, R.style.MediumTextFontStyle) + binding.title.setTextAppearance(context, WidgetsR.style.MediumTextFontStyle) } } diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/SwitchSelectionWidget.kt b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/SwitchSelectionWidget.kt index 657737a742..71600efdff 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/SwitchSelectionWidget.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/SwitchSelectionWidget.kt @@ -7,6 +7,8 @@ package com.navi.insurance.common.widgets +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.graphics.drawable.GradientDrawable @@ -97,11 +99,11 @@ class SwitchSelectionWidget @JvmOverloads constructor( val widgetDrawable = GradientDrawable() widgetDrawable.shape = GradientDrawable.RECTANGLE widgetDrawable.setColor(Color.WHITE) - widgetDrawable.cornerRadius = resources.getDimension(R.dimen.layout_dp_8) + widgetDrawable.cornerRadius = resources.getDimension(CommonR.dimen.layout_dp_8) context?.run { widgetDrawable.setStroke( resources.getDimension(R.dimen.dp_1).toInt(), - ContextCompat.getColor(this, R.color.chinese_white) + ContextCompat.getColor(this, DesignR.color.chinese_white) ) } return widgetDrawable @@ -116,31 +118,31 @@ class SwitchSelectionWidget @JvmOverloads constructor( context?.run { widgetDrawable.setStroke( resources.getDimension(R.dimen.dp_1).toInt(), - ContextCompat.getColor(this, R.color.chinese_white) + ContextCompat.getColor(this, DesignR.color.chinese_white) ) } widgetDrawable.setColor(Color.parseColor(colorCode)) if (isLeftButton) { widgetDrawable.cornerRadii = floatArrayOf( - resources.getDimension(R.dimen.layout_dp_8), - resources.getDimension(R.dimen.layout_dp_8), - resources.getDimension(R.dimen.layout_dp_0), - resources.getDimension(R.dimen.layout_dp_0), - resources.getDimension(R.dimen.layout_dp_0), - resources.getDimension(R.dimen.layout_dp_0), - resources.getDimension(R.dimen.layout_dp_8), - resources.getDimension(R.dimen.layout_dp_8) + resources.getDimension(CommonR.dimen.layout_dp_8), + resources.getDimension(CommonR.dimen.layout_dp_8), + resources.getDimension(CommonR.dimen.layout_dp_0), + resources.getDimension(CommonR.dimen.layout_dp_0), + resources.getDimension(CommonR.dimen.layout_dp_0), + resources.getDimension(CommonR.dimen.layout_dp_0), + resources.getDimension(CommonR.dimen.layout_dp_8), + resources.getDimension(CommonR.dimen.layout_dp_8) ) } else { widgetDrawable.cornerRadii = floatArrayOf( - resources.getDimension(R.dimen.layout_dp_0), - resources.getDimension(R.dimen.layout_dp_0), - resources.getDimension(R.dimen.layout_dp_8), - resources.getDimension(R.dimen.layout_dp_8), - resources.getDimension(R.dimen.layout_dp_8), - resources.getDimension(R.dimen.layout_dp_8), - resources.getDimension(R.dimen.layout_dp_0), - resources.getDimension(R.dimen.layout_dp_0) + resources.getDimension(CommonR.dimen.layout_dp_0), + resources.getDimension(CommonR.dimen.layout_dp_0), + resources.getDimension(CommonR.dimen.layout_dp_8), + resources.getDimension(CommonR.dimen.layout_dp_8), + resources.getDimension(CommonR.dimen.layout_dp_8), + resources.getDimension(CommonR.dimen.layout_dp_8), + resources.getDimension(CommonR.dimen.layout_dp_0), + resources.getDimension(CommonR.dimen.layout_dp_0) ) } return widgetDrawable @@ -160,4 +162,4 @@ class SwitchSelectionWidget @JvmOverloads constructor( } return null } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/TextInputWidget.kt b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/TextInputWidget.kt index 19f6f849ea..1c2b6137d4 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/TextInputWidget.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/TextInputWidget.kt @@ -7,6 +7,8 @@ package com.navi.insurance.common.widgets +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.graphics.drawable.GradientDrawable @@ -67,11 +69,11 @@ class TextInputWidget @JvmOverloads constructor( val widgetDrawable = GradientDrawable() widgetDrawable.shape = GradientDrawable.RECTANGLE widgetDrawable.setColor(Color.WHITE) - widgetDrawable.cornerRadius = resources.getDimension(R.dimen.layout_dp_8) + widgetDrawable.cornerRadius = resources.getDimension(CommonR.dimen.layout_dp_8) context?.run { widgetDrawable.setStroke( resources.getDimension(R.dimen.dp_1).toInt(), - ContextCompat.getColor(this, R.color.blueberry) + ContextCompat.getColor(this, DesignR.color.blueberry) ) } return widgetDrawable diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/TextWithElevatedIconWidget.kt b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/TextWithElevatedIconWidget.kt index 0ce7f3e47c..f41e0930d3 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/TextWithElevatedIconWidget.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/TextWithElevatedIconWidget.kt @@ -1,5 +1,6 @@ package com.navi.insurance.common.widgets +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -48,8 +49,8 @@ class TextWithElevatedIconWidget @JvmOverloads constructor( Glide.with(context) .load(leftIconId) - .placeholder(R.drawable.widget_image_placeholder) - .error(R.drawable.widget_image_placeholder) + .placeholder(WidgetsR.drawable.widget_image_placeholder) + .error(WidgetsR.drawable.widget_image_placeholder) .into(binding.icon) leftIcon?.color?.takeIf { isValidHexColor(it) }?.let { @@ -60,8 +61,8 @@ class TextWithElevatedIconWidget @JvmOverloads constructor( Glide.with(context) .load(rightIconId) - .placeholder(com.navi.common.R.drawable.widget_image_placeholder) - .error(R.drawable.widget_image_placeholder) + .placeholder(WidgetsR.drawable.widget_image_placeholder) + .error(WidgetsR.drawable.widget_image_placeholder) .into(binding.endIconIv) rightIcon?.color?.takeIf { isValidHexColor(it) }?.let { @@ -85,4 +86,4 @@ class TextWithElevatedIconWidget @JvmOverloads constructor( fun getDivider(): View = binding.divider -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/TitleWithSummaryLayout.kt b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/TitleWithSummaryLayout.kt index 43b48bca1f..234f250267 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/TitleWithSummaryLayout.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/TitleWithSummaryLayout.kt @@ -7,6 +7,7 @@ package com.navi.insurance.common.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -92,10 +93,10 @@ class TitleWithSummaryLayout @JvmOverloads constructor( if (!isItemValid.orTrue()) { val itemView = binding?.listHolderLayout?.getChildAt(index) itemView?.findViewById(R.id.title)?.setTextColor( - ResourcesCompat.getColor(context.resources, R.color.color_EF0000, null) + ResourcesCompat.getColor(context.resources, DesignR.color.color_EF0000, null) ) itemView?.findViewById(R.id.subtitle)?.setTextColor( - ResourcesCompat.getColor(context.resources, R.color.color_EF0000, null) + ResourcesCompat.getColor(context.resources, DesignR.color.color_EF0000, null) ) itemView?.startAnimation( diff --git a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/UploadCardWidgetView.kt b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/UploadCardWidgetView.kt index 0df5fa7a1a..adc66d2591 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/common/widgets/UploadCardWidgetView.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/common/widgets/UploadCardWidgetView.kt @@ -1,5 +1,6 @@ package com.navi.insurance.common.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -271,7 +272,7 @@ class UploadCardWidgetView @JvmOverloads constructor( tips.forEach { getTooltipItem( it, - ContextCompat.getColor(context, R.color.naviSubText) + ContextCompat.getColor(context, DesignR.color.naviSubText) ).let { view -> binding.suggestionLayout.addView(view) } diff --git a/navi-insurance/src/main/java/com/navi/insurance/eia/EIAFormFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/eia/EIAFormFragment.kt index 7b71f90957..7458ed009f 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/eia/EIAFormFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/eia/EIAFormFragment.kt @@ -7,6 +7,7 @@ package com.navi.insurance.eia +import com.navi.design.R as DesignR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -86,7 +87,7 @@ class EIAFormFragment : BaseFragment(), IdentifyableTextWatcherCallback { view.findViewById(R.id.title).text = getString(R.string.eia_number) val colorMap = mapOf( Pair( - EIAConstants.VERIFIED, getColor(R.color.blueberry) + EIAConstants.VERIFIED, getColor(DesignR.color.blueberry) ), Pair( EIAConstants.SUBMITTED, getColor(R.color.rating_yellow) @@ -95,7 +96,7 @@ class EIAFormFragment : BaseFragment(), IdentifyableTextWatcherCallback { EIAConstants.DOCUMENT_SUBMITTED, getColor(R.color.rating_yellow) ), Pair( - EIAConstants.REJECTED, getColor(R.color.alert_red) + EIAConstants.REJECTED, getColor(DesignR.color.alert_red) ) ) adapter = EIAAdapter(colorMap, this, analyticsHandler) diff --git a/navi-insurance/src/main/java/com/navi/insurance/eia/adapter/EIAAdapter.kt b/navi-insurance/src/main/java/com/navi/insurance/eia/adapter/EIAAdapter.kt index 5f8a187483..0242337bfd 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/eia/adapter/EIAAdapter.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/eia/adapter/EIAAdapter.kt @@ -7,6 +7,7 @@ package com.navi.insurance.eia.adapter +import com.navi.design.R as DesignR import android.graphics.Color import android.graphics.drawable.GradientDrawable import android.text.InputType @@ -105,13 +106,13 @@ class EIAAdapter( holder.binding.policyHolderText.setTextColor( ContextCompat.getColor( holder.binding.policyHolderText.context, - R.color.naviSubText + DesignR.color.naviSubText ) ) holder.binding.eiaNumber.setTextColor( ContextCompat.getColor( holder.binding.eiaNumber.context, - R.color.naviSubText + DesignR.color.naviSubText ) ) } else { @@ -130,13 +131,13 @@ class EIAAdapter( holder.binding.policyHolderText.setTextColor( ContextCompat.getColor( holder.binding.policyHolderText.context, - R.color.naviGrey + DesignR.color.naviGrey ) ) holder.binding.eiaNumber.setTextColor( ContextCompat.getColor( holder.binding.eiaNumber.context, - R.color.naviGrey + DesignR.color.naviGrey ) ) } @@ -185,4 +186,4 @@ class EIAAdapter( override fun onTextChanged(uniqueness: String, text: String) { eiaMap[uniqueness] = text } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/external_porting/fragment/ApologyFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/external_porting/fragment/ApologyFragment.kt index 17c331dc9b..2e578fd68f 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/external_porting/fragment/ApologyFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/external_porting/fragment/ApologyFragment.kt @@ -7,6 +7,7 @@ package com.navi.insurance.external_porting.fragment +import com.navi.design.R as DesignR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -146,7 +147,7 @@ class ApologyFragment : BaseFragment(), ActionHandler.ActionOwner { title.text = data.header?.text leftIcon.setImageResource(IconUtil.getIconDrawableResource(data.header?.leftIcon)) rightIcon.setImageResource(IconUtil.getIconDrawableResource(data.header?.rightIcon)) - rightIcon.setColorFilter(ResourcesCompat.getColor(resources, R.color.naviSubText, null)) + rightIcon.setColorFilter(ResourcesCompat.getColor(resources, DesignR.color.naviSubText, null)) leftIcon.setOnClickListener { analyticsEventTracker.backButtonPressed( mapOf( diff --git a/navi-insurance/src/main/java/com/navi/insurance/external_porting/ui/fragment/ExternalPortingBaseFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/external_porting/ui/fragment/ExternalPortingBaseFragment.kt index 663b7a0c79..25ccd6fb10 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/external_porting/ui/fragment/ExternalPortingBaseFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/external_porting/ui/fragment/ExternalPortingBaseFragment.kt @@ -7,6 +7,7 @@ package com.navi.insurance.external_porting.ui.fragment +import com.navi.common.R as CommonR import android.content.Intent import android.os.Bundle import android.view.View @@ -61,7 +62,7 @@ abstract class ExternalPortingBaseFragment : BaseFragment(), ActionHandler.Actio if ( !tryHandleError( err, - actionMessage = resources.getString(R.string.retry_label), + actionMessage = resources.getString(CommonR.string.retry_label), actionCallback = getRetryAction(err), containerId = (activity as? ExternalPortingBaseActivity)?.getContainerId() ) diff --git a/navi-insurance/src/main/java/com/navi/insurance/formbase/adapters/ExpandableQuesAdapter.kt b/navi-insurance/src/main/java/com/navi/insurance/formbase/adapters/ExpandableQuesAdapter.kt index 887cac5b88..bcc04a46bd 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/formbase/adapters/ExpandableQuesAdapter.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/formbase/adapters/ExpandableQuesAdapter.kt @@ -1,5 +1,7 @@ package com.navi.insurance.formbase.adapters +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.content.Context import android.graphics.drawable.Drawable import android.text.Spannable @@ -138,7 +140,7 @@ class ExpandableQuesAdapter( ) { val drawable: Drawable? = ResourcesCompat.getDrawable( context.resources, - R.drawable.ic_grey_dark_info_new, + WidgetsR.drawable.ic_grey_dark_info_new, null ) drawable?.let { drawable -> @@ -200,8 +202,8 @@ class ExpandableQuesAdapter( } private fun setExpandableArrowIcon(expanded: Boolean, arrowDown: AppCompatImageView) { - if (expanded) arrowDown.setBackgroundResource(R.drawable.ic_arrow_up_small_blue) - else arrowDown.setBackgroundResource(R.drawable.ic_arrow_down_small_blue) + if (expanded) arrowDown.setBackgroundResource(DesignR.drawable.ic_arrow_up_small_blue) + else arrowDown.setBackgroundResource(DesignR.drawable.ic_arrow_down_small_blue) } private fun setExpandableQuesClickListener( diff --git a/navi-insurance/src/main/java/com/navi/insurance/formbase/views/AmountExplainerTextWidget.kt b/navi-insurance/src/main/java/com/navi/insurance/formbase/views/AmountExplainerTextWidget.kt index 8b24bf5604..94b5615023 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/formbase/views/AmountExplainerTextWidget.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/formbase/views/AmountExplainerTextWidget.kt @@ -7,6 +7,7 @@ package com.navi.insurance.formbase.views +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -65,7 +66,7 @@ constructor(context: Context, attrs: AttributeSet? = null) : FormBaseWidgetView( binding.bottomIconIv.setImageResource( IconUtil.getIconDrawableResource( widgetData.bottomTextData?.iconCode, - R.drawable.widget_image_placeholder + WidgetsR.drawable.widget_image_placeholder ) ) widgetData.lineItemList?.forEachIndexed { index, lineItem -> diff --git a/navi-insurance/src/main/java/com/navi/insurance/formbase/views/CheckListAdapter.kt b/navi-insurance/src/main/java/com/navi/insurance/formbase/views/CheckListAdapter.kt index 0e16bb0e8a..eb6ff5b60f 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/formbase/views/CheckListAdapter.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/formbase/views/CheckListAdapter.kt @@ -1,5 +1,6 @@ package com.navi.insurance.formbase.views +import com.navi.design.R as DesignR import android.content.Context import android.view.LayoutInflater import android.view.View @@ -147,8 +148,8 @@ class CheckListAdapter( } private fun setArrowIcon(expanded: Boolean, arrowDown: ImageView) { - if (expanded) arrowDown.setBackgroundResource(com.navi.naviwidgets.R.drawable.ic_arrow_up_small_purple) - else arrowDown.setBackgroundResource(com.navi.naviwidgets.R.drawable.ic_arrow_down_small_purple) + if (expanded) arrowDown.setBackgroundResource(DesignR.drawable.ic_arrow_up_small_purple) + else arrowDown.setBackgroundResource(DesignR.drawable.ic_arrow_down_small_purple) } private fun setPillGridData( @@ -194,11 +195,11 @@ class CheckListAdapter( context?.let { context -> if (selectedState) { val pillTv = pillView.findViewById(R.id.pill_btn) - pillTv.setTextColor(ContextCompat.getColor(context, R.color.blueberry)) + pillTv.setTextColor(ContextCompat.getColor(context, DesignR.color.blueberry)) pillTv.background = getNaviDrawable( cornerRadius = context.resources.getDimensionPixelSize(R.dimen.dp_18), - strokeColor = ContextCompat.getColor(context, R.color.blueberry), + strokeColor = ContextCompat.getColor(context, DesignR.color.blueberry), strokeWidth = context.resources.getDimensionPixelSize(R.dimen.dp_1), backgroundColor = ContextCompat.getColor(context, R.color.white) ) @@ -209,7 +210,7 @@ class CheckListAdapter( getNaviDrawable( cornerRadius = context.resources.getDimensionPixelSize(R.dimen.dp_18), backgroundColor = - ContextCompat.getColor(context, R.color.naviBorderLightGrey) + ContextCompat.getColor(context, DesignR.color.naviBorderLightGrey) ) } pillView.tag = pillItem.copy(isSelected = selectedState) diff --git a/navi-insurance/src/main/java/com/navi/insurance/formbase/views/MemberDetailInputWidget.kt b/navi-insurance/src/main/java/com/navi/insurance/formbase/views/MemberDetailInputWidget.kt index 18027ce9be..7e1e24ff8c 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/formbase/views/MemberDetailInputWidget.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/formbase/views/MemberDetailInputWidget.kt @@ -7,6 +7,7 @@ package com.navi.insurance.formbase.views +import com.navi.common.R as CommonR import android.app.Activity import android.content.Context import android.graphics.Point @@ -193,7 +194,7 @@ class MemberDetailInputWidget(context: Context, attrs: AttributeSet? = null) : option!! }?.toTypedArray() ?: emptyArray() val items: Array = dataList.map { it.name!! }.toTypedArray() - customSpinner.setData(items, resources.getString(R.string.select)) + customSpinner.setData(items, resources.getString(CommonR.string.select)) if (selectedItemPosition != -1) { customSpinner.setSelection(selectedItemPosition) } @@ -219,7 +220,7 @@ class MemberDetailInputWidget(context: Context, attrs: AttributeSet? = null) : customSpinner.tag = dataList[position].id } errorTextView.visibility = - if (customSpinner.selectedItem == resources.getString(R.string.select)) { + if (customSpinner.selectedItem == resources.getString(CommonR.string.select)) { View.VISIBLE } else { View.GONE @@ -501,8 +502,8 @@ class MemberDetailInputWidget(context: Context, attrs: AttributeSet? = null) : private fun validateAppointeeRelation(relation: String) { isValid = - isValid && (relation.isBlank() || relation.equals(resources.getString(R.string.select))).not() - if (!isValid && (relation.isBlank() || relation.equals(resources.getString(R.string.select)))) { + isValid && (relation.isBlank() || relation.equals(resources.getString(CommonR.string.select))).not() + if (!isValid && (relation.isBlank() || relation.equals(resources.getString(CommonR.string.select)))) { binding.policyDetailsAppointeeRelationship.isFocusableInTouchMode = false binding.appointeeRelationSelectErrorTv.visibility = VISIBLE @@ -618,8 +619,8 @@ class MemberDetailInputWidget(context: Context, attrs: AttributeSet? = null) : relation: String ) { isValid = - isValid && !(relation.isBlank() || relation.equals(resources.getString(R.string.select))) - if (!isValid && (relation.isBlank() || relation.equals(resources.getString(R.string.select)))) { + isValid && !(relation.isBlank() || relation.equals(resources.getString(CommonR.string.select))) + if (!isValid && (relation.isBlank() || relation.equals(resources.getString(CommonR.string.select)))) { binding.policyDetailsNomineeRelationship.isFocusableInTouchMode = false binding.policyDetailsNomineeRelationship.requestFocus() binding.relationshipSelectErrorTv.visibility = VISIBLE diff --git a/navi-insurance/src/main/java/com/navi/insurance/formbase/views/ProgressBarAmountBreakupWidget.kt b/navi-insurance/src/main/java/com/navi/insurance/formbase/views/ProgressBarAmountBreakupWidget.kt index 05e34ea543..7ddc3958ec 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/formbase/views/ProgressBarAmountBreakupWidget.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/formbase/views/ProgressBarAmountBreakupWidget.kt @@ -7,6 +7,7 @@ package com.navi.insurance.formbase.views +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -146,7 +147,7 @@ constructor(context: Context, attrs: AttributeSet? = null) : FormBaseWidgetView( } if (leftBarValue == 0.0 && rightBarValue == 0.0) { - binding.emptyBarTv.setTextColor(ContextCompat.getColor(context, R.color.dim_grey)) + binding.emptyBarTv.setTextColor(ContextCompat.getColor(context, DesignR.color.dim_grey)) } else { binding.emptyBarTv.setTextColor(ContextCompat.getColor(context, R.color.light_grey_99)) } diff --git a/navi-insurance/src/main/java/com/navi/insurance/formbase/views/SelectorIconUtils.kt b/navi-insurance/src/main/java/com/navi/insurance/formbase/views/SelectorIconUtils.kt index 72027e737b..80336656bf 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/formbase/views/SelectorIconUtils.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/formbase/views/SelectorIconUtils.kt @@ -1,5 +1,6 @@ package com.navi.insurance.formbase.views +import com.navi.naviwidgets.R as WidgetsR import com.navi.insurance.R object SelectorIconUtils { @@ -9,18 +10,18 @@ object SelectorIconUtils { return when(isSelected) { true -> { when(iconType) { - CHECK_BOX -> R.drawable.ic_tick_blue_rectangle - RADIO_BUTTON -> R.drawable.radio_button_checked_blue + CHECK_BOX -> WidgetsR.drawable.ic_tick_blue_rectangle + RADIO_BUTTON -> WidgetsR.drawable.radio_button_checked_blue else -> R.drawable.health_red_dot } } else -> { when(iconType) { - CHECK_BOX -> R.drawable.ic_unchecked_box - RADIO_BUTTON -> R.drawable.radio_button_unchecked_grey + CHECK_BOX -> WidgetsR.drawable.ic_unchecked_box + RADIO_BUTTON -> WidgetsR.drawable.radio_button_unchecked_grey else -> R.drawable.health_red_dot } } } } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/formbase/views/SingleChoiceRadioItemView.kt b/navi-insurance/src/main/java/com/navi/insurance/formbase/views/SingleChoiceRadioItemView.kt index 8ade4a4447..358d20c4be 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/formbase/views/SingleChoiceRadioItemView.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/formbase/views/SingleChoiceRadioItemView.kt @@ -7,6 +7,8 @@ package com.navi.insurance.formbase.views +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.graphics.drawable.GradientDrawable @@ -53,7 +55,7 @@ class SingleChoiceRadioItemView @JvmOverloads constructor( title.setTextFieldData(data.title) val imageResId = if (data.isSelected == true) { subtitle.isVisible = true - R.drawable.radio_button_checked_blue + WidgetsR.drawable.radio_button_checked_blue } else { subtitle.isVisible = false title.setFontStyle(FontWeightEnum.TT_REGULAR) @@ -61,11 +63,11 @@ class SingleChoiceRadioItemView @JvmOverloads constructor( title.setTextColor( ContextCompat.getColor( context, - R.color.dim_grey + DesignR.color.dim_grey ) ) } - R.drawable.radio_button_unchecked_grey + WidgetsR.drawable.radio_button_unchecked_grey } tag = data.widgetKey @@ -104,12 +106,12 @@ class SingleChoiceRadioItemView @JvmOverloads constructor( title.setTextColor( ContextCompat.getColor( context, - R.color.dim_grey + DesignR.color.dim_grey ) ) } selectorImage.setImageDrawable( - ResourcesCompat.getDrawable(resources, R.drawable.radio_button_unchecked_grey, null) + ResourcesCompat.getDrawable(resources, WidgetsR.drawable.radio_button_unchecked_grey, null) ) } } @@ -128,7 +130,7 @@ class SingleChoiceRadioItemView @JvmOverloads constructor( ) } selectorImage.setImageDrawable( - ResourcesCompat.getDrawable(resources, R.drawable.radio_button_checked_blue, null) + ResourcesCompat.getDrawable(resources, WidgetsR.drawable.radio_button_checked_blue, null) ) } } @@ -165,4 +167,4 @@ class SingleChoiceRadioItemView @JvmOverloads constructor( binding = null } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/formbase/views/TabWithPickerWidgetLayout.kt b/navi-insurance/src/main/java/com/navi/insurance/formbase/views/TabWithPickerWidgetLayout.kt index b9de409dd5..50d3e45d30 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/formbase/views/TabWithPickerWidgetLayout.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/formbase/views/TabWithPickerWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.insurance.formbase.views +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.util.TypedValue @@ -238,7 +239,7 @@ class TabWithPickerWidgetLayout @JvmOverloads constructor( ) child.background = getNaviDrawable( - backgroundColor = ContextCompat.getColor(context, R.color.color_EAF2FF), + backgroundColor = ContextCompat.getColor(context, DesignR.color.color_EAF2FF), cornerRadius = context.resources.getDimensionPixelSize(R.dimen.dp_8) ) } @@ -280,4 +281,4 @@ class TabWithPickerWidgetLayout @JvmOverloads constructor( } } } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/formbase/views/TitleIconSingleSelectWidget.kt b/navi-insurance/src/main/java/com/navi/insurance/formbase/views/TitleIconSingleSelectWidget.kt index f0a6039cdd..abdd95df4e 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/formbase/views/TitleIconSingleSelectWidget.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/formbase/views/TitleIconSingleSelectWidget.kt @@ -7,6 +7,7 @@ package com.navi.insurance.formbase.views +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -148,7 +149,7 @@ class TitleIconSingleSelectWidget @JvmOverloads constructor( itemBinding.iconIv.setImageResource( IconUtil.getIconDrawableResource( cardData.iconCode, - R.drawable.widget_image_placeholder + WidgetsR.drawable.widget_image_placeholder ) ) itemBinding.root.tag = cardData @@ -173,4 +174,4 @@ class TitleIconSingleSelectWidget @JvmOverloads constructor( fun setLayoutParams(widgetLayoutParams: WidgetLayoutParams) { binding?.rootLl?.let { setWidgetLayoutParams(widgetLayoutParams, it) } } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/formbase/views/TitleSubtitlePillSelectionView.kt b/navi-insurance/src/main/java/com/navi/insurance/formbase/views/TitleSubtitlePillSelectionView.kt index 6c09ab9719..d792cd8a2c 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/formbase/views/TitleSubtitlePillSelectionView.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/formbase/views/TitleSubtitlePillSelectionView.kt @@ -7,6 +7,7 @@ package com.navi.insurance.formbase.views +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -114,12 +115,12 @@ class TitleSubtitlePillSelectionView @JvmOverloads constructor( pillTv.setTextColor( ContextCompat.getColor( context, - R.color.blueberry + DesignR.color.blueberry ) ) pillTv.background = getNaviDrawable( cornerRadius = resources.getDimensionPixelSize(R.dimen.dp_18), - strokeColor = ContextCompat.getColor(context, R.color.blueberry), + strokeColor = ContextCompat.getColor(context, DesignR.color.blueberry), strokeWidth = resources.getDimensionPixelSize(R.dimen.dp_1), backgroundColor = ContextCompat.getColor(context, R.color.white) ) @@ -133,7 +134,7 @@ class TitleSubtitlePillSelectionView @JvmOverloads constructor( ) pillTv.background = getNaviDrawable( cornerRadius = resources.getDimensionPixelSize(R.dimen.dp_18), - backgroundColor = ContextCompat.getColor(context, R.color.naviBorderLightGrey) + backgroundColor = ContextCompat.getColor(context, DesignR.color.naviBorderLightGrey) ) } callback?.invoke( @@ -194,4 +195,4 @@ class TitleSubtitlePillSelectionView @JvmOverloads constructor( data = null binding = null } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/adapter/EmiTimelineAdapter.kt b/navi-insurance/src/main/java/com/navi/insurance/health/adapter/EmiTimelineAdapter.kt index f9b37ee74f..17cf624d1a 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/adapter/EmiTimelineAdapter.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/adapter/EmiTimelineAdapter.kt @@ -7,6 +7,7 @@ package com.navi.insurance.health.adapter +import com.navi.design.R as DesignR import android.content.Context import android.content.res.ColorStateList import android.view.LayoutInflater @@ -156,10 +157,10 @@ class EmiTimelineAdapter( if (emiTimelineItem.isLapsed) { itemView.findViewById(R.id.tv_step_subtitle) - .setTextColor(ContextCompat.getColor(context, R.color.alert_red)) + .setTextColor(ContextCompat.getColor(context, DesignR.color.alert_red)) itemView.findViewById(R.id.tv_step_subtitle).alpha = 1F itemView.findViewById(R.id.iv_step).imageTintList = - ColorStateList.valueOf(ContextCompat.getColor(context, R.color.alert_red)) + ColorStateList.valueOf(ContextCompat.getColor(context, DesignR.color.alert_red)) } } } @@ -173,7 +174,7 @@ class EmiTimelineAdapter( emiTimelineItem.subtitle if (emiTimelineItem.paymentDebitMethod == AUTO_PAY && emiTimelineItem.paymentStatus == FAILED) { itemView.findViewById(R.id.tv_step_subtitle) - .setTextColor(ContextCompat.getColor(context, R.color.alert_red)) + .setTextColor(ContextCompat.getColor(context, DesignR.color.alert_red)) } else { itemView.findViewById(R.id.tv_step_subtitle) .setTextColor(ContextCompat.getColor(context, R.color.black)) @@ -182,7 +183,7 @@ class EmiTimelineAdapter( if (emiTimelineItem.isOverdue) { itemView.findViewById(R.id.tv_step_subtitle) - .setTextColor(ContextCompat.getColor(context, R.color.alert_red)) + .setTextColor(ContextCompat.getColor(context, DesignR.color.alert_red)) itemView.findViewById(R.id.tv_step_subtitle).alpha = 1F } @@ -205,4 +206,4 @@ class EmiTimelineAdapter( } } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/adapter/FaqAdapter.kt b/navi-insurance/src/main/java/com/navi/insurance/health/adapter/FaqAdapter.kt index 5c3db39dbf..21741d09a6 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/adapter/FaqAdapter.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/adapter/FaqAdapter.kt @@ -7,6 +7,7 @@ package com.navi.insurance.health.adapter +import com.navi.design.R as DesignR import android.text.method.LinkMovementMethod import android.view.LayoutInflater import android.view.View @@ -75,7 +76,7 @@ class FaqAdapter(private var faqList: List) : faqView.findViewById(R.id.tv_answer).visibility = View.VISIBLE faqView.findViewById(R.id.divider).visibility = View.VISIBLE faqView.findViewById(R.id.tv_view_hide) - .setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_up_small_blue, 0) + .setCompoundDrawablesWithIntrinsicBounds(0, 0, DesignR.drawable.ic_arrow_up_small_blue, 0) faqView.findViewById(R.id.tv_view_hide).text = faqView.context.getString(R.string.hide) faqView.findViewById(R.id.card_faq_item).background = @@ -88,7 +89,7 @@ class FaqAdapter(private var faqList: List) : .setCompoundDrawablesWithIntrinsicBounds( 0, 0, - R.drawable.ic_arrow_down_small_blue, + DesignR.drawable.ic_arrow_down_small_blue, 0 ) faqView.findViewById(R.id.tv_view_hide).text = @@ -99,4 +100,4 @@ class FaqAdapter(private var faqList: List) : } } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/adapter/HospitalVerticalListAdapter.kt b/navi-insurance/src/main/java/com/navi/insurance/health/adapter/HospitalVerticalListAdapter.kt index 479bd4a161..dfb1726aad 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/adapter/HospitalVerticalListAdapter.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/adapter/HospitalVerticalListAdapter.kt @@ -7,6 +7,7 @@ package com.navi.insurance.health.adapter +import com.navi.design.R as DesignR import android.content.Context import android.content.Intent import android.net.Uri @@ -82,7 +83,7 @@ class HospitalVerticalListAdapter( searchString?.let { // To change text color of the searched text in results hospitalView.findViewById(R.id.item_title) - .setTextColor(ContextCompat.getColor(context, R.color.naviGrey)) + .setTextColor(ContextCompat.getColor(context, DesignR.color.naviGrey)) var hospitalName: String = hospital.hospital?.name?.toLowerCase() ?: "" @@ -149,4 +150,3 @@ class HospitalVerticalListAdapter( return messageList.get(position) } } - diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/adapter/PlacePredictionAdapter.kt b/navi-insurance/src/main/java/com/navi/insurance/health/adapter/PlacePredictionAdapter.kt index 2ed854d104..d1eb31ec01 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/adapter/PlacePredictionAdapter.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/adapter/PlacePredictionAdapter.kt @@ -7,6 +7,7 @@ package com.navi.insurance.health.adapter +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Typeface import android.text.Spannable @@ -76,7 +77,7 @@ class PlacePredictionAdapter() : searchString?.let { // To change text color of the searched text in results - title.setTextColor(ContextCompat.getColor(context, R.color.naviGrey)) + title.setTextColor(ContextCompat.getColor(context, DesignR.color.naviGrey)) var placeName: String = prediction.getPrimaryText(StyleSpan(Typeface.NORMAL)).toString() if (placeName.toLowerCase().contains(searchString!!.toLowerCase())) { @@ -99,4 +100,4 @@ class PlacePredictionAdapter() : address.text = prediction.getSecondaryText(StyleSpan(Typeface.NORMAL)) } } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/DeductibleHelpBottomSheet.kt b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/DeductibleHelpBottomSheet.kt index 3301375a7f..1f2e1dd31d 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/DeductibleHelpBottomSheet.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/DeductibleHelpBottomSheet.kt @@ -7,6 +7,8 @@ package com.navi.insurance.health.fragment +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -164,7 +166,7 @@ class DeductibleHelpBottomSheet : BaseBottomSheet() { itemView.findViewById(R.id.pill_btn)?.setTextColor( ContextCompat.getColor( this, - R.color.blueberry + DesignR.color.blueberry ) ) } @@ -175,7 +177,7 @@ class DeductibleHelpBottomSheet : BaseBottomSheet() { val screenSize = getScreenWidth() var currentItemWidth = - (screenSize.toDouble() - resources.getDimension(R.dimen.layout_dp_48)) / columnCount.toDouble() + (screenSize.toDouble() - resources.getDimension(CommonR.dimen.layout_dp_48)) / columnCount.toDouble() itemViewBinding?.root?.layoutParams?.width = currentItemWidth.toInt() } @@ -195,4 +197,4 @@ class DeductibleHelpBottomSheet : BaseBottomSheet() { get() = InsuranceAnalyticsConstants.DEDUCTIBLE_HELP_BOTTOM_SHEET -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/FeedbackFormFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/FeedbackFormFragment.kt index bb08f953a3..2524d7f8a3 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/FeedbackFormFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/FeedbackFormFragment.kt @@ -7,6 +7,8 @@ package com.navi.insurance.health.fragment +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.os.Bundle import android.text.Editable import android.text.TextWatcher @@ -197,7 +199,7 @@ class FeedbackFormFragment: GiBaseFragment(), WidgetCallback, NaviErrorPageView. private fun getTextWithCheckboxBinding(): TextviewWithCheckboxLayoutBinding { return DataBindingUtil.inflate( LayoutInflater.from(context), - com.navi.naviwidgets.R.layout.textview_with_checkbox_layout, + WidgetsR.layout.textview_with_checkbox_layout, binding.feedbackResponseLl, false ) @@ -218,14 +220,14 @@ class FeedbackFormFragment: GiBaseFragment(), WidgetCallback, NaviErrorPageView. setSubmitButtonTint() textWithCheckboxBinding.checkbox.background = ContextCompat.getDrawable( requireContext(), - com.navi.naviwidgets.R.drawable.ic_tick_orange_rectangle + WidgetsR.drawable.ic_tick_orange_rectangle ) if(reason.showTextInput == true){ textWithCheckboxBinding.userInput.hideCutCopyMenuPopUp() textWithCheckboxBinding.userInput.isVisible = true if(userInputs.get(reason.id)?.isEmpty() == true){ textWithCheckboxBinding.userInput.hint = reason.textInputHint - textWithCheckboxBinding.userInput.setHintTextColor(ResourcesCompat.getColor(resources, com.navi.naviwidgets.R.color.backgroundColor5, null)) + textWithCheckboxBinding.userInput.setHintTextColor(ResourcesCompat.getColor(resources, DesignR.color.backgroundColor5, null)) } else{ textWithCheckboxBinding.userInput.setText(userInputs[reason.id]) @@ -245,8 +247,8 @@ class FeedbackFormFragment: GiBaseFragment(), WidgetCallback, NaviErrorPageView. setSubmitButtonTint() textWithCheckboxBinding.checkbox.background = getNaviDrawable( cornerRadius = resources.getDimensionPixelSize(R.dimen.dp_4), - backgroundColor = ResourcesCompat.getColor(resources, com.navi.naviwidgets.R.color.backgroundColor4, null), - strokeColor = ResourcesCompat.getColor(resources, com.navi.naviwidgets.R.color.descriptionColor6, null), + backgroundColor = ResourcesCompat.getColor(resources, DesignR.color.backgroundColor4, null), + strokeColor = ResourcesCompat.getColor(resources, DesignR.color.descriptionColor6, null), ) textWithCheckboxBinding.userInput.apply { this.hideCutCopyMenuPopUp() diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/HospitalsFragmentV2.kt b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/HospitalsFragmentV2.kt index d566e51b68..030cf8961b 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/HospitalsFragmentV2.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/HospitalsFragmentV2.kt @@ -7,6 +7,7 @@ package com.navi.insurance.health.fragment +import com.navi.design.R as DesignR import android.Manifest import android.app.Activity import android.content.Intent @@ -950,7 +951,7 @@ class HospitalsFragmentV2 : if (isAdded) { binding.title.tvSearch.text = getString(R.string.default_hint_search) binding.title.tvSearch.setTextColor( - ContextCompat.getColor(requireContext(), R.color.naviGrey) + ContextCompat.getColor(requireContext(), DesignR.color.naviGrey) ) } } diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/LandingPageVpItemFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/LandingPageVpItemFragment.kt index 1a221d6dde..a5811d4592 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/LandingPageVpItemFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/LandingPageVpItemFragment.kt @@ -7,6 +7,7 @@ package com.navi.insurance.health.fragment +import com.navi.naviwidgets.R as WidgetsR import android.graphics.drawable.Drawable import android.os.Bundle import android.view.LayoutInflater @@ -90,7 +91,7 @@ class LandingPageVpItemFragment : BaseFragment() { Glide .with(it) .load(url) - .placeholder(it.getDrawable(R.drawable.widget_image_placeholder)) + .placeholder(it.getDrawable(WidgetsR.drawable.widget_image_placeholder)) .diskCacheStrategy(DiskCacheStrategy.DATA) .listener(object : RequestListener { override fun onLoadFailed( @@ -184,4 +185,4 @@ class LandingPageVpItemFragment : BaseFragment() { } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PaymentAttentionBottomSheet.kt b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PaymentAttentionBottomSheet.kt index e44de526ce..00c2f43d74 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PaymentAttentionBottomSheet.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PaymentAttentionBottomSheet.kt @@ -1,5 +1,6 @@ package com.navi.insurance.health.fragment +import com.navi.naviwidgets.R as WidgetsR import android.content.DialogInterface import android.os.Bundle import android.view.LayoutInflater @@ -99,7 +100,7 @@ class PaymentAttentionBottomSheet : BaseBottomSheet() { removeAllViews() items?.forEachIndexed { index, data -> val inflater = LayoutInflater.from(context) - val view = inflater.inflate(com.navi.naviwidgets.R.layout.text_item, this, false) + val view = inflater.inflate(WidgetsR.layout.text_item, this, false) val binding: TextItemBinding? = DataBindingUtil.bind(view) binding?.apply { icon.setImageFieldData(data.icon) @@ -294,4 +295,4 @@ class PaymentAttentionBottomSheet : BaseBottomSheet() { interface AttentionSheetListener { fun onAttentionClick(type: String? = null) } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PaymentMethodSelectionFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PaymentMethodSelectionFragment.kt index f49032ab97..686f8aff14 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PaymentMethodSelectionFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PaymentMethodSelectionFragment.kt @@ -7,6 +7,8 @@ package com.navi.insurance.health.fragment +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.graphics.Color import android.graphics.drawable.Drawable import android.os.Bundle @@ -197,7 +199,7 @@ class PaymentMethodSelectionFragment : if (!FirebaseRemoteConfigHelper.getBoolean("AB_TEST_SHOW_OLD_SHARE_ICON")) { binding.title.shareBtn.setImageResource(R.drawable.share_blue_whatsapp) } - binding.title.shareBtn.setColorFilter(resources.getColor(R.color.naviSubText)) + binding.title.shareBtn.setColorFilter(resources.getColor(DesignR.color.naviSubText)) binding.title.helpButton.visibility = View.VISIBLE if (FirebaseRemoteConfigHelper.getBoolean("AB_TEST_SHOW_REVIEW_POLICY_SECTION")) { @@ -501,7 +503,7 @@ class PaymentMethodSelectionFragment : override fun onLoadCleared(placeholder: Drawable?) { binding.paymentOfferContainer.offerCalloutTv .setCompoundDrawablesWithIntrinsicBounds( - com.navi.common.R.drawable.widget_image_placeholder, + WidgetsR.drawable.widget_image_placeholder, 0, 0, 0 @@ -692,12 +694,12 @@ class PaymentMethodSelectionFragment : binding.layoutPaymentMethod.itemSelectedFullPayment.isChecked = true if (isMinimumOsVersionM()) { binding.layoutPaymentMethod.paymentInfoTypeFullPaymentTxt.setTextAppearance( - R.style.MediumTextFontBoldStyle + WidgetsR.style.MediumTextFontBoldStyle ) } else { binding.layoutPaymentMethod.paymentInfoTypeFullPaymentTxt.setTextAppearance( context, - R.style.MediumTextFontBoldStyle + WidgetsR.style.MediumTextFontBoldStyle ) } paymentMode = binding.layoutPaymentMethod.itemSelectedFullPayment.tag as String @@ -721,12 +723,12 @@ class PaymentMethodSelectionFragment : binding.layoutPaymentMethod.itemSelectedFullPayment.isChecked = false if (isMinimumOsVersionM()) { binding.layoutPaymentMethod.paymentInfoTypeFullPaymentTxt.setTextAppearance( - R.style.MediumTextFontStyle + WidgetsR.style.MediumTextFontStyle ) } else { binding.layoutPaymentMethod.paymentInfoTypeFullPaymentTxt.setTextAppearance( context, - R.style.MediumTextFontStyle + WidgetsR.style.MediumTextFontStyle ) } } @@ -737,12 +739,12 @@ class PaymentMethodSelectionFragment : binding.layoutPaymentMethod.itemSelectedEmi.isChecked = true if (isMinimumOsVersionM()) { binding.layoutPaymentMethod.paymentInfoTypeEmiTxt.setTextAppearance( - R.style.MediumTextFontBoldStyle + WidgetsR.style.MediumTextFontBoldStyle ) } else { binding.layoutPaymentMethod.paymentInfoTypeEmiTxt.setTextAppearance( context, - R.style.MediumTextFontBoldStyle + WidgetsR.style.MediumTextFontBoldStyle ) } paymentMode = binding.layoutPaymentMethod.itemSelectedEmi.tag as String @@ -760,12 +762,12 @@ class PaymentMethodSelectionFragment : binding.layoutPaymentMethod.itemSelectedEmi.isChecked = false if (isMinimumOsVersionM()) { binding.layoutPaymentMethod.paymentInfoTypeEmiTxt.setTextAppearance( - R.style.MediumTextFontStyle + WidgetsR.style.MediumTextFontStyle ) } else { binding.layoutPaymentMethod.paymentInfoTypeEmiTxt.setTextAppearance( context, - R.style.MediumTextFontStyle + WidgetsR.style.MediumTextFontStyle ) } } diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PolicySelectionFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PolicySelectionFragment.kt index bb29f08241..8bbc1a5f90 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PolicySelectionFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PolicySelectionFragment.kt @@ -7,6 +7,7 @@ package com.navi.insurance.health.fragment +import com.navi.common.R as CommonR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -58,7 +59,7 @@ class PolicySelectionFragment( false ) - binding.title.title.text = getString(R.string.select_policy) + binding.title.title.text = getString(CommonR.string.select_policy) binding.title.header.setOnClickListener { onBackPressed() } @@ -202,4 +203,4 @@ class PolicySelectionFragment( } } } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/QuoteBenefitsFragmentV2.kt b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/QuoteBenefitsFragmentV2.kt index 4db689b5b2..14cef3c9ec 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/QuoteBenefitsFragmentV2.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/QuoteBenefitsFragmentV2.kt @@ -7,6 +7,7 @@ package com.navi.insurance.health.fragment +import com.navi.design.R as DesignR import android.app.Activity import android.graphics.Typeface import android.os.Bundle @@ -205,7 +206,7 @@ class QuoteBenefitsFragmentV2 : BaseFragment() { ss.setSpan(policyDoc, startIndexPolicy, startIndexPolicy + 17, 0) ss.setSpan( - ForegroundColorSpan(ContextCompat.getColor(requireContext(), R.color.blueberry)), + ForegroundColorSpan(ContextCompat.getColor(requireContext(), DesignR.color.blueberry)), startIndexPolicy, startIndexPolicy + 17, 0 diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/QuoteClaimsFragmentV2.kt b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/QuoteClaimsFragmentV2.kt index 03f2c5f1e0..017160a136 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/QuoteClaimsFragmentV2.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/QuoteClaimsFragmentV2.kt @@ -7,6 +7,7 @@ package com.navi.insurance.health.fragment +import com.navi.design.R as DesignR import android.content.Intent import android.graphics.Typeface import android.os.Bundle @@ -100,7 +101,7 @@ class QuoteClaimsFragmentV2 : BaseFragment() { ss.setSpan(faq, startIndexPolicy, startIndexPolicy + 4, 0) ss.setSpan( - ForegroundColorSpan(ContextCompat.getColor(requireContext(), R.color.blueberry)), + ForegroundColorSpan(ContextCompat.getColor(requireContext(), DesignR.color.blueberry)), startIndexPolicy, startIndexPolicy + 4, 0 @@ -117,4 +118,4 @@ class QuoteClaimsFragmentV2 : BaseFragment() { const val TAG = "QuoteClaimsFragmentV2" } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/SupportHomeFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/SupportHomeFragment.kt index aadd137cab..e0c83f4166 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/SupportHomeFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/SupportHomeFragment.kt @@ -7,6 +7,8 @@ package com.navi.insurance.health.fragment +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR import android.content.Intent import android.net.Uri import android.os.Bundle @@ -329,7 +331,7 @@ class SupportHomeFragment : BaseFragment(), View.OnClickListener { false ) categoryItemView.layoutParams.width = - screenSize / GRID_COLUMN_COUNT - resources.getDimensionPixelSize(R.dimen.layout_dp_30) + screenSize / GRID_COLUMN_COUNT - resources.getDimensionPixelSize(CommonR.dimen.layout_dp_30) categoryItemView.findViewById(R.id.category_item_tv).text = categoryList[index].name categoryItemView @@ -396,7 +398,7 @@ class SupportHomeFragment : BaseFragment(), View.OnClickListener { val spannableString = SpannableString(callUsText) val greyColorStartIndex: Int = callUsText.indexOf(helpCallTimings) spannableString.setSpan( - ForegroundColorSpan(ContextCompat.getColor(requireContext(), R.color.naviGrey)), + ForegroundColorSpan(ContextCompat.getColor(requireContext(), DesignR.color.naviGrey)), greyColorStartIndex, callUsText.length, 0 @@ -404,7 +406,7 @@ class SupportHomeFragment : BaseFragment(), View.OnClickListener { callUsView.findViewById(R.id.question_label_tv).text = spannableString callUsView .findViewById(R.id.question_label_tv) - .setCompoundDrawablesWithIntrinsicBounds(R.drawable.call_black_icon, 0, 0, 0) + .setCompoundDrawablesWithIntrinsicBounds(DesignR.drawable.call_black_icon, 0, 0, 0) callUsView.findViewById(R.id.question_label_tv).compoundDrawablePadding = resources.getDimension(R.dimen.dp_8).roundToInt() callUsView.findViewById(R.id.divider).isVisible = false diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/SupportQuestionAnswerFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/SupportQuestionAnswerFragment.kt index 09cb68d63b..a6e4b68584 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/SupportQuestionAnswerFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/SupportQuestionAnswerFragment.kt @@ -7,6 +7,7 @@ package com.navi.insurance.health.fragment +import com.navi.design.R as DesignR import android.content.Intent import android.net.Uri import android.os.Bundle @@ -150,7 +151,7 @@ open class SupportQuestionAnswerFragment : BaseFragment(), View.OnClickListener val spannableString = SpannableString(callUsText) val greyColorStartIndex: Int = callUsText.indexOf(helpCallTimings) spannableString.setSpan( - ForegroundColorSpan(ContextCompat.getColor(requireContext(), R.color.naviGrey)), + ForegroundColorSpan(ContextCompat.getColor(requireContext(), DesignR.color.naviGrey)), greyColorStartIndex, callUsText.length, 0 diff --git a/navi-insurance/src/main/java/com/navi/insurance/health_risk_score/activity/HealthRiskScoreActivity.kt b/navi-insurance/src/main/java/com/navi/insurance/health_risk_score/activity/HealthRiskScoreActivity.kt index b92769a05d..bd065b7bfd 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health_risk_score/activity/HealthRiskScoreActivity.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health_risk_score/activity/HealthRiskScoreActivity.kt @@ -7,6 +7,7 @@ package com.navi.insurance.health_risk_score.activity +import com.navi.naviwidgets.R as WidgetsR import android.content.Intent import android.os.Bundle import androidx.databinding.DataBindingUtil @@ -45,7 +46,7 @@ class HealthRiskScoreActivity : GiBaseActivity(), HrsBackBottomSheet.HrsButtonCl private var source: String? = null override fun onCreate(savedInstanceState: Bundle?) { - binding = DataBindingUtil.setContentView(this, R.layout.activity_health_risk_score) + binding = DataBindingUtil.setContentView(this, WidgetsR.layout.activity_health_risk_score) super.onCreate(savedInstanceState) source = intent.getStringExtra(SOURCE) val url = getLaunchFragmentUrl(savedInstanceState) @@ -148,5 +149,5 @@ class HealthRiskScoreActivity : GiBaseActivity(), HrsBackBottomSheet.HrsButtonCl } } - override fun getContainerId(): Int = R.id.fragment_container_fl -} \ No newline at end of file + override fun getContainerId(): Int = WidgetsR.id.fragment_container_fl +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/health_risk_score/fragment/HealthRiskLandingFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/health_risk_score/fragment/HealthRiskLandingFragment.kt index fd93a28a56..53d9d91d72 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health_risk_score/fragment/HealthRiskLandingFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health_risk_score/fragment/HealthRiskLandingFragment.kt @@ -7,6 +7,7 @@ package com.navi.insurance.health_risk_score.fragment +import com.navi.naviwidgets.R as WidgetsR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -99,7 +100,7 @@ class HealthRiskLandingFragment : GiBaseFragment() { R.anim.slide_out_right ) .add( - R.id.fragment_container_fl, + WidgetsR.id.fragment_container_fl, HealthRiskQuestionFragment(), HealthRiskQuestionFragment.TAG ) diff --git a/navi-insurance/src/main/java/com/navi/insurance/health_risk_score/fragment/HealthRiskQuestionFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/health_risk_score/fragment/HealthRiskQuestionFragment.kt index b67606c57f..95ccf692ea 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health_risk_score/fragment/HealthRiskQuestionFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health_risk_score/fragment/HealthRiskQuestionFragment.kt @@ -7,6 +7,8 @@ package com.navi.insurance.health_risk_score.fragment +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.content.Context import android.content.Intent import android.os.Bundle @@ -238,7 +240,7 @@ class HealthRiskQuestionFragment : optionView.rootLl.background = getNaviDrawable( cornerRadius = resources.getDimensionPixelSize(R.dimen.dp_8), - backgroundColor = ContextCompat.getColor(context, R.color.black_10) + backgroundColor = ContextCompat.getColor(context, DesignR.color.black_10) ) } @@ -322,7 +324,7 @@ class HealthRiskQuestionFragment : optionView.checkbox.background = getNaviDrawable( cornerRadius = resources.getDimensionPixelSize(R.dimen.dp_8), - backgroundColor = ContextCompat.getColor(context, R.color.black_10) + backgroundColor = ContextCompat.getColor(context, DesignR.color.black_10) ) } @@ -402,7 +404,7 @@ class HealthRiskQuestionFragment : context?.let { context -> checkBox.background = getNaviDrawable( - backgroundColor = ContextCompat.getColor(context, R.color.black_10), + backgroundColor = ContextCompat.getColor(context, DesignR.color.black_10), cornerRadius = context.resources.getDimensionPixelSize(R.dimen.dp_8) ) checkBox.setFontStyle(FontWeightEnum.TT_REGULAR) @@ -437,7 +439,7 @@ class HealthRiskQuestionFragment : val layoutParams = LinearLayout.LayoutParams( resources.getDimensionPixelSize(R.dimen.dp_150), - resources.getDimensionPixelSize(R.dimen.dp_300) + resources.getDimensionPixelSize(DesignR.dimen.dp_300) ) layoutParams.gravity = Gravity.CENTER_HORIZONTAL binding.itemPicker.layoutParams = layoutParams @@ -446,7 +448,7 @@ class HealthRiskQuestionFragment : val layoutParams = LinearLayout.LayoutParams( resources.getDimensionPixelSize(R.dimen.dp_250), - resources.getDimensionPixelSize(R.dimen.dp_300) + resources.getDimensionPixelSize(DesignR.dimen.dp_300) ) binding.itemPicker.setItemSpacing(resources.getDimensionPixelSize(R.dimen.dp_0)) layoutParams.gravity = Gravity.CENTER_HORIZONTAL @@ -731,7 +733,7 @@ class HealthRiskQuestionFragment : ) child.background = getNaviDrawable( - backgroundColor = ContextCompat.getColor(context, R.color.black_10), + backgroundColor = ContextCompat.getColor(context, DesignR.color.black_10), cornerRadius = context.resources.getDimensionPixelSize(R.dimen.dp_8) ) } @@ -838,7 +840,7 @@ class HealthRiskQuestionFragment : // do nothing } - override fun getContainerId(): Int = R.id.fragment_container_fl + override fun getContainerId(): Int = WidgetsR.id.fragment_container_fl override fun onDestroyView() { super.onDestroyView() diff --git a/navi-insurance/src/main/java/com/navi/insurance/health_risk_score/fragment/HealthRiskScoreFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/health_risk_score/fragment/HealthRiskScoreFragment.kt index 3b096f1044..99321aca3b 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health_risk_score/fragment/HealthRiskScoreFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health_risk_score/fragment/HealthRiskScoreFragment.kt @@ -7,6 +7,8 @@ package com.navi.insurance.health_risk_score.fragment +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.graphics.drawable.GradientDrawable @@ -645,7 +647,7 @@ class HealthRiskScoreFragment : GiBaseFragment(), WidgetCallback, Runnable { healthScorePageState: HealthScorePageResponse ) { if (collapsedState) { - binding.acclerometerLayout.shareButton.setImageResource(R.drawable.purple_share_btn) + binding.acclerometerLayout.shareButton.setImageResource(WidgetsR.drawable.purple_share_btn) healthScorePageState.scoreDetails ?.collapsedState ?.cardProperties @@ -678,7 +680,7 @@ class HealthRiskScoreFragment : GiBaseFragment(), WidgetCallback, Runnable { if (healthScorePageState.scoreDetails?.collapsedState?.shareCta == null) { R.dimen.dp_68 } else { - R.dimen.dp_168 + DesignR.dimen.dp_168 } collapse( binding.acclerometerLayout.rootCard, @@ -686,7 +688,7 @@ class HealthRiskScoreFragment : GiBaseFragment(), WidgetCallback, Runnable { resources.getDimensionPixelSize(collapseDimenRes) ) } else { - binding.acclerometerLayout.shareButton.setImageResource(R.drawable.orange_share_btn) + binding.acclerometerLayout.shareButton.setImageResource(WidgetsR.drawable.orange_share_btn) context?.let { context -> val colorDrawable = ColorDrawable(ContextCompat.getColor(context, R.color.white)) binding.acclerometerLayout.rootCard.background = colorDrawable @@ -700,7 +702,7 @@ class HealthRiskScoreFragment : GiBaseFragment(), WidgetCallback, Runnable { if (healthScorePageState.scoreDetails?.collapsedState?.shareCta == null) { R.dimen.dp_220 } else { - R.dimen.dp_332 + DesignR.dimen.dp_332 } expand( binding.acclerometerLayout.rootCard, @@ -772,7 +774,7 @@ class HealthRiskScoreFragment : GiBaseFragment(), WidgetCallback, Runnable { return false } - override fun getContainerId(): Int = R.id.fragment_container_fl + override fun getContainerId(): Int = WidgetsR.id.fragment_container_fl inner class CarouselAdapter(val list: List) : RecyclerView.Adapter() { @@ -884,13 +886,13 @@ class HealthRiskScoreFragment : GiBaseFragment(), WidgetCallback, Runnable { addDotInView( dotsWrapper, resources.getDimensionPixelSize(R.dimen.dp_109), - resources.getDimensionPixelSize(R.dimen.dp_184) + resources.getDimensionPixelSize(DesignR.dimen.dp_184) ) val image4 = addDotInView( dotsWrapper, resources.getDimensionPixelSize(R.dimen.dp_143), - resources.getDimensionPixelSize(R.dimen.dp_184) + resources.getDimensionPixelSize(DesignR.dimen.dp_184) ) mapOfViews[it] = listOf(image1, image2, image3, image4) } @@ -913,7 +915,7 @@ class HealthRiskScoreFragment : GiBaseFragment(), WidgetCallback, Runnable { val image1 = addDotInView( dotsWrapper, - resources.getDimensionPixelSize(R.dimen.dp_132), + resources.getDimensionPixelSize(DesignR.dimen.dp_132), resources.getDimensionPixelSize(R.dimen.dp_83) ) mapOfViews[it] = listOf(image1) @@ -938,13 +940,13 @@ class HealthRiskScoreFragment : GiBaseFragment(), WidgetCallback, Runnable { addDotInView( dotsWrapper, resources.getDimensionPixelSize(R.dimen.dp_112), - resources.getDimensionPixelSize(R.dimen.dp_122) + resources.getDimensionPixelSize(DesignR.dimen.dp_122) ) val image2 = addDotInView( dotsWrapper, resources.getDimensionPixelSize(R.dimen.dp_140), - resources.getDimensionPixelSize(R.dimen.dp_122) + resources.getDimensionPixelSize(DesignR.dimen.dp_122) ) mapOfViews[it] = listOf(image1, image2) } @@ -989,7 +991,7 @@ class HealthRiskScoreFragment : GiBaseFragment(), WidgetCallback, Runnable { addDotInView( dotsWrapper, resources.getDimensionPixelSize(R.dimen.dp_125), - resources.getDimensionPixelSize(R.dimen.dp_33) + resources.getDimensionPixelSize(DesignR.dimen.dp_33) ) mapOfViews[it] = listOf(image1) } diff --git a/navi-insurance/src/main/java/com/navi/insurance/hi_quiz/fragment/HiQuizQuestionFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/hi_quiz/fragment/HiQuizQuestionFragment.kt index 15159dccf6..3138babbb6 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/hi_quiz/fragment/HiQuizQuestionFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/hi_quiz/fragment/HiQuizQuestionFragment.kt @@ -7,6 +7,7 @@ package com.navi.insurance.hi_quiz.fragment +import com.navi.naviwidgets.R as WidgetsR import android.animation.Animator import android.content.res.ColorStateList import android.media.MediaPlayer @@ -391,32 +392,32 @@ class HiQuizQuestionFragment : GiBaseFragment(), HiQuizActivity.BackPressListene index: Int ) { var hapticValue = HapticFeedbackConstants.CLOCK_TICK - var lottieResFile = R.raw.button_confetti - var soundResFile = R.raw.quiz_correct_answer_sound + var lottieResFile = WidgetsR.raw.button_confetti + var soundResFile = WidgetsR.raw.quiz_correct_answer_sound lifecycleScope.launch { when (optionStatus) { OptionStatus.CORRECT -> { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { hapticValue = HapticFeedbackConstants.CONFIRM } - lottieResFile = R.raw.quiz_correct - soundResFile = R.raw.quiz_correct_answer_sound + lottieResFile = WidgetsR.raw.quiz_correct + soundResFile = WidgetsR.raw.quiz_correct_answer_sound setDotColor(correct = true) } OptionStatus.INCORRECT -> { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { hapticValue = HapticFeedbackConstants.REJECT } - lottieResFile = R.raw.quiz_incorrect - soundResFile = R.raw.quiz_wrong_answer_sound + lottieResFile = WidgetsR.raw.quiz_incorrect + soundResFile = WidgetsR.raw.quiz_wrong_answer_sound setDotColor(correct = false) } OptionStatus.TIMEOUT -> { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { hapticValue = HapticFeedbackConstants.REJECT } - lottieResFile = R.raw.quiz_time_up - soundResFile = R.raw.quiz_wrong_answer_sound + lottieResFile = WidgetsR.raw.quiz_time_up + soundResFile = WidgetsR.raw.quiz_wrong_answer_sound setDotColor(correct = false) } } diff --git a/navi-insurance/src/main/java/com/navi/insurance/hi_quiz/fragment/HiQuizResultFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/hi_quiz/fragment/HiQuizResultFragment.kt index accb9fcaca..f67af70c7c 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/hi_quiz/fragment/HiQuizResultFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/hi_quiz/fragment/HiQuizResultFragment.kt @@ -1,5 +1,6 @@ package com.navi.insurance.hi_quiz.fragment +import com.navi.naviwidgets.R as WidgetsR import android.app.Activity import android.content.Intent import android.graphics.Color @@ -149,7 +150,7 @@ class HiQuizResultFragment : GiBaseFragment(), WidgetCallback, HiQuizActivity.Ba private fun setResultData(resultData: QuizResultResponse) { if(showGratificationAnimation) { - val mPlayer: MediaPlayer = MediaPlayer.create(context, R.raw.quiz_complete_sound) + val mPlayer: MediaPlayer = MediaPlayer.create(context, WidgetsR.raw.quiz_complete_sound) mPlayer.start() } resultData.scoreSectionData?.let { @@ -329,4 +330,4 @@ class HiQuizResultFragment : GiBaseFragment(), WidgetCallback, HiQuizActivity.Ba } return false } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/notifications/AppNotification.kt b/navi-insurance/src/main/java/com/navi/insurance/notifications/AppNotification.kt index 26cc467c1b..f842b20fb0 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/notifications/AppNotification.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/notifications/AppNotification.kt @@ -7,6 +7,7 @@ package com.navi.insurance.notifications +import com.navi.common.R as CommonR import android.annotation.TargetApi import android.app.NotificationChannel import android.app.NotificationManager @@ -56,7 +57,7 @@ class AppNotification { ) .setContentText(message) .setAutoCancel(true) - .setSmallIcon(R.drawable.ic_navi_logo_white) + .setSmallIcon(CommonR.drawable.ic_navi_logo_white) .setLargeIcon( BitmapFactory.decodeResource( CommonLibManager.application.resources, diff --git a/navi-insurance/src/main/java/com/navi/insurance/payment/PaymentStatusBottomSheet.kt b/navi-insurance/src/main/java/com/navi/insurance/payment/PaymentStatusBottomSheet.kt index 7cd3faf819..fad36cfec8 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/payment/PaymentStatusBottomSheet.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/payment/PaymentStatusBottomSheet.kt @@ -92,7 +92,7 @@ class PaymentStatusBottomSheet : BaseBottomSheet() { override fun onStart() { super.onStart() - dialog?.window?.decorView?.findViewById(R.id.touch_outside) + dialog?.window?.decorView?.findViewById(com.google.android.material.R.id.touch_outside) ?.setOnTouchListener { v, event -> onTouchEvent(event, ctaData) } diff --git a/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/ChangeDeductibleFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/ChangeDeductibleFragment.kt index bf5996fe3b..98f185a1f1 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/ChangeDeductibleFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/ChangeDeductibleFragment.kt @@ -7,6 +7,7 @@ package com.navi.insurance.quoteredesign.fragments +import com.navi.common.R as CommonR import android.content.Context import android.graphics.Color import android.os.Bundle @@ -177,7 +178,7 @@ class ChangeDeductibleFragment : BaseFragment() { } apiErrorHandler?.handleApiError( - resources.getString(R.string.retry_label), + resources.getString(CommonR.string.retry_label), fetchDeductibleData ) } diff --git a/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/ClaimsSocialValidationBottomSheet.kt b/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/ClaimsSocialValidationBottomSheet.kt index 987fe54b5b..12be07836c 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/ClaimsSocialValidationBottomSheet.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/ClaimsSocialValidationBottomSheet.kt @@ -1,5 +1,6 @@ package com.navi.insurance.quoteredesign.fragments +import com.navi.design.R as DesignR import android.content.Context import android.os.Bundle import android.view.View @@ -99,7 +100,7 @@ class ClaimsSocialValidationBottomSheet: BaseBottomSheet() { hospitalClaimsHug.background = getNaviDrawable( cornerRadius = dpToPxInInt(10), backgroundColor = ResourcesCompat.getColor( - resources, R.color.successColor, null + resources, DesignR.color.successColor, null ) ) } @@ -144,4 +145,4 @@ class ClaimsSocialValidationBottomSheet: BaseBottomSheet() { arguments = Bundle().apply { putParcelable(Constants.DATA, getJsonObject(claimsSocialValidationData)) } } } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/LineTextBottomSheet.kt b/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/LineTextBottomSheet.kt index 85a305c1fe..f8e57f50bb 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/LineTextBottomSheet.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/LineTextBottomSheet.kt @@ -7,6 +7,7 @@ package com.navi.insurance.quoteredesign.fragments +import com.navi.naviwidgets.R as WidgetsR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -82,7 +83,7 @@ class LineTextBottomSheet : BaseBottomSheet() { val viewBinding = DataBindingUtil.inflate( LayoutInflater.from(context), - R.layout.layout_left_right_text, + WidgetsR.layout.layout_left_right_text, binding.lineItemContainer, false ) diff --git a/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/PolicyAddonFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/PolicyAddonFragment.kt index 570432873f..ce123db60f 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/PolicyAddonFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/PolicyAddonFragment.kt @@ -7,6 +7,7 @@ package com.navi.insurance.quoteredesign.fragments +import com.navi.common.R as CommonR import android.content.Context import android.graphics.Color import android.os.Bundle @@ -197,7 +198,7 @@ class PolicyAddonFragment : BaseFragment(), WidgetCallback, View.OnClickListener } } - apiErrorHandler?.handleApiError(resources.getString(R.string.retry_label), fetchAddons) + apiErrorHandler?.handleApiError(resources.getString(CommonR.string.retry_label), fetchAddons) } private fun startFooterLoading() { diff --git a/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/PolicyBenefitsFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/PolicyBenefitsFragment.kt index 5a8ff31f01..4f45262700 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/PolicyBenefitsFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/PolicyBenefitsFragment.kt @@ -7,6 +7,7 @@ package com.navi.insurance.quoteredesign.fragments +import com.navi.common.R as CommonR import android.app.Activity import android.content.Context import android.content.Intent @@ -193,7 +194,7 @@ class PolicyBenefitsFragment : BaseFragment(), WidgetCallback, View.OnClickListe } apiErrorHandler?.handleApiError( - resources.getString(R.string.retry_label), + resources.getString(CommonR.string.retry_label), fetchBenefitsData ) binding.quoteFooterView.getBinding().continueBtn.setOnClickListener(this) diff --git a/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuoteHighlightFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuoteHighlightFragment.kt index 8edcbeace7..d8fb012d80 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuoteHighlightFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuoteHighlightFragment.kt @@ -6,6 +6,9 @@ */ package com.navi.insurance.quoteredesign.fragments +import com.navi.common.R as CommonR +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.graphics.Color import android.graphics.drawable.GradientDrawable import android.os.Bundle @@ -70,7 +73,7 @@ class QuoteHighlightFragment : BottomSheetDialogFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setStyle(STYLE_NORMAL, com.navi.naviwidgets.R.style.SheetDialog) + setStyle(STYLE_NORMAL, WidgetsR.style.SheetDialog) } private fun initUI() { @@ -104,11 +107,11 @@ class QuoteHighlightFragment : BottomSheetDialogFragment() { val preferenceWidgetDrawable = GradientDrawable() preferenceWidgetDrawable.shape = GradientDrawable.RECTANGLE preferenceWidgetDrawable.setColor(Color.WHITE) - preferenceWidgetDrawable.cornerRadius = resources.getDimension(R.dimen.layout_dp_8) + preferenceWidgetDrawable.cornerRadius = resources.getDimension(CommonR.dimen.layout_dp_8) context?.run { preferenceWidgetDrawable.setStroke( resources.getDimension(R.dimen.dp_2).toInt(), - ContextCompat.getColor(this, R.color.blueberry) + ContextCompat.getColor(this, DesignR.color.blueberry) ) } return preferenceWidgetDrawable @@ -118,7 +121,7 @@ class QuoteHighlightFragment : BottomSheetDialogFragment() { val toolTipDrawable = GradientDrawable() toolTipDrawable.shape = GradientDrawable.RECTANGLE toolTipDrawable.setColor(Color.WHITE) - toolTipDrawable.cornerRadius = resources.getDimension(R.dimen.layout_dp_8) + toolTipDrawable.cornerRadius = resources.getDimension(CommonR.dimen.layout_dp_8) binding.tooltipDataLayout.background = toolTipDrawable } @@ -131,4 +134,4 @@ class QuoteHighlightFragment : BottomSheetDialogFragment() { } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuoteOfferFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuoteOfferFragment.kt index f55fde5f5f..e9760db4cb 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuoteOfferFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuoteOfferFragment.kt @@ -7,6 +7,7 @@ package com.navi.insurance.quoteredesign.fragments +import com.navi.common.R as CommonR import android.app.Activity import android.content.Context import android.content.Intent @@ -418,7 +419,7 @@ class QuoteOfferFragment : BaseFragment(), WidgetCallback, View.OnClickListener } apiErrorHandler?.handleApiError( - resources.getString(R.string.retry_label), + resources.getString(CommonR.string.retry_label), fetchCardsOrClearCache ) handleCallbackResponseError() diff --git a/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/holders/PlanListItemVH.kt b/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/holders/PlanListItemVH.kt index 06237c02a8..f15e95a12e 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/holders/PlanListItemVH.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/holders/PlanListItemVH.kt @@ -7,6 +7,7 @@ package com.navi.insurance.quoteredesign.holders +import com.navi.common.R as CommonR import android.view.View.GONE import android.view.View.VISIBLE import android.widget.TextView @@ -36,7 +37,7 @@ class PlanListItemVH(private val binding: PlanListItemBinding) : RecyclerView.Vi textView.visibility = GONE imageView.visibility = VISIBLE if(compareInfoData.iconCode == TICK) { - imageView.setImageResource(R.drawable.check) + imageView.setImageResource(CommonR.drawable.check) } else if (compareInfoData.iconCode == CROSS) { imageView.setImageResource(R.drawable.gi_ic_cross) } @@ -51,4 +52,4 @@ class PlanListItemVH(private val binding: PlanListItemBinding) : RecyclerView.Vi private const val CROSS = "CROSS" private const val TICK = "TICK" } -} \ No newline at end of file +} diff --git a/navi-insurance/src/main/java/com/navi/insurance/util/Utility.kt b/navi-insurance/src/main/java/com/navi/insurance/util/Utility.kt index 2ce23465a5..eb1ed0033e 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/util/Utility.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/util/Utility.kt @@ -519,7 +519,7 @@ fun slideOutFromBottom(view: View?) { fun slideViewFromTop(view: View?) { if (view == null || view.visibility == View.VISIBLE) return - view.startAnimation(AnimationUtils.loadAnimation(view.context, R.anim.slide_up_in)) + view.startAnimation(AnimationUtils.loadAnimation(view.context, com.payu.custombrowser.R.anim.slide_up_in)) view.visibility = View.VISIBLE } diff --git a/navi-pay/src/main/kotlin/com/navi/pay/common/ui/NaviPayCommonView.kt b/navi-pay/src/main/kotlin/com/navi/pay/common/ui/NaviPayCommonView.kt index 07dd1868d1..5e5f833f86 100644 --- a/navi-pay/src/main/kotlin/com/navi/pay/common/ui/NaviPayCommonView.kt +++ b/navi-pay/src/main/kotlin/com/navi/pay/common/ui/NaviPayCommonView.kt @@ -7,6 +7,7 @@ package com.navi.pay.common.ui +import com.navi.common.R as CommonR import androidx.annotation.DrawableRes import androidx.annotation.StringRes import androidx.compose.foundation.BorderStroke @@ -299,7 +300,7 @@ fun BottomSheetContentWithIconHeaderDescButton( @Composable fun BottomSheetContentWithIconHeaderDescButton( iconId: Int = R.drawable.ic_circular_red_exclamation, - @StringRes headerTextId: Int = R.string.something_went_wrong, + @StringRes headerTextId: Int = CommonR.string.something_went_wrong, @StringRes descriptionTextId: Int = R.string.something_went_wrong_desc, @StringRes buttonTextId: Int = R.string.try_again, isPrimaryTypeButton: Boolean = true, @@ -1415,4 +1416,4 @@ fun NaviPayCircularProgressIndicator( color = color, strokeWidth = strokeWidth ) -} \ No newline at end of file +} diff --git a/navi-pay/src/main/kotlin/com/navi/pay/common/utils/NaviPayCommonUtils.kt b/navi-pay/src/main/kotlin/com/navi/pay/common/utils/NaviPayCommonUtils.kt index 7ed84ebbbb..bc660f6057 100644 --- a/navi-pay/src/main/kotlin/com/navi/pay/common/utils/NaviPayCommonUtils.kt +++ b/navi-pay/src/main/kotlin/com/navi/pay/common/utils/NaviPayCommonUtils.kt @@ -1,5 +1,6 @@ package com.navi.pay.common.utils +import com.navi.common.R as CommonR import android.Manifest import android.app.PendingIntent import android.content.Context @@ -100,11 +101,11 @@ object NaviPayCommonUtils { private fun getCarrierIcon(carrierName: String): Int { return when (carrierName) { - CARRIER_JIO -> R.drawable.ic_carrier_jio - CARRIER_AIRTEL -> R.drawable.ic_carrier_airtel - CARRIER_VI -> R.drawable.ic_carrier_vi - CARRIER_BSNL -> R.drawable.ic_carrier_bsnl - else -> R.drawable.ic_carrier_default + CARRIER_JIO -> CommonR.drawable.ic_carrier_jio + CARRIER_AIRTEL -> CommonR.drawable.ic_carrier_airtel + CARRIER_VI -> CommonR.drawable.ic_carrier_vi + CARRIER_BSNL -> CommonR.drawable.ic_carrier_bsnl + else -> CommonR.drawable.ic_carrier_default } } diff --git a/navi-pay/src/main/kotlin/com/navi/pay/common/utils/NaviPayNotificationHandler.kt b/navi-pay/src/main/kotlin/com/navi/pay/common/utils/NaviPayNotificationHandler.kt index 45d0a6a8f1..1574ae8e78 100644 --- a/navi-pay/src/main/kotlin/com/navi/pay/common/utils/NaviPayNotificationHandler.kt +++ b/navi-pay/src/main/kotlin/com/navi/pay/common/utils/NaviPayNotificationHandler.kt @@ -1,5 +1,6 @@ package com.navi.pay.common.utils +import com.navi.design.R as DesignR import android.app.NotificationChannel import android.app.NotificationManager import android.app.PendingIntent @@ -70,7 +71,7 @@ object NaviPayNotificationHandler { .setContentTitle(notificationContentTitle) .setContentText(notificationContentBody) .setSmallIcon(R.drawable.navi_pay_notification_icon) - .setColor(ContextCompat.getColor(context, R.color.white)) + .setColor(ContextCompat.getColor(context, DesignR.color.white)) .setAutoCancel(true) .setDefaults(DEFAULT_ALL) .setFullScreenIntent(pendingIntent, true) @@ -106,4 +107,4 @@ object NaviPayNotificationHandler { val notificationIdAsInt = getNotificationIdAsInt(data = notificationId) NotificationManagerCompat.from(context).cancel(notificationIdAsInt) } -} \ No newline at end of file +} diff --git a/navi-pay/src/main/kotlin/com/navi/pay/common/viewmodel/NaviPayBaseVM.kt b/navi-pay/src/main/kotlin/com/navi/pay/common/viewmodel/NaviPayBaseVM.kt index 456952ef70..4f4807b2ec 100644 --- a/navi-pay/src/main/kotlin/com/navi/pay/common/viewmodel/NaviPayBaseVM.kt +++ b/navi-pay/src/main/kotlin/com/navi/pay/common/viewmodel/NaviPayBaseVM.kt @@ -1,5 +1,6 @@ package com.navi.pay.common.viewmodel +import com.navi.common.R as CommonR import androidx.lifecycle.viewModelScope import com.navi.common.CommonLibManager import com.navi.common.network.models.ErrorMessage @@ -126,7 +127,7 @@ abstract class NaviPayBaseVM(private val naviPayVmData: NaviPayVmData) : BaseVM( fun getGenericErrorConfig() = NaviPayErrorConfig( iconResId = R.drawable.ic_error_red_gradient, - title = CommonLibManager.application.resources.getString(R.string.something_went_wrong), + title = CommonLibManager.application.resources.getString(CommonR.string.something_went_wrong), description = CommonLibManager.application.resources.getString(R.string.generic_error_description), buttonConfigs = listOf(defaultButtonConfig()), code = UNKNOWN_ERROR_CODE, @@ -140,7 +141,7 @@ abstract class NaviPayBaseVM(private val naviPayVmData: NaviPayVmData) : BaseVM( title = noInternetGenericResponse.title ?: CommonLibManager.application.getString(R.string.navi_pay_no_internet_connection_error), description = noInternetGenericResponse.message - ?: CommonLibManager.application.getString(com.navi.common.R.string.check_internet_connectivity_and_try_again), + ?: CommonLibManager.application.getString(CommonR.string.check_internet_connectivity_and_try_again), buttonConfigs = listOf(defaultButtonConfig().copy(text = "Retry")), code = UNKNOWN_ERROR_CODE, tag = ERROR_DEFAULT_TAG @@ -192,13 +193,13 @@ abstract class NaviPayBaseVM(private val naviPayVmData: NaviPayVmData) : BaseVM( } private fun defaultButtonConfig() = NaviPayErrorButtonConfig( - text = CommonLibManager.application.resources.getString(R.string.okay), + text = CommonLibManager.application.resources.getString(CommonR.string.okay), type = NaviPayButtonTheme.Primary, action = NaviPayButtonAction.Dismiss ) private fun Action.toNaviPayErrorButtonConfig(): NaviPayErrorButtonConfig { - val text = title ?: CommonLibManager.application.resources.getString(R.string.okay) + val text = title ?: CommonLibManager.application.resources.getString(CommonR.string.okay) val type = when (tag?.lowercase()) { CTA_THEME_PRIMARY -> NaviPayButtonTheme.Primary CTA_THEME_SECONDARY -> NaviPayButtonTheme.Secondary @@ -241,4 +242,4 @@ abstract class NaviPayBaseVM(private val naviPayVmData: NaviPayVmData) : BaseVM( ) } -} \ No newline at end of file +} diff --git a/navi-pay/src/main/kotlin/com/navi/pay/management/upilite/ui/UpiLiteOnBoardingScreen.kt b/navi-pay/src/main/kotlin/com/navi/pay/management/upilite/ui/UpiLiteOnBoardingScreen.kt index 9311010ff9..a397b4ae2a 100644 --- a/navi-pay/src/main/kotlin/com/navi/pay/management/upilite/ui/UpiLiteOnBoardingScreen.kt +++ b/navi-pay/src/main/kotlin/com/navi/pay/management/upilite/ui/UpiLiteOnBoardingScreen.kt @@ -1,5 +1,6 @@ package com.navi.pay.management.upilite.ui +import com.navi.naviwidgets.R as WidgetsR import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -128,7 +129,7 @@ fun RenderUSPPointsSegment(modifier: Modifier) { Spacer(modifier = Modifier.width(4.dp)) Text( - text = stringResource(id = R.string.dot), + text = stringResource(id = WidgetsR.string.dot), fontSize = 10.sp, color = FFFFFF, fontFamily = ttComposeFontFamily, @@ -148,7 +149,7 @@ fun RenderUSPPointsSegment(modifier: Modifier) { Spacer(modifier = Modifier.width(4.dp)) Text( - text = stringResource(id = R.string.dot), + text = stringResource(id = WidgetsR.string.dot), fontSize = 10.sp, color = FFFFFF, fontFamily = ttComposeFontFamily, @@ -207,4 +208,4 @@ fun RenderOnBoardingDescriptionSegment(modifier: Modifier) { } Text(text = descriptionAnnotatedText, modifier = modifier) -} \ No newline at end of file +} diff --git a/navi-pay/src/main/kotlin/com/navi/pay/permission/ui/PermissionScreen.kt b/navi-pay/src/main/kotlin/com/navi/pay/permission/ui/PermissionScreen.kt index 94d65d73ad..59e53d43ea 100644 --- a/navi-pay/src/main/kotlin/com/navi/pay/permission/ui/PermissionScreen.kt +++ b/navi-pay/src/main/kotlin/com/navi/pay/permission/ui/PermissionScreen.kt @@ -7,6 +7,8 @@ package com.navi.pay.permission.ui +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR import android.app.Activity import android.content.Intent import android.content.pm.PackageManager @@ -256,7 +258,7 @@ fun RenderNaviPayPermissionScreen( sheetState = state, sheetContent = { BottomSheetContentWithIconHeaderDescButton( - iconId = R.drawable.ic_info_icon_black, + iconId = DesignR.drawable.ic_info_icon_black, headerTextId = R.string.know_more_navi_pay, descriptionTextId = R.string.permission_settings_know_more, buttonTextId = R.string.np_okay_got_it, @@ -330,7 +332,7 @@ fun RenderNaviPayPermissionScreen( verticalAlignment = Alignment.CenterVertically ) { Image( - painter = painterResource(id = R.drawable.ic_security_checked_green_svg), + painter = painterResource(id = CommonR.drawable.ic_security_checked_green_svg), contentDescription = null ) Spacer(modifier = Modifier.width(4.dp)) diff --git a/navi-payment/src/main/java/com/navi/payment/paymentscreen/ui/PaymentMethodSuccessFragment.kt b/navi-payment/src/main/java/com/navi/payment/paymentscreen/ui/PaymentMethodSuccessFragment.kt index 409ea26c34..155419fb9e 100644 --- a/navi-payment/src/main/java/com/navi/payment/paymentscreen/ui/PaymentMethodSuccessFragment.kt +++ b/navi-payment/src/main/java/com/navi/payment/paymentscreen/ui/PaymentMethodSuccessFragment.kt @@ -1,5 +1,6 @@ package com.navi.payment.paymentscreen.ui +import com.navi.common.R as CommonR import android.app.Dialog import android.os.Bundle import android.view.View @@ -15,7 +16,7 @@ import com.navi.payment.utils.Constants.LOTTIE_FIELD_DATA class PaymentMethodSuccessFragment : BaseDialogFragment( R.layout.payment_success_layout, - com.navi.common.R.style.FullScreenDialogFragment + CommonR.style.FullScreenDialogFragment ) { private var paymentSuccessListener: PaymentSuccessListener? = null diff --git a/navi-rr/src/main/java/com/navi/rr/common/views/NaviRRCommonView.kt b/navi-rr/src/main/java/com/navi/rr/common/views/NaviRRCommonView.kt index 7ff076d4e5..554b45521b 100644 --- a/navi-rr/src/main/java/com/navi/rr/common/views/NaviRRCommonView.kt +++ b/navi-rr/src/main/java/com/navi/rr/common/views/NaviRRCommonView.kt @@ -1,5 +1,7 @@ package com.navi.rr.common.views +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import androidx.compose.foundation.Canvas import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -53,7 +55,7 @@ import com.navi.rr.utils.spannableString @Composable fun NaviRRHeader( title: String, - navigationIcon: Int = R.drawable.ic_arrow_left_black, + navigationIcon: Int = WidgetsR.drawable.ic_arrow_left_black, onNavigationIconClick: (() -> Unit), actionIconId: Int = -1, onActionClick: (() -> Unit)? = null, @@ -125,7 +127,7 @@ fun NaviRRLoadingScreen() { fun NaviRRErrorScreen( title: String = stringResource(id = R.string.error_screen_title), subtitle: String = stringResource(id = R.string.error_screen_subtitle), - errorImage: Int = R.drawable.ic_something_went_wrong + errorImage: Int = WidgetsR.drawable.ic_something_went_wrong ) { Column( Modifier @@ -268,7 +270,7 @@ fun PaginationErrorComponent() { modifier = Modifier.padding(16.dp, 16.dp, 16.dp, 40.dp), ) { Image( - painter = painterResource(id = R.drawable.ic_info_icon_black), + painter = painterResource(id = DesignR.drawable.ic_info_icon_black), modifier = Modifier.size(16.dp), contentDescription = "error_icon" ) @@ -309,4 +311,4 @@ fun CircularView(color: Color) { .size(8.dp) .background(color, shape = CircleShape) ) -} \ No newline at end of file +} diff --git a/navi-rr/src/main/java/com/navi/rr/referral/ui/activity/RefereeTrackerActivity.kt b/navi-rr/src/main/java/com/navi/rr/referral/ui/activity/RefereeTrackerActivity.kt index 247274a5c5..4389e78770 100644 --- a/navi-rr/src/main/java/com/navi/rr/referral/ui/activity/RefereeTrackerActivity.kt +++ b/navi-rr/src/main/java/com/navi/rr/referral/ui/activity/RefereeTrackerActivity.kt @@ -1,5 +1,6 @@ package com.navi.rr.referral.ui.activity +import com.navi.common.R as CommonR import android.os.Bundle import androidx.activity.compose.setContent import com.navi.common.lottie.LottieRemoteHelper @@ -59,7 +60,7 @@ class RefereeTrackerActivity : BaseActivity() { } ) } - overridePendingTransition(R.anim.activity_slide_in_right, R.anim.nothing) + overridePendingTransition(CommonR.anim.activity_slide_in_right, CommonR.anim.nothing) } companion object { diff --git a/navi-rr/src/main/java/com/navi/rr/referral/ui/bottomsheet/RefereeBottomSheetView.kt b/navi-rr/src/main/java/com/navi/rr/referral/ui/bottomsheet/RefereeBottomSheetView.kt index a00e943a30..17cadf5de3 100644 --- a/navi-rr/src/main/java/com/navi/rr/referral/ui/bottomsheet/RefereeBottomSheetView.kt +++ b/navi-rr/src/main/java/com/navi/rr/referral/ui/bottomsheet/RefereeBottomSheetView.kt @@ -1,5 +1,6 @@ package com.navi.rr.referral.ui.bottomsheet +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -106,7 +107,7 @@ constructor(parentContext: Context, attrs: AttributeSet? = null, defStyleAttr: I DividerItemDecorator( ResourcesCompat.getDrawable( resources, - R.drawable.divider, + DesignR.drawable.divider, null ) ) @@ -160,4 +161,4 @@ constructor(parentContext: Context, attrs: AttributeSet? = null, defStyleAttr: I const val BACKGROUND_WIDTH = 18f const val PROGRESS_BAR_WIDTH = 22f } -} \ No newline at end of file +} diff --git a/navi-rr/src/main/java/com/navi/rr/referral/ui/bottomsheet/ReferralContactsBottomSheet.kt b/navi-rr/src/main/java/com/navi/rr/referral/ui/bottomsheet/ReferralContactsBottomSheet.kt index 6080e2a582..10f30b2dae 100644 --- a/navi-rr/src/main/java/com/navi/rr/referral/ui/bottomsheet/ReferralContactsBottomSheet.kt +++ b/navi-rr/src/main/java/com/navi/rr/referral/ui/bottomsheet/ReferralContactsBottomSheet.kt @@ -7,6 +7,7 @@ package com.navi.rr.referral.ui.bottomsheet +import com.navi.common.R as CommonR import android.content.Context import android.os.Bundle import android.view.View @@ -57,7 +58,7 @@ class ReferralContactsBottomSheet : BaseBottomSheet() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setStyle(STYLE_NORMAL, R.style.BottomSheetDialogThemeNoFloating) + setStyle(STYLE_NORMAL, CommonR.style.BottomSheetDialogThemeNoFloating) } override fun setContainerView(viewStub: ViewStub) { diff --git a/navi-rr/src/main/java/com/navi/rr/referral/ui/compose/RefereeTrackerStateComposables.kt b/navi-rr/src/main/java/com/navi/rr/referral/ui/compose/RefereeTrackerStateComposables.kt index b23a53c42d..4e6cb5d3de 100644 --- a/navi-rr/src/main/java/com/navi/rr/referral/ui/compose/RefereeTrackerStateComposables.kt +++ b/navi-rr/src/main/java/com/navi/rr/referral/ui/compose/RefereeTrackerStateComposables.kt @@ -1,5 +1,6 @@ package com.navi.rr.referral.ui.compose +import com.navi.naviwidgets.R as WidgetsR import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.Image import androidx.compose.foundation.clickable @@ -53,7 +54,7 @@ fun RemindStateComponent( ) { if (reminded) { Image( - painter = painterResource(id = R.drawable.ic_tick_mark_green), + painter = painterResource(id = WidgetsR.drawable.ic_tick_mark_green), modifier = Modifier.size(14.dp), contentDescription = "tick_mark" ) @@ -153,7 +154,7 @@ fun CompletedStateComponent(title: NaviTextComponent?) { Row(modifier = Modifier.padding(8.dp, 4.dp)) { Image( modifier = Modifier.size(12.dp), - painter = painterResource(id = R.drawable.ic_confetti_right_pop), + painter = painterResource(id = WidgetsR.drawable.ic_confetti_right_pop), contentDescription = "competed_confetti" ) Spacer(modifier = Modifier.width(4.dp)) diff --git a/navi-rr/src/main/java/com/navi/rr/referral/ui/fragment/RefereeOverlayBottomSheetFragment.kt b/navi-rr/src/main/java/com/navi/rr/referral/ui/fragment/RefereeOverlayBottomSheetFragment.kt index 436c85c05f..343efb6990 100644 --- a/navi-rr/src/main/java/com/navi/rr/referral/ui/fragment/RefereeOverlayBottomSheetFragment.kt +++ b/navi-rr/src/main/java/com/navi/rr/referral/ui/fragment/RefereeOverlayBottomSheetFragment.kt @@ -1,5 +1,7 @@ package com.navi.rr.referral.ui.fragment +import com.navi.common.R as CommonR +import com.navi.naviwidgets.R as WidgetsR import android.app.Dialog import android.os.Bundle import android.view.View @@ -29,7 +31,7 @@ class RefereeOverlayBottomSheetFragment : override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) readArguments() - setStyle(STYLE_NORMAL, R.style.FullScreenWithStatusBar) + setStyle(STYLE_NORMAL, CommonR.style.FullScreenWithStatusBar) } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { @@ -77,13 +79,13 @@ class RefereeOverlayBottomSheetFragment : } private fun fadeOutScreenAnimation() { - val animation = AnimationUtils.loadAnimation(requireContext(), R.anim.fade_out) + val animation = AnimationUtils.loadAnimation(requireContext(), CommonR.anim.fade_out) animation.duration = FADE_OUT_ANIMATION_DURATION binding.clParent.startAnimation(animation) } private fun openBottomSheetAnimation() { - val animation = AnimationUtils.loadAnimation(requireContext(), R.anim.slide_in_bottom) + val animation = AnimationUtils.loadAnimation(requireContext(), WidgetsR.anim.slide_in_bottom) animation.setAnimationListener(object : AnimationListener { override fun onAnimationStart(p0: Animation?) {} @@ -139,4 +141,4 @@ class RefereeOverlayBottomSheetFragment : override val screenName: String get() = TAG -} \ No newline at end of file +} diff --git a/navi-rr/src/main/java/com/navi/rr/rewards/ui/activity/RewardDelightActivity.kt b/navi-rr/src/main/java/com/navi/rr/rewards/ui/activity/RewardDelightActivity.kt index 218bb1ff8c..76e22d9436 100644 --- a/navi-rr/src/main/java/com/navi/rr/rewards/ui/activity/RewardDelightActivity.kt +++ b/navi-rr/src/main/java/com/navi/rr/rewards/ui/activity/RewardDelightActivity.kt @@ -7,6 +7,8 @@ package com.navi.rr.rewards.ui.activity +import com.navi.common.R as CommonR +import com.navi.naviwidgets.R as WidgetsR import android.animation.Animator import android.animation.AnimatorSet import android.animation.ObjectAnimator @@ -142,7 +144,7 @@ class RewardDelightActivity : BaseActivity(), ActionButtonClickListener { clRewardParent.setBackgroundResource( when (rewardsWidgetData?.rewardsInfo?.rewardType) { RewardType.GOLD.name -> { - R.drawable.rounded_gold_rect_radius_20 + CommonR.drawable.rounded_gold_rect_radius_20 } RewardType.CASH.name -> { 0 @@ -162,15 +164,15 @@ class RewardDelightActivity : BaseActivity(), ActionButtonClickListener { when (rewardsWidgetData?.rewardsInfo?.rewardType) { RewardType.GOLD.name -> { ivRewardIcon.isVisible = false - R.drawable.ic_rewards_gold_detail_corner + WidgetsR.drawable.ic_rewards_gold_detail_corner } RewardType.CASH.name -> { ivRewardIcon.isVisible = true - R.drawable.ic_rewards_detail_corner + WidgetsR.drawable.ic_rewards_detail_corner } else -> { ivRewardIcon.isVisible = true - R.drawable.ic_rewards_detail_corner + WidgetsR.drawable.ic_rewards_detail_corner } } ) diff --git a/navi-rr/src/main/java/com/navi/rr/rewards/ui/activity/RewardInfoActivity.kt b/navi-rr/src/main/java/com/navi/rr/rewards/ui/activity/RewardInfoActivity.kt index cc9be2dead..55b5b69770 100644 --- a/navi-rr/src/main/java/com/navi/rr/rewards/ui/activity/RewardInfoActivity.kt +++ b/navi-rr/src/main/java/com/navi/rr/rewards/ui/activity/RewardInfoActivity.kt @@ -6,7 +6,8 @@ */ package com.navi.rr.rewards.ui.activity -/* + +import com.navi.design.R as DesignR/* * * * Copyright © 2022 by Navi Technologies Private Limited * * All rights reserved. Strictly confidential @@ -121,7 +122,7 @@ class RewardInfoActivity : BaseActivity(), WidgetCallback { root.setBackgroundColor( ContextCompat.getColor( this@RewardInfoActivity, - R.color.white + DesignR.color.white ) ) rewardInfoItems.setPadding( diff --git a/navi-rr/src/main/java/com/navi/rr/rewards/ui/activity/RewardsDashboardActivity.kt b/navi-rr/src/main/java/com/navi/rr/rewards/ui/activity/RewardsDashboardActivity.kt index 6d0534fe50..42dc6a308a 100644 --- a/navi-rr/src/main/java/com/navi/rr/rewards/ui/activity/RewardsDashboardActivity.kt +++ b/navi-rr/src/main/java/com/navi/rr/rewards/ui/activity/RewardsDashboardActivity.kt @@ -7,6 +7,7 @@ package com.navi.rr.rewards.ui.activity +import com.navi.common.R as CommonR import android.os.Bundle import androidx.fragment.app.Fragment import androidx.lifecycle.Lifecycle @@ -56,10 +57,10 @@ class RewardsDashboardActivity : BaseActivity(), FragmentInterchangeListener, Wi val fragmentTransaction = supportFragmentManager.beginTransaction() if (!supportFragmentManager.isStateSaved && !supportFragmentManager.isDestroyed) { fragmentTransaction.setCustomAnimations( - R.anim.parallax_slide_in_right, - R.anim.parallax_slide_out_left, - R.anim.parallax_slide_in_left, - R.anim.parallax_slide_out_right + CommonR.anim.parallax_slide_in_right, + CommonR.anim.parallax_slide_out_left, + CommonR.anim.parallax_slide_in_left, + CommonR.anim.parallax_slide_out_right ) if(fragment.isAdded) { fragmentTransaction.show(fragment) diff --git a/navi-rr/src/main/java/com/navi/rr/rewards/ui/fragment/RewardsDetailFragment.kt b/navi-rr/src/main/java/com/navi/rr/rewards/ui/fragment/RewardsDetailFragment.kt index 0f45307ce3..24d3571560 100644 --- a/navi-rr/src/main/java/com/navi/rr/rewards/ui/fragment/RewardsDetailFragment.kt +++ b/navi-rr/src/main/java/com/navi/rr/rewards/ui/fragment/RewardsDetailFragment.kt @@ -7,6 +7,8 @@ package com.navi.rr.rewards.ui.fragment +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR import android.app.Dialog import android.os.Bundle import android.view.View @@ -62,7 +64,7 @@ class RewardsDetailFragment : override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) readArguments() - styleId = R.style.FullScreenWithStatusBar + styleId = CommonR.style.FullScreenWithStatusBar setStyle(STYLE_NORMAL, styleId) sharedVM = activity?.let { ViewModelProvider(it)[RewardDashboardSharedVM::class.java] } } @@ -129,7 +131,7 @@ class RewardsDetailFragment : clRewardParent.setBackgroundResource( when (rewardsWidgetData?.rewardsInfo?.rewardType) { RewardType.GOLD.name -> { - R.drawable.rounded_gold_rect_radius_20 + CommonR.drawable.rounded_gold_rect_radius_20 } RewardType.CASH.name -> { 0 @@ -168,9 +170,9 @@ class RewardsDetailFragment : tagLabel.background = getNaviDrawableFromBackend( backgroundColor = rewardsWidgetData?.popUpTagInfo?.bgColor.parseColorSafe(), radii = CornerRadius( - leftBottom = resources.getDimensionPixelSize(R.dimen.dp_16) + leftBottom = resources.getDimensionPixelSize(DesignR.dimen.dp_16) .toFloat(), - rightTop = resources.getDimensionPixelSize(R.dimen.dp_16) + rightTop = resources.getDimensionPixelSize(DesignR.dimen.dp_16) .toFloat() ) ) diff --git a/navi-rr/src/main/java/com/navi/rr/rewards/views/RewardsTooltipView.kt b/navi-rr/src/main/java/com/navi/rr/rewards/views/RewardsTooltipView.kt index a55dac10e4..4a72927728 100644 --- a/navi-rr/src/main/java/com/navi/rr/rewards/views/RewardsTooltipView.kt +++ b/navi-rr/src/main/java/com/navi/rr/rewards/views/RewardsTooltipView.kt @@ -7,6 +7,7 @@ package com.navi.rr.rewards.views +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.content.res.ColorStateList import android.util.AttributeSet @@ -68,13 +69,13 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 context, when (rewardsInfo?.rewardType) { RewardType.CASH.name -> { - com.navi.naviwidgets.R.drawable.ic_rewards_info_cash_bg + WidgetsR.drawable.ic_rewards_info_cash_bg } RewardType.GOLD.name -> { - com.navi.naviwidgets.R.drawable.ic_rewards_info_gold_bg + WidgetsR.drawable.ic_rewards_info_gold_bg } else -> { - com.navi.naviwidgets.R.drawable.ic_rewards_info_cash_bg + WidgetsR.drawable.ic_rewards_info_cash_bg } } ) diff --git a/navi-rr/src/main/java/com/navi/rr/utils/RRAnimationUtil.kt b/navi-rr/src/main/java/com/navi/rr/utils/RRAnimationUtil.kt index 64714e86a7..0c08809029 100644 --- a/navi-rr/src/main/java/com/navi/rr/utils/RRAnimationUtil.kt +++ b/navi-rr/src/main/java/com/navi/rr/utils/RRAnimationUtil.kt @@ -1,17 +1,18 @@ package com.navi.rr.utils +import com.navi.common.R as CommonR import android.app.Activity import com.navi.rr.R fun Activity.startEnterAnimation() { this.overridePendingTransition( - R.anim.parallax_slide_in_right, - R.anim.parallax_slide_out_left) + CommonR.anim.parallax_slide_in_right, + CommonR.anim.parallax_slide_out_left) } fun Activity.startExitAnimation() { this.overridePendingTransition( - R.anim.parallax_slide_in_left, - R.anim.parallax_slide_out_right + CommonR.anim.parallax_slide_in_left, + CommonR.anim.parallax_slide_out_right ) -} \ No newline at end of file +} diff --git a/navi-rr/src/main/res/anim/slide_up_out.xml b/navi-rr/src/main/res/anim/slide_up_out.xml new file mode 100644 index 0000000000..4b5d11cb93 --- /dev/null +++ b/navi-rr/src/main/res/anim/slide_up_out.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/navi-vkyc/src/main/java/com/navi/vkyc/presentation/adapter/PermissionAdapter.kt b/navi-vkyc/src/main/java/com/navi/vkyc/presentation/adapter/PermissionAdapter.kt index 970433192c..bc8156da61 100644 --- a/navi-vkyc/src/main/java/com/navi/vkyc/presentation/adapter/PermissionAdapter.kt +++ b/navi-vkyc/src/main/java/com/navi/vkyc/presentation/adapter/PermissionAdapter.kt @@ -7,6 +7,7 @@ package com.navi.vkyc.presentation.adapter +import com.navi.design.R as DesignR import android.annotation.SuppressLint import android.content.pm.PackageManager import android.view.LayoutInflater @@ -48,14 +49,14 @@ class PermissionAdapter : RecyclerView.Adapter { permissionTile.allowed = true permissionTile.statusVisibility = true binding.titleTv.setTextColor( - ContextCompat.getColor(binding.titleTv.context, R.color.red) + ContextCompat.getColor(binding.titleTv.context, DesignR.color.red) ) } else -> { diff --git a/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VKYCPermissionFragment.kt b/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VKYCPermissionFragment.kt index 2680c3362a..2bce0655c2 100644 --- a/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VKYCPermissionFragment.kt +++ b/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VKYCPermissionFragment.kt @@ -7,6 +7,7 @@ package com.navi.vkyc.presentation.fragments +import com.navi.common.R as CommonR import android.Manifest import android.app.Activity import android.content.ActivityNotFoundException @@ -225,12 +226,12 @@ class VKYCPermissionFragment : binding ?.permissionTileRvv ?.addItemDecoration( - TopMarginItemDecoration(resources.getDimension(R.dimen.layout_dp_24)) + TopMarginItemDecoration(resources.getDimension(CommonR.dimen.layout_dp_24)) ) binding ?.permissionDeniedLayoutV2 - ?.setCornerRadius(resources.getDimension(R.dimen.layout_dp_8)) + ?.setCornerRadius(resources.getDimension(CommonR.dimen.layout_dp_8)) permissionAdapter.updatePermissionTiles(permissionTiles) binding?.permissionDeniedLayoutV2?.setCallback { naviAnalyticsEventTracker.onAllPermissionMandatoryClicked() diff --git a/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VKYCWaitingForExecutiveFragment.kt b/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VKYCWaitingForExecutiveFragment.kt index dbd8d903ec..4dd275d109 100644 --- a/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VKYCWaitingForExecutiveFragment.kt +++ b/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VKYCWaitingForExecutiveFragment.kt @@ -7,6 +7,8 @@ package com.navi.vkyc.presentation.fragments +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR import android.app.Activity import android.media.AudioManager import android.os.Bundle @@ -297,11 +299,11 @@ class VKYCWaitingForExecutiveFragment : BaseFragment(), NaviHeaderView.Interacti strokeColor = ResourcesCompat.getColor( resources, - R.color.view_background_color_six, + DesignR.color.view_background_color_six, null ), - cornerRadius = resources.getDimension(R.dimen.dp_4).toInt(), - strokeWidth = resources.getDimension(R.dimen.dp_2).toInt() + cornerRadius = resources.getDimension(DesignR.dimen.dp_4).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_2).toInt() ) timerCard.timerMinutes.timerFieldLabelTv.text = getString(R.string.minutes) @@ -310,11 +312,11 @@ class VKYCWaitingForExecutiveFragment : BaseFragment(), NaviHeaderView.Interacti strokeColor = ResourcesCompat.getColor( resources, - R.color.view_background_color_six, + DesignR.color.view_background_color_six, null ), - cornerRadius = resources.getDimension(R.dimen.dp_4).toInt(), - strokeWidth = resources.getDimension(R.dimen.dp_2).toInt() + cornerRadius = resources.getDimension(DesignR.dimen.dp_4).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_2).toInt() ) timerCard.timerSeconds.timerFieldLabelTv.text = getString(R.string.seconds) @@ -337,14 +339,14 @@ class VKYCWaitingForExecutiveFragment : BaseFragment(), NaviHeaderView.Interacti rootLayout.background = getNaviDrawable( backgroundColor = - ResourcesCompat.getColor(resources, R.color.grey_alabaster, null), + ResourcesCompat.getColor(resources, DesignR.color.grey_alabaster, null), ) timerCard.timerCardCl.background = getNaviDrawable( backgroundColor = - ResourcesCompat.getColor(resources, R.color.white, null), - cornerRadius = resources.getDimension(R.dimen.dp_8).toInt() + ResourcesCompat.getColor(resources, DesignR.color.white, null), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt() ) } startTime = System.currentTimeMillis() @@ -412,10 +414,10 @@ class VKYCWaitingForExecutiveFragment : BaseFragment(), NaviHeaderView.Interacti } ?: run { binding?.volumeCard?.volumePrompt?.setPadding( - resources.getDimension(R.dimen.layout_dp_8).toInt(), - resources.getDimension(R.dimen.layout_dp_4).toInt(), - resources.getDimension(R.dimen.layout_dp_8).toInt(), - resources.getDimension(R.dimen.layout_dp_4).toInt() + resources.getDimension(CommonR.dimen.layout_dp_8).toInt(), + resources.getDimension(CommonR.dimen.layout_dp_4).toInt(), + resources.getDimension(CommonR.dimen.layout_dp_8).toInt(), + resources.getDimension(CommonR.dimen.layout_dp_4).toInt() ) } } diff --git a/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VkycInformationBottomSheet.kt b/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VkycInformationBottomSheet.kt index ea600b5d8e..54f104cdf5 100644 --- a/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VkycInformationBottomSheet.kt +++ b/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VkycInformationBottomSheet.kt @@ -7,6 +7,7 @@ package com.navi.vkyc.presentation.fragments +import com.navi.design.R as DesignR import android.os.Bundle import android.view.ViewStub import androidx.databinding.DataBindingUtil @@ -43,8 +44,8 @@ class VkycInformationBottomSheet : BaseBottomSheet() { binding.binder = it binding.primaryAbv.setProperties( binding.binder?.cta?.title, - R.color.white, - R.color.outrageous_orange + DesignR.color.white, + DesignR.color.outrageous_orange ) } } diff --git a/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VkycLongWaitForAgentFragment.kt b/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VkycLongWaitForAgentFragment.kt index a0dcd36127..d19d8d4d27 100644 --- a/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VkycLongWaitForAgentFragment.kt +++ b/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VkycLongWaitForAgentFragment.kt @@ -1,5 +1,6 @@ package com.navi.vkyc.presentation.fragments +import com.navi.design.R as DesignR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -45,8 +46,8 @@ class VkycLongWaitForAgentFragment : BaseFragment(), NaviHeaderView.InteractionL binding?.rootLayout?.background = getNaviDrawable( backgroundColor = - ResourcesCompat.getColor(resources, R.color.white, null), - cornerRadius = resources.getDimension(R.dimen.dp_8).toInt() + ResourcesCompat.getColor(resources, DesignR.color.white, null), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt() ) initObserver() @@ -163,4 +164,4 @@ class VkycLongWaitForAgentFragment : BaseFragment(), NaviHeaderView.InteractionL ) } -} \ No newline at end of file +} diff --git a/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VkycStatusCheckFragment.kt b/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VkycStatusCheckFragment.kt index c6f32af009..a26749f05c 100644 --- a/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VkycStatusCheckFragment.kt +++ b/navi-vkyc/src/main/java/com/navi/vkyc/presentation/fragments/VkycStatusCheckFragment.kt @@ -7,6 +7,7 @@ package com.navi.vkyc.presentation.fragments +import com.navi.naviwidgets.R as WidgetsR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -144,7 +145,7 @@ class VkycStatusCheckFragment : BaseFragment() { private fun startSuccessAnimations(ctaData: CtaData? = null) { binding?.vkycSuccessAnimation?.visibility = View.VISIBLE - binding?.vkycSuccessAnimation?.setAnimation(com.navi.naviwidgets.R.raw.video_kyc_success) + binding?.vkycSuccessAnimation?.setAnimation(WidgetsR.raw.video_kyc_success) binding?.vkycSuccessAnimation?.playAnimation() startSuccessAnimationEndListener(ctaData) } diff --git a/navi-vkyc/src/main/java/com/navi/vkyc/presentation/view/FooterView.kt b/navi-vkyc/src/main/java/com/navi/vkyc/presentation/view/FooterView.kt index a57bbf77ef..e5fb81e045 100644 --- a/navi-vkyc/src/main/java/com/navi/vkyc/presentation/view/FooterView.kt +++ b/navi-vkyc/src/main/java/com/navi/vkyc/presentation/view/FooterView.kt @@ -7,6 +7,8 @@ package com.navi.vkyc.presentation.view +import com.navi.common.R as CommonR +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -57,15 +59,15 @@ class FooterView @JvmOverloads constructor(context: Context?, attrs: AttributeSe binding.prevBtn.background = getNaviDrawable( backgroundColor = - ResourcesCompat.getColor(resources, R.color.view_background_color_six, null), - cornerRadius = resources.getDimension(R.dimen.layout_dp_100).toInt() + ResourcesCompat.getColor(resources, DesignR.color.view_background_color_six, null), + cornerRadius = resources.getDimension(CommonR.dimen.layout_dp_100).toInt() ) binding.nextBtn.background = getNaviDrawable( backgroundColor = - ResourcesCompat.getColor(resources, R.color.outrageous_orange, null), - cornerRadius = resources.getDimension(R.dimen.layout_dp_100).toInt() + ResourcesCompat.getColor(resources, DesignR.color.outrageous_orange, null), + cornerRadius = resources.getDimension(CommonR.dimen.layout_dp_100).toInt() ) binding.knowMoreTv.underLineText() } diff --git a/navi-vkyc/src/main/java/com/navi/vkyc/presentation/viewmodel/VKycFullScreenViewModel.kt b/navi-vkyc/src/main/java/com/navi/vkyc/presentation/viewmodel/VKycFullScreenViewModel.kt index 2e542aef5b..e9399bd216 100644 --- a/navi-vkyc/src/main/java/com/navi/vkyc/presentation/viewmodel/VKycFullScreenViewModel.kt +++ b/navi-vkyc/src/main/java/com/navi/vkyc/presentation/viewmodel/VKycFullScreenViewModel.kt @@ -7,6 +7,7 @@ package com.navi.vkyc.presentation.viewmodel +import com.navi.common.R as CommonR import android.app.Activity import android.app.Application import android.media.AudioManager @@ -71,7 +72,7 @@ class VKycFullScreenViewModel @Inject constructor( val localPeerSpeakingLiveData = MutableLiveData(false) val customerExecutiveSpeaking = MutableLiveData(false) val increaseVolumePrompt = MutableLiveData(false) - val messagePromptText = MutableLiveData(applicationContext.resources.getString(R.string.increase_volume)) + val messagePromptText = MutableLiveData(applicationContext.resources.getString(CommonR.string.increase_volume)) val navigationLiveData = MutableLiveData() private var previewPutUrl: String? = null @@ -288,7 +289,7 @@ class VKycFullScreenViewModel @Inject constructor( val isVolumeLessThanTwentyPercent = audioManager.getStreamVolume(AudioManager.STREAM_VOICE_CALL) < VOLUME_PERMISSIBLE * audioManager.getStreamMaxVolume(AudioManager.STREAM_VOICE_CALL) - showMessageToast(isVolumeLessThanTwentyPercent, applicationContext.resources.getString(R.string.increase_volume)) + showMessageToast(isVolumeLessThanTwentyPercent, applicationContext.resources.getString(CommonR.string.increase_volume)) } private fun showMessageToast(showToast: Boolean, message: String) { diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/VerticalCheckpointWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/VerticalCheckpointWidgetLayout.kt index c6af06cd83..bf7003fd9a 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/VerticalCheckpointWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/VerticalCheckpointWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -96,7 +97,7 @@ constructor( visitedCheckpointBinding.subTitle.setTextFieldData(it) } if(statusType == CheckpointStatusType.COMPLETED){ - visitedCheckpointBinding.verticalLine.setBackgroundColor(ContextCompat.getColor(context, com.navi.design.R.color.description_color_five)) + visitedCheckpointBinding.verticalLine.setBackgroundColor(ContextCompat.getColor(context, DesignR.color.description_color_five)) } else{ if(index == 0){ @@ -109,7 +110,7 @@ constructor( private fun setCheckpointBackground(visitedCheckpointBinding: CheckpointLayoutVisitedBinding, checkpointData: CheckpointData, showFullBackgroundColor: Boolean): View { if(checkpointData.showGreenBackground && showFullBackgroundColor){ - visitedCheckpointBinding.root.setBackgroundColor(ContextCompat.getColor(context, com.navi.design.R.color.light_yellowish_green)) + visitedCheckpointBinding.root.setBackgroundColor(ContextCompat.getColor(context, DesignR.color.light_yellowish_green)) } if(checkpointData.showGreenBackground && !showFullBackgroundColor){ visitedCheckpointBinding.checkpointBackground.visibility = VISIBLE @@ -127,4 +128,4 @@ constructor( } return unvisitedCheckpointBinding.root } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/EmiCalenderWidgetAdapter.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/EmiCalenderWidgetAdapter.kt index 95e4c7f07d..0e7b962904 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/EmiCalenderWidgetAdapter.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/EmiCalenderWidgetAdapter.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.adapters +import com.navi.design.R as DesignR import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView @@ -41,23 +42,23 @@ class EmiCalenderWidgetAdapter(val dataList: List? = null) : if (firstItem) { binding.layoutItem.setPadding( 0, - binding.root.context.resources.getDimension(com.navi.design.R.dimen.dp_20).toInt(), + binding.root.context.resources.getDimension(DesignR.dimen.dp_20).toInt(), 0, - binding.root.context.resources.getDimension(com.navi.design.R.dimen.dp_10).toInt() + binding.root.context.resources.getDimension(DesignR.dimen.dp_10).toInt() ) } else if (lastItem) { binding.layoutItem.setPadding( 0, - binding.root.context.resources.getDimension(com.navi.design.R.dimen.dp_10).toInt(), + binding.root.context.resources.getDimension(DesignR.dimen.dp_10).toInt(), 0, - binding.root.context.resources.getDimension(com.navi.design.R.dimen.dp_20).toInt() + binding.root.context.resources.getDimension(DesignR.dimen.dp_20).toInt() ) } else { binding.layoutItem.setPadding( 0, - binding.root.context.resources.getDimension(com.navi.design.R.dimen.dp_10).toInt(), + binding.root.context.resources.getDimension(DesignR.dimen.dp_10).toInt(), 0, - binding.root.context.resources.getDimension(com.navi.design.R.dimen.dp_10).toInt() + binding.root.context.resources.getDimension(DesignR.dimen.dp_10).toInt() ) } installmentData?.apply { diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/ExpandableFaqAdapter.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/ExpandableFaqAdapter.kt index 1ab6ad394a..50d0be865a 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/ExpandableFaqAdapter.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/ExpandableFaqAdapter.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.adapters +import com.navi.design.R as DesignR import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -120,8 +121,8 @@ class ExpandableFaqAdapter(private val widgetCallback: WidgetCallback?) : } private fun setFaqArrowIcon(expanded: Boolean, arrowDown: AppCompatImageView) { - if (expanded) arrowDown.setBackgroundResource(com.navi.design.R.drawable.ic_arrow_up_small_purple) - else arrowDown.setBackgroundResource(com.navi.design.R.drawable.ic_arrow_down_small_purple) + if (expanded) arrowDown.setBackgroundResource(DesignR.drawable.ic_arrow_up_small_purple) + else arrowDown.setBackgroundResource(DesignR.drawable.ic_arrow_down_small_purple) } private fun setFaqTextField( diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/FreeInsurancePaymentOptionsAdapter.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/FreeInsurancePaymentOptionsAdapter.kt index a7b6e5e36c..96f5b68c35 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/FreeInsurancePaymentOptionsAdapter.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/FreeInsurancePaymentOptionsAdapter.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.adapters +import com.navi.design.R as DesignR import android.content.Context import android.view.LayoutInflater import android.view.View @@ -76,7 +77,7 @@ class FreeInsurancePaymentOptionsAdapter(private val parentContext: Context?, pr if (this.discountText.isNotNull()) { setTextViewFields(this.discountText, binding.discountAmount) parentContext?.let { - binding.discountAmount.background = getNaviDrawable(cornerRadius = dpToPxInInt(10), backgroundColor = ContextCompat.getColor(it, com.navi.design.R.color.light_green_2)) + binding.discountAmount.background = getNaviDrawable(cornerRadius = dpToPxInInt(10), backgroundColor = ContextCompat.getColor(it, DesignR.color.light_green_2)) } } } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/ImageGridRVAdapter.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/ImageGridRVAdapter.kt index 81ac57b1fe..826471a25a 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/ImageGridRVAdapter.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/ImageGridRVAdapter.kt @@ -6,6 +6,7 @@ */ package com.navi.naviwidgets.adapters +import com.navi.design.R as DesignR import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.view.isVisible @@ -70,7 +71,7 @@ class ImageGridRVAdapter( private fun setWidthAndHeight(imageItem: BannerGridWidgetItem, isVisible: Boolean) { val resources = binding.root.context.resources val currentItemWidth = - (layoutWidth.toDouble() - resources.getDimension(com.navi.design.R.dimen.dp_64)) / spanCount + (layoutWidth.toDouble() - resources.getDimension(DesignR.dimen.dp_64)) / spanCount binding.root.layoutParams.width = if (isVisible) currentItemWidth.toInt() else DIMEN_ZERO val currentItemHeight = @@ -78,4 +79,4 @@ class ImageGridRVAdapter( binding.root.layoutParams.height = if (isVisible) currentItemHeight else DIMEN_ZERO } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/TextEditTextCalendarItemAdapter.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/TextEditTextCalendarItemAdapter.kt index 55c0f268cf..816b13a480 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/TextEditTextCalendarItemAdapter.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/adapters/TextEditTextCalendarItemAdapter.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.adapters +import com.navi.design.R as DesignR import android.app.DatePickerDialog import android.text.Editable import android.text.InputType @@ -274,12 +275,12 @@ class TextEditTextCalendarItemAdapter( etName?.isFocusable = false etName?.isEnabled = false etName?.inputType = InputType.TYPE_NULL - etName?.setBackgroundDrawable(binding.root.context.resources.getDrawable(com.navi.design.R.drawable.bg_grey_border)) + etName?.setBackgroundDrawable(binding.root.context.resources.getDrawable(DesignR.drawable.bg_grey_border)) } else { etName?.isFocusable = true etName?.isEnabled = true etName?.inputType = InputType.TYPE_TEXT_VARIATION_PERSON_NAME - etName?.setBackgroundDrawable(binding.root.context.resources.getDrawable(com.navi.design.R.drawable.rounded_rectangle_white_border_8dp_radius)) + etName?.setBackgroundDrawable(binding.root.context.resources.getDrawable(DesignR.drawable.rounded_rectangle_white_border_8dp_radius)) } } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/base/BaseInputWidget.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/base/BaseInputWidget.kt index f1c599a1f9..4bf1fe655a 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/base/BaseInputWidget.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/base/BaseInputWidget.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.base +import com.navi.design.R as DesignR import android.content.Context import android.content.ContextWrapper import android.util.AttributeSet @@ -144,7 +145,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 private fun setErrorTextColor(errorColor: Int?) { errorColor?.let { binding.errorText.setTextColor(ContextCompat.getColor(context, it)) } - ?: run { binding.errorText.setTextColor(ContextCompat.getColor(context, com.navi.design.R.color.red)) } + ?: run { binding.errorText.setTextColor(ContextCompat.getColor(context, DesignR.color.red)) } } private fun setErrorStyle(errorStyle: Int?) { @@ -162,7 +163,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 ) { binding.errorText.text = successText setErrorStyle(successStyle) - binding.errorText.setTextColor(resources.getColor(com.navi.design.R.color.green)) + binding.errorText.setTextColor(resources.getColor(DesignR.color.green)) if (successText != null && successText.isNotEmpty()) { errorState = true binding.errorText.visibility = View.VISIBLE @@ -186,7 +187,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 ) { binding.errorText.text = errorText setErrorStyle(errorStyle) - binding.errorText.setTextColor(resources.getColor(com.navi.design.R.color.red)) + binding.errorText.setTextColor(resources.getColor(DesignR.color.red)) if (errorText != null && errorText.isNotEmpty()) { errorState = true binding.errorText.visibility = View.VISIBLE @@ -407,7 +408,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 } private fun updateNewTheme() { - binding.titleTv.setStyle(com.navi.design.R.style.TextInputV1Style) + binding.titleTv.setStyle(DesignR.style.TextInputV1Style) binding.info.setImageResource(R.drawable.ic_info_icon_dark) binding.baseBorder.background = ResourcesCompat.getDrawable(context.resources, R.drawable.default_rectangle_bg, null) @@ -416,7 +417,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 private fun setErrorWithOldTheme(errorText: String?) { if ((errorText != null) || (isErrorTextNull)) { binding.errorText.text = errorText - binding.errorText.setTextColor(resources.getColor(com.navi.design.R.color.red)) + binding.errorText.setTextColor(resources.getColor(DesignR.color.red)) } if (errorText != null) { errorState = true @@ -446,7 +447,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 private fun setSuccessTextWithOldTheme(successText: String?, iconId: Int? = null) { binding.errorText.text = successText isErrorTextNull = (successText == null) - binding.errorText.setTextColor(resources.getColor(com.navi.design.R.color.green)) + binding.errorText.setTextColor(resources.getColor(DesignR.color.green)) if (successText != null) { errorState = true binding.errorText.visibility = View.VISIBLE @@ -468,7 +469,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 fun setErrorWithNewTheme(errorText: String?) { if (errorText != null || isErrorTextNull) { binding.errorText.text = errorText - binding.errorText.setStyle(com.navi.design.R.style.TextErrorStyle) + binding.errorText.setStyle(DesignR.style.TextErrorStyle) } if (errorText != null) { errorState = true @@ -498,7 +499,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 private fun setSuccessTextWithNewTheme(successText: String?, iconId: Int?) { binding.errorText.text = successText isErrorTextNull = (successText == null) - binding.errorText.setStyle(com.navi.design.R.style.TextSuccessStyle) + binding.errorText.setStyle(DesignR.style.TextSuccessStyle) if (successText != null) { errorState = true binding.infoText.visibility = View.GONE diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/extensions/WidgetExt.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/extensions/WidgetExt.kt index abd19be95c..381dcc215b 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/extensions/WidgetExt.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/extensions/WidgetExt.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.extensions +import com.navi.design.R as DesignR import android.animation.Animator import android.content.Context import android.content.res.Resources @@ -432,7 +433,7 @@ fun TextView.setTextFieldData( if (drawablePadding != null && drawablePadding!! >= 0) { dpToPxInInt(drawablePadding!!) } else { - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_8) + resources.getDimensionPixelSize(DesignR.dimen.dp_8) } } ?: run { setCompoundDrawablesWithIntrinsicBounds(null, null, null, null) @@ -516,7 +517,7 @@ private fun TextView.setTextAlignment(alignment: String) { fun TextView.setLayoutFieldData( layoutFieldData: LayoutFieldData?, - @DimenRes cornerRadius: Int? = resources.getDimension(com.navi.design.R.dimen.dp_32).toInt(), + @DimenRes cornerRadius: Int? = resources.getDimension(DesignR.dimen.dp_32).toInt(), ctaCallback: ((ctaData: CtaData) -> Unit)? = null ) { setTextFieldData(layoutFieldData?.action, ctaCallback) @@ -587,7 +588,7 @@ fun TextView.setSubstringStyles( val drawableWidth = textviewHeight * (drawable.intrinsicWidth / drawable.intrinsicHeight) drawable.setBounds( - dpToPxInInt(resources.getInteger(com.navi.design.R.integer.integer_8)), + dpToPxInInt(resources.getInteger(DesignR.integer.integer_8)), dpToPxInInt(0), drawableWidth, textviewHeight diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/extensions/WidgetViewMapping.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/extensions/WidgetViewMapping.kt index 037b35420b..e3da47e3b5 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/extensions/WidgetViewMapping.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/extensions/WidgetViewMapping.kt @@ -7,6 +7,8 @@ package com.navi.naviwidgets.extensions +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.view.LayoutInflater import android.view.ViewGroup import androidx.databinding.DataBindingUtil @@ -85,7 +87,7 @@ object WidgetViewMapping { val binding: LayoutLabeledInputV2Binding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - com.navi.naviwidgets.R.layout.layout_labeled_input_v2, + WidgetsR.layout.layout_labeled_input_v2, parent, false ) @@ -95,7 +97,7 @@ object WidgetViewMapping { val binding: LayoutTextDisplayBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - com.navi.naviwidgets.R.layout.layout_text_display, + WidgetsR.layout.layout_text_display, parent, false ) @@ -105,7 +107,7 @@ object WidgetViewMapping { val binding: LayoutLabeledDateInputBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - com.navi.naviwidgets.R.layout.layout_labeled_date_input, + WidgetsR.layout.layout_labeled_date_input, parent, false ) @@ -115,7 +117,7 @@ object WidgetViewMapping { val binding: LayoutLabeledInputFixedHintBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - com.navi.naviwidgets.R.layout.layout_labeled_input_fixed_hint, + WidgetsR.layout.layout_labeled_input_fixed_hint, parent, false ) @@ -126,7 +128,7 @@ object WidgetViewMapping { val binding: LayoutLabeledOptionSelectionTileBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - com.navi.naviwidgets.R.layout.layout_labeled_option_selection_tile, + WidgetsR.layout.layout_labeled_option_selection_tile, parent, false ) @@ -137,7 +139,7 @@ object WidgetViewMapping { val binding: LayoutLabeledOptionSelectionListBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - com.navi.naviwidgets.R.layout.layout_labeled_option_selection_list, + WidgetsR.layout.layout_labeled_option_selection_list, parent, false ) @@ -148,7 +150,7 @@ object WidgetViewMapping { val binding: LayoutLabelWithInputSearchBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - com.navi.naviwidgets.R.layout.layout_label_with_input_search, + WidgetsR.layout.layout_label_with_input_search, parent, false ) @@ -158,7 +160,7 @@ object WidgetViewMapping { val binding: LayoutTextWithSearchBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - com.navi.naviwidgets.R.layout.layout_text_with_search, + WidgetsR.layout.layout_text_with_search, parent, false ) @@ -172,7 +174,7 @@ object WidgetViewMapping { parent, false ) - val topMargin = binding.root.context.resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_18) + val topMargin = binding.root.context.resources.getDimensionPixelSize(DesignR.dimen.dp_18) binding.root.layoutParams = (binding.root.layoutParams as ViewGroup.MarginLayoutParams).apply { setMargins(0, topMargin, 0, 0) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/story/NaviTimerView.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/story/NaviTimerView.kt index b40f2d817c..85d0f2c7e2 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/story/NaviTimerView.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/story/NaviTimerView.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.story +import com.navi.design.R as DesignR import android.animation.Animator import android.animation.ValueAnimator import android.content.Context @@ -42,7 +43,7 @@ class NaviTimerView(context: Context, attrs: AttributeSet?) : ViewGroup(context, } init { - paint.color = ContextCompat.getColor(context, com.navi.design.R.color.lightGrey) + paint.color = ContextCompat.getColor(context, DesignR.color.lightGrey) paint.style = Paint.Style.STROKE paint.strokeCap = Paint.Cap.ROUND paint.strokeWidth = strokeWidthInDp @@ -57,7 +58,7 @@ class NaviTimerView(context: Context, attrs: AttributeSet?) : ViewGroup(context, super.draw(canvas) for (i in 1..totalCells) { if (timerPosition > getCellEndX(i)) { - paint.color = ContextCompat.getColor(context, com.navi.design.R.color.outrageous_orange) + paint.color = ContextCompat.getColor(context, DesignR.color.outrageous_orange) canvas.drawLine( getCellStartX(i), paddingTopInPx, @@ -66,7 +67,7 @@ class NaviTimerView(context: Context, attrs: AttributeSet?) : ViewGroup(context, paint ) } else if (timerPosition <= getCellEndX(i) && timerPosition > getCellStartX(i)) { - paint.color = ContextCompat.getColor(context, com.navi.design.R.color.outrageous_orange) + paint.color = ContextCompat.getColor(context, DesignR.color.outrageous_orange) canvas.drawLine( getCellStartX(i), paddingTopInPx, @@ -74,7 +75,7 @@ class NaviTimerView(context: Context, attrs: AttributeSet?) : ViewGroup(context, paddingTopInPx, paint ) - paint.color = ContextCompat.getColor(context, com.navi.design.R.color.white) + paint.color = ContextCompat.getColor(context, DesignR.color.white) canvas.drawLine( timerPosition, paddingTopInPx, @@ -83,7 +84,7 @@ class NaviTimerView(context: Context, attrs: AttributeSet?) : ViewGroup(context, paint ) } else { - paint.color = ContextCompat.getColor(context, com.navi.design.R.color.white) + paint.color = ContextCompat.getColor(context, DesignR.color.white) canvas.drawLine( getCellStartX(i), paddingTopInPx, diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/utils/NaviWidgetIconUtils.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/utils/NaviWidgetIconUtils.kt index 178a6aedfa..5c28ce7393 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/utils/NaviWidgetIconUtils.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/utils/NaviWidgetIconUtils.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.utils +import com.navi.design.R as DesignR import android.graphics.drawable.Drawable import android.widget.ImageView import com.google.firebase.crashlytics.FirebaseCrashlytics @@ -951,8 +952,8 @@ object NaviWidgetIconUtils { DIVIDE_ICON_GREY -> R.drawable.ic_divide_grey EQUALS_ICON_GREY -> R.drawable.ic_equals_grey DIVIDER_ICON_GREY -> R.drawable.ic_divider_grey - OUTLINED_INFO_ICON_BLACK -> com.navi.design.R.drawable.ic_info_icon_black - OUTLINED_INFO_ICON_BLACK_LARGE -> com.navi.design.R.drawable.ic_info_icon_black_large + OUTLINED_INFO_ICON_BLACK -> DesignR.drawable.ic_info_icon_black + OUTLINED_INFO_ICON_BLACK_LARGE -> DesignR.drawable.ic_info_icon_black_large OUTLINED_CALENDER_ICON -> R.drawable.ic_calendar OUTLINED_NEXT_EMI_ICON -> R.drawable.ic_next_emi ERROR_ICON_RED -> R.drawable.ic_alert_error_red @@ -1002,12 +1003,12 @@ object NaviWidgetIconUtils { ARROW_DOWN_BLACK -> R.drawable.ic_arrow_down_black_24dp OUTLINED_ERROR_ICON_RED -> R.drawable.common_ic_outlined_error_red CIRCULAR_MEMBERS_ICON -> R.drawable.ic_circular_members - CIRCULAR_MONEY_ICON -> com.navi.design.R.drawable.ic_circular_money - CIRCULAR_INSURANCE_TENURE_ICON -> com.navi.design.R.drawable.ic_circular_insurance_tenure - CIRCULAR_BENEFITS_ICON -> com.navi.design.R.drawable.ic_circular_benefits - CIRCULAR_ADD_ON_ICON -> com.navi.design.R.drawable.ic_circular_add_on - CIRCULAR_WAITING_PERIOD_ICON -> com.navi.design.R.drawable.ic_circular_waiting_period - RIGHT_ARROW_ORANGE_ICON -> com.navi.design.R.drawable.ic_orange_arrow_forward + CIRCULAR_MONEY_ICON -> DesignR.drawable.ic_circular_money + CIRCULAR_INSURANCE_TENURE_ICON -> DesignR.drawable.ic_circular_insurance_tenure + CIRCULAR_BENEFITS_ICON -> DesignR.drawable.ic_circular_benefits + CIRCULAR_ADD_ON_ICON -> DesignR.drawable.ic_circular_add_on + CIRCULAR_WAITING_PERIOD_ICON -> DesignR.drawable.ic_circular_waiting_period + RIGHT_ARROW_ORANGE_ICON -> DesignR.drawable.ic_orange_arrow_forward NAVI_REWARDS_GOLD_INFO_ICON -> R.drawable.ic_gold NAVI_REWARDS_GOLD_MEDIUM_ICON -> R.drawable.ic_gold_medium NAVI_REWARDS_GOLD_SMALL_ICON -> R.drawable.ic_rewards_gold @@ -1296,9 +1297,9 @@ object NaviWidgetIconUtils { YELLOW_SEPARATOR_ICON -> R.drawable.yellow_separator_icon DIGITAL_GOLD_BULLET_ICON -> R.drawable.ic_profile_digital_gold ASSET_GRAPH -> R.drawable.ic_asset_graph - BENEFITS_ICON -> com.navi.design.R.drawable.ic_hands_with_plus_icon - HAPPY_POT -> com.navi.design.R.drawable.happy_pot - SAD_PINK_POT -> com.navi.design.R.drawable.pink_sad_pot + BENEFITS_ICON -> DesignR.drawable.ic_hands_with_plus_icon + HAPPY_POT -> DesignR.drawable.happy_pot + SAD_PINK_POT -> DesignR.drawable.pink_sad_pot ICON_USE_PHONE -> R.drawable.ic_use_phone ICON_MESSAGE -> R.drawable.ic_message ICON_GET_REWARD -> R.drawable.ic_get_reward @@ -1338,13 +1339,13 @@ object NaviWidgetIconUtils { SOMETHING_WENT_WRONG -> R.drawable.ic_new_generic_error ICON_CHECK_MARK_GREEN_MEDIUM -> R.drawable.ic_check_green_48 ICON_SOLID_TICK -> R.drawable.ic_solid_tick - ICON_SECURITY_SMALL -> com.navi.design.R.drawable.ic_security_check_small_svg + ICON_SECURITY_SMALL -> DesignR.drawable.ic_security_check_small_svg ICON_ADD_UPI -> R.drawable.ic_add_upi ICON_PURPLE_PLANT_SAD -> R.drawable.ic_icon_plant_sad ICON_TIMER_GREY -> R.drawable.ic_timer ICON_TIMER_GREY_SMALL -> R.drawable.ic_timer_grey_small ICON_EXTRA_MEDIUM_BULLET_DOT -> R.drawable.ic_bullet_point_medium - PULSE_INDICATOR -> com.navi.design.R.drawable.ic_pulse_indicator + PULSE_INDICATOR -> DesignR.drawable.ic_pulse_indicator CHECK_WHITE -> R.drawable.ic_check_white GIFT_BOX_WITH_COINS -> R.drawable.ic_gift_box_with_coins RIGHT_ARROW_PURPLE_WITH_WHITE_BG -> R.drawable.ic_right_arrow_purple_with_white_bg diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/viewholder/PaymentOptionItemVH.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/viewholder/PaymentOptionItemVH.kt index 2138c617aa..82635f4d29 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/viewholder/PaymentOptionItemVH.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/viewholder/PaymentOptionItemVH.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.viewholder +import com.navi.design.R as DesignR import android.content.Context import android.view.LayoutInflater import android.view.View @@ -46,27 +47,27 @@ class PaymentOptionItemVH(private val viewBinding: ViewDataBinding) : root.background = getNaviDrawable( backgroundColor = ResourcesCompat.getColor( resources, - com.navi.design.R.color.white, null + DesignR.color.white, null ), - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), strokeColor = ResourcesCompat.getColor( resources, - com.navi.design.R.color.outrageous_orange, null + DesignR.color.outrageous_orange, null ), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt() + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt() ) } else { root.background = getNaviDrawable( backgroundColor = ResourcesCompat.getColor( resources, - com.navi.design.R.color.white, null + DesignR.color.white, null ), - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), strokeColor = ResourcesCompat.getColor( resources, - com.navi.design.R.color.border_dark_grey_color, null + DesignR.color.border_dark_grey_color, null ), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt() + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt() ) } @@ -78,26 +79,26 @@ class PaymentOptionItemVH(private val viewBinding: ViewDataBinding) : radioButton.isChecked = model.getSelectedState() header.background = getNaviDrawable( - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), backgroundColor = ResourcesCompat.getColor( resources, - com.navi.design.R.color.grey_alabaster, null + DesignR.color.grey_alabaster, null ), radii = CornerRadius( - leftTop = resources.getDimension(com.navi.design.R.dimen.dp_8), - rightTop = resources.getDimension(com.navi.design.R.dimen.dp_8) + leftTop = resources.getDimension(DesignR.dimen.dp_8), + rightTop = resources.getDimension(DesignR.dimen.dp_8) ) ) footer.background = getNaviDrawable( - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), backgroundColor = ResourcesCompat.getColor( resources, - com.navi.design.R.color.color_FFFBFA, null + DesignR.color.color_FFFBFA, null ), radii = CornerRadius( - leftBottom = resources.getDimension(com.navi.design.R.dimen.dp_8), - rightBottom = resources.getDimension(com.navi.design.R.dimen.dp_8) + leftBottom = resources.getDimension(DesignR.dimen.dp_8), + rightBottom = resources.getDimension(DesignR.dimen.dp_8) ) ) model.header?.let { @@ -168,4 +169,4 @@ class PaymentOptionItemVH(private val viewBinding: ViewDataBinding) : } return layoutLeftRightTextBinding.root } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/viewholder/RepaymentOptionLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/viewholder/RepaymentOptionLayout.kt index a1cb456a6b..9411e1632d 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/viewholder/RepaymentOptionLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/viewholder/RepaymentOptionLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.viewholder +import com.navi.design.R as DesignR import android.annotation.SuppressLint import android.content.Context import android.content.res.Resources @@ -111,12 +112,12 @@ constructor(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(co binding.messageLayout.background = getNaviDrawable( backgroundColor = Color.parseColor(this), - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), strokeColor = Color.parseColor(this), radii = CornerRadius( - leftBottom = resources.getDimension(com.navi.design.R.dimen.dp_8), - rightBottom = resources.getDimension(com.navi.design.R.dimen.dp_8) + leftBottom = resources.getDimension(DesignR.dimen.dp_8), + rightBottom = resources.getDimension(DesignR.dimen.dp_8) ) ) } @@ -133,12 +134,12 @@ constructor(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(co ?.run { binding.ribbon.background = getNaviDrawable( - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), backgroundColor = Color.parseColor(this), radii = CornerRadius( - leftBottom = resources.getDimension(com.navi.design.R.dimen.dp_8), - rightTop = resources.getDimension(com.navi.design.R.dimen.dp_8) + leftBottom = resources.getDimension(DesignR.dimen.dp_8), + rightTop = resources.getDimension(DesignR.dimen.dp_8) ) ) } @@ -363,29 +364,29 @@ constructor(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(co root.background = getNaviDrawable( backgroundColor = - ResourcesCompat.getColor(resources, com.navi.design.R.color.grey_alabaster, null), - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), + ResourcesCompat.getColor(resources, DesignR.color.grey_alabaster, null), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), strokeColor = - ResourcesCompat.getColor(resources, com.navi.design.R.color.border_dark_grey_color, null), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt() + ResourcesCompat.getColor(resources, DesignR.color.border_dark_grey_color, null), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt() ) } else if (model.selected.orFalse()) { root.background = getNaviDrawable( - backgroundColor = ResourcesCompat.getColor(resources, com.navi.design.R.color.white, null), - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), + backgroundColor = ResourcesCompat.getColor(resources, DesignR.color.white, null), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), strokeColor = - ResourcesCompat.getColor(resources, com.navi.design.R.color.outrageous_orange, null), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt() + ResourcesCompat.getColor(resources, DesignR.color.outrageous_orange, null), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt() ) } else { root.background = getNaviDrawable( - backgroundColor = ResourcesCompat.getColor(resources, com.navi.design.R.color.white, null), - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), + backgroundColor = ResourcesCompat.getColor(resources, DesignR.color.white, null), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), strokeColor = - ResourcesCompat.getColor(resources, com.navi.design.R.color.border_dark_grey_color, null), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt() + ResourcesCompat.getColor(resources, DesignR.color.border_dark_grey_color, null), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt() ) } } @@ -469,7 +470,7 @@ constructor(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(co ?: RepaymentErrorMessage( title = TextFieldData( text = context.getString(R.string.invalid_amount), - textColor = context.getString(com.navi.design.R.color.errorColor), + textColor = context.getString(DesignR.color.errorColor), font = FontWeightEnum.TT_REGULAR.name, size = 12 ), @@ -494,7 +495,7 @@ constructor(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(co private fun setDefaultLabel(repaymentErrorMessage: RepaymentErrorMessage?) { binding.tvFootNote.setTextFieldData(repaymentErrorMessage?.title) - binding.tvFootNote.setTextColor(ContextCompat.getColor(context, com.navi.design.R.color.color_6B6B6B)) + binding.tvFootNote.setTextColor(ContextCompat.getColor(context, DesignR.color.color_6B6B6B)) setDefaultGreyLineForInputField() binding.leftIcon.visibility = VISIBLE binding.leftIcon.setImageResource(R.drawable.grey_info) @@ -508,7 +509,7 @@ constructor(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(co ) binding.tvFootNote.visibility = VISIBLE binding.tvFootNote.text = successText - binding.tvFootNote.setTextColor(ContextCompat.getColor(context, com.navi.design.R.color.green)) + binding.tvFootNote.setTextColor(ContextCompat.getColor(context, DesignR.color.green)) binding.leftIcon.visibility = VISIBLE binding.leftIcon.setImageResource(R.drawable.ic_rupee_solid_green) setDefaultGreyLineForInputField() @@ -516,9 +517,9 @@ constructor(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(co private fun setDefaultGreyLineForInputField() { binding.etInput.background = getNaviDrawable( - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt(), - strokeColor = ResourcesCompat.getColor(resources, com.navi.design.R.color.border_dark_grey_color, null) + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), + strokeColor = ResourcesCompat.getColor(resources, DesignR.color.border_dark_grey_color, null) ) } @@ -527,9 +528,9 @@ constructor(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(co binding.leftIcon.setImageFieldData(repaymentErrorMessage?.icon) binding.etInput.background = getNaviDrawable( - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt(), - strokeColor = ResourcesCompat.getColor(resources, com.navi.design.R.color.color_EF0000, null) + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), + strokeColor = ResourcesCompat.getColor(resources, DesignR.color.color_EF0000, null) ) } @@ -551,16 +552,16 @@ constructor(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(co } if (index == 0) { layoutLeftRightTextBinding.rootLayout.setPadding( - resources.getDimension(com.navi.design.R.dimen.dp_12).toInt(), - resources.getDimension(com.navi.design.R.dimen.dp_16).toInt(), - resources.getDimension(com.navi.design.R.dimen.dp_12).toInt(), + resources.getDimension(DesignR.dimen.dp_12).toInt(), + resources.getDimension(DesignR.dimen.dp_16).toInt(), + resources.getDimension(DesignR.dimen.dp_12).toInt(), 0 ) } else { layoutLeftRightTextBinding.rootLayout.setPadding( - resources.getDimension(com.navi.design.R.dimen.dp_12).toInt(), - resources.getDimension(com.navi.design.R.dimen.dp_4).toInt(), - resources.getDimension(com.navi.design.R.dimen.dp_12).toInt(), + resources.getDimension(DesignR.dimen.dp_12).toInt(), + resources.getDimension(DesignR.dimen.dp_4).toInt(), + resources.getDimension(DesignR.dimen.dp_12).toInt(), 0 ) } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/AutoCarouselWithDescriptionWidgetView.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/AutoCarouselWithDescriptionWidgetView.kt index 5f0b8b5f33..03688ee1d6 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/AutoCarouselWithDescriptionWidgetView.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/AutoCarouselWithDescriptionWidgetView.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.views +import com.navi.design.R as DesignR import android.annotation.SuppressLint import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background @@ -92,7 +93,7 @@ fun AutoCarouselWithDescriptionWidgetView( .shadow( elevation = 12.dp, shape = RoundedCornerShape(8.dp), - spotColor = colorResource(id = com.navi.design.R.color.outlineSpotShadowColor) + spotColor = colorResource(id = DesignR.color.outlineSpotShadowColor) ) ) { var currentPageIndex = remember { mutableIntStateOf(0) } @@ -303,7 +304,7 @@ internal fun AnimatedViewPager( verticalAlignment = Alignment.CenterVertically, ) { thisPageIndex -> val pageDist = abs(thisPageIndex - pagerState.currentPage) - val spotShadowColor = colorResource(id = com.navi.design.R.color.outlineSpotShadowColor) + val spotShadowColor = colorResource(id = DesignR.color.outlineSpotShadowColor) PageLayout( modifier = Modifier .width(itemWidth) @@ -485,4 +486,3 @@ fun Modifier.pagerAnimation( - diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/BannerDescriptionCarouselItemView.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/BannerDescriptionCarouselItemView.kt index 4e0b5d762e..ee29cf838f 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/BannerDescriptionCarouselItemView.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/BannerDescriptionCarouselItemView.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.views +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -34,7 +35,7 @@ class BannerDescriptionCarouselItemView(context: Context, attrs: AttributeSet?) bannerAspectRatio: Double? ) { binding.rootCl.layoutParams = FrameLayout.LayoutParams( - screenWidth - (resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_40)), + screenWidth - (resources.getDimensionPixelSize(DesignR.dimen.dp_40)), FrameLayout.LayoutParams.WRAP_CONTENT ) itemData.bannerUrl?.let { @@ -46,4 +47,4 @@ class BannerDescriptionCarouselItemView(context: Context, attrs: AttributeSet?) itemData.cta?.let { widgetCallback?.onClick(it) } } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/CircularProgressBar.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/CircularProgressBar.kt index e5e767a1b7..9a1091a083 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/CircularProgressBar.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/CircularProgressBar.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.views +import com.navi.design.R as DesignR import android.animation.ValueAnimator import android.content.Context import android.graphics.Canvas @@ -41,8 +42,8 @@ class CircularProgressBar( private lateinit var progressCirclePaint: Paint private var animator: ValueAnimator? = null - private val PADDING = resources.getDimension(com.navi.design.R.dimen.dp_4) - private val ZERO = resources.getInteger(com.navi.design.R.integer.zero).toFloat() + private val PADDING = resources.getDimension(DesignR.dimen.dp_4) + private val ZERO = resources.getInteger(DesignR.integer.zero).toFloat() private var VIEW_HEIGHT = ZERO private var VIEW_WIDTH = ZERO @@ -50,26 +51,26 @@ class CircularProgressBar( private var CENTER_X = ZERO private var CENTER_Y = ZERO - private var START_ANGLE = -resources.getInteger(com.navi.design.R.integer.integer_90).toFloat() + private var START_ANGLE = -resources.getInteger(DesignR.integer.integer_90).toFloat() private var SWEEP_ANGLE = ZERO private val FROM = ZERO - private var TO = resources.getInteger(com.navi.design.R.integer.integer_360).toFloat() + private var TO = resources.getInteger(DesignR.integer.integer_360).toFloat() - private var STROKE_WIDTH = resources.getDimension(com.navi.design.R.dimen.dp_8) - private var pathCircleColor = ResourcesCompat.getColor(resources, com.navi.design.R.color.divider_color, null) - private var progressCircleColor = ResourcesCompat.getColor(resources, com.navi.design.R.color.naviBlue, null) + private var STROKE_WIDTH = resources.getDimension(DesignR.dimen.dp_8) + private var pathCircleColor = ResourcesCompat.getColor(resources, DesignR.color.divider_color, null) + private var progressCircleColor = ResourcesCompat.getColor(resources, DesignR.color.naviBlue, null) init { context.theme?.obtainStyledAttributes( - attrs, com.navi.design.R.styleable.ProgressBar, ZERO.toInt(), ZERO.toInt() + attrs, DesignR.styleable.ProgressBar, ZERO.toInt(), ZERO.toInt() )?.apply { try { - pathCircleColor = getColor(com.navi.design.R.styleable.ProgressBar_path_color, pathCircleColor) + pathCircleColor = getColor(DesignR.styleable.ProgressBar_path_color, pathCircleColor) progressCircleColor = getColor( - com.navi.design.R.styleable.ProgressBar_progress_color, progressCircleColor + DesignR.styleable.ProgressBar_progress_color, progressCircleColor ) - STROKE_WIDTH = getDimension(com.navi.design.R.styleable.ProgressBar_stroke_width, STROKE_WIDTH) - TO = getFloat(((com.navi.design.R.styleable.ProgressBar_progress_value/100)*360), TO) + STROKE_WIDTH = getDimension(DesignR.styleable.ProgressBar_stroke_width, STROKE_WIDTH) + TO = getFloat(((DesignR.styleable.ProgressBar_progress_value/100)*360), TO) setPaint() setAnimator() } catch (e: Exception) { @@ -124,7 +125,7 @@ class CircularProgressBar( private fun setAnimator(customInterpolator: Interpolator? = null) { animator = ValueAnimator.ofFloat(FROM, TO).apply { - duration = resources.getInteger(com.navi.design.R.integer.integer_3000).toLong() + duration = resources.getInteger(DesignR.integer.integer_3000).toLong() interpolator = customInterpolator ?: AccelerateDecelerateInterpolator() addUpdateListener { SWEEP_ANGLE = it.animatedValue as Float diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/ClaimsClickCardItemView.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/ClaimsClickCardItemView.kt index 007ed26d09..6eaf97ef2e 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/ClaimsClickCardItemView.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/ClaimsClickCardItemView.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.views +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -33,14 +34,14 @@ class ClaimsClickCardItemView (context: Context, attrs: AttributeSet?): Constrai widgetCallback: WidgetCallback? ){ layoutParams = FrameLayout.LayoutParams( - screenWidth - (resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_40)), + screenWidth - (resources.getDimensionPixelSize(DesignR.dimen.dp_40)), FrameLayout.LayoutParams.WRAP_CONTENT ) binding.root.background = getNaviDrawable( - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), - strokeColor = ResourcesCompat.getColor(resources, com.navi.design.R.color.very_pale_orange_color, null), - backgroundColor = ResourcesCompat.getColor(resources, com.navi.design.R.color.noticeOrangeColor, null), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt() + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), + strokeColor = ResourcesCompat.getColor(resources, DesignR.color.very_pale_orange_color, null), + backgroundColor = ResourcesCompat.getColor(resources, DesignR.color.noticeOrangeColor, null), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt() ) claimsClickCardItemData.avatarDetails?.url.let { loadUrlIntoImageView(context, it, binding.itemImage) @@ -61,4 +62,4 @@ class ClaimsClickCardItemView (context: Context, attrs: AttributeSet?): Constrai binding.itemImage.layoutParams.height = dpToPxInInt(claimsClickCardItemData.avatarWidth) } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt index 072d5f2e44..b1cfa88ed5 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt @@ -6,7 +6,8 @@ */ package com.navi.naviwidgets.views -/* + +import com.navi.design.R as DesignR/* * * * Copyright © 2022 by Navi Technologies Private Limited * * All rights reserved. Strictly confidential @@ -47,7 +48,7 @@ constructor(context: Context?, attrs: AttributeSet? = null) : CollapsibleAmountSliderViewBinding.inflate(LayoutInflater.from(context), this, true) init { - endMargin = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_48) + endMargin = resources.getDimensionPixelSize(DesignR.dimen.dp_48) binding.seekbar.setOnSeekBarChangeListener(this) binding.toolTipView.getTriangleView().isVisible = false currentIndex = minIndex @@ -71,7 +72,7 @@ constructor(context: Context?, attrs: AttributeSet? = null) : binding.toolTipView.doAnimate( scaleX = 1F, scaleY = 1F, - duration = resources.getInteger(com.navi.design.R.integer.zero).toLong(), + duration = resources.getInteger(DesignR.integer.zero).toLong(), x = getTooltipTextPosition(seekBar) ) } @@ -80,7 +81,7 @@ constructor(context: Context?, attrs: AttributeSet? = null) : binding.triangleView.doAnimate( scaleX = 1F, scaleY = 1F, - duration = resources.getInteger(com.navi.design.R.integer.zero).toLong(), + duration = resources.getInteger(DesignR.integer.zero).toLong(), x = getTrianglePosition(seekBar), ) } @@ -97,7 +98,7 @@ constructor(context: Context?, attrs: AttributeSet? = null) : return seekBar.thumb.bounds.left.toFloat() + ((seekBar.thumb.bounds.right.toFloat() - seekBar.thumb.bounds.left.toFloat()) / 2.0f) - - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_4) + resources.getDimensionPixelSize(DesignR.dimen.dp_4) } private fun getTooltipTextPosition(seekBar: SeekBar?): Float? { @@ -112,8 +113,8 @@ constructor(context: Context?, attrs: AttributeSet? = null) : if (endPos >= (deviceWidth() - endMargin)) { endPos = deviceWidth() - endMargin.toFloat() startingPos = endPos - binding.toolTipView.getTextView().measuredWidth - } else if (startingPos < resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_8)) { - startingPos = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_8).toFloat() + } else if (startingPos < resources.getDimensionPixelSize(DesignR.dimen.dp_8)) { + startingPos = resources.getDimensionPixelSize(DesignR.dimen.dp_8).toFloat() } return startingPos } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/GoldImageCarousalItemView.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/GoldImageCarousalItemView.kt index 47315664a4..aef620ecf8 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/GoldImageCarousalItemView.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/GoldImageCarousalItemView.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.views +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -32,7 +33,7 @@ class GoldImageCarousalItemView(context: Context, attrs: AttributeSet?): Constra ){ this.layoutParams = FrameLayout.LayoutParams( LayoutParams.MATCH_PARENT, - bannerHeight + resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_24) + bannerHeight + resources.getDimensionPixelSize(DesignR.dimen.dp_24) ) binding.itemIv.showWhenDataIsAvailable( ImageDetail(data.imageUrl, data.imageUrl), ResourcesCompat.getDrawable( diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/HorizontalCarouselWithTextView.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/HorizontalCarouselWithTextView.kt index 0f1b22c6d2..bf1ef9ec3e 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/HorizontalCarouselWithTextView.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/HorizontalCarouselWithTextView.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.views +import com.navi.design.R as DesignR import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.LocalOverscrollConfiguration import androidx.compose.foundation.background @@ -160,7 +161,7 @@ fun ButtonComposable( ) { Box( modifier = Modifier - .background(color = Color(com.navi.design.R.color.dark_purple)) + .background(color = Color(DesignR.color.dark_purple)) .padding(horizontal = 16.dp, vertical = 9.dp) ) { Row(verticalAlignment = Alignment.CenterVertically) { @@ -404,4 +405,4 @@ fun RoundedImageIcon(modifier: Modifier = Modifier, size: Dp = 0.dp, url: String imageFieldData = ImageFieldData(contentScale = "CROP", url = url, iconCode = url) ) } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/HorizontalStoryListItemView.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/HorizontalStoryListItemView.kt index c6b70fad16..90d544b40c 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/HorizontalStoryListItemView.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/HorizontalStoryListItemView.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.views +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -62,7 +63,7 @@ class HorizontalStoryListItemView(context: Context, attrs: AttributeSet?): Const binding.imageFl.background = getNaviDrawable( DrawableShape.RECTANGLE, cornerRadius = dpToPx(34).toInt(), - backgroundColor = ResourcesCompat.getColor(resources, com.navi.design.R.color.defaultColor, null) + backgroundColor = ResourcesCompat.getColor(resources, DesignR.color.defaultColor, null) ) } } @@ -91,4 +92,4 @@ class HorizontalStoryListItemView(context: Context, attrs: AttributeSet?): Const } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/ImageTextDividerWidget.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/ImageTextDividerWidget.kt index 4b2de6a0ec..b9119593c9 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/ImageTextDividerWidget.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/ImageTextDividerWidget.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.views +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -76,7 +77,7 @@ class ImageTextDividerWidget(context: Context, attrs: AttributeSet?) : ) background = getNaviDrawable( backgroundColor = it.bgColor.parseColorSafe(), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_100).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_100).toInt(), ) } } ?: binding.tvTag.setVisibilityState(GONE) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/ImageViewWidget.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/ImageViewWidget.kt index 3f1773c130..f8e2623d0b 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/ImageViewWidget.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/ImageViewWidget.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.views +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -34,11 +35,11 @@ class ImageViewWidget(context: Context, attrs: AttributeSet?) : DataBindingUtil.inflate(inflater, R.layout.image_widget_view, this, true) layoutParams = LayoutParams( - deviceWidth() - resources.getDimension(com.navi.design.R.dimen.dp_54).toInt(), + deviceWidth() - resources.getDimension(DesignR.dimen.dp_54).toInt(), ConstraintLayout.LayoutParams.MATCH_PARENT ) - elevation = resources.getDimension(com.navi.design.R.dimen.dp_0) - radius = resources.getDimension(com.navi.design.R.dimen.dp_16) + elevation = resources.getDimension(DesignR.dimen.dp_0) + radius = resources.getDimension(DesignR.dimen.dp_16) } fun setProperties( @@ -50,7 +51,7 @@ class ImageViewWidget(context: Context, attrs: AttributeSet?) : ) { if (isSingleBannerView) { layoutParams = LayoutParams( - deviceWidth() - resources.getDimension(com.navi.design.R.dimen.dp_32).toInt(), + deviceWidth() - resources.getDimension(DesignR.dimen.dp_32).toInt(), ConstraintLayout.LayoutParams.MATCH_PARENT ) setMargin(data?.margin?.startDp?.toInt() ?: 16, data?.margin?.topDp?.toInt() ?: 0, data?.margin?.endDp?.toInt() ?: 0, data?.margin?.bottomDp?.toInt() ?: 0) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/LottieBannerWidget.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/LottieBannerWidget.kt index 7a62724039..8a48efc3eb 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/LottieBannerWidget.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/LottieBannerWidget.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.views +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -32,11 +33,11 @@ class LottieBannerWidget(context: Context, attrs: AttributeSet?) : DataBindingUtil.inflate(inflater, R.layout.lottie_banner_widget, this, true) layoutParams = LayoutParams( - deviceWidth() - resources.getDimension(com.navi.design.R.dimen.dp_54).toInt(), + deviceWidth() - resources.getDimension(DesignR.dimen.dp_54).toInt(), ConstraintLayout.LayoutParams.MATCH_PARENT ) - elevation = resources.getDimension(com.navi.design.R.dimen.dp_0) - radius = resources.getDimension(com.navi.design.R.dimen.dp_16) + elevation = resources.getDimension(DesignR.dimen.dp_0) + radius = resources.getDimension(DesignR.dimen.dp_16) } fun setProperties( @@ -47,7 +48,7 @@ class LottieBannerWidget(context: Context, attrs: AttributeSet?) : ) { if (isSingleBannerView) { layoutParams = LayoutParams( - deviceWidth() - resources.getDimension(com.navi.design.R.dimen.dp_32).toInt(), + deviceWidth() - resources.getDimension(DesignR.dimen.dp_32).toInt(), ConstraintLayout.LayoutParams.MATCH_PARENT ) setMargin(16, 0, 0, 0) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/PaymentActionView.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/PaymentActionView.kt index 6c0792a04e..e744ad9ee6 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/PaymentActionView.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/PaymentActionView.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.views +import com.navi.design.R as DesignR import android.content.Context import android.graphics.drawable.LayerDrawable import android.util.AttributeSet @@ -83,7 +84,7 @@ class PaymentActionView(context: Context, attributeSet: AttributeSet? = null) : it.actionDetails?.let { actionData -> primaryBtn.apply { actionData.primaryAction?.let { - setCornerRadius(resources.getDimension(com.navi.design.R.dimen.dp_24)) + setCornerRadius(resources.getDimension(DesignR.dimen.dp_24)) setBackgroundColor(actionData.primaryAction?.bgColor.parseColorSafe()) setText(actionData.primaryAction?.title) setTextColor(actionData.primaryAction?.titleColor.parseColorSafe()) @@ -95,7 +96,7 @@ class PaymentActionView(context: Context, attributeSet: AttributeSet? = null) : } secondaryBtn.apply { actionData.secondaryAction?.let { - setCornerRadius(resources.getDimension(com.navi.design.R.dimen.dp_24)) + setCornerRadius(resources.getDimension(DesignR.dimen.dp_24)) setBackgroundColor(actionData.secondaryAction?.bgColor.parseColorSafe()) setText(actionData.secondaryAction?.title) setTextColor(actionData.secondaryAction?.titleColor.parseColorSafe()) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/ProductClickCardItemView.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/ProductClickCardItemView.kt index 0691bc4f60..baf815f66a 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/ProductClickCardItemView.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/ProductClickCardItemView.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.views +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -35,7 +36,7 @@ class ProductClickCardItemView (context: Context, attrs: AttributeSet?): Constra ){ layoutParams = FrameLayout.LayoutParams( - screenWidth - (resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_24) + dpToPxInInt(extraPadding)), + screenWidth - (resources.getDimensionPixelSize(DesignR.dimen.dp_24) + dpToPxInInt(extraPadding)), FrameLayout.LayoutParams.WRAP_CONTENT ) productClickCardsItemData.itemStyle?.let { @@ -98,4 +99,4 @@ fun setCornerRadii(cornerRadii: String? = null): CornerRadius { } return CornerRadius(leftTop,rightTop,rightBottom,leftBottom) -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/RatingColorBoxView.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/RatingColorBoxView.kt index 7f302f72f0..a0dcb16ea6 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/RatingColorBoxView.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/RatingColorBoxView.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.views +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.graphics.drawable.GradientDrawable @@ -32,7 +33,7 @@ class RatingColorBoxView(context: Context, attrs: AttributeSet?, width: Int) : ) { binding.numberTv.setProperties( npsWidgetConstraint?.npsColorData?.text, - color = com.navi.design.R.color.santas_gray + color = DesignR.color.santas_gray ) val indexList = getRadiiIndexes(position) setCornersRadius(npsWidgetConstraint, indexList, endBorder, false) @@ -47,7 +48,7 @@ class RatingColorBoxView(context: Context, attrs: AttributeSet?, width: Int) : val gradientDrawable = GradientDrawable() val radii = FloatArray(8) indexList.forEach { - radii[it] = resources.getDimension(com.navi.design.R.dimen.dp_4) + radii[it] = resources.getDimension(DesignR.dimen.dp_4) } gradientDrawable.cornerRadii = radii if (onClick) { @@ -70,7 +71,7 @@ class RatingColorBoxView(context: Context, attrs: AttributeSet?, width: Int) : npsWidgetConstraint: NpsWidgetConstraint?, previousColorBoxView: RatingColorBoxView ) { - binding.numberTv.setTextColor(ContextCompat.getColor(context, com.navi.design.R.color.white)) + binding.numberTv.setTextColor(ContextCompat.getColor(context, DesignR.color.white)) previousColorBoxView.binding.lineView.visibility = View.GONE val indexList = arrayListOf(0, 1, 2, 3, 4, 5, 6, 7) setCornersRadius(npsWidgetConstraint, indexList, endBorderRequired = false, onClick = true) @@ -80,7 +81,7 @@ class RatingColorBoxView(context: Context, attrs: AttributeSet?, width: Int) : val endBorderRequired = position != Position.END this.apply { binding.numberTv.text = npsWidgetConstraint?.npsColorData?.text - binding.numberTv.setTextColor(ContextCompat.getColor(context, com.navi.design.R.color.santas_gray)) + binding.numberTv.setTextColor(ContextCompat.getColor(context, DesignR.color.santas_gray)) scaleY = 1f binding.numberTv.scaleY = 1f } @@ -95,4 +96,4 @@ class RatingColorBoxView(context: Context, attrs: AttributeSet?, width: Int) : else -> arrayListOf() } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/SeekBarWithCircle.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/SeekBarWithCircle.kt index f371e6dbb9..766c88e1ae 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/SeekBarWithCircle.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/SeekBarWithCircle.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.views +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Canvas import android.graphics.Paint @@ -29,7 +30,7 @@ class SeekbarWithCircle @JvmOverloads constructor(context: Context, attrs: Attri init { setWillNotDraw(false) circlePaint.style = Paint.Style.FILL - circlePaint.color = ContextCompat.getColor(context, com.navi.design.R.color.border_grey_color) + circlePaint.color = ContextCompat.getColor(context, DesignR.color.border_grey_color) } fun updateProgress(defaultSelectedPosition: Int, progress: Int, totalProgress: Int) { @@ -44,8 +45,8 @@ class SeekbarWithCircle @JvmOverloads constructor(context: Context, attrs: Attri circlePaint.color = ContextCompat.getColor( context, - if (progress > defaultSelectedProgressPosition) com.navi.design.R.color.linkColorBlue - else com.navi.design.R.color.border_grey_color + if (progress > defaultSelectedProgressPosition) DesignR.color.linkColorBlue + else DesignR.color.border_grey_color ) canvas.drawCircle(defaultXPositionInPx, height / 2f, circleRadius, circlePaint) super.draw(canvas) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/StoryViewWithTextLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/StoryViewWithTextLayout.kt index db2a943eaf..1ed3befdc3 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/StoryViewWithTextLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/StoryViewWithTextLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.views +import com.navi.design.R as DesignR import android.content.Context import android.text.TextUtils import android.util.AttributeSet @@ -63,7 +64,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 footerHug.setTextFieldData(footer?.tag) footerHug.background = getNaviDrawable( cornerRadius = dpToPxInInt(8), - backgroundColor = ContextCompat.getColor(context, com.navi.design.R.color.white_opaque) + backgroundColor = ContextCompat.getColor(context, DesignR.color.white_opaque) ) footerTitle.setTextFieldData(footer?.title) footerSubtitle.setTextFieldData(footer?.subTitle) @@ -82,4 +83,4 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 } } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/ToolTipMarkerView.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/ToolTipMarkerView.kt index 2ce6be2ca1..f5acd1e4d8 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/ToolTipMarkerView.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/ToolTipMarkerView.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.views +import com.navi.design.R as DesignR import android.content.Context import android.view.View import android.widget.ImageView @@ -51,7 +52,7 @@ class ToolTipMarkerView( txtDateData?.text = yData.date.toString() } ?: kotlin.run { txtDateData?.isVisible = false - txtViewData?.setPadding(resources.getInteger(com.navi.design.R.integer.integer_8),resources.getInteger(R.integer.integer_4),resources.getInteger(com.navi.design.R.integer.integer_8),resources.getInteger(R.integer.integer_4)) + txtViewData?.setPadding(resources.getInteger(DesignR.integer.integer_8),resources.getInteger(R.integer.integer_4),resources.getInteger(DesignR.integer.integer_8),resources.getInteger(R.integer.integer_4)) } yData.priceWeight?.let { priceWeight -> @@ -59,7 +60,7 @@ class ToolTipMarkerView( } } ?: kotlin.run { txtDateData?.isVisible = false - txtViewData?.setPadding(resources.getInteger(com.navi.design.R.integer.integer_8),resources.getInteger(R.integer.integer_4),resources.getInteger(com.navi.design.R.integer.integer_8),resources.getInteger(R.integer.integer_4)) + txtViewData?.setPadding(resources.getInteger(DesignR.integer.integer_8),resources.getInteger(R.integer.integer_4),resources.getInteger(DesignR.integer.integer_8),resources.getInteger(R.integer.integer_4)) } txtViewData?.text = price @@ -103,4 +104,4 @@ class ToolTipMarkerView( offset.y = -(height.toFloat() - indicatorOffset - dpToPx(4)) return offset } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ActionButtonWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ActionButtonWidgetLayout.kt index 4eb5f23303..6c0a0eef02 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ActionButtonWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ActionButtonWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.content.res.ColorStateList import android.util.AttributeSet @@ -80,10 +81,10 @@ class ActionButtonWidgetLayout @JvmOverloads constructor( } if (info.widgetData?.removePadding == true) { root.setPadding( - dpToPxInInt(resources.getInteger(com.navi.design.R.integer.zero)), - dpToPxInInt(resources.getInteger(com.navi.design.R.integer.zero)), - dpToPxInInt(resources.getInteger(com.navi.design.R.integer.zero)), - dpToPxInInt(resources.getInteger(com.navi.design.R.integer.zero)) + dpToPxInInt(resources.getInteger(DesignR.integer.zero)), + dpToPxInInt(resources.getInteger(DesignR.integer.zero)), + dpToPxInInt(resources.getInteger(DesignR.integer.zero)), + dpToPxInInt(resources.getInteger(DesignR.integer.zero)) ) } if(info.widgetData?.showShareCta == true) { diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ActionCardWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ActionCardWidgetLayout.kt index fef2e334bc..5e2348e711 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ActionCardWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ActionCardWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -48,7 +49,7 @@ class ActionCardWidgetLayout @JvmOverloads constructor( icon.showWhenDataIsAvailable(data.rightIconCode) if (isValidHexColor(data.bgColor)) { root.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), backgroundColor = Color.parseColor(data.bgColor) ) } else { @@ -67,4 +68,3 @@ class ActionCardWidgetLayout @JvmOverloads constructor( } - diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AdjustedEmiWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AdjustedEmiWidgetLayout.kt index 1158725ca4..04d21c0fbc 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AdjustedEmiWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AdjustedEmiWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.drawable.GradientDrawable import android.util.AttributeSet @@ -71,12 +72,12 @@ class AdjustedEmiWidgetLayout @JvmOverloads constructor( private fun getTopBackgroundDrawable(): GradientDrawable { val widgetDrawable = GradientDrawable() widgetDrawable.shape = GradientDrawable.RECTANGLE - widgetDrawable.setColor(ContextCompat.getColor(context, com.navi.design.R.color.grey_alabaster)) + widgetDrawable.setColor(ContextCompat.getColor(context, DesignR.color.grey_alabaster)) widgetDrawable.cornerRadii = floatArrayOf( - resources.getDimension(com.navi.design.R.dimen.dp_8), - resources.getDimension(com.navi.design.R.dimen.dp_8), - resources.getDimension(com.navi.design.R.dimen.dp_8), - resources.getDimension(com.navi.design.R.dimen.dp_8), + resources.getDimension(DesignR.dimen.dp_8), + resources.getDimension(DesignR.dimen.dp_8), + resources.getDimension(DesignR.dimen.dp_8), + resources.getDimension(DesignR.dimen.dp_8), 0f, 0f, 0f, @@ -84,8 +85,8 @@ class AdjustedEmiWidgetLayout @JvmOverloads constructor( ) context?.run { widgetDrawable.setStroke( - resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), - ContextCompat.getColor(this, com.navi.design.R.color.border_dark_grey_color) + resources.getDimension(DesignR.dimen.dp_1).toInt(), + ContextCompat.getColor(this, DesignR.color.border_dark_grey_color) ) } return widgetDrawable @@ -94,16 +95,16 @@ class AdjustedEmiWidgetLayout @JvmOverloads constructor( private fun getWidgetDrawable(): GradientDrawable { val widgetDrawable = GradientDrawable() widgetDrawable.shape = GradientDrawable.RECTANGLE - widgetDrawable.cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8) - widgetDrawable.setColor(ContextCompat.getColor(context, com.navi.design.R.color.white)) + widgetDrawable.cornerRadius = resources.getDimension(DesignR.dimen.dp_8) + widgetDrawable.setColor(ContextCompat.getColor(context, DesignR.color.white)) context?.run { widgetDrawable.setStroke( - resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), - ContextCompat.getColor(this, com.navi.design.R.color.border_dark_grey_color) + resources.getDimension(DesignR.dimen.dp_1).toInt(), + ContextCompat.getColor(this, DesignR.color.border_dark_grey_color) ) } return widgetDrawable } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AdvertisementWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AdvertisementWidgetLayout.kt index 97a548ad05..add3b60af3 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AdvertisementWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AdvertisementWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.os.Handler @@ -100,7 +101,7 @@ class AdvertisementWidgetLayout(context: Context, attributeSet: AttributeSet) : titleTv.showWhenDataIsAvailable( showText = widgetData.advertisementWidgetData?.header?.title ) - mainContent.setCornerRadius(resources.getDimension(com.navi.design.R.dimen.dp_12)) + mainContent.setCornerRadius(resources.getDimension(DesignR.dimen.dp_12)) widgetData.advertisementWidgetData?.content?.bgColor?.let { mainContent.setBackgroundColor(it.parseColorSafe()) } @@ -149,8 +150,8 @@ class AdvertisementWidgetLayout(context: Context, attributeSet: AttributeSet) : backgroundColor = it.bgColor.parseColorSafe(), radii = CornerRadius( - leftBottom = resources.getDimension(com.navi.design.R.dimen.dp_12), - rightBottom = resources.getDimension(com.navi.design.R.dimen.dp_12) + leftBottom = resources.getDimension(DesignR.dimen.dp_12), + rightBottom = resources.getDimension(DesignR.dimen.dp_12) ) ) it.items?.forEach { item -> @@ -233,7 +234,7 @@ class AdvertisementWidgetLayout(context: Context, attributeSet: AttributeSet) : } else { ContextCompat.getColor( context, - com.navi.design.R.color.backgroundPrimaryColor + DesignR.color.backgroundPrimaryColor ) } ) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AlertInfoWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AlertInfoWidgetLayout.kt index bf6a23f522..3e62633bc2 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AlertInfoWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AlertInfoWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -70,13 +71,13 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 llDescriptions.visibility = VISIBLE data?.descriptions?.forEach { textFieldData -> val itemView = getDescriptionsItem(textFieldData) - itemView.setLineSpacing(resources.getDimension(com.navi.design.R.dimen.dp_1), 1.0f) + itemView.setLineSpacing(resources.getDimension(DesignR.dimen.dp_1), 1.0f) llDescriptions.addView(itemView) } } else if (data?.subTitle?.isNotNull().orFalse()) { llDescriptions.visibility = VISIBLE val itemView = getDescriptionsItem(data?.subTitle) - itemView.setLineSpacing(resources.getDimension(com.navi.design.R.dimen.dp_1), 1.0f) + itemView.setLineSpacing(resources.getDimension(DesignR.dimen.dp_1), 1.0f) llDescriptions.addView(itemView) } @@ -102,16 +103,16 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 ?.run { ribbon.background = getNaviDrawable( - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), backgroundColor = Color.parseColor(this), radii = CornerRadius( - leftBottom = resources.getDimension(com.navi.design.R.dimen.dp_4), - rightBottom = resources.getDimension(com.navi.design.R.dimen.dp_4) + leftBottom = resources.getDimension(DesignR.dimen.dp_4), + rightBottom = resources.getDimension(DesignR.dimen.dp_4) ) ) } - setBackground(resources.getDimension(com.navi.design.R.dimen.dp_16)) + setBackground(resources.getDimension(DesignR.dimen.dp_16)) } } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AmountInputWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AmountInputWidgetLayout.kt index 0f2697b31f..0192392f3a 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AmountInputWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AmountInputWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.text.Editable import android.text.TextWatcher @@ -153,7 +154,7 @@ class AmountInputWidgetLayout @JvmOverloads constructor( } else if (enteredAMount < minAmount) { if (info?.widgetData?.footNotes?.normal != null) { binding?.tvFootNote?.setTextFieldData(info?.widgetData?.footNotes?.normal?.label) - binding?.tvFootNote?.setTextColor(ContextCompat.getColor(context, com.navi.design.R.color.criticalColor)) + binding?.tvFootNote?.setTextColor(ContextCompat.getColor(context, DesignR.color.criticalColor)) //binding?.tvFootNote?.setTextFieldData(info?.widgetData?.footNotes?.error?.minAmountTitle) //Will uncomment this once backend changes will deploy } @@ -172,7 +173,7 @@ class AmountInputWidgetLayout @JvmOverloads constructor( private fun showAmountInWords(enteredAMount: Int) { val successText = BaseUtils.numberToWords(enteredAMount.toString()) binding?.tvFootNote?.text = successText - binding?.tvFootNote?.setTextColor(ContextCompat.getColor(context, com.navi.design.R.color.green)) + binding?.tvFootNote?.setTextColor(ContextCompat.getColor(context, DesignR.color.green)) binding?.leftIcon?.visibility = VISIBLE binding?.leftIcon?.setImageResource(R.drawable.ic_rupee_solid_green) setDefaultGreyLineForInputField() @@ -193,11 +194,11 @@ class AmountInputWidgetLayout @JvmOverloads constructor( } } binding?.etInput?.background = getNaviDrawable( - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), strokeColor = ResourcesCompat.getColor( resources, - com.navi.design.R.color.criticalColor, + DesignR.color.criticalColor, null ) ) @@ -211,9 +212,9 @@ class AmountInputWidgetLayout @JvmOverloads constructor( private fun setDefaultGreyLineForInputField() { binding?.etInput?.background = getNaviDrawable( - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt(), - strokeColor = ResourcesCompat.getColor(resources, com.navi.design.R.color.border_dark_grey_color, null) + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), + strokeColor = ResourcesCompat.getColor(resources, DesignR.color.border_dark_grey_color, null) ) } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AnimatedLoaderWithTextWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AnimatedLoaderWithTextWidgetLayout.kt index 9b43790c57..a9aaa7647a 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AnimatedLoaderWithTextWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/AnimatedLoaderWithTextWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.animation.Animator import android.animation.ValueAnimator import android.content.Context @@ -70,7 +71,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 } else { widgetData.animatedLoaderWithTextWidgetData?.percentage?.let { val endValue = it.toFloat() - val duration = resources.getInteger(com.navi.design.R.integer.integer_3000).toLong() + val duration = resources.getInteger(DesignR.integer.integer_3000).toLong() val valueAnimator = ValueAnimator.ofFloat(0f, endValue) valueAnimator.duration = duration valueAnimator.addUpdateListener { animation -> diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/BannerDescriptionCarouselWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/BannerDescriptionCarouselWidgetLayout.kt index edaceefe9e..dcff7e0cdc 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/BannerDescriptionCarouselWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/BannerDescriptionCarouselWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -52,11 +53,11 @@ constructor( CirclePagerIndicatorDecoration( colorActive = ContextCompat.getColor( context, - com.navi.design.R.color.outrageous_orange + DesignR.color.outrageous_orange ), colorInactive = ContextCompat.getColor( context, - com.navi.design.R.color.defaultColor + DesignR.color.defaultColor ), indicatorHeight = INDICATOR_HEIGHT ) @@ -65,4 +66,4 @@ constructor( } } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/BannerGridWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/BannerGridWidgetLayout.kt index 158570d796..c00329bc77 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/BannerGridWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/BannerGridWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.drawable.Drawable import android.util.AttributeSet @@ -121,10 +122,10 @@ class BannerGridWidgetLayout @JvmOverloads constructor( var currentItemWidth = (screenSize.toDouble() / columnCount.toDouble()) - resources.getDimension( - com.navi.design.R.dimen.dp_20 + DesignR.dimen.dp_20 ) - currentItemWidth -= (resources.getDimension(com.navi.design.R.dimen.dp_20) + currentItemWidth -= (resources.getDimension(DesignR.dimen.dp_20) .toDouble() / columnCount.toDouble()).toInt() itemViewBinding.root.layoutParams.width = currentItemWidth.toInt() @@ -173,4 +174,4 @@ class BannerGridWidgetLayout @JvmOverloads constructor( }) .into(itemViewBinding.bannerGridImage) } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/BannerWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/BannerWidgetLayout.kt index 14345418e2..afc2211a92 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/BannerWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/BannerWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -48,8 +49,8 @@ class BannerWidgetLayout @JvmOverloads constructor( binding.apply { if (bannerWidget?.widgetData?.removeCompleteMargin != null && bannerWidget?.widgetData?.removeCompleteMargin == true) { val params = cardView.layoutParams as RecyclerView.LayoutParams - params.marginStart = resources.getDimension(com.navi.design.R.dimen.dp_0).toInt() - params.marginEnd = resources.getDimension(com.navi.design.R.dimen.dp_0).toInt() + params.marginStart = resources.getDimension(DesignR.dimen.dp_0).toInt() + params.marginEnd = resources.getDimension(DesignR.dimen.dp_0).toInt() cardView.layoutParams = params } bannerWidget?.widgetData?.let { data -> @@ -75,7 +76,7 @@ class BannerWidgetLayout @JvmOverloads constructor( ) if (isValidHexColor(data.buttonData?.bgColor)) { actionBtn.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_20).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_20).toInt(), backgroundColor = Color.parseColor(data.buttonData?.bgColor) ) } @@ -96,4 +97,3 @@ class BannerWidgetLayout @JvmOverloads constructor( } - diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/BenefitExplainerWidget.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/BenefitExplainerWidget.kt index 50b6e9fb51..e8b14a8192 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/BenefitExplainerWidget.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/BenefitExplainerWidget.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -79,14 +80,14 @@ constructor( setUpRecyclerView(currentTabData.dataList) } val text = tab?.customView?.findViewById(R.id.tab_text) - text?.setTextColor(resources.getColor(com.navi.design.R.color.health_insurance_theme_color)) - text?.typeface = ResourcesCompat.getFont(context, com.navi.design.R.font.tt_semi_bold) + text?.setTextColor(resources.getColor(DesignR.color.health_insurance_theme_color)) + text?.typeface = ResourcesCompat.getFont(context, DesignR.font.tt_semi_bold) } override fun onTabUnselected(tab: TabLayout.Tab?) { val text = tab?.customView?.findViewById(R.id.tab_text) - text?.setTextColor(resources.getColor(com.navi.design.R.color.dark_gray)) - text?.typeface = ResourcesCompat.getFont(context, com.navi.design.R.font.tt_regular) + text?.setTextColor(resources.getColor(DesignR.color.dark_gray)) + text?.typeface = ResourcesCompat.getFont(context, DesignR.font.tt_regular) } override fun onTabReselected(tab: TabLayout.Tab?) { @@ -97,8 +98,8 @@ constructor( setUpRecyclerView(currentTabData.dataList) } val text = tab?.customView?.findViewById(R.id.tab_text) - text?.setTextColor(resources.getColor(com.navi.design.R.color.health_insurance_theme_color)) - text?.typeface = ResourcesCompat.getFont(context, com.navi.design.R.font.tt_semi_bold) + text?.setTextColor(resources.getColor(DesignR.color.health_insurance_theme_color)) + text?.typeface = ResourcesCompat.getFont(context, DesignR.font.tt_semi_bold) } }) } @@ -138,4 +139,4 @@ constructor( } } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ChildContainerWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ChildContainerWidgetLayout.kt index 97903087c3..fc0a75a7a5 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ChildContainerWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ChildContainerWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -35,7 +36,7 @@ constructor( private lateinit var binding: LayoutChildContainerBinding private lateinit var info: ChildContainerWidgetInfo private lateinit var widgetCallback: WidgetCallback - private var childItemBottomPadding: Int = context.resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_8) + private var childItemBottomPadding: Int = context.resources.getDimensionPixelSize(DesignR.dimen.dp_8) private val naviAdapter = object : diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ClaimsClickCardCarousalWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ClaimsClickCardCarousalWidgetLayout.kt index 6418917c49..b400b52fec 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ClaimsClickCardCarousalWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ClaimsClickCardCarousalWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -51,11 +52,11 @@ constructor( CirclePagerIndicatorDecoration( colorActive = ContextCompat.getColor( context, - com.navi.design.R.color.color_1F002A + DesignR.color.color_1F002A ), colorInactive = ContextCompat.getColor( context, - com.navi.design.R.color.defaultColor + DesignR.color.defaultColor ), indicatorHeight = 4 ) @@ -64,4 +65,4 @@ constructor( } } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ContainerWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ContainerWidgetLayout.kt index 92181f8ce8..bf774fc4db 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ContainerWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ContainerWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.ViewGroup @@ -206,7 +207,7 @@ class ContainerWidgetLayout @JvmOverloads constructor( } } if (info.removeElevation() == true) cwlParent.elevation = - resources.getDimension(R.dimen.dp_0) + resources.getDimension(DesignR.dimen.dp_0) info.setMargin()?.let { cwlParent.setMargin(it) } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/CornerRoundedImageWithInfoWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/CornerRoundedImageWithInfoWidgetLayout.kt index 6e34eeea0d..adec3ecbd3 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/CornerRoundedImageWithInfoWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/CornerRoundedImageWithInfoWidgetLayout.kt @@ -9,6 +9,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -61,7 +62,7 @@ class CornerRoundedImageWithInfoWidgetLayout @JvmOverloads constructor( image.showWhenDataIsAvailable(cornerRoundedImageWithInfoWidget?.widgetData?.iconUrl) if (isValidHexColor(cornerRoundedImageWithInfoWidget?.widgetData?.bgColor)) { headerLayout.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), backgroundColor = cornerRoundedImageWithInfoWidget?.widgetData?.bgColor.parseColorSafe() ) } else { @@ -69,4 +70,4 @@ class CornerRoundedImageWithInfoWidgetLayout @JvmOverloads constructor( } } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/CornerRoundedWithDataWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/CornerRoundedWithDataWidgetLayout.kt index 7e8835c2d4..5858329f24 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/CornerRoundedWithDataWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/CornerRoundedWithDataWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -49,7 +50,7 @@ class CornerRoundedWithDataWidgetLayout @JvmOverloads constructor( cornerRoundedWithDataWidget?.widgetData?.let { data -> if (isValidHexColor(data.bgColor)) { root.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), backgroundColor = Color.parseColor(data.bgColor) ) } else { diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/CustomBannerWidgetItemLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/CustomBannerWidgetItemLayout.kt index be107eb64b..6f8d741fde 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/CustomBannerWidgetItemLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/CustomBannerWidgetItemLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.content.res.ColorStateList import android.graphics.Color @@ -51,14 +52,14 @@ class CustomBannerWidgetItemLayout @JvmOverloads constructor( cardWidgetData.widgetData?.bgGradient?.let { cvParent.background = getNaviDrawableFromBackend( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_16).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_16).toInt(), gradientOrientation = GradientOrientation.TR_BL, gradientColors = intArrayOf( Color.parseColor(it.startGradientColor), Color.parseColor(it.endGradientColor) ), - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), - strokeColor = ContextCompat.getColor(context, com.navi.design.R.color.dark_black) + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), + strokeColor = ContextCompat.getColor(context, DesignR.color.dark_black) ) } cardWidgetData.widgetData?.title?.let { @@ -83,4 +84,4 @@ class CustomBannerWidgetItemLayout @JvmOverloads constructor( binding.unbind() } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/DetailsWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/DetailsWidgetLayout.kt index 12e19f5481..ffc47715ec 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/DetailsWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/DetailsWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.View @@ -62,13 +63,13 @@ class DetailsWidgetLayout(context: Context, attributeSet: AttributeSet) : getNaviDrawable( radii = CornerRadius( - leftBottom = resources.getDimension(com.navi.design.R.dimen.dp_8), - rightBottom = resources.getDimension(com.navi.design.R.dimen.dp_8) + leftBottom = resources.getDimension(DesignR.dimen.dp_8), + rightBottom = resources.getDimension(DesignR.dimen.dp_8) ), backgroundColor = it.bgColor.parseColorSafe(), strokeColor = - ContextCompat.getColor(context, com.navi.design.R.color.boundaryColor), - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt() + ContextCompat.getColor(context, DesignR.color.boundaryColor), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt() ) ) ) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/DottedTagWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/DottedTagWidgetLayout.kt index 8b356e803d..8126fb01c1 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/DottedTagWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/DottedTagWidgetLayout.kt @@ -9,6 +9,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -60,7 +61,7 @@ class DottedTagWidgetLayout @JvmOverloads constructor( if (isValidHexColor(dottedTagWidget?.widgetData?.bgColor)) { llParent.background = getNaviDrawable( backgroundColor = dottedTagWidget?.widgetData?.bgColor.parseColorSafe(), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_20).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_20).toInt(), ) } else { llParent.background = null @@ -73,4 +74,4 @@ class DottedTagWidgetLayout @JvmOverloads constructor( } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/DualActionButtonWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/DualActionButtonWidgetLayout.kt index 3739037ef9..5b68a83d96 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/DualActionButtonWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/DualActionButtonWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.os.CountDownTimer import android.util.AttributeSet @@ -155,10 +156,10 @@ class DualActionButtonWidgetLayout @JvmOverloads constructor( binding.apply { if (info.widgetData?.removePadding == true) { root.setPadding( - dpToPxInInt(resources.getInteger(com.navi.design.R.integer.zero)), - dpToPxInInt(resources.getInteger(com.navi.design.R.integer.zero)), - dpToPxInInt(resources.getInteger(com.navi.design.R.integer.zero)), - dpToPxInInt(resources.getInteger(com.navi.design.R.integer.zero)) + dpToPxInInt(resources.getInteger(DesignR.integer.zero)), + dpToPxInInt(resources.getInteger(DesignR.integer.zero)), + dpToPxInInt(resources.getInteger(DesignR.integer.zero)), + dpToPxInInt(resources.getInteger(DesignR.integer.zero)) ) } if(info.widgetData?.ctaRadius == true) { diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/EmiCalendarWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/EmiCalendarWidgetLayout.kt index cb8696cc49..81bff293ee 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/EmiCalendarWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/EmiCalendarWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.annotation.SuppressLint import android.content.Context import android.graphics.drawable.GradientDrawable @@ -69,8 +70,8 @@ class EmiCalendarWidgetLayout @JvmOverloads constructor( layoutTop.headerRightText.setTextFieldData(info?.widgetData?.header?.rightText) layoutTop.layoutItem.background = getTopBackgroundDrawable() layoutTop.layoutItem.setPadding( - 0, resources.getDimension(com.navi.design.R.dimen.dp_16).toInt(), - 0, resources.getDimension(com.navi.design.R.dimen.dp_12).toInt() + 0, resources.getDimension(DesignR.dimen.dp_16).toInt(), + 0, resources.getDimension(DesignR.dimen.dp_12).toInt() ) root.background = getWidgetDrawable() info?.widgetData?.content?.let { contentList -> @@ -184,12 +185,12 @@ class EmiCalendarWidgetLayout @JvmOverloads constructor( private fun getTopBackgroundDrawable(): GradientDrawable { //TODO Use NaviDrawable val widgetDrawable = GradientDrawable() widgetDrawable.shape = GradientDrawable.RECTANGLE - widgetDrawable.setColor(ContextCompat.getColor(context, com.navi.design.R.color.grey_alabaster)) + widgetDrawable.setColor(ContextCompat.getColor(context, DesignR.color.grey_alabaster)) widgetDrawable.cornerRadii = floatArrayOf( - resources.getDimension(com.navi.design.R.dimen.dp_8), - resources.getDimension(com.navi.design.R.dimen.dp_8), - resources.getDimension(com.navi.design.R.dimen.dp_8), - resources.getDimension(com.navi.design.R.dimen.dp_8), + resources.getDimension(DesignR.dimen.dp_8), + resources.getDimension(DesignR.dimen.dp_8), + resources.getDimension(DesignR.dimen.dp_8), + resources.getDimension(DesignR.dimen.dp_8), 0f, 0f, 0f, @@ -197,8 +198,8 @@ class EmiCalendarWidgetLayout @JvmOverloads constructor( ) context?.run { widgetDrawable.setStroke( - resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), - ContextCompat.getColor(this, com.navi.design.R.color.border_dark_grey_color) + resources.getDimension(DesignR.dimen.dp_1).toInt(), + ContextCompat.getColor(this, DesignR.color.border_dark_grey_color) ) } return widgetDrawable @@ -207,12 +208,12 @@ class EmiCalendarWidgetLayout @JvmOverloads constructor( private fun getWidgetDrawable(): GradientDrawable { //TODO Use NaviDrawable val widgetDrawable = GradientDrawable() widgetDrawable.shape = GradientDrawable.RECTANGLE - widgetDrawable.cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8) - widgetDrawable.setColor(ContextCompat.getColor(context, com.navi.design.R.color.white)) + widgetDrawable.cornerRadius = resources.getDimension(DesignR.dimen.dp_8) + widgetDrawable.setColor(ContextCompat.getColor(context, DesignR.color.white)) context?.run { widgetDrawable.setStroke( - resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), - ContextCompat.getColor(this, com.navi.design.R.color.border_dark_grey_color) + resources.getDimension(DesignR.dimen.dp_1).toInt(), + ContextCompat.getColor(this, DesignR.color.border_dark_grey_color) ) } return widgetDrawable diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/FinancialSanctionWidget.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/FinancialSanctionWidget.kt index 9e6f7a8f2d..a914ec8ab7 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/FinancialSanctionWidget.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/FinancialSanctionWidget.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -80,7 +81,7 @@ constructor( } private fun getLoanDetailItemWidth(itemsSize: Int): Int { - val layoutWidth = (getScreenWidth() - resources.getDimension(com.navi.design.R.dimen.dp_32)).toInt() + val layoutWidth = (getScreenWidth() - resources.getDimension(DesignR.dimen.dp_32)).toInt() return if (itemsSize == 0) layoutWidth else layoutWidth / itemsSize } } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/FooterWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/FooterWidgetLayout.kt index 70056ad8f5..5c6e0dbff2 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/FooterWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/FooterWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.content.res.ColorStateList import android.graphics.Color @@ -58,8 +59,8 @@ constructor( tvPrimaryAction.showWhenDataIsAvailable(showText = info?.widgetData?.action?.title) tvPrimaryAction.background = getNaviDrawable( backgroundColor = - ContextCompat.getColor(context, com.navi.design.R.color.outrageous_orange), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_24).toInt() + ContextCompat.getColor(context, DesignR.color.outrageous_orange), + cornerRadius = resources.getDimension(DesignR.dimen.dp_24).toInt() ) val titleColor = info?.widgetData?.action?.titleColor if (isValidHexColor(titleColor)) { diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/GoldConversionWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/GoldConversionWidgetLayout.kt index 87d0d5eaba..204b6f97dc 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/GoldConversionWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/GoldConversionWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -160,10 +161,10 @@ class GoldConversionWidgetLayout @JvmOverloads constructor( } setBackgroundForAmountLayout() binding.clWeightParent.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt(), - backgroundColor = ContextCompat.getColor(context, com.navi.design.R.color.white), - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), - strokeColor = ContextCompat.getColor(context, com.navi.design.R.color.border_dark_grey_color) + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), + backgroundColor = ContextCompat.getColor(context, DesignR.color.white), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), + strokeColor = ContextCompat.getColor(context, DesignR.color.border_dark_grey_color) ) info.actionButtonStyle()?.let { btnStyle -> tvAction.background = getNaviDrawable( @@ -348,20 +349,20 @@ class GoldConversionWidgetLayout @JvmOverloads constructor( private fun setBackgroundForAmountLayout() { binding.clAmountParent.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt(), - backgroundColor = ContextCompat.getColor(context, com.navi.design.R.color.white), - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), - strokeColor = ContextCompat.getColor(context, com.navi.design.R.color.border_dark_grey_color) + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), + backgroundColor = ContextCompat.getColor(context, DesignR.color.white), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), + strokeColor = ContextCompat.getColor(context, DesignR.color.border_dark_grey_color) ) } private fun setErrorBackgroundForAmountLayout() { binding.clAmountParent.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt(), - backgroundColor = ContextCompat.getColor(context, com.navi.design.R.color.white), - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), - strokeColor = ContextCompat.getColor(context, com.navi.design.R.color.criticalColor) + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), + backgroundColor = ContextCompat.getColor(context, DesignR.color.white), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), + strokeColor = ContextCompat.getColor(context, DesignR.color.criticalColor) ) } @@ -852,4 +853,4 @@ class GoldConversionWidgetLayout @JvmOverloads constructor( binding.clError.isVisible = true widgetCallback.widgetAnalytics(GenericAnalyticsData(eventName = INPUT_ERROR_EVENT)) } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/GoldImageCarousalWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/GoldImageCarousalWidgetLayout.kt index f956f72a1c..adff07b65d 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/GoldImageCarousalWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/GoldImageCarousalWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.os.CountDownTimer import android.util.AttributeSet @@ -109,11 +110,11 @@ class GoldImageCarousalWidgetLayout @JvmOverloads constructor( CirclePagerIndicatorDecoration( colorActive = ContextCompat.getColor( context, - com.navi.design.R.color.color_1F002A + DesignR.color.color_1F002A ), colorInactive = ContextCompat.getColor( context, - com.navi.design.R.color.defaultColor + DesignR.color.defaultColor ), indicatorHeight = 4 ) @@ -128,10 +129,10 @@ class GoldImageCarousalWidgetLayout @JvmOverloads constructor( private fun getBannerHeight(aspectRatio: Double): Int { val space = if (widgetData.widgetData?.banners?.size.orZero() > 1) { - resources.getDimension(com.navi.design.R.dimen.dp_78) + resources.getDimension(DesignR.dimen.dp_78) } else { - resources.getDimension(com.navi.design.R.dimen.dp_32) + resources.getDimension(DesignR.dimen.dp_32) } return (aspectRatio * (deviceWidth() - space)).toInt() } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/GridCustomBannerWidgetItemLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/GridCustomBannerWidgetItemLayout.kt index 9d020471f4..e7fa935b5e 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/GridCustomBannerWidgetItemLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/GridCustomBannerWidgetItemLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.content.res.ColorStateList import android.util.AttributeSet @@ -80,8 +81,8 @@ class GridCustomBannerWidgetItemLayout @JvmOverloads constructor( tagLabel.background = getNaviDrawableFromBackend( backgroundColor = cardWidgetData.widgetData?.tagInfo?.bgColor.parseColorSafe(), radii = CornerRadius( - leftBottom = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_4).toFloat(), - rightBottom = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_4).toFloat(), + leftBottom = resources.getDimensionPixelSize(DesignR.dimen.dp_4).toFloat(), + rightBottom = resources.getDimensionPixelSize(DesignR.dimen.dp_4).toFloat(), ) ) @@ -97,4 +98,4 @@ class GridCustomBannerWidgetItemLayout @JvmOverloads constructor( binding.unbind() } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/GridWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/GridWidgetLayout.kt index 2de4a66fff..53dfbb11ce 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/GridWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/GridWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -25,7 +26,7 @@ class GridWidgetLayout @JvmOverloads constructor( private lateinit var binding: GridWidgetLayoutBinding private lateinit var widgetInfo: GridWidget private lateinit var widgetCallback: WidgetCallback - private val totalWidgetItemPadding: Int = context.resources.getInteger(com.navi.design.R.integer.integer_10) + private val totalWidgetItemPadding: Int = context.resources.getInteger(DesignR.integer.integer_10) private val widgetWidth = (context.resources.displayMetrics.widthPixels - dpToPxInInt(totalWidgetItemPadding)) / 2 private val naviAdapter = object : NaviAdapter( @@ -65,8 +66,8 @@ class GridWidgetLayout @JvmOverloads constructor( ) { override fun onBindViewHolder(holder: BaseViewHolder, position: Int) { if (widgetInfo.widgetData?.removeDefaultSize == false) { - holder.itemView.layoutParams.width = dpToPxInInt(resources.getInteger(com.navi.design.R.integer.integer_148)) - holder.itemView.layoutParams.height = dpToPxInInt(resources.getInteger(com.navi.design.R.integer.integer_88)) + holder.itemView.layoutParams.width = dpToPxInInt(resources.getInteger(DesignR.integer.integer_148)) + holder.itemView.layoutParams.height = dpToPxInInt(resources.getInteger(DesignR.integer.integer_88)) } super.onBindViewHolder(holder, position) } @@ -97,4 +98,4 @@ class GridWidgetLayout @JvmOverloads constructor( } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HelpfulFeedbackWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HelpfulFeedbackWidgetLayout.kt index a1c9d50875..81c8cc3607 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HelpfulFeedbackWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HelpfulFeedbackWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.graphics.Typeface @@ -201,8 +202,8 @@ constructor( setSubmitButtonTint() textWithCheckboxBinding.checkbox.background = getNaviDrawable( cornerRadius = dpToPxInInt(4), - backgroundColor = ResourcesCompat.getColor(resources, com.navi.design.R.color.backgroundColor4, null), - strokeColor = ResourcesCompat.getColor(resources, com.navi.design.R.color.descriptionColor6, null), + backgroundColor = ResourcesCompat.getColor(resources, DesignR.color.backgroundColor4, null), + strokeColor = ResourcesCompat.getColor(resources, DesignR.color.descriptionColor6, null), ) binding.userInput.setText("") } @@ -211,10 +212,10 @@ constructor( if(isHelpful){ helpfulFeedbackWidgetBody?.rightButton?.let { buttonData -> binding.apply { - buttonRight.setTextColor(ResourcesCompat.getColor(resources, com.navi.design.R.color.color_6B6B6B, null)) + buttonRight.setTextColor(ResourcesCompat.getColor(resources, DesignR.color.color_6B6B6B, null)) buttonData.leftIcon?.let { iconName -> val leftIconDrawable = ContextCompat.getDrawable(context, NaviWidgetIconUtils.getImageFromIconCode(iconName)) - leftIconDrawable?.setTint(ResourcesCompat.getColor(resources, com.navi.design.R.color.color_6B6B6B, null)) + leftIconDrawable?.setTint(ResourcesCompat.getColor(resources, DesignR.color.color_6B6B6B, null)) buttonRight.setCompoundDrawablesWithIntrinsicBounds(leftIconDrawable, null, null, null) } buttonRight.setOnClickListener(null) @@ -224,10 +225,10 @@ constructor( else{ helpfulFeedbackWidgetBody?.leftButton?.let { buttonData -> binding.apply { - buttonLeft.setTextColor(ResourcesCompat.getColor(resources, com.navi.design.R.color.color_6B6B6B, null)) + buttonLeft.setTextColor(ResourcesCompat.getColor(resources, DesignR.color.color_6B6B6B, null)) buttonData.leftIcon?.let { iconName -> val leftIconDrawable = ContextCompat.getDrawable(context, NaviWidgetIconUtils.getImageFromIconCode(iconName)) - leftIconDrawable?.setTint(ResourcesCompat.getColor(resources, com.navi.design.R.color.color_6B6B6B, null)) + leftIconDrawable?.setTint(ResourcesCompat.getColor(resources, DesignR.color.color_6B6B6B, null)) buttonLeft.setCompoundDrawablesWithIntrinsicBounds(leftIconDrawable, null, null, null) } buttonLeft.setOnClickListener(null) @@ -260,7 +261,7 @@ constructor( private fun initButtons(){ binding.triangle.isVisible = false - binding.triangle.setColor(com.navi.design.R.color.white) + binding.triangle.setColor(DesignR.color.white) helpfulFeedbackWidgetBody?.leftButton?.let { buttonData -> binding.apply { @@ -271,7 +272,7 @@ constructor( } buttonLeft.background = getNaviDrawable( cornerRadius = dpToPxInInt(100), - backgroundColor = ResourcesCompat.getColor(resources, com.navi.design.R.color.white, null) + backgroundColor = ResourcesCompat.getColor(resources, DesignR.color.white, null) ) buttonLeft.setOnClickListener { widgetCallback?.widgetAnalytics(buttonData.analyticsEvent) @@ -303,7 +304,7 @@ constructor( } buttonRight.background = getNaviDrawable( cornerRadius = dpToPxInInt(100), - backgroundColor = ResourcesCompat.getColor(resources, com.navi.design.R.color.white, null) + backgroundColor = ResourcesCompat.getColor(resources, DesignR.color.white, null) ) buttonRight.setOnClickListener { widgetCallback?.widgetAnalytics(buttonData.analyticsEvent) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HoldingsWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HoldingsWidgetLayout.kt index 305fe41961..316f5a1146 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HoldingsWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HoldingsWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -60,7 +61,7 @@ class HoldingsWidgetLayout(context: Context, attributeSet: AttributeSet? = null) text.setTextColor(data.action.titleColor.parseColorSafe()) root.background = getNaviDrawable( backgroundColor = data.action.bgColor.parseColorSafe(), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_100).toInt() + cornerRadius = resources.getDimension(DesignR.dimen.dp_100).toInt() ) } true diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HorizontalCarouselWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HorizontalCarouselWidgetLayout.kt index 7486069748..35136d41c1 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HorizontalCarouselWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HorizontalCarouselWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.graphics.drawable.GradientDrawable @@ -152,10 +153,10 @@ constructor( val layoutParams = MarginLayoutParams(itemWidth, LayoutParams.WRAP_CONTENT) layoutParams.setMargins( - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_16), - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_0), - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_0), - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_8) + resources.getDimensionPixelSize(DesignR.dimen.dp_16), + resources.getDimensionPixelSize(DesignR.dimen.dp_0), + resources.getDimensionPixelSize(DesignR.dimen.dp_0), + resources.getDimensionPixelSize(DesignR.dimen.dp_8) ) itemViewBinding.root.layoutParams = layoutParams @@ -182,10 +183,10 @@ constructor( val layoutParams = MarginLayoutParams(itemWidth, LayoutParams.WRAP_CONTENT) layoutParams.setMargins( - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_16), - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_0), - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_0), - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_8) + resources.getDimensionPixelSize(DesignR.dimen.dp_16), + resources.getDimensionPixelSize(DesignR.dimen.dp_0), + resources.getDimensionPixelSize(DesignR.dimen.dp_0), + resources.getDimensionPixelSize(DesignR.dimen.dp_8) ) itemViewBinding.root.layoutParams = layoutParams @@ -196,7 +197,7 @@ constructor( setRoundedRectangleView( itemViewBinding.imageLl, Color.parseColor(imageFieldData.backgroundColor), - resources.getDimension(com.navi.design.R.dimen.dp_10) + resources.getDimension(DesignR.dimen.dp_10) ) } loadUrlIntoImageView(context, imageFieldData.url, itemViewBinding.itemImage) @@ -207,8 +208,8 @@ constructor( itemViewBinding.videoOverlayBackgroundIv.isVisible = true itemViewBinding.videoOverlayPlayBtnIv.isVisible = true val shape = GradientDrawable() - shape.cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_10) - shape.setColor(ContextCompat.getColor(context, com.navi.design.R.color.dark_gray_opacity_30)) + shape.cornerRadius = resources.getDimension(DesignR.dimen.dp_10) + shape.setColor(ContextCompat.getColor(context, DesignR.color.dark_gray_opacity_30)) itemViewBinding.videoOverlayBackgroundIv.setImageDrawable(shape) } } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HorizontalImageScrollWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HorizontalImageScrollWidgetLayout.kt index 674b162736..495966fba0 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HorizontalImageScrollWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HorizontalImageScrollWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -66,7 +67,7 @@ constructor( private fun getItemWidth(visibleItemsOnScreen: Float?): Int { val screenWidth = - getScreenWidth().toDouble() - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_8) + getScreenWidth().toDouble() - resources.getDimensionPixelSize(DesignR.dimen.dp_8) return (screenWidth / ((visibleItemsOnScreen ?: defaultItemsOnScreen).toDouble())) .roundToInt() } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HorizontallyScrollableVideosWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HorizontallyScrollableVideosWidgetLayout.kt index 4596d49eb6..8fda4a8020 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HorizontallyScrollableVideosWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/HorizontallyScrollableVideosWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -76,7 +77,7 @@ class HorizontallyScrollableVideosWidgetLayout @JvmOverloads constructor( ) itemBinding.data = itemData val layoutParams = MarginLayoutParams(imgWidth, LayoutParams.WRAP_CONTENT) - layoutParams.marginEnd = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_18) + layoutParams.marginEnd = resources.getDimensionPixelSize(DesignR.dimen.dp_18) itemBinding.root.layoutParams = layoutParams itemBinding.root.setOnClickListener { itemData?.ctaData?.let { cta -> @@ -88,7 +89,7 @@ class HorizontallyScrollableVideosWidgetLayout @JvmOverloads constructor( private fun getItemWidth(itemsOnScreen: Float?): Int { val screenWidth = - getScreenWidth().toDouble() - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_8) + getScreenWidth().toDouble() - resources.getDimensionPixelSize(DesignR.dimen.dp_8) return (screenWidth / ((itemsOnScreen ?: defaultItemsOnScreen).toDouble())).roundToInt() } } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/IconTitleWithTimerWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/IconTitleWithTimerWidgetLayout.kt index dacfb03e40..fe188fb108 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/IconTitleWithTimerWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/IconTitleWithTimerWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.content.res.ColorStateList import android.graphics.Color @@ -71,7 +72,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 if (isValidHexColor(it.gradient.startGradientColor) && isValidHexColor(it.gradient.endGradientColor)) { rootLayout.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_16).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_16).toInt(), gradientColors = intArrayOf( Color.parseColor(it.gradient.startGradientColor), Color.parseColor(it.gradient.endGradientColor) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ImageCarousalView.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ImageCarousalView.kt index 9467af44d9..da45f82330 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ImageCarousalView.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ImageCarousalView.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.os.CountDownTimer @@ -137,7 +138,7 @@ class ImageCarousalView @JvmOverloads constructor( iconIv.showWhenDataIsAvailable(imageUrl = widgetData.widgetData?.iconUrl) widgetData.widgetData?.label?.bgColor?.let { label.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_100).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_100).toInt(), backgroundColor = Color.parseColor(it) ) label.setPadding(12, 4, 12, 4) @@ -175,7 +176,7 @@ class ImageCarousalView @JvmOverloads constructor( override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { super.onScrolled(recyclerView, dx, dy) itemPosition += dx - updateTab((itemPosition / (deviceWidth() - resources.getDimension(com.navi.design.R.dimen.dp_54))).roundToInt()) + updateTab((itemPosition / (deviceWidth() - resources.getDimension(DesignR.dimen.dp_54))).roundToInt()) } }) } @@ -192,9 +193,9 @@ class ImageCarousalView @JvmOverloads constructor( } override fun onFinish() { - updateTab((itemPosition / (deviceWidth() - resources.getDimension(com.navi.design.R.dimen.dp_54))).roundToInt()) + updateTab((itemPosition / (deviceWidth() - resources.getDimension(DesignR.dimen.dp_54))).roundToInt()) binding.recycleView.scrollBy(itemPosition, 0) - itemPosition += (deviceWidth() - resources.getDimension(com.navi.design.R.dimen.dp_54)).toInt() + itemPosition += (deviceWidth() - resources.getDimension(DesignR.dimen.dp_54)).toInt() startCountDownTimer(3) } } @@ -208,9 +209,9 @@ class ImageCarousalView @JvmOverloads constructor( private fun getBannerHeight(aspectRatio: Double): Int { val space = if (widgetData.widgetData?.banners?.size.orZero() > 1) { - resources.getDimension(com.navi.design.R.dimen.dp_54) + resources.getDimension(DesignR.dimen.dp_54) } else { - resources.getDimension(com.navi.design.R.dimen.dp_32) + resources.getDimension(DesignR.dimen.dp_32) } return (aspectRatio * (deviceWidth() - space)).toInt() } @@ -240,4 +241,4 @@ class ImageCarousalView @JvmOverloads constructor( ) widgetVisibleStartTime = null } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ImageTextItemLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ImageTextItemLayout.kt index e68efb275d..0907cd8ef6 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ImageTextItemLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ImageTextItemLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -58,7 +59,7 @@ class ImageTextItemLayout @JvmOverloads constructor( val backgroundColor = if(isValidHexColor(info.topTagBackground())) { Color.parseColor(info.topTagBackground()) } else { - ContextCompat.getColor(context, com.navi.design.R.color.lightYellow) + ContextCompat.getColor(context, DesignR.color.lightYellow) } topTagTv.background = getNaviDrawable( backgroundColor = backgroundColor, diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ImageTextListWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ImageTextListWidgetLayout.kt index b4a22eb1bd..ab9a1c8fe8 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ImageTextListWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ImageTextListWidgetLayout.kt @@ -9,6 +9,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -107,14 +108,14 @@ class ImageTextListWidgetLayout @JvmOverloads constructor( val parentLayoutParams = (itlwlParent.layoutParams as RecyclerView.LayoutParams) if (info.addMargin() == true) { parentLayoutParams.marginStart = - dpToPxInInt(context.resources.getInteger(com.navi.design.R.integer.integer_16)) + dpToPxInInt(context.resources.getInteger(DesignR.integer.integer_16)) parentLayoutParams.marginEnd = - dpToPxInInt(context.resources.getInteger(com.navi.design.R.integer.integer_16)) + dpToPxInInt(context.resources.getInteger(DesignR.integer.integer_16)) } else { parentLayoutParams.marginStart = - dpToPxInInt(context.resources.getInteger(com.navi.design.R.integer.zero)) + dpToPxInInt(context.resources.getInteger(DesignR.integer.zero)) parentLayoutParams.marginEnd = - dpToPxInInt(context.resources.getInteger(com.navi.design.R.integer.zero)) + dpToPxInInt(context.resources.getInteger(DesignR.integer.zero)) } itlwlParent.layoutParams = parentLayoutParams @@ -132,12 +133,12 @@ class ImageTextListWidgetLayout @JvmOverloads constructor( if (info.contentActionData().isNotNull()) { tvAction.showWhenDataIsAvailable(showText = info.contentActionData()?.title) layoutParams.bottomMargin = - dpToPxInInt(context.resources.getInteger(com.navi.design.R.integer.integer_12)) - rvItems.updatePadding(bottom = dpToPxInInt(context.resources.getInteger(com.navi.design.R.integer.integer_24))) + dpToPxInInt(context.resources.getInteger(DesignR.integer.integer_12)) + rvItems.updatePadding(bottom = dpToPxInInt(context.resources.getInteger(DesignR.integer.integer_24))) } else { layoutParams.bottomMargin = - dpToPxInInt(context.resources.getInteger(com.navi.design.R.integer.zero)) - rvItems.updatePadding(bottom = dpToPxInInt(context.resources.getInteger(com.navi.design.R.integer.zero))) + dpToPxInInt(context.resources.getInteger(DesignR.integer.zero)) + rvItems.updatePadding(bottom = dpToPxInInt(context.resources.getInteger(DesignR.integer.zero))) } rvItems.layoutParams = layoutParams tvAction.isVisible = info.contentActionData().isNotNull() == true @@ -170,7 +171,7 @@ class ImageTextListWidgetLayout @JvmOverloads constructor( DividerItemDecorator( ResourcesCompat.getDrawable( resources, - com.navi.design.R.drawable.divider, + DesignR.drawable.divider, null ) ) @@ -178,4 +179,4 @@ class ImageTextListWidgetLayout @JvmOverloads constructor( } } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InfoWithTimerV2WidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InfoWithTimerV2WidgetLayout.kt index a411c4c5ec..40ed73faa5 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InfoWithTimerV2WidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InfoWithTimerV2WidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.os.CountDownTimer import android.util.AttributeSet @@ -55,8 +56,8 @@ class InfoWithTimerV2WidgetLayout @JvmOverloads constructor( if (it.currentTime.isNotNull() && it.endTime.isNotNull()) { timerLayout.visibility = View.VISIBLE timerLayout.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt(), - backgroundColor = ResourcesCompat.getColor(resources, com.navi.design.R.color.white, null) + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), + backgroundColor = ResourcesCompat.getColor(resources, DesignR.color.white, null) ) val millsInFuture = it.endTime!! - it.currentTime!! @@ -112,4 +113,4 @@ class InfoWithTimerV2WidgetLayout @JvmOverloads constructor( companion object{ const val DEFAULT_UPDATE_DURATION_IN_MILLIS:Long = 1000 } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InfoWithTimerV3WidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InfoWithTimerV3WidgetLayout.kt index bb26377322..88dd1a9a80 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InfoWithTimerV3WidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InfoWithTimerV3WidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.os.CountDownTimer import android.util.AttributeSet @@ -54,7 +55,7 @@ class InfoWithTimerV3WidgetLayout @JvmOverloads constructor( try { if (it.currentTime.isNotNull() && it.endTime.isNotNull()) { timerTv.visibility = View.VISIBLE - timerTv.background = getNaviDrawable(cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_23).toInt()) + timerTv.background = getNaviDrawable(cornerRadius = resources.getDimension(DesignR.dimen.dp_23).toInt()) val millsInFuture = it.endTime!! - it.currentTime!! countDownTimer = object : CountDownTimer( millsInFuture, DEFAULT_UPDATE_DURATION_IN_MILLIS @@ -93,7 +94,7 @@ class InfoWithTimerV3WidgetLayout @JvmOverloads constructor( widgetData?.timerInfo?.textFieldData?.text = timerString binding?.timerTv?.setTextFieldData(widgetData?.timerInfo?.textFieldData) binding?.timerTv?.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_23).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_23).toInt(), backgroundColor = widgetData?.timerInfo?.bgColor.parseColorSafe() ) } @@ -107,4 +108,4 @@ class InfoWithTimerV3WidgetLayout @JvmOverloads constructor( const val DEFAULT_UPDATE_DURATION_IN_MILLIS:Long = 1000 } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InformationActionWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InformationActionWidgetLayout.kt index 17c666e97b..2bf2bc504c 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InformationActionWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InformationActionWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.os.Build import android.util.AttributeSet @@ -79,7 +80,7 @@ class InformationActionWidgetLayout @JvmOverloads constructor( } ?: kotlin.run { iawParent.setCardBackgroundColor(info.bgColor().parseColorSafe()) } - if(info.removeElevation() == true) iawParent.elevation = resources.getDimension(com.navi.design.R.dimen.dp_0) + if(info.removeElevation() == true) iawParent.elevation = resources.getDimension(DesignR.dimen.dp_0) info.leftIconDetail()?.let { imageDetails -> ivLeftIcon.updateLayoutParams { imageDetails.iconHeight?.let { diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InformationWidgetWithListOfWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InformationWidgetWithListOfWidgetLayout.kt index 95b11a1797..8af6dd5e56 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InformationWidgetWithListOfWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InformationWidgetWithListOfWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Path import android.util.AttributeSet @@ -100,13 +101,13 @@ class InformationWidgetWithListOfWidgetLayout @JvmOverloads constructor( background = getNaviDrawable( gradientColors = getGradientColors(data.gradient), radii = CornerRadius( - leftTop = dpToPx(data.radius?.leftTop ?: resources.getInteger(com.navi.design.R.integer.integer_8)), - rightTop = dpToPx(data.radius?.rightTop ?: resources.getInteger(com.navi.design.R.integer.integer_8)), - leftBottom = dpToPx(data.radius?.leftBottom ?: resources.getInteger(com.navi.design.R.integer.integer_8)), - rightBottom = dpToPx(data.radius?.rightBottom ?: resources.getInteger(com.navi.design.R.integer.integer_8)) + leftTop = dpToPx(data.radius?.leftTop ?: resources.getInteger(DesignR.integer.integer_8)), + rightTop = dpToPx(data.radius?.rightTop ?: resources.getInteger(DesignR.integer.integer_8)), + leftBottom = dpToPx(data.radius?.leftBottom ?: resources.getInteger(DesignR.integer.integer_8)), + rightBottom = dpToPx(data.radius?.rightBottom ?: resources.getInteger(DesignR.integer.integer_8)) ), strokeWidth = dpToPxInInt( - data.border?.borderWidth ?: resources.getInteger(com.navi.design.R.integer.zero) + data.border?.borderWidth ?: resources.getInteger(DesignR.integer.zero) ), strokeColor = data.border?.borderColor.parseColorSafe(), gradientOrientation = GradientOrientation.valueOf( @@ -159,7 +160,7 @@ class InformationWidgetWithListOfWidgetLayout @JvmOverloads constructor( leftImg.isVisible = false rightImg.isVisible = false root.post { - root.setCornerRadius(data.radius?.leftTop ?: resources.getInteger(com.navi.design.R.integer.integer_8)) + root.setCornerRadius(data.radius?.leftTop ?: resources.getInteger(DesignR.integer.integer_8)) } } } @@ -168,4 +169,3 @@ class InformationWidgetWithListOfWidgetLayout @JvmOverloads constructor( } - diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InvestmentsWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InvestmentsWidgetLayout.kt index 03931984ae..7f1a6f7ae0 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InvestmentsWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/InvestmentsWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.annotation.SuppressLint import android.content.Context import android.graphics.drawable.LayerDrawable @@ -57,7 +58,7 @@ class InvestmentsWidgetLayout(context: Context, attributeSet: AttributeSet? = nu binding.header.root.background = getDrawable( radii = CornerRadius(leftTop = dpToPx(16), rightTop = dpToPx(16)), bgColor = headerData?.bgColor, - strokeColor = resources.getString(com.navi.design.R.color.border_grey_color), + strokeColor = resources.getString(DesignR.color.border_grey_color), strokeWidth = 1, insetTop = 0, insetBottom = -4 @@ -103,8 +104,8 @@ class InvestmentsWidgetLayout(context: Context, attributeSet: AttributeSet? = nu leftBottom = dpToPx(16), rightBottom = dpToPx(16) ), - bgColor = resources.getString(com.navi.design.R.color.white), - strokeColor = resources.getString(com.navi.design.R.color.border_grey_color), + bgColor = resources.getString(DesignR.color.white), + strokeColor = resources.getString(DesignR.color.border_grey_color), strokeWidth = 1, insetTop = -4, insetBottom = 0 diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/KeyValueWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/KeyValueWidgetLayout.kt index 47188d8db2..d469a59407 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/KeyValueWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/KeyValueWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.Gravity @@ -67,11 +68,11 @@ class KeyValueWidgetLayout @JvmOverloads constructor( background = getNaviDrawable( backgroundColor = it.bgColor.parseColorSafe(), radii = CornerRadius( - leftBottom = dpToPx(it.radius?.leftBottom ?: resources.getInteger(R.integer.zero)), - leftTop = dpToPx(it.radius?.leftTop ?: resources.getInteger(R.integer.zero)), + leftBottom = dpToPx(it.radius?.leftBottom ?: resources.getInteger(DesignR.integer.zero)), + leftTop = dpToPx(it.radius?.leftTop ?: resources.getInteger(DesignR.integer.zero)), rightBottom = dpToPx(it.radius?.rightBottom ?: resources.getInteger( - R.integer.zero)), - rightTop = dpToPx(it.radius?.rightTop ?: resources.getInteger(R.integer.zero)) + DesignR.integer.zero)), + rightTop = dpToPx(it.radius?.rightTop ?: resources.getInteger(DesignR.integer.zero)) ) ) } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/LabelWithRadioGroupLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/LabelWithRadioGroupLayout.kt index 2026908ff6..af29622c16 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/LabelWithRadioGroupLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/LabelWithRadioGroupLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.View @@ -110,7 +111,7 @@ class LabelWithRadioGroupLayout @JvmOverloads constructor( addItemDecoration( LeftMarginItemDecoration( context.resources.getDimension( - com.navi.design.R.dimen.dp_24 + DesignR.dimen.dp_24 ) ) ) @@ -224,4 +225,4 @@ class LabelWithRadioGroupLayout @JvmOverloads constructor( } } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/LargeBannerWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/LargeBannerWidgetLayout.kt index 07e25e48e7..b31a110447 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/LargeBannerWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/LargeBannerWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -54,7 +55,7 @@ class LargeBannerWidgetLayout @JvmOverloads constructor( image.showWhenDataIsAvailable(data.imageUrl) if (isValidHexColor(data.gradient?.startGradientColor) && isValidHexColor(data.gradient?.endGradientColor)) { root.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_16).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_16).toInt(), gradientColors = intArrayOf( Color.parseColor(data.gradient?.startGradientColor), Color.parseColor(data.gradient?.endGradientColor) @@ -96,7 +97,7 @@ class LargeBannerWidgetLayout @JvmOverloads constructor( ) if (isValidHexColor(data.buttonData?.bgColor)) { actionBtn.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_20).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_20).toInt(), backgroundColor = Color.parseColor(data.buttonData?.bgColor) ) } @@ -130,4 +131,3 @@ class LargeBannerWidgetLayout @JvmOverloads constructor( - diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/LeaderBoardWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/LeaderBoardWidgetLayout.kt index 156d99f4f3..9af1ac31c6 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/LeaderBoardWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/LeaderBoardWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.animation.ObjectAnimator import android.content.Context import android.util.AttributeSet @@ -107,7 +108,7 @@ class LeaderBoardWidgetLayout @JvmOverloads constructor( setRvData() binding.apply { parentRv.background = getNaviDrawableFromBackend( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_1).toInt(), shape = DrawableShape.RECTANGLE ) bgIv.showWhenDataIsAvailable(info.widgetData?.bgImageUrl) @@ -124,13 +125,13 @@ class LeaderBoardWidgetLayout @JvmOverloads constructor( if (isValidHexColor(data.bgColor)) { iwlParent.background = getNaviDrawableFromBackend( backgroundColor = data.bgColor.parseColorSafe(), - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), strokeColor = data.borderColor.parseColorSafe(), radii = CornerRadius( - leftBottom = dpToPx(resources.getDimension(com.navi.design.R.dimen.dp_4).toInt()), - leftTop = dpToPx(resources.getDimension(com.navi.design.R.dimen.dp_4).toInt()), - rightBottom = dpToPx(resources.getDimension(com.navi.design.R.dimen.dp_4).toInt()), - rightTop = dpToPx(resources.getDimension(com.navi.design.R.dimen.dp_4).toInt()) + leftBottom = dpToPx(resources.getDimension(DesignR.dimen.dp_4).toInt()), + leftTop = dpToPx(resources.getDimension(DesignR.dimen.dp_4).toInt()), + rightBottom = dpToPx(resources.getDimension(DesignR.dimen.dp_4).toInt()), + rightTop = dpToPx(resources.getDimension(DesignR.dimen.dp_4).toInt()) ) ) } else { diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/LoanOfferStepItemWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/LoanOfferStepItemWidgetLayout.kt index 518297b95b..9cfe64f146 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/LoanOfferStepItemWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/LoanOfferStepItemWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -65,7 +66,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 .orZero() ) .toInt(), - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), strokeColor = widgetData.loanOfferStepItemWidgetData ?.cardData diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/MultiCtaWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/MultiCtaWidgetLayout.kt index ca92d0463f..ef7da4af23 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/MultiCtaWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/MultiCtaWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -50,18 +51,18 @@ class MultiCtaWidgetLayout @JvmOverloads constructor( if (infoWidgetData?.widgetData()?.viewType == VIEW_TYPE_NOT_COMBINED_WITHOUT_BORDER) { binding.itemContainer.elevation = 0f binding.itemContainer.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), backgroundColor = ResourcesCompat.getColor( resources, - com.navi.design.R.color.grey_alabaster, + DesignR.color.grey_alabaster, null ) ) binding.itemContainer.setPadding( - resources.getDimension(com.navi.design.R.dimen.dp_16).toInt(), - resources.getDimension(com.navi.design.R.dimen.dp_13).toInt(), + resources.getDimension(DesignR.dimen.dp_16).toInt(), + resources.getDimension(DesignR.dimen.dp_13).toInt(), 0, - resources.getDimension(com.navi.design.R.dimen.dp_13).toInt() + resources.getDimension(DesignR.dimen.dp_13).toInt() ) } setWidgetLayoutParams(infoWidgetData?.widgetLayoutParams(), binding.root) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatActivityRedirectionWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatActivityRedirectionWidgetLayout.kt index de919de923..dd2e0be006 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatActivityRedirectionWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatActivityRedirectionWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -101,9 +102,9 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 isClickable = enable isFocusable = enable if (enable) { - setTextColor(ContextCompat.getColor(context, com.navi.design.R.color.navi_chat_option_message_color)) + setTextColor(ContextCompat.getColor(context, DesignR.color.navi_chat_option_message_color)) } else { - setTextColor(ContextCompat.getColor(context, com.navi.design.R.color.textTertiaryColor)) + setTextColor(ContextCompat.getColor(context, DesignR.color.textTertiaryColor)) } } } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatItemMessageWithAttachmentLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatItemMessageWithAttachmentLayout.kt index 6c5deaba17..49a67aa8a7 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatItemMessageWithAttachmentLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatItemMessageWithAttachmentLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -47,8 +48,8 @@ class NaviChatItemMessageWithAttachmentLayout @JvmOverloads constructor( private fun setMargin() { (binding.root.layoutParams as? RecyclerView.LayoutParams)?.setNaviChatMessageMargin( - bottomMargin = binding.root.context.resources.getInteger(com.navi.design.R.integer.integer_8), - topMargin = binding.root.context.resources.getInteger(com.navi.design.R.integer.integer_16) + bottomMargin = binding.root.context.resources.getInteger(DesignR.integer.integer_8), + topMargin = binding.root.context.resources.getInteger(DesignR.integer.integer_16) ) } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatMessageWithActionItemListWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatMessageWithActionItemListWidgetLayout.kt index ee18438956..584cd1964c 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatMessageWithActionItemListWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatMessageWithActionItemListWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.widget.LinearLayout @@ -149,8 +150,8 @@ class NaviChatMessageWithActionItemListWidgetLayout @JvmOverloads constructor( private fun setMargin() { (binding.root.layoutParams as? RecyclerView.LayoutParams)?.setNaviChatMessageMargin( - bottomMargin = binding.root.context.resources.getInteger(com.navi.design.R.integer.integer_8), - topMargin = binding.root.context.resources.getInteger(com.navi.design.R.integer.integer_16) + bottomMargin = binding.root.context.resources.getInteger(DesignR.integer.integer_8), + topMargin = binding.root.context.resources.getInteger(DesignR.integer.integer_16) ) } } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatMessageWithActionItemWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatMessageWithActionItemWidgetLayout.kt index f3d51e6473..577f43184e 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatMessageWithActionItemWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatMessageWithActionItemWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -64,9 +65,9 @@ class NaviChatMessageWithActionItemWidgetLayout @JvmOverloads constructor( tvOption.isClickable = info.getIsSelectionDone().not() tvOption.isFocusable = info.getIsSelectionDone().not() if (info.getIsSelectionDone()) { - tvOption.setTextColor(ContextCompat.getColor(context, com.navi.design.R.color.textTertiaryColor)) + tvOption.setTextColor(ContextCompat.getColor(context, DesignR.color.textTertiaryColor)) } else { - tvOption.setTextColor(ContextCompat.getColor(context, com.navi.design.R.color.dark_gray)) + tvOption.setTextColor(ContextCompat.getColor(context, DesignR.color.dark_gray)) } tvOption.showWhenDataIsAvailable(showText = info.message()) } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatMessageWithItemListWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatMessageWithItemListWidgetLayout.kt index 0ce17742fa..78deeb90da 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatMessageWithItemListWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatMessageWithItemListWidgetLayout.kt @@ -6,6 +6,7 @@ */ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -125,8 +126,8 @@ class NaviChatMessageWithItemListWidgetLayout @JvmOverloads constructor( private fun setMargin() { (binding.root.layoutParams as? RecyclerView.LayoutParams)?.setNaviChatMessageMargin( - bottomMargin = binding.root.context.resources.getInteger(com.navi.design.R.integer.integer_8), - topMargin = binding.root.context.resources.getInteger(com.navi.design.R.integer.integer_16) + bottomMargin = binding.root.context.resources.getInteger(DesignR.integer.integer_8), + topMargin = binding.root.context.resources.getInteger(DesignR.integer.integer_16) ) } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatReceivedMessageWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatReceivedMessageWidgetLayout.kt index 6bff845b20..98d3ee0aa8 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatReceivedMessageWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatReceivedMessageWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -51,8 +52,8 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 private fun setMargin() { (binding.root.layoutParams as? RecyclerView.LayoutParams)?.setNaviChatMessageMargin( - bottomMargin = binding.root.context.resources.getInteger(com.navi.design.R.integer.integer_8), - topMargin = binding.root.context.resources.getInteger(com.navi.design.R.integer.integer_16) + bottomMargin = binding.root.context.resources.getInteger(DesignR.integer.integer_8), + topMargin = binding.root.context.resources.getInteger(DesignR.integer.integer_16) ) } } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatReceivedMessageWithAttachmentLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatReceivedMessageWithAttachmentLayout.kt index 987c24d1db..c6618e6a88 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatReceivedMessageWithAttachmentLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatReceivedMessageWithAttachmentLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.widget.ProgressBar @@ -143,8 +144,8 @@ class NaviChatReceivedMessageWithAttachmentLayout @JvmOverloads constructor( private fun setMargin() { (binding.root.layoutParams as? RecyclerView.LayoutParams)?.setNaviChatMessageMargin( - bottomMargin = binding.root.context.resources.getInteger(com.navi.design.R.integer.integer_8), - topMargin = binding.root.context.resources.getInteger(com.navi.design.R.integer.integer_16) + bottomMargin = binding.root.context.resources.getInteger(DesignR.integer.integer_8), + topMargin = binding.root.context.resources.getInteger(DesignR.integer.integer_16) ) } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatSentMessageWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatSentMessageWidgetLayout.kt index 91e56c57c8..5bddb0c9f1 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatSentMessageWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatSentMessageWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.View @@ -57,8 +58,8 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 private fun setMargin() { (binding.root.layoutParams as? RecyclerView.LayoutParams)?.setNaviChatMessageMargin( - bottomMargin = binding.root.context.resources.getInteger(com.navi.design.R.integer.integer_8), - topMargin = binding.root.context.resources.getInteger(com.navi.design.R.integer.integer_16) + bottomMargin = binding.root.context.resources.getInteger(DesignR.integer.integer_8), + topMargin = binding.root.context.resources.getInteger(DesignR.integer.integer_16) ) } } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatSentMessageWithAttachmentLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatSentMessageWithAttachmentLayout.kt index d7909d8a66..fb98045e1f 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatSentMessageWithAttachmentLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatSentMessageWithAttachmentLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.View @@ -177,8 +178,8 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 private fun setMargin() { (binding.root.layoutParams as? RecyclerView.LayoutParams)?.setNaviChatMessageMargin( - bottomMargin = binding.root.context.resources.getInteger(com.navi.design.R.integer.integer_8), - topMargin = binding.root.context.resources.getInteger(com.navi.design.R.integer.integer_16) + bottomMargin = binding.root.context.resources.getInteger(DesignR.integer.integer_8), + topMargin = binding.root.context.resources.getInteger(DesignR.integer.integer_16) ) } } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatTypingStatusLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatTypingStatusLayout.kt index 429aa8bd92..580d2f9799 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatTypingStatusLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NaviChatTypingStatusLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -46,8 +47,8 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 private fun setMargin() { (binding.root.layoutParams as? RecyclerView.LayoutParams)?.setNaviChatMessageMargin( - bottomMargin = binding.root.context.resources.getInteger(com.navi.design.R.integer.integer_8), - topMargin = binding.root.context.resources.getInteger(com.navi.design.R.integer.integer_16) + bottomMargin = binding.root.context.resources.getInteger(DesignR.integer.integer_8), + topMargin = binding.root.context.resources.getInteger(DesignR.integer.integer_16) ) } } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NoteWithBottomTextWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NoteWithBottomTextWidgetLayout.kt index ce5198d3da..78846deb2d 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NoteWithBottomTextWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NoteWithBottomTextWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -56,7 +57,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 widget.widgetData?.apply { noteCardData?.bgColor?.let { binding.noteCl.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), backgroundColor = it.parseColorSafe() ) } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NotesWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NotesWidgetLayout.kt index 48e37b0416..3918a7d2c8 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NotesWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NotesWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -60,7 +61,7 @@ constructor( rootLayout.background = getNaviDrawable( backgroundColor = Color.parseColor(backgroundColor), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt() + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt() ) } info?.widgetLayoutParams?.let { setWidgetLayoutParams(it, this.rootLayout) } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NpsWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NpsWidgetLayout.kt index 358617378c..166acb5022 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NpsWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/NpsWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -56,7 +57,7 @@ class NpsWidgetLayout(context: Context, attributeSet: AttributeSet) : val horizontalMargin = binding.colorBoxGroupCard.elevation.toInt() * 2 + binding.colorBoxGroupParentLayout.paddingLeft + binding.colorBoxGroupParentLayout.paddingRight + binding.colorBoxGroupCard.marginLeft + - binding.colorBoxGroupCard.marginRight + resources.getInteger(com.navi.design.R.integer.integer_10) + binding.colorBoxGroupCard.marginRight + resources.getInteger(DesignR.integer.integer_10) val deviceWidthInPixels = resources.displayMetrics.widthPixels binding.colorBoxGroup.setProperties( npsWidgetData, diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/OfferBannerWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/OfferBannerWidgetLayout.kt index 45df828915..13a7057564 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/OfferBannerWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/OfferBannerWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -63,7 +64,7 @@ class OfferBannerWidgetLayout @JvmOverloads constructor( image.showWhenDataIsAvailable(data.iconCode) if (isValidHexColor(data.gradient?.startGradientColor) && isValidHexColor(data.gradient?.endGradientColor)) { root.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), gradientColors = intArrayOf( Color.parseColor(data.gradient?.startGradientColor), Color.parseColor(data.gradient?.endGradientColor) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/OfferWidgetItemLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/OfferWidgetItemLayout.kt index b79e5b1d5d..3afbfd2107 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/OfferWidgetItemLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/OfferWidgetItemLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.content.res.ColorStateList import android.util.AttributeSet @@ -59,8 +60,8 @@ class OfferWidgetItemLayout @JvmOverloads constructor( info.bgGradient()?.startGradientColor.parseColorSafe(), info.bgGradient()?.endGradientColor.parseColorSafe()), radii = CornerRadius( - leftBottom = dpToPx(resources.getInteger(com.navi.design.R.integer.integer_16)), - rightBottom = dpToPx(resources.getInteger(com.navi.design.R.integer.integer_16)) + leftBottom = dpToPx(resources.getInteger(DesignR.integer.integer_16)), + rightBottom = dpToPx(resources.getInteger(DesignR.integer.integer_16)) ), gradientOrientation = GradientOrientation.valueOf( info.bgGradient()?.orientation ?: GradientOrientation.LEFT_RIGHT.name diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ParentContainerWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ParentContainerWidgetLayout.kt index eff6b7f3a4..f04157114f 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ParentContainerWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ParentContainerWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -46,7 +47,7 @@ class ParentContainerWidgetLayout @JvmOverloads constructor( private lateinit var widgetCallback: WidgetCallback private var childItemCount: Float = DEFAULT_VISIBLE_COUNT private var childItemPadding: Int = - context.resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_16) + context.resources.getDimensionPixelSize(DesignR.dimen.dp_16) private var childTotalItem: Int = 0 private var currentTabPosition: Int = 0 @@ -109,7 +110,7 @@ class ParentContainerWidgetLayout @JvmOverloads constructor( this.widgetCallback = widgetCallback this.childItemCount = info.visibleItem() if (info.items().isNullOrEmpty().not() && info.items()?.size!! > 1) { - childItemPadding = context.resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_8) + childItemPadding = context.resources.getDimensionPixelSize(DesignR.dimen.dp_8) } info.items()?.let { childItemList -> @@ -144,7 +145,7 @@ class ParentContainerWidgetLayout @JvmOverloads constructor( super.onScrolled(recyclerView, dx, dy) layoutManager?.requestLayout() currentTabPosition += dx - updateTab((currentTabPosition / (deviceWidth() - resources.getDimension(com.navi.design.R.dimen.dp_54))).roundToInt()) + updateTab((currentTabPosition / (deviceWidth() - resources.getDimension(DesignR.dimen.dp_54))).roundToInt()) } }) } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/PaymentLabelWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/PaymentLabelWidgetLayout.kt index 937e674085..0f9daf2737 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/PaymentLabelWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/PaymentLabelWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -64,13 +65,13 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 getNaviDrawable( radii = CornerRadius( - leftBottom = resources.getDimension(com.navi.design.R.dimen.dp_8), - rightBottom = resources.getDimension(com.navi.design.R.dimen.dp_8) + leftBottom = resources.getDimension(DesignR.dimen.dp_8), + rightBottom = resources.getDimension(DesignR.dimen.dp_8) ), backgroundColor = it.bgColor.parseColorSafe(), strokeColor = - ContextCompat.getColor(context, com.navi.design.R.color.boundaryColor), - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt() + ContextCompat.getColor(context, DesignR.color.boundaryColor), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt() ) ) ) @@ -92,4 +93,4 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 viewBinding.valueTv.setTextFieldData(info.value) return viewBinding.root } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/PaymentOptionsWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/PaymentOptionsWidgetLayout.kt index 91136ba876..3ffbf3385c 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/PaymentOptionsWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/PaymentOptionsWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.View @@ -63,7 +64,7 @@ constructor( radioButtonListener = this@PaymentOptionsWidgetLayout ) recyclerView.addItemDecoration( - SpaceDecoration(resources.getDimension(com.navi.design.R.dimen.dp_16)) + SpaceDecoration(resources.getDimension(DesignR.dimen.dp_16)) ) } else { (recyclerView.adapter as? RadioButtonModelAdapter)?.updateData(this) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/PostDisbursalSuccessWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/PostDisbursalSuccessWidgetLayout.kt index 9119301f5a..473004c7ca 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/PostDisbursalSuccessWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/PostDisbursalSuccessWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -74,7 +75,7 @@ class PostDisbursalSuccessWidgetLayout @JvmOverloads constructor( } post { val params = headerView.layoutParams - val extraHeight = if (rvNaviWidgetsCard.isVisible) resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_30) else 0 + val extraHeight = if (rvNaviWidgetsCard.isVisible) resources.getDimensionPixelSize(DesignR.dimen.dp_30) else 0 params.height = extraHeight + headerLayout.height - rvNaviWidgetsCard.height widgetData?.postDisbursalSuccessWidgetData?.header?.bgColor?.let { bgColor -> @@ -85,4 +86,4 @@ class PostDisbursalSuccessWidgetLayout @JvmOverloads constructor( } } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/PreferenceInfoWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/PreferenceInfoWidgetLayout.kt index c50299bef4..e3d9b100c5 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/PreferenceInfoWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/PreferenceInfoWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.graphics.drawable.Drawable @@ -232,8 +233,8 @@ class PreferenceInfoWidgetLayout @JvmOverloads constructor( } if (textData?.enabled == false) { - primaryTextView?.setTextColor(resources.getColor(com.navi.design.R.color.titleTertiaryColor)) - textView?.setTextColor(resources.getColor(com.navi.design.R.color.titleTertiaryColor)) + primaryTextView?.setTextColor(resources.getColor(DesignR.color.titleTertiaryColor)) + textView?.setTextColor(resources.getColor(DesignR.color.titleTertiaryColor)) } textData?.cta?.let { ctaInfo -> @@ -248,4 +249,4 @@ class PreferenceInfoWidgetLayout @JvmOverloads constructor( SUPER_TOP_UP("super_top_up"), ONE_STEP_SUPER_TOPUP("one_step_super_top_up") } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ProductBenefitsGridWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ProductBenefitsGridWidgetLayout.kt index 54958ee5a7..ba8ddb0439 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ProductBenefitsGridWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ProductBenefitsGridWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.annotation.SuppressLint import android.content.Context import android.util.AttributeSet @@ -89,7 +90,7 @@ class ProductBenefitsGridWidgetLayout @JvmOverloads constructor( data.spanCount?.let { binding.rvBenefits.layoutManager = GridLayoutManager(context, it) val spacing = - dpToPxInInt(data.itemSpacing ?: resources.getInteger(com.navi.design.R.integer.integer_14)) + dpToPxInInt(data.itemSpacing ?: resources.getInteger(DesignR.integer.integer_14)) binding.rvBenefits.addItemDecoration(GridSpacingItemDecoration(it, spacing, false)) } benefitsItemAdapter.setHasStableIds(true) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ProductClickCardCarousalWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ProductClickCardCarousalWidgetLayout.kt index 959f7321b3..59f26ca76d 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ProductClickCardCarousalWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ProductClickCardCarousalWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -73,11 +74,11 @@ constructor( CirclePagerIndicatorDecoration( colorActive = ContextCompat.getColor( context, - com.navi.design.R.color.outrageous_orange + DesignR.color.outrageous_orange ), colorInactive = ContextCompat.getColor( context, - com.navi.design.R.color.defaultColor + DesignR.color.defaultColor ), indicatorHeight = 4 ) @@ -87,4 +88,4 @@ constructor( } } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ProductStatusLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ProductStatusLayout.kt index 091e20f1ab..f72594f83a 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ProductStatusLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ProductStatusLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.os.Handler import android.os.Looper @@ -109,7 +110,7 @@ class ProductStatusLayout @JvmOverloads constructor( primaryAction.visibility = View.INVISIBLE } else { primaryAction.apply { - setCornerRadius(resources.getDimension(com.navi.design.R.dimen.dp_24)) + setCornerRadius(resources.getDimension(DesignR.dimen.dp_24)) setBackgroundColor(actionData.primaryAction?.bgColor.parseColorSafe()) setText(actionData.primaryAction?.title) setTextColor(actionData.primaryAction?.titleColor.parseColorSafe()) @@ -130,7 +131,7 @@ class ProductStatusLayout @JvmOverloads constructor( secondaryAction.visibility = View.INVISIBLE } else { secondaryAction.apply { - setCornerRadius(resources.getDimension(com.navi.design.R.dimen.dp_24)) + setCornerRadius(resources.getDimension(DesignR.dimen.dp_24)) setBackgroundColor(actionData.secondaryAction?.bgColor.parseColorSafe()) setText(actionData.secondaryAction?.title) setTextColor(actionData.secondaryAction?.titleColor.parseColorSafe()) @@ -227,11 +228,11 @@ class ProductStatusLayout @JvmOverloads constructor( CirclePagerIndicatorDecoration( colorActive = ContextCompat.getColor( context, - com.navi.design.R.color.outrageous_orange + DesignR.color.outrageous_orange ), colorInactive = ContextCompat.getColor( context, - com.navi.design.R.color.defaultColor + DesignR.color.defaultColor ), indicatorHeight = 12 ) @@ -318,4 +319,4 @@ class ProductStatusLayout @JvmOverloads constructor( companion object{ const val AUTO_SCROLL_DELAY_IN_MILLIS = 8000L } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ProfileBannerLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ProfileBannerLayout.kt index 9cb9688867..5ecba09b68 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ProfileBannerLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ProfileBannerLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -67,9 +68,9 @@ class ProfileBannerLayout @JvmOverloads constructor( } } binding.profileDetailsLayout.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_16).toInt(), - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), - strokeColor = ResourcesCompat.getColor(resources, com.navi.design.R.color.light_white_orange, null), + cornerRadius = resources.getDimension(DesignR.dimen.dp_16).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), + strokeColor = ResourcesCompat.getColor(resources, DesignR.color.light_white_orange, null), gradientColors = intArrayOf( Color.parseColor(startColor), Color.parseColor(endColor) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RadioButtonWithItemGroupWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RadioButtonWithItemGroupWidgetLayout.kt index 126a3a6143..0b33338717 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RadioButtonWithItemGroupWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RadioButtonWithItemGroupWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.widget.FrameLayout @@ -48,7 +49,7 @@ class RadioButtonWithItemGroupWidgetLayout @JvmOverloads constructor( it, widgetCallback ) - binding.layoutRv.addItemDecoration(SpaceDecoration(resources.getDimension(com.navi.design.R.dimen.dp_12))) + binding.layoutRv.addItemDecoration(SpaceDecoration(resources.getDimension(DesignR.dimen.dp_12))) } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RadioButtonWithItemListLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RadioButtonWithItemListLayout.kt index d7e496b8fc..2bbc55510e 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RadioButtonWithItemListLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RadioButtonWithItemListLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -62,7 +63,7 @@ class RadioButtonWithItemListLayout @JvmOverloads constructor( "" ) if (!flagDecoration) { - binding.iconTextRv.addItemDecoration(SpaceDecoration(resources.getDimension(com.navi.design.R.dimen.dp_12))) + binding.iconTextRv.addItemDecoration(SpaceDecoration(resources.getDimension(DesignR.dimen.dp_12))) flagDecoration = true } } @@ -107,4 +108,4 @@ class RadioButtonWithItemListLayout @JvmOverloads constructor( fun getHeaderLayout(): ConstraintLayout { return binding.headerLayout } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RadioGroupWithFooterCardWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RadioGroupWithFooterCardWidgetLayout.kt index 6630eea41f..b37af38942 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RadioGroupWithFooterCardWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RadioGroupWithFooterCardWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -41,6 +42,6 @@ constructor( radioListWidgetData.radioGroupWithFooterCardWidgetData?.radioItems?.let { binding.layoutRv.adapter = RadioButtonWithFooterCardAdapter(it, widgetCallback) } - binding.layoutRv.addItemDecoration(SpaceDecoration(resources.getDimension(com.navi.design.R.dimen.dp_16))) + binding.layoutRv.addItemDecoration(SpaceDecoration(resources.getDimension(DesignR.dimen.dp_16))) } } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ReferWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ReferWidgetLayout.kt index 5b29e35b1c..0ac04c47a0 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ReferWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ReferWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -54,10 +55,10 @@ class ReferWidgetLayout @JvmOverloads constructor( if (isValidHexColor(data.linkBgGradient?.startGradientColor) && isValidHexColor(data.linkBgGradient?.endGradientColor)) { urlContainer.background = getNaviDrawable( radii = CornerRadius( - rightBottom = resources.getDimension(com.navi.design.R.dimen.dp_0), - leftBottom = resources.getDimension(com.navi.design.R.dimen.dp_8), - rightTop = resources.getDimension(com.navi.design.R.dimen.dp_0), - leftTop = resources.getDimension(com.navi.design.R.dimen.dp_8) + rightBottom = resources.getDimension(DesignR.dimen.dp_0), + leftBottom = resources.getDimension(DesignR.dimen.dp_8), + rightTop = resources.getDimension(DesignR.dimen.dp_0), + leftTop = resources.getDimension(DesignR.dimen.dp_8) ), gradientColors = intArrayOf( Color.parseColor(data.linkBgGradient?.startGradientColor), @@ -73,10 +74,10 @@ class ReferWidgetLayout @JvmOverloads constructor( ) { socialMediaContainer.background = getNaviDrawable( radii = CornerRadius( - rightBottom = resources.getDimension(com.navi.design.R.dimen.dp_8), - leftBottom = resources.getDimension(com.navi.design.R.dimen.dp_0), - rightTop = resources.getDimension(com.navi.design.R.dimen.dp_8), - leftTop = resources.getDimension(com.navi.design.R.dimen.dp_0) + rightBottom = resources.getDimension(DesignR.dimen.dp_8), + leftBottom = resources.getDimension(DesignR.dimen.dp_0), + rightTop = resources.getDimension(DesignR.dimen.dp_8), + leftTop = resources.getDimension(DesignR.dimen.dp_0) ), gradientColors = intArrayOf( Color.parseColor(data.linkRightBgGradient?.startGradientColor), @@ -89,29 +90,29 @@ class ReferWidgetLayout @JvmOverloads constructor( if (data.lottieFileName.isNullOrEmpty()) { val layoutParams: MarginLayoutParams = rvNaviWidgetsCard.layoutParams as MarginLayoutParams - layoutParams.setMargins(0, 0, 0, resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_4)) + layoutParams.setMargins(0, 0, 0, resources.getDimensionPixelSize(DesignR.dimen.dp_4)) rvNaviWidgetsCard.layoutParams = layoutParams referContainer.setPadding( - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_16), - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_24), - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_16), - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_40) + resources.getDimensionPixelSize(DesignR.dimen.dp_16), + resources.getDimensionPixelSize(DesignR.dimen.dp_24), + resources.getDimensionPixelSize(DesignR.dimen.dp_16), + resources.getDimensionPixelSize(DesignR.dimen.dp_40) ) } else { val layoutParams: MarginLayoutParams = rvNaviWidgetsCard.layoutParams as MarginLayoutParams layoutParams.setMargins( 0, - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_106), + resources.getDimensionPixelSize(DesignR.dimen.dp_106), 0, - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_4) + resources.getDimensionPixelSize(DesignR.dimen.dp_4) ) rvNaviWidgetsCard.layoutParams = layoutParams referContainer.setPadding( - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_16), - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_64), - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_16), - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_40) + resources.getDimensionPixelSize(DesignR.dimen.dp_16), + resources.getDimensionPixelSize(DesignR.dimen.dp_64), + resources.getDimensionPixelSize(DesignR.dimen.dp_16), + resources.getDimensionPixelSize(DesignR.dimen.dp_40) ) } urlTitle.showWhenDataIsAvailable(data.shareLink) @@ -148,4 +149,4 @@ class ReferWidgetLayout @JvmOverloads constructor( } } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RewardEarnWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RewardEarnWidgetLayout.kt index 0711351998..b68a0083d2 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RewardEarnWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RewardEarnWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -63,8 +64,8 @@ class RewardEarnWidgetLayout @JvmOverloads constructor( data.shimmerFileName ) referContainer.background = getNaviDrawable( - backgroundColor = ContextCompat.getColor(context, com.navi.design.R.color.white), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_16).toInt() + backgroundColor = ContextCompat.getColor(context, DesignR.color.white), + cornerRadius = resources.getDimension(DesignR.dimen.dp_16).toInt() ) lottieShadow.showWhenDataIsAvailable(data.lottieShadowFileName) data.cardTopMargin?.let { diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RewardsInfoWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RewardsInfoWidgetLayout.kt index 807aeac9b6..1d4207578d 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RewardsInfoWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RewardsInfoWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.content.res.ColorStateList import android.util.AttributeSet @@ -46,7 +47,7 @@ class RewardsInfoWidgetLayout @JvmOverloads constructor( init { layoutParams = LayoutParams( LayoutParams.MATCH_PARENT, - context.resources.getDimension(com.navi.design.R.dimen.dp_52).toInt() + context.resources.getDimension(DesignR.dimen.dp_52).toInt() ) } @@ -59,8 +60,8 @@ class RewardsInfoWidgetLayout @JvmOverloads constructor( ), info: RewardsInfoWidgetInfo, widgetCallback: WidgetCallback? = null, - marginHorizontal: Float = resources.getDimension(com.navi.design.R.dimen.dp_16), - marginTop: Float = resources.getDimension(com.navi.design.R.dimen.dp_0), + marginHorizontal: Float = resources.getDimension(DesignR.dimen.dp_16), + marginTop: Float = resources.getDimension(DesignR.dimen.dp_0), margin: Margin? = null ) { this.binding = binding diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RewardsWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RewardsWidgetLayout.kt index a420c33a42..2e350ef5e0 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RewardsWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RewardsWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.View @@ -90,8 +91,8 @@ class RewardsWidgetLayout @JvmOverloads constructor( tagLabel.background = getNaviDrawableFromBackend( backgroundColor = info.widgetData?.tagInfo?.bgColor.parseColorSafe(), radii = CornerRadius( - leftBottom = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_16).toFloat(), - rightTop = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_16).toFloat() + leftBottom = resources.getDimensionPixelSize(DesignR.dimen.dp_16).toFloat(), + rightTop = resources.getDimensionPixelSize(DesignR.dimen.dp_16).toFloat() ) ) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RowsWithFooterWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RowsWithFooterWidgetLayout.kt index 6580c343f0..498e9a9fcf 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RowsWithFooterWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/RowsWithFooterWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -43,9 +44,9 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 binding.rootLayout.background = getNaviDrawable( backgroundColor = Color.parseColor(defaultBackgroundColor), - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), strokeColor = Color.parseColor(defaultStrokeColor), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt() + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt() ) binding.contentLayout.removeAllViews() if (!content.isNullOrEmpty()) { diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ShimmerAdvertisementWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ShimmerAdvertisementWidgetLayout.kt index 9015d0f0f0..10465bea30 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ShimmerAdvertisementWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/ShimmerAdvertisementWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.animation.ObjectAnimator import android.content.Context import android.graphics.Color @@ -57,7 +58,7 @@ class ShimmerAdvertisementWidgetLayout @JvmOverloads constructor( ivIcon.showWhenDataIsAvailable(data.iconCode) if (isValidHexColor(data.bgColor)) { root.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), backgroundColor = Color.parseColor(data.bgColor) ) } else { @@ -84,4 +85,3 @@ class ShimmerAdvertisementWidgetLayout @JvmOverloads constructor( } - diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/SimpleTextWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/SimpleTextWidgetLayout.kt index 5f47353b52..6f50d6acdc 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/SimpleTextWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/SimpleTextWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.text.method.LinkMovementMethod import android.util.AttributeSet @@ -183,7 +184,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 } catch (_: Exception) {} } if (simpleTextWidget?.widgetData?.enableLineSpacing == false) { - tvTitle.setLineSpacing(resources.getDimension(com.navi.design.R.dimen.dp_0), 1F) + tvTitle.setLineSpacing(resources.getDimension(DesignR.dimen.dp_0), 1F) } icon.showWhenDataIsAvailable(simpleTextWidget?.widgetData?.endIconCode) tagLottie.showWhenDataIsAvailable(simpleTextWidget?.widgetData?.lottieFileName) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/SliderWithDotIndicatorsWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/SliderWithDotIndicatorsWidgetLayout.kt index 3233b402f6..a356bd41cc 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/SliderWithDotIndicatorsWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/SliderWithDotIndicatorsWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.ViewTreeObserver @@ -69,8 +70,8 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 adapter = sliderAdapter addItemDecoration( CirclePagerIndicatorDecoration( - colorActive = ContextCompat.getColor(context, com.navi.design.R.color.outrageous_orange), - colorInactive = ContextCompat.getColor(context, com.navi.design.R.color.defaultColor) + colorActive = ContextCompat.getColor(context, DesignR.color.outrageous_orange), + colorInactive = ContextCompat.getColor(context, DesignR.color.defaultColor) ) ) PagerSnapHelper().attachToRecyclerView(this) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/StaggeredBgImageTextWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/StaggeredBgImageTextWidgetLayout.kt index 5766cebdf8..ed41ec0abf 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/StaggeredBgImageTextWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/StaggeredBgImageTextWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -55,8 +56,8 @@ class StaggeredBgImageTextWidgetLayout @JvmOverloads constructor( tagLabel.background = getNaviDrawableFromBackend( backgroundColor = cardWidgetData.widgetData?.tagInfo?.bgColor.parseColorSafe(), radii = CornerRadius( - leftBottom = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_4).toFloat(), - rightBottom = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_4).toFloat() + leftBottom = resources.getDimensionPixelSize(DesignR.dimen.dp_4).toFloat(), + rightBottom = resources.getDimensionPixelSize(DesignR.dimen.dp_4).toFloat() ) ) @@ -68,8 +69,8 @@ class StaggeredBgImageTextWidgetLayout @JvmOverloads constructor( bgTag.background = getNaviDrawableFromBackend( backgroundColor = cardWidgetData.widgetData?.bgTagColor.parseColorSafe(), radii = CornerRadius( - leftBottom = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_4).toFloat(), - rightBottom = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_4).toFloat() + leftBottom = resources.getDimensionPixelSize(DesignR.dimen.dp_4).toFloat(), + rightBottom = resources.getDimensionPixelSize(DesignR.dimen.dp_4).toFloat() ) ) @@ -81,4 +82,4 @@ class StaggeredBgImageTextWidgetLayout @JvmOverloads constructor( binding.unbind() } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/StatusTrackerWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/StatusTrackerWidgetLayout.kt index 0ba61e03d5..2f500b22a7 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/StatusTrackerWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/StatusTrackerWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -133,12 +134,12 @@ constructor( } statusTrackerWidgetItem.descriptions?.forEach { textFieldData -> val itemView = getStatusDescriptionsItem(textFieldData) - itemView.setLineSpacing(resources.getDimension(com.navi.design.R.dimen.dp_4), 1.0f) + itemView.setLineSpacing(resources.getDimension(DesignR.dimen.dp_4), 1.0f) if (textFieldData.textColor.isNull()) { itemView.setTextColor( ContextCompat.getColor( context, - com.navi.design.R.color.titleSecondaryColor + DesignR.color.titleSecondaryColor ) ) } @@ -222,19 +223,19 @@ constructor( val textView = AppCompatTextView(context) textView.setTextFieldData(layoutFieldData?.action) if (layoutFieldData?.action?.textColor.isNull()) { - textView.setTextColor(ContextCompat.getColor(context, com.navi.design.R.color.titleSecondaryColor)) + textView.setTextColor(ContextCompat.getColor(context, DesignR.color.titleSecondaryColor)) } textView.setPadding( - context.resources.getDimension(com.navi.design.R.dimen.dp_14).toInt(), - context.resources.getDimension(com.navi.design.R.dimen.dp_8).toInt(), - context.resources.getDimension(com.navi.design.R.dimen.dp_14).toInt(), - context.resources.getDimension(com.navi.design.R.dimen.dp_8).toInt() + context.resources.getDimension(DesignR.dimen.dp_14).toInt(), + context.resources.getDimension(DesignR.dimen.dp_8).toInt(), + context.resources.getDimension(DesignR.dimen.dp_14).toInt(), + context.resources.getDimension(DesignR.dimen.dp_8).toInt() ) if (isValidHexColor(layoutFieldData?.bgColor)) { textView.background = getNaviDrawable( backgroundColor = Color.parseColor(layoutFieldData?.bgColor), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt() + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt() ) } return textView diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/StepsWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/StepsWidgetLayout.kt index 7b1396d03c..03a7b6bfc1 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/StepsWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/StepsWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.View @@ -74,9 +75,9 @@ class StepsWidgetLayout @JvmOverloads constructor( ) } ?: kotlin.run { setPadding( - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_16), + resources.getDimensionPixelSize(DesignR.dimen.dp_16), 0, - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_16), + resources.getDimensionPixelSize(DesignR.dimen.dp_16), 0 ) } @@ -87,7 +88,7 @@ class StepsWidgetLayout @JvmOverloads constructor( ) } ?: kotlin.run { setHeight( - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_24), + resources.getDimensionPixelSize(DesignR.dimen.dp_24), binding.separator ) } @@ -117,14 +118,14 @@ class StepsWidgetLayout @JvmOverloads constructor( SELECTED_CIRCULAR -> { binding.numberTv.setPadding( 0, 0, 0, - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_8) + resources.getDimensionPixelSize(DesignR.dimen.dp_8) ) binding.titleTv.setMargin( 0, 0, 0, - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_4) + resources.getDimensionPixelSize(DesignR.dimen.dp_4) ) setHeight( - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_16), + resources.getDimensionPixelSize(DesignR.dimen.dp_16), binding.separator ) numberBg.background = @@ -169,18 +170,17 @@ class StepsWidgetLayout @JvmOverloads constructor( stepsWidget?.widgetData?.removeTitleEndMargin?.let { val layoutParams = binding.titleTv.layoutParams as LayoutParams - layoutParams.marginEnd = dpToPxInInt(context.resources.getInteger(com.navi.design.R.integer.zero)) + layoutParams.marginEnd = dpToPxInInt(context.resources.getInteger(DesignR.integer.zero)) binding.titleTv.layoutParams = layoutParams binding.container.setPadding( - dpToPxInInt(context.resources.getInteger(com.navi.design.R.integer.zero)), - dpToPxInInt(context.resources.getInteger(com.navi.design.R.integer.zero)), - dpToPxInInt(context.resources.getInteger(com.navi.design.R.integer.zero)), - dpToPxInInt(context.resources.getInteger(com.navi.design.R.integer.zero)) + dpToPxInInt(context.resources.getInteger(DesignR.integer.zero)), + dpToPxInInt(context.resources.getInteger(DesignR.integer.zero)), + dpToPxInInt(context.resources.getInteger(DesignR.integer.zero)), + dpToPxInInt(context.resources.getInteger(DesignR.integer.zero)) ) } } } - diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/StripWithTitleAndSubtitleWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/StripWithTitleAndSubtitleWidgetLayout.kt index e0f1b6f221..749d8a1baf 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/StripWithTitleAndSubtitleWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/StripWithTitleAndSubtitleWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -62,7 +63,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 leftBottom = dpToPx(8), rightBottom = dpToPx(8) ), - backgroundColor = ContextCompat.getColor(context, com.navi.design.R.color.white) + backgroundColor = ContextCompat.getColor(context, DesignR.color.white) ) widgetData.stripWithButtonAndImageWidgetData?.stripBackgroundColor?.let { binding.stripTv.setBackgroundTintList(it) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TextCardWithShimmerWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TextCardWithShimmerWidgetLayout.kt index 73548a1b6c..4a6b38c16b 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TextCardWithShimmerWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TextCardWithShimmerWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.animation.ObjectAnimator import android.content.Context import android.graphics.Color @@ -55,7 +56,7 @@ class TextCardWithShimmerWidgetLayout @JvmOverloads constructor( private fun setProperties() { binding.apply { textCardWithShimmerWidget?.widgetData?.let { data -> - if(data.removeElevation.orFalse()) binding.rootLayout.elevation = resources.getDimension(com.navi.design.R.dimen.dp_0) + if(data.removeElevation.orFalse()) binding.rootLayout.elevation = resources.getDimension(DesignR.dimen.dp_0) data.tag?.let { binding.tvTag.apply { isVisible = true @@ -66,10 +67,10 @@ class TextCardWithShimmerWidgetLayout @JvmOverloads constructor( background = getNaviDrawable( backgroundColor = it.bgColor.parseColorSafe(), radii = CornerRadius( - leftBottom = dpToPx(it.radius?.leftBottom ?: resources.getInteger(com.navi.design.R.integer.zero)), - leftTop = dpToPx(it.radius?.leftTop ?: resources.getInteger(com.navi.design.R.integer.zero)), - rightBottom = dpToPx(it.radius?.rightBottom ?: resources.getInteger(com.navi.design.R.integer.zero)), - rightTop = dpToPx(it.radius?.rightTop ?: resources.getInteger(com.navi.design.R.integer.zero)) + leftBottom = dpToPx(it.radius?.leftBottom ?: resources.getInteger(DesignR.integer.zero)), + leftTop = dpToPx(it.radius?.leftTop ?: resources.getInteger(DesignR.integer.zero)), + rightBottom = dpToPx(it.radius?.rightBottom ?: resources.getInteger(DesignR.integer.zero)), + rightTop = dpToPx(it.radius?.rightTop ?: resources.getInteger(DesignR.integer.zero)) ) ) @@ -102,10 +103,10 @@ class TextCardWithShimmerWidgetLayout @JvmOverloads constructor( background = getNaviDrawable( backgroundColor = it.bgColor.parseColorSafe(), radii = CornerRadius( - leftBottom = dpToPx(it.radius?.leftBottom ?: resources.getDimension(com.navi.design.R.dimen.dp_32).toInt()), - leftTop = dpToPx(it.radius?.leftTop ?: resources.getDimension(com.navi.design.R.dimen.dp_32).toInt()), - rightBottom = dpToPx(it.radius?.rightBottom ?: resources.getDimension(com.navi.design.R.dimen.dp_32).toInt()), - rightTop = dpToPx(it.radius?.rightTop ?: resources.getDimension(com.navi.design.R.dimen.dp_32).toInt()) + leftBottom = dpToPx(it.radius?.leftBottom ?: resources.getDimension(DesignR.dimen.dp_32).toInt()), + leftTop = dpToPx(it.radius?.leftTop ?: resources.getDimension(DesignR.dimen.dp_32).toInt()), + rightBottom = dpToPx(it.radius?.rightBottom ?: resources.getDimension(DesignR.dimen.dp_32).toInt()), + rightTop = dpToPx(it.radius?.rightTop ?: resources.getDimension(DesignR.dimen.dp_32).toInt()) ) ) } @@ -113,10 +114,10 @@ class TextCardWithShimmerWidgetLayout @JvmOverloads constructor( if (isValidHexColor(data.bgColor)) { root.background = getNaviDrawable( radii = CornerRadius( - leftBottom = dpToPx(data.radius?.leftBottom ?: resources.getInteger(com.navi.design.R.integer.zero)), - leftTop = dpToPx(data.radius?.leftTop ?: resources.getInteger(com.navi.design.R.integer.zero)), - rightBottom = dpToPx(data.radius?.rightBottom ?: resources.getInteger(com.navi.design.R.integer.zero)), - rightTop = dpToPx(data.radius?.rightTop ?: resources.getInteger(com.navi.design.R.integer.zero)) + leftBottom = dpToPx(data.radius?.leftBottom ?: resources.getInteger(DesignR.integer.zero)), + leftTop = dpToPx(data.radius?.leftTop ?: resources.getInteger(DesignR.integer.zero)), + rightBottom = dpToPx(data.radius?.rightBottom ?: resources.getInteger(DesignR.integer.zero)), + rightTop = dpToPx(data.radius?.rightTop ?: resources.getInteger(DesignR.integer.zero)) ), backgroundColor = Color.parseColor(data.bgColor) ) @@ -132,7 +133,7 @@ class TextCardWithShimmerWidgetLayout @JvmOverloads constructor( ) background = getNaviDrawable( backgroundColor = it.bgColor.parseColorSafe(), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_32).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_32).toInt(), ) } } ?: binding.tvLeftTitleTag.setVisibilityState(GONE) @@ -149,9 +150,9 @@ class TextCardWithShimmerWidgetLayout @JvmOverloads constructor( binding.toolTip.tooltipTv.background = getNaviDrawable( backgroundColor = ContextCompat.getColor( binding.toolTip.root.context, - com.navi.design.R.color.cta_purple_color + DesignR.color.cta_purple_color ), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_4).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_4).toInt(), ) binding.toolTip.tooltipTv.text = it.text.spannedText( context = context, @@ -290,4 +291,3 @@ class TextCardWithShimmerWidgetLayout @JvmOverloads constructor( } - diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TextIconWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TextIconWidgetLayout.kt index 26b05aacbc..580ae241c2 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TextIconWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TextIconWidgetLayout.kt @@ -9,6 +9,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.Gravity @@ -51,7 +52,7 @@ class TextIconWidgetLayout @JvmOverloads constructor( binding.apply { root.background = getNaviDrawableFromBackend( backgroundColor = info.widgetData?.bgColor.parseColorSafe(), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt() + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt() ) tvText.text = info.widgetData?.title?.text.spannedText(context = context, span = info.widgetData?.title?.span) tvText.gravity = when (info.widgetData?.gravity) { @@ -66,4 +67,4 @@ class TextIconWidgetLayout @JvmOverloads constructor( } } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TextLottieWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TextLottieWidgetLayout.kt index 63951c7fc2..dc10c3b858 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TextLottieWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TextLottieWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.animation.ObjectAnimator import android.content.Context import android.graphics.Color @@ -54,8 +55,8 @@ class TextLottieWidgetLayout @JvmOverloads constructor( Color.parseColor(info.startGradientColor()), Color.parseColor(info.endGradientColor()) ), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt(), - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), strokeColor = info.borderColor().parseColorSafe(), ) @@ -87,4 +88,4 @@ class TextLottieWidgetLayout @JvmOverloads constructor( } } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TextWithCardWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TextWithCardWidgetLayout.kt index 5b20589789..dc291ff89c 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TextWithCardWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TextWithCardWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -53,7 +54,7 @@ class TextWithCardWidgetLayout @JvmOverloads constructor( topIcon.showWhenDataIsAvailable(data.topIconCode) if (isValidHexColor(data.bgColor)) { root.background = getNaviDrawable( - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), backgroundColor = Color.parseColor(data.bgColor) ) } else { @@ -80,4 +81,3 @@ class TextWithCardWidgetLayout @JvmOverloads constructor( } - diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TimeBoundCardWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TimeBoundCardWidgetLayout.kt index ff266cf51b..5e629694d8 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TimeBoundCardWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TimeBoundCardWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.View @@ -42,10 +43,10 @@ class TimeBoundCardWidgetLayout @JvmOverloads constructor( cvParent.background = getNaviDrawableFromBackend( backgroundColor = cardWidgetData.widgetData?.bgColor?.parseColorSafe(), radii = CornerRadius( - leftBottom = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_8).toFloat(), - rightBottom = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_8).toFloat(), - leftTop = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_8).toFloat(), - rightTop = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_8).toFloat() + leftBottom = resources.getDimensionPixelSize(DesignR.dimen.dp_8).toFloat(), + rightBottom = resources.getDimensionPixelSize(DesignR.dimen.dp_8).toFloat(), + leftTop = resources.getDimensionPixelSize(DesignR.dimen.dp_8).toFloat(), + rightTop = resources.getDimensionPixelSize(DesignR.dimen.dp_8).toFloat() ) ) @@ -74,10 +75,10 @@ class TimeBoundCardWidgetLayout @JvmOverloads constructor( cta.background = getNaviDrawableFromBackend( backgroundColor = cardWidgetData.widgetData?.ctaBgColor?.parseColorSafe(), radii = CornerRadius( - leftBottom = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_100).toFloat(), - rightBottom = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_100).toFloat(), - leftTop = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_100).toFloat(), - rightTop = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_100).toFloat() + leftBottom = resources.getDimensionPixelSize(DesignR.dimen.dp_100).toFloat(), + rightBottom = resources.getDimensionPixelSize(DesignR.dimen.dp_100).toFloat(), + leftTop = resources.getDimensionPixelSize(DesignR.dimen.dp_100).toFloat(), + rightTop = resources.getDimensionPixelSize(DesignR.dimen.dp_100).toFloat() ) ) } else { @@ -98,7 +99,7 @@ class TimeBoundCardWidgetLayout @JvmOverloads constructor( tagLabel.background = getNaviDrawableFromBackend( backgroundColor = cardWidgetData.widgetData?.tagInfo?.bgColor.parseColorSafe(), radii = CornerRadius( - leftBottom = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_8).toFloat() + leftBottom = resources.getDimensionPixelSize(DesignR.dimen.dp_8).toFloat() ) ) @@ -111,4 +112,4 @@ class TimeBoundCardWidgetLayout @JvmOverloads constructor( } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TimelineChecklistWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TimelineChecklistWidgetLayout.kt index 1460f066e4..4c104cb8d5 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TimelineChecklistWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TimelineChecklistWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -51,7 +52,7 @@ class TimelineChecklistWidgetLayout @JvmOverloads constructor( widgetData?.gradient?.let { binding.timelineGradient.setGradient(it) binding.timelineGradient.setCornerRadius( - resources.getDimension(com.navi.design.R.dimen.dp_12).toInt() + resources.getDimension(DesignR.dimen.dp_12).toInt() ) } binding.items.setTimelineItemsData(widgetData.items) @@ -72,13 +73,13 @@ private fun LinearLayout.setTimelineItemsData(items: List loadUrlIntoImageView(context, url, binding.rightSideImage) @@ -86,4 +87,4 @@ class TitleWithBannerInfoWidget @JvmOverloads constructor( } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TitleWithIconWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TitleWithIconWidgetLayout.kt index fa27ea433f..3fa17c6186 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TitleWithIconWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TitleWithIconWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -62,7 +63,7 @@ class TitleWithIconWidgetLayout @JvmOverloads constructor( span = titleWithIconWidget?.widgetData?.title?.span ) if(titleWithIconWidget?.widgetData?.enableLineSpacing == true) { - title.setLineSpacing(resources.getDimension(com.navi.design.R.dimen.dp_4), LINE_SPACING_FACTOR) + title.setLineSpacing(resources.getDimension(DesignR.dimen.dp_4), LINE_SPACING_FACTOR) } icon.showWhenDataIsAvailable(titleWithIconWidget?.widgetData?.iconCode) endIcon.showWhenDataIsAvailable(titleWithIconWidget?.widgetData?.endIconCode) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TitleWithRadioWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TitleWithRadioWidgetLayout.kt index 48a1370742..2026f71ba1 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TitleWithRadioWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TitleWithRadioWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.content.res.ColorStateList import android.util.AttributeSet @@ -57,8 +58,8 @@ class TitleWithRadioWidgetLayout @JvmOverloads constructor( intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked)), intArrayOf( - ContextCompat.getColor(context, com.navi.design.R.color.color_dark_gray), - ContextCompat.getColor(context, com.navi.design.R.color.color_1F002A) + ContextCompat.getColor(context, DesignR.color.color_dark_gray), + ContextCompat.getColor(context, DesignR.color.color_1F002A) ) ) } tvTitle.text = info.widgetData?.title?.text?.spannedText( @@ -83,7 +84,7 @@ class TitleWithRadioWidgetLayout @JvmOverloads constructor( info.widgetData?.bgColor?.let { twlParent.background = getNaviDrawable( backgroundColor = it.parseColorSafe(), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt() + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt() ) } } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TopProductLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TopProductLayout.kt index d4ba2345c5..3fb577a156 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TopProductLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/TopProductLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.graphics.drawable.LayerDrawable @@ -164,7 +165,7 @@ class TopProductLayout @JvmOverloads constructor( ), strokeColor = if (widget.requiresStroke.orFalse()) ContextCompat.getColor( context, - R.color.border_grey_color + DesignR.color.border_grey_color ) else Color.TRANSPARENT, strokeWidth = dpToPx(1).toInt(), backgroundColor = if(widget.footerBgColor.isNotNullAndNotEmpty()) @@ -187,7 +188,7 @@ class TopProductLayout @JvmOverloads constructor( cornerRadius = dpToPx(4).toInt(), strokeColor = if (widget.requiresStroke.orFalse()) ContextCompat.getColor( context, - com.navi.design.R.color.border_grey_color + DesignR.color.border_grey_color ) else Color.TRANSPARENT, strokeWidth = dpToPx(1).toInt(), backgroundColor = if(widget.bgColor.isNotNullAndNotEmpty()) @@ -199,9 +200,9 @@ class TopProductLayout @JvmOverloads constructor( ) if (widgets.size == 1) { val layoutParams = LinearLayout.LayoutParams( - deviceWidth() - resources.getDimension(com.navi.design.R.dimen.dp_32).toInt(), + deviceWidth() - resources.getDimension(DesignR.dimen.dp_32).toInt(), if(widget.cardHeight != null) dpToPx(widget.cardHeight).toInt() - else resources.getDimension(com.navi.design.R.dimen.dp_148).toInt() + else resources.getDimension(DesignR.dimen.dp_148).toInt() ) layoutParams.rightMargin = dpToPx(16).toInt() layoutParams.topMargin = dpToPx(10).toInt() @@ -212,7 +213,7 @@ class TopProductLayout @JvmOverloads constructor( val layoutParams = LinearLayout.LayoutParams( (deviceWidth() * 0.77).toInt(), if(widget.cardHeight != null) dpToPx(widget.cardHeight).toInt() - else resources.getDimension(com.navi.design.R.dimen.dp_148).toInt() + else resources.getDimension(DesignR.dimen.dp_148).toInt() ) layoutParams.rightMargin = dpToPx(16).toInt() layoutParams.topMargin = dpToPx(10).toInt() @@ -223,7 +224,7 @@ class TopProductLayout @JvmOverloads constructor( val layoutParams = LinearLayout.LayoutParams( (deviceWidth() * 0.77).toInt(), if (widget.cardHeight != null) dpToPxInInt(widget.cardHeight) - else resources.getDimension(com.navi.design.R.dimen.dp_148).toInt() + else resources.getDimension(DesignR.dimen.dp_148).toInt() ) layoutParams.topMargin = dpToPx(10).toInt() layoutParams.leftMargin = dpToPx(16).toInt() @@ -239,4 +240,4 @@ class TopProductLayout @JvmOverloads constructor( binding.itemContainer.addView(view) } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/UrgentActionWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/UrgentActionWidgetLayout.kt index c397718866..825c40cc59 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/UrgentActionWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/UrgentActionWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.util.AttributeSet @@ -43,9 +44,9 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 binding.rootLayout.background = getNaviDrawable( backgroundColor = Color.parseColor(defaultBackgroundColor), - strokeWidth = resources.getDimension(com.navi.design.R.dimen.dp_1).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), strokeColor = Color.parseColor(defaultStrokeColor), - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_8).toInt() + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt() ) binding.contentLayout.removeAllViews() if (!descriptions.isNullOrEmpty()) { @@ -59,7 +60,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 binding.imageView.setImageFieldData(bottomRightIcon) binding.actionTv.setLayoutFieldData( actionData, - cornerRadius = resources.getDimension(com.navi.design.R.dimen.dp_25).toInt() + cornerRadius = resources.getDimension(DesignR.dimen.dp_25).toInt() ) { widgetCallback.onClick(it) widgetCallback.widgetAnalytics(it.analyticsEventProperties) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/VerticalCheckpointWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/VerticalCheckpointWidgetLayout.kt index 4f01340520..76f89e42d1 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/VerticalCheckpointWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/VerticalCheckpointWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -97,7 +98,7 @@ constructor( visitedCheckpointBinding.subTitle.setTextFieldData(it) } if(statusType == CheckpointStatusType.COMPLETED){ - visitedCheckpointBinding.verticalLine.setBackgroundColor(ContextCompat.getColor(context, com.navi.design.R.color.description_color_five)) + visitedCheckpointBinding.verticalLine.setBackgroundColor(ContextCompat.getColor(context, DesignR.color.description_color_five)) } else{ if(index == 0){ @@ -110,7 +111,7 @@ constructor( private fun setCheckpointBackground(visitedCheckpointBinding: CheckpointLayoutVisitedBinding, checkpointData: CheckpointData, showFullBackgroundColor: Boolean): View { if(checkpointData.showGreenBackground && showFullBackgroundColor){ - visitedCheckpointBinding.root.setBackgroundColor(ContextCompat.getColor(context, com.navi.design.R.color.light_yellowish_green)) + visitedCheckpointBinding.root.setBackgroundColor(ContextCompat.getColor(context, DesignR.color.light_yellowish_green)) } if(checkpointData.showGreenBackground && !showFullBackgroundColor){ visitedCheckpointBinding.checkpointBackground.visibility = VISIBLE @@ -128,4 +129,4 @@ constructor( } return unvisitedCheckpointBinding.root } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/amc/AmcPortfolioInformationWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/amc/AmcPortfolioInformationWidgetLayout.kt index eaf729d40b..7d27cf29b7 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/amc/AmcPortfolioInformationWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/amc/AmcPortfolioInformationWidgetLayout.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets.amc +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -69,7 +70,7 @@ class AmcPortfolioInformationWidgetLayout @JvmOverloads constructor( clContent.background = getNaviDrawable( strokeWidth = dpToPxInInt(1), - strokeColor = ContextCompat.getColor(context, R.color.border_grey_color), + strokeColor = ContextCompat.getColor(context, DesignR.color.border_grey_color), cornerRadius = dpToPxInInt(4) ) @@ -85,4 +86,4 @@ class AmcPortfolioInformationWidgetLayout @JvmOverloads constructor( } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/amc/FundCardAdapter.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/amc/FundCardAdapter.kt index 3d807cfc43..c3f2f8d51b 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/amc/FundCardAdapter.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/amc/FundCardAdapter.kt @@ -1,5 +1,6 @@ package com.navi.naviwidgets.widgets.amc +import com.navi.design.R as DesignR import android.graphics.drawable.LayerDrawable import android.view.LayoutInflater import android.view.View @@ -81,12 +82,12 @@ class DefaultFundCardViewHolder( cornerRadius = dpToPx(4).toInt(), strokeColor = ContextCompat.getColor( itemView.context, - com.navi.design.R.color.border_grey_color + DesignR.color.border_grey_color ), strokeWidth = dpToPx(1).toInt(), backgroundColor = ContextCompat.getColor( itemView.context, - com.navi.design.R.color.white + DesignR.color.white ) ) fundTitle.setSpannableString(card.title) @@ -149,7 +150,7 @@ class DefaultFundCardViewHolder( backgroundColor = card.footerBgColor.parseColorSafe(COLOR_WHITE), strokeColor = ContextCompat.getColor( itemView.context, - R.color.border_grey_color + DesignR.color.border_grey_color ), strokeWidth = dpToPx(1).toInt(), ) @@ -182,12 +183,12 @@ class IndexReturnFundCardViewHolder( cornerRadius = dpToPx(4).toInt(), strokeColor = ContextCompat.getColor( itemView.context, - com.navi.design.R.color.border_grey_color + DesignR.color.border_grey_color ), strokeWidth = dpToPx(1).toInt(), backgroundColor = ContextCompat.getColor( itemView.context, - com.navi.design.R.color.white + DesignR.color.white ) ) title.setSpannableString(card.title) @@ -230,4 +231,4 @@ class IndexReturnFundCardViewHolder( } } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/amc/TopProductHorizontalListLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/amc/TopProductHorizontalListLayout.kt index 356f4b41e3..31595a1485 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/amc/TopProductHorizontalListLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/amc/TopProductHorizontalListLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets.amc +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -110,8 +111,8 @@ class TopProductHorizontalListLayout @JvmOverloads constructor( if (totalItems == 1) { val layoutParams = LinearLayout.LayoutParams( - deviceWidth() - resources.getDimension(com.navi.design.R.dimen.dp_32).toInt(), - resources.getDimension(com.navi.design.R.dimen.dp_274).toInt() + deviceWidth() - resources.getDimension(DesignR.dimen.dp_32).toInt(), + resources.getDimension(DesignR.dimen.dp_274).toInt() ) layoutParams.rightMargin = dpToPx(16).toInt() layoutParams.leftMargin = dpToPx(16).toInt() @@ -120,7 +121,7 @@ class TopProductHorizontalListLayout @JvmOverloads constructor( } else if (position == totalItems - 1) { val layoutParams = LinearLayout.LayoutParams( (deviceWidth() * 0.86).toInt(), - resources.getDimension(com.navi.design.R.dimen.dp_274).toInt() + resources.getDimension(DesignR.dimen.dp_274).toInt() ) layoutParams.rightMargin = dpToPx(16).toInt() layoutParams.leftMargin = dpToPx(16).toInt() @@ -129,7 +130,7 @@ class TopProductHorizontalListLayout @JvmOverloads constructor( } else { val layoutParams = LinearLayout.LayoutParams( (deviceWidth() * 0.86).toInt(), - resources.getDimension(com.navi.design.R.dimen.dp_274).toInt() + resources.getDimension(DesignR.dimen.dp_274).toInt() ) layoutParams.leftMargin = dpToPx(16).toInt() layoutParams.bottomMargin = dpToPx(16).toInt() diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/bottomsheetselector/ui/LabeledOptionSelectorListWidget.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/bottomsheetselector/ui/LabeledOptionSelectorListWidget.kt index 2835846c91..ae0151d146 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/bottomsheetselector/ui/LabeledOptionSelectorListWidget.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/bottomsheetselector/ui/LabeledOptionSelectorListWidget.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets.bottomsheetselector.ui +import com.navi.design.R as DesignR import android.content.Context import android.content.ContextWrapper import android.util.AttributeSet @@ -136,7 +137,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 private fun updateNewTheme() { widgetBinding.iconIv.setImageResource(R.drawable.ic_small_chevron_down_blue_svg) - widgetBinding.choiceDisplay.setStyle(com.navi.design.R.style.TextInputV2Style) + widgetBinding.choiceDisplay.setStyle(DesignR.style.TextInputV2Style) } override fun initiateUI() { diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/bottomsheetselector/ui/NewOptionListBottomSheet.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/bottomsheetselector/ui/NewOptionListBottomSheet.kt index c9bfe19c1c..f60c5f9d46 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/bottomsheetselector/ui/NewOptionListBottomSheet.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/bottomsheetselector/ui/NewOptionListBottomSheet.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets.bottomsheetselector.ui +import com.navi.design.R as DesignR import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -81,12 +82,12 @@ class NewOptionListBottomSheet : BottomSheetDialogFragment() { onItemSelectAction.invoke(pair.first) pair.second.apply { iconIv.visibility = View.VISIBLE - titleTv.setTextColor(resources.getColor(com.navi.design.R.color.title_text_red_color)) + titleTv.setTextColor(resources.getColor(DesignR.color.title_text_red_color)) } } else { pair.second.apply { iconIv.visibility = View.GONE - titleTv.setTextColor(resources.getColor(com.navi.design.R.color.dark_gray)) + titleTv.setTextColor(resources.getColor(DesignR.color.dark_gray)) } } } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/callout/CalloutWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/callout/CalloutWidgetLayout.kt index ac3fab6daa..fc9959a3b6 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/callout/CalloutWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/callout/CalloutWidgetLayout.kt @@ -6,6 +6,7 @@ */ package com.navi.naviwidgets.viewholder.callout +import com.navi.design.R as DesignR import android.content.Context import android.os.Handler import android.util.AttributeSet @@ -123,8 +124,8 @@ class HorizontalAdapter(val callouts: List, val onClickListener: View.O val padding = 21F val margin = 16F val paddingPx = - holder.binding.topView.resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_21) - val marginPx = holder.binding.topView.resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_16) + holder.binding.topView.resources.getDimensionPixelSize(DesignR.dimen.dp_21) + val marginPx = holder.binding.topView.resources.getDimensionPixelSize(DesignR.dimen.dp_16) val deltaVisible = 16F val itemWidthDp = windowWidthDp - padding * 2 - margin - deltaVisible val itemWidthPx = dpToPxInInt(itemWidthDp.toInt()) @@ -165,4 +166,4 @@ class HorizontalAdapter(val callouts: List, val onClickListener: View.O override fun getItemCount(): Int { return Integer.MAX_VALUE } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/DashboardInsuranceDetailsWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/DashboardInsuranceDetailsWidgetLayout.kt index ac8a5b130f..b9a6910ea1 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/DashboardInsuranceDetailsWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/DashboardInsuranceDetailsWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets.dashboard +import com.navi.design.R as DesignR import android.animation.ValueAnimator import android.content.Context import android.graphics.Color @@ -238,19 +239,19 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 val layoutParams: MarginLayoutParams = offerLayout.layoutParams as MarginLayoutParams layoutParams.setMargins( - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_1), - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_1), - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_1), - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_0) + resources.getDimensionPixelSize(DesignR.dimen.dp_1), + resources.getDimensionPixelSize(DesignR.dimen.dp_1), + resources.getDimensionPixelSize(DesignR.dimen.dp_1), + resources.getDimensionPixelSize(DesignR.dimen.dp_0) ) offerLayout.background = getNaviDrawable( radii = CornerRadius( - rightBottom = resources.getDimension(com.navi.design.R.dimen.dp_0), - leftBottom = resources.getDimension(com.navi.design.R.dimen.dp_0), - rightTop = resources.getDimension(com.navi.design.R.dimen.dp_16), - leftTop = resources.getDimension(com.navi.design.R.dimen.dp_16) + rightBottom = resources.getDimension(DesignR.dimen.dp_0), + leftBottom = resources.getDimension(DesignR.dimen.dp_0), + rightTop = resources.getDimension(DesignR.dimen.dp_16), + leftTop = resources.getDimension(DesignR.dimen.dp_16) ), gradientColors = intArrayOf( @@ -268,20 +269,20 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 val layoutParams: MarginLayoutParams = offerLayout.layoutParams as MarginLayoutParams layoutParams.setMargins( - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_1), - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_0), - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_1), - resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_0) + resources.getDimensionPixelSize(DesignR.dimen.dp_1), + resources.getDimensionPixelSize(DesignR.dimen.dp_0), + resources.getDimensionPixelSize(DesignR.dimen.dp_1), + resources.getDimensionPixelSize(DesignR.dimen.dp_0) ) offerLayout.layoutParams = layoutParams offerLayout.background = getNaviDrawable( radii = CornerRadius( - rightBottom = resources.getDimension(com.navi.design.R.dimen.dp_0), - leftBottom = resources.getDimension(com.navi.design.R.dimen.dp_0), - rightTop = resources.getDimension(com.navi.design.R.dimen.dp_0), - leftTop = resources.getDimension(com.navi.design.R.dimen.dp_0) + rightBottom = resources.getDimension(DesignR.dimen.dp_0), + leftBottom = resources.getDimension(DesignR.dimen.dp_0), + rightTop = resources.getDimension(DesignR.dimen.dp_0), + leftTop = resources.getDimension(DesignR.dimen.dp_0) ), gradientColors = intArrayOf( @@ -307,8 +308,8 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 } info.offerData()?.onlyTitle?.let { offerTitle.isVisible = false - offerLeftIcon.layoutParams.width = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_20) - offerLeftIcon.layoutParams.height = resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_20) + offerLeftIcon.layoutParams.width = resources.getDimensionPixelSize(DesignR.dimen.dp_20) + offerLeftIcon.layoutParams.height = resources.getDimensionPixelSize(DesignR.dimen.dp_20) offerSubtitle.isVisible = false subtitleDefaultIcon.isVisible = false singleTitleInMiddle.setTextFieldData(it) @@ -338,10 +339,10 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 getNaviDrawable( radii = CornerRadius( - rightBottom = resources.getDimension(com.navi.design.R.dimen.dp_16), - leftBottom = resources.getDimension(com.navi.design.R.dimen.dp_16), - rightTop = resources.getDimension(com.navi.design.R.dimen.dp_0), - leftTop = resources.getDimension(com.navi.design.R.dimen.dp_0) + rightBottom = resources.getDimension(DesignR.dimen.dp_16), + leftBottom = resources.getDimension(DesignR.dimen.dp_16), + rightTop = resources.getDimension(DesignR.dimen.dp_0), + leftTop = resources.getDimension(DesignR.dimen.dp_0) ), gradientColors = intArrayOf( diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/DashboardPaymentWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/DashboardPaymentWidgetLayout.kt index 1652bf19cf..0e3ff6527c 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/DashboardPaymentWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/DashboardPaymentWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets.dashboard +import com.navi.design.R as DesignR import android.content.Context import android.graphics.Color import android.os.CountDownTimer @@ -162,10 +163,10 @@ constructor( val secondaryActionLayoutParams = (tvSecondaryAction.layoutParams as LayoutParams) if (info.actionData()?.primaryAction?.title.isNotNull()) { secondaryActionLayoutParams.marginEnd = - dpToPxInInt(context.resources.getInteger(com.navi.design.R.integer.integer_8)) + dpToPxInInt(context.resources.getInteger(DesignR.integer.integer_8)) } else { secondaryActionLayoutParams.marginEnd = - dpToPxInInt(context.resources.getInteger(com.navi.design.R.integer.integer_16)) + dpToPxInInt(context.resources.getInteger(DesignR.integer.integer_16)) } tvSecondaryAction.layoutParams = secondaryActionLayoutParams @@ -191,10 +192,10 @@ constructor( val layoutParams = (tvLeftTopSubText.layoutParams as LayoutParams) if (info.lineData().isNotNull()) { layoutParams.bottomMargin = - dpToPxInInt(context.resources.getInteger(com.navi.design.R.integer.integer_16)) + dpToPxInInt(context.resources.getInteger(DesignR.integer.integer_16)) } else { layoutParams.bottomMargin = - dpToPxInInt(context.resources.getInteger(com.navi.design.R.integer.zero)) + dpToPxInInt(context.resources.getInteger(DesignR.integer.zero)) } tvLeftTopSubText.layoutParams = layoutParams diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/EmptyProductItemWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/EmptyProductItemWidgetLayout.kt index e88128d403..fb10bca5db 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/EmptyProductItemWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/EmptyProductItemWidgetLayout.kt @@ -9,6 +9,7 @@ package com.navi.naviwidgets.widgets.dashboard +import com.navi.design.R as DesignR import android.content.Context import android.graphics.drawable.LayerDrawable import android.text.method.LinkMovementMethod @@ -62,38 +63,38 @@ class EmptyProductItemWidgetLayout @JvmOverloads constructor( if (info.isCompact().orFalse()) { ivContentIcon.updateLayoutParams { - topMargin = resources.getDimension(R.dimen.dp_8).roundToInt() + topMargin = resources.getDimension(DesignR.dimen.dp_8).roundToInt() } tvContentTitle.updateLayoutParams { - topMargin = resources.getDimension(R.dimen.dp_12).roundToInt() + topMargin = resources.getDimension(DesignR.dimen.dp_12).roundToInt() } tvContentDescription.updateLayoutParams { - topMargin = resources.getDimension(R.dimen.dp_4).roundToInt() + topMargin = resources.getDimension(DesignR.dimen.dp_4).roundToInt() } tvAction.updateLayoutParams { - topMargin = resources.getDimension(R.dimen.dp_16).roundToInt() + topMargin = resources.getDimension(DesignR.dimen.dp_16).roundToInt() } } else { ivContentIcon.updateLayoutParams { - topMargin = resources.getDimension(R.dimen.dp_24).roundToInt() + topMargin = resources.getDimension(DesignR.dimen.dp_24).roundToInt() } tvContentTitle.updateLayoutParams { - topMargin = resources.getDimension(R.dimen.dp_8).roundToInt() + topMargin = resources.getDimension(DesignR.dimen.dp_8).roundToInt() } tvContentDescription.updateLayoutParams { - topMargin = resources.getDimension(R.dimen.dp_8).roundToInt() + topMargin = resources.getDimension(DesignR.dimen.dp_8).roundToInt() } tvAction.updateLayoutParams { - topMargin = resources.getDimension(R.dimen.dp_16).roundToInt() - bottomMargin = resources.getDimension(R.dimen.dp_24).roundToInt() + topMargin = resources.getDimension(DesignR.dimen.dp_16).roundToInt() + bottomMargin = resources.getDimension(DesignR.dimen.dp_24).roundToInt() } } @@ -116,7 +117,7 @@ class EmptyProductItemWidgetLayout @JvmOverloads constructor( getNaviDrawable( shape = DrawableShape.RECTANGLE, backgroundColor = info.headerBgColor().parseColorSafe(), - strokeColor = context.resources.getColor(R.color.border_grey_color), + strokeColor = context.resources.getColor(DesignR.color.border_grey_color), strokeWidth = dpToPxInInt(1), radii = CornerRadius( leftTop = dpToPx(4), @@ -158,4 +159,4 @@ class EmptyProductItemWidgetLayout @JvmOverloads constructor( } } } -} \ No newline at end of file +} diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/EmptyProductWidgetLayout.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/EmptyProductWidgetLayout.kt index a68fef947b..33c6a72dc8 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/EmptyProductWidgetLayout.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/EmptyProductWidgetLayout.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets.dashboard +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -44,7 +45,7 @@ class EmptyProductWidgetLayout @JvmOverloads constructor( private lateinit var widgetCallback: WidgetCallback private var productItemCount: Float = DEFAULT_VISIBLE_COUNT private var productItemPadding: Int = - context.resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_16) + context.resources.getDimensionPixelSize(DesignR.dimen.dp_16) private var productTotalItem: Int = 0 private var currentTabPosition: Int = 0 private val naviAdapter = NaviAdapter( @@ -98,19 +99,19 @@ class EmptyProductWidgetLayout @JvmOverloads constructor( if (info.productItems().isNullOrEmpty().not() && info.productItems()?.size!! > 1 || info.isChildWidget() == true ) { - productItemPadding = context.resources.getDimensionPixelSize(com.navi.design.R.dimen.dp_8) + productItemPadding = context.resources.getDimensionPixelSize(DesignR.dimen.dp_8) } if (info.isChildWidget() == true) { binding.rvEmptyProducts.setHorizontalPadding( context.resources.getDimensionPixelSize( - com.navi.design.R.dimen.dp_0 + DesignR.dimen.dp_0 ) ) } else { binding.rvEmptyProducts.setHorizontalPadding( context.resources.getDimensionPixelSize( - R.dimen.dp_8 + DesignR.dimen.dp_8 ) ) } @@ -142,7 +143,7 @@ class EmptyProductWidgetLayout @JvmOverloads constructor( override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { super.onScrolled(recyclerView, dx, dy) currentTabPosition += dx - updateTab((currentTabPosition / (deviceWidth() - resources.getDimension(com.navi.design.R.dimen.dp_54))).roundToInt()) + updateTab((currentTabPosition / (deviceWidth() - resources.getDimension(DesignR.dimen.dp_54))).roundToInt()) } }) } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/fixedhinttextinput/ui/LabeledTextInputFixedHintWidget.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/fixedhinttextinput/ui/LabeledTextInputFixedHintWidget.kt index c0617f0308..d94e37d3cd 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/fixedhinttextinput/ui/LabeledTextInputFixedHintWidget.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/fixedhinttextinput/ui/LabeledTextInputFixedHintWidget.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets.fixedhinttextinput.ui +import com.navi.design.R as DesignR import android.content.Context import android.text.Editable import android.text.TextWatcher @@ -202,8 +203,8 @@ class LabeledTextInputFixedHintWidget @JvmOverloads constructor( } private fun updateNewTheme() { - widgetBinding.fixedHint.setStyle(com.navi.design.R.style.TextInputV2Style) - widgetBinding.plainTextInput.setStyle(com.navi.design.R.style.TextInputV2Style) + widgetBinding.fixedHint.setStyle(DesignR.style.TextInputV2Style) + widgetBinding.plainTextInput.setStyle(DesignR.style.TextInputV2Style) } override fun initiateUI() { diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/labeleddatetextinput/ui/LabeledDateTextInputWidget.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/labeleddatetextinput/ui/LabeledDateTextInputWidget.kt index 50d5eda00f..2362f0b045 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/labeleddatetextinput/ui/LabeledDateTextInputWidget.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/labeleddatetextinput/ui/LabeledDateTextInputWidget.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets.labeleddatetextinput.ui +import com.navi.design.R as DesignR import android.content.Context import android.text.Editable import android.text.TextWatcher @@ -278,13 +279,13 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 private fun updateNewTheme(isNonEditable: Boolean) { if (isNonEditable) { - widgetBinding.dateInput.setStyle(com.navi.design.R.style.TextInputDisableStyle) - widgetBinding.monthInput.setStyle(com.navi.design.R.style.TextInputDisableStyle) - widgetBinding.yearInput.setStyle(com.navi.design.R.style.TextInputDisableStyle) + widgetBinding.dateInput.setStyle(DesignR.style.TextInputDisableStyle) + widgetBinding.monthInput.setStyle(DesignR.style.TextInputDisableStyle) + widgetBinding.yearInput.setStyle(DesignR.style.TextInputDisableStyle) } else { - widgetBinding.dateInput.setStyle(com.navi.design.R.style.TextInputV2Style) - widgetBinding.monthInput.setStyle(com.navi.design.R.style.TextInputV2Style) - widgetBinding.yearInput.setStyle(com.navi.design.R.style.TextInputV2Style) + widgetBinding.dateInput.setStyle(DesignR.style.TextInputV2Style) + widgetBinding.monthInput.setStyle(DesignR.style.TextInputV2Style) + widgetBinding.yearInput.setStyle(DesignR.style.TextInputV2Style) } widgetModel.widgetData?.inputDateData?.inputSize?.let { widgetBinding.dateInput.apply{ diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/labeledinputsearch/ui/LabeledTextSearchInputWidget.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/labeledinputsearch/ui/LabeledTextSearchInputWidget.kt index 710289067d..0d09a778a5 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/labeledinputsearch/ui/LabeledTextSearchInputWidget.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/labeledinputsearch/ui/LabeledTextSearchInputWidget.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets.labeledinputsearch.ui +import com.navi.design.R as DesignR import android.content.Context import android.text.Editable import android.text.TextUtils @@ -127,9 +128,9 @@ class LabeledTextSearchInputWidget @JvmOverloads constructor( private fun updateNewTheme(isNonEditable: Boolean) { if (isNonEditable) { - widgetBinding.plainTextInput.setStyle(com.navi.design.R.style.TextInputDisableStyle) + widgetBinding.plainTextInput.setStyle(DesignR.style.TextInputDisableStyle) } else { - widgetBinding.plainTextInput.setStyle(com.navi.design.R.style.TextInputV2Style) + widgetBinding.plainTextInput.setStyle(DesignR.style.TextInputV2Style) } } diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/labledtextinput/ui/LabeledTextInputWidgetV2.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/labledtextinput/ui/LabeledTextInputWidgetV2.kt index a9db4139ac..e805787d0c 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/labledtextinput/ui/LabeledTextInputWidgetV2.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/labledtextinput/ui/LabeledTextInputWidgetV2.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets.labledtextinput.ui +import com.navi.design.R as DesignR import android.content.Context import android.content.res.ColorStateList import android.graphics.Color @@ -288,9 +289,9 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 private fun updateNewTheme(isNonEditable: Boolean) { if (isNonEditable) { - widgetBinding.plainTextInput.setStyle(com.navi.design.R.style.TextInputDisableStyle) + widgetBinding.plainTextInput.setStyle(DesignR.style.TextInputDisableStyle) } else { - widgetBinding.plainTextInput.setStyle(com.navi.design.R.style.TextInputV2Style) + widgetBinding.plainTextInput.setStyle(DesignR.style.TextInputV2Style) } widgetModel.widgetData?.inputTextData?.inputSize?.let { widgetBinding.plainTextInput.textSize = it.toFloat() diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/tileoptionselector/ui/LabeledOptionSelectorTileWidget.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/tileoptionselector/ui/LabeledOptionSelectorTileWidget.kt index 46084f4dd9..3f1d713ed9 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/tileoptionselector/ui/LabeledOptionSelectorTileWidget.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/tileoptionselector/ui/LabeledOptionSelectorTileWidget.kt @@ -7,6 +7,7 @@ package com.navi.naviwidgets.widgets.tileoptionselector.ui +import com.navi.design.R as DesignR import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -88,7 +89,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 ) { itemBinding.icon.visibility = View.GONE itemBinding.root.layoutParams.height = - resources.getDimension(com.navi.design.R.dimen.dp_48).toInt() + resources.getDimension(DesignR.dimen.dp_48).toInt() itemBinding.title.setMargin(0, 16, 0, 0) } if (index < widgetCount - 1) { @@ -150,7 +151,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 if (item.iconCode.isNullOrEmpty()) { itemBinding.icon.visibility = View.GONE itemBinding.root.layoutParams.height = - resources.getDimension(com.navi.design.R.dimen.dp_48).toInt() + resources.getDimension(DesignR.dimen.dp_48).toInt() } else layoutParams.height = itemDimension.toInt() if (index < widgetCount - 1) { layoutParams.marginEnd = interItemSpace.toInt() @@ -208,7 +209,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 if (pair.first.isSelected) { widgetModel.inputData = pair.first.id pair.second.apply { - title.setStyle(com.navi.design.R.style.TextV4Style) + title.setStyle(DesignR.style.TextV4Style) root.background = ResourcesCompat.getDrawable( context.resources, @@ -222,7 +223,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 } } else { pair.second.apply { - title.setStyle(com.navi.design.R.style.TextInputV5Style) + title.setStyle(DesignR.style.TextInputV5Style) root.background = ResourcesCompat.getDrawable( context.resources, diff --git a/navi-widgets/src/test/java/com/navi/naviwidgets/utils/NaviWidgetIconUtilsTest.kt b/navi-widgets/src/test/java/com/navi/naviwidgets/utils/NaviWidgetIconUtilsTest.kt index 782631eea8..aaed6c470f 100644 --- a/navi-widgets/src/test/java/com/navi/naviwidgets/utils/NaviWidgetIconUtilsTest.kt +++ b/navi-widgets/src/test/java/com/navi/naviwidgets/utils/NaviWidgetIconUtilsTest.kt @@ -7,6 +7,8 @@ package com.navi.naviwidgets.utils +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.widget.ImageView import com.navi.base.model.ImageDetail @@ -31,7 +33,7 @@ class NaviWidgetIconUtilsTest { @Test fun testUpdateIcon() { NaviWidgetIconUtils.updateIcon("WHATSAPP_ICON", imageView) - verify { imageView.setImageResource(com.navi.naviwidgets.R.drawable.ic_whatsapp_background_svg) } + verify { imageView.setImageResource(WidgetsR.drawable.ic_whatsapp_background_svg) } confirmVerified(imageView) NaviWidgetIconUtils.updateIcon("MISSING_ICON", imageView) @@ -45,7 +47,7 @@ class NaviWidgetIconUtilsTest { iconCode = "WHATSAPP_ICON" ), imageView ) - verify { imageView.setImageResource(com.navi.naviwidgets.R.drawable.ic_whatsapp_background_svg) } + verify { imageView.setImageResource(WidgetsR.drawable.ic_whatsapp_background_svg) } confirmVerified(imageView) NaviWidgetIconUtils.updateIcon( @@ -65,7 +67,7 @@ class NaviWidgetIconUtilsTest { ), imageView, null ) - verify { imageView.setImageResource(com.navi.naviwidgets.R.drawable.ic_whatsapp_background_svg) } + verify { imageView.setImageResource(WidgetsR.drawable.ic_whatsapp_background_svg) } confirmVerified(imageView) NaviWidgetIconUtils.updateIcon( @@ -98,718 +100,718 @@ class NaviWidgetIconUtilsTest { private fun getIconCodeDrawableMap(): Map { val map = mutableMapOf() - map["WHATSAPP_ICON"] = com.navi.naviwidgets.R.drawable.ic_whatsapp_background_svg - map["ICON_INFO"] = com.navi.naviwidgets.R.drawable.ic_info_gray - map["STAR_MARK_ICON"] = com.navi.naviwidgets.R.drawable.star_mark_icon - map["CHAT_DOT"] = com.navi.naviwidgets.R.drawable.ic_dot_navi_theme_color - map["ICO_EMPLOYMENT_SALARIED"] = com.navi.naviwidgets.R.drawable.ic_employment_salaried - map["ICO_EMPLOYMENT_SELF_EMPLOYED"] = com.navi.naviwidgets.R.drawable.ic_self_employed - map["ICO_EMPLOYMENT_OTHERS"] = com.navi.naviwidgets.R.drawable.ic_employment_other - map["ICON_CHAT_ERROR"] = com.navi.naviwidgets.R.drawable.ic_chat_error + map["WHATSAPP_ICON"] = WidgetsR.drawable.ic_whatsapp_background_svg + map["ICON_INFO"] = WidgetsR.drawable.ic_info_gray + map["STAR_MARK_ICON"] = WidgetsR.drawable.star_mark_icon + map["CHAT_DOT"] = WidgetsR.drawable.ic_dot_navi_theme_color + map["ICO_EMPLOYMENT_SALARIED"] = WidgetsR.drawable.ic_employment_salaried + map["ICO_EMPLOYMENT_SELF_EMPLOYED"] = WidgetsR.drawable.ic_self_employed + map["ICO_EMPLOYMENT_OTHERS"] = WidgetsR.drawable.ic_employment_other + map["ICON_CHAT_ERROR"] = WidgetsR.drawable.ic_chat_error map["CIRCULAR_FILLED_CHECK_ICON"] = - com.navi.naviwidgets.R.drawable.ic_circular_filled_check_green - map["CIRCULAR_FILLED_MINUS_ICON"] = com.navi.naviwidgets.R.drawable.ic_circular_filled_minus - map["APP_SHARE_ICON"] = com.navi.naviwidgets.R.drawable.ic_app_share - map["ARROW_FORWARD_ORANGE"] = com.navi.naviwidgets.R.drawable.arrow_orange_right - map["ARROW_FORWARD_PURPLE"] = com.navi.naviwidgets.R.drawable.arrow_purple_right - map["CIRCULAR_DOCUMENT_UPLOAD"] = com.navi.naviwidgets.R.drawable.circular_document_upload - map["ARROW_FORWARD"] = com.navi.naviwidgets.R.drawable.arrow_forward - map["ARROW_FORWARD_WHITE"] = com.navi.naviwidgets.R.drawable.arrow_forward_white - map["ARROW_FORWARD_BLACK"] = com.navi.naviwidgets.R.drawable.arrow_forward_black - map["ARROW_FORWARD_GREY"] = com.navi.naviwidgets.R.drawable.arrow_forward_grey - map["GREEN_CHECK_MARK_ICON"] = com.navi.naviwidgets.R.drawable.ic_green_check_mark_new + WidgetsR.drawable.ic_circular_filled_check_green + map["CIRCULAR_FILLED_MINUS_ICON"] = WidgetsR.drawable.ic_circular_filled_minus + map["APP_SHARE_ICON"] = WidgetsR.drawable.ic_app_share + map["ARROW_FORWARD_ORANGE"] = WidgetsR.drawable.arrow_orange_right + map["ARROW_FORWARD_PURPLE"] = WidgetsR.drawable.arrow_purple_right + map["CIRCULAR_DOCUMENT_UPLOAD"] = WidgetsR.drawable.circular_document_upload + map["ARROW_FORWARD"] = WidgetsR.drawable.arrow_forward + map["ARROW_FORWARD_WHITE"] = WidgetsR.drawable.arrow_forward_white + map["ARROW_FORWARD_BLACK"] = WidgetsR.drawable.arrow_forward_black + map["ARROW_FORWARD_GREY"] = WidgetsR.drawable.arrow_forward_grey + map["GREEN_CHECK_MARK_ICON"] = WidgetsR.drawable.ic_green_check_mark_new map["GREY_ROUNDED_RIGHT_ARROW_MEDIUM_ICON"] = - com.navi.naviwidgets.R.drawable.ic_grey_rounded_right_arrow_medium + WidgetsR.drawable.ic_grey_rounded_right_arrow_medium map["GREY_ROUNDED_RIGHT_ARROW_SMALL_ICON"] = - com.navi.naviwidgets.R.drawable.ic_grey_rounded_right_arrow_small - map["REPROMISE_DATE_ICON"] = com.navi.naviwidgets.R.drawable.ic_repromise_or_emi_calendar - map["EMI_CALENDAR_ICON"] = com.navi.naviwidgets.R.drawable.ic_repromise_or_emi_calendar - map["HEART_TICK"] = com.navi.naviwidgets.R.drawable.heart_tick - map["EMI_CHANGE_ICON"] = com.navi.naviwidgets.R.drawable.ic_emi_change - map["HOSPITAL_ICON"] = com.navi.naviwidgets.R.drawable.ic_hospital_new - map["CALL_ORANGE_ICON"] = com.navi.naviwidgets.R.drawable.ic_call_orange - map["GREY_DARK_INFO_ICON"] = com.navi.naviwidgets.R.drawable.ic_grey_dark_info_new - map["PAYTM_ICON"] = com.navi.naviwidgets.R.drawable.ic_paytm_money_new - map["GROWW_ICON"] = com.navi.naviwidgets.R.drawable.ic_groww_new - map["ZERODHA_ICON"] = com.navi.naviwidgets.R.drawable.ic_zerodha_new - map["IND_MONEY_ICON"] = com.navi.naviwidgets.R.drawable.ic_ind_money_new - map["RED_FAILED_OR_ALERT_ICON"] = com.navi.naviwidgets.R.drawable.ic_alert_failed_new - map["UP_SIDE_TRENDING_ICON"] = com.navi.naviwidgets.R.drawable.ic_green_up_side_trending - map["FAQ_ICON"] = com.navi.naviwidgets.R.drawable.ic_profile_faq - map["FAQ_ICON_GOLD"] = com.navi.naviwidgets.R.drawable.ic_faq_gold - map["EMAIL_ICON"] = com.navi.naviwidgets.R.drawable.ic_profile_email - map["CALL_ICON"] = com.navi.naviwidgets.R.drawable.ic_profile_call - map["RATE_ICON"] = com.navi.naviwidgets.R.drawable.ic_profile_rate_us - map["SHARE_APP_ICON"] = com.navi.naviwidgets.R.drawable.ic_profile_share - map["NOTIFICATION_ICON"] = com.navi.naviwidgets.R.drawable.ic_profile_notification_settings - map["PRIVACY_POLICY_ICON"] = com.navi.naviwidgets.R.drawable.ic_profile_privacy_policy - map["TNC_ICON"] = com.navi.naviwidgets.R.drawable.ic_profile_terms - map["CHAT_ICON"] = com.navi.naviwidgets.R.drawable.ic_profile_chat_with_us - map["ABOUT_US_ICON"] = com.navi.naviwidgets.R.drawable.ic_profile_about_us - map["PL_PRODUCT_ICON"] = com.navi.naviwidgets.R.drawable.ic_pl_product_svg - map["HL_PRODUCT_ICON"] = com.navi.naviwidgets.R.drawable.ic_hl_product_svg - map["HI_PRODUCT_ICON"] = com.navi.naviwidgets.R.drawable.ic_hi_product_svg - map["NEW_LAUNCH_ICON"] = com.navi.naviwidgets.R.drawable.ic_new_launch_svg - map["PRODUCT_CLAIMS_ICON"] = com.navi.naviwidgets.R.drawable.ic_product_claims_svg - map["PLUS_DOCUMENT"] = com.navi.naviwidgets.R.drawable.plus_document - map["PORT"] = com.navi.naviwidgets.R.drawable.port - map["INSURANCE_GREEN_MONEY"] = com.navi.naviwidgets.R.drawable.insurance_green_money - map["UMBRELLA"] = com.navi.naviwidgets.R.drawable.umbrella - map["SUB_TRANSFER"] = com.navi.naviwidgets.R.drawable.balance_transfer_svg - map["EMPLOYEE"] = com.navi.naviwidgets.R.drawable.employee - map["WAIT_CLOCK_ICON"] = com.navi.naviwidgets.R.drawable.wait_clock_icon - map["PERSON_TICK"] = com.navi.naviwidgets.R.drawable.person_tick - map["UPLOAD"] = com.navi.naviwidgets.R.drawable.upload - map["HOUSE_VERIFY"] = com.navi.naviwidgets.R.drawable.house_verify - map["DOCUMENT"] = com.navi.naviwidgets.R.drawable.document - map["PDF_DOCUMENT"] = com.navi.naviwidgets.R.drawable.pdf_document - map["INFO_HOUSE"] = com.navi.naviwidgets.R.drawable.info_house - map["RUPEE_HOUSE"] = com.navi.naviwidgets.R.drawable.rupee_house - map["SUB_LAP"] = com.navi.naviwidgets.R.drawable.sub_lap - map["SUB_HOUSE"] = com.navi.naviwidgets.R.drawable.sub_house - map["HOUSE_OFFER"] = com.navi.naviwidgets.R.drawable.house_offer - map["MONEY_BAG"] = com.navi.naviwidgets.R.drawable.money_bag - map["PL_GREEN_MONEY"] = com.navi.naviwidgets.R.drawable.green_money - map["PIGGY_BANK"] = com.navi.naviwidgets.R.drawable.piggy_bank - map["DOCUMENT_VERIFY"] = com.navi.naviwidgets.R.drawable.document_verify - map["NEW_OFFER"] = com.navi.naviwidgets.R.drawable.new_offer - map["MULTIPLE_MONEY_BAGS"] = com.navi.naviwidgets.R.drawable.multiple_money_bags - map["HAND_COINS"] = com.navi.naviwidgets.R.drawable.hand_coins - map["SMALL_RUPEE"] = com.navi.naviwidgets.R.drawable.small_rupee - map["SMALL_BULB"] = com.navi.naviwidgets.R.drawable.small_bulb - map["SMALL_HOUSE"] = com.navi.naviwidgets.R.drawable.small_house - map["SMALL_HEART"] = com.navi.naviwidgets.R.drawable.small_heart - map["SMALL_ERROR"] = com.navi.naviwidgets.R.drawable.small_error - map["GIFT"] = com.navi.naviwidgets.R.drawable.gift - map["PERSON_MONEY"] = com.navi.naviwidgets.R.drawable.person_money - map["BIG_MONEY"] = com.navi.naviwidgets.R.drawable.personal_loan_illustration - map["PINK_HOUSE"] = com.navi.naviwidgets.R.drawable.pink_house - map["INSURANCE_PAD"] = com.navi.naviwidgets.R.drawable.insurance_pad - map["REPEAT_LOAN"] = com.navi.naviwidgets.R.drawable.repeat_loan_offer - map["CONTINUE_ARROW"] = com.navi.naviwidgets.R.drawable.continue_arrow - map["SMALL_WHATSAPP"] = com.navi.naviwidgets.R.drawable.small_whatsapp - map["MF_MONEY"] = com.navi.naviwidgets.R.drawable.money_graph - map["AMC_PRODUCT_ICON"] = com.navi.naviwidgets.R.drawable.amc_product_icon - map["HEALTH_HEART"] = com.navi.naviwidgets.R.drawable.ic_health_heart - map["ICON_INFO_DARK"] = com.navi.naviwidgets.R.drawable.ic_info_dark + WidgetsR.drawable.ic_grey_rounded_right_arrow_small + map["REPROMISE_DATE_ICON"] = WidgetsR.drawable.ic_repromise_or_emi_calendar + map["EMI_CALENDAR_ICON"] = WidgetsR.drawable.ic_repromise_or_emi_calendar + map["HEART_TICK"] = WidgetsR.drawable.heart_tick + map["EMI_CHANGE_ICON"] = WidgetsR.drawable.ic_emi_change + map["HOSPITAL_ICON"] = WidgetsR.drawable.ic_hospital_new + map["CALL_ORANGE_ICON"] = WidgetsR.drawable.ic_call_orange + map["GREY_DARK_INFO_ICON"] = WidgetsR.drawable.ic_grey_dark_info_new + map["PAYTM_ICON"] = WidgetsR.drawable.ic_paytm_money_new + map["GROWW_ICON"] = WidgetsR.drawable.ic_groww_new + map["ZERODHA_ICON"] = WidgetsR.drawable.ic_zerodha_new + map["IND_MONEY_ICON"] = WidgetsR.drawable.ic_ind_money_new + map["RED_FAILED_OR_ALERT_ICON"] = WidgetsR.drawable.ic_alert_failed_new + map["UP_SIDE_TRENDING_ICON"] = WidgetsR.drawable.ic_green_up_side_trending + map["FAQ_ICON"] = WidgetsR.drawable.ic_profile_faq + map["FAQ_ICON_GOLD"] = WidgetsR.drawable.ic_faq_gold + map["EMAIL_ICON"] = WidgetsR.drawable.ic_profile_email + map["CALL_ICON"] = WidgetsR.drawable.ic_profile_call + map["RATE_ICON"] = WidgetsR.drawable.ic_profile_rate_us + map["SHARE_APP_ICON"] = WidgetsR.drawable.ic_profile_share + map["NOTIFICATION_ICON"] = WidgetsR.drawable.ic_profile_notification_settings + map["PRIVACY_POLICY_ICON"] = WidgetsR.drawable.ic_profile_privacy_policy + map["TNC_ICON"] = WidgetsR.drawable.ic_profile_terms + map["CHAT_ICON"] = WidgetsR.drawable.ic_profile_chat_with_us + map["ABOUT_US_ICON"] = WidgetsR.drawable.ic_profile_about_us + map["PL_PRODUCT_ICON"] = WidgetsR.drawable.ic_pl_product_svg + map["HL_PRODUCT_ICON"] = WidgetsR.drawable.ic_hl_product_svg + map["HI_PRODUCT_ICON"] = WidgetsR.drawable.ic_hi_product_svg + map["NEW_LAUNCH_ICON"] = WidgetsR.drawable.ic_new_launch_svg + map["PRODUCT_CLAIMS_ICON"] = WidgetsR.drawable.ic_product_claims_svg + map["PLUS_DOCUMENT"] = WidgetsR.drawable.plus_document + map["PORT"] = WidgetsR.drawable.port + map["INSURANCE_GREEN_MONEY"] = WidgetsR.drawable.insurance_green_money + map["UMBRELLA"] = WidgetsR.drawable.umbrella + map["SUB_TRANSFER"] = WidgetsR.drawable.balance_transfer_svg + map["EMPLOYEE"] = WidgetsR.drawable.employee + map["WAIT_CLOCK_ICON"] = WidgetsR.drawable.wait_clock_icon + map["PERSON_TICK"] = WidgetsR.drawable.person_tick + map["UPLOAD"] = WidgetsR.drawable.upload + map["HOUSE_VERIFY"] = WidgetsR.drawable.house_verify + map["DOCUMENT"] = WidgetsR.drawable.document + map["PDF_DOCUMENT"] = WidgetsR.drawable.pdf_document + map["INFO_HOUSE"] = WidgetsR.drawable.info_house + map["RUPEE_HOUSE"] = WidgetsR.drawable.rupee_house + map["SUB_LAP"] = WidgetsR.drawable.sub_lap + map["SUB_HOUSE"] = WidgetsR.drawable.sub_house + map["HOUSE_OFFER"] = WidgetsR.drawable.house_offer + map["MONEY_BAG"] = WidgetsR.drawable.money_bag + map["PL_GREEN_MONEY"] = WidgetsR.drawable.green_money + map["PIGGY_BANK"] = WidgetsR.drawable.piggy_bank + map["DOCUMENT_VERIFY"] = WidgetsR.drawable.document_verify + map["NEW_OFFER"] = WidgetsR.drawable.new_offer + map["MULTIPLE_MONEY_BAGS"] = WidgetsR.drawable.multiple_money_bags + map["HAND_COINS"] = WidgetsR.drawable.hand_coins + map["SMALL_RUPEE"] = WidgetsR.drawable.small_rupee + map["SMALL_BULB"] = WidgetsR.drawable.small_bulb + map["SMALL_HOUSE"] = WidgetsR.drawable.small_house + map["SMALL_HEART"] = WidgetsR.drawable.small_heart + map["SMALL_ERROR"] = WidgetsR.drawable.small_error + map["GIFT"] = WidgetsR.drawable.gift + map["PERSON_MONEY"] = WidgetsR.drawable.person_money + map["BIG_MONEY"] = WidgetsR.drawable.personal_loan_illustration + map["PINK_HOUSE"] = WidgetsR.drawable.pink_house + map["INSURANCE_PAD"] = WidgetsR.drawable.insurance_pad + map["REPEAT_LOAN"] = WidgetsR.drawable.repeat_loan_offer + map["CONTINUE_ARROW"] = WidgetsR.drawable.continue_arrow + map["SMALL_WHATSAPP"] = WidgetsR.drawable.small_whatsapp + map["MF_MONEY"] = WidgetsR.drawable.money_graph + map["AMC_PRODUCT_ICON"] = WidgetsR.drawable.amc_product_icon + map["HEALTH_HEART"] = WidgetsR.drawable.ic_health_heart + map["ICON_INFO_DARK"] = WidgetsR.drawable.ic_info_dark map["RIGHT_ARROW_WITH_BACKGROUND"] = - com.navi.naviwidgets.R.drawable.right_arrow_with_background_svg + WidgetsR.drawable.right_arrow_with_background_svg map["RIGHT_ARROW_WITH_TRANSLUCENT_BACKGROUND"] = - com.navi.naviwidgets.R.drawable.right_arrow_with_translucent_background - map["EMI_DUE"] = com.navi.naviwidgets.R.drawable.ic_product_emi_is_due_svg + WidgetsR.drawable.right_arrow_with_translucent_background + map["EMI_DUE"] = WidgetsR.drawable.ic_product_emi_is_due_svg map["INFORMATION_SUCCESS"] = - com.navi.naviwidgets.R.drawable.ic_product_payment_successful_svg - map["IN_PROGRESS"] = com.navi.naviwidgets.R.drawable.ic_product_in_progress_svg - map["CUSTOM_RATING_ICON"] = com.navi.naviwidgets.R.drawable.ic_custom_rating - map["NOTE_PAD"] = com.navi.naviwidgets.R.drawable.note_pad - map["PERSON_PLUS"] = com.navi.naviwidgets.R.drawable.person_plus - map["PERSON_MEDICAL"] = com.navi.naviwidgets.R.drawable.person_medical - map["SHIELD"] = com.navi.naviwidgets.R.drawable.shield - map["SHIELD_UPGRADE"] = com.navi.naviwidgets.R.drawable.shield_upgrade - map["PAD_NEGATIVE"] = com.navi.naviwidgets.R.drawable.pad_negative - map["MOBILE"] = com.navi.naviwidgets.R.drawable.mobile - map["X_BACKGROUND_ICON"] = com.navi.naviwidgets.R.drawable.ic_2x_svg - map["ALERT_YELLOW_ICON"] = com.navi.naviwidgets.R.drawable.ic_alert_yellow - map["REWARD_INFO_ICON"] = com.navi.naviwidgets.R.drawable.ic_reward_info_svg - map["MOBILE_WITH_RUPEE"] = com.navi.naviwidgets.R.drawable.ic_mobille_with_rupee_svg - map["CALENDAR_ICON"] = com.navi.naviwidgets.R.drawable.ic_calendar_svg - map["REWARD_ICON"] = com.navi.naviwidgets.R.drawable.ic_reward_icon - map["REWARDS_PROFILE_ICON"] = com.navi.naviwidgets.R.drawable.ic_profile_rewards - map["NAVI_REWARDS_ICON"] = com.navi.naviwidgets.R.drawable.ic_rewards_navi + WidgetsR.drawable.ic_product_payment_successful_svg + map["IN_PROGRESS"] = WidgetsR.drawable.ic_product_in_progress_svg + map["CUSTOM_RATING_ICON"] = WidgetsR.drawable.ic_custom_rating + map["NOTE_PAD"] = WidgetsR.drawable.note_pad + map["PERSON_PLUS"] = WidgetsR.drawable.person_plus + map["PERSON_MEDICAL"] = WidgetsR.drawable.person_medical + map["SHIELD"] = WidgetsR.drawable.shield + map["SHIELD_UPGRADE"] = WidgetsR.drawable.shield_upgrade + map["PAD_NEGATIVE"] = WidgetsR.drawable.pad_negative + map["MOBILE"] = WidgetsR.drawable.mobile + map["X_BACKGROUND_ICON"] = WidgetsR.drawable.ic_2x_svg + map["ALERT_YELLOW_ICON"] = WidgetsR.drawable.ic_alert_yellow + map["REWARD_INFO_ICON"] = WidgetsR.drawable.ic_reward_info_svg + map["MOBILE_WITH_RUPEE"] = WidgetsR.drawable.ic_mobille_with_rupee_svg + map["CALENDAR_ICON"] = WidgetsR.drawable.ic_calendar_svg + map["REWARD_ICON"] = WidgetsR.drawable.ic_reward_icon + map["REWARDS_PROFILE_ICON"] = WidgetsR.drawable.ic_profile_rewards + map["NAVI_REWARDS_ICON"] = WidgetsR.drawable.ic_rewards_navi map["NEW_NAVI_LOGO_IN_WHITE_CARD"] = - com.navi.naviwidgets.R.drawable.ic_navi_logo_in_white_card + WidgetsR.drawable.ic_navi_logo_in_white_card map["TRANSLUCENT_VIDEO_OVERLAY"] = - com.navi.naviwidgets.R.drawable.ic_translucent_video_play_button - map["RED_VIDEO_OVERLAY"] = com.navi.naviwidgets.R.drawable.ic_red_video_play_button - map["WHITE_VIDEO_OVERLAY"] = com.navi.naviwidgets.R.drawable.ic_white_video_play_button - map["NAVI_LOGO"] = com.navi.naviwidgets.R.drawable.ic_new_navi_logo - map["NAVI_REWARDS_LOCK_ICON"] = com.navi.naviwidgets.R.drawable.ic_rewards_lock - map["NAVI_REWARDS_INFO_ICON"] = com.navi.naviwidgets.R.drawable.ic_rewards_info - map["INSURANCE_HOSPITAL"] = com.navi.naviwidgets.R.drawable.insurance_hospital - map["INSURANCE_HOSPITAL_SMALL"] = com.navi.naviwidgets.R.drawable.insurance_hospital_small - map["INSURANCE_UMBRELLA"] = com.navi.naviwidgets.R.drawable.umbrella_hospital - map["INSURANCE_DOCTOR"] = com.navi.naviwidgets.R.drawable.insurance_doctor - map["INSURANCE_FAMILY"] = com.navi.naviwidgets.R.drawable.insurance_family - map["INSURANCE_REPORT"] = com.navi.naviwidgets.R.drawable.insurance_report - map["FEEDBACK_CHECK_ICON"] = com.navi.naviwidgets.R.drawable.ic_feedback_check - map["NEW_SHARE_ICON"] = com.navi.naviwidgets.R.drawable.ic_new_share - map["WHITE_SHARE_ICON"] = com.navi.naviwidgets.R.drawable.ic_white_share - map["ICON_ERROR_EXCLAMATION"] = com.navi.naviwidgets.R.drawable.error_exclaim - map["LEFT_ARROW_ICON_BLACK"] = com.navi.naviwidgets.R.drawable.back_arrow_black - map["RUPEE_ICON"] = com.navi.naviwidgets.R.drawable.ic_rupee_black - map["TICK_MARK_GREEN"] = com.navi.naviwidgets.R.drawable.ic_tick_mark_green - map["CROSS_ICON_BLACK"] = com.navi.naviwidgets.R.drawable.ic_cross_black - map["DIVIDE_ICON_GREY"] = com.navi.naviwidgets.R.drawable.ic_divide_grey - map["EQUALS_ICON_GREY"] = com.navi.naviwidgets.R.drawable.ic_equals_grey - map["DIVIDER_ICON_GREY"] = com.navi.naviwidgets.R.drawable.ic_divider_grey - map["OUTLINED_INFO_ICON_BLACK"] = com.navi.naviwidgets.R.drawable.ic_info_icon_black - map["OUTLINED_CALENDER_ICON"] = com.navi.naviwidgets.R.drawable.ic_calendar - map["OUTLINED_NEXT_EMI_ICON"] = com.navi.naviwidgets.R.drawable.ic_next_emi - map["ERROR_ICON_RED"] = com.navi.naviwidgets.R.drawable.ic_alert_error_red - map["ICON_MALE"] = com.navi.naviwidgets.R.drawable.ic_male - map["ICON_FEMALE"] = com.navi.naviwidgets.R.drawable.ic_female - map["SHARE_ICON"] = com.navi.naviwidgets.R.drawable.ic_share - map["ICON_SHARE_ORANGE"] = com.navi.naviwidgets.R.drawable.orange_share_btn - map["NOTE_ICON"] = com.navi.naviwidgets.R.drawable.ic_note_yellow_light - map["ICON_TICK_WHITE"] = com.navi.naviwidgets.R.drawable.ic_tick_white - map["ALERT_RED"] = com.navi.naviwidgets.R.drawable.ic_alert_red - map["BLUE_ARROW_FORWARD"] = com.navi.naviwidgets.R.drawable.arrow_blue_right - map["BLACK_ARROW_FORWARD"] = com.navi.naviwidgets.R.drawable.arrow_forward_black - map["ORANGE_ARROW_FORWARD"] = com.navi.naviwidgets.R.drawable.arrow_orange_right - map["ENABLED_ARROW_BACKWARD"] = com.navi.naviwidgets.R.drawable.arrow_orange_left - map["ENABLED_ARROW_FORWARD"] = com.navi.naviwidgets.R.drawable.arrow_orange_forward_right - map["DISABLED_ARROW_BACKWARD"] = com.navi.naviwidgets.R.drawable.ic_disabled_icon_backward - map["DISABLED_ARROW_FORWARD"] = com.navi.naviwidgets.R.drawable.ic_disabled_icon_forward - map["ENABLED_ARROW_BACKWARD_BLUE"] = com.navi.naviwidgets.R.drawable.arrow_purple_left - map["ENABLED_ARROW_FORWARD_BLUE"] = com.navi.naviwidgets.R.drawable.arrow_purple_forward_right -// map["DISABLED_ARROW_BACKWARD_BLUE"] = com.navi.naviwidgets.R.drawable.ic_disabled_icon_backward_blue -// map["DISABLED_ARROW_FORWARD_BLUE"] = com.navi.naviwidgets.R.drawable.ic_disabled_icon_forward_blue - map["NO_STRESS_EMOJI"] = com.navi.naviwidgets.R.drawable.ic_no_stress_32 - map["SLIGHT_STRESS_EMOJI"] = com.navi.naviwidgets.R.drawable.ic_slight_stress_32 - map["MODERATE_STRESS_EMOJI"] = com.navi.naviwidgets.R.drawable.ic_moderate_stress_32 - map["EXTREME_STRESS_EMOJI"] = com.navi.naviwidgets.R.drawable.ic_extreme_stress_32 - map["BULB_ICON"] = com.navi.naviwidgets.R.drawable.glowing_bulb - map["GLOWING_BULB"] = com.navi.naviwidgets.R.drawable.glowing_bulb - map["UMBRELLA_CROSS"] = com.navi.naviwidgets.R.drawable.umbrella_cross - map["UMBRELLA_HEART"] = com.navi.naviwidgets.R.drawable.umbrella_heart + WidgetsR.drawable.ic_translucent_video_play_button + map["RED_VIDEO_OVERLAY"] = WidgetsR.drawable.ic_red_video_play_button + map["WHITE_VIDEO_OVERLAY"] = WidgetsR.drawable.ic_white_video_play_button + map["NAVI_LOGO"] = WidgetsR.drawable.ic_new_navi_logo + map["NAVI_REWARDS_LOCK_ICON"] = WidgetsR.drawable.ic_rewards_lock + map["NAVI_REWARDS_INFO_ICON"] = WidgetsR.drawable.ic_rewards_info + map["INSURANCE_HOSPITAL"] = WidgetsR.drawable.insurance_hospital + map["INSURANCE_HOSPITAL_SMALL"] = WidgetsR.drawable.insurance_hospital_small + map["INSURANCE_UMBRELLA"] = WidgetsR.drawable.umbrella_hospital + map["INSURANCE_DOCTOR"] = WidgetsR.drawable.insurance_doctor + map["INSURANCE_FAMILY"] = WidgetsR.drawable.insurance_family + map["INSURANCE_REPORT"] = WidgetsR.drawable.insurance_report + map["FEEDBACK_CHECK_ICON"] = WidgetsR.drawable.ic_feedback_check + map["NEW_SHARE_ICON"] = WidgetsR.drawable.ic_new_share + map["WHITE_SHARE_ICON"] = WidgetsR.drawable.ic_white_share + map["ICON_ERROR_EXCLAMATION"] = WidgetsR.drawable.error_exclaim + map["LEFT_ARROW_ICON_BLACK"] = WidgetsR.drawable.back_arrow_black + map["RUPEE_ICON"] = WidgetsR.drawable.ic_rupee_black + map["TICK_MARK_GREEN"] = WidgetsR.drawable.ic_tick_mark_green + map["CROSS_ICON_BLACK"] = WidgetsR.drawable.ic_cross_black + map["DIVIDE_ICON_GREY"] = WidgetsR.drawable.ic_divide_grey + map["EQUALS_ICON_GREY"] = WidgetsR.drawable.ic_equals_grey + map["DIVIDER_ICON_GREY"] = WidgetsR.drawable.ic_divider_grey + map["OUTLINED_INFO_ICON_BLACK"] = DesignR.drawable.ic_info_icon_black + map["OUTLINED_CALENDER_ICON"] = WidgetsR.drawable.ic_calendar + map["OUTLINED_NEXT_EMI_ICON"] = WidgetsR.drawable.ic_next_emi + map["ERROR_ICON_RED"] = WidgetsR.drawable.ic_alert_error_red + map["ICON_MALE"] = WidgetsR.drawable.ic_male + map["ICON_FEMALE"] = WidgetsR.drawable.ic_female + map["SHARE_ICON"] = WidgetsR.drawable.ic_share + map["ICON_SHARE_ORANGE"] = WidgetsR.drawable.orange_share_btn + map["NOTE_ICON"] = WidgetsR.drawable.ic_note_yellow_light + map["ICON_TICK_WHITE"] = WidgetsR.drawable.ic_tick_white + map["ALERT_RED"] = WidgetsR.drawable.ic_alert_red + map["BLUE_ARROW_FORWARD"] = WidgetsR.drawable.arrow_blue_right + map["BLACK_ARROW_FORWARD"] = WidgetsR.drawable.arrow_forward_black + map["ORANGE_ARROW_FORWARD"] = WidgetsR.drawable.arrow_orange_right + map["ENABLED_ARROW_BACKWARD"] = WidgetsR.drawable.arrow_orange_left + map["ENABLED_ARROW_FORWARD"] = WidgetsR.drawable.arrow_orange_forward_right + map["DISABLED_ARROW_BACKWARD"] = WidgetsR.drawable.ic_disabled_icon_backward + map["DISABLED_ARROW_FORWARD"] = WidgetsR.drawable.ic_disabled_icon_forward + map["ENABLED_ARROW_BACKWARD_BLUE"] = WidgetsR.drawable.arrow_purple_left + map["ENABLED_ARROW_FORWARD_BLUE"] = WidgetsR.drawable.arrow_purple_forward_right +// map["DISABLED_ARROW_BACKWARD_BLUE"] = WidgetsR.drawable.ic_disabled_icon_backward_blue +// map["DISABLED_ARROW_FORWARD_BLUE"] = WidgetsR.drawable.ic_disabled_icon_forward_blue + map["NO_STRESS_EMOJI"] = WidgetsR.drawable.ic_no_stress_32 + map["SLIGHT_STRESS_EMOJI"] = WidgetsR.drawable.ic_slight_stress_32 + map["MODERATE_STRESS_EMOJI"] = WidgetsR.drawable.ic_moderate_stress_32 + map["EXTREME_STRESS_EMOJI"] = WidgetsR.drawable.ic_extreme_stress_32 + map["BULB_ICON"] = WidgetsR.drawable.glowing_bulb + map["GLOWING_BULB"] = WidgetsR.drawable.glowing_bulb + map["UMBRELLA_CROSS"] = WidgetsR.drawable.umbrella_cross + map["UMBRELLA_HEART"] = WidgetsR.drawable.umbrella_heart map["CIRCULAR_FILLED_CHECK"] = - com.navi.naviwidgets.R.drawable.ic_circular_filled_check_green_24 + WidgetsR.drawable.ic_circular_filled_check_green_24 map["CIRCULAR_FILLED_THREE_DOTS"] = - com.navi.naviwidgets.R.drawable.ic_circular_filled_three_dot + WidgetsR.drawable.ic_circular_filled_three_dot map["CIRCULAR_FILLED_WARNING_RED"] = - com.navi.naviwidgets.R.drawable.ic_circular_filled_warning_red - map["OUTLINED_HOME_ICON"] = com.navi.naviwidgets.R.drawable.ic_outlined_home_icon - map["RED_PLUS_ICON"] = com.navi.naviwidgets.R.drawable.ic_add_red - map["OUTLINED_CALENDAR_ICON_RED"] = com.navi.naviwidgets.R.drawable.ic_calendar - map["DOWN_ARROW_BLACK"] = com.navi.naviwidgets.R.drawable.ic_down_arrow_black + WidgetsR.drawable.ic_circular_filled_warning_red + map["OUTLINED_HOME_ICON"] = WidgetsR.drawable.ic_outlined_home_icon + map["RED_PLUS_ICON"] = WidgetsR.drawable.ic_add_red + map["OUTLINED_CALENDAR_ICON_RED"] = WidgetsR.drawable.ic_calendar + map["DOWN_ARROW_BLACK"] = WidgetsR.drawable.ic_down_arrow_black map["ARROW_IN_ORANGE_CIRCLE"] = - com.navi.naviwidgets.R.drawable.right_arrow_with_background_svg - map["UP_ARROW_RED"] = com.navi.naviwidgets.R.drawable.ic_up_arrow_red - map["OUTLINED_CLOCK_ICON"] = com.navi.naviwidgets.R.drawable.ic_outlined_clock + WidgetsR.drawable.right_arrow_with_background_svg + map["UP_ARROW_RED"] = WidgetsR.drawable.ic_up_arrow_red + map["OUTLINED_CLOCK_ICON"] = WidgetsR.drawable.ic_outlined_clock map["OUTLINED_TICK_MARK_GREEN"] = - com.navi.naviwidgets.R.drawable.common_ic_outlined_tick_green - map["OUTLINED_INFO_ICON_RED"] = com.navi.naviwidgets.R.drawable.common_ic_outlined_info_red + WidgetsR.drawable.common_ic_outlined_tick_green + map["OUTLINED_INFO_ICON_RED"] = WidgetsR.drawable.common_ic_outlined_info_red map["OUTLINED_ERROR_ICON_BLACK"] = - com.navi.naviwidgets.R.drawable.common_ic_outlined_info_black - map["CIRCULAR_FILLED_PLUS_ICON"] = com.navi.naviwidgets.R.drawable.ic_plus_circular_filled - map["OUTLINED_DELETE_ICON"] = com.navi.naviwidgets.R.drawable.ic_delete_outlined_24dp - map["ARROW_DOWN_BLACK"] = com.navi.naviwidgets.R.drawable.ic_arrow_down_black_24dp + WidgetsR.drawable.common_ic_outlined_info_black + map["CIRCULAR_FILLED_PLUS_ICON"] = WidgetsR.drawable.ic_plus_circular_filled + map["OUTLINED_DELETE_ICON"] = WidgetsR.drawable.ic_delete_outlined_24dp + map["ARROW_DOWN_BLACK"] = WidgetsR.drawable.ic_arrow_down_black_24dp map["OUTLINED_ERROR_ICON_RED"] = - com.navi.naviwidgets.R.drawable.common_ic_outlined_error_red - map["CIRCULAR_MEMBERS_ICON"] = com.navi.naviwidgets.R.drawable.ic_circular_members - map["CIRCULAR_MONEY_ICON"] = com.navi.naviwidgets.R.drawable.ic_circular_money + WidgetsR.drawable.common_ic_outlined_error_red + map["CIRCULAR_MEMBERS_ICON"] = WidgetsR.drawable.ic_circular_members + map["CIRCULAR_MONEY_ICON"] = DesignR.drawable.ic_circular_money map["CIRCULAR_INSURANCE_TENURE_ICON"] = - com.navi.naviwidgets.R.drawable.ic_circular_insurance_tenure - map["CIRCULAR_BENEFITS_ICON"] = com.navi.naviwidgets.R.drawable.ic_circular_benefits - map["CIRCULAR_ADD_ON_ICON"] = com.navi.naviwidgets.R.drawable.ic_circular_add_on + DesignR.drawable.ic_circular_insurance_tenure + map["CIRCULAR_BENEFITS_ICON"] = DesignR.drawable.ic_circular_benefits + map["CIRCULAR_ADD_ON_ICON"] = DesignR.drawable.ic_circular_add_on map["CIRCULAR_WAITING_PERIOD_ICON"] = - com.navi.naviwidgets.R.drawable.ic_circular_waiting_period - map["RIGHT_ARROW_ORANGE_ICON"] = com.navi.naviwidgets.R.drawable.ic_orange_arrow_forward - map["NAVI_REWARDS_GOLD_INFO_ICON"] = com.navi.naviwidgets.R.drawable.ic_gold - map["NAVI_REWARDS_GOLD_MEDIUM_ICON"] = com.navi.naviwidgets.R.drawable.ic_gold_medium - map["NAVI_REWARDS_GOLD_SMALL_ICON"] = com.navi.naviwidgets.R.drawable.ic_rewards_gold - map["NAVI_REWARDS_SMALL_ICON"] = com.navi.naviwidgets.R.drawable.ic_rewards_small - map["SAFE_GOLD_ICON"] = com.navi.naviwidgets.R.drawable.ic_safe_gold_logo - map["ICON_BACK_ARROW_BLACK"] = com.navi.naviwidgets.R.drawable.ic_arrow_left_black - map["REQUEST_INITIATED"] = com.navi.naviwidgets.R.drawable.ic_request_initiated - map["REQUEST_CREATED"] = com.navi.naviwidgets.R.drawable.ic_request_created - map["REQUEST_WAITING"] = com.navi.naviwidgets.R.drawable.ic_request_waiting - map["REQUEST_PROCESSING"] = com.navi.naviwidgets.R.drawable.ic_request_processing - map["REQUEST_PROCESSED"] = com.navi.naviwidgets.R.drawable.ic_request_processed - map["AUTO_DEBIT_PROCESSING"] = com.navi.naviwidgets.R.drawable.ic_auto_debit_processing - map["AUTO_DEBIT_SUCCESSFUL"] = com.navi.naviwidgets.R.drawable.ic_auto_debit_successful - map["GOLD_WITH_MOBILE"] = com.navi.naviwidgets.R.drawable.gold_with_mobile - map["UP_ARROW"] = com.navi.naviwidgets.R.drawable.up_arrow - map["DOWN_ARROW"] = com.navi.naviwidgets.R.drawable.arrow_down - map["TIMER_ICON"] = com.navi.naviwidgets.R.drawable.ic_timer_red - map["TRANSACTION_HISTORY_ICON"] = com.navi.naviwidgets.R.drawable.transaction_history_svg - map["SELL_GOLD"] = com.navi.naviwidgets.R.drawable.ic_sell_gold - map["NAVI_THEME_RIGHT_ARROW"] = com.navi.naviwidgets.R.drawable.ic_right_navi_them_arrow - map["DIGITAL_GOLD_DELIVER"] = com.navi.naviwidgets.R.drawable.ic_gold_deliver - map["BUY_GOLD"] = com.navi.naviwidgets.R.drawable.ic_buy_gold - map["RED_ERROR_MEDIUM"] = com.navi.naviwidgets.R.drawable.red_error_medium - map["SAFE_GOLD_ICON_LARGE"] = com.navi.naviwidgets.R.drawable.safe_gold_logo_large + DesignR.drawable.ic_circular_waiting_period + map["RIGHT_ARROW_ORANGE_ICON"] = DesignR.drawable.ic_orange_arrow_forward + map["NAVI_REWARDS_GOLD_INFO_ICON"] = WidgetsR.drawable.ic_gold + map["NAVI_REWARDS_GOLD_MEDIUM_ICON"] = WidgetsR.drawable.ic_gold_medium + map["NAVI_REWARDS_GOLD_SMALL_ICON"] = WidgetsR.drawable.ic_rewards_gold + map["NAVI_REWARDS_SMALL_ICON"] = WidgetsR.drawable.ic_rewards_small + map["SAFE_GOLD_ICON"] = WidgetsR.drawable.ic_safe_gold_logo + map["ICON_BACK_ARROW_BLACK"] = WidgetsR.drawable.ic_arrow_left_black + map["REQUEST_INITIATED"] = WidgetsR.drawable.ic_request_initiated + map["REQUEST_CREATED"] = WidgetsR.drawable.ic_request_created + map["REQUEST_WAITING"] = WidgetsR.drawable.ic_request_waiting + map["REQUEST_PROCESSING"] = WidgetsR.drawable.ic_request_processing + map["REQUEST_PROCESSED"] = WidgetsR.drawable.ic_request_processed + map["AUTO_DEBIT_PROCESSING"] = WidgetsR.drawable.ic_auto_debit_processing + map["AUTO_DEBIT_SUCCESSFUL"] = WidgetsR.drawable.ic_auto_debit_successful + map["GOLD_WITH_MOBILE"] = WidgetsR.drawable.gold_with_mobile + map["UP_ARROW"] = WidgetsR.drawable.up_arrow + map["DOWN_ARROW"] = WidgetsR.drawable.arrow_down + map["TIMER_ICON"] = WidgetsR.drawable.ic_timer_red + map["TRANSACTION_HISTORY_ICON"] = WidgetsR.drawable.transaction_history_svg + map["SELL_GOLD"] = WidgetsR.drawable.ic_sell_gold + map["NAVI_THEME_RIGHT_ARROW"] = WidgetsR.drawable.ic_right_navi_them_arrow + map["DIGITAL_GOLD_DELIVER"] = WidgetsR.drawable.ic_gold_deliver + map["BUY_GOLD"] = WidgetsR.drawable.ic_buy_gold + map["RED_ERROR_MEDIUM"] = WidgetsR.drawable.red_error_medium + map["SAFE_GOLD_ICON_LARGE"] = WidgetsR.drawable.safe_gold_logo_large map["RIGHT_ARROW_WITH_WHITE_BACKGROUND"] = - com.navi.naviwidgets.R.drawable.right_arrow_with_white_background_svg - map["TRENDING_ICON"] = com.navi.naviwidgets.R.drawable.ic_trending_svg - map["ICON_BACK_ARROW"] = com.navi.naviwidgets.R.drawable.ic_black_back_arrow_svg - map["ICON_CROSS_ARROW"] = com.navi.naviwidgets.R.drawable.ic_cross_svg - map["ICON_SECURITY"] = com.navi.naviwidgets.R.drawable.ic_security_svg - map["ICON_DROP_ARROW"] = com.navi.naviwidgets.R.drawable.ic_drop_arrow_svg - map["ICON_SINGLE_SELECTED"] = com.navi.naviwidgets.R.drawable.ic_single_selected_svg - map["ICON_SINGLE_UNSELECTED"] = com.navi.naviwidgets.R.drawable.ic_single_unselected_svg - map["ICON_MARRIED_SELECTED"] = com.navi.naviwidgets.R.drawable.ic_married_selected_svg - map["ICON_MARRIED_UNSELECTED"] = com.navi.naviwidgets.R.drawable.ic_married_unselected_svg - map["ICON_SALARY_SELECTED"] = com.navi.naviwidgets.R.drawable.ic_salaried_selected_svg - map["ICON_SALARY_UNSELECTED"] = com.navi.naviwidgets.R.drawable.ic_salaried_unselected_svg + WidgetsR.drawable.right_arrow_with_white_background_svg + map["TRENDING_ICON"] = WidgetsR.drawable.ic_trending_svg + map["ICON_BACK_ARROW"] = WidgetsR.drawable.ic_black_back_arrow_svg + map["ICON_CROSS_ARROW"] = WidgetsR.drawable.ic_cross_svg + map["ICON_SECURITY"] = WidgetsR.drawable.ic_security_svg + map["ICON_DROP_ARROW"] = WidgetsR.drawable.ic_drop_arrow_svg + map["ICON_SINGLE_SELECTED"] = WidgetsR.drawable.ic_single_selected_svg + map["ICON_SINGLE_UNSELECTED"] = WidgetsR.drawable.ic_single_unselected_svg + map["ICON_MARRIED_SELECTED"] = WidgetsR.drawable.ic_married_selected_svg + map["ICON_MARRIED_UNSELECTED"] = WidgetsR.drawable.ic_married_unselected_svg + map["ICON_SALARY_SELECTED"] = WidgetsR.drawable.ic_salaried_selected_svg + map["ICON_SALARY_UNSELECTED"] = WidgetsR.drawable.ic_salaried_unselected_svg map["ICON_SELF_EMPLOYED_SELECTED"] = - com.navi.naviwidgets.R.drawable.ic_self_employed_selected_svg + WidgetsR.drawable.ic_self_employed_selected_svg map["ICON_SELF_EMPLOYED_UNSELECTED"] = - com.navi.naviwidgets.R.drawable.ic_self_employed_unselected_svg - map["ICON_OTHERS_SELECTED"] = com.navi.naviwidgets.R.drawable.ic_others_selected_svg - map["ICON_OTHERS_UNSELECTED"] = com.navi.naviwidgets.R.drawable.ic_others_unselected_svg - map["ICON_SECURITY_CHECK"] = com.navi.naviwidgets.R.drawable.ic_security_check_svg - map["ICON_INFO_SIMPLE"] = com.navi.naviwidgets.R.drawable.ic_info_icon_svg - map["CHEVRON"] = com.navi.naviwidgets.R.drawable.ic_chevrons - map["CHEVRON_V2"] = com.navi.naviwidgets.R.drawable.ic_chevrons_v2 - map["CHEVRON_V3"] = com.navi.naviwidgets.R.drawable.ic_chevron_v3 + WidgetsR.drawable.ic_self_employed_unselected_svg + map["ICON_OTHERS_SELECTED"] = WidgetsR.drawable.ic_others_selected_svg + map["ICON_OTHERS_UNSELECTED"] = WidgetsR.drawable.ic_others_unselected_svg + map["ICON_SECURITY_CHECK"] = WidgetsR.drawable.ic_security_check_svg + map["ICON_INFO_SIMPLE"] = WidgetsR.drawable.ic_info_icon_svg + map["CHEVRON"] = WidgetsR.drawable.ic_chevrons + map["CHEVRON_V2"] = WidgetsR.drawable.ic_chevrons_v2 + map["CHEVRON_V3"] = WidgetsR.drawable.ic_chevron_v3 map["CHEVRON_ICON_WITH_WHITE_BG"] = - com.navi.naviwidgets.R.drawable.ic_chevrons_with_white_bg_svg - map["CHEVRON_BLACK_RIGHT"] = com.navi.naviwidgets.R.drawable.ic_chevron_black_right - map["CHAT_NEW_ICON"] = com.navi.naviwidgets.R.drawable.ic_new_chat_svg - map["CALL_NEW_ICON"] = com.navi.naviwidgets.R.drawable.ic_new_phone_call_svg - map["DOWNLOAD_ICON"] = com.navi.naviwidgets.R.drawable.download - map["ICON_SEARCH"] = com.navi.naviwidgets.R.drawable.ic_bold_search_svg - map["SPLIT_COLOR_CHECK_MARK"] = com.navi.naviwidgets.R.drawable.ic_split_color_check_mark - map["SPLIT_COLOR_HOUR_GLASS"] = com.navi.naviwidgets.R.drawable.ic_split_color_hour_glass - map["SPLIT_COLOR_RUPEE"] = com.navi.naviwidgets.R.drawable.ic_split_color_rupee + WidgetsR.drawable.ic_chevrons_with_white_bg_svg + map["CHEVRON_BLACK_RIGHT"] = WidgetsR.drawable.ic_chevron_black_right + map["CHAT_NEW_ICON"] = WidgetsR.drawable.ic_new_chat_svg + map["CALL_NEW_ICON"] = WidgetsR.drawable.ic_new_phone_call_svg + map["DOWNLOAD_ICON"] = WidgetsR.drawable.download + map["ICON_SEARCH"] = WidgetsR.drawable.ic_bold_search_svg + map["SPLIT_COLOR_CHECK_MARK"] = WidgetsR.drawable.ic_split_color_check_mark + map["SPLIT_COLOR_HOUR_GLASS"] = WidgetsR.drawable.ic_split_color_hour_glass + map["SPLIT_COLOR_RUPEE"] = WidgetsR.drawable.ic_split_color_rupee map["SPLIT_COLOR_RUPEE_MEDIUM"] = - com.navi.naviwidgets.R.drawable.ic_split_color_rupee_medium_svg + WidgetsR.drawable.ic_split_color_rupee_medium_svg map["SPLIT_COLOR_RUPEE_LARGE"] = - com.navi.naviwidgets.R.drawable.ic_split_color_rupee_large_svg - map["SPLIT_COLOR_WALLET"] = com.navi.naviwidgets.R.drawable.ic_split_color_wallet + WidgetsR.drawable.ic_split_color_rupee_large_svg + map["SPLIT_COLOR_WALLET"] = WidgetsR.drawable.ic_split_color_wallet map["ADDITIONAL_CASH_LOAN_BANNER"] = - com.navi.naviwidgets.R.drawable.ic_additional_cash_loan_banner + WidgetsR.drawable.ic_additional_cash_loan_banner map["ADDITIONAL_CASH_LOAN_ACTION_CARD"] = - com.navi.naviwidgets.R.drawable.ic_additional_cash_loan_action_card - map["CONFETTI_FILLED_ICON"] = com.navi.naviwidgets.R.drawable.ic_confetti_filled - map["RED_RIGHT_ARROW_ICON"] = com.navi.naviwidgets.R.drawable.ic_red_right_arrow + WidgetsR.drawable.ic_additional_cash_loan_action_card + map["CONFETTI_FILLED_ICON"] = WidgetsR.drawable.ic_confetti_filled + map["RED_RIGHT_ARROW_ICON"] = WidgetsR.drawable.ic_red_right_arrow map["ICON_ADD_COAPPLICANT_RED_PLUS"] = - com.navi.naviwidgets.R.drawable.ic_add_co_applicant_red_plus_svg - map["EDIT_ICON"] = com.navi.naviwidgets.R.drawable.ic_small_red_pencil_edit - map["EDIT_LOAN_ICON"] = com.navi.naviwidgets.R.drawable.ic_edit_loan - map["CIRCULAR_HEART"] = com.navi.naviwidgets.R.drawable.ic_circular_heart - map["DOWN_ARROW_RED"] = com.navi.naviwidgets.R.drawable.ic_down_arrow_red - map["INSURANCE_HAND_SHIELD"] = com.navi.naviwidgets.R.drawable.ic_shield_with_hand - map["RED_ICON_CROSS"] = com.navi.naviwidgets.R.drawable.red_unsuccessful - map["EMPTY_STATE"] = com.navi.naviwidgets.R.drawable.empty_icon - map["CROSS"] = com.navi.naviwidgets.R.drawable.small_cross - map["ARROW_TERTIARY"] = com.navi.naviwidgets.R.drawable.ic_li_chevron_right - map["ARROW_TERITARY_ORANGE"] = com.navi.naviwidgets.R.drawable.ic_orange_chevron_right - map["EXCLAMATION_TOAST"] = com.navi.naviwidgets.R.drawable.ic_exclamation_toast - map["YELLOW_EXCLAMATION_TOAST"] = com.navi.naviwidgets.R.drawable.yellow_ic_explamation - map["BLUE_INFO_TOAST"] = com.navi.naviwidgets.R.drawable.blue_info_toast_svg - map["GRAY_INFO"] = com.navi.naviwidgets.R.drawable.grey_info - map["PERSON_CROSS"] = com.navi.naviwidgets.R.drawable.ic_kyc_rejected - map["REFRESH_ICON"] = com.navi.naviwidgets.R.drawable.ic_profile_refresh - map["HAND_UPGRADE"] = com.navi.naviwidgets.R.drawable.hand_upgrade + WidgetsR.drawable.ic_add_co_applicant_red_plus_svg + map["EDIT_ICON"] = WidgetsR.drawable.ic_small_red_pencil_edit + map["EDIT_LOAN_ICON"] = WidgetsR.drawable.ic_edit_loan + map["CIRCULAR_HEART"] = WidgetsR.drawable.ic_circular_heart + map["DOWN_ARROW_RED"] = WidgetsR.drawable.ic_down_arrow_red + map["INSURANCE_HAND_SHIELD"] = WidgetsR.drawable.ic_shield_with_hand + map["RED_ICON_CROSS"] = WidgetsR.drawable.red_unsuccessful + map["EMPTY_STATE"] = WidgetsR.drawable.empty_icon + map["CROSS"] = WidgetsR.drawable.small_cross + map["ARROW_TERTIARY"] = WidgetsR.drawable.ic_li_chevron_right + map["ARROW_TERITARY_ORANGE"] = WidgetsR.drawable.ic_orange_chevron_right + map["EXCLAMATION_TOAST"] = WidgetsR.drawable.ic_exclamation_toast + map["YELLOW_EXCLAMATION_TOAST"] = WidgetsR.drawable.yellow_ic_explamation + map["BLUE_INFO_TOAST"] = WidgetsR.drawable.blue_info_toast_svg + map["GRAY_INFO"] = WidgetsR.drawable.grey_info + map["PERSON_CROSS"] = WidgetsR.drawable.ic_kyc_rejected + map["REFRESH_ICON"] = WidgetsR.drawable.ic_profile_refresh + map["HAND_UPGRADE"] = WidgetsR.drawable.hand_upgrade map["RIGHT_ARROW_IN_ORANGE_CIRCLE"] = - com.navi.naviwidgets.R.drawable.right_arrow_in_orange_circle + WidgetsR.drawable.right_arrow_in_orange_circle map["RIGHT_ARROW_IN_BLUE_CIRCLE"] = - com.navi.naviwidgets.R.drawable.right_arrow_in_blue_circle - map["ANNOUNCEMENT_GOLD_ICON"] = com.navi.naviwidgets.R.drawable.ic_announcement_gold - map["ANNOUNCEMENT_CASH_ICON"] = com.navi.naviwidgets.R.drawable.ic_announcement_cash + WidgetsR.drawable.right_arrow_in_blue_circle + map["ANNOUNCEMENT_GOLD_ICON"] = WidgetsR.drawable.ic_announcement_gold + map["ANNOUNCEMENT_CASH_ICON"] = WidgetsR.drawable.ic_announcement_cash map["PL_REWARDS_ANNOUNCEMENT_ICON"] = - com.navi.naviwidgets.R.drawable.ic_rewards_announcement_confetti - map["BROWSER_ORANGE"] = com.navi.naviwidgets.R.drawable.ic_browser_orange - map["ACCOUNT_TYPE_ORANGE"] = com.navi.naviwidgets.R.drawable.ic_account_type_orange - map["VERIFY_OTP_ORANGE"] = com.navi.naviwidgets.R.drawable.ic_verify_otp_orange - map["EXPECT_A_CALL"] = com.navi.naviwidgets.R.drawable.ic_expect_a_call - map["TEAM_WILL_CALL_YOU"] = com.navi.naviwidgets.R.drawable.ic_team_will_call - map["INFO_GREY_18"] = com.navi.naviwidgets.R.drawable.ic_info_gray_18_18 - map["ICON_BIG_ERROR_RED"] = com.navi.naviwidgets.R.drawable.ic_big_error - map["INFO_ICON_GRADIENT"] = com.navi.naviwidgets.R.drawable.ic_info_icon_gradient - map["GOLD_PRODUCT_ICON"] = com.navi.naviwidgets.R.drawable.gold_product_icon - map["GOLD_WITH_MOBILE_ICON"] = com.navi.naviwidgets.R.drawable.gold_with_mobile_icon - map["NEW_GLOWING_BULB"] = com.navi.naviwidgets.R.drawable.ic_new_glowing_bulb - map["ICON_HL_HOME_WITH_COINS"] = com.navi.naviwidgets.R.drawable.home_loan_intro - map["ICON_GIFT"] = com.navi.naviwidgets.R.drawable.ic_gift_box - map["ICON_RBI"] = com.navi.naviwidgets.R.drawable.ic_rbi_registered - map["ICON_MAGNIFIER"] = com.navi.naviwidgets.R.drawable.ic_magnifier_lens - map["ICON_LOAN_DISBURSED"] = com.navi.naviwidgets.R.drawable.img_loan_amount_disbursed - map["ICON_LOAN_APPLICATIONS"] = com.navi.naviwidgets.R.drawable.image_loan_applications + WidgetsR.drawable.ic_rewards_announcement_confetti + map["BROWSER_ORANGE"] = WidgetsR.drawable.ic_browser_orange + map["ACCOUNT_TYPE_ORANGE"] = WidgetsR.drawable.ic_account_type_orange + map["VERIFY_OTP_ORANGE"] = WidgetsR.drawable.ic_verify_otp_orange + map["EXPECT_A_CALL"] = WidgetsR.drawable.ic_expect_a_call + map["TEAM_WILL_CALL_YOU"] = WidgetsR.drawable.ic_team_will_call + map["INFO_GREY_18"] = WidgetsR.drawable.ic_info_gray_18_18 + map["ICON_BIG_ERROR_RED"] = WidgetsR.drawable.ic_big_error + map["INFO_ICON_GRADIENT"] = WidgetsR.drawable.ic_info_icon_gradient + map["GOLD_PRODUCT_ICON"] = WidgetsR.drawable.gold_product_icon + map["GOLD_WITH_MOBILE_ICON"] = WidgetsR.drawable.gold_with_mobile_icon + map["NEW_GLOWING_BULB"] = WidgetsR.drawable.ic_new_glowing_bulb + map["ICON_HL_HOME_WITH_COINS"] = WidgetsR.drawable.home_loan_intro + map["ICON_GIFT"] = WidgetsR.drawable.ic_gift_box + map["ICON_RBI"] = WidgetsR.drawable.ic_rbi_registered + map["ICON_MAGNIFIER"] = WidgetsR.drawable.ic_magnifier_lens + map["ICON_LOAN_DISBURSED"] = WidgetsR.drawable.img_loan_amount_disbursed + map["ICON_LOAN_APPLICATIONS"] = WidgetsR.drawable.image_loan_applications map["ICON_ERROR_OUTLINED_ROUND_EXCLAMATION"] = - com.navi.naviwidgets.R.drawable.ic_error_outlined - map["BADGE_PLUS_UPGRADE"] = com.navi.naviwidgets.R.drawable.badge_plus_upgrade - map["LEFT_CONFETTI_POP_ICON"] = com.navi.naviwidgets.R.drawable.ic_confetti_left_pop - map["RIGHT_CONFETTI_POP_ICON"] = com.navi.naviwidgets.R.drawable.ic_confetti_right_pop - map["RED_LOCK_ICON"] = com.navi.naviwidgets.R.drawable.ic_lock_red - map["ICON_CLOCK_TICKING"] = com.navi.naviwidgets.R.drawable.ic_clock_ticking - map["ICON_HANDS_WITH_HEART"] = com.navi.naviwidgets.R.drawable.ic_hands_with_heart - map["ICON_EXPIRED"] = com.navi.naviwidgets.R.drawable.ic_expired - map["ICON_CROSS_BLACK"] = com.navi.naviwidgets.R.drawable.ic_rounded_cross - map["GIFT_ICON_WITH_CONGRATS"] = com.navi.naviwidgets.R.drawable.gift_icon_with_congrats_svg - map["EXPIRY_ALERT_ICON"] = com.navi.naviwidgets.R.drawable.exipry_alert_icon - map["READY_POLICY_ICON"] = com.navi.naviwidgets.R.drawable.ready_policy_icon - map["ALERT_POLICY_ICON"] = com.navi.naviwidgets.R.drawable.alert_policy_icon - map["EXPIRED_POLICY_ICON"] = com.navi.naviwidgets.R.drawable.expired_policy_icon - map["ICON_HAND_WAVE"] = com.navi.naviwidgets.R.drawable.icon_hand_wave - map["ICON_PLAY_VIDEO"] = com.navi.naviwidgets.R.drawable.ic_play_video - map["CALENDAR_UP_ARROW"] = com.navi.naviwidgets.R.drawable.ic_calendar_up_arrow - map["CALENDAR_DOWN_ARROW"] = com.navi.naviwidgets.R.drawable.ic_calendar_down_arrow - map["TICK_LIGHT_ORANGE"] = com.navi.naviwidgets.R.drawable.ic_tick_light_orange - map["TICK_DARK_ORANGE"] = com.navi.naviwidgets.R.drawable.ic_tick_dark_orange - map["TICK_DARK_BLUE"] = com.navi.naviwidgets.R.drawable.ic_tick_dark_blue - map["DOWNLOAD_BLACK_ICON"] = com.navi.naviwidgets.R.drawable.ic_download_black - map["SHARE_APP_WITH_BACKGROUND"] = com.navi.naviwidgets.R.drawable.share_app_with_background - map["FIRST_STEP_ICON"] = com.navi.naviwidgets.R.drawable.ic_first_step_icon - map["SECOND_STEP_ICON"] = com.navi.naviwidgets.R.drawable.ic_second_step_icon - map["THIRD_STEP_ICON"] = com.navi.naviwidgets.R.drawable.ic_third_step_icon - map["LOAN_ICON_WITH_BACKGROUND"] = com.navi.naviwidgets.R.drawable.loan_icon_with_background - map["REWARD_WITH_BACKGROUND"] = com.navi.naviwidgets.R.drawable.reward_with_background - map["REWARD_WITHOUT_BACKGROUND"] = com.navi.naviwidgets.R.drawable.reward_without_background - map["GOLD_COIN"] = com.navi.naviwidgets.R.drawable.gold_icon_with_rupee - map["WHATSAPP_ICON_GREEN"] = com.navi.naviwidgets.R.drawable.whatsapp_icon_green - map["PURPLE_SHIELD_ICON"] = com.navi.naviwidgets.R.drawable.shield_icon - map["COPY_ICON_BLUE"] = com.navi.naviwidgets.R.drawable.copy_icon_blue - map["SHARE_ICON_BLUE"] = com.navi.naviwidgets.R.drawable.share_icon_blue - map["LINK_ICON"] = com.navi.naviwidgets.R.drawable.link_icon_light_pink - map["NAVI_ICON_WITH_GOLD"] = com.navi.naviwidgets.R.drawable.navi_icon_with_gold - map["GIFT_ICON_WITH_MONEY"] = com.navi.naviwidgets.R.drawable.gift_icon_with_money - map["REFERRAL_ICON"] = com.navi.naviwidgets.R.drawable.ic_profile_referral + WidgetsR.drawable.ic_error_outlined + map["BADGE_PLUS_UPGRADE"] = WidgetsR.drawable.badge_plus_upgrade + map["LEFT_CONFETTI_POP_ICON"] = WidgetsR.drawable.ic_confetti_left_pop + map["RIGHT_CONFETTI_POP_ICON"] = WidgetsR.drawable.ic_confetti_right_pop + map["RED_LOCK_ICON"] = WidgetsR.drawable.ic_lock_red + map["ICON_CLOCK_TICKING"] = WidgetsR.drawable.ic_clock_ticking + map["ICON_HANDS_WITH_HEART"] = WidgetsR.drawable.ic_hands_with_heart + map["ICON_EXPIRED"] = WidgetsR.drawable.ic_expired + map["ICON_CROSS_BLACK"] = WidgetsR.drawable.ic_rounded_cross + map["GIFT_ICON_WITH_CONGRATS"] = WidgetsR.drawable.gift_icon_with_congrats_svg + map["EXPIRY_ALERT_ICON"] = WidgetsR.drawable.exipry_alert_icon + map["READY_POLICY_ICON"] = WidgetsR.drawable.ready_policy_icon + map["ALERT_POLICY_ICON"] = WidgetsR.drawable.alert_policy_icon + map["EXPIRED_POLICY_ICON"] = WidgetsR.drawable.expired_policy_icon + map["ICON_HAND_WAVE"] = WidgetsR.drawable.icon_hand_wave + map["ICON_PLAY_VIDEO"] = WidgetsR.drawable.ic_play_video + map["CALENDAR_UP_ARROW"] = WidgetsR.drawable.ic_calendar_up_arrow + map["CALENDAR_DOWN_ARROW"] = WidgetsR.drawable.ic_calendar_down_arrow + map["TICK_LIGHT_ORANGE"] = WidgetsR.drawable.ic_tick_light_orange + map["TICK_DARK_ORANGE"] = WidgetsR.drawable.ic_tick_dark_orange + map["TICK_DARK_BLUE"] = WidgetsR.drawable.ic_tick_dark_blue + map["DOWNLOAD_BLACK_ICON"] = WidgetsR.drawable.ic_download_black + map["SHARE_APP_WITH_BACKGROUND"] = WidgetsR.drawable.share_app_with_background + map["FIRST_STEP_ICON"] = WidgetsR.drawable.ic_first_step_icon + map["SECOND_STEP_ICON"] = WidgetsR.drawable.ic_second_step_icon + map["THIRD_STEP_ICON"] = WidgetsR.drawable.ic_third_step_icon + map["LOAN_ICON_WITH_BACKGROUND"] = WidgetsR.drawable.loan_icon_with_background + map["REWARD_WITH_BACKGROUND"] = WidgetsR.drawable.reward_with_background + map["REWARD_WITHOUT_BACKGROUND"] = WidgetsR.drawable.reward_without_background + map["GOLD_COIN"] = WidgetsR.drawable.gold_icon_with_rupee + map["WHATSAPP_ICON_GREEN"] = WidgetsR.drawable.whatsapp_icon_green + map["PURPLE_SHIELD_ICON"] = WidgetsR.drawable.shield_icon + map["COPY_ICON_BLUE"] = WidgetsR.drawable.copy_icon_blue + map["SHARE_ICON_BLUE"] = WidgetsR.drawable.share_icon_blue + map["LINK_ICON"] = WidgetsR.drawable.link_icon_light_pink + map["NAVI_ICON_WITH_GOLD"] = WidgetsR.drawable.navi_icon_with_gold + map["GIFT_ICON_WITH_MONEY"] = WidgetsR.drawable.gift_icon_with_money + map["REFERRAL_ICON"] = WidgetsR.drawable.ic_profile_referral map["ICON_PROPERTY_TYPE_FLAT_SELECTED"] = - com.navi.naviwidgets.R.drawable.ic_property_type_flat_selected_svg + WidgetsR.drawable.ic_property_type_flat_selected_svg map["ICON_PROPERTY_TYPE_FLAT_UNSELECTED"] = - com.navi.naviwidgets.R.drawable.ic_property_type_flat_unselected_svg + WidgetsR.drawable.ic_property_type_flat_unselected_svg map["ICON_PROPERTY_TYPE_OTHERS_SELECTED"] = - com.navi.naviwidgets.R.drawable.ic_property_type_others_selected_svg + WidgetsR.drawable.ic_property_type_others_selected_svg map["ICON_PROPERTY_TYPE_OTHERS_UNSELECTED"] = - com.navi.naviwidgets.R.drawable.ic_property_type_others_unselected_svg + WidgetsR.drawable.ic_property_type_others_unselected_svg map["ICON_PROPERTY_TYPE_NOT_DECIDED_SELECTED"] = - com.navi.naviwidgets.R.drawable.ic_property_type_not_decided_selected_svg + WidgetsR.drawable.ic_property_type_not_decided_selected_svg map["ICON_PROPERTY_TYPE_NOT_DECIDED_UNSELECTED"] = - com.navi.naviwidgets.R.drawable.ic_property_type_not_decided_un_selected_svg + WidgetsR.drawable.ic_property_type_not_decided_un_selected_svg map["ICON_HL_PERSON_CIRCLE_GRAY"] = - com.navi.naviwidgets.R.drawable.ic_hl_person_circle_gray_bg_svg + WidgetsR.drawable.ic_hl_person_circle_gray_bg_svg map["ICON_HL_HOME_CIRCLE_GRAY"] = - com.navi.naviwidgets.R.drawable.ic_hl_home_circle_gray_bg_svg + WidgetsR.drawable.ic_hl_home_circle_gray_bg_svg map["ICON_HL_FINGERPRINT_CIRCLE_GRAY"] = - com.navi.naviwidgets.R.drawable.ic_hl_fingerprint_circle_gray_bg_svg + WidgetsR.drawable.ic_hl_fingerprint_circle_gray_bg_svg map["ICON_HL_WALLET_CIRCLE_GRAY"] = - com.navi.naviwidgets.R.drawable.ic_hl_wallet_circle_gray_bg_svg + WidgetsR.drawable.ic_hl_wallet_circle_gray_bg_svg map["ICON_HL_SMALL_CIRCLE_GRAY"] = - com.navi.naviwidgets.R.drawable.ic_hl_small_circle_gray_bg_svg + WidgetsR.drawable.ic_hl_small_circle_gray_bg_svg map["ICON_HL_EXTRA_SMALL_CIRCLE_GRAY"] = - com.navi.naviwidgets.R.drawable.ic_hl_extra_small_circle_gray_bg_svg + WidgetsR.drawable.ic_hl_extra_small_circle_gray_bg_svg map["ICON_HL_SMALL_CIRCLE_YELLOW"] = - com.navi.naviwidgets.R.drawable.ic_hl_small_circle_yellow_bg_svg + WidgetsR.drawable.ic_hl_small_circle_yellow_bg_svg map["ICON_HL_EXTRA_SMALL_CIRCLE_YELLOW"] = - com.navi.naviwidgets.R.drawable.ic_hl_extra_small_circle_yellow_bg_svg + WidgetsR.drawable.ic_hl_extra_small_circle_yellow_bg_svg map["ICON_HL_SMALL_CIRCLE_GREEN_TICK"] = - com.navi.naviwidgets.R.drawable.ic_hl_small_circle_green_tick_svg + WidgetsR.drawable.ic_hl_small_circle_green_tick_svg map["ICON_HL_EXTRA_SMALL_CIRCLE_GREEN"] = - com.navi.naviwidgets.R.drawable.ic_hl_extra_small_circle_green_svg + WidgetsR.drawable.ic_hl_extra_small_circle_green_svg map["ICON_HL_SMALL_RED_RIGHT_ARROW"] = - com.navi.naviwidgets.R.drawable.ic_hl_small_circle_right_arrow_gray_bg_svg + WidgetsR.drawable.ic_hl_small_circle_right_arrow_gray_bg_svg map["ICON_HL_SMALL_RED_WHITE_BG_RIGHT_ARROW"] = - com.navi.naviwidgets.R.drawable.ic_hl_small_circle_right_arrow_white_bg_svg - map["ICON_HL_SMALL_LOCK_GRAY"] = com.navi.naviwidgets.R.drawable.ic_hl_small_gray_lock_svg + WidgetsR.drawable.ic_hl_small_circle_right_arrow_white_bg_svg + map["ICON_HL_SMALL_LOCK_GRAY"] = WidgetsR.drawable.ic_hl_small_gray_lock_svg map["ICON_HL_SMALL_RED_CIRCLE_PLUS"] = - com.navi.naviwidgets.R.drawable.ic_hl_small_circle_red_plus_svg - map["ICON_HL_RED_CONFETTI"] = com.navi.naviwidgets.R.drawable.ic_hl_red_confetti_icon_svg + WidgetsR.drawable.ic_hl_small_circle_red_plus_svg + map["ICON_HL_RED_CONFETTI"] = WidgetsR.drawable.ic_hl_red_confetti_icon_svg map["ICON_HL_RED_LARGE_CONFETTI"] = - com.navi.naviwidgets.R.drawable.ic_hl_red_large_confetti_icon_svg + WidgetsR.drawable.ic_hl_red_large_confetti_icon_svg map["ICON_HL_PERSON_WITH_RED_PLUS"] = - com.navi.naviwidgets.R.drawable.ic_hl_person_with_red_plus_svg + WidgetsR.drawable.ic_hl_person_with_red_plus_svg map["ICON_HL_HOME_WITH_RED_PLUS"] = - com.navi.naviwidgets.R.drawable.ic_hl_home_with_red_plus_svg + WidgetsR.drawable.ic_hl_home_with_red_plus_svg map["ICON_EXTRA_SMALL_BULLET_DOT"] = - com.navi.naviwidgets.R.drawable.ic_extra_small_bullet_dot + WidgetsR.drawable.ic_extra_small_bullet_dot map["ICON_HL_SMALL_YELLOW_ALERT"] = - com.navi.naviwidgets.R.drawable.ic_hl_small_yellow_alert_bg_svg - map["ICON_SMALL_BLUE_ALERT"] = com.navi.naviwidgets.R.drawable.ic_hl_small_blue_alert_svg - map["ICON_MESSAGE_COLOURED"] = com.navi.naviwidgets.R.drawable.ic_hl_message_coloured_svg - map["ICON_CALL_COLOURED"] = com.navi.naviwidgets.R.drawable.ic_hl_call_coloured_svg - map["ICON_LOCATION_COLOURED"] = com.navi.naviwidgets.R.drawable.ic_hl_location_coloured_svg - map["ICON_DEVICE_COLOURED"] = com.navi.naviwidgets.R.drawable.ic_hl_device_coloured_svg + WidgetsR.drawable.ic_hl_small_yellow_alert_bg_svg + map["ICON_SMALL_BLUE_ALERT"] = WidgetsR.drawable.ic_hl_small_blue_alert_svg + map["ICON_MESSAGE_COLOURED"] = WidgetsR.drawable.ic_hl_message_coloured_svg + map["ICON_CALL_COLOURED"] = WidgetsR.drawable.ic_hl_call_coloured_svg + map["ICON_LOCATION_COLOURED"] = WidgetsR.drawable.ic_hl_location_coloured_svg + map["ICON_DEVICE_COLOURED"] = WidgetsR.drawable.ic_hl_device_coloured_svg map["ICON_MESSAGE_COLOURED_FAILURE"] = - com.navi.naviwidgets.R.drawable.ic_hl_message_coloured_failure_svg + WidgetsR.drawable.ic_hl_message_coloured_failure_svg map["ICON_CALL_COLOURED_FAILURE"] = - com.navi.naviwidgets.R.drawable.ic_hl_call_coloured_failure_svg + WidgetsR.drawable.ic_hl_call_coloured_failure_svg map["ICON_LOCATION_COLOURED_FAILURE"] = - com.navi.naviwidgets.R.drawable.ic_hl_location_coloured_failure_svg + WidgetsR.drawable.ic_hl_location_coloured_failure_svg map["ICON_DEVICE_COLOURED_FAILURE"] = - com.navi.naviwidgets.R.drawable.ic_hl_device_coloured_failure_svg + WidgetsR.drawable.ic_hl_device_coloured_failure_svg map["ICON_MESSAGE_COLOURED_SUCCESS"] = - com.navi.naviwidgets.R.drawable.ic_hl_message_coloured_success_svg + WidgetsR.drawable.ic_hl_message_coloured_success_svg map["ICON_CALL_COLOURED_SUCCESS"] = - com.navi.naviwidgets.R.drawable.ic_hl_call_coloured_success_svg + WidgetsR.drawable.ic_hl_call_coloured_success_svg map["ICON_LOCATION_COLOURED_SUCCESS"] = - com.navi.naviwidgets.R.drawable.ic_hl_location_coloured_success_svg + WidgetsR.drawable.ic_hl_location_coloured_success_svg map["ICON_DEVICE_COLOURED_SUCCESS"] = - com.navi.naviwidgets.R.drawable.ic_hl_device_coloured_success_svg + WidgetsR.drawable.ic_hl_device_coloured_success_svg map["ICON_HL_SAFETY_SMALL_GREEN_TICK"] = - com.navi.naviwidgets.R.drawable.ic_icon_hl_safety_small_green_tick_svg + WidgetsR.drawable.ic_icon_hl_safety_small_green_tick_svg map["ICON_DELHI_CITY_BLACK_BORDER"] = - com.navi.naviwidgets.R.drawable.ic_delhi_city_black_border_svg - map["ICON_HOME_WITH_SEARCH"] = com.navi.naviwidgets.R.drawable.ic_home_with_search_icon + WidgetsR.drawable.ic_delhi_city_black_border_svg + map["ICON_HOME_WITH_SEARCH"] = WidgetsR.drawable.ic_home_with_search_icon map["ICON_HYDERABAD_CITY_BLACK_BORDER"] = - com.navi.naviwidgets.R.drawable.ic_hyderabad_city_black_border_svg + WidgetsR.drawable.ic_hyderabad_city_black_border_svg map["ICON_BENGALURU_CITY_BLACK_BORDER"] = - com.navi.naviwidgets.R.drawable.ic_bengaluru_city_black_border_svg + WidgetsR.drawable.ic_bengaluru_city_black_border_svg map["ICON_MUMBAI_CITY_BLACK_BORDER"] = - com.navi.naviwidgets.R.drawable.ic_mumbai_city_black_border_svg + WidgetsR.drawable.ic_mumbai_city_black_border_svg map["ICON_CHENNAI_CITY_BLACK_BORDER"] = - com.navi.naviwidgets.R.drawable.ic_chennai_city_black_border_svg + WidgetsR.drawable.ic_chennai_city_black_border_svg map["ICON_PUNE_CITY_BLACK_BORDER"] = - com.navi.naviwidgets.R.drawable.ic_pune_city_black_border_svg + WidgetsR.drawable.ic_pune_city_black_border_svg map["ICON_HYDERABAD_CITY_ORANGE_FILLED"] = - com.navi.naviwidgets.R.drawable.ic_hyderabad_city_orange_filled + WidgetsR.drawable.ic_hyderabad_city_orange_filled map["ICON_BENGALURU_CITY_ORANGE_FILLED"] = - com.navi.naviwidgets.R.drawable.ic_bengaluru_city_orange_filled + WidgetsR.drawable.ic_bengaluru_city_orange_filled map["ICON_MUMBAI_CITY_ORANGE_FILLED"] = - com.navi.naviwidgets.R.drawable.ic_mumbai_city_orange_filled + WidgetsR.drawable.ic_mumbai_city_orange_filled map["ICON_CHENNAI_CITY_ORANGE_FILLED"] = - com.navi.naviwidgets.R.drawable.ic_chennai_city_orange_filled + WidgetsR.drawable.ic_chennai_city_orange_filled map["ICON_PUNE_CITY_ORANGE_FILLED"] = - com.navi.naviwidgets.R.drawable.ic_pune_city_orange_filled - map["ICON_HL_HELP_FAQ"] = com.navi.naviwidgets.R.drawable.ic_hl_help_faq_svg - map["ICON_HL_HELP_CHAT"] = com.navi.naviwidgets.R.drawable.ic_hl_help_chat_svg - map["ICON_HL_HELP_EMAIL"] = com.navi.naviwidgets.R.drawable.ic_hl_help_email_svg - map["ICON_HL_HELP_CALL"] = com.navi.naviwidgets.R.drawable.ic_hl_help_call + WidgetsR.drawable.ic_pune_city_orange_filled + map["ICON_HL_HELP_FAQ"] = WidgetsR.drawable.ic_hl_help_faq_svg + map["ICON_HL_HELP_CHAT"] = WidgetsR.drawable.ic_hl_help_chat_svg + map["ICON_HL_HELP_EMAIL"] = WidgetsR.drawable.ic_hl_help_email_svg + map["ICON_HL_HELP_CALL"] = WidgetsR.drawable.ic_hl_help_call map["ICON_RED_BORDER_PERSON_WITH_PLUS"] = - com.navi.naviwidgets.R.drawable.ic_red_border_person_with_plus_svg + WidgetsR.drawable.ic_red_border_person_with_plus_svg map["ICON_EXTRA_SMALL_RED_CIRCLE_PLUS"] = - com.navi.naviwidgets.R.drawable.ic_extra_small_circle_red_plus_svg - map["ICON_RED_BORDER_TRASH"] = com.navi.naviwidgets.R.drawable.ic_red_border_trash_svg - map["ICON_RED_BORDER_DOWNLOAD"] = com.navi.naviwidgets.R.drawable.ic_red_border_download_svg + WidgetsR.drawable.ic_extra_small_circle_red_plus_svg + map["ICON_RED_BORDER_TRASH"] = WidgetsR.drawable.ic_red_border_trash_svg + map["ICON_RED_BORDER_DOWNLOAD"] = WidgetsR.drawable.ic_red_border_download_svg map["ICON_HL_PERSON_WITH_RED_PLUS_GREY_BG"] = - com.navi.naviwidgets.R.drawable.ic_hl_person_with_red_plus_and_grey_bg - map["ICON_SAD_FLOWER_POT"] = com.navi.naviwidgets.R.drawable.ic_sad_flower_pot + WidgetsR.drawable.ic_hl_person_with_red_plus_and_grey_bg + map["ICON_SAD_FLOWER_POT"] = WidgetsR.drawable.ic_sad_flower_pot map["ICON_SMALL_DOWNWARD_GREY_ARROW"] = - com.navi.naviwidgets.R.drawable.ic_small_downward_grey_arrow + WidgetsR.drawable.ic_small_downward_grey_arrow map["ICON_SMALL_BLUE_CIRCLE_MINUS"] = - com.navi.naviwidgets.R.drawable.ic_small_blue_circle_minus_svg + WidgetsR.drawable.ic_small_blue_circle_minus_svg map["ICON_EXTRA_SMALL_CIRCLE_GREEN_TICK"] = - com.navi.naviwidgets.R.drawable.ic_extra_small_green_tick_svg + WidgetsR.drawable.ic_extra_small_green_tick_svg map["ICON_HL_SMALL_SOLID_RED_ALERT"] = - com.navi.naviwidgets.R.drawable.ic_hl_small_solid_red_alert_svg + WidgetsR.drawable.ic_hl_small_solid_red_alert_svg map["ICON_HL_SMALL_SOLID_YELLOW_ALERT"] = - com.navi.naviwidgets.R.drawable.ic_hl_small_solid_yellow_alert_svg + WidgetsR.drawable.ic_hl_small_solid_yellow_alert_svg map["ICON_HL_KYC_SELFIE_CAMERA"] = - com.navi.naviwidgets.R.drawable.ic_hl_kyc_selfie_camera_svg + WidgetsR.drawable.ic_hl_kyc_selfie_camera_svg map["ICON_RIGHT_ARROW_IN_ORANGE_CIRCLE"] = - com.navi.naviwidgets.R.drawable.ic_right_arrow_in_orange_circle_svg + WidgetsR.drawable.ic_right_arrow_in_orange_circle_svg map["ICON_HAT_CROSSED_WITH_RED_LINE"] = - com.navi.naviwidgets.R.drawable.ic_hat_crossed_with_red_line_svg + WidgetsR.drawable.ic_hat_crossed_with_red_line_svg map["ICON_GLASSES_CROSSED_WITH_RED_LINE"] = - com.navi.naviwidgets.R.drawable.ic_glasses_crossed_with_red_line_svg - map["ICON_HL_KYC_HOUSE"] = com.navi.naviwidgets.R.drawable.ic_hl_kyc_house_svg - map["ICON_HL_KYC_LOCK"] = com.navi.naviwidgets.R.drawable.ic_hl_kyc_lock_svg - map["ICON_HL_KYC_FINGERPRINT"] = com.navi.naviwidgets.R.drawable.ic_hl_kyc_fingerprint_svg + WidgetsR.drawable.ic_glasses_crossed_with_red_line_svg + map["ICON_HL_KYC_HOUSE"] = WidgetsR.drawable.ic_hl_kyc_house_svg + map["ICON_HL_KYC_LOCK"] = WidgetsR.drawable.ic_hl_kyc_lock_svg + map["ICON_HL_KYC_FINGERPRINT"] = WidgetsR.drawable.ic_hl_kyc_fingerprint_svg map["ICON_HL_MEDIUM_CIRCLE_GREEN_TICK"] = - com.navi.naviwidgets.R.drawable.ic_hl_medium_circle_green_tick_svg + WidgetsR.drawable.ic_hl_medium_circle_green_tick_svg map["ICON_HL_KYC_SELFIE_PLACEHOLDER"] = - com.navi.naviwidgets.R.drawable.ic_hl_kyc_selfie_placeholder_svg + WidgetsR.drawable.ic_hl_kyc_selfie_placeholder_svg map["ICON_ORANGE_BORDER_SMALL_PENCIL"] = - com.navi.naviwidgets.R.drawable.ic_orange_border_small_pencil_svg + WidgetsR.drawable.ic_orange_border_small_pencil_svg map["ICON_ORANGE_FILLED_CIRCLE_PLUS"] = - com.navi.naviwidgets.R.drawable.ic_orange_filled_circle_plus_svg + WidgetsR.drawable.ic_orange_filled_circle_plus_svg map["ICON_HL_ROUNDED_PLACE_HOLDER_BANK"] = - com.navi.naviwidgets.R.drawable.ic_rounded_placeholder_bank - map["ICON_EXTRA_SMALL_YELLOW_CLOCK"] = com.navi.naviwidgets.R.drawable.ic_small_clock_orange + WidgetsR.drawable.ic_rounded_placeholder_bank + map["ICON_EXTRA_SMALL_YELLOW_CLOCK"] = WidgetsR.drawable.ic_small_clock_orange map["ICON_HL_SMALL_BLACK_GREY_BG_RIGHT_ARROW"] = - com.navi.naviwidgets.R.drawable.ic_small_black_grey_right_arrow - map["ICON_HL_RED_TICK"] = com.navi.naviwidgets.R.drawable.ic_red_tick_svg - map["ICON_HL_RED_TICK_SMALL"] = com.navi.naviwidgets.R.drawable.ic_red_tick_small + WidgetsR.drawable.ic_small_black_grey_right_arrow + map["ICON_HL_RED_TICK"] = WidgetsR.drawable.ic_red_tick_svg + map["ICON_HL_RED_TICK_SMALL"] = WidgetsR.drawable.ic_red_tick_small map["ICON_LARGE_PURPLE_TIMER_WITH_DOG"] = - com.navi.naviwidgets.R.drawable.ic_eval_screen_icon + WidgetsR.drawable.ic_eval_screen_icon map["ICON_SMALL_DOWNWARD_BLACK_ARROW"] = - com.navi.naviwidgets.R.drawable.ic_small_downward_black_arrow - map["ICON_BENEFITS"] = com.navi.naviwidgets.R.drawable.ic_benefits + WidgetsR.drawable.ic_small_downward_black_arrow + map["ICON_BENEFITS"] = WidgetsR.drawable.ic_benefits map["ICON_SECURITY_CHECK_ORANGE"] = - com.navi.naviwidgets.R.drawable.ic_hl_security_check_orange - map["ICON_HL_NPCI"] = com.navi.naviwidgets.R.drawable.ic_hl_npci - map["ICON_HL_NET_BANKING"] = com.navi.naviwidgets.R.drawable.ic_auto_pay_step_1 - map["ICON_HL_ACCOUNT_TYPE"] = com.navi.naviwidgets.R.drawable.ic_auto_pay_step_2 - map["ICON_HL_VERIFY_OTP"] = com.navi.naviwidgets.R.drawable.ic_auto_pay_step_3 - map["ICON_SMALL_YELLOW_BULB"] = com.navi.naviwidgets.R.drawable.ic_small_yellow_bulb_svg - map["ICON_SMALL_ORANGE_BULB"] = com.navi.naviwidgets.R.drawable.ic_icon_small_orange_bulb - map["REFER_RUPEE_ICON"] = com.navi.naviwidgets.R.drawable.refer_rupee_icon - map["COPY_ICON_WHITE"] = com.navi.naviwidgets.R.drawable.ic_copy_icon - map["COPY_SHARE_WHITE"] = com.navi.naviwidgets.R.drawable.ic_share_icon - map["LINK_ICON_WHITE"] = com.navi.naviwidgets.R.drawable.ic_link_icon_white - map["LINK_ICON_PURPLE"] = com.navi.naviwidgets.R.drawable.ic_link_icon_purple - map["ARROW_FORWARD_RED"] = com.navi.naviwidgets.R.drawable.ic_arrow_forward_red - map["DOUBLE_RIGHT_ARROW"] = com.navi.naviwidgets.R.drawable.ic_double_right_arrow + WidgetsR.drawable.ic_hl_security_check_orange + map["ICON_HL_NPCI"] = WidgetsR.drawable.ic_hl_npci + map["ICON_HL_NET_BANKING"] = WidgetsR.drawable.ic_auto_pay_step_1 + map["ICON_HL_ACCOUNT_TYPE"] = WidgetsR.drawable.ic_auto_pay_step_2 + map["ICON_HL_VERIFY_OTP"] = WidgetsR.drawable.ic_auto_pay_step_3 + map["ICON_SMALL_YELLOW_BULB"] = WidgetsR.drawable.ic_small_yellow_bulb_svg + map["ICON_SMALL_ORANGE_BULB"] = WidgetsR.drawable.ic_icon_small_orange_bulb + map["REFER_RUPEE_ICON"] = WidgetsR.drawable.refer_rupee_icon + map["COPY_ICON_WHITE"] = WidgetsR.drawable.ic_copy_icon + map["COPY_SHARE_WHITE"] = WidgetsR.drawable.ic_share_icon + map["LINK_ICON_WHITE"] = WidgetsR.drawable.ic_link_icon_white + map["LINK_ICON_PURPLE"] = WidgetsR.drawable.ic_link_icon_purple + map["ARROW_FORWARD_RED"] = WidgetsR.drawable.ic_arrow_forward_red + map["DOUBLE_RIGHT_ARROW"] = WidgetsR.drawable.ic_double_right_arrow map["TIP_RECTANGLE_BACKGROUND_IMAGE"] = - com.navi.naviwidgets.R.drawable.ic_tip_rectangle_background_image + WidgetsR.drawable.ic_tip_rectangle_background_image map["ICON_SMALL_WHITE_BG_BLUE_RIGHT_ARROW"] = - com.navi.naviwidgets.R.drawable.ic_small_circle_blue_right_arrow_white_bg_svg + WidgetsR.drawable.ic_small_circle_blue_right_arrow_white_bg_svg map["ICON_WHITE_HOME_WITH_SEARCH"] = - com.navi.naviwidgets.R.drawable.ic_white_home_with_search_icon_svg + WidgetsR.drawable.ic_white_home_with_search_icon_svg map["ICON_EXTRA_SMALL_ORANGE_PLUS"] = - com.navi.naviwidgets.R.drawable.ic_extra_small_orange_plus_svg - map["ICON_RED_ALERT_CIRCLE"] = com.navi.naviwidgets.R.drawable.ic_red_alert_circle - map["ICON_HELP_ORANGE_BLACK"] = com.navi.naviwidgets.R.drawable.ic_help_orange_black_icon + WidgetsR.drawable.ic_extra_small_orange_plus_svg + map["ICON_RED_ALERT_CIRCLE"] = WidgetsR.drawable.ic_red_alert_circle + map["ICON_HELP_ORANGE_BLACK"] = WidgetsR.drawable.ic_help_orange_black_icon map["ICON_HL_BOOK_WITH_RED_TICK_GREY_BG"] = - com.navi.naviwidgets.R.drawable.ic_hl_book_with_red_tick_grey_bg_svg + WidgetsR.drawable.ic_hl_book_with_red_tick_grey_bg_svg map["ICON_HL_DOCUMENT_WITH_UP_ARROW_GREY_BG"] = - com.navi.naviwidgets.R.drawable.ic_hl_document_with_up_arrow_grey_bg - map["ICON_NO_REWARDS"] = com.navi.naviwidgets.R.drawable.ic_empty - map["STAR_ICON"] = com.navi.naviwidgets.R.drawable.star_icon - map["STAR_ICON_WITH_GERY_BG"] = com.navi.naviwidgets.R.drawable.ic_star_with_grey_bg - map["REWARD_BACKGROUND"] = com.navi.naviwidgets.R.drawable.rewards_background - map["REWARD_LARGE_BACKGROUND"] = com.navi.naviwidgets.R.drawable.rewards_large_background - map["GOLD_SHADOW"] = com.navi.naviwidgets.R.drawable.gold_shadow - map["AMC_REWARD"] = com.navi.naviwidgets.R.drawable.amc_reward - map["POP_UP"] = com.navi.naviwidgets.R.drawable.pop_up - map["SMALL_AMC_REWARD"] = com.navi.naviwidgets.R.drawable.small_amc_reward - map["POT"] = com.navi.naviwidgets.R.drawable.pot - map["GREEN_CHECK_ICON"] = com.navi.naviwidgets.R.drawable.ic_green_check - map["ORANGE_LOCK_ICON"] = com.navi.naviwidgets.R.drawable.ic_orange_lock - map["GREY_WHITE_STAR"] = com.navi.naviwidgets.R.drawable.ic_grey_white_star - map["HEART_WITH_HEARTBEAT"] = com.navi.naviwidgets.R.drawable.ic_heart_with_heartbeat - map["CROSS_WHITE"] = com.navi.naviwidgets.R.drawable.ic_cross_white - map["ICON_CROSS_WHITE"] = com.navi.naviwidgets.R.drawable.ic_cross_white - map["GREEN_TICK_ICON_16_16"] = com.navi.naviwidgets.R.drawable.ic_tick_green_16_16 - map["RED_CROSS_ICON_16_16"] = com.navi.naviwidgets.R.drawable.ic_cross_red_16_16 - map["ORANGE_TICK_RECTANGLE"] = com.navi.naviwidgets.R.drawable.ic_tick_orange_rectangle + WidgetsR.drawable.ic_hl_document_with_up_arrow_grey_bg + map["ICON_NO_REWARDS"] = WidgetsR.drawable.ic_empty + map["STAR_ICON"] = WidgetsR.drawable.star_icon + map["STAR_ICON_WITH_GERY_BG"] = WidgetsR.drawable.ic_star_with_grey_bg + map["REWARD_BACKGROUND"] = WidgetsR.drawable.rewards_background + map["REWARD_LARGE_BACKGROUND"] = WidgetsR.drawable.rewards_large_background + map["GOLD_SHADOW"] = WidgetsR.drawable.gold_shadow + map["AMC_REWARD"] = WidgetsR.drawable.amc_reward + map["POP_UP"] = WidgetsR.drawable.pop_up + map["SMALL_AMC_REWARD"] = WidgetsR.drawable.small_amc_reward + map["POT"] = WidgetsR.drawable.pot + map["GREEN_CHECK_ICON"] = WidgetsR.drawable.ic_green_check + map["ORANGE_LOCK_ICON"] = WidgetsR.drawable.ic_orange_lock + map["GREY_WHITE_STAR"] = WidgetsR.drawable.ic_grey_white_star + map["HEART_WITH_HEARTBEAT"] = WidgetsR.drawable.ic_heart_with_heartbeat + map["CROSS_WHITE"] = WidgetsR.drawable.ic_cross_white + map["ICON_CROSS_WHITE"] = WidgetsR.drawable.ic_cross_white + map["GREEN_TICK_ICON_16_16"] = WidgetsR.drawable.ic_tick_green_16_16 + map["RED_CROSS_ICON_16_16"] = WidgetsR.drawable.ic_cross_red_16_16 + map["ORANGE_TICK_RECTANGLE"] = WidgetsR.drawable.ic_tick_orange_rectangle map["THIN_BLACK_ARROW_FORWARD"] = - com.navi.naviwidgets.R.drawable.ic_thin_black_forward_arrow - map["HOUR_GLASS"] = com.navi.naviwidgets.R.drawable.ic_hour_glass - map["YELLOW_SEPARATOR_ICON"] = com.navi.naviwidgets.R.drawable.yellow_separator_icon - map["DIGITAL_GOLD_BULLET_ICON"] = com.navi.naviwidgets.R.drawable.ic_profile_digital_gold - map["ASSET_GRAPH"] = com.navi.naviwidgets.R.drawable.ic_asset_graph - map["BENEFITS_ICON"] = com.navi.naviwidgets.R.drawable.ic_hands_with_plus_icon - map["HAPPY_POT"] = com.navi.naviwidgets.R.drawable.happy_pot - map["SAD_PINK_POT"] = com.navi.naviwidgets.R.drawable.pink_sad_pot - map["ICON_USE_PHONE"] = com.navi.naviwidgets.R.drawable.ic_use_phone - map["ICON_MESSAGE"] = com.navi.naviwidgets.R.drawable.ic_message - map["ICON_GET_REWARD"] = com.navi.naviwidgets.R.drawable.ic_get_reward - map["ICON_PLANT_SAD"] = com.navi.naviwidgets.R.drawable.ic_plant_sad - map["ICON_ADD_NOMINEE"] = com.navi.naviwidgets.R.drawable.ic_add_nominee - map["ICON_ROUND_ORANGE_ARROW"] = com.navi.naviwidgets.R.drawable.ic_round_ornage_arrow - map["FILLED_TRIANGLE_DOWN_LIGHT_PINK"] = com.navi.naviwidgets.R.drawable.ic_triangle_down + WidgetsR.drawable.ic_thin_black_forward_arrow + map["HOUR_GLASS"] = WidgetsR.drawable.ic_hour_glass + map["YELLOW_SEPARATOR_ICON"] = WidgetsR.drawable.yellow_separator_icon + map["DIGITAL_GOLD_BULLET_ICON"] = WidgetsR.drawable.ic_profile_digital_gold + map["ASSET_GRAPH"] = WidgetsR.drawable.ic_asset_graph + map["BENEFITS_ICON"] = DesignR.drawable.ic_hands_with_plus_icon + map["HAPPY_POT"] = DesignR.drawable.happy_pot + map["SAD_PINK_POT"] = DesignR.drawable.pink_sad_pot + map["ICON_USE_PHONE"] = WidgetsR.drawable.ic_use_phone + map["ICON_MESSAGE"] = WidgetsR.drawable.ic_message + map["ICON_GET_REWARD"] = WidgetsR.drawable.ic_get_reward + map["ICON_PLANT_SAD"] = WidgetsR.drawable.ic_plant_sad + map["ICON_ADD_NOMINEE"] = WidgetsR.drawable.ic_add_nominee + map["ICON_ROUND_ORANGE_ARROW"] = WidgetsR.drawable.ic_round_ornage_arrow + map["FILLED_TRIANGLE_DOWN_LIGHT_PINK"] = WidgetsR.drawable.ic_triangle_down map["FILLED_TRIANGLE_UP_LIGHT_GREEN"] = - com.navi.naviwidgets.R.drawable.ic_triangle_light_green_up_svg - map["DUE_ALARM_ICON"] = com.navi.naviwidgets.R.drawable.ic_due_alarm - map["PENALTY_ALARM_ICON"] = com.navi.naviwidgets.R.drawable.ic_penalty_alarm + WidgetsR.drawable.ic_triangle_light_green_up_svg + map["DUE_ALARM_ICON"] = WidgetsR.drawable.ic_due_alarm + map["PENALTY_ALARM_ICON"] = WidgetsR.drawable.ic_penalty_alarm map["RIGHT_ARROW_WITH_CIRCLE_BG_ICON"] = - com.navi.naviwidgets.R.drawable.ic_right_arrow_circle_bg + WidgetsR.drawable.ic_right_arrow_circle_bg map["RIGHT_ARROW_WITH_CIRCLE_BG_ICON_BLUE"] = - com.navi.naviwidgets.R.drawable.ic_right_arrow_circle_bg_blue - map["ICON_BLACK_BORDER_PENCIL"] = com.navi.naviwidgets.R.drawable.ic_black_pencil + WidgetsR.drawable.ic_right_arrow_circle_bg_blue + map["ICON_BLACK_BORDER_PENCIL"] = WidgetsR.drawable.ic_black_pencil map["ICON_BLACK_PREVIOUS_DOCUMENT"] = - com.navi.naviwidgets.R.drawable.ic_black_previous_document - map["ICON_INFO_SMALL_DARK"] = com.navi.naviwidgets.R.drawable.ic_info_small_dark - map["ICON_INFO_MEDIUM_DARK_BLUE"] = com.navi.naviwidgets.R.drawable.ic_info_medium_dark_blue - map["REFERRAL_GIFT_ICON"] = com.navi.naviwidgets.R.drawable.referral_gift_icon - map["REFERRAL_GIFT_GREEN_ICON"] = com.navi.naviwidgets.R.drawable.gift - map["YELLOW_PERCENTAGE_CLOUD"] = com.navi.naviwidgets.R.drawable.ic_percentage_cloud_yellow - map["ICON_CIRCULAR_HOME"] = com.navi.naviwidgets.R.drawable.icon_circular_home + WidgetsR.drawable.ic_black_previous_document + map["ICON_INFO_SMALL_DARK"] = WidgetsR.drawable.ic_info_small_dark + map["ICON_INFO_MEDIUM_DARK_BLUE"] = WidgetsR.drawable.ic_info_medium_dark_blue + map["REFERRAL_GIFT_ICON"] = WidgetsR.drawable.referral_gift_icon + map["REFERRAL_GIFT_GREEN_ICON"] = WidgetsR.drawable.gift + map["YELLOW_PERCENTAGE_CLOUD"] = WidgetsR.drawable.ic_percentage_cloud_yellow + map["ICON_CIRCULAR_HOME"] = WidgetsR.drawable.icon_circular_home map["ICON_CIRCULAR_SPLIT_COLOR_RUPEE"] = - com.navi.naviwidgets.R.drawable.icon_circular_split_color_rupee + WidgetsR.drawable.icon_circular_split_color_rupee map["ANTI_CLOCKWISE_ARROW_WITH_RUPEE"] = - com.navi.naviwidgets.R.drawable.ic_anti_clockwise_aroow_with_rupee_svg + WidgetsR.drawable.ic_anti_clockwise_aroow_with_rupee_svg map["ICON_RIGHT_ARROW_LIGHT_ORANGE_BG"] = - com.navi.naviwidgets.R.drawable.right_arrow_light_orange_background_svg + WidgetsR.drawable.right_arrow_light_orange_background_svg map["ICON_RED_PLAY_VIDEO_GREY_BG"] = - com.navi.naviwidgets.R.drawable.ic_red_play_video_grey_bg_svg + WidgetsR.drawable.ic_red_play_video_grey_bg_svg map["ICON_LATE_FEE_AND_PENAL_INTEREST"] = - com.navi.naviwidgets.R.drawable.ic_late_fee_and_penal_interest_svg + WidgetsR.drawable.ic_late_fee_and_penal_interest_svg map["ICON_NO_NEW_LOANS_WITH_STOP"] = - com.navi.naviwidgets.R.drawable.ic_no_new_loans_with_stop_svg + WidgetsR.drawable.ic_no_new_loans_with_stop_svg map["ICON_HIGH_INTEREST_RATES_WITH_SPIKE"] = - com.navi.naviwidgets.R.drawable.ic_high_interest_rates_with_spike + WidgetsR.drawable.ic_high_interest_rates_with_spike map["ICON_LEGAL_ACTIONS_WITH_WARNING"] = - com.navi.naviwidgets.R.drawable.ic_legal_actions_with_warning_svg - map["HAND_WITH_COINS_ICON"] = com.navi.naviwidgets.R.drawable.ic_hand_with_coins - map["ICON_MAD_GREY"] = com.navi.naviwidgets.R.drawable.ic_mad_grey - map["ICON_SAD_GREY"] = com.navi.naviwidgets.R.drawable.ic_sad_grey - map["ICON_SMILE_GREY"] = com.navi.naviwidgets.R.drawable.ic_smile_grey - map["ICON_UNHAPPY_GREY"] = com.navi.naviwidgets.R.drawable.ic_unhappy_grey - map["ICON_THRILLED_GREY"] = com.navi.naviwidgets.R.drawable.ic_thrilled_grey - map["NO_INTERNET"] = com.navi.naviwidgets.R.drawable.ic_new_no_internet - map["SOMETHING_WENT_WRONG"] = com.navi.naviwidgets.R.drawable.ic_new_generic_error - map["ICON_CHECK_MARK_GREEN_MEDIUM"] = com.navi.naviwidgets.R.drawable.ic_check_green_48 - map["ICON_SOLID_TICK"] = com.navi.naviwidgets.R.drawable.ic_solid_tick - map["ICON_SECURITY_SMALL"] = com.navi.naviwidgets.R.drawable.ic_security_check_small_svg - map["ICON_ADD_UPI"] = com.navi.naviwidgets.R.drawable.ic_add_upi - map["ICON_TIMER_GREY"] = com.navi.naviwidgets.R.drawable.ic_timer - map["ICON_EXTRA_MEDIUM_BULLET_DOT"] = com.navi.naviwidgets.R.drawable.ic_bullet_point_medium - map["PULSE_INDICATOR"] = com.navi.naviwidgets.R.drawable.ic_pulse_indicator - map["CHECK_WHITE"] = com.navi.naviwidgets.R.drawable.ic_check_white - map["GIFT_BOX_WITH_COINS"] = com.navi.naviwidgets.R.drawable.ic_gift_box_with_coins + WidgetsR.drawable.ic_legal_actions_with_warning_svg + map["HAND_WITH_COINS_ICON"] = WidgetsR.drawable.ic_hand_with_coins + map["ICON_MAD_GREY"] = WidgetsR.drawable.ic_mad_grey + map["ICON_SAD_GREY"] = WidgetsR.drawable.ic_sad_grey + map["ICON_SMILE_GREY"] = WidgetsR.drawable.ic_smile_grey + map["ICON_UNHAPPY_GREY"] = WidgetsR.drawable.ic_unhappy_grey + map["ICON_THRILLED_GREY"] = WidgetsR.drawable.ic_thrilled_grey + map["NO_INTERNET"] = WidgetsR.drawable.ic_new_no_internet + map["SOMETHING_WENT_WRONG"] = WidgetsR.drawable.ic_new_generic_error + map["ICON_CHECK_MARK_GREEN_MEDIUM"] = WidgetsR.drawable.ic_check_green_48 + map["ICON_SOLID_TICK"] = WidgetsR.drawable.ic_solid_tick + map["ICON_SECURITY_SMALL"] = DesignR.drawable.ic_security_check_small_svg + map["ICON_ADD_UPI"] = WidgetsR.drawable.ic_add_upi + map["ICON_TIMER_GREY"] = WidgetsR.drawable.ic_timer + map["ICON_EXTRA_MEDIUM_BULLET_DOT"] = WidgetsR.drawable.ic_bullet_point_medium + map["PULSE_INDICATOR"] = DesignR.drawable.ic_pulse_indicator + map["CHECK_WHITE"] = WidgetsR.drawable.ic_check_white + map["GIFT_BOX_WITH_COINS"] = WidgetsR.drawable.ic_gift_box_with_coins map["RIGHT_ARROW_PURPLE_WITH_WHITE_BG"] = - com.navi.naviwidgets.R.drawable.ic_right_arrow_purple_with_white_bg + WidgetsR.drawable.ic_right_arrow_purple_with_white_bg map["REFERRAL_GIFT_MEDIUM_ICON"] = - com.navi.naviwidgets.R.drawable.ic_referral_gift_icon_medium - map["ICON_BOY_CONFUSED"] = com.navi.naviwidgets.R.drawable.ic_boy_confused - map["REFERRAL_ANNOUNCEMENT_ICON"] = com.navi.naviwidgets.R.drawable.ic_referral_announcement - map["REWARDS_CASH_ICON"] = com.navi.naviwidgets.R.drawable.ic_rewards_cash_svg + WidgetsR.drawable.ic_referral_gift_icon_medium + map["ICON_BOY_CONFUSED"] = WidgetsR.drawable.ic_boy_confused + map["REFERRAL_ANNOUNCEMENT_ICON"] = WidgetsR.drawable.ic_referral_announcement + map["REWARDS_CASH_ICON"] = WidgetsR.drawable.ic_rewards_cash_svg map["ICON_GOLDEN_COIN_WITH_NAVI_LOGO"] = - com.navi.naviwidgets.R.drawable.ic_golden_coin_with_navi_logo_large_svg + WidgetsR.drawable.ic_golden_coin_with_navi_logo_large_svg map["GOLDEN_COIN_WITH_GOLDEN_NAVI_LOGO"] = - com.navi.naviwidgets.R.drawable.ic_golden_coin_with_golden_navi_logo - map["ICON_INFO_DARK_PURPLE"] = com.navi.naviwidgets.R.drawable.ic_info_icon_dark_purple_svg + WidgetsR.drawable.ic_golden_coin_with_golden_navi_logo + map["ICON_INFO_DARK_PURPLE"] = WidgetsR.drawable.ic_info_icon_dark_purple_svg map["ICON_INFO_DARK_PURPLE_LARGE"] = - com.navi.naviwidgets.R.drawable.ic_info_icon_dark_purple_svg - map["THUMBS_UP"] = com.navi.naviwidgets.R.drawable.ic_yes_chat_resolution - map["THUMBS_DOWN"] = com.navi.naviwidgets.R.drawable.ic_no_chat_resolution - map["ICON_UPI_SMALL"] = com.navi.naviwidgets.R.drawable.upi_small - map["COPY_ICON"] = com.navi.naviwidgets.R.drawable.copy_icon - map["REFERRAL_POST_DISBURSAL_ICON"] = com.navi.naviwidgets.R.drawable.ic_referral_pds - map["ICON_TIMER_RESET"] = com.navi.naviwidgets.R.drawable.ic_timer_reset - map["UPI_ICON"] = com.navi.naviwidgets.R.drawable.ic_upi - map["RETRY_ICON"] = com.navi.naviwidgets.R.drawable.retry_icon - map["ICON_STAGE_COMPLETED"] = com.navi.naviwidgets.R.drawable.ic_success_icon_2 - map["ICON_STAGE_PENDING"] = com.navi.naviwidgets.R.drawable.ic_processing_icon_in_progress_2 - map["ICON_STAGE_UNINITIATED"] = com.navi.naviwidgets.R.drawable.ic_uninitiated - map["ICON_INFO_GREEN"] = com.navi.naviwidgets.R.drawable.ic_line_success_svg - map["INCREMENT_ICON"] = com.navi.naviwidgets.R.drawable.increment_icon - map["RUPEE_PROCESSING_ALERT"] = com.navi.naviwidgets.R.drawable.rupee_processing_alert_svg - map["GOLD_PRODUCT_ICON_GOLDEN"] = com.navi.naviwidgets.R.drawable.three_gold_bricks - map["HAND_WITH_GOLD_RUPEE"] = com.navi.naviwidgets.R.drawable.hand_with_gold_rupee + WidgetsR.drawable.ic_info_icon_dark_purple_svg + map["THUMBS_UP"] = WidgetsR.drawable.ic_yes_chat_resolution + map["THUMBS_DOWN"] = WidgetsR.drawable.ic_no_chat_resolution + map["ICON_UPI_SMALL"] = WidgetsR.drawable.upi_small + map["COPY_ICON"] = WidgetsR.drawable.copy_icon + map["REFERRAL_POST_DISBURSAL_ICON"] = WidgetsR.drawable.ic_referral_pds + map["ICON_TIMER_RESET"] = WidgetsR.drawable.ic_timer_reset + map["UPI_ICON"] = WidgetsR.drawable.ic_upi + map["RETRY_ICON"] = WidgetsR.drawable.retry_icon + map["ICON_STAGE_COMPLETED"] = WidgetsR.drawable.ic_success_icon_2 + map["ICON_STAGE_PENDING"] = WidgetsR.drawable.ic_processing_icon_in_progress_2 + map["ICON_STAGE_UNINITIATED"] = WidgetsR.drawable.ic_uninitiated + map["ICON_INFO_GREEN"] = WidgetsR.drawable.ic_line_success_svg + map["INCREMENT_ICON"] = WidgetsR.drawable.increment_icon + map["RUPEE_PROCESSING_ALERT"] = WidgetsR.drawable.rupee_processing_alert_svg + map["GOLD_PRODUCT_ICON_GOLDEN"] = WidgetsR.drawable.three_gold_bricks + map["HAND_WITH_GOLD_RUPEE"] = WidgetsR.drawable.hand_with_gold_rupee map["GOLD_PRICE_INCREASE_RUPEE_ICON"] = - com.navi.naviwidgets.R.drawable.ic_gold_price_increase_rupee - map["GOLD_DOOR_ICON"] = com.navi.naviwidgets.R.drawable.ic_gold_door - map["ICON_RUPEE_CIRCULAR"] = com.navi.naviwidgets.R.drawable.ic_rupee_circular - map["ICON_GENERIC_FUND_GRAPH"] = com.navi.naviwidgets.R.drawable.generic_fund_graph + WidgetsR.drawable.ic_gold_price_increase_rupee + map["GOLD_DOOR_ICON"] = WidgetsR.drawable.ic_gold_door + map["ICON_RUPEE_CIRCULAR"] = WidgetsR.drawable.ic_rupee_circular + map["ICON_GENERIC_FUND_GRAPH"] = WidgetsR.drawable.generic_fund_graph map["ICON_GENERIC_MANAGER_PROFILE"] = - com.navi.naviwidgets.R.drawable.ic_generic_manager_profile - map["ICON_FUND_MANAGEMENT"] = com.navi.naviwidgets.R.drawable.ic_fund_management - map["ICON_LEADERBOARD_ADDS"] = com.navi.naviwidgets.R.drawable.ic_leaderboard_adds_icon - map["ICON_LEADERBOARD_RANK"] = com.navi.naviwidgets.R.drawable.ic_trophy_icon - map["LEADERBOARD_BG"] = com.navi.naviwidgets.R.drawable.ic_leaderboard_background - map["ICON_FUND_RETURNS"] = com.navi.naviwidgets.R.drawable.ic_fund_returns - map["ICON_FUND_PORTFOLIO"] = com.navi.naviwidgets.R.drawable.ic_fund_portfolio + WidgetsR.drawable.ic_generic_manager_profile + map["ICON_FUND_MANAGEMENT"] = WidgetsR.drawable.ic_fund_management + map["ICON_LEADERBOARD_ADDS"] = WidgetsR.drawable.ic_leaderboard_adds_icon + map["ICON_LEADERBOARD_RANK"] = WidgetsR.drawable.ic_trophy_icon + map["LEADERBOARD_BG"] = WidgetsR.drawable.ic_leaderboard_background + map["ICON_FUND_RETURNS"] = WidgetsR.drawable.ic_fund_returns + map["ICON_FUND_PORTFOLIO"] = WidgetsR.drawable.ic_fund_portfolio map["ICON_TRENDING_LIGHT_GREEN"] = - com.navi.naviwidgets.R.drawable.ic_trending_arrow_light_green - map["ICON_EMI_HOLIDAY"] = com.navi.naviwidgets.R.drawable.piggy_bank_with_heart_bg - map["ICON_CUSTOM_EMI"] = com.navi.naviwidgets.R.drawable.ic_custom_emi - map["ICON_PRE_EMI"] = com.navi.naviwidgets.R.drawable.ic_pre_emi - map["ICON_REGULAR_EMI"] = com.navi.naviwidgets.R.drawable.ic_regular_emi - map["ICON_TRANCHE_EMI"] = com.navi.naviwidgets.R.drawable.ic_tranche_emi - map["ICON_GREEN_RUPEE"] = com.navi.naviwidgets.R.drawable.ic_rupee_solid - map["PL_OFFER_CARD_BACKGROUND"] = com.navi.naviwidgets.R.drawable.pl_offer_background - map["PL_OFFER_ICON"] = com.navi.naviwidgets.R.drawable.pl_offer_icon - map["BLUE_INFO_ICON"] = com.navi.naviwidgets.R.drawable.blue_info_icon - map["DELIVERED_ICON"] = com.navi.naviwidgets.R.drawable.delivery_icon - map["TRANSACTION_HISTORY"] = com.navi.naviwidgets.R.drawable.transaction_history_icon - map["SELL_ICON_SMALL"] = com.navi.naviwidgets.R.drawable.ic_sell_icon_small - map["ICON_CHEVRON_LEFT_DISABLED"] = com.navi.naviwidgets.R.drawable.ic_disabled_chevron_left + WidgetsR.drawable.ic_trending_arrow_light_green + map["ICON_EMI_HOLIDAY"] = WidgetsR.drawable.piggy_bank_with_heart_bg + map["ICON_CUSTOM_EMI"] = WidgetsR.drawable.ic_custom_emi + map["ICON_PRE_EMI"] = WidgetsR.drawable.ic_pre_emi + map["ICON_REGULAR_EMI"] = WidgetsR.drawable.ic_regular_emi + map["ICON_TRANCHE_EMI"] = WidgetsR.drawable.ic_tranche_emi + map["ICON_GREEN_RUPEE"] = WidgetsR.drawable.ic_rupee_solid + map["PL_OFFER_CARD_BACKGROUND"] = WidgetsR.drawable.pl_offer_background + map["PL_OFFER_ICON"] = WidgetsR.drawable.pl_offer_icon + map["BLUE_INFO_ICON"] = WidgetsR.drawable.blue_info_icon + map["DELIVERED_ICON"] = WidgetsR.drawable.delivery_icon + map["TRANSACTION_HISTORY"] = WidgetsR.drawable.transaction_history_icon + map["SELL_ICON_SMALL"] = WidgetsR.drawable.ic_sell_icon_small + map["ICON_CHEVRON_LEFT_DISABLED"] = WidgetsR.drawable.ic_disabled_chevron_left map["ICON_CHEVRON_RIGHT_DISABLED"] = - com.navi.naviwidgets.R.drawable.ic_disabled_chevron_right - map["ICON_CHEVRON_LEFT_ENABLED"] = com.navi.naviwidgets.R.drawable.ic_enabled_chevron_left - map["ICON_CHEVRON_RIGHT_ENABLED"] = com.navi.naviwidgets.R.drawable.ic_enabled_chevron_right - map["SAFE_GOLD_LOGO_ICON"] = com.navi.naviwidgets.R.drawable.safe_gold_logo_icon - map["AUGMONT_LOGO"] = com.navi.naviwidgets.R.drawable.augmont_logo - map["AUGMONT_LOGO_ICON"] = com.navi.naviwidgets.R.drawable.augmont_logo_icon - map["AUGMONT_ICON_LARGE"] = com.navi.naviwidgets.R.drawable.augmont_icon_large - map["SAD_GREY_PLANT"] = com.navi.naviwidgets.R.drawable.ic_sad_plant_grey - map["TOOLTIP_GREY_BG"] = com.navi.naviwidgets.R.drawable.ic_tooltip_grey_bg - map["ICON_DOG_WITH_RED_ALERT"] = com.navi.naviwidgets.R.drawable.ic_dog_with_red_alert - map["ICON_DOWN_ARROW_BLACK_10X6"] = com.navi.naviwidgets.R.drawable.ic_down_arrow_black_10_6 - map["ICON_UP_ARROW_BLACK_10X6"] = com.navi.naviwidgets.R.drawable.ic_arrow_up_black_10_6 + WidgetsR.drawable.ic_disabled_chevron_right + map["ICON_CHEVRON_LEFT_ENABLED"] = WidgetsR.drawable.ic_enabled_chevron_left + map["ICON_CHEVRON_RIGHT_ENABLED"] = WidgetsR.drawable.ic_enabled_chevron_right + map["SAFE_GOLD_LOGO_ICON"] = WidgetsR.drawable.safe_gold_logo_icon + map["AUGMONT_LOGO"] = WidgetsR.drawable.augmont_logo + map["AUGMONT_LOGO_ICON"] = WidgetsR.drawable.augmont_logo_icon + map["AUGMONT_ICON_LARGE"] = WidgetsR.drawable.augmont_icon_large + map["SAD_GREY_PLANT"] = WidgetsR.drawable.ic_sad_plant_grey + map["TOOLTIP_GREY_BG"] = WidgetsR.drawable.ic_tooltip_grey_bg + map["ICON_DOG_WITH_RED_ALERT"] = WidgetsR.drawable.ic_dog_with_red_alert + map["ICON_DOWN_ARROW_BLACK_10X6"] = WidgetsR.drawable.ic_down_arrow_black_10_6 + map["ICON_UP_ARROW_BLACK_10X6"] = WidgetsR.drawable.ic_arrow_up_black_10_6 map["ICON_LEFT_SEMI_CIRCLE_WHITE"] = - com.navi.naviwidgets.R.drawable.ic_left_semi_circle_white_svg + WidgetsR.drawable.ic_left_semi_circle_white_svg map["ICON_RIGHT_SEMI_CIRCLE_WHITE"] = - com.navi.naviwidgets.R.drawable.ic_right_semi_circle_white_svg - map["ICON_REFRESH_BLACK"] = com.navi.naviwidgets.R.drawable.ic_refresh_black + WidgetsR.drawable.ic_right_semi_circle_white_svg + map["ICON_REFRESH_BLACK"] = WidgetsR.drawable.ic_refresh_black map["ICON_GOLD_BRICKS_WITH_GOLD_COIN"] = - com.navi.naviwidgets.R.drawable.ic_gold_bricks_with_gold_coin - map["ICON_MONEY_BUNDLE"] = com.navi.naviwidgets.R.drawable.ic_money_bundle - map["TRENDING_ICON_RED"] = com.navi.naviwidgets.R.drawable.ic_trending_red - map["DOCUMENT_LOAN_DETAILS"] = com.navi.naviwidgets.R.drawable.ic_document_loan_details - map["RUPPE_COIN_IN_HAND"] = com.navi.naviwidgets.R.drawable.ic_ruppe_coin_in_hand - map["RUPPE_COIN_WITH_TICK"] = com.navi.naviwidgets.R.drawable.ic_ruppe_coin_tick - map["PROFILE_USER_ICON"] = com.navi.naviwidgets.R.drawable.ic_profile_user - map["ARROW_RIGHT_PURPLE"] = com.navi.naviwidgets.R.drawable.ic_arrow_right_purple - map["ARROW_RIGHT_PINK"] = com.navi.naviwidgets.R.drawable.ic_arrow_right_pink - map["COIN_USER_PLANE"] = com.navi.naviwidgets.R.drawable.ic_coin_user_plane + WidgetsR.drawable.ic_gold_bricks_with_gold_coin + map["ICON_MONEY_BUNDLE"] = WidgetsR.drawable.ic_money_bundle + map["TRENDING_ICON_RED"] = WidgetsR.drawable.ic_trending_red + map["DOCUMENT_LOAN_DETAILS"] = WidgetsR.drawable.ic_document_loan_details + map["RUPPE_COIN_IN_HAND"] = WidgetsR.drawable.ic_ruppe_coin_in_hand + map["RUPPE_COIN_WITH_TICK"] = WidgetsR.drawable.ic_ruppe_coin_tick + map["PROFILE_USER_ICON"] = WidgetsR.drawable.ic_profile_user + map["ARROW_RIGHT_PURPLE"] = WidgetsR.drawable.ic_arrow_right_purple + map["ARROW_RIGHT_PINK"] = WidgetsR.drawable.ic_arrow_right_pink + map["COIN_USER_PLANE"] = WidgetsR.drawable.ic_coin_user_plane map["MISSING_ICON"] = -1 return map } diff --git a/navi_hl_dynamic/src/main/java/com/navi/hl/accountagreegator/HLAccountAggregatorActivity.kt b/navi_hl_dynamic/src/main/java/com/navi/hl/accountagreegator/HLAccountAggregatorActivity.kt index b87956ab0d..142f0d781c 100644 --- a/navi_hl_dynamic/src/main/java/com/navi/hl/accountagreegator/HLAccountAggregatorActivity.kt +++ b/navi_hl_dynamic/src/main/java/com/navi/hl/accountagreegator/HLAccountAggregatorActivity.kt @@ -7,6 +7,8 @@ package com.navi.hl.accountagreegator +import com.navi.insurance.R as InsuranceR +import com.navi.design.R as DesignR import android.annotation.SuppressLint import android.os.Bundle import android.text.TextUtils @@ -226,7 +228,7 @@ class HLAccountAggregatorActivity : BaseActivity() { binding.progressLayout.setBackgroundColor( ContextCompat.getColor( this@HLAccountAggregatorActivity, - R.color.white + DesignR.color.white ) ) binding.title.setTextFieldData( @@ -234,7 +236,7 @@ class HLAccountAggregatorActivity : BaseActivity() { text = getString(R.string.redirecting_to_account_aggregator), size = DEFAULT_TEXT_SIZE, font = FontWeightEnum.TT_MEDIUM.name, - textColor = getString(R.color.naviBlackText) + textColor = getString(InsuranceR.color.naviBlackText) ) ) } @@ -262,7 +264,7 @@ class HLAccountAggregatorActivity : BaseActivity() { binding.progressLayout.setBackgroundColor( ContextCompat.getColor( this@HLAccountAggregatorActivity, - R.color.cta_purple_color + DesignR.color.cta_purple_color ) ) binding.title.setTextFieldData( @@ -270,7 +272,7 @@ class HLAccountAggregatorActivity : BaseActivity() { text = getString(R.string.verifying_bank_statement), size = DEFAULT_TEXT_SIZE, font = FontWeightEnum.TT_MEDIUM.name, - textColor = getString(R.color.white) + textColor = getString(DesignR.color.white) ) ) } diff --git a/navi_hl_dynamic/src/main/java/com/navi/hl/common/adapter/HLFormScreenWidgetViewMapping.kt b/navi_hl_dynamic/src/main/java/com/navi/hl/common/adapter/HLFormScreenWidgetViewMapping.kt index d55a27318f..02a147d77a 100644 --- a/navi_hl_dynamic/src/main/java/com/navi/hl/common/adapter/HLFormScreenWidgetViewMapping.kt +++ b/navi_hl_dynamic/src/main/java/com/navi/hl/common/adapter/HLFormScreenWidgetViewMapping.kt @@ -10,7 +10,7 @@ package com.navi.hl.common.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.databinding.DataBindingUtil -import com.navi.naviwidgets.R as widgetsR +import com.navi.naviwidgets.R as WidgetsR import com.navi.naviwidgets.databinding.LayoutInformationBinding import com.navi.naviwidgets.databinding.LayoutLabelWithInputSearchBinding import com.navi.naviwidgets.databinding.LayoutLabeledDateInputBinding @@ -112,7 +112,7 @@ object HLFormScreenWidgetViewMapping { val binding: LayoutLabeledInputV2Binding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - widgetsR.layout.layout_labeled_input_v2, + WidgetsR.layout.layout_labeled_input_v2, parent, false ) @@ -122,7 +122,7 @@ object HLFormScreenWidgetViewMapping { val binding: LayoutTextDisplayBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - widgetsR.layout.layout_text_display, + WidgetsR.layout.layout_text_display, parent, false ) @@ -132,7 +132,7 @@ object HLFormScreenWidgetViewMapping { val binding: LayoutLabeledDateInputBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - widgetsR.layout.layout_labeled_date_input, + WidgetsR.layout.layout_labeled_date_input, parent, false ) @@ -142,7 +142,7 @@ object HLFormScreenWidgetViewMapping { val binding: LayoutLabeledInputFixedHintBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - widgetsR.layout.layout_labeled_input_fixed_hint, + WidgetsR.layout.layout_labeled_input_fixed_hint, parent, false ) @@ -153,7 +153,7 @@ object HLFormScreenWidgetViewMapping { val binding: LayoutLabeledOptionSelectionTileBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - widgetsR.layout.layout_labeled_option_selection_tile, + WidgetsR.layout.layout_labeled_option_selection_tile, parent, false ) @@ -164,7 +164,7 @@ object HLFormScreenWidgetViewMapping { val binding: LayoutLabeledOptionSelectionListBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - widgetsR.layout.layout_labeled_option_selection_list, + WidgetsR.layout.layout_labeled_option_selection_list, parent, false ) @@ -175,7 +175,7 @@ object HLFormScreenWidgetViewMapping { val binding: LayoutLabelWithInputSearchBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - widgetsR.layout.layout_label_with_input_search, + WidgetsR.layout.layout_label_with_input_search, parent, false ) @@ -185,7 +185,7 @@ object HLFormScreenWidgetViewMapping { val binding: LayoutToastBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - widgetsR.layout.layout_toast, + WidgetsR.layout.layout_toast, parent, false ) @@ -196,7 +196,7 @@ object HLFormScreenWidgetViewMapping { val binding: LayoutToolTipSliderBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - widgetsR.layout.layout_tool_tip_slider, + WidgetsR.layout.layout_tool_tip_slider, parent, false ) @@ -206,7 +206,7 @@ object HLFormScreenWidgetViewMapping { val binding: LayoutNoteWithBulletPointsWidgetBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - widgetsR.layout.layout_note_with_bullet_points_widget, + WidgetsR.layout.layout_note_with_bullet_points_widget, parent, false ) @@ -216,7 +216,7 @@ object HLFormScreenWidgetViewMapping { val binding: LayoutTitleEndIconWithGradientWidgetBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - widgetsR.layout.layout_title_end_icon_with_gradient_widget, + WidgetsR.layout.layout_title_end_icon_with_gradient_widget, parent, false ) @@ -227,7 +227,7 @@ object HLFormScreenWidgetViewMapping { val binding: LayoutInformationBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - widgetsR.layout.layout_information, + WidgetsR.layout.layout_information, parent, false ) @@ -237,7 +237,7 @@ object HLFormScreenWidgetViewMapping { val binding: LayoutTitleDescImageWidgetBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - widgetsR.layout.layout_title_desc_image_widget, + WidgetsR.layout.layout_title_desc_image_widget, parent, false ) @@ -247,7 +247,7 @@ object HLFormScreenWidgetViewMapping { val binding: LayoutProductBenefitsGridWidgetBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - widgetsR.layout.layout_product_benefits_grid_widget, + WidgetsR.layout.layout_product_benefits_grid_widget, parent, false ) @@ -257,7 +257,7 @@ object HLFormScreenWidgetViewMapping { val binding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), - widgetsR.layout.view_base_input, + WidgetsR.layout.view_base_input, parent, false ) diff --git a/navi_hl_dynamic/src/main/java/com/navi/hl/emiplans/activity/HomeLoanEmiPlansActivity.kt b/navi_hl_dynamic/src/main/java/com/navi/hl/emiplans/activity/HomeLoanEmiPlansActivity.kt index dfceb93135..187c79c994 100644 --- a/navi_hl_dynamic/src/main/java/com/navi/hl/emiplans/activity/HomeLoanEmiPlansActivity.kt +++ b/navi_hl_dynamic/src/main/java/com/navi/hl/emiplans/activity/HomeLoanEmiPlansActivity.kt @@ -7,6 +7,7 @@ package com.navi.hl.emiplans.activity +import com.navi.design.R as DesignR import android.os.Bundle import android.view.View import android.view.ViewGroup @@ -163,7 +164,7 @@ class HomeLoanEmiPlansActivity : HomeLoanBaseActivity(), HLTopNavigationHeaderIn tabInfo.customView ?.findViewById(com.navi.homeloan.R.id.tvTabName) ?.setTextColor( - ContextCompat.getColor(this, com.navi.design.R.color.title_text_red_color) + ContextCompat.getColor(this, DesignR.color.title_text_red_color) ) tabInfo.customView ?.findViewById(com.navi.homeloan.R.id.tvTabName) diff --git a/navi_hl_dynamic/src/main/java/com/navi/hl/emiplans/fragment/HomeLoanEmiPlanFragment.kt b/navi_hl_dynamic/src/main/java/com/navi/hl/emiplans/fragment/HomeLoanEmiPlanFragment.kt index 19a9c46ad7..c7c830f5a1 100644 --- a/navi_hl_dynamic/src/main/java/com/navi/hl/emiplans/fragment/HomeLoanEmiPlanFragment.kt +++ b/navi_hl_dynamic/src/main/java/com/navi/hl/emiplans/fragment/HomeLoanEmiPlanFragment.kt @@ -7,6 +7,7 @@ package com.navi.hl.emiplans.fragment +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.os.Bundle import android.view.LayoutInflater @@ -127,7 +128,7 @@ class HomeLoanEmiPlanFragment : private fun getLineItemView(data: KeyValueTextFieldData): View { return DataBindingUtil.inflate( LayoutInflater.from(context), - com.navi.naviwidgets.R.layout.row_loan_detail_v2, + WidgetsR.layout.row_loan_detail_v2, null, false ) diff --git a/navi_hl_dynamic/src/main/java/com/navi/hl/emiplans/fragment/bottomsheet/TitleWithInputFieldBottomSheet.kt b/navi_hl_dynamic/src/main/java/com/navi/hl/emiplans/fragment/bottomsheet/TitleWithInputFieldBottomSheet.kt index a81f1e6ab4..b971aa0cee 100644 --- a/navi_hl_dynamic/src/main/java/com/navi/hl/emiplans/fragment/bottomsheet/TitleWithInputFieldBottomSheet.kt +++ b/navi_hl_dynamic/src/main/java/com/navi/hl/emiplans/fragment/bottomsheet/TitleWithInputFieldBottomSheet.kt @@ -23,7 +23,7 @@ import com.navi.base.utils.BaseUtils.moneyFormat import com.navi.base.utils.BaseUtils.numberToWords import com.navi.common.ui.fragment.BaseBottomSheet import com.navi.common.utils.COMMA -import com.navi.design.R as designR +import com.navi.design.R as DesignR import com.navi.design.font.FontWeightEnum import com.navi.design.utils.DrawableShape import com.navi.design.utils.dpToPxInInt @@ -129,8 +129,8 @@ class TitleWithInputFieldBottomSheet : BaseBottomSheet(), HLFooterListener { } private fun setCustomStyles() { - binding.editText.fixedHint.setStyle(designR.style.TextInputV2Style) - binding.editText.plainTextInput.setStyle(designR.style.TextInputV2Style) + binding.editText.fixedHint.setStyle(DesignR.style.TextInputV2Style) + binding.editText.plainTextInput.setStyle(DesignR.style.TextInputV2Style) val layoutParams = binding.editText.fixedHint.layoutParams as MarginLayoutParams layoutParams.leftMargin = dpToPxInInt(16) @@ -174,15 +174,15 @@ class TitleWithInputFieldBottomSheet : BaseBottomSheet(), HLFooterListener { binding.editText.root.background = getNaviDrawable( shape = DrawableShape.RECTANGLE, - cornerRadius = resources.getDimension(designR.dimen.dp_8).toInt(), - strokeWidth = resources.getDimension(designR.dimen.dp_1).toInt(), - strokeColor = ContextCompat.getColor(requireContext(), designR.color.successColor) + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), + strokeColor = ContextCompat.getColor(requireContext(), DesignR.color.successColor) ) val successText = numberToWords(amount) binding.subtextTv.setTextFieldData( textFieldData = TextFieldData( - textColor = resources.getString(designR.color.successColor), + textColor = resources.getString(DesignR.color.successColor), text = successText, font = FontWeightEnum.TT_REGULAR.name, textDrawableData = @@ -204,9 +204,9 @@ class TitleWithInputFieldBottomSheet : BaseBottomSheet(), HLFooterListener { binding.editText.root.background = getNaviDrawable( shape = DrawableShape.RECTANGLE, - cornerRadius = resources.getDimension(designR.dimen.dp_8).toInt(), - strokeWidth = resources.getDimension(designR.dimen.dp_1).toInt(), - strokeColor = ContextCompat.getColor(requireContext(), designR.color.errorColor) + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), + strokeColor = ContextCompat.getColor(requireContext(), DesignR.color.errorColor) ) val errorText = @@ -217,7 +217,7 @@ class TitleWithInputFieldBottomSheet : BaseBottomSheet(), HLFooterListener { binding.subtextTv.setTextFieldData( textFieldData = TextFieldData( - textColor = resources.getString(designR.color.active_button_color), + textColor = resources.getString(DesignR.color.active_button_color), text = errorText, font = FontWeightEnum.TT_REGULAR.name, textDrawableData = @@ -239,15 +239,15 @@ class TitleWithInputFieldBottomSheet : BaseBottomSheet(), HLFooterListener { binding.editText.root.background = getNaviDrawable( shape = DrawableShape.RECTANGLE, - cornerRadius = resources.getDimension(designR.dimen.dp_8).toInt(), - strokeWidth = resources.getDimension(designR.dimen.dp_1).toInt(), - strokeColor = ContextCompat.getColor(requireContext(), designR.color.errorColor) + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), + strokeColor = ContextCompat.getColor(requireContext(), DesignR.color.errorColor) ) binding.subtextTv.setTextFieldData( textFieldData = TextFieldData( - textColor = resources.getString(designR.color.active_button_color), + textColor = resources.getString(DesignR.color.active_button_color), text = bottomSheetData?.emptyError, font = FontWeightEnum.TT_REGULAR.name, textDrawableData = @@ -267,10 +267,10 @@ class TitleWithInputFieldBottomSheet : BaseBottomSheet(), HLFooterListener { binding.editText.root.background = getNaviDrawable( shape = DrawableShape.RECTANGLE, - cornerRadius = resources.getDimension(designR.dimen.dp_8).toInt(), - strokeWidth = resources.getDimension(designR.dimen.dp_1).toInt(), + cornerRadius = resources.getDimension(DesignR.dimen.dp_8).toInt(), + strokeWidth = resources.getDimension(DesignR.dimen.dp_1).toInt(), strokeColor = - ContextCompat.getColor(requireContext(), designR.color.strokePrimaryColor) + ContextCompat.getColor(requireContext(), DesignR.color.strokePrimaryColor) ) } diff --git a/navi_hl_dynamic/src/main/java/com/navi/hl/steps/activity/HomeLoanStepsActivity.kt b/navi_hl_dynamic/src/main/java/com/navi/hl/steps/activity/HomeLoanStepsActivity.kt index b60c579a0a..52236817db 100644 --- a/navi_hl_dynamic/src/main/java/com/navi/hl/steps/activity/HomeLoanStepsActivity.kt +++ b/navi_hl_dynamic/src/main/java/com/navi/hl/steps/activity/HomeLoanStepsActivity.kt @@ -7,6 +7,7 @@ package com.navi.hl.steps.activity +import com.navi.design.R as DesignR import android.graphics.Color import android.net.Uri import android.os.Bundle @@ -231,7 +232,7 @@ class HomeLoanStepsActivity : hideLoader() toast( resources.getString(homeLoanR.string.hl_downloading), - offsetY = resources.getDimension(com.navi.design.R.dimen.dp_40).toInt() + offsetY = resources.getDimension(DesignR.dimen.dp_40).toInt() ) val destinationPath = cacheDirUri( diff --git a/navi_hl_dynamic/src/main/java/com/navi/hl/steps/fragment/HomeLoanDocumentUploadFragment.kt b/navi_hl_dynamic/src/main/java/com/navi/hl/steps/fragment/HomeLoanDocumentUploadFragment.kt index 7db62a0abd..58d432e3eb 100644 --- a/navi_hl_dynamic/src/main/java/com/navi/hl/steps/fragment/HomeLoanDocumentUploadFragment.kt +++ b/navi_hl_dynamic/src/main/java/com/navi/hl/steps/fragment/HomeLoanDocumentUploadFragment.kt @@ -7,6 +7,7 @@ package com.navi.hl.steps.fragment +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.net.Uri import android.os.Bundle @@ -402,7 +403,7 @@ class HomeLoanDocumentUploadFragment : binding.documentUploadSection.background = ResourcesCompat.getDrawable( resources, - com.navi.naviwidgets.R.drawable.bg_border_red_rounded_8, + WidgetsR.drawable.bg_border_red_rounded_8, null ) binding.nestedScrollView.post { @@ -416,7 +417,7 @@ class HomeLoanDocumentUploadFragment : binding.documentUploadSection.background = ResourcesCompat.getDrawable( resources, - com.navi.naviwidgets.R.drawable.rounded_rectangle_white_border_8dp, + WidgetsR.drawable.rounded_rectangle_white_border_8dp, null ) } diff --git a/navi_hl_dynamic/src/main/java/com/navi/hl/steps/fragment/HomeLoanFormScreenFragment.kt b/navi_hl_dynamic/src/main/java/com/navi/hl/steps/fragment/HomeLoanFormScreenFragment.kt index 6091a1772a..0dc1cf1c02 100644 --- a/navi_hl_dynamic/src/main/java/com/navi/hl/steps/fragment/HomeLoanFormScreenFragment.kt +++ b/navi_hl_dynamic/src/main/java/com/navi/hl/steps/fragment/HomeLoanFormScreenFragment.kt @@ -7,6 +7,8 @@ package com.navi.hl.steps.fragment +import com.navi.naviwidgets.R as WidgetsR +import com.navi.design.R as DesignR import android.Manifest import android.content.Context import android.os.Bundle @@ -334,7 +336,7 @@ class HomeLoanFormScreenFragment : val toastView = getToastView(it, context) context.customToast( customView = toastView, - offsetY = resources.getDimension(com.navi.design.R.dimen.dp_110).toInt() + offsetY = resources.getDimension(DesignR.dimen.dp_110).toInt() ) } } @@ -481,7 +483,7 @@ class HomeLoanFormScreenFragment : val toastView = getToastView(it, context) context.customToast( customView = toastView, - offsetY = resources.getDimension(com.navi.design.R.dimen.dp_110).toInt() + offsetY = resources.getDimension(DesignR.dimen.dp_110).toInt() ) } } @@ -961,7 +963,7 @@ class HomeLoanFormScreenFragment : ifscInputWidget?.updateTextInputData(ifscCode) ifscInputWidget?.setSuccessText( branchName, - com.navi.naviwidgets.R.drawable.ic_green_success_small_svg + WidgetsR.drawable.ic_green_success_small_svg ) } } diff --git a/navi_hl_dynamic/src/main/java/com/navi/hl/steps/fragment/HomeLoanWidgetizedInfoFragment.kt b/navi_hl_dynamic/src/main/java/com/navi/hl/steps/fragment/HomeLoanWidgetizedInfoFragment.kt index 46e2e9d39f..9be51e6adb 100644 --- a/navi_hl_dynamic/src/main/java/com/navi/hl/steps/fragment/HomeLoanWidgetizedInfoFragment.kt +++ b/navi_hl_dynamic/src/main/java/com/navi/hl/steps/fragment/HomeLoanWidgetizedInfoFragment.kt @@ -7,6 +7,7 @@ package com.navi.hl.steps.fragment +import com.navi.design.R as DesignR import android.content.Context import android.net.Uri import android.os.Bundle @@ -170,7 +171,7 @@ class HomeLoanWidgetizedInfoFragment : hideLoader() context?.toast( resources.getString(com.navi.homeloan.R.string.hl_downloading), - offsetY = resources.getDimension(com.navi.design.R.dimen.dp_40).toInt() + offsetY = resources.getDimension(DesignR.dimen.dp_40).toInt() ) val destinationPath = cacheDirUri(it?.first.orElse("sanction_letter.pdf"), applicationContext) @@ -313,7 +314,7 @@ class HomeLoanWidgetizedInfoFragment : private fun downloadPdf(naviClickAction: DownloadWidgetClickAction) { context?.toast( resources.getString(com.navi.homeloan.R.string.hl_downloading), - offsetY = resources.getDimension(com.navi.design.R.dimen.dp_40).toInt() + offsetY = resources.getDimension(DesignR.dimen.dp_40).toInt() ) val destinationPath = cacheDirUri(naviClickAction.name.orElse(SANCTION_LETTER), applicationContext) diff --git a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/BankStatementInfoBottomSheet.kt b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/BankStatementInfoBottomSheet.kt index d3386a5452..d120ed26d4 100644 --- a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/BankStatementInfoBottomSheet.kt +++ b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/BankStatementInfoBottomSheet.kt @@ -7,6 +7,7 @@ package com.navi.pl.dynamic.fragment +import com.navi.design.R as DesignR import android.os.Bundle import android.view.LayoutInflater import android.view.ViewStub @@ -40,7 +41,7 @@ class BankStatementInfoBottomSheet() : BaseBottomSheet() { ) binding.itemListContainer.background = getNaviDrawable( - backgroundColor = ResourcesCompat.getColor(resources, R.color.grey_alabaster, null), + backgroundColor = ResourcesCompat.getColor(resources, DesignR.color.grey_alabaster, null), cornerRadius = resources.getDimension(R.dimen.layout_dp_8).toInt() ) diff --git a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/BankStatementV2Fragment.kt b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/BankStatementV2Fragment.kt index 42d8902aff..2506b2fdf6 100644 --- a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/BankStatementV2Fragment.kt +++ b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/BankStatementV2Fragment.kt @@ -7,6 +7,7 @@ package com.navi.pl.dynamic.fragment +import com.navi.design.R as DesignR import android.app.Activity import android.content.Context import android.content.Intent @@ -597,7 +598,7 @@ class BankStatementV2Fragment : binding.bankNameContainer.isFocusable = true binding.bankNameTv.apply { typeface = ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.TT_REGULAR)) - setTextColor(ResourcesCompat.getColor(resources, R.color.titleTertiaryColor, null)) + setTextColor(ResourcesCompat.getColor(resources, DesignR.color.titleTertiaryColor, null)) } } diff --git a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/EmiSelectorV2Fragment.kt b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/EmiSelectorV2Fragment.kt index deb448d7ca..6560895635 100644 --- a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/EmiSelectorV2Fragment.kt +++ b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/EmiSelectorV2Fragment.kt @@ -7,6 +7,7 @@ package com.navi.pl.dynamic.fragment +import com.navi.common.R as CommonR import android.app.Activity import android.content.Context import android.content.Intent @@ -255,7 +256,7 @@ class EmiSelectorV2Fragment : BaseFragment(), BackListener { headerInteractionListener?.setProperties(title = it.title) headerInteractionListener?.updateHeader( iconCode = IconUtils.ICON_BACK_ARROW, - styleResId = R.style.TextDescMediumFontStyle2, + styleResId = CommonR.style.TextDescMediumFontStyle2, titleCentric = true, ) } diff --git a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/EmploymentOtpVerificationFragment.kt b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/EmploymentOtpVerificationFragment.kt index 3010e47607..3e08cc2404 100644 --- a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/EmploymentOtpVerificationFragment.kt +++ b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/EmploymentOtpVerificationFragment.kt @@ -7,6 +7,7 @@ package com.navi.pl.dynamic.fragment +import com.navi.design.R as DesignR import android.content.Context import android.content.IntentFilter import android.os.Bundle @@ -202,7 +203,7 @@ open class EmploymentOtpVerificationFragment : Constants.SECONDS_PER_MINUTE if (isAdded) binding.countdownTimerTv.text = - " ${String.format(getString(R.string.time_format), minutes, seconds)}" + " ${String.format(getString(DesignR.string.time_format), minutes, seconds)}" } override fun onFinish() { diff --git a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/EmploymentVerificationV2Fragment.kt b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/EmploymentVerificationV2Fragment.kt index 478efdb791..a501b01dee 100644 --- a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/EmploymentVerificationV2Fragment.kt +++ b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/EmploymentVerificationV2Fragment.kt @@ -7,6 +7,7 @@ package com.navi.pl.dynamic.fragment +import com.navi.design.R as DesignR import android.content.Context import android.os.Bundle import android.view.Gravity @@ -152,7 +153,7 @@ open class EmploymentVerificationV2Fragment : cornerRadius = resources.getDimension(R.dimen.layout_dp_8).toInt(), strokeWidth = resources.getDimension(R.dimen.layout_dp_1).toInt(), strokeColor = - ResourcesCompat.getColor(resources, R.color.border_dark_grey_color, null) + ResourcesCompat.getColor(resources, DesignR.color.border_dark_grey_color, null) ) binding.generateOtpContainer.background = getNaviDrawable( diff --git a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/GstVerificationPasswordV2Fragment.kt b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/GstVerificationPasswordV2Fragment.kt index df51f08ec1..1f65cbc8f1 100644 --- a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/GstVerificationPasswordV2Fragment.kt +++ b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/GstVerificationPasswordV2Fragment.kt @@ -7,6 +7,8 @@ package com.navi.pl.dynamic.fragment +import com.navi.insurance.R as InsuranceR +import com.navi.design.R as DesignR import android.content.Context import android.os.Build import android.os.Bundle @@ -210,7 +212,7 @@ class GstVerificationPasswordV2Fragment : BaseFragment(), FooterViewV2.FooterInt binding.gstDetailContainer.background = getNaviDrawable( strokeColor = - ResourcesCompat.getColor(resources, R.color.naviBorderLightGrey, null), + ResourcesCompat.getColor(resources, DesignR.color.naviBorderLightGrey, null), strokeWidth = resources.getDimension(R.dimen.layout_dp_1).toInt(), cornerRadius = resources.getDimension(R.dimen.layout_dp_8).toInt(), backgroundColor = ResourcesCompat.getColor(resources, R.color.white, null) @@ -471,7 +473,7 @@ class GstVerificationPasswordV2Fragment : BaseFragment(), FooterViewV2.FooterInt binding.textField.background = getNaviDrawable( strokeWidth = resources.getDimension(R.dimen.layout_dp_1).toInt(), - strokeColor = ResourcesCompat.getColor(resources, R.color.zircon_grey, null), + strokeColor = ResourcesCompat.getColor(resources, InsuranceR.color.zircon_grey, null), cornerRadius = resources.getDimension(R.dimen.layout_dp_8).toInt() ) } diff --git a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/GstVerificationV2Fragment.kt b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/GstVerificationV2Fragment.kt index 31833c7f1c..5ae2c5c890 100644 --- a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/GstVerificationV2Fragment.kt +++ b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/GstVerificationV2Fragment.kt @@ -7,6 +7,7 @@ package com.navi.pl.dynamic.fragment +import com.navi.design.R as DesignR import android.content.Context import android.os.Bundle import android.view.LayoutInflater @@ -237,7 +238,7 @@ class GstVerificationV2Fragment : ) setHintStyle( textSizeInSp = 14f, - hintTextColor = R.color.titleTertiaryColor, + hintTextColor = DesignR.color.titleTertiaryColor, fontId = getFontStyle(FontWeightEnum.TT_REGULAR) ) } diff --git a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/KycPanOptionsFragment.kt b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/KycPanOptionsFragment.kt index a188f16876..37b0545bc3 100644 --- a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/KycPanOptionsFragment.kt +++ b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/KycPanOptionsFragment.kt @@ -7,6 +7,7 @@ package com.navi.pl.dynamic.fragment +import com.navi.naviwidgets.R as WidgetsR import android.annotation.SuppressLint import android.content.Context import android.os.Bundle @@ -230,7 +231,7 @@ class KycPanOptionsFragment : fun RenderDigioSuccess() { val composition by - rememberLottieComposition(LottieCompositionSpec.RawRes(R.raw.digilocker_success)) + rememberLottieComposition(LottieCompositionSpec.RawRes(WidgetsR.raw.digilocker_success)) val progress by animateLottieCompositionAsState(composition) diff --git a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/LoanDetailsEditorFragment.kt b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/LoanDetailsEditorFragment.kt index eec72820a6..f2ea9cb3d0 100644 --- a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/LoanDetailsEditorFragment.kt +++ b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/LoanDetailsEditorFragment.kt @@ -120,7 +120,7 @@ class LoanDetailsEditorFragment : private fun initUI() { binding.footerListener = this binding.footerView.visibility = View.VISIBLE - binding.footer = Footer(nextCta = CtaData(title = resources.getString(R.string.confirm))) + binding.footer = Footer(nextCta = CtaData(title = resources.getString(com.navi.pay.R.string.confirm))) } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { diff --git a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/LoanDetailsV2BaseFragment.kt b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/LoanDetailsV2BaseFragment.kt index d7cb69e6bf..076d62d650 100644 --- a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/LoanDetailsV2BaseFragment.kt +++ b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/LoanDetailsV2BaseFragment.kt @@ -7,6 +7,7 @@ package com.navi.pl.dynamic.fragment +import com.navi.common.R as CommonR import android.annotation.SuppressLint import android.view.View import android.webkit.WebChromeClient @@ -186,7 +187,7 @@ abstract class LoanDetailsV2BaseFragment : } override fun onWebViewError(failingUrl: String?) { - context?.let { showToast(it, it.getString(com.navi.common.R.string.web_view_failed)) } + context?.let { showToast(it, it.getString(CommonR.string.web_view_failed)) } loanDetailsBaseEventTracker.onLoanDetailWebViewLoadFailed( failingUrl, this.webViewScreenName diff --git a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/LoanSummaryV2Fragment.kt b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/LoanSummaryV2Fragment.kt index de9697946d..916c5a8379 100644 --- a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/LoanSummaryV2Fragment.kt +++ b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/LoanSummaryV2Fragment.kt @@ -7,6 +7,7 @@ package com.navi.pl.dynamic.fragment +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.os.Bundle import android.view.LayoutInflater @@ -457,7 +458,7 @@ class LoanSummaryV2Fragment : text, R.style.NaviSansSemiBoldExtraSmall, R.color.error_red, - R.drawable.ic_line_error_svg, + WidgetsR.drawable.ic_line_error_svg, R.drawable.bg_error_red_border_rounded_8, ) ltView.binding.errorIcon.setPadding(Padding(1f, 1f, 1f, 1f)) diff --git a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/ProfileV2Fragment.kt b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/ProfileV2Fragment.kt index af8fc2de87..87fd2d42d3 100644 --- a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/ProfileV2Fragment.kt +++ b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/ProfileV2Fragment.kt @@ -7,6 +7,8 @@ package com.navi.pl.dynamic.fragment +import com.navi.common.R as CommonR +import com.navi.naviwidgets.R as WidgetsR import android.app.Activity import android.content.Context import android.os.Bundle @@ -539,7 +541,7 @@ class ProfileV2Fragment : } private fun updateDateBackground() { - binding.dobLt.setBaseBorderBackground(R.drawable.bg_green_border_rounded_8) + binding.dobLt.setBaseBorderBackground(CommonR.drawable.bg_green_border_rounded_8) } private fun updateDateSuccessText() { @@ -565,8 +567,8 @@ class ProfileV2Fragment : binding.dobLt.setSuccessText( validation.first.trim(), R.style.NaviSansSemiBoldExtraSmall, - R.drawable.ic_line_success_svg, - R.drawable.bg_green_border_rounded_8 + WidgetsR.drawable.ic_line_success_svg, + CommonR.drawable.bg_green_border_rounded_8 ) } else { setErrorProperties(binding.dobLt, validation.first) @@ -744,7 +746,7 @@ class ProfileV2Fragment : null } loadTimeEventTracker.onLoadingStarted(NaviAnalytics.PL_BASIC_DETAILS_LOAD_TIME) - showLoader(context?.resources?.getString(R.string.verifying_your_details)) + showLoader(context?.resources?.getString(CommonR.string.verifying_your_details)) viewModel.submitProfileDetails( name.capitalize(Locale.ENGLISH), dob, @@ -784,7 +786,7 @@ class ProfileV2Fragment : text, R.style.NaviSansSemiBoldExtraSmall, R.color.error_red, - R.drawable.ic_line_error_svg, + WidgetsR.drawable.ic_line_error_svg, R.drawable.bg_error_red_border_rounded_8, ) } diff --git a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/TelcoOtpV2Fragment.kt b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/TelcoOtpV2Fragment.kt index 5414c6d1b9..0659c0e0a5 100644 --- a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/TelcoOtpV2Fragment.kt +++ b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/TelcoOtpV2Fragment.kt @@ -7,6 +7,7 @@ package com.navi.pl.dynamic.fragment +import com.navi.design.R as DesignR import android.content.Context import android.content.IntentFilter import android.os.Bundle @@ -186,7 +187,7 @@ class TelcoOtpV2Fragment : Constants.SECONDS_PER_MINUTE if (isAdded) binding.countdownTimerTv.text = - " ${String.format(getString(R.string.time_format), minutes, seconds)}" + " ${String.format(getString(DesignR.string.time_format), minutes, seconds)}" } override fun onFinish() { diff --git a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/TrueCallerAuthenticatorFragment.kt b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/TrueCallerAuthenticatorFragment.kt index a705a1ddb4..a475b49127 100644 --- a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/TrueCallerAuthenticatorFragment.kt +++ b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/TrueCallerAuthenticatorFragment.kt @@ -7,6 +7,7 @@ package com.navi.pl.dynamic.fragment +import com.navi.design.R as DesignR import android.content.Context import android.content.IntentFilter import android.os.Bundle @@ -184,7 +185,7 @@ class TrueCallerAuthenticatorFragment : BaseFragment(), View.OnClickListener, Ba Constants.SECONDS_PER_MINUTE if (isAdded) binding.countdownTimerTv.text = - " ${String.format(getString(R.string.time_format), minutes, seconds)}" + " ${String.format(getString(DesignR.string.time_format), minutes, seconds)}" } override fun onFinish() { diff --git a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/WorkV2Fragment.kt b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/WorkV2Fragment.kt index ef01539421..f4806b979a 100644 --- a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/WorkV2Fragment.kt +++ b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/fragment/WorkV2Fragment.kt @@ -7,6 +7,7 @@ package com.navi.pl.dynamic.fragment +import com.navi.naviwidgets.R as WidgetsR import android.content.Context import android.os.Build import android.os.Bundle @@ -675,7 +676,7 @@ class WorkV2Fragment : BaseFragment(), FooterViewV2.FooterInteractionListener { text, R.style.NaviSansSemiBoldExtraSmall, R.color.error_red, - R.drawable.ic_line_error_svg, + WidgetsR.drawable.ic_line_error_svg, R.drawable.bg_error_red_border_rounded_8, ) } diff --git a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/helper/KycAddressV2Helper.kt b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/helper/KycAddressV2Helper.kt index ffff9cc963..7253e0d23d 100644 --- a/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/helper/KycAddressV2Helper.kt +++ b/navi_pl_dynamic/src/main/java/com/navi/pl/dynamic/helper/KycAddressV2Helper.kt @@ -62,7 +62,7 @@ object KycAddressV2Helper { return LabeledTextInputWidgetModelV2( widgetData = TextInputWidgetData( inputTextData = InputTextWidgetMeta( - hint = context.getString(R.string.ex_650087), + hint = context.getString(com.navi.amc.R.string.ex_650087), inputType = TextInputUtil.INPUT_TYPE_NUMBER, savedText = name )