From 0eee1bc5efc39c48d103f9e8085ee7f1bc2b13bd Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Tue, 26 Nov 2024 17:25:53 +0530 Subject: [PATCH] NTP-15317 | FontUtil Optimization (#13784) --- .../AccountAggregatorActivity.kt | 4 +- .../bottomSheets/ErrorBottomSheetContent.kt | 2 +- .../NotificationSettingsBottomSheetContent.kt | 2 +- .../PermissionSettingBottomSheet.kt | 4 +- .../ui/common/ScreenInformationText.kt | 2 +- .../ui/common/SwitchableSettingsContainer.kt | 2 +- .../ui/screens/AppSettingsMainScreen.kt | 2 +- .../appupdate/activities/UpdateAppActivity.kt | 2 +- .../naviapp/common/customview/OtpInputView.kt | 4 +- .../configuration/composable/NaviButton.kt | 8 +- .../composable/NaviHeaderView.kt | 12 +- .../composable/NaviOutlinedTextField.kt | 12 +- .../NaviTextFieldWithTitleAndButton.kt | 8 +- .../activities/AboutUsActivity.kt | 14 +- .../home/ui/footer/AppInstallSnackBar.kt | 12 +- .../home/ui/footer/BottomStickyNudgeUI.kt | 29 +- .../home/dashboard/ui/ClosedLoansFragment.kt | 4 +- .../home/dashboard/ui/DashboardFragment.kt | 4 +- .../java/com/naviapp/home/ui/CustomToast.kt | 8 +- .../ui/EmptyNotificationScreenRenderer.kt | 8 +- .../home/ui/NotificationBottomSheet.kt | 12 +- .../com/naviapp/home/ui/NotificationScreen.kt | 8 +- .../home/ui/NotificationScreenRenderer.kt | 30 +- .../home/ui/utils/NotificationUtils.kt | 7 +- .../com/naviapp/home/utils/HomePageUtils.kt | 10 +- .../fragments/CreditAssignmentFragment.kt | 2 +- .../common/LabeledInputTextWithButton.kt | 12 +- .../selfiecapture/SelfieVerificationHelper.kt | 6 +- .../fragment/BankDetailsPostKycFragment.kt | 7 +- .../fragments/BankDetailsV2Fragment.kt | 10 +- .../helper/BankDetailsV2Helper.kt | 4 +- .../manageLoan/composables/ManageLoanTab.kt | 10 +- .../screens/ReleaseLogCommonView.kt | 12 +- .../releaselog/screens/ReleaseLogScreen.kt | 28 +- .../nudge/ui/NudgeContainerExpandedState.kt | 8 +- .../screenOverlay/nudge/ui/NudgeMiddlePill.kt | 12 +- .../nudge/ui/nudgeUI/NudgeBackLayer.kt | 8 +- .../screenOverlay/popup/ui/CloseAllOption.kt | 6 +- .../composables/WebRedirectionScreen.kt | 20 +- .../action_button_v2_with_shimmer_view.xml | 2 +- .../layout/action_card_with_padding_view.xml | 6 +- ...ty_bank_account_verification_loader_v2.xml | 8 +- .../main/res/layout/activity_cross_sell.xml | 2 +- .../layout/activity_mandate_permission.xml | 4 +- .../res/layout/auto_debit_card_detail.xml | 2 +- .../res/layout/auto_debit_items_layout.xml | 4 +- .../res/layout/auto_pay_bank_details_view.xml | 8 +- .../res/layout/auto_pay_pending_v2_layout.xml | 4 +- .../res/layout/auto_pay_schedule_view.xml | 4 +- .../res/layout/auto_pay_schedule_view_v2.xml | 6 +- .../layout/auto_pay_verification_method.xml | 2 +- ...k_account_verification_loader_activity.xml | 2 +- .../layout/bank_details_post_kyc_fragment.xml | 4 +- .../res/layout/bank_details_v2_fragment.xml | 6 +- .../src/main/res/layout/bank_header_view.xml | 2 +- .../main/res/layout/bank_name_card_view.xml | 4 +- .../bank_search_suggested_result_view.xml | 4 +- .../main/res/layout/bottom_sheet_info_v3.xml | 8 +- .../layout/contact_permission_bottomsheet.xml | 4 +- .../layout/contact_search_select_fragment.xml | 6 +- .../res/layout/credit_assigment_fragment.xml | 16 +- .../src/main/res/layout/csat_bottom_sheet.xml | 2 +- .../app/src/main/res/layout/custom_toast.xml | 2 +- .../res/layout/daily_offer_bottom_sheet.xml | 8 +- .../layout/daily_offer_bottom_sheet_v2.xml | 8 +- .../dashboard_insurance_bottomsheet.xml | 6 +- .../dashboard_policy_payment_bottom_sheet.xml | 6 +- .../res/layout/dashboard_tab_item_layout.xml | 2 +- ...vider_with_image_title_subtitle_layout.xml | 2 +- .../res/layout/emi_calendar_header_layout.xml | 6 +- .../src/main/res/layout/emi_calendar_item.xml | 6 +- .../layout/emi_date_change_bottom_sheet.xml | 4 +- .../res/layout/emi_date_change_fragment.xml | 2 +- .../app/src/main/res/layout/emi_date_item.xml | 2 +- .../emi_method_selector_skip_mandate_v2.xml | 2 +- .../main/res/layout/emi_split_up_layout.xml | 6 +- .../res/layout/emi_table_view_item_v2.xml | 6 +- .../res/layout/emi_table_view_last_item.xml | 2 +- .../layout/emi_updated_calendar_fragment.xml | 8 +- .../src/main/res/layout/enach_steps_view.xml | 2 +- .../main/res/layout/enach_tutorial_steps.xml | 8 +- .../main/res/layout/error_v2_bottom_sheet.xml | 4 +- .../res/layout/exclamation_toast_layout.xml | 2 +- .../res/layout/expandable_title_desc_view.xml | 2 +- .../src/main/res/layout/footer_view_v2.xml | 18 +- .../footer_view_with_title_description.xml | 8 +- .../main/res/layout/fragment_closed_loans.xml | 2 +- .../res/layout/fragment_offer_in_review.xml | 2 +- .../layout/header_with_description_view.xml | 4 +- .../res/layout/horizontal_note_layout.xml | 4 +- .../res/layout/icon_text_steps_layout.xml | 6 +- .../src/main/res/layout/ifsc_v2_fragment.xml | 4 +- .../main/res/layout/important_note_layout.xml | 4 +- .../res/layout/info_bottom_sheet_layout.xml | 4 +- .../main/res/layout/info_bottomsheet_item.xml | 2 +- .../layout/input_with_error_label_view.xml | 2 +- .../input_with_label_and_error_label.xml | 4 +- .../main/res/layout/item_footer_kyc_v2.xml | 2 +- .../src/main/res/layout/kyc_document_item.xml | 2 +- .../layout/labeled_input_text_with_button.xml | 2 +- .../layout_document_dropdown_card_view.xml | 2 +- .../layout_dropdown_bottom_sheet_item.xml | 2 +- .../res/layout/layout_tnc_bottomsheet.xml | 2 +- .../left_icon_text_with_right_button.xml | 4 +- .../layout/loan_disbursement_success_view.xml | 4 +- .../main/res/layout/loan_emi_tenure_view.xml | 4 +- .../loan_offer_bottomsheet_data_row.xml | 4 +- .../loan_offer_stickiness_bottom_sheet.xml | 8 +- .../src/main/res/layout/login_fragment.xml | 2 +- .../mandatory_permission_banner_layout.xml | 4 +- .../mandatory_permission_denied_layout.xml | 4 +- .../src/main/res/layout/navi_header_view.xml | 2 +- .../res/layout/no_transactions_layout.xml | 2 +- .../res/layout/note_with_timer_v2_view.xml | 4 +- .../main/res/layout/note_with_timer_view.xml | 2 +- .../offer_improvement_card_view_layout_v2.xml | 8 +- .../res/layout/offer_upgrade_card_v2_view.xml | 4 +- .../res/layout/offer_upgrade_card_view.xml | 4 +- .../layout/offer_upgrade_info_bottomsheet.xml | 8 +- .../res/layout/offer_upgraded_card_layout.xml | 8 +- .../src/main/res/layout/otp_box_layout.xml | 2 +- .../app/src/main/res/layout/otp_fragment.xml | 2 +- .../res/layout/part_pre_payment_fragment.xml | 6 +- .../layout/part_prepayment_review_view.xml | 4 +- .../res/layout/penny_drop_attempts_layout.xml | 4 +- .../layout/penny_drop_attempts_v2_layout.xml | 4 +- .../penny_drop_failure_v2_bottom_sheet.xml | 6 +- .../res/layout/penny_error_bottom_sheet.xml | 6 +- .../res/layout/popular_bank_image_view.xml | 2 +- .../res/layout/radio_selector_item_view.xml | 4 +- .../main/res/layout/row_part_pre_payment.xml | 8 +- .../layout/row_part_pre_payment_header.xml | 6 +- .../main/res/layout/search_field_layout.xml | 2 +- .../res/layout/search_field_v2_layout.xml | 2 +- .../layout/security_text_with_icon_layout.xml | 2 +- .../layout/select_bank_row_header_item.xml | 2 +- .../main/res/layout/select_bank_v2_layout.xml | 2 +- .../main/res/layout/select_bank_v3_layout.xml | 2 +- .../res/layout/selected_contact_grid_item.xml | 4 +- .../res/layout/selector_tile_item_view.xml | 4 +- .../layout/set_up_mandate_benefits_view.xml | 6 +- .../res/layout/slider_with_tooltip_view.xml | 12 +- .../res/layout/styled_key_value_card_view.xml | 2 +- .../main/res/layout/styled_key_value_view.xml | 4 +- .../layout/styled_title_wtth_button_view.xml | 6 +- .../src/main/res/layout/summary_line_item.xml | 2 +- .../main/res/layout/text_and_image_row.xml | 2 +- .../layout/text_icon_view_with_tick_v2.xml | 2 +- .../res/layout/timer_with_loader_view.xml | 4 +- .../res/layout/title_with_button_view.xml | 6 +- .../res/layout/top_header_registration.xml | 2 +- .../src/main/res/layout/topup_info_view.xml | 12 +- .../main/res/layout/universal_bottomsheet.xml | 4 +- .../value_addition_card_key_value_view.xml | 8 +- .../src/main/res/layout/view_common_note.xml | 2 +- .../src/main/res/layout/view_coupon_apply.xml | 2 +- .../res/layout/view_cta_widget_layout.xml | 4 +- .../main/res/layout/view_key_value_item.xml | 4 +- .../res/layout/view_open_close_header.xml | 2 +- .../res/layout/view_radio_icon_custom.xml | 2 +- .../res/layout/view_text_symbol_item_v2.xml | 2 +- android/app/src/main/res/values/styles.xml | 206 ++++++------ .../navi/ap/common/renderer/CalendarWidget.kt | 6 +- .../pan/init/PLHyperVergePanInitStrategy.kt | 8 +- .../init/PLHyperVergeSelfieInitStrategy.kt | 6 +- .../screens/vkyc/ui/VKYCMeetingRoomScreen.kt | 16 +- .../res/layout/vkyc_meeting_room_screen.xml | 14 +- android/gradle/libs.versions.toml | 2 +- .../com/navi/amc/common/view/OptionsView.kt | 4 +- .../com/navi/amc/common/view/SwitchView.kt | 8 +- .../fragments/FundInformationFragment.kt | 11 +- .../fundbuy/fragments/FundListingFragment.kt | 6 +- .../fragments/FundListingFragmentV2.kt | 2 +- .../fragments/PaymentSummaryFragment.kt | 8 +- .../fundbuy/fragments/SipCalendarFragment.kt | 4 +- .../fundbuy/viewmodel/FundBuyV2ViewModel.kt | 2 +- .../fragments/MyInvestmentsFragment.kt | 4 +- .../amc/portfolio/fragments/OrdersFragment.kt | 2 +- .../src/main/res/layout/amc_button.xml | 2 +- .../res/layout/amc_reward_bottomsheet.xml | 2 +- .../res/layout/auto_debit_failed_card.xml | 2 +- .../src/main/res/layout/autopay_footer.xml | 4 +- .../layout/cutoff_time_bank_bottomsheet.xml | 2 +- .../src/main/res/layout/dynamic_footer.xml | 4 +- .../res/layout/empty_product_item_layout.xml | 8 +- .../src/main/res/layout/empty_state.xml | 2 +- .../src/main/res/layout/footer_btn.xml | 2 +- .../src/main/res/layout/footer_btn_v2.xml | 2 +- .../main/res/layout/fragment_auto_success.xml | 2 +- .../res/layout/fragment_fund_buying_v2.xml | 6 +- .../main/res/layout/fragment_signature.xml | 2 +- .../src/main/res/layout/fund_card_view.xml | 2 +- .../fund_detail_screen_expandable_layout.xml | 2 +- ...nd_details_compact_manager_info_layout.xml | 2 +- .../res/layout/fund_slider_with_tool_tip.xml | 8 +- .../main/res/layout/help_bottom_sheet_amc.xml | 2 +- .../res/layout/layout_permission_fragment.xml | 2 +- .../layout/list_item_progress_bottomsheet.xml | 2 +- .../src/main/res/layout/new_footer_layout.xml | 2 +- .../main/res/layout/overview_card_layout.xml | 2 +- .../main/res/layout/overview_icon_layout.xml | 4 +- .../src/main/res/layout/overview_layout.xml | 2 +- .../main/res/layout/payment_btn_layout.xml | 4 +- .../main/res/layout/permisson_type_layout.xml | 4 +- .../src/main/res/layout/reward_layout.xml | 4 +- .../res/layout/search_field_layout_amc.xml | 2 +- .../src/main/res/layout/sip_card_layout.xml | 2 +- .../src/main/res/layout/snackbar_layout.xml | 2 +- .../navi-amc/src/main/res/layout/tab_item.xml | 2 +- .../main/res/layout/view_help_menu_amc.xml | 2 +- .../navi-amc/src/main/res/values/themes.xml | 126 ++++---- .../ui/CreditCardNumberBottomSheetContent.kt | 8 +- .../ui/DropdownOptionsBottomSheetContent.kt | 8 +- .../navi/bbps/common/ui/NaviBbpsButtons.kt | 14 +- .../common/ui/NaviBbpsCommonComposable.kt | 64 ++-- .../ui/BillerListBottomSheetContent.kt | 8 +- .../feature/billerlist/ui/BillerListScreen.kt | 8 +- .../billerlist/ui/RenderBillerListScreen.kt | 28 +- .../MyBillDetailsMenuBottomSheetContent.kt | 6 +- .../ui/BillTransactionsListView.kt | 14 +- .../ui/MyBillHistoryDetailsScreen.kt | 10 +- ...illCategoriesCoinUtilisationComposables.kt | 44 +-- .../category/ui/BillCategoryScreenV2.kt | 28 +- .../category/ui/RenderBillCategoriesScreen.kt | 26 +- .../ui/ContactListBottomSheetContent.kt | 6 +- .../contactlist/ui/RenderContactListScreen.kt | 26 +- .../ui/CustomerDataInputScreen.kt | 10 +- .../mybills/ui/RenderEmptyMyBillsScreen.kt | 6 +- .../feature/mybills/ui/RenderMyBillsScreen.kt | 26 +- .../feature/paybill/ui/AmountTextField.kt | 12 +- .../ui/PayBillCoinUtilisationComposables.kt | 26 +- .../bbps/feature/paybill/ui/PayBillScreen.kt | 30 +- .../ui/RenderCreditCardPayBillScreen.kt | 34 +- .../feature/permission/ui/PermissionScreen.kt | 18 +- .../ui/PrepaidRechargeScreen.kt | 8 +- ...PrepaidRechargeScreenBottomSheetContent.kt | 16 +- .../ui/RenderPrepaidRechargeScreen.kt | 28 +- .../ui/BbpsPostPaymentScreen.kt | 48 +-- .../ui/BbpsPostPaymentScreenV2.kt | 62 ++-- .../ui/BbpsTransactionDetailsScreen.kt | 34 +- .../layout_bbps_share_transaction_details.xml | 22 +- .../layout_share_transaction_details_new.xml | 10 +- .../java/com/navi/chat/db/utils/ChatUtils.kt | 8 +- .../ui/activities/SupportScreenActivity.kt | 4 +- .../ui/adapters/SupportScreenFaqAdapter.kt | 4 +- .../chat/ui/compose/AttachmentPickerScreen.kt | 15 +- .../chat/ui/compose/NaviChatCommonViews.kt | 12 +- .../navi/chat/ui/compose/TicketCommonViews.kt | 16 +- .../com/navi/chat/ui/compose/TicketScreen.kt | 8 +- .../chat/ui/fragments/NaviChatFragment.kt | 8 +- .../layout/activity_navi_chat_view_video.xml | 4 +- .../res/layout/activity_support_screen.xml | 4 +- .../layout/chat_attachment_bottom_sheet.xml | 2 +- ...hat_call_status_wait_time_breach_nudge.xml | 2 +- .../chat_call_status_wait_time_nudge.xml | 2 +- .../layout/chat_resolution_bottom_sheet.xml | 8 +- .../main/res/layout/csat_option_layout.xml | 2 +- .../res/layout/cta_under_faq_bottom_sheet.xml | 4 +- .../faq_list_single_item_with_heading.xml | 4 +- .../res/layout/faq_recent_searches_view.xml | 2 +- .../main/res/layout/faq_search_empty_view.xml | 10 +- .../main/res/layout/faq_search_error_view.xml | 6 +- .../res/layout/faq_search_footer_section.xml | 4 +- .../res/layout/fragment_common_navi_chat.xml | 2 +- .../main/res/layout/fragment_faq_search.xml | 2 +- .../res/layout/fragment_navi_chat_csat.xml | 8 +- .../res/layout/fragment_navi_chat_error.xml | 4 +- .../main/res/layout/item_chat_attachment.xml | 2 +- .../res/layout/item_chat_exit_bottomsheet.xml | 2 +- .../src/main/res/layout/navi_chat_toolbar.xml | 2 +- .../network_error_video_faq_placeholder.xml | 4 +- .../layout/recent_search_option_layout.xml | 2 +- .../res/layout/spinner_dropdown_item_view.xml | 2 +- .../src/main/res/layout/spinner_item_view.xml | 2 +- .../navi-chat/src/main/res/values/styles.xml | 10 +- .../coin/ui/compose/common/CoinHistory.kt | 26 +- .../com/navi/coin/ui/compose/common/Common.kt | 12 +- .../compose/common/ScratchCardListRenderer.kt | 38 +-- .../ui/compose/screen/CoinHistoryScreen.kt | 6 +- .../ui/compose/screen/ReferralShareScreen.kt | 77 +++-- .../ui/compose/screen/RewardsShareScreen.kt | 48 +-- .../screen/ScratchCardHistoryScreen.kt | 10 +- .../java/com/navi/coin/utils/CommonUtils.kt | 6 +- .../common/customview/ButtonComposable.kt | 10 +- .../common/ui/dialog/NaviLockScreenDialog.kt | 16 +- .../errorview/FullScreenErrorComposeView.kt | 16 +- .../ui/fragment/ActionWarningFragment.kt | 6 +- .../uitron/util/UiTronDependencyProvider.kt | 5 +- .../java/com/navi/common/utils/CommonUtils.kt | 6 +- .../main/java/com/navi/common/utils/Ext.kt | 7 +- .../layout/account_aggregator_activity.xml | 2 +- .../main/res/layout/action_button_v2_view.xml | 2 +- .../main/res/layout/action_error_fragment.xml | 2 +- .../res/layout/action_error_fragment_v2.xml | 6 +- .../res/layout/action_warning_fragment.xml | 4 +- .../res/layout/csat_common_bottom_sheet.xml | 2 +- .../full_action_error_screen_fragment.xml | 6 +- .../src/main/res/layout/header_card_view.xml | 2 +- .../horizontal_action_error_fragment.xml | 2 +- .../layout/layout_rewards_announcement.xml | 2 +- .../layout/mandate_permission_type_layout.xml | 4 +- .../permission_mandate_banner_layout.xml | 4 +- .../res/layout/permission_type_layout.xml | 4 +- .../res/layout/search_field_item_layout.xml | 2 +- .../src/main/res/values/styles.xml | 54 ++-- .../com/navi/cycs/common/ui/CycsButtons.kt | 12 +- .../cycs/common/ui/CycsCommonComposable.kt | 12 +- .../ui/CycsFullScreenErrorComposeView.kt | 16 +- .../com/navi/cycs/feature/landing/Loader.kt | 6 +- .../cycs/feature/score/ScoreScreenHelper.kt | 8 +- .../trend/CycsTrendLineChartRenderer.kt | 20 +- .../calendar/view/NaviCalendarItemView.kt | 16 +- .../design/common/TextViewBindingAdapter.kt | 4 +- .../com/navi/design/editview/NaviEditText.kt | 1 + .../java/com/navi/design/font/FontUtil.kt | 120 +++++++ .../com/navi/design/font/FontWeightEnum.kt | 147 ++++++--- .../com/navi/design/snackbar/NaviSnackbar.kt | 8 +- .../com/navi/design/textview/NaviTextView.kt | 2 +- .../navi/design/textview/model/NaviSpan.kt | 2 +- .../com/navi/design/theme/ComposeFontUtil.kt | 100 ------ .../main/java/com/navi/design/theme/Type.kt | 53 +-- .../navi/design/utils/BindingAdapterUtils.kt | 2 +- .../main/java/com/navi/design/utils/Ext.kt | 38 ++- .../java/com/navi/design/utils/FontUtils.kt | 77 ----- ..._semi_bold.otf => navi_body_demi_bold.otf} | Bin .../{tt_regular.ttf => navi_body_regular.ttf} | Bin .../{tt_bold.otf => navi_headline_bold.otf} | Bin ...t_medium.ttf => navi_headline_regular.ttf} | Bin .../src/main/res/layout/tool_tip_view.xml | 2 +- .../src/main/res/values/styles.xml | 304 +++++++++--------- .../java/com/navi/design/ExampleUnitTest.kt | 23 -- .../com/navi/design/utils/FontUtilsKtTest.kt | 70 ---- .../res/layout/activity_digital_gold_home.xml | 2 +- .../res/layout/activity_digital_gold_sell.xml | 2 +- .../activity_digital_gold_transaction.xml | 2 +- .../res/layout/fragment_bank_details_gold.xml | 2 +- .../src/main/res/layout/fragment_blocker.xml | 2 +- .../res/layout/fragment_digital_gold_kyc.xml | 2 +- .../fragment_digital_gold_setup_sip.xml | 2 +- .../fragment_digital_gold_sip_details.xml | 2 +- .../main/res/layout/gold_pd_rpd_footer.xml | 4 +- .../icon_title_desc_bottomsheet_layout.xml | 2 +- .../layout_common_permission_fragment.xml | 4 +- .../main/res/layout/pd_rpd_options_layout.xml | 2 +- .../res/layout/search_field_layout_gold.xml | 2 +- .../res/layout/select_bank_layout_gold.xml | 2 +- .../navi-gold/src/main/res/values/styles.xml | 2 +- .../ui/TabbedMediatorNestedScrollView.kt | 6 +- .../bottom_sheet/TitleWithGridBottomSheet.kt | 9 +- .../fragment/IncentiviseAutopayFragment.kt | 12 +- .../common/widgets/NaviWidgetViewDataExt.kt | 8 +- .../fragment/HealthRiskQuestionFragment.kt | 10 +- .../composables/H1bacBottomSheetComposable.kt | 14 +- .../composables/HeaderComposable.kt | 8 +- .../composables/PdQuestionnaireScreen.kt | 30 +- .../composables/PdScoreScreenComposable.kt | 12 +- .../views/MultiSelectCheckboxWidgetView.kt | 6 +- .../formbase/views/MultiSelectWidgetView.kt | 8 +- .../views/SingleChoiceRadioItemView.kt | 6 +- .../views/TabWithPickerWidgetLayout.kt | 12 +- .../health/composables/HealthCardFooter.kt | 14 +- .../fragment/HospitalsSearchFragment.kt | 6 +- .../health/fragment/SupportHomeFragment.kt | 4 +- .../view/DividerItemComposable.kt | 2 +- .../view/ErrorItemComposable.kt | 6 +- .../view/HospitalItemComposable.kt | 18 +- .../view/HospitalPageComposable.kt | 21 +- .../view/HospitalTopSectionComposable.kt | 9 +- .../view/LocationItemComposable.kt | 5 +- .../view/LocationPageComposable.kt | 9 +- .../composables/OutlinedCheckWithDropDown.kt | 4 +- .../theme/PrePurchaseJourneyTypography.kt | 2 +- .../QuotePremiumDetailsBottomSheet.kt | 7 +- .../java/com/navi/insurance/util/Utility.kt | 4 +- .../src/main/res/layout/about_us.xml | 22 +- .../main/res/layout/action_button_layout.xml | 4 +- .../src/main/res/layout/activity_intro_v3.xml | 8 +- .../src/main/res/layout/activity_kyc.xml | 2 +- .../res/layout/activity_splash_screen.xml | 6 +- .../layout/address_details_page_layout.xml | 36 +-- .../src/main/res/layout/all_banks_item.xml | 2 +- .../amount_explainer_animation_widget.xml | 6 +- .../layout/amount_explainer_text_widget.xml | 6 +- .../layout/amount_selection_bottom_sheet.xml | 4 +- .../main/res/layout/answer_chat_message.xml | 4 +- .../src/main/res/layout/apology_fragment.xml | 4 +- .../layout/auto_pay_status_bottom_sheet.xml | 8 +- .../layout/autopay_from_quote_bottomsheet.xml | 2 +- .../autopay_setup_back_bottom_sheet.xml | 14 +- .../main/res/layout/bank_branches_item.xml | 4 +- .../res/layout/bank_search_bottom_sheet.xml | 10 +- .../layout/benefit_details_bottom_sheet.xml | 4 +- .../main/res/layout/bottom_rating_view.xml | 2 +- .../res/layout/bottom_sheet_add_member.xml | 2 +- .../main/res/layout/bottom_sheet_api_call.xml | 8 +- .../layout/bottom_sheet_edit_sum_insured.xml | 10 +- .../layout/bottom_sheet_existing_members.xml | 2 +- .../res/layout/bottom_sheet_payment_modes.xml | 2 +- .../res/layout/bottom_sheet_two_action.xml | 4 +- .../main/res/layout/bottomsheet_about_us.xml | 2 +- .../bottomsheet_header_and_text_lines.xml | 6 +- .../bottomsheet_request_callback_success.xml | 6 +- .../main/res/layout/box_edit_text_layout.xml | 2 +- .../res/layout/branch_search_bottom_sheet.xml | 4 +- .../main/res/layout/bullet_point_two_grid.xml | 4 +- .../main/res/layout/buy_insurance_card.xml | 4 +- .../res/layout/card_checkbox_list_item.xml | 2 +- .../layout/card_checkbox_unwell_member.xml | 2 +- .../src/main/res/layout/card_feedback.xml | 8 +- .../main/res/layout/card_feedback_success.xml | 8 +- .../main/res/layout/card_hospital_list_v2.xml | 4 +- .../src/main/res/layout/card_hospital_v2.xml | 4 +- .../layout/card_input_policy_mem_details.xml | 14 +- .../card_input_policy_nominee_details.xml | 36 +-- .../card_item_disease_detail_with_chip.xml | 2 +- .../src/main/res/layout/card_member_age.xml | 4 +- .../layout/card_planned_hospitalisation.xml | 2 +- .../src/main/res/layout/card_policy.xml | 38 +-- .../main/res/layout/card_policy_addon_v2.xml | 8 +- .../src/main/res/layout/card_policy_cover.xml | 4 +- .../main/res/layout/card_policy_cover_v2.xml | 4 +- .../main/res/layout/card_policy_member.xml | 22 +- .../main/res/layout/card_support_search.xml | 4 +- .../res/layout/card_with_items_and_footer.xml | 2 +- .../chat_backpress_edit_member_popup.xml | 8 +- .../circular_progress_bar_with_text.xml | 2 +- .../main/res/layout/claims_bottom_sheet.xml | 4 +- .../claims_terms_conditions_bottomsheet.xml | 2 +- .../res/layout/combined_insurance_card.xml | 4 +- .../main/res/layout/compare_plans_layout.xml | 16 +- ...ontent_header_description_chevron_item.xml | 4 +- .../conversation_form_porting_layout.xml | 4 +- .../layout/conversational_form_complete.xml | 10 +- .../layout/conversational_form_continue.xml | 2 +- .../conversational_form_continue_v2.xml | 4 +- .../conversational_form_diseases_details.xml | 14 +- ...tional_form_input_unwell_members_names.xml | 14 +- .../layout/conversational_form_loading.xml | 4 +- .../conversational_form_member_age_input.xml | 8 +- ...onversational_form_member_age_input_v2.xml | 4 +- .../conversational_form_member_dob_input.xml | 2 +- .../conversational_form_postal_code.xml | 14 +- .../conversational_form_select_members.xml | 30 +- .../conversational_form_select_members_v2.xml | 32 +- ...ersational_form_select_unwell_diseases.xml | 8 +- ...versational_form_select_unwell_members.xml | 14 +- .../conversational_form_size_select.xml | 6 +- .../layout/conversational_form_text_input.xml | 4 +- .../res/layout/conversational_form_yes_no.xml | 4 +- .../layout/conversational_form_yes_no_v2.xml | 4 +- .../layout/covered_illness_bottom_sheet.xml | 22 +- .../main/res/layout/custom_gender_dialog.xml | 6 +- .../layout/deductible_help_bottom_sheet.xml | 8 +- .../res/layout/doc_picker_bottomsheet.xml | 6 +- .../main/res/layout/document_child_layout.xml | 2 +- .../document_image_preview_fragment.xml | 2 +- .../edit_members_details_bottom_sheet.xml | 8 +- .../src/main/res/layout/eia_card.xml | 2 +- .../src/main/res/layout/eia_form_item.xml | 18 +- .../src/main/res/layout/eia_form_page.xml | 6 +- .../emi_date_confirmation_bottom_sheet.xml | 10 +- .../main/res/layout/emi_info_bottom_sheet.xml | 6 +- .../main/res/layout/error_bottom_sheet.xml | 8 +- .../layout/expandable_list_widget_item.xml | 4 +- .../res/layout/expanded_quote_header_view.xml | 20 +- .../src/main/res/layout/faq_item.xml | 4 +- .../res/layout/footer_and_image_fragment.xml | 4 +- .../res/layout/footer_view_button_list.xml | 2 +- .../footer_view_single_choice_option.xml | 2 +- .../footer_with_left_right_button_widget.xml | 6 +- .../layout/footer_with_two_button_widget.xml | 2 +- .../main/res/layout/form_fragment_layout.xml | 2 +- .../layout/form_member_detail_item_layout.xml | 6 +- .../main/res/layout/form_picker_layout.xml | 6 +- .../res/layout/form_pill_selection_item.xml | 2 +- .../layout/fragment_aadhaar_verification.xml | 4 +- .../layout/fragment_add_policy_members.xml | 2 +- .../res/layout/fragment_auto_pay_status.xml | 8 +- ...fragment_autopay_from_quote_processing.xml | 2 +- .../res/layout/fragment_bank_verification.xml | 24 +- .../main/res/layout/fragment_claim_rating.xml | 2 +- .../main/res/layout/fragment_emi_calendar.xml | 2 +- .../main/res/layout/fragment_emi_details.xml | 12 +- .../fragment_free_insurance_landing_page.xml | 6 +- .../main/res/layout/fragment_health_app.xml | 2 +- .../layout/fragment_health_risk_landing.xml | 2 +- .../layout/fragment_health_risk_questions.xml | 10 +- .../layout/fragment_hi_quiz_questionnaire.xml | 14 +- .../res/layout/fragment_hi_quiz_result.xml | 8 +- .../res/layout/fragment_hra_fi_activation.xml | 8 +- .../layout/fragment_incentivise_autopay.xml | 2 +- .../res/layout/fragment_landing_page_item.xml | 6 +- .../main/res/layout/fragment_offers_v2.xml | 62 ++-- .../layout/fragment_payment_bottomsheet.xml | 4 +- .../res/layout/fragment_payment_error_gi.xml | 6 +- .../fragment_payment_method_selection.xml | 22 +- .../layout/fragment_payment_processing.xml | 6 +- .../res/layout/fragment_payment_success.xml | 4 +- .../res/layout/fragment_policy_activation.xml | 10 +- .../layout/fragment_policy_members_dob.xml | 2 +- .../fragment_policy_members_health_state.xml | 2 +- .../layout/fragment_policy_members_list.xml | 2 +- .../layout/fragment_policy_members_name.xml | 2 +- .../res/layout/fragment_policy_summary.xml | 34 +- .../res/layout/fragment_quote_benefits_v2.xml | 4 +- .../res/layout/fragment_quote_claims_v2.xml | 20 +- .../layout/fragment_search_by_location.xml | 6 +- .../res/layout/fragment_search_by_name.xml | 6 +- .../fragment_support_question_answer.xml | 14 +- .../main/res/layout/fragment_testimonials.xml | 4 +- .../layout/full_payment_info_bottom_sheet.xml | 6 +- .../res/layout/generic_info_bottom_sheet.xml | 2 +- .../main/res/layout/gi_help_bottom_sheet.xml | 4 +- .../res/layout/grid_image_card_widget.xml | 6 +- .../res/layout/header_with_title_and_icon.xml | 4 +- .../layout/health_benefits_bottom_sheet.xml | 2 +- .../res/layout/health_compare_list_item.xml | 6 +- .../res/layout/health_risk_acclerometer.xml | 14 +- .../res/layout/health_risk_header_layout.xml | 2 +- .../res/layout/health_risk_score_layout.xml | 2 +- .../res/layout/health_risk_separator_view.xml | 2 +- .../res/layout/help_options_bottom_sheet.xml | 6 +- .../main/res/layout/hi_quiz_option_card.xml | 2 +- .../src/main/res/layout/hrc_category_item.xml | 4 +- .../main/res/layout/hrc_multi_select_item.xml | 2 +- .../res/layout/hrc_single_select_item.xml | 2 +- .../main/res/layout/hrs_back_bottom_sheet.xml | 8 +- .../layout/icon_with_bottom_text_layout.xml | 2 +- .../src/main/res/layout/info_bottom_sheet.xml | 6 +- .../src/main/res/layout/insurance_advisor.xml | 2 +- .../src/main/res/layout/item_auto_pay.xml | 2 +- .../main/res/layout/item_auto_pay_enabled.xml | 10 +- .../layout/item_auto_pay_payment_failure.xml | 12 +- .../main/res/layout/item_auto_pay_pending.xml | 10 +- .../src/main/res/layout/item_button.xml | 2 +- .../res/layout/item_emi_middle_step_due.xml | 4 +- .../item_emi_middle_step_due_and_payable.xml | 4 +- .../res/layout/item_emi_middle_step_paid.xml | 4 +- .../res/layout/item_emi_step_first_paid.xml | 4 +- .../res/layout/item_emi_step_last_due.xml | 4 +- .../item_emi_step_last_due_and_payable.xml | 4 +- .../res/layout/item_emi_step_last_paid.xml | 4 +- .../layout/item_message_hospitals_nearby.xml | 4 +- .../res/layout/item_message_permissions.xml | 8 +- .../main/res/layout/item_message_received.xml | 6 +- .../src/main/res/layout/item_message_sent.xml | 4 +- .../src/main/res/layout/item_payment_done.xml | 10 +- .../src/main/res/layout/item_payment_due.xml | 12 +- .../main/res/layout/item_payment_overdue.xml | 12 +- .../res/layout/item_payment_processing.xml | 10 +- .../res/layout/key_value_horizontal_item.xml | 6 +- .../res/layout/landing_page_sticky_footer.xml | 4 +- .../layout_autopay_setup_bottomsheet.xml | 4 +- .../main/res/layout/layout_chip_choice.xml | 2 +- .../main/res/layout/layout_dynamic_button.xml | 2 +- .../res/layout/layout_error_bottom_sheet.xml | 2 +- .../layout/layout_fixed_label_input_text.xml | 4 +- .../layout_footer_with_title_subtitle.xml | 4 +- .../main/res/layout/layout_no_hospitals.xml | 4 +- .../main/res/layout/layout_payment_method.xml | 2 +- .../layout_payment_method_experiment.xml | 10 +- .../main/res/layout/layout_payment_type.xml | 6 +- .../res/layout/layout_policy_summary_item.xml | 4 +- .../main/res/layout/layout_popup_activity.xml | 2 +- .../main/res/layout/layout_reward_banner.xml | 4 +- .../res/layout/layout_team_member_item.xml | 6 +- .../main/res/layout/layout_tv_policy_doc.xml | 2 +- .../layout/list_card_widget_fixed_item.xml | 4 +- .../main/res/layout/loader_bottom_sheet.xml | 4 +- .../src/main/res/layout/loader_view.xml | 2 +- .../main/res/layout/logout_bottom_sheet.xml | 8 +- .../res/layout/max_age_cover_bottom_sheet.xml | 12 +- .../res/layout/member_details_view_item.xml | 2 +- .../res/layout/members_age_picker_card.xml | 2 +- .../multi_select_checkbox_widget_item.xml | 2 +- .../navi_insurance_activity_update_app.xml | 6 +- .../src/main/res/layout/navi_radio_button.xml | 4 +- .../src/main/res/layout/navi_toolbar_view.xml | 6 +- .../src/main/res/layout/no_content_widget.xml | 2 +- .../main/res/layout/number_picker_layout.xml | 6 +- .../res/layout/number_picker_layout_v2.xml | 6 +- .../main/res/layout/number_text_layout.xml | 2 +- ..._fragment_premium_details_bottom_sheet.xml | 6 +- .../src/main/res/layout/payment_header.xml | 2 +- .../res/layout/payment_header_attached.xml | 6 +- .../layout/payment_offer_callouts_layout.xml | 4 +- .../layout/payment_status_bottom_sheet.xml | 8 +- .../src/main/res/layout/pill_button.xml | 2 +- .../main/res/layout/place_prediction_item.xml | 4 +- .../src/main/res/layout/plan_list_item.xml | 6 +- .../src/main/res/layout/policy_add_member.xml | 2 +- .../layout/policy_selection_radio_button.xml | 4 +- .../main/res/layout/policy_status_card.xml | 8 +- .../main/res/layout/popular_banks_item.xml | 2 +- .../layout/premium_details_bottom_sheet.xml | 30 +- .../res/layout/premium_details_line_item.xml | 4 +- .../layout/premium_details_line_item_bold.xml | 4 +- .../progress_bar_amount_breakup_widget.xml | 14 +- .../main/res/layout/question_chat_message.xml | 4 +- .../main/res/layout/question_option_item.xml | 2 +- .../src/main/res/layout/quote_footer_view.xml | 16 +- .../quote_premium_details_bottom_sheet.xml | 4 +- .../layout/quote_sum_insured_bottom_sheet.xml | 8 +- .../layout/radio_options_with_header_view.xml | 2 +- .../main/res/layout/reset_bottom_sheet.xml | 8 +- .../rooted_device_error_bottom_sheet.xml | 6 +- .../src/main/res/layout/screen_api_error.xml | 4 +- .../main/res/layout/screen_health_cards.xml | 8 +- .../src/main/res/layout/screen_home.xml | 6 +- .../main/res/layout/screen_hospitals_v2.xml | 4 +- .../main/res/layout/screen_illness_yes.xml | 12 +- .../main/res/layout/screen_make_claims.xml | 14 +- .../layout/screen_notification_settings.xml | 4 +- .../src/main/res/layout/screen_payment.xml | 8 +- .../layout/screen_policy_input_details.xml | 16 +- .../res/layout/screen_register_phone_otp.xml | 36 +-- .../res/layout/screen_request_callback.xml | 10 +- ...ction_item_with_slider_selector_layout.xml | 6 +- ...tion_items_with_slider_selector_layout.xml | 4 +- .../main/res/layout/section_with_item_v2.xml | 6 +- .../layout/section_with_items_widget_v2.xml | 6 +- .../res/layout/seekbar_with_anchor_text.xml | 2 +- .../main/res/layout/select_policy_item.xml | 2 +- .../layout/select_policy_item_bottomsheet.xml | 4 +- .../layout/set_up_auto_pay_bottom_sheet.xml | 2 +- .../layout/shimmer_card_policy_cover_v2.xml | 4 +- .../src/main/res/layout/shimmer_faq_item.xml | 2 +- .../src/main/res/layout/show_more_layout.xml | 2 +- .../main/res/layout/single_choice_button.xml | 4 +- .../main/res/layout/status_banner_view.xml | 4 +- .../layout/status_track_description_item.xml | 4 +- .../res/layout/status_track_item_widget.xml | 2 +- .../supertopup_sync_date_bottom_panel.xml | 10 +- .../main/res/layout/survey_bottom_sheet.xml | 2 +- .../res/layout/survey_pill_selection_item.xml | 2 +- .../tele_hra_attention_bottom_sheet.xml | 2 +- .../tele_hra_payment_status_bottom_sheet.xml | 14 +- .../res/layout/text_display_widget_layout.xml | 2 +- .../main/res/layout/text_header_widget.xml | 2 +- .../src/main/res/layout/text_input_item.xml | 4 +- .../src/main/res/layout/text_line_item.xml | 4 +- .../text_with_background_widget_item.xml | 4 +- .../main/res/layout/title_icon_card_item.xml | 2 +- .../title_icon_desc_bottomsheet_layout.xml | 20 +- .../src/main/res/layout/title_only_back.xml | 4 +- .../title_subtitle_pill_selection_widget.xml | 2 +- .../title_with_primary_secondary_btn.xml | 8 +- .../src/main/res/layout/toolbar_blue.xml | 4 +- .../layout/toolbar_for_search_fragment.xml | 4 +- .../layout/toolbar_for_search_with_loader.xml | 6 +- .../main/res/layout/toolbar_quote_screen.xml | 4 +- .../src/main/res/layout/toolbar_white.xml | 2 +- .../src/main/res/layout/two_grid_button.xml | 4 +- .../src/main/res/layout/two_grid_layout.xml | 8 +- .../layout/updated_premium_bottom_sheet.xml | 6 +- .../res/layout/upload_card_view_widget.xml | 8 +- .../res/layout/upload_document_image_item.xml | 4 +- .../upload_in_progress_bottom_sheet.xml | 2 +- .../whatsapp_disable_warning_bottom_sheet.xml | 8 +- .../res/layout/widget_member_detail_input.xml | 40 +-- .../src/main/res/values/styles.xml | 88 ++--- .../navi/pay/common/model/view/NaviPayText.kt | 8 +- .../pay/common/settingscreen/ui/QRCard.kt | 14 +- .../settingscreen/ui/UPISettingContent.kt | 8 +- .../pay/common/ui/BankAccountsListSection.kt | 14 +- .../com/navi/pay/common/ui/NaviPayButtons.kt | 22 +- .../navi/pay/common/ui/NaviPayCommonView.kt | 168 +++++----- .../navi/pay/common/ui/PayeeDetailsView.kt | 24 +- .../com/navi/pay/common/view/CommonView.kt | 12 +- .../pay/entry/ui/NaviPayAccessDeniedScreen.kt | 8 +- .../blockedusers/ui/BlockedUsersScreen.kt | 12 +- .../collectrequest/ui/CollectRequestItem.kt | 12 +- .../paymentsummary/ui/PaymentSummaryScreen.kt | 12 +- .../PaymentSummaryTransactionDetailSection.kt | 22 +- .../common/sendmoney/ui/AmountTextField.kt | 10 +- .../common/sendmoney/ui/NotesSection.kt | 6 +- .../common/sendmoney/ui/NotesTextField.kt | 8 +- .../ui/SendMoneyAccountSelectionView.kt | 8 +- .../sendmoney/ui/SendMoneyMainScreen.kt | 6 +- .../sendmoney/viewmodel/SendMoneyViewModel.kt | 2 +- .../transactionlist/ui/TransactionListView.kt | 16 +- .../TransactionDetailSectionCommonViewsV2.kt | 14 +- .../common/upiid/ui/UPIIdInputScreen.kt | 20 +- .../lite/ui/AboutUpiLiteBottomSheet.kt | 8 +- .../lite/ui/AddBalanceModalContent.kt | 8 +- .../ui/AutoTopUpConfirmationBottomSheet.kt | 18 +- .../lite/ui/AutoTopUpKnowMoreBottomSheet.kt | 10 +- .../lite/ui/UpiLiteBottomSheetContent.kt | 2 +- .../ui/UpiLiteMenuOptionBottomSheetContent.kt | 6 +- .../pay/management/lite/ui/UpiLiteSection.kt | 56 ++-- .../pay/management/lite/util/UpiLiteUtils.kt | 20 +- .../navi/pay/management/mandate/ui/Common.kt | 40 +-- ...etailOfActiveCategoryBottomSheetContent.kt | 14 +- ...DetailScreenOfActiveOrCompletedCategory.kt | 52 +-- .../MandateDetailScreenOfPendingCategory.kt | 10 +- .../management/mandate/ui/MandateScreen.kt | 18 +- .../mandate/ui/MandateSummaryScreen.kt | 12 +- .../mandate/ui/ModifyMandateScreen.kt | 18 +- .../bank/ui/BankDetailInputScreen.kt | 12 +- .../scanpay/ui/QrScannerScreen.kt | 14 +- .../paytocontacts/ui/PayToContactsScreen.kt | 24 +- .../ui/SavedBeneficiaryScreen.kt | 16 +- .../TransactionHistoryBottomSheetContent.kt | 16 +- .../ui/TransactionHistoryDetailSectionV2.kt | 28 +- .../ui/TransactionHistoryScreen.kt | 22 +- .../addnew/ui/AddNewUpiNumberScreen.kt | 22 +- .../addnew/ui/AddNewUpiNumberScreenV2.kt | 32 +- ...ConfirmNewUpiNumberCreationModalContent.kt | 10 +- .../common/ui/AddNewCustomUpiNumberBanner.kt | 12 +- .../upinumber/link/ui/LinkUpiNumberScreen.kt | 20 +- .../list/ui/ActivateUpiNumberModalContent.kt | 10 +- .../ui/ActivateUpiNumberModalContentV2.kt | 10 +- ...NumberToNaviPayConfirmationModalContent.kt | 12 +- ...mberToNaviPayConfirmationModalContentV2.kt | 12 +- .../list/ui/UpiNumberInfoModalContent.kt | 8 +- .../list/ui/UpiNumberLinkedSuccessContent.kt | 10 +- ...piNumberLinkedToExternalUpiModalContent.kt | 12 +- ...NumberLinkedToExternalUpiModalContentV2.kt | 12 +- .../ui/UpiNumberMenuOptionsModalContent.kt | 8 +- .../ui/UpiNumberMenuOptionsModalContentV2.kt | 8 +- .../list/ui/UpiNumberNotSetScreen.kt | 8 +- .../upinumber/list/ui/UpiNumberScreen.kt | 26 +- .../upinumber/list/ui/UpiNumberScreenV2.kt | 22 +- .../ui/UpiNumberSelectAccountsModalContent.kt | 14 +- .../UpiNumberSelectAccountsModalContentV2.kt | 14 +- .../add/ui/FetchedAccountsListBottomSheet.kt | 8 +- .../account/add/ui/SelectBankScreen.kt | 22 +- .../add/ui/UpiGuidelinesBottomSheetContent.kt | 8 +- .../common/ui/LinkedAccountBalanceScreen.kt | 36 +-- .../ui/AadhaarConsentBottomSheetContent.kt | 8 +- .../detail/ui/LinkedAccountDetailScreen.kt | 34 +- .../detail/ui/LinkedAccountVerifyScreen.kt | 20 +- .../ui/RenderAadhaarNumberInputScreen.kt | 18 +- .../detail/ui/RenderPinModeSelectionScreen.kt | 14 +- .../account/linked/ui/LinkedAccountsScreen.kt | 18 +- .../linked/ui/NoLinkedAccountScreen.kt | 8 +- ...rSelfTransferNoneAndSingleAccountScreen.kt | 16 +- .../binding/ui/SimSelectionContent.kt | 14 +- ...SingleSimConfirmationBottomSheetContent.kt | 10 +- .../navi/pay/onboarding/faq/ui/FaqSection.kt | 12 +- .../pay/onboarding/faq/ui/NaviPayFaqScreen.kt | 12 +- .../ui/SelectLanguageBottomSheetContent.kt | 8 +- .../navi/pay/onboarding/faq/utils/FaqUtils.kt | 8 +- .../pay/permission/ui/PermissionScreen.kt | 20 +- .../pay/permission/ui/PermissionScreenV2.kt | 20 +- .../ui/bbps/BbpsOrderDetailsSummarySection.kt | 24 +- .../ui/common/OrderDetailsSummarySection.kt | 8 +- .../details/ui/common/PaymentStatusSection.kt | 18 +- .../details/ui/common/ShowMoreLessButton.kt | 6 +- .../upi/NaviPayOrderDetailsSummarySection.kt | 26 +- .../list/ui/OrderHistoryBottomSheetContent.kt | 16 +- .../tstore/list/ui/OrderHistoryItemView.kt | 20 +- .../pay/tstore/list/ui/OrderHistoryScreen.kt | 18 +- .../com/navi/pay/utils/ShareReceiptUtils.kt | 2 +- ...out_bbps_share_transaction_details_new.xml | 10 +- .../src/main/res/layout/layout_share_qr.xml | 8 +- .../layout_share_transaction_details.xml | 16 +- .../navi_pay_rewards_callout_layout.xml | 6 +- .../nativepayment/components/FeedbackView.kt | 8 +- .../components/MPSScreenViews.kt | 18 +- .../components/NPSAmountHeader.kt | 17 +- .../nativepayment/components/NPSCommonView.kt | 22 +- .../nativepayment/components/NPSHeader.kt | 8 +- .../components/NPSNaviUpiWidget.kt | 8 +- .../components/NetBankingScreenHeader.kt | 12 +- .../components/NetBankingScreenListSection.kt | 20 +- .../components/NpsCoinEarnBanner.kt | 16 +- .../OutlinedTextFieldWithLabelAndError.kt | 16 +- .../components/UpiCollectWidget.kt | 18 +- .../components/UpiIntentAppsSection.kt | 8 +- .../components/UpiintentScreenToast.kt | 8 +- .../components/coins/CoinBurnBanner.kt | 30 +- .../components/coins/CoinEarnBanner.kt | 16 +- .../model/S2sPaymentMethodResponse.kt | 6 +- .../screens/CardDetailsScreen.kt | 10 +- .../nativepayment/screens/NPSScreen.kt | 10 +- .../nativepayment/screens/NetBankingScreen.kt | 12 +- .../composables/PaymentErrorScreen.kt | 12 +- .../turbocheckout/composables/ErrorScreen.kt | 6 +- .../com/navi/rr/common/ui/RRErrorScreen.kt | 16 +- .../navi/rr/common/views/NaviRRCommonView.kt | 16 +- .../ui/compose/LeaderboardScreen.kt | 22 +- .../views/LeaderboardCommonViews.kt | 8 +- .../milestones/ui/compose/MilestoneViews.kt | 40 +-- .../rr/referral/ui/compose/CommonViews.kt | 18 +- .../rr/referral/ui/compose/RefereeHomePage.kt | 16 +- .../ui/compose/RefereeTrackerScreenV2.kt | 16 +- .../compose/RefereeTrackerStateComposables.kt | 28 +- .../ui/compose/ReferralContactBottomSheet.kt | 40 +-- .../main/java/com/navi/rr/utils/RRUtils.kt | 6 +- .../rr/utils/composeutils/ComposableUtils.kt | 16 +- .../res/layout/activity_reward_delight.xml | 4 +- .../layout/activity_reward_summary_layout.xml | 2 +- .../src/main/res/layout/fragment_tds.xml | 2 +- .../src/main/res/layout/fragment_upi.xml | 2 +- .../src/main/res/layout/header_view.xml | 2 +- .../res/layout/layout_rewards_details.xml | 4 +- .../layout/layout_rewards_lock_details.xml | 2 +- .../layout_rewards_pl_unlock_details.xml | 4 +- .../layout/layout_rewards_pl_unlock_item.xml | 4 +- .../res/layout/layout_rewards_tooltip.xml | 2 +- .../layout/layout_rewards_unlock_details.xml | 2 +- .../main/res/layout/rr_header_card_view.xml | 2 +- .../navi-rr/src/main/res/values/styles.xml | 4 +- .../widgets/EditableTextWidgetComposable.kt | 8 +- .../widgets/OTPWidgetComposable.kt | 6 +- .../extensions/ComposeWidgetExt.kt | 15 +- .../navi/naviwidgets/extensions/WidgetExt.kt | 1 + .../viewholder/RepaymentOptionLayout.kt | 6 +- .../AutoCarouselWithDescriptionWidgetView.kt | 4 +- .../navi/naviwidgets/views/ImageTextWidget.kt | 11 +- .../AutoCarouselCardsPDWidgetComposable.kt | 4 +- .../widgets/BenefitExplainerWidget.kt | 9 +- .../widgets/CibilChartWidgetLayout.kt | 6 +- .../widgets/HelpfulFeedbackWidgetLayout.kt | 6 +- .../widgets/ImageTextItemLayout.kt | 4 +- .../naviwidgets/widgets/NotesWidgetLayout.kt | 4 +- .../widgets/dashboard/ComposeDummyWidget.kt | 43 ++- .../textdisplay/TextDisplayWidgetData.kt | 4 +- .../textdisplay/ui/TextDisplayWidget.kt | 2 +- .../layout/action_button_widget_layout.xml | 2 +- .../src/main/res/layout/action_item_view.xml | 2 +- .../main/res/layout/addons_widget_layout.xml | 4 +- .../src/main/res/layout/button_view.xml | 2 +- ...ard_with_left_right_text_widget_layout.xml | 6 +- .../centre_title_subtitle_widget_layout.xml | 4 +- .../layout/collapsible_amount_slider_view.xml | 14 +- .../main/res/layout/csat_number_layout.xml | 6 +- ...ashboard_nstp_insurance_details_layout.xml | 2 +- .../main/res/layout/details_widget_layout.xml | 2 +- .../src/main/res/layout/drop_down_btn.xml | 2 +- .../main/res/layout/elevated_icon_view.xml | 2 +- .../res/layout/expandable_info_table_item.xml | 6 +- .../layout/expandable_info_table_widget.xml | 8 +- .../layout/footer_with_title_and_button.xml | 2 +- .../layout/free_insurance_success_widget.xml | 6 +- .../full_screen_exoplayer_controls_layout.xml | 10 +- .../layout/helpful_feedback_widget_layout.xml | 2 +- .../res/layout/horizontal_carousel_item.xml | 6 +- .../horizontal_story_list_widget_layout.xml | 4 +- .../layout/horizontal_text_img_carousel.xml | 4 +- .../layout/hospital_card_widget_layout.xml | 10 +- .../layout/hospital_card_widget_v2_layout.xml | 8 +- .../main/res/layout/icon_with_label_view.xml | 2 +- .../inline_exoplayer_controls_layout.xml | 4 +- .../main/res/layout/item_existing_loan.xml | 12 +- .../src/main/res/layout/item_info.xml | 2 +- .../main/res/layout/layout_amount_input.xml | 4 +- .../layout_applied_user_count_widget.xml | 2 +- .../res/layout/layout_bottom_tooltip_text.xml | 2 +- .../layout_chat_conversation_status.xml | 2 +- .../layout/layout_chat_timestamp_divider.xml | 2 +- ...ayout_check_box_radio_button_card_item.xml | 12 +- .../layout_custom_payment_option_item.xml | 8 +- .../layout/layout_dashboard_amc_details.xml | 22 +- .../layout_dashboard_insurance_details.xml | 28 +- .../res/layout/layout_dashboard_payment.xml | 24 +- .../res/layout/layout_empty_product_item.xml | 8 +- .../layout_feedback_acknowledgement.xml | 4 +- .../src/main/res/layout/layout_footer.xml | 2 +- ...yout_footer_with_title_and_description.xml | 6 +- .../res/layout/layout_gold_conversion.xml | 6 +- .../res/layout/layout_image_text_item.xml | 4 +- .../res/layout/layout_image_text_list.xml | 4 +- .../main/res/layout/layout_information.xml | 4 +- .../res/layout/layout_left_right_text.xml | 4 +- .../layout_left_right_text_single_line.xml | 4 +- ...oan_item_with_checkbox_document_widget.xml | 12 +- .../layout/layout_navi_chat_call_status.xml | 2 +- .../layout_navi_chat_call_status_item.xml | 4 +- .../layout/layout_navi_chat_csat_rating.xml | 4 +- ...navi_chat_item_message_with_attachment.xml | 2 +- ...out_navi_chat_message_with_action_item.xml | 2 +- ...avi_chat_message_with_action_item_list.xml | 6 +- ...layout_navi_chat_message_with_deeplink.xml | 6 +- .../layout_navi_chat_message_with_item.xml | 2 +- ...ayout_navi_chat_message_with_item_list.xml | 4 +- .../layout_navi_chat_received_message.xml | 4 +- ..._chat_received_message_with_attachment.xml | 2 +- .../layout/layout_navi_chat_sent_message.xml | 4 +- ...navi_chat_sent_message_with_attachment.xml | 2 +- .../layout_navi_chat_transaction_status.xml | 8 +- ...i_chat_transaction_status_message_item.xml | 4 +- .../main/res/layout/layout_offer_widget.xml | 4 +- .../res/layout/layout_offer_widget_item.xml | 10 +- .../main/res/layout/layout_payment_footer.xml | 8 +- .../res/layout/layout_payment_option_item.xml | 6 +- .../main/res/layout/layout_product_header.xml | 4 +- .../main/res/layout/layout_reward_item.xml | 4 +- .../main/res/layout/layout_rewards_info.xml | 2 +- ...yout_row_item_foreclosure_offer_widget.xml | 4 +- .../layout_separate_card_with_card_list.xml | 4 +- .../res/layout/layout_share_app_widget.xml | 6 +- .../main/res/layout/layout_text_action.xml | 2 +- .../layout_text_edittext_calendar_item.xml | 6 +- .../layout_text_with_icons_card_widget.xml | 2 +- .../main/res/layout/layout_ticket_details.xml | 10 +- .../layout_title_subtitle_image_widget.xml | 4 +- .../src/main/res/layout/layout_toast.xml | 2 +- .../src/main/res/layout/layout_toolbar.xml | 4 +- .../res/layout/layout_view_conversations.xml | 2 +- .../main/res/layout/left_tool_tip_view.xml | 2 +- .../src/main/res/layout/list_card_item.xml | 2 +- .../src/main/res/layout/nps_widget_layout.xml | 2 +- .../res/layout/offer_banner_widget_layout.xml | 2 +- .../main/res/layout/payment_action_view.xml | 8 +- .../main/res/layout/payment_widget_layout.xml | 2 +- .../layout/preference_info_widget_layout.xml | 4 +- .../preference_info_widget_v2_layout.xml | 4 +- ...reference_info_widget_v2_selected_item.xml | 6 +- ...ference_info_widget_v2_unselected_item.xml | 4 +- .../layout/product_info_widget_v2_layout.xml | 4 +- .../layout/purchase_details_widget_layout.xml | 18 +- .../res/layout/refer_header_widget_layout.xml | 6 +- .../layout/reward_callout_widget_layout.xml | 2 +- .../main/res/layout/rich_info_widget_view.xml | 2 +- .../main/res/layout/row_loan_detail_v2.xml | 6 +- .../res/layout/separator_with_text_widget.xml | 2 +- .../text_with_background_widget_layout.xml | 4 +- ...itle_subtitle_with_image_widget_layout.xml | 4 +- .../main/res/layout/title_widget_layout.xml | 2 +- .../layout/title_with_banner_info_widget.xml | 4 +- .../src/main/res/layout/user_info_widget.xml | 6 +- .../src/main/res/layout/user_review_item.xml | 2 +- .../res/layout/video_player_widget_layout.xml | 2 +- .../src/main/res/layout/view_base_input.xml | 2 +- .../res/layout/view_text_display_widget.xml | 2 +- .../layout/widget_announcement_call_out.xml | 4 +- .../res/layout/widget_announcement_info.xml | 4 +- .../widget_bordered_title_with_image_grid.xml | 2 +- .../main/res/layout/widget_improve_offer.xml | 16 +- .../src/main/res/layout/widget_info_list.xml | 2 +- .../src/main/res/values/styles.xml | 168 +++++----- 933 files changed, 4539 insertions(+), 4528 deletions(-) create mode 100644 android/navi-design/src/main/java/com/navi/design/font/FontUtil.kt delete mode 100644 android/navi-design/src/main/java/com/navi/design/theme/ComposeFontUtil.kt delete mode 100644 android/navi-design/src/main/java/com/navi/design/utils/FontUtils.kt rename android/navi-design/src/main/res/font/{tt_semi_bold.otf => navi_body_demi_bold.otf} (100%) rename android/navi-design/src/main/res/font/{tt_regular.ttf => navi_body_regular.ttf} (100%) rename android/navi-design/src/main/res/font/{tt_bold.otf => navi_headline_bold.otf} (100%) rename android/navi-design/src/main/res/font/{tt_medium.ttf => navi_headline_regular.ttf} (100%) delete mode 100644 android/navi-design/src/test/java/com/navi/design/ExampleUnitTest.kt delete mode 100644 android/navi-design/src/test/java/com/navi/design/utils/FontUtilsKtTest.kt diff --git a/android/app/src/main/java/com/naviapp/account_aggregator/AccountAggregatorActivity.kt b/android/app/src/main/java/com/naviapp/account_aggregator/AccountAggregatorActivity.kt index 31efe12cee..700cdf7b6a 100644 --- a/android/app/src/main/java/com/naviapp/account_aggregator/AccountAggregatorActivity.kt +++ b/android/app/src/main/java/com/naviapp/account_aggregator/AccountAggregatorActivity.kt @@ -166,7 +166,7 @@ class AccountAggregatorActivity : BaseActivity() { TextFieldData( text = getString(R.string.redirecting_to_account_aggregator), size = DEFAULT_TEXT_SIZE, - font = FontWeightEnum.TT_MEDIUM.name, + font = FontWeightEnum.NAVI_HEADLINE_REGULAR.name, textColor = getString(InsuranceR.color.naviBlackText) ) ) @@ -201,7 +201,7 @@ class AccountAggregatorActivity : BaseActivity() { TextFieldData( text = getString(R.string.verifying_bank_statement), size = DEFAULT_TEXT_SIZE, - font = FontWeightEnum.TT_MEDIUM.name, + font = FontWeightEnum.NAVI_HEADLINE_REGULAR.name, textColor = getString(DesignR.color.white) ) ) diff --git a/android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/ErrorBottomSheetContent.kt b/android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/ErrorBottomSheetContent.kt index 43d35aa2e5..7fe2e9dbf9 100644 --- a/android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/ErrorBottomSheetContent.kt +++ b/android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/ErrorBottomSheetContent.kt @@ -66,7 +66,7 @@ fun ErrorBottomSheetContent(errorMessage: GenericErrorResponse? = null, onDismis ?: stringResource(com.naviapp.R.string.please_try_again_later), color = Color(0xFF6B6B6B), fontSize = 14.sp, - fontWeight = FontWeightEnum.TT_REGULAR, + fontWeight = FontWeightEnum.NAVI_BODY_REGULAR, fontFamily = FontFamilyEnum.TT, lineHeight = 22.sp ) diff --git a/android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/NotificationSettingsBottomSheetContent.kt b/android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/NotificationSettingsBottomSheetContent.kt index 267bdf528a..adfda44895 100644 --- a/android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/NotificationSettingsBottomSheetContent.kt +++ b/android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/NotificationSettingsBottomSheetContent.kt @@ -80,7 +80,7 @@ fun NotificationSettingBottomSheetContent(onDismiss: () -> Unit, onClick: () -> text = stringResource(R.string.to_enable_notifications), color = Color(0xFF6B6B6B), fontSize = 12.sp, - fontWeight = FontWeightEnum.TT_REGULAR, + fontWeight = FontWeightEnum.NAVI_BODY_REGULAR, fontFamily = FontFamilyEnum.TT, lineHeight = 18.sp ) diff --git a/android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/PermissionSettingBottomSheet.kt b/android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/PermissionSettingBottomSheet.kt index 839af500b5..eed8a0c2d2 100644 --- a/android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/PermissionSettingBottomSheet.kt +++ b/android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/PermissionSettingBottomSheet.kt @@ -67,7 +67,7 @@ fun PermissionSettingBottomSheet( text = permissionSettingsBottomSheetData.message, fontSize = 14.sp, lineHeight = 22.sp, - fontWeight = FontWeightEnum.TT_REGULAR, + fontWeight = FontWeightEnum.NAVI_BODY_REGULAR, color = Color(0xff6B6B6B) ) if (permissionSettingsBottomSheetData.pathText != null) { @@ -75,7 +75,7 @@ fun PermissionSettingBottomSheet( text = permissionSettingsBottomSheetData.pathText, fontSize = 14.sp, lineHeight = 22.sp, - fontWeight = FontWeightEnum.TT_REGULAR, + fontWeight = FontWeightEnum.NAVI_BODY_REGULAR, color = Color(0xff191919) ) } diff --git a/android/app/src/main/java/com/naviapp/appsettings/ui/common/ScreenInformationText.kt b/android/app/src/main/java/com/naviapp/appsettings/ui/common/ScreenInformationText.kt index 0e363e5409..ba1797c2c0 100644 --- a/android/app/src/main/java/com/naviapp/appsettings/ui/common/ScreenInformationText.kt +++ b/android/app/src/main/java/com/naviapp/appsettings/ui/common/ScreenInformationText.kt @@ -20,6 +20,6 @@ fun ScreenInformationText(description: String) { fontSize = 12.sp, lineHeight = 16.sp, color = Color(0xff6B6B6B), - fontWeight = FontWeightEnum.TT_REGULAR + fontWeight = FontWeightEnum.NAVI_BODY_REGULAR ) } diff --git a/android/app/src/main/java/com/naviapp/appsettings/ui/common/SwitchableSettingsContainer.kt b/android/app/src/main/java/com/naviapp/appsettings/ui/common/SwitchableSettingsContainer.kt index c2890f9785..056ce45575 100644 --- a/android/app/src/main/java/com/naviapp/appsettings/ui/common/SwitchableSettingsContainer.kt +++ b/android/app/src/main/java/com/naviapp/appsettings/ui/common/SwitchableSettingsContainer.kt @@ -78,7 +78,7 @@ fun SwitchableSetting( if (description != null) ElexText( text = description, - fontWeight = FontWeightEnum.TT_REGULAR, + fontWeight = FontWeightEnum.NAVI_BODY_REGULAR, fontSize = 12.sp, lineHeight = 16.sp, color = Color(0xff444444) diff --git a/android/app/src/main/java/com/naviapp/appsettings/ui/screens/AppSettingsMainScreen.kt b/android/app/src/main/java/com/naviapp/appsettings/ui/screens/AppSettingsMainScreen.kt index 317b3ab048..e7f59ac17b 100644 --- a/android/app/src/main/java/com/naviapp/appsettings/ui/screens/AppSettingsMainScreen.kt +++ b/android/app/src/main/java/com/naviapp/appsettings/ui/screens/AppSettingsMainScreen.kt @@ -147,7 +147,7 @@ private fun AppSettingsItemCard(title: String, description: String, onCardClick: description, color = Color(0xff6B6B6B), fontSize = 12.sp, - fontWeight = FontWeightEnum.TT_REGULAR, + fontWeight = FontWeightEnum.NAVI_BODY_REGULAR, lineHeight = 18.sp ) } 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 1cc3bc587c..8b4f5edae3 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 @@ -67,7 +67,7 @@ class UpdateAppActivity : BaseActivity(), View.OnClickListener { titleColor = R.color.white, ) setTextSize(textSize = resources.getInteger(R.integer.font_small)) - setTitleFont(font = FontWeightEnum.TT_SEMI_BOLD) + setTitleFont(font = FontWeightEnum.NAVI_BODY_DEMI_BOLD) setViewBg( cornerRadiusId = WidgetsR.integer.integer_4, bgColor = DesignR.color.dark_purple, diff --git a/android/app/src/main/java/com/naviapp/common/customview/OtpInputView.kt b/android/app/src/main/java/com/naviapp/common/customview/OtpInputView.kt index 180af46eb7..a1a297f364 100644 --- a/android/app/src/main/java/com/naviapp/common/customview/OtpInputView.kt +++ b/android/app/src/main/java/com/naviapp/common/customview/OtpInputView.kt @@ -29,7 +29,7 @@ import com.navi.common.ui.activity.NaviWebViewActivity import com.navi.common.utils.hideKeyboard import com.navi.design.R as DesignR import com.navi.design.font.FontWeightEnum -import com.navi.design.utils.getFontStyle +import com.navi.design.font.getFontStyle import com.navi.design.utils.hideCutCopyMenuPopUp import com.navi.naviwidgets.R as WidgetsR import com.naviapp.R @@ -181,7 +181,7 @@ class OtpInputView(context: Context, attributeSet: AttributeSet) : val spannableString = SpannableString(completeText) val colorSpan = ForegroundColorSpan(resources.getColor(R.color.red)) val typeface: Typeface? = - ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.TT_REGULAR)) + ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR)) typeface?.let { val boldSpan = CustomTypefaceSpan(it) spannableString.setSpan( diff --git a/android/app/src/main/java/com/naviapp/configuration/composable/NaviButton.kt b/android/app/src/main/java/com/naviapp/configuration/composable/NaviButton.kt index 40c99676cb..5a11621275 100644 --- a/android/app/src/main/java/com/naviapp/configuration/composable/NaviButton.kt +++ b/android/app/src/main/java/com/naviapp/configuration/composable/NaviButton.kt @@ -17,11 +17,11 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.theme.FF1F002A import com.navi.design.theme.GreyA3A3AB import com.navi.design.theme.WhiteFFFFFF -import com.navi.design.theme.composeFontFamily -import com.navi.design.theme.getFontWeight @Composable internal fun NaviButton( @@ -46,8 +46,8 @@ internal fun NaviButton( text = title, fontSize = 14.sp, color = WhiteFFFFFF, - fontFamily = composeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_MEDIUM), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), ) } } diff --git a/android/app/src/main/java/com/naviapp/configuration/composable/NaviHeaderView.kt b/android/app/src/main/java/com/naviapp/configuration/composable/NaviHeaderView.kt index 27aa5ad818..5af087d9e0 100644 --- a/android/app/src/main/java/com/naviapp/configuration/composable/NaviHeaderView.kt +++ b/android/app/src/main/java/com/naviapp/configuration/composable/NaviHeaderView.kt @@ -19,10 +19,10 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.theme.Black1A1A1A import com.navi.design.theme.Grey6B6B6B -import com.navi.design.theme.composeFontFamily -import com.navi.design.theme.getFontWeight @Composable fun NaviHeaderView( @@ -43,8 +43,8 @@ fun NaviHeaderView( text = titleText, fontSize = 24.sp, color = Black1A1A1A, - fontFamily = composeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_MEDIUM), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), ) Spacer(modifier = Modifier.height(4.dp)) Text( @@ -52,8 +52,8 @@ fun NaviHeaderView( text = subtitleText, fontSize = 12.sp, color = Grey6B6B6B, - fontFamily = composeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_MEDIUM), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), ) } } diff --git a/android/app/src/main/java/com/naviapp/configuration/composable/NaviOutlinedTextField.kt b/android/app/src/main/java/com/naviapp/configuration/composable/NaviOutlinedTextField.kt index e81ede4422..9fed8eea59 100644 --- a/android/app/src/main/java/com/naviapp/configuration/composable/NaviOutlinedTextField.kt +++ b/android/app/src/main/java/com/naviapp/configuration/composable/NaviOutlinedTextField.kt @@ -29,13 +29,13 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.navi.base.utils.EMPTY import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.theme.FF191919 import com.navi.design.theme.FF1F002A import com.navi.design.theme.FFA8A8A8 import com.navi.design.theme.GreyE3E5E5 import com.navi.design.theme.WhiteFFFFFF -import com.navi.design.theme.composeFontFamily -import com.navi.design.theme.getFontWeight @Composable fun NaviOutlinedTextField( @@ -60,8 +60,8 @@ fun NaviOutlinedTextField( text = placeholderText, fontSize = 14.sp, color = FFA8A8A8, - fontFamily = composeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), ) }, onValueChange = { onTextValueChanged(it) }, @@ -76,8 +76,8 @@ fun NaviOutlinedTextField( TextStyle( fontSize = 14.sp, color = FF191919, - fontFamily = composeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), ), keyboardOptions = KeyboardOptions( diff --git a/android/app/src/main/java/com/naviapp/configuration/composable/NaviTextFieldWithTitleAndButton.kt b/android/app/src/main/java/com/naviapp/configuration/composable/NaviTextFieldWithTitleAndButton.kt index 1a29a82d0d..2f4fe36f49 100644 --- a/android/app/src/main/java/com/naviapp/configuration/composable/NaviTextFieldWithTitleAndButton.kt +++ b/android/app/src/main/java/com/naviapp/configuration/composable/NaviTextFieldWithTitleAndButton.kt @@ -22,9 +22,9 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.navi.base.utils.EMPTY import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.theme.Black1A1A1A -import com.navi.design.theme.composeFontFamily -import com.navi.design.theme.getFontWeight @Composable fun NaviTextFieldWithTitleAndButton( @@ -50,8 +50,8 @@ fun NaviTextFieldWithTitleAndButton( text = titleText, fontSize = 16.sp, color = Black1A1A1A, - fontFamily = composeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_MEDIUM), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), ) Spacer(modifier = Modifier.height(8.dp)) NaviOutlinedTextField( diff --git a/android/app/src/main/java/com/naviapp/dashboard/menu/customersupport/activities/AboutUsActivity.kt b/android/app/src/main/java/com/naviapp/dashboard/menu/customersupport/activities/AboutUsActivity.kt index 6d527e08a6..7dd1f0698b 100644 --- a/android/app/src/main/java/com/naviapp/dashboard/menu/customersupport/activities/AboutUsActivity.kt +++ b/android/app/src/main/java/com/naviapp/dashboard/menu/customersupport/activities/AboutUsActivity.kt @@ -34,6 +34,8 @@ import androidx.constraintlayout.compose.Dimension import com.navi.common.model.ModuleNameV2 import com.navi.common.ui.activity.BaseActivity import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.theme.* import com.navi.insurance.R as InsuranceR import com.naviapp.R @@ -82,8 +84,8 @@ class AboutUsActivity : BaseActivity() { text = stringResource(R.string.about_us), fontSize = 20.sp, color = Black1A1A1A, - fontFamily = composeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_MEDIUM), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), modifier = Modifier.constrainAs(aboutUsTv) { top.linkTo(backIv.bottom, 30.dp) @@ -97,8 +99,8 @@ class AboutUsActivity : BaseActivity() { color = Grey4d4d4d, lineHeight = 2.2.em, letterSpacing = 0.01.em, - fontFamily = composeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), modifier = Modifier.constrainAs(bodyTv) { top.linkTo(aboutUsTv.bottom, 24.dp) @@ -125,8 +127,8 @@ class AboutUsActivity : BaseActivity() { text = stringResource(R.string.copyright_text), fontSize = 10.sp, color = WhiteCCCCCC, - fontFamily = composeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), textAlign = TextAlign.Center, modifier = Modifier.constrainAs(copyrightTv) { diff --git a/android/app/src/main/java/com/naviapp/home/compose/home/ui/footer/AppInstallSnackBar.kt b/android/app/src/main/java/com/naviapp/home/compose/home/ui/footer/AppInstallSnackBar.kt index 1ffad684fa..946dbad988 100644 --- a/android/app/src/main/java/com/naviapp/home/compose/home/ui/footer/AppInstallSnackBar.kt +++ b/android/app/src/main/java/com/naviapp/home/compose/home/ui/footer/AppInstallSnackBar.kt @@ -21,8 +21,8 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText import com.navi.rr.utils.ext.clickable import com.naviapp.R @@ -42,8 +42,8 @@ fun AppInstallSnackBar(appInstallSnackBarOnClick: () -> Unit) { color = HomeScreenColor.colorWhite, style = TextStyle( - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 12.sp, ) ) @@ -53,8 +53,8 @@ fun AppInstallSnackBar(appInstallSnackBarOnClick: () -> Unit) { text = stringResource(id = R.string.install).uppercase(), style = TextStyle( - fontWeight = getFontWeight(FontWeightEnum.TT_BOLD), - fontFamily = ttComposeFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_BOLD), + fontFamily = naviFontFamily, fontSize = 12.sp ), color = HomeScreenColor.colorRed diff --git a/android/app/src/main/java/com/naviapp/home/compose/home/ui/footer/BottomStickyNudgeUI.kt b/android/app/src/main/java/com/naviapp/home/compose/home/ui/footer/BottomStickyNudgeUI.kt index 0c924cb2a8..5662881190 100644 --- a/android/app/src/main/java/com/naviapp/home/compose/home/ui/footer/BottomStickyNudgeUI.kt +++ b/android/app/src/main/java/com/naviapp/home/compose/home/ui/footer/BottomStickyNudgeUI.kt @@ -37,11 +37,11 @@ import com.navi.common.model.common.AppUpdateData import com.navi.common.model.common.InvestmentTabNudgeData import com.navi.common.model.common.NetworkConnectivityNudgeData import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.theme.FF191919 import com.navi.design.theme.FF1F002A import com.navi.design.theme.FF444444 -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily import com.navi.design.utils.parseColorSafe import com.navi.naviwidgets.extensions.NaviText import com.naviapp.home.compose.extension.ImageFromIconCodeOrUrl @@ -102,13 +102,8 @@ fun NetworkConnectivityNudge(data: NetworkConnectivityNudgeData) { NaviText( text = data.title?.text ?: EMPTY, color = Color(data.titleColor.parseColorSafe()), - fontWeight = getFontWeight(FontWeightEnum.TT_MEDIUM), - style = - TextStyle( - fontSize = 12.sp, - fontFamily = ttComposeFontFamily, - lineHeight = 18.sp - ) + fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), + style = TextStyle(fontSize = 12.sp, fontFamily = naviFontFamily, lineHeight = 18.sp) ) } } @@ -148,11 +143,11 @@ fun AppUpdateBottomStickyNudge(data: AppUpdateData, bottomNudgeOnClick: (ActionD NaviText( text = data.title?.text ?: EMPTY, color = FF191919, - fontWeight = getFontWeight(FontWeightEnum.TT_MEDIUM), + fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), style = TextStyle( fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, lineHeight = 18.sp, ), maxLines = 1, @@ -171,8 +166,8 @@ fun AppUpdateBottomStickyNudge(data: AppUpdateData, bottomNudgeOnClick: (ActionD style = TextStyle( fontSize = 12.sp, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), lineHeight = 18.sp ) ) @@ -200,11 +195,11 @@ fun InvestmentTabNudge(data: InvestmentTabNudgeData? = null) { NaviText( text = data.title ?: EMPTY, color = FF191919, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), style = TextStyle( fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, lineHeight = 22.sp ), modifier = Modifier.height(22.dp) @@ -213,11 +208,11 @@ fun InvestmentTabNudge(data: InvestmentTabNudgeData? = null) { NaviText( text = data.subtitle ?: EMPTY, color = FF444444, - fontWeight = getFontWeight(FontWeightEnum.TT_MEDIUM), + fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), style = TextStyle( fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, lineHeight = 18.sp ), modifier = Modifier.height(18.dp) diff --git a/android/app/src/main/java/com/naviapp/home/dashboard/ui/ClosedLoansFragment.kt b/android/app/src/main/java/com/naviapp/home/dashboard/ui/ClosedLoansFragment.kt index 32d559f3d9..240b7b3894 100644 --- a/android/app/src/main/java/com/naviapp/home/dashboard/ui/ClosedLoansFragment.kt +++ b/android/app/src/main/java/com/naviapp/home/dashboard/ui/ClosedLoansFragment.kt @@ -136,7 +136,7 @@ class ClosedLoansFragment : BaseFragment() { ) it.customView ?.findViewById(R.id.tvTabName) - ?.setFontStyle(FontWeightEnum.TT_SEMI_BOLD) + ?.setFontStyle(FontWeightEnum.NAVI_BODY_DEMI_BOLD) it.customView?.findViewById(R.id.indicator)?.visibility = View.VISIBLE } } @@ -148,7 +148,7 @@ class ClosedLoansFragment : BaseFragment() { ?.setTextColor(ContextCompat.getColor(requireContext(), R.color.santas_gray)) it.customView ?.findViewById(R.id.tvTabName) - ?.setFontStyle(FontWeightEnum.TT_REGULAR) + ?.setFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) it.customView?.findViewById(R.id.indicator)?.visibility = View.GONE } } diff --git a/android/app/src/main/java/com/naviapp/home/dashboard/ui/DashboardFragment.kt b/android/app/src/main/java/com/naviapp/home/dashboard/ui/DashboardFragment.kt index 026f7a333d..56d3e0c29c 100644 --- a/android/app/src/main/java/com/naviapp/home/dashboard/ui/DashboardFragment.kt +++ b/android/app/src/main/java/com/naviapp/home/dashboard/ui/DashboardFragment.kt @@ -215,7 +215,7 @@ class DashboardFragment : PaymentBaseFragment() { ) it.customView ?.findViewById(R.id.tvTabName) - ?.setFontStyle(FontWeightEnum.TT_SEMI_BOLD) + ?.setFontStyle(FontWeightEnum.NAVI_BODY_DEMI_BOLD) it.customView?.findViewById(R.id.indicator)?.visibility = VISIBLE } } @@ -227,7 +227,7 @@ class DashboardFragment : PaymentBaseFragment() { ?.setTextColor(ContextCompat.getColor(requireContext(), R.color.santas_gray)) it.customView ?.findViewById(R.id.tvTabName) - ?.setFontStyle(FontWeightEnum.TT_REGULAR) + ?.setFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) it.customView?.findViewById(R.id.indicator)?.visibility = GONE } } diff --git a/android/app/src/main/java/com/naviapp/home/ui/CustomToast.kt b/android/app/src/main/java/com/naviapp/home/ui/CustomToast.kt index a1afaa2106..83327cbb2a 100644 --- a/android/app/src/main/java/com/naviapp/home/ui/CustomToast.kt +++ b/android/app/src/main/java/com/naviapp/home/ui/CustomToast.kt @@ -31,8 +31,8 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.naviapp.R import com.naviapp.home.model.ToastBarState import com.naviapp.home.ui.theme.color.NotificationColor @@ -72,8 +72,8 @@ fun BoxScope.CustomToast( text = text, color = Color.White, fontSize = 14.sp, - style = TextStyle(fontFamily = ttComposeFontFamily), - fontWeight = getFontWeight(FontWeightEnum.TT_MEDIUM) + style = TextStyle(fontFamily = naviFontFamily), + fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR) ) } } diff --git a/android/app/src/main/java/com/naviapp/home/ui/EmptyNotificationScreenRenderer.kt b/android/app/src/main/java/com/naviapp/home/ui/EmptyNotificationScreenRenderer.kt index db88515fe1..3f6fbecba0 100644 --- a/android/app/src/main/java/com/naviapp/home/ui/EmptyNotificationScreenRenderer.kt +++ b/android/app/src/main/java/com/naviapp/home/ui/EmptyNotificationScreenRenderer.kt @@ -41,8 +41,8 @@ import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper.NAVI_IAN_CROSS_SELL_AD_FALLBACK_TIMEOUT import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper.NAVI_IAN_CROSS_SELL_AD_RE_ID import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.pay.common.theme.color.NaviPayColor import com.naviapp.R import com.naviapp.home.activity.InAppNotificationActivity @@ -90,8 +90,8 @@ fun EmptyNotificationScreenRenderer( text = stringResource(id = R.string.no_notifications), fontSize = 14.sp, color = NotificationColor.noNotificationGray, - style = TextStyle(fontFamily = ttComposeFontFamily), - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), + style = TextStyle(fontFamily = naviFontFamily), + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), modifier = Modifier.align(Alignment.CenterHorizontally) ) } 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 5cc557035a..8c8f8941ce 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 @@ -35,8 +35,8 @@ import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import coil.request.ImageRequest import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.naviapp.R import com.naviapp.analytics.utils.NaviAnalytics import com.naviapp.home.model.Notification @@ -76,7 +76,7 @@ fun NotificationBottomSheet( text = bottomSheetData.notificationPayload?.team.orEmpty(), fontSize = 14.sp, color = Color.Black, - style = TextStyle(fontFamily = ttComposeFontFamily), + style = TextStyle(fontFamily = naviFontFamily), fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), ) } @@ -89,8 +89,8 @@ fun NotificationBottomSheet( lineHeight = 22.sp, fontSize = 14.sp, color = Color.Black, - style = TextStyle(fontFamily = ttComposeFontFamily), - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR) + style = TextStyle(fontFamily = naviFontFamily), + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) } @@ -180,7 +180,7 @@ private fun BottomSheetRowItem( stringResource(id = title), fontSize = 14.sp, color = Color.Black, - style = TextStyle(fontFamily = ttComposeFontFamily), + style = TextStyle(fontFamily = naviFontFamily), fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), modifier = Modifier.weight(1f) ) diff --git a/android/app/src/main/java/com/naviapp/home/ui/NotificationScreen.kt b/android/app/src/main/java/com/naviapp/home/ui/NotificationScreen.kt index ab6246ae71..ca2206c0b8 100644 --- a/android/app/src/main/java/com/naviapp/home/ui/NotificationScreen.kt +++ b/android/app/src/main/java/com/naviapp/home/ui/NotificationScreen.kt @@ -29,8 +29,8 @@ import androidx.compose.ui.unit.sp import androidx.constraintlayout.compose.ConstraintLayout import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.R as NaviWidgetsR import com.navi.pay.utils.noRippleClickable import com.naviapp.R @@ -127,8 +127,8 @@ fun NotificationScreenHeaderRenderer(activity: InAppNotificationActivity) { TextStyle( color = Color.Black, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR) + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) ) } 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 1af3af625e..daa18c6b64 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 @@ -81,8 +81,8 @@ import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper.NAVI_IAN_ import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper.NAVI_IAN_CROSS_SELL_AD_RE_ID import com.navi.common.utils.capitalize import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.pay.common.theme.color.NaviPayColor import com.naviapp.R import com.naviapp.analytics.utils.NaviAnalytics @@ -219,7 +219,7 @@ fun BoxScope.NotificationWidgetsRenderer( text = stringResource(id = R.string.previous_notifications), fontSize = 16.sp, color = Color.Black, - style = TextStyle(fontFamily = ttComposeFontFamily), + style = TextStyle(fontFamily = naviFontFamily), fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR) ) } @@ -391,8 +391,8 @@ fun NotificationRenderer( text = notification.notificationPayload.appearance.capitalize(), fontSize = 12.sp, color = Color.White, - style = TextStyle(fontFamily = ttComposeFontFamily), - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), + style = TextStyle(fontFamily = naviFontFamily), + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), ) } Spacer(modifier = Modifier.height(8.dp)) @@ -404,8 +404,8 @@ fun NotificationRenderer( modifier = Modifier.align(Alignment.CenterVertically), text = notification.notificationPayload?.team ?: EMPTY, fontSize = 12.sp, - style = TextStyle(fontFamily = ttComposeFontFamily), - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR) + style = TextStyle(fontFamily = naviFontFamily), + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) Spacer(modifier = Modifier.width(8.dp)) Text( @@ -413,8 +413,8 @@ fun NotificationRenderer( text = "•", color = colorResource(id = R.color.description_color_seven), fontSize = 16.sp, - style = TextStyle(fontFamily = ttComposeFontFamily), - fontWeight = getFontWeight(FontWeightEnum.TT_BOLD) + style = TextStyle(fontFamily = naviFontFamily), + fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_BOLD) ) Spacer(modifier = Modifier.width(8.dp)) Text( @@ -422,8 +422,8 @@ fun NotificationRenderer( text = timeElapsed.orEmpty(), color = NotificationColor.subTextSecondaryGray, fontSize = 12.sp, - style = TextStyle(fontFamily = ttComposeFontFamily), - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR) + style = TextStyle(fontFamily = naviFontFamily), + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) } Spacer(modifier = Modifier.height(8.dp)) @@ -433,8 +433,8 @@ fun NotificationRenderer( notification.notificationPayload?.title.orEmpty() ), fontSize = 14.sp, - style = TextStyle(fontFamily = ttComposeFontFamily), - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), + style = TextStyle(fontFamily = naviFontFamily), + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), lineHeight = 22.sp ) Spacer(modifier = Modifier.height(6.dp)) @@ -444,8 +444,8 @@ fun NotificationRenderer( notification.notificationPayload?.subtext.orEmpty() ), fontSize = 12.sp, - style = TextStyle(fontFamily = ttComposeFontFamily), - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), + style = TextStyle(fontFamily = naviFontFamily), + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NotificationColor.subTextPrimaryGray, lineHeight = 18.sp ) diff --git a/android/app/src/main/java/com/naviapp/home/ui/utils/NotificationUtils.kt b/android/app/src/main/java/com/naviapp/home/ui/utils/NotificationUtils.kt index 0168353b26..204efa8972 100644 --- a/android/app/src/main/java/com/naviapp/home/ui/utils/NotificationUtils.kt +++ b/android/app/src/main/java/com/naviapp/home/ui/utils/NotificationUtils.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.text.withStyle import androidx.core.net.toUri import com.navi.base.model.LineItem import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight +import com.navi.design.font.getFontWeight import com.navi.pay.utils.IS_FROM_IAN import com.naviapp.analytics.utils.NaviAnalytics import com.naviapp.common.navigator.NaviDeepLinkNavigator @@ -38,9 +38,10 @@ fun createAnnotatedStringWithBold(text: String): AnnotatedString { val endIndex = result.range.last + 1 // Adding 1 to include the second asterisk segments.addAll( listOf( - text.substring(lastIndex, startIndex) to getFontWeight(FontWeightEnum.TT_REGULAR), + text.substring(lastIndex, startIndex) to + getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), text.substring(startIndex + 2, endIndex - 2) to - getFontWeight(FontWeightEnum.TT_SEMI_BOLD) + getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) ) ) lastIndex = endIndex diff --git a/android/app/src/main/java/com/naviapp/home/utils/HomePageUtils.kt b/android/app/src/main/java/com/naviapp/home/utils/HomePageUtils.kt index 4153137e53..874c297b4e 100644 --- a/android/app/src/main/java/com/naviapp/home/utils/HomePageUtils.kt +++ b/android/app/src/main/java/com/naviapp/home/utils/HomePageUtils.kt @@ -31,10 +31,10 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.sp import com.navi.common.viewmodel.BaseVM import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.theme.FF191919 import com.navi.design.theme.FFA8A8A8 -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily import com.navi.naviwidgets.extensions.NaviText import com.navi.pay.common.theme.color.NaviPayColor import com.navi.uitron.model.UiTronResponse @@ -78,8 +78,8 @@ fun TabText(selectedTabId: String, tabName: String, tabId: String) { remember(selectedTabId, tabId) { if (selectedTabId == tabId) FF191919 else FFA8A8A8 } val fontWeight = remember(selectedTabId, tabId) { - if (selectedTabId == tabId) getFontWeight(FontWeightEnum.TT_SEMI_BOLD) - else getFontWeight(FontWeightEnum.TT_MEDIUM) + if (selectedTabId == tabId) getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) + else getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR) } NaviText( text = tabName, @@ -87,7 +87,7 @@ fun TabText(selectedTabId: String, tabName: String, tabId: String) { color = color, maxLines = 1, lineHeight = 18.sp, - style = TextStyle(fontFamily = ttComposeFontFamily), + style = TextStyle(fontFamily = naviFontFamily), fontWeight = fontWeight ) } diff --git a/android/app/src/main/java/com/naviapp/personalloan/getloan/creditAssignment/fragments/CreditAssignmentFragment.kt b/android/app/src/main/java/com/naviapp/personalloan/getloan/creditAssignment/fragments/CreditAssignmentFragment.kt index 17d6d6d26e..07cfdab86c 100644 --- a/android/app/src/main/java/com/naviapp/personalloan/getloan/creditAssignment/fragments/CreditAssignmentFragment.kt +++ b/android/app/src/main/java/com/naviapp/personalloan/getloan/creditAssignment/fragments/CreditAssignmentFragment.kt @@ -492,7 +492,7 @@ class CreditAssignmentFragment : TextFieldData( text = getCurrencyString(loanAmount.amount?.roundToInt()), size = loanAmountTextSize, - font = FontWeightEnum.TT_MEDIUM.name, + font = FontWeightEnum.NAVI_HEADLINE_REGULAR.name, textColor = loanAmountTextColor ) ) diff --git a/android/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/common/LabeledInputTextWithButton.kt b/android/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/common/LabeledInputTextWithButton.kt index 7327654a1a..b926345832 100644 --- a/android/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/common/LabeledInputTextWithButton.kt +++ b/android/app/src/main/java/com/naviapp/personalloan/getloan/loandetails/common/LabeledInputTextWithButton.kt @@ -22,7 +22,7 @@ import androidx.core.widget.doOnTextChanged import com.navi.common.utils.EMPTY import com.navi.design.R as DesignR import com.navi.design.font.FontWeightEnum -import com.navi.design.utils.getFontStyle +import com.navi.design.font.getFontStyle import com.navi.design.utils.getNaviDrawable import com.navi.design.utils.hideCutCopyMenuPopUp import com.navi.insurance.common.custom_view.addOnMultipleClicksHandler @@ -149,7 +149,10 @@ constructor(context: Context?, attrs: AttributeSet? = null) : LinearLayout(conte ) ) typeface = - ResourcesCompat.getFont(context, fontId ?: getFontStyle(FontWeightEnum.TT_REGULAR)) + ResourcesCompat.getFont( + context, + fontId ?: getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) + ) } } @@ -167,7 +170,10 @@ constructor(context: Context?, attrs: AttributeSet? = null) : LinearLayout(conte ResourcesCompat.getColor(resources, textColor ?: R.color.title_color_one, null) ) typeface = - ResourcesCompat.getFont(context, fontId ?: getFontStyle(FontWeightEnum.TT_MEDIUM)) + ResourcesCompat.getFont( + context, + fontId ?: getFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) + ) } } diff --git a/android/app/src/main/java/com/naviapp/personalloan/selfiecapture/SelfieVerificationHelper.kt b/android/app/src/main/java/com/naviapp/personalloan/selfiecapture/SelfieVerificationHelper.kt index 60d68d35d1..09fb430293 100644 --- a/android/app/src/main/java/com/naviapp/personalloan/selfiecapture/SelfieVerificationHelper.kt +++ b/android/app/src/main/java/com/naviapp/personalloan/selfiecapture/SelfieVerificationHelper.kt @@ -22,7 +22,7 @@ import com.navi.base.utils.orTrue import com.navi.base.utils.orZero import com.navi.common.utils.log import com.navi.design.font.FontWeightEnum -import com.navi.design.utils.getFontStyle +import com.navi.design.font.getFontStyle import com.naviapp.R import com.naviapp.analytics.utils.NaviAnalytics import com.naviapp.models.request.SelfieSetting @@ -55,8 +55,8 @@ class SelfieVerificationHelper { HyperSnapSDK.getInstance().setUiConfig(activity, uiConfig) val hvFaceConfig = HVFaceConfig() hvFaceConfig.isShouldAutoCapture = data?.shouldAutoCapture ?: true - hvFaceConfig.titleTypeface = getFontStyle(FontWeightEnum.TT_MEDIUM) - hvFaceConfig.statusTypeFace = getFontStyle(FontWeightEnum.TT_REGULAR) + hvFaceConfig.titleTypeface = getFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) + hvFaceConfig.statusTypeFace = getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) hvFaceConfig.faceDetectorTimeout = 5000L data?.let { hvFaceConfig.setLivenessMode( diff --git a/android/app/src/main/java/com/naviapp/personalloanrevamp/bankDetailsPostKyc/fragment/BankDetailsPostKycFragment.kt b/android/app/src/main/java/com/naviapp/personalloanrevamp/bankDetailsPostKyc/fragment/BankDetailsPostKycFragment.kt index 866b4336ae..8b69e3206d 100644 --- a/android/app/src/main/java/com/naviapp/personalloanrevamp/bankDetailsPostKyc/fragment/BankDetailsPostKycFragment.kt +++ b/android/app/src/main/java/com/naviapp/personalloanrevamp/bankDetailsPostKyc/fragment/BankDetailsPostKycFragment.kt @@ -278,7 +278,7 @@ class BankDetailsPostKycFragment : listOf( BoldTypeList( text = branchName, - fontType = FontWeightEnum.TT_REGULAR.name + fontType = FontWeightEnum.NAVI_BODY_REGULAR.name ) ), iconCode = ICON_IFSC_SUCCESS @@ -324,7 +324,10 @@ class BankDetailsPostKycFragment : }", boldTypeList = listOf( - BoldTypeList(text = text, fontType = FontWeightEnum.TT_REGULAR.name) + BoldTypeList( + text = text, + fontType = FontWeightEnum.NAVI_BODY_REGULAR.name + ) ), iconCode = IconUtils.ICON_ALERT_SOLID_RED ), diff --git a/android/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/fragments/BankDetailsV2Fragment.kt b/android/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/fragments/BankDetailsV2Fragment.kt index a3a2cc2034..3aa3e0524a 100644 --- a/android/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/fragments/BankDetailsV2Fragment.kt +++ b/android/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/fragments/BankDetailsV2Fragment.kt @@ -45,7 +45,7 @@ import com.navi.common.utils.* import com.navi.common.utils.toggleViewDisability import com.navi.design.R as DesignR import com.navi.design.font.FontWeightEnum -import com.navi.design.utils.getFontStyle +import com.navi.design.font.getFontStyle import com.navi.naviwidgets.R as WidgetsR import com.navi.naviwidgets.base.BaseInputWidget import com.navi.naviwidgets.models.response.Footer @@ -216,20 +216,20 @@ class BankDetailsV2Fragment : private fun initUi() { binding.ifscLt.setInputTextStyle( textColorId = R.color.title_color_four, - fontId = getFontStyle(FontWeightEnum.TT_REGULAR), + fontId = getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR), ) binding.bankAccountNumberLt.setInputTextStyle( textColorId = R.color.title_color_four, - fontId = getFontStyle(FontWeightEnum.TT_REGULAR), + fontId = getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR), ) binding.ifscLt.setHintTextStyle( textColorId = DesignR.color.dim_grey, - fontId = getFontStyle(FontWeightEnum.TT_REGULAR), + fontId = getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR), ) binding.bankAccountNumberLt.setHintTextStyle( textColorId = DesignR.color.dim_grey, - fontId = getFontStyle(FontWeightEnum.TT_REGULAR), + fontId = getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR), ) arguments?.getBoolean(EDIT_ACCOUNT)?.let { diff --git a/android/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/helper/BankDetailsV2Helper.kt b/android/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/helper/BankDetailsV2Helper.kt index b7521fd60e..5879f49f8d 100644 --- a/android/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/helper/BankDetailsV2Helper.kt +++ b/android/app/src/main/java/com/naviapp/personalloanrevamp/getloanRevamp/helper/BankDetailsV2Helper.kt @@ -77,7 +77,7 @@ object BankDetailsV2Helper { NaviSpan( fontSize = 14.0, spanColor = "#EF0000", - fontName = FontWeightEnum.TT_MEDIUM.name + fontName = FontWeightEnum.NAVI_HEADLINE_REGULAR.name ) ) ) @@ -93,7 +93,7 @@ object BankDetailsV2Helper { NaviSpan( fontSize = 12.0, spanColor = "#4D4D4D", - fontName = FontWeightEnum.TT_REGULAR.name + fontName = FontWeightEnum.NAVI_BODY_REGULAR.name ) ) ) diff --git a/android/app/src/main/java/com/naviapp/personalloanrevamp/manageLoan/composables/ManageLoanTab.kt b/android/app/src/main/java/com/naviapp/personalloanrevamp/manageLoan/composables/ManageLoanTab.kt index b372c04079..20206b3430 100644 --- a/android/app/src/main/java/com/naviapp/personalloanrevamp/manageLoan/composables/ManageLoanTab.kt +++ b/android/app/src/main/java/com/naviapp/personalloanrevamp/manageLoan/composables/ManageLoanTab.kt @@ -42,8 +42,8 @@ import coil.request.ImageRequest import com.google.accompanist.pager.ExperimentalPagerApi import com.google.accompanist.pager.rememberPagerState import com.navi.analytics.utils.NaviTrackEvent -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.utils.NoRippleIndicationSource import com.navi.naviwidgets.models.ScrollableTabWidgetData import com.navi.rr.utils.ext.clickable @@ -116,7 +116,7 @@ fun ManageLoanTab(widget: WidgetModelDefinition, viewModel: Mana style = TextStyle( fontSize = scrollWidgetData?.header?.title?.size?.sp ?: 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(scrollWidgetData?.header?.title?.font ?: ""), color = scrollWidgetData?.header?.title?.textColor?.hexToComposeColor @@ -136,7 +136,7 @@ fun ManageLoanTab(widget: WidgetModelDefinition, viewModel: Mana style = TextStyle( fontSize = scrollWidgetData?.header?.rightText?.size?.sp ?: 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(scrollWidgetData?.header?.rightText?.font ?: ""), color = @@ -163,7 +163,7 @@ fun ManageLoanTab(widget: WidgetModelDefinition, viewModel: Mana style = TextStyle( fontSize = title.tabTitle?.size?.sp ?: 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = if (selectedIndex == index) getFontWeight(title.tabTitle?.font) diff --git a/android/app/src/main/java/com/naviapp/releaselog/screens/ReleaseLogCommonView.kt b/android/app/src/main/java/com/naviapp/releaselog/screens/ReleaseLogCommonView.kt index c96fc37b3e..28ebdebd73 100644 --- a/android/app/src/main/java/com/naviapp/releaselog/screens/ReleaseLogCommonView.kt +++ b/android/app/src/main/java/com/naviapp/releaselog/screens/ReleaseLogCommonView.kt @@ -33,12 +33,12 @@ import com.airbnb.lottie.compose.LottieCompositionSpec import com.airbnb.lottie.compose.animateLottieCompositionAsState import com.airbnb.lottie.compose.rememberLottieComposition import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.theme.Black1A1A1A import com.navi.design.theme.Grey6B6B6B import com.navi.design.theme.WhiteFFFFFF import com.navi.design.theme.appBarGradientStart -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily import com.navi.naviwidgets.R as WidgetsR import com.naviapp.releaselog.activity.ReleaseLogActivity.Companion.APP_BAR_END_GRADIENT_POSITION import com.naviapp.releaselog.activity.ReleaseLogActivity.Companion.APP_BAR_START_GRADIENT_POSITION @@ -93,8 +93,8 @@ fun NaviErrorScreen( text = title, textAlign = TextAlign.Center, color = Black1A1A1A, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_MEDIUM), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 16.sp ) Spacer(modifier = Modifier.height(8.dp)) @@ -102,8 +102,8 @@ fun NaviErrorScreen( text = subtitle, textAlign = TextAlign.Center, color = Grey6B6B6B, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp ) } diff --git a/android/app/src/main/java/com/naviapp/releaselog/screens/ReleaseLogScreen.kt b/android/app/src/main/java/com/naviapp/releaselog/screens/ReleaseLogScreen.kt index 40b5bdc2dc..4f5318e902 100644 --- a/android/app/src/main/java/com/naviapp/releaselog/screens/ReleaseLogScreen.kt +++ b/android/app/src/main/java/com/naviapp/releaselog/screens/ReleaseLogScreen.kt @@ -72,8 +72,8 @@ import com.google.gson.reflect.TypeToken import com.navi.base.db.model.LogsEvent import com.navi.base.utils.isNotNullAndNotEmpty import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.R as WidgetsR import com.navi.pay.common.theme.color.NaviPayColor import com.naviapp.releaselog.utils.NetWatchUtil.colorKeysAndValues @@ -178,8 +178,8 @@ fun LogItem(log: LogsEvent, navController: NavController, viewModel: ReleaseLogV Text( text = if (log.statusCode != "null") log.statusCode.toString() else " !!! ", fontSize = 16.sp, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_MEDIUM), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = statusCodeColor, modifier = Modifier.width(40.dp).align(Alignment.CenterVertically), textAlign = TextAlign.Center @@ -189,16 +189,16 @@ fun LogItem(log: LogsEvent, navController: NavController, viewModel: ReleaseLogV Text( text = log.method.toString() + " " + log.endPoint.toString(), fontSize = 16.sp, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_MEDIUM), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = statusCodeColor ) Text( modifier = Modifier.fillMaxWidth(), text = log.baseUrl.toString(), fontSize = 14.sp, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = statusCodeColor ) Row { @@ -208,8 +208,8 @@ fun LogItem(log: LogsEvent, navController: NavController, viewModel: ReleaseLogV fontSize = 14.sp, maxLines = 1, overflow = TextOverflow.Ellipsis, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = statusCodeColor ) Text( @@ -218,8 +218,8 @@ fun LogItem(log: LogsEvent, navController: NavController, viewModel: ReleaseLogV fontSize = 14.sp, maxLines = 1, overflow = TextOverflow.Ellipsis, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = statusCodeColor ) Text( @@ -228,8 +228,8 @@ fun LogItem(log: LogsEvent, navController: NavController, viewModel: ReleaseLogV fontSize = 14.sp, maxLines = 1, overflow = TextOverflow.Ellipsis, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = statusCodeColor ) } diff --git a/android/app/src/main/java/com/naviapp/screenOverlay/nudge/ui/NudgeContainerExpandedState.kt b/android/app/src/main/java/com/naviapp/screenOverlay/nudge/ui/NudgeContainerExpandedState.kt index fa568978ee..c2263d6a4c 100644 --- a/android/app/src/main/java/com/naviapp/screenOverlay/nudge/ui/NudgeContainerExpandedState.kt +++ b/android/app/src/main/java/com/naviapp/screenOverlay/nudge/ui/NudgeContainerExpandedState.kt @@ -38,9 +38,9 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.theme.FF191919 -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily import com.navi.naviwidgets.composewidget.reusable.whiteColor import com.navi.naviwidgets.extensions.NaviText import com.navi.naviwidgets.utils.NaviWidgetIconUtils.getImageFromIconCode @@ -136,8 +136,8 @@ private fun NudgeExpandedStateHeader(onClick: () -> Unit) { NaviText( text = YOUR_PAYMENTS, color = FF191919, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), - style = TextStyle(fontSize = 16.sp, fontFamily = ttComposeFontFamily) + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), + style = TextStyle(fontSize = 16.sp, fontFamily = naviFontFamily) ) Box( modifier = Modifier.size(28.dp).clip(CircleShape).clickable(onClick = { onClick() }), diff --git a/android/app/src/main/java/com/naviapp/screenOverlay/nudge/ui/NudgeMiddlePill.kt b/android/app/src/main/java/com/naviapp/screenOverlay/nudge/ui/NudgeMiddlePill.kt index 8606351926..daa8bfd679 100644 --- a/android/app/src/main/java/com/naviapp/screenOverlay/nudge/ui/NudgeMiddlePill.kt +++ b/android/app/src/main/java/com/naviapp/screenOverlay/nudge/ui/NudgeMiddlePill.kt @@ -35,8 +35,8 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.navi.coin.theme.borderAlt import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.composewidget.reusable.whiteColor import com.navi.naviwidgets.extensions.NaviText import com.navi.naviwidgets.utils.NaviWidgetIconUtils.CHEVRON_UP_BLACK @@ -88,15 +88,15 @@ fun BoxScope.NudgeMiddlePill(nudgeCount: Int, onClick: () -> Unit) { NaviText( text = "+${(it - 1).coerceAtMost(9)} ", color = darkTextColor, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), - style = TextStyle(fontSize = 12.sp, fontFamily = ttComposeFontFamily) + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), + style = TextStyle(fontSize = 12.sp, fontFamily = naviFontFamily) ) } NaviText( text = MORE, color = darkTextColor, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), - style = TextStyle(fontSize = 12.sp, fontFamily = ttComposeFontFamily) + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), + style = TextStyle(fontSize = 12.sp, fontFamily = naviFontFamily) ) Spacer(Modifier.width(4.dp)) Image( diff --git a/android/app/src/main/java/com/naviapp/screenOverlay/nudge/ui/nudgeUI/NudgeBackLayer.kt b/android/app/src/main/java/com/naviapp/screenOverlay/nudge/ui/nudgeUI/NudgeBackLayer.kt index 0e9f797f9c..4bffa7d8bb 100644 --- a/android/app/src/main/java/com/naviapp/screenOverlay/nudge/ui/nudgeUI/NudgeBackLayer.kt +++ b/android/app/src/main/java/com/naviapp/screenOverlay/nudge/ui/nudgeUI/NudgeBackLayer.kt @@ -24,8 +24,8 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.sp import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText import com.naviapp.screenOverlay.nudge.utils.NudgeColor.colorRed import com.naviapp.screenOverlay.nudge.utils.NudgeColor.lightRed @@ -62,13 +62,13 @@ fun NudgeBackLayer( NaviText( text = DISMISS, color = colorRed, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), maxLines = 1, overflow = TextOverflow.Ellipsis, style = TextStyle( fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Center ), modifier = Modifier.width(ANCHOR_DRAG_WIDTH) diff --git a/android/app/src/main/java/com/naviapp/screenOverlay/popup/ui/CloseAllOption.kt b/android/app/src/main/java/com/naviapp/screenOverlay/popup/ui/CloseAllOption.kt index e790975cd6..2819793581 100644 --- a/android/app/src/main/java/com/naviapp/screenOverlay/popup/ui/CloseAllOption.kt +++ b/android/app/src/main/java/com/naviapp/screenOverlay/popup/ui/CloseAllOption.kt @@ -33,8 +33,8 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.composewidget.reusable.whiteColor import com.navi.naviwidgets.extensions.NaviText import com.navi.naviwidgets.utils.NaviWidgetIconUtils.ICON_CROSS_WHITE_24_24 @@ -73,7 +73,7 @@ fun BoxScope.CloseAllOption(isCloseAllButtonVisible: Boolean, listSize: Int, onC textAlign = TextAlign.Center, modifier = Modifier.padding(top = 8.dp), fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = whiteColor ) diff --git a/android/app/src/main/java/com/naviapp/webredirection/presentation/composables/WebRedirectionScreen.kt b/android/app/src/main/java/com/naviapp/webredirection/presentation/composables/WebRedirectionScreen.kt index a680fd1162..ba577aad39 100644 --- a/android/app/src/main/java/com/naviapp/webredirection/presentation/composables/WebRedirectionScreen.kt +++ b/android/app/src/main/java/com/naviapp/webredirection/presentation/composables/WebRedirectionScreen.kt @@ -39,8 +39,8 @@ import com.airbnb.lottie.compose.animateLottieCompositionAsState import com.airbnb.lottie.compose.rememberLottieComposition import com.navi.base.utils.EMPTY import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText import com.naviapp.R import com.naviapp.webredirection.presentation.utils.NAVI_FINSERV_LOGO_URL @@ -82,9 +82,9 @@ fun WebRedirectionLoadingScreen( NaviText( text = "Opening browser", fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, color = Color(0xFF191919), - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), ) Spacer(modifier = Modifier.height(24.dp)) WebRedirectionLottieAnimation( @@ -96,8 +96,8 @@ fun WebRedirectionLoadingScreen( NaviText( text = title, fontSize = 16.sp, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), modifier = Modifier.padding(30.dp, 0.dp), textAlign = TextAlign.Center ) @@ -105,9 +105,9 @@ fun WebRedirectionLoadingScreen( NaviText( text = subtitle, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, color = Color.Gray, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR) + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) } Row( @@ -124,9 +124,9 @@ fun WebRedirectionLoadingScreen( NaviText( text = "Safe & Secure", fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, color = Color.Gray, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD) + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) ) } } diff --git a/android/app/src/main/res/layout/action_button_v2_with_shimmer_view.xml b/android/app/src/main/res/layout/action_button_v2_with_shimmer_view.xml index 77beb3ebd4..b0bfd9c75c 100644 --- a/android/app/src/main/res/layout/action_button_v2_with_shimmer_view.xml +++ b/android/app/src/main/res/layout/action_button_v2_with_shimmer_view.xml @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:textColor="@color/white" android:textSize="@dimen/layout_sp_14" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" tools:text="Get loan" /> @@ -89,7 +89,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/layout_dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" tools:text="Please fill EMI date to proceed" android:textColor="@color/error_red" android:textSize="@dimen/spacing_12" diff --git a/android/app/src/main/res/layout/activity_bank_account_verification_loader_v2.xml b/android/app/src/main/res/layout/activity_bank_account_verification_loader_v2.xml index 276e4d52c0..b349cf2a33 100644 --- a/android/app/src/main/res/layout/activity_bank_account_verification_loader_v2.xml +++ b/android/app/src/main/res/layout/activity_bank_account_verification_loader_v2.xml @@ -71,7 +71,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/loader_animation" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" /> + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" /> + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" /> + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" /> + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" /> diff --git a/android/app/src/main/res/layout/auto_pay_pending_v2_layout.xml b/android/app/src/main/res/layout/auto_pay_pending_v2_layout.xml index 6d79c47e59..decd5e08d6 100644 --- a/android/app/src/main/res/layout/auto_pay_pending_v2_layout.xml +++ b/android/app/src/main/res/layout/auto_pay_pending_v2_layout.xml @@ -31,7 +31,7 @@ + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" /> @@ -76,7 +76,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/optional_tv" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" tool:text="Why setup?" /> diff --git a/android/app/src/main/res/layout/auto_pay_verification_method.xml b/android/app/src/main/res/layout/auto_pay_verification_method.xml index bab80f989c..026de26dcf 100644 --- a/android/app/src/main/res/layout/auto_pay_verification_method.xml +++ b/android/app/src/main/res/layout/auto_pay_verification_method.xml @@ -28,7 +28,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:setFontStyle="@{FontWeightEnum.TT_SEMI_BOLD}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_DEMI_BOLD}" tools:text="Select verification method" /> diff --git a/android/app/src/main/res/layout/bank_details_v2_fragment.xml b/android/app/src/main/res/layout/bank_details_v2_fragment.xml index e088a58501..eda3d0779a 100644 --- a/android/app/src/main/res/layout/bank_details_v2_fragment.xml +++ b/android/app/src/main/res/layout/bank_details_v2_fragment.xml @@ -87,7 +87,7 @@ android:textSize="@dimen/spacing_16" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/bank_details_view" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" /> + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" /> diff --git a/android/app/src/main/res/layout/bank_header_view.xml b/android/app/src/main/res/layout/bank_header_view.xml index 7db7cb7ece..1cbbd5a2b0 100644 --- a/android/app/src/main/res/layout/bank_header_view.xml +++ b/android/app/src/main/res/layout/bank_header_view.xml @@ -36,7 +36,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="@dimen/layout_dp_12" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" android:textColor="@color/black_one" android:textSize="@dimen/spacing_12" app:layout_constraintTop_toBottomOf="@id/bank_disclaimer_view" diff --git a/android/app/src/main/res/layout/bank_name_card_view.xml b/android/app/src/main/res/layout/bank_name_card_view.xml index f4d460d59f..d34dc31d5c 100644 --- a/android/app/src/main/res/layout/bank_name_card_view.xml +++ b/android/app/src/main/res/layout/bank_name_card_view.xml @@ -42,7 +42,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginTop="@dimen/layout_dp_24" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" android:textColor="@color/title_color_one" android:textSize="@dimen/spacing_14" android:text="@{bankCardBinder.title}" @@ -59,7 +59,7 @@ android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginTop="@dimen/layout_dp_4" android:layout_marginBottom="@dimen/layout_dp_24" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" android:textColor="@color/description_color_seven" android:textSize="@dimen/spacing_12" android:text="@{bankCardBinder.description}" diff --git a/android/app/src/main/res/layout/bank_search_suggested_result_view.xml b/android/app/src/main/res/layout/bank_search_suggested_result_view.xml index 5a1566184a..85e40cbcc0 100644 --- a/android/app/src/main/res/layout/bank_search_suggested_result_view.xml +++ b/android/app/src/main/res/layout/bank_search_suggested_result_view.xml @@ -30,7 +30,7 @@ @@ -140,7 +140,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:clickable="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/select_contact" android:textSize="@dimen/font_small" android:textAllCaps="false" diff --git a/android/app/src/main/res/layout/credit_assigment_fragment.xml b/android/app/src/main/res/layout/credit_assigment_fragment.xml index fea957999c..9d08179483 100644 --- a/android/app/src/main/res/layout/credit_assigment_fragment.xml +++ b/android/app/src/main/res/layout/credit_assigment_fragment.xml @@ -130,7 +130,7 @@ android:layout_height="wrap_content" android:background="@null" android:paddingVertical="@dimen/layout_dp_14" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:maxLength="7" android:hint="@string/enter_amount" android:inputType="number" @@ -151,7 +151,7 @@ tools:visibility="visible" android:textColor="@color/error_red" android:textSize="@dimen/font_extra_small" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" tools:text="Max. amount is ₹1,00,000" android:layout_marginTop="@dimen/layout_dp_4"/> @@ -223,7 +223,7 @@ style="@style/Subtitle2TextStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/edit" android:paddingTop="@dimen/layout_dp_8" android:paddingStart="@dimen/layout_dp_16" @@ -263,7 +263,7 @@ android:gravity="center_vertical" android:paddingVertical="@dimen/layout_dp_13" android:paddingHorizontal="@dimen/layout_dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:hint="@string/select_contact" android:textColor="@color/naviBlackText" android:textSize="@dimen/font_small" @@ -282,7 +282,7 @@ tools:visibility="visible" android:textColor="@color/error_red" android:textSize="@dimen/font_extra_small" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" tools:text="Need to select a contact to proceed" android:layout_marginTop="@dimen/layout_dp_4"/> @@ -328,7 +328,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textAllCaps="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:clickable="false" android:layout_gravity="center" android:textColor="@color/white" @@ -353,7 +353,7 @@ android:textColor="@color/description_color_seven" android:text="@string/link_will_be_shared_via" android:drawablePadding="@dimen/layout_dp_2" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:drawableEndCompat="@drawable/whatsapp" /> + android:fontFamily="@font/navi_body_regular"/> diff --git a/android/app/src/main/res/layout/csat_bottom_sheet.xml b/android/app/src/main/res/layout/csat_bottom_sheet.xml index 91a60e57d9..803fe26e96 100644 --- a/android/app/src/main/res/layout/csat_bottom_sheet.xml +++ b/android/app/src/main/res/layout/csat_bottom_sheet.xml @@ -61,7 +61,7 @@ android:layout_weight="@integer/integer_700" android:lineSpacingExtra="@dimen/_12dp" android:textAlignment="center" - tools:fontFamily="@font/tt_regular" + tools:fontFamily="@font/navi_body_regular" tools:text="₹1,04,356.42 has been received towards your loan. \nThere are no dues pending from your end." /> diff --git a/android/app/src/main/res/layout/custom_toast.xml b/android/app/src/main/res/layout/custom_toast.xml index 8ba8959028..40ddb84654 100644 --- a/android/app/src/main/res/layout/custom_toast.xml +++ b/android/app/src/main/res/layout/custom_toast.xml @@ -42,7 +42,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginStart="@dimen/layout_dp_8" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" android:textColor="@color/white" android:textSize="@dimen/_12sp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/android/app/src/main/res/layout/daily_offer_bottom_sheet.xml b/android/app/src/main/res/layout/daily_offer_bottom_sheet.xml index bbb1dc4cfb..cc18c19ec1 100644 --- a/android/app/src/main/res/layout/daily_offer_bottom_sheet.xml +++ b/android/app/src/main/res/layout/daily_offer_bottom_sheet.xml @@ -43,7 +43,7 @@ android:id="@+id/title_tv" android:layout_width="0dp" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/title_color_one" android:textSize="@dimen/spacing_12" android:layout_marginTop="@dimen/layout_dp_12" @@ -60,7 +60,7 @@ android:id="@+id/subtitle_tv" android:layout_width="0dp" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/title_color_one" android:textSize="@dimen/spacing_12" android:layout_marginTop="@dimen/layout_dp_8" @@ -77,7 +77,7 @@ android:id="@+id/description_tv" android:layout_width="0dp" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/description_color_seven" android:textSize="@dimen/spacing_12" android:layout_marginTop="@dimen/layout_dp_16" @@ -94,7 +94,7 @@ android:id="@+id/offer_text_tv" android:layout_width="0dp" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:layout_marginTop="@dimen/layout_dp_4" android:layout_marginStart="@dimen/layout_dp_20" android:layout_marginEnd="@dimen/layout_dp_20" diff --git a/android/app/src/main/res/layout/daily_offer_bottom_sheet_v2.xml b/android/app/src/main/res/layout/daily_offer_bottom_sheet_v2.xml index 97d727bd0d..52c2348545 100644 --- a/android/app/src/main/res/layout/daily_offer_bottom_sheet_v2.xml +++ b/android/app/src/main/res/layout/daily_offer_bottom_sheet_v2.xml @@ -40,7 +40,7 @@ xmlns:tools="http://schemas.android.com/tools"> android:layout_marginStart="@dimen/layout_dp_20" android:layout_marginTop="@dimen/layout_dp_12" android:layout_marginEnd="@dimen/layout_dp_20" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" android:text="@{offerBinder.title}" android:textAlignment="center" android:textColor="@color/description_color_seven" @@ -58,7 +58,7 @@ xmlns:tools="http://schemas.android.com/tools"> android:layout_marginStart="@dimen/layout_dp_20" android:layout_marginTop="@dimen/layout_dp_8" android:layout_marginEnd="@dimen/layout_dp_20" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" android:text="@{offerBinder.subtitle}" android:textAlignment="center" android:textColor="@color/black" @@ -76,7 +76,7 @@ xmlns:tools="http://schemas.android.com/tools"> android:layout_marginStart="@dimen/layout_dp_20" android:layout_marginTop="@dimen/layout_dp_16" android:layout_marginEnd="@dimen/layout_dp_20" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" android:textAlignment="center" android:textColor="@color/description_color_seven" android:textSize="@dimen/spacing_12" @@ -94,7 +94,7 @@ xmlns:tools="http://schemas.android.com/tools"> android:layout_marginStart="@dimen/layout_dp_20" android:layout_marginTop="@dimen/layout_dp_4" android:layout_marginEnd="@dimen/layout_dp_20" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" android:textAlignment="center" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/android/app/src/main/res/layout/dashboard_insurance_bottomsheet.xml b/android/app/src/main/res/layout/dashboard_insurance_bottomsheet.xml index eb0d5aa80e..1d64c4687c 100644 --- a/android/app/src/main/res/layout/dashboard_insurance_bottomsheet.xml +++ b/android/app/src/main/res/layout/dashboard_insurance_bottomsheet.xml @@ -35,7 +35,7 @@ android:textColor="@color/title_color_four" android:textSize="@dimen/sp_16" android:textStyle="bold" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/calendar" tools:text="Covered members" /> @@ -66,7 +66,7 @@ android:clickable="true" android:elevation="@dimen/dp_0" android:focusable="true" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center_horizontal|center_vertical" android:text="@string/skip" android:textAllCaps="false" @@ -83,7 +83,7 @@ android:layout_weight="1" android:clickable="true" android:focusable="true" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center_horizontal|center_vertical" android:text="@string/text_continue" android:textAllCaps="false" diff --git a/android/app/src/main/res/layout/dashboard_policy_payment_bottom_sheet.xml b/android/app/src/main/res/layout/dashboard_policy_payment_bottom_sheet.xml index 055dbcfc9a..c401bb9161 100644 --- a/android/app/src/main/res/layout/dashboard_policy_payment_bottom_sheet.xml +++ b/android/app/src/main/res/layout/dashboard_policy_payment_bottom_sheet.xml @@ -72,7 +72,7 @@ android:layout_marginVertical="@dimen/layout_dp_16" android:layout_marginEnd="@dimen/layout_dp_16" android:background="@drawable/rounded_positive_button_bg" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:textColor="@color/white" android:textSize="@dimen/font_small" @@ -100,7 +100,7 @@ android:id="@+id/due_date_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/description_color_two" android:textSize="@dimen/font_extra_small" app:layout_constraintBottom_toBottomOf="parent" @@ -115,7 +115,7 @@ style="@style/BannerFontStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/title_color_one" tools:text="₹2500" /> diff --git a/android/app/src/main/res/layout/dashboard_tab_item_layout.xml b/android/app/src/main/res/layout/dashboard_tab_item_layout.xml index 71859384d6..46e47bc2e5 100644 --- a/android/app/src/main/res/layout/dashboard_tab_item_layout.xml +++ b/android/app/src/main/res/layout/dashboard_tab_item_layout.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/layout_dp_2" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:textColor="@color/santas_gray" android:textSize="@dimen/font_medium" diff --git a/android/app/src/main/res/layout/divider_with_image_title_subtitle_layout.xml b/android/app/src/main/res/layout/divider_with_image_title_subtitle_layout.xml index 2d2b728a53..248e270421 100644 --- a/android/app/src/main/res/layout/divider_with_image_title_subtitle_layout.xml +++ b/android/app/src/main/res/layout/divider_with_image_title_subtitle_layout.xml @@ -86,7 +86,7 @@ app:setDrawableStartFromIconCode="@{binder.footerTagData.iconCode}" app:setStyledText="@{binder.footerTagData}" tools:drawableStartCompat="@drawable/document_with_info" - tools:fontFamily="@font/tt_medium" + tools:fontFamily="@font/navi_headline_regular" tools:text="Your total rate of interest is 14.25%" tools:textColor="#011A48" /> diff --git a/android/app/src/main/res/layout/emi_calendar_header_layout.xml b/android/app/src/main/res/layout/emi_calendar_header_layout.xml index 75b75a213e..a83a05dc00 100644 --- a/android/app/src/main/res/layout/emi_calendar_header_layout.xml +++ b/android/app/src/main/res/layout/emi_calendar_header_layout.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:text="@string/emi" android:textSize="@dimen/spacing_14" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/title_text_color" app:layout_constraintHorizontal_weight="0.2" app:layout_constraintStart_toStartOf="parent" @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:text="@string/due_date" android:textSize="@dimen/spacing_14" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/title_text_color" app:layout_constraintHorizontal_weight="0.5" app:layout_constraintStart_toEndOf="@id/emi_tv" @@ -37,7 +37,7 @@ android:layout_height="wrap_content" android:text="@string/amount" android:textSize="@dimen/spacing_14" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/title_text_color" android:gravity="end" app:layout_constraintHorizontal_weight="0.3" diff --git a/android/app/src/main/res/layout/emi_calendar_item.xml b/android/app/src/main/res/layout/emi_calendar_item.xml index b5a22b3691..a104b714ba 100644 --- a/android/app/src/main/res/layout/emi_calendar_item.xml +++ b/android/app/src/main/res/layout/emi_calendar_item.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:text="@{emiDateBinder.serialNumber}" android:textSize="@dimen/spacing_14" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/description_color_one" app:layout_constraintHorizontal_weight="0.2" app:layout_constraintStart_toStartOf="parent" @@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:text="@{emiDateBinder.dueDate}" android:textSize="@dimen/spacing_14" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/description_color_one" app:layout_constraintHorizontal_weight="0.5" app:layout_constraintStart_toEndOf="@id/emi_tv" @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:text="@{emiDateBinder.emi}" android:textSize="@dimen/spacing_14" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/description_color_one" android:gravity="end" app:layout_constraintHorizontal_weight="0.3" diff --git a/android/app/src/main/res/layout/emi_date_change_bottom_sheet.xml b/android/app/src/main/res/layout/emi_date_change_bottom_sheet.xml index 171f25d69d..16bab8b8ad 100644 --- a/android/app/src/main/res/layout/emi_date_change_bottom_sheet.xml +++ b/android/app/src/main/res/layout/emi_date_change_bottom_sheet.xml @@ -62,7 +62,7 @@ android:layout_marginTop="@dimen/dp_32" android:layout_marginEnd="@dimen/dp_16" android:background="@drawable/rounded_positive_button_bg" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:letterSpacing="0.02" android:textColor="@color/white" @@ -80,7 +80,7 @@ android:layout_marginEnd="@dimen/dp_16" android:layout_marginBottom="@dimen/dp_32" android:background="@drawable/rounded_rectangle_grey_24dp_radius" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:letterSpacing="0.02" android:textColor="@color/outrageous_orange" diff --git a/android/app/src/main/res/layout/emi_date_change_fragment.xml b/android/app/src/main/res/layout/emi_date_change_fragment.xml index f54e1e2bb2..ff9eb0aed1 100644 --- a/android/app/src/main/res/layout/emi_date_change_fragment.xml +++ b/android/app/src/main/res/layout/emi_date_change_fragment.xml @@ -52,7 +52,7 @@ android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginTop="@dimen/layout_dp_24" android:layout_marginEnd="@dimen/layout_dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@{emiDateBinder.content.chooseDateHeader}" android:textColor="@color/title_color_one" android:textSize="@dimen/spacing_14" diff --git a/android/app/src/main/res/layout/emi_date_item.xml b/android/app/src/main/res/layout/emi_date_item.xml index b779db8e26..fde08f0298 100644 --- a/android/app/src/main/res/layout/emi_date_item.xml +++ b/android/app/src/main/res/layout/emi_date_item.xml @@ -31,7 +31,7 @@ android:id="@+id/date_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@{keyValueBinder.value}" android:textSize="@dimen/spacing_14" android:gravity="center" diff --git a/android/app/src/main/res/layout/emi_method_selector_skip_mandate_v2.xml b/android/app/src/main/res/layout/emi_method_selector_skip_mandate_v2.xml index 6e33deeeb9..f8a29bddef 100644 --- a/android/app/src/main/res/layout/emi_method_selector_skip_mandate_v2.xml +++ b/android/app/src/main/res/layout/emi_method_selector_skip_mandate_v2.xml @@ -22,7 +22,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" tools:text="Choose the method for paying EMI" /> @@ -59,7 +59,7 @@ app:layout_constraintEnd_toStartOf="@id/second_view_tv" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/first_view" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" tools:text="Use Netbanking" /> diff --git a/android/app/src/main/res/layout/error_v2_bottom_sheet.xml b/android/app/src/main/res/layout/error_v2_bottom_sheet.xml index 97fe01078c..9292129334 100644 --- a/android/app/src/main/res/layout/error_v2_bottom_sheet.xml +++ b/android/app/src/main/res/layout/error_v2_bottom_sheet.xml @@ -50,7 +50,7 @@ diff --git a/android/app/src/main/res/layout/exclamation_toast_layout.xml b/android/app/src/main/res/layout/exclamation_toast_layout.xml index 6c92aa8502..14c6abdc88 100644 --- a/android/app/src/main/res/layout/exclamation_toast_layout.xml +++ b/android/app/src/main/res/layout/exclamation_toast_layout.xml @@ -37,7 +37,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="@dimen/layout_dp_8" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/white" android:textSize="@dimen/font_extra_small" app:drawableStartCompat="@drawable/ic_exclamation_white" diff --git a/android/app/src/main/res/layout/expandable_title_desc_view.xml b/android/app/src/main/res/layout/expandable_title_desc_view.xml index b55a00498c..868646e35e 100644 --- a/android/app/src/main/res/layout/expandable_title_desc_view.xml +++ b/android/app/src/main/res/layout/expandable_title_desc_view.xml @@ -65,7 +65,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:visibility="gone" tools:text="@string/emi_debit_title" tools:visibility="visible" /> diff --git a/android/app/src/main/res/layout/footer_view_v2.xml b/android/app/src/main/res/layout/footer_view_v2.xml index 17b7e91c9a..1c4e311cc2 100644 --- a/android/app/src/main/res/layout/footer_view_v2.xml +++ b/android/app/src/main/res/layout/footer_view_v2.xml @@ -48,7 +48,7 @@ app:layout_constraintEnd_toStartOf="@id/know_more_tv" app:layout_constraintStart_toEndOf="@id/data_security_iv" app:layout_constraintTop_toTopOf="parent" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" /> + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" /> + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" /> @@ -210,7 +210,7 @@ android:background="@color/view_background_color_six" android:clickable="true" android:focusable="true" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" android:gravity="center" android:text="@{footer.backCta.title}" android:textColor="@color/outrageous_orange" @@ -243,7 +243,7 @@ android:background="@color/outrageous_orange" android:clickable="true" android:focusable="true" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" android:gravity="center" android:text="@{footer.nextCta.title}" android:textColor="@color/white" @@ -275,7 +275,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/progress_b" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" tools:visibility="gone" /> diff --git a/android/app/src/main/res/layout/footer_view_with_title_description.xml b/android/app/src/main/res/layout/footer_view_with_title_description.xml index f7a7ce7017..6bfae1205f 100644 --- a/android/app/src/main/res/layout/footer_view_with_title_description.xml +++ b/android/app/src/main/res/layout/footer_view_with_title_description.xml @@ -48,7 +48,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="1.0" app:setClickableTextListener="@{clickableTextListener}" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" app:setStyledText="@{footerBinder.overlayDescription}" tools:text="By continuing, you accept terms of the Loan agreement and declare that you are not politically exposed." /> @@ -89,7 +89,7 @@ diff --git a/android/app/src/main/res/layout/header_with_description_view.xml b/android/app/src/main/res/layout/header_with_description_view.xml index 45160c34b6..b6787b277f 100644 --- a/android/app/src/main/res/layout/header_with_description_view.xml +++ b/android/app/src/main/res/layout/header_with_description_view.xml @@ -33,7 +33,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_goneMarginTop="@dimen/layout_dp_16" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" tools:text="Basic Details" tools:visibility="visible" /> @@ -66,7 +66,7 @@ app:layout_constraintEnd_toStartOf="@id/form_animation" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/form_title" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" app:setStyledText="@{header.styledDescription}" tools:text="We need their details to provide you best offer" tools:visibility="visible" /> diff --git a/android/app/src/main/res/layout/horizontal_note_layout.xml b/android/app/src/main/res/layout/horizontal_note_layout.xml index e3d6f3a1d1..0f5679bdbd 100644 --- a/android/app/src/main/res/layout/horizontal_note_layout.xml +++ b/android/app/src/main/res/layout/horizontal_note_layout.xml @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" tools:textSize="@dimen/_10sp" - app:setFontStyle="@{FontWeightEnum.TT_BOLD}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_BOLD}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:setTextWithStyle="@{horizontalNote.title}" @@ -37,7 +37,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/layout_dp_12" tools:textSize="@dimen/_10sp" - setFontStyle="@{FontWeightEnum.TT_REGULAR}" + setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/tv_title" diff --git a/android/app/src/main/res/layout/icon_text_steps_layout.xml b/android/app/src/main/res/layout/icon_text_steps_layout.xml index 03bc3ce12c..282ee976a1 100644 --- a/android/app/src/main/res/layout/icon_text_steps_layout.xml +++ b/android/app/src/main/res/layout/icon_text_steps_layout.xml @@ -26,7 +26,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" setStyledText="@{topupItemBinder.textHeader}" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:textColor="@color/outrageous_orange" android:paddingHorizontal="@dimen/layout_dp_10" android:paddingVertical="@dimen/layout_dp_5" @@ -35,11 +35,11 @@ diff --git a/android/app/src/main/res/layout/info_bottom_sheet_layout.xml b/android/app/src/main/res/layout/info_bottom_sheet_layout.xml index 3ad5f918dc..0d928ee4c3 100644 --- a/android/app/src/main/res/layout/info_bottom_sheet_layout.xml +++ b/android/app/src/main/res/layout/info_bottom_sheet_layout.xml @@ -38,7 +38,7 @@ android:textSize="@dimen/spacing_18" app:layout_constraintStart_toStartOf="@id/info_iv" app:layout_constraintTop_toBottomOf="@id/info_iv" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" tools:text="Know more" /> diff --git a/android/app/src/main/res/layout/info_bottomsheet_item.xml b/android/app/src/main/res/layout/info_bottomsheet_item.xml index b4ec21f8e6..f83fc38642 100644 --- a/android/app/src/main/res/layout/info_bottomsheet_item.xml +++ b/android/app/src/main/res/layout/info_bottomsheet_item.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_8" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/tick_icon" app:layout_constraintTop_toTopOf="parent" diff --git a/android/app/src/main/res/layout/input_with_error_label_view.xml b/android/app/src/main/res/layout/input_with_error_label_view.xml index 2089fdbdc1..9e956d3df3 100644 --- a/android/app/src/main/res/layout/input_with_error_label_view.xml +++ b/android/app/src/main/res/layout/input_with_error_label_view.xml @@ -22,7 +22,7 @@ android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginEnd="@dimen/layout_dp_16" android:background="@null" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:imeOptions="actionDone" android:inputType="text" android:maxLines="1" diff --git a/android/app/src/main/res/layout/input_with_label_and_error_label.xml b/android/app/src/main/res/layout/input_with_label_and_error_label.xml index a3fc5d8fed..498c1e7f57 100644 --- a/android/app/src/main/res/layout/input_with_label_and_error_label.xml +++ b/android/app/src/main/res/layout/input_with_label_and_error_label.xml @@ -57,7 +57,7 @@ android:visibility="gone" android:textSize="@dimen/layout_sp_14" android:enabled="@{inputWithErrorData.editable}" - app:setFontStyle="@{inputWithErrorData.fontFamily == null ? FontWeightEnum.TT_REGULAR : inputWithErrorData.fontFamily}" + app:setFontStyle="@{inputWithErrorData.fontFamily == null ? FontWeightEnum.NAVI_BODY_REGULAR : inputWithErrorData.fontFamily}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_label" /> @@ -70,7 +70,7 @@ android:baselineAligned="false" android:layout_marginHorizontal="@dimen/layout_dp_16" android:enabled="@{inputWithErrorData.editable}" - app:setFontStyle="@{inputWithErrorData.fontFamily == null ? FontWeightEnum.TT_REGULAR : inputWithErrorData.fontFamily}" + app:setFontStyle="@{inputWithErrorData.fontFamily == null ? FontWeightEnum.NAVI_BODY_REGULAR : inputWithErrorData.fontFamily}" android:hint="@{inputWithErrorData.inputData.hint}" android:imeOptions="actionDone" android:inputType="text" 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 783575f8fd..6e5851df44 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 @@ -29,7 +29,7 @@ style="@style/BulletTextStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" android:text="@{itemFooter.text}" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/app/src/main/res/layout/kyc_document_item.xml b/android/app/src/main/res/layout/kyc_document_item.xml index 98f9469fba..90202ce5a8 100644 --- a/android/app/src/main/res/layout/kyc_document_item.xml +++ b/android/app/src/main/res/layout/kyc_document_item.xml @@ -21,7 +21,7 @@ style="@style/TitleFontStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" tools:text="Electricity Bill" /> diff --git a/android/app/src/main/res/layout/layout_dropdown_bottom_sheet_item.xml b/android/app/src/main/res/layout/layout_dropdown_bottom_sheet_item.xml index 48bab2c6ed..ddfaa28ec0 100644 --- a/android/app/src/main/res/layout/layout_dropdown_bottom_sheet_item.xml +++ b/android/app/src/main/res/layout/layout_dropdown_bottom_sheet_item.xml @@ -17,7 +17,7 @@ android:id="@+id/title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/description_color_one" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/android/app/src/main/res/layout/layout_tnc_bottomsheet.xml b/android/app/src/main/res/layout/layout_tnc_bottomsheet.xml index 00da4a0cc2..fed2d2fd22 100644 --- a/android/app/src/main/res/layout/layout_tnc_bottomsheet.xml +++ b/android/app/src/main/res/layout/layout_tnc_bottomsheet.xml @@ -48,7 +48,7 @@ android:background="@drawable/rounded_rectangle_orange_24dp_radius" android:clickable="true" android:focusable="true" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:textColor="@color/white" android:textSize="@dimen/sp_14" diff --git a/android/app/src/main/res/layout/left_icon_text_with_right_button.xml b/android/app/src/main/res/layout/left_icon_text_with_right_button.xml index 1871e5d8a3..c6cad28727 100644 --- a/android/app/src/main/res/layout/left_icon_text_with_right_button.xml +++ b/android/app/src/main/res/layout/left_icon_text_with_right_button.xml @@ -25,7 +25,7 @@ android:gravity="start" android:textColor="@color/title_color_two" android:textSize="@dimen/spacing_16" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" /> + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" /> + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" /> \ No newline at end of file diff --git a/android/app/src/main/res/layout/loan_disbursement_success_view.xml b/android/app/src/main/res/layout/loan_disbursement_success_view.xml index 46c28e8b68..ca2f2ded77 100644 --- a/android/app/src/main/res/layout/loan_disbursement_success_view.xml +++ b/android/app/src/main/res/layout/loan_disbursement_success_view.xml @@ -41,7 +41,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/success_iv" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" tools:text="Loan Transferred Successfully" /> diff --git a/android/app/src/main/res/layout/loan_emi_tenure_view.xml b/android/app/src/main/res/layout/loan_emi_tenure_view.xml index c695519d68..14862d958b 100644 --- a/android/app/src/main/res/layout/loan_emi_tenure_view.xml +++ b/android/app/src/main/res/layout/loan_emi_tenure_view.xml @@ -36,7 +36,7 @@ android:id="@+id/loan_amount_tv" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:textColor="@color/black" android:gravity="center" android:textSize="@dimen/spacing_18" @@ -78,7 +78,7 @@ android:layout_height="wrap_content" android:background="@color/view_background_color_eighteen" app:setBackgroundColor="@{binder.footerbgColor}" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/description_color_seven" android:gravity="center" android:textSize="@dimen/spacing_10" diff --git a/android/app/src/main/res/layout/loan_offer_bottomsheet_data_row.xml b/android/app/src/main/res/layout/loan_offer_bottomsheet_data_row.xml index 1c66c8fef2..6fb7f2ebd1 100644 --- a/android/app/src/main/res/layout/loan_offer_bottomsheet_data_row.xml +++ b/android/app/src/main/res/layout/loan_offer_bottomsheet_data_row.xml @@ -21,7 +21,7 @@ android:id="@+id/loan_amount_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:text="@{bottomSheetListItem.key}" android:textColor="@color/description_color_seven" android:textSize="@dimen/spacing_14" @@ -32,7 +32,7 @@ + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" /> + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_BOLD}" /> @@ -69,8 +69,8 @@ app:layout_constraintEnd_toStartOf="@+id/arrow_iv" app:layout_constraintStart_toEndOf="@+id/image_iv" app:layout_constraintTop_toBottomOf="@+id/title_tv" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" - tools:fontFamily="@font/tt_regular" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" + tools:fontFamily="@font/navi_body_regular" tools:text="via OTP or net banking login" tools:visibility="visible" /> 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 2da256769e..538154906c 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 @@ -43,7 +43,7 @@ @@ -57,7 +57,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title_tv" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" app:setTextFieldData="@{binder.description}" tools:text="Description" /> @@ -73,7 +73,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/description_tv" - app:setFontStyle="@{FontWeightEnum.TT_SEMI_BOLD}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_DEMI_BOLD}" app:setTextFieldData="@{binder.nextCta.title}" android:visibility="@{binder.nextCta == null ? View.GONE : View.VISIBLE}" tools:text="Next" /> @@ -90,7 +90,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/next_cta" - app:setFontStyle="@{FontWeightEnum.TT_SEMI_BOLD}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_DEMI_BOLD}" app:setTextFieldData="@{binder.footerCta.title}" android:visibility="@{binder.footerCta == null ? View.GONE : View.VISIBLE}" tools:text="Footer" /> diff --git a/android/app/src/main/res/layout/offer_upgraded_card_layout.xml b/android/app/src/main/res/layout/offer_upgraded_card_layout.xml index c24db37bd8..26a44a8d11 100644 --- a/android/app/src/main/res/layout/offer_upgraded_card_layout.xml +++ b/android/app/src/main/res/layout/offer_upgraded_card_layout.xml @@ -56,7 +56,7 @@ android:visibility="@{response.loanAmount==null ? View.GONE : View.VISIBLE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title_tv" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" tools:text="+ ₹1,00,000" /> diff --git a/android/app/src/main/res/layout/otp_box_layout.xml b/android/app/src/main/res/layout/otp_box_layout.xml index 99446611f7..c4686f1a91 100644 --- a/android/app/src/main/res/layout/otp_box_layout.xml +++ b/android/app/src/main/res/layout/otp_box_layout.xml @@ -13,7 +13,7 @@ style="@style/BoxInputGroupStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:inputType="number" /> diff --git a/android/app/src/main/res/layout/otp_fragment.xml b/android/app/src/main/res/layout/otp_fragment.xml index 768a80e00c..43858dc73e 100644 --- a/android/app/src/main/res/layout/otp_fragment.xml +++ b/android/app/src/main/res/layout/otp_fragment.xml @@ -166,7 +166,7 @@ style="@style/ActionButtonTextStyle" android:layout_width="match_parent" android:layout_height="@dimen/layout_dp_48" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:gravity="center" android:text="@string/verify" android:textSize="@dimen/layout_sp_14" diff --git a/android/app/src/main/res/layout/part_pre_payment_fragment.xml b/android/app/src/main/res/layout/part_pre_payment_fragment.xml index 335d72f1ef..df6897abee 100644 --- a/android/app/src/main/res/layout/part_pre_payment_fragment.xml +++ b/android/app/src/main/res/layout/part_pre_payment_fragment.xml @@ -88,7 +88,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@{prePaymentDetailsResponse.content.faqDetail.title}" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_12" @@ -105,7 +105,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="5sp" android:text="@{prePaymentDetailsResponse.content.faqDetail.description}" android:textColor="@color/naviSubText" @@ -123,7 +123,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:onClick="@{(view)->prePaymentFragment.onFaqTap()}" android:text="@{prePaymentDetailsResponse.content.faqDetail.footer}" android:textColor="@color/naviBlackText" diff --git a/android/app/src/main/res/layout/part_prepayment_review_view.xml b/android/app/src/main/res/layout/part_prepayment_review_view.xml index 66fb003452..05e0bb4769 100644 --- a/android/app/src/main/res/layout/part_prepayment_review_view.xml +++ b/android/app/src/main/res/layout/part_prepayment_review_view.xml @@ -17,7 +17,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_16" app:layout_constraintEnd_toEndOf="parent" @@ -65,7 +65,7 @@ android:layout_marginTop="@dimen/dp_24" android:drawableEnd="@drawable/ic_arrow_down_small" android:drawablePadding="@dimen/dp_8" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/view_all" android:textColor="@color/action_view_gradient_start_color" android:textSize="@dimen/sp_14" diff --git a/android/app/src/main/res/layout/penny_drop_attempts_layout.xml b/android/app/src/main/res/layout/penny_drop_attempts_layout.xml index cc34205333..a0b6ebd7ce 100644 --- a/android/app/src/main/res/layout/penny_drop_attempts_layout.xml +++ b/android/app/src/main/res/layout/penny_drop_attempts_layout.xml @@ -29,7 +29,7 @@ android:id="@+id/title_tv" android:layout_width="0dp" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/spacing_12" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -51,7 +51,7 @@ android:id="@+id/subtitle_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/spacing_10" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/android/app/src/main/res/layout/penny_drop_attempts_v2_layout.xml b/android/app/src/main/res/layout/penny_drop_attempts_v2_layout.xml index c31de0469f..0118f3d46f 100644 --- a/android/app/src/main/res/layout/penny_drop_attempts_v2_layout.xml +++ b/android/app/src/main/res/layout/penny_drop_attempts_v2_layout.xml @@ -38,7 +38,7 @@ diff --git a/android/app/src/main/res/layout/penny_error_bottom_sheet.xml b/android/app/src/main/res/layout/penny_error_bottom_sheet.xml index 654c59c8b7..46d7ac906e 100644 --- a/android/app/src/main/res/layout/penny_error_bottom_sheet.xml +++ b/android/app/src/main/res/layout/penny_error_bottom_sheet.xml @@ -44,7 +44,7 @@ android:layout_marginStart="@dimen/layout_dp_24" android:layout_marginTop="@dimen/layout_dp_12" android:layout_marginEnd="@dimen/layout_dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/title_color_one" android:textSize="@dimen/spacing_20" android:visibility="@{binder.title == null ? View.GONE : View.VISIBLE}" @@ -61,7 +61,7 @@ android:layout_marginStart="@dimen/layout_dp_24" android:layout_marginTop="@dimen/layout_dp_8" android:layout_marginEnd="@dimen/layout_dp_24" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/description_color_one" android:textSize="@dimen/spacing_14" android:visibility="@{binder.description == null ? View.GONE : View.VISIBLE}" @@ -123,7 +123,7 @@ android:layout_marginStart="@dimen/layout_dp_24" android:layout_marginTop="@dimen/layout_dp_8" android:layout_marginEnd="@dimen/layout_dp_24" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/red" android:textSize="@dimen/spacing_12" android:textAlignment="center" 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 6baa728550..ae9c18639c 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 @@ -42,7 +42,7 @@ app:layout_constraintEnd_toEndOf="@+id/image_lay" app:layout_constraintStart_toStartOf="@+id/image_lay" app:layout_constraintTop_toBottomOf="@+id/image_lay" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" tools:text="ICICI" /> diff --git a/android/app/src/main/res/layout/radio_selector_item_view.xml b/android/app/src/main/res/layout/radio_selector_item_view.xml index 57bbad4995..98ebdd827a 100644 --- a/android/app/src/main/res/layout/radio_selector_item_view.xml +++ b/android/app/src/main/res/layout/radio_selector_item_view.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/layout_dp_12" android:layout_marginEnd="@dimen/layout_dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/description_color_seven" android:textSize="@dimen/layout_sp_14" app:layout_constraintBottom_toBottomOf="@id/radio_btn" @@ -46,7 +46,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/layout_dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/description_color_seven" android:textSize="@dimen/layout_sp_16" app:layout_constraintBottom_toBottomOf="@id/radio_btn" diff --git a/android/app/src/main/res/layout/row_part_pre_payment.xml b/android/app/src/main/res/layout/row_part_pre_payment.xml index 5d950eb16a..334bc8ebcb 100644 --- a/android/app/src/main/res/layout/row_part_pre_payment.xml +++ b/android/app/src/main/res/layout/row_part_pre_payment.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom" android:layout_marginStart="@dimen/dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/description_color_one" android:textSize="@dimen/sp_14" tools:text="EMI" @@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/description_color_one" android:textSize="@dimen/sp_12" app:layout_constraintStart_toStartOf="parent" @@ -54,7 +54,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_20" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/description_color_one" android:textSize="@dimen/sp_14" app:layout_constraintStart_toStartOf="@+id/dueDateStatus" @@ -70,7 +70,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom" android:layout_marginEnd="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/greyish_brown" android:textSize="@dimen/sp_14" tools:text="Amount" diff --git a/android/app/src/main/res/layout/row_part_pre_payment_header.xml b/android/app/src/main/res/layout/row_part_pre_payment_header.xml index d5bf353d2d..6a7977cfce 100644 --- a/android/app/src/main/res/layout/row_part_pre_payment_header.xml +++ b/android/app/src/main/res/layout/row_part_pre_payment_header.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom" android:layout_marginStart="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/title_text_color" android:textSize="@dimen/sp_14" tools:text="EMI" @@ -32,7 +32,7 @@ android:id="@+id/dueDateTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:layout_marginHorizontal="@dimen/dp_16" android:textColor="@color/title_text_color" android:textSize="@dimen/sp_14" @@ -45,7 +45,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom" android:layout_marginEnd="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/title_text_color" android:textSize="@dimen/sp_14" tools:text="Amount" diff --git a/android/app/src/main/res/layout/search_field_layout.xml b/android/app/src/main/res/layout/search_field_layout.xml index 6c756eec0d..4d316222b9 100644 --- a/android/app/src/main/res/layout/search_field_layout.xml +++ b/android/app/src/main/res/layout/search_field_layout.xml @@ -38,7 +38,7 @@ android:layout_toStartOf="@id/close_iv" android:layout_toEndOf="@id/search_iv" android:background="@null" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:inputType="text" android:maxLength="@integer/max_company_name_length" /> diff --git a/android/app/src/main/res/layout/search_field_v2_layout.xml b/android/app/src/main/res/layout/search_field_v2_layout.xml index 8b37f60bdb..e09473d140 100644 --- a/android/app/src/main/res/layout/search_field_v2_layout.xml +++ b/android/app/src/main/res/layout/search_field_v2_layout.xml @@ -40,7 +40,7 @@ android:inputType="text" android:maxLength="@integer/max_company_name_length" android:textSize="@dimen/spacing_14" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" tools:hint="Search Your Bank" /> + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" /> diff --git a/android/app/src/main/res/layout/select_bank_row_header_item.xml b/android/app/src/main/res/layout/select_bank_row_header_item.xml index c2c38a9625..bb84c4199a 100644 --- a/android/app/src/main/res/layout/select_bank_row_header_item.xml +++ b/android/app/src/main/res/layout/select_bank_row_header_item.xml @@ -16,5 +16,5 @@ android:layout_marginBottom="@dimen/layout_dp_8" android:textColor="@color/title_color_two" android:textSize="@dimen/spacing_16" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" /> + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" /> \ No newline at end of file diff --git a/android/app/src/main/res/layout/select_bank_v2_layout.xml b/android/app/src/main/res/layout/select_bank_v2_layout.xml index 7ff07ece5e..69c6041b01 100644 --- a/android/app/src/main/res/layout/select_bank_v2_layout.xml +++ b/android/app/src/main/res/layout/select_bank_v2_layout.xml @@ -27,7 +27,7 @@ + android:fontFamily="@font/navi_body_demi_bold"/> @@ -63,7 +63,7 @@ android:maxLines="@integer/integer_2" android:minLines="@integer/integer_2" android:textSize="@dimen/font_mini" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/black" tools:text="Himanshu Tanwar" android:ellipsize="end"/> diff --git a/android/app/src/main/res/layout/selector_tile_item_view.xml b/android/app/src/main/res/layout/selector_tile_item_view.xml index af807921c8..d11caec10e 100644 --- a/android/app/src/main/res/layout/selector_tile_item_view.xml +++ b/android/app/src/main/res/layout/selector_tile_item_view.xml @@ -54,7 +54,7 @@ android:textAlignment="center" android:visibility="@{currentConfigBinder.title != null ? View.VISIBLE : View.GONE}" app:setStyledText="@{currentConfigBinder.title}" - tools:fontFamily="@font/tt_semi_bold" + tools:fontFamily="@font/navi_body_demi_bold" tools:text="4245" tools:textColor="@color/outrageous_orange" tools:textSize="@dimen/spacing_14" @@ -68,7 +68,7 @@ android:textAlignment="center" android:visibility="@{currentConfigBinder.subtitle != null ? View.VISIBLE : View.GONE}" app:setStyledText="@{currentConfigBinder.subtitle}" - tools:fontFamily="@font/tt_medium" + tools:fontFamily="@font/navi_headline_regular" tools:targetApi="p" tools:text="06 Months" tools:textColor="@color/color_191919" 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 8c957ece80..791d57fad7 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 @@ -27,7 +27,7 @@ diff --git a/android/app/src/main/res/layout/styled_key_value_view.xml b/android/app/src/main/res/layout/styled_key_value_view.xml index 98049f773b..6e45323598 100644 --- a/android/app/src/main/res/layout/styled_key_value_view.xml +++ b/android/app/src/main/res/layout/styled_key_value_view.xml @@ -37,7 +37,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="@dimen/spacing_14" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" app:setStyledText="@{styledKeyValueBinder.styledKey}" tools:text="Loan amount" /> @@ -63,7 +63,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toEndOf="@id/styled_key_ll" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" app:setStyledText="@{styledKeyValueBinder.styledValue}" tools:text="₹ 12,00,000" /> diff --git a/android/app/src/main/res/layout/styled_title_wtth_button_view.xml b/android/app/src/main/res/layout/styled_title_wtth_button_view.xml index 3bf1c8834f..0df97efd59 100644 --- a/android/app/src/main/res/layout/styled_title_wtth_button_view.xml +++ b/android/app/src/main/res/layout/styled_title_wtth_button_view.xml @@ -33,7 +33,7 @@ app:layout_constraintEnd_toStartOf="@id/description_tv" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" app:setStyledText="@{titleBinder.title}" tools:text="Choose EMI Plan" /> @@ -48,7 +48,7 @@ app:layout_constraintEnd_toStartOf="@id/description_tv" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title_tv" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" app:setStyledText="@{titleBinder.subtitle}" tools:text="Change" /> @@ -64,7 +64,7 @@ android:visibility="@{titleBinder.description == null ? View.GONE : View.VISIBLE}" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" app:setStyledText="@{titleBinder.description}" tools:text="Change" /> diff --git a/android/app/src/main/res/layout/summary_line_item.xml b/android/app/src/main/res/layout/summary_line_item.xml index 4fe374b5e0..8a10185a72 100644 --- a/android/app/src/main/res/layout/summary_line_item.xml +++ b/android/app/src/main/res/layout/summary_line_item.xml @@ -98,7 +98,7 @@ android:id="@+id/tag_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@{summeryBinder.styledSubTitle.text}" android:textColor="@color/white" android:textSize="@dimen/spacing_12" diff --git a/android/app/src/main/res/layout/text_and_image_row.xml b/android/app/src/main/res/layout/text_and_image_row.xml index ee6c418ca0..17ee713c29 100644 --- a/android/app/src/main/res/layout/text_and_image_row.xml +++ b/android/app/src/main/res/layout/text_and_image_row.xml @@ -18,7 +18,7 @@ android:id="@+id/text_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviBlackText" android:textSize="@dimen/font_small" app:layout_constraintBottom_toBottomOf="parent" diff --git a/android/app/src/main/res/layout/text_icon_view_with_tick_v2.xml b/android/app/src/main/res/layout/text_icon_view_with_tick_v2.xml index b3b91f416c..8ef5ca582a 100644 --- a/android/app/src/main/res/layout/text_icon_view_with_tick_v2.xml +++ b/android/app/src/main/res/layout/text_icon_view_with_tick_v2.xml @@ -39,7 +39,7 @@ style="@style/miniTextFontStyle" android:layout_width="0dp" android:layout_height="wrap_content" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" android:layout_marginStart="@dimen/layout_dp_8" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/android/app/src/main/res/layout/timer_with_loader_view.xml b/android/app/src/main/res/layout/timer_with_loader_view.xml index 85a9ea7ad5..81173fdfe7 100644 --- a/android/app/src/main/res/layout/timer_with_loader_view.xml +++ b/android/app/src/main/res/layout/timer_with_loader_view.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="@dimen/spacing_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/black" android:includeFontPadding="false" app:layout_constraintStart_toStartOf="parent" @@ -45,7 +45,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="@dimen/spacing_8" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/description_color_seven" android:includeFontPadding="false" app:layout_constraintStart_toStartOf="parent" diff --git a/android/app/src/main/res/layout/title_with_button_view.xml b/android/app/src/main/res/layout/title_with_button_view.xml index 73d3d12856..84f6d8ff43 100644 --- a/android/app/src/main/res/layout/title_with_button_view.xml +++ b/android/app/src/main/res/layout/title_with_button_view.xml @@ -36,7 +36,7 @@ app:layout_constraintEnd_toStartOf="@id/btn_tv" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" tools:text="Choose EMI Plan" /> diff --git a/android/app/src/main/res/layout/top_header_registration.xml b/android/app/src/main/res/layout/top_header_registration.xml index deffd81c57..8c03f128e0 100644 --- a/android/app/src/main/res/layout/top_header_registration.xml +++ b/android/app/src/main/res/layout/top_header_registration.xml @@ -43,7 +43,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/product_branding" android:textColor="@color/color_3C0050" android:textSize="@dimen/font_small" diff --git a/android/app/src/main/res/layout/topup_info_view.xml b/android/app/src/main/res/layout/topup_info_view.xml index 187666e1bb..0ff7e4687b 100644 --- a/android/app/src/main/res/layout/topup_info_view.xml +++ b/android/app/src/main/res/layout/topup_info_view.xml @@ -22,11 +22,11 @@ @@ -53,9 +53,9 @@ android:textSize="@dimen/sp_12" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/styled_key_tv" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" app:setStyledText="@{valueAdditionWidgetKeyValueBinder.styledValue}" - tools:fontFamily="@font/tt_medium" + tools:fontFamily="@font/navi_headline_regular" tools:targetApi="p" tools:text="₹ 62,500" tools:textFontWeight="@integer/integer_700" /> diff --git a/android/app/src/main/res/layout/view_common_note.xml b/android/app/src/main/res/layout/view_common_note.xml index 2333e69eb2..7849e3b5b9 100644 --- a/android/app/src/main/res/layout/view_common_note.xml +++ b/android/app/src/main/res/layout/view_common_note.xml @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/layout_dp_8" android:layout_marginEnd="@dimen/layout_dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="@dimen/layout_dp_5" app:layout_constraintEnd_toEndOf="@id/parent_view" app:layout_constraintStart_toEndOf="@id/icon_iv" diff --git a/android/app/src/main/res/layout/view_coupon_apply.xml b/android/app/src/main/res/layout/view_coupon_apply.xml index 2a97df29d0..f0ca8e97c0 100644 --- a/android/app/src/main/res/layout/view_coupon_apply.xml +++ b/android/app/src/main/res/layout/view_coupon_apply.xml @@ -30,7 +30,7 @@ android:layout_marginStart="@dimen/layout_dp_10" android:layout_marginEnd="@dimen/layout_dp_10" android:background="@null" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:hint="@string/enter_coupon_code" android:inputType="text" android:maxLength="@integer/max_company_name_length" diff --git a/android/app/src/main/res/layout/view_cta_widget_layout.xml b/android/app/src/main/res/layout/view_cta_widget_layout.xml index ead3e4e3c5..90a1fda586 100644 --- a/android/app/src/main/res/layout/view_cta_widget_layout.xml +++ b/android/app/src/main/res/layout/view_cta_widget_layout.xml @@ -45,7 +45,7 @@ app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" tools:text="EMIs will be deducted on 24th of every month" /> diff --git a/android/app/src/main/res/layout/view_key_value_item.xml b/android/app/src/main/res/layout/view_key_value_item.xml index d0d6bc06b3..eb096ffbec 100644 --- a/android/app/src/main/res/layout/view_key_value_item.xml +++ b/android/app/src/main/res/layout/view_key_value_item.xml @@ -35,7 +35,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="0.5" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" android:textColor="@color/description_color_one" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -47,7 +47,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="0.5" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" android:gravity="end" android:textColor="@color/title_text_color" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/app/src/main/res/layout/view_open_close_header.xml b/android/app/src/main/res/layout/view_open_close_header.xml index ec71f75b78..2c686dd3b0 100644 --- a/android/app/src/main/res/layout/view_open_close_header.xml +++ b/android/app/src/main/res/layout/view_open_close_header.xml @@ -35,7 +35,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="@dimen/spacing_14" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/red" app:setStyledText="@{header}" tools:text="View All" diff --git a/android/app/src/main/res/layout/view_radio_icon_custom.xml b/android/app/src/main/res/layout/view_radio_icon_custom.xml index 66d09b3254..82f14abb4d 100644 --- a/android/app/src/main/res/layout/view_radio_icon_custom.xml +++ b/android/app/src/main/res/layout/view_radio_icon_custom.xml @@ -53,7 +53,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:setColorStateListToRadioText="@{data.selectorRadioButton}" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" app:setStyledText="@{data.styledTitle}" tools:text="Debit Card / Netbanking" /> diff --git a/android/app/src/main/res/layout/view_text_symbol_item_v2.xml b/android/app/src/main/res/layout/view_text_symbol_item_v2.xml index 3a8cd536b7..16b88e822c 100644 --- a/android/app/src/main/res/layout/view_text_symbol_item_v2.xml +++ b/android/app/src/main/res/layout/view_text_symbol_item_v2.xml @@ -39,7 +39,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@id/bullet_iv" app:layout_constraintTop_toTopOf="parent" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" tools:text="Avoid late fee" /> @dimen/font_extra_large @color/title_color_one - @font/tt_semi_bold + @font/navi_body_demi_bold 0.01 @@ -58,21 +58,21 @@ @@ -81,7 +81,7 @@ 0.04 @android:color/transparent @color/title_color_one - @font/tt_medium + @font/navi_headline_regular @@ -116,11 +116,11 @@ @@ -134,13 +134,13 @@ @@ -150,62 +150,62 @@ @@ -216,7 +216,7 @@ @drawable/box_input_background @drawable/box_input_background_tint 1 - @font/tt_semi_bold + @font/navi_body_demi_bold @string/hyphen @color/tara_color false @@ -224,19 +224,19 @@ @@ -246,7 +246,7 @@ @@ -254,43 +254,43 @@ @@ -299,11 +299,11 @@ @android:color/transparent @color/red @dimen/font_small - @font/tt_medium + @font/navi_headline_regular @@ -314,60 +314,60 @@ @@ -377,25 +377,25 @@ @@ -408,116 +408,116 @@ @@ -561,7 +561,7 @@ @@ -570,7 +570,7 @@ @@ -650,37 +650,37 @@ @@ -692,7 +692,7 @@ diff --git a/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/renderer/CalendarWidget.kt b/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/renderer/CalendarWidget.kt index a187fd300d..6e3b33463a 100644 --- a/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/renderer/CalendarWidget.kt +++ b/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/renderer/CalendarWidget.kt @@ -47,8 +47,8 @@ import com.navi.ap.utils.constants.WIDGET_DATA import com.navi.ap.utils.injector.FieldInjector import com.navi.base.utils.EMPTY import com.navi.base.utils.orTrue -import com.navi.design.theme.getFontFamily -import com.navi.design.theme.getFontWeight +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.uitron.model.UiTronResponse import com.navi.uitron.model.data.ImageData import com.navi.uitron.model.data.UiTronActionData @@ -210,7 +210,7 @@ class CalendarWidget { ) { Text( text = day.toString(), - fontFamily = getFontFamily(calendarWidgetData.calendarTextProperty?.fontFamily), + fontFamily = naviFontFamily, fontWeight = getFontWeight(calendarWidgetData.calendarTextProperty?.fontWeight), fontSize = calendarWidgetData.calendarTextProperty?.fontSize?.sp ?: 14.sp, textAlign = getTextAlignment(calendarWidgetData.calendarTextProperty?.textAlign), diff --git a/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/sdk/hyperverge/pan/init/PLHyperVergePanInitStrategy.kt b/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/sdk/hyperverge/pan/init/PLHyperVergePanInitStrategy.kt index 2839479b6f..7827011151 100644 --- a/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/sdk/hyperverge/pan/init/PLHyperVergePanInitStrategy.kt +++ b/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/sdk/hyperverge/pan/init/PLHyperVergePanInitStrategy.kt @@ -33,7 +33,7 @@ import com.navi.ap.utils.logApEvent import com.navi.base.utils.orFalse import com.navi.common.utils.log import com.navi.design.font.FontWeightEnum -import com.navi.design.utils.getFontStyle +import com.navi.design.font.getFontStyle import com.navi.uitron.utils.orTrue class PLHyperVergePanInitStrategy : IHyperVergePanCapture() { @@ -72,9 +72,9 @@ class PLHyperVergePanInitStrategy : IHyperVergePanCapture() { setShouldShowReviewScreen(hyperVergePanSettingData?.showReviewScreen.orTrue()) setDocCaptureTitle(hyperVergePanSettingData?.title.orEmpty()) isShouldAutoCapture = hyperVergePanSettingData?.shouldAutoCapture.orFalse() - hintTypeface = getFontStyle(FontWeightEnum.TT_REGULAR) - setTitleTypeFace(getFontStyle(FontWeightEnum.TT_MEDIUM)) - setDescTypeFace(getFontStyle(FontWeightEnum.TT_REGULAR)) + hintTypeface = getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) + setTitleTypeFace(getFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR)) + setDescTypeFace(getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR)) } } diff --git a/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/sdk/hyperverge/selfie/init/PLHyperVergeSelfieInitStrategy.kt b/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/sdk/hyperverge/selfie/init/PLHyperVergeSelfieInitStrategy.kt index 8133d1aa37..e117ef3b29 100644 --- a/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/sdk/hyperverge/selfie/init/PLHyperVergeSelfieInitStrategy.kt +++ b/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/sdk/hyperverge/selfie/init/PLHyperVergeSelfieInitStrategy.kt @@ -38,7 +38,7 @@ import com.navi.base.utils.orTrue import com.navi.base.utils.orZero import com.navi.common.utils.log import com.navi.design.font.FontWeightEnum -import com.navi.design.utils.getFontStyle +import com.navi.design.font.getFontStyle import org.json.JSONObject class PLHyperVergeSelfieInitStrategy : IHypervergeSelfieCapture() { @@ -133,8 +133,8 @@ class PLHyperVergeSelfieInitStrategy : IHypervergeSelfieCapture() { ): HVFaceConfig { return HVFaceConfig().apply { isShouldAutoCapture = hyperVergeSelfieSettingData?.shouldAutoCapture.orTrue() - titleTypeface = getFontStyle(FontWeightEnum.TT_MEDIUM) - statusTypeFace = getFontStyle(FontWeightEnum.TT_REGULAR) + titleTypeface = getFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) + statusTypeFace = getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) faceDetectorTimeout = 5000L } } diff --git a/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/screens/vkyc/ui/VKYCMeetingRoomScreen.kt b/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/screens/vkyc/ui/VKYCMeetingRoomScreen.kt index 0e3ee8d23a..1885d341a5 100644 --- a/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/screens/vkyc/ui/VKYCMeetingRoomScreen.kt +++ b/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/screens/vkyc/ui/VKYCMeetingRoomScreen.kt @@ -101,8 +101,8 @@ import com.navi.common.utils.EMPTY import com.navi.common.utils.SPACE import com.navi.design.common.ComposeSize import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.utils.parseColorSafe import com.navi.naviwidgets.extensions.setImageFieldData import com.navi.naviwidgets.extensions.setVisibilityState @@ -333,8 +333,8 @@ fun ConstructBottomSheet( ), color = Color(TEXT_PRIMARY_HEX_CODE.parseColorSafe()), fontSize = 16.sp, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), modifier = Modifier.wrapContentWidth().wrapContentHeight().padding(top = 8.dp) ) Button( @@ -360,8 +360,8 @@ fun ConstructBottomSheet( Text( color = Color(WHITE_HEX_CODE.parseColorSafe()), fontSize = 14.sp, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), modifier = Modifier.wrapContentWidth().wrapContentHeight().padding(8.dp), text = stringResource(id = CommonR.string.continue_with_the_call) ) @@ -407,8 +407,8 @@ fun ConstructBottomSheet( Text( color = Color(TEXT_PRIMARY_HEX_CODE.parseColorSafe()), fontSize = 14.sp, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), modifier = Modifier.wrapContentWidth().wrapContentHeight().padding(8.dp), text = stringResource(id = CommonR.string.cancel_the_call) ) diff --git a/android/application-platform/navi-ap/src/main/res/layout/vkyc_meeting_room_screen.xml b/android/application-platform/navi-ap/src/main/res/layout/vkyc_meeting_room_screen.xml index 42a098be0d..9bcf377a1a 100644 --- a/android/application-platform/navi-ap/src/main/res/layout/vkyc_meeting_room_screen.xml +++ b/android/application-platform/navi-ap/src/main/res/layout/vkyc_meeting_room_screen.xml @@ -83,7 +83,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:elevation="@dimen/layout_dp_8" android:text="@string/navi_executive" @@ -100,7 +100,7 @@ android:layout_marginBottom="@dimen/dp_2" android:layout_marginHorizontal="@dimen/layout_dp_2" android:elevation="@dimen/layout_dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="@string/navi_executive" android:visibility="visible" @@ -291,7 +291,7 @@ android:id="@+id/volume_prompt_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="@dimen/dp_16" android:text="@{vkycVideoCallingScreenViewModel.messagePromptText}" @@ -318,7 +318,7 @@ android:id="@+id/loan_amount_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/loan_amount" android:textColor="@color/primaryColor" android:textSize="@dimen/sp_14" /> @@ -327,7 +327,7 @@ android:id="@+id/colon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/semi_colon_with_space" android:textColor="@color/primaryColor" android:textSize="@dimen/sp_14" /> @@ -337,7 +337,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_8" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:gravity="center" android:textColor="@color/primaryColor" android:textSize="@dimen/sp_20" @@ -356,7 +356,7 @@ android:drawableStart="@drawable/ic_overlapped_tick" android:drawablePadding="@dimen/layout_dp_12" android:elevation="@dimen/layout_dp_8" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:gravity="center_vertical" android:paddingHorizontal="@dimen/layout_dp_24" android:paddingVertical="@dimen/dp_16" diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 8bcc9c13cc..c743d3d44e 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -98,7 +98,7 @@ navi-alfred = "1.18.1" navi-elex = "1.4.0" navi-guarddog = "3.10.0" navi-pulse = "1.12.0" -navi-uitron = "2.0.3" +navi-uitron = "2.1.0" navigation = "2.5.3" okhttp-bom = "4.12.0" otaliastudios-cameraview = "2.7.2" diff --git a/android/navi-amc/src/main/java/com/navi/amc/common/view/OptionsView.kt b/android/navi-amc/src/main/java/com/navi/amc/common/view/OptionsView.kt index 089490f6af..e04390a26d 100644 --- a/android/navi-amc/src/main/java/com/navi/amc/common/view/OptionsView.kt +++ b/android/navi-amc/src/main/java/com/navi/amc/common/view/OptionsView.kt @@ -139,9 +139,9 @@ class OptionsView(context: Context, attributeSet: AttributeSet? = null) : val selectedTv = if (isFirstOptionSelected) binding.option1.title else binding.option2.title val unSelectedTv = if (isFirstOptionSelected) binding.option2.title else binding.option1.title - selectedTv.changeFontStyle(FontWeightEnum.TT_SEMI_BOLD) + selectedTv.changeFontStyle(FontWeightEnum.NAVI_BODY_DEMI_BOLD) selectedTv.changeFontColor(PURPLE) - unSelectedTv.changeFontStyle(FontWeightEnum.TT_REGULAR) + unSelectedTv.changeFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) unSelectedTv.changeFontColor(GREY) } } diff --git a/android/navi-amc/src/main/java/com/navi/amc/common/view/SwitchView.kt b/android/navi-amc/src/main/java/com/navi/amc/common/view/SwitchView.kt index e81d40eb2c..056f411593 100644 --- a/android/navi-amc/src/main/java/com/navi/amc/common/view/SwitchView.kt +++ b/android/navi-amc/src/main/java/com/navi/amc/common/view/SwitchView.kt @@ -82,18 +82,18 @@ class SwitchView(context: Context, attributeSet: AttributeSet? = null) : fun leftChecked() { binding.left.background = ColorUtils.getPurpleRoundedDrawable(context) binding.left.setStyle(DesignR.style.ButtonTextStyle) - binding.left.changeFontStyle(FontWeightEnum.TT_SEMI_BOLD) + binding.left.changeFontStyle(FontWeightEnum.NAVI_BODY_DEMI_BOLD) binding.right.background = null binding.right.setStyle(DesignR.style.Body7TextStyle) - binding.right.changeFontStyle(FontWeightEnum.TT_MEDIUM) + binding.right.changeFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) } fun rightChecked() { binding.right.background = ColorUtils.getPurpleRoundedDrawable(context) binding.right.setStyle(DesignR.style.ButtonTextStyle) - binding.right.changeFontStyle(FontWeightEnum.TT_SEMI_BOLD) + binding.right.changeFontStyle(FontWeightEnum.NAVI_BODY_DEMI_BOLD) binding.left.background = null binding.left.setStyle(DesignR.style.Body7TextStyle) - binding.left.changeFontStyle(FontWeightEnum.TT_MEDIUM) + binding.left.changeFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) } } diff --git a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundInformationFragment.kt b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundInformationFragment.kt index 3919030cf6..69da95c01f 100644 --- a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundInformationFragment.kt +++ b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundInformationFragment.kt @@ -36,10 +36,9 @@ import com.navi.amc.fundbuy.viewmodel.FundInformationViewModel import com.navi.amc.utils.SubPageStatusType.FUND_INFORMATION import com.navi.common.listeners.HeaderInteractionListener import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.textview.model.TextWithStyle -import com.navi.design.theme.getFontFamily -import com.navi.design.theme.getFontWeight -import com.navi.design.utils.Constants import com.navi.uitron.utils.hexToComposeColor import dagger.hilt.android.AndroidEntryPoint @@ -114,13 +113,15 @@ class FundInformationFragment() : AmcBaseFragment() { val fontSize = item.style?.getOrNull(0)?.fontSize?.sp ?: 14.sp val fontColor = item.style?.getOrNull(0)?.spanColor?.hexToComposeColor ?: Color.Black val fontWeight = - getFontWeight(item.style?.getOrNull(0)?.fontName ?: FontWeightEnum.TT_REGULAR.name) + getFontWeight( + item.style?.getOrNull(0)?.fontName ?: FontWeightEnum.NAVI_BODY_REGULAR.name + ) Text( text = text, fontSize = fontSize, color = fontColor, fontWeight = fontWeight, - fontFamily = getFontFamily(Constants.TT_FONT_FAMILY), + fontFamily = naviFontFamily, lineHeight = 22.sp ) } diff --git a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragment.kt b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragment.kt index 1668da7c9b..f63685b779 100644 --- a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragment.kt +++ b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragment.kt @@ -34,11 +34,11 @@ import com.navi.base.model.ActionData import com.navi.base.utils.orFalse import com.navi.common.listeners.FragmentInterchangeListener import com.navi.common.listeners.HeaderInteractionListener +import com.navi.design.font.FontWeightEnum import com.navi.design.utils.dpToPx import com.navi.design.utils.getNaviDrawable import com.navi.design.utils.parseColorSafe import com.navi.design.utils.setSpannableString -import com.navi.design.utils.updateFontToTTMedium import com.navi.naviwidgets.R as WidgetsR import com.navi.naviwidgets.extensions.setGradient import com.navi.naviwidgets.extensions.showWhenDataIsAvailable @@ -83,7 +83,9 @@ class FundListingFragment : AmcBaseFragment() { } ?: run { list.visibility = View.GONE } it?.header?.let { binding.fundHeader.apply { - updateFontToTTMedium(it.title?.style) + it.title?.style?.forEach { style -> + style.fontName = FontWeightEnum.NAVI_HEADLINE_REGULAR.name + } it.gradient?.let { it -> root.setGradient(it) } title.setSpannableString(it.title) subtitle.setSpannableString(it.subTitle) diff --git a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragmentV2.kt b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragmentV2.kt index 3cd9ec8330..e8bad89e81 100644 --- a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragmentV2.kt +++ b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragmentV2.kt @@ -373,7 +373,7 @@ class FundListingFragmentV2 : AmcBaseFragment(), WidgetCallback { listOf( NaviSpan( fontSize = 14.0, - fontName = FontWeightEnum.NAVI_BOLD.name, + fontName = FontWeightEnum.NAVI_HEADLINE_REGULAR.name, spanColor = PURPLE ) ) diff --git a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/PaymentSummaryFragment.kt b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/PaymentSummaryFragment.kt index d5da96a070..ff3297bb8d 100644 --- a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/PaymentSummaryFragment.kt +++ b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/PaymentSummaryFragment.kt @@ -107,7 +107,7 @@ class PaymentSummaryFragment : AmcBaseFragment() { style = listOf( NaviSpan( - fontName = FontWeightEnum.NAVI_REGULAR.name, + fontName = FontWeightEnum.NAVI_BODY_REGULAR.name, fontSize = 14.0, spanColor = "#6B6B6B" ) @@ -124,7 +124,7 @@ class PaymentSummaryFragment : AmcBaseFragment() { style = listOf( NaviSpan( - fontName = FontWeightEnum.NAVI_BOLD.name, + fontName = FontWeightEnum.NAVI_HEADLINE_REGULAR.name, fontSize = 16.0, spanColor = "#191919" ) @@ -141,7 +141,7 @@ class PaymentSummaryFragment : AmcBaseFragment() { style = listOf( NaviSpan( - fontName = FontWeightEnum.NAVI_REGULAR.name, + fontName = FontWeightEnum.NAVI_BODY_REGULAR.name, fontSize = 14.0, spanColor = "#6B6B6B" ) @@ -153,7 +153,7 @@ class PaymentSummaryFragment : AmcBaseFragment() { style = listOf( NaviSpan( - fontName = FontWeightEnum.NAVI_REGULAR.name, + fontName = FontWeightEnum.NAVI_BODY_REGULAR.name, fontSize = 16.0, spanColor = "#191919" ) diff --git a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/SipCalendarFragment.kt b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/SipCalendarFragment.kt index 8dc5afc639..2859de29ad 100644 --- a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/SipCalendarFragment.kt +++ b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/SipCalendarFragment.kt @@ -145,7 +145,7 @@ class SipCalendarFragment() : NaviSpan( fontSize = 12.0, spanColor = "#1F002A", - fontName = FontWeightEnum.NAVI_EXTRA_BOLD.name + fontName = FontWeightEnum.NAVI_BODY_DEMI_BOLD.name ) ) ), @@ -160,7 +160,7 @@ class SipCalendarFragment() : NaviSpan( fontSize = 12.0, spanColor = "#6B6B6B", - fontName = FontWeightEnum.NAVI_REGULAR.name + fontName = FontWeightEnum.NAVI_BODY_REGULAR.name ) ) ) diff --git a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/viewmodel/FundBuyV2ViewModel.kt b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/viewmodel/FundBuyV2ViewModel.kt index 400dad1775..85c0354b50 100644 --- a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/viewmodel/FundBuyV2ViewModel.kt +++ b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/viewmodel/FundBuyV2ViewModel.kt @@ -362,7 +362,7 @@ class FundBuyV2ViewModel @Inject constructor(private val repository: FundBuyRepo it.copy( startSpan = startIndex, endSpan = endIndex, - fontName = FontWeightEnum.TT_MEDIUM.name + fontName = FontWeightEnum.NAVI_HEADLINE_REGULAR.name ) ) } diff --git a/android/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/MyInvestmentsFragment.kt b/android/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/MyInvestmentsFragment.kt index 77514c1323..d5234f1a5f 100644 --- a/android/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/MyInvestmentsFragment.kt +++ b/android/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/MyInvestmentsFragment.kt @@ -147,7 +147,7 @@ class MyInvestmentsFragment() : AmcBaseFragment() { ?.setTextColor(ContextCompat.getColor(requireContext(), DesignR.color.color_1F002A)) it.customView ?.findViewById(R.id.tvTabName) - ?.setFontStyle(FontWeightEnum.TT_SEMI_BOLD) + ?.setFontStyle(FontWeightEnum.NAVI_BODY_DEMI_BOLD) it.customView?.findViewById(R.id.indicator)?.visibility = View.VISIBLE } } @@ -161,7 +161,7 @@ class MyInvestmentsFragment() : AmcBaseFragment() { ) it.customView ?.findViewById(R.id.tvTabName) - ?.setFontStyle(FontWeightEnum.NAVI_BOLD) + ?.setFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) it.customView?.findViewById(R.id.indicator)?.visibility = View.GONE } } diff --git a/android/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/OrdersFragment.kt b/android/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/OrdersFragment.kt index 51f5052eff..a9af5b872e 100644 --- a/android/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/OrdersFragment.kt +++ b/android/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/OrdersFragment.kt @@ -385,7 +385,7 @@ class OrdersFragment : AmcBaseFragment() { listOf( NaviSpan( fontSize = 14.0, - fontName = FontWeightEnum.NAVI_BOLD.name, + fontName = FontWeightEnum.NAVI_HEADLINE_REGULAR.name, spanColor = PURPLE ) ) diff --git a/android/navi-amc/src/main/res/layout/amc_button.xml b/android/navi-amc/src/main/res/layout/amc_button.xml index cd872d18bb..05d4995a61 100644 --- a/android/navi-amc/src/main/res/layout/amc_button.xml +++ b/android/navi-amc/src/main/res/layout/amc_button.xml @@ -15,7 +15,7 @@ android:id="@+id/text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:textSize="@dimen/sp_14" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/android/navi-amc/src/main/res/layout/amc_reward_bottomsheet.xml b/android/navi-amc/src/main/res/layout/amc_reward_bottomsheet.xml index 7b4354757d..c3029bd30c 100644 --- a/android/navi-amc/src/main/res/layout/amc_reward_bottomsheet.xml +++ b/android/navi-amc/src/main/res/layout/amc_reward_bottomsheet.xml @@ -49,7 +49,7 @@ android:layout_marginEnd="@dimen/dp_16" android:layout_marginBottom="@dimen/layout_dp_32" android:background="@drawable/bg_cta_primary_purple_amc_rounded_4" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:gravity="center" android:textColor="@color/white" android:textSize="@dimen/font_small" diff --git a/android/navi-amc/src/main/res/layout/auto_debit_failed_card.xml b/android/navi-amc/src/main/res/layout/auto_debit_failed_card.xml index 2ba3323fbb..e3a66ae8e8 100644 --- a/android/navi-amc/src/main/res/layout/auto_debit_failed_card.xml +++ b/android/navi-amc/src/main/res/layout/auto_debit_failed_card.xml @@ -150,7 +150,7 @@ style="@style/ActionButtonText10Style" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:gravity="center" android:text="Pay installment"/> diff --git a/android/navi-amc/src/main/res/layout/autopay_footer.xml b/android/navi-amc/src/main/res/layout/autopay_footer.xml index 2a58426455..9b9c1e4930 100644 --- a/android/navi-amc/src/main/res/layout/autopay_footer.xml +++ b/android/navi-amc/src/main/res/layout/autopay_footer.xml @@ -50,7 +50,7 @@ app:layout_constraintTop_toBottomOf="@id/title" android:textSize="14sp" android:textColor="@color/color_191919" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" tools:text="UPI" /> @@ -238,7 +238,7 @@ android:layout_marginStart="@dimen/_16dp" android:layout_marginTop="@dimen/_14dp" android:layout_marginEnd="@dimen/_16dp" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:textAlignment="center" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/android/navi-amc/src/main/res/layout/fragment_signature.xml b/android/navi-amc/src/main/res/layout/fragment_signature.xml index b50875f25a..40fb14495b 100644 --- a/android/navi-amc/src/main/res/layout/fragment_signature.xml +++ b/android/navi-amc/src/main/res/layout/fragment_signature.xml @@ -99,7 +99,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:clickable="false" - setFontStyle="@{FontWeightEnum.TT_SEMI_BOLD}" + setFontStyle="@{FontWeightEnum.NAVI_BODY_DEMI_BOLD}" android:textAlignment="center" android:textColor="#1F002A" android:textSize="@dimen/_14sp" diff --git a/android/navi-amc/src/main/res/layout/fund_card_view.xml b/android/navi-amc/src/main/res/layout/fund_card_view.xml index 4ad83b22ac..c5896dcb98 100644 --- a/android/navi-amc/src/main/res/layout/fund_card_view.xml +++ b/android/navi-amc/src/main/res/layout/fund_card_view.xml @@ -15,7 +15,7 @@ android:id="@+id/title" android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" - app:fontFamily="@font/tt_medium" + app:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/sp_14" app:layout_constraintEnd_toStartOf="@id/icon" app:layout_constraintStart_toStartOf="parent" diff --git a/android/navi-amc/src/main/res/layout/fund_detail_screen_expandable_layout.xml b/android/navi-amc/src/main/res/layout/fund_detail_screen_expandable_layout.xml index ec5aadac30..f942522d88 100644 --- a/android/navi-amc/src/main/res/layout/fund_detail_screen_expandable_layout.xml +++ b/android/navi-amc/src/main/res/layout/fund_detail_screen_expandable_layout.xml @@ -25,7 +25,7 @@ android:layout_marginStart="@dimen/_16dp" android:layout_marginEnd="@dimen/_16dp" android:clickable="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingTop="@dimen/_20dp" android:paddingBottom="@dimen/_20dp" android:textColor="@color/primaryColor" diff --git a/android/navi-amc/src/main/res/layout/fund_details_compact_manager_info_layout.xml b/android/navi-amc/src/main/res/layout/fund_details_compact_manager_info_layout.xml index a815149e30..6aa8fd4118 100644 --- a/android/navi-amc/src/main/res/layout/fund_details_compact_manager_info_layout.xml +++ b/android/navi-amc/src/main/res/layout/fund_details_compact_manager_info_layout.xml @@ -135,7 +135,7 @@ android:id="@+id/manager_info_cta" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingStart="@dimen/_16dp" android:paddingTop="@dimen/_8dp" android:paddingEnd="@dimen/_16dp" diff --git a/android/navi-amc/src/main/res/layout/fund_slider_with_tool_tip.xml b/android/navi-amc/src/main/res/layout/fund_slider_with_tool_tip.xml index 12a9c56588..af5f1578c2 100644 --- a/android/navi-amc/src/main/res/layout/fund_slider_with_tool_tip.xml +++ b/android/navi-amc/src/main/res/layout/fund_slider_with_tool_tip.xml @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginTop="@dimen/layout_dp_4" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/description_color_seven" android:textSize="@dimen/_12sp" app:layout_constraintStart_toStartOf="parent" @@ -56,7 +56,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginBottom="@dimen/layout_dp_8" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/_12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -69,7 +69,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/layout_dp_4" android:layout_marginEnd="@dimen/layout_dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/description_color_seven" android:textSize="@dimen/_12sp" app:layout_constraintEnd_toEndOf="parent" @@ -82,7 +82,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/layout_dp_16" android:layout_marginBottom="@dimen/layout_dp_8" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/_12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/navi-amc/src/main/res/layout/help_bottom_sheet_amc.xml b/android/navi-amc/src/main/res/layout/help_bottom_sheet_amc.xml index adcb9a573a..e37209c5cb 100644 --- a/android/navi-amc/src/main/res/layout/help_bottom_sheet_amc.xml +++ b/android/navi-amc/src/main/res/layout/help_bottom_sheet_amc.xml @@ -13,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/need_help" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/android/navi-amc/src/main/res/layout/layout_permission_fragment.xml b/android/navi-amc/src/main/res/layout/layout_permission_fragment.xml index c2d825844d..e958f39cfc 100644 --- a/android/navi-amc/src/main/res/layout/layout_permission_fragment.xml +++ b/android/navi-amc/src/main/res/layout/layout_permission_fragment.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:textColor="@color/title_color_one" android:textSize="@dimen/sp_24" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" android:layout_marginHorizontal="@dimen/dp_16" android:layout_marginTop="@dimen/dp_8" app:layout_constraintTop_toTopOf="parent" /> diff --git a/android/navi-amc/src/main/res/layout/list_item_progress_bottomsheet.xml b/android/navi-amc/src/main/res/layout/list_item_progress_bottomsheet.xml index 41c6a6d0a6..677f92ed3f 100644 --- a/android/navi-amc/src/main/res/layout/list_item_progress_bottomsheet.xml +++ b/android/navi-amc/src/main/res/layout/list_item_progress_bottomsheet.xml @@ -107,7 +107,7 @@ android:layout_marginBottom="@dimen/dp_24" android:background="@drawable/bg_cta_primary_purple_amc_rounded_4" android:gravity="center" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/sp_14" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/android/navi-amc/src/main/res/layout/new_footer_layout.xml b/android/navi-amc/src/main/res/layout/new_footer_layout.xml index 0668d98fb4..b4279c24ab 100644 --- a/android/navi-amc/src/main/res/layout/new_footer_layout.xml +++ b/android/navi-amc/src/main/res/layout/new_footer_layout.xml @@ -53,7 +53,7 @@ android:layout_marginEnd="@dimen/dp_16" android:layout_marginBottom="@dimen/dp_32" android:background="@drawable/bg_cta_primary_purple_amc_rounded_4" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:gravity="center" android:textColor="@color/white" android:textSize="@dimen/sp_14" diff --git a/android/navi-amc/src/main/res/layout/overview_card_layout.xml b/android/navi-amc/src/main/res/layout/overview_card_layout.xml index bc4a1914d9..e4c999d37e 100644 --- a/android/navi-amc/src/main/res/layout/overview_card_layout.xml +++ b/android/navi-amc/src/main/res/layout/overview_card_layout.xml @@ -84,7 +84,7 @@ diff --git a/android/navi-amc/src/main/res/layout/snackbar_layout.xml b/android/navi-amc/src/main/res/layout/snackbar_layout.xml index a489f20676..8a6a2a36b5 100644 --- a/android/navi-amc/src/main/res/layout/snackbar_layout.xml +++ b/android/navi-amc/src/main/res/layout/snackbar_layout.xml @@ -26,7 +26,7 @@ android:id="@+id/snackbar_title" style="@style/BottomNavBarInactiveStyle" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" diff --git a/android/navi-amc/src/main/res/layout/tab_item.xml b/android/navi-amc/src/main/res/layout/tab_item.xml index c1ff5bf90c..1261fe3b1c 100644 --- a/android/navi-amc/src/main/res/layout/tab_item.xml +++ b/android/navi-amc/src/main/res/layout/tab_item.xml @@ -13,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/layout_dp_2" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:textColor="@color/textTertiaryColor" android:textSize="@dimen/font_medium" diff --git a/android/navi-amc/src/main/res/layout/view_help_menu_amc.xml b/android/navi-amc/src/main/res/layout/view_help_menu_amc.xml index 7365cc6c0b..3fdb50ea7d 100644 --- a/android/navi-amc/src/main/res/layout/view_help_menu_amc.xml +++ b/android/navi-amc/src/main/res/layout/view_help_menu_amc.xml @@ -45,7 +45,7 @@ android:layout_height="wrap_content" android:text="@{menuBinder.subtitle}" android:textSize="@dimen/_14sp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:layout_marginStart="@dimen/_12dp" app:layout_constraintStart_toEndOf="@id/menu_title_tv" app:layout_constraintTop_toTopOf="parent"/> diff --git a/android/navi-amc/src/main/res/values/themes.xml b/android/navi-amc/src/main/res/values/themes.xml index 996da9e552..9895f8ffec 100644 --- a/android/navi-amc/src/main/res/values/themes.xml +++ b/android/navi-amc/src/main/res/values/themes.xml @@ -9,25 +9,25 @@ @@ -93,17 +93,17 @@ @@ -510,7 +510,7 @@ diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/ui/CreditCardNumberBottomSheetContent.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/ui/CreditCardNumberBottomSheetContent.kt index 4661b27937..6d25b26d99 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/ui/CreditCardNumberBottomSheetContent.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/ui/CreditCardNumberBottomSheetContent.kt @@ -25,8 +25,8 @@ import com.navi.bbps.common.ICON_CREDIT_CARD_LAST_FOUR_DIGITS_BOTTOMSHEET import com.navi.bbps.common.theme.NaviBbpsColor import com.navi.bbps.common.ui.ThemeRoundedButton import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText @Composable @@ -44,7 +44,7 @@ fun CreditCardNumberBottomSheetContent(closeSheet: () -> Unit) { NaviText( text = stringResource(id = R.string.bbps_example), fontSize = 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviBbpsColor.textPrimary ) @@ -54,7 +54,7 @@ fun CreditCardNumberBottomSheetContent(closeSheet: () -> Unit) { NaviText( text = stringResource(id = R.string.bbps_credit_card_bottomsheet_description), fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textTertiary ) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/ui/DropdownOptionsBottomSheetContent.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/ui/DropdownOptionsBottomSheetContent.kt index f742f7cc1e..ef3d78e372 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/ui/DropdownOptionsBottomSheetContent.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/ui/DropdownOptionsBottomSheetContent.kt @@ -22,8 +22,8 @@ import com.navi.bbps.clickableDebounce import com.navi.bbps.common.theme.NaviBbpsColor import com.navi.bbps.feature.customerinput.model.view.CustomerParam import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText @Composable @@ -36,7 +36,7 @@ fun DropdownOptionsBottomSheetContent( modifier = Modifier.fillMaxWidth(), text = customerParam.paramName, fontSize = 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, color = NaviBbpsColor.textPrimary, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), ) @@ -49,7 +49,7 @@ fun DropdownOptionsBottomSheetContent( }, text = paramValue, fontSize = 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, color = NaviBbpsColor.textPrimary, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), ) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/ui/NaviBbpsButtons.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/ui/NaviBbpsButtons.kt index 15684ac692..c391b42ef1 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/ui/NaviBbpsButtons.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/ui/NaviBbpsButtons.kt @@ -40,8 +40,8 @@ import com.navi.bbps.common.theme.NaviBbpsColor import com.navi.common.utils.ClickDebounce import com.navi.common.utils.get import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText @Composable @@ -75,7 +75,7 @@ fun ThemeRoundedButton( NaviText( text = text, fontSize = fontSize, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviBbpsColor.textWhite ) @@ -103,7 +103,7 @@ fun SecondaryRoundedButton( NaviText( text = text, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviBbpsColor.ctaPrimary ) @@ -145,7 +145,7 @@ fun ThemeRoundedButtonWithImage( NaviText( text = text, fontSize = fontSize, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = textColor, maxLines = 1, @@ -168,7 +168,7 @@ fun ThemeRoundedButtonWithImage( NaviText( text = text, fontSize = fontSize, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = textColor, maxLines = 1, @@ -207,7 +207,7 @@ fun ThemeRoundedButtonV2( NaviText( text = text, fontSize = fontSize, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviBbpsColor.textWhite ) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/ui/NaviBbpsCommonComposable.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/ui/NaviBbpsCommonComposable.kt index 7b71fc6a50..c60ea40358 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/ui/NaviBbpsCommonComposable.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/ui/NaviBbpsCommonComposable.kt @@ -121,10 +121,10 @@ import com.navi.common.R as CommonR import com.navi.common.model.NaviLottieCompositionSpecType import com.navi.common.model.common.NudgeDetailEntity import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.theme.ABABAB import com.navi.design.theme.D1D9E6_30 -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily import com.navi.naviwidgets.extensions.NaviText import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay @@ -150,7 +150,7 @@ fun NaviBbpsHeader( NaviText( text = title, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = titleColor, maxLines = maxLines, @@ -176,7 +176,7 @@ fun NaviBbpsHeader( NaviText( text = actionIconText.orEmpty(), fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = titleColor, textAlign = TextAlign.Center, @@ -224,7 +224,7 @@ fun BottomSheetContentWithIconHeaderPrimarySecondaryButton( NaviText( text = header, fontSize = 18.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = NaviBbpsColor.textPrimary ) @@ -234,7 +234,7 @@ fun BottomSheetContentWithIconHeaderPrimarySecondaryButton( NaviText( text = description, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textSecondary ) @@ -292,7 +292,7 @@ fun BottomSheetContentWithVerticalPrimarySecondaryButton( text = headerText, fontSize = 16.sp, lineHeight = 24.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviBbpsColor.textPrimary ) @@ -302,7 +302,7 @@ fun BottomSheetContentWithVerticalPrimarySecondaryButton( text = descriptionText, fontSize = 14.sp, lineHeight = 22.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textSecondary ) @@ -510,7 +510,7 @@ fun InputTextFieldWithDescriptionHeader( NaviText( text = placeHolderString, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textTertiary, maxLines = 1, @@ -521,7 +521,7 @@ fun InputTextFieldWithDescriptionHeader( textStyle: TextStyle = TextStyle( fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textPrimary, ), @@ -534,7 +534,7 @@ fun InputTextFieldWithDescriptionHeader( NaviText( text = headerString, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = NaviBbpsColor.textPrimary ) @@ -624,7 +624,7 @@ fun InputTextFieldWithDescriptionHeader( NaviText( text = errorMessage, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, color = NaviBbpsColor.inputFieldError, ) @@ -645,7 +645,7 @@ fun DropdownFieldWithDescriptionHeader( NaviText( text = placeHolderString, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textTertiary ) @@ -659,7 +659,7 @@ fun DropdownFieldWithDescriptionHeader( NaviText( text = headerString, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = NaviBbpsColor.textPrimary ) @@ -685,7 +685,7 @@ fun DropdownFieldWithDescriptionHeader( textStyle = TextStyle( fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textPrimary ), @@ -747,7 +747,7 @@ fun TextImage( NaviText( text = initials, fontSize = textFontSize, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, color = textColor, fontWeight = getFontWeight(textFontWeight) ) @@ -767,7 +767,7 @@ fun KeyValueWithCopySection( Column(modifier = modifier) { NaviText( text = key, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 12.sp, color = NaviBbpsColor.textTertiary @@ -784,7 +784,7 @@ fun KeyValueWithCopySection( NaviText( modifier = Modifier.weight(1f), text = value, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = valueFontWeight, fontSize = 14.sp, color = valueColor, @@ -903,7 +903,7 @@ fun ConfirmationBottomSheetContent( NaviText( text = title, fontSize = 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviBbpsColor.textPrimary ) @@ -913,7 +913,7 @@ fun ConfirmationBottomSheetContent( NaviText( text = description, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textTertiary, lineHeight = 22.sp @@ -959,7 +959,7 @@ fun KeyValueTextSection( text = key, textAlign = TextAlign.Start, fontSize = keyFontSize, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = keyFontWeight, color = keyColor, maxLines = keyMaxLines, @@ -973,7 +973,7 @@ fun KeyValueTextSection( text = value, textAlign = TextAlign.End, fontSize = valueFontSize, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = valueFontWeight, color = valueColor, maxLines = valueMaxLines, @@ -1061,7 +1061,7 @@ fun PermissionTile( Column(modifier = Modifier.weight(1f)) { NaviText( text = permissionDescription, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 12.sp, color = NaviBbpsColor.textPrimary, @@ -1086,7 +1086,7 @@ fun PermissionTile( Spacer(modifier = Modifier.height(4.dp)) NaviText( text = permissionDescriptionSetting, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 10.sp, color = NaviBbpsColor.textSecondary, @@ -1125,7 +1125,7 @@ fun RewardsNudgeWithBg( text = nudgeDetailEntity.prefixText, color = NaviBbpsColor.textWhite, fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) @@ -1143,7 +1143,7 @@ fun RewardsNudgeWithBg( text = nudgeDetailEntity.formattedAmount, color = NaviBbpsColor.textWhite, fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) ) @@ -1153,7 +1153,7 @@ fun RewardsNudgeWithBg( text = nudgeDetailEntity.suffixText, color = NaviBbpsColor.textWhite, fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) @@ -1189,7 +1189,7 @@ fun RewardsExchangeRatioWithOneSidedCurve(modifier: Modifier) { text = NAVI_PAY_REWARDS_EXCHANGE_RATIO, color = NaviBbpsColor.textWhite, fontSize = 10.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) ) } @@ -1262,7 +1262,7 @@ fun TitleDescriptionWithLinearProgressBar( if (!title.isNullOrEmpty()) { NaviText( text = title, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 16.sp, color = NaviBbpsColor.textPrimary @@ -1279,7 +1279,7 @@ fun TitleDescriptionWithLinearProgressBar( TextStyle( fontSize = 16.sp, lineHeight = 24.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviBbpsColor.textPrimary ) @@ -1291,7 +1291,7 @@ fun TitleDescriptionWithLinearProgressBar( if (!description.isNullOrEmpty()) { NaviText( text = description, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.textTertiary @@ -1316,7 +1316,7 @@ fun RolodexAnimationText( TextStyle( fontSize = fontSize, lineHeight = 18.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = NaviBbpsColor.ctaPrimary, ) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billerlist/ui/BillerListBottomSheetContent.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billerlist/ui/BillerListBottomSheetContent.kt index f80ffe6def..c448dbad07 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billerlist/ui/BillerListBottomSheetContent.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billerlist/ui/BillerListBottomSheetContent.kt @@ -35,8 +35,8 @@ import com.navi.bbps.common.ui.ThemeRoundedButton import com.navi.bbps.feature.billerlist.model.view.BillerListBottomSheetType import com.navi.bbps.feature.mybills.model.view.MyBillEntity import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText @Composable @@ -116,7 +116,7 @@ fun BillerListMenuBottomSheetContent(onDeleteAccountBillClicked: () -> Unit) { NaviText( text = stringResource(id = R.string.bbps_remove_account), fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textPrimary ) @@ -130,7 +130,7 @@ fun FastagBankDetailsBottomSheetContent(closeSheet: () -> Unit) { NaviText( text = stringResource(id = R.string.bbps_fastag_bottomsheet_message), fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.inputFieldDefault ) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billerlist/ui/BillerListScreen.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billerlist/ui/BillerListScreen.kt index afa7030609..c64ad7b1d9 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billerlist/ui/BillerListScreen.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billerlist/ui/BillerListScreen.kt @@ -72,9 +72,9 @@ import com.navi.bbps.feature.permission.utils.PermissionKeys import com.navi.bbps.feature.permission.utils.PermissionUtils import com.navi.bbps.initials import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.snackbar.SuccessSnackBar -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily import com.navi.naviwidgets.extensions.NaviText import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator @@ -494,7 +494,7 @@ fun RenderSearchBarSection( Column { NaviText( text = phoneNumberDetailState.phoneContactEntity.name, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 16.sp, color = NaviBbpsColor.textPrimary @@ -502,7 +502,7 @@ fun RenderSearchBarSection( NaviText( text = phoneNumberDetailState.phoneContactEntity.phoneNumber, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, color = NaviBbpsColor.textPrimary ) 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 15316da81c..93f7424923 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 @@ -68,8 +68,8 @@ import com.navi.common.R as CommonR import com.navi.common.constants.GENERIC_LOADER_LOTTIE_FILE_NAME import com.navi.common.extensions.conditional import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.utils.clickableWithNoGesture import com.navi.design.utils.maxScrollFlingBehavior import com.navi.naviwidgets.extensions.NaviText @@ -126,7 +126,7 @@ fun RenderBillerListScreen( ) { NaviText( text = stringResource(id = R.string.bbps_how_to_find_your_fastag_bank), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 12.sp, color = NaviBbpsColor.textTertiary, @@ -135,7 +135,7 @@ fun RenderBillerListScreen( NaviText( text = stringResource(id = R.string.bbps_view), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.textPrimary, @@ -166,7 +166,7 @@ fun RenderBillerListScreen( Spacer(modifier = Modifier.width(8.dp)) NaviText( text = stringResource(id = R.string.bbps_searching), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 12.sp, color = NaviBbpsColor.textTertiary @@ -196,7 +196,7 @@ fun RenderBillerListScreen( Spacer(modifier = Modifier.height(16.dp)) NaviText( text = stringResource(id = R.string.bbps_no_billers_found), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 14.sp, lineHeight = 24.sp, @@ -263,7 +263,7 @@ fun PopularBillersSection( if (popularBillers.isNotEmpty()) { NaviText( text = stringResource(id = R.string.bbps_top_billers), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = NaviBbpsColor.textPrimary @@ -332,7 +332,7 @@ fun TopBillersView( text = billerEntity.billerName, textAlign = TextAlign.Center, fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = NaviBbpsColor.textPrimary, maxLines = 2, @@ -349,7 +349,7 @@ private fun RecentBillTitle(billerListState: BillerListState.Loaded) { Column(modifier = Modifier.fillMaxSize()) { NaviText( text = billerListState.recentBills.title, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 16.sp, color = NaviBbpsColor.textPrimary, @@ -386,7 +386,7 @@ fun RecentBillerItem( Column(modifier = Modifier.fillMaxHeight().weight(1f).fillMaxWidth(0.8f)) { NaviText( text = myBillEntity.billerName, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.textPrimary, @@ -399,7 +399,7 @@ fun RecentBillerItem( NaviText( text = primaryCustomerParamValue, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 14.sp, color = NaviBbpsColor.textPrimary, lineHeight = 20.sp @@ -411,7 +411,7 @@ fun RecentBillerItem( NaviText( text = "${stringResource(id = R.string.bbps_last_paid_on)} ${myBillEntity.formattedLastPaidDate} ", - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, color = NaviBbpsColor.textTertiary ) @@ -440,7 +440,7 @@ fun BillerTitle(billerGroupItemEntity: BillerGroupItemEntity) { Box(modifier = Modifier.fillMaxSize()) { NaviText( text = billerGroupItemEntity.title, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 16.sp, color = NaviBbpsColor.textPrimary, @@ -462,7 +462,7 @@ fun BillerItem(billerItemEntity: BillerItemEntity, onItemClicked: () -> Unit) { NaviText( text = billerItemEntity.billerName, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 14.sp, color = NaviBbpsColor.textPrimary, modifier = Modifier.align(Alignment.CenterVertically), diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/model/view/MyBillDetailsMenuBottomSheetContent.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/model/view/MyBillDetailsMenuBottomSheetContent.kt index 7df0d3cf66..a67248ef53 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/model/view/MyBillDetailsMenuBottomSheetContent.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/model/view/MyBillDetailsMenuBottomSheetContent.kt @@ -28,8 +28,8 @@ import androidx.compose.ui.unit.sp import com.navi.bbps.R import com.navi.bbps.common.theme.NaviBbpsColor import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText @Composable @@ -58,7 +58,7 @@ fun MyBillDetailsMenuBottomSheetContent(onDeleteBillMenuClicked: () -> Unit) { style = TextStyle( fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textPrimary, ) 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 888835fdec..b1db59c8ef 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 @@ -33,8 +33,8 @@ import com.navi.bbps.feature.billhistorydetail.model.view.BillTransactionItemEnt import com.navi.bbps.feature.billhistorydetail.model.view.BillTransactionsState import com.navi.common.R as CommonR import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText @Composable @@ -49,7 +49,7 @@ fun BillTransactionsListView( modifier = Modifier.padding(horizontal = NaviBbpsDimens.horizontalMargin), text = stringResource(id = R.string.bbps_bill_payment_history), color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Center, fontSize = 16.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), @@ -92,7 +92,7 @@ private fun BillTransactionItem(transaction: BillTransactionItemEntity, onItemCl NaviText( text = transaction.title, color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Center, fontSize = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), @@ -102,7 +102,7 @@ private fun BillTransactionItem(transaction: BillTransactionItemEntity, onItemCl NaviText( text = transaction.relativeTimestamp, color = NaviBbpsColor.textSecondary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Center, fontSize = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), @@ -117,7 +117,7 @@ private fun BillTransactionItem(transaction: BillTransactionItemEntity, onItemCl text = stringResource(id = R.string.bbps_ruppes_symbol_x, transaction.formattedAmount), color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Center, fontSize = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), @@ -127,7 +127,7 @@ private fun BillTransactionItem(transaction: BillTransactionItemEntity, onItemCl NaviText( text = transaction.billTransactionStatus.displayableText, color = transaction.billTransactionStatus.textColor, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Center, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), 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 ab59343c46..ee66641f32 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 @@ -57,8 +57,8 @@ import com.navi.bbps.feature.mybills.model.view.MyBillEntity import com.navi.common.R as CommonR import com.navi.common.customview.LoaderRoundedButton import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.utils.clickableWithNoGesture import com.navi.naviwidgets.extensions.NaviText import com.ramcosta.composedestinations.annotation.Destination @@ -302,7 +302,7 @@ private fun MyBillsHistoryHeader( modifier = Modifier.weight(1f).align(Alignment.CenterVertically), text = myBillEntity.billerName, color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), overflow = TextOverflow.Ellipsis @@ -343,7 +343,7 @@ private fun CustomerParamsView(customerParams: Map) { NaviText( text = customerParamKey, color = NaviBbpsColor.textSecondary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Start, fontSize = 14.sp, maxLines = 2, @@ -355,7 +355,7 @@ private fun CustomerParamsView(customerParams: Map) { NaviText( text = customerParamValue, color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.End, fontSize = 14.sp, maxLines = 2, diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/category/ui/BillCategoriesCoinUtilisationComposables.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/category/ui/BillCategoriesCoinUtilisationComposables.kt index 1d2d1bccf9..29a95f9f7e 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/category/ui/BillCategoriesCoinUtilisationComposables.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/category/ui/BillCategoriesCoinUtilisationComposables.kt @@ -45,8 +45,8 @@ import com.navi.bbps.feature.category.model.view.RewardDataEntity import com.navi.common.ui.compose.RolodexAnimationComposable import com.navi.common.utils.CommonUtils.formattedCurrency import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText @Composable @@ -86,7 +86,7 @@ fun RewardCoinBurnBanner( NaviText( text = subtitleDescriptionText, color = NaviBbpsColor.textSecondary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, lineHeight = 18.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), @@ -124,7 +124,7 @@ fun BurnRewardsTitle(modifier: Modifier, rewardsDetails: RewardDataEntity) { NaviText( text = rewardsDetails.burnBannerPrefixText ?: "", color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 20.sp, lineHeight = 28.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) @@ -139,7 +139,7 @@ fun BurnRewardsTitle(modifier: Modifier, rewardsDetails: RewardDataEntity) { NaviText( text = rewardsDetails.burnBannerSuffix1Text ?: "", color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 20.sp, lineHeight = 28.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) @@ -149,7 +149,7 @@ fun BurnRewardsTitle(modifier: Modifier, rewardsDetails: RewardDataEntity) { NaviText( text = rewardsDetails.burnBannerSuffix2Text ?: "", color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 20.sp, lineHeight = 28.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), @@ -173,7 +173,7 @@ fun additionalInfo(): AnnotatedString { style = SpanStyle( color = NaviBbpsColor.textSecondary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) ), @@ -221,7 +221,7 @@ fun CoinBurnStripRotatingText(rewardsDetails: RewardDataEntity?) { rewardsDetails?.earnBannerPrefixText ?: stringResource(id = R.string.bbps_win_up_to), color = NaviBbpsColor.textWhite, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, lineHeight = 18.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR) @@ -236,7 +236,7 @@ fun CoinBurnStripRotatingText(rewardsDetails: RewardDataEntity?) { NaviText( text = rewardsDetails?.amount ?: NAVI_BBPS_MAX_COIN_EARN, color = NaviBbpsColor.textWhite, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, lineHeight = 18.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) @@ -247,7 +247,7 @@ fun CoinBurnStripRotatingText(rewardsDetails: RewardDataEntity?) { rewardsDetails?.earnBannerSuffixText ?: stringResource(id = R.string.bbps_on_every_payment), color = NaviBbpsColor.textWhite, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, lineHeight = 18.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR) @@ -274,7 +274,7 @@ fun CoinBurnRewardsText(rewardsDetails: RewardDataEntity) { NaviText( text = descriptionText, color = NaviBbpsColor.textWhite, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, lineHeight = 18.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR) @@ -289,7 +289,7 @@ fun CoinBurnRewardsText(rewardsDetails: RewardDataEntity) { NaviText( text = rewardsDetails.applicableDiscount.toString().formattedCurrency(), color = NaviBbpsColor.textWhite, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, lineHeight = 18.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) @@ -322,7 +322,7 @@ fun rewardBurnCalloutDescription(rewardsDetails: RewardDataEntity): AnnotatedStr style = SpanStyle( color = NaviBbpsColor.brandSecondaryGreen, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) ), @@ -371,7 +371,7 @@ fun RewardCoinEarnBanner( NaviText( text = rewardsDetails.earnBannerSuffixText ?: "", color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, lineHeight = 24.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), @@ -405,7 +405,7 @@ fun EarnRewardsTitle(rewardsDetails: RewardDataEntity, modifier: Modifier) { NaviText( text = rewardsDetails.earnBannerPrefixText ?: "", color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 20.sp, lineHeight = 28.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) @@ -420,7 +420,7 @@ fun EarnRewardsTitle(rewardsDetails: RewardDataEntity, modifier: Modifier) { Spacer(modifier = Modifier.width(4.dp)) NaviText( text = rewardsDetails.amount, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 24.sp, lineHeight = 36.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) @@ -454,7 +454,7 @@ fun RewardCoinEarnCalloutStrip(rewardsDetails: RewardDataEntity) { NaviText( text = earnStripDescriptionText, color = NaviBbpsColor.textWhite, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, lineHeight = 18.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR) @@ -486,7 +486,7 @@ fun burnNudgeTextWithDifferentStyle(rewardsDetails: RewardDataEntity): Annotated style = SpanStyle( color = NaviBbpsColor.brandSecondaryGreen, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 10.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) ), @@ -521,7 +521,7 @@ fun BillDiscountCoinBurnNudge(rewardsDetails: RewardDataEntity) { NaviText( text = burnNudgeText, color = NaviBbpsColor.textWhite, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 10.sp, lineHeight = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) @@ -555,7 +555,7 @@ fun BillDiscountCoinEarnNudge(rewardsDetails: RewardDataEntity) { NaviText( text = rewardsDetails.earnNudgeText ?: "", color = NaviBbpsColor.textWhite, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 10.sp, lineHeight = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) @@ -571,7 +571,7 @@ fun BillDiscountCoinEarnNudge(rewardsDetails: RewardDataEntity) { NaviText( text = rewardsDetails.amount, color = NaviBbpsColor.textWhite, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 10.sp, lineHeight = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), @@ -596,7 +596,7 @@ fun earnStripTextWithDifferentStyle(rewardsDetails: RewardDataEntity): Annotated style = SpanStyle( color = NaviBbpsColor.textWhite, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) ), 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 ee964fa5d5..08c0644e4e 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 @@ -116,8 +116,8 @@ import com.navi.common.extensions.conditional import com.navi.common.uitron.model.action.CtaAction import com.navi.common.uitron.render.CommonCustomUiTronRenderer import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.R as WidgetsR import com.navi.naviwidgets.extensions.NaviText import com.navi.rr.utils.ext.toJson @@ -510,7 +510,7 @@ fun PendingCountSectionV2( nonDismissedUnpaidBills.size ), color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), overflow = TextOverflow.Ellipsis @@ -523,7 +523,7 @@ fun PendingCountSectionV2( NaviText( text = stringResource(id = R.string.bbps_my_bills), color = NaviBbpsColor.ctaPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), overflow = TextOverflow.Ellipsis @@ -568,7 +568,7 @@ fun ManageMyBillCardV2( NaviText( text = stringResource(id = R.string.bbps_my_bills), color = NaviBbpsColor.ctaPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Center, fontSize = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), @@ -591,7 +591,7 @@ fun ManageMyBillCardV2( myBillCardInfoState.unpaidBillsCount ), color = NaviBbpsColor.onSurfaceCritical, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Center, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), @@ -602,7 +602,7 @@ fun ManageMyBillCardV2( NaviText( text = accountsCountText, color = NaviBbpsColor.ctaPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Center, fontSize = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), @@ -719,7 +719,7 @@ private fun PendingBillItemV2( getReminderTitleFromMyBillEntity(myBillEntity) } $DASH ${myBillEntity.primaryCustomerParamValue}", color = NaviBbpsColor.textSecondary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, maxLines = 1, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), @@ -737,7 +737,7 @@ private fun PendingBillItemV2( .getDisplayableAmount(), ), color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), overflow = TextOverflow.Ellipsis @@ -746,7 +746,7 @@ private fun PendingBillItemV2( NaviText( text = BULLET, color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) @@ -755,7 +755,7 @@ private fun PendingBillItemV2( NaviText( text = myBillEntity.unpaidBillWarning, color = NaviBbpsColor.onSurfaceCritical, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), overflow = TextOverflow.Ellipsis, @@ -789,7 +789,7 @@ private fun PendingBillItemV2( text = myBillEntity.nextActionCtaText, fontSize = 12.sp, lineHeight = 18.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviBbpsColor.ctaPrimary ) @@ -874,7 +874,7 @@ private fun BbpsLandingPageHeader( NaviText( text = stringResource(id = R.string.bbps_title_bills_and_recharges), fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textPrimary, textAlign = TextAlign.Center @@ -899,7 +899,7 @@ private fun BbpsLandingPageHeader( NaviText( text = helpCtaText.orEmpty(), fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = if (hasScrolledPastStatusBar || shouldUseDarkIcons) 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 fc5268fa89..a2334b2f33 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 @@ -72,9 +72,9 @@ import com.navi.common.R as CommonR import com.navi.common.utils.log import com.navi.design.common.NaviVerticalGrid import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.theme.ABABAB -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily import com.navi.naviwidgets.extensions.NaviText import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.collectLatest @@ -178,7 +178,7 @@ fun PendingCountSection( nonDismissedUnpaidBills.size ), color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), overflow = TextOverflow.Ellipsis @@ -189,7 +189,7 @@ fun PendingCountSection( text = stringResource(id = R.string.bbps_my_bills), modifier = Modifier.clickableDebounce { onManageMyBillsClicked() }, color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), overflow = TextOverflow.Ellipsis @@ -295,7 +295,7 @@ private fun PendingBillItem( "${getReminderTitleFromMyBillEntity(myBillEntity) } $DASH ${myBillEntity.primaryCustomerParamValue}", color = NaviBbpsColor.textSecondary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, maxLines = 1, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), @@ -312,7 +312,7 @@ private fun PendingBillItem( myBillEntity.unpaidBillDetails.amount.getDisplayableAmount(), ), color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), overflow = TextOverflow.Ellipsis @@ -321,7 +321,7 @@ private fun PendingBillItem( NaviText( text = BULLET, color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) @@ -330,7 +330,7 @@ private fun PendingBillItem( NaviText( text = myBillEntity.unpaidBillWarning, color = NaviBbpsColor.onSurfaceCritical, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 10.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), overflow = TextOverflow.Ellipsis, @@ -391,7 +391,7 @@ internal fun ManageMyBillCard( NaviText( text = stringResource(id = R.string.bbps_my_bills), color = NaviBbpsColor.ctaPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Center, fontSize = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), @@ -414,7 +414,7 @@ internal fun ManageMyBillCard( myBillCardInfoState.unpaidBillsCount ), color = NaviBbpsColor.onSurfaceCritical, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Center, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), @@ -425,7 +425,7 @@ internal fun ManageMyBillCard( NaviText( text = accountsCountText, color = NaviBbpsColor.textSecondary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Center, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), @@ -452,7 +452,7 @@ private fun BillCategoryGroupItem( NaviText( text = billCategoryGroupEntity.title, color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), modifier = Modifier.padding(horizontal = NaviBbpsDimens.horizontalMargin) @@ -512,7 +512,7 @@ private fun BillCategoryItem(billCategoryEntity: BillCategoryEntity, onSelected: NaviText( text = billCategoryEntity.title, color = NaviBbpsColor.textSecondary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Center, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/contactlist/ui/ContactListBottomSheetContent.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/contactlist/ui/ContactListBottomSheetContent.kt index 9cb10e3e2f..d60a353e80 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/contactlist/ui/ContactListBottomSheetContent.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/contactlist/ui/ContactListBottomSheetContent.kt @@ -31,8 +31,8 @@ import com.navi.bbps.common.ui.ConfirmationBottomSheetContent import com.navi.bbps.feature.contactlist.model.view.ContactListBottomSheetType import com.navi.bbps.feature.mybills.model.view.MyBillEntity import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText @Composable @@ -109,7 +109,7 @@ fun ContactListMenuBottomSheetContent(onDeleteAccountBillClicked: () -> Unit) { NaviText( text = stringResource(id = R.string.bbps_remove_account), fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textPrimary ) 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 602f782114..099bb0e145 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 @@ -23,8 +23,6 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource @@ -57,8 +55,8 @@ import com.navi.common.extensions.conditional import com.navi.common.model.common.NudgeDetailEntity import com.navi.common.utils.contactInitials import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText @OptIn(ExperimentalPermissionsApi::class, ExperimentalFoundationApi::class) @@ -105,7 +103,7 @@ fun RenderContactListScreen( NaviText( modifier = Modifier.padding(top = 8.dp, start = 16.dp, end = 16.dp), text = stringResource(id = R.string.bbps_please_enter_valid_number_contact), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 12.sp, color = NaviBbpsColor.textPrimary, @@ -195,7 +193,7 @@ fun RenderContactListScreen( NaviText( modifier = Modifier.padding(horizontal = 16.dp), text = stringResource(id = R.string.bbps_your_contacts), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 16.sp, color = NaviBbpsColor.textPrimary, @@ -243,7 +241,7 @@ fun EmptyContactListState() { Spacer(modifier = Modifier.height(16.dp)) NaviText( text = stringResource(id = R.string.bbps_no_relevant_result_found), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 16.sp, lineHeight = 24.sp, @@ -252,7 +250,7 @@ fun EmptyContactListState() { ) NaviText( text = stringResource(id = R.string.bbps_no_contact_found_description), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, lineHeight = 22.sp, @@ -286,14 +284,14 @@ fun PhoneContactView( NaviText( text = phoneContact.name, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textPrimary ) NaviText( text = phoneContact.phoneNumber, fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textTertiary, ) @@ -308,7 +306,7 @@ private fun RecentBillTitle( Column(modifier = Modifier.fillMaxSize().padding(horizontal = 16.dp)) { NaviText( text = title, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 16.sp, color = NaviBbpsColor.textPrimary, @@ -348,7 +346,7 @@ fun RecentBillerItem( Column(modifier = Modifier.fillMaxHeight().weight(1f).fillMaxWidth(0.8f)) { NaviText( text = getContactNameFromPhoneNumber(primaryCustomerParamValue), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 14.sp, color = NaviBbpsColor.textPrimary, lineHeight = 20.sp, @@ -360,7 +358,7 @@ fun RecentBillerItem( NaviText( text = primaryCustomerParamValue, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.textPrimary, @@ -377,7 +375,7 @@ fun RecentBillerItem( myBillEntity.formattedLastPaidAmount, myBillEntity.formattedLastPaidDate ), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, color = NaviBbpsColor.textTertiary ) 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 6c4a4460e4..b99bfa68ad 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 @@ -96,8 +96,8 @@ import com.navi.bbps.feature.customerinput.model.view.TextInputType import com.navi.common.customview.LoaderRoundedButton import com.navi.common.extensions.conditional import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.utils.clickableWithNoGesture import com.navi.naviwidgets.extensions.NaviText import com.ramcosta.composedestinations.annotation.Destination @@ -314,7 +314,7 @@ fun CustomerDataInputScreen( NaviText( text = billCategoryEntity.title, fontSize = 24.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviBbpsColor.textPrimary, @@ -400,7 +400,7 @@ fun CustomerDataInputScreen( text = naviBbpsDefaultConfig.consentConfig.billFetchConsentMessage, fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, color = NaviBbpsColor.textSecondary, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), ) @@ -472,7 +472,7 @@ fun RenderBillerDetailStrip(billerItemEntity: BillerItemEntity) { NaviText( text = billerItemEntity.billerName, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textPrimary, maxLines = 1, diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/mybills/ui/RenderEmptyMyBillsScreen.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/mybills/ui/RenderEmptyMyBillsScreen.kt index 0621bf7b8e..d76affd860 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/mybills/ui/RenderEmptyMyBillsScreen.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/mybills/ui/RenderEmptyMyBillsScreen.kt @@ -29,8 +29,8 @@ import com.navi.bbps.common.theme.NaviBbpsColor import com.navi.bbps.common.ui.ThemeRoundedButton import com.navi.bbps.entry.NaviBbpsRouter import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText import com.ramcosta.composedestinations.navigation.DestinationsNavigator @@ -61,7 +61,7 @@ fun RenderEmptyMyBillsScreen( NaviText( text = stringResource(id = R.string.bbps_no_bills_paid_description), color = NaviBbpsColor.textTertiary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), modifier = Modifier.align(Alignment.CenterHorizontally), 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 0dbf86e5bf..47312f896a 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 @@ -48,8 +48,8 @@ import com.navi.bbps.feature.mybills.model.view.MyBillEntity import com.navi.common.R as CommonR import com.navi.common.extensions.conditional import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText @OptIn(ExperimentalFoundationApi::class) @@ -76,7 +76,7 @@ fun RenderMyBillsScreen( myUnpaidBills.size ), color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR) ) @@ -100,7 +100,7 @@ fun RenderMyBillsScreen( NaviText( text = stringResource(id = R.string.bbps_saved_bills), color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR) ) @@ -163,7 +163,7 @@ private fun MyBillItem( NaviText( text = myBillEntity.billerName, color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), maxLines = 1, @@ -173,7 +173,7 @@ private fun MyBillItem( NaviText( text = myBillEntity.primaryCustomerParamValue, color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), overflow = TextOverflow.Ellipsis, @@ -219,7 +219,7 @@ private fun MyBillItem( myBillEntity.formattedLastPaidAmount, ), color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), overflow = TextOverflow.Ellipsis @@ -230,7 +230,7 @@ private fun MyBillItem( NaviText( text = BULLET, color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) @@ -239,7 +239,7 @@ private fun MyBillItem( text = " ${stringResource(id = R.string.bbps_last_paid_on)} ${myBillEntity.formattedLastPaidDate}", color = NaviBbpsColor.textSecondary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), overflow = TextOverflow.Ellipsis @@ -262,7 +262,7 @@ private fun MyBillItem( myBillEntity.unpaidBillDetails.amount.getDisplayableAmount(), ), color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), overflow = TextOverflow.Ellipsis @@ -271,7 +271,7 @@ private fun MyBillItem( NaviText( text = "•", color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) @@ -280,7 +280,7 @@ private fun MyBillItem( NaviText( text = myBillEntity.unpaidBillWarning, color = NaviBbpsColor.onSurfaceCritical, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), overflow = TextOverflow.Ellipsis @@ -291,7 +291,7 @@ private fun MyBillItem( text = stringResource(id = R.string.bbps_mark_as_paid), modifier = Modifier.clickableDebounce { onBillMarkAsPaidClicked(myBillEntity) }, color = NaviBbpsColor.ctaPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), textDecoration = Underline diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/AmountTextField.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/AmountTextField.kt index d10ff63718..8dc372118d 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/AmountTextField.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/AmountTextField.kt @@ -48,8 +48,8 @@ import androidx.compose.ui.unit.sp import com.navi.bbps.common.theme.NaviBbpsColor import com.navi.common.utils.CurrencyMaskTransformation import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.utils.clickableWithNoGesture import com.navi.naviwidgets.extensions.NaviText import kotlinx.coroutines.delay @@ -106,7 +106,7 @@ fun AmountTextField( if (paymentAmount.isNotBlank()) NaviBbpsColor.textPrimary else NaviBbpsColor.inputFieldDefault, fontSize = 30.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) BasicTextField( @@ -125,7 +125,7 @@ fun AmountTextField( TextStyle( color = NaviBbpsColor.textPrimary, fontSize = AMOUNT_TEXT_SIZE.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(AMOUNT_FIELD_FONT_WEIGHT), textAlign = TextAlign.Start ), @@ -186,7 +186,7 @@ fun AmountTextField( text = errorTextMessage, color = NaviBbpsColor.inputFieldError, fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), textAlign = TextAlign.Center ) @@ -202,7 +202,7 @@ fun AmountFieldPlaceholder() { modifier = Modifier.wrapContentWidth().align(Alignment.Center), text = "0", fontSize = PLACEHOLDER_AMOUNT_TEXT_SIZE.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(AMOUNT_FIELD_FONT_WEIGHT), color = NaviBbpsColor.inputFieldDefault, textAlign = TextAlign.Center diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/PayBillCoinUtilisationComposables.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/PayBillCoinUtilisationComposables.kt index e305830abe..2b24184794 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/PayBillCoinUtilisationComposables.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/PayBillCoinUtilisationComposables.kt @@ -51,8 +51,8 @@ import com.navi.common.constants.EMPTY import com.navi.common.constants.NAVI_BBPS_COIN_LOTTIE import com.navi.common.model.common.NudgeDetailEntity import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText import com.navi.uitron.model.ui.PeakDirection import com.navi.uitron.model.ui.PeakPosition @@ -88,7 +88,7 @@ fun CoinUtilisationBottomNudgeWithAnimation(nudgeDetailEntity: NudgeDetailEntity text = nudgeDetailEntity.prefixText, fontSize = 12.sp, lineHeight = 18.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = NaviBbpsColor.coinUtilisationBottomDescGradient1, ) @@ -103,7 +103,7 @@ fun CoinUtilisationBottomNudgeWithAnimation(nudgeDetailEntity: NudgeDetailEntity text = nudgeDetailEntity.formattedAmount, fontSize = 12.sp, lineHeight = 18.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviBbpsColor.coinUtilisationBottomDescGradient1, ) @@ -123,7 +123,7 @@ fun CoinUtilisationBottomNudgeWithAnimation(nudgeDetailEntity: NudgeDetailEntity ) ) ), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR) ) Spacer(modifier = Modifier.width(4.dp)) @@ -151,7 +151,7 @@ fun CoinUtilisationBottomNudge(nudgeDetailEntity: NudgeDetailEntity) { text = nudgeDetailEntity.prefixText, fontSize = 12.sp, lineHeight = 18.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = NaviBbpsColor.coinUtilisationBottomDescGradient1, ) @@ -166,7 +166,7 @@ fun CoinUtilisationBottomNudge(nudgeDetailEntity: NudgeDetailEntity) { text = nudgeDetailEntity.formattedAmount, fontSize = 12.sp, lineHeight = 18.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviBbpsColor.coinUtilisationBottomDescGradient1, ) @@ -186,7 +186,7 @@ fun CoinUtilisationBottomNudge(nudgeDetailEntity: NudgeDetailEntity) { ) ) ), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR) ) Spacer(modifier = Modifier.width(4.dp)) @@ -207,7 +207,7 @@ fun coinUtilisationBottomText(): AnnotatedString { addStyle( style = SpanStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) ), @@ -237,7 +237,7 @@ fun CoinValueDescriptionBox() { text = stringResource(id = R.string.bbps_coin_to_amount_value), fontSize = 10.sp, lineHeight = 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviBbpsColor.textPrimary ) @@ -278,7 +278,7 @@ fun RewardBurnCalloutBanner( NaviText( text = descriptionText, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, lineHeight = 22.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textWhite @@ -293,7 +293,7 @@ fun RewardBurnCalloutBanner( NaviText( text = coinUtilisationProperties?.coinUsedForDiscount.orEmpty(), fontSize = 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, lineHeight = 22.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviBbpsColor.textWhite @@ -319,7 +319,7 @@ fun payBillCoinUtilisationInfo( style = SpanStyle( color = NaviBbpsColor.brandSecondaryGreen, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) ), 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 d47e8d2466..e7dd4ae882 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 @@ -98,8 +98,8 @@ import com.navi.common.utils.CommonUtils.FragmentContainer import com.navi.common.utils.stringToJsonObject import com.navi.design.decorator.DashedDivider import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.utils.clickableWithNoGesture import com.navi.naviwidgets.extensions.NaviText import com.navi.payment.model.common.PaymentSdkInitParams @@ -570,7 +570,7 @@ fun RenderPayBillPrepaidBox( NaviText( text = stringResource(id = R.string.bbps_plan_details), fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = NaviBbpsColor.textPrimary ) @@ -612,7 +612,7 @@ fun RenderPayBillPrepaidBox( payBillScreenState.planItemEntity.packageDescription ), fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textTertiary ) @@ -638,7 +638,7 @@ fun RenderPayBillPrepaidBox( NaviText( text = stringResource(id = R.string.bbps_view_other_plans), color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Start, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), @@ -688,7 +688,7 @@ fun RenderPayBillBox( NaviText( text = stringResource(id = R.string.bbps_bill_details), fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = NaviBbpsColor.textPrimary ) @@ -808,7 +808,7 @@ fun BillHistorySection( stringResource(id = R.string.bbps_recharge_history) else stringResource(id = R.string.bbps_bill_history), color = NaviBbpsColor.textSecondary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Start, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), @@ -820,7 +820,7 @@ fun BillHistorySection( text = "${stringResource(id = R.string.bbps_last_paid_on)} $formattedLastPaidDate", color = NaviBbpsColor.textSecondary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), overflow = TextOverflow.Ellipsis @@ -831,7 +831,7 @@ fun BillHistorySection( NaviText( text = BULLET, color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) @@ -843,7 +843,7 @@ fun BillHistorySection( formattedLastPaidAmount, ), color = NaviBbpsColor.textTertiary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Start, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), @@ -886,7 +886,7 @@ fun RenderPayBillDthStickySnackbar() { NaviText( text = stringResource(id = R.string.bbps_dth_note), color = NaviBbpsColor.textTertiary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Center, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_BOLD), @@ -895,7 +895,7 @@ fun RenderPayBillDthStickySnackbar() { NaviText( text = stringResource(id = R.string.bbps_dth_note_message), color = NaviBbpsColor.textTertiary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Start, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), @@ -977,7 +977,7 @@ private fun RenderPayBillHeaderPrepaid( if (phoneNumberDetail.name.isNotEmpty()) { NaviText( text = phoneNumberDetail.name, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 16.sp, maxLines = 1, @@ -988,7 +988,7 @@ private fun RenderPayBillHeaderPrepaid( NaviText( text = phoneNumberDetail.phoneNumber, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, color = NaviBbpsColor.textPrimary ) @@ -1032,7 +1032,7 @@ private fun RenderPayBillHeaderOthers( NaviText( text = billerDetailsEntity.billerName, color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Start, fontSize = 14.sp, maxLines = 1, 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 47bb7b4c0b..b8a3b81160 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 @@ -75,8 +75,8 @@ import com.navi.common.R as CommonR import com.navi.common.utils.CommonUtils.formattedCurrency import com.navi.common.utils.Constants.COMMA_CHAR import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText import com.ramcosta.composedestinations.navigation.DestinationsNavigator import kotlinx.coroutines.flow.filter @@ -121,7 +121,7 @@ fun RenderCreditCardPayBillScreen( NaviText( text = stringResource(id = R.string.bbps_credit_card_bill), fontSize = 24.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviBbpsColor.textPrimary, maxLines = 1, @@ -142,7 +142,7 @@ fun RenderCreditCardPayBillScreen( NaviText( text = stringResource(id = R.string.bbps_select_amount_to_pay), fontSize = 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviBbpsColor.textPrimary, maxLines = 1, @@ -209,7 +209,7 @@ fun DueDateText( style = SpanStyle( fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textTertiary ) @@ -222,7 +222,7 @@ fun DueDateText( style = SpanStyle( fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = if (isOverdue) NaviBbpsColor.onSurfaceCritical @@ -236,7 +236,7 @@ fun DueDateText( NaviText( text = annotatedString, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviBbpsColor.textPrimary, maxLines = 1, @@ -318,7 +318,7 @@ private fun PaymentAmountOptionItem( NaviText( text = creditCardPaymentOption.title, fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textTertiary ) @@ -328,7 +328,7 @@ private fun PaymentAmountOptionItem( NaviText( text = creditCardPaymentOption.description, fontSize = 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = NaviBbpsColor.textPrimary ) @@ -374,7 +374,7 @@ private fun PaymentAmountOptionItem( textStyle = TextStyle( fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textPrimary ) @@ -470,7 +470,7 @@ fun CreditCardBillHistorySection( NaviText( text = "${stringResource(id = R.string.bbps_last_paid_on)} $formattedLastPaidDate", color = NaviBbpsColor.textSecondary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), overflow = TextOverflow.Ellipsis @@ -481,7 +481,7 @@ fun CreditCardBillHistorySection( NaviText( text = BULLET, color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) @@ -493,7 +493,7 @@ fun CreditCardBillHistorySection( formattedLastPaidAmount, ), color = NaviBbpsColor.textTertiary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, textAlign = TextAlign.Start, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), @@ -505,7 +505,7 @@ fun CreditCardBillHistorySection( NaviText( text = stringResource(id = R.string.bbps_view_history), color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), textDecoration = TextDecoration.Underline @@ -539,7 +539,7 @@ fun CardDetailsSection( NaviText( text = payBillScreenState.billDetailsEntity.accountHolderName, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviBbpsColor.textPrimary, maxLines = 1, @@ -552,7 +552,7 @@ fun CardDetailsSection( NaviText( text = billerDetailsEntity.billerName, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textPrimary, maxLines = 1, @@ -565,7 +565,7 @@ fun CardDetailsSection( text = " $DASH ${getLastFourDigitsOfCreditCard(payBillScreenSource.customerParams)}", fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textPrimary, maxLines = 1, diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/permission/ui/PermissionScreen.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/permission/ui/PermissionScreen.kt index 9bc3b8137f..dfdbdabf91 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/permission/ui/PermissionScreen.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/permission/ui/PermissionScreen.kt @@ -59,8 +59,8 @@ import com.navi.bbps.feature.permission.model.view.PermissionState import com.navi.bbps.feature.permission.utils.PermissionUtils.getPermissionListFromPermissionKey import com.navi.bbps.feature.permission.viewmodel.PermissionViewModel import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator @@ -246,7 +246,7 @@ fun RenderNaviBbpsPermissionScreen( NaviText( modifier = Modifier.padding(horizontal = 16.dp), text = stringResource(id = subTitleText), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textTertiary @@ -310,7 +310,7 @@ fun TitleText(modifier: Modifier, textResId: Int, permissionKey: String) { val titleText = stringResource(id = textResId) NaviText( text = titleText, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 20.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = NaviBbpsColor.textPrimary, @@ -376,14 +376,14 @@ fun PermissionTileView(permissionData: PermissionData, permissionState: Permissi NaviText( text = stringResource(id = permissionData.titleId), fontSize = 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = NaviBbpsColor.textPrimary ) NaviText( text = stringResource(id = permissionData.descriptionId), fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textTertiary ) @@ -397,14 +397,14 @@ fun PermissionTileView(permissionData: PermissionData, permissionState: Permissi NaviText( text = stringResource(id = permissionData.titleId), fontSize = 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = NaviBbpsColor.textPrimary ) NaviText( text = stringResource(id = permissionData.descriptionId), fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textTertiary ) @@ -414,7 +414,7 @@ fun PermissionTileView(permissionData: PermissionData, permissionState: Permissi NaviText( text = stringResource(id = R.string.bbps_permission_settings_path), fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = NaviBbpsColor.textTertiary ) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/prepaidrecharge/ui/PrepaidRechargeScreen.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/prepaidrecharge/ui/PrepaidRechargeScreen.kt index beef715dea..ee95517b4d 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/prepaidrecharge/ui/PrepaidRechargeScreen.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/prepaidrecharge/ui/PrepaidRechargeScreen.kt @@ -54,8 +54,8 @@ import com.navi.bbps.feature.prepaidrecharge.model.view.CircleItemEntity import com.navi.bbps.feature.prepaidrecharge.model.view.OperatorItemEntity import com.navi.bbps.feature.prepaidrecharge.model.view.PrepaidRechargeState import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator @@ -437,7 +437,7 @@ private fun PlanDisclaimer( addStyle( style = SpanStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 10.sp, color = NaviBbpsColor.textSecondary @@ -448,7 +448,7 @@ private fun PlanDisclaimer( addStyle( style = SpanStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 10.sp, color = NaviBbpsColor.textPrimary 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 0b0240d2ef..1d4923128c 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 @@ -47,8 +47,8 @@ import com.navi.bbps.feature.prepaidrecharge.model.view.CircleItemEntity import com.navi.bbps.feature.prepaidrecharge.model.view.OperatorItemEntity import com.navi.common.R as CommonR import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText typealias CircleId = String @@ -149,7 +149,7 @@ private fun getCircleOperatorBottomSheetDescriptionText( addStyle( style = SpanStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 14.sp, color = NaviBbpsColor.textPrimary @@ -161,7 +161,7 @@ private fun getCircleOperatorBottomSheetDescriptionText( addStyle( style = SpanStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 14.sp, color = NaviBbpsColor.textPrimary @@ -189,7 +189,7 @@ private fun RenderPrepaidRechargeBottomSheetOperator( text = stringResource(id = R.string.bbps_select_operator), color = NaviBbpsColor.textPrimary, fontSize = 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) ) @@ -211,7 +211,7 @@ private fun RenderPrepaidRechargeBottomSheetOperator( text = operator.operatorName, color = NaviBbpsColor.textPrimary, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), ) } @@ -235,7 +235,7 @@ fun RenderPrepaidRechargeBottomSheetCircle( text = stringResource(id = R.string.bbps_select_circle), color = NaviBbpsColor.textPrimary, fontSize = 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), modifier = Modifier.fillMaxWidth().padding(16.dp) ) @@ -249,7 +249,7 @@ fun RenderPrepaidRechargeBottomSheetCircle( text = circle.circleName, color = NaviBbpsColor.textPrimary, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), ) 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 43f618e00c..c13f80b662 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 @@ -92,10 +92,10 @@ import com.navi.common.model.common.NudgeDetailEntity import com.navi.common.utils.CommonUtils.flingBehavior import com.navi.common.utils.appendStrings import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.tab.NaviScrollableTabRow import com.navi.design.tab.NaviTab -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily import com.navi.naviwidgets.extensions.NaviText import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow @@ -167,7 +167,7 @@ fun RenderPrepaidRechargeScreen( Column { NaviText( text = phoneNumberDetail.name, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 16.sp, color = NaviBbpsColor.textPrimary @@ -176,7 +176,7 @@ fun RenderPrepaidRechargeScreen( NaviText( text = "$INDIA_COUNTRY_CODE_WITH_PLUS ${getNormalisedPhoneNumber(phoneNumberDetail.phoneNumber)}", - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, color = NaviBbpsColor.textPrimary ) @@ -225,7 +225,7 @@ fun RenderPrepaidRechargeScreen( NaviText( text = stringResource(id = R.string.bbps_search_prepaid_plans), fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.inputFieldDefault, maxLines = 1 @@ -293,7 +293,7 @@ fun RenderPrepaidRechargeScreen( NaviText( text = planGroup.planType, fontSize = 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight( FontWeightEnum.NAVI_HEADLINE_REGULAR @@ -427,7 +427,7 @@ fun RenderPrepaidRechargePlansEmptyScreen( NaviText( text = stringResource(id = R.string.bbps_no_plans_found), color = NaviBbpsColor.textTertiary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), modifier = Modifier.align(Alignment.CenterHorizontally).padding(top = 16.dp) @@ -436,7 +436,7 @@ fun RenderPrepaidRechargePlansEmptyScreen( NaviText( text = stringResource(id = R.string.bbps_no_plans_found_description), color = NaviBbpsColor.textTertiary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), modifier = Modifier.align(Alignment.CenterHorizontally).padding(horizontal = 16.dp), @@ -494,7 +494,7 @@ fun PlanItemBoxWithDivider( .align(Alignment.Top), text = "$SYMBOL_RUPEE${plan.price.getDisplayableAmount()}", color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 16.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) ) @@ -510,7 +510,7 @@ fun PlanItemBoxWithDivider( NaviText( text = "${stringResource(id = R.string.bbps_validity)} :", color = NaviBbpsColor.textSecondary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), modifier = Modifier.alignByBaseline() @@ -522,7 +522,7 @@ fun PlanItemBoxWithDivider( text = plan.validity.ifEmpty { stringResource(id = R.string.bbps_not_available) }, color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 14.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), modifier = Modifier.alignByBaseline() @@ -533,7 +533,7 @@ fun PlanItemBoxWithDivider( NaviText( text = if (isExpanded) plan.packageDescription else nonExpandedDescription, color = NaviBbpsColor.textTertiary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 10.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), modifier = Modifier.padding(end = 16.dp), @@ -558,7 +558,7 @@ fun PlanItemBoxWithDivider( ) }, color = NaviBbpsColor.textPrimary, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 10.sp, textDecoration = TextDecoration.Underline, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR) @@ -598,7 +598,7 @@ private fun TagCardItem(onClick: () -> Unit, text: String) { text = text, color = NaviBbpsColor.ctaPrimary, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), overflow = TextOverflow.Ellipsis, maxLines = 1, 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 697dd9df32..17a5e74ad2 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 @@ -120,8 +120,8 @@ import com.navi.common.model.NaviLottieCompositionSpecType import com.navi.common.utils.CommonUtils.capitalizeMeridiem import com.navi.common.utils.Constants import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText import com.navi.rr.scratchcard.model.ScratchCardBackResponse import com.navi.rr.scratchcard.ui.compose.ScratchCardComposable @@ -560,7 +560,7 @@ fun TransactionInfoCard( NaviText( text = stringResource(id = R.string.bbps_receipt_success_message), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 24.sp, color = transactionHistoryDetailItemProperty.bannerTextColor, @@ -597,7 +597,7 @@ fun TransactionInfoCard( Column(modifier = Modifier.weight(1f)) { NaviText( text = transactionEntity?.billerName ?: "", - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 14.sp, color = transactionHistoryDetailItemProperty.bannerTextColor, @@ -611,7 +611,7 @@ fun TransactionInfoCard( text = transactionEntity?.formattedTransactionTimestamp?.capitalizeMeridiem() ?: "", - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, color = transactionHistoryDetailItemProperty.bannerTextColor @@ -632,7 +632,7 @@ fun TransactionInfoCard( ) { NaviText( text = stringResource(id = R.string.bbps_view_details), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 14.sp, color = transactionHistoryDetailItemProperty.bannerTextColor @@ -674,7 +674,7 @@ private fun TransactionAmountSection( transactionEntity?.formattedAmount ?: "" ) }, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 24.sp, color = transactionHistoryDetailItemProperty.bannerTextColor, @@ -693,7 +693,7 @@ private fun TransactionAmountSection( id = R.string.bbps_rupee_symbol_x, transactionEntity.formattedAmount ), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 14.sp, lineHeight = 22.sp, @@ -840,7 +840,7 @@ private fun BannerCtaAndTextSection( Column(modifier = modifier.wrapContentHeight()) { NaviText( text = title, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 16.sp, color = NaviBbpsColor.textPrimary @@ -850,7 +850,7 @@ private fun BannerCtaAndTextSection( NaviText( text = description, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.ctaPrimary, @@ -1042,7 +1042,7 @@ private fun RewardsGratificationSection( NaviText( text = stringResource(id = R.string.bbps_rewards_won_prefix), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.ctaPrimary @@ -1054,7 +1054,7 @@ private fun RewardsGratificationSection( id = R.string.bbps_rewards_won_suffix, rewardsGratificationUIState.amount ), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 14.sp, color = NaviBbpsColor.ctaPrimary @@ -1114,7 +1114,7 @@ private fun RenderScratchCardProcessingUI( addStyle( style = SpanStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.textSecondary @@ -1126,7 +1126,7 @@ private fun RenderScratchCardProcessingUI( addStyle( style = SpanStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 14.sp, color = NaviBbpsColor.textSecondary @@ -1138,7 +1138,7 @@ private fun RenderScratchCardProcessingUI( addStyle( style = SpanStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.textSecondary @@ -1165,7 +1165,7 @@ private fun RenderScratchCardProcessingUI( NaviText( text = stringResource(id = R.string.bbps_scratch_card_processing_header), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 16.sp, color = NaviBbpsColor.textPrimary @@ -1187,7 +1187,7 @@ private fun RenderScratchCardProcessingUI( ) { NaviText( text = stringResource(id = R.string.bbps_processed_on), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.black @@ -1195,7 +1195,7 @@ private fun RenderScratchCardProcessingUI( NaviText( text = processedOnFormatted, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.textPrimary @@ -1280,7 +1280,7 @@ private fun CrossSellFallbackSection( Column { NaviText( text = nameOfCard, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 10.sp, color = NaviBbpsColor.textTertiary, @@ -1292,7 +1292,7 @@ private fun CrossSellFallbackSection( NaviText( text = cardDetails, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 16.sp, color = NaviBbpsColor.textPrimary, @@ -1332,7 +1332,7 @@ private fun PaymentStatusDescription(billEntity: MyBillEntity) { }, color = NaviBbpsColor.textPrimary, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) } @@ -1366,7 +1366,7 @@ private fun CoinDiscountBanner(availableCoinsDiscount: String?) { NaviText( text = descriptionText, fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, lineHeight = 16.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textWhite @@ -1383,7 +1383,7 @@ private fun CoinDiscountBanner(availableCoinsDiscount: String?) { color = NaviBbpsColor.textWhite, fontSize = 12.sp, lineHeight = 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) } @@ -1405,7 +1405,7 @@ private fun coinDiscountBannerInfo(availableCoinsDiscount: String?): AnnotatedSt style = SpanStyle( color = NaviBbpsColor.brandSecondaryGreen, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) ), 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 d2d9a115b1..fa65ee0a6d 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 @@ -145,8 +145,8 @@ import com.navi.common.ui.compose.EquilateralTriangle import com.navi.common.utils.CommonUtils.capitalizeMeridiem import com.navi.common.utils.Constants import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText import com.navi.rr.scratchcard.model.ScratchCardBackResponse import com.navi.rr.scratchcard.ui.compose.ScratchCardComposable @@ -712,7 +712,7 @@ fun TransactionInfoCardV2( NaviText( text = stringResource(id = R.string.bbps_receipt_success_message), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 24.sp, color = transactionHistoryDetailItemProperty.bannerTextColor, @@ -749,7 +749,7 @@ fun TransactionInfoCardV2( Column(modifier = Modifier.weight(1f)) { NaviText( text = transactionEntity?.billerName ?: EMPTY, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 14.sp, color = transactionHistoryDetailItemProperty.bannerTextColor, @@ -763,7 +763,7 @@ fun TransactionInfoCardV2( text = transactionEntity?.formattedTransactionTimestamp?.capitalizeMeridiem() ?: EMPTY, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, color = transactionHistoryDetailItemProperty.bannerTextColor @@ -784,7 +784,7 @@ fun TransactionInfoCardV2( ) { NaviText( text = stringResource(id = R.string.bbps_view_details), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 14.sp, color = transactionHistoryDetailItemProperty.bannerTextColor @@ -826,7 +826,7 @@ private fun TransactionAmountSection( transactionEntity?.formattedAmount ?: EMPTY ) }, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 24.sp, color = transactionHistoryDetailItemProperty.bannerTextColor, @@ -845,7 +845,7 @@ private fun TransactionAmountSection( id = R.string.bbps_rupee_symbol_x, transactionEntity.formattedAmount ), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 14.sp, lineHeight = 22.sp, @@ -992,7 +992,7 @@ private fun BannerCtaAndTextSection( Column(modifier = modifier.wrapContentHeight()) { NaviText( text = title, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 16.sp, color = NaviBbpsColor.textPrimary @@ -1002,7 +1002,7 @@ private fun BannerCtaAndTextSection( NaviText( text = description, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.ctaPrimary, @@ -1170,7 +1170,7 @@ private fun RewardsWonGratificationSection( NaviText( text = stringResource(id = R.string.bbps_rewards_won_prefix_pps), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.ctaPrimary @@ -1182,7 +1182,7 @@ private fun RewardsWonGratificationSection( id = R.string.bbps_rewards_won_suffix_pps, rewardsGratificationUIState.amount ), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 14.sp, color = NaviBbpsColor.ctaPrimary @@ -1239,7 +1239,7 @@ private fun RenderScratchCardProcessingUI( addStyle( style = SpanStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.textSecondary @@ -1251,7 +1251,7 @@ private fun RenderScratchCardProcessingUI( addStyle( style = SpanStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 14.sp, color = NaviBbpsColor.textSecondary @@ -1263,7 +1263,7 @@ private fun RenderScratchCardProcessingUI( addStyle( style = SpanStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.textSecondary @@ -1290,7 +1290,7 @@ private fun RenderScratchCardProcessingUI( NaviText( text = stringResource(id = R.string.bbps_scratch_card_processing_header), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 16.sp, color = NaviBbpsColor.textPrimary @@ -1312,7 +1312,7 @@ private fun RenderScratchCardProcessingUI( ) { NaviText( text = stringResource(id = R.string.bbps_processed_on), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.black @@ -1320,7 +1320,7 @@ private fun RenderScratchCardProcessingUI( NaviText( text = processedOnFormatted, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.textPrimary @@ -1403,7 +1403,7 @@ private fun CrossSellFallbackSection( Column { NaviText( text = nameOfCard, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 10.sp, color = NaviBbpsColor.textTertiary, @@ -1415,7 +1415,7 @@ private fun CrossSellFallbackSection( NaviText( text = cardDetails, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 16.sp, color = NaviBbpsColor.textPrimary, @@ -1455,7 +1455,7 @@ private fun PaymentStatusDescription(billEntity: MyBillEntity) { }, color = NaviBbpsColor.textPrimary, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) } @@ -1489,7 +1489,7 @@ private fun CoinDiscountBanner(availableCoinsDiscount: String?) { NaviText( text = descriptionText, fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, lineHeight = 16.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = NaviBbpsColor.textWhite @@ -1506,7 +1506,7 @@ private fun CoinDiscountBanner(availableCoinsDiscount: String?) { color = NaviBbpsColor.textWhite, fontSize = 12.sp, lineHeight = 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) } @@ -1528,7 +1528,7 @@ private fun coinDiscountBannerInfo(availableCoinsDiscount: String?): AnnotatedSt style = SpanStyle( color = NaviBbpsColor.brandSecondaryGreen, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) ), @@ -1661,7 +1661,7 @@ private fun getBottomSheetDescriptionText( withStyle( style = SpanStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.textSecondary @@ -1673,7 +1673,7 @@ private fun getBottomSheetDescriptionText( withStyle( style = SpanStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 14.sp, color = NaviBbpsColor.textSecondary @@ -1688,7 +1688,7 @@ private fun getBottomSheetDescriptionText( withStyle( style = SpanStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.textSecondary @@ -1752,7 +1752,7 @@ private fun PaymentSummaryScreenBottomSheet( NaviText( text = stringResource(id = headerTextResId), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 16.sp, color = NaviBbpsColor.textPrimary @@ -1836,7 +1836,7 @@ private fun ScratchAndWinButton(modifier: Modifier = Modifier) { NaviText( text = stringResource(id = R.string.bbps_scratch_and_win), fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviBbpsColor.textWhite, maxLines = 1, @@ -1909,7 +1909,7 @@ private fun SharedTransitionScope.RewardsBottomBarWithStripSection( withStyle( style = SpanStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, @@ -1921,7 +1921,7 @@ private fun SharedTransitionScope.RewardsBottomBarWithStripSection( withStyle( style = SpanStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 14.sp, 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 c9cea83e66..81e4a68601 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 @@ -93,8 +93,8 @@ import com.navi.common.utils.CommonUtils.capitalizeMeridiem import com.navi.common.utils.clickableDebounce import com.navi.common.utils.copyToClipboard import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator @@ -372,7 +372,7 @@ private fun PaymentDetailsSection( modifier = Modifier.padding(horizontal = 16.dp), text = stringResource(id = transactionHistoryDetailItemProperty.nameInfoCardPreTextId), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 12.sp, color = NaviBbpsColor.textTertiary @@ -393,7 +393,7 @@ private fun PaymentDetailsSection( NaviText( modifier = Modifier.weight(1f, fill = false), text = primaryCustomParamPair.first, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.textTertiary, @@ -405,7 +405,7 @@ private fun PaymentDetailsSection( NaviText( text = "- " + primaryCustomParamPair.second, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.textTertiary, @@ -560,7 +560,7 @@ private fun ShowMoreLessButton(isTransactionDetailsVisible: Boolean, onClick: () if (isTransactionDetailsVisible) R.string.bbps_show_less else R.string.bbps_show_more ), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 14.sp, color = NaviBbpsColor.ctaPrimary, @@ -600,7 +600,7 @@ private fun BillerNameView( NaviText( modifier = Modifier.weight(1f), text = billerName, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 14.sp, color = NaviBbpsColor.textPrimary, @@ -619,7 +619,7 @@ private fun BillerNameView( onViewHistoryButtonClicked() }, text = stringResource(id = R.string.bbps_view_history), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 12.sp, color = NaviBbpsColor.textLinkAndCta, @@ -655,7 +655,7 @@ private fun TransactionInfoCard( id = R.string.bbps_rupee_symbol_x, transactionEntity?.formattedAmount ?: "" ), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 24.sp, color = transactionHistoryDetailItemProperty.bannerTextColor, @@ -670,7 +670,7 @@ private fun TransactionInfoCard( stringResource( id = transactionHistoryDetailItemProperty.bannerTransactionStatusTextId ), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 20.sp, color = transactionHistoryDetailItemProperty.bannerTextColor, @@ -686,7 +686,7 @@ private fun TransactionInfoCard( ?.formattedTransactionTimestamp ?.capitalizeMeridiem() .orEmpty(), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp, color = transactionHistoryDetailItemProperty.bannerTextColor, @@ -754,7 +754,7 @@ private fun RefundStatusCard( color = NaviBbpsColor.textPrimary, letterSpacing = 0.1.sp, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), ) @@ -770,7 +770,7 @@ private fun RefundStatusCard( color = refundStatusWidgetProperties.statusTextColor, letterSpacing = 0.1.sp, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), ) } @@ -790,7 +790,7 @@ private fun RefundStatusCard( color = NaviBbpsColor.textTertiary, letterSpacing = 0.1.sp, fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), ) } @@ -839,7 +839,7 @@ private fun FailedTransactionDescriptionText(modifier: Modifier, onContactUsClic color = NaviBbpsColor.textTertiary, fontSize = 12.sp, letterSpacing = 0.1.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), ), text = text, @@ -880,7 +880,7 @@ private fun ColumnScope.PaymentStatusDescriptionCard( color = NaviBbpsColor.textPrimary, letterSpacing = 0.1.sp, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), ) } @@ -912,7 +912,7 @@ fun ShareReceiptButton(onClick: () -> Unit) { color = NaviBbpsColor.ctaPrimary, letterSpacing = 0.1.sp, fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), ) Spacer(modifier = Modifier.width(8.dp)) 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 85b566e772..649fca698e 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 @@ -41,7 +41,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/layout_dp_24" android:layout_marginTop="@dimen/layout_dp_40" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:text="@{receiptDetailsEntity.formattedAmount}" android:textColor="@color/white" android:textSize="28sp" @@ -55,7 +55,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/layout_dp_24" android:layout_marginTop="@dimen/dp_8" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:text="@{receiptDetailsEntity.shareReceiptUiProperties.transactionStatusText}" android:textColor="@color/white" android:textSize="20sp" @@ -68,7 +68,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_2" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintStart_toStartOf="parent" android:paddingHorizontal="@dimen/layout_dp_24" app:layout_constraintTop_toBottomOf="@+id/tvPaymentStatus" @@ -98,7 +98,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:paddingHorizontal="@dimen/layout_dp_24" android:text="@{receiptDetailsEntity.billerName}" android:textColor="@color/bbps_text_primary" @@ -110,7 +110,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingHorizontal="@dimen/layout_dp_24" android:lineSpacingExtra="@dimen/layout_dp_4" android:text="@{receiptDetailsEntity.displayableCustomerParams}" @@ -123,7 +123,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingHorizontal="@dimen/layout_dp_24" android:text="@string/bbps_biller_reference_id" android:textColor="@color/bbps_text_tertiary" @@ -134,7 +134,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingHorizontal="@dimen/layout_dp_24" android:text="@{receiptDetailsEntity.billerReferenceId}" android:textColor="@color/bbps_text_primary" @@ -145,7 +145,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingHorizontal="@dimen/layout_dp_24" android:text="@string/bbps_transaction_id" android:textColor="@color/bbps_text_tertiary" @@ -156,7 +156,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingHorizontal="@dimen/layout_dp_24" android:text="@{receiptDetailsEntity.paymentTransactionId}" android:textColor="@color/bbps_text_primary" @@ -167,7 +167,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingHorizontal="@dimen/layout_dp_24" android:text="@string/bbps_payment_mode" android:textColor="@color/bbps_text_tertiary" @@ -178,7 +178,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingHorizontal="@dimen/layout_dp_24" android:text="@{receiptDetailsEntity.paymentMode}" android:textColor="@color/bbps_text_primary" diff --git a/android/navi-bbps/src/main/res/layout/layout_share_transaction_details_new.xml b/android/navi-bbps/src/main/res/layout/layout_share_transaction_details_new.xml index c49c36dd30..2af6cb1237 100644 --- a/android/navi-bbps/src/main/res/layout/layout_share_transaction_details_new.xml +++ b/android/navi-bbps/src/main/res/layout/layout_share_transaction_details_new.xml @@ -22,7 +22,7 @@ android:id="@+id/paid_securely_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:layout_marginBottom="@dimen/dp_8" android:gravity="center" android:text="@string/np_paid_securely_on" @@ -77,7 +77,7 @@ android:id="@+id/text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:letterSpacing="0.1" android:gravity="center" android:textColor="#FFFFFF" @@ -111,7 +111,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@{receiptDetailsEntity.shareReceiptUiProperties.transactionStatusText}" android:textColor="@color/bbps_text_tertiary" android:textSize="14sp" @@ -147,7 +147,7 @@ android:id="@+id/amount_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="40sp" tools:text="$1234"/> @@ -196,7 +196,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@{receiptDetailsEntity.formattedDateTime}" android:textColor="@color/bbps_text_tertiary" android:textSize="14sp" diff --git a/android/navi-chat/src/main/java/com/navi/chat/db/utils/ChatUtils.kt b/android/navi-chat/src/main/java/com/navi/chat/db/utils/ChatUtils.kt index c8c0e89a72..7437d03601 100644 --- a/android/navi-chat/src/main/java/com/navi/chat/db/utils/ChatUtils.kt +++ b/android/navi-chat/src/main/java/com/navi/chat/db/utils/ChatUtils.kt @@ -14,8 +14,6 @@ import android.database.Cursor import android.net.Uri import android.provider.OpenableColumns import android.webkit.MimeTypeMap -import androidx.compose.runtime.getValue -import androidx.compose.runtime.setValue import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.SpanStyle @@ -27,9 +25,9 @@ import com.navi.chat.utils.TIME_FORMAT_TO_DISPLAY import com.navi.chat.utils.USER_SENDER_TYPE import com.navi.chat.utils.maxFileSizeInKb import com.navi.common.utils.log +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.textview.model.TextWithStyle -import com.navi.design.theme.getFontFamily -import com.navi.design.theme.getFontWeight import com.navi.naviwidgets.models.NaviChatWidget import com.navi.naviwidgets.models.response.* import com.navi.uitron.utils.hexToComposeColor @@ -257,7 +255,7 @@ fun spannableString(textWithStyle: TextWithStyle): AnnotatedString? { addStyle( style = SpanStyle( - fontFamily = getFontFamily(styleData.fontName), + fontFamily = naviFontFamily, fontWeight = getFontWeight(styleData.fontWeight), fontSize = styleData.fontSize?.sp ?: 14.sp, color = styleData.spanColor?.hexToComposeColor ?: Color.Black, diff --git a/android/navi-chat/src/main/java/com/navi/chat/ui/activities/SupportScreenActivity.kt b/android/navi-chat/src/main/java/com/navi/chat/ui/activities/SupportScreenActivity.kt index 00c8635233..e25e8273e4 100644 --- a/android/navi-chat/src/main/java/com/navi/chat/ui/activities/SupportScreenActivity.kt +++ b/android/navi-chat/src/main/java/com/navi/chat/ui/activities/SupportScreenActivity.kt @@ -499,7 +499,7 @@ class SupportScreenActivity : setTextColor( ContextCompat.getColor(this@SupportScreenActivity, DesignR.color.white) ) - setFontStyle(FontWeightEnum.TT_MEDIUM) + setFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) background = getNaviDrawable( radii = @@ -528,7 +528,7 @@ class SupportScreenActivity : DesignR.color.textSecondaryColor ) ) - setFontStyle(FontWeightEnum.TT_REGULAR) + setFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) background = getNaviDrawable( radii = diff --git a/android/navi-chat/src/main/java/com/navi/chat/ui/adapters/SupportScreenFaqAdapter.kt b/android/navi-chat/src/main/java/com/navi/chat/ui/adapters/SupportScreenFaqAdapter.kt index 682e62b361..22e52b2ba0 100644 --- a/android/navi-chat/src/main/java/com/navi/chat/ui/adapters/SupportScreenFaqAdapter.kt +++ b/android/navi-chat/src/main/java/com/navi/chat/ui/adapters/SupportScreenFaqAdapter.kt @@ -197,7 +197,7 @@ class SupportScreenFaqAdapter( } binding.apply { - question.setFontStyle(FontWeightEnum.TT_MEDIUM) + question.setFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) setFaqArrowIcon(position, arrowDown) question.setSpannableString(faqData?.question) question.isVisible = true @@ -206,7 +206,7 @@ class SupportScreenFaqAdapter( } if (isExpanded(position)) { - binding.description.setFontStyle(FontWeightEnum.TT_REGULAR) + binding.description.setFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) binding.description.setSpannableString(faqData?.answer) binding.cta.showWhenDataIsAvailable(faqData?.ctaInfo?.title) binding.cta.setOnClickListener { diff --git a/android/navi-chat/src/main/java/com/navi/chat/ui/compose/AttachmentPickerScreen.kt b/android/navi-chat/src/main/java/com/navi/chat/ui/compose/AttachmentPickerScreen.kt index a561bcae46..bc4b2c4743 100644 --- a/android/navi-chat/src/main/java/com/navi/chat/ui/compose/AttachmentPickerScreen.kt +++ b/android/navi-chat/src/main/java/com/navi/chat/ui/compose/AttachmentPickerScreen.kt @@ -99,8 +99,7 @@ import com.navi.chat.utils.NaviChatAnalytics.Companion.CANCEL_MEDIA_ATTACHMENT import com.navi.chat.utils.NaviChatAnalytics.Companion.CHAT_ATTACHMENT_ADDS_ATTACHMENT import com.navi.chat.utils.maxAudioFileLimit import com.navi.chat.utils.maxFileLimit -import com.navi.design.theme.composeFontFamily -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.naviFontFamily import com.navi.uitron.utils.toPx import kotlinx.coroutines.launch @@ -343,7 +342,7 @@ fun GalleryItem( text = fileName, fontSize = 12.sp, lineHeight = 18.sp, - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, color = Color.Black, modifier = Modifier.padding(horizontal = 10.dp), textAlign = TextAlign.Center, @@ -461,7 +460,7 @@ fun AudioItem(fileUri: Uri, onRemoveClick: () -> Unit, onPlayClick: (fileUri: Ur fontSize = 16.sp, lineHeight = 24.sp, fontFamily = - FontFamily(Font(com.navi.design.R.font.tt_regular)), + FontFamily(Font(com.navi.design.R.font.navi_body_regular)), fontWeight = FontWeight(400), color = Color(0xFF000000) ), @@ -477,7 +476,7 @@ fun AudioItem(fileUri: Uri, onRemoveClick: () -> Unit, onPlayClick: (fileUri: Ur fontSize = 16.sp, lineHeight = 24.sp, fontFamily = - FontFamily(Font(com.navi.design.R.font.tt_regular)), + FontFamily(Font(com.navi.design.R.font.navi_body_regular)), fontWeight = FontWeight(400), color = Color(0xFF6B6B6B) ), @@ -561,7 +560,7 @@ fun AddMedia( text = stringResource(id = R.string.add_media), fontSize = 16.sp, lineHeight = 24.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight(600), color = NaviChatColor.textSecondary, ) @@ -612,7 +611,7 @@ fun AddAudio( text = stringResource(id = R.string.add_audio), fontSize = 16.sp, lineHeight = 24.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight(600), color = NaviChatColor.textSecondary, ) @@ -662,7 +661,7 @@ fun AddDocument( text = stringResource(id = R.string.add_attachment), fontSize = 16.sp, lineHeight = 24.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight(600), color = NaviChatColor.textSecondary, textAlign = TextAlign.Center diff --git a/android/navi-chat/src/main/java/com/navi/chat/ui/compose/NaviChatCommonViews.kt b/android/navi-chat/src/main/java/com/navi/chat/ui/compose/NaviChatCommonViews.kt index 3eabe4b7cc..ec71d81c12 100644 --- a/android/navi-chat/src/main/java/com/navi/chat/ui/compose/NaviChatCommonViews.kt +++ b/android/navi-chat/src/main/java/com/navi/chat/ui/compose/NaviChatCommonViews.kt @@ -50,8 +50,8 @@ import com.navi.chat.utils.PROGRESS_LOADER_PURPLE_LOTTIE import com.navi.common.utils.ClickDebounce import com.navi.common.utils.get import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily @Composable fun NaviChatHeader( @@ -66,8 +66,8 @@ fun NaviChatHeader( Text( text = title, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), textAlign = TextAlign.Center, modifier = Modifier.fillMaxWidth().padding(end = 60.dp) ) @@ -146,7 +146,7 @@ fun ThemeRoundedButton( Text( text = text, fontSize = fontSize, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviChatColor.textWhite, letterSpacing = 0.sp @@ -175,7 +175,7 @@ fun SecondaryRoundedButton( Text( text = text, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = NaviChatColor.ctaPrimary, letterSpacing = 0.sp diff --git a/android/navi-chat/src/main/java/com/navi/chat/ui/compose/TicketCommonViews.kt b/android/navi-chat/src/main/java/com/navi/chat/ui/compose/TicketCommonViews.kt index 52d697924f..a46336c9b6 100644 --- a/android/navi-chat/src/main/java/com/navi/chat/ui/compose/TicketCommonViews.kt +++ b/android/navi-chat/src/main/java/com/navi/chat/ui/compose/TicketCommonViews.kt @@ -53,9 +53,9 @@ import com.navi.chat.models.response.TicketDetail import com.navi.chat.ui.theme.NaviChatColor import com.navi.chat.utils.shimmerEffect import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.textview.model.TextWithStyle -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily import com.navi.design.utils.parseColorSafe @Composable @@ -306,8 +306,8 @@ fun PaginationErrorComponent() { text = stringResource(id = R.string.pagination_error), modifier = Modifier.padding(8.dp, 0.dp, 0.dp, 0.dp), color = NaviChatColor.textSecondary, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 12.sp ) } @@ -395,8 +395,8 @@ fun TicketErrorScreen( text = title, textAlign = TextAlign.Center, color = NaviChatColor.blackText, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_MEDIUM), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = 16.sp ) Spacer(modifier = Modifier.height(8.dp)) @@ -404,8 +404,8 @@ fun TicketErrorScreen( text = subtitle, textAlign = TextAlign.Center, color = NaviChatColor.tertiaryText, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 14.sp ) } diff --git a/android/navi-chat/src/main/java/com/navi/chat/ui/compose/TicketScreen.kt b/android/navi-chat/src/main/java/com/navi/chat/ui/compose/TicketScreen.kt index dc14ed755a..f0c85ccbb8 100644 --- a/android/navi-chat/src/main/java/com/navi/chat/ui/compose/TicketScreen.kt +++ b/android/navi-chat/src/main/java/com/navi/chat/ui/compose/TicketScreen.kt @@ -54,9 +54,9 @@ import com.navi.chat.ui.theme.NaviChatColor import com.navi.chat.viewmodels.TicketListViewModel import com.navi.chat.viewmodels.TicketScreenState import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.textview.model.TextWithStyle -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily import kotlinx.coroutines.launch @Composable @@ -247,8 +247,8 @@ fun NoTicketView(ticketScreenPageData: TicketScreenPageData, onBackPress: () -> start.linkTo(parent.start, margin = 16.dp) end.linkTo(parent.end, margin = 16.dp) }, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), - fontFamily = ttComposeFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), + fontFamily = naviFontFamily, color = NaviChatColor.noTicketColor ) } diff --git a/android/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatFragment.kt b/android/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatFragment.kt index 3b1697fb59..da3aa0c5dc 100644 --- a/android/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatFragment.kt +++ b/android/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatFragment.kt @@ -793,7 +793,7 @@ class NaviChatFragment : BaseFragment(), WidgetCallback, MessageOperation, Toolb NaviSpan( startSpan = DISCONNECTED_TEXT_START_SPAN, endSpan = DISCONNECTED_TITLE_TEXT.length, - fontName = FontWeightEnum.TT_SEMI_BOLD.name, + fontName = FontWeightEnum.NAVI_BODY_DEMI_BOLD.name, fontSize = DISCONNECTED_TITLE_FONT_SIZE, spanColor = DISCONNECTED_TITLE_COLOR ) @@ -813,7 +813,7 @@ class NaviChatFragment : BaseFragment(), WidgetCallback, MessageOperation, Toolb NaviSpan( startSpan = DISCONNECTED_TEXT_START_SPAN, endSpan = DISCONNECTED_SUBTITLE_END_SPAN, - fontName = FontWeightEnum.TT_MEDIUM.name, + fontName = FontWeightEnum.NAVI_HEADLINE_REGULAR.name, fontSize = DISCONNECTED_SUBTITLE_FONT_SIZE, spanColor = DISCONNECTED_SUBTITLE_COLOR ) @@ -837,7 +837,7 @@ class NaviChatFragment : BaseFragment(), WidgetCallback, MessageOperation, Toolb NaviSpan( startSpan = CONNECTED_TEXT_START_SPAN, endSpan = CONNECTED_TITLE_TEXT.length, - fontName = FontWeightEnum.TT_SEMI_BOLD.name, + fontName = FontWeightEnum.NAVI_BODY_DEMI_BOLD.name, fontSize = CONNECTED_TITLE_FONT_SIZE, spanColor = CONNECTED_TITLE_COLOR ) @@ -851,7 +851,7 @@ class NaviChatFragment : BaseFragment(), WidgetCallback, MessageOperation, Toolb NaviSpan( startSpan = CONNECTED_TEXT_START_SPAN, endSpan = CONNECTED_SUBTITLE_END_SPAN, - fontName = FontWeightEnum.TT_MEDIUM.name, + fontName = FontWeightEnum.NAVI_HEADLINE_REGULAR.name, fontSize = CONNECTED_SUBTITLE_FONT_SIZE, spanColor = CONNECTED_SUBTITLE_COLOR ) 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 26475eef0d..cec397a3e9 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 @@ -113,7 +113,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_16" android:textSize="@dimen/sp_12" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintBottom_toBottomOf="@id/videoSeekbar" app:layout_constraintEnd_toStartOf="@id/videoSeekbar" app:layout_constraintStart_toStartOf="parent" @@ -140,7 +140,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="@dimen/sp_12" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintBottom_toBottomOf="@id/videoSeekbar" app:layout_constraintEnd_toStartOf="@id/fullScreen" app:layout_constraintStart_toEndOf="@id/videoSeekbar" 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 7d1370ac02..0b5725b4ae 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 @@ -89,7 +89,7 @@ android:drawableStart="@drawable/ic_search_grey" android:drawablePadding="@dimen/dp_8" android:focusableInTouchMode="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_vertical" android:hint="@string/search" android:paddingHorizontal="@dimen/layout_dp_16" @@ -147,7 +147,7 @@ @@ -135,7 +135,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" android:background="@drawable/bg_rounded_white_blue_border_4" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:paddingHorizontal="@dimen/dp_18" android:paddingVertical="@dimen/dp_8" diff --git a/android/navi-chat/src/main/res/layout/faq_recent_searches_view.xml b/android/navi-chat/src/main/res/layout/faq_recent_searches_view.xml index 7741cb2659..10cb81638c 100644 --- a/android/navi-chat/src/main/res/layout/faq_recent_searches_view.xml +++ b/android/navi-chat/src/main/res/layout/faq_recent_searches_view.xml @@ -26,7 +26,7 @@ android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_16" android:layout_marginBottom="@dimen/dp_12" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/grey_charcoal" android:textSize="@dimen/sp_16" app:layout_constraintBottom_toBottomOf="@id/rvCsatOptions" diff --git a/android/navi-chat/src/main/res/layout/faq_search_empty_view.xml b/android/navi-chat/src/main/res/layout/faq_search_empty_view.xml index 6a8a16616b..45e8032fb7 100644 --- a/android/navi-chat/src/main/res/layout/faq_search_empty_view.xml +++ b/android/navi-chat/src/main/res/layout/faq_search_empty_view.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/layout_dp_24" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:textColor="@color/dark_gray" android:text="@string/oops" android:textSize="@dimen/sp_16" /> @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/layout_dp_4" android:textColor="@color/titleTertiaryColor" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/we_haven_t_covered_this_in_our_faqs" android:textSize="@dimen/sp_14" /> @@ -48,10 +48,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/layout_dp_24" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/reach_out_to_our_support_team" android:textSize="@dimen/sp_12" - app:fontFamily="@font/tt_regular" /> + app:fontFamily="@font/navi_body_regular" /> diff --git a/android/navi-chat/src/main/res/layout/faq_search_error_view.xml b/android/navi-chat/src/main/res/layout/faq_search_error_view.xml index 0672c53901..d47edee3d4 100644 --- a/android/navi-chat/src/main/res/layout/faq_search_error_view.xml +++ b/android/navi-chat/src/main/res/layout/faq_search_error_view.xml @@ -30,17 +30,17 @@ android:layout_height="wrap_content" android:textColor="@color/dark_gray" android:layout_marginTop="@dimen/layout_dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/error_screen_title" android:textSize="@dimen/sp_16" - app:fontFamily="@font/tt_semi_bold" /> + app:fontFamily="@font/navi_body_demi_bold" /> diff --git a/android/navi-chat/src/main/res/layout/faq_search_footer_section.xml b/android/navi-chat/src/main/res/layout/faq_search_footer_section.xml index b340172f7a..050b962e0e 100644 --- a/android/navi-chat/src/main/res/layout/faq_search_footer_section.xml +++ b/android/navi-chat/src/main/res/layout/faq_search_footer_section.xml @@ -29,7 +29,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="@string/unable_to_find_what_you_are_looking_for" android:textColor="@color/charcol_gray" @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_5" android:layout_marginBottom="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:text="@string/chat_with_us" android:textColor="@color/ctaTitleDark" diff --git a/android/navi-chat/src/main/res/layout/fragment_common_navi_chat.xml b/android/navi-chat/src/main/res/layout/fragment_common_navi_chat.xml index 81eb06a1b0..d7b8eda7a3 100644 --- a/android/navi-chat/src/main/res/layout/fragment_common_navi_chat.xml +++ b/android/navi-chat/src/main/res/layout/fragment_common_navi_chat.xml @@ -157,7 +157,7 @@ android:layout_height="wrap_content" android:background="@null" android:cursorVisible="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_vertical" android:inputType="textMultiLine" android:maxLines="@integer/integer_3" diff --git a/android/navi-chat/src/main/res/layout/fragment_faq_search.xml b/android/navi-chat/src/main/res/layout/fragment_faq_search.xml index de2a6973bc..7958973380 100644 --- a/android/navi-chat/src/main/res/layout/fragment_faq_search.xml +++ b/android/navi-chat/src/main/res/layout/fragment_faq_search.xml @@ -75,7 +75,7 @@ android:layout_toStartOf="@id/close_iv" android:layout_toEndOf="@id/search_iv" android:background="@null" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:inputType="text" /> diff --git a/android/navi-chat/src/main/res/layout/item_chat_attachment.xml b/android/navi-chat/src/main/res/layout/item_chat_attachment.xml index 9aba59e4ab..bc62b87fac 100644 --- a/android/navi-chat/src/main/res/layout/item_chat_attachment.xml +++ b/android/navi-chat/src/main/res/layout/item_chat_attachment.xml @@ -40,7 +40,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="@dimen/layout_dp_24" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingVertical="@dimen/dp_4" android:textColor="@color/grey_charcoal" android:textSize="@dimen/layout_sp_14" diff --git a/android/navi-chat/src/main/res/layout/item_chat_exit_bottomsheet.xml b/android/navi-chat/src/main/res/layout/item_chat_exit_bottomsheet.xml index f1dd732e96..67c5a35d54 100644 --- a/android/navi-chat/src/main/res/layout/item_chat_exit_bottomsheet.xml +++ b/android/navi-chat/src/main/res/layout/item_chat_exit_bottomsheet.xml @@ -42,7 +42,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="@dimen/layout_dp_12" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/black" android:textSize="@dimen/layout_sp_16" app:layout_constraintBottom_toBottomOf="parent" 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 7d627de252..9207441a8c 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 @@ -41,7 +41,7 @@ + android:fontFamily="@font/navi_headline_regular" /> + android:fontFamily="@font/navi_body_regular" /> \ No newline at end of file diff --git a/android/navi-chat/src/main/res/layout/recent_search_option_layout.xml b/android/navi-chat/src/main/res/layout/recent_search_option_layout.xml index a13df35c9e..df19110f59 100644 --- a/android/navi-chat/src/main/res/layout/recent_search_option_layout.xml +++ b/android/navi-chat/src/main/res/layout/recent_search_option_layout.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/dp_16" android:background="@drawable/bg_rounded_rectangle_grey_border_4dp_radius" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingHorizontal="@dimen/dp_12" android:paddingVertical="@dimen/dp_8" android:textSize="@dimen/sp_14" diff --git a/android/navi-chat/src/main/res/layout/spinner_dropdown_item_view.xml b/android/navi-chat/src/main/res/layout/spinner_dropdown_item_view.xml index fc804cb3de..b1ed92db70 100644 --- a/android/navi-chat/src/main/res/layout/spinner_dropdown_item_view.xml +++ b/android/navi-chat/src/main/res/layout/spinner_dropdown_item_view.xml @@ -13,7 +13,7 @@ android:id="@+id/itemText" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingHorizontal="@dimen/dp_13" android:paddingTop="@dimen/layout_dp_16" android:paddingBottom="@dimen/dp_12" diff --git a/android/navi-chat/src/main/res/layout/spinner_item_view.xml b/android/navi-chat/src/main/res/layout/spinner_item_view.xml index ef15a556cf..7912ce4b52 100644 --- a/android/navi-chat/src/main/res/layout/spinner_item_view.xml +++ b/android/navi-chat/src/main/res/layout/spinner_item_view.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@color/strokeTertiaryColor" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingVertical="@dimen/dp_4" android:gravity="center" android:text="Item1" diff --git a/android/navi-chat/src/main/res/values/styles.xml b/android/navi-chat/src/main/res/values/styles.xml index 6931c01238..ae72eb9c70 100644 --- a/android/navi-chat/src/main/res/values/styles.xml +++ b/android/navi-chat/src/main/res/values/styles.xml @@ -10,30 +10,30 @@ @@ -74,7 +74,7 @@ @android:color/transparent @color/red @dimen/font_small - @font/tt_medium + @font/navi_headline_regular @@ -230,13 +230,13 @@ @@ -244,20 +244,20 @@ @@ -289,13 +289,13 @@ @@ -305,7 +305,7 @@ @@ -320,42 +320,42 @@ diff --git a/android/navi-cycs/src/main/kotlin/com/navi/cycs/common/ui/CycsButtons.kt b/android/navi-cycs/src/main/kotlin/com/navi/cycs/common/ui/CycsButtons.kt index 225550152f..3afdbedc92 100644 --- a/android/navi-cycs/src/main/kotlin/com/navi/cycs/common/ui/CycsButtons.kt +++ b/android/navi-cycs/src/main/kotlin/com/navi/cycs/common/ui/CycsButtons.kt @@ -21,8 +21,8 @@ import com.navi.common.utils.ClickDebounce import com.navi.common.utils.get import com.navi.cycs.theme.CycsColor import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText @Composable @@ -45,8 +45,8 @@ fun PrimaryRoundedButton( text = text, color = Color.White, fontSize = 14.sp, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), - fontFamily = ttComposeFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), + fontFamily = naviFontFamily, lineHeight = 22.sp ) } @@ -68,8 +68,8 @@ fun SecondaryRoundedButton(modifier: Modifier, text: String, onClick: () -> Unit text = text, color = CycsColor.ctaPrimary, fontSize = 14.sp, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), - fontFamily = ttComposeFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), + fontFamily = naviFontFamily, lineHeight = 22.sp ) } diff --git a/android/navi-cycs/src/main/kotlin/com/navi/cycs/common/ui/CycsCommonComposable.kt b/android/navi-cycs/src/main/kotlin/com/navi/cycs/common/ui/CycsCommonComposable.kt index 5d4f9e82b3..abd33af51d 100644 --- a/android/navi-cycs/src/main/kotlin/com/navi/cycs/common/ui/CycsCommonComposable.kt +++ b/android/navi-cycs/src/main/kotlin/com/navi/cycs/common/ui/CycsCommonComposable.kt @@ -47,8 +47,8 @@ import com.navi.cycs.sharedelements.FadeMode import com.navi.cycs.sharedelements.MaterialContainerTransformSpec import com.navi.cycs.theme.CycsColor import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.utils.shimmerEffect import com.navi.naviwidgets.extensions.NaviText @@ -81,8 +81,8 @@ fun BottomSheetContentWithIconHeaderPrimarySecondaryButton( text = header, color = CycsColor.textPrimary, fontSize = 16.sp, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), - fontFamily = ttComposeFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), + fontFamily = naviFontFamily, lineHeight = 24.sp ) @@ -92,8 +92,8 @@ fun BottomSheetContentWithIconHeaderPrimarySecondaryButton( text = description, color = descriptionColor ?: CycsColor.textSecondary, fontSize = 14.sp, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), - fontFamily = ttComposeFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), + fontFamily = naviFontFamily, lineHeight = 22.sp ) diff --git a/android/navi-cycs/src/main/kotlin/com/navi/cycs/common/ui/CycsFullScreenErrorComposeView.kt b/android/navi-cycs/src/main/kotlin/com/navi/cycs/common/ui/CycsFullScreenErrorComposeView.kt index c24a6e5d88..7bee8508bd 100644 --- a/android/navi-cycs/src/main/kotlin/com/navi/cycs/common/ui/CycsFullScreenErrorComposeView.kt +++ b/android/navi-cycs/src/main/kotlin/com/navi/cycs/common/ui/CycsFullScreenErrorComposeView.kt @@ -36,8 +36,8 @@ import com.navi.common.network.models.GenericErrorResponse import com.navi.cycs.CycsAnalytics import com.navi.cycs.R import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText @Composable @@ -62,18 +62,18 @@ fun CycsFullScreenErrorComposeView( modifier = Modifier.wrapContentSize().padding(horizontal = 16.dp), text = error?.title ?: "Something went wrong", fontSize = 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, color = Color(0xFF191919), - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD) + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) ) Spacer(modifier = Modifier.height(8.dp)) NaviText( modifier = Modifier.wrapContentSize().padding(horizontal = 16.dp), text = "Please check your internet connection", fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, color = Color(0xFF6B6B6B), - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR) + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) Spacer(modifier = Modifier.height(32.dp)) Box( @@ -92,8 +92,8 @@ fun CycsFullScreenErrorComposeView( modifier = Modifier.fillMaxSize().wrapContentSize(), text = "Try again", fontSize = 14.sp, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), color = Color.White, textAlign = TextAlign.Center ) diff --git a/android/navi-cycs/src/main/kotlin/com/navi/cycs/feature/landing/Loader.kt b/android/navi-cycs/src/main/kotlin/com/navi/cycs/feature/landing/Loader.kt index bfaf012314..1e76da7d60 100644 --- a/android/navi-cycs/src/main/kotlin/com/navi/cycs/feature/landing/Loader.kt +++ b/android/navi-cycs/src/main/kotlin/com/navi/cycs/feature/landing/Loader.kt @@ -45,8 +45,8 @@ import com.navi.cycs.common.ui.FadeOutTransitionSpec import com.navi.cycs.sharedelements.SharedMaterialContainer import com.navi.cycs.theme.CycsColor import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.naviwidgets.extensions.NaviText @Composable @@ -79,7 +79,7 @@ fun Loader( text = stringResource(id = R.string.cycs_cibil_score), color = CycsColor.textPrimary, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), maxLines = 1, overflow = TextOverflow.Ellipsis, diff --git a/android/navi-cycs/src/main/kotlin/com/navi/cycs/feature/score/ScoreScreenHelper.kt b/android/navi-cycs/src/main/kotlin/com/navi/cycs/feature/score/ScoreScreenHelper.kt index a749efcf10..7a3038c11b 100644 --- a/android/navi-cycs/src/main/kotlin/com/navi/cycs/feature/score/ScoreScreenHelper.kt +++ b/android/navi-cycs/src/main/kotlin/com/navi/cycs/feature/score/ScoreScreenHelper.kt @@ -33,9 +33,9 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.navi.cycs.CycsConstants.AnimationLabels.ROLODEX_ANIMATION import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.theme.FF191919 -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily import kotlinx.coroutines.delay fun calculateProgressAfterAnimation(serverProgress: Int): Float { @@ -100,8 +100,8 @@ fun Rolodex( Text( modifier = modifier, text = target.toString(), - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), fontSize = 26.sp, color = FF191919 ) diff --git a/android/navi-cycs/src/main/kotlin/com/navi/cycs/feature/trend/CycsTrendLineChartRenderer.kt b/android/navi-cycs/src/main/kotlin/com/navi/cycs/feature/trend/CycsTrendLineChartRenderer.kt index b91eb5a462..110c1a68b3 100644 --- a/android/navi-cycs/src/main/kotlin/com/navi/cycs/feature/trend/CycsTrendLineChartRenderer.kt +++ b/android/navi-cycs/src/main/kotlin/com/navi/cycs/feature/trend/CycsTrendLineChartRenderer.kt @@ -35,8 +35,8 @@ import com.navi.cycs.common.model.PlottableScorePointEntity import com.navi.cycs.common.model.WidgetModelDefinition import com.navi.cycs.common.model.response.CreditScoreTrendData import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.uitron.model.UiTronResponse import org.joda.time.DateTime import org.joda.time.format.DateTimeFormat @@ -90,8 +90,8 @@ fun LineChart(widget: WidgetModelDefinition, modifier: Modifier TextStyle( fontSize = 12.dp.toSp(), color = Color(0xFF6B6B6B), - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), lineHeight = 14.sp ), topLeft = Offset(x, size.height - 14.dp.toPx()) @@ -109,8 +109,8 @@ fun LineChart(widget: WidgetModelDefinition, modifier: Modifier TextStyle( fontSize = 12.dp.toSp(), color = Color(0xFF6B6B6B), - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), lineHeight = 14.sp ), topLeft = Offset(16.dp.toPx(), y) @@ -230,8 +230,8 @@ fun LineChart(widget: WidgetModelDefinition, modifier: Modifier TextStyle( fontSize = 12.dp.toSp(), color = Color(0xFF6B6B6B), - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), lineHeight = 18.sp ), topLeft = labelTextTopLeftPoint @@ -295,8 +295,8 @@ fun LineChart(widget: WidgetModelDefinition, modifier: Modifier TextStyle( fontSize = 12.dp.toSp(), color = Color(0xFFFFFFFF), - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), lineHeight = 18.sp ), topLeft = labelTextTopLeftPoint diff --git a/android/navi-design/src/main/java/com/navi/design/calendar/view/NaviCalendarItemView.kt b/android/navi-design/src/main/java/com/navi/design/calendar/view/NaviCalendarItemView.kt index 5acdff501c..9de82eb014 100644 --- a/android/navi-design/src/main/java/com/navi/design/calendar/view/NaviCalendarItemView.kt +++ b/android/navi-design/src/main/java/com/navi/design/calendar/view/NaviCalendarItemView.kt @@ -19,7 +19,7 @@ import com.navi.design.calendar.model.DateTransformData import com.navi.design.calendar.model.WeekDayData import com.navi.design.databinding.NaviCalendarItemViewBinding import com.navi.design.font.FontWeightEnum -import com.navi.design.utils.getFontStyle +import com.navi.design.font.getFontStyle import java.util.* class NaviCalendarItemView @@ -93,7 +93,8 @@ constructor( private fun highlightSelection() { binding.dateTv.apply { setTextColor(ResourcesCompat.getColor(resources, R.color.black, null)) - typeface = ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.TT_MEDIUM.name)) + typeface = + ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR)) background = ResourcesCompat.getDrawable(resources, R.drawable.circular_light_green_16dp, null) } @@ -113,7 +114,10 @@ constructor( ?: kotlin.run { setTextColor(ResourcesCompat.getColor(resources, R.color.white, null)) typeface = - ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.TT_MEDIUM)) + ResourcesCompat.getFont( + context, + getFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) + ) background = ResourcesCompat.getDrawable( resources, @@ -127,7 +131,8 @@ constructor( private fun setUnselected() { binding.dateTv.apply { background = null - typeface = ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.TT_REGULAR)) + typeface = + ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR)) setTextColor(ResourcesCompat.getColor(resources, R.color.descriptionColor9, null)) } } @@ -137,7 +142,8 @@ constructor( background = null alpha = 0.3F setTextColor(ResourcesCompat.getColor(resources, R.color.descriptionColor9, null)) - typeface = ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.TT_REGULAR)) + typeface = + ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR)) } } } diff --git a/android/navi-design/src/main/java/com/navi/design/common/TextViewBindingAdapter.kt b/android/navi-design/src/main/java/com/navi/design/common/TextViewBindingAdapter.kt index 29b264f7f1..b2a7d28800 100644 --- a/android/navi-design/src/main/java/com/navi/design/common/TextViewBindingAdapter.kt +++ b/android/navi-design/src/main/java/com/navi/design/common/TextViewBindingAdapter.kt @@ -11,6 +11,7 @@ import android.os.Build import android.widget.TextView import androidx.core.content.res.ResourcesCompat import androidx.databinding.BindingAdapter +import com.navi.design.font.getFont import com.navi.design.theme.* import com.navi.design.utils.spToPx @@ -89,8 +90,7 @@ fun TextView.setStyleDetails(textStyle: TextStyle) { // Retrieve values from typography and set on text view apply { textSize = typography.fontSize.value - typeface = - ResourcesCompat.getFont(context, typography.fontWeight.getFont(typography.fontFamily)) + typeface = ResourcesCompat.getFont(context, typography.fontWeight.getFont()) letterSpacing = context.spToPx(typography.letterSpacing.value) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { diff --git a/android/navi-design/src/main/java/com/navi/design/editview/NaviEditText.kt b/android/navi-design/src/main/java/com/navi/design/editview/NaviEditText.kt index d844b917f3..9bdd0573c5 100644 --- a/android/navi-design/src/main/java/com/navi/design/editview/NaviEditText.kt +++ b/android/navi-design/src/main/java/com/navi/design/editview/NaviEditText.kt @@ -18,6 +18,7 @@ import androidx.appcompat.widget.AppCompatEditText import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import com.navi.design.R +import com.navi.design.font.getFontStyle import com.navi.design.utils.* class NaviEditText(context: Context, attrs: AttributeSet) : AppCompatEditText(context, attrs) { diff --git a/android/navi-design/src/main/java/com/navi/design/font/FontUtil.kt b/android/navi-design/src/main/java/com/navi/design/font/FontUtil.kt new file mode 100644 index 0000000000..c7d4f8903a --- /dev/null +++ b/android/navi-design/src/main/java/com/navi/design/font/FontUtil.kt @@ -0,0 +1,120 @@ +/* + * + * * Copyright © 2022-2024 by Navi Technologies Limited + * * All rights reserved. Strictly confidential + * + */ + +package com.navi.design.font + +import androidx.compose.ui.text.font.Font +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import com.navi.design.R + +fun getFontStyle(fontWeight: FontWeightEnum?): Int = getFontStyle(fontWeight?.name) + +fun getFontStyle(fontWeightName: String?): Int = + when (fontWeightName) { + /** Navi Headline - Regular (400) */ + FontWeightEnum.NAVI_HEADLINE_REGULAR.name, + FontWeightEnum.TT_MEDIUM.name, + FontWeightEnum.ROBOTO_MEDIUM.name, + FontWeightEnum.BOLD.name, + FontWeightEnum.NAVI_BOLD.name -> R.font.navi_headline_regular + + /** Navi Headline - Bold (700) */ + FontWeightEnum.NAVI_HEADLINE_BOLD.name, + FontWeightEnum.TT_BOLD.name -> R.font.navi_headline_bold + + /** Navi Body - Regular (400) */ + FontWeightEnum.NAVI_BODY_REGULAR.name, + FontWeightEnum.TT_REGULAR.name, + FontWeightEnum.ROBOTO_REGULAR.name, + FontWeightEnum.REGULAR.name, + FontWeightEnum.SEMI_BOLD.name, + FontWeightEnum.NAVI_REGULAR.name, + FontWeightEnum.NAVI_SEMI_BOLD.name -> R.font.navi_body_regular + + /** Navi Body - Demi Bold (600) */ + FontWeightEnum.NAVI_BODY_DEMI_BOLD.name, + FontWeightEnum.TT_SEMI_BOLD.name, + FontWeightEnum.ROBOTO_BOLD.name, + FontWeightEnum.EXTRA_BOLD.name, + FontWeightEnum.NAVI_EXTRA_BOLD.name, + FontWeightEnum.NAVI_BLACK.name -> R.font.navi_body_demi_bold + + /** Fallback */ + else -> R.font.navi_body_regular + } + +val naviFontFamily: FontFamily = + FontFamily( + /** Navi Headline - Regular (400) */ + Font(getFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR), FontWeight.Medium), + + /** Navi Headline - Bold (700) */ + Font(getFontStyle(FontWeightEnum.NAVI_HEADLINE_BOLD), FontWeight.Bold), + + /** Navi Body - Regular (400) */ + Font(getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR), FontWeight.Normal), + + /** Navi Body - Demi Bold (600) */ + Font(getFontStyle(FontWeightEnum.NAVI_BODY_DEMI_BOLD), FontWeight.SemiBold), + ) + +fun getFontWeight(fontWeight: FontWeightEnum?): FontWeight = getFontWeight(fontWeight?.name) + +fun getFontWeight(fontWeightName: String?): FontWeight = + when (fontWeightName) { + /** Navi Headline - Regular (400) */ + FontWeightEnum.NAVI_HEADLINE_REGULAR.name, + FontWeightEnum.TT_MEDIUM.name, + FontWeightEnum.ROBOTO_MEDIUM.name, + FontWeightEnum.BOLD.name, + FontWeightEnum.NAVI_BOLD.name -> FontWeight.Medium + + /** Navi Headline - Bold (700) */ + FontWeightEnum.NAVI_HEADLINE_BOLD.name, + FontWeightEnum.TT_BOLD.name -> FontWeight.Bold + + /** Navi Body - Regular (400) */ + FontWeightEnum.NAVI_BODY_REGULAR.name, + FontWeightEnum.TT_REGULAR.name, + FontWeightEnum.ROBOTO_REGULAR.name, + FontWeightEnum.REGULAR.name, + FontWeightEnum.SEMI_BOLD.name, + FontWeightEnum.NAVI_REGULAR.name, + FontWeightEnum.NAVI_SEMI_BOLD.name -> FontWeight.Normal + + /** Navi Body - Demi Bold (600) */ + FontWeightEnum.NAVI_BODY_DEMI_BOLD.name, + FontWeightEnum.TT_SEMI_BOLD.name, + FontWeightEnum.ROBOTO_BOLD.name, + FontWeightEnum.EXTRA_BOLD.name, + FontWeightEnum.NAVI_EXTRA_BOLD.name, + FontWeightEnum.NAVI_BLACK.name -> FontWeight.SemiBold + + /** Fallback */ + else -> FontWeight.Normal + } + +fun FontWeight?.getFont(): Int = getFontStyle(this?.toEnum()) + +fun FontWeight?.toEnum(): FontWeightEnum = + when (this) { + /** Navi Headline - Regular (400) */ + FontWeight.Medium -> FontWeightEnum.NAVI_HEADLINE_REGULAR + + /** Navi Headline - Bold (700) */ + FontWeight.Bold -> FontWeightEnum.NAVI_HEADLINE_BOLD + + /** Navi Body - Regular (400) */ + FontWeight.Normal -> FontWeightEnum.NAVI_BODY_REGULAR + + /** Navi Body - Demi Bold (600) */ + FontWeight.SemiBold -> FontWeightEnum.NAVI_BODY_DEMI_BOLD + + /** Fallback */ + else -> FontWeightEnum.NAVI_BODY_REGULAR + } diff --git a/android/navi-design/src/main/java/com/navi/design/font/FontWeightEnum.kt b/android/navi-design/src/main/java/com/navi/design/font/FontWeightEnum.kt index eb61daf1a0..4e367a8285 100644 --- a/android/navi-design/src/main/java/com/navi/design/font/FontWeightEnum.kt +++ b/android/navi-design/src/main/java/com/navi/design/font/FontWeightEnum.kt @@ -8,61 +8,120 @@ package com.navi.design.font enum class FontWeightEnum { - /** Navi Body - Regular (400) */ - TT_REGULAR, - - /** Navi Headline - Regular (400) */ - TT_MEDIUM, - - /** Navi Body - DemiBold (600) */ - TT_SEMI_BOLD, - - /** Navi Headline - Bold (700) */ - TT_BOLD, - - /** For Navi Pay usage only * */ + /** ================================================================================= */ + /** -------------------------- Navi Headline - Regular (400) ------------------------ */ + /** ================================================================================= */ NAVI_HEADLINE_REGULAR, - NAVI_HEADLINE_BOLD, - NAVI_BODY_REGULAR, - NAVI_BODY_DEMI_BOLD, - @Deprecated("Use 'TT_REGULAR' instead.", ReplaceWith("TT_REGULAR"), DeprecationLevel.WARNING) - ROBOTO_REGULAR, - @Deprecated("Use 'TT_MEDIUM' instead.", ReplaceWith("TT_MEDIUM"), DeprecationLevel.WARNING) + @Deprecated( + message = "Use 'NAVI_HEADLINE_REGULAR' instead.", + replaceWith = ReplaceWith(expression = "NAVI_HEADLINE_REGULAR"), + level = DeprecationLevel.WARNING, + ) + TT_MEDIUM, + @Deprecated( + message = "Use 'NAVI_HEADLINE_REGULAR' instead.", + replaceWith = ReplaceWith(expression = "NAVI_HEADLINE_REGULAR"), + level = DeprecationLevel.WARNING, + ) ROBOTO_MEDIUM, @Deprecated( - "Use 'TT_SEMI_BOLD' instead.", - ReplaceWith("TT_SEMI_BOLD"), - DeprecationLevel.WARNING + message = "Use 'NAVI_HEADLINE_REGULAR' instead.", + replaceWith = ReplaceWith(expression = "NAVI_HEADLINE_REGULAR"), + level = DeprecationLevel.WARNING, ) - ROBOTO_BOLD, - @Deprecated("Use 'TT_REGULAR' instead.", ReplaceWith("TT_REGULAR"), DeprecationLevel.WARNING) - REGULAR, - @Deprecated("Use 'TT_REGULAR' instead.", ReplaceWith("TT_REGULAR"), DeprecationLevel.WARNING) - SEMI_BOLD, - @Deprecated("Use 'TT_MEDIUM' instead.", ReplaceWith("TT_MEDIUM"), DeprecationLevel.WARNING) BOLD, @Deprecated( - "Use 'TT_SEMI_BOLD' instead.", - ReplaceWith("TT_SEMI_BOLD"), - DeprecationLevel.WARNING + message = "Use 'NAVI_HEADLINE_REGULAR' instead.", + replaceWith = ReplaceWith(expression = "NAVI_HEADLINE_REGULAR"), + level = DeprecationLevel.WARNING, + ) + NAVI_BOLD, + + /** ================================================================================= */ + /** -------------------------- Navi Headline - Bold (700) --------------------------- */ + /** ================================================================================= */ + NAVI_HEADLINE_BOLD, + @Deprecated( + message = "Use 'NAVI_HEADLINE_BOLD' instead.", + replaceWith = ReplaceWith(expression = "NAVI_HEADLINE_BOLD"), + level = DeprecationLevel.WARNING, + ) + TT_BOLD, + + /** ================================================================================= */ + /** -------------------------- Navi Body - Regular (400) ---------------------------- */ + /** ================================================================================= */ + NAVI_BODY_REGULAR, + @Deprecated( + message = "Use 'NAVI_BODY_REGULAR' instead.", + replaceWith = ReplaceWith(expression = "NAVI_BODY_REGULAR"), + level = DeprecationLevel.WARNING, + ) + TT_REGULAR, + @Deprecated( + message = "Use 'NAVI_BODY_REGULAR' instead.", + replaceWith = ReplaceWith(expression = "NAVI_BODY_REGULAR"), + level = DeprecationLevel.WARNING, + ) + ROBOTO_REGULAR, + @Deprecated( + message = "Use 'NAVI_BODY_REGULAR' instead.", + replaceWith = ReplaceWith(expression = "NAVI_BODY_REGULAR"), + level = DeprecationLevel.WARNING, + ) + REGULAR, + @Deprecated( + message = "Use 'NAVI_BODY_REGULAR' instead.", + replaceWith = ReplaceWith(expression = "NAVI_BODY_REGULAR"), + level = DeprecationLevel.WARNING, + ) + SEMI_BOLD, + @Deprecated( + message = "Use 'NAVI_BODY_REGULAR' instead.", + replaceWith = ReplaceWith(expression = "NAVI_BODY_REGULAR"), + level = DeprecationLevel.WARNING, + ) + NAVI_REGULAR, + @Deprecated( + message = "Use 'NAVI_BODY_REGULAR' instead.", + replaceWith = ReplaceWith(expression = "NAVI_BODY_REGULAR"), + level = DeprecationLevel.WARNING, + ) + NAVI_SEMI_BOLD, + + /** ================================================================================= */ + /** -------------------------- Navi Body - Demi Bold (600) -------------------------- */ + /** ================================================================================= */ + NAVI_BODY_DEMI_BOLD, + @Deprecated( + message = "Use 'NAVI_BODY_DEMI_BOLD' instead.", + replaceWith = ReplaceWith(expression = "NAVI_BODY_DEMI_BOLD"), + level = DeprecationLevel.WARNING, + ) + TT_SEMI_BOLD, + @Deprecated( + message = "Use 'NAVI_BODY_DEMI_BOLD' instead.", + replaceWith = ReplaceWith(expression = "NAVI_BODY_DEMI_BOLD"), + level = DeprecationLevel.WARNING, + ) + ROBOTO_BOLD, + @Deprecated( + message = "Use 'NAVI_BODY_DEMI_BOLD' instead.", + replaceWith = ReplaceWith(expression = "NAVI_BODY_DEMI_BOLD"), + level = DeprecationLevel.WARNING, ) EXTRA_BOLD, - @Deprecated("Use 'TT_REGULAR' instead.", ReplaceWith("TT_REGULAR"), DeprecationLevel.WARNING) - NAVI_REGULAR, - @Deprecated("Use 'TT_REGULAR' instead.", ReplaceWith("TT_REGULAR"), DeprecationLevel.WARNING) - NAVI_SEMI_BOLD, - @Deprecated("Use 'TT_MEDIUM' instead.", ReplaceWith("TT_MEDIUM"), DeprecationLevel.WARNING) - NAVI_BOLD, @Deprecated( - "Use 'TT_SEMI_BOLD' instead.", - ReplaceWith("TT_SEMI_BOLD"), - DeprecationLevel.WARNING + message = "Use 'NAVI_BODY_DEMI_BOLD' instead.", + replaceWith = ReplaceWith(expression = "NAVI_BODY_DEMI_BOLD"), + level = DeprecationLevel.WARNING, ) NAVI_EXTRA_BOLD, @Deprecated( - "Use 'TT_SEMI_BOLD' instead.", - ReplaceWith("TT_SEMI_BOLD"), - DeprecationLevel.WARNING + message = "Use 'NAVI_BODY_DEMI_BOLD' instead.", + replaceWith = ReplaceWith(expression = "NAVI_BODY_DEMI_BOLD"), + level = DeprecationLevel.WARNING, ) - NAVI_BLACK + NAVI_BLACK, + } diff --git a/android/navi-design/src/main/java/com/navi/design/snackbar/NaviSnackbar.kt b/android/navi-design/src/main/java/com/navi/design/snackbar/NaviSnackbar.kt index cb63f58e76..dd6365ec15 100644 --- a/android/navi-design/src/main/java/com/navi/design/snackbar/NaviSnackbar.kt +++ b/android/navi-design/src/main/java/com/navi/design/snackbar/NaviSnackbar.kt @@ -35,13 +35,13 @@ import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.theme.EF0000 import com.navi.design.theme.FF4D4D4D import com.navi.design.theme.FFEAEA import com.navi.design.theme.FFFFFF import com.navi.design.theme.Grey4d4d4d -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily data class SnackBarConfig( @DrawableRes val leadingIconResId: Int? = null, @@ -92,7 +92,7 @@ fun NaviSnackBar( Text( color = titleColor, text = snackBarConfig.title, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), fontSize = titleSize, textAlign = TextAlign.Center @@ -101,7 +101,7 @@ fun NaviSnackBar( Text( color = descriptionColor, text = snackBarConfig.description, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), fontSize = 12.sp ) diff --git a/android/navi-design/src/main/java/com/navi/design/textview/NaviTextView.kt b/android/navi-design/src/main/java/com/navi/design/textview/NaviTextView.kt index b318ac55ac..046af575c8 100644 --- a/android/navi-design/src/main/java/com/navi/design/textview/NaviTextView.kt +++ b/android/navi-design/src/main/java/com/navi/design/textview/NaviTextView.kt @@ -18,8 +18,8 @@ import androidx.appcompat.widget.AppCompatTextView import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import com.navi.design.R +import com.navi.design.font.getFontStyle import com.navi.design.utils.dpToPxInInt -import com.navi.design.utils.getFontStyle import com.navi.design.utils.getStyle import com.navi.design.utils.setViewBackground diff --git a/android/navi-design/src/main/java/com/navi/design/textview/model/NaviSpan.kt b/android/navi-design/src/main/java/com/navi/design/textview/model/NaviSpan.kt index 44fc67d4ba..ef3530298e 100644 --- a/android/navi-design/src/main/java/com/navi/design/textview/model/NaviSpan.kt +++ b/android/navi-design/src/main/java/com/navi/design/textview/model/NaviSpan.kt @@ -40,7 +40,7 @@ data class NaviSpan( override fun spanBgColor(): String? = spanBgColor - override fun fontName(): String = fontName ?: FontWeightEnum.TT_REGULAR.name + override fun fontName(): String = fontName ?: FontWeightEnum.NAVI_BODY_REGULAR.name override fun fontSize(): Double? = fontSize diff --git a/android/navi-design/src/main/java/com/navi/design/theme/ComposeFontUtil.kt b/android/navi-design/src/main/java/com/navi/design/theme/ComposeFontUtil.kt deleted file mode 100644 index 6daf7ed55b..0000000000 --- a/android/navi-design/src/main/java/com/navi/design/theme/ComposeFontUtil.kt +++ /dev/null @@ -1,100 +0,0 @@ -/* - * - * * Copyright © 2022-2024 by Navi Technologies Limited - * * All rights reserved. Strictly confidential - * - */ - -package com.navi.design.theme - -import androidx.compose.ui.text.font.Font -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.font.FontWeight -import com.navi.design.font.FontWeightEnum -import com.navi.design.utils.Constants.TT_FONT_FAMILY -import com.navi.design.utils.getFontStyle - -val composeFontFamily = - FontFamily( - Font(getFontStyle(FontWeightEnum.REGULAR), FontWeight.Normal), - Font(getFontStyle(FontWeightEnum.SEMI_BOLD), FontWeight.SemiBold), - Font(getFontStyle(FontWeightEnum.BOLD), FontWeight.Bold), - Font(getFontStyle(FontWeightEnum.EXTRA_BOLD), FontWeight.ExtraBold), - Font(getFontStyle(FontWeightEnum.ROBOTO_REGULAR), FontWeight.Normal), - Font(getFontStyle(FontWeightEnum.ROBOTO_MEDIUM), FontWeight.Medium), - Font(getFontStyle(FontWeightEnum.ROBOTO_BOLD), FontWeight.Bold), - ) - -val ttComposeFontFamily = - FontFamily( - Font(getFontStyle(FontWeightEnum.TT_MEDIUM), FontWeight.Medium), - Font(getFontStyle(FontWeightEnum.TT_BOLD), FontWeight.Bold), - Font(getFontStyle(FontWeightEnum.TT_SEMI_BOLD), FontWeight.SemiBold), - Font(getFontStyle(FontWeightEnum.TT_REGULAR), FontWeight.Normal) - ) - -fun getFontWeight(fontWeight: FontWeightEnum): FontWeight { - return when (fontWeight) { - FontWeightEnum.ROBOTO_REGULAR, - FontWeightEnum.REGULAR, - FontWeightEnum.TT_REGULAR, - FontWeightEnum.NAVI_BODY_REGULAR -> FontWeight.Normal - FontWeightEnum.SEMI_BOLD, - FontWeightEnum.TT_SEMI_BOLD, - FontWeightEnum.NAVI_BODY_DEMI_BOLD -> FontWeight.SemiBold - FontWeightEnum.ROBOTO_MEDIUM, - FontWeightEnum.TT_MEDIUM, - FontWeightEnum.NAVI_HEADLINE_REGULAR -> FontWeight.Medium - FontWeightEnum.ROBOTO_BOLD, - FontWeightEnum.TT_BOLD, - FontWeightEnum.BOLD, - FontWeightEnum.NAVI_HEADLINE_BOLD -> FontWeight.Bold - FontWeightEnum.EXTRA_BOLD -> FontWeight.ExtraBold - else -> FontWeight.Normal - } -} - -fun getFontFamily(fontFamily: String?): FontFamily { - return when (fontFamily) { - TT_FONT_FAMILY -> ttComposeFontFamily - else -> composeFontFamily - } -} - -fun getFontWeight(fontWeight: String?): FontWeight { - return when (fontWeight) { - FontWeightEnum.TT_REGULAR.name, - FontWeightEnum.ROBOTO_REGULAR.name, - FontWeightEnum.REGULAR.name, - FontWeightEnum.NAVI_REGULAR.name -> FontWeight.Normal - FontWeightEnum.TT_SEMI_BOLD.name, - FontWeightEnum.SEMI_BOLD.name, - FontWeightEnum.NAVI_EXTRA_BOLD.name -> FontWeight.SemiBold - FontWeightEnum.ROBOTO_MEDIUM.name, - FontWeightEnum.TT_MEDIUM.name, - FontWeightEnum.NAVI_BOLD.name -> FontWeight.Medium - FontWeightEnum.ROBOTO_BOLD.name, - FontWeightEnum.TT_BOLD.name, - FontWeightEnum.BOLD.name -> FontWeight.Bold - FontWeightEnum.EXTRA_BOLD.name -> FontWeight.ExtraBold - else -> FontWeight.Normal - } -} - -fun FontWeight?.toEnum(fontFamily: FontFamily?) = - if (fontFamily == ttComposeFontFamily) { - when (this) { - FontWeight.Medium -> FontWeightEnum.TT_MEDIUM - FontWeight.Bold -> FontWeightEnum.TT_BOLD - else -> FontWeightEnum.TT_MEDIUM - } - } else { - when (this) { - FontWeight.Normal -> FontWeightEnum.ROBOTO_REGULAR - FontWeight.Medium -> FontWeightEnum.ROBOTO_MEDIUM - FontWeight.Bold -> FontWeightEnum.ROBOTO_BOLD - else -> FontWeightEnum.ROBOTO_REGULAR - } - } - -fun FontWeight?.getFont(fontFamily: FontFamily?) = getFontStyle(this.toEnum(fontFamily)) diff --git a/android/navi-design/src/main/java/com/navi/design/theme/Type.kt b/android/navi-design/src/main/java/com/navi/design/theme/Type.kt index f7772ff0ff..296a97ef59 100644 --- a/android/navi-design/src/main/java/com/navi/design/theme/Type.kt +++ b/android/navi-design/src/main/java/com/navi/design/theme/Type.kt @@ -11,61 +11,62 @@ import androidx.compose.material.Typography import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp +import com.navi.design.font.naviFontFamily val typography = Typography( h1 = TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Bold, fontSize = 32.sp, letterSpacing = 0.6.sp, ), h2 = TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Bold, fontSize = 28.sp, letterSpacing = 0.3.sp ), h3 = TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.SemiBold, fontSize = 24.sp, letterSpacing = 0.2.sp ), h4 = TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Medium, fontSize = 20.sp, letterSpacing = 0.2.sp ), subtitle1 = TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Medium, fontSize = 16.sp, letterSpacing = 0.3.sp ), subtitle2 = TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Normal, fontSize = 14.sp, letterSpacing = 0.3.sp ), body1 = TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Normal, fontSize = 16.sp, letterSpacing = 0.2.sp ), body2 = TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Normal, fontSize = 14.sp, letterSpacing = 0.3.sp @@ -75,7 +76,7 @@ val typography = val Typography.title1: TextStyle get() { return TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Medium, fontSize = 18.sp, letterSpacing = 0.2.sp @@ -85,7 +86,7 @@ val Typography.title1: TextStyle val Typography.title2: TextStyle get() { return TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Medium, fontSize = 16.sp, letterSpacing = 0.2.sp @@ -95,7 +96,7 @@ val Typography.title2: TextStyle val Typography.body3: TextStyle get() { return TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Normal, fontSize = 12.sp, letterSpacing = 0.sp @@ -105,7 +106,7 @@ val Typography.body3: TextStyle val Typography.caption1: TextStyle get() { return TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.SemiBold, fontSize = 12.sp, letterSpacing = 0.3.sp @@ -115,7 +116,7 @@ val Typography.caption1: TextStyle val Typography.caption2: TextStyle get() { return TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Medium, fontSize = 10.sp, letterSpacing = 0.2.sp @@ -125,7 +126,7 @@ val Typography.caption2: TextStyle val Typography.caption3: TextStyle get() { return TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Normal, fontSize = 10.sp, letterSpacing = 0.2.sp @@ -135,7 +136,7 @@ val Typography.caption3: TextStyle val Typography.overline1: TextStyle get() { return TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Normal, fontSize = 12.sp, letterSpacing = 0.2.sp @@ -145,7 +146,7 @@ val Typography.overline1: TextStyle val Typography.overline2: TextStyle get() { return TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Normal, fontSize = 8.sp, letterSpacing = 0.2.sp @@ -155,7 +156,7 @@ val Typography.overline2: TextStyle val Typography.button1: TextStyle get() { return TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Medium, fontSize = 16.sp, letterSpacing = 0.2.sp @@ -165,7 +166,7 @@ val Typography.button1: TextStyle val Typography.button2: TextStyle get() { return TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Medium, fontSize = 14.sp, letterSpacing = 0.2.sp @@ -175,7 +176,7 @@ val Typography.button2: TextStyle val Typography.button3: TextStyle get() { return TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Medium, fontSize = 12.sp, letterSpacing = 0.2.sp @@ -185,7 +186,7 @@ val Typography.button3: TextStyle val Typography.link: TextStyle get() { return TextStyle( - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Medium, fontSize = 14.sp, letterSpacing = 0.2.sp @@ -194,7 +195,7 @@ val Typography.link: TextStyle val Typography.tt_h1: TextStyle get() { return TextStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Normal, fontSize = 32.sp, letterSpacing = 0.sp @@ -203,7 +204,7 @@ val Typography.tt_h1: TextStyle val Typography.tt_h2: TextStyle get() { return TextStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Normal, fontSize = 28.sp, letterSpacing = 0.sp @@ -212,7 +213,7 @@ val Typography.tt_h2: TextStyle val Typography.tt_h3: TextStyle get() { return TextStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Normal, fontSize = 24.sp, letterSpacing = 0.sp @@ -221,7 +222,7 @@ val Typography.tt_h3: TextStyle val Typography.tt_h4: TextStyle get() { return TextStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Normal, fontSize = 20.sp, letterSpacing = 0.sp @@ -230,7 +231,7 @@ val Typography.tt_h4: TextStyle val Typography.tt_h6: TextStyle get() { return TextStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Normal, fontSize = 18.sp, letterSpacing = 0.sp @@ -240,7 +241,7 @@ val Typography.tt_h6: TextStyle val Typography.tt_title1: TextStyle get() { return TextStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Normal, fontSize = 18.sp, letterSpacing = 0.sp diff --git a/android/navi-design/src/main/java/com/navi/design/utils/BindingAdapterUtils.kt b/android/navi-design/src/main/java/com/navi/design/utils/BindingAdapterUtils.kt index 8047d4587c..8f51b4d8e1 100644 --- a/android/navi-design/src/main/java/com/navi/design/utils/BindingAdapterUtils.kt +++ b/android/navi-design/src/main/java/com/navi/design/utils/BindingAdapterUtils.kt @@ -1,6 +1,6 @@ /* * - * * Copyright © 2022 by Navi Technologies Limited + * * Copyright © 2022-2024 by Navi Technologies Limited * * All rights reserved. Strictly confidential * */ diff --git a/android/navi-design/src/main/java/com/navi/design/utils/Ext.kt b/android/navi-design/src/main/java/com/navi/design/utils/Ext.kt index 6583a76045..00f1bd8aea 100644 --- a/android/navi-design/src/main/java/com/navi/design/utils/Ext.kt +++ b/android/navi-design/src/main/java/com/navi/design/utils/Ext.kt @@ -52,6 +52,7 @@ import com.navi.base.utils.orFalse import com.navi.design.R import com.navi.design.common.CommonViewData import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontStyle import com.navi.design.textview.model.NaviSpan import com.navi.design.textview.model.SpanInterface import com.navi.design.textview.model.TextWithStyle @@ -343,6 +344,39 @@ fun TextView.setSpannableString( clickCta?.let { clickListener?.invoke(it) } } +fun TextView.changeFontStyle(fontWeight: FontWeightEnum?) { + val spannableString = SpannableStringBuilder(text) + val size = text.toString().length + + spannableString.setSpan( + ResourcesCompat.getFont(context, getFontStyle(fontWeight))?.let { typeface -> + CustomTypefaceSpan(typeface) + }, + 0, + size, + SpannableString.SPAN_INCLUSIVE_INCLUSIVE + ) + text = spannableString +} + +fun TextView.changeFontColor(color: String?) { + color?.let { + val spannableString = SpannableStringBuilder(text) + val size = text.toString().length + spannableString.setSpan( + ForegroundColorSpan(it.parseColorSafe()), + 0, + size, + SpannableString.SPAN_INCLUSIVE_INCLUSIVE + ) + text = spannableString + } +} + +fun TextView.setFontStyle(fontWeight: FontWeightEnum) { + typeface = ResourcesCompat.getFont(context, getFontStyle(fontWeight)) +} + private fun getSpanGravity(gravity: String): Layout.Alignment { return when (gravity) { Layout.Alignment.ALIGN_OPPOSITE.name -> Layout.Alignment.ALIGN_OPPOSITE @@ -491,10 +525,6 @@ fun ViewGroup.replaceLayout(layoutId: Int): ViewDataBinding? { return binding } -fun updateFontToTTMedium(style: List?) { - style?.forEach { it.fontName = FontWeightEnum.TT_MEDIUM.name } -} - fun hexColorCodePrefix(opacity: Float): String { if (opacity <= 0) return "00" else if (opacity <= 1) return "03" diff --git a/android/navi-design/src/main/java/com/navi/design/utils/FontUtils.kt b/android/navi-design/src/main/java/com/navi/design/utils/FontUtils.kt deleted file mode 100644 index 7391a19554..0000000000 --- a/android/navi-design/src/main/java/com/navi/design/utils/FontUtils.kt +++ /dev/null @@ -1,77 +0,0 @@ -/* - * - * * Copyright © 2022-2024 by Navi Technologies Limited - * * All rights reserved. Strictly confidential - * - */ - -package com.navi.design.utils - -import android.text.SpannableString -import android.text.SpannableStringBuilder -import android.text.style.ForegroundColorSpan -import android.widget.TextView -import androidx.core.content.res.ResourcesCompat -import com.navi.design.R -import com.navi.design.font.FontWeightEnum - -fun getFontStyle(fontWeightName: String?) = - when (fontWeightName) { - FontWeightEnum.TT_REGULAR.name, - FontWeightEnum.ROBOTO_REGULAR.name, - FontWeightEnum.SEMI_BOLD.name, - FontWeightEnum.NAVI_SEMI_BOLD.name, - FontWeightEnum.REGULAR.name, - FontWeightEnum.NAVI_REGULAR.name, - FontWeightEnum.NAVI_BODY_REGULAR.name -> R.font.tt_regular - FontWeightEnum.TT_MEDIUM.name, - FontWeightEnum.ROBOTO_MEDIUM.name, - FontWeightEnum.BOLD.name, - FontWeightEnum.NAVI_BOLD.name, - FontWeightEnum.TT_MEDIUM.name, - FontWeightEnum.NAVI_HEADLINE_REGULAR.name -> R.font.tt_medium - FontWeightEnum.TT_SEMI_BOLD.name, - FontWeightEnum.ROBOTO_BOLD.name, - FontWeightEnum.EXTRA_BOLD.name, - FontWeightEnum.NAVI_EXTRA_BOLD.name, - FontWeightEnum.NAVI_BLACK.name, - FontWeightEnum.NAVI_BODY_DEMI_BOLD.name -> R.font.tt_semi_bold - FontWeightEnum.TT_BOLD.name, - FontWeightEnum.NAVI_HEADLINE_BOLD.name -> R.font.tt_bold - else -> R.font.tt_regular - } - -fun getFontStyle(fontWeight: FontWeightEnum?): Int = getFontStyle(fontWeight?.name) - -fun TextView.setFontStyle(fontWeight: FontWeightEnum) { - typeface = ResourcesCompat.getFont(context, getFontStyle(fontWeight)) -} - -fun TextView.changeFontStyle(fontWeight: FontWeightEnum?) { - val spannableString = SpannableStringBuilder(text) - val size = text.toString().length - - spannableString.setSpan( - ResourcesCompat.getFont(context, getFontStyle(fontWeight))?.let { typeface -> - CustomTypefaceSpan(typeface) - }, - 0, - size, - SpannableString.SPAN_INCLUSIVE_INCLUSIVE - ) - text = spannableString -} - -fun TextView.changeFontColor(color: String?) { - color?.let { - val spannableString = SpannableStringBuilder(text) - val size = text.toString().length - spannableString.setSpan( - ForegroundColorSpan(it.parseColorSafe()), - 0, - size, - SpannableString.SPAN_INCLUSIVE_INCLUSIVE - ) - text = spannableString - } -} diff --git a/android/navi-design/src/main/res/font/tt_semi_bold.otf b/android/navi-design/src/main/res/font/navi_body_demi_bold.otf similarity index 100% rename from android/navi-design/src/main/res/font/tt_semi_bold.otf rename to android/navi-design/src/main/res/font/navi_body_demi_bold.otf diff --git a/android/navi-design/src/main/res/font/tt_regular.ttf b/android/navi-design/src/main/res/font/navi_body_regular.ttf similarity index 100% rename from android/navi-design/src/main/res/font/tt_regular.ttf rename to android/navi-design/src/main/res/font/navi_body_regular.ttf diff --git a/android/navi-design/src/main/res/font/tt_bold.otf b/android/navi-design/src/main/res/font/navi_headline_bold.otf similarity index 100% rename from android/navi-design/src/main/res/font/tt_bold.otf rename to android/navi-design/src/main/res/font/navi_headline_bold.otf diff --git a/android/navi-design/src/main/res/font/tt_medium.ttf b/android/navi-design/src/main/res/font/navi_headline_regular.ttf similarity index 100% rename from android/navi-design/src/main/res/font/tt_medium.ttf rename to android/navi-design/src/main/res/font/navi_headline_regular.ttf diff --git a/android/navi-design/src/main/res/layout/tool_tip_view.xml b/android/navi-design/src/main/res/layout/tool_tip_view.xml index f595d0af99..c7517d0448 100644 --- a/android/navi-design/src/main/res/layout/tool_tip_view.xml +++ b/android/navi-design/src/main/res/layout/tool_tip_view.xml @@ -23,7 +23,7 @@ android:textColor="@color/white" tools:text="Move the slider" android:textSize="@dimen/sp_10" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/android/navi-design/src/main/res/values/styles.xml b/android/navi-design/src/main/res/values/styles.xml index 2cdb9d9245..92a89a2f17 100644 --- a/android/navi-design/src/main/res/values/styles.xml +++ b/android/navi-design/src/main/res/values/styles.xml @@ -11,352 +11,352 @@ @@ -365,37 +365,37 @@ @@ -404,272 +404,272 @@ @color/descriptionColor4 @dimen/sp_14 0.02 - @font/tt_regular + @font/navi_body_regular @@ -680,37 +680,37 @@ @@ -720,7 +720,7 @@ @drawable/primary_button_background @color/white false - @font/tt_regular + @font/navi_body_regular @dimen/sp_14 @null @@ -730,7 +730,7 @@ @drawable/primary_button_background @color/white false - @font/tt_semi_bold + @font/navi_body_demi_bold @dimen/sp_14 @null @@ -740,7 +740,7 @@ @drawable/primary_button_background_blue @color/white false - @font/tt_regular + @font/navi_body_regular @dimen/sp_14 @null @@ -750,19 +750,19 @@ @drawable/secondary_button_background @color/linkColor false - @font/tt_regular + @font/navi_body_regular @dimen/sp_14 @null @@ -775,19 +775,19 @@ @@ -850,40 +850,40 @@ diff --git a/android/navi-design/src/test/java/com/navi/design/ExampleUnitTest.kt b/android/navi-design/src/test/java/com/navi/design/ExampleUnitTest.kt deleted file mode 100644 index 41e7f28eab..0000000000 --- a/android/navi-design/src/test/java/com/navi/design/ExampleUnitTest.kt +++ /dev/null @@ -1,23 +0,0 @@ -/* - * - * * Copyright © 2021-2022 by Navi Technologies Limited - * * All rights reserved. Strictly confidential - * - */ - -package com.navi.design - -import org.junit.Assert.* -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/android/navi-design/src/test/java/com/navi/design/utils/FontUtilsKtTest.kt b/android/navi-design/src/test/java/com/navi/design/utils/FontUtilsKtTest.kt deleted file mode 100644 index b7c45122ff..0000000000 --- a/android/navi-design/src/test/java/com/navi/design/utils/FontUtilsKtTest.kt +++ /dev/null @@ -1,70 +0,0 @@ -/* - * - * * Copyright © 2023-2024 by Navi Technologies Limited - * * All rights reserved. Strictly confidential - * - */ - -package com.navi.design.utils - -import DesignR.font.tt_bold -import DesignR.font.tt_medium -import DesignR.font.tt_regular -import DesignR.font.tt_semi_bold -import com.navi.base.utils.EMPTY -import com.navi.design.font.FontWeightEnum -import org.junit.Assert.assertEquals -import org.junit.Test - -class FontUtilsKtTest { - - @Test - fun testGetFontStyle() { - assertEquals(tt_regular, getFontStyle(fontWeightName = "TT_REGULAR")) - assertEquals(tt_regular, getFontStyle(fontWeightName = "ROBOTO_REGULAR")) - assertEquals(tt_regular, getFontStyle(fontWeightName = "SEMI_BOLD")) - assertEquals(tt_regular, getFontStyle(fontWeightName = "NAVI_SEMI_BOLD")) - assertEquals(tt_regular, getFontStyle(fontWeightName = "REGULAR")) - assertEquals(tt_regular, getFontStyle(fontWeightName = "NAVI_REGULAR")) - - assertEquals(tt_medium, getFontStyle(fontWeightName = "TT_MEDIUM")) - assertEquals(tt_medium, getFontStyle(fontWeightName = "ROBOTO_MEDIUM")) - assertEquals(tt_medium, getFontStyle(fontWeightName = "BOLD")) - assertEquals(tt_medium, getFontStyle(fontWeightName = "NAVI_BOLD")) - - assertEquals(tt_semi_bold, getFontStyle(fontWeightName = "TT_SEMI_BOLD")) - assertEquals(tt_semi_bold, getFontStyle(fontWeightName = "ROBOTO_BOLD")) - assertEquals(tt_semi_bold, getFontStyle(fontWeightName = "EXTRA_BOLD")) - assertEquals(tt_semi_bold, getFontStyle(fontWeightName = "NAVI_EXTRA_BOLD")) - assertEquals(tt_semi_bold, getFontStyle(fontWeightName = "NAVI_BLACK")) - - assertEquals(tt_bold, getFontStyle(fontWeightName = "TT_BOLD")) - - assertEquals(tt_regular, getFontStyle(fontWeightName = EMPTY)) - } - - @Test - fun testGetFontStyleUsingFontWeightEnum() { - assertEquals(tt_regular, getFontStyle(fontWeight = FontWeightEnum.TT_REGULAR)) - assertEquals(tt_regular, getFontStyle(fontWeight = FontWeightEnum.ROBOTO_REGULAR)) - assertEquals(tt_regular, getFontStyle(fontWeight = FontWeightEnum.SEMI_BOLD)) - assertEquals(tt_regular, getFontStyle(fontWeight = FontWeightEnum.NAVI_SEMI_BOLD)) - assertEquals(tt_regular, getFontStyle(fontWeight = FontWeightEnum.REGULAR)) - assertEquals(tt_regular, getFontStyle(fontWeight = FontWeightEnum.NAVI_REGULAR)) - - assertEquals(tt_medium, getFontStyle(fontWeight = FontWeightEnum.TT_MEDIUM)) - assertEquals(tt_medium, getFontStyle(fontWeight = FontWeightEnum.ROBOTO_MEDIUM)) - assertEquals(tt_medium, getFontStyle(fontWeight = FontWeightEnum.BOLD)) - assertEquals(tt_medium, getFontStyle(fontWeight = FontWeightEnum.NAVI_BOLD)) - - assertEquals(tt_semi_bold, getFontStyle(fontWeight = FontWeightEnum.TT_SEMI_BOLD)) - assertEquals(tt_semi_bold, getFontStyle(fontWeight = FontWeightEnum.ROBOTO_BOLD)) - assertEquals(tt_semi_bold, getFontStyle(fontWeight = FontWeightEnum.EXTRA_BOLD)) - assertEquals(tt_semi_bold, getFontStyle(fontWeight = FontWeightEnum.NAVI_EXTRA_BOLD)) - assertEquals(tt_semi_bold, getFontStyle(fontWeight = FontWeightEnum.NAVI_BLACK)) - - assertEquals(tt_bold, getFontStyle(fontWeight = FontWeightEnum.TT_BOLD)) - - assertEquals(tt_regular, getFontStyle(fontWeight = null)) - } -} diff --git a/android/navi-gold/src/main/res/layout/activity_digital_gold_home.xml b/android/navi-gold/src/main/res/layout/activity_digital_gold_home.xml index 12fed911a8..7b2dc46be0 100644 --- a/android/navi-gold/src/main/res/layout/activity_digital_gold_home.xml +++ b/android/navi-gold/src/main/res/layout/activity_digital_gold_home.xml @@ -71,7 +71,7 @@ android:layout_width="@dimen/layout_dp_0" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/layout_dp_56" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/navi-gold/src/main/res/layout/activity_digital_gold_sell.xml b/android/navi-gold/src/main/res/layout/activity_digital_gold_sell.xml index f8b1d3304e..840f0d80b6 100644 --- a/android/navi-gold/src/main/res/layout/activity_digital_gold_sell.xml +++ b/android/navi-gold/src/main/res/layout/activity_digital_gold_sell.xml @@ -56,7 +56,7 @@ android:layout_width="@dimen/layout_dp_0" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/layout_dp_56" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/navi-gold/src/main/res/layout/activity_digital_gold_transaction.xml b/android/navi-gold/src/main/res/layout/activity_digital_gold_transaction.xml index 65fa5c7da6..0879b9c5f7 100644 --- a/android/navi-gold/src/main/res/layout/activity_digital_gold_transaction.xml +++ b/android/navi-gold/src/main/res/layout/activity_digital_gold_transaction.xml @@ -57,7 +57,7 @@ android:layout_width="@dimen/layout_dp_0" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/layout_dp_56" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/android/navi-gold/src/main/res/layout/fragment_bank_details_gold.xml b/android/navi-gold/src/main/res/layout/fragment_bank_details_gold.xml index 782be23998..709a66ba4a 100644 --- a/android/navi-gold/src/main/res/layout/fragment_bank_details_gold.xml +++ b/android/navi-gold/src/main/res/layout/fragment_bank_details_gold.xml @@ -51,7 +51,7 @@ android:layout_width="@dimen/layout_dp_0" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/layout_dp_56" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/navi-gold/src/main/res/layout/fragment_blocker.xml b/android/navi-gold/src/main/res/layout/fragment_blocker.xml index 743c65f3cb..167c2bad9f 100644 --- a/android/navi-gold/src/main/res/layout/fragment_blocker.xml +++ b/android/navi-gold/src/main/res/layout/fragment_blocker.xml @@ -47,7 +47,7 @@ android:layout_width="@dimen/layout_dp_0" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/layout_dp_56" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/android/navi-gold/src/main/res/layout/fragment_digital_gold_kyc.xml b/android/navi-gold/src/main/res/layout/fragment_digital_gold_kyc.xml index a89daa5c58..2c6bd81e7c 100644 --- a/android/navi-gold/src/main/res/layout/fragment_digital_gold_kyc.xml +++ b/android/navi-gold/src/main/res/layout/fragment_digital_gold_kyc.xml @@ -79,7 +79,7 @@ android:layout_width="@dimen/layout_dp_0" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/layout_dp_56" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:textFontWeight="@integer/integer_400" app:layout_constraintBottom_toBottomOf="parent" diff --git a/android/navi-gold/src/main/res/layout/fragment_digital_gold_setup_sip.xml b/android/navi-gold/src/main/res/layout/fragment_digital_gold_setup_sip.xml index f7b4bfa001..882fdfa0c1 100644 --- a/android/navi-gold/src/main/res/layout/fragment_digital_gold_setup_sip.xml +++ b/android/navi-gold/src/main/res/layout/fragment_digital_gold_setup_sip.xml @@ -72,7 +72,7 @@ android:layout_width="@dimen/layout_dp_0" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/layout_dp_56" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/navi-gold/src/main/res/layout/fragment_digital_gold_sip_details.xml b/android/navi-gold/src/main/res/layout/fragment_digital_gold_sip_details.xml index d852b57f15..610ac0bd52 100644 --- a/android/navi-gold/src/main/res/layout/fragment_digital_gold_sip_details.xml +++ b/android/navi-gold/src/main/res/layout/fragment_digital_gold_sip_details.xml @@ -72,7 +72,7 @@ android:layout_width="@dimen/layout_dp_0" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/layout_dp_56" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/navi-gold/src/main/res/layout/gold_pd_rpd_footer.xml b/android/navi-gold/src/main/res/layout/gold_pd_rpd_footer.xml index 51753518b5..5687cb3323 100644 --- a/android/navi-gold/src/main/res/layout/gold_pd_rpd_footer.xml +++ b/android/navi-gold/src/main/res/layout/gold_pd_rpd_footer.xml @@ -18,7 +18,7 @@ android:layout_marginTop="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_8" android:background="@drawable/bg_grey_rounded_4" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" app:layout_constraintBottom_toBottomOf="@id/next_btn" app:layout_constraintEnd_toStartOf="@id/next_btn" @@ -35,7 +35,7 @@ android:layout_marginEnd="@dimen/dp_16" android:layout_marginBottom="@dimen/dp_32" android:background="@drawable/rounded_purple_color_enabled_state" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:textColor="@color/white" android:textSize="@dimen/sp_14" diff --git a/android/navi-gold/src/main/res/layout/icon_title_desc_bottomsheet_layout.xml b/android/navi-gold/src/main/res/layout/icon_title_desc_bottomsheet_layout.xml index 799009643c..2f3881a084 100644 --- a/android/navi-gold/src/main/res/layout/icon_title_desc_bottomsheet_layout.xml +++ b/android/navi-gold/src/main/res/layout/icon_title_desc_bottomsheet_layout.xml @@ -32,7 +32,7 @@ android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:lineHeight="@dimen/sp_24" android:textColor="@color/black" android:textSize="@dimen/sp_18" diff --git a/android/navi-gold/src/main/res/layout/layout_common_permission_fragment.xml b/android/navi-gold/src/main/res/layout/layout_common_permission_fragment.xml index 248c7b5611..dbb8083d59 100644 --- a/android/navi-gold/src/main/res/layout/layout_common_permission_fragment.xml +++ b/android/navi-gold/src/main/res/layout/layout_common_permission_fragment.xml @@ -51,7 +51,7 @@ android:layout_width="@dimen/layout_dp_0" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/layout_dp_56" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -82,7 +82,7 @@ android:layout_height="wrap_content" android:textColor="@color/title_color_one" android:textSize="@dimen/sp_24" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" android:layout_marginHorizontal="@dimen/dp_16" android:layout_marginTop="@dimen/dp_8" app:layout_constraintTop_toBottomOf="@id/cvParent" /> diff --git a/android/navi-gold/src/main/res/layout/pd_rpd_options_layout.xml b/android/navi-gold/src/main/res/layout/pd_rpd_options_layout.xml index 566d1dc9e9..e10d512020 100644 --- a/android/navi-gold/src/main/res/layout/pd_rpd_options_layout.xml +++ b/android/navi-gold/src/main/res/layout/pd_rpd_options_layout.xml @@ -45,7 +45,7 @@ android:layout_width="@dimen/layout_dp_0" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/layout_dp_56" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/navi-gold/src/main/res/layout/search_field_layout_gold.xml b/android/navi-gold/src/main/res/layout/search_field_layout_gold.xml index 227a1147e8..b3461d6ea2 100644 --- a/android/navi-gold/src/main/res/layout/search_field_layout_gold.xml +++ b/android/navi-gold/src/main/res/layout/search_field_layout_gold.xml @@ -16,7 +16,7 @@ android:layout_marginStart="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16" android:background="@null" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:inputType="text" android:maxLength="@integer/value_100" android:textCursorDrawable="@drawable/cursor_drawable" diff --git a/android/navi-gold/src/main/res/layout/select_bank_layout_gold.xml b/android/navi-gold/src/main/res/layout/select_bank_layout_gold.xml index 84d809f68e..7668f2b979 100644 --- a/android/navi-gold/src/main/res/layout/select_bank_layout_gold.xml +++ b/android/navi-gold/src/main/res/layout/select_bank_layout_gold.xml @@ -49,7 +49,7 @@ android:layout_width="@dimen/layout_dp_0" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/layout_dp_56" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/navi-gold/src/main/res/values/styles.xml b/android/navi-gold/src/main/res/values/styles.xml index 6fbde31a24..1ddff05fc6 100644 --- a/android/navi-gold/src/main/res/values/styles.xml +++ b/android/navi-gold/src/main/res/values/styles.xml @@ -17,7 +17,7 @@ diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/TabbedMediatorNestedScrollView.kt b/android/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/TabbedMediatorNestedScrollView.kt index e654744b36..b046760ff9 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/TabbedMediatorNestedScrollView.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/TabbedMediatorNestedScrollView.kt @@ -18,7 +18,7 @@ import com.navi.base.utils.isNull import com.navi.common.customtab.TabClickListener import com.navi.design.R as DesignR import com.navi.design.font.FontWeightEnum -import com.navi.design.utils.getFontStyle +import com.navi.design.font.getFontStyle import com.navi.insurance.analytics.InsuranceAnalyticsHandler import com.navi.insurance.common.models.HeaderTab import timber.log.Timber @@ -126,7 +126,7 @@ class TabbedMediatorNestedScrollView( val typeFace = ResourcesCompat.getFont( nestedScrollView.context, - getFontStyle(FontWeightEnum.TT_MEDIUM.name) + getFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) ) (tab.customView as? TextView)?.apply { @@ -140,7 +140,7 @@ class TabbedMediatorNestedScrollView( val typeFace = ResourcesCompat.getFont( nestedScrollView.context, - getFontStyle(FontWeightEnum.TT_REGULAR) + getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) ) (tab.customView as? TextView)?.apply { diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/common/bottom_sheet/TitleWithGridBottomSheet.kt b/android/navi-insurance/src/main/java/com/navi/insurance/common/bottom_sheet/TitleWithGridBottomSheet.kt index 896f317887..1132627b63 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/common/bottom_sheet/TitleWithGridBottomSheet.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/common/bottom_sheet/TitleWithGridBottomSheet.kt @@ -42,8 +42,8 @@ import com.navi.common.model.ModuleName import com.navi.common.utils.CommonNaviAnalytics import com.navi.common.utils.getNetworkType import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.insurance.R import com.navi.insurance.analytics.InsuranceAnalyticsConstants import com.navi.insurance.analytics.InsuranceAnalyticsHandler @@ -196,11 +196,12 @@ class TitleWithGridBottomSheet : BaseBottomSheet(), WidgetCallback { color = getColorFromHexCode(hex = gridItem?.itemTitle?.textColor.orEmpty()), fontSize = gridItem?.itemTitle?.size?.toFloat().orZero().sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight( FontWeightEnum.valueOf( - gridItem?.itemTitle?.font ?: FontWeightEnum.TT_REGULAR.name + gridItem?.itemTitle?.font + ?: FontWeightEnum.NAVI_BODY_REGULAR.name ) ), textAlign = TextAlign.Center diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/common/fragment/IncentiviseAutopayFragment.kt b/android/navi-insurance/src/main/java/com/navi/insurance/common/fragment/IncentiviseAutopayFragment.kt index 98972b166c..2b33db3f37 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/common/fragment/IncentiviseAutopayFragment.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/common/fragment/IncentiviseAutopayFragment.kt @@ -62,14 +62,14 @@ import com.navi.base.utils.orFalse import com.navi.common.network.models.ErrorMessage import com.navi.common.utils.log import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.theme.Green22A940 import com.navi.design.theme.Grey6B6B6B import com.navi.design.theme.GreyE3E5E5 import com.navi.design.theme.OrangeFF5732 import com.navi.design.theme.RedEF0000 import com.navi.design.theme.WhiteFAFAFA -import com.navi.design.theme.composeFontFamily -import com.navi.design.theme.getFontWeight import com.navi.design.utils.isValidHexColor import com.navi.insurance.R import com.navi.insurance.analytics.InsuranceAnalyticsConstants @@ -506,8 +506,8 @@ class IncentiviseAutopayFragment : GiBaseFragment(), WidgetCallback { TextStyle( color = Grey6B6B6B, fontSize = 14.sp, - fontFamily = composeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR) + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) ) }, @@ -523,9 +523,9 @@ class IncentiviseAutopayFragment : GiBaseFragment(), WidgetCallback { style = TextStyle( color = RedEF0000, - fontFamily = composeFontFamily, + fontFamily = naviFontFamily, fontSize = 12.sp, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR) + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) ) } 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 ba2f1261d6..24751459a4 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 @@ -31,7 +31,7 @@ import com.navi.base.model.CtaData import com.navi.common.R as CommonR import com.navi.design.R as DesignR import com.navi.design.font.FontWeightEnum -import com.navi.design.utils.getFontStyle +import com.navi.design.font.getFontStyle import com.navi.design.utils.isValidHexColor import com.navi.insurance.R import com.navi.insurance.claim.IconUtil @@ -297,10 +297,12 @@ fun TabLayout.addTextTab(text: String?, isSelected: Boolean) { gravity = Gravity.CENTER setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(R.dimen.sp_14)) if (isSelected) { - typeface = ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.TT_MEDIUM)) + typeface = + ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR)) setTextColor(ContextCompat.getColor(context, DesignR.color.blueberry)) } else { - typeface = ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.TT_REGULAR)) + typeface = + ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR)) setTextColor(ContextCompat.getColor(context, DesignR.color.naviGrey)) } } diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/engagement/health_risk_score/fragment/HealthRiskQuestionFragment.kt b/android/navi-insurance/src/main/java/com/navi/insurance/engagement/health_risk_score/fragment/HealthRiskQuestionFragment.kt index c7c79a1d46..1b622c7547 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/engagement/health_risk_score/fragment/HealthRiskQuestionFragment.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/engagement/health_risk_score/fragment/HealthRiskQuestionFragment.kt @@ -34,7 +34,7 @@ import com.navi.common.network.models.ErrorMessage import com.navi.common.utils.observeNonNull import com.navi.design.R as DesignR import com.navi.design.font.FontWeightEnum -import com.navi.design.utils.getFontStyle +import com.navi.design.font.getFontStyle import com.navi.design.utils.getNaviDrawable import com.navi.design.utils.setFontStyle import com.navi.insurance.R @@ -404,7 +404,7 @@ class HealthRiskQuestionFragment : strokeColor = ContextCompat.getColor(context, R.color.white), strokeWidth = context.resources.getDimensionPixelSize(R.dimen.dp_1) ) - checkBox.setFontStyle(FontWeightEnum.TT_MEDIUM) + checkBox.setFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) } } else { context?.let { context -> @@ -413,7 +413,7 @@ class HealthRiskQuestionFragment : backgroundColor = ContextCompat.getColor(context, DesignR.color.black_10), cornerRadius = context.resources.getDimensionPixelSize(R.dimen.dp_8) ) - checkBox.setFontStyle(FontWeightEnum.TT_REGULAR) + checkBox.setFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) } } } @@ -462,9 +462,9 @@ class HealthRiskQuestionFragment : } context?.let { context -> binding.itemPicker.typeface = - ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.TT_REGULAR)) + ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR)) binding.itemPicker.setSelectedTypeface( - ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.TT_REGULAR)) + ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR)) ) } question.options?.let { questionList -> diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/engagement/pre_diabetes_check/composables/H1bacBottomSheetComposable.kt b/android/navi-insurance/src/main/java/com/navi/insurance/engagement/pre_diabetes_check/composables/H1bacBottomSheetComposable.kt index 8dc2d3ac37..cd687c06de 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/engagement/pre_diabetes_check/composables/H1bacBottomSheetComposable.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/engagement/pre_diabetes_check/composables/H1bacBottomSheetComposable.kt @@ -50,8 +50,7 @@ import androidx.compose.ui.unit.sp import com.navi.base.model.AnalyticsEvent import com.navi.base.model.CtaData import com.navi.base.model.LineItem -import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontFamily +import com.navi.design.font.naviFontFamily import com.navi.insurance.analytics.InsuranceAnalyticsConstants import com.navi.insurance.analytics.InsuranceAnalyticsHandler import com.navi.insurance.engagement.pre_diabetes_check.models.H1bacBottomSheetWidgetData @@ -201,7 +200,7 @@ fun H1bacBottomSheetComposable( TextStyle( fontSize = 14.sp, lineHeight = 22.sp, - fontFamily = getFontFamily(FontWeightEnum.TT_MEDIUM.name), + fontFamily = naviFontFamily, fontWeight = FontWeight(400), color = Color(0xFF191919), textDecoration = TextDecoration.Underline, @@ -245,8 +244,7 @@ fun H1bacBottomSheetComposable( TextStyle( fontSize = 12.sp, lineHeight = 18.sp, - fontFamily = - getFontFamily(FontWeightEnum.TT_SEMI_BOLD.name), + fontFamily = naviFontFamily, fontWeight = FontWeight(400), color = Color(0xFF191919), ) @@ -312,8 +310,7 @@ fun H1bacBottomSheetComposable( TextStyle( fontSize = 12.sp, lineHeight = 18.sp, - fontFamily = - getFontFamily(FontWeightEnum.TT_SEMI_BOLD.name), + fontFamily = naviFontFamily, fontWeight = FontWeight(400), color = Color(0xFF191919), ) @@ -354,8 +351,7 @@ fun H1bacBottomSheetComposable( TextStyle( fontSize = 12.sp, lineHeight = 18.sp, - fontFamily = - getFontFamily(FontWeightEnum.TT_SEMI_BOLD.name), + fontFamily = naviFontFamily, fontWeight = FontWeight(400), color = Color(0xFF191919), ) diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/engagement/pre_diabetes_check/composables/HeaderComposable.kt b/android/navi-insurance/src/main/java/com/navi/insurance/engagement/pre_diabetes_check/composables/HeaderComposable.kt index fd623a8383..645383d1e2 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/engagement/pre_diabetes_check/composables/HeaderComposable.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/engagement/pre_diabetes_check/composables/HeaderComposable.kt @@ -32,8 +32,8 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.insurance.R @Composable @@ -61,8 +61,8 @@ fun HeaderComposable( text = title.orEmpty(), color = titleColor, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_MEDIUM), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), modifier = Modifier.fillMaxWidth(), textAlign = TextAlign.Center ) diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/engagement/pre_diabetes_check/composables/PdQuestionnaireScreen.kt b/android/navi-insurance/src/main/java/com/navi/insurance/engagement/pre_diabetes_check/composables/PdQuestionnaireScreen.kt index 31b4eceaa0..7106c7d535 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/engagement/pre_diabetes_check/composables/PdQuestionnaireScreen.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/engagement/pre_diabetes_check/composables/PdQuestionnaireScreen.kt @@ -100,8 +100,8 @@ import com.navi.common.ResponseState import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper import com.navi.common.utils.clickableDebounce import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.insurance.R import com.navi.insurance.analytics.InsuranceAnalyticsConstants import com.navi.insurance.analytics.InsuranceAnalyticsHandler @@ -419,7 +419,7 @@ private fun QuestionnaireLandingScreenComposable( maxLines = 2, overflow = TextOverflow.Ellipsis, fontSize = 40.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, color = Color.White, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), textAlign = TextAlign.Center @@ -436,7 +436,7 @@ private fun QuestionnaireLandingScreenComposable( maxLines = 3, overflow = TextOverflow.Ellipsis, fontSize = 16.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, color = Color.White, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), textAlign = TextAlign.Center @@ -607,7 +607,7 @@ fun CurrentQuestionSection( overflow = TextOverflow.Ellipsis, fontSize = 16.sp, lineHeight = 24.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, color = Color.White, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), textAlign = TextAlign.Center @@ -620,7 +620,7 @@ fun CurrentQuestionSection( maxLines = 3, overflow = TextOverflow.Ellipsis, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, color = Color.White, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), textAlign = TextAlign.Center @@ -887,7 +887,7 @@ fun WheelPicker( totalItemsOnScreen, listSize ), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = calculateFontWeight( firstVisibleItemIndexState, @@ -1010,10 +1010,10 @@ fun calculateFontWeight( listSize ) return when (abs(middleItemIndex - currentIndex)) { - 0 -> getFontWeight(FontWeightEnum.TT_SEMI_BOLD) - 1 -> getFontWeight(FontWeightEnum.TT_SEMI_BOLD) - 2 -> getFontWeight(FontWeightEnum.TT_MEDIUM) - else -> getFontWeight(FontWeightEnum.TT_MEDIUM) + 0 -> getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) + 1 -> getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) + 2 -> getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR) + else -> getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR) } } @@ -1053,7 +1053,7 @@ fun VerticalOptionsSection( text = item.title.orEmpty(), maxLines = 2, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = Color(0xFF191919), overflow = TextOverflow.Ellipsis, @@ -1103,7 +1103,7 @@ fun GridOptionsSection( text = item.title.orEmpty(), maxLines = 2, fontSize = 14.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_REGULAR), color = Color(0xFF191919), overflow = TextOverflow.Ellipsis, @@ -1181,7 +1181,7 @@ fun TranslucentWhiteCard(text: String?) { text = text ?: EMPTY, maxLines = 2, fontSize = 12.sp, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR), color = Color(0xFF191919), overflow = TextOverflow.Ellipsis, @@ -1250,7 +1250,7 @@ fun CustomLinearProgressIndicator( overflow = TextOverflow.Ellipsis, fontSize = 14.sp, color = Color(0xFF191919), - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD), textAlign = TextAlign.Start ) diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/engagement/pre_diabetes_check/composables/PdScoreScreenComposable.kt b/android/navi-insurance/src/main/java/com/navi/insurance/engagement/pre_diabetes_check/composables/PdScoreScreenComposable.kt index e82cdbdfa6..9b99cb4cac 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/engagement/pre_diabetes_check/composables/PdScoreScreenComposable.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/engagement/pre_diabetes_check/composables/PdScoreScreenComposable.kt @@ -74,8 +74,8 @@ import com.navi.base.model.AnalyticsEvent import com.navi.base.model.CtaData import com.navi.common.ResponseState import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.insurance.R import com.navi.insurance.analytics.InsuranceAnalyticsConstants import com.navi.insurance.analytics.InsuranceAnalyticsHandler @@ -493,8 +493,8 @@ fun PdScoreHeader( Text( text = "${scoreSwitcherValue.intValue}/10", color = Color(0xFF191919), - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_BOLD), + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_HEADLINE_BOLD), textAlign = TextAlign.End, modifier = Modifier.padding(bottom = 14.dp).widthIn(min = 80.dp), fontSize = 24.sp @@ -520,7 +520,7 @@ fun PdScoreHeader( substring = LocalContext.current.getString(R.string.you_are_at), textColor = "#444444", size = 14, - font = FontWeightEnum.TT_REGULAR.name + font = FontWeightEnum.NAVI_BODY_REGULAR.name ) else StyleString() NaviTextWidgetized( @@ -537,7 +537,7 @@ fun PdScoreHeader( listOf( styleString, ), - font = FontWeightEnum.TT_BOLD.name, + font = FontWeightEnum.NAVI_HEADLINE_BOLD.name, size = if (showScoreHeaderBg.value) 20 else 16, textColor = if (showScoreHeaderBg.value) scoreTitleColor.value else "#191919", diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/formbase/views/MultiSelectCheckboxWidgetView.kt b/android/navi-insurance/src/main/java/com/navi/insurance/formbase/views/MultiSelectCheckboxWidgetView.kt index eb5ec7a268..d364c9c30d 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/formbase/views/MultiSelectCheckboxWidgetView.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/formbase/views/MultiSelectCheckboxWidgetView.kt @@ -117,12 +117,12 @@ constructor(context: Context, attrs: AttributeSet? = null) : FormBaseWidgetView( itemBinding.checkboxTv.setTextFieldData(multiSelectCheckboxItem.selectedStateTitle) if (multiSelectCheckboxItem.selectedStateTitle.isNull()) { itemBinding.checkboxTv.setTextFieldData(multiSelectCheckboxItem.title) - itemBinding.checkboxTv.setFontStyle(FontWeightEnum.TT_MEDIUM) + itemBinding.checkboxTv.setFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) } } else { selectedItems.remove(selectedItem) itemBinding.checkboxTv.setTextFieldData(multiSelectCheckboxItem.title) - itemBinding.checkboxTv.setFontStyle(FontWeightEnum.TT_REGULAR) + itemBinding.checkboxTv.setFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) } callback?.invoke(CtaData(type = CtaType.VALIDATE_FORM_PAGE.value)) } @@ -145,7 +145,7 @@ constructor(context: Context, attrs: AttributeSet? = null) : FormBaseWidgetView( itemViewBinding.checkboxTv.setTextFieldData(multiSelectCheckboxItem.selectedStateTitle) if (multiSelectCheckboxItem.selectedStateTitle.isNull()) { itemViewBinding.checkboxTv.setTextFieldData(multiSelectCheckboxItem.title) - itemViewBinding.checkboxTv.setFontStyle(FontWeightEnum.TT_MEDIUM) + itemViewBinding.checkboxTv.setFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) } callback?.invoke(CtaData(type = CtaType.VALIDATE_FORM_PAGE.value)) } else { diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/formbase/views/MultiSelectWidgetView.kt b/android/navi-insurance/src/main/java/com/navi/insurance/formbase/views/MultiSelectWidgetView.kt index 2a6a94044a..e4d10300bc 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/formbase/views/MultiSelectWidgetView.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/formbase/views/MultiSelectWidgetView.kt @@ -148,7 +148,7 @@ class MultiSelectWidgetView(context: Context, attributeSet: AttributeSet? = null } if (itemViewBinding.checkboxOption.isChecked) { - itemViewBinding.title.setFontStyle(FontWeightEnum.TT_MEDIUM) + itemViewBinding.title.setFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) attributes?.get(AttributeKeys.proposerRelationShip)?.let { if (it is String) { if (selectedItemData?.containsKey(it) == false) { @@ -160,7 +160,7 @@ class MultiSelectWidgetView(context: Context, attributeSet: AttributeSet? = null } } } else { - itemViewBinding.title.setFontStyle(FontWeightEnum.TT_REGULAR) + itemViewBinding.title.setFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) } if (!optionItemData.rightSideContent.isNull()) { @@ -371,7 +371,7 @@ class MultiSelectWidgetView(context: Context, attributeSet: AttributeSet? = null val proposerRelationShip: String? = tag.attributes?.get(AttributeKeys.proposerRelationShip) as? String if (itemViewBinding.checkboxOption.isChecked) { - itemViewBinding.title.setFontStyle(FontWeightEnum.TT_MEDIUM) + itemViewBinding.title.setFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) if ( !proposerRelationShip.isNullOrEmpty() && selectedItemData?.containsKey(proposerRelationShip) == true @@ -440,7 +440,7 @@ class MultiSelectWidgetView(context: Context, attributeSet: AttributeSet? = null } } } else { - itemViewBinding.title.setFontStyle(FontWeightEnum.TT_REGULAR) + itemViewBinding.title.setFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) if (selectedItemData?.containsKey(proposerRelationShip) == true) { val gender = selectedItemData?.get(proposerRelationShip)?.gender if (proposerRelationShip == RelationShipTypes.SPOUSE.name) { diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/formbase/views/SingleChoiceRadioItemView.kt b/android/navi-insurance/src/main/java/com/navi/insurance/formbase/views/SingleChoiceRadioItemView.kt index 2047a1d373..6d8c484f55 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/formbase/views/SingleChoiceRadioItemView.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/formbase/views/SingleChoiceRadioItemView.kt @@ -65,7 +65,7 @@ constructor(context: Context?, attrs: AttributeSet? = null) : LinearLayout(conte WidgetsR.drawable.radio_button_checked_blue } else { subtitle.isVisible = false - title.setFontStyle(FontWeightEnum.TT_REGULAR) + title.setFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) context?.let { context -> title.setTextColor(ContextCompat.getColor(context, DesignR.color.dim_grey)) } @@ -95,7 +95,7 @@ constructor(context: Context?, attrs: AttributeSet? = null) : LinearLayout(conte binding?.apply { selectedState = false subtitle.isVisible = false - title.setFontStyle(FontWeightEnum.TT_REGULAR) + title.setFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) context?.let { context -> title.setTextColor(ContextCompat.getColor(context, DesignR.color.dim_grey)) } @@ -113,7 +113,7 @@ constructor(context: Context?, attrs: AttributeSet? = null) : LinearLayout(conte binding?.apply { selectedState = true subtitle.isVisible = true - title.setFontStyle(FontWeightEnum.TT_MEDIUM) + title.setFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) context?.let { context -> title.setTextColor(ContextCompat.getColor(context, R.color.naviBlackText)) } diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/formbase/views/TabWithPickerWidgetLayout.kt b/android/navi-insurance/src/main/java/com/navi/insurance/formbase/views/TabWithPickerWidgetLayout.kt index 290174117b..6802c8d6e1 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/formbase/views/TabWithPickerWidgetLayout.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/formbase/views/TabWithPickerWidgetLayout.kt @@ -22,7 +22,7 @@ import com.navi.base.model.CtaData import com.navi.base.model.CtaType import com.navi.design.R as DesignR import com.navi.design.font.FontWeightEnum -import com.navi.design.utils.getFontStyle +import com.navi.design.font.getFontStyle import com.navi.design.utils.getNaviDrawable import com.navi.insurance.R import com.navi.insurance.common.models.NaviWidgetData @@ -152,9 +152,15 @@ constructor(context: Context, attrs: AttributeSet? = null) : FormBaseWidgetView( } context?.let { context -> itemPicker.typeface = - ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.TT_REGULAR)) + ResourcesCompat.getFont( + context, + getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) + ) itemPicker.setSelectedTypeface( - ResourcesCompat.getFont(context, getFontStyle(FontWeightEnum.TT_REGULAR)) + ResourcesCompat.getFont( + context, + getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) + ) ) } itemPicker.setOnScrollListener { view, scrollState -> diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/health/composables/HealthCardFooter.kt b/android/navi-insurance/src/main/java/com/navi/insurance/health/composables/HealthCardFooter.kt index c079b87758..561c5e7215 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/health/composables/HealthCardFooter.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/health/composables/HealthCardFooter.kt @@ -35,8 +35,8 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.navi.base.model.CtaData import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.insurance.R import com.navi.insurance.health.card.HealthCardScreenResponse.HealthCardData.HealthCardFooterData import com.navi.naviwidgets.callbacks.WidgetCallback @@ -85,12 +85,14 @@ fun HealthCardFooter( buildAnnotatedString { withStyle( SpanStyle( - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontSize = 14.sp, color = DARK_GRAY.hexToComposeColor, fontWeight = getFontWeight( - FontWeightEnum.valueOf(FontWeightEnum.TT_REGULAR.name) + FontWeightEnum.valueOf( + FontWeightEnum.NAVI_BODY_REGULAR.name + ) ) ) ) { @@ -100,7 +102,9 @@ fun HealthCardFooter( color = DARK_NAVY_BLUE.hexToComposeColor, fontWeight = getFontWeight( - FontWeightEnum.valueOf(FontWeightEnum.TT_SEMI_BOLD.name) + FontWeightEnum.valueOf( + FontWeightEnum.NAVI_BODY_DEMI_BOLD.name + ) ) ) ) { diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/HospitalsSearchFragment.kt b/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/HospitalsSearchFragment.kt index a8c3226a8d..5692947ac9 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/HospitalsSearchFragment.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/health/fragment/HospitalsSearchFragment.kt @@ -27,7 +27,7 @@ import androidx.viewpager2.widget.ViewPager2 import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator import com.navi.design.font.FontWeightEnum -import com.navi.design.utils.getFontStyle +import com.navi.design.font.getFontStyle import com.navi.insurance.R import com.navi.insurance.analytics.InsuranceAnalyticsConstants import com.navi.insurance.analytics.NaviInsuranceAnalytics @@ -210,7 +210,7 @@ class HospitalsSearchFragment : BaseFragment(), View.OnClickListener { val typeface = ResourcesCompat.getFont( requireContext(), - getFontStyle(FontWeightEnum.TT_MEDIUM) + getFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) ) tabTextView.typeface = typeface @@ -236,7 +236,7 @@ class HospitalsSearchFragment : BaseFragment(), View.OnClickListener { val typeface = ResourcesCompat.getFont( requireContext(), - getFontStyle(FontWeightEnum.TT_REGULAR) + getFontStyle(FontWeightEnum.NAVI_BODY_REGULAR) ) tabTextView.typeface = typeface } 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 ab00c91ad3..03b3ca0925 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 @@ -372,7 +372,7 @@ class SupportHomeFragment : BaseFragment(), View.OnClickListener { resources.getDimension(R.dimen.dp_8).roundToInt() emailView .findViewById(R.id.question_label_tv) - .setFontStyle(FontWeightEnum.TT_MEDIUM) + .setFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) binding.moreHelpLayout.addView(emailView) emailView.addOnMultipleClicksHandler { @@ -417,7 +417,7 @@ class SupportHomeFragment : BaseFragment(), View.OnClickListener { callUsView.findViewById(R.id.divider).isVisible = false callUsView .findViewById(R.id.question_label_tv) - .setFontStyle(FontWeightEnum.TT_MEDIUM) + .setFontStyle(FontWeightEnum.NAVI_HEADLINE_REGULAR) binding.moreHelpLayout.addView(callUsView) callUsView.addOnMultipleClicksHandler { diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/DividerItemComposable.kt b/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/DividerItemComposable.kt index 2e31e0e63c..17833b3290 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/DividerItemComposable.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/DividerItemComposable.kt @@ -44,7 +44,7 @@ fun DividerItemComposable(dividerItemContent: OtherResultsItemContent?) { TextStyle( fontSize = 12.sp, lineHeight = 18.sp, - fontFamily = FontFamily(Font(com.navi.design.R.font.tt_medium)), + fontFamily = FontFamily(Font(com.navi.design.R.font.navi_headline_regular)), fontWeight = FontWeight(400), color = Color(0xFF6B6B6B), ), diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/ErrorItemComposable.kt b/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/ErrorItemComposable.kt index 62c2d5e4b1..ddb2384614 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/ErrorItemComposable.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/ErrorItemComposable.kt @@ -46,7 +46,7 @@ fun ErrorItemComposable(errorItemContent: ErrorItemContent?, onReloadClick: () - TextStyle( fontSize = 14.sp, lineHeight = 22.sp, - fontFamily = FontFamily(Font(com.navi.design.R.font.tt_semi_bold)), + fontFamily = FontFamily(Font(com.navi.design.R.font.navi_body_demi_bold)), fontWeight = FontWeight(600), color = Color(0xFF191919), textAlign = TextAlign.Center, @@ -60,7 +60,7 @@ fun ErrorItemComposable(errorItemContent: ErrorItemContent?, onReloadClick: () - TextStyle( fontSize = 12.sp, lineHeight = 18.sp, - fontFamily = FontFamily(Font(com.navi.design.R.font.tt_medium)), + fontFamily = FontFamily(Font(com.navi.design.R.font.navi_headline_regular)), fontWeight = FontWeight(400), color = Color(0xFF6B6B6B), textAlign = TextAlign.Center, @@ -74,7 +74,7 @@ fun ErrorItemComposable(errorItemContent: ErrorItemContent?, onReloadClick: () - TextStyle( fontSize = 12.sp, lineHeight = 18.sp, - fontFamily = FontFamily(Font(com.navi.design.R.font.tt_medium)), + fontFamily = FontFamily(Font(com.navi.design.R.font.navi_headline_regular)), fontWeight = FontWeight(400), color = Color(0xFF1F002A), textAlign = TextAlign.Center, diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/HospitalItemComposable.kt b/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/HospitalItemComposable.kt index 09a8a777d9..5a3e4fc3ee 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/HospitalItemComposable.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/HospitalItemComposable.kt @@ -104,7 +104,8 @@ fun HospitalItemComposable( TextStyle( fontSize = 14.sp, lineHeight = 22.sp, - fontFamily = FontFamily(Font(com.navi.design.R.font.tt_semi_bold)), + fontFamily = + FontFamily(Font(com.navi.design.R.font.navi_body_demi_bold)), fontWeight = FontWeight(600), color = Color(0xFF191919), ) @@ -160,7 +161,7 @@ fun HospitalItemComposable( fontSize = 12.sp, lineHeight = 18.sp, fontFamily = - FontFamily(Font(com.navi.design.R.font.tt_regular)), + FontFamily(Font(com.navi.design.R.font.navi_body_regular)), fontWeight = FontWeight(400), color = Color(0xFF444444), ) @@ -173,7 +174,7 @@ fun HospitalItemComposable( fontSize = 12.sp, lineHeight = 18.sp, fontFamily = - FontFamily(Font(com.navi.design.R.font.tt_regular)), + FontFamily(Font(com.navi.design.R.font.navi_body_regular)), fontWeight = FontWeight(400), color = Color(0xFF444444), ) @@ -188,7 +189,8 @@ fun HospitalItemComposable( TextStyle( fontSize = 12.sp, lineHeight = 18.sp, - fontFamily = FontFamily(Font(com.navi.design.R.font.tt_regular)), + fontFamily = + FontFamily(Font(com.navi.design.R.font.navi_body_regular)), fontWeight = FontWeight(400), color = Color(0xFF444444), ) @@ -203,7 +205,9 @@ fun HospitalItemComposable( style = SpanStyle( fontFamily = - FontFamily(Font(com.navi.design.R.font.tt_medium)), + FontFamily( + Font(com.navi.design.R.font.navi_headline_regular) + ), ) ) { append(stringResource(id = R.string.address_address_value)) @@ -223,7 +227,7 @@ fun HospitalItemComposable( TextStyle( fontSize = 12.sp, lineHeight = 18.sp, - fontFamily = FontFamily(Font(com.navi.design.R.font.tt_regular)), + fontFamily = FontFamily(Font(com.navi.design.R.font.navi_body_regular)), fontWeight = FontWeight(400), color = Color(0xFF191919), ) @@ -245,7 +249,7 @@ fun HospitalItemComposable( fontSize = 12.sp, lineHeight = 18.sp, fontFamily = - FontFamily(Font(com.navi.design.R.font.tt_regular)), + FontFamily(Font(com.navi.design.R.font.navi_body_regular)), fontWeight = FontWeight(400), color = Color(0xFF22A940), ) diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/HospitalPageComposable.kt b/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/HospitalPageComposable.kt index 7f38414637..dfaff79128 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/HospitalPageComposable.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/HospitalPageComposable.kt @@ -112,10 +112,8 @@ import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper.GOOGLE_MA import com.navi.common.utils.CommonUtils import com.navi.common.utils.Constants as CommonConstants import com.navi.design.font.FontWeightEnum -import com.navi.design.theme.getFontFamily -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily -import com.navi.design.utils.Constants +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.insurance.BuildConfig import com.navi.insurance.R import com.navi.insurance.analytics.InsuranceAnalyticsConstants @@ -485,7 +483,7 @@ fun HospitalFooterButtonComposable( TextStyle( fontSize = 14.sp, lineHeight = 22.sp, - fontFamily = FontFamily(Font(com.navi.design.R.font.tt_semi_bold)), + fontFamily = FontFamily(Font(com.navi.design.R.font.navi_body_demi_bold)), fontWeight = FontWeight(600), color = Color.White, ), @@ -685,7 +683,8 @@ fun ScrollableRowWithCards( Text( modifier = Modifier.align(Alignment.CenterVertically), text = filterItem.value.orEmpty(), - fontFamily = FontFamily(Font(com.navi.design.R.font.tt_semi_bold)), + fontFamily = + FontFamily(Font(com.navi.design.R.font.navi_body_demi_bold)), fontSize = 12.sp, color = Color(0xFF1F002A) ) @@ -950,11 +949,7 @@ fun SearchField( ), keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() }), - textStyle = - TextStyle( - fontSize = 16.sp, - fontFamily = getFontFamily(Constants.TT_FONT_FAMILY) - ), + textStyle = TextStyle(fontSize = 16.sp, fontFamily = naviFontFamily), singleLine = true, modifier = Modifier.fillMaxWidth() ) @@ -965,8 +960,8 @@ fun SearchField( fontSize = 16.sp, modifier = Modifier.fillMaxWidth(), color = Color.Gray.copy(alpha = 0.5f), - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_REGULAR) + fontFamily = naviFontFamily, + fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_REGULAR) ) } } diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/HospitalTopSectionComposable.kt b/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/HospitalTopSectionComposable.kt index 9c55a0d5b9..cedc2546e1 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/HospitalTopSectionComposable.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/HospitalTopSectionComposable.kt @@ -108,7 +108,10 @@ fun HospitalTopSectionComposable( TextStyle( fontSize = 16.sp, lineHeight = 24.sp, - fontFamily = FontFamily(Font(com.navi.design.R.font.tt_medium)), + fontFamily = + FontFamily( + Font(com.navi.design.R.font.navi_headline_regular) + ), fontWeight = FontWeight(600), color = Color.White, textAlign = TextAlign.Center, @@ -154,7 +157,9 @@ fun HospitalTopSectionComposable( fontSize = 14.sp, lineHeight = 22.sp, fontFamily = - FontFamily(Font(com.navi.design.R.font.tt_regular)), + FontFamily( + Font(com.navi.design.R.font.navi_body_regular) + ), fontWeight = FontWeight(600), color = Color.White, ) diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/LocationItemComposable.kt b/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/LocationItemComposable.kt index f1d827df58..1040ea888a 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/LocationItemComposable.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/LocationItemComposable.kt @@ -73,7 +73,8 @@ fun LocationItemComposable( TextStyle( fontSize = 14.sp, lineHeight = 22.sp, - fontFamily = FontFamily(Font(com.navi.design.R.font.tt_medium)), + fontFamily = + FontFamily(Font(com.navi.design.R.font.navi_headline_regular)), fontWeight = FontWeight(400), color = Color(0xFF444444), ) @@ -86,7 +87,7 @@ fun LocationItemComposable( TextStyle( fontSize = 12.sp, lineHeight = 18.sp, - fontFamily = FontFamily(Font(com.navi.design.R.font.tt_regular)), + fontFamily = FontFamily(Font(com.navi.design.R.font.navi_body_regular)), fontWeight = FontWeight(400), color = Color(0xFF6B6B6B), ) diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/LocationPageComposable.kt b/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/LocationPageComposable.kt index 824b43c32b..323d779362 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/LocationPageComposable.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/new_hospital_experience/view/LocationPageComposable.kt @@ -55,10 +55,10 @@ import com.navi.base.utils.EMPTY import com.navi.base.utils.orZero import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper import com.navi.design.font.FontWeightEnum +import com.navi.design.font.getFontWeight +import com.navi.design.font.naviFontFamily import com.navi.design.theme.FF1F002A import com.navi.design.theme.GreyE3E5E5 -import com.navi.design.theme.getFontWeight -import com.navi.design.theme.ttComposeFontFamily import com.navi.insurance.BuildConfig import com.navi.insurance.R import com.navi.insurance.analytics.InsuranceAnalyticsConstants @@ -226,8 +226,9 @@ fun LocationPageComposable( ), text = stringResource(id = R.string.search_results), color = FF1F002A, - fontFamily = ttComposeFontFamily, - fontWeight = getFontWeight(FontWeightEnum.TT_SEMI_BOLD) + fontFamily = naviFontFamily, + fontWeight = + getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD) ) } LocationItemComposable( 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 b645072281..00cda13642 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 @@ -68,7 +68,7 @@ import com.navi.base.utils.orFalse import com.navi.base.utils.orOne import com.navi.base.utils.orZero import com.navi.design.customview.DashedDivider -import com.navi.design.theme.ttComposeFontFamily +import com.navi.design.font.naviFontFamily import com.navi.insurance.R as InsuranceR import com.navi.insurance.pre.purchase.journey.composables.reusable.CustomCheckBox import com.navi.insurance.pre.purchase.journey.composables.reusable.CustomRadioButton @@ -590,7 +590,7 @@ fun Counter(countData: CounterDropDownData?, onSelection: (CounterDropDownData) color = colorTextPrimary, fontSize = 16.sp, textAlign = TextAlign.Center, - fontFamily = ttComposeFontFamily, + fontFamily = naviFontFamily, fontWeight = FontWeight.Medium, style = TextStyle(platformStyle = PlatformTextStyle(includeFontPadding = true)) ) diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/pre/purchase/journey/theme/PrePurchaseJourneyTypography.kt b/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/pre/purchase/journey/theme/PrePurchaseJourneyTypography.kt index 3b5e2c38a4..c9d93f9179 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/pre/purchase/journey/theme/PrePurchaseJourneyTypography.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/pre/purchase/journey/theme/PrePurchaseJourneyTypography.kt @@ -21,7 +21,7 @@ import com.navi.naviwidgets.models.response.ImageFieldData import com.navi.naviwidgets.models.response.TextDrawableData import com.navi.naviwidgets.models.response.TextFieldData -private val ttFontFamily = FontFamily(Font(NaviDesignR.font.tt_regular, FontWeight.Normal)) +private val ttFontFamily = FontFamily(Font(NaviDesignR.font.navi_body_regular, FontWeight.Normal)) data class PrePurchaseJourneyTypography( val subtitle: TextStyle = diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuotePremiumDetailsBottomSheet.kt b/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuotePremiumDetailsBottomSheet.kt index 4a8f0e1de3..9767a5e0eb 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuotePremiumDetailsBottomSheet.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/QuotePremiumDetailsBottomSheet.kt @@ -23,7 +23,7 @@ import com.navi.common.model.ModuleName import com.navi.common.utils.CommonNaviAnalytics import com.navi.common.utils.getNetworkType import com.navi.design.font.FontWeightEnum -import com.navi.design.utils.getFontStyle +import com.navi.design.font.getFontStyle import com.navi.insurance.R import com.navi.insurance.common.fragment.BaseBottomSheet import com.navi.insurance.common.models.GiErrorMetaData @@ -187,7 +187,10 @@ class QuotePremiumDetailsBottomSheet : BaseBottomSheet(), View.OnClickListener { if (bold) { val typeFace = - ResourcesCompat.getFont(requireContext(), getFontStyle(FontWeightEnum.TT_SEMI_BOLD)) + ResourcesCompat.getFont( + requireContext(), + getFontStyle(FontWeightEnum.NAVI_BODY_DEMI_BOLD) + ) subViewBinding.itemTitle.typeface = typeFace subViewBinding.itemValue.typeface = typeFace } 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 65a6ed8998..b1e6bb5b1f 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 @@ -590,7 +590,7 @@ fun getTitleDescBottomSheetCta(title: String?, description: String?, buttonText: title, size = 16, textColor = R.color.eerie_black.toHexRgbColorString(), - font = FontWeightEnum.TT_SEMI_BOLD.name + font = FontWeightEnum.NAVI_BODY_DEMI_BOLD.name ), description = TextFieldData( @@ -602,7 +602,7 @@ fun getTitleDescBottomSheetCta(title: String?, description: String?, buttonText: TextFieldData( text = buttonText, textColor = R.color.white.toHexRgbColorString(), - font = FontWeightEnum.TT_SEMI_BOLD.name + font = FontWeightEnum.NAVI_BODY_DEMI_BOLD.name ) ) ) diff --git a/android/navi-insurance/src/main/res/layout/about_us.xml b/android/navi-insurance/src/main/res/layout/about_us.xml index cca7dddaf4..a848ddc5b9 100644 --- a/android/navi-insurance/src/main/res/layout/about_us.xml +++ b/android/navi-insurance/src/main/res/layout/about_us.xml @@ -48,7 +48,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_32" android:alpha="0.70" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Making Health Insurance" android:textColor="@color/white" android:textSize="@dimen/sp_14" /> @@ -58,7 +58,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_12" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Fast, Affordable & Reliable" android:textColor="@color/white" android:textSize="@dimen/sp_20" /> @@ -79,7 +79,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_10" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="You’re with the experts" android:textColor="@color/naviSubText" android:textSize="@dimen/sp_14" /> @@ -102,7 +102,7 @@ android:id="@+id/tv_claims_value" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:text="₹ 27Cr+" android:textAlignment="center" android:textColor="@color/naviBlackText" @@ -116,7 +116,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_4" android:alpha="0.6" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="Claims Settled" android:textAlignment="center" android:textColor="@color/naviBlackText" @@ -137,7 +137,7 @@ android:id="@+id/tv_customers_value" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:text="12 Lakhs+" android:textAlignment="center" android:textColor="@color/naviBlackText" @@ -151,7 +151,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_4" android:alpha="0.6" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="Customers Trust" android:textAlignment="center" android:textColor="@color/naviBlackText" @@ -182,7 +182,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_10" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="Who are we?" android:textColor="@color/naviSubText" android:textSize="@dimen/sp_14" /> @@ -193,7 +193,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="@dimen/dp_4" android:paddingHorizontal="@dimen/dp_40" android:text="At Navi General Insurance, our purpose is to give you one of the world's best claims experience and benefits." @@ -219,7 +219,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_10" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="Our Team" android:textColor="@color/naviSubText" android:textSize="@dimen/sp_14" /> @@ -249,7 +249,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:alpha="0.8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="IRDAI Reg No: 155 \nCIN: U66000KA2016PLC148551" android:textAlignment="center" android:textColor="@color/naviGrey" diff --git a/android/navi-insurance/src/main/res/layout/action_button_layout.xml b/android/navi-insurance/src/main/res/layout/action_button_layout.xml index 5ecb11a200..c72e077368 100644 --- a/android/navi-insurance/src/main/res/layout/action_button_layout.xml +++ b/android/navi-insurance/src/main/res/layout/action_button_layout.xml @@ -41,7 +41,7 @@ tools:text="Retake" style="@style/ButtonFontStyleGreyBlack" android:textAllCaps="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_14" android:layout_marginEnd="@dimen/dp_8" android:layout_width="@dimen/dp_0" @@ -52,7 +52,7 @@ android:id="@+id/main_action_button" style="@style/ButtonFontStylePurple" android:textAllCaps="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_14" tools:text="Get Insured" android:layout_marginStart="@dimen/dp_8" diff --git a/android/navi-insurance/src/main/res/layout/activity_intro_v3.xml b/android/navi-insurance/src/main/res/layout/activity_intro_v3.xml index 40dde87ca7..bfd612cf8e 100644 --- a/android/navi-insurance/src/main/res/layout/activity_intro_v3.xml +++ b/android/navi-insurance/src/main/res/layout/activity_intro_v3.xml @@ -80,7 +80,7 @@ style="@style/ButtonFontStylePurple" android:clickable="true" android:focusable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_horizontal|center_vertical" android:text="@string/get_started" android:textAlignment="center" @@ -159,7 +159,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_32" android:background="@color/shimmerGrey" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:lineSpacingExtra="@dimen/sp_6" android:textAlignment="center" @@ -175,7 +175,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:background="@color/shimmerGrey" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="@dimen/sp_4" android:textAlignment="center" @@ -191,7 +191,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_16" android:background="@color/shimmerGrey" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:lineSpacingExtra="@dimen/sp_4" android:minWidth="@dimen/dp_150" diff --git a/android/navi-insurance/src/main/res/layout/activity_kyc.xml b/android/navi-insurance/src/main/res/layout/activity_kyc.xml index 2c7ddff56d..48c5e8482c 100644 --- a/android/navi-insurance/src/main/res/layout/activity_kyc.xml +++ b/android/navi-insurance/src/main/res/layout/activity_kyc.xml @@ -42,7 +42,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:minWidth="@dimen/dp_20" android:textColor="@color/naviBlackText" 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 27b8a0e24b..e1462209bd 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 @@ -38,7 +38,7 @@ android:layout_weight="1" android:drawablePadding="10dp" android:drawableTop="@drawable/ic_trust" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Trusted by\n12 lakh Indians" android:textColor="@color/naviGrey" android:textAlignment="center" @@ -51,7 +51,7 @@ android:layout_weight="1" android:drawableTop="@drawable/navi_insurance_ic_money_bag" android:drawablePadding="10dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="₹ 27 Cr+ \nClaims Settled" android:textColor="@color/naviGrey" android:textAlignment="center" @@ -64,7 +64,7 @@ android:layout_weight="1" android:drawablePadding="8dp" android:drawableTop="@drawable/ic_medal" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Certified \nby IRDAI" android:textColor="@color/naviGrey" android:textAlignment="center" diff --git a/android/navi-insurance/src/main/res/layout/address_details_page_layout.xml b/android/navi-insurance/src/main/res/layout/address_details_page_layout.xml index 9f3aa07e91..bd80c79371 100644 --- a/android/navi-insurance/src/main/res/layout/address_details_page_layout.xml +++ b/android/navi-insurance/src/main/res/layout/address_details_page_layout.xml @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:textColor="@color/title_text_color" android:textSize="@dimen/sp_20" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" tools:text="Gift box dispatched" /> @@ -81,7 +81,7 @@ android:layout_marginTop="@dimen/dp_8" android:textColor="@color/titleTertiaryColor" android:textSize="@dimen/sp_12" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintStart_toStartOf="parent" android:lineSpacingExtra="@dimen/sp_6" app:layout_constraintTop_toBottomOf="@id/title_gift" @@ -97,7 +97,7 @@ android:paddingHorizontal="@dimen/dp_16" android:paddingVertical="@dimen/dp_12" android:textColor="@color/titleTertiaryColor" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_12" android:lineSpacingExtra="@dimen/sp_6" app:layout_constraintStart_toStartOf="parent" @@ -134,7 +134,7 @@ android:id="@+id/address_text_view" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/confirm_your_details" android:textColor="@color/title_text_color" android:textSize="@dimen/sp_20" @@ -148,7 +148,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_4" android:text="@string/gift_box_address" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/description4Color" android:textSize="@dimen/sp_12" app:layout_constraintStart_toStartOf="parent" @@ -160,7 +160,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_32" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/contact_number" android:textColor="@color/titleColor1" android:textSize="@dimen/sp_16" @@ -183,7 +183,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/country_code" android:textColor="@color/color_191919" android:textSize="@dimen/sp_16" /> @@ -202,7 +202,7 @@ android:layout_gravity="center" android:layout_marginStart="@dimen/dp_8" android:background="@color/white" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:hint="@string/enter_here" android:inputType="number" android:maxLength="@integer/integer_10" @@ -217,7 +217,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/flat_house_no_title" android:textColor="@color/titleColor1" android:textSize="@dimen/sp_16" @@ -230,7 +230,7 @@ android:layout_height="@dimen/dp_48" android:layout_marginTop="@dimen/dp_8" android:background="@drawable/rounded_rect_light_grey_border_8dp_radius" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:hint="@string/address_line_1_hint" android:paddingHorizontal="@dimen/dp_16" android:textColor="@color/color_191919" @@ -245,7 +245,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/street" android:textColor="@color/titleColor1" android:textSize="@dimen/sp_16" @@ -258,7 +258,7 @@ android:layout_height="@dimen/dp_48" android:layout_marginTop="@dimen/dp_8" android:background="@drawable/rounded_rect_light_grey_border_8dp_radius" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:hint="@string/address_line_2_hint" android:paddingHorizontal="@dimen/dp_16" android:textColor="@color/color_191919" @@ -273,7 +273,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/local_area" android:textColor="@color/titleColor1" android:textSize="@dimen/sp_16" @@ -286,7 +286,7 @@ android:layout_height="@dimen/dp_48" android:layout_marginTop="@dimen/dp_8" android:background="@drawable/rounded_rect_light_grey_border_8dp_radius" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:hint="@string/address_line_3_hint" android:paddingHorizontal="@dimen/dp_16" android:textColor="@color/color_191919" @@ -301,7 +301,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/postal_code" android:textColor="@color/titleColor1" android:textSize="@dimen/sp_16" @@ -317,7 +317,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/city_district" android:textColor="@color/titleColor1" android:textSize="@dimen/sp_16" @@ -334,7 +334,7 @@ android:layout_marginTop="@dimen/dp_8" android:layout_marginEnd="@dimen/dp_16" android:background="@drawable/rounded_rect_light_grey_border_8dp_radius" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:hint="@string/enter_here" android:inputType="number" android:maxLength="@integer/integer_6" @@ -354,7 +354,7 @@ android:layout_height="@dimen/dp_48" android:layout_marginTop="@dimen/dp_8" android:background="@drawable/rounded_rect_light_grey_border_8dp_radius" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:hint="@string/enter_city" android:inputType="text" android:paddingHorizontal="@dimen/dp_16" diff --git a/android/navi-insurance/src/main/res/layout/all_banks_item.xml b/android/navi-insurance/src/main/res/layout/all_banks_item.xml index 28a632d616..7b8d079d19 100644 --- a/android/navi-insurance/src/main/res/layout/all_banks_item.xml +++ b/android/navi-insurance/src/main/res/layout/all_banks_item.xml @@ -9,7 +9,7 @@ android:layout_marginVertical="@dimen/dp_16" android:layout_width="wrap_content" android:textSize="@dimen/sp_14" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviBlackText" android:layout_height="wrap_content" tools:text="TextView" /> diff --git a/android/navi-insurance/src/main/res/layout/amount_explainer_animation_widget.xml b/android/navi-insurance/src/main/res/layout/amount_explainer_animation_widget.xml index e511a8afbb..2dfe45dbc0 100644 --- a/android/navi-insurance/src/main/res/layout/amount_explainer_animation_widget.xml +++ b/android/navi-insurance/src/main/res/layout/amount_explainer_animation_widget.xml @@ -38,7 +38,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_2" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/grey_charcoal" android:textSize="@dimen/sp_14" app:layout_constraintStart_toStartOf="parent" @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_22" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/white" android:textSize="@dimen/sp_12" android:layout_marginTop="@dimen/dp_4" @@ -90,7 +90,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/layout_dp_38" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingBottom="@dimen/dp_12" android:textColor="@color/blueberry" android:textSize="@dimen/sp_12" diff --git a/android/navi-insurance/src/main/res/layout/amount_explainer_text_widget.xml b/android/navi-insurance/src/main/res/layout/amount_explainer_text_widget.xml index 3cd2fb857d..412d67fb20 100644 --- a/android/navi-insurance/src/main/res/layout/amount_explainer_text_widget.xml +++ b/android/navi-insurance/src/main/res/layout/amount_explainer_text_widget.xml @@ -38,7 +38,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_2" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/grey_charcoal" android:textSize="@dimen/sp_14" app:layout_constraintStart_toStartOf="parent" @@ -68,7 +68,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingEnd="@dimen/dp_100" android:textColor="@color/black" android:textSize="@dimen/sp_14" @@ -101,7 +101,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_12" android:layout_marginTop="@dimen/dp_36" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingEnd="@dimen/dp_56" android:textColor="@color/dim_grey" android:textSize="@dimen/sp_12" diff --git a/android/navi-insurance/src/main/res/layout/amount_selection_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/amount_selection_bottom_sheet.xml index c776787550..809506d078 100644 --- a/android/navi-insurance/src/main/res/layout/amount_selection_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/amount_selection_bottom_sheet.xml @@ -22,7 +22,7 @@ android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" tools:text="We currently don’t have plans as per your existing cover" android:lineHeight="@dimen/sp_24" android:textColor="@color/black" @@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_16" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:lineHeight="@dimen/sp_22" tools:text="Pay monthly for a period of 12 months.Pay monthly for a period of 12 months.Pay monthly for a period of 12 months." diff --git a/android/navi-insurance/src/main/res/layout/answer_chat_message.xml b/android/navi-insurance/src/main/res/layout/answer_chat_message.xml index 91b371dbce..3f4527fe78 100644 --- a/android/navi-insurance/src/main/res/layout/answer_chat_message.xml +++ b/android/navi-insurance/src/main/res/layout/answer_chat_message.xml @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_12" app:layout_constraintStart_toStartOf="parent" @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_4" android:ellipsize="end" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviSubText" android:textSize="@dimen/sp_12" app:layout_constraintBottom_toBottomOf="parent" 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 f5a7aa9e8c..e87e783683 100644 --- a/android/navi-insurance/src/main/res/layout/apology_fragment.xml +++ b/android/navi-insurance/src/main/res/layout/apology_fragment.xml @@ -120,7 +120,7 @@ android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_12" android:layout_marginEnd="@dimen/dp_20" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textAlignment="center" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -138,7 +138,7 @@ android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_12" android:layout_marginEnd="@dimen/dp_20" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textAlignment="center" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/auto_pay_status_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/auto_pay_status_bottom_sheet.xml index 3b46fc0e0a..c1018219b3 100644 --- a/android/navi-insurance/src/main/res/layout/auto_pay_status_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/auto_pay_status_bottom_sheet.xml @@ -27,7 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="₹440 AutoPay setup failed" android:textAlignment="center" android:textAllCaps="false" @@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_12" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Please retry again" android:textAllCaps="false" android:textColor="#4d4d4d" @@ -54,7 +54,7 @@ android:layout_gravity="center_vertical" android:layout_marginTop="@dimen/dp_24" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_horizontal|center_vertical" android:paddingLeft="15dp" android:paddingRight="15dp" @@ -73,7 +73,7 @@ android:layout_gravity="center_vertical" android:layout_marginTop="@dimen/dp_24" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_horizontal|center_vertical" android:paddingLeft="15dp" android:paddingRight="15dp" diff --git a/android/navi-insurance/src/main/res/layout/autopay_from_quote_bottomsheet.xml b/android/navi-insurance/src/main/res/layout/autopay_from_quote_bottomsheet.xml index 73bc821503..d039c55010 100644 --- a/android/navi-insurance/src/main/res/layout/autopay_from_quote_bottomsheet.xml +++ b/android/navi-insurance/src/main/res/layout/autopay_from_quote_bottomsheet.xml @@ -105,7 +105,7 @@ android:layout_marginTop="@dimen/dp_24" style="@style/ButtonFontStylePurple" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_horizontal|center_vertical" android:paddingLeft="@dimen/dp_15" android:paddingRight="@dimen/dp_15" diff --git a/android/navi-insurance/src/main/res/layout/autopay_setup_back_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/autopay_setup_back_bottom_sheet.xml index 783c3299b9..e7ec38a29e 100644 --- a/android/navi-insurance/src/main/res/layout/autopay_setup_back_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/autopay_setup_back_bottom_sheet.xml @@ -51,7 +51,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_11" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:lineHeight="@dimen/sp_22" android:paddingTop="@dimen/dp_17" android:paddingBottom="@dimen/dp_17" @@ -71,7 +71,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_16" android:layout_marginTop="@dimen/dp_16" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:lineHeight="@dimen/sp_24" android:textColor="@color/black" android:textSize="@dimen/sp_18" @@ -85,7 +85,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_16" android:layout_marginTop="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineHeight="@dimen/sp_24" android:lineSpacingExtra="@dimen/sp_4" android:textColor="@color/black" @@ -124,7 +124,7 @@ android:id="@+id/left_button_tv" android:layout_width="match_parent" android:layout_height="match_parent" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:gravity="center" android:lineSpacingExtra="@dimen/sp_2" android:textSize="@dimen/sp_14" @@ -157,7 +157,7 @@ android:id="@+id/right_button_tv" android:layout_width="match_parent" android:layout_height="match_parent" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:gravity="center" android:lineSpacingExtra="@dimen/sp_2" android:textSize="@dimen/sp_14" @@ -202,7 +202,7 @@ android:id="@+id/left_button_vertical_tv" android:layout_width="wrap_content" android:layout_height="match_parent" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:gravity="center" android:lineSpacingExtra="@dimen/sp_2" android:textSize="@dimen/sp_14" @@ -236,7 +236,7 @@ android:id="@+id/right_button_vertical_tv" android:layout_width="wrap_content" android:layout_height="match_parent" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:gravity="center" android:lineSpacingExtra="@dimen/sp_2" android:textSize="@dimen/sp_14" diff --git a/android/navi-insurance/src/main/res/layout/bank_branches_item.xml b/android/navi-insurance/src/main/res/layout/bank_branches_item.xml index 57a093e939..1d2914c1a5 100644 --- a/android/navi-insurance/src/main/res/layout/bank_branches_item.xml +++ b/android/navi-insurance/src/main/res/layout/bank_branches_item.xml @@ -12,7 +12,7 @@ android:id="@+id/title" android:textSize="@dimen/sp_14" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:layout_marginBottom="@dimen/dp_4" android:layout_width="wrap_content" android:textColor="@color/naviBlackText" @@ -22,7 +22,7 @@ android:id="@+id/subtitle" android:textSize="@dimen/sp_12" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/naviSubText" diff --git a/android/navi-insurance/src/main/res/layout/bank_search_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/bank_search_bottom_sheet.xml index 5298f45fee..a07a65f13f 100644 --- a/android/navi-insurance/src/main/res/layout/bank_search_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/bank_search_bottom_sheet.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:layout_marginHorizontal="@dimen/dp_20" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/search_for_bank" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_18" /> @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginTop="@dimen/dp_32" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/subtitle_select_bank" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_18" /> @@ -61,7 +61,7 @@ android:drawableTint="@color/naviSubText" android:paddingHorizontal="@dimen/dp_9" android:textSize="@dimen/sp_14" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:inputType="textVisiblePassword|textNoSuggestions" android:hint="@string/search_for_your_bank_name_here" > @@ -73,7 +73,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_16" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:text="@string/popular_banks" android:textColor="@color/naviSubText" android:textSize="@dimen/sp_14" /> @@ -95,7 +95,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_8" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:text="@string/all_banks" android:textColor="@color/naviSubText" android:textSize="@dimen/sp_14" /> diff --git a/android/navi-insurance/src/main/res/layout/benefit_details_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/benefit_details_bottom_sheet.xml index 60f3694ed4..0cc711ad01 100644 --- a/android/navi-insurance/src/main/res/layout/benefit_details_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/benefit_details_bottom_sheet.xml @@ -41,7 +41,7 @@ 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 af796c56d2..abffbc5c11 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 @@ -73,7 +73,7 @@ android:layout_marginEnd="@dimen/dp_30" android:layout_marginBottom="@dimen/dp_16" android:background="@drawable/navi_insurance_button_with_state_8dp_radius" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/submit_rating" android:textAllCaps="false" android:textColor="@color/white" diff --git a/android/navi-insurance/src/main/res/layout/bottom_sheet_add_member.xml b/android/navi-insurance/src/main/res/layout/bottom_sheet_add_member.xml index 41bff99caf..d283a65cd1 100644 --- a/android/navi-insurance/src/main/res/layout/bottom_sheet_add_member.xml +++ b/android/navi-insurance/src/main/res/layout/bottom_sheet_add_member.xml @@ -103,7 +103,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_8" android:background="@drawable/circular_navi_red_light_background" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:paddingHorizontal="@dimen/dp_5" android:textColor="@color/text_secondary_color" diff --git a/android/navi-insurance/src/main/res/layout/bottom_sheet_api_call.xml b/android/navi-insurance/src/main/res/layout/bottom_sheet_api_call.xml index 4241c5b52e..d92d0ea8d0 100644 --- a/android/navi-insurance/src/main/res/layout/bottom_sheet_api_call.xml +++ b/android/navi-insurance/src/main/res/layout/bottom_sheet_api_call.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textAlignment="center" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_16" @@ -41,7 +41,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginTop="@dimen/dp_6" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textAlignment="center" android:textColor="@color/naviSubText" android:textSize="@dimen/sp_12" @@ -59,7 +59,7 @@ android:layout_marginBottom="@dimen/dp_20" android:visibility="gone" android:gravity="center" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/retry" app:layout_constraintStart_toStartOf="parent" @@ -74,7 +74,7 @@ android:layout_height="@dimen/dp_48" android:layout_marginHorizontal="@dimen/dp_20" android:visibility="gone" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" app:layout_constraintBottom_toBottomOf="@id/close" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/close" diff --git a/android/navi-insurance/src/main/res/layout/bottom_sheet_edit_sum_insured.xml b/android/navi-insurance/src/main/res/layout/bottom_sheet_edit_sum_insured.xml index a1bec12541..673bcdbb5a 100644 --- a/android/navi-insurance/src/main/res/layout/bottom_sheet_edit_sum_insured.xml +++ b/android/navi-insurance/src/main/res/layout/bottom_sheet_edit_sum_insured.xml @@ -33,7 +33,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/layout_dp_24" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:paddingStart="@dimen/layout_dp_24" android:paddingEnd="@dimen/layout_dp_24" @@ -51,7 +51,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/layout_dp_8" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:paddingStart="@dimen/layout_dp_24" android:paddingEnd="@dimen/layout_dp_24" @@ -70,7 +70,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/layout_dp_16" android:background="@drawable/grey_rounded_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:paddingStart="@dimen/layout_dp_16" android:paddingTop="@dimen/layout_dp_8" @@ -103,7 +103,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/layout_dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:paddingStart="@dimen/layout_dp_24" android:paddingEnd="@dimen/layout_dp_24" @@ -125,7 +125,7 @@ android:layout_marginEnd="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_24" style="@style/ButtonFontStylePurple" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/text_continue" android:textAllCaps="false" android:textSize="@dimen/sp_16" diff --git a/android/navi-insurance/src/main/res/layout/bottom_sheet_existing_members.xml b/android/navi-insurance/src/main/res/layout/bottom_sheet_existing_members.xml index 06f6881508..d77e22223e 100644 --- a/android/navi-insurance/src/main/res/layout/bottom_sheet_existing_members.xml +++ b/android/navi-insurance/src/main/res/layout/bottom_sheet_existing_members.xml @@ -42,7 +42,7 @@ android:layout_marginTop="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_24" style="@style/ButtonFontStylePurple" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:stateListAnimator="@null" android:text="@string/ok_got_it" android:textAllCaps="false" diff --git a/android/navi-insurance/src/main/res/layout/bottom_sheet_payment_modes.xml b/android/navi-insurance/src/main/res/layout/bottom_sheet_payment_modes.xml index cdf533360c..970fd548d0 100644 --- a/android/navi-insurance/src/main/res/layout/bottom_sheet_payment_modes.xml +++ b/android/navi-insurance/src/main/res/layout/bottom_sheet_payment_modes.xml @@ -31,7 +31,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_48" android:layout_marginVertical="@dimen/dp_24" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="@string/pay_amount_title" android:textAllCaps="false" diff --git a/android/navi-insurance/src/main/res/layout/bottom_sheet_two_action.xml b/android/navi-insurance/src/main/res/layout/bottom_sheet_two_action.xml index de9969c508..3e6d6189e0 100644 --- a/android/navi-insurance/src/main/res/layout/bottom_sheet_two_action.xml +++ b/android/navi-insurance/src/main/res/layout/bottom_sheet_two_action.xml @@ -50,7 +50,7 @@ android:layout_marginTop="@dimen/dp_24" android:layout_marginEnd="@dimen/dp_20" style="@style/ButtonFontStylePurple" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:stateListAnimator="@null" android:textAllCaps="false" android:textSize="@dimen/sp_14" @@ -67,7 +67,7 @@ android:layout_marginTop="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_32" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:stateListAnimator="@null" android:textAllCaps="false" android:textSize="@dimen/sp_14" diff --git a/android/navi-insurance/src/main/res/layout/bottomsheet_about_us.xml b/android/navi-insurance/src/main/res/layout/bottomsheet_about_us.xml index 66c5a40bd5..5ffba4c7d0 100644 --- a/android/navi-insurance/src/main/res/layout/bottomsheet_about_us.xml +++ b/android/navi-insurance/src/main/res/layout/bottomsheet_about_us.xml @@ -59,7 +59,7 @@ android:layout_gravity="start" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="0dp" android:text="Okay, got it" diff --git a/android/navi-insurance/src/main/res/layout/bottomsheet_header_and_text_lines.xml b/android/navi-insurance/src/main/res/layout/bottomsheet_header_and_text_lines.xml index 9abf4a2d37..1fa80846d6 100644 --- a/android/navi-insurance/src/main/res/layout/bottomsheet_header_and_text_lines.xml +++ b/android/navi-insurance/src/main/res/layout/bottomsheet_header_and_text_lines.xml @@ -45,7 +45,7 @@ android:id="@+id/header_title" android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:lineSpacingExtra="@dimen/sp_4" android:textColor="@color/black" android:textSize="@dimen/sp_14" @@ -87,7 +87,7 @@ android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_16" android:layout_marginBottom="@dimen/dp_32" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:gravity="center" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -106,7 +106,7 @@ android:layout_marginTop="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16" android:layout_marginBottom="@dimen/dp_32" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:gravity="center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/bottomsheet_request_callback_success.xml b/android/navi-insurance/src/main/res/layout/bottomsheet_request_callback_success.xml index e989e96b02..bbf6a62cfe 100644 --- a/android/navi-insurance/src/main/res/layout/bottomsheet_request_callback_success.xml +++ b/android/navi-insurance/src/main/res/layout/bottomsheet_request_callback_success.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="@dimen/dp_20" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/callback_request_received" android:textAlignment="center" android:textAllCaps="false" @@ -44,7 +44,7 @@ android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_8" android:layout_marginEnd="@dimen/dp_20" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/insurance_expert_call_back_text" android:textAlignment="center" android:textAllCaps="false" @@ -70,7 +70,7 @@ android:layout_gravity="start" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="@string/okay_got_it" android:textAllCaps="false" diff --git a/android/navi-insurance/src/main/res/layout/box_edit_text_layout.xml b/android/navi-insurance/src/main/res/layout/box_edit_text_layout.xml index eab8c2b59c..984e5900cb 100644 --- a/android/navi-insurance/src/main/res/layout/box_edit_text_layout.xml +++ b/android/navi-insurance/src/main/res/layout/box_edit_text_layout.xml @@ -6,7 +6,7 @@ style="@style/BoxInputGroupStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:inputType="number" /> diff --git a/android/navi-insurance/src/main/res/layout/branch_search_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/branch_search_bottom_sheet.xml index 005c32ca4d..270dae0b8a 100644 --- a/android/navi-insurance/src/main/res/layout/branch_search_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/branch_search_bottom_sheet.xml @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:layout_marginHorizontal="@dimen/dp_20" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/search_for_branch" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_18" /> @@ -46,7 +46,7 @@ android:drawableStart="@drawable/search" android:drawablePadding="@dimen/dp_9" android:drawableTint="@color/naviSubText" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:hint="@string/enter_branch_name" android:inputType="textVisiblePassword|textNoSuggestions" android:paddingHorizontal="@dimen/dp_9" diff --git a/android/navi-insurance/src/main/res/layout/bullet_point_two_grid.xml b/android/navi-insurance/src/main/res/layout/bullet_point_two_grid.xml index c2f11dd3cf..740d489847 100644 --- a/android/navi-insurance/src/main/res/layout/bullet_point_two_grid.xml +++ b/android/navi-insurance/src/main/res/layout/bullet_point_two_grid.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:drawableStart="@drawable/ic_bullet_round_white" android:drawablePadding="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingHorizontal="@dimen/dp_12" android:textColor="@color/white" android:textSize="@dimen/sp_12" @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:drawableStart="@drawable/ic_bullet_round_white" android:drawablePadding="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingHorizontal="@dimen/dp_24" android:textColor="@color/white" android:textSize="@dimen/sp_12" diff --git a/android/navi-insurance/src/main/res/layout/buy_insurance_card.xml b/android/navi-insurance/src/main/res/layout/buy_insurance_card.xml index 57d13738a6..ff7c2d4d73 100644 --- a/android/navi-insurance/src/main/res/layout/buy_insurance_card.xml +++ b/android/navi-insurance/src/main/res/layout/buy_insurance_card.xml @@ -15,7 +15,7 @@ android:layout_marginStart="@dimen/dp_24" android:layout_marginTop="@dimen/dp_32" android:layout_marginEnd="@dimen/dp_16" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:textColor="@color/white" android:textSize="@dimen/sp_20" app:layout_constraintEnd_toStartOf="@+id/title_image" @@ -55,7 +55,7 @@ android:layout_marginTop="@dimen/dp_32" android:layout_marginEnd="@dimen/dp_24" android:layout_marginBottom="@dimen/dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textAllCaps="false" android:textSize="@dimen/sp_16" style="@style/ButtonFontStylePurple" diff --git a/android/navi-insurance/src/main/res/layout/card_checkbox_list_item.xml b/android/navi-insurance/src/main/res/layout/card_checkbox_list_item.xml index 547fee2fc4..f06a8252c7 100644 --- a/android/navi-insurance/src/main/res/layout/card_checkbox_list_item.xml +++ b/android/navi-insurance/src/main/res/layout/card_checkbox_list_item.xml @@ -24,7 +24,7 @@ android:clipToPadding="false" android:drawableEnd="@drawable/checkbox_circle" android:drawablePadding="8dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingEnd="15dp" android:paddingVertical="16dp" android:text="Myself" diff --git a/android/navi-insurance/src/main/res/layout/card_checkbox_unwell_member.xml b/android/navi-insurance/src/main/res/layout/card_checkbox_unwell_member.xml index 315917f4a3..1f4428a307 100644 --- a/android/navi-insurance/src/main/res/layout/card_checkbox_unwell_member.xml +++ b/android/navi-insurance/src/main/res/layout/card_checkbox_unwell_member.xml @@ -24,7 +24,7 @@ android:clipToPadding="false" android:drawableEnd="@drawable/checkbox_circle" android:drawablePadding="8dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingEnd="15dp" android:paddingVertical="16dp" android:text="Myself" 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 c283f5ea1f..94cd797821 100644 --- a/android/navi-insurance/src/main/res/layout/card_feedback.xml +++ b/android/navi-insurance/src/main/res/layout/card_feedback.xml @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:layout_marginStart="20dp" android:layout_marginTop="32dp" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="Seems like you are leaving!" android:textAlignment="center" android:textAllCaps="false" @@ -45,7 +45,7 @@ android:layout_height="wrap_content" android:layout_marginStart="20dp" android:layout_marginTop="24dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="What went wrong?" android:textColor="@color/naviBlackText" android:textSize="12sp" /> @@ -78,7 +78,7 @@ android:layout_weight="1" android:background="@drawable/rounded_rectangle_grey_8dp_radius" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="0dp" android:text="Close" @@ -98,7 +98,7 @@ android:layout_weight="1" android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="0dp" android:text="Submit" diff --git a/android/navi-insurance/src/main/res/layout/card_feedback_success.xml b/android/navi-insurance/src/main/res/layout/card_feedback_success.xml index 27b015cf8a..98e3ff6fbc 100644 --- a/android/navi-insurance/src/main/res/layout/card_feedback_success.xml +++ b/android/navi-insurance/src/main/res/layout/card_feedback_success.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="20dp" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="Feedback received" android:textAlignment="center" android:textAllCaps="false" @@ -43,7 +43,7 @@ android:layout_marginStart="20dp" android:layout_marginTop="8dp" android:layout_marginEnd="30dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Thank you for sharing the feedback with us." android:textAllCaps="false" android:textColor="#4d4d4d" @@ -67,7 +67,7 @@ android:layout_gravity="start" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="0dp" android:text="Close" @@ -85,7 +85,7 @@ android:layout_marginStart="20dp" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="0dp" android:text="Exit App" diff --git a/android/navi-insurance/src/main/res/layout/card_hospital_list_v2.xml b/android/navi-insurance/src/main/res/layout/card_hospital_list_v2.xml index 07760ff473..0df9470d31 100644 --- a/android/navi-insurance/src/main/res/layout/card_hospital_list_v2.xml +++ b/android/navi-insurance/src/main/res/layout/card_hospital_list_v2.xml @@ -28,7 +28,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:text="Ameya Netra Rugnalaya" android:maxLines="2" @@ -45,7 +45,7 @@ android:layout_height="wrap_content" android:layout_marginTop="5dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="You can claim up to ₹ 2,000 against ambulance charges once for each hospitalization" android:textColor="@color/naviSubText" diff --git a/android/navi-insurance/src/main/res/layout/card_hospital_v2.xml b/android/navi-insurance/src/main/res/layout/card_hospital_v2.xml index 9ad7dbdda1..354edf861a 100644 --- a/android/navi-insurance/src/main/res/layout/card_hospital_v2.xml +++ b/android/navi-insurance/src/main/res/layout/card_hospital_v2.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:text="Ameya Netra Rugnalaya" android:maxLines="1" @@ -44,7 +44,7 @@ android:layout_height="wrap_content" android:layout_marginTop="6dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:maxLines="2" android:text="You can claim up to ₹ 2,000 against ambulance charges once for each hospitalization" diff --git a/android/navi-insurance/src/main/res/layout/card_input_policy_mem_details.xml b/android/navi-insurance/src/main/res/layout/card_input_policy_mem_details.xml index bbe43eef31..8e018dac31 100644 --- a/android/navi-insurance/src/main/res/layout/card_input_policy_mem_details.xml +++ b/android/navi-insurance/src/main/res/layout/card_input_policy_mem_details.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_gravity="start" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="@string/your_details" android:textColor="@color/dark_gray" @@ -40,7 +40,7 @@ android:layout_gravity="start" android:layout_marginTop="16dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Full Name" android:textColor="#4D4D4D" @@ -53,7 +53,7 @@ android:layout_height="wrap_content" android:layout_gravity="start" android:layout_marginTop="6dp" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:hint="First & Last Name" android:enabled="false" android:importantForAutofill="no" @@ -87,7 +87,7 @@ android:layout_gravity="start" android:layout_marginTop="40dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Gender" android:textColor="#4D4D4D" @@ -124,7 +124,7 @@ android:layout_gravity="start" android:layout_marginTop="40dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Date of Birth" android:textColor="#4D4D4D" @@ -140,7 +140,7 @@ android:cursorVisible="false" android:focusable="false" android:enabled="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:hint="YYYY-MM-DD" android:inputType="date" android:maxLength="10" @@ -166,7 +166,7 @@ android:layout_gravity="start" android:layout_marginTop="4dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:text="7th November, 1994" android:textColor="#4D4D4D" diff --git a/android/navi-insurance/src/main/res/layout/card_input_policy_nominee_details.xml b/android/navi-insurance/src/main/res/layout/card_input_policy_nominee_details.xml index 1218619c2e..7e60debcc7 100644 --- a/android/navi-insurance/src/main/res/layout/card_input_policy_nominee_details.xml +++ b/android/navi-insurance/src/main/res/layout/card_input_policy_nominee_details.xml @@ -47,7 +47,7 @@ android:layout_marginTop="0dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:text="Please fill in the nominee details below" android:textColor="@color/naviBlackText" @@ -67,7 +67,7 @@ android:layout_gravity="start" android:layout_marginTop="24dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Nominee details" android:textColor="@color/dark_gray" @@ -81,7 +81,7 @@ android:layout_gravity="start" android:layout_marginTop="16dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Full Name" android:textColor="#4D4D4D" @@ -94,7 +94,7 @@ android:layout_height="wrap_content" android:layout_gravity="start" android:layout_marginTop="6dp" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:hint="First & Last Name" android:importantForAutofill="no" android:inputType="textPersonName|textCapWords|textFilter|textVisiblePassword" @@ -121,7 +121,7 @@ android:layout_gravity="start" android:layout_marginTop="40dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Nominee is your" android:textColor="#4D4D4D" @@ -157,7 +157,7 @@ android:layout_gravity="start" android:layout_marginTop="40dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Nominee's Date of Birth" android:textColor="#4D4D4D" @@ -172,7 +172,7 @@ android:clickable="true" android:cursorVisible="false" android:focusable="true" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:hint="DD-MM-YYYY" android:inputType="date" android:maxLength="10" @@ -199,7 +199,7 @@ android:layout_gravity="start" android:layout_marginTop="4dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:text="7th November, 1994" android:textColor="#4D4D4D" @@ -223,7 +223,7 @@ android:layout_marginTop="24dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:text="Nominee is less than 18 years old. Please nominate an adult appointee" android:textColor="@color/naviBlackText" @@ -237,7 +237,7 @@ android:layout_gravity="start" android:layout_marginTop="26dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Appointee details" android:textColor="@color/dark_gray" @@ -251,7 +251,7 @@ android:layout_gravity="start" android:layout_marginTop="16dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Full Name" android:textColor="#4D4D4D" @@ -264,7 +264,7 @@ android:layout_height="wrap_content" android:layout_gravity="start" android:layout_marginTop="6dp" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:hint="First & Last Name" android:importantForAutofill="no" android:inputType="textPersonName|textCapWords|textFilter|textVisiblePassword" @@ -291,7 +291,7 @@ android:layout_gravity="start" android:layout_marginTop="40dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Appointee is Nominee's" android:textColor="#4D4D4D" @@ -327,7 +327,7 @@ android:layout_gravity="start" android:layout_marginTop="40dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Appointee's Date of Birth" android:textColor="#4D4D4D" @@ -342,7 +342,7 @@ android:clickable="true" android:cursorVisible="false" android:focusable="true" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:hint="DD-MM-YYYY" android:inputType="date" android:maxLength="10" @@ -369,7 +369,7 @@ android:layout_gravity="start" android:layout_marginTop="4dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:text="7th November, 1994" android:textColor="#4D4D4D" @@ -383,7 +383,7 @@ android:layout_gravity="start" android:layout_marginTop="40dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Appointee's Contact Number" android:textColor="#4D4D4D" @@ -398,7 +398,7 @@ android:layout_marginTop="6dp" android:autofillHints="phoneNational" android:ems="10" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:hint="Contact Number" android:inputType="phone" android:maxLength="10" diff --git a/android/navi-insurance/src/main/res/layout/card_item_disease_detail_with_chip.xml b/android/navi-insurance/src/main/res/layout/card_item_disease_detail_with_chip.xml index bce289e828..9d214ef393 100644 --- a/android/navi-insurance/src/main/res/layout/card_item_disease_detail_with_chip.xml +++ b/android/navi-insurance/src/main/res/layout/card_item_disease_detail_with_chip.xml @@ -25,7 +25,7 @@ android:text="1. Sample question?" android:paddingEnd="20dp" android:textSize="@dimen/sp_14" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/naviBlackText"/> @@ -232,7 +232,7 @@ android:layout_marginHorizontal="@dimen/dp_12" android:layout_marginTop="@dimen/dp_8" android:layout_marginBottom="@dimen/dp_12" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/health_card_tpa_description" android:textColor="@color/eerie_black" android:textSize="@dimen/sp_14" /> diff --git a/android/navi-insurance/src/main/res/layout/card_support_search.xml b/android/navi-insurance/src/main/res/layout/card_support_search.xml index d11cb58a2a..750838cc89 100644 --- a/android/navi-insurance/src/main/res/layout/card_support_search.xml +++ b/android/navi-insurance/src/main/res/layout/card_support_search.xml @@ -39,7 +39,7 @@ android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:padding="@dimen/dp_4" android:tag="title" android:text="@string/help_center" @@ -65,7 +65,7 @@ android:drawableTint="@color/naviGrey" android:background="@drawable/rounded_rectangle_grey_border_8dp_radius" android:hint="@string/default_hint_search_by_question" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_14" android:textColor="@color/naviBlackText" app:layout_constraintTop_toBottomOf="@+id/title" diff --git a/android/navi-insurance/src/main/res/layout/card_with_items_and_footer.xml b/android/navi-insurance/src/main/res/layout/card_with_items_and_footer.xml index 12d906b9d9..de9837675b 100644 --- a/android/navi-insurance/src/main/res/layout/card_with_items_and_footer.xml +++ b/android/navi-insurance/src/main/res/layout/card_with_items_and_footer.xml @@ -56,7 +56,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_weight="1" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_14" tools:text="More Details" /> diff --git a/android/navi-insurance/src/main/res/layout/chat_backpress_edit_member_popup.xml b/android/navi-insurance/src/main/res/layout/chat_backpress_edit_member_popup.xml index 380bfea3cf..b30d7c0ae6 100644 --- a/android/navi-insurance/src/main/res/layout/chat_backpress_edit_member_popup.xml +++ b/android/navi-insurance/src/main/res/layout/chat_backpress_edit_member_popup.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_32" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/do_you_want_to_go_back" android:textAlignment="center" android:textAllCaps="false" @@ -33,7 +33,7 @@ android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_8" android:layout_marginEnd="@dimen/dp_30" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="@string/details_will_be_lost" android:textAllCaps="false" @@ -58,7 +58,7 @@ android:layout_gravity="start" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="0dp" android:text="@string/exit" @@ -76,7 +76,7 @@ android:layout_marginStart="@dimen/dp_20" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="0dp" android:text="@string/stay_back" diff --git a/android/navi-insurance/src/main/res/layout/circular_progress_bar_with_text.xml b/android/navi-insurance/src/main/res/layout/circular_progress_bar_with_text.xml index 9a14d9efd8..418c9348e1 100644 --- a/android/navi-insurance/src/main/res/layout/circular_progress_bar_with_text.xml +++ b/android/navi-insurance/src/main/res/layout/circular_progress_bar_with_text.xml @@ -23,7 +23,7 @@ android:id="@+id/text_view_progress" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textAppearance="@style/TextAppearance.AppCompat.Large" app:layout_constraintBottom_toBottomOf="@+id/progress_bar" app:layout_constraintEnd_toEndOf="@+id/progress_bar" diff --git a/android/navi-insurance/src/main/res/layout/claims_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/claims_bottom_sheet.xml index f22942934c..a0d60c5f53 100644 --- a/android/navi-insurance/src/main/res/layout/claims_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/claims_bottom_sheet.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/rounded_top_corner_image_red" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:padding="@dimen/layout_dp_14" android:textAlignment="center" android:textColor="@color/alert_red" @@ -28,7 +28,7 @@ android:id="@+id/tv_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingBottom="@dimen/_16dp" android:textSize="@dimen/sp_10" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/claims_terms_conditions_bottomsheet.xml b/android/navi-insurance/src/main/res/layout/claims_terms_conditions_bottomsheet.xml index 0473e729cd..c3d92c980d 100644 --- a/android/navi-insurance/src/main/res/layout/claims_terms_conditions_bottomsheet.xml +++ b/android/navi-insurance/src/main/res/layout/claims_terms_conditions_bottomsheet.xml @@ -52,7 +52,7 @@ android:layout_gravity="start" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:gravity="center" android:padding="0dp" android:textAllCaps="false" diff --git a/android/navi-insurance/src/main/res/layout/combined_insurance_card.xml b/android/navi-insurance/src/main/res/layout/combined_insurance_card.xml index 5bb168d940..8d46fc578a 100644 --- a/android/navi-insurance/src/main/res/layout/combined_insurance_card.xml +++ b/android/navi-insurance/src/main/res/layout/combined_insurance_card.xml @@ -36,7 +36,7 @@ android:layout_height="50dp" android:layout_marginTop="@dimen/dp_32" android:background="@drawable/naviblue_background_12dp_radius" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/buy" android:textAllCaps="false" android:textColor="@color/white" @@ -77,7 +77,7 @@ android:layout_height="50dp" android:layout_marginTop="@dimen/dp_32" android:background="@drawable/naviblue_background_12dp_radius" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/upgrade" android:textAllCaps="false" android:textColor="@color/white" diff --git a/android/navi-insurance/src/main/res/layout/compare_plans_layout.xml b/android/navi-insurance/src/main/res/layout/compare_plans_layout.xml index 2e674bd5ce..e8de11ab04 100644 --- a/android/navi-insurance/src/main/res/layout/compare_plans_layout.xml +++ b/android/navi-insurance/src/main/res/layout/compare_plans_layout.xml @@ -65,7 +65,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:maxLines="2" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_12" @@ -85,7 +85,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:maxLines="1" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_12" @@ -122,7 +122,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:maxLines="1" android:textColor="@color/rating_yellow" android:textSize="@dimen/sp_12" @@ -164,7 +164,7 @@ android:gravity="center_horizontal" android:layout_marginTop="@dimen/dp_24" android:layout_marginBottom="@dimen/dp_40" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/refer_policy_prospectus" android:textColor="@color/naviSubText" /> @@ -198,7 +198,7 @@ android:layout_marginTop="17dp" android:layout_marginBottom="@dimen/dp_4" android:ellipsize="end" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:maxLines="1" android:textColor="@color/black" android:textSize="@dimen/sp_12" @@ -211,7 +211,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="11dp" android:ellipsize="end" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:maxLines="1" android:textColor="@color/black" android:textSize="@dimen/sp_14" @@ -250,7 +250,7 @@ android:layout_marginTop="17dp" android:layout_marginBottom="@dimen/dp_4" android:ellipsize="end" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:maxLines="1" android:textColor="@color/black" android:textSize="@dimen/sp_12" @@ -263,7 +263,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="11dp" android:ellipsize="end" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:maxLines="1" android:textColor="@color/black" android:textSize="@dimen/sp_14" 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 9079bf7656..e150a3c018 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 @@ -19,7 +19,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_14" app:layout_constraintStart_toStartOf="parent" @@ -57,7 +57,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_4" android:drawablePadding="@dimen/dp_9" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" tools:text="Details completed" android:gravity="center_vertical" android:textColor="@color/description_colour_seven" diff --git a/android/navi-insurance/src/main/res/layout/conversation_form_porting_layout.xml b/android/navi-insurance/src/main/res/layout/conversation_form_porting_layout.xml index 0a2553cab6..d22bb63478 100644 --- a/android/navi-insurance/src/main/res/layout/conversation_form_porting_layout.xml +++ b/android/navi-insurance/src/main/res/layout/conversation_form_porting_layout.xml @@ -42,7 +42,7 @@ android:clickable="true" android:drawablePadding="@dimen/dp_8" android:focusable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:outlineSpotShadowColor="@color/naviGrey" android:paddingStart="@dimen/dp_20" @@ -63,7 +63,7 @@ android:clickable="true" android:drawablePadding="@dimen/dp_8" android:focusable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:outlineSpotShadowColor="@color/naviGrey" android:paddingStart="@dimen/dp_20" 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 1ea27bc6ac..b43cb8a872 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 @@ -32,7 +32,7 @@ android:layout_marginBottom="0dp" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="Your policy is ready for purchase!" android:textColor="@color/naviBlackText" @@ -46,7 +46,7 @@ android:layout_marginTop="8dp" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="0dp" android:text="Please check your policy details" @@ -62,7 +62,7 @@ android:layout_marginTop="24dp" android:background="@drawable/navi_insurance_rounded_rectangle_blue_8dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:maxWidth="240dp" android:minWidth="150dp" @@ -88,7 +88,7 @@ android:layout_marginTop="24dp" android:background="@drawable/navi_insurance_rounded_rectangle_blue_8dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:maxWidth="240dp" android:minWidth="150dp" @@ -115,7 +115,7 @@ android:layout_gravity="center" android:text="Restart Application" android:textColor="@color/naviBlue" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="12sp"/> diff --git a/android/navi-insurance/src/main/res/layout/conversational_form_continue.xml b/android/navi-insurance/src/main/res/layout/conversational_form_continue.xml index a5693e6129..9a9552beca 100644 --- a/android/navi-insurance/src/main/res/layout/conversational_form_continue.xml +++ b/android/navi-insurance/src/main/res/layout/conversational_form_continue.xml @@ -30,7 +30,7 @@ android:layout_margin="1dp" style="@style/ButtonFontStylePurple" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="Continue" android:textAllCaps="false" 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 5b2e822f73..a9dc617fd1 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 @@ -35,7 +35,7 @@ android:layout_gravity="center" android:layout_marginBottom="6dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="tap to select" android:textColor="@color/naviGrey" @@ -53,7 +53,7 @@ android:outlineSpotShadowColor="@color/naviGrey" style="@style/ButtonFontStylePurple" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" 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 8fef1c0d42..a752db554d 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 @@ -36,7 +36,7 @@ android:layout_gravity="center" android:layout_marginTop="@dimen/dp_6" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="tap to select" android:textColor="@color/naviGrey" @@ -55,7 +55,7 @@ android:outlineSpotShadowColor="@color/naviGrey" android:background="@drawable/rounded_rectangle_white_border_10dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" @@ -90,7 +90,7 @@ android:layout_marginBottom="32dp" android:text="Can you tell us more details about XYZ?" android:textColor="@color/naviBlackText" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="20sp" android:paddingStart="20dp" android:paddingTop="20dp" @@ -142,7 +142,7 @@ android:layout_marginRight="20dp" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:minWidth="150dp" android:text="Please choose your answer for all the questions" android:textColor="#FF3333" @@ -194,7 +194,7 @@ android:layout_marginTop="10dp" android:layout_marginRight="10dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:minWidth="150dp" android:paddingLeft="10dp" android:text="Total count" @@ -211,7 +211,7 @@ android:layout_marginRight="10dp" android:layout_marginBottom="10dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingLeft="10dp" android:paddingTop="4dp" android:paddingRight="10dp" @@ -232,7 +232,7 @@ android:layout_marginBottom="12dp" android:layout_marginTop="12dp" android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_horizontal|center_vertical" android:minWidth="150dp" android:text="Continue" 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 c8c7b611c2..52f310c291 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 @@ -36,7 +36,7 @@ android:layout_gravity="center" android:layout_marginTop="@dimen/dp_6" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="tap to select" android:textColor="@color/naviGrey" @@ -55,7 +55,7 @@ android:outlineSpotShadowColor="@color/naviGrey" android:background="@drawable/rounded_rectangle_white_border_10dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" @@ -91,7 +91,7 @@ android:text="Select all the members who have one or more health issues" android:visibility="gone" android:textColor="@color/naviBlackText" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="20sp" android:paddingStart="20dp" android:paddingTop="20dp" @@ -143,7 +143,7 @@ android:layout_marginRight="20dp" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:minWidth="150dp" android:text="Total count:" android:textColor="#FF3333" @@ -195,7 +195,7 @@ android:layout_marginTop="10dp" android:layout_marginRight="10dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:minWidth="150dp" android:paddingLeft="10dp" android:text="Total count" @@ -212,7 +212,7 @@ android:layout_marginRight="10dp" android:layout_marginBottom="10dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingLeft="10dp" android:paddingTop="4dp" android:paddingRight="10dp" @@ -235,7 +235,7 @@ android:enabled="true" android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_horizontal|center_vertical" android:minWidth="150dp" android:text="Continue" diff --git a/android/navi-insurance/src/main/res/layout/conversational_form_loading.xml b/android/navi-insurance/src/main/res/layout/conversational_form_loading.xml index 2ec8ff1ffd..2aa124f4d9 100644 --- a/android/navi-insurance/src/main/res/layout/conversational_form_loading.xml +++ b/android/navi-insurance/src/main/res/layout/conversational_form_loading.xml @@ -31,7 +31,7 @@ android:layout_marginBottom="0dp" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="Creating the best policy for you" android:textColor="@color/naviBlackText" @@ -46,7 +46,7 @@ android:layout_marginBottom="10dp" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="0dp" android:text="Please wait...it may take upto 30 seconds" diff --git a/android/navi-insurance/src/main/res/layout/conversational_form_member_age_input.xml b/android/navi-insurance/src/main/res/layout/conversational_form_member_age_input.xml index a2dc693bc8..ba49aba689 100644 --- a/android/navi-insurance/src/main/res/layout/conversational_form_member_age_input.xml +++ b/android/navi-insurance/src/main/res/layout/conversational_form_member_age_input.xml @@ -44,7 +44,7 @@ android:background="@null" android:clickable="true" android:drawableStart="@drawable/arrow_back" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="left|center_vertical" android:paddingLeft="10dp" android:text="" @@ -67,7 +67,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="Enter Age" android:textColor="@color/naviBlackText" @@ -79,7 +79,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="y : years | m: months" android:textColor="#92929B" @@ -98,7 +98,7 @@ android:layout_weight="0.5" android:background="@null" android:clickable="true" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="right|center_vertical" android:paddingRight="10dp" android:text="@string/text_continue" 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 668187f47d..ff4ecd27c0 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 @@ -53,7 +53,7 @@ android:layout_marginBottom="32dp" android:text="What is their age?" android:textColor="@color/naviBlackText" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="20sp" /> 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 c764fa6841..784448c2e9 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 @@ -32,7 +32,7 @@ android:layout_marginTop="20dp" android:text="Buy health insurance for:" android:textColor="@color/naviBlackText" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="16sp" app:layout_constraintBottom_toTopOf="@+id/sv_members" app:layout_constraintStart_toStartOf="parent"/> @@ -69,7 +69,7 @@ android:clipToPadding="false" android:drawableEnd="@drawable/checkbox_circle" android:drawablePadding="8dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingStart="15dp" android:paddingTop="10dp" android:paddingEnd="15dp" @@ -91,7 +91,7 @@ android:clipToPadding="false" android:drawableEnd="@drawable/checkbox_circle" android:drawablePadding="8dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingStart="15dp" android:paddingTop="10dp" android:paddingEnd="15dp" @@ -113,7 +113,7 @@ android:clipToPadding="false" android:drawableEnd="@drawable/checkbox_circle" android:drawablePadding="8dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingStart="15dp" android:paddingTop="10dp" android:paddingEnd="15dp" @@ -135,7 +135,7 @@ android:clipToPadding="false" android:drawableEnd="@drawable/checkbox_circle" android:drawablePadding="8dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingStart="15dp" android:paddingTop="10dp" android:paddingEnd="15dp" @@ -157,7 +157,7 @@ android:clipToPadding="false" android:drawableEnd="@drawable/checkbox_circle" android:drawablePadding="8dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingStart="15dp" android:paddingTop="10dp" android:paddingEnd="15dp" @@ -180,7 +180,7 @@ android:clipToPadding="false" android:drawableEnd="@drawable/checkbox_circle" android:drawablePadding="8dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingStart="15dp" android:paddingTop="10dp" android:paddingEnd="15dp" @@ -210,7 +210,7 @@ android:layout_gravity="center_vertical" android:layout_marginRight="20dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:padding="4dp" android:text="Son:" android:textColor="@color/naviBlackText" @@ -222,7 +222,7 @@ android:layout_height="35dp" android:layout_margin="4dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="14sp" /> @@ -306,7 +306,7 @@ android:layout_marginRight="20dp" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:minWidth="150dp" android:text="Total count:" android:textColor="#FF3333" @@ -357,7 +357,7 @@ android:layout_marginTop="10dp" android:layout_marginRight="10dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:minWidth="150dp" android:paddingLeft="10dp" android:text="Total count" @@ -374,7 +374,7 @@ android:layout_marginRight="10dp" android:layout_marginBottom="10dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingLeft="10dp" android:paddingTop="4dp" android:paddingRight="10dp" @@ -393,7 +393,7 @@ android:layout_margin="10dp" android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_horizontal|center_vertical" android:minWidth="150dp" android:text="Continue" 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 5fe5c67d50..4d66c25981 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 @@ -39,7 +39,7 @@ android:outlineSpotShadowColor="@color/naviGrey" android:background="@drawable/rounded_rectangle_white_border_10dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" @@ -95,7 +95,7 @@ android:layout_marginBottom="32dp" android:text="Who do you want to cover?" android:textColor="@color/naviBlackText" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="20sp" /> @@ -278,7 +278,7 @@ android:layout_marginStart="@dimen/dp_8" android:layout_gravity="center_vertical" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:layout_weight="1" android:text="Daughter" android:textColor="@color/naviBlackText" @@ -289,7 +289,7 @@ android:layout_width="70dp" android:layout_height="35dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:foregroundTint="@color/naviBlue" app:custom_layout="@layout/number_picker_layout_v2" android:padding="0dp" @@ -315,7 +315,7 @@ android:clipToPadding="false" android:drawableStart="@drawable/checkbox_circle" android:drawablePadding="8dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingEnd="15dp" android:paddingBottom="16dp" android:text="Father" @@ -339,7 +339,7 @@ android:clipToPadding="false" android:drawableStart="@drawable/checkbox_circle" android:drawablePadding="8dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingEnd="15dp" android:paddingBottom="16dp" android:text="Mother" @@ -363,7 +363,7 @@ android:clipToPadding="false" android:drawableStart="@drawable/checkbox_circle" android:drawablePadding="8dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingEnd="15dp" android:paddingBottom="16dp" android:text="@string/father_in_law" @@ -387,7 +387,7 @@ android:clipToPadding="false" android:drawableStart="@drawable/checkbox_circle" android:drawablePadding="8dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingEnd="15dp" android:paddingBottom="16dp" android:text="@string/mother_in_law" @@ -421,7 +421,7 @@ android:layout_marginRight="20dp" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:minWidth="150dp" android:text="Total count:" android:textColor="#FF3333" @@ -473,7 +473,7 @@ android:layout_marginTop="10dp" android:layout_marginRight="10dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:minWidth="150dp" android:paddingLeft="10dp" android:text="Total count" @@ -490,7 +490,7 @@ android:layout_marginRight="10dp" android:layout_marginBottom="10dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingLeft="10dp" android:paddingTop="4dp" android:paddingRight="10dp" @@ -511,7 +511,7 @@ android:layout_marginBottom="12dp" android:layout_marginTop="12dp" android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_horizontal|center_vertical" android:minWidth="150dp" android:text="Continue" 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 e6834daece..3af29198b0 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 @@ -36,7 +36,7 @@ android:layout_gravity="center" android:layout_marginTop="@dimen/dp_6" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="tap to select" android:textColor="@color/naviGrey" @@ -55,7 +55,7 @@ android:outlineSpotShadowColor="@color/naviGrey" android:background="@drawable/rounded_rectangle_white_border_10dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" @@ -120,7 +120,7 @@ android:layout_marginRight="20dp" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:minWidth="150dp" android:text="Total count:" android:textColor="#FF3333" @@ -166,7 +166,7 @@ android:layout_marginBottom="12dp" android:layout_marginTop="12dp" android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_horizontal|center_vertical" android:minWidth="150dp" android:text="Continue" 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 ee0e85b57d..c7cefba73c 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 @@ -36,7 +36,7 @@ android:layout_gravity="center" android:layout_marginTop="@dimen/dp_6" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="tap to select" android:textColor="@color/naviGrey" @@ -55,7 +55,7 @@ android:outlineSpotShadowColor="@color/naviGrey" android:background="@drawable/rounded_rectangle_white_border_10dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" @@ -90,7 +90,7 @@ android:layout_marginBottom="32dp" android:text="Select all the members who have one or more health issues" android:textColor="@color/naviBlackText" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="20sp" android:paddingStart="20dp" android:paddingTop="20dp" @@ -142,7 +142,7 @@ android:layout_marginRight="20dp" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:minWidth="150dp" android:text="Total count:" android:textColor="#FF3333" @@ -194,7 +194,7 @@ android:layout_marginTop="10dp" android:layout_marginRight="10dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:minWidth="150dp" android:paddingLeft="10dp" android:text="Total count" @@ -211,7 +211,7 @@ android:layout_marginRight="10dp" android:layout_marginBottom="10dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingLeft="10dp" android:paddingTop="4dp" android:paddingRight="10dp" @@ -232,7 +232,7 @@ android:layout_marginBottom="12dp" android:layout_marginTop="12dp" android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_horizontal|center_vertical" android:minWidth="150dp" android:text="Continue" 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 dfbdf77f7e..98cc3c0a11 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 @@ -36,7 +36,7 @@ android:layout_gravity="center" android:layout_marginTop="@dimen/dp_6" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Slide to select waist size" android:textColor="@color/naviGrey" @@ -72,7 +72,7 @@ android:layout_gravity="center" android:layout_marginTop="@dimen/dp_6" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="inches" android:textColor="@color/naviBlackText" @@ -92,7 +92,7 @@ android:layout_marginTop="12dp" android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_horizontal|center_vertical" android:minWidth="150dp" android:text="Continue" diff --git a/android/navi-insurance/src/main/res/layout/conversational_form_text_input.xml b/android/navi-insurance/src/main/res/layout/conversational_form_text_input.xml index 3234b6e055..baa64aa3a9 100644 --- a/android/navi-insurance/src/main/res/layout/conversational_form_text_input.xml +++ b/android/navi-insurance/src/main/res/layout/conversational_form_text_input.xml @@ -32,7 +32,7 @@ android:layout_weight="1" android:autofillHints="postalCode" android:background="@drawable/rounded_rectangle_grey" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:maxLines="1" android:padding="8dp" android:singleLine="true" @@ -48,7 +48,7 @@ android:layout_marginBottom="8dp" android:background="@drawable/rounded_rectangle_dark_grey" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:src="@drawable/send" android:textSize="14sp" /> diff --git a/android/navi-insurance/src/main/res/layout/conversational_form_yes_no.xml b/android/navi-insurance/src/main/res/layout/conversational_form_yes_no.xml index 632a393058..a973ca8013 100644 --- a/android/navi-insurance/src/main/res/layout/conversational_form_yes_no.xml +++ b/android/navi-insurance/src/main/res/layout/conversational_form_yes_no.xml @@ -32,7 +32,7 @@ android:layout_weight="1" android:background="@drawable/button_with_state_rounded_30dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="Yes" android:textAllCaps="false" @@ -50,7 +50,7 @@ android:layout_weight="1" android:background="@drawable/button_with_state_rounded_30dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="No" android:textAllCaps="false" 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 c1aca06a07..0cf36676f7 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 @@ -40,7 +40,7 @@ android:outlineSpotShadowColor="@color/naviGrey" android:background="@drawable/rounded_rectangle_white_border_10dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" @@ -61,7 +61,7 @@ android:outlineSpotShadowColor="@color/naviGrey" android:background="@drawable/rounded_rectangle_white_border_10dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" diff --git a/android/navi-insurance/src/main/res/layout/covered_illness_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/covered_illness_bottom_sheet.xml index c84a032194..7c9458a4c0 100644 --- a/android/navi-insurance/src/main/res/layout/covered_illness_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/covered_illness_bottom_sheet.xml @@ -19,7 +19,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingBottom="16dp" android:text="Covered Critical Illness" android:textAlignment="center" @@ -45,7 +45,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:paddingVertical="16dp" android:text="Heart Attack or Myocardial Infarction" @@ -68,7 +68,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:paddingVertical="16dp" android:text="Open Chest Bypass Surgery (CABG) " @@ -91,7 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:paddingVertical="16dp" android:text="Open Heart Replacement or Repair of Heart Valves " @@ -114,7 +114,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:paddingVertical="16dp" android:text="Stroke Resulting in Permanent Symptoms" @@ -137,7 +137,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:paddingVertical="16dp" android:text="Kidney Failure Requiring Regular Dialysis" @@ -160,7 +160,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:paddingVertical="16dp" android:text="Cancer of specified severity " @@ -183,7 +183,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:paddingVertical="16dp" android:text="Major Organ/Bone Marrow Transplant" @@ -206,7 +206,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:paddingVertical="16dp" android:text="Permanent Paralysis of Limbs" @@ -229,7 +229,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:paddingVertical="16dp" android:text="Multiple Sclerosis with Persisting Symptoms" @@ -252,7 +252,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:paddingVertical="16dp" android:text="Third Degree Burns" diff --git a/android/navi-insurance/src/main/res/layout/custom_gender_dialog.xml b/android/navi-insurance/src/main/res/layout/custom_gender_dialog.xml index 4536109d0d..6b0376e035 100644 --- a/android/navi-insurance/src/main/res/layout/custom_gender_dialog.xml +++ b/android/navi-insurance/src/main/res/layout/custom_gender_dialog.xml @@ -11,7 +11,7 @@ @@ -61,7 +61,7 @@ android:textColor="@color/davyGrey" android:textSize="@dimen/sp_12" android:paddingHorizontal="@dimen/dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="@dimen/sp_4" tools:text="Tap on the options below to understand better"/> @@ -91,7 +91,7 @@ android:textSize="@dimen/sp_12" android:layout_marginBottom="@dimen/dp_4" android:paddingHorizontal="@dimen/dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="@dimen/sp_4" android:visibility="gone" tools:visibility="visible" 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 cad8ea7645..fa279ca10c 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 @@ -79,7 +79,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/dp_4" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/picker_camera" android:textColor="@color/blueberry" android:textSize="@dimen/sp_14" /> @@ -109,7 +109,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/dp_4" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/picker_gallery" android:textColor="@color/blueberry" android:textSize="@dimen/sp_14" /> @@ -140,7 +140,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/dp_4" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/picker_file" android:textColor="@color/blueberry" android:textSize="@dimen/sp_14" /> diff --git a/android/navi-insurance/src/main/res/layout/document_child_layout.xml b/android/navi-insurance/src/main/res/layout/document_child_layout.xml index 5447de388e..12fc1bde87 100644 --- a/android/navi-insurance/src/main/res/layout/document_child_layout.xml +++ b/android/navi-insurance/src/main/res/layout/document_child_layout.xml @@ -53,7 +53,7 @@ android:id="@+id/date" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" tools:text="19 sept 2021" /> diff --git a/android/navi-insurance/src/main/res/layout/document_image_preview_fragment.xml b/android/navi-insurance/src/main/res/layout/document_image_preview_fragment.xml index c367d46796..a7c5a86233 100644 --- a/android/navi-insurance/src/main/res/layout/document_image_preview_fragment.xml +++ b/android/navi-insurance/src/main/res/layout/document_image_preview_fragment.xml @@ -145,7 +145,7 @@ android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_12" android:layout_marginEnd="@dimen/dp_20" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textAlignment="center" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/edit_members_details_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/edit_members_details_bottom_sheet.xml index b019d15568..1f0e48a658 100644 --- a/android/navi-insurance/src/main/res/layout/edit_members_details_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/edit_members_details_bottom_sheet.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:layout_marginStart="20dp" android:layout_marginTop="32dp" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="Selected Member(s)" android:textAlignment="center" android:textAllCaps="false" @@ -34,7 +34,7 @@ android:layout_marginStart="20dp" android:layout_marginTop="8dp" android:layout_marginEnd="30dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Family members to be included in your health insurance policy" android:textAllCaps="false" @@ -92,7 +92,7 @@ android:layout_gravity="start" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="0dp" android:text="Edit" @@ -110,7 +110,7 @@ android:layout_marginStart="20dp" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="0dp" android:text="Close" diff --git a/android/navi-insurance/src/main/res/layout/eia_card.xml b/android/navi-insurance/src/main/res/layout/eia_card.xml index e1afa0d023..33882c2fb5 100644 --- a/android/navi-insurance/src/main/res/layout/eia_card.xml +++ b/android/navi-insurance/src/main/res/layout/eia_card.xml @@ -23,7 +23,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviBlue" android:textSize="@dimen/sp_14" tools:text="Have an eIA number?" /> 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 59b04dd0ba..d5cc642cb2 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 @@ -30,7 +30,7 @@ tools:background="@drawable/navi_insurance_rounded_rectangle_blue_8dp_radius" android:textSize="@dimen/sp_12" tools:text="Verified" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingHorizontal="@dimen/dp_8" android:paddingVertical="@dimen/dp_3"/> @@ -39,7 +39,7 @@ android:id="@+id/statusText" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingHorizontal="@dimen/dp_8" android:paddingVertical="@dimen/dp_3" android:textSize="@dimen/sp_12" @@ -51,7 +51,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="@dimen/sp_14" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" tools:text="Policy No : 2610000000093" android:layout_marginBottom="@dimen/dp_6" android:textColor="@color/black" @@ -61,7 +61,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="@dimen/sp_14" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviSubText" tools:text="₹10,00,000 * 4 members" android:layout_marginBottom="@dimen/dp_24" @@ -71,7 +71,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="@dimen/sp_14" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviSubText" tools:text="Policy Holder Name" android:layout_marginBottom="@dimen/dp_6" @@ -81,7 +81,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="@dimen/sp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" tools:text="Kota Pavan Kumar" android:layout_marginBottom="@dimen/dp_10" /> @@ -91,7 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="@dimen/sp_14" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviSubText" tools:text="eIA Number" android:layout_marginBottom="@dimen/dp_6" @@ -103,7 +103,7 @@ android:hint="@string/enter_here" android:textSize="@dimen/sp_16" android:maxLength="13" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:inputType="number" /> diff --git a/android/navi-insurance/src/main/res/layout/eia_form_page.xml b/android/navi-insurance/src/main/res/layout/eia_form_page.xml index 5fa96d9a41..91a466eb2d 100644 --- a/android/navi-insurance/src/main/res/layout/eia_form_page.xml +++ b/android/navi-insurance/src/main/res/layout/eia_form_page.xml @@ -37,7 +37,7 @@ android:layout_height="wrap_content" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" tools:text="Please provide eIA number" /> diff --git a/android/navi-insurance/src/main/res/layout/emi_info_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/emi_info_bottom_sheet.xml index 510333ebf0..8b5bd81cb0 100644 --- a/android/navi-insurance/src/main/res/layout/emi_info_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/emi_info_bottom_sheet.xml @@ -37,7 +37,7 @@ android:layout_marginTop="@dimen/dp_10" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_18" @@ -52,7 +52,7 @@ android:layout_marginTop="@dimen/dp_6" android:layout_marginBottom="@dimen/dp_10" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Pay monthly. No extra charges" android:textColor="@color/naviSubText" @@ -82,7 +82,7 @@ android:layout_marginTop="@dimen/dp_16" android:layout_weight="1" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/okay_got_it" android:textAllCaps="false" android:textSize="@dimen/sp_16" /> 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 cf4519e512..59483021a5 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 @@ -31,7 +31,7 @@ android:layout_marginTop="@dimen/dp_24" android:layout_marginBottom="@dimen/dp_6" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_16" @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:textColor="@color/naviSubText" android:textSize="@dimen/sp_12" @@ -60,7 +60,7 @@ android:id="@+id/closeBtn" android:layout_width="@dimen/dp_0" android:textSize="@dimen/sp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:layout_height="@dimen/dp_60" android:layout_marginHorizontal="@dimen/dp_8" android:layout_weight="1" @@ -71,7 +71,7 @@ android:id="@+id/primaryBtn" android:layout_width="@dimen/dp_0" android:textSize="@dimen/sp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:layout_height="@dimen/dp_60" android:layout_marginHorizontal="@dimen/dp_8" android:layout_weight="1" diff --git a/android/navi-insurance/src/main/res/layout/expandable_list_widget_item.xml b/android/navi-insurance/src/main/res/layout/expandable_list_widget_item.xml index 331a288895..5949978d29 100644 --- a/android/navi-insurance/src/main/res/layout/expandable_list_widget_item.xml +++ b/android/navi-insurance/src/main/res/layout/expandable_list_widget_item.xml @@ -33,7 +33,7 @@ android:id="@+id/item_title" android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textAlignment="textStart" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_14" @@ -70,7 +70,7 @@ android:id="@+id/item_value" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textAlignment="textEnd" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_14" diff --git a/android/navi-insurance/src/main/res/layout/expanded_quote_header_view.xml b/android/navi-insurance/src/main/res/layout/expanded_quote_header_view.xml index 17ccab2fcb..ae28c1cbc0 100644 --- a/android/navi-insurance/src/main/res/layout/expanded_quote_header_view.xml +++ b/android/navi-insurance/src/main/res/layout/expanded_quote_header_view.xml @@ -32,7 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_18" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/edit_preferences" android:textColor="@color/black" android:textSize="@dimen/sp_14" @@ -58,7 +58,7 @@ android:layout_height="match_parent" android:layout_alignParentStart="true" android:layout_marginStart="@dimen/dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="@string/sum_insured_title" android:textSize="@dimen/sp_14" /> @@ -70,7 +70,7 @@ android:layout_height="match_parent" android:layout_marginEnd="@dimen/dp_8" android:layout_toStartOf="@+id/sumInsuredChange" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:textColor="@color/naviBlackText" tools:text="₹10,00,000" /> @@ -82,7 +82,7 @@ android:layout_height="match_parent" android:layout_alignParentEnd="true" android:layout_marginEnd="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:textColor="@color/blueberry" android:textSize="@dimen/sp_14" /> @@ -109,7 +109,7 @@ android:layout_height="match_parent" android:layout_alignParentStart="true" android:layout_marginStart="@dimen/dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" tools:text="@string/deductible" android:textSize="@dimen/sp_14" /> @@ -121,7 +121,7 @@ android:layout_height="match_parent" android:layout_marginEnd="@dimen/dp_8" android:layout_toStartOf="@+id/deductible_change" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:textColor="@color/naviBlackText" tools:text="₹1,00,000" /> @@ -135,7 +135,7 @@ android:layout_marginEnd="@dimen/dp_16" android:clickable="true" android:focusable="true" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:textColor="@color/blueberry" android:textSize="@dimen/sp_14" /> @@ -161,7 +161,7 @@ android:layout_height="match_parent" android:layout_alignParentStart="true" android:layout_marginStart="@dimen/dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="@string/header_members" android:textSize="@dimen/sp_14" /> @@ -173,7 +173,7 @@ android:layout_height="match_parent" android:layout_marginEnd="@dimen/dp_8" android:layout_toStartOf="@+id/memberChange" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:textColor="@color/naviBlackText" tools:text="4" /> @@ -187,7 +187,7 @@ android:layout_marginEnd="@dimen/dp_16" android:clickable="true" android:focusable="true" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:textColor="@color/blueberry" android:textSize="@dimen/sp_14" /> diff --git a/android/navi-insurance/src/main/res/layout/faq_item.xml b/android/navi-insurance/src/main/res/layout/faq_item.xml index e28ec2f007..87819c8ba4 100644 --- a/android/navi-insurance/src/main/res/layout/faq_item.xml +++ b/android/navi-insurance/src/main/res/layout/faq_item.xml @@ -30,7 +30,7 @@ android:id="@+id/tv_question" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Test Question" android:textColor="@color/naviBlackText" android:textSize="14sp" @@ -71,7 +71,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="6sp" android:text="Test Answer" android:textColor="@color/naviSubText" diff --git a/android/navi-insurance/src/main/res/layout/footer_and_image_fragment.xml b/android/navi-insurance/src/main/res/layout/footer_and_image_fragment.xml index 47f4944cbc..6365119076 100644 --- a/android/navi-insurance/src/main/res/layout/footer_and_image_fragment.xml +++ b/android/navi-insurance/src/main/res/layout/footer_and_image_fragment.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" tools:text="Documents uploaded successfully!" android:layout_marginHorizontal="@dimen/dp_20" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:textSize="@dimen/sp_14" android:textColor="@color/textSecondaryColor" android:layout_marginTop="@dimen/dp_24" @@ -40,7 +40,7 @@ android:gravity="center" tools:text="Go to home" style="@style/ButtonFontStylePurple" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" app:layout_constraintBottom_toBottomOf="parent"/> \ No newline at end of file diff --git a/android/navi-insurance/src/main/res/layout/footer_view_button_list.xml b/android/navi-insurance/src/main/res/layout/footer_view_button_list.xml index f5b5a65752..21de97aa2a 100644 --- a/android/navi-insurance/src/main/res/layout/footer_view_button_list.xml +++ b/android/navi-insurance/src/main/res/layout/footer_view_button_list.xml @@ -13,7 +13,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_12" android:layout_marginVertical="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textAlignment="center" android:textColor="@color/naviGrey" android:textSize="@dimen/sp_10" diff --git a/android/navi-insurance/src/main/res/layout/footer_view_single_choice_option.xml b/android/navi-insurance/src/main/res/layout/footer_view_single_choice_option.xml index 731ed03338..0bf0af7c0b 100644 --- a/android/navi-insurance/src/main/res/layout/footer_view_single_choice_option.xml +++ b/android/navi-insurance/src/main/res/layout/footer_view_single_choice_option.xml @@ -28,7 +28,7 @@ android:layout_marginBottom="@dimen/dp_24" style="@style/ButtonFontStylePurple" android:textAllCaps="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/footer_with_left_right_button_widget.xml b/android/navi-insurance/src/main/res/layout/footer_with_left_right_button_widget.xml index 104cb103cf..1eae6d309b 100644 --- a/android/navi-insurance/src/main/res/layout/footer_with_left_right_button_widget.xml +++ b/android/navi-insurance/src/main/res/layout/footer_with_left_right_button_widget.xml @@ -82,7 +82,7 @@ android:paddingHorizontal="@dimen/dp_20" android:paddingVertical="@dimen/dp_4" android:textAlignment="center" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/sp_12" android:lineSpacingExtra="@dimen/sp_4" tools:text="By proceeding, I accept the terms & conditions and declare that I am not a politically exposed person" /> @@ -96,7 +96,7 @@ android:textAlignment="center" android:visibility="visible" android:background="@color/black_opacity_0" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" android:textSize="@dimen/sp_12" @@ -213,7 +213,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" android:layout_marginHorizontal="@dimen/dp_8" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:textSize="@dimen/sp_10" android:visibility="gone" diff --git a/android/navi-insurance/src/main/res/layout/footer_with_two_button_widget.xml b/android/navi-insurance/src/main/res/layout/footer_with_two_button_widget.xml index 0297b9d910..286b24f657 100644 --- a/android/navi-insurance/src/main/res/layout/footer_with_two_button_widget.xml +++ b/android/navi-insurance/src/main/res/layout/footer_with_two_button_widget.xml @@ -39,7 +39,7 @@ style="@style/ButtonFontStyleGreyBlack" android:layout_marginEnd="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_20" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:stateListAnimator="@null" android:textAllCaps="false" app:layout_constraintBottom_toTopOf="@+id/primary_text_button" diff --git a/android/navi-insurance/src/main/res/layout/form_fragment_layout.xml b/android/navi-insurance/src/main/res/layout/form_fragment_layout.xml index 4abeae37da..b106e284eb 100644 --- a/android/navi-insurance/src/main/res/layout/form_fragment_layout.xml +++ b/android/navi-insurance/src/main/res/layout/form_fragment_layout.xml @@ -70,7 +70,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:minWidth="@dimen/dp_20" android:textColor="@color/naviBlackText" diff --git a/android/navi-insurance/src/main/res/layout/form_member_detail_item_layout.xml b/android/navi-insurance/src/main/res/layout/form_member_detail_item_layout.xml index 0d94b98de2..b380c2bcac 100644 --- a/android/navi-insurance/src/main/res/layout/form_member_detail_item_layout.xml +++ b/android/navi-insurance/src/main/res/layout/form_member_detail_item_layout.xml @@ -46,7 +46,7 @@ android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="match_parent" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingEnd="@dimen/dp_40" android:gravity="center_vertical" android:paddingStart="@dimen/dp_16" @@ -65,7 +65,7 @@ android:layout_gravity="end|center_vertical" android:drawableEnd="@drawable/ic_down_arrow_black" android:drawablePadding="@dimen/dp_5" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/title_color_two" android:textSize="@dimen/sp_14" android:visibility="gone" @@ -82,7 +82,7 @@ android:layout_height="wrap_content" android:layout_gravity="end|center_vertical" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" 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/form_picker_layout.xml b/android/navi-insurance/src/main/res/layout/form_picker_layout.xml index 5f99a09987..6544ded6d6 100644 --- a/android/navi-insurance/src/main/res/layout/form_picker_layout.xml +++ b/android/navi-insurance/src/main/res/layout/form_picker_layout.xml @@ -14,7 +14,7 @@ android:layout_height="match_parent" android:background="@null" android:drawableEnd="@drawable/gi_picker_minus" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/font_medium" tools:ignore="RtlSymmetry" /> @@ -23,7 +23,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginHorizontal="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:inputType="number" android:includeFontPadding="false" @@ -37,7 +37,7 @@ android:layout_height="match_parent" android:background="@null" android:drawableStart="@drawable/gi_picker_plus" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/font_medium" tools:ignore="RtlSymmetry" /> diff --git a/android/navi-insurance/src/main/res/layout/form_pill_selection_item.xml b/android/navi-insurance/src/main/res/layout/form_pill_selection_item.xml index 3521936530..f6f0feef93 100644 --- a/android/navi-insurance/src/main/res/layout/form_pill_selection_item.xml +++ b/android/navi-insurance/src/main/res/layout/form_pill_selection_item.xml @@ -19,7 +19,7 @@ android:gravity="center" android:textAllCaps="false" android:textColor="@color/naviBlackText" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_14" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/fragment_aadhaar_verification.xml b/android/navi-insurance/src/main/res/layout/fragment_aadhaar_verification.xml index 816ae16b4d..c5abb014aa 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_aadhaar_verification.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_aadhaar_verification.xml @@ -38,7 +38,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_60" android:layout_marginTop="@dimen/dp_26" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/titlePrimaryColor" android:gravity="center" android:textSize="@dimen/sp_16" /> @@ -51,7 +51,7 @@ android:layout_height="@dimen/dp_48" android:layout_marginHorizontal="@dimen/dp_16" android:layout_marginBottom="@dimen/dp_32" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" tools:text="@string/ok_got_it" /> diff --git a/android/navi-insurance/src/main/res/layout/fragment_add_policy_members.xml b/android/navi-insurance/src/main/res/layout/fragment_add_policy_members.xml index 55ea9ae6e3..eacac75a8a 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_add_policy_members.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_add_policy_members.xml @@ -67,7 +67,7 @@ android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_20" android:background="@drawable/navi_insurance_button_with_state_8dp_radius" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:stateListAnimator="@null" android:text="@string/text_continue" android:textAllCaps="false" diff --git a/android/navi-insurance/src/main/res/layout/fragment_auto_pay_status.xml b/android/navi-insurance/src/main/res/layout/fragment_auto_pay_status.xml index 233562195f..548ad73056 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_auto_pay_status.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_auto_pay_status.xml @@ -96,7 +96,7 @@ android:layout_gravity="center_vertical" android:layout_marginTop="@dimen/dp_48" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_horizontal|center_vertical" android:paddingLeft="15dp" android:paddingRight="15dp" @@ -115,7 +115,7 @@ android:layout_gravity="center_vertical" android:layout_marginTop="@dimen/dp_24" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_horizontal|center_vertical" android:paddingLeft="15dp" android:paddingRight="15dp" @@ -134,7 +134,7 @@ android:layout_gravity="center_vertical" android:layout_marginTop="@dimen/dp_24" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_horizontal|center_vertical" android:paddingLeft="@dimen/dp_15" android:paddingRight="@dimen/dp_15" @@ -153,7 +153,7 @@ android:layout_gravity="center_vertical" android:layout_marginTop="@dimen/dp_24" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_horizontal|center_vertical" android:paddingLeft="15dp" android:paddingRight="15dp" diff --git a/android/navi-insurance/src/main/res/layout/fragment_autopay_from_quote_processing.xml b/android/navi-insurance/src/main/res/layout/fragment_autopay_from_quote_processing.xml index 4839a319f5..b0b017688b 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_autopay_from_quote_processing.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_autopay_from_quote_processing.xml @@ -41,7 +41,7 @@ android:layout_marginTop="@dimen/dp_0" android:layout_marginBottom="@dimen/dp_0" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="@string/autopay_payment_pending_title" android:textSize="@dimen/sp_20" /> diff --git a/android/navi-insurance/src/main/res/layout/fragment_bank_verification.xml b/android/navi-insurance/src/main/res/layout/fragment_bank_verification.xml index 3f8a16d0ad..c9d859f59d 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_bank_verification.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_bank_verification.xml @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginVertical="@dimen/dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_20" tools:text="Enter Pavan Kumar's Details" /> @@ -54,7 +54,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/bank_name" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_14" /> @@ -71,7 +71,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/rounded_rectangle_grey_border_4dp_radius" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_vertical" android:hint="@string/select_your_bank" android:paddingStart="@dimen/dp_12" @@ -95,7 +95,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/red_brick" android:layout_marginBottom="@dimen/dp_16" android:textSize="@dimen/sp_12" @@ -109,7 +109,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/account_number" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_14" /> @@ -125,7 +125,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/rounded_rectangle_grey_border_4dp_radius" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:hint="@string/enter_as_per_bank_records" android:inputType="number" android:paddingStart="@dimen/dp_12" @@ -141,7 +141,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/red_brick" android:layout_marginBottom="@dimen/dp_16" android:textSize="@dimen/sp_12" @@ -161,7 +161,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentStart="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/ifsc_code" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_14" /> @@ -172,7 +172,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/search_for_ifsc_code" android:textColor="@color/blueberry" android:visibility="gone" @@ -190,7 +190,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/rounded_rectangle_grey_border_4dp_radius" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:hint="@string/enter_ifsc_code_here" android:inputType="textVisiblePassword|textNoSuggestions|textCapCharacters" android:maxLength="11" @@ -211,7 +211,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_12" tools:text="IFSC Code : Mahadevapura HDFC Branch" app:layout_constraintTop_toTopOf="parent"/> @@ -222,7 +222,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/red_brick" android:textSize="@dimen/sp_12" tools:text="Incorrect IFC code" diff --git a/android/navi-insurance/src/main/res/layout/fragment_claim_rating.xml b/android/navi-insurance/src/main/res/layout/fragment_claim_rating.xml index 6457284715..5311e380ec 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_claim_rating.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_claim_rating.xml @@ -30,7 +30,7 @@ android:layout_marginStart="@dimen/dp_100" android:layout_marginTop="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_100" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_16" diff --git a/android/navi-insurance/src/main/res/layout/fragment_emi_calendar.xml b/android/navi-insurance/src/main/res/layout/fragment_emi_calendar.xml index 545b08686f..eb069ebd77 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_emi_calendar.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_emi_calendar.xml @@ -121,7 +121,7 @@ android:layout_marginBottom="@dimen/dp_32" android:alpha="0.56" android:clickable="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingHorizontal="@dimen/dp_134" android:paddingVertical="@dimen/dp_13" android:text="@string/text_continue" diff --git a/android/navi-insurance/src/main/res/layout/fragment_emi_details.xml b/android/navi-insurance/src/main/res/layout/fragment_emi_details.xml index 78c6a5fdbd..be586cbcd1 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_emi_details.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_emi_details.xml @@ -109,7 +109,7 @@ android:id="@+id/tv_emi_amount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" tools:text="₹4,840" android:textColor="@color/white" android:textSize="@dimen/sp_20" /> @@ -119,7 +119,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_4" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="@string/monthly_premium" android:textColor="@color/white_70" @@ -140,7 +140,7 @@ android:id="@+id/tv_emi_months_paid" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" tools:text="07" android:textColor="@color/white" android:textSize="@dimen/sp_20" /> @@ -151,7 +151,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_4" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Month Paid" android:gravity="center" android:textColor="@color/white_70" @@ -172,7 +172,7 @@ android:id="@+id/tv_emi_months_left" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" tools:text="03" android:textColor="@color/white" android:textSize="@dimen/sp_20" /> @@ -183,7 +183,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_4" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Month Left" android:gravity="center" android:textColor="@color/white_70" diff --git a/android/navi-insurance/src/main/res/layout/fragment_free_insurance_landing_page.xml b/android/navi-insurance/src/main/res/layout/fragment_free_insurance_landing_page.xml index 3a4c1ea8ed..2c54329a4b 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_free_insurance_landing_page.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_free_insurance_landing_page.xml @@ -139,7 +139,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_56" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:lineSpacingExtra="1sp" android:textAlignment="center" android:textColor="@color/dark_gray" @@ -164,7 +164,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_14" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textAlignment="center" android:textColor="@color/color_191919" android:textSize="@dimen/sp_14" @@ -188,7 +188,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_14" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textAlignment="center" android:textColor="@color/color_191919" android:textSize="@dimen/sp_14" diff --git a/android/navi-insurance/src/main/res/layout/fragment_health_app.xml b/android/navi-insurance/src/main/res/layout/fragment_health_app.xml index 7eee403139..89a6f93d35 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_health_app.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_health_app.xml @@ -84,7 +84,7 @@ android:clickable="false" android:layout_gravity="center" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:drawableStart="@drawable/ic_google_play" android:drawablePadding="@dimen/dp_4" android:gravity="center" diff --git a/android/navi-insurance/src/main/res/layout/fragment_health_risk_landing.xml b/android/navi-insurance/src/main/res/layout/fragment_health_risk_landing.xml index 5ac600bbc8..1dde7b74b6 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_health_risk_landing.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_health_risk_landing.xml @@ -49,7 +49,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_20" android:textColor="@color/white" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:paddingHorizontal="@dimen/dp_16" android:text="@string/preparing_questions_health_score" diff --git a/android/navi-insurance/src/main/res/layout/fragment_health_risk_questions.xml b/android/navi-insurance/src/main/res/layout/fragment_health_risk_questions.xml index e9305c7817..e5028f06d9 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_health_risk_questions.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_health_risk_questions.xml @@ -50,7 +50,7 @@ android:id="@+id/category_status_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/white" android:textSize="@dimen/sp_14" android:visibility="gone" @@ -106,7 +106,7 @@ android:textSize="@dimen/sp_14" android:textColor="@color/white" android:layout_gravity="center_vertical" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:layout_marginEnd="@dimen/dp_12" android:layout_marginStart="@dimen/dp_2" android:visibility="gone" @@ -153,7 +153,7 @@ android:id="@+id/question_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:layout_marginHorizontal="@dimen/dp_20" android:textColor="@color/white" android:textSize="@dimen/sp_18" @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_2" android:layout_marginHorizontal="@dimen/dp_20" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/white" android:textSize="@dimen/sp_14" android:visibility="gone" @@ -200,7 +200,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_8" android:layout_marginVertical="@dimen/dp_4" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/can_select_more_than_one" android:textColor="@color/white" android:textSize="@dimen/sp_10" /> diff --git a/android/navi-insurance/src/main/res/layout/fragment_hi_quiz_questionnaire.xml b/android/navi-insurance/src/main/res/layout/fragment_hi_quiz_questionnaire.xml index 37265d8aab..3df06bb309 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_hi_quiz_questionnaire.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_hi_quiz_questionnaire.xml @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_20" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:paddingHorizontal="@dimen/dp_16" android:text="@string/preparing_questions_health_score" @@ -94,7 +94,7 @@ app:layout_constraintBottom_toTopOf="@+id/landingSubtitle" android:layout_marginBottom="@dimen/dp_16" android:textColor="@color/sherpa_blue" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:textSize="@dimen/sp_20" tools:text="Play this fun quiz and learn about health insurance"/> @@ -110,7 +110,7 @@ app:layout_constraintBottom_toTopOf="@+id/landingCountDownProgressBar" android:layout_marginBottom="@dimen/dp_36" android:textColor="@color/sherpa_blue" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" tools:text="Takes less than 1 min"/> @@ -196,7 +196,7 @@ android:layout_marginHorizontal="@dimen/dp_24" app:layout_constraintTop_toTopOf="parent" android:textColor="@color/white" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" tools:text="What is the usual claim settlement time in India?" android:layout_marginTop="@dimen/dp_58"/> @@ -296,7 +296,7 @@ tools:text="Next question" android:paddingStart="@dimen/sp_14" android:paddingEnd="@dimen/dp_6" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:textColor="@color/white"/> @@ -91,7 +91,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_24" android:layout_marginTop="@dimen/dp_12" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:textAlignment="center" android:textColor="@color/white" android:textSize="@dimen/sp_28" /> @@ -102,7 +102,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_24" android:layout_marginTop="@dimen/dp_16" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:textAlignment="center" android:textColor="@color/white" android:textSize="@dimen/sp_12" @@ -126,7 +126,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:gravity="center" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="@dimen/sp_4" android:textAlignment="center" android:textColor="@color/sherpa_blue" diff --git a/android/navi-insurance/src/main/res/layout/fragment_hra_fi_activation.xml b/android/navi-insurance/src/main/res/layout/fragment_hra_fi_activation.xml index d44d59a0ec..9c0c1a759d 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_hra_fi_activation.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_hra_fi_activation.xml @@ -48,7 +48,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_60" android:layout_marginTop="@dimen/dp_26" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:textColor="@color/titlePrimaryColor" android:textSize="@dimen/sp_16" /> @@ -59,7 +59,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginTop="@dimen/dp_4" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:textColor="@color/titlePrimaryColor" android:textSize="@dimen/sp_16" /> @@ -72,7 +72,7 @@ android:layout_height="@dimen/dp_48" android:layout_marginHorizontal="@dimen/dp_16" android:layout_marginBottom="@dimen/dp_32" - android:fontFamily="@font/tt_bold" + android:fontFamily="@font/navi_headline_bold" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" tools:text="@string/ok_got_it" /> @@ -130,7 +130,7 @@ android:layout_height="@dimen/dp_48" android:layout_marginHorizontal="@dimen/dp_16" android:layout_marginBottom="@dimen/dp_32" - android:fontFamily="@font/tt_bold" + android:fontFamily="@font/navi_headline_bold" app:layout_constraintBottom_toBottomOf="parent" tools:text="Activate policy" /> diff --git a/android/navi-insurance/src/main/res/layout/fragment_incentivise_autopay.xml b/android/navi-insurance/src/main/res/layout/fragment_incentivise_autopay.xml index 030855e54d..0e9be567a1 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_incentivise_autopay.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_incentivise_autopay.xml @@ -85,7 +85,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_16" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:gravity="center" android:textColor="@color/grey_charcoal" android:textSize="@dimen/sp_14" diff --git a/android/navi-insurance/src/main/res/layout/fragment_landing_page_item.xml b/android/navi-insurance/src/main/res/layout/fragment_landing_page_item.xml index 4faf7880a1..2b257b2288 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_landing_page_item.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_landing_page_item.xml @@ -61,7 +61,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:lineSpacingExtra="@dimen/sp_6" android:textAlignment="center" @@ -77,7 +77,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="@dimen/sp_4" android:textAlignment="center" @@ -93,7 +93,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:lineSpacingExtra="@dimen/sp_4" android:padding="@dimen/dp_8" diff --git a/android/navi-insurance/src/main/res/layout/fragment_offers_v2.xml b/android/navi-insurance/src/main/res/layout/fragment_offers_v2.xml index ea29bc1545..7dd9add2fa 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_offers_v2.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_offers_v2.xml @@ -55,7 +55,7 @@ android:layout_gravity="center" android:layout_marginTop="32dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="Choose Sum Insured" android:textColor="@color/naviBlackText" @@ -73,7 +73,7 @@ android:layout_gravity="center" android:layout_marginTop="4dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="₹ " android:textColor="@color/naviBlackText" @@ -89,7 +89,7 @@ android:layout_gravity="center" android:layout_marginTop="4dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="2,00,000" android:textColor="@color/naviBlackText" @@ -107,7 +107,7 @@ android:layout_marginLeft="10dp" android:background="@null" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/why" android:textAllCaps="false" android:textColor="@color/naviBlue" @@ -155,7 +155,7 @@ android:layout_marginTop="6dp" android:clipToPadding="false" android:drawablePadding="12dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="1 year coverage" android:drawableStart="@drawable/ic_calendar_2" android:textColor="@color/naviSubText" @@ -182,7 +182,7 @@ android:layout_gravity="center" android:clipToPadding="false" android:drawablePadding="12dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:text="Covered Members" android:drawableStart="@drawable/ic_members" @@ -202,7 +202,7 @@ android:layout_marginTop="6dp" android:clipToPadding="false" android:drawablePadding="12dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Members" android:drawableEnd="@drawable/ic_edit" android:textColor="@color/naviSubText" @@ -250,7 +250,7 @@ android:layout_marginTop="4dp" android:clipToPadding="false" android:ellipsize="end" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="10,000+ Navi Cashless Hospitals" android:textAlignment="center" android:textColor="@android:color/black" @@ -270,7 +270,7 @@ android:text="Best in Industry" android:textColor="@color/naviGreen" android:textSize="10sp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingHorizontal="16dp" android:paddingVertical="6dp"/> @@ -304,7 +304,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:text="Apollo, Fortis, Sakra and 24 other hospitals around you" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/white" android:textSize="@dimen/sp_12" android:lineSpacingExtra="@dimen/dp_4" @@ -335,7 +335,7 @@ android:textSize="12sp" android:layout_marginTop="26dp" android:textColor="@color/naviBlue" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" app:drawableEndCompat="@drawable/ic_arrow_forward_rounded" android:drawablePadding="@dimen/dp_8"/> @@ -370,7 +370,7 @@ android:layout_height="wrap_content" android:clipToPadding="false" android:ellipsize="end" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="Hassle Free Claims" android:textAlignment="center" android:textColor="@android:color/black" @@ -394,7 +394,7 @@ android:layout_weight="1" android:drawableTop="@drawable/cover_no_co_pay" android:drawablePadding="10dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="4sp" android:text="97% Claim\nSettlement Ratio" android:textAlignment="center" @@ -409,7 +409,7 @@ android:drawablePadding="10dp" android:drawableTop="@drawable/ic_support" android:lineSpacingExtra="4sp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/claim_relationship_manager" android:textColor="@color/naviSubText" android:textAlignment="center" @@ -422,7 +422,7 @@ android:layout_weight="1" android:drawableTop="@drawable/ic_clock" android:drawablePadding="10dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="4sp" android:text="20 Minutes\nClaim Approval" android:textColor="@color/naviSubText" @@ -439,7 +439,7 @@ android:text="Details" android:textSize="12sp" android:textColor="@color/naviBlue" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" app:drawableEndCompat="@drawable/ic_arrow_forward_rounded" android:drawablePadding="@dimen/dp_8"/> @@ -473,7 +473,7 @@ android:layout_height="wrap_content" android:clipToPadding="false" android:ellipsize="end" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="What is Covered in the Policy?" android:textAlignment="center" android:textColor="@android:color/black" @@ -497,7 +497,7 @@ android:drawablePadding="10dp" android:drawableTop="@drawable/ic_covid" android:lineSpacingExtra="4sp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Covid-19 \n Hospitalisation" android:textColor="@color/naviSubText" android:textAlignment="center" @@ -511,7 +511,7 @@ android:drawablePadding="10dp" android:drawableTop="@drawable/cover_23" android:lineSpacingExtra="4sp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Cumulative Bonus \n on No Claim" android:textColor="@color/naviSubText" android:textAlignment="center" @@ -525,7 +525,7 @@ android:drawableTop="@drawable/cover_9" android:drawablePadding="10dp" android:lineSpacingExtra="4sp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Road Ambulance \nCover" android:textColor="@color/naviSubText" android:textAlignment="center" @@ -549,7 +549,7 @@ android:drawablePadding="10dp" android:layout_marginRight="60dp" android:drawableTop="@drawable/cover_22" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="4sp" android:text="No Limit \non Room Rent" android:textColor="@color/naviSubText" @@ -562,7 +562,7 @@ android:layout_height="wrap_content" android:drawablePadding="10dp" android:drawableTop="@drawable/cover_5" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="4sp" android:text="Free Refill of \nCover Amount" android:textColor="@color/naviSubText" @@ -580,7 +580,7 @@ android:text="All Benefits" android:textSize="12sp" android:textColor="@color/naviBlue" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" app:drawableEndCompat="@drawable/ic_arrow_forward_rounded" android:drawablePadding="@dimen/dp_8"/> @@ -624,7 +624,7 @@ android:layout_marginBottom="15dp" android:clipToPadding="false" android:ellipsize="end" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="No Medical Checkup Required" android:textAlignment="center" android:textColor="@android:color/black" @@ -641,7 +641,7 @@ android:textAlignment="center" android:textSize="12sp" android:textColor="@color/naviSubText" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:drawablePadding="@dimen/dp_8"/> @@ -676,7 +676,7 @@ android:layout_height="wrap_content" android:clipToPadding="false" android:ellipsize="end" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="About Navi General Insurance" android:textAlignment="center" android:textColor="@android:color/black" @@ -700,7 +700,7 @@ android:layout_weight="1" android:drawablePadding="10dp" android:drawableTop="@drawable/ic_trust" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Trusted by\n12 lakh Indians" android:textColor="@color/naviSubText" android:textAlignment="center" @@ -713,7 +713,7 @@ android:layout_weight="1" android:drawableTop="@drawable/navi_insurance_ic_money_bag" android:drawablePadding="10dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="₹ 27 Cr+ \nClaims Settled" android:textColor="@color/naviSubText" android:textAlignment="center" @@ -726,7 +726,7 @@ android:layout_weight="1" android:drawablePadding="8dp" android:drawableTop="@drawable/ic_award" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Best General\nInsurance Company" android:textColor="@color/naviSubText" android:textAlignment="center" @@ -742,7 +742,7 @@ android:text="Know More " android:textSize="12sp" android:textColor="@color/naviBlue" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" app:drawableEndCompat="@drawable/ic_arrow_forward_rounded" android:drawablePadding="@dimen/dp_8"/> @@ -777,7 +777,7 @@ android:layout_height="wrap_content" android:clipToPadding="false" android:ellipsize="end" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="Customer Speak" android:textAlignment="center" android:textColor="@android:color/black" diff --git a/android/navi-insurance/src/main/res/layout/fragment_payment_bottomsheet.xml b/android/navi-insurance/src/main/res/layout/fragment_payment_bottomsheet.xml index a8b75d0ab3..101867523b 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_payment_bottomsheet.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_payment_bottomsheet.xml @@ -33,7 +33,7 @@ android:id="@+id/tv_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:lineHeight="@dimen/layout_dp_28" android:text="@string/gi_make_payment" android:textColor="@color/black" @@ -57,7 +57,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:drawablePadding="@dimen/layout_dp_8" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:lineHeight="@dimen/layout_dp_22" android:paddingHorizontal="@dimen/layout_dp_16" android:paddingVertical="@dimen/layout_dp_8" diff --git a/android/navi-insurance/src/main/res/layout/fragment_payment_error_gi.xml b/android/navi-insurance/src/main/res/layout/fragment_payment_error_gi.xml index 50e593f342..37e27f57ef 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_payment_error_gi.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_payment_error_gi.xml @@ -43,7 +43,7 @@ android:layout_marginTop="@dimen/layout_dp_20" android:textSize="@dimen/sp_20" android:textColor="@color/black" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:lineHeight="@dimen/layout_dp_28" tools:text="₹310 payment failed" /> @@ -56,7 +56,7 @@ android:layout_marginTop="@dimen/layout_dp_12" android:textSize="@dimen/layout_sp_14" android:textColor="@color/naviSubText" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineHeight="@dimen/layout_dp_22" android:text="@string/gi_please_retry_again" /> @@ -79,7 +79,7 @@ android:layout_height="wrap_content" android:padding="@dimen/layout_dp_12" android:textSize="@dimen/sp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center_horizontal" android:layout_marginTop="@dimen/layout_dp_16" android:layout_marginBottom="@dimen/layout_dp_4" diff --git a/android/navi-insurance/src/main/res/layout/fragment_payment_method_selection.xml b/android/navi-insurance/src/main/res/layout/fragment_payment_method_selection.xml index 0be98a7dc2..c4c2d1581a 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_payment_method_selection.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_payment_method_selection.xml @@ -159,7 +159,7 @@ android:layout_gravity="center" android:clipToPadding="false" android:drawablePadding="@dimen/dp_12" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start|center_vertical" android:text="@string/sum_insured_title" android:textColor="@color/naviBlackText" @@ -176,7 +176,7 @@ android:layout_gravity="center" android:clipToPadding="false" android:drawablePadding="@dimen/dp_12" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingStart="@dimen/dp_32" android:paddingTop="@dimen/dp_12" @@ -193,7 +193,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start|center_vertical" android:paddingStart="@dimen/dp_32" android:paddingTop="@dimen/dp_18" @@ -234,7 +234,7 @@ android:layout_gravity="center" android:clipToPadding="false" android:drawablePadding="@dimen/dp_12" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start|center_vertical" android:text="@string/deductible" android:textColor="@color/naviBlackText" @@ -251,7 +251,7 @@ android:layout_gravity="center" android:clipToPadding="false" android:drawablePadding="@dimen/dp_12" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingStart="@dimen/dp_32" android:paddingTop="@dimen/dp_12" @@ -288,7 +288,7 @@ android:layout_gravity="center" android:clipToPadding="false" android:drawablePadding="@dimen/dp_12" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start|center_vertical" android:text="@string/insurance_tenure" android:textColor="@color/naviBlackText" @@ -305,7 +305,7 @@ android:layout_gravity="center" android:clipToPadding="false" android:drawablePadding="@dimen/dp_12" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingStart="@dimen/dp_32" android:paddingTop="@dimen/dp_12" @@ -340,7 +340,7 @@ android:layout_gravity="center" android:clipToPadding="false" android:drawablePadding="@dimen/dp_12" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start|center_vertical" android:text="@string/family_members_title" android:textColor="@color/naviBlackText" @@ -367,7 +367,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start|center_vertical" android:paddingStart="@dimen/dp_32" android:paddingBottom="@dimen/dp_18" @@ -405,7 +405,7 @@ android:layout_gravity="center" android:clipToPadding="false" android:drawablePadding="@dimen/dp_12" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start|center_vertical" android:text="@string/addon_screen_title" android:textColor="@color/naviBlackText" @@ -451,7 +451,7 @@ android:layout_gravity="center" android:clipToPadding="false" android:drawablePadding="@dimen/dp_12" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start|center_vertical" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_14" diff --git a/android/navi-insurance/src/main/res/layout/fragment_payment_processing.xml b/android/navi-insurance/src/main/res/layout/fragment_payment_processing.xml index 9d7ba8d575..53f1b13d29 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_payment_processing.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_payment_processing.xml @@ -38,7 +38,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" android:drawableStart="@drawable/refresh" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingStart="10dp" android:layout_gravity="end" android:text="Refresh" @@ -84,7 +84,7 @@ android:layout_gravity="center" android:layout_marginTop="@dimen/dp_40" android:layout_marginBottom="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="Payment processing" android:textAlignment="center" android:textAllCaps="false" @@ -98,7 +98,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="27dp" android:layout_marginTop="6dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:paddingHorizontal="10dp" android:text="We are yet to receive confirmation from your bank. Please check back in an hour" diff --git a/android/navi-insurance/src/main/res/layout/fragment_payment_success.xml b/android/navi-insurance/src/main/res/layout/fragment_payment_success.xml index f6c99ac71e..384a51d55d 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_payment_success.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_payment_success.xml @@ -42,7 +42,7 @@ android:layout_marginTop="0dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="Payment Successful" android:textSize="@dimen/sp_20" /> @@ -111,7 +111,7 @@ android:layout_gravity="center_vertical" android:layout_marginTop="@dimen/dp_24" android:clickable="true" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center_horizontal|center_vertical" android:text="@string/continue_text" android:textAlignment="center" diff --git a/android/navi-insurance/src/main/res/layout/fragment_policy_activation.xml b/android/navi-insurance/src/main/res/layout/fragment_policy_activation.xml index aef8a3a39e..636b83f241 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_policy_activation.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_policy_activation.xml @@ -43,7 +43,7 @@ android:layout_marginTop="0dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="Policy Activated" android:textColor="@color/naviBlackText" @@ -123,7 +123,7 @@ android:layout_marginTop="0dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="Policy Activated" android:textColor="@color/naviBlackText" @@ -234,7 +234,7 @@ android:clickable="true" android:elevation="@dimen/dp_0" android:focusable="true" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center_horizontal|center_vertical" android:text="@string/skip_for_now" android:textAllCaps="false" @@ -250,7 +250,7 @@ android:layout_weight="1" android:clickable="true" android:focusable="true" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center_horizontal|center_vertical" android:text="@string/autopay_bottomsheet_title" android:textAllCaps="false" @@ -276,7 +276,7 @@ android:layout_marginTop="@dimen/dp_24" android:clickable="true" android:focusable="true" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center_horizontal|center_vertical" android:paddingLeft="@dimen/dp_15" android:paddingRight="@dimen/dp_15" diff --git a/android/navi-insurance/src/main/res/layout/fragment_policy_members_dob.xml b/android/navi-insurance/src/main/res/layout/fragment_policy_members_dob.xml index 9292198f7f..2037a77902 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_policy_members_dob.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_policy_members_dob.xml @@ -69,7 +69,7 @@ android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_20" style="@style/ButtonFontStylePurple" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:stateListAnimator="@null" android:text="@string/text_continue" android:textAllCaps="false" diff --git a/android/navi-insurance/src/main/res/layout/fragment_policy_members_health_state.xml b/android/navi-insurance/src/main/res/layout/fragment_policy_members_health_state.xml index 340b46097c..79c771367b 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_policy_members_health_state.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_policy_members_health_state.xml @@ -61,7 +61,7 @@ android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_20" android:background="@drawable/navi_insurance_button_with_state_8dp_radius" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:stateListAnimator="@null" android:text="@string/text_continue" android:textAllCaps="false" diff --git a/android/navi-insurance/src/main/res/layout/fragment_policy_members_list.xml b/android/navi-insurance/src/main/res/layout/fragment_policy_members_list.xml index fa35083ec1..0e58d93bf1 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_policy_members_list.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_policy_members_list.xml @@ -68,7 +68,7 @@ android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_32" style="@style/ButtonFontStylePurple" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:stateListAnimator="@null" android:text="@string/done" android:textAllCaps="false" diff --git a/android/navi-insurance/src/main/res/layout/fragment_policy_members_name.xml b/android/navi-insurance/src/main/res/layout/fragment_policy_members_name.xml index fc65fad765..52c27c623c 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_policy_members_name.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_policy_members_name.xml @@ -64,7 +64,7 @@ android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_20" style="@style/ButtonFontStylePurple" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:stateListAnimator="@null" android:text="@string/text_continue" android:textAllCaps="false" diff --git a/android/navi-insurance/src/main/res/layout/fragment_policy_summary.xml b/android/navi-insurance/src/main/res/layout/fragment_policy_summary.xml index 3ddca45ff1..dc713e490f 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_policy_summary.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_policy_summary.xml @@ -107,7 +107,7 @@ android:id="@+id/tv_sum_insured" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="5,00,000" android:textColor="@color/black" android:textSize="20sp" @@ -119,7 +119,7 @@ android:id="@+id/tv_price_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Sum Insured" android:textColor="@color/naviSubText" android:textSize="14sp" @@ -140,7 +140,7 @@ android:id="@+id/tv_tenure" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="2 years" android:textColor="@color/black" android:textSize="20sp" @@ -152,7 +152,7 @@ android:id="@+id/tv_tenure_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Years Covered" android:textColor="@color/naviSubText" android:textSize="14sp" @@ -180,7 +180,7 @@ android:layout_gravity="center" android:clipToPadding="false" android:drawablePadding="12dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" @@ -203,7 +203,7 @@ android:layout_marginTop="24dp" android:clipToPadding="false" android:drawablePadding="12dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" @@ -242,7 +242,7 @@ android:layout_gravity="center" android:clipToPadding="false" android:drawablePadding="12dp" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start|center_vertical" android:text="Price" android:textColor="@color/naviBlackText" @@ -260,7 +260,7 @@ android:layout_gravity="center" android:clipToPadding="false" android:drawablePadding="12dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingStart="@dimen/dp_32" android:paddingTop="@dimen/dp_12" @@ -296,7 +296,7 @@ android:layout_gravity="center" android:clipToPadding="false" android:drawablePadding="12dp" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start|center_vertical" android:text="Family Members" android:textColor="@color/naviBlackText" @@ -340,7 +340,7 @@ android:id="@+id/tv_addons_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="Add-ons" android:textColor="@color/black" android:textSize="16sp" @@ -381,7 +381,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="Premium Breakup" android:textColor="@color/black" android:textSize="16sp" @@ -420,7 +420,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="0.7" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="Total" android:textColor="@color/naviBlackText" android:textSize="14sp" /> @@ -431,7 +431,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="0.3" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="1000" android:textAlignment="textEnd" android:textColor="@color/naviBlackText" @@ -457,7 +457,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="Paying via monthly premiums" android:textColor="@color/black" android:textSize="16sp" @@ -496,7 +496,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="0.7" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="Total of all monthly premiums" android:textColor="@color/naviBlackText" android:textSize="14sp" /> @@ -507,7 +507,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="0.3" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="1000" android:textAlignment="textEnd" android:textColor="@color/naviBlackText" @@ -567,7 +567,7 @@ android:layout_height="match_parent" android:clickable="false" android:drawablePadding="6dp" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="Pay" android:textAllCaps="false" diff --git a/android/navi-insurance/src/main/res/layout/fragment_quote_benefits_v2.xml b/android/navi-insurance/src/main/res/layout/fragment_quote_benefits_v2.xml index c6e90b0d74..e8e1680439 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_quote_benefits_v2.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_quote_benefits_v2.xml @@ -78,7 +78,7 @@ android:layout_marginStart="20dp" android:layout_marginEnd="20dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" tools:text="20+ Included Health Benefits" android:textColor="#000000" @@ -95,7 +95,7 @@ android:layout_marginTop="2dp" android:layout_marginEnd="20dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Comprehensive Policy. Maximum Coverage." android:textColor="@color/naviBlackText" diff --git a/android/navi-insurance/src/main/res/layout/fragment_quote_claims_v2.xml b/android/navi-insurance/src/main/res/layout/fragment_quote_claims_v2.xml index 4ceec599f8..5fbf826e4f 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_quote_claims_v2.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_quote_claims_v2.xml @@ -52,7 +52,7 @@ android:layout_weight="1" android:drawableTop="@drawable/cover_no_co_pay" android:drawablePadding="@dimen/dp_10" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/_98_claim_nsettlement_ratio" android:lineSpacingExtra="4sp" android:textAlignment="center" @@ -66,7 +66,7 @@ android:layout_weight="1" android:drawableTop="@drawable/ic_support" android:drawablePadding="10dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="4sp" android:text="@string/claim_relationship_manager" android:textAlignment="center" @@ -80,7 +80,7 @@ android:layout_weight="1" android:drawableTop="@drawable/ic_clock" android:drawablePadding="10dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="4sp" android:text="@string/twenty_min_claims_approval" android:textAlignment="center" @@ -112,7 +112,7 @@ android:id="@+id/how_claims_deductibles_work_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/how_claims_deductible_works" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_14" @@ -192,7 +192,7 @@ android:id="@+id/ll_how_claims_work_1_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/how_to_make_health_insurance_claims" android:textColor="@color/naviBlackText" android:textSize="14sp" @@ -206,7 +206,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="4sp" android:text="@string/how_to_make_hi_claims" android:textColor="@color/naviSubText" @@ -239,7 +239,7 @@ android:id="@+id/ll_how_claims_work_2_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/what_is_cashless_claims" android:textColor="@color/naviBlackText" android:textSize="14sp" @@ -253,7 +253,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="4sp" android:text="@string/cashless_claims_explanation" android:textColor="@color/naviSubText" @@ -285,7 +285,7 @@ android:id="@+id/ll_how_claims_work_3_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/how_to_get_refund_for_your_hospital_bills" android:textColor="@color/naviBlackText" android:textSize="14sp" @@ -299,7 +299,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="4sp" android:text="@string/hospitalisation_refund_explanation" android:textColor="@color/naviSubText" diff --git a/android/navi-insurance/src/main/res/layout/fragment_search_by_location.xml b/android/navi-insurance/src/main/res/layout/fragment_search_by_location.xml index 5d0b3c99f7..1aba0e1d57 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_search_by_location.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_search_by_location.xml @@ -51,7 +51,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="No Results Found" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="12sp" android:textColor="@color/naviBlackText"/> @@ -63,7 +63,7 @@ android:textAlignment="center" android:lineSpacingExtra="4sp" android:text="Entered location could not be found" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="12sp" android:textColor="@color/naviSubText"/> @@ -79,7 +79,7 @@ android:paddingVertical="10dp" android:textAlignment="center" android:text="@string/search_by_name" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="12sp" android:textColor="@color/naviBlue"/> diff --git a/android/navi-insurance/src/main/res/layout/fragment_search_by_name.xml b/android/navi-insurance/src/main/res/layout/fragment_search_by_name.xml index c580c9a643..e216f80f8b 100644 --- a/android/navi-insurance/src/main/res/layout/fragment_search_by_name.xml +++ b/android/navi-insurance/src/main/res/layout/fragment_search_by_name.xml @@ -52,7 +52,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="No Results Found" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="12sp" android:textColor="@color/naviBlackText"/> @@ -64,7 +64,7 @@ android:textAlignment="center" android:lineSpacingExtra="4sp" android:text="Entered hospital name is not a \npart of Navi’s cashless hospitals network" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="12sp" android:textColor="@color/naviSubText"/> @@ -81,7 +81,7 @@ android:paddingVertical="10dp" android:textAlignment="center" android:text="@string/search_by_location" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="12sp" android:textColor="@color/naviBlue"/> 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 660be99ee6..aac1325577 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 @@ -82,7 +82,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:alpha="0.8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="@dimen/sp_6" android:paddingVertical="@dimen/dp_20" android:paddingStart="@dimen/dp_20" @@ -98,7 +98,7 @@ android:id="@+id/link_tv" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="@dimen/sp_6" android:paddingHorizontal="@dimen/dp_20" android:text="Check now" @@ -151,7 +151,7 @@ android:layout_height="wrap_content" android:drawableLeft="@drawable/yes_sign" android:drawablePadding="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="@dimen/sp_6" android:paddingHorizontal="@dimen/layout_dp_24" android:paddingVertical="@dimen/dp_12" @@ -181,7 +181,7 @@ android:layout_height="wrap_content" android:drawableLeft="@drawable/no_sign" android:drawablePadding="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="@dimen/sp_6" android:paddingHorizontal="@dimen/layout_dp_24" android:paddingVertical="@dimen/dp_12" @@ -231,7 +231,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/tooltip_text_background" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="@dimen/sp_6" android:text="Great! We're happy to help you :)" android:textColor="@color/naviBlackText" @@ -248,7 +248,7 @@ diff --git a/android/navi-insurance/src/main/res/layout/generic_info_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/generic_info_bottom_sheet.xml index f67762c581..a010f7684b 100644 --- a/android/navi-insurance/src/main/res/layout/generic_info_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/generic_info_bottom_sheet.xml @@ -80,7 +80,7 @@ style="@style/ButtonFontStylePurple" android:layout_width="match_parent" android:layout_height="@dimen/dp_48" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:layout_gravity="center_vertical" app:layout_constraintTop_toBottomOf="@+id/compose_layout" android:layout_marginTop="@dimen/dp_32" diff --git a/android/navi-insurance/src/main/res/layout/gi_help_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/gi_help_bottom_sheet.xml index ec51c1e164..ca68e087af 100644 --- a/android/navi-insurance/src/main/res/layout/gi_help_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/gi_help_bottom_sheet.xml @@ -38,7 +38,7 @@ android:clipToPadding="false" android:drawableStart="@drawable/ic_help_stroke" android:drawablePadding="@dimen/dp_10" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:padding="@dimen/dp_0" android:text="@string/help_center" @@ -71,7 +71,7 @@ android:clipToPadding="false" android:drawableStart="@drawable/ic_call" android:drawablePadding="@dimen/dp_10" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:padding="@dimen/dp_0" android:text="@string/request_callback" diff --git a/android/navi-insurance/src/main/res/layout/grid_image_card_widget.xml b/android/navi-insurance/src/main/res/layout/grid_image_card_widget.xml index 569f9bb61e..0295d9a2cf 100644 --- a/android/navi-insurance/src/main/res/layout/grid_image_card_widget.xml +++ b/android/navi-insurance/src/main/res/layout/grid_image_card_widget.xml @@ -41,7 +41,7 @@ android:layout_height="wrap_content" android:layout_gravity="start" android:layout_marginStart="@dimen/dp_8" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/font_small" app:layout_constraintEnd_toStartOf="@+id/guideline" app:layout_constraintHorizontal_bias="0" @@ -79,7 +79,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/layout_dp_8" android:layout_weight="1" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="end" android:textColor="@color/blueberry" android:textSize="@dimen/font_small" @@ -132,7 +132,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/upload_loader_text" android:textColor="@color/blueberry" android:textSize="@dimen/sp_14" diff --git a/android/navi-insurance/src/main/res/layout/header_with_title_and_icon.xml b/android/navi-insurance/src/main/res/layout/header_with_title_and_icon.xml index 0b2061fde1..cff1d39c87 100644 --- a/android/navi-insurance/src/main/res/layout/header_with_title_and_icon.xml +++ b/android/navi-insurance/src/main/res/layout/header_with_title_and_icon.xml @@ -31,7 +31,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:includeFontPadding="false" android:textColor="@color/black" android:textSize="@dimen/sp_16" @@ -47,7 +47,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" android:layout_marginBottom="@dimen/dp_12" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviSubText" android:textSize="@dimen/sp_12" app:layout_constraintBottom_toBottomOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/health_benefits_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/health_benefits_bottom_sheet.xml index 5d5c9def6f..664485b378 100644 --- a/android/navi-insurance/src/main/res/layout/health_benefits_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/health_benefits_bottom_sheet.xml @@ -50,7 +50,7 @@ android:layout_marginTop="@dimen/dp_16" android:layout_weight="1" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/okay_got_it" android:textAllCaps="false" android:textSize="@dimen/sp_16" diff --git a/android/navi-insurance/src/main/res/layout/health_compare_list_item.xml b/android/navi-insurance/src/main/res/layout/health_compare_list_item.xml index 67b6233874..cc1326d316 100644 --- a/android/navi-insurance/src/main/res/layout/health_compare_list_item.xml +++ b/android/navi-insurance/src/main/res/layout/health_compare_list_item.xml @@ -19,7 +19,7 @@ android:layout_margin="@dimen/dp_16" android:layout_centerVertical="true" android:layout_width="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:layout_height="wrap_content" android:id="@+id/first_cell_text" tools:text="Hi" @@ -38,7 +38,7 @@ android:layout_margin="@dimen/dp_16" android:layout_gravity="center" android:layout_width="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:layout_height="wrap_content" android:id="@+id/second_cell_text" tools:text="Hi" @@ -56,7 +56,7 @@ android:textAlignment="center" android:layout_margin="@dimen/dp_16" android:layout_gravity="center" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/third_cell_text" diff --git a/android/navi-insurance/src/main/res/layout/health_risk_acclerometer.xml b/android/navi-insurance/src/main/res/layout/health_risk_acclerometer.xml index a58ba4f8c0..2509a02f34 100644 --- a/android/navi-insurance/src/main/res/layout/health_risk_acclerometer.xml +++ b/android/navi-insurance/src/main/res/layout/health_risk_acclerometer.xml @@ -45,7 +45,7 @@ android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_16" android:layout_weight="1" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center_vertical" android:textColor="@color/gi_lightish_grey" android:textSize="@dimen/sp_14" @@ -65,7 +65,7 @@ android:layout_gravity="end" android:layout_marginStart="@dimen/dp_16" android:layout_weight="1" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingTop="@dimen/dp_8" android:paddingEnd="@dimen/dp_8" android:paddingBottom="@dimen/dp_8" @@ -91,7 +91,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginHorizontal="@dimen/dp_9" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:textColor="@color/gi_lightish_grey" android:textSize="@dimen/sp_10" @@ -185,7 +185,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="@dimen/dp_36" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/black" android:textSize="@dimen/sp_46" tools:text="100" /> @@ -221,7 +221,7 @@ android:layout_gravity="start|center_horizontal" android:layout_marginStart="@dimen/dp_2" android:layout_weight="1" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="@string/zero_value" android:textColor="@color/gi_lightish_grey" @@ -250,7 +250,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingHorizontal="@dimen/dp_8" android:textColor="@color/gi_lightish_grey" android:textSize="@dimen/sp_10" @@ -285,7 +285,7 @@ android:layout_height="@dimen/dp_20" android:layout_gravity="start|center_horizontal" android:layout_weight="1" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="@string/hundred_value" android:textColor="@color/gi_lightish_grey" diff --git a/android/navi-insurance/src/main/res/layout/health_risk_header_layout.xml b/android/navi-insurance/src/main/res/layout/health_risk_header_layout.xml index b331dcea0c..cc02bc2deb 100644 --- a/android/navi-insurance/src/main/res/layout/health_risk_header_layout.xml +++ b/android/navi-insurance/src/main/res/layout/health_risk_header_layout.xml @@ -27,7 +27,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_15" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textAlignment="center" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_16" diff --git a/android/navi-insurance/src/main/res/layout/health_risk_score_layout.xml b/android/navi-insurance/src/main/res/layout/health_risk_score_layout.xml index 68be68cc54..e4943d9d88 100644 --- a/android/navi-insurance/src/main/res/layout/health_risk_score_layout.xml +++ b/android/navi-insurance/src/main/res/layout/health_risk_score_layout.xml @@ -115,7 +115,7 @@ diff --git a/android/navi-insurance/src/main/res/layout/hrc_category_item.xml b/android/navi-insurance/src/main/res/layout/hrc_category_item.xml index 4a8634b62a..f1769a5e02 100644 --- a/android/navi-insurance/src/main/res/layout/hrc_category_item.xml +++ b/android/navi-insurance/src/main/res/layout/hrc_category_item.xml @@ -29,7 +29,7 @@ android:textColor="@color/white" android:textSize="@dimen/sp_14" android:visibility="gone" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" tools:text="Personal Details" tools:visibility="visible" /> @@ -58,7 +58,7 @@ android:alpha="0.4" android:textColor="@color/white" android:textSize="@dimen/sp_20" - app:setFontStyle="@{FontWeightEnum.TT_MEDIUM}" + app:setFontStyle="@{FontWeightEnum.NAVI_HEADLINE_REGULAR}" tools:text="Personal Details" /> diff --git a/android/navi-insurance/src/main/res/layout/hrc_multi_select_item.xml b/android/navi-insurance/src/main/res/layout/hrc_multi_select_item.xml index fb1fc732de..0c2663032d 100644 --- a/android/navi-insurance/src/main/res/layout/hrc_multi_select_item.xml +++ b/android/navi-insurance/src/main/res/layout/hrc_multi_select_item.xml @@ -29,7 +29,7 @@ android:paddingVertical="@dimen/dp_14" android:paddingStart="@dimen/dp_16" android:textColor="@color/white" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" tools:ignore="RtlSymmetry" tools:text="CheckBox" /> \ No newline at end of file diff --git a/android/navi-insurance/src/main/res/layout/hrc_single_select_item.xml b/android/navi-insurance/src/main/res/layout/hrc_single_select_item.xml index ff1fee59ae..0fee444b18 100644 --- a/android/navi-insurance/src/main/res/layout/hrc_single_select_item.xml +++ b/android/navi-insurance/src/main/res/layout/hrc_single_select_item.xml @@ -35,7 +35,7 @@ android:minHeight="@dimen/dp_22" android:textColor="@color/white" android:textSize="@dimen/sp_14" - app:setFontStyle="@{FontWeightEnum.TT_REGULAR}" + app:setFontStyle="@{FontWeightEnum.NAVI_BODY_REGULAR}" tools:ignore="RtlSymmetry" tools:text="CheckBox" /> diff --git a/android/navi-insurance/src/main/res/layout/hrs_back_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/hrs_back_bottom_sheet.xml index a80d2ba5eb..2b11100cea 100644 --- a/android/navi-insurance/src/main/res/layout/hrs_back_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/hrs_back_bottom_sheet.xml @@ -21,7 +21,7 @@ android:id="@+id/title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/sp_18" android:textColor="@color/naviBlackText" android:text="@string/are_you_sure_you_want_to_exit"/> @@ -31,7 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="@dimen/sp_14" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviSubText" android:layout_marginTop="@dimen/dp_10" android:text="@string/your_progress_will_be_lost"/> @@ -51,7 +51,7 @@ android:layout_height="@dimen/dp_48" android:gravity="center" android:clickable="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:padding="@dimen/layout_dp_0" android:textAllCaps="false" android:text="@string/continue_assessment" /> @@ -72,7 +72,7 @@ android:layout_height="@dimen/dp_48" android:gravity="center" android:clickable="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:padding="@dimen/layout_dp_0" android:textAllCaps="false" android:text="@string/exit_assessment"/> diff --git a/android/navi-insurance/src/main/res/layout/icon_with_bottom_text_layout.xml b/android/navi-insurance/src/main/res/layout/icon_with_bottom_text_layout.xml index b367e64a79..32729307fc 100644 --- a/android/navi-insurance/src/main/res/layout/icon_with_bottom_text_layout.xml +++ b/android/navi-insurance/src/main/res/layout/icon_with_bottom_text_layout.xml @@ -39,7 +39,7 @@ android:gravity="center" android:textSize="@dimen/sp_12" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" tools:text="Title" android:text="@{title}" android:layout_marginTop="@dimen/dp_8" diff --git a/android/navi-insurance/src/main/res/layout/info_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/info_bottom_sheet.xml index 17614f5973..b8140c503f 100644 --- a/android/navi-insurance/src/main/res/layout/info_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/info_bottom_sheet.xml @@ -21,7 +21,7 @@ android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" tools:text="Full Payment" android:lineHeight="@dimen/sp_28" android:textColor="@color/black" @@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_20" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:lineHeight="@dimen/sp_24" tools:text="Pay monthly for a period of 12 months.Pay monthly for a period of 12 months.Pay monthly for a period of 12 months." @@ -45,7 +45,7 @@ android:visibility="gone" tools:visibility="visible" android:textSize="@dimen/sp_14" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:layout_marginTop="@dimen/dp_20" android:lineHeight="@dimen/sp_24" android:layout_width="wrap_content" diff --git a/android/navi-insurance/src/main/res/layout/insurance_advisor.xml b/android/navi-insurance/src/main/res/layout/insurance_advisor.xml index a6976b1ad8..641428b541 100644 --- a/android/navi-insurance/src/main/res/layout/insurance_advisor.xml +++ b/android/navi-insurance/src/main/res/layout/insurance_advisor.xml @@ -21,7 +21,7 @@ android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_12" android:textColor="@color/naviGrey" android:textAlignment="center" diff --git a/android/navi-insurance/src/main/res/layout/item_auto_pay.xml b/android/navi-insurance/src/main/res/layout/item_auto_pay.xml index 8ed63205a0..7589cb1db9 100644 --- a/android/navi-insurance/src/main/res/layout/item_auto_pay.xml +++ b/android/navi-insurance/src/main/res/layout/item_auto_pay.xml @@ -29,7 +29,7 @@ @@ -71,7 +71,7 @@ android:textSize="@dimen/dp_12" android:textColor="@color/black" android:alpha="0.6" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintTop_toBottomOf="@+id/tv_step_title" app:layout_constraintStart_toEndOf="@+id/ll_step" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/android/navi-insurance/src/main/res/layout/item_emi_middle_step_due_and_payable.xml b/android/navi-insurance/src/main/res/layout/item_emi_middle_step_due_and_payable.xml index ff73412098..e1b8140d81 100644 --- a/android/navi-insurance/src/main/res/layout/item_emi_middle_step_due_and_payable.xml +++ b/android/navi-insurance/src/main/res/layout/item_emi_middle_step_due_and_payable.xml @@ -55,7 +55,7 @@ android:text="January'21" android:textSize="@dimen/sp_14" android:textColor="@color/naviBlackText" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintTop_toTopOf="@+id/ll_step" app:layout_constraintStart_toEndOf="@+id/ll_step" app:layout_constraintEnd_toEndOf="parent"/> @@ -71,7 +71,7 @@ android:textSize="@dimen/dp_12" android:textColor="@color/black" android:alpha="0.6" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintTop_toBottomOf="@+id/tv_step_title" app:layout_constraintStart_toEndOf="@+id/ll_step" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/android/navi-insurance/src/main/res/layout/item_emi_middle_step_paid.xml b/android/navi-insurance/src/main/res/layout/item_emi_middle_step_paid.xml index d8f3b2fa18..3989ddcd54 100644 --- a/android/navi-insurance/src/main/res/layout/item_emi_middle_step_paid.xml +++ b/android/navi-insurance/src/main/res/layout/item_emi_middle_step_paid.xml @@ -54,7 +54,7 @@ android:text="January'21" android:textSize="@dimen/sp_14" android:textColor="@color/naviBlackText" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintTop_toTopOf="@+id/ll_step" app:layout_constraintStart_toEndOf="@+id/ll_step" app:layout_constraintEnd_toEndOf="parent"/> @@ -70,7 +70,7 @@ android:textSize="@dimen/dp_12" android:textColor="@color/black" android:alpha="0.6" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintTop_toBottomOf="@+id/tv_step_title" app:layout_constraintStart_toEndOf="@+id/ll_step" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/android/navi-insurance/src/main/res/layout/item_emi_step_first_paid.xml b/android/navi-insurance/src/main/res/layout/item_emi_step_first_paid.xml index 71a0a55d39..56a677b887 100644 --- a/android/navi-insurance/src/main/res/layout/item_emi_step_first_paid.xml +++ b/android/navi-insurance/src/main/res/layout/item_emi_step_first_paid.xml @@ -56,7 +56,7 @@ android:text="January'21" android:textSize="@dimen/sp_14" android:textColor="@color/naviBlackText" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintTop_toTopOf="@+id/ll_step" app:layout_constraintStart_toEndOf="@+id/ll_step" app:layout_constraintEnd_toEndOf="parent"/> @@ -72,7 +72,7 @@ android:textSize="@dimen/dp_12" android:textColor="@color/black" android:alpha="0.6" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintTop_toBottomOf="@+id/tv_step_title" app:layout_constraintStart_toEndOf="@+id/ll_step" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/android/navi-insurance/src/main/res/layout/item_emi_step_last_due.xml b/android/navi-insurance/src/main/res/layout/item_emi_step_last_due.xml index db02e5df65..daa9e916da 100644 --- a/android/navi-insurance/src/main/res/layout/item_emi_step_last_due.xml +++ b/android/navi-insurance/src/main/res/layout/item_emi_step_last_due.xml @@ -48,7 +48,7 @@ android:text="January'21" android:textSize="@dimen/sp_14" android:textColor="@color/naviBlackText" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintTop_toTopOf="@+id/ll_step" app:layout_constraintStart_toEndOf="@+id/ll_step" app:layout_constraintEnd_toEndOf="parent"/> @@ -64,7 +64,7 @@ android:textSize="@dimen/dp_12" android:textColor="@color/black" android:alpha="0.6" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintTop_toBottomOf="@+id/tv_step_title" app:layout_constraintStart_toEndOf="@+id/ll_step" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/android/navi-insurance/src/main/res/layout/item_emi_step_last_due_and_payable.xml b/android/navi-insurance/src/main/res/layout/item_emi_step_last_due_and_payable.xml index dd852f86d4..806a341fa7 100644 --- a/android/navi-insurance/src/main/res/layout/item_emi_step_last_due_and_payable.xml +++ b/android/navi-insurance/src/main/res/layout/item_emi_step_last_due_and_payable.xml @@ -49,7 +49,7 @@ android:text="January'21" android:textSize="@dimen/sp_14" android:textColor="@color/naviBlackText" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintTop_toTopOf="@+id/ll_step" app:layout_constraintStart_toEndOf="@+id/ll_step" app:layout_constraintEnd_toEndOf="parent"/> @@ -65,7 +65,7 @@ android:textSize="@dimen/dp_12" android:textColor="@color/black" android:alpha="0.6" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintTop_toBottomOf="@+id/tv_step_title" app:layout_constraintStart_toEndOf="@+id/ll_step" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/android/navi-insurance/src/main/res/layout/item_emi_step_last_paid.xml b/android/navi-insurance/src/main/res/layout/item_emi_step_last_paid.xml index 6bd8537037..566b570563 100644 --- a/android/navi-insurance/src/main/res/layout/item_emi_step_last_paid.xml +++ b/android/navi-insurance/src/main/res/layout/item_emi_step_last_paid.xml @@ -47,7 +47,7 @@ android:text="January'21" android:textSize="@dimen/sp_14" android:textColor="@color/naviBlackText" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintTop_toTopOf="@+id/ll_step" app:layout_constraintStart_toEndOf="@+id/ll_step" app:layout_constraintEnd_toEndOf="parent"/> @@ -63,7 +63,7 @@ android:textSize="@dimen/dp_12" android:textColor="@color/black" android:alpha="0.6" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintTop_toBottomOf="@+id/tv_step_title" app:layout_constraintStart_toEndOf="@+id/ll_step" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/android/navi-insurance/src/main/res/layout/item_message_hospitals_nearby.xml b/android/navi-insurance/src/main/res/layout/item_message_hospitals_nearby.xml index 12fe4f4189..77ac810cf7 100644 --- a/android/navi-insurance/src/main/res/layout/item_message_hospitals_nearby.xml +++ b/android/navi-insurance/src/main/res/layout/item_message_hospitals_nearby.xml @@ -89,7 +89,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:lineHeight="@dimen/sp_22" android:text="@{nearByHospitalDataV2.footerText}" android:textColor="@color/naviSubText" @@ -194,7 +194,7 @@ android:layout_margin="@dimen/dp_2" android:background="@drawable/circle" android:ellipsize="end" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:maxLines="1" android:text="@{`+`+nearByHospitalDataV2.numberOfHospitals}" diff --git a/android/navi-insurance/src/main/res/layout/item_message_permissions.xml b/android/navi-insurance/src/main/res/layout/item_message_permissions.xml index 7872a3794a..e998bdcdb2 100644 --- a/android/navi-insurance/src/main/res/layout/item_message_permissions.xml +++ b/android/navi-insurance/src/main/res/layout/item_message_permissions.xml @@ -62,7 +62,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="0dp" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:text="SMS Permission" android:textAllCaps="false" @@ -79,7 +79,7 @@ android:layout_height="wrap_content" android:layout_marginStart="0dp" android:layout_marginTop="2dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="To read Navi OTP and send you policy and claims related info" android:textAllCaps="false" @@ -119,7 +119,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="0dp" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:text="Location Permission" android:textAllCaps="false" @@ -136,7 +136,7 @@ android:layout_height="wrap_content" android:layout_marginStart="0dp" android:layout_marginTop="2dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="To show Navi’s cashless hospital network around your area" android:textAllCaps="false" diff --git a/android/navi-insurance/src/main/res/layout/item_message_received.xml b/android/navi-insurance/src/main/res/layout/item_message_received.xml index a9318222a0..e66d4362d0 100644 --- a/android/navi-insurance/src/main/res/layout/item_message_received.xml +++ b/android/navi-insurance/src/main/res/layout/item_message_received.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginTop="4dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="John Doe" android:textSize="14sp" android:visibility="gone" @@ -46,7 +46,7 @@ android:layout_marginLeft="8dp" android:layout_marginTop="4dp" android:background="@drawable/rounded_rectangle_grey" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:maxWidth="240dp" android:paddingLeft="15dp" android:paddingTop="10dp" @@ -64,7 +64,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="11:40" android:textSize="10sp" android:visibility="gone" diff --git a/android/navi-insurance/src/main/res/layout/item_message_sent.xml b/android/navi-insurance/src/main/res/layout/item_message_sent.xml index 0e1c756638..fa222a9140 100644 --- a/android/navi-insurance/src/main/res/layout/item_message_sent.xml +++ b/android/navi-insurance/src/main/res/layout/item_message_sent.xml @@ -20,7 +20,7 @@ android:layout_marginRight="8dp" android:layout_marginTop="8dp" android:background="@drawable/rounded_rectangle_white_border" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:maxWidth="240dp" android:paddingLeft="15dp" android:paddingTop="10dp" @@ -38,7 +38,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="4dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="11:40" android:textSize="10sp" android:visibility="gone" diff --git a/android/navi-insurance/src/main/res/layout/item_payment_done.xml b/android/navi-insurance/src/main/res/layout/item_payment_done.xml index 2321cf2ed0..b35762ff40 100644 --- a/android/navi-insurance/src/main/res/layout/item_payment_done.xml +++ b/android/navi-insurance/src/main/res/layout/item_payment_done.xml @@ -20,7 +20,7 @@ android:paddingStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_16" android:id="@+id/policy_txt" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviSubText" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" android:paddingStart="@dimen/dp_20" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:text="₹4,840 Paid" android:ellipsize="end" @@ -53,7 +53,7 @@ android:paddingHorizontal="@dimen/dp_20" android:layout_marginTop="@dimen/dp_4" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="@string/payment_done_for_x_month_next_bill_on_y" android:ellipsize="end" @@ -71,7 +71,7 @@ android:paddingStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_4" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Due date: 4 Apr’21" android:ellipsize="end" @@ -109,7 +109,7 @@ android:text="View Details" android:drawableStart="@drawable/ic_view_details" android:drawableEnd="@drawable/ic_arrow_forward_no_tail" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviBlackText" android:drawablePadding="@dimen/dp_8" app:layout_constraintTop_toTopOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/item_payment_due.xml b/android/navi-insurance/src/main/res/layout/item_payment_due.xml index b5ec9937f6..8a9a395f65 100644 --- a/android/navi-insurance/src/main/res/layout/item_payment_due.xml +++ b/android/navi-insurance/src/main/res/layout/item_payment_due.xml @@ -20,7 +20,7 @@ android:paddingStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_16" android:id="@+id/policy_txt" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviSubText" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" android:paddingStart="@dimen/dp_20" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:text="₹4,840" android:ellipsize="end" @@ -63,7 +63,7 @@ android:paddingStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_4" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Monthly due generated" android:maxLines="1" @@ -82,7 +82,7 @@ android:paddingStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_4" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Due date: 4 Apr’21" android:ellipsize="end" @@ -100,7 +100,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_20" android:background="@drawable/button_with_state" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="@dimen/dp_8" android:text="Pay now" @@ -139,7 +139,7 @@ android:text="View Details" android:drawableStart="@drawable/ic_view_details" android:drawableEnd="@drawable/ic_arrow_forward_no_tail" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviBlackText" android:drawablePadding="@dimen/dp_8" app:layout_constraintTop_toTopOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/item_payment_overdue.xml b/android/navi-insurance/src/main/res/layout/item_payment_overdue.xml index 0b9f0a0f2a..cfa40c0395 100644 --- a/android/navi-insurance/src/main/res/layout/item_payment_overdue.xml +++ b/android/navi-insurance/src/main/res/layout/item_payment_overdue.xml @@ -20,7 +20,7 @@ android:paddingStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_16" android:id="@+id/policy_txt" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviSubText" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -37,7 +37,7 @@ android:paddingStart="@dimen/dp_20" android:drawableEnd="@drawable/ic_alert" android:drawablePadding="@dimen/dp_6" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:text="₹4,840" android:ellipsize="end" @@ -65,7 +65,7 @@ android:paddingStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_4" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Overdue for payment" android:maxLines="1" @@ -83,7 +83,7 @@ android:paddingStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_4" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="@string/due_date_x" android:ellipsize="end" @@ -101,7 +101,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_20" android:background="@drawable/button_with_state" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="@dimen/dp_8" android:text="Pay now" @@ -140,7 +140,7 @@ android:text="View Details" android:drawableStart="@drawable/ic_view_details" android:drawableEnd="@drawable/ic_arrow_forward_no_tail" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviBlackText" android:drawablePadding="@dimen/dp_8" app:layout_constraintTop_toTopOf="parent" 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 cdaee20588..779c1ff39b 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 @@ -20,7 +20,7 @@ android:paddingStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_16" android:id="@+id/policy_txt" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviSubText" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -37,7 +37,7 @@ android:paddingStart="@dimen/dp_20" android:drawableEnd="@drawable/navi_insurance_ic_alert_yellow" android:drawablePadding="@dimen/dp_6" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:text="Payment Processing" android:ellipsize="end" @@ -53,7 +53,7 @@ android:paddingHorizontal="@dimen/dp_20" android:layout_marginTop="@dimen/dp_4" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Please check back after 1-2 hours to see the payment status" android:ellipsize="end" @@ -71,7 +71,7 @@ android:paddingStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_4" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Due date: 4 Apr’21" android:ellipsize="end" @@ -109,7 +109,7 @@ android:text="View Details" android:drawableStart="@drawable/ic_view_details" android:drawableEnd="@drawable/ic_arrow_forward_no_tail" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviBlackText" android:drawablePadding="@dimen/dp_8" app:layout_constraintTop_toTopOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/key_value_horizontal_item.xml b/android/navi-insurance/src/main/res/layout/key_value_horizontal_item.xml index 7ec4580bba..7be27518d0 100644 --- a/android/navi-insurance/src/main/res/layout/key_value_horizontal_item.xml +++ b/android/navi-insurance/src/main/res/layout/key_value_horizontal_item.xml @@ -36,7 +36,7 @@ app:layout_constraintStart_toEndOf="@+id/row_icon" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_14" android:textColor="@color/naviBlackText" android:textAlignment="textStart"/> @@ -48,7 +48,7 @@ app:layout_constraintTop_toTopOf="parent" android:layout_marginEnd="@dimen/dp_8" app:layout_constraintEnd_toStartOf="@id/item_value" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_12" tools:text="$350" android:textColor="@color/naviGrey" @@ -62,7 +62,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_14" android:textColor="@color/naviBlackText" android:textAlignment="textEnd"/> diff --git a/android/navi-insurance/src/main/res/layout/landing_page_sticky_footer.xml b/android/navi-insurance/src/main/res/layout/landing_page_sticky_footer.xml index bff6107971..c028e7cd54 100644 --- a/android/navi-insurance/src/main/res/layout/landing_page_sticky_footer.xml +++ b/android/navi-insurance/src/main/res/layout/landing_page_sticky_footer.xml @@ -53,7 +53,7 @@ android:layout_height="@dimen/dp_48" android:clickable="false" android:focusable="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="@string/buy_health_insurance" android:textSize="@dimen/sp_16" @@ -68,7 +68,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/continueBtn" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/dim_grey" android:layout_marginTop="@dimen/dp_16" tools:text="starts at only ₹241 /month" 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 ed02fa26c6..64c50276e9 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 @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:lineSpacingExtra="@dimen/sp_4" android:textColor="@color/black" android:textSize="@dimen/sp_20" @@ -42,7 +42,7 @@ android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_8" android:layout_marginEnd="@dimen/dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="@dimen/sp_4" android:textColor="@color/color_191919" android:textSize="@dimen/sp_14" diff --git a/android/navi-insurance/src/main/res/layout/layout_chip_choice.xml b/android/navi-insurance/src/main/res/layout/layout_chip_choice.xml index a683711aa8..d31f4bbee8 100644 --- a/android/navi-insurance/src/main/res/layout/layout_chip_choice.xml +++ b/android/navi-insurance/src/main/res/layout/layout_chip_choice.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content" android:minWidth="@dimen/dp_75" android:minHeight="@dimen/dp_40" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textAlignment="center" android:paddingHorizontal="@dimen/dp_16" android:paddingVertical="@dimen/dp_4" diff --git a/android/navi-insurance/src/main/res/layout/layout_dynamic_button.xml b/android/navi-insurance/src/main/res/layout/layout_dynamic_button.xml index 1a2a58b918..a7f2a6a781 100644 --- a/android/navi-insurance/src/main/res/layout/layout_dynamic_button.xml +++ b/android/navi-insurance/src/main/res/layout/layout_dynamic_button.xml @@ -22,7 +22,7 @@ android:outlineSpotShadowColor="@color/naviGrey" android:background="@drawable/rounded_rectangle_white_border_10dp_radius" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingStart="20dp" android:paddingEnd="20dp" diff --git a/android/navi-insurance/src/main/res/layout/layout_error_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/layout_error_bottom_sheet.xml index 42c4af99ff..301e68f642 100644 --- a/android/navi-insurance/src/main/res/layout/layout_error_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/layout_error_bottom_sheet.xml @@ -59,7 +59,7 @@ android:layout_marginBottom="@dimen/dp_20" android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="0dp" android:text="@string/retry_text" diff --git a/android/navi-insurance/src/main/res/layout/layout_fixed_label_input_text.xml b/android/navi-insurance/src/main/res/layout/layout_fixed_label_input_text.xml index 244b8ea285..a84180c269 100644 --- a/android/navi-insurance/src/main/res/layout/layout_fixed_label_input_text.xml +++ b/android/navi-insurance/src/main/res/layout/layout_fixed_label_input_text.xml @@ -54,7 +54,7 @@ android:paddingTop="@dimen/dp_13" android:paddingBottom="@dimen/dp_2" android:paddingEnd="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_12" android:textColor="@color/titleSecondaryColor" android:layout_marginBottom="@dimen/dp_8" @@ -69,7 +69,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/EditTextStyle" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingVertical="@dimen/dp_16" android:paddingHorizontal="@dimen/dp_16" android:paddingTop="0dp" diff --git a/android/navi-insurance/src/main/res/layout/layout_footer_with_title_subtitle.xml b/android/navi-insurance/src/main/res/layout/layout_footer_with_title_subtitle.xml index 029b4c7a05..904c795192 100644 --- a/android/navi-insurance/src/main/res/layout/layout_footer_with_title_subtitle.xml +++ b/android/navi-insurance/src/main/res/layout/layout_footer_with_title_subtitle.xml @@ -49,7 +49,7 @@ android:layout_width="wrap_content" android:layout_height="0dp" android:layout_marginStart="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/eerie_black" android:textSize="@dimen/payu_dimen_20sp" android:lineHeight="@dimen/sp_28" @@ -66,7 +66,7 @@ style="@style/MediumTextSemiBoldGreyFontStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/eerie_black" android:textStyle="bold" android:textSize="@dimen/sp_12" diff --git a/android/navi-insurance/src/main/res/layout/layout_no_hospitals.xml b/android/navi-insurance/src/main/res/layout/layout_no_hospitals.xml index 72442853b5..149a15a2d0 100644 --- a/android/navi-insurance/src/main/res/layout/layout_no_hospitals.xml +++ b/android/navi-insurance/src/main/res/layout/layout_no_hospitals.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:text="No hospitals found" android:textSize="12sp" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:layout_gravity="center" android:textColor="@color/naviBlackText"/> @@ -37,7 +37,7 @@ android:layout_marginTop="6dp" android:text="Kindly zoom out or move the map to find nearby cashless hospitals." android:textSize="12sp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:layout_gravity="center" android:textAlignment="center" android:textColor="@color/naviSubText"/> diff --git a/android/navi-insurance/src/main/res/layout/layout_payment_method.xml b/android/navi-insurance/src/main/res/layout/layout_payment_method.xml index e31633fbcc..e3d0733a5b 100644 --- a/android/navi-insurance/src/main/res/layout/layout_payment_method.xml +++ b/android/navi-insurance/src/main/res/layout/layout_payment_method.xml @@ -203,7 +203,7 @@ android:gravity="center" android:paddingHorizontal="@dimen/dp_16" android:padding="@dimen/dp_10" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/highlightColor" tools:text="10% off on both monthly and full payment!" /> diff --git a/android/navi-insurance/src/main/res/layout/layout_payment_method_experiment.xml b/android/navi-insurance/src/main/res/layout/layout_payment_method_experiment.xml index 1f0b211f01..9d0ed0752c 100644 --- a/android/navi-insurance/src/main/res/layout/layout_payment_method_experiment.xml +++ b/android/navi-insurance/src/main/res/layout/layout_payment_method_experiment.xml @@ -93,7 +93,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/layout_dp_10" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/gi_monthly_premium_for_12_months" android:textColor="@color/davyGrey" app:layout_constraintBottom_toBottomOf="parent" @@ -106,7 +106,7 @@ android:id="@+id/emi_amount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/greyish_brown" android:layout_marginTop="@dimen/layout_dp_12" app:layout_constraintStart_toStartOf="@id/emi_title" @@ -194,7 +194,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/layout_dp_10" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/full_annual_premium" android:textColor="@color/davyGrey" app:layout_constraintBottom_toBottomOf="parent" @@ -207,7 +207,7 @@ android:id="@+id/full_amount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/greyish_brown" tools:text="₹310/month" app:visibility="@{isFullPayment}" @@ -275,7 +275,7 @@ android:gravity="center" android:paddingHorizontal="@dimen/dp_16" android:padding="@dimen/dp_10" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/highlightColor" tools:text="10% off on both monthly and full payment!" /> diff --git a/android/navi-insurance/src/main/res/layout/layout_payment_type.xml b/android/navi-insurance/src/main/res/layout/layout_payment_type.xml index bfd66fed0c..548787d06b 100644 --- a/android/navi-insurance/src/main/res/layout/layout_payment_type.xml +++ b/android/navi-insurance/src/main/res/layout/layout_payment_type.xml @@ -74,7 +74,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/layout_dp_16" android:layout_marginBottom="@dimen/layout_dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/gi_monthly_premium_for_12_months" android:textColor="@color/davyGrey" app:layout_constraintBottom_toBottomOf="parent" @@ -87,7 +87,7 @@ android:id="@+id/amount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/greyish_brown" android:layout_marginBottom="@dimen/layout_dp_16" app:layout_constraintBottom_toBottomOf="parent" @@ -144,7 +144,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:drawablePadding="@dimen/layout_dp_8" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:lineHeight="@dimen/layout_dp_22" android:paddingHorizontal="@dimen/layout_dp_8" android:paddingVertical="@dimen/layout_dp_4" diff --git a/android/navi-insurance/src/main/res/layout/layout_policy_summary_item.xml b/android/navi-insurance/src/main/res/layout/layout_policy_summary_item.xml index 1994f23cad..8bd3a251d4 100644 --- a/android/navi-insurance/src/main/res/layout/layout_policy_summary_item.xml +++ b/android/navi-insurance/src/main/res/layout/layout_policy_summary_item.xml @@ -30,7 +30,7 @@ android:layout_weight="0.7" android:layout_height="wrap_content" android:text="Text" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="14sp" android:textColor="@color/naviBlackText" android:textAlignment="textStart"/> @@ -41,7 +41,7 @@ android:layout_weight="0.3" android:layout_height="wrap_content" android:text="Value" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="14sp" android:textColor="@color/naviBlackText" android:textAlignment="textEnd"/> diff --git a/android/navi-insurance/src/main/res/layout/layout_popup_activity.xml b/android/navi-insurance/src/main/res/layout/layout_popup_activity.xml index 576e6a0857..53d86d22a8 100644 --- a/android/navi-insurance/src/main/res/layout/layout_popup_activity.xml +++ b/android/navi-insurance/src/main/res/layout/layout_popup_activity.xml @@ -24,7 +24,7 @@ android:layout_width="wrap_content" android:layout_height="@dimen/layout_dp_48" style="@style/ButtonFontStylePurple" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:paddingHorizontal="@dimen/dp_22" android:textSize="@dimen/font_small" diff --git a/android/navi-insurance/src/main/res/layout/layout_reward_banner.xml b/android/navi-insurance/src/main/res/layout/layout_reward_banner.xml index 13a57193e3..8cd5634fdf 100644 --- a/android/navi-insurance/src/main/res/layout/layout_reward_banner.xml +++ b/android/navi-insurance/src/main/res/layout/layout_reward_banner.xml @@ -29,7 +29,7 @@ android:layout_width="wrap_content" android:visibility="visible" android:layout_height="wrap_content" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:textSize="@dimen/sp_12" android:textColor="@color/dark_green" android:lineHeight="@dimen/sp_18" @@ -58,7 +58,7 @@ android:layout_width="wrap_content" android:visibility="visible" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/sp_12" android:textColor="@color/color_3C0050" android:lineHeight="@dimen/sp_18" diff --git a/android/navi-insurance/src/main/res/layout/layout_team_member_item.xml b/android/navi-insurance/src/main/res/layout/layout_team_member_item.xml index 37e6353d4a..a49f92d1da 100644 --- a/android/navi-insurance/src/main/res/layout/layout_team_member_item.xml +++ b/android/navi-insurance/src/main/res/layout/layout_team_member_item.xml @@ -29,7 +29,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:text="Sachin Bansal, CEO Navi Group" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_14" android:layout_marginStart="@dimen/dp_8" @@ -42,7 +42,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:text="Lorem Ipsum" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviSubText" android:textSize="@dimen/sp_12" android:lineSpacingExtra="@dimen/dp_4" @@ -58,7 +58,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/more" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_12" android:textColor="@color/naviBlue" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/layout_tv_policy_doc.xml b/android/navi-insurance/src/main/res/layout/layout_tv_policy_doc.xml index 0bb60d0a5b..49b368d611 100644 --- a/android/navi-insurance/src/main/res/layout/layout_tv_policy_doc.xml +++ b/android/navi-insurance/src/main/res/layout/layout_tv_policy_doc.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:paddingHorizontal="8dp" android:paddingBottom="50dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:layout_marginTop="20dp" android:text="@string/for_more_details_read_our_policy_prospectus" android:textAlignment="center" diff --git a/android/navi-insurance/src/main/res/layout/list_card_widget_fixed_item.xml b/android/navi-insurance/src/main/res/layout/list_card_widget_fixed_item.xml index 5b64c61474..f3c9c605f3 100644 --- a/android/navi-insurance/src/main/res/layout/list_card_widget_fixed_item.xml +++ b/android/navi-insurance/src/main/res/layout/list_card_widget_fixed_item.xml @@ -25,7 +25,7 @@ android:layout_marginStart="@dimen/dp_10" android:layout_marginTop="@dimen/dp_24" android:layout_marginEnd="@dimen/dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_14" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/title_image" @@ -38,7 +38,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingMultiplier="1.3" android:orientation="vertical" app:layout_goneMarginTop="@dimen/dp_0" diff --git a/android/navi-insurance/src/main/res/layout/loader_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/loader_bottom_sheet.xml index 471a2f66af..3ea53f8ed9 100644 --- a/android/navi-insurance/src/main/res/layout/loader_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/loader_bottom_sheet.xml @@ -23,7 +23,7 @@ android:layout_marginTop="@dimen/dp_24" android:layout_marginBottom="@dimen/dp_6" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" tools:text="Loading" android:textColor="@color/naviBlackText" @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" tools:text="@string/benefit_loading_desc" android:textColor="@color/naviSubText" diff --git a/android/navi-insurance/src/main/res/layout/loader_view.xml b/android/navi-insurance/src/main/res/layout/loader_view.xml index f434482b9b..595a27c6d6 100644 --- a/android/navi-insurance/src/main/res/layout/loader_view.xml +++ b/android/navi-insurance/src/main/res/layout/loader_view.xml @@ -31,7 +31,7 @@ android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:paddingHorizontal="@dimen/dp_16" android:text="@string/personalise_your_buying_experience" diff --git a/android/navi-insurance/src/main/res/layout/logout_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/logout_bottom_sheet.xml index 656380e979..92dee37443 100644 --- a/android/navi-insurance/src/main/res/layout/logout_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/logout_bottom_sheet.xml @@ -19,7 +19,7 @@ android:id="@+id/logout_tv" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="Logout?" android:textAllCaps="false" android:textColor="@color/naviBlackText" @@ -33,7 +33,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="24dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Are you sure you want to logout from the app?" android:textColor="@color/naviBlackText" app:layout_constraintStart_toStartOf="parent" @@ -61,7 +61,7 @@ android:layout_weight="1" android:background="@drawable/rounded_rectangle_grey_8dp_radius" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="0dp" android:text="Logout" @@ -81,7 +81,7 @@ android:layout_weight="1" android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="0dp" android:text="Cancel" diff --git a/android/navi-insurance/src/main/res/layout/max_age_cover_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/max_age_cover_bottom_sheet.xml index cb87ac0227..39ae7642ab 100644 --- a/android/navi-insurance/src/main/res/layout/max_age_cover_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/max_age_cover_bottom_sheet.xml @@ -22,7 +22,7 @@ android:layout_marginStart="20dp" android:layout_marginTop="32dp" android:layout_marginEnd="20dp" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:text="Why is the max(& min) cover ₹ 2 lakhs?" android:textAllCaps="false" @@ -36,7 +36,7 @@ android:layout_marginStart="20dp" android:layout_marginTop="8dp" android:layout_marginEnd="20dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="Since your father’s age is more than 70 years, the cover we can provide for is ₹ 2 lakhs as per our policy document." android:textAllCaps="false" @@ -49,7 +49,7 @@ android:layout_marginStart="20dp" android:layout_marginTop="32dp" android:layout_marginEnd="20dp" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:text="How can I increase the cover amount?" android:textAllCaps="false" @@ -64,7 +64,7 @@ android:layout_marginTop="8dp" android:layout_marginEnd="20dp" android:layout_marginBottom="40dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="You can remove your father from the family policy and buy a separate policy only for him later in the app. Most of our customers follow this process." android:textAllCaps="false" @@ -89,7 +89,7 @@ android:layout_weight="1" android:background="@drawable/rounded_rectangle_grey" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="0dp" android:text="Edit Members" @@ -109,7 +109,7 @@ android:layout_weight="1" android:background="@drawable/button_with_state" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="0dp" android:text="Cancel" diff --git a/android/navi-insurance/src/main/res/layout/member_details_view_item.xml b/android/navi-insurance/src/main/res/layout/member_details_view_item.xml index 053c1b6de5..cf1bd9e5b3 100644 --- a/android/navi-insurance/src/main/res/layout/member_details_view_item.xml +++ b/android/navi-insurance/src/main/res/layout/member_details_view_item.xml @@ -50,7 +50,7 @@ android:layout_marginStart="@dimen/dp_16" android:textSize="@dimen/sp_12" android:textColor="@color/descriptionColor9" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" tools:text="The KYC for this member has been verified. No changes can be made to this user’s details."/> diff --git a/android/navi-insurance/src/main/res/layout/members_age_picker_card.xml b/android/navi-insurance/src/main/res/layout/members_age_picker_card.xml index 7b52bc59e9..37d2242620 100644 --- a/android/navi-insurance/src/main/res/layout/members_age_picker_card.xml +++ b/android/navi-insurance/src/main/res/layout/members_age_picker_card.xml @@ -33,7 +33,7 @@ android:textSize="@dimen/sp_14" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:padding="@dimen/dp_2" android:drawablePadding="@dimen/dp_8" android:textColor="@color/dim_grey" diff --git a/android/navi-insurance/src/main/res/layout/multi_select_checkbox_widget_item.xml b/android/navi-insurance/src/main/res/layout/multi_select_checkbox_widget_item.xml index 2f0d9b1673..d942b9ed89 100644 --- a/android/navi-insurance/src/main/res/layout/multi_select_checkbox_widget_item.xml +++ b/android/navi-insurance/src/main/res/layout/multi_select_checkbox_widget_item.xml @@ -41,7 +41,7 @@ android:clipToPadding="false" android:drawablePadding="@dimen/dp_16" android:focusable="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_vertical" android:paddingStart="@dimen/dp_16" android:textColor="@color/davyGrey" diff --git a/android/navi-insurance/src/main/res/layout/navi_insurance_activity_update_app.xml b/android/navi-insurance/src/main/res/layout/navi_insurance_activity_update_app.xml index 5905a397e8..755fdf51de 100644 --- a/android/navi-insurance/src/main/res/layout/navi_insurance_activity_update_app.xml +++ b/android/navi-insurance/src/main/res/layout/navi_insurance_activity_update_app.xml @@ -32,7 +32,7 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:text="@string/app_upgrade_required" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="20sp" android:textColor="@color/naviBlackText" app:layout_constraintEnd_toEndOf="@+id/description_tv" @@ -47,7 +47,7 @@ android:layout_marginTop="12dp" android:text="@string/app_upgrade_description" android:textColor="@color/naviSubText" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textAlignment="center" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -73,7 +73,7 @@ android:layout_width="match_parent" android:layout_height="60dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="Update" android:textAllCaps="false" diff --git a/android/navi-insurance/src/main/res/layout/navi_radio_button.xml b/android/navi-insurance/src/main/res/layout/navi_radio_button.xml index 504e8a52a7..30ae55d686 100644 --- a/android/navi-insurance/src/main/res/layout/navi_radio_button.xml +++ b/android/navi-insurance/src/main/res/layout/navi_radio_button.xml @@ -25,7 +25,7 @@ android:clickable="false" android:ellipsize="end" android:focusable="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:maxLines="1" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_12" @@ -44,7 +44,7 @@ android:layout_marginEnd="@dimen/dp_16" android:clickable="false" android:focusable="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="#991A1A1A" android:textSize="@dimen/sp_12" app:layout_constraintEnd_toEndOf="parent" 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 7b91e533d0..16c90b05e9 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 @@ -35,7 +35,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="@dimen/dp_57" android:layout_marginStart="@dimen/dp_12" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_14" android:gravity="center" @@ -76,7 +76,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_20" android:drawablePadding="@dimen/dp_4" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviBlue" android:textSize="@dimen/sp_14" android:visibility="gone" @@ -119,7 +119,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="@dimen/sp_14" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/naviBlackText" tools:text="Father's health details"/> diff --git a/android/navi-insurance/src/main/res/layout/no_content_widget.xml b/android/navi-insurance/src/main/res/layout/no_content_widget.xml index a915591c3f..fd7d689079 100644 --- a/android/navi-insurance/src/main/res/layout/no_content_widget.xml +++ b/android/navi-insurance/src/main/res/layout/no_content_widget.xml @@ -23,7 +23,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_16" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/number_picker_layout.xml b/android/navi-insurance/src/main/res/layout/number_picker_layout.xml index 7aca1bbfb6..d5b0352fac 100644 --- a/android/navi-insurance/src/main/res/layout/number_picker_layout.xml +++ b/android/navi-insurance/src/main/res/layout/number_picker_layout.xml @@ -17,7 +17,7 @@ android:layout_width="25dp" android:layout_height="match_parent" android:background="@null" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:padding="0dp" android:text="-" android:textColor="@color/naviBlue" @@ -28,7 +28,7 @@ android:id="@+id/display" android:layout_width="20dp" android:layout_height="match_parent" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:inputType="number" android:text="12" @@ -40,7 +40,7 @@ android:layout_width="25dp" android:layout_height="match_parent" android:background="@null" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:padding="0dp" android:text="+" android:textColor="@color/naviBlue" diff --git a/android/navi-insurance/src/main/res/layout/number_picker_layout_v2.xml b/android/navi-insurance/src/main/res/layout/number_picker_layout_v2.xml index 1469f7a702..1ea4ec875f 100644 --- a/android/navi-insurance/src/main/res/layout/number_picker_layout_v2.xml +++ b/android/navi-insurance/src/main/res/layout/number_picker_layout_v2.xml @@ -16,7 +16,7 @@ android:layout_width="25dp" android:layout_height="match_parent" android:background="@null" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingEnd="5dp" android:drawableEnd="@drawable/minus_circle" android:textColor="@color/naviBlue" @@ -27,7 +27,7 @@ android:id="@+id/display" android:layout_width="20dp" android:layout_height="match_parent" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:inputType="number" android:text="12" @@ -39,7 +39,7 @@ android:layout_width="25dp" android:layout_height="match_parent" android:background="@null" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingStart="4dp" android:drawableStart="@drawable/plus_circle" android:textColor="@color/naviBlue" diff --git a/android/navi-insurance/src/main/res/layout/number_text_layout.xml b/android/navi-insurance/src/main/res/layout/number_text_layout.xml index 7eb06b035e..8f804c4a9f 100644 --- a/android/navi-insurance/src/main/res/layout/number_text_layout.xml +++ b/android/navi-insurance/src/main/res/layout/number_text_layout.xml @@ -7,7 +7,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="@dimen/dp_20" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/black" android:textAlignment="center" android:textSize="@dimen/sp_46" diff --git a/android/navi-insurance/src/main/res/layout/offer_fragment_premium_details_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/offer_fragment_premium_details_bottom_sheet.xml index 0eb636932f..479c46c6a6 100644 --- a/android/navi-insurance/src/main/res/layout/offer_fragment_premium_details_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/offer_fragment_premium_details_bottom_sheet.xml @@ -49,7 +49,7 @@ android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/premium_details" android:textColor="@color/black" android:textSize="@dimen/sp_16" @@ -61,7 +61,7 @@ android:id="@+id/loading_text_tv" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviSubText" android:textSize="@dimen/sp_14" android:visibility="gone" @@ -121,7 +121,7 @@ android:layout_weight="1" android:clickable="true" android:focusable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingVertical="@dimen/dp_18" android:text="@string/okay_got_it" android:textAllCaps="false" diff --git a/android/navi-insurance/src/main/res/layout/payment_header.xml b/android/navi-insurance/src/main/res/layout/payment_header.xml index 02f29f61f5..b2cbfd9757 100644 --- a/android/navi-insurance/src/main/res/layout/payment_header.xml +++ b/android/navi-insurance/src/main/res/layout/payment_header.xml @@ -23,7 +23,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_17" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/fully_refundable_for_15_days" android:textColor="@color/naviSuccessGreen" android:textSize="@dimen/sp_12" diff --git a/android/navi-insurance/src/main/res/layout/payment_header_attached.xml b/android/navi-insurance/src/main/res/layout/payment_header_attached.xml index ca0d5be349..88c8370dd5 100644 --- a/android/navi-insurance/src/main/res/layout/payment_header_attached.xml +++ b/android/navi-insurance/src/main/res/layout/payment_header_attached.xml @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/discount_background" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingHorizontal="@dimen/dp_12" android:paddingVertical="@dimen/dp_4" android:textColor="@color/naviSuccessGreen" @@ -41,7 +41,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_5" android:layout_marginEnd="@dimen/dp_4" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_12" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -55,7 +55,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_2" android:layout_marginEnd="@dimen/dp_8" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="bottom" android:textColor="@color/black" android:textSize="@dimen/sp_18" diff --git a/android/navi-insurance/src/main/res/layout/payment_offer_callouts_layout.xml b/android/navi-insurance/src/main/res/layout/payment_offer_callouts_layout.xml index 2b2a654ff1..6509fba0ba 100644 --- a/android/navi-insurance/src/main/res/layout/payment_offer_callouts_layout.xml +++ b/android/navi-insurance/src/main/res/layout/payment_offer_callouts_layout.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:background="@color/offer_light_green" android:drawablePadding="@dimen/dp_10" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingStart="@dimen/dp_20" android:paddingTop="@dimen/dp_18" android:paddingEnd="@dimen/dp_40" @@ -67,7 +67,7 @@ android:id="@+id/callout_description_tv" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:padding="@dimen/dp_16" android:paddingEnd="@dimen/dp_20" diff --git a/android/navi-insurance/src/main/res/layout/payment_status_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/payment_status_bottom_sheet.xml index 76db99f5f6..3d81217b13 100644 --- a/android/navi-insurance/src/main/res/layout/payment_status_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/payment_status_bottom_sheet.xml @@ -30,7 +30,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/payment_cancelled" android:textAllCaps="false" android:textColor="@color/naviBlackText" @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/kindly_retry_payment" android:lineSpacingExtra="@dimen/sp_4" android:textAllCaps="false" @@ -63,7 +63,7 @@ android:layout_gravity="start" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:padding="@dimen/dp_0" android:text="@string/close" @@ -79,7 +79,7 @@ android:layout_marginStart="@dimen/dp_16" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:padding="@dimen/dp_0" android:text="@string/places_try_again" diff --git a/android/navi-insurance/src/main/res/layout/pill_button.xml b/android/navi-insurance/src/main/res/layout/pill_button.xml index 5d97312dc6..24ccdfb0d7 100644 --- a/android/navi-insurance/src/main/res/layout/pill_button.xml +++ b/android/navi-insurance/src/main/res/layout/pill_button.xml @@ -20,7 +20,7 @@ android:gravity="center" android:textAllCaps="false" android:textColor="@color/naviBlackText" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_12" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/place_prediction_item.xml b/android/navi-insurance/src/main/res/layout/place_prediction_item.xml index 6e49adf38c..027d9e3809 100644 --- a/android/navi-insurance/src/main/res/layout/place_prediction_item.xml +++ b/android/navi-insurance/src/main/res/layout/place_prediction_item.xml @@ -21,7 +21,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Title" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/naviBlackText" android:textSize="12sp" app:layout_constraintStart_toStartOf="parent" @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:text="Address" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviSubText" android:textSize="12sp" app:layout_constraintStart_toStartOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/plan_list_item.xml b/android/navi-insurance/src/main/res/layout/plan_list_item.xml index 807a8ba1a8..cf2404acf5 100644 --- a/android/navi-insurance/src/main/res/layout/plan_list_item.xml +++ b/android/navi-insurance/src/main/res/layout/plan_list_item.xml @@ -33,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/naviSubText" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/sp_12" android:maxLines="2" android:ellipsize="end" @@ -53,7 +53,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/naviSubText" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/sp_12" android:gravity="center" android:maxLines="2" @@ -90,7 +90,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:maxLines="2" android:textColor="@color/naviSubText" diff --git a/android/navi-insurance/src/main/res/layout/policy_add_member.xml b/android/navi-insurance/src/main/res/layout/policy_add_member.xml index 835ea0ee80..0a1dae8d75 100644 --- a/android/navi-insurance/src/main/res/layout/policy_add_member.xml +++ b/android/navi-insurance/src/main/res/layout/policy_add_member.xml @@ -36,7 +36,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/rounded_rectangle_white_border_8dp_radius" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:hint="@string/enter_full_name_text" android:imeOptions="actionDone" android:inputType="textPersonName|textCapWords|textFilter|textVisiblePassword" diff --git a/android/navi-insurance/src/main/res/layout/policy_selection_radio_button.xml b/android/navi-insurance/src/main/res/layout/policy_selection_radio_button.xml index be9ec159bf..4fef2f8f80 100644 --- a/android/navi-insurance/src/main/res/layout/policy_selection_radio_button.xml +++ b/android/navi-insurance/src/main/res/layout/policy_selection_radio_button.xml @@ -37,7 +37,7 @@ android:layout_marginStart="@dimen/dp_4" android:layout_marginTop="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/black" android:textSize="@dimen/sp_14" app:layout_constraintEnd_toEndOf="parent" @@ -53,7 +53,7 @@ android:layout_marginTop="@dimen/dp_8" android:layout_marginEnd="@dimen/dp_16" android:layout_marginBottom="@dimen/dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviSubText" android:textSize="@dimen/sp_12" app:layout_constraintBottom_toBottomOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/policy_status_card.xml b/android/navi-insurance/src/main/res/layout/policy_status_card.xml index 88e3e8bcff..9a86f2589a 100644 --- a/android/navi-insurance/src/main/res/layout/policy_status_card.xml +++ b/android/navi-insurance/src/main/res/layout/policy_status_card.xml @@ -35,7 +35,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_52" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingStart="@dimen/dp_24" android:paddingEnd="@dimen/dp_24" android:textAlignment="center" @@ -51,7 +51,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_12" android:alpha="0.5" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingStart="@dimen/dp_24" android:paddingEnd="@dimen/dp_24" android:textAlignment="center" @@ -74,7 +74,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingStart="@dimen/dp_24" android:paddingEnd="@dimen/dp_24" android:textAlignment="center" @@ -106,7 +106,7 @@ android:id="@+id/action_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textAlignment="center" android:textColor="@color/naviBlue" android:textSize="@dimen/sp_16" diff --git a/android/navi-insurance/src/main/res/layout/popular_banks_item.xml b/android/navi-insurance/src/main/res/layout/popular_banks_item.xml index de99c8f100..579c81bf89 100644 --- a/android/navi-insurance/src/main/res/layout/popular_banks_item.xml +++ b/android/navi-insurance/src/main/res/layout/popular_banks_item.xml @@ -29,7 +29,7 @@ diff --git a/android/navi-insurance/src/main/res/layout/premium_details_line_item.xml b/android/navi-insurance/src/main/res/layout/premium_details_line_item.xml index 09ba98a767..273b665579 100644 --- a/android/navi-insurance/src/main/res/layout/premium_details_line_item.xml +++ b/android/navi-insurance/src/main/res/layout/premium_details_line_item.xml @@ -22,7 +22,7 @@ android:layout_weight="0.7" android:layout_height="wrap_content" tools:text="Text" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_14" android:textColor="@color/naviBlackText" android:textAlignment="textStart"/> @@ -33,7 +33,7 @@ android:layout_weight="0.3" android:layout_height="wrap_content" tools:text="Value" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_14" android:textColor="@color/naviBlackText" android:textAlignment="textEnd"/> diff --git a/android/navi-insurance/src/main/res/layout/premium_details_line_item_bold.xml b/android/navi-insurance/src/main/res/layout/premium_details_line_item_bold.xml index 8966957f32..178562a49c 100644 --- a/android/navi-insurance/src/main/res/layout/premium_details_line_item_bold.xml +++ b/android/navi-insurance/src/main/res/layout/premium_details_line_item_bold.xml @@ -22,7 +22,7 @@ android:layout_weight="0.7" android:layout_height="wrap_content" tools:text="Text" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/sp_14" android:textColor="@color/naviBlackText" android:textAlignment="textStart"/> @@ -33,7 +33,7 @@ android:layout_weight="0.3" android:layout_height="wrap_content" tools:text="Value" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/sp_14" android:textColor="@color/naviBlackText" android:textAlignment="textEnd"/> diff --git a/android/navi-insurance/src/main/res/layout/progress_bar_amount_breakup_widget.xml b/android/navi-insurance/src/main/res/layout/progress_bar_amount_breakup_widget.xml index 02bd11c3df..c703381b3c 100644 --- a/android/navi-insurance/src/main/res/layout/progress_bar_amount_breakup_widget.xml +++ b/android/navi-insurance/src/main/res/layout/progress_bar_amount_breakup_widget.xml @@ -20,7 +20,7 @@ android:id="@+id/title_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingHorizontal="@dimen/dp_16" android:paddingTop="@dimen/dp_32" android:textColor="@color/glitter_black" @@ -36,7 +36,7 @@ android:layout_marginStart="@dimen/dp_64" android:layout_marginBottom="@dimen/dp_12" android:background="@drawable/bar_top_tooltip" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:paddingHorizontal="@dimen/dp_10" android:paddingBottom="@dimen/dp_5" @@ -54,7 +54,7 @@ android:layout_marginHorizontal="@dimen/dp_16" android:layout_marginTop="@dimen/dp_62" android:background="@color/light_grey_99" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:textColor="@color/dim_grey" android:textSize="@dimen/sp_12" @@ -70,7 +70,7 @@ android:layout_marginTop="@dimen/dp_62" android:background="@color/theme_blue" android:minWidth="@dimen/dp_65" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:textColor="@color/white" android:textSize="@dimen/sp_12" @@ -85,7 +85,7 @@ android:layout_marginTop="@dimen/dp_62" android:minWidth="@dimen/dp_65" android:background="@color/solitude" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:textColor="@color/black" android:textSize="@dimen/sp_12" @@ -100,7 +100,7 @@ android:layout_marginTop="@dimen/dp_12" android:layout_marginEnd="@dimen/dp_64" android:background="@drawable/bar_bottom_tooltip" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:paddingHorizontal="@dimen/dp_10" android:paddingTop="@dimen/dp_4" @@ -178,7 +178,7 @@ android:layout_width="@dimen/dp_260" android:layout_height="wrap_content" android:layout_marginEnd="-8dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingStart="@dimen/dp_12" android:paddingTop="@dimen/dp_6" android:paddingEnd="@dimen/dp_8" diff --git a/android/navi-insurance/src/main/res/layout/question_chat_message.xml b/android/navi-insurance/src/main/res/layout/question_chat_message.xml index 1c72a25b1d..79538ed1bb 100644 --- a/android/navi-insurance/src/main/res/layout/question_chat_message.xml +++ b/android/navi-insurance/src/main/res/layout/question_chat_message.xml @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_12" app:layout_constraintStart_toStartOf="parent" @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_4" android:ellipsize="end" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviSubText" android:textSize="@dimen/sp_12" app:layout_constraintBottom_toBottomOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/question_option_item.xml b/android/navi-insurance/src/main/res/layout/question_option_item.xml index e52eca3a1d..21299310bc 100644 --- a/android/navi-insurance/src/main/res/layout/question_option_item.xml +++ b/android/navi-insurance/src/main/res/layout/question_option_item.xml @@ -26,7 +26,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_12" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:lineSpacingExtra="@dimen/sp_4" android:textColor="@color/text_secondary_color" android:textSize="@dimen/sp_16" diff --git a/android/navi-insurance/src/main/res/layout/quote_footer_view.xml b/android/navi-insurance/src/main/res/layout/quote_footer_view.xml index d02a5097c1..e6d9755cb1 100644 --- a/android/navi-insurance/src/main/res/layout/quote_footer_view.xml +++ b/android/navi-insurance/src/main/res/layout/quote_footer_view.xml @@ -78,7 +78,7 @@ android:id="@+id/offer_premium_amount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:text="@{quoteFooterInfoModel.ctaTitle}" android:textColor="#191919" android:textSize="@dimen/sp_20" @@ -93,7 +93,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_5" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/dim_grey" android:textSize="@dimen/sp_14" android:lineHeight="@dimen/sp_22" @@ -111,7 +111,7 @@ app:layout_constraintBottom_toBottomOf="@+id/strike_off_tv" android:text="@string/emi_button_placeholder" android:textColor="@color/dim_grey" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_14" android:lineHeight="@dimen/sp_22" android:layout_marginStart="@dimen/dp_1"/> @@ -124,7 +124,7 @@ android:layout_marginEnd="@dimen/dp_20" android:layout_marginTop="@dimen/dp_4" android:drawablePadding="@dimen/dp_6" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="end" android:text="@string/view_payment_details" android:textColor="@color/dark_purple" @@ -164,7 +164,7 @@ android:layout_height="@dimen/dp_48" android:layout_gravity="center_vertical|end" android:layout_marginHorizontal="@dimen/dp_8" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:text="@{quoteFooterInfoModel.cta.title != null ? quoteFooterInfoModel.cta.title : @string/text_continue }" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -193,7 +193,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/dp_8" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:textSize="@dimen/sp_12" android:textColor="@color/dark_green" android:lineHeight="@dimen/sp_18" @@ -210,7 +210,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/dp_8" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/sp_12" android:gravity="center" tools:text="Yay! 25% off will now be applicable" @@ -225,7 +225,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/dp_8" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/sp_12" android:textColor="@color/color_3C0050" android:lineHeight="@dimen/sp_18" diff --git a/android/navi-insurance/src/main/res/layout/quote_premium_details_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/quote_premium_details_bottom_sheet.xml index 53bfc1b3b2..ee8f70c95e 100644 --- a/android/navi-insurance/src/main/res/layout/quote_premium_details_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/quote_premium_details_bottom_sheet.xml @@ -31,7 +31,7 @@ android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_12" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/premium_details" android:textColor="@color/black" android:textSize="@dimen/sp_18" @@ -43,7 +43,7 @@ android:id="@+id/loading_text_tv" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviSubText" android:textSize="@dimen/sp_14" android:visibility="gone" diff --git a/android/navi-insurance/src/main/res/layout/quote_sum_insured_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/quote_sum_insured_bottom_sheet.xml index dd0a8f3642..8ef1f50bb1 100644 --- a/android/navi-insurance/src/main/res/layout/quote_sum_insured_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/quote_sum_insured_bottom_sheet.xml @@ -18,7 +18,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_12" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/choose_sum_insured" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_14" @@ -31,7 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_4" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_20" app:layout_constraintEnd_toEndOf="parent" @@ -63,7 +63,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_16" android:alpha="0.5" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:paddingStart="@dimen/dp_25" android:paddingEnd="@dimen/dp_30" @@ -191,7 +191,7 @@ android:layout_marginTop="@dimen/dp_40" android:layout_marginEnd="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/text_continue" android:textAllCaps="false" android:textSize="@dimen/sp_16" diff --git a/android/navi-insurance/src/main/res/layout/radio_options_with_header_view.xml b/android/navi-insurance/src/main/res/layout/radio_options_with_header_view.xml index cf1355a63d..4999d0b52d 100644 --- a/android/navi-insurance/src/main/res/layout/radio_options_with_header_view.xml +++ b/android/navi-insurance/src/main/res/layout/radio_options_with_header_view.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginTop="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/black" android:textSize="@dimen/sp_20" app:layout_constraintEnd_toEndOf="parent" 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 ea42df0482..faed6b2e65 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 @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_16" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/want_to_restart" android:textAlignment="center" android:textAllCaps="false" /> @@ -35,7 +35,7 @@ android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_8" android:layout_marginEnd="@dimen/dp_30" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="@string/reset_message" android:textAllCaps="false" /> @@ -59,7 +59,7 @@ android:layout_weight="1" android:background="@drawable/rounded_rectangle_navi_blue_border_12dp_radius_2dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="0dp" android:text="Restart" @@ -79,7 +79,7 @@ android:layout_weight="1" android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="@dimen/dp_0" android:text="Cancel" diff --git a/android/navi-insurance/src/main/res/layout/rooted_device_error_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/rooted_device_error_bottom_sheet.xml index 7c6df396cd..fd5171cb1b 100644 --- a/android/navi-insurance/src/main/res/layout/rooted_device_error_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/rooted_device_error_bottom_sheet.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="20dp" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="Error" android:textAlignment="center" android:textAllCaps="false" @@ -42,7 +42,7 @@ android:layout_marginStart="20dp" android:layout_marginTop="8dp" android:layout_marginEnd="20dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Sorry, your device is not supported." android:textAllCaps="false" android:textColor="#4d4d4d" @@ -67,7 +67,7 @@ android:layout_gravity="start" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="0dp" android:text="Close" diff --git a/android/navi-insurance/src/main/res/layout/screen_api_error.xml b/android/navi-insurance/src/main/res/layout/screen_api_error.xml index b7e7b98341..8a59dbd3df 100644 --- a/android/navi-insurance/src/main/res/layout/screen_api_error.xml +++ b/android/navi-insurance/src/main/res/layout/screen_api_error.xml @@ -51,7 +51,7 @@ android:layout_marginTop="0dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="Error Message" android:textColor="@color/naviBlackText" @@ -65,7 +65,7 @@ android:layout_gravity="center" android:layout_marginTop="12dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:maxWidth="240dp" android:text="Description of the error message for the user to act upon." diff --git a/android/navi-insurance/src/main/res/layout/screen_health_cards.xml b/android/navi-insurance/src/main/res/layout/screen_health_cards.xml index ce343f4ec7..bf4bf46f4e 100644 --- a/android/navi-insurance/src/main/res/layout/screen_health_cards.xml +++ b/android/navi-insurance/src/main/res/layout/screen_health_cards.xml @@ -78,7 +78,7 @@ android:layout_marginTop="0dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="For claims, kindly call our partner\nfor a seamless experience." android:textColor="@color/naviBlackText" @@ -99,7 +99,7 @@ android:background="@drawable/bg_rounded_24_orange_border" android:clickable="true" android:drawableStart="@drawable/phone" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:paddingStart="15dp" android:paddingEnd="15dp" @@ -148,7 +148,7 @@ android:layout_marginTop="0dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="Will be available shortly..." android:textColor="@color/naviBlackText" @@ -164,7 +164,7 @@ android:layout_marginRight="20dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="Your health cards are being generated, please check again in a few minutes" android:textColor="@color/naviBlackText" diff --git a/android/navi-insurance/src/main/res/layout/screen_home.xml b/android/navi-insurance/src/main/res/layout/screen_home.xml index 525517504f..eefdf54c60 100644 --- a/android/navi-insurance/src/main/res/layout/screen_home.xml +++ b/android/navi-insurance/src/main/res/layout/screen_home.xml @@ -155,7 +155,7 @@ android:layout_marginTop="0dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="Please wait..." android:textColor="@color/naviBlackText" @@ -172,7 +172,7 @@ android:layout_marginRight="20dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="We are getting your policies" android:textColor="@color/naviBlackText" @@ -200,7 +200,7 @@ android:layout_height="48dp" android:layout_gravity="center" android:drawableStart="@drawable/refresh" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:paddingStart="10dp" android:text="Retry" android:textAlignment="center" diff --git a/android/navi-insurance/src/main/res/layout/screen_hospitals_v2.xml b/android/navi-insurance/src/main/res/layout/screen_hospitals_v2.xml index 51b9b36412..90f3e47c24 100644 --- a/android/navi-insurance/src/main/res/layout/screen_hospitals_v2.xml +++ b/android/navi-insurance/src/main/res/layout/screen_hospitals_v2.xml @@ -76,7 +76,7 @@ android:drawableStart="@drawable/ic_map" android:drawablePadding="-8dp" android:drawableTint="@color/white" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="12dp" android:paddingStart="18dp" @@ -93,7 +93,7 @@ android:drawableStart="@drawable/ic_list" android:drawablePadding="-8dp" android:drawableTint="@color/naviBlue" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:padding="12dp" android:paddingStart="18dp" diff --git a/android/navi-insurance/src/main/res/layout/screen_illness_yes.xml b/android/navi-insurance/src/main/res/layout/screen_illness_yes.xml index ede2f1d485..3151439250 100644 --- a/android/navi-insurance/src/main/res/layout/screen_illness_yes.xml +++ b/android/navi-insurance/src/main/res/layout/screen_illness_yes.xml @@ -50,7 +50,7 @@ android:layout_gravity="center" android:paddingHorizontal="@dimen/dp_32" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="Our doctor shall get in touch with you shortly" android:textColor="@color/naviBlackText" @@ -64,7 +64,7 @@ android:layout_gravity="center" android:layout_marginTop="@dimen/dp_12" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:maxWidth="280dp" android:text="To provide the best insurance for you, we will need some more information" @@ -85,7 +85,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="What's next?" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/sp_16" android:textColor="@color/naviBlackText" android:layout_marginTop="@dimen/dp_32"/> @@ -110,7 +110,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_8" android:text="Our doctor will call you to get a few more details to assist you in purchasing our health insurance policy" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_14" android:textColor="@color/naviSubText" app:layout_constraintTop_toTopOf="parent" @@ -140,7 +140,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_8" android:text="It takes 2 to 4 hours for us to get in touch with you" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_14" android:textColor="@color/naviSubText" app:layout_constraintTop_toTopOf="parent" @@ -170,7 +170,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_8" android:text="Please expect a call from 7948061769, our toll-free number" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_14" android:textColor="@color/naviSubText" app:layout_constraintTop_toTopOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/screen_make_claims.xml b/android/navi-insurance/src/main/res/layout/screen_make_claims.xml index 84b4868de3..4977642c2b 100644 --- a/android/navi-insurance/src/main/res/layout/screen_make_claims.xml +++ b/android/navi-insurance/src/main/res/layout/screen_make_claims.xml @@ -42,7 +42,7 @@ android:layout_gravity="center" android:layout_marginTop="@dimen/dp_8" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="@string/claim_title_text" android:textColor="@color/naviBlackText" @@ -62,7 +62,7 @@ android:layout_marginBottom="@dimen/dp_8" android:background="@drawable/bg_rounded_gray_8dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:paddingHorizontal="@dimen/dp_20" android:paddingVertical="@dimen/dp_24" @@ -84,7 +84,7 @@ style="@style/ButtonFontStylePurple" android:clickable="true" android:focusable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_horizontal|center_vertical" android:text="@string/call" android:textAlignment="center" @@ -102,7 +102,7 @@ android:layout_gravity="center" android:layout_marginTop="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_24" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="@string/available_on_all_7_days_9_am_to_8_pm" android:textColor="@color/naviSubText" @@ -117,7 +117,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="@string/for_more_details_write_to" android:textColor="@color/naviGrey" @@ -135,7 +135,7 @@ android:layout_gravity="center" android:layout_marginBottom="@dimen/dp_40" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:textColor="@color/naviGrey" android:textColorLink="@color/naviBlue" @@ -177,7 +177,7 @@ android:layout_marginTop="0dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="Please wait..." android:textColor="@color/naviBlackText" diff --git a/android/navi-insurance/src/main/res/layout/screen_notification_settings.xml b/android/navi-insurance/src/main/res/layout/screen_notification_settings.xml index 7e9ac1bcb1..0d1db0ea40 100644 --- a/android/navi-insurance/src/main/res/layout/screen_notification_settings.xml +++ b/android/navi-insurance/src/main/res/layout/screen_notification_settings.xml @@ -29,7 +29,7 @@ android:layout_gravity="start|center_vertical" android:layout_marginStart="20dp" android:layout_marginTop="23dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="WhatsApp" android:textAllCaps="false" android:textColor="@color/naviBlackText" @@ -44,7 +44,7 @@ android:layout_marginStart="20dp" android:layout_marginTop="2dp" android:layout_marginEnd="10dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Get policy documents, renewal reminders and updates" android:textAllCaps="false" android:textColor="#4d4d4d" diff --git a/android/navi-insurance/src/main/res/layout/screen_payment.xml b/android/navi-insurance/src/main/res/layout/screen_payment.xml index a2dfc88a0b..25fa5645bb 100644 --- a/android/navi-insurance/src/main/res/layout/screen_payment.xml +++ b/android/navi-insurance/src/main/res/layout/screen_payment.xml @@ -53,7 +53,7 @@ android:layout_marginTop="0dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="Please wait..." android:textColor="@color/naviBlackText" @@ -70,7 +70,7 @@ android:layout_marginRight="20dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="We are processing your payment. It might take upto 2 minutes" android:textColor="@color/naviBlackText" @@ -87,7 +87,7 @@ android:layout_marginRight="20dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="Please wait while we redirect you to payment. It might take upto 2 minutes" android:textColor="@color/naviBlackText" @@ -122,7 +122,7 @@ android:layout_marginTop="0dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="Payment Successful" android:textColor="@color/naviBlackText" diff --git a/android/navi-insurance/src/main/res/layout/screen_policy_input_details.xml b/android/navi-insurance/src/main/res/layout/screen_policy_input_details.xml index 9987f3cd31..6bd2b22777 100644 --- a/android/navi-insurance/src/main/res/layout/screen_policy_input_details.xml +++ b/android/navi-insurance/src/main/res/layout/screen_policy_input_details.xml @@ -49,7 +49,7 @@ android:layout_marginTop="4dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:paddingStart="20dp" android:paddingEnd="30dp" @@ -68,7 +68,7 @@ android:paddingEnd="30dp" android:layout_marginTop="30dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:visibility="gone" android:text="Pincode of current residential address" @@ -84,7 +84,7 @@ android:layout_marginTop="6dp" android:clickable="true" android:focusable="true" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:hint="XXXXXX" android:visibility="gone" android:inputType="number" @@ -146,7 +146,7 @@ android:layout_margin="20dp" style="@style/ButtonFontStylePurple" android:clickable="true" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center_horizontal|center_vertical" android:paddingLeft="15dp" android:paddingRight="15dp" @@ -211,7 +211,7 @@ android:layout_marginTop="0dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="Please wait..." android:textColor="@color/naviBlackText" @@ -227,7 +227,7 @@ android:layout_marginRight="20dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="We are submitting your policy details" android:textColor="@color/naviBlackText" @@ -266,7 +266,7 @@ android:layout_marginTop="0dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="Please wait..." android:textColor="@color/naviBlackText" @@ -282,7 +282,7 @@ android:layout_marginRight="20dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="We are fetching your policy details" android:textColor="@color/naviBlackText" diff --git a/android/navi-insurance/src/main/res/layout/screen_register_phone_otp.xml b/android/navi-insurance/src/main/res/layout/screen_register_phone_otp.xml index 9b7a19d6f7..7f1191d902 100644 --- a/android/navi-insurance/src/main/res/layout/screen_register_phone_otp.xml +++ b/android/navi-insurance/src/main/res/layout/screen_register_phone_otp.xml @@ -40,7 +40,7 @@ android:layout_marginTop="40dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:gravity="center" android:text="Mobile Number" android:textColor="@color/naviBlackText" @@ -58,7 +58,7 @@ android:layout_marginTop="0dp" android:layout_marginBottom="2dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="+91" android:textColor="@color/naviBlackText" @@ -77,7 +77,7 @@ android:autofillHints="phoneNational" android:backgroundTint="#E4E4E4" android:ems="10" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:inputType="phone" android:maxLength="10" android:maxLines="1" @@ -134,7 +134,7 @@ android:clickable="true" android:drawableEnd="@drawable/chevron_right" android:enabled="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingLeft="20dp" android:paddingRight="20dp" @@ -156,7 +156,7 @@ android:clipToPadding="false" android:focusable="true" android:focusableInTouchMode="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:paddingBottom="@dimen/dp_12" android:text="I agree to terms of use and privacy policy" @@ -187,7 +187,7 @@ android:layout_marginTop="40dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:gravity="center" android:text="Enter OTP" android:textColor="@color/naviBlackText" @@ -205,7 +205,7 @@ android:layout_marginTop="5dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="+91" android:textColor="@color/naviBlackText" @@ -223,7 +223,7 @@ android:layout_marginTop="5dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="9999999999" android:textColor="@color/naviBlackText" @@ -241,7 +241,7 @@ android:layout_marginBottom="0dp" android:background="@null" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="Edit" android:textAllCaps="false" @@ -270,7 +270,7 @@ android:layout_marginBottom="10dp" android:background="@drawable/rounded_rectangle_white_border" android:ems="1" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:hint="-" android:inputType="number" android:maxLength="1" @@ -289,7 +289,7 @@ android:layout_marginBottom="10dp" android:background="@drawable/rounded_rectangle_white_border" android:ems="1" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:hint="-" android:inputType="number" android:maxLength="1" @@ -308,7 +308,7 @@ android:layout_marginBottom="10dp" android:background="@drawable/rounded_rectangle_white_border" android:ems="1" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:hint="-" android:inputType="number" android:maxLength="1" @@ -327,7 +327,7 @@ android:layout_marginBottom="10dp" android:background="@drawable/rounded_rectangle_white_border" android:ems="1" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:hint="-" android:inputType="number" android:maxLength="1" @@ -363,7 +363,7 @@ android:layout_marginTop="15dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="1:24" android:textColor="@color/naviBlackText" @@ -383,7 +383,7 @@ android:clickable="true" android:drawableStart="@drawable/refresh" android:drawablePadding="6dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingEnd="20dp" android:text="Resend OTP" @@ -404,7 +404,7 @@ android:clickable="true" android:drawableStart="@drawable/phone_callback" android:drawablePadding="6dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingEnd="20dp" android:text="Get OTP via call" @@ -427,7 +427,7 @@ android:clickable="true" android:drawableEnd="@drawable/check_tick" android:enabled="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start|center_vertical" android:paddingLeft="20dp" android:paddingRight="20dp" @@ -467,7 +467,7 @@ android:layout_marginTop="0dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="Please wait..." android:textColor="@color/white" diff --git a/android/navi-insurance/src/main/res/layout/screen_request_callback.xml b/android/navi-insurance/src/main/res/layout/screen_request_callback.xml index e99ab6c324..7f408a0429 100644 --- a/android/navi-insurance/src/main/res/layout/screen_request_callback.xml +++ b/android/navi-insurance/src/main/res/layout/screen_request_callback.xml @@ -40,7 +40,7 @@ android:layout_marginTop="40dp" android:layout_marginBottom="0dp" android:clipToPadding="false" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:gravity="center" android:text="Mobile Number" android:textColor="@color/naviBlackText" @@ -58,7 +58,7 @@ android:layout_marginTop="0dp" android:layout_marginBottom="2dp" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="+91" android:textColor="@color/naviBlackText" @@ -77,7 +77,7 @@ android:autofillHints="phoneNational" android:backgroundTint="#E4E4E4" android:ems="10" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:inputType="phone" android:maxLength="10" android:maxLines="1" @@ -94,7 +94,7 @@ app:layout_constraintStart_toStartOf="parent" android:layout_margin="20dp" android:text="We will call you back to help you with any questions" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="12sp" android:textColor="@color/naviGrey" /> @@ -111,7 +111,7 @@ android:layout_marginBottom="20dp" android:clickable="true" android:enabled="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:paddingLeft="20dp" android:paddingRight="20dp" diff --git a/android/navi-insurance/src/main/res/layout/section_item_with_slider_selector_layout.xml b/android/navi-insurance/src/main/res/layout/section_item_with_slider_selector_layout.xml index 984f9fc9b5..893d9ff03e 100644 --- a/android/navi-insurance/src/main/res/layout/section_item_with_slider_selector_layout.xml +++ b/android/navi-insurance/src/main/res/layout/section_item_with_slider_selector_layout.xml @@ -12,7 +12,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/davyGrey" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -23,7 +23,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingHorizontal="@dimen/dp_8" android:paddingVertical="@dimen/dp_3" android:textColor="@color/davyGrey" @@ -38,7 +38,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_2" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/davyGrey" app:layout_constraintBottom_toBottomOf="@id/left_text" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/section_items_with_slider_selector_layout.xml b/android/navi-insurance/src/main/res/layout/section_items_with_slider_selector_layout.xml index 9b2385dd1e..c0612c6c42 100644 --- a/android/navi-insurance/src/main/res/layout/section_items_with_slider_selector_layout.xml +++ b/android/navi-insurance/src/main/res/layout/section_items_with_slider_selector_layout.xml @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_8" android:layout_marginTop="@dimen/dp_28" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/color_191919" app:layout_constraintEnd_toStartOf="@id/right_text" app:layout_constraintStart_toEndOf="@id/header_icon" @@ -50,7 +50,7 @@ android:id="@+id/right_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:layout_marginEnd="@dimen/dp_16" android:textColor="@color/blueberry" app:layout_constraintBottom_toBottomOf="@id/left_text" diff --git a/android/navi-insurance/src/main/res/layout/section_with_item_v2.xml b/android/navi-insurance/src/main/res/layout/section_with_item_v2.xml index a560e3494e..54f80b2e3f 100644 --- a/android/navi-insurance/src/main/res/layout/section_with_item_v2.xml +++ b/android/navi-insurance/src/main/res/layout/section_with_item_v2.xml @@ -12,7 +12,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/davyGrey" android:textSize="@dimen/dp_14" app:layout_constraintStart_toStartOf="parent" @@ -24,7 +24,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingHorizontal="@dimen/dp_8" android:paddingVertical="@dimen/dp_3" android:textColor="@color/davyGrey" @@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/dp_16" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/davyGrey" android:textSize="@dimen/dp_14" app:layout_constraintBottom_toBottomOf="@id/left_text" diff --git a/android/navi-insurance/src/main/res/layout/section_with_items_widget_v2.xml b/android/navi-insurance/src/main/res/layout/section_with_items_widget_v2.xml index e3db0673c2..c5218f1437 100644 --- a/android/navi-insurance/src/main/res/layout/section_with_items_widget_v2.xml +++ b/android/navi-insurance/src/main/res/layout/section_with_items_widget_v2.xml @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_8" android:layout_marginTop="@dimen/dp_28" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/color_191919" android:textSize="@dimen/dp_14" app:layout_constraintEnd_toStartOf="@id/right_text" @@ -51,7 +51,7 @@ android:id="@+id/right_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/blueberry" android:textSize="@dimen/dp_14" app:layout_constraintBottom_toBottomOf="@id/left_text" @@ -77,7 +77,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_18" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:textColor="@color/blueberry" android:textSize="@dimen/dp_14" android:visibility="gone" diff --git a/android/navi-insurance/src/main/res/layout/seekbar_with_anchor_text.xml b/android/navi-insurance/src/main/res/layout/seekbar_with_anchor_text.xml index 9516eabe88..3531b6c862 100644 --- a/android/navi-insurance/src/main/res/layout/seekbar_with_anchor_text.xml +++ b/android/navi-insurance/src/main/res/layout/seekbar_with_anchor_text.xml @@ -35,7 +35,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/ic_anchor_bg" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:paddingTop="@dimen/dp_4" android:textColor="@color/descriptionColor9" diff --git a/android/navi-insurance/src/main/res/layout/select_policy_item.xml b/android/navi-insurance/src/main/res/layout/select_policy_item.xml index fde2d452d1..a84e4fb0c7 100644 --- a/android/navi-insurance/src/main/res/layout/select_policy_item.xml +++ b/android/navi-insurance/src/main/res/layout/select_policy_item.xml @@ -25,7 +25,7 @@ android:layout_width="@dimen/dp_0" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_12" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:lineSpacingExtra="@dimen/sp_4" android:textColor="@color/text_secondary_color" android:textSize="@dimen/sp_16" diff --git a/android/navi-insurance/src/main/res/layout/select_policy_item_bottomsheet.xml b/android/navi-insurance/src/main/res/layout/select_policy_item_bottomsheet.xml index 75a2ebeeb9..311136d1c3 100644 --- a/android/navi-insurance/src/main/res/layout/select_policy_item_bottomsheet.xml +++ b/android/navi-insurance/src/main/res/layout/select_policy_item_bottomsheet.xml @@ -13,7 +13,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_4" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/color_191919" android:textSize="@dimen/sp_18" app:layout_constraintStart_toStartOf="parent" @@ -38,7 +38,7 @@ android:layout_marginHorizontal="@dimen/dp_16" android:layout_marginTop="@dimen/dp_8" android:layout_marginBottom="@dimen/dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="@string/continue_text" android:textSize="@dimen/sp_14" diff --git a/android/navi-insurance/src/main/res/layout/set_up_auto_pay_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/set_up_auto_pay_bottom_sheet.xml index 4d29594470..6042d71973 100644 --- a/android/navi-insurance/src/main/res/layout/set_up_auto_pay_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/set_up_auto_pay_bottom_sheet.xml @@ -89,7 +89,7 @@ android:layout_marginTop="@dimen/dp_24" style="@style/ButtonFontStylePurple" android:clickable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center_horizontal|center_vertical" android:paddingLeft="15dp" android:paddingRight="15dp" 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 3032ded384..79fd9f3c5b 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 @@ -53,7 +53,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="start" android:background="@color/shimmerGrey" android:text="In-Patient Hospitalization" @@ -67,7 +67,7 @@ android:layout_height="wrap_content" android:layout_marginTop="6dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="start" android:text="You can claim up to ₹ 2,000" android:lineSpacingExtra="4sp" diff --git a/android/navi-insurance/src/main/res/layout/shimmer_faq_item.xml b/android/navi-insurance/src/main/res/layout/shimmer_faq_item.xml index 57832ec0c5..338ef621fc 100644 --- a/android/navi-insurance/src/main/res/layout/shimmer_faq_item.xml +++ b/android/navi-insurance/src/main/res/layout/shimmer_faq_item.xml @@ -30,7 +30,7 @@ android:id="@+id/tv_question" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="Test Question" android:textColor="@color/shimmerGrey" android:textSize="14sp" diff --git a/android/navi-insurance/src/main/res/layout/show_more_layout.xml b/android/navi-insurance/src/main/res/layout/show_more_layout.xml index 0f03537fc7..f270ac7528 100644 --- a/android/navi-insurance/src/main/res/layout/show_more_layout.xml +++ b/android/navi-insurance/src/main/res/layout/show_more_layout.xml @@ -26,7 +26,7 @@ android:paddingTop="@dimen/dp_6" android:text="@string/show_more" android:textColor="@color/blueberry" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/android/navi-insurance/src/main/res/layout/single_choice_button.xml b/android/navi-insurance/src/main/res/layout/single_choice_button.xml index 19dced1dbf..762cc6de9a 100644 --- a/android/navi-insurance/src/main/res/layout/single_choice_button.xml +++ b/android/navi-insurance/src/main/res/layout/single_choice_button.xml @@ -24,7 +24,7 @@ android:layout_marginHorizontal="@dimen/dp_16" android:layout_marginTop="@dimen/dp_16" android:textColor="@color/black" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/sp_14" app:layout_constraintBottom_toTopOf="@+id/subTitle" app:layout_constraintStart_toStartOf="parent" @@ -42,7 +42,7 @@ android:layout_marginTop="@dimen/dp_4" android:layout_marginBottom="@dimen/dp_16" android:textSize="@dimen/sp_12" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@+id/icon" diff --git a/android/navi-insurance/src/main/res/layout/status_banner_view.xml b/android/navi-insurance/src/main/res/layout/status_banner_view.xml index 74cedc22a0..43a2897a9d 100644 --- a/android/navi-insurance/src/main/res/layout/status_banner_view.xml +++ b/android/navi-insurance/src/main/res/layout/status_banner_view.xml @@ -18,7 +18,7 @@ android:lineSpacingExtra="4sp" android:textColor="@color/white" android:textSize="@dimen/sp_12" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -34,7 +34,7 @@ android:lineSpacingExtra="4sp" android:textColor="#B3FFFFFF" android:textSize="@dimen/sp_12" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/title" diff --git a/android/navi-insurance/src/main/res/layout/status_track_description_item.xml b/android/navi-insurance/src/main/res/layout/status_track_description_item.xml index a7f907019f..1198a176fe 100644 --- a/android/navi-insurance/src/main/res/layout/status_track_description_item.xml +++ b/android/navi-insurance/src/main/res/layout/status_track_description_item.xml @@ -11,7 +11,7 @@ style="@style/SmallTextSemiBoldGreyFontStyle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:layout_marginTop="@dimen/dp_4" tools:text="Approval requested for Pavan Kumar at Apollo Hospitals for ₹34,000" /> @@ -23,7 +23,7 @@ android:layout_marginBottom="@dimen/dp_4" android:layout_marginTop="@dimen/dp_5" android:alpha="0.7" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:visibility="visible" tools:text="10 June 2021, 11:33am" /> diff --git a/android/navi-insurance/src/main/res/layout/status_track_item_widget.xml b/android/navi-insurance/src/main/res/layout/status_track_item_widget.xml index 78018cbbd3..184dd4cb32 100644 --- a/android/navi-insurance/src/main/res/layout/status_track_item_widget.xml +++ b/android/navi-insurance/src/main/res/layout/status_track_item_widget.xml @@ -87,7 +87,7 @@ android:background="@drawable/rounded_rectangle_blue_border_8dp_radius_50_opacity" android:clickable="true" android:focusable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:padding="@dimen/dp_8" android:textAllCaps="false" android:visibility="visible" diff --git a/android/navi-insurance/src/main/res/layout/supertopup_sync_date_bottom_panel.xml b/android/navi-insurance/src/main/res/layout/supertopup_sync_date_bottom_panel.xml index 9cbd556ea3..c2a19a9b6b 100644 --- a/android/navi-insurance/src/main/res/layout/supertopup_sync_date_bottom_panel.xml +++ b/android/navi-insurance/src/main/res/layout/supertopup_sync_date_bottom_panel.xml @@ -54,7 +54,7 @@ android:layout_marginTop="@dimen/dp_0" android:layout_marginBottom="@dimen/dp_0" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center" android:text="@string/policy_activation_title" android:textColor="@color/naviBlackText" @@ -191,7 +191,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_32" android:drawablePadding="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:text="@string/premium_payments_hassle_free" android:textSize="@dimen/sp_14" tools:text="@string/premium_payments_hassle_free" /> @@ -209,7 +209,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:drawablePadding="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_14" tools:text="@string/emi_date_sync_tools_text" /> @@ -231,7 +231,7 @@ android:clickable="true" android:elevation="@dimen/dp_0" android:focusable="true" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center_horizontal|center_vertical" android:text="@string/skip_for_now" android:textAllCaps="false" @@ -247,7 +247,7 @@ android:layout_weight="1" android:clickable="true" android:focusable="true" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:gravity="center_horizontal|center_vertical" android:text="@string/sync_date_stu" android:textAllCaps="false" diff --git a/android/navi-insurance/src/main/res/layout/survey_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/survey_bottom_sheet.xml index 2668cc7c1d..b989d86bc7 100644 --- a/android/navi-insurance/src/main/res/layout/survey_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/survey_bottom_sheet.xml @@ -21,7 +21,7 @@ android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:lineHeight="@dimen/sp_24" android:textColor="@color/black" android:textSize="@dimen/sp_16" diff --git a/android/navi-insurance/src/main/res/layout/survey_pill_selection_item.xml b/android/navi-insurance/src/main/res/layout/survey_pill_selection_item.xml index 68225bbdec..5c787a86e3 100644 --- a/android/navi-insurance/src/main/res/layout/survey_pill_selection_item.xml +++ b/android/navi-insurance/src/main/res/layout/survey_pill_selection_item.xml @@ -26,7 +26,7 @@ android:gravity="center" android:textAllCaps="false" android:textColor="@color/naviBlackText" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_12" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/tele_hra_attention_bottom_sheet.xml b/android/navi-insurance/src/main/res/layout/tele_hra_attention_bottom_sheet.xml index 4dd6a7261e..f25521c9a5 100644 --- a/android/navi-insurance/src/main/res/layout/tele_hra_attention_bottom_sheet.xml +++ b/android/navi-insurance/src/main/res/layout/tele_hra_attention_bottom_sheet.xml @@ -65,7 +65,7 @@ android:layout_gravity="start" android:layout_weight="1" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:text="@string/i_understand" android:textAllCaps="false" 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 1afdcbf3e8..a421137cf5 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 @@ -50,7 +50,7 @@ android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:clipToPadding="false" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:text="@string/payment_details" android:textColor="@color/black" android:textSize="@dimen/sp_16" @@ -94,7 +94,7 @@ android:layout_weight="0.4" android:layout_height="wrap_content" tools:text="Text" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/sp_14" android:textColor="@color/naviBlackText" android:textAlignment="textStart"/> @@ -106,7 +106,7 @@ android:layout_weight="0.6" android:layout_height="wrap_content" tools:text="Value" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textSize="@dimen/sp_14" android:textColor="@color/naviBlackText" android:textAlignment="textEnd"/> @@ -127,7 +127,7 @@ android:layout_weight="0.4" android:layout_height="wrap_content" tools:text="Text" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_14" android:textColor="@color/naviBlackText" android:textAlignment="textStart"/> @@ -139,7 +139,7 @@ android:layout_weight="0.6" android:layout_height="wrap_content" tools:text="Value" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_14" android:textColor="@color/naviBlackText" android:textAlignment="textEnd"/> @@ -155,7 +155,7 @@ android:id="@+id/refund_tv" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/black" android:textSize="@dimen/sp_14" app:layout_constraintTop_toBottomOf="@+id/payment_data_card" @@ -186,7 +186,7 @@ android:background="@drawable/navi_insurance_button_with_state_8dp_radius" android:clickable="true" android:focusable="true" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingVertical="@dimen/dp_18" android:text="@string/okay_got_it" android:textAllCaps="false" diff --git a/android/navi-insurance/src/main/res/layout/text_display_widget_layout.xml b/android/navi-insurance/src/main/res/layout/text_display_widget_layout.xml index c5ddfe44d0..8954a214ef 100644 --- a/android/navi-insurance/src/main/res/layout/text_display_widget_layout.xml +++ b/android/navi-insurance/src/main/res/layout/text_display_widget_layout.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginHorizontal="@dimen/dp_10" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/grey_charcoal" android:textSize="@dimen/sp_10" tools:text="Father’s details" /> diff --git a/android/navi-insurance/src/main/res/layout/text_header_widget.xml b/android/navi-insurance/src/main/res/layout/text_header_widget.xml index 0b2f24d111..cf0181af92 100644 --- a/android/navi-insurance/src/main/res/layout/text_header_widget.xml +++ b/android/navi-insurance/src/main/res/layout/text_header_widget.xml @@ -13,7 +13,7 @@ android:id="@+id/header" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textColor="@color/black" android:textSize="@dimen/sp_16" app:layout_constraintStart_toStartOf="parent" diff --git a/android/navi-insurance/src/main/res/layout/text_input_item.xml b/android/navi-insurance/src/main/res/layout/text_input_item.xml index 14b9472977..432c4af12d 100644 --- a/android/navi-insurance/src/main/res/layout/text_input_item.xml +++ b/android/navi-insurance/src/main/res/layout/text_input_item.xml @@ -19,7 +19,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/color_191919" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" tools:text="Full name (As per PAN card) "/> diff --git a/android/navi-insurance/src/main/res/layout/text_line_item.xml b/android/navi-insurance/src/main/res/layout/text_line_item.xml index a101637a8b..b0a782184e 100644 --- a/android/navi-insurance/src/main/res/layout/text_line_item.xml +++ b/android/navi-insurance/src/main/res/layout/text_line_item.xml @@ -20,7 +20,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" android:textSize="@dimen/sp_14" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" tools:text="Out of pocket cover" android:layout_marginTop="@dimen/dp_12" android:textColor="@color/description_grey_color_seven"/> @@ -33,7 +33,7 @@ app:layout_constraintTop_toTopOf="@id/title" app:layout_constraintBottom_toBottomOf="@id/title" android:textSize="@dimen/sp_14" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" tools:text="Out of pocket cover" android:textColor="@color/black"/> diff --git a/android/navi-insurance/src/main/res/layout/text_with_background_widget_item.xml b/android/navi-insurance/src/main/res/layout/text_with_background_widget_item.xml index 8bb1d53992..6be1e71fa8 100644 --- a/android/navi-insurance/src/main/res/layout/text_with_background_widget_item.xml +++ b/android/navi-insurance/src/main/res/layout/text_with_background_widget_item.xml @@ -27,7 +27,7 @@ android:id="@+id/title" android:layout_width="@dimen/layout_dp_0" android:layout_height="wrap_content" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviBlackText" android:textSize="@dimen/font_small" android:layout_marginHorizontal="@dimen/layout_dp_8" @@ -40,7 +40,7 @@ android:id="@+id/subTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:lineSpacingExtra="@dimen/layout_dp_8" android:textSize="@dimen/font_extra_small" android:layout_marginTop="@dimen/layout_dp_2" diff --git a/android/navi-insurance/src/main/res/layout/title_icon_card_item.xml b/android/navi-insurance/src/main/res/layout/title_icon_card_item.xml index 7d754c73bb..2809be997c 100644 --- a/android/navi-insurance/src/main/res/layout/title_icon_card_item.xml +++ b/android/navi-insurance/src/main/res/layout/title_icon_card_item.xml @@ -52,7 +52,7 @@ android:textSize="@dimen/sp_14" android:textColor="@color/black" android:paddingHorizontal="@dimen/dp_2" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" tools:text="No, I don’t have" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/android/navi-insurance/src/main/res/layout/title_icon_desc_bottomsheet_layout.xml b/android/navi-insurance/src/main/res/layout/title_icon_desc_bottomsheet_layout.xml index 88a7cf5191..e19ade00d2 100644 --- a/android/navi-insurance/src/main/res/layout/title_icon_desc_bottomsheet_layout.xml +++ b/android/navi-insurance/src/main/res/layout/title_icon_desc_bottomsheet_layout.xml @@ -42,7 +42,7 @@ android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:lineHeight="@dimen/sp_24" android:textColor="@color/black" android:paddingHorizontal="@dimen/dp_16" @@ -56,7 +56,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/black" android:lineSpacingExtra="@dimen/sp_4" android:paddingHorizontal="@dimen/dp_16" @@ -82,7 +82,7 @@ android:id="@+id/pop_up_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:lineHeight="@dimen/sp_24" android:visibility="gone" tools:visibility="visible" @@ -99,7 +99,7 @@ android:id="@+id/pop_up_description" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:lineHeight="@dimen/sp_24" android:visibility="gone" tools:visibility="visible" @@ -127,7 +127,7 @@ android:id="@+id/pop_up_visibility" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:lineHeight="@dimen/sp_24" android:visibility="gone" tools:visibility="visible" @@ -178,7 +178,7 @@ style="@style/ButtonFontStyleGreyBlack" android:gravity="center" android:textAlignment="center" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:lineSpacingExtra="@dimen/sp_2" android:textSize="@dimen/sp_14" app:layout_constraintBottom_toBottomOf="parent" @@ -216,7 +216,7 @@ android:textAlignment="center" android:lineSpacingExtra="@dimen/sp_2" android:textSize="@dimen/sp_14" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -261,7 +261,7 @@ android:textAlignment="center" android:lineSpacingExtra="@dimen/sp_2" android:textSize="@dimen/sp_14" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -293,7 +293,7 @@ style="@style/ButtonFontStyleGreyBlack" android:gravity="center" android:textAlignment="center" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:lineSpacingExtra="@dimen/sp_2" android:textSize="@dimen/sp_14" app:layout_constraintBottom_toBottomOf="parent" @@ -316,7 +316,7 @@ android:gravity="center" android:background="@color/transparent" android:textAlignment="center" - android:fontFamily="@font/tt_semi_bold" + android:fontFamily="@font/navi_body_demi_bold" android:lineSpacingExtra="@dimen/sp_2" android:layout_marginTop="@dimen/_16dp" android:textSize="@dimen/sp_14" diff --git a/android/navi-insurance/src/main/res/layout/title_only_back.xml b/android/navi-insurance/src/main/res/layout/title_only_back.xml index b97090ba38..3e08085e2c 100644 --- a/android/navi-insurance/src/main/res/layout/title_only_back.xml +++ b/android/navi-insurance/src/main/res/layout/title_only_back.xml @@ -38,7 +38,7 @@ android:layout_marginStart="20dp" android:layout_marginEnd="20dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:padding="4dp" android:tag="title" android:text="Create Account" @@ -58,7 +58,7 @@ android:padding="8dp" android:text="Help" android:drawablePadding="4dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviBlue" android:textSize="14sp" app:layout_constraintTop_toTopOf="@+id/header" diff --git a/android/navi-insurance/src/main/res/layout/title_subtitle_pill_selection_widget.xml b/android/navi-insurance/src/main/res/layout/title_subtitle_pill_selection_widget.xml index b7aa9fe7f8..7fc51b330d 100644 --- a/android/navi-insurance/src/main/res/layout/title_subtitle_pill_selection_widget.xml +++ b/android/navi-insurance/src/main/res/layout/title_subtitle_pill_selection_widget.xml @@ -53,7 +53,7 @@ android:id="@+id/subtitle" android:layout_width="@dimen/dp_0" android:textSize="@dimen/sp_14" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_16" android:visibility="gone" diff --git a/android/navi-insurance/src/main/res/layout/title_with_primary_secondary_btn.xml b/android/navi-insurance/src/main/res/layout/title_with_primary_secondary_btn.xml index 352b850a8d..902c6012ef 100644 --- a/android/navi-insurance/src/main/res/layout/title_with_primary_secondary_btn.xml +++ b/android/navi-insurance/src/main/res/layout/title_with_primary_secondary_btn.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginTop="@dimen/dp_24" - android:fontFamily="@font/tt_medium" + android:fontFamily="@font/navi_headline_regular" android:textAlignment="viewStart" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_18" @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginTop="@dimen/dp_6" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textAlignment="viewStart" android:textColor="@color/naviBlackText" android:textSize="@dimen/sp_14" @@ -58,7 +58,7 @@ android:layout_marginVertical="@dimen/dp_1" android:background="@null" android:elevation="@dimen/dp_0" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:textAllCaps="false" android:textAlignment="center" @@ -86,7 +86,7 @@ android:layout_gravity="center" android:background="@null" android:elevation="@dimen/dp_0" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:gravity="center" android:textAlignment="center" android:textAllCaps="false" diff --git a/android/navi-insurance/src/main/res/layout/toolbar_blue.xml b/android/navi-insurance/src/main/res/layout/toolbar_blue.xml index 3e1ae9ef7c..dfce8b35d7 100644 --- a/android/navi-insurance/src/main/res/layout/toolbar_blue.xml +++ b/android/navi-insurance/src/main/res/layout/toolbar_blue.xml @@ -37,7 +37,7 @@ android:layout_marginStart="20dp" android:layout_marginEnd="20dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:padding="4dp" android:tag="title" android:text="@string/policy_summary_title" @@ -57,7 +57,7 @@ android:gravity="center" android:text="Share" android:drawablePadding="4dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/white" android:textSize="14sp" android:visibility="gone" diff --git a/android/navi-insurance/src/main/res/layout/toolbar_for_search_fragment.xml b/android/navi-insurance/src/main/res/layout/toolbar_for_search_fragment.xml index 0c95f10602..ef6ba78ab3 100644 --- a/android/navi-insurance/src/main/res/layout/toolbar_for_search_fragment.xml +++ b/android/navi-insurance/src/main/res/layout/toolbar_for_search_fragment.xml @@ -39,7 +39,7 @@ android:layout_marginStart="20dp" android:layout_marginEnd="20dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:padding="4dp" android:tag="title" android:text="Create Account" @@ -85,7 +85,7 @@ android:drawableTint="@color/naviGrey" android:background="@drawable/rounded_rectangle_grey_border_8dp_radius" android:hint="@string/default_hint_search_by_name" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="14sp" android:textColor="@color/naviBlackText" app:layout_constraintTop_toBottomOf="@+id/tab_layout_divider" diff --git a/android/navi-insurance/src/main/res/layout/toolbar_for_search_with_loader.xml b/android/navi-insurance/src/main/res/layout/toolbar_for_search_with_loader.xml index c3f8c91148..6f7be7f6fb 100644 --- a/android/navi-insurance/src/main/res/layout/toolbar_for_search_with_loader.xml +++ b/android/navi-insurance/src/main/res/layout/toolbar_for_search_with_loader.xml @@ -39,7 +39,7 @@ android:layout_marginStart="20dp" android:layout_marginEnd="20dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:padding="4dp" android:tag="title" android:text="Create Account" @@ -59,7 +59,7 @@ android:padding="8dp" android:text="Help" android:drawablePadding="4dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textColor="@color/naviBlue" android:textSize="14sp" app:layout_constraintTop_toTopOf="@+id/header" @@ -81,7 +81,7 @@ android:drawableTint="@color/naviGrey" android:background="@drawable/rounded_rectangle_grey_border_8dp_radius" android:text="@string/default_hint_search" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="14sp" android:textColor="@color/naviGrey" app:layout_constraintTop_toBottomOf="@+id/title" diff --git a/android/navi-insurance/src/main/res/layout/toolbar_quote_screen.xml b/android/navi-insurance/src/main/res/layout/toolbar_quote_screen.xml index 5053df9252..b70a6fd323 100644 --- a/android/navi-insurance/src/main/res/layout/toolbar_quote_screen.xml +++ b/android/navi-insurance/src/main/res/layout/toolbar_quote_screen.xml @@ -63,7 +63,7 @@ android:layout_marginStart="20dp" android:layout_marginEnd="20dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:padding="4dp" android:tag="title" android:text="Create Account" @@ -83,7 +83,7 @@ android:layout_marginEnd="20dp" android:drawableStart="@drawable/ic_call" android:drawablePadding="4dp" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:padding="8dp" android:text="Help" android:textColor="@color/naviBlue" diff --git a/android/navi-insurance/src/main/res/layout/toolbar_white.xml b/android/navi-insurance/src/main/res/layout/toolbar_white.xml index d0b968f9d7..e63a2ec56a 100644 --- a/android/navi-insurance/src/main/res/layout/toolbar_white.xml +++ b/android/navi-insurance/src/main/res/layout/toolbar_white.xml @@ -37,7 +37,7 @@ android:layout_marginStart="20dp" android:layout_marginEnd="20dp" android:clipToPadding="false" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:padding="4dp" android:tag="title" android:text="Create Account" diff --git a/android/navi-insurance/src/main/res/layout/two_grid_button.xml b/android/navi-insurance/src/main/res/layout/two_grid_button.xml index 9abbdebda6..ea5e3e0e2a 100644 --- a/android/navi-insurance/src/main/res/layout/two_grid_button.xml +++ b/android/navi-insurance/src/main/res/layout/two_grid_button.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:layout_width="0dp" android:layout_weight="1" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:paddingVertical="@dimen/dp_20" android:textSize="@dimen/sp_14" android:includeFontPadding="false" @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_width="0dp" android:layout_weight="1" - android:fontFamily="@font/tt_regular" + android:fontFamily="@font/navi_body_regular" android:textSize="@dimen/sp_14" android:paddingVertical="@dimen/dp_20" android:includeFontPadding="false" diff --git a/android/navi-insurance/src/main/res/layout/two_grid_layout.xml b/android/navi-insurance/src/main/res/layout/two_grid_layout.xml index 1395723fa2..c3c3828715 100644 --- a/android/navi-insurance/src/main/res/layout/two_grid_layout.xml +++ b/android/navi-insurance/src/main/res/layout/two_grid_layout.xml @@ -37,7 +37,7 @@ android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_8" android:layout_gravity="center_vertical|start" - tools:fontFamily="@font/tt_regular" + tools:fontFamily="@font/navi_body_regular" tools:textSize="@dimen/sp_12" android:padding="@dimen/dp_16" tools:text="For all 4 concerning issues" /> @@ -49,7 +49,7 @@ android:layout_height="wrap_content" android:layout_below="@+id/title_left" android:layout_gravity="center_vertical|end" - tools:fontFamily="@font/tt_medium" + tools:fontFamily="@font/navi_headline_regular" tools:textColor="@color/black" tools:textSize="@dimen/sp_18" android:padding="@dimen/dp_16" @@ -103,7 +103,7 @@ tools:textSize="@dimen/dp_12" android:padding="@dimen/dp_16" android:lineSpacingExtra="@dimen/dp_8" - tools:fontFamily="@font/tt_regular" + tools:fontFamily="@font/navi_body_regular" tools:text="Save 95% of your medical \ncosts with insurance" />