diff --git a/android/app/build.gradle b/android/app/build.gradle index ba20603401..871ac2ac04 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -24,7 +24,7 @@ android { defaultConfig { applicationId "com.naviapp" - minSdk 23 + minSdk 24 targetSdk 34 versionCode VERSION_CODE versionName VERSION_NAME diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index fa5bdac6b4..a9bd08dc95 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -2,7 +2,7 @@ @@ -10,17 +10,12 @@ - - - + + tools:ignore="MissingApplicationIcon" + tools:replace="android:name,android:usesCleartextTraffic" /> - \ No newline at end of file + diff --git a/android/app/src/debug/java/hyperion/HyperionApplication.kt b/android/app/src/debug/java/hyperion/HyperionApplication.kt index e5f2641c27..e6834a667c 100644 --- a/android/app/src/debug/java/hyperion/HyperionApplication.kt +++ b/android/app/src/debug/java/hyperion/HyperionApplication.kt @@ -26,7 +26,7 @@ class HyperionApplication : NaviApplication() { intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) startActivity(intent) } - .image(R.drawable.ic_navi_logo) + .image(R.drawable.app_ic_navi_logo) .build() ) } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index e91f41cfb0..2351aaf6cf 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -2,7 +2,7 @@ @@ -30,19 +30,14 @@ - - - - + + + + android:exported="false" + android:screenOrientation="portrait" /> + android:theme="@style/BaseThemeStyle" + android:windowSoftInputMode="adjustResize" /> + android:theme="@style/TranslucentDisplay" /> + tools:ignore="LockedOrientationActivity"> @@ -340,6 +339,7 @@ com.th3rdwave.safeareacontext, com.horcrux.svg, org.reactnative.maskedview, com. + - + + @@ -411,6 +410,7 @@ com.th3rdwave.safeareacontext, com.horcrux.svg, org.reactnative.maskedview, com. + @@ -435,6 +435,6 @@ com.th3rdwave.safeareacontext, com.horcrux.svg, org.reactnative.maskedview, com. + android:value="ca-app-pub-3741839945842082~4098575184" /> \ No newline at end of file diff --git a/android/app/src/main/java/com/naviapp/appupdate/activities/UpdateAppActivity.kt b/android/app/src/main/java/com/naviapp/appupdate/activities/UpdateAppActivity.kt index 30639439d5..1cc3bc587c 100644 --- a/android/app/src/main/java/com/naviapp/appupdate/activities/UpdateAppActivity.kt +++ b/android/app/src/main/java/com/naviapp/appupdate/activities/UpdateAppActivity.kt @@ -29,16 +29,16 @@ import com.navi.design.R as DesignR import com.navi.design.font.FontWeightEnum import com.navi.naviwidgets.R as WidgetsR import com.naviapp.R -import com.naviapp.databinding.ActivityUpdateAppBinding +import com.naviapp.databinding.AppActivityUpdateAppBinding class UpdateAppActivity : BaseActivity(), View.OnClickListener { - private lateinit var binding: ActivityUpdateAppBinding + private lateinit var binding: AppActivityUpdateAppBinding private lateinit var appUpdateManager: AppUpdateManager override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - binding = DataBindingUtil.setContentView(this, R.layout.activity_update_app) + binding = DataBindingUtil.setContentView(this, R.layout.app_activity_update_app) super.setContentView(binding.root) initListeners() initUi() @@ -59,7 +59,7 @@ class UpdateAppActivity : BaseActivity(), View.OnClickListener { } } - private fun ActivityUpdateAppBinding.updatePrimaryAbv() { + private fun AppActivityUpdateAppBinding.updatePrimaryAbv() { primaryAbv.apply { setButtonHeight(height = resources.getDimension(R.dimen.layout_dp_48)) setProperties( @@ -76,7 +76,7 @@ class UpdateAppActivity : BaseActivity(), View.OnClickListener { } } - private fun ActivityUpdateAppBinding.updateDescription() { + private fun AppActivityUpdateAppBinding.updateDescription() { descriptionTv.apply { setText( getAppUpgradeDataFromIntent()?.description @@ -85,7 +85,7 @@ class UpdateAppActivity : BaseActivity(), View.OnClickListener { } } - private fun ActivityUpdateAppBinding.updateTitle() { + private fun AppActivityUpdateAppBinding.updateTitle() { titleTv.apply { setText( getAppUpgradeDataFromIntent()?.title ?: resources.getString(R.string.update_now) diff --git a/android/app/src/main/java/com/naviapp/common/customview/LabelWithSpinnerView.kt b/android/app/src/main/java/com/naviapp/common/customview/LabelWithSpinnerView.kt index a61500c58e..9d07b6875f 100644 --- a/android/app/src/main/java/com/naviapp/common/customview/LabelWithSpinnerView.kt +++ b/android/app/src/main/java/com/naviapp/common/customview/LabelWithSpinnerView.kt @@ -71,13 +71,13 @@ class LabelWithSpinnerView(context: Context, attrs: AttributeSet? = null) : val spinnerAdapter = HintAdapter( context, - R.layout.spinner_text_view, + R.layout.app_spinner_text_view, spinnerOptionList .map { it.value } .toMutableList() .apply { add(resources.getString(R.string.select)) } ) - spinnerAdapter.setDropDownViewResource(R.layout.spinner_drop_down_view_transparent) + spinnerAdapter.setDropDownViewResource(R.layout.app_spinner_drop_down_view_transparent) binding.spinner.adapter = spinnerAdapter binding.spinner.setSelection(spinnerAdapter.count, true) } diff --git a/android/app/src/main/java/com/naviapp/common/tab/insurance/ui/TrialInsuranceDashboardFragment.kt b/android/app/src/main/java/com/naviapp/common/tab/insurance/ui/TrialInsuranceDashboardFragment.kt index 960d39d923..ab01dcea96 100644 --- a/android/app/src/main/java/com/naviapp/common/tab/insurance/ui/TrialInsuranceDashboardFragment.kt +++ b/android/app/src/main/java/com/naviapp/common/tab/insurance/ui/TrialInsuranceDashboardFragment.kt @@ -82,7 +82,7 @@ class TrialInsuranceDashboardFragment(private val lazyListState: () -> LazyListS val layout = ShimmerFrameLayout(requireContext()) layout.addView( LayoutInflater.from(requireContext()) - .inflate(R.layout.shimmer_tab_layout, layout, false) + .inflate(R.layout.navi_insurance_shimmer_tab_layout, layout, false) ) AndroidView(modifier = Modifier.fillMaxSize().background(Color.White), factory = { layout }) } diff --git a/android/app/src/main/java/com/naviapp/crosssell/ui/CrossSellActivity.kt b/android/app/src/main/java/com/naviapp/crosssell/ui/CrossSellActivity.kt index baefc3c794..daaa83f941 100644 --- a/android/app/src/main/java/com/naviapp/crosssell/ui/CrossSellActivity.kt +++ b/android/app/src/main/java/com/naviapp/crosssell/ui/CrossSellActivity.kt @@ -82,7 +82,7 @@ class CrossSellActivity : BaseActivity(), WidgetCallback, FeedbackEventListener playStoreInAppRatingHelper = PlayStoreInAppRatingHelper(this, source = PL_EVENT_NAME) } initUI() - overridePendingTransition(R.anim.activity_bottom_to_top_slide, R.anim.nothing) + overridePendingTransition(R.anim.activity_bottom_to_top_slide, R.anim.app_nothing) initObserver() initError( viewModel = crossSellVM, diff --git a/android/app/src/main/java/com/naviapp/home/compose/home/ui/header/HomeTopBar.kt b/android/app/src/main/java/com/naviapp/home/compose/home/ui/header/HomeTopBar.kt index ac42191019..38e8ca7ae8 100644 --- a/android/app/src/main/java/com/naviapp/home/compose/home/ui/header/HomeTopBar.kt +++ b/android/app/src/main/java/com/naviapp/home/compose/home/ui/header/HomeTopBar.kt @@ -71,12 +71,12 @@ fun DefaultTopBar() { ) { Image( modifier = Modifier.size(40.dp), - painter = painterResource(id = R.drawable.ic_profile), + painter = painterResource(id = R.drawable.app_ic_profile), contentDescription = "Profile Icon" ) Image( modifier = Modifier.size(40.dp), - painter = painterResource(id = WidgetR.drawable.ic_notification), + painter = painterResource(id = WidgetR.drawable.navi_widgets_ic_notification), contentDescription = "Notifications Icon" ) } diff --git a/android/app/src/main/java/com/naviapp/home/dashboard/ui/compose/insuranceTab/InsuranceTabComposables.kt b/android/app/src/main/java/com/naviapp/home/dashboard/ui/compose/insuranceTab/InsuranceTabComposables.kt index 2dcd4f8b32..e426d74108 100644 --- a/android/app/src/main/java/com/naviapp/home/dashboard/ui/compose/insuranceTab/InsuranceTabComposables.kt +++ b/android/app/src/main/java/com/naviapp/home/dashboard/ui/compose/insuranceTab/InsuranceTabComposables.kt @@ -264,6 +264,9 @@ fun ContentComposable( fun ShowShimmer() { val context = LocalContext.current val layout = ShimmerFrameLayout(context) - layout.addView(LayoutInflater.from(context).inflate(R.layout.shimmer_tab_layout, layout, false)) + layout.addView( + LayoutInflater.from(context) + .inflate(R.layout.navi_insurance_shimmer_tab_layout, layout, false) + ) AndroidView(modifier = Modifier.fillMaxSize().background(Color.White), factory = { layout }) } diff --git a/android/app/src/main/java/com/naviapp/home/ui/NotificationBottomSheet.kt b/android/app/src/main/java/com/naviapp/home/ui/NotificationBottomSheet.kt index afbaf6ce62..5cc557035a 100644 --- a/android/app/src/main/java/com/naviapp/home/ui/NotificationBottomSheet.kt +++ b/android/app/src/main/java/com/naviapp/home/ui/NotificationBottomSheet.kt @@ -68,7 +68,7 @@ fun NotificationBottomSheet( .allowHardware(false) .build(), contentDescription = null, - error = painterResource(id = R.drawable.ic_navi_logo) + error = painterResource(id = R.drawable.app_ic_navi_logo) ) Spacer(modifier = Modifier.width(12.dp)) Text( diff --git a/android/app/src/main/java/com/naviapp/home/ui/NotificationScreenRenderer.kt b/android/app/src/main/java/com/naviapp/home/ui/NotificationScreenRenderer.kt index 48417a90ef..1af3af625e 100644 --- a/android/app/src/main/java/com/naviapp/home/ui/NotificationScreenRenderer.kt +++ b/android/app/src/main/java/com/naviapp/home/ui/NotificationScreenRenderer.kt @@ -356,7 +356,7 @@ fun NotificationRenderer( .allowHardware(false) .build(), contentDescription = null, - error = painterResource(id = R.drawable.ic_navi_logo) + error = painterResource(id = R.drawable.app_ic_navi_logo) ) if ( notificationData.status == NotificationStatus.READ.name || diff --git a/android/app/src/main/java/com/naviapp/payment/activities/NaviPaymentActivity.kt b/android/app/src/main/java/com/naviapp/payment/activities/NaviPaymentActivity.kt index 9aa01e60f7..39e21f738d 100644 --- a/android/app/src/main/java/com/naviapp/payment/activities/NaviPaymentActivity.kt +++ b/android/app/src/main/java/com/naviapp/payment/activities/NaviPaymentActivity.kt @@ -163,10 +163,10 @@ class NaviPaymentActivity : DashboardBaseActivity(), FragmentInteractionListener private fun FragmentTransaction.addAnimations(screen: String) { if (screen == CUSTOM_PAYMENT_PAGE) setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.app_slide_in_right, + R.anim.app_slide_out_left, + R.anim.app_slide_in_left, + R.anim.app_slide_out_right ) } diff --git a/android/app/src/main/java/com/naviapp/payment/fragments/PaymentFragment.kt b/android/app/src/main/java/com/naviapp/payment/fragments/PaymentFragment.kt index a5de464e3c..3f7a62a48e 100644 --- a/android/app/src/main/java/com/naviapp/payment/fragments/PaymentFragment.kt +++ b/android/app/src/main/java/com/naviapp/payment/fragments/PaymentFragment.kt @@ -137,7 +137,7 @@ class PaymentFragment : PaymentBaseFragment() { binding.goCustomPayTv.setTextSize(16) binding.goCustomPayTv.setViewBg( bgDrawable = - context?.let { ContextCompat.getDrawable(it, R.drawable.bg_grey_rounded_8) } + context?.let { ContextCompat.getDrawable(it, R.drawable.app_bg_grey_rounded_8) } ) binding.goCustomPayTv.setCardBackgroundColor(R.color.white) binding.goCustomPayTv.addOnMultipleClicksHandler { handleCustomAndPartPrePaymentClick() } diff --git a/android/app/src/main/java/com/naviapp/permission/utils/PermissionUtil.kt b/android/app/src/main/java/com/naviapp/permission/utils/PermissionUtil.kt index 9a9a2e9942..30d9230451 100644 --- a/android/app/src/main/java/com/naviapp/permission/utils/PermissionUtil.kt +++ b/android/app/src/main/java/com/naviapp/permission/utils/PermissionUtil.kt @@ -79,7 +79,7 @@ fun getAlternatePermissionTilesV2(): List { PermissionTile( ResourcesCompat.getDrawable( application.resources, - R.drawable.ic_contact_permission, + R.drawable.app_ic_contact_permission, null ), application.getString(R.string.contacts), diff --git a/android/app/src/main/java/com/naviapp/registration/RegistrationActivity.kt b/android/app/src/main/java/com/naviapp/registration/RegistrationActivity.kt index f94f2390c5..60325d1437 100644 --- a/android/app/src/main/java/com/naviapp/registration/RegistrationActivity.kt +++ b/android/app/src/main/java/com/naviapp/registration/RegistrationActivity.kt @@ -10,7 +10,6 @@ package com.naviapp.registration import android.content.ActivityNotFoundException import android.content.Intent import android.content.IntentFilter -import android.os.Build import android.os.Bundle import android.view.View import android.view.ViewTreeObserver @@ -45,7 +44,6 @@ import com.navi.common.utils.Constants.LOGIN_SOURCE import com.navi.common.utils.Constants.ScreenLockConstants.LOGIN_SESSION_ID import com.navi.common.utils.FirebaseAuthHelper import com.navi.common.utils.TemporaryStorageHelper -import com.navi.common.utils.getOsVersion import com.navi.common.utils.getScreenRefreshRate import com.navi.common.utils.getSessionId import com.navi.common.utils.log @@ -184,10 +182,6 @@ class RegistrationActivity : private fun initTrueCaller() { if (PreferenceManager.getBooleanPreference(key = TRUECALLER_ENABLED, defValue = false)) { - if (getOsVersion() < Build.VERSION_CODES.N) { - registrationSharedVM.setLoginViaMobile(true) - return - } val stateRequested = getUniqueRandomNumber() codeVerifier = CodeVerifierUtil.generateRandomCodeVerifier() FcmAnalyticsUtil.analytics.setCrashlyticRandomRequestId(stateRequested) @@ -327,9 +321,10 @@ class RegistrationActivity : } private fun FragmentTransaction.addAnimations(screen: String, bundle: Bundle?) { - if (screen == OTP_SCREEN) setCustomAnimations(R.anim.slide_in_right, R.anim.slide_out_left) + if (screen == OTP_SCREEN) + setCustomAnimations(R.anim.app_slide_in_right, R.anim.app_slide_out_left) else if ((screen == LOGIN_SCREEN) && bundle != null) - setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_right) + setCustomAnimations(R.anim.app_slide_in_left, R.anim.app_slide_out_right) } override fun onActivityCompleted(screen: String?, bundle: Bundle?) {} diff --git a/android/app/src/main/java/com/naviapp/utils/IconUtils.kt b/android/app/src/main/java/com/naviapp/utils/IconUtils.kt index ca4f92f5bf..2a75ed3e3f 100644 --- a/android/app/src/main/java/com/naviapp/utils/IconUtils.kt +++ b/android/app/src/main/java/com/naviapp/utils/IconUtils.kt @@ -456,16 +456,16 @@ object IconUtils { ICON_PHONE_CALL -> R.drawable.ic_grey_call ICON_DOWNLOAD_SL -> R.drawable.download_icon ICON_INFO_RED -> R.drawable.icon_info_red - ICON_TICK_WHITE -> R.drawable.ic_tick_white + ICON_TICK_WHITE -> R.drawable.app_ic_tick_white RED_PLUS_ICON -> R.drawable.red_plus_icon GREY_PLUS_ICON -> R.drawable.ic_grey_plus_icon_svg RED_RIGHT_ARROW_ICON -> R.drawable.ic_red_right_arrow_svg ICON_ALERT_YELLOW_BORDERED -> R.drawable.ic_alert_yellow_bordered ICON_DOWNLOAD_WHITE -> R.drawable.ic_download_white - INFO_YELLOW -> R.drawable.ic_info_yellow + INFO_YELLOW -> R.drawable.app_ic_info_yellow ICON_INFO_GREY -> R.drawable.ic_info_grey_svg ICON_UP_RED -> R.drawable.ic_up_arrow_red - ICON_DOWN_RED -> R.drawable.ic_down_arrow_red + ICON_DOWN_RED -> R.drawable.app_ic_down_arrow_red ICON_FLASH_RED -> R.drawable.ic_flash_red ICON_FLASH_WHITE -> R.drawable.ic_flash_white ICON_OFFER_LEFT -> WidgetsR.drawable.ic_offer_left_icon @@ -514,7 +514,7 @@ object IconUtils { ICON_EMP_BANK -> R.drawable.ic_employee_bank ICON_EMP_VERIFY -> R.drawable.ic_verify ICON_MESSAGE_PERMISSION -> CommonR.drawable.ic_message_permission - ICON_CONTACTS_PERMISSION -> R.drawable.ic_contact_permission + ICON_CONTACTS_PERMISSION -> R.drawable.app_ic_contact_permission ICON_LOCATION_PERMISSION -> R.drawable.ic_location_permission ICON_DEVICE_PERMISSION -> R.drawable.ic_phone ICON_ALERT_GREEN -> WidgetsR.drawable.ic_line_success_svg @@ -566,7 +566,7 @@ object IconUtils { ICON_BANK_ACCOUNT -> R.drawable.ic_auto_pay_bank ICON_LATE_FEE -> R.drawable.ic_late_fee ICON_CREDIT_SCORE -> R.drawable.ic_credit_score - ICON_PAYMENTS -> R.drawable.ic_money_bag + ICON_PAYMENTS -> R.drawable.app_ic_money_bag ICON_EMI_PAYMENT -> R.drawable.ic_emi_payment WHITE_CELEBRATION_ICON -> R.drawable.ic_white_celebration IC_TICK_SMALL -> R.drawable.ic_tick_small @@ -607,7 +607,7 @@ object IconUtils { 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 + YELLOW_ALERT_ICON -> R.drawable.app_ic_yellow_alert ICON_CLOCK_WHITE_BG -> R.drawable.ic_clock_white_bg DOWN_ARROW_PURPLE -> R.drawable.ic_down_arrow_black else -> -1 diff --git a/android/app/src/main/res/anim/nothing.xml b/android/app/src/main/res/anim/app_nothing.xml similarity index 100% rename from android/app/src/main/res/anim/nothing.xml rename to android/app/src/main/res/anim/app_nothing.xml diff --git a/android/app/src/main/res/anim/slide_in_left.xml b/android/app/src/main/res/anim/app_slide_in_left.xml similarity index 100% rename from android/app/src/main/res/anim/slide_in_left.xml rename to android/app/src/main/res/anim/app_slide_in_left.xml diff --git a/android/app/src/main/res/anim/slide_in_right.xml b/android/app/src/main/res/anim/app_slide_in_right.xml similarity index 100% rename from android/app/src/main/res/anim/slide_in_right.xml rename to android/app/src/main/res/anim/app_slide_in_right.xml diff --git a/android/app/src/main/res/anim/slide_out_left.xml b/android/app/src/main/res/anim/app_slide_out_left.xml similarity index 100% rename from android/app/src/main/res/anim/slide_out_left.xml rename to android/app/src/main/res/anim/app_slide_out_left.xml diff --git a/android/app/src/main/res/anim/slide_out_right.xml b/android/app/src/main/res/anim/app_slide_out_right.xml similarity index 100% rename from android/app/src/main/res/anim/slide_out_right.xml rename to android/app/src/main/res/anim/app_slide_out_right.xml diff --git a/android/app/src/main/res/drawable/bg_back_red_variant_rounded_8.xml b/android/app/src/main/res/drawable/app_bg_back_red_variant_rounded_8.xml similarity index 100% rename from android/app/src/main/res/drawable/bg_back_red_variant_rounded_8.xml rename to android/app/src/main/res/drawable/app_bg_back_red_variant_rounded_8.xml diff --git a/android/app/src/main/res/drawable/bg_background_six_rounded_24.xml b/android/app/src/main/res/drawable/app_bg_background_six_rounded_24.xml similarity index 100% rename from android/app/src/main/res/drawable/bg_background_six_rounded_24.xml rename to android/app/src/main/res/drawable/app_bg_background_six_rounded_24.xml diff --git a/android/app/src/main/res/drawable/bg_dark_grey_4dp_radius.xml b/android/app/src/main/res/drawable/app_bg_dark_grey_4dp_radius.xml similarity index 100% rename from android/app/src/main/res/drawable/bg_dark_grey_4dp_radius.xml rename to android/app/src/main/res/drawable/app_bg_dark_grey_4dp_radius.xml diff --git a/android/app/src/main/res/drawable/bg_grey_4dp_radius.xml b/android/app/src/main/res/drawable/app_bg_grey_4dp_radius.xml similarity index 100% rename from android/app/src/main/res/drawable/bg_grey_4dp_radius.xml rename to android/app/src/main/res/drawable/app_bg_grey_4dp_radius.xml diff --git a/android/app/src/main/res/drawable/bg_grey_rounded_12.xml b/android/app/src/main/res/drawable/app_bg_grey_rounded_12.xml similarity index 100% rename from android/app/src/main/res/drawable/bg_grey_rounded_12.xml rename to android/app/src/main/res/drawable/app_bg_grey_rounded_12.xml diff --git a/android/app/src/main/res/drawable/bg_grey_rounded_8.xml b/android/app/src/main/res/drawable/app_bg_grey_rounded_8.xml similarity index 100% rename from android/app/src/main/res/drawable/bg_grey_rounded_8.xml rename to android/app/src/main/res/drawable/app_bg_grey_rounded_8.xml diff --git a/android/app/src/main/res/drawable/bg_light_grey_rounded_4.xml b/android/app/src/main/res/drawable/app_bg_light_grey_rounded_4.xml similarity index 100% rename from android/app/src/main/res/drawable/bg_light_grey_rounded_4.xml rename to android/app/src/main/res/drawable/app_bg_light_grey_rounded_4.xml diff --git a/android/app/src/main/res/drawable/bg_note_bottom_corner_8.xml b/android/app/src/main/res/drawable/app_bg_note_bottom_corner_8.xml similarity index 100% rename from android/app/src/main/res/drawable/bg_note_bottom_corner_8.xml rename to android/app/src/main/res/drawable/app_bg_note_bottom_corner_8.xml diff --git a/android/app/src/main/res/drawable/bg_rounded_rect_black_10.xml b/android/app/src/main/res/drawable/app_bg_rounded_rect_black_10.xml similarity index 100% rename from android/app/src/main/res/drawable/bg_rounded_rect_black_10.xml rename to android/app/src/main/res/drawable/app_bg_rounded_rect_black_10.xml diff --git a/android/app/src/main/res/drawable/bg_white_rounded_16.xml b/android/app/src/main/res/drawable/app_bg_white_rounded_16.xml similarity index 100% rename from android/app/src/main/res/drawable/bg_white_rounded_16.xml rename to android/app/src/main/res/drawable/app_bg_white_rounded_16.xml diff --git a/android/app/src/main/res/drawable/bg_white_rounded_24.xml b/android/app/src/main/res/drawable/app_bg_white_rounded_24.xml similarity index 100% rename from android/app/src/main/res/drawable/bg_white_rounded_24.xml rename to android/app/src/main/res/drawable/app_bg_white_rounded_24.xml diff --git a/android/app/src/main/res/drawable/bg_white_rounded_8.xml b/android/app/src/main/res/drawable/app_bg_white_rounded_8.xml similarity index 100% rename from android/app/src/main/res/drawable/bg_white_rounded_8.xml rename to android/app/src/main/res/drawable/app_bg_white_rounded_8.xml diff --git a/android/app/src/main/res/drawable/bottom_sheet_background.xml b/android/app/src/main/res/drawable/app_bottom_sheet_background.xml similarity index 100% rename from android/app/src/main/res/drawable/bottom_sheet_background.xml rename to android/app/src/main/res/drawable/app_bottom_sheet_background.xml diff --git a/android/app/src/main/res/drawable/dialog_box_background.xml b/android/app/src/main/res/drawable/app_dialog_box_background.xml similarity index 100% rename from android/app/src/main/res/drawable/dialog_box_background.xml rename to android/app/src/main/res/drawable/app_dialog_box_background.xml diff --git a/android/app/src/main/res/drawable/dotted_line_gap_2_rounded.xml b/android/app/src/main/res/drawable/app_dotted_line_gap_2_rounded.xml similarity index 100% rename from android/app/src/main/res/drawable/dotted_line_gap_2_rounded.xml rename to android/app/src/main/res/drawable/app_dotted_line_gap_2_rounded.xml diff --git a/android/app/src/main/res/drawable/dotted_line_gap_2_rounded_horizontal.xml b/android/app/src/main/res/drawable/app_dotted_line_gap_2_rounded_horizontal.xml similarity index 100% rename from android/app/src/main/res/drawable/dotted_line_gap_2_rounded_horizontal.xml rename to android/app/src/main/res/drawable/app_dotted_line_gap_2_rounded_horizontal.xml diff --git a/android/app/src/main/res/drawable/finserv_logo_purple.xml b/android/app/src/main/res/drawable/app_finserv_logo_purple.xml similarity index 100% rename from android/app/src/main/res/drawable/finserv_logo_purple.xml rename to android/app/src/main/res/drawable/app_finserv_logo_purple.xml diff --git a/android/app/src/main/res/drawable/ic_close_grey_svg.xml b/android/app/src/main/res/drawable/app_ic_close_grey_svg.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_close_grey_svg.xml rename to android/app/src/main/res/drawable/app_ic_close_grey_svg.xml diff --git a/android/app/src/main/res/drawable/ic_contact_permission.xml b/android/app/src/main/res/drawable/app_ic_contact_permission.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_contact_permission.xml rename to android/app/src/main/res/drawable/app_ic_contact_permission.xml diff --git a/android/app/src/main/res/drawable/ic_dotted_grey_dashgap_10.xml b/android/app/src/main/res/drawable/app_ic_dotted_grey_dashgap_10.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_dotted_grey_dashgap_10.xml rename to android/app/src/main/res/drawable/app_ic_dotted_grey_dashgap_10.xml diff --git a/android/app/src/main/res/drawable/ic_down_arrow_red.xml b/android/app/src/main/res/drawable/app_ic_down_arrow_red.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_down_arrow_red.xml rename to android/app/src/main/res/drawable/app_ic_down_arrow_red.xml diff --git a/android/app/src/main/res/drawable/ic_info_yellow.xml b/android/app/src/main/res/drawable/app_ic_info_yellow.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_info_yellow.xml rename to android/app/src/main/res/drawable/app_ic_info_yellow.xml diff --git a/android/app/src/main/res/drawable/ic_money_bag.xml b/android/app/src/main/res/drawable/app_ic_money_bag.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_money_bag.xml rename to android/app/src/main/res/drawable/app_ic_money_bag.xml diff --git a/android/app/src/main/res/drawable/ic_navi_logo.xml b/android/app/src/main/res/drawable/app_ic_navi_logo.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_navi_logo.xml rename to android/app/src/main/res/drawable/app_ic_navi_logo.xml diff --git a/android/app/src/main/res/drawable/ic_pan_vkyc.xml b/android/app/src/main/res/drawable/app_ic_pan_vkyc.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_pan_vkyc.xml rename to android/app/src/main/res/drawable/app_ic_pan_vkyc.xml diff --git a/android/app/src/main/res/drawable/ic_profile.xml b/android/app/src/main/res/drawable/app_ic_profile.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_profile.xml rename to android/app/src/main/res/drawable/app_ic_profile.xml diff --git a/android/app/src/main/res/drawable/ic_tick_green.xml b/android/app/src/main/res/drawable/app_ic_tick_green.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_tick_green.xml rename to android/app/src/main/res/drawable/app_ic_tick_green.xml diff --git a/android/app/src/main/res/drawable/ic_tick_white.xml b/android/app/src/main/res/drawable/app_ic_tick_white.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_tick_white.xml rename to android/app/src/main/res/drawable/app_ic_tick_white.xml diff --git a/android/app/src/main/res/drawable/ic_yellow_alert.xml b/android/app/src/main/res/drawable/app_ic_yellow_alert.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_yellow_alert.xml rename to android/app/src/main/res/drawable/app_ic_yellow_alert.xml diff --git a/android/app/src/main/res/drawable/spinner_background.xml b/android/app/src/main/res/drawable/app_spinner_background.xml similarity index 100% rename from android/app/src/main/res/drawable/spinner_background.xml rename to android/app/src/main/res/drawable/app_spinner_background.xml diff --git a/android/app/src/main/res/drawable/tab_selector.xml b/android/app/src/main/res/drawable/app_tab_selector.xml similarity index 100% rename from android/app/src/main/res/drawable/tab_selector.xml rename to android/app/src/main/res/drawable/app_tab_selector.xml diff --git a/android/app/src/main/res/layout/activity_loan_agreement_v2_shimmer.xml b/android/app/src/main/res/layout/activity_loan_agreement_v2_shimmer.xml index 42884e8fee..c111468074 100644 --- a/android/app/src/main/res/layout/activity_loan_agreement_v2_shimmer.xml +++ b/android/app/src/main/res/layout/activity_loan_agreement_v2_shimmer.xml @@ -19,7 +19,7 @@ android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginTop="@dimen/layout_dp_48" android:layout_marginEnd="@dimen/layout_dp_16" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -28,7 +28,7 @@ android:layout_width="@dimen/layout_dp_150" android:layout_height="@dimen/layout_dp_20" android:layout_marginTop="@dimen/layout_dp_48" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -39,7 +39,7 @@ android:layout_height="@dimen/layout_dp_24" android:layout_marginTop="@dimen/layout_dp_48" android:layout_marginEnd="@dimen/layout_dp_16" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -51,7 +51,7 @@ android:layout_marginTop="@dimen/layout_dp_78" android:layout_marginEnd="@dimen/layout_dp_16" android:layout_marginBottom="@dimen/_24dp" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/back" app:layout_constraintBottom_toTopOf="@id/footerButton"/> @@ -63,7 +63,7 @@ android:layout_marginHorizontal="@dimen/_16dp" android:layout_marginTop="@dimen/layout_dp_42" android:layout_marginBottom="@dimen/layout_dp_32" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/android/app/src/main/res/layout/activity_update_app.xml b/android/app/src/main/res/layout/app_activity_update_app.xml similarity index 97% rename from android/app/src/main/res/layout/activity_update_app.xml rename to android/app/src/main/res/layout/app_activity_update_app.xml index 858bb0f68b..74bf98a85d 100644 --- a/android/app/src/main/res/layout/activity_update_app.xml +++ b/android/app/src/main/res/layout/app_activity_update_app.xml @@ -28,7 +28,7 @@ android:layout_width="@dimen/layout_dp_60" android:layout_height="wrap_content" android:adjustViewBounds="true" - android:src="@drawable/ic_navi_logo" + android:src="@drawable/app_ic_navi_logo" tools:ignore="ContentDescription" /> @@ -24,7 +24,7 @@ android:layout_height="@dimen/dp_24" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_76" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -33,7 +33,7 @@ android:layout_height="@dimen/dp_24" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_130" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -42,7 +42,7 @@ android:layout_height="@dimen/dp_24" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_186" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -51,7 +51,7 @@ android:layout_height="@dimen/dp_16" android:layout_marginTop="@dimen/dp_78" android:layout_marginEnd="@dimen/dp_20" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -60,7 +60,7 @@ android:layout_height="@dimen/dp_16" android:layout_marginTop="@dimen/dp_134" android:layout_marginEnd="@dimen/dp_20" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -69,7 +69,7 @@ android:layout_height="@dimen/dp_16" android:layout_marginTop="@dimen/dp_190" android:layout_marginEnd="@dimen/dp_20" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -78,7 +78,7 @@ android:layout_height="@dimen/dp_16" android:layout_marginStart="@dimen/dp_54" android:layout_marginTop="@dimen/dp_78" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -87,7 +87,7 @@ android:layout_height="@dimen/dp_16" android:layout_marginStart="@dimen/dp_54" android:layout_marginTop="@dimen/dp_134" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -96,7 +96,7 @@ android:layout_height="@dimen/dp_16" android:layout_marginStart="@dimen/dp_54" android:layout_marginTop="@dimen/dp_190" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/android/app/src/main/res/layout/shimmer_tab_layout.xml b/android/app/src/main/res/layout/app_shimmer_tab_layout.xml similarity index 100% rename from android/app/src/main/res/layout/shimmer_tab_layout.xml rename to android/app/src/main/res/layout/app_shimmer_tab_layout.xml diff --git a/android/app/src/main/res/layout/spinner_drop_down_view_transparent.xml b/android/app/src/main/res/layout/app_spinner_drop_down_view_transparent.xml similarity index 100% rename from android/app/src/main/res/layout/spinner_drop_down_view_transparent.xml rename to android/app/src/main/res/layout/app_spinner_drop_down_view_transparent.xml diff --git a/android/app/src/main/res/layout/spinner_text_view.xml b/android/app/src/main/res/layout/app_spinner_text_view.xml similarity index 100% rename from android/app/src/main/res/layout/spinner_text_view.xml rename to android/app/src/main/res/layout/app_spinner_text_view.xml diff --git a/android/app/src/main/res/layout/bank_account_verification_loader_activity.xml b/android/app/src/main/res/layout/bank_account_verification_loader_activity.xml index 74990de427..8d0fe86a11 100644 --- a/android/app/src/main/res/layout/bank_account_verification_loader_activity.xml +++ b/android/app/src/main/res/layout/bank_account_verification_loader_activity.xml @@ -19,7 +19,7 @@ android:id="@+id/logo_iv" android:layout_width="@dimen/form_header_logo_size" android:layout_height="@dimen/form_header_logo_size" - android:src="@drawable/ic_navi_logo" + android:src="@drawable/app_ic_navi_logo" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/android/app/src/main/res/layout/bank_details_fragment.xml b/android/app/src/main/res/layout/bank_details_fragment.xml index bbf718c33a..e738833104 100644 --- a/android/app/src/main/res/layout/bank_details_fragment.xml +++ b/android/app/src/main/res/layout/bank_details_fragment.xml @@ -127,7 +127,7 @@ android:id="@+id/logo_iv" android:layout_width="@dimen/form_header_logo_size" android:layout_height="@dimen/form_header_logo_size" - android:src="@drawable/ic_navi_logo" + android:src="@drawable/app_ic_navi_logo" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/android/app/src/main/res/layout/base_dialog_box.xml b/android/app/src/main/res/layout/base_dialog_box.xml index 25d1e87f11..80390e7836 100644 --- a/android/app/src/main/res/layout/base_dialog_box.xml +++ b/android/app/src/main/res/layout/base_dialog_box.xml @@ -18,7 +18,7 @@ android:id="@+id/container_fl" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/dialog_box_background" + android:background="@drawable/app_dialog_box_background" tools:ignore="UselessParent"> diff --git a/android/app/src/main/res/layout/credit_score_item.xml b/android/app/src/main/res/layout/credit_score_item.xml index 0fc757f40e..b8d87ef4eb 100644 --- a/android/app/src/main/res/layout/credit_score_item.xml +++ b/android/app/src/main/res/layout/credit_score_item.xml @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/layout_dp_20" - android:background="@drawable/bg_white_rounded_16" + android:background="@drawable/app_bg_white_rounded_16" android:padding="@dimen/layout_dp_20"> + tools:src="@drawable/app_ic_tick_white" /> @@ -29,7 +29,7 @@ android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginTop="@dimen/layout_dp_24" android:layout_marginEnd="@dimen/layout_dp_16" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/viewTitle" /> @@ -40,7 +40,7 @@ android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginTop="@dimen/layout_dp_4" android:layout_marginEnd="@dimen/layout_dp_16" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/viewContent1" /> diff --git a/android/app/src/main/res/layout/dashboard_tabs_shimmer.xml b/android/app/src/main/res/layout/dashboard_tabs_shimmer.xml index bd5ba060a7..d582273777 100644 --- a/android/app/src/main/res/layout/dashboard_tabs_shimmer.xml +++ b/android/app/src/main/res/layout/dashboard_tabs_shimmer.xml @@ -19,7 +19,7 @@ android:layout_marginStart="@dimen/layout_dp_24" android:layout_marginTop="@dimen/layout_dp_42" android:layout_marginEnd="@dimen/layout_dp_12" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -30,7 +30,7 @@ android:layout_marginStart="@dimen/layout_dp_12" android:layout_marginTop="@dimen/layout_dp_42" android:layout_marginEnd="@dimen/layout_dp_12" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toEndOf="@id/viewTab1" app:layout_constraintTop_toTopOf="parent" /> @@ -40,7 +40,7 @@ android:layout_height="@dimen/layout_dp_14" android:layout_marginStart="@dimen/layout_dp_12" android:layout_marginTop="@dimen/layout_dp_42" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toEndOf="@id/viewTab2" app:layout_constraintTop_toTopOf="parent" /> diff --git a/android/app/src/main/res/layout/divider_title_subtitle_v2_view.xml b/android/app/src/main/res/layout/divider_title_subtitle_v2_view.xml index 896599881e..b4d1b1e0e1 100644 --- a/android/app/src/main/res/layout/divider_title_subtitle_v2_view.xml +++ b/android/app/src/main/res/layout/divider_title_subtitle_v2_view.xml @@ -43,7 +43,7 @@ android:layout_height="match_parent" android:layout_gravity="center" android:layout_weight="0.1" - android:background="@drawable/dotted_line_gap_2_rounded" /> + android:background="@drawable/app_dotted_line_gap_2_rounded" /> + android:background="@drawable/app_dotted_line_gap_2_rounded" /> + android:background="@drawable/app_dotted_line_gap_2_rounded" /> + android:background="@drawable/app_dotted_line_gap_2_rounded" /> + android:background="@drawable/app_dotted_line_gap_2_rounded" /> + android:background="@drawable/app_dotted_line_gap_2_rounded" /> + android:background="@drawable/app_bg_white_rounded_8"> diff --git a/android/app/src/main/res/layout/gst_item_layout.xml b/android/app/src/main/res/layout/gst_item_layout.xml index 7f770be1fc..fdcf2ec073 100644 --- a/android/app/src/main/res/layout/gst_item_layout.xml +++ b/android/app/src/main/res/layout/gst_item_layout.xml @@ -51,7 +51,7 @@ android:layout_height="@dimen/layout_dp_16" android:layout_marginEnd="@dimen/layout_dp_20" android:alpha="0.2" - android:src="@drawable/arrow_forward_black" + android:src="@drawable/navi_widgets_arrow_forward_black" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/android/app/src/main/res/layout/info_banner_view.xml b/android/app/src/main/res/layout/info_banner_view.xml index a1ad8480b5..0594999b0e 100644 --- a/android/app/src/main/res/layout/info_banner_view.xml +++ b/android/app/src/main/res/layout/info_banner_view.xml @@ -18,7 +18,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/layout_dp_28" - android:background="@drawable/bg_white_rounded_8" + android:background="@drawable/app_bg_white_rounded_8" android:paddingHorizontal="@dimen/layout_dp_16" android:paddingBottom="@dimen/layout_dp_24" app:layout_constraintTop_toTopOf="parent"> diff --git a/android/app/src/main/res/layout/info_message_view.xml b/android/app/src/main/res/layout/info_message_view.xml index e9c2ffb640..860fc5352f 100644 --- a/android/app/src/main/res/layout/info_message_view.xml +++ b/android/app/src/main/res/layout/info_message_view.xml @@ -12,7 +12,7 @@ android:id="@+id/layout_message" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/bg_grey_rounded_8" + android:background="@drawable/app_bg_grey_rounded_8" android:padding="@dimen/layout_dp_12" android:visibility="gone" tools:visibility="visible"> diff --git a/android/app/src/main/res/layout/item_footer_kyc_v2.xml b/android/app/src/main/res/layout/item_footer_kyc_v2.xml index ecd3a88d52..783575f8fd 100644 --- a/android/app/src/main/res/layout/item_footer_kyc_v2.xml +++ b/android/app/src/main/res/layout/item_footer_kyc_v2.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:visibility="@{itemFooter == null ? View.GONE : View.VISIBLE, default=gone}" app:setBackgroundTintColorString="@{itemFooter.hexColor}" - android:background="@drawable/bg_note_bottom_corner_8" + android:background="@drawable/app_bg_note_bottom_corner_8" android:paddingVertical="@dimen/_8dp"> + android:background="@drawable/app_dialog_box_background"> + android:background="@drawable/app_dialog_box_background"> diff --git a/android/app/src/main/res/layout/mandatory_permission_banner_layout.xml b/android/app/src/main/res/layout/mandatory_permission_banner_layout.xml index f1fef501d4..4815c0d336 100644 --- a/android/app/src/main/res/layout/mandatory_permission_banner_layout.xml +++ b/android/app/src/main/res/layout/mandatory_permission_banner_layout.xml @@ -14,7 +14,7 @@ + android:background="@drawable/app_bg_back_red_variant_rounded_8"> diff --git a/android/app/src/main/res/layout/offer_upgrade_card_v2_view.xml b/android/app/src/main/res/layout/offer_upgrade_card_v2_view.xml index 6050a5965b..2da256769e 100644 --- a/android/app/src/main/res/layout/offer_upgrade_card_v2_view.xml +++ b/android/app/src/main/res/layout/offer_upgrade_card_v2_view.xml @@ -87,7 +87,7 @@ android:layout_height="@dimen/layout_dp_24" android:layout_marginTop="@dimen/layout_dp_24" android:layout_marginEnd="@dimen/layout_dp_18" - android:background="@drawable/bg_white_rounded_24" + android:background="@drawable/app_bg_white_rounded_24" android:padding="@dimen/layout_dp_4" android:src="@drawable/ic_right_arrow_outrageous_orange" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/app/src/main/res/layout/offer_upgrade_card_view.xml b/android/app/src/main/res/layout/offer_upgrade_card_view.xml index 9050b3d708..de3e94a565 100644 --- a/android/app/src/main/res/layout/offer_upgrade_card_view.xml +++ b/android/app/src/main/res/layout/offer_upgrade_card_view.xml @@ -60,7 +60,7 @@ android:layout_width="@dimen/layout_dp_24" android:layout_height="@dimen/layout_dp_24" android:layout_marginStart="@dimen/layout_dp_16" - android:background="@drawable/bg_white_rounded_24" + android:background="@drawable/app_bg_white_rounded_24" android:padding="@dimen/layout_dp_4" android:src="@drawable/ic_right_arrow_outrageous_orange" android:visibility="@{offerBinder.description == null ? View.VISIBLE : View.GONE}" diff --git a/android/app/src/main/res/layout/popular_bank_image_view.xml b/android/app/src/main/res/layout/popular_bank_image_view.xml index 3926caccf0..6baa728550 100644 --- a/android/app/src/main/res/layout/popular_bank_image_view.xml +++ b/android/app/src/main/res/layout/popular_bank_image_view.xml @@ -18,7 +18,7 @@ android:layout_width="@dimen/layout_dp_40" android:layout_height="@dimen/layout_dp_40" android:layout_margin="@dimen/_4dp" - android:background="@drawable/bg_white_rounded_8" + android:background="@drawable/app_bg_white_rounded_8" android:elevation="@dimen/_4dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/android/app/src/main/res/layout/set_up_mandate_benefits_view.xml b/android/app/src/main/res/layout/set_up_mandate_benefits_view.xml index 738c8bccf1..8c957ece80 100644 --- a/android/app/src/main/res/layout/set_up_mandate_benefits_view.xml +++ b/android/app/src/main/res/layout/set_up_mandate_benefits_view.xml @@ -23,7 +23,7 @@ + android:background="@drawable/app_bottom_sheet_background"> @@ -20,7 +20,7 @@ android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_100" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -32,7 +32,7 @@ android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_48" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/first_card" /> diff --git a/android/app/src/main/res/layout/shimmer_multiple_cards.xml b/android/app/src/main/res/layout/shimmer_multiple_cards.xml index 98428b2be2..e439cb5aa3 100644 --- a/android/app/src/main/res/layout/shimmer_multiple_cards.xml +++ b/android/app/src/main/res/layout/shimmer_multiple_cards.xml @@ -20,7 +20,7 @@ android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_100" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -32,7 +32,7 @@ android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_48" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/first_card" /> @@ -44,7 +44,7 @@ android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_48" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/second_card" /> diff --git a/android/app/src/main/res/layout/shimmer_permission_fragment.xml b/android/app/src/main/res/layout/shimmer_permission_fragment.xml index fcb4f1e921..4e7fb47a82 100644 --- a/android/app/src/main/res/layout/shimmer_permission_fragment.xml +++ b/android/app/src/main/res/layout/shimmer_permission_fragment.xml @@ -15,7 +15,7 @@ android:layout_height="@dimen/dp_32" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_112" - android:background="@drawable/bg_grey_4dp_radius" + android:background="@drawable/app_bg_grey_4dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -26,7 +26,7 @@ android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_4" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_grey_4dp_radius" + android:background="@drawable/app_bg_grey_4dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/view1" /> @@ -47,7 +47,7 @@ android:layout_height="@dimen/dp_18" android:layout_marginStart="@dimen/dp_14" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_grey_4dp_radius" + android:background="@drawable/app_bg_grey_4dp_radius" app:layout_constraintStart_toEndOf="@id/view3" app:layout_constraintTop_toTopOf="@id/view3" /> @@ -58,7 +58,7 @@ android:layout_marginStart="@dimen/dp_14" android:layout_marginTop="@dimen/dp_4" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_grey_4dp_radius" + android:background="@drawable/app_bg_grey_4dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/view3" app:layout_constraintTop_toBottomOf="@id/view4" /> @@ -70,7 +70,7 @@ android:layout_marginStart="@dimen/dp_14" android:layout_marginTop="@dimen/dp_4" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_grey_4dp_radius" + android:background="@drawable/app_bg_grey_4dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/view3" app:layout_constraintTop_toBottomOf="@id/view5" /> @@ -92,7 +92,7 @@ android:layout_height="@dimen/dp_18" android:layout_marginStart="@dimen/dp_14" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_grey_4dp_radius" + android:background="@drawable/app_bg_grey_4dp_radius" app:layout_constraintStart_toEndOf="@id/view7" app:layout_constraintTop_toTopOf="@id/view7" /> @@ -103,7 +103,7 @@ android:layout_marginStart="@dimen/dp_14" android:layout_marginTop="@dimen/dp_4" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_grey_4dp_radius" + android:background="@drawable/app_bg_grey_4dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/view7" app:layout_constraintTop_toBottomOf="@id/view8" /> @@ -115,7 +115,7 @@ android:layout_marginStart="@dimen/dp_14" android:layout_marginTop="@dimen/dp_4" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_grey_4dp_radius" + android:background="@drawable/app_bg_grey_4dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/view7" app:layout_constraintTop_toBottomOf="@id/view9" /> @@ -137,7 +137,7 @@ android:layout_height="@dimen/dp_18" android:layout_marginStart="@dimen/dp_14" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_grey_4dp_radius" + android:background="@drawable/app_bg_grey_4dp_radius" app:layout_constraintStart_toEndOf="@id/view12" app:layout_constraintTop_toTopOf="@id/view12" /> @@ -148,7 +148,7 @@ android:layout_marginStart="@dimen/dp_14" android:layout_marginTop="@dimen/dp_4" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_grey_4dp_radius" + android:background="@drawable/app_bg_grey_4dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/view12" app:layout_constraintTop_toBottomOf="@id/view13" /> @@ -160,7 +160,7 @@ android:layout_marginStart="@dimen/dp_14" android:layout_marginTop="@dimen/dp_4" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_grey_4dp_radius" + android:background="@drawable/app_bg_grey_4dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/view12" app:layout_constraintTop_toBottomOf="@id/view14" /> @@ -173,7 +173,7 @@ android:layout_marginTop="@dimen/dp_4" android:layout_marginEnd="@dimen/dp_16" android:layout_marginBottom="@dimen/dp_32" - android:background="@drawable/bg_dark_grey_4dp_radius" + android:background="@drawable/app_bg_dark_grey_4dp_radius" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/android/app/src/main/res/layout/shimmer_profile_basic_details_fragment.xml b/android/app/src/main/res/layout/shimmer_profile_basic_details_fragment.xml index ea1485ec31..f6fe7f26b0 100644 --- a/android/app/src/main/res/layout/shimmer_profile_basic_details_fragment.xml +++ b/android/app/src/main/res/layout/shimmer_profile_basic_details_fragment.xml @@ -17,7 +17,7 @@ android:id="@+id/header" android:layout_width="@dimen/layout_dp_24" android:layout_height="@dimen/layout_dp_24" - android:background="@drawable/bg_grey_4dp_radius" + android:background="@drawable/app_bg_grey_4dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -26,7 +26,7 @@ android:layout_width="@dimen/layout_dp_200" android:layout_height="@dimen/layout_dp_32" android:layout_marginTop="@dimen/layout_dp_40" - android:background="@drawable/bg_grey_4dp_radius" + android:background="@drawable/app_bg_grey_4dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/header" /> @@ -35,7 +35,7 @@ android:layout_width="@dimen/layout_dp_156" android:layout_height="@dimen/layout_dp_24" android:layout_marginTop="@dimen/layout_dp_24" - android:background="@drawable/bg_grey_4dp_radius" + android:background="@drawable/app_bg_grey_4dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/view1" /> @@ -44,7 +44,7 @@ android:layout_width="@dimen/layout_dp_0" android:layout_height="@dimen/layout_dp_48" android:layout_marginTop="@dimen/layout_dp_8" - android:background="@drawable/bg_grey_4dp_radius" + android:background="@drawable/app_bg_grey_4dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/view2" /> @@ -54,7 +54,7 @@ android:layout_width="@dimen/layout_dp_156" android:layout_height="@dimen/layout_dp_24" android:layout_marginTop="@dimen/layout_dp_24" - android:background="@drawable/bg_grey_4dp_radius" + android:background="@drawable/app_bg_grey_4dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/view3" /> @@ -63,7 +63,7 @@ android:layout_width="@dimen/layout_dp_0" android:layout_height="@dimen/layout_dp_48" android:layout_marginTop="@dimen/layout_dp_8" - android:background="@drawable/bg_grey_4dp_radius" + android:background="@drawable/app_bg_grey_4dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/view4" /> @@ -73,7 +73,7 @@ android:layout_width="@dimen/layout_dp_200" android:layout_height="@dimen/layout_dp_18" android:layout_marginBottom="@dimen/layout_dp_16" - android:background="@drawable/bg_grey_4dp_radius" + android:background="@drawable/app_bg_grey_4dp_radius" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/android/app/src/main/res/layout/shimmer_screen.xml b/android/app/src/main/res/layout/shimmer_screen.xml index 64f65f1a3b..d90f938482 100644 --- a/android/app/src/main/res/layout/shimmer_screen.xml +++ b/android/app/src/main/res/layout/shimmer_screen.xml @@ -15,7 +15,7 @@ android:layout_height="@dimen/dp_24" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_48" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -24,7 +24,7 @@ android:layout_height="@dimen/dp_24" android:layout_marginEnd="@dimen/dp_16" android:layout_marginTop="@dimen/dp_48" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -33,7 +33,7 @@ android:layout_height="@dimen/dp_32" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_106" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -43,7 +43,7 @@ android:layout_marginStart="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16" android:layout_marginTop="@dimen/dp_146" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -54,7 +54,7 @@ android:layout_marginStart="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16" android:layout_marginTop="@dimen/dp_278" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -65,7 +65,7 @@ android:layout_marginStart="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16" android:layout_marginTop="330dp" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -77,7 +77,7 @@ android:layout_marginStart="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16" android:layout_marginTop="560dp" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -88,7 +88,7 @@ android:layout_marginStart="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16" android:layout_marginTop="600dp" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -107,7 +107,7 @@ android:layout_height="wrap_content"> + android:background="@drawable/app_bg_white_rounded_8"> diff --git a/android/app/src/main/res/layout/value_addition_card_view.xml b/android/app/src/main/res/layout/value_addition_card_view.xml index 55eb1e2fb7..359f313967 100644 --- a/android/app/src/main/res/layout/value_addition_card_view.xml +++ b/android/app/src/main/res/layout/value_addition_card_view.xml @@ -25,7 +25,7 @@ - - - - - - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/values-v23/styles.xml b/android/app/src/main/res/values-v23/styles.xml deleted file mode 100644 index 945860749d..0000000000 --- a/android/app/src/main/res/values-v23/styles.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/values/keys_strings.xml b/android/app/src/main/res/values/app_keys_strings.xml similarity index 100% rename from android/app/src/main/res/values/keys_strings.xml rename to android/app/src/main/res/values/app_keys_strings.xml diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 3261e6ea61..32fcf96580 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -1,20 +1,20 @@ - + + + diff --git a/android/navi-analytics/build.gradle b/android/navi-analytics/build.gradle index 0a25ec6eed..26ad69ceea 100644 --- a/android/navi-analytics/build.gradle +++ b/android/navi-analytics/build.gradle @@ -9,7 +9,7 @@ android { compileSdk 34 defaultConfig { - minSdk 23 + minSdk 24 targetSdk 34 consumerProguardFiles "consumer-rules.pro" diff --git a/android/navi-base/build.gradle b/android/navi-base/build.gradle index f0deb31916..a84fb1e780 100644 --- a/android/navi-base/build.gradle +++ b/android/navi-base/build.gradle @@ -11,7 +11,7 @@ android { compileSdk 34 defaultConfig { - minSdk 23 + minSdk 24 targetSdk 34 consumerProguardFiles "consumer-rules.pro" diff --git a/android/navi-base/src/main/java/com/navi/base/utils/Ext.kt b/android/navi-base/src/main/java/com/navi/base/utils/Ext.kt index 42b0696cfe..2dd337e2af 100644 --- a/android/navi-base/src/main/java/com/navi/base/utils/Ext.kt +++ b/android/navi-base/src/main/java/com/navi/base/utils/Ext.kt @@ -8,7 +8,6 @@ package com.navi.base.utils import android.graphics.Paint -import android.os.Build import android.widget.TextView import com.google.gson.Gson import com.navi.base.model.AnalyticsEvent @@ -73,12 +72,7 @@ fun TextView.underLineText() { } inline fun Map.getOrDefaultCompat(key: K, defaultValue: V): V { - // Check if the SDK version is Nougat or higher (API level 24) - return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - getOrDefault(key, defaultValue) - } else { - get(key) ?: defaultValue - } + return getOrDefault(key, defaultValue) } /** diff --git a/android/navi-bbps/build.gradle b/android/navi-bbps/build.gradle index c355632251..b1a17e4e1f 100644 --- a/android/navi-bbps/build.gradle +++ b/android/navi-bbps/build.gradle @@ -12,7 +12,7 @@ android { compileSdk 34 defaultConfig { - minSdk 23 + minSdk 24 targetSdk 34 consumerProguardFiles "consumer-rules.pro" diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billerlist/ui/RenderBillerListScreen.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billerlist/ui/RenderBillerListScreen.kt index 1fec758efb..15316da81c 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billerlist/ui/RenderBillerListScreen.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billerlist/ui/RenderBillerListScreen.kt @@ -322,7 +322,7 @@ fun TopBillersView( padding = 4.dp, backgroundColor = NaviBbpsColor.bgAlt, imageUrl = billerEntity.billerLogoUrl, - placeholderIconResId = CommonR.drawable.ic_biller_placeholder + placeholderIconResId = CommonR.drawable.navi_common_ic_biller_placeholder ) Spacer(modifier = Modifier.height(8.dp)) @@ -378,7 +378,7 @@ fun RecentBillerItem( BbpsCircleImage( modifier = Modifier.size(48.dp), imageUrl = myBillEntity.billerLogoUrl, - placeholderIconResId = CommonR.drawable.ic_biller_placeholder + placeholderIconResId = CommonR.drawable.navi_common_ic_biller_placeholder ) Spacer(modifier = Modifier.width(8.dp)) @@ -456,7 +456,7 @@ fun BillerItem(billerItemEntity: BillerItemEntity, onItemClicked: () -> Unit) { BbpsCircleImage( modifier = Modifier.size(48.dp), imageUrl = billerItemEntity.billerLogoUrl, - placeholderIconResId = CommonR.drawable.ic_biller_placeholder + placeholderIconResId = CommonR.drawable.navi_common_ic_biller_placeholder ) Spacer(modifier = Modifier.width(8.dp)) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/ui/BillTransactionsListView.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/ui/BillTransactionsListView.kt index 19f5a26782..888835fdec 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/ui/BillTransactionsListView.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/ui/BillTransactionsListView.kt @@ -85,7 +85,7 @@ private fun BillTransactionItem(transaction: BillTransactionItemEntity, onItemCl padding = 8.dp, backgroundColor = NaviBbpsColor.ctaWhite, imageUrl = transaction.transactionIconUrl, - placeholderIconResId = CommonR.drawable.ic_biller_placeholder + placeholderIconResId = CommonR.drawable.navi_common_ic_biller_placeholder ) Spacer(modifier = Modifier.width(12.dp)) Column(modifier = Modifier.weight(1f)) { diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/ui/MyBillHistoryDetailsScreen.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/ui/MyBillHistoryDetailsScreen.kt index d50d61ffd6..ab59343c46 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/ui/MyBillHistoryDetailsScreen.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/ui/MyBillHistoryDetailsScreen.kt @@ -294,7 +294,7 @@ private fun MyBillsHistoryHeader( BbpsCircleImage( boxSize = 48.dp, imageUrl = myBillEntity.billerLogoUrl, - placeholderIconResId = CommonR.drawable.ic_biller_placeholder + placeholderIconResId = CommonR.drawable.navi_common_ic_biller_placeholder ) Spacer(modifier = Modifier.width(12.dp)) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/category/model/view/BillCategoryGroupEntity.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/category/model/view/BillCategoryGroupEntity.kt index e25b1ae221..a50b50dd6c 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/category/model/view/BillCategoryGroupEntity.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/category/model/view/BillCategoryGroupEntity.kt @@ -33,5 +33,5 @@ data class BillCategoryEntity( val reminderTitle: String = EMPTY ) : Parcelable { val fallbackImageResId - get() = CommonR.drawable.ic_biller_placeholder + get() = CommonR.drawable.navi_common_ic_biller_placeholder } diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/category/ui/BillCategoryScreenV2.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/category/ui/BillCategoryScreenV2.kt index ab18fce264..ea26f3ad41 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/category/ui/BillCategoryScreenV2.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/category/ui/BillCategoryScreenV2.kt @@ -702,7 +702,7 @@ private fun PendingBillItemV2( ) { BbpsCircleImage( imageUrl = myBillEntity.billerLogoUrl, - placeholderIconResId = CommonR.drawable.ic_biller_placeholder, + placeholderIconResId = CommonR.drawable.navi_common_ic_biller_placeholder, boxSize = 40.dp ) Spacer(modifier = Modifier.width(8.dp)) @@ -871,7 +871,7 @@ private fun BbpsLandingPageHeader( painterResource( if (hasScrolledPastStatusBar || shouldUseDarkIcons) CommonR.drawable.ic_arrow_left_black_v2 - else CommonR.drawable.ic_arrow_left_white_v2 + else CommonR.drawable.navi_common_ic_arrow_left_white_v2 ), contentDescription = null ) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/category/ui/RenderBillCategoriesScreen.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/category/ui/RenderBillCategoriesScreen.kt index e9f7fd54d4..4cafeed717 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/category/ui/RenderBillCategoriesScreen.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/category/ui/RenderBillCategoriesScreen.kt @@ -277,7 +277,7 @@ private fun PendingBillItem( ) { BbpsCircleImage( imageUrl = myBillEntity.billerLogoUrl, - placeholderIconResId = CommonR.drawable.ic_biller_placeholder, + placeholderIconResId = CommonR.drawable.navi_common_ic_biller_placeholder, boxSize = 40.dp ) Spacer(modifier = Modifier.width(8.dp)) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/contactlist/ui/RenderContactListScreen.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/contactlist/ui/RenderContactListScreen.kt index cef8666e39..602f782114 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/contactlist/ui/RenderContactListScreen.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/contactlist/ui/RenderContactListScreen.kt @@ -340,7 +340,7 @@ fun RecentBillerItem( BbpsCircleImage( modifier = Modifier.size(48.dp), imageUrl = myBillEntity.billerLogoUrl, - placeholderIconResId = CommonR.drawable.ic_biller_placeholder + placeholderIconResId = CommonR.drawable.navi_common_ic_biller_placeholder ) Spacer(modifier = Modifier.width(8.dp)) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/customerinput/ui/CustomerDataInputScreen.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/customerinput/ui/CustomerDataInputScreen.kt index a45f7d2622..6c4a4460e4 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/customerinput/ui/CustomerDataInputScreen.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/customerinput/ui/CustomerDataInputScreen.kt @@ -464,7 +464,7 @@ fun RenderBillerDetailStrip(billerItemEntity: BillerItemEntity) { ) { BbpsCircleImage( imageUrl = billerItemEntity.billerLogoUrl, - placeholderIconResId = com.navi.common.R.drawable.ic_biller_placeholder, + placeholderIconResId = com.navi.common.R.drawable.navi_common_ic_biller_placeholder, ) Spacer(modifier = Modifier.width(8.dp)) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/mybills/ui/RenderMyBillsScreen.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/mybills/ui/RenderMyBillsScreen.kt index ccb610d7da..0dbf86e5bf 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/mybills/ui/RenderMyBillsScreen.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/mybills/ui/RenderMyBillsScreen.kt @@ -156,7 +156,7 @@ private fun MyBillItem( BbpsCircleImage( imageUrl = myBillEntity.billerLogoUrl, boxSize = 40.dp, - placeholderIconResId = CommonR.drawable.ic_biller_placeholder + placeholderIconResId = CommonR.drawable.navi_common_ic_biller_placeholder ) Spacer(modifier = Modifier.width(8.dp)) Column(modifier = Modifier.weight(1f)) { diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/PayBillScreen.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/PayBillScreen.kt index 61848ab2de..d47e8d2466 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/PayBillScreen.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/PayBillScreen.kt @@ -968,7 +968,7 @@ private fun RenderPayBillHeaderPrepaid( BbpsCircleImage( boxSize = 48.dp, imageUrl = operatorItemEntity?.operatorLogoUrl, - placeholderIconResId = CommonR.drawable.ic_biller_placeholder + placeholderIconResId = CommonR.drawable.navi_common_ic_biller_placeholder ) Spacer(modifier = Modifier.width(16.dp)) @@ -1025,7 +1025,7 @@ private fun RenderPayBillHeaderOthers( BbpsCircleImage( boxSize = 48.dp, imageUrl = billerDetailsEntity.billerLogoUrl, - placeholderIconResId = CommonR.drawable.ic_biller_placeholder + placeholderIconResId = CommonR.drawable.navi_common_ic_biller_placeholder ) Spacer(modifier = Modifier.width(12.dp)) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/RenderCreditCardPayBillScreen.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/RenderCreditCardPayBillScreen.kt index f12a562a8a..47bb7b4c0b 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/RenderCreditCardPayBillScreen.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/RenderCreditCardPayBillScreen.kt @@ -529,7 +529,7 @@ fun CardDetailsSection( BbpsCircleImage( imageUrl = billerDetailsEntity.billerLogoUrl, boxSize = 40.dp, - placeholderIconResId = CommonR.drawable.ic_biller_placeholder, + placeholderIconResId = CommonR.drawable.navi_common_ic_biller_placeholder, ) Spacer(modifier = Modifier.width(8.dp)) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/permission/utils/PermissionUtils.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/permission/utils/PermissionUtils.kt index 534cff899b..352e8b70b7 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/permission/utils/PermissionUtils.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/permission/utils/PermissionUtils.kt @@ -41,7 +41,7 @@ object PermissionKeyData { val BBPS_CONTACT_PERMISSION_DATA = listOf( PermissionData( - iconId = CommonR.drawable.ic_contact_permission, + iconId = CommonR.drawable.navi_common_ic_contact_permission, titleId = R.string.bbps_contacts, descriptionId = R.string.bbps_contact_state_permission_description, qualifierList = listOf(Manifest.permission.READ_CONTACTS) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/prepaidrecharge/ui/PrepaidRechargeScreenBottomSheetContent.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/prepaidrecharge/ui/PrepaidRechargeScreenBottomSheetContent.kt index 288aa26da8..0b0240d2ef 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/prepaidrecharge/ui/PrepaidRechargeScreenBottomSheetContent.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/prepaidrecharge/ui/PrepaidRechargeScreenBottomSheetContent.kt @@ -204,7 +204,7 @@ private fun RenderPrepaidRechargeBottomSheetOperator( BbpsCircleImage( modifier = Modifier.size(32.dp), imageUrl = operator.operatorLogoUrl, - placeholderIconResId = CommonR.drawable.ic_biller_placeholder + placeholderIconResId = CommonR.drawable.navi_common_ic_biller_placeholder ) Spacer(modifier = Modifier.width(16.dp)) NaviText( diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/prepaidrecharge/ui/RenderPrepaidRechargeScreen.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/prepaidrecharge/ui/RenderPrepaidRechargeScreen.kt index 82bbab4fc3..43f618e00c 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/prepaidrecharge/ui/RenderPrepaidRechargeScreen.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/prepaidrecharge/ui/RenderPrepaidRechargeScreen.kt @@ -159,7 +159,7 @@ fun RenderPrepaidRechargeScreen( BbpsCircleImage( boxSize = 48.dp, imageUrl = selectedOperatorEntity?.operatorLogoUrl, - placeholderIconResId = CommonR.drawable.ic_biller_placeholder + placeholderIconResId = CommonR.drawable.navi_common_ic_biller_placeholder ) Spacer(modifier = Modifier.width(16.dp)) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsPostPaymentScreen.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsPostPaymentScreen.kt index 95d4654717..697dd9df32 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsPostPaymentScreen.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsPostPaymentScreen.kt @@ -823,7 +823,7 @@ private fun BbpsEngagementBanner( BbpsAsyncImage( modifier = Modifier.padding(top = 26.dp, end = 16.dp).size(112.dp), imageUrl = engagementBannerEntityList[currentPage % originalPagerSize].iconUrl, - placeholderIconResId = CommonR.drawable.ic_biller_placeholder, + placeholderIconResId = CommonR.drawable.navi_common_ic_biller_placeholder, ) } } diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsPostPaymentScreenV2.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsPostPaymentScreenV2.kt index 4e6cb606b0..156a02ddb7 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsPostPaymentScreenV2.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsPostPaymentScreenV2.kt @@ -980,7 +980,7 @@ private fun BbpsEngagementBanner( BbpsAsyncImage( modifier = Modifier.padding(top = 26.dp, end = 16.dp).size(112.dp), imageUrl = engagementBannerEntityList[currentPage % originalPagerSize].iconUrl, - placeholderIconResId = CommonR.drawable.ic_biller_placeholder, + placeholderIconResId = CommonR.drawable.navi_common_ic_biller_placeholder, ) } } @@ -1641,7 +1641,7 @@ private fun RenderPaymentSummaryBottomSheetUI( bottomSheetUIState = bottomSheetUIState, formattedCoinsAmount = formattedCoinsAmount ), - imageResId = CommonR.drawable.ic_checked_circle_green, + imageResId = CommonR.drawable.navi_common_ic_checked_circle_green, headerTextResId = R.string.bbps_scratch_card_ready_header, headerLottieFileName = NAVI_PAY_GREEN_TICK_LOTTIE ) @@ -1948,7 +1948,8 @@ private fun SharedTransitionScope.RewardsBottomBarWithStripSection( Spacer(modifier = Modifier.width(8.dp)) Image( - painter = painterResource(id = CommonR.drawable.ic_double_right_arrow), + painter = + painterResource(id = CommonR.drawable.navi_common_ic_double_right_arrow), contentDescription = EMPTY, modifier = Modifier.size(20.dp) ) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsTransactionDetailsScreen.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsTransactionDetailsScreen.kt index 9c646dd13c..c9cea83e66 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsTransactionDetailsScreen.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsTransactionDetailsScreen.kt @@ -592,7 +592,7 @@ private fun BillerNameView( boxSize = 24.dp, backgroundColor = NaviBbpsColor.textWhite, imageUrl = billerLogoUrl, - placeholderIconResId = CommonR.drawable.ic_biller_placeholder + placeholderIconResId = CommonR.drawable.navi_common_ic_biller_placeholder ) Spacer(modifier = Modifier.width(4.dp)) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/viewmodel/BbpsTransactionDetailsViewModel.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/viewmodel/BbpsTransactionDetailsViewModel.kt index fc518710e3..02dc83751b 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/viewmodel/BbpsTransactionDetailsViewModel.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/viewmodel/BbpsTransactionDetailsViewModel.kt @@ -584,7 +584,7 @@ constructor( }, bannerBgColor = NaviBbpsColor.onSurfaceHighlight, bannerTextColor = NaviBbpsColor.textWhite, - headerNavigationIconId = CommonR.drawable.ic_arrow_left_white_v2, + headerNavigationIconId = CommonR.drawable.navi_common_ic_arrow_left_white_v2, nameInfoCardPreTextId = nameInfoCardPreTextId, nameInfoCardBgColor = NaviBbpsColor.brandSupportingLightGreen, statusBarColorId = R.color.bbps_ctaPriority, diff --git a/android/navi-bbps/src/main/res/layout/layout_bbps_share_transaction_details.xml b/android/navi-bbps/src/main/res/layout/layout_bbps_share_transaction_details.xml index a2b5262a5b..85b566e772 100644 --- a/android/navi-bbps/src/main/res/layout/layout_bbps_share_transaction_details.xml +++ b/android/navi-bbps/src/main/res/layout/layout_bbps_share_transaction_details.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" android:paddingHorizontal="@dimen/layout_dp_24" - android:src="@drawable/ic_navi_logo_with_name" + android:src="@drawable/navi_common_ic_navi_logo_with_name" tools:ignore="ContentDescription" /> = Build.VERSION_CODES.N) { - viewLifecycleOwner.lifecycleScope.launchWhenStarted { - launch { - naviChatViewModel.connectivityObserverHolder.collect { - if ( - binding.viewSeparator.isVisible && - naviChatSharedViewModel.isCsatFragmentShown.value != true - ) { - when (it) { - ConnectivityObserver.Status.Available -> { - crmEventTracker.sendEvent(NETWORK_AVAILABLE_IN_CHAT) - if (binding.networkConnectivityNudgeLayout.root.isVisible) { - updateNetworkConnectivityNudge( - networkConnectivityNudgeData = - getNudgeDataForInternetConnected() - ) - } - delay(CONNECTED_NUDGE_DELAY) - hideNetworkConnectivityNudge() - binding.etFreeText.isEnabled = true - binding.clFreeText.alpha = FREE_TEXT_ENABLED_ALPHA_VALUE - } - ConnectivityObserver.Status.Unavailable, - ConnectivityObserver.Status.Losing, - ConnectivityObserver.Status.Lost -> { - scrollChatToLatestMessageReceived() - crmEventTracker.sendEvent(NETWORK_UNAVAILABLE_IN_CHAT) - binding.etFreeText.isEnabled = false - binding.clFreeText.alpha = FREE_TEXT_DISABLED_ALPHA_VALUE + viewLifecycleOwner.lifecycleScope.launchWhenStarted { + launch { + naviChatViewModel.connectivityObserverHolder.collect { + if ( + binding.viewSeparator.isVisible && + naviChatSharedViewModel.isCsatFragmentShown.value != true + ) { + when (it) { + ConnectivityObserver.Status.Available -> { + crmEventTracker.sendEvent(NETWORK_AVAILABLE_IN_CHAT) + if (binding.networkConnectivityNudgeLayout.root.isVisible) { updateNetworkConnectivityNudge( networkConnectivityNudgeData = - getNudgeDataForInternetDisconnected() + getNudgeDataForInternetConnected() ) } + delay(CONNECTED_NUDGE_DELAY) + hideNetworkConnectivityNudge() + binding.etFreeText.isEnabled = true + binding.clFreeText.alpha = FREE_TEXT_ENABLED_ALPHA_VALUE + } + ConnectivityObserver.Status.Unavailable, + ConnectivityObserver.Status.Losing, + ConnectivityObserver.Status.Lost -> { + scrollChatToLatestMessageReceived() + crmEventTracker.sendEvent(NETWORK_UNAVAILABLE_IN_CHAT) + binding.etFreeText.isEnabled = false + binding.clFreeText.alpha = FREE_TEXT_DISABLED_ALPHA_VALUE + updateNetworkConnectivityNudge( + networkConnectivityNudgeData = + getNudgeDataForInternetDisconnected() + ) } } } diff --git a/android/navi-chat/src/main/java/com/navi/chat/viewmodels/NaviChatViewModel.kt b/android/navi-chat/src/main/java/com/navi/chat/viewmodels/NaviChatViewModel.kt index 9d21bd5fa2..2659b1bb7c 100644 --- a/android/navi-chat/src/main/java/com/navi/chat/viewmodels/NaviChatViewModel.kt +++ b/android/navi-chat/src/main/java/com/navi/chat/viewmodels/NaviChatViewModel.kt @@ -1,6 +1,6 @@ /* * - * * Copyright © 2023 by Navi Technologies Limited + * * Copyright © 2023-2024 by Navi Technologies Limited * * All rights reserved. Strictly confidential * */ @@ -9,7 +9,6 @@ package com.navi.chat.viewmodels import android.annotation.SuppressLint import android.content.Context -import android.os.Build import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope @@ -133,12 +132,8 @@ constructor( } init { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - viewModelScope.launch(Dispatchers.IO) { - connectivityObserver.observe().collectLatest { - _connectivityObserverHolder.emit(it) - } - } + viewModelScope.launch(Dispatchers.IO) { + connectivityObserver.observe().collectLatest { _connectivityObserverHolder.emit(it) } } } diff --git a/android/navi-chat/src/main/res/color/navi_chat_exit_item_selector.xml b/android/navi-chat/src/main/res/color/navi_chat_navi_chat_exit_item_selector.xml similarity index 100% rename from android/navi-chat/src/main/res/color/navi_chat_exit_item_selector.xml rename to android/navi-chat/src/main/res/color/navi_chat_navi_chat_exit_item_selector.xml diff --git a/android/navi-chat/src/main/res/drawable/ic_play_video.xml b/android/navi-chat/src/main/res/drawable/navi_chat_ic_play_video.xml similarity index 100% rename from android/navi-chat/src/main/res/drawable/ic_play_video.xml rename to android/navi-chat/src/main/res/drawable/navi_chat_ic_play_video.xml diff --git a/android/navi-chat/src/main/res/drawable/ic_tooltip_slider_purple.xml b/android/navi-chat/src/main/res/drawable/navi_chat_ic_tooltip_slider_purple.xml similarity index 100% rename from android/navi-chat/src/main/res/drawable/ic_tooltip_slider_purple.xml rename to android/navi-chat/src/main/res/drawable/navi_chat_ic_tooltip_slider_purple.xml diff --git a/android/navi-chat/src/main/res/layout/activity_help_center.xml b/android/navi-chat/src/main/res/layout/activity_help_center.xml index 3c4cce092c..df58960d9a 100644 --- a/android/navi-chat/src/main/res/layout/activity_help_center.xml +++ b/android/navi-chat/src/main/res/layout/activity_help_center.xml @@ -20,13 +20,13 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - + - + diff --git a/android/navi-chat/src/main/res/layout/activity_navi_chat_view_video.xml b/android/navi-chat/src/main/res/layout/activity_navi_chat_view_video.xml index d6e41d6237..26475eef0d 100644 --- a/android/navi-chat/src/main/res/layout/activity_navi_chat_view_video.xml +++ b/android/navi-chat/src/main/res/layout/activity_navi_chat_view_video.xml @@ -127,7 +127,7 @@ app:layout_constraintBottom_toBottomOf="parent" android:layout_marginBottom="@dimen/dp_34" android:progressTint="@color/dark_purple" - android:thumb="@drawable/ic_tooltip_slider_purple" + android:thumb="@drawable/navi_chat_ic_tooltip_slider_purple" app:layout_constraintHorizontal_bias="0.0" tools:progress="50" android:progressBackgroundTint="@color/white" diff --git a/android/navi-chat/src/main/res/layout/activity_support_screen.xml b/android/navi-chat/src/main/res/layout/activity_support_screen.xml index 856c5ab988..7d1370ac02 100644 --- a/android/navi-chat/src/main/res/layout/activity_support_screen.xml +++ b/android/navi-chat/src/main/res/layout/activity_support_screen.xml @@ -19,13 +19,13 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - + - + diff --git a/android/navi-chat/src/main/res/layout/base_bottom_sheet.xml b/android/navi-chat/src/main/res/layout/base_bottom_sheet.xml index 13822b70fe..c387044fee 100644 --- a/android/navi-chat/src/main/res/layout/base_bottom_sheet.xml +++ b/android/navi-chat/src/main/res/layout/base_bottom_sheet.xml @@ -26,7 +26,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="@dimen/layout_dp_12" - android:background="@drawable/bottom_sheet_background" + android:background="@drawable/navi_common_bottom_sheet_background" android:paddingTop="@dimen/layout_dp_20"> diff --git a/android/navi-chat/src/main/res/layout/shimmer_profile_item_layout.xml b/android/navi-chat/src/main/res/layout/navi_chat_shimmer_profile_item_layout.xml similarity index 100% rename from android/navi-chat/src/main/res/layout/shimmer_profile_item_layout.xml rename to android/navi-chat/src/main/res/layout/navi_chat_shimmer_profile_item_layout.xml diff --git a/android/navi-chat/src/main/res/layout/navi_chat_toolbar.xml b/android/navi-chat/src/main/res/layout/navi_chat_toolbar.xml index ae189adc2f..7d627de252 100644 --- a/android/navi-chat/src/main/res/layout/navi_chat_toolbar.xml +++ b/android/navi-chat/src/main/res/layout/navi_chat_toolbar.xml @@ -66,7 +66,7 @@ android:paddingVertical="@dimen/dp_3" android:paddingStart="@dimen/dp_8" android:paddingEnd="@dimen/dp_28" - android:popupBackground="@drawable/bg_white_rounded_8" + android:popupBackground="@drawable/navi_widgets_bg_white_rounded_8" android:popupElevation="@dimen/_16dp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/android/navi-chat/src/main/res/layout/shimmer_layout_faq_search.xml b/android/navi-chat/src/main/res/layout/shimmer_layout_faq_search.xml index 4982db17c5..bb5b28c668 100644 --- a/android/navi-chat/src/main/res/layout/shimmer_layout_faq_search.xml +++ b/android/navi-chat/src/main/res/layout/shimmer_layout_faq_search.xml @@ -16,27 +16,27 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_44" android:layout_marginHorizontal="@dimen/dp_16" - android:background="@drawable/bg_grey_8dp_radius" /> + android:background="@drawable/navi_common_bg_grey_8dp_radius" /> + android:background="@drawable/navi_common_bg_grey_8dp_radius" /> + android:background="@drawable/navi_common_bg_grey_8dp_radius" /> + android:background="@drawable/navi_common_bg_grey_8dp_radius" /> \ No newline at end of file diff --git a/android/navi-chat/src/main/res/layout/shimmer_layout_my_tickets.xml b/android/navi-chat/src/main/res/layout/shimmer_layout_my_tickets.xml index f8cd529e52..f9cfdbc3b9 100644 --- a/android/navi-chat/src/main/res/layout/shimmer_layout_my_tickets.xml +++ b/android/navi-chat/src/main/res/layout/shimmer_layout_my_tickets.xml @@ -17,26 +17,26 @@ android:layout_height="@dimen/dp_160" android:layout_marginHorizontal="@dimen/dp_16" android:layout_marginTop="@dimen/dp_16" - android:background="@drawable/bg_grey_rounded_12" /> + android:background="@drawable/navi_widgets_bg_grey_rounded_12" /> + android:background="@drawable/navi_widgets_bg_grey_rounded_12" /> + android:background="@drawable/navi_widgets_bg_grey_rounded_12" /> + android:background="@drawable/navi_widgets_bg_grey_rounded_12" /> \ No newline at end of file diff --git a/android/navi-chat/src/main/res/layout/shimmer_layout_new_chat.xml b/android/navi-chat/src/main/res/layout/shimmer_layout_new_chat.xml index 582b985e22..66ebf031dd 100644 --- a/android/navi-chat/src/main/res/layout/shimmer_layout_new_chat.xml +++ b/android/navi-chat/src/main/res/layout/shimmer_layout_new_chat.xml @@ -37,7 +37,7 @@ android:layout_height="@dimen/dp_90" android:layout_marginStart="@dimen/dp_56" android:layout_marginTop="@dimen/dp_36" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -47,7 +47,7 @@ android:layout_height="@dimen/dp_112" android:layout_marginStart="@dimen/dp_56" android:layout_marginTop="@dimen/dp_20" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/userMessage1" /> @@ -57,7 +57,7 @@ android:layout_height="@dimen/dp_90" android:layout_marginStart="@dimen/dp_56" android:layout_marginTop="@dimen/dp_4" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/serverMessage2" /> @@ -67,7 +67,7 @@ android:layout_height="@dimen/dp_68" android:layout_marginTop="@dimen/dp_144" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -77,7 +77,7 @@ android:layout_height="@dimen/dp_68" android:layout_marginTop="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/serverMessage3" /> @@ -87,7 +87,7 @@ android:layout_height="@dimen/dp_68" android:layout_marginTop="@dimen/dp_4" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/userMessage2" /> @@ -107,7 +107,7 @@ android:layout_height="@dimen/dp_90" android:layout_marginStart="@dimen/dp_56" android:layout_marginTop="@dimen/dp_20" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/userMessage3" /> diff --git a/android/navi-coin/build.gradle b/android/navi-coin/build.gradle index 7e14e26a36..34239a4a44 100644 --- a/android/navi-coin/build.gradle +++ b/android/navi-coin/build.gradle @@ -12,7 +12,7 @@ android { compileSdk 34 defaultConfig { - minSdk 23 + minSdk 24 targetSdk 34 consumerProguardFiles "consumer-rules.pro" diff --git a/android/navi-common/build.gradle b/android/navi-common/build.gradle index 202b689e32..f980733c76 100644 --- a/android/navi-common/build.gradle +++ b/android/navi-common/build.gradle @@ -14,7 +14,7 @@ android { compileSdk 34 defaultConfig { - minSdk 23 + minSdk 24 targetSdk 34 consumerProguardFiles "consumer-rules.pro" diff --git a/android/navi-common/src/main/java/com/navi/common/animation/AnimationUtils.kt b/android/navi-common/src/main/java/com/navi/common/animation/AnimationUtils.kt index 20bc44692f..f853c96ace 100644 --- a/android/navi-common/src/main/java/com/navi/common/animation/AnimationUtils.kt +++ b/android/navi-common/src/main/java/com/navi/common/animation/AnimationUtils.kt @@ -44,7 +44,9 @@ fun fadeIn(view: View?, callback: () -> Unit = {}) { } fun slideOutBottom(view: View?, callback: () -> Unit = {}) { - outAnimation(R.anim.slide_out_bottom, view, callback)?.let { view?.startAnimation(it) } + outAnimation(R.anim.navi_common_slide_out_bottom, view, callback)?.let { + view?.startAnimation(it) + } } fun snapOut(view: View?, callback: () -> Unit = {}) { diff --git a/android/navi-common/src/main/java/com/navi/common/utils/AnimationUtils.kt b/android/navi-common/src/main/java/com/navi/common/utils/AnimationUtils.kt index 82e502e07b..15d0f8b2ae 100644 --- a/android/navi-common/src/main/java/com/navi/common/utils/AnimationUtils.kt +++ b/android/navi-common/src/main/java/com/navi/common/utils/AnimationUtils.kt @@ -19,7 +19,10 @@ import timber.log.Timber fun setEaseInAnimation(vararg views: View, startOffset: Long? = null) { try { val animation = - AnimationUtils.loadAnimation(AppServiceManager.application, R.anim.ease_in_animation) + AnimationUtils.loadAnimation( + AppServiceManager.application, + R.anim.navi_common_ease_in_animation + ) startOffset?.let { animation.startOffset = it } views.forEach { it.animation = animation diff --git a/android/navi-common/src/main/res/anim/ease_in_animation.xml b/android/navi-common/src/main/res/anim/navi_common_ease_in_animation.xml similarity index 100% rename from android/navi-common/src/main/res/anim/ease_in_animation.xml rename to android/navi-common/src/main/res/anim/navi_common_ease_in_animation.xml diff --git a/android/navi-common/src/main/res/anim/fade_out.xml b/android/navi-common/src/main/res/anim/navi_common_fade_out.xml similarity index 100% rename from android/navi-common/src/main/res/anim/fade_out.xml rename to android/navi-common/src/main/res/anim/navi_common_fade_out.xml diff --git a/android/navi-common/src/main/res/anim/nothing.xml b/android/navi-common/src/main/res/anim/navi_common_nothing.xml similarity index 100% rename from android/navi-common/src/main/res/anim/nothing.xml rename to android/navi-common/src/main/res/anim/navi_common_nothing.xml diff --git a/android/navi-common/src/main/res/anim/slide_in_bottom.xml b/android/navi-common/src/main/res/anim/navi_common_slide_in_bottom.xml similarity index 100% rename from android/navi-common/src/main/res/anim/slide_in_bottom.xml rename to android/navi-common/src/main/res/anim/navi_common_slide_in_bottom.xml diff --git a/android/navi-common/src/main/res/anim/slide_out_bottom.xml b/android/navi-common/src/main/res/anim/navi_common_slide_out_bottom.xml similarity index 100% rename from android/navi-common/src/main/res/anim/slide_out_bottom.xml rename to android/navi-common/src/main/res/anim/navi_common_slide_out_bottom.xml diff --git a/android/navi-common/src/main/res/drawable/button_with_state_8dp_radius.xml b/android/navi-common/src/main/res/drawable/button_with_state_8dp_radius.xml deleted file mode 100644 index 6bda19b9ad..0000000000 --- a/android/navi-common/src/main/res/drawable/button_with_state_8dp_radius.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/android/navi-common/src/main/res/drawable/arrow_blue_right.xml b/android/navi-common/src/main/res/drawable/navi_common_arrow_blue_right.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/arrow_blue_right.xml rename to android/navi-common/src/main/res/drawable/navi_common_arrow_blue_right.xml diff --git a/android/navi-common/src/main/res/drawable/arrow_purple_right.xml b/android/navi-common/src/main/res/drawable/navi_common_arrow_purple_right.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/arrow_purple_right.xml rename to android/navi-common/src/main/res/drawable/navi_common_arrow_purple_right.xml diff --git a/android/navi-common/src/main/res/drawable/bg_border_light_grey_rounded_4.xml b/android/navi-common/src/main/res/drawable/navi_common_bg_border_light_grey_rounded_4.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/bg_border_light_grey_rounded_4.xml rename to android/navi-common/src/main/res/drawable/navi_common_bg_border_light_grey_rounded_4.xml diff --git a/android/navi-common/src/main/res/drawable/bg_grey_8dp_radius.xml b/android/navi-common/src/main/res/drawable/navi_common_bg_grey_8dp_radius.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/bg_grey_8dp_radius.xml rename to android/navi-common/src/main/res/drawable/navi_common_bg_grey_8dp_radius.xml diff --git a/android/navi-common/src/main/res/drawable/bg_rounded_rect_black_10.xml b/android/navi-common/src/main/res/drawable/navi_common_bg_rounded_rect_black_10.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/bg_rounded_rect_black_10.xml rename to android/navi-common/src/main/res/drawable/navi_common_bg_rounded_rect_black_10.xml diff --git a/android/navi-common/src/main/res/drawable/bottom_sheet_background.xml b/android/navi-common/src/main/res/drawable/navi_common_bottom_sheet_background.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/bottom_sheet_background.xml rename to android/navi-common/src/main/res/drawable/navi_common_bottom_sheet_background.xml diff --git a/android/navi-common/src/main/res/drawable/navi_common_button_with_state_8dp_radius.xml b/android/navi-common/src/main/res/drawable/navi_common_button_with_state_8dp_radius.xml new file mode 100644 index 0000000000..4073aef97e --- /dev/null +++ b/android/navi-common/src/main/res/drawable/navi_common_button_with_state_8dp_radius.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/android/navi-common/src/main/res/drawable/chevron_purple_right.xml b/android/navi-common/src/main/res/drawable/navi_common_chevron_purple_right.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/chevron_purple_right.xml rename to android/navi-common/src/main/res/drawable/navi_common_chevron_purple_right.xml diff --git a/android/navi-common/src/main/res/drawable/dialog_box_background.xml b/android/navi-common/src/main/res/drawable/navi_common_dialog_box_background.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/dialog_box_background.xml rename to android/navi-common/src/main/res/drawable/navi_common_dialog_box_background.xml diff --git a/android/navi-common/src/main/res/drawable/divider_horizontal_24.xml b/android/navi-common/src/main/res/drawable/navi_common_divider_horizontal_24.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/divider_horizontal_24.xml rename to android/navi-common/src/main/res/drawable/navi_common_divider_horizontal_24.xml diff --git a/android/navi-common/src/main/res/drawable/face_top_left_bottom_right.xml b/android/navi-common/src/main/res/drawable/navi_common_face_top_left_bottom_right.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/face_top_left_bottom_right.xml rename to android/navi-common/src/main/res/drawable/navi_common_face_top_left_bottom_right.xml diff --git a/android/navi-common/src/main/res/drawable/face_top_right_bottom_left.xml b/android/navi-common/src/main/res/drawable/navi_common_face_top_right_bottom_left.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/face_top_right_bottom_left.xml rename to android/navi-common/src/main/res/drawable/navi_common_face_top_right_bottom_left.xml diff --git a/android/navi-common/src/main/res/drawable/help.xml b/android/navi-common/src/main/res/drawable/navi_common_help.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/help.xml rename to android/navi-common/src/main/res/drawable/navi_common_help.xml diff --git a/android/navi-common/src/main/res/drawable/ic_arrow_left_white_v2.xml b/android/navi-common/src/main/res/drawable/navi_common_ic_arrow_left_white_v2.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/ic_arrow_left_white_v2.xml rename to android/navi-common/src/main/res/drawable/navi_common_ic_arrow_left_white_v2.xml diff --git a/android/navi-common/src/main/res/drawable/ic_bg_circle.xml b/android/navi-common/src/main/res/drawable/navi_common_ic_bg_circle.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/ic_bg_circle.xml rename to android/navi-common/src/main/res/drawable/navi_common_ic_bg_circle.xml diff --git a/android/navi-common/src/main/res/drawable/ic_biller_placeholder.xml b/android/navi-common/src/main/res/drawable/navi_common_ic_biller_placeholder.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/ic_biller_placeholder.xml rename to android/navi-common/src/main/res/drawable/navi_common_ic_biller_placeholder.xml diff --git a/android/navi-common/src/main/res/drawable/ic_checked_circle_green.xml b/android/navi-common/src/main/res/drawable/navi_common_ic_checked_circle_green.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/ic_checked_circle_green.xml rename to android/navi-common/src/main/res/drawable/navi_common_ic_checked_circle_green.xml diff --git a/android/navi-common/src/main/res/drawable/ic_contact_permission.xml b/android/navi-common/src/main/res/drawable/navi_common_ic_contact_permission.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/ic_contact_permission.xml rename to android/navi-common/src/main/res/drawable/navi_common_ic_contact_permission.xml diff --git a/android/navi-common/src/main/res/drawable/ic_double_right_arrow.xml b/android/navi-common/src/main/res/drawable/navi_common_ic_double_right_arrow.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/ic_double_right_arrow.xml rename to android/navi-common/src/main/res/drawable/navi_common_ic_double_right_arrow.xml diff --git a/android/navi-common/src/main/res/drawable/ic_navi_logo_with_name.xml b/android/navi-common/src/main/res/drawable/navi_common_ic_navi_logo_with_name.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/ic_navi_logo_with_name.xml rename to android/navi-common/src/main/res/drawable/navi_common_ic_navi_logo_with_name.xml diff --git a/android/navi-common/src/main/res/drawable/ic_rupee_solid_green.xml b/android/navi-common/src/main/res/drawable/navi_common_ic_rupee_solid_green.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/ic_rupee_solid_green.xml rename to android/navi-common/src/main/res/drawable/navi_common_ic_rupee_solid_green.xml diff --git a/android/navi-common/src/main/res/drawable/ic_switch_camera.xml b/android/navi-common/src/main/res/drawable/navi_common_ic_switch_camera.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/ic_switch_camera.xml rename to android/navi-common/src/main/res/drawable/navi_common_ic_switch_camera.xml diff --git a/android/navi-common/src/main/res/drawable/increase_volume_bg.xml b/android/navi-common/src/main/res/drawable/navi_common_increase_volume_bg.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/increase_volume_bg.xml rename to android/navi-common/src/main/res/drawable/navi_common_increase_volume_bg.xml diff --git a/android/navi-common/src/main/res/drawable/instruction_bg.xml b/android/navi-common/src/main/res/drawable/navi_common_instruction_bg.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/instruction_bg.xml rename to android/navi-common/src/main/res/drawable/navi_common_instruction_bg.xml diff --git a/android/navi-common/src/main/res/drawable/rounded_rectangle_blue_8dp_radius.xml b/android/navi-common/src/main/res/drawable/navi_common_rounded_rectangle_blue_8dp_radius.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/rounded_rectangle_blue_8dp_radius.xml rename to android/navi-common/src/main/res/drawable/navi_common_rounded_rectangle_blue_8dp_radius.xml diff --git a/android/navi-common/src/main/res/drawable/rounded_rectangle_blue_disabled_8dp_radius.xml b/android/navi-common/src/main/res/drawable/navi_common_rounded_rectangle_blue_disabled_8dp_radius.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/rounded_rectangle_blue_disabled_8dp_radius.xml rename to android/navi-common/src/main/res/drawable/navi_common_rounded_rectangle_blue_disabled_8dp_radius.xml diff --git a/android/navi-common/src/main/res/drawable/support_category_invalid_category_placeholder_icon.xml b/android/navi-common/src/main/res/drawable/navi_common_support_category_invalid_category_placeholder_icon.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/support_category_invalid_category_placeholder_icon.xml rename to android/navi-common/src/main/res/drawable/navi_common_support_category_invalid_category_placeholder_icon.xml diff --git a/android/navi-common/src/main/res/drawable/transparent_green_border.xml b/android/navi-common/src/main/res/drawable/navi_common_transparent_green_border.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/transparent_green_border.xml rename to android/navi-common/src/main/res/drawable/navi_common_transparent_green_border.xml diff --git a/android/navi-common/src/main/res/drawable/transparent_green_border_with_radius.xml b/android/navi-common/src/main/res/drawable/navi_common_transparent_green_border_with_radius.xml similarity index 100% rename from android/navi-common/src/main/res/drawable/transparent_green_border_with_radius.xml rename to android/navi-common/src/main/res/drawable/navi_common_transparent_green_border_with_radius.xml diff --git a/android/navi-common/src/main/res/layout/activity_cross_sell_shimmer.xml b/android/navi-common/src/main/res/layout/activity_cross_sell_shimmer.xml index c589bdc5ba..2e4d3f2f25 100644 --- a/android/navi-common/src/main/res/layout/activity_cross_sell_shimmer.xml +++ b/android/navi-common/src/main/res/layout/activity_cross_sell_shimmer.xml @@ -19,7 +19,7 @@ android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginTop="@dimen/layout_dp_24" android:layout_marginEnd="@dimen/layout_dp_16" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -29,7 +29,7 @@ android:layout_height="@dimen/layout_dp_20" android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginTop="@dimen/layout_dp_42" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/viewContent1" /> @@ -40,7 +40,7 @@ android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginTop="@dimen/layout_dp_16" android:layout_marginEnd="@dimen/layout_dp_16" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/viewTitle" /> @@ -50,7 +50,7 @@ android:layout_height="@dimen/layout_dp_20" android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginTop="@dimen/layout_dp_42" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/viewContent2" /> @@ -61,7 +61,7 @@ android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginTop="@dimen/layout_dp_16" android:layout_marginEnd="@dimen/layout_dp_16" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/viewTitle1" /> @@ -80,7 +80,7 @@ android:layout_height="@dimen/layout_dp_20" android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginTop="@dimen/layout_dp_40" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/divider" /> @@ -92,7 +92,7 @@ android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginTop="@dimen/layout_dp_16" android:layout_marginEnd="@dimen/layout_dp_16" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/viewTitle3" /> diff --git a/android/navi-common/src/main/res/layout/base_dialog_box_layout.xml b/android/navi-common/src/main/res/layout/base_dialog_box_layout.xml index 53d3faa229..86c9cfaf71 100644 --- a/android/navi-common/src/main/res/layout/base_dialog_box_layout.xml +++ b/android/navi-common/src/main/res/layout/base_dialog_box_layout.xml @@ -19,7 +19,7 @@ android:id="@+id/container_fl" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/dialog_box_background" + android:background="@drawable/navi_common_dialog_box_background" tools:ignore="UselessParent"> + android:background="@drawable/navi_common_bottom_sheet_background"> diff --git a/android/navi-common/src/main/res/values/styles.xml b/android/navi-common/src/main/res/values/styles.xml index 3803983222..fb0b5caf68 100644 --- a/android/navi-common/src/main/res/values/styles.xml +++ b/android/navi-common/src/main/res/values/styles.xml @@ -1,11 +1,11 @@ - + @@ -164,8 +164,8 @@ @@ -845,7 +845,7 @@ \ No newline at end of file diff --git a/android/navi-hl/src/main/res/values/themes.xml b/android/navi-hl/src/main/res/values/themes.xml index 1beb6c1354..f132dc8724 100644 --- a/android/navi-hl/src/main/res/values/themes.xml +++ b/android/navi-hl/src/main/res/values/themes.xml @@ -1,4 +1,4 @@ - + diff --git a/android/navi-insurance/build.gradle b/android/navi-insurance/build.gradle index c1248376a6..eeae9c2f18 100644 --- a/android/navi-insurance/build.gradle +++ b/android/navi-insurance/build.gradle @@ -12,7 +12,7 @@ android { compileSdk 34 defaultConfig { - minSdk 23 + minSdk 24 targetSdk 34 consumerProguardFiles "consumer-rules.pro" diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/claim/IconUtil.kt b/android/navi-insurance/src/main/java/com/navi/insurance/claim/IconUtil.kt index c200d78658..3184aa201d 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/claim/IconUtil.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/claim/IconUtil.kt @@ -16,7 +16,7 @@ object IconUtil { fun getIconDrawableResource(iconCode: String?, defaultValue: Int = 0): Int { return when (iconCode) { "RIGHT_ARROW_ICON" -> DesignR.drawable.ic_arrow_forward_24dp - "NAVI_ICON" -> R.drawable.ic_navi_logo + "NAVI_ICON" -> R.drawable.navi_insurance_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 @@ -39,7 +39,7 @@ object IconUtil { "CIRCULAR_FILLED_WARNING_ICON" -> R.drawable.ic_yellow_warning "CIRCULAR_FILLED_DOC_LOCKED_ICON" -> R.drawable.ic_file_locked "CIRCULAR_FILLED_RUPEE_ICON" -> R.drawable.ic_rupee_grey - "CIRCULAR_FILLED_INFO_ICON" -> R.drawable.ic_info_grey + "CIRCULAR_FILLED_INFO_ICON" -> R.drawable.navi_insurance_ic_info_grey "CIRCULAR_FILLED_INFO_BLUE_ICON" -> R.drawable.gi_ic_info_layered_blue_white "BACK_ARROW_WITH_TAIL" -> R.drawable.ic_back_arrow_with_tail "DOC_ICON" -> R.drawable.ic_document_grey @@ -60,21 +60,21 @@ object IconUtil { "BILL_ICON" -> R.drawable.gi_ic_bill "STETHOSCOPE_ICON" -> R.drawable.gi_ic_sthethoscope_white "WALLET_ICON_WHITE" -> R.drawable.ic_wallet_white - "HELP_ICON" -> R.drawable.help + "HELP_ICON" -> R.drawable.navi_insurance_help "EXTERNAL_PORTING_ICON" -> R.drawable.gi_ic_external_porting "SUPER_TOP_UP_ICON" -> R.drawable.gi_ic_smart_health - "CIRCULAR_GREY_TICK_SMALL" -> R.drawable.ic_round_grey_tick - "ATTENTION_ICON" -> R.drawable.ic_attention + "CIRCULAR_GREY_TICK_SMALL" -> R.drawable.navi_insurance_ic_round_grey_tick + "ATTENTION_ICON" -> R.drawable.navi_insurance_ic_attention "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 + "RED_TEXT_HELP_ICON" -> R.drawable.navi_insurance_ic_purple_text_help_icon + "PURPLE_TEXT_HELP_ICON" -> R.drawable.navi_insurance_ic_purple_text_help_icon "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 "DOC_ICON_BLUE" -> R.drawable.ic_doc_icon_blue "RIGHT_ARROW_WHITE_ICON" -> R.drawable.gi_ic_right_arrow_white - "FORWARD_ARROW_ICON_BLACK" -> R.drawable.arrow_forward_black + "FORWARD_ARROW_ICON_BLACK" -> R.drawable.navi_insurance_arrow_forward_black "CIRCULAR_FILLED_ADD_DOCUMENT_ICON" -> R.drawable.gi_ic_circular_document_add "CIRCULAR_FILLED_FILE_CHECKED" -> R.drawable.gi_ic_circular_file_checked "REFRESH_ICON" -> R.drawable.gi_ic_refresh_grey_24dp @@ -87,7 +87,7 @@ object IconUtil { "RELATION_ICON_GREY" -> R.drawable.gi_ic_relation_grey "EDIT_ICON_NAVI_BLUE" -> R.drawable.gi_ic_edit_blue "CIRCULAR_FILLED_TASK_PLANNING_ICON" -> R.drawable.gi_ic_task_planning_blue - "CIRCULAR_OUTLINED_RUPEE_ICON" -> R.drawable.ic_rupee + "CIRCULAR_OUTLINED_RUPEE_ICON" -> R.drawable.navi_insurance_ic_rupee "CIRCULAR_OUTLINED_INFO_ICON" -> R.drawable.gi_ic_info_grey "OUTLINED_CALENDAR_ICON" -> R.drawable.ic_tenure "OUTLINED_PERSONS_ICON" -> R.drawable.people diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/claim/fragment/PolicySelectionBottomSheet.kt b/android/navi-insurance/src/main/java/com/navi/insurance/claim/fragment/PolicySelectionBottomSheet.kt index 35514d7667..73af41e779 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/claim/fragment/PolicySelectionBottomSheet.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/claim/fragment/PolicySelectionBottomSheet.kt @@ -29,7 +29,7 @@ import com.navi.insurance.common.util.ActionHandler import com.navi.insurance.common.util.IdProvider import com.navi.insurance.common.widgets.BaseNaviWidgetView import com.navi.insurance.common.widgets.replaceLayout -import com.navi.insurance.databinding.BottomSheetPolicySelectionBinding +import com.navi.insurance.databinding.NaviInsuranceBottomSheetPolicySelectionBinding import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject import kotlinx.coroutines.flow.collect @@ -38,7 +38,7 @@ import kotlinx.coroutines.launch @AndroidEntryPoint class PolicySelectionBottomSheet : GiBaseBottomSheet(), ActionHandler.ActionOwner { - private lateinit var binding: BottomSheetPolicySelectionBinding + private lateinit var binding: NaviInsuranceBottomSheetPolicySelectionBinding private val viewModel by viewModels() @Inject lateinit var idProvider: IdProvider @@ -46,7 +46,7 @@ class PolicySelectionBottomSheet : GiBaseBottomSheet(), ActionHandler.ActionOwne override fun getViewModel(): GiBaseVM = viewModel override fun setContainerView(viewStub: ViewStub) { - viewStub.layoutResource = R.layout.bottom_sheet_policy_selection + viewStub.layoutResource = R.layout.navi_insurance_bottom_sheet_policy_selection binding = DataBindingUtil.getBinding(viewStub.inflate())!! } diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/common/activity/UpdateAppActivity.kt b/android/navi-insurance/src/main/java/com/navi/insurance/common/activity/UpdateAppActivity.kt index 6b3cdf6258..b107f80a11 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/common/activity/UpdateAppActivity.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/common/activity/UpdateAppActivity.kt @@ -18,7 +18,7 @@ import com.navi.base.utils.orFalse import com.navi.insurance.R import com.navi.insurance.analytics.InsuranceAnalyticsConstants import com.navi.insurance.analytics.NaviInsuranceAnalytics -import com.navi.insurance.databinding.ActivityUpdateAppBinding +import com.navi.insurance.databinding.NaviInsuranceActivityUpdateAppBinding import com.navi.insurance.health.activity.BaseActivity import com.navi.insurance.models.response.AppUpgradeResponse import com.navi.insurance.util.Constants.APP_UPGRADE_EXTRA @@ -26,11 +26,11 @@ import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint class UpdateAppActivity : BaseActivity(), View.OnClickListener { - private lateinit var binding: ActivityUpdateAppBinding + private lateinit var binding: NaviInsuranceActivityUpdateAppBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - binding = DataBindingUtil.setContentView(this, R.layout.activity_update_app) + binding = DataBindingUtil.setContentView(this, R.layout.navi_insurance_activity_update_app) initListeners() initUi() } diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/common/fragment/BaseBottomSheet.kt b/android/navi-insurance/src/main/java/com/navi/insurance/common/fragment/BaseBottomSheet.kt index 2d89cbd51a..388356e1c7 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/common/fragment/BaseBottomSheet.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/common/fragment/BaseBottomSheet.kt @@ -135,8 +135,10 @@ abstract class BaseBottomSheet : NaviAnalyticsBaseBottomSheet() { fun setBottomSheetRadius(radius: Float) { val drawable = - ContextCompat.getDrawable(requireContext(), R.drawable.bottom_sheet_background) - as GradientDrawable + ContextCompat.getDrawable( + requireContext(), + R.drawable.navi_insurance_bottom_sheet_background + ) as GradientDrawable drawable.cornerRadii = floatArrayOf( dpToPx(requireContext(), radius), diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/common/widgets/NaviWidgetViewDataExt.kt b/android/navi-insurance/src/main/java/com/navi/insurance/common/widgets/NaviWidgetViewDataExt.kt index a90f6e8463..ba2f1261d6 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/common/widgets/NaviWidgetViewDataExt.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/common/widgets/NaviWidgetViewDataExt.kt @@ -9,7 +9,6 @@ package com.navi.insurance.common.widgets import android.graphics.Color import android.graphics.drawable.GradientDrawable -import android.os.Build import android.text.* import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan @@ -111,14 +110,7 @@ fun TextView.setData( visibility = textViewData?.let { textViewData.text?.run { text = this } - textViewData.htmlText?.run { - text = - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - Html.fromHtml(this, Html.FROM_HTML_MODE_COMPACT) - } else { - Html.fromHtml(this) - } - } + textViewData.htmlText?.run { text = Html.fromHtml(this, Html.FROM_HTML_MODE_COMPACT) } textViewData.styledText?.let { this.setTextFieldData(it) } textViewData.action ?.takeIf { textViewData.actionText.isNullOrEmpty() } diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/engagement/health_risk_score/fragment/HealthRiskLandingFragment.kt b/android/navi-insurance/src/main/java/com/navi/insurance/engagement/health_risk_score/fragment/HealthRiskLandingFragment.kt index dd07b290a2..17aa244d08 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/engagement/health_risk_score/fragment/HealthRiskLandingFragment.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/engagement/health_risk_score/fragment/HealthRiskLandingFragment.kt @@ -94,10 +94,10 @@ class HealthRiskLandingFragment : GiBaseFragment() { parentFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.fade_out, - R.anim.fade_in, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_fade_out, + R.anim.navi_insurance_fade_in, + R.anim.navi_insurance_slide_out_right ) .add( WidgetsR.id.fragment_container_fl, diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/BaseActivity.kt b/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/BaseActivity.kt index e328dd2c48..a4c35f690d 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/BaseActivity.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/BaseActivity.kt @@ -416,7 +416,10 @@ abstract class BaseActivity : NaviCoreActivity() { var transaction = supportFragmentManager .beginTransaction() - .setCustomAnimations(R.anim.fade_in, R.anim.fade_out) + .setCustomAnimations( + R.anim.navi_insurance_fade_in, + R.anim.navi_insurance_fade_out + ) if (fragment != null && fragment.isAdded) { transaction = transaction.hide(fragment) } diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/DashboardActivity.kt b/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/DashboardActivity.kt index 7c8589bffe..87322ec7ae 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/DashboardActivity.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/DashboardActivity.kt @@ -159,10 +159,10 @@ class DashboardActivity : supportFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .replace(R.id.form_fragment, makeClaimsFragment, MakeClaimsFragment.TAG) .commit() @@ -204,10 +204,10 @@ class DashboardActivity : supportFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .replace(R.id.form_fragment, emiCalendarFragment, EmiDetailsFragment.TAG) .commit() @@ -231,10 +231,10 @@ class DashboardActivity : supportFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .addToBackStack(InsuranceAnalyticsConstants.QUOTE_BENEFITS_SCREEN_V2) .replace(R.id.form_fragment, quoteBenefitsFragmentV2) @@ -315,10 +315,10 @@ class DashboardActivity : supportFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .add( R.id.form_fragment, @@ -333,10 +333,10 @@ class DashboardActivity : supportFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .add(R.id.form_fragment, EIAFormFragment(), EIAFormFragment.TAG) .addToBackStack(EIAFormFragment.TAG) diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/FaqActivity.kt b/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/FaqActivity.kt index 5606b3957d..e63f5b5cce 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/FaqActivity.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/FaqActivity.kt @@ -38,10 +38,10 @@ class FaqActivity : BaseActivity() { supportFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .add(R.id.faq_fragment, FaqFragment.newInstance(), FaqFragment.TAG) .commit() diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/PaymentActivity.kt b/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/PaymentActivity.kt index da03ec2535..38bb9ea5f0 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/PaymentActivity.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/PaymentActivity.kt @@ -1065,10 +1065,10 @@ class PaymentActivity : supportFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .replace(R.id.form_fragment, paymentSuccessFragment, PaymentSuccessFragment.TAG) .addToBackStack(PaymentSuccessFragment.TAG) @@ -1100,10 +1100,10 @@ class PaymentActivity : supportFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .replace(R.id.form_fragment, autoPayStatusFragment, AutoPayStatusFragment.TAG) .addToBackStack(AutoPayStatusFragment.TAG) @@ -1120,10 +1120,10 @@ class PaymentActivity : supportFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .replace( R.id.form_fragment, @@ -1172,10 +1172,10 @@ class PaymentActivity : supportFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .replace( R.id.form_fragment, @@ -1233,10 +1233,10 @@ class PaymentActivity : supportFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .replace( R.id.form_fragment, @@ -1324,10 +1324,10 @@ class PaymentActivity : supportFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .replace(R.id.form_fragment, autoPayStatusFragment, AutoPayStatusFragment.TAG) .addToBackStack(AutoPayStatusFragment.TAG) diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/health/card/HealthCardsFragment.kt b/android/navi-insurance/src/main/java/com/navi/insurance/health/card/HealthCardsFragment.kt index 8a7015d5ef..0b438efa94 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/health/card/HealthCardsFragment.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/health/card/HealthCardsFragment.kt @@ -232,7 +232,7 @@ class HealthCardsFragment : BaseFragment(), WidgetCallback { val layout = ShimmerFrameLayout(requireContext()) layout.addView( LayoutInflater.from(requireContext()) - .inflate(R.layout.shimmer_tab_layout, layout, false) + .inflate(R.layout.navi_insurance_shimmer_tab_layout, layout, false) ) AndroidView(modifier = Modifier.fillMaxSize().background(Color.White), factory = { layout }) } diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/HomeFragment.kt b/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/HomeFragment.kt index 1cf15479e8..bdfba2ba75 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/HomeFragment.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/HomeFragment.kt @@ -671,10 +671,10 @@ class HomeFragment : parentFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .replace( R.id.form_fragment, @@ -1618,10 +1618,10 @@ class HomeFragment : parentFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .replace( R.id.form_fragment, @@ -1638,10 +1638,10 @@ class HomeFragment : parentFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .hide(this) .add(R.id.form_fragment, policyDocFragment, "policy_doc_fragment") @@ -1655,10 +1655,10 @@ class HomeFragment : parentFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .hide(this@HomeFragment) .add(R.id.form_fragment, makeClaimsFragment, MakeClaimsFragment.TAG) @@ -1677,10 +1677,10 @@ class HomeFragment : parentFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .hide(this) .add(R.id.form_fragment, healthCardsFragment, "health_cards_fragment") @@ -1810,10 +1810,10 @@ class HomeFragment : parentFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .replace(R.id.form_fragment, webViewFragment, WebViewFragment.TAG) .addToBackStack(WebViewFragment.TAG) @@ -1984,10 +1984,10 @@ class HomeFragment : parentFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .replace(R.id.form_fragment, fragment, PolicySelectionFragment.TAG) .addToBackStack(PolicySelectionFragment.TAG) diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/OfferFragmentPremiumDetailsBottomSheet.kt b/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/OfferFragmentPremiumDetailsBottomSheet.kt index eb0dc1f0d6..e864ab295d 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/OfferFragmentPremiumDetailsBottomSheet.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/OfferFragmentPremiumDetailsBottomSheet.kt @@ -197,7 +197,11 @@ class OfferFragmentPremiumDetailsBottomSheet : BaseBottomSheet() { if (premiumDetailsData?.paymentOption?.paymentMode == Constants.SUBSCRIPTION_PAYMENT) { // grey divider val divider = - layoutInflater.inflate(R.layout.grey_divider, binding.paymentDataLl, false) + layoutInflater.inflate( + R.layout.navi_insurance_grey_divider, + binding.paymentDataLl, + false + ) binding.paymentDataLl.addView(divider) diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PaymentAttentionBottomSheet.kt b/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PaymentAttentionBottomSheet.kt index 32e82d0d29..51cbd7953f 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PaymentAttentionBottomSheet.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PaymentAttentionBottomSheet.kt @@ -135,7 +135,7 @@ class PaymentAttentionBottomSheet : BaseBottomSheet() { if (resId != -1) { binding.topIcon.setImageResource(resId) } else { - binding.topIcon.setImageResource(R.drawable.ic_attention) + binding.topIcon.setImageResource(R.drawable.navi_insurance_ic_attention) } binding.closeBtn.text = data.cta?.title @@ -182,7 +182,7 @@ class PaymentAttentionBottomSheet : BaseBottomSheet() { val itemView = item.body?.let { getItemView(it) } itemView?.let { binding.itemsLayout.addView(it) } } - binding.topIcon.setImageResource(R.drawable.ic_attention) + binding.topIcon.setImageResource(R.drawable.navi_insurance_ic_attention) binding.closeBtn.text = FirebaseRemoteConfigHelper.getString( GiFirebaseRemoteConfigConstants.TELEHRA_ATTENTION_SHEET_CTA @@ -263,7 +263,7 @@ class PaymentAttentionBottomSheet : BaseBottomSheet() { if (resId != -1) { itemViewBinding.iconIv.setImageResource(resId) } else { - itemViewBinding.iconIv.setImageResource(R.drawable.ic_round_grey_tick) + itemViewBinding.iconIv.setImageResource(R.drawable.navi_insurance_ic_round_grey_tick) } itemViewBinding.descriptionTv.text = item.description return itemViewBinding.root diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PaymentMethodSelectionFragment.kt b/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PaymentMethodSelectionFragment.kt index cfd0c56e5d..0c7937f876 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PaymentMethodSelectionFragment.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/PaymentMethodSelectionFragment.kt @@ -598,10 +598,10 @@ class PaymentMethodSelectionFragment : parentFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .replace(R.id.quote_content_view, questionAnswerFragment, QuoteQnAFragment.TAG) .addToBackStack(QuoteQnAFragment.TAG) @@ -925,10 +925,10 @@ class PaymentMethodSelectionFragment : parentFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .add( viewId, diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/QuoteQnAFragment.kt b/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/QuoteQnAFragment.kt index ac83e85ad5..a14e85b9c6 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/QuoteQnAFragment.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/QuoteQnAFragment.kt @@ -214,10 +214,10 @@ class QuoteQnAFragment : SupportQuestionAnswerFragment() { ?.supportFragmentManager ?.beginTransaction() ?.setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) ?.add( R.id.quote_content_view, diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/SupportHomeFragment.kt b/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/SupportHomeFragment.kt index d5f82d20b4..ab00c91ad3 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/SupportHomeFragment.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/SupportHomeFragment.kt @@ -166,10 +166,10 @@ class SupportHomeFragment : BaseFragment(), View.OnClickListener { parentFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .add( if (activity !is QuoteActivity) R.id.question_list_fragment @@ -189,10 +189,10 @@ class SupportHomeFragment : BaseFragment(), View.OnClickListener { parentFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .add( if (activity !is QuoteActivity) R.id.question_answer_fragment @@ -268,10 +268,10 @@ class SupportHomeFragment : BaseFragment(), View.OnClickListener { parentFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .add( if (activity !is QuoteActivity) R.id.question_list_fragment diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/SupportQuestionListFragment.kt b/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/SupportQuestionListFragment.kt index f3c6bfd28c..88a0013f90 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/SupportQuestionListFragment.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/SupportQuestionListFragment.kt @@ -1,6 +1,6 @@ /* * - * * Copyright © 2019-2022 by Navi Technologies Limited + * * Copyright © 2019-2024 by Navi Technologies Limited * * All rights reserved. Strictly confidential * */ @@ -163,10 +163,10 @@ class SupportQuestionListFragment : BaseFragment(), View.OnClickListener, OnQues ?.supportFragmentManager ?.beginTransaction() ?.setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) ?.add( if (activity !is QuoteActivity) R.id.question_list_fragment @@ -192,10 +192,10 @@ class SupportQuestionListFragment : BaseFragment(), View.OnClickListener, OnQues ?.supportFragmentManager ?.beginTransaction() ?.setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) ?.add( if (activity !is QuoteActivity) R.id.question_list_fragment diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/models/response/SupportHomeData.kt b/android/navi-insurance/src/main/java/com/navi/insurance/models/response/SupportHomeData.kt index c36aa97f30..48fc29af7e 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/models/response/SupportHomeData.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/models/response/SupportHomeData.kt @@ -45,7 +45,7 @@ data class Category( "claims_icon" -> R.drawable.support_category_claims_icon "renewals_icon" -> R.drawable.support_category_renewals_icon "renewals_icon_v2" -> R.drawable.support_category_renewals_icon_v2 - else -> R.drawable.support_category_invalid_category_placeholder_icon + else -> R.drawable.navi_insurance_support_category_invalid_category_placeholder_icon } } diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/policy/details/PolicyDetailsFragment.kt b/android/navi-insurance/src/main/java/com/navi/insurance/policy/details/PolicyDetailsFragment.kt index 096485c303..31b058ceeb 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/policy/details/PolicyDetailsFragment.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/policy/details/PolicyDetailsFragment.kt @@ -161,7 +161,7 @@ class PolicyDetailsFragment : BaseFragment(), WidgetCallback { val layout = ShimmerFrameLayout(requireContext()) layout.addView( LayoutInflater.from(requireContext()) - .inflate(R.layout.shimmer_tab_layout, layout, false) + .inflate(R.layout.navi_insurance_shimmer_tab_layout, layout, false) ) AndroidView( modifier = Modifier.fillMaxSize().background(Color.White), diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/OutlinedCheckWithDropDown.kt b/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/OutlinedCheckWithDropDown.kt index d15a96f5b8..b645072281 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/OutlinedCheckWithDropDown.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/OutlinedCheckWithDropDown.kt @@ -399,7 +399,10 @@ fun DetailsDropDownData( modifier = Modifier.align(Alignment.CenterVertically) .padding(top = LocalDimensions.current.dp4), - painter = painterResource(id = NaviWidgetR.drawable.chevron_purple_right), + painter = + painterResource( + id = NaviWidgetR.drawable.navi_widgets_chevron_purple_right + ), contentDescription = "" ) } @@ -441,7 +444,8 @@ fun GenderDropDownData( modifier = Modifier.align(Alignment.CenterVertically) .padding(start = LocalDimensions.current.dp5), - painter = painterResource(id = NaviWidgetR.drawable.chevron_purple_right), + painter = + painterResource(id = NaviWidgetR.drawable.navi_widgets_chevron_purple_right), contentDescription = "" ) } diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/QuoteActivity.kt b/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/QuoteActivity.kt index 9df88f0065..a74a9e799a 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/QuoteActivity.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/QuoteActivity.kt @@ -277,10 +277,10 @@ class QuoteActivity : !supportFragmentManager.isStateSaved && !supportFragmentManager.isDestroyed ) { fragmentTransaction.setCustomAnimations( - R.anim.slide_in_right, - R.anim.fade_out, - R.anim.fade_in, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_fade_out, + R.anim.navi_insurance_fade_in, + R.anim.navi_insurance_slide_out_right ) fragmentTransaction.replace(R.id.quote_content_view, fragment, tag) if (screen != Screen.OverviewScreen.value) { @@ -295,10 +295,10 @@ class QuoteActivity : val fragmentTransaction = supportFragmentManager.beginTransaction() if (!supportFragmentManager.isStateSaved && !supportFragmentManager.isDestroyed) { fragmentTransaction.setCustomAnimations( - R.anim.slide_in_right, - R.anim.fade_out, - R.anim.fade_in, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_fade_out, + R.anim.navi_insurance_fade_in, + R.anim.navi_insurance_slide_out_right ) fragmentTransaction.replace(R.id.quote_content_view, fragment, tag) if (screen != Screen.OverviewScreen.value) { @@ -683,10 +683,10 @@ class QuoteActivity : supportFragmentManager .beginTransaction() .setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) .replace(R.id.form_fragment, paymentErrorFragment, PaymentErrorFragment.TAG) .addToBackStack(PaymentErrorFragment.TAG) diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/PolicyBenefitsFragment.kt b/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/PolicyBenefitsFragment.kt index c24e4ae806..de88ab6723 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/PolicyBenefitsFragment.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/PolicyBenefitsFragment.kt @@ -239,10 +239,10 @@ class PolicyBenefitsFragment : BaseFragment(), WidgetCallback, View.OnClickListe ?.supportFragmentManager ?.beginTransaction() ?.setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) ?.add( R.id.quote_content_view, diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuoteMemberDetailsFragment.kt b/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuoteMemberDetailsFragment.kt index 1233c9fcb7..c36fe0a702 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuoteMemberDetailsFragment.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuoteMemberDetailsFragment.kt @@ -223,10 +223,10 @@ class QuoteMemberDetailsFragment : BaseFragment(), View.OnClickListener { ?.supportFragmentManager ?.beginTransaction() ?.setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) ?.add( R.id.quote_content_view, diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuoteOfferFragment.kt b/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuoteOfferFragment.kt index fb31360708..5be32f0b8e 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuoteOfferFragment.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuoteOfferFragment.kt @@ -1193,10 +1193,10 @@ class QuoteOfferFragment : BaseFragment(), WidgetCallback, View.OnClickListener ?.supportFragmentManager ?.beginTransaction() ?.setCustomAnimations( - R.anim.slide_in_right, - R.anim.slide_out_left, - R.anim.slide_in_left, - R.anim.slide_out_right + R.anim.navi_insurance_slide_in_right, + R.anim.navi_insurance_slide_out_left, + R.anim.navi_insurance_slide_in_left, + R.anim.navi_insurance_slide_out_right ) ?.add( R.id.quote_content_view, diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/renewal/ui/PremiumUpdatedPromptView.kt b/android/navi-insurance/src/main/java/com/navi/insurance/renewal/ui/PremiumUpdatedPromptView.kt index c9cb8097a4..ea66ed147d 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/renewal/ui/PremiumUpdatedPromptView.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/renewal/ui/PremiumUpdatedPromptView.kt @@ -9,7 +9,6 @@ package com.navi.insurance.renewal.ui import android.content.Context import android.graphics.Color -import android.os.Build import android.text.Html import android.util.AttributeSet import android.view.LayoutInflater @@ -39,12 +38,7 @@ constructor(context: Context, attrs: AttributeSet? = null) : CardView(context, a } fun setProperties(premiumUpdatePrompt: PremiumUpdatePrompt) { - binding.title.text = - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - Html.fromHtml(premiumUpdatePrompt.title, Html.FROM_HTML_MODE_COMPACT) - } else { - Html.fromHtml(premiumUpdatePrompt.title) - } + binding.title.text = Html.fromHtml(premiumUpdatePrompt.title, Html.FROM_HTML_MODE_COMPACT) if (isValidHexColor(premiumUpdatePrompt.color)) { binding.dummyBackground.setBackgroundColor(Color.parseColor(premiumUpdatePrompt.color)) } diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/util/AnimationUtils.kt b/android/navi-insurance/src/main/java/com/navi/insurance/util/AnimationUtils.kt index 4aa880fe2b..1a05326d1d 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/util/AnimationUtils.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/util/AnimationUtils.kt @@ -75,7 +75,7 @@ fun collapse(v: View, duration: Int, targetHeight: Int, prevHeight: Int = v.heig } fun fadeIn(view: View?, callback: () -> Unit = {}) { - inAnimation(R.anim.fade_in, view, callback)?.let { view?.startAnimation(it) } + inAnimation(R.anim.navi_insurance_fade_in, view, callback)?.let { view?.startAnimation(it) } } fun zoomIn(view: View?, callback: () -> Unit = {}) { @@ -83,15 +83,21 @@ fun zoomIn(view: View?, callback: () -> Unit = {}) { } fun slideInBottom(view: View?, callback: () -> Unit = {}) { - inAnimation(R.anim.slide_in_bottom, view, callback)?.let { view?.startAnimation(it) } + inAnimation(R.anim.navi_insurance_slide_in_bottom, view, callback)?.let { + view?.startAnimation(it) + } } fun slideInRight(view: View?, callback: () -> Unit = {}) { - inAnimation(R.anim.slide_in_right, view, callback)?.let { view?.startAnimation(it) } + inAnimation(R.anim.navi_insurance_slide_in_right, view, callback)?.let { + view?.startAnimation(it) + } } fun slideInLeft(view: View?, callback: () -> Unit = {}) { - inAnimation(R.anim.slide_in_left, view, callback)?.let { view?.startAnimation(it) } + inAnimation(R.anim.navi_insurance_slide_in_left, view, callback)?.let { + view?.startAnimation(it) + } } fun slideInRightNoFade(view: View?, callback: () -> Unit = {}) { @@ -99,15 +105,19 @@ fun slideInRightNoFade(view: View?, callback: () -> Unit = {}) { } fun fadeOut(view: View?, callback: () -> Unit = {}) { - outAnimation(R.anim.fade_out, view, callback)?.let { view?.startAnimation(it) } + outAnimation(R.anim.navi_insurance_fade_out, view, callback)?.let { view?.startAnimation(it) } } fun slideOutLeft(view: View?, invisible: Boolean = false, callback: () -> Unit = {}) { - outAnimation(R.anim.slide_out_left, view, callback, invisible)?.let { view?.startAnimation(it) } + outAnimation(R.anim.navi_insurance_slide_out_left, view, callback, invisible)?.let { + view?.startAnimation(it) + } } fun slideOutRight(view: View?, callback: () -> Unit = {}) { - outAnimation(R.anim.slide_out_right, view, callback)?.let { view?.startAnimation(it) } + outAnimation(R.anim.navi_insurance_slide_out_right, view, callback)?.let { + view?.startAnimation(it) + } } fun slideOutRightNoFade(view: View?, callback: () -> Unit = {}) { @@ -115,7 +125,9 @@ fun slideOutRightNoFade(view: View?, callback: () -> Unit = {}) { } fun slideOutBottom(view: View?, callback: () -> Unit = {}) { - outAnimation(R.anim.slide_out_bottom, view, callback)?.let { view?.startAnimation(it) } + outAnimation(R.anim.navi_insurance_slide_out_bottom, view, callback)?.let { + view?.startAnimation(it) + } } fun inAnimation(id: Int, view: View?, callback: () -> Unit = {}): Animation? { diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/util/Utility.kt b/android/navi-insurance/src/main/java/com/navi/insurance/util/Utility.kt index bb5c8030be..17b90158ba 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/util/Utility.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/util/Utility.kt @@ -21,7 +21,6 @@ import android.graphics.drawable.GradientDrawable import android.graphics.drawable.VectorDrawable import android.net.ConnectivityManager import android.net.Uri -import android.os.Build import android.provider.Settings import android.text.Html import android.text.format.DateFormat @@ -285,12 +284,7 @@ fun disableButton(button: Button) { } fun getTrimmedHtmlText(stringHtml: String): CharSequence? { - val spannedHtml = - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - Html.fromHtml(stringHtml, Html.FROM_HTML_MODE_COMPACT) - } else { - Html.fromHtml(stringHtml) - } + val spannedHtml = Html.fromHtml(stringHtml, Html.FROM_HTML_MODE_COMPACT) return spannedHtml.trim() } @@ -525,13 +519,17 @@ fun RepoResult<*>.extractErrorDataTo(errorDetail: GiErrorMetaData) { fun slideViewFromBottom(view: View?) { if (view == null || view.visibility == View.VISIBLE) return - view.startAnimation(AnimationUtils.loadAnimation(view.context, R.anim.slide_in_bottom)) + view.startAnimation( + AnimationUtils.loadAnimation(view.context, R.anim.navi_insurance_slide_in_bottom) + ) view.visibility = View.VISIBLE } fun slideOutFromBottom(view: View?) { if (view == null || view.visibility == View.GONE) return - view.startAnimation(AnimationUtils.loadAnimation(view.context, R.anim.slide_out_bottom)) + view.startAnimation( + AnimationUtils.loadAnimation(view.context, R.anim.navi_insurance_slide_out_bottom) + ) view.visibility = View.GONE } diff --git a/android/navi-insurance/src/main/res/anim/ease_in_animation.xml b/android/navi-insurance/src/main/res/anim/navi_insurance_ease_in_animation.xml similarity index 100% rename from android/navi-insurance/src/main/res/anim/ease_in_animation.xml rename to android/navi-insurance/src/main/res/anim/navi_insurance_ease_in_animation.xml diff --git a/android/navi-insurance/src/main/res/anim/fade_in.xml b/android/navi-insurance/src/main/res/anim/navi_insurance_fade_in.xml similarity index 100% rename from android/navi-insurance/src/main/res/anim/fade_in.xml rename to android/navi-insurance/src/main/res/anim/navi_insurance_fade_in.xml diff --git a/android/navi-insurance/src/main/res/anim/fade_out.xml b/android/navi-insurance/src/main/res/anim/navi_insurance_fade_out.xml similarity index 100% rename from android/navi-insurance/src/main/res/anim/fade_out.xml rename to android/navi-insurance/src/main/res/anim/navi_insurance_fade_out.xml diff --git a/android/navi-insurance/src/main/res/anim/slide_in_bottom.xml b/android/navi-insurance/src/main/res/anim/navi_insurance_slide_in_bottom.xml similarity index 100% rename from android/navi-insurance/src/main/res/anim/slide_in_bottom.xml rename to android/navi-insurance/src/main/res/anim/navi_insurance_slide_in_bottom.xml diff --git a/android/navi-insurance/src/main/res/anim/slide_in_left.xml b/android/navi-insurance/src/main/res/anim/navi_insurance_slide_in_left.xml similarity index 100% rename from android/navi-insurance/src/main/res/anim/slide_in_left.xml rename to android/navi-insurance/src/main/res/anim/navi_insurance_slide_in_left.xml diff --git a/android/navi-insurance/src/main/res/anim/slide_in_right.xml b/android/navi-insurance/src/main/res/anim/navi_insurance_slide_in_right.xml similarity index 100% rename from android/navi-insurance/src/main/res/anim/slide_in_right.xml rename to android/navi-insurance/src/main/res/anim/navi_insurance_slide_in_right.xml diff --git a/android/navi-insurance/src/main/res/anim/slide_out_bottom.xml b/android/navi-insurance/src/main/res/anim/navi_insurance_slide_out_bottom.xml similarity index 100% rename from android/navi-insurance/src/main/res/anim/slide_out_bottom.xml rename to android/navi-insurance/src/main/res/anim/navi_insurance_slide_out_bottom.xml diff --git a/android/navi-insurance/src/main/res/anim/slide_out_left.xml b/android/navi-insurance/src/main/res/anim/navi_insurance_slide_out_left.xml similarity index 100% rename from android/navi-insurance/src/main/res/anim/slide_out_left.xml rename to android/navi-insurance/src/main/res/anim/navi_insurance_slide_out_left.xml diff --git a/android/navi-insurance/src/main/res/anim/slide_out_right.xml b/android/navi-insurance/src/main/res/anim/navi_insurance_slide_out_right.xml similarity index 100% rename from android/navi-insurance/src/main/res/anim/slide_out_right.xml rename to android/navi-insurance/src/main/res/anim/navi_insurance_slide_out_right.xml diff --git a/android/navi-insurance/src/main/res/drawable/button_light_grey_8dp_radius.xml b/android/navi-insurance/src/main/res/drawable/button_light_grey_8dp_radius.xml index 194428ef1b..d2dcfe423e 100644 --- a/android/navi-insurance/src/main/res/drawable/button_light_grey_8dp_radius.xml +++ b/android/navi-insurance/src/main/res/drawable/button_light_grey_8dp_radius.xml @@ -6,7 +6,7 @@ --> - - - + + + \ No newline at end of file diff --git a/android/navi-insurance/src/main/res/drawable/button_register.xml b/android/navi-insurance/src/main/res/drawable/button_register.xml index 81edba40e5..75a0edd431 100644 --- a/android/navi-insurance/src/main/res/drawable/button_register.xml +++ b/android/navi-insurance/src/main/res/drawable/button_register.xml @@ -6,8 +6,8 @@ --> - - + + - + \ No newline at end of file diff --git a/android/navi-insurance/src/main/res/drawable/button_with_state_8dp_radius.xml b/android/navi-insurance/src/main/res/drawable/button_with_state_8dp_radius.xml deleted file mode 100644 index e7146791e8..0000000000 --- a/android/navi-insurance/src/main/res/drawable/button_with_state_8dp_radius.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/android/navi-insurance/src/main/res/drawable/arrow_forward.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_arrow_forward.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/arrow_forward.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_arrow_forward.xml diff --git a/android/navi-insurance/src/main/res/drawable/arrow_forward_black.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_arrow_forward_black.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/arrow_forward_black.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_arrow_forward_black.xml diff --git a/android/navi-insurance/src/main/res/drawable/bottom_sheet_background.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_bottom_sheet_background.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/bottom_sheet_background.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_bottom_sheet_background.xml diff --git a/android/navi-insurance/src/main/res/drawable/navi_insurance_button_with_state_8dp_radius.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_button_with_state_8dp_radius.xml new file mode 100644 index 0000000000..47c716d097 --- /dev/null +++ b/android/navi-insurance/src/main/res/drawable/navi_insurance_button_with_state_8dp_radius.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/android/navi-insurance/src/main/res/drawable/help.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_help.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/help.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_help.xml diff --git a/android/navi-insurance/src/main/res/drawable/ic_alert_yellow.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_ic_alert_yellow.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/ic_alert_yellow.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_ic_alert_yellow.xml diff --git a/android/navi-insurance/src/main/res/drawable/ic_attention.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_ic_attention.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/ic_attention.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_ic_attention.xml diff --git a/android/navi-insurance/src/main/res/drawable/ic_close_grey_svg.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_ic_close_grey_svg.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/ic_close_grey_svg.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_ic_close_grey_svg.xml diff --git a/android/navi-insurance/src/main/res/drawable/ic_info_grey.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_ic_info_grey.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/ic_info_grey.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_ic_info_grey.xml diff --git a/android/navi-insurance/src/main/res/drawable/ic_info_yellow.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_ic_info_yellow.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/ic_info_yellow.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_ic_info_yellow.xml diff --git a/android/navi-insurance/src/main/res/drawable/ic_money_bag.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_ic_money_bag.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/ic_money_bag.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_ic_money_bag.xml diff --git a/android/navi-insurance/src/main/res/drawable/ic_navi_logo.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_ic_navi_logo.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/ic_navi_logo.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_ic_navi_logo.xml diff --git a/android/navi-insurance/src/main/res/drawable/ic_notification.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_ic_notification.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/ic_notification.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_ic_notification.xml diff --git a/android/navi-insurance/src/main/res/drawable/ic_purple_text_help_icon.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_ic_purple_text_help_icon.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/ic_purple_text_help_icon.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_ic_purple_text_help_icon.xml diff --git a/android/navi-insurance/src/main/res/drawable/ic_round_grey_tick.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_ic_round_grey_tick.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/ic_round_grey_tick.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_ic_round_grey_tick.xml diff --git a/android/navi-insurance/src/main/res/drawable/ic_rupee.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_ic_rupee.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/ic_rupee.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_ic_rupee.xml diff --git a/android/navi-insurance/src/main/res/drawable/rounded_8dp_light_grey_rect.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_rounded_8dp_light_grey_rect.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/rounded_8dp_light_grey_rect.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_rounded_8dp_light_grey_rect.xml diff --git a/android/navi-insurance/src/main/res/drawable/rounded_rectangle_blue_8dp_radius.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_rounded_rectangle_blue_8dp_radius.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/rounded_rectangle_blue_8dp_radius.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_rounded_rectangle_blue_8dp_radius.xml diff --git a/android/navi-insurance/src/main/res/drawable/rounded_rectangle_blue_disabled_8dp_radius.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_rounded_rectangle_blue_disabled_8dp_radius.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/rounded_rectangle_blue_disabled_8dp_radius.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_rounded_rectangle_blue_disabled_8dp_radius.xml diff --git a/android/navi-insurance/src/main/res/drawable/spinner_background.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_spinner_background.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/spinner_background.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_spinner_background.xml diff --git a/android/navi-insurance/src/main/res/drawable/support_category_invalid_category_placeholder_icon.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_support_category_invalid_category_placeholder_icon.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/support_category_invalid_category_placeholder_icon.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_support_category_invalid_category_placeholder_icon.xml diff --git a/android/navi-insurance/src/main/res/drawable/tab_selector.xml b/android/navi-insurance/src/main/res/drawable/navi_insurance_tab_selector.xml similarity index 100% rename from android/navi-insurance/src/main/res/drawable/tab_selector.xml rename to android/navi-insurance/src/main/res/drawable/navi_insurance_tab_selector.xml diff --git a/android/navi-insurance/src/main/res/layout/activity_splash_screen.xml b/android/navi-insurance/src/main/res/layout/activity_splash_screen.xml index cdfcd833c8..27b8a0e24b 100644 --- a/android/navi-insurance/src/main/res/layout/activity_splash_screen.xml +++ b/android/navi-insurance/src/main/res/layout/activity_splash_screen.xml @@ -49,7 +49,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:drawableTop="@drawable/ic_money_bag" + android:drawableTop="@drawable/navi_insurance_ic_money_bag" android:drawablePadding="10dp" android:fontFamily="@font/tt_regular" android:text="₹ 27 Cr+ \nClaims Settled" diff --git a/android/navi-insurance/src/main/res/layout/apology_fragment.xml b/android/navi-insurance/src/main/res/layout/apology_fragment.xml index 4f58b5bc75..f5a7aa9e8c 100644 --- a/android/navi-insurance/src/main/res/layout/apology_fragment.xml +++ b/android/navi-insurance/src/main/res/layout/apology_fragment.xml @@ -63,7 +63,7 @@ android:layout_marginEnd="@dimen/dp_20" android:clickable="true" android:focusable="true" - android:src="@drawable/ic_purple_text_help_icon" + android:src="@drawable/navi_insurance_ic_purple_text_help_icon" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/android/navi-insurance/src/main/res/layout/bottom_rating_view.xml b/android/navi-insurance/src/main/res/layout/bottom_rating_view.xml index d43ed88d20..af796c56d2 100644 --- a/android/navi-insurance/src/main/res/layout/bottom_rating_view.xml +++ b/android/navi-insurance/src/main/res/layout/bottom_rating_view.xml @@ -72,7 +72,7 @@ android:layout_marginTop="@dimen/dp_25" android:layout_marginEnd="@dimen/dp_30" android:layout_marginBottom="@dimen/dp_16" - android:background="@drawable/button_with_state_8dp_radius" + android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:fontFamily="@font/tt_medium" android:text="@string/submit_rating" android:textAllCaps="false" diff --git a/android/navi-insurance/src/main/res/layout/card_feedback.xml b/android/navi-insurance/src/main/res/layout/card_feedback.xml index aa609254b4..c283f5ea1f 100644 --- a/android/navi-insurance/src/main/res/layout/card_feedback.xml +++ b/android/navi-insurance/src/main/res/layout/card_feedback.xml @@ -96,7 +96,7 @@ android:layout_gravity="start" android:layout_marginStart="20dp" android:layout_weight="1" - android:background="@drawable/button_with_state_8dp_radius" + android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clipToPadding="false" android:fontFamily="@font/tt_regular" android:gravity="center" diff --git a/android/navi-insurance/src/main/res/layout/card_policy.xml b/android/navi-insurance/src/main/res/layout/card_policy.xml index ca6afa6cc2..57daafc9e5 100644 --- a/android/navi-insurance/src/main/res/layout/card_policy.xml +++ b/android/navi-insurance/src/main/res/layout/card_policy.xml @@ -124,7 +124,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_12" - android:drawableEnd="@drawable/arrow_forward" + android:drawableEnd="@drawable/navi_insurance_arrow_forward" android:drawablePadding="@dimen/dp_8" android:fontFamily="@font/tt_medium" android:textColor="@color/white" diff --git a/android/navi-insurance/src/main/res/layout/card_policy_cover.xml b/android/navi-insurance/src/main/res/layout/card_policy_cover.xml index 0038298a7b..65c814214d 100644 --- a/android/navi-insurance/src/main/res/layout/card_policy_cover.xml +++ b/android/navi-insurance/src/main/res/layout/card_policy_cover.xml @@ -80,7 +80,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/item_content" - app:srcCompat="@drawable/arrow_forward"/> + app:srcCompat="@drawable/navi_insurance_arrow_forward"/> + app:srcCompat="@drawable/navi_insurance_arrow_forward"/> diff --git a/android/navi-insurance/src/main/res/layout/card_support_question_label.xml b/android/navi-insurance/src/main/res/layout/card_support_question_label.xml index 220cbedc88..6d8223cd0e 100644 --- a/android/navi-insurance/src/main/res/layout/card_support_question_label.xml +++ b/android/navi-insurance/src/main/res/layout/card_support_question_label.xml @@ -37,7 +37,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginEnd="@dimen/dp_16" - android:src="@drawable/arrow_forward_black" + android:src="@drawable/navi_insurance_arrow_forward_black" android:tag="header" android:gravity="center_vertical" android:padding="2dp" /> diff --git a/android/navi-insurance/src/main/res/layout/content_header_description_chevron_item.xml b/android/navi-insurance/src/main/res/layout/content_header_description_chevron_item.xml index 1b7158993e..9079bf7656 100644 --- a/android/navi-insurance/src/main/res/layout/content_header_description_chevron_item.xml +++ b/android/navi-insurance/src/main/res/layout/content_header_description_chevron_item.xml @@ -46,7 +46,7 @@ android:id="@+id/chevron_iv" android:layout_width="@dimen/dp_12" android:layout_height="@dimen/dp_12" - android:src="@drawable/arrow_forward_black" + android:src="@drawable/navi_insurance_arrow_forward_black" app:layout_constraintBottom_toBottomOf="@+id/status_tv" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/title_tv" /> diff --git a/android/navi-insurance/src/main/res/layout/conversational_form_complete.xml b/android/navi-insurance/src/main/res/layout/conversational_form_complete.xml index e44c9636bc..1ea27bc6ac 100644 --- a/android/navi-insurance/src/main/res/layout/conversational_form_complete.xml +++ b/android/navi-insurance/src/main/res/layout/conversational_form_complete.xml @@ -60,7 +60,7 @@ android:layout_height="50dp" android:layout_gravity="center" android:layout_marginTop="24dp" - android:background="@drawable/rounded_rectangle_blue_8dp_radius" + android:background="@drawable/navi_insurance_rounded_rectangle_blue_8dp_radius" android:clickable="true" android:fontFamily="@font/tt_regular" android:gravity="center" @@ -86,7 +86,7 @@ android:layout_height="50dp" android:layout_gravity="center" android:layout_marginTop="24dp" - android:background="@drawable/rounded_rectangle_blue_8dp_radius" + android:background="@drawable/navi_insurance_rounded_rectangle_blue_8dp_radius" android:clickable="true" android:fontFamily="@font/tt_regular" android:gravity="center" diff --git a/android/navi-insurance/src/main/res/layout/conversational_form_continue_v2.xml b/android/navi-insurance/src/main/res/layout/conversational_form_continue_v2.xml index c32574863b..5b2e822f73 100644 --- a/android/navi-insurance/src/main/res/layout/conversational_form_continue_v2.xml +++ b/android/navi-insurance/src/main/res/layout/conversational_form_continue_v2.xml @@ -57,7 +57,7 @@ android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" - android:drawableEnd="@drawable/arrow_forward" + android:drawableEnd="@drawable/navi_insurance_arrow_forward" android:text="Continue" android:textAllCaps="false" android:textSize="14sp" /> diff --git a/android/navi-insurance/src/main/res/layout/conversational_form_diseases_details.xml b/android/navi-insurance/src/main/res/layout/conversational_form_diseases_details.xml index a6e375c7c3..8fef1c0d42 100644 --- a/android/navi-insurance/src/main/res/layout/conversational_form_diseases_details.xml +++ b/android/navi-insurance/src/main/res/layout/conversational_form_diseases_details.xml @@ -59,7 +59,7 @@ android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" - android:drawableEnd="@drawable/arrow_forward" + android:drawableEnd="@drawable/navi_insurance_arrow_forward" android:text="Enter more details" android:textAllCaps="false" android:textColor="@color/naviBlue" @@ -230,7 +230,7 @@ android:layout_marginStart="20dp" android:layout_marginEnd="20dp" android:layout_marginBottom="12dp" - android:layout_marginTop="12dp" android:background="@drawable/button_with_state_8dp_radius" + android:layout_marginTop="12dp" android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clickable="true" android:fontFamily="@font/tt_regular" android:gravity="center_horizontal|center_vertical" diff --git a/android/navi-insurance/src/main/res/layout/conversational_form_dynamic_yes_no_v2.xml b/android/navi-insurance/src/main/res/layout/conversational_form_dynamic_yes_no_v2.xml index ee14eb372e..98336b7ac1 100644 --- a/android/navi-insurance/src/main/res/layout/conversational_form_dynamic_yes_no_v2.xml +++ b/android/navi-insurance/src/main/res/layout/conversational_form_dynamic_yes_no_v2.xml @@ -41,7 +41,7 @@ - + @@ -62,7 +62,7 @@ - + diff --git a/android/navi-insurance/src/main/res/layout/conversational_form_input_unwell_members_names.xml b/android/navi-insurance/src/main/res/layout/conversational_form_input_unwell_members_names.xml index 2fd9af97d9..c8c7b611c2 100644 --- a/android/navi-insurance/src/main/res/layout/conversational_form_input_unwell_members_names.xml +++ b/android/navi-insurance/src/main/res/layout/conversational_form_input_unwell_members_names.xml @@ -59,7 +59,7 @@ android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" - android:drawableEnd="@drawable/arrow_forward" + android:drawableEnd="@drawable/navi_insurance_arrow_forward" android:text="Enter Names" android:textAllCaps="false" android:textColor="@color/naviBlue" @@ -233,7 +233,7 @@ android:layout_marginBottom="12dp" android:layout_marginTop="12dp" android:enabled="true" - android:background="@drawable/button_with_state_8dp_radius" + android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clickable="true" android:fontFamily="@font/tt_regular" android:gravity="center_horizontal|center_vertical" diff --git a/android/navi-insurance/src/main/res/layout/conversational_form_member_age_input_v2.xml b/android/navi-insurance/src/main/res/layout/conversational_form_member_age_input_v2.xml index d6368310f4..668187f47d 100644 --- a/android/navi-insurance/src/main/res/layout/conversational_form_member_age_input_v2.xml +++ b/android/navi-insurance/src/main/res/layout/conversational_form_member_age_input_v2.xml @@ -93,7 +93,7 @@ android:layout_marginEnd="20dp" android:layout_marginBottom="12dp" android:layout_marginTop="12dp" - android:background="@drawable/button_with_state_8dp_radius" + android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clickable="true" android:fontFamily="@font/tt_regular" android:gravity="center_horizontal|center_vertical" diff --git a/android/navi-insurance/src/main/res/layout/conversational_form_member_dob_input.xml b/android/navi-insurance/src/main/res/layout/conversational_form_member_dob_input.xml index 90929ed111..aba0e8ef7c 100644 --- a/android/navi-insurance/src/main/res/layout/conversational_form_member_dob_input.xml +++ b/android/navi-insurance/src/main/res/layout/conversational_form_member_dob_input.xml @@ -91,7 +91,7 @@ android:layout_marginEnd="20dp" android:layout_marginBottom="12dp" android:layout_marginTop="12dp" - android:background="@drawable/button_with_state_8dp_radius" + android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clickable="true" android:fontFamily="@font/tt_regular" android:gravity="center_horizontal|center_vertical" diff --git a/android/navi-insurance/src/main/res/layout/conversational_form_select_members.xml b/android/navi-insurance/src/main/res/layout/conversational_form_select_members.xml index 6975084654..c764fa6841 100644 --- a/android/navi-insurance/src/main/res/layout/conversational_form_select_members.xml +++ b/android/navi-insurance/src/main/res/layout/conversational_form_select_members.xml @@ -391,7 +391,7 @@ android:layout_height="match_parent" android:layout_gravity="center_vertical" android:layout_margin="10dp" - android:background="@drawable/button_with_state_8dp_radius" + android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clickable="true" android:fontFamily="@font/tt_regular" android:gravity="center_horizontal|center_vertical" diff --git a/android/navi-insurance/src/main/res/layout/conversational_form_select_members_v2.xml b/android/navi-insurance/src/main/res/layout/conversational_form_select_members_v2.xml index f556fa67a0..5fe5c67d50 100644 --- a/android/navi-insurance/src/main/res/layout/conversational_form_select_members_v2.xml +++ b/android/navi-insurance/src/main/res/layout/conversational_form_select_members_v2.xml @@ -43,7 +43,7 @@ android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" - android:drawableEnd="@drawable/arrow_forward" + android:drawableEnd="@drawable/navi_insurance_arrow_forward" android:text="Select family members" android:textAllCaps="false" android:textColor="@color/naviBlue" @@ -509,7 +509,7 @@ android:layout_marginStart="20dp" android:layout_marginEnd="20dp" android:layout_marginBottom="12dp" - android:layout_marginTop="12dp" android:background="@drawable/button_with_state_8dp_radius" + android:layout_marginTop="12dp" android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clickable="true" android:fontFamily="@font/tt_regular" android:gravity="center_horizontal|center_vertical" diff --git a/android/navi-insurance/src/main/res/layout/conversational_form_select_unwell_diseases.xml b/android/navi-insurance/src/main/res/layout/conversational_form_select_unwell_diseases.xml index b64048d6f1..e6834daece 100644 --- a/android/navi-insurance/src/main/res/layout/conversational_form_select_unwell_diseases.xml +++ b/android/navi-insurance/src/main/res/layout/conversational_form_select_unwell_diseases.xml @@ -59,7 +59,7 @@ android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" - android:drawableEnd="@drawable/arrow_forward" + android:drawableEnd="@drawable/navi_insurance_arrow_forward" android:text="Enter member’s pre-existing illness" android:textAllCaps="false" android:textColor="@color/naviBlue" @@ -164,7 +164,7 @@ android:layout_marginStart="20dp" android:layout_marginEnd="20dp" android:layout_marginBottom="12dp" - android:layout_marginTop="12dp" android:background="@drawable/button_with_state_8dp_radius" + android:layout_marginTop="12dp" android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clickable="true" android:fontFamily="@font/tt_regular" android:gravity="center_horizontal|center_vertical" diff --git a/android/navi-insurance/src/main/res/layout/conversational_form_select_unwell_members.xml b/android/navi-insurance/src/main/res/layout/conversational_form_select_unwell_members.xml index 801426e6e3..ee0e85b57d 100644 --- a/android/navi-insurance/src/main/res/layout/conversational_form_select_unwell_members.xml +++ b/android/navi-insurance/src/main/res/layout/conversational_form_select_unwell_members.xml @@ -59,7 +59,7 @@ android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" - android:drawableEnd="@drawable/arrow_forward" + android:drawableEnd="@drawable/navi_insurance_arrow_forward" android:text="Select members with health issues" android:textAllCaps="false" android:textColor="@color/naviBlue" @@ -230,7 +230,7 @@ android:layout_marginStart="20dp" android:layout_marginEnd="20dp" android:layout_marginBottom="12dp" - android:layout_marginTop="12dp" android:background="@drawable/button_with_state_8dp_radius" + android:layout_marginTop="12dp" android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clickable="true" android:fontFamily="@font/tt_regular" android:gravity="center_horizontal|center_vertical" diff --git a/android/navi-insurance/src/main/res/layout/conversational_form_size_select.xml b/android/navi-insurance/src/main/res/layout/conversational_form_size_select.xml index eef77e4213..dfbdf77f7e 100644 --- a/android/navi-insurance/src/main/res/layout/conversational_form_size_select.xml +++ b/android/navi-insurance/src/main/res/layout/conversational_form_size_select.xml @@ -90,7 +90,7 @@ android:layout_marginEnd="20dp" android:layout_marginBottom="12dp" android:layout_marginTop="12dp" - android:background="@drawable/button_with_state_8dp_radius" + android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clickable="true" android:fontFamily="@font/tt_regular" android:gravity="center_horizontal|center_vertical" diff --git a/android/navi-insurance/src/main/res/layout/conversational_form_yes_no_v2.xml b/android/navi-insurance/src/main/res/layout/conversational_form_yes_no_v2.xml index d7e29dfd75..c1aca06a07 100644 --- a/android/navi-insurance/src/main/res/layout/conversational_form_yes_no_v2.xml +++ b/android/navi-insurance/src/main/res/layout/conversational_form_yes_no_v2.xml @@ -44,7 +44,7 @@ android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" - android:drawableEnd="@drawable/arrow_forward" + android:drawableEnd="@drawable/navi_insurance_arrow_forward" android:text="Everyone is healthy" android:textAllCaps="false" android:textColor="@color/naviBlue" @@ -65,7 +65,7 @@ android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" - android:drawableEnd="@drawable/arrow_forward" + android:drawableEnd="@drawable/navi_insurance_arrow_forward" android:text="One or more have health issues" android:textAllCaps="false" android:textColor="@color/naviBlue" diff --git a/android/navi-insurance/src/main/res/layout/doc_picker_bottomsheet.xml b/android/navi-insurance/src/main/res/layout/doc_picker_bottomsheet.xml index ed8cfae713..cad8ea7645 100644 --- a/android/navi-insurance/src/main/res/layout/doc_picker_bottomsheet.xml +++ b/android/navi-insurance/src/main/res/layout/doc_picker_bottomsheet.xml @@ -23,7 +23,7 @@ android:layout_marginTop="@dimen/dp_2" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/title" - app:srcCompat="@drawable/ic_info_grey" + app:srcCompat="@drawable/navi_insurance_ic_info_grey" app:tint="@color/naviSubText" /> diff --git a/android/navi-insurance/src/main/res/layout/eia_form_item.xml b/android/navi-insurance/src/main/res/layout/eia_form_item.xml index 4ed4919541..59b04dd0ba 100644 --- a/android/navi-insurance/src/main/res/layout/eia_form_item.xml +++ b/android/navi-insurance/src/main/res/layout/eia_form_item.xml @@ -27,7 +27,7 @@ android:id="@+id/statusTextBackground" android:layout_width="wrap_content" android:layout_height="wrap_content" - tools:background="@drawable/rounded_rectangle_blue_8dp_radius" + tools:background="@drawable/navi_insurance_rounded_rectangle_blue_8dp_radius" android:textSize="@dimen/sp_12" tools:text="Verified" android:fontFamily="@font/tt_medium" diff --git a/android/navi-insurance/src/main/res/layout/error_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/error_bottom_sheet.xml index 551a5f590f..cf4519e512 100644 --- a/android/navi-insurance/src/main/res/layout/error_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/error_bottom_sheet.xml @@ -75,7 +75,7 @@ android:layout_height="@dimen/dp_60" android:layout_marginHorizontal="@dimen/dp_8" android:layout_weight="1" - android:background="@drawable/rounded_rectangle_blue_8dp_radius" + android:background="@drawable/navi_insurance_rounded_rectangle_blue_8dp_radius" android:textColor="@color/white" tools:text="Retry" /> diff --git a/android/navi-insurance/src/main/res/layout/footer_with_two_icon_widget.xml b/android/navi-insurance/src/main/res/layout/footer_with_two_icon_widget.xml index 09a7c5581a..1af3c6c3d1 100644 --- a/android/navi-insurance/src/main/res/layout/footer_with_two_icon_widget.xml +++ b/android/navi-insurance/src/main/res/layout/footer_with_two_icon_widget.xml @@ -24,7 +24,7 @@ android:layout_marginTop="@dimen/dp_26" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:src="@drawable/ic_navi_logo" /> + tools:src="@drawable/navi_insurance_ic_navi_logo" /> diff --git a/android/navi-insurance/src/main/res/layout/fragment_offers_v2_button.xml b/android/navi-insurance/src/main/res/layout/fragment_offers_v2_button.xml index b837908b94..479c159524 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_offers_v2_button.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_offers_v2_button.xml @@ -115,7 +115,7 @@ android:layout_marginEnd="@dimen/dp_14" android:background="@drawable/circle" android:padding="@dimen/dp_5" - android:src="@drawable/arrow_forward" /> + android:src="@drawable/navi_insurance_arrow_forward" /> diff --git a/android/navi-insurance/src/main/res/layout/fragment_request_policy_changes.xml b/android/navi-insurance/src/main/res/layout/fragment_request_policy_changes.xml index 2d4d697c94..7c2a44e58d 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_request_policy_changes.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_request_policy_changes.xml @@ -85,7 +85,7 @@ android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginTop="@dimen/dp_24" android:layout_marginBottom="@dimen/dp_32" - android:background="@drawable/button_with_state_8dp_radius" + android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:stateListAnimator="@null" android:text="@string/call_us_text" android:textAllCaps="false" diff --git a/android/navi-insurance/src/main/res/layout/fragment_support_question_answer.xml b/android/navi-insurance/src/main/res/layout/fragment_support_question_answer.xml index 1c75d46280..660be99ee6 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_support_question_answer.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_support_question_answer.xml @@ -254,7 +254,7 @@ android:layout_height="wrap_content" android:gravity="start|center_vertical" android:drawableStart="@drawable/email_black_icon" - android:drawableEnd="@drawable/arrow_forward" + android:drawableEnd="@drawable/navi_insurance_arrow_forward" android:drawablePadding="@dimen/layout_dp_8" android:paddingHorizontal="@dimen/dp_16" android:layout_marginTop="@dimen/layout_dp_8" @@ -276,7 +276,7 @@ android:layout_height="wrap_content" android:gravity="start|center_vertical" android:drawableStart="@drawable/call_black_icon" - android:drawableEnd="@drawable/arrow_forward" + android:drawableEnd="@drawable/navi_insurance_arrow_forward" android:drawablePadding="@dimen/layout_dp_8" android:paddingHorizontal="@dimen/dp_16" android:text="@string/call_us_text" diff --git a/android/navi-insurance/src/main/res/layout/gi_base_bottom_sheet_fragment.xml b/android/navi-insurance/src/main/res/layout/gi_base_bottom_sheet_fragment.xml index 567a11e22d..a6a10d8970 100644 --- a/android/navi-insurance/src/main/res/layout/gi_base_bottom_sheet_fragment.xml +++ b/android/navi-insurance/src/main/res/layout/gi_base_bottom_sheet_fragment.xml @@ -25,7 +25,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="12dp" - android:background="@drawable/bottom_sheet_background" + android:background="@drawable/navi_insurance_bottom_sheet_background" android:paddingTop="20dp"> + tools:src="@drawable/navi_insurance_ic_navi_logo" /> + tools:src="@drawable/navi_insurance_ic_navi_logo" /> @@ -167,7 +167,7 @@ android:scaleType="centerCrop" app:layoutHeight="@{smallerWidget ? @dimen/dp_32: @dimen/dp_34}" app:layoutWidth="@{smallerWidget ? @dimen/dp_32: @dimen/dp_34}" - tools:src="@drawable/ic_navi_logo" /> + tools:src="@drawable/navi_insurance_ic_navi_logo" /> diff --git a/android/navi-insurance/src/main/res/layout/item_payment_processing.xml b/android/navi-insurance/src/main/res/layout/item_payment_processing.xml index 22f6105d92..cdaee20588 100644 --- a/android/navi-insurance/src/main/res/layout/item_payment_processing.xml +++ b/android/navi-insurance/src/main/res/layout/item_payment_processing.xml @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" android:paddingStart="@dimen/dp_20" - android:drawableEnd="@drawable/ic_alert_yellow" + android:drawableEnd="@drawable/navi_insurance_ic_alert_yellow" android:drawablePadding="@dimen/dp_6" android:fontFamily="@font/tt_medium" android:gravity="start" diff --git a/android/navi-insurance/src/main/res/layout/landing_page_shimmer_placeholder.xml b/android/navi-insurance/src/main/res/layout/landing_page_shimmer_placeholder.xml index 645c3e593f..34108c5d65 100644 --- a/android/navi-insurance/src/main/res/layout/landing_page_shimmer_placeholder.xml +++ b/android/navi-insurance/src/main/res/layout/landing_page_shimmer_placeholder.xml @@ -18,7 +18,7 @@ android:layout_height="@dimen/layout_dp_20" android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginTop="@dimen/layout_dp_42" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -29,7 +29,7 @@ android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginTop="@dimen/layout_dp_24" android:layout_marginEnd="@dimen/layout_dp_16" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/viewTitle" /> @@ -40,7 +40,7 @@ android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginTop="@dimen/layout_dp_4" android:layout_marginEnd="@dimen/layout_dp_16" - android:background="@drawable/bg_grey_8dp_radius" + android:background="@drawable/navi_common_bg_grey_8dp_radius" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/viewContent1" /> diff --git a/android/navi-insurance/src/main/res/layout/layout_autopay_setup_bottomsheet.xml b/android/navi-insurance/src/main/res/layout/layout_autopay_setup_bottomsheet.xml index ed29469b3d..ed02fa26c6 100644 --- a/android/navi-insurance/src/main/res/layout/layout_autopay_setup_bottomsheet.xml +++ b/android/navi-insurance/src/main/res/layout/layout_autopay_setup_bottomsheet.xml @@ -7,7 +7,7 @@ android:id="@+id/root_cl" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/bottom_sheet_background"> + android:background="@drawable/navi_insurance_bottom_sheet_background"> diff --git a/android/navi-insurance/src/main/res/layout/bottom_sheet_policy_selection.xml b/android/navi-insurance/src/main/res/layout/navi_insurance_bottom_sheet_policy_selection.xml similarity index 100% rename from android/navi-insurance/src/main/res/layout/bottom_sheet_policy_selection.xml rename to android/navi-insurance/src/main/res/layout/navi_insurance_bottom_sheet_policy_selection.xml diff --git a/android/navi-insurance/src/main/res/layout/grey_divider.xml b/android/navi-insurance/src/main/res/layout/navi_insurance_grey_divider.xml similarity index 100% rename from android/navi-insurance/src/main/res/layout/grey_divider.xml rename to android/navi-insurance/src/main/res/layout/navi_insurance_grey_divider.xml diff --git a/android/navi-insurance/src/main/res/layout/shimmer_tab_layout.xml b/android/navi-insurance/src/main/res/layout/navi_insurance_shimmer_tab_layout.xml similarity index 100% rename from android/navi-insurance/src/main/res/layout/shimmer_tab_layout.xml rename to android/navi-insurance/src/main/res/layout/navi_insurance_shimmer_tab_layout.xml diff --git a/android/navi-insurance/src/main/res/layout/navi_toolbar_view.xml b/android/navi-insurance/src/main/res/layout/navi_toolbar_view.xml index 1c425a7cf4..7b91e533d0 100644 --- a/android/navi-insurance/src/main/res/layout/navi_toolbar_view.xml +++ b/android/navi-insurance/src/main/res/layout/navi_toolbar_view.xml @@ -27,7 +27,7 @@ app:layout_constraintStart_toEndOf="@id/leftIcon" app:layout_constraintTop_toTopOf="parent" app:layout_goneMarginStart="@dimen/dp_12" - tools:src="@drawable/ic_navi_logo" + tools:src="@drawable/navi_insurance_ic_navi_logo" tools:visibility="visible" /> + android:src="@drawable/navi_insurance_arrow_forward" /> diff --git a/android/navi-insurance/src/main/res/layout/quote_header_view.xml b/android/navi-insurance/src/main/res/layout/quote_header_view.xml index f4e1ffc307..23724c3d95 100644 --- a/android/navi-insurance/src/main/res/layout/quote_header_view.xml +++ b/android/navi-insurance/src/main/res/layout/quote_header_view.xml @@ -37,7 +37,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" android:visibility="gone" - android:src="@drawable/ic_purple_text_help_icon" + android:src="@drawable/navi_insurance_ic_purple_text_help_icon" tools:visibility="visible" /> diff --git a/android/navi-insurance/src/main/res/layout/referral_card.xml b/android/navi-insurance/src/main/res/layout/referral_card.xml index 729cb21d6f..0aee815afa 100644 --- a/android/navi-insurance/src/main/res/layout/referral_card.xml +++ b/android/navi-insurance/src/main/res/layout/referral_card.xml @@ -54,7 +54,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="@dimen/dp_4" - android:src="@drawable/arrow_forward" + android:src="@drawable/navi_insurance_arrow_forward" app:layout_constraintBottom_toBottomOf="@id/refer_now" app:layout_constraintStart_toEndOf="@+id/refer_now" app:layout_constraintTop_toTopOf="@+id/refer_now" /> diff --git a/android/navi-insurance/src/main/res/layout/reset_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/reset_bottom_sheet.xml index c0ba49f63d..ea42df0482 100644 --- a/android/navi-insurance/src/main/res/layout/reset_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/reset_bottom_sheet.xml @@ -77,7 +77,7 @@ android:layout_gravity="start" android:layout_marginStart="@dimen/dp_20" android:layout_weight="1" - android:background="@drawable/button_with_state_8dp_radius" + android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clipToPadding="false" android:fontFamily="@font/tt_regular" android:gravity="center" diff --git a/android/navi-insurance/src/main/res/layout/shimmer_card_policy_cover_v2.xml b/android/navi-insurance/src/main/res/layout/shimmer_card_policy_cover_v2.xml index b6913ceed6..3032ded384 100644 --- a/android/navi-insurance/src/main/res/layout/shimmer_card_policy_cover_v2.xml +++ b/android/navi-insurance/src/main/res/layout/shimmer_card_policy_cover_v2.xml @@ -87,7 +87,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/item_content" - app:srcCompat="@drawable/arrow_forward"/> + app:srcCompat="@drawable/navi_insurance_arrow_forward"/> diff --git a/android/navi-insurance/src/main/res/layout/tele_hra_payment_status_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/tele_hra_payment_status_bottom_sheet.xml index db00d6329e..1afdcbf3e8 100644 --- a/android/navi-insurance/src/main/res/layout/tele_hra_payment_status_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/tele_hra_payment_status_bottom_sheet.xml @@ -183,7 +183,7 @@ android:layout_gravity="center_vertical" android:layout_marginTop="@dimen/dp_20" android:layout_weight="1" - android:background="@drawable/button_with_state_8dp_radius" + android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clickable="true" android:focusable="true" android:fontFamily="@font/tt_regular" diff --git a/android/navi-insurance/src/main/res/layout/whatsapp_disable_warning_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/whatsapp_disable_warning_bottom_sheet.xml index fc7ebc32ca..332e17103e 100644 --- a/android/navi-insurance/src/main/res/layout/whatsapp_disable_warning_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/whatsapp_disable_warning_bottom_sheet.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:adjustViewBounds="true" android:scaleType="fitCenter" - android:src="@drawable/ic_notification" /> + android:src="@drawable/navi_insurance_ic_notification" /> + tools:src="@drawable/navi_insurance_ic_info_grey" /> + tools:src="@drawable/navi_insurance_ic_info_grey" /> @color/white @dimen/sp_14 0.01 - @drawable/button_with_state_8dp_radius + @drawable/navi_insurance_button_with_state_8dp_radius - - - - \ No newline at end of file diff --git a/android/navi-rr/src/main/res/values-v23/styles.xml b/android/navi-rr/src/main/res/values-v23/styles.xml deleted file mode 100644 index e079a0a0e7..0000000000 --- a/android/navi-rr/src/main/res/values-v23/styles.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/android/navi-rr/src/main/res/values/styles.xml b/android/navi-rr/src/main/res/values/styles.xml index 3a5d3fe769..7a695396d5 100644 --- a/android/navi-rr/src/main/res/values/styles.xml +++ b/android/navi-rr/src/main/res/values/styles.xml @@ -1,14 +1,15 @@ - + +