From 0f119116599af2c2267de97c1728684e0cf96096 Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Mon, 2 Dec 2024 15:01:56 +0530 Subject: [PATCH] NTP-16689 | GH Action | Validate Font Weight Usage (#13904) --- .../workflows/validate-font-weight-usage.yml | 134 ++++++++++++ .../androidTest/resources/ap_test_mock.json | 192 +++++++++--------- android/app/src/test/resources/ap_mock.json | 152 +++++++------- .../generic_error_bottom_sheet_config.json | 6 +- .../common/fragment/OrderStatusFragment.kt | 4 +- .../navi/amc/common/viewmodel/CheckerVM.kt | 10 +- .../fundbuy/viewmodel/FundDetailViewModel.kt | 4 +- .../amc/fundbuy/views/FundGraphToolTipView.kt | 6 +- .../bottom_sheet/TIExplainerBottomSheet.kt | 2 +- .../composables/H1bacBottomSheetComposable.kt | 26 ++- .../NameDobEditTextWidgetComposable.kt | 4 +- .../composables/OutlinedCheckWithDropDown.kt | 2 +- .../reusable/PincodeInputComposable.kt | 2 +- .../composables/reusable/WheelPicker.kt | 2 +- .../theme/PrePurchaseJourneyTypography.kt | 6 +- .../journey/ui/PreQuoteJourneyViewModel.kt | 2 +- ...GridImage Widget.kt => GridImageWidget.kt} | 0 .../AutoCarouselCardsPDWidgetComposable.kt | 2 +- ...dHorizontalAutoCarouselWidgetComposable.kt | 8 +- .../CardWithCtaAndImageWidgetComposable.kt | 4 +- .../ResultScreenFooterWidgetComposable.kt | 2 +- .../TitleSubtitleWithIconsWidgetComposable.kt | 2 +- .../composables/TitleWidgetComposable.kt | 2 +- .../widgets/dashboard/ComposeDummyWidget.kt | 4 +- 24 files changed, 358 insertions(+), 220 deletions(-) create mode 100644 .github/workflows/validate-font-weight-usage.yml rename android/navi-widgets/src/main/java/com/navi/naviwidgets/models/{GridImage Widget.kt => GridImageWidget.kt} (100%) diff --git a/.github/workflows/validate-font-weight-usage.yml b/.github/workflows/validate-font-weight-usage.yml new file mode 100644 index 0000000000..951a31cf29 --- /dev/null +++ b/.github/workflows/validate-font-weight-usage.yml @@ -0,0 +1,134 @@ +name: Validate Font Weight Usage + +on: + pull_request: + branches: [ master ] + merge_group: + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +jobs: + validate-font-weight-usage: + runs-on: [ default ] + defaults: + run: + working-directory: android + if: github.event_name != 'merge_group' + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Generate Violations Report + id: find-violations + run: | + DEPRECATED_WEIGHTS=( + "TT_MEDIUM" + "ROBOTO_MEDIUM" + "BOLD" + "NAVI_BOLD" + "TT_BOLD" + "TT_REGULAR" + "ROBOTO_REGULAR" + "REGULAR" + "SEMI_BOLD" + "NAVI_REGULAR" + "NAVI_SEMI_BOLD" + "TT_SEMI_BOLD" + "ROBOTO_BOLD" + "EXTRA_BOLD" + "NAVI_EXTRA_BOLD" + "NAVI_BLACK" + ) + + echo "| Module | File | Deprecated Value | Link |" > violations.md + echo "|--------|------|------------------|------|" >> violations.md + + files=$(git ls-tree -r HEAD --name-only) + + for file in $files; do + if [[ "$file" == navi-design/src/main/java/com/navi/design/font/* ]]; then + continue + fi + + pattern=$(IFS=\|; echo "\b(${DEPRECATED_WEIGHTS[*]})\b") + excludePattern="Typeface." + + matches=$(grep -HnE "$pattern" "$file" | grep -v "$excludePattern" || true) + + if [[ -n "$matches" ]]; then + while read -r line; do + FILE=$(echo "$line" | cut -d: -f1) + LINE_NUM=$(echo "$line" | cut -d: -f2) + MATCH=$(echo "$line" | grep -Eo "$pattern" | xargs) + + MODULE=$(echo "$FILE" | cut -d/ -f1) + FILE_NAME=$(echo "$FILE" | awk -F/ '{print $NF}') + + LINK="https://github.com/${{ github.repository }}/blob/${{ github.head_ref }}/android/$FILE#L$LINE_NUM" + echo "| $MODULE | $FILE_NAME | \`$MATCH\` | [View Line]($LINK) |" >> violations.md + done <<< "$matches" + fi + done + + cat violations.md > $GITHUB_WORKSPACE/violations.md + + if [ "$(wc -l < violations.md)" -gt 2 ]; then + echo "violations=true" >> $GITHUB_OUTPUT + else + echo "violations=false" >> $GITHUB_OUTPUT + fi + - name: Add Comment on PR + uses: actions/github-script@v7 + with: + github-token: ${{ secrets.GH_ANDROID_BOT_PAT }} + script: | + const violationsFound = '${{ steps.find-violations.outputs.violations }}' === 'true'; + let comment; + + const fs = require('fs'); + const violationsContentString = fs.readFileSync('${{ github.workspace }}/violations.md', 'utf8'); + + if (violationsFound) { + comment = `*This is an automated message. Please do not modify or delete it.* + + ### :exclamation: Validate Font Weight Usage - Issues Found + The following deprecated font weights were detected in this PR. Please remove or replace them with the updated, non-deprecated font weights: + + ${violationsContentString} + + Ensure these issues are addressed before proceeding with the PR.`; + } else { + comment = `*This is an automated message. Please do not modify or delete it.* + + ### :white_check_mark: Validate Font Weight Usage - Issues Resolved + No deprecated font weights were found in this PR. All font weights are up to date, and no action is required.`; + } + + const comments = await github.rest.issues.listComments({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + }); + + const existingComment = comments.data.find(c => c.body.includes('Validate Font Weight Usage')); + + if (existingComment) { + github.rest.issues.updateComment({ + comment_id: existingComment.id, + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + body: comment, + }); + } else if (violationsFound) { + github.rest.issues.createComment({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + body: comment, + }); + } + - name: Fail Job if Violations Found + if: ${{ steps.find-violations.outputs.violations == 'true' }} + run: exit 1 diff --git a/android/app/src/androidTest/resources/ap_test_mock.json b/android/app/src/androidTest/resources/ap_test_mock.json index aa51f6d081..5baeccd902 100644 --- a/android/app/src/androidTest/resources/ap_test_mock.json +++ b/android/app/src/androidTest/resources/ap_test_mock.json @@ -295,7 +295,7 @@ "viewType": "Text", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -317,7 +317,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_BOLD", + "fontWeight": "NAVI_HEADLINE_BOLD", "textDecoration": "Underline", "constraintLinks": { "END": { @@ -405,7 +405,7 @@ "isVisible": "true", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" }, "stringId": "agreement_text" }, @@ -415,7 +415,7 @@ "isVisible": "true", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "Underline" }, "stringId": "privacy_policy_text" @@ -426,7 +426,7 @@ "isVisible": "true", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" }, "stringId": "and_symbol_text" }, @@ -436,7 +436,7 @@ "isVisible": "true", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "Underline" }, "stringId": "terms_of_use_text" @@ -528,7 +528,7 @@ "viewType": "Text", "textColor": "#FFFFFF", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] @@ -683,7 +683,7 @@ "isVisible": "true", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" } }, { @@ -707,7 +707,7 @@ "isVisible": "true", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD", + "fontWeight": "NAVI_BODY_DEMI_BOLD", "constraintLinks": { "end": { "layoutId": "parent", @@ -806,7 +806,7 @@ "viewType": "Text", "textColor": "#191919", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] @@ -840,7 +840,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "" }, "stringId": "start_text" @@ -854,7 +854,7 @@ "viewType": "Text", "textColor": "#AA3CE6", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "" }, "stringId": "end_text" @@ -928,7 +928,7 @@ "viewType": "Text", "textColor": "#2A0038", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "" } } @@ -1090,7 +1090,7 @@ "viewType": "Text", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -1115,7 +1115,7 @@ "viewType": "Text", "textColor": "#444444", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "item_0_title_OJjpC", @@ -1183,7 +1183,7 @@ "viewType": "Text", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -1208,7 +1208,7 @@ "viewType": "Text", "textColor": "#444444", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "item_1_title_OJjpC", @@ -1265,7 +1265,7 @@ "viewType": "Text", "textColor": "#2A0038", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] @@ -1323,7 +1323,7 @@ "viewType": "Text", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -1348,7 +1348,7 @@ "viewType": "Text", "textColor": "#444444", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "item_2_title_OJjpC", @@ -1416,7 +1416,7 @@ "viewType": "Text", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -1441,7 +1441,7 @@ "viewType": "Text", "textColor": "#444444", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "item_3_title_OJjpC", @@ -1498,7 +1498,7 @@ "viewType": "Text", "textColor": "#2A0038", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] @@ -1560,7 +1560,7 @@ "viewType": "Text", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "" } } @@ -1645,7 +1645,7 @@ "viewType": "Text", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -2107,7 +2107,7 @@ "viewType": "Text", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -2129,7 +2129,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_BOLD", + "fontWeight": "NAVI_HEADLINE_BOLD", "textDecoration": "Underline", "constraintLinks": { "END": { @@ -2217,7 +2217,7 @@ "isVisible": "true", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" }, "stringId": "agreement_text" }, @@ -2227,7 +2227,7 @@ "isVisible": "true", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "Underline" }, "stringId": "privacy_policy_text" @@ -2238,7 +2238,7 @@ "isVisible": "true", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" }, "stringId": "and_symbol_text" }, @@ -2248,7 +2248,7 @@ "isVisible": "true", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "Underline" }, "stringId": "terms_of_use_text" @@ -2340,7 +2340,7 @@ "viewType": "Text", "textColor": "#FFFFFF", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] @@ -2495,7 +2495,7 @@ "isVisible": "true", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" } }, { @@ -2519,7 +2519,7 @@ "isVisible": "true", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD", + "fontWeight": "NAVI_BODY_DEMI_BOLD", "constraintLinks": { "end": { "layoutId": "parent", @@ -2618,7 +2618,7 @@ "viewType": "Text", "textColor": "#191919", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] @@ -2652,7 +2652,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "" }, "stringId": "start_text" @@ -2666,7 +2666,7 @@ "viewType": "Text", "textColor": "#AA3CE6", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "" }, "stringId": "end_text" @@ -2740,7 +2740,7 @@ "viewType": "Text", "textColor": "#2A0038", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "" } } @@ -2902,7 +2902,7 @@ "viewType": "Text", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -2927,7 +2927,7 @@ "viewType": "Text", "textColor": "#444444", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "item_0_title_OJjpC", @@ -2995,7 +2995,7 @@ "viewType": "Text", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -3020,7 +3020,7 @@ "viewType": "Text", "textColor": "#444444", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "item_1_title_OJjpC", @@ -3077,7 +3077,7 @@ "viewType": "Text", "textColor": "#2A0038", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] @@ -3135,7 +3135,7 @@ "viewType": "Text", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -3160,7 +3160,7 @@ "viewType": "Text", "textColor": "#444444", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "item_2_title_OJjpC", @@ -3228,7 +3228,7 @@ "viewType": "Text", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -3253,7 +3253,7 @@ "viewType": "Text", "textColor": "#444444", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "item_3_title_OJjpC", @@ -3310,7 +3310,7 @@ "viewType": "Text", "textColor": "#2A0038", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] @@ -3372,7 +3372,7 @@ "viewType": "Text", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "" } } @@ -3457,7 +3457,7 @@ "viewType": "Text", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -3738,7 +3738,7 @@ "viewType": "Text", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -3760,7 +3760,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "Underline", "constraintLinks": { "END": { @@ -3803,7 +3803,7 @@ "textAlign": "Center", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "end": { "layoutId": "parent", @@ -3930,7 +3930,7 @@ }, "textColor": "#FFFFFF", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD", + "fontWeight": "NAVI_BODY_DEMI_BOLD", "isStateFul": true, "isDataMutable": true } @@ -4120,7 +4120,7 @@ "viewType": "Text", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "end": { "layoutId": "parent", @@ -4146,7 +4146,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD", + "fontWeight": "NAVI_BODY_DEMI_BOLD", "constraintLinks": { "end": { "layoutId": "parent", @@ -4214,7 +4214,7 @@ "textAlign": "Start", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" } }, { @@ -4231,7 +4231,7 @@ "textAlign": "Start", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" } } ] @@ -4315,7 +4315,7 @@ "textAlign": "Start", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" } }, { @@ -4332,7 +4332,7 @@ "textAlign": "Start", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" } } ] @@ -4427,7 +4427,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD", + "fontWeight": "NAVI_BODY_DEMI_BOLD", "textDecoration": "Underline" } } @@ -4483,7 +4483,7 @@ "viewType": "Text", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "" } } @@ -4568,7 +4568,7 @@ "viewType": "Text", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -4679,7 +4679,7 @@ "textAlign": "Start", "textColor": "#191919", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" } }, { @@ -4830,7 +4830,7 @@ "viewType": "Text", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -4852,7 +4852,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "Underline", "constraintLinks": { "END": { @@ -4895,7 +4895,7 @@ "textAlign": "Center", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "end": { "layoutId": "parent", @@ -4984,7 +4984,7 @@ "viewType": "Text", "textColor": "#FFFFFF", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] @@ -5142,7 +5142,7 @@ "viewType": "Text", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -5164,7 +5164,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "Underline", "constraintLinks": { "END": { @@ -5207,7 +5207,7 @@ "textAlign": "Center", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "end": { "layoutId": "parent", @@ -5296,7 +5296,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] @@ -5553,7 +5553,7 @@ "viewType": "Text", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -5575,7 +5575,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "Underline", "constraintLinks": { "END": { @@ -5618,7 +5618,7 @@ "textAlign": "Center", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "end": { "layoutId": "parent", @@ -5720,7 +5720,7 @@ "viewType": "Text", "textColor": "#FFFFFF", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] @@ -5857,7 +5857,7 @@ "viewType": "Text", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "end": { "layoutId": "parent", @@ -5883,7 +5883,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD", + "fontWeight": "NAVI_BODY_DEMI_BOLD", "constraintLinks": { "end": { "layoutId": "parent", @@ -5951,7 +5951,7 @@ "textAlign": "Start", "textColor": "#191919", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" } }, { @@ -5968,7 +5968,7 @@ "textAlign": "Start", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" } } ] @@ -6038,7 +6038,7 @@ "textAlign": "Start", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" } }, { @@ -6055,7 +6055,7 @@ "textAlign": "Start", "textColor": "#444444", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" } } ] @@ -6122,7 +6122,7 @@ "viewType": "Text", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -6200,7 +6200,7 @@ "viewType": "Text", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -6278,7 +6278,7 @@ "viewType": "Text", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -6356,7 +6356,7 @@ "viewType": "Text", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -6434,7 +6434,7 @@ "viewType": "Text", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -6512,7 +6512,7 @@ "viewType": "Text", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -6596,7 +6596,7 @@ "textAlign": "Start", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" } }, { @@ -6613,7 +6613,7 @@ "textAlign": "Start", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" } } ] @@ -6753,7 +6753,7 @@ "viewType": "Text", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -6775,7 +6775,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "Underline", "constraintLinks": { "END": { @@ -6818,7 +6818,7 @@ "textAlign": "Center", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "end": { "layoutId": "parent", @@ -6907,7 +6907,7 @@ "viewType": "Text", "textColor": "#FFFFFF", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] @@ -6975,7 +6975,7 @@ "viewType": "Text", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "" } } @@ -7060,7 +7060,7 @@ "viewType": "Text", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", diff --git a/android/app/src/test/resources/ap_mock.json b/android/app/src/test/resources/ap_mock.json index 04dd499a35..684fddb785 100644 --- a/android/app/src/test/resources/ap_mock.json +++ b/android/app/src/test/resources/ap_mock.json @@ -413,7 +413,7 @@ "viewType": "Text", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -435,7 +435,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "Underline", "constraintLinks": { "END": { @@ -523,7 +523,7 @@ "isVisible": "true", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" }, "stringId": "agreement_text" }, @@ -533,7 +533,7 @@ "isVisible": "true", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "Underline" }, "stringId": "privacy_policy_text" @@ -544,7 +544,7 @@ "isVisible": "true", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" }, "stringId": "and_symbol_text" }, @@ -554,7 +554,7 @@ "isVisible": "true", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "Underline" }, "stringId": "terms_of_use_text" @@ -668,7 +668,7 @@ }, "textColor": "#FFFFFF", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD", + "fontWeight": "NAVI_BODY_DEMI_BOLD", "isStateFul": true } }, @@ -945,7 +945,7 @@ "isVisible": true, "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" } }, { @@ -969,7 +969,7 @@ "isVisible": true, "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD", + "fontWeight": "NAVI_BODY_DEMI_BOLD", "constraintLinks": { "end": { "layoutId": "parent", @@ -1068,7 +1068,7 @@ "viewType": "Text", "textColor": "#191919", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] @@ -1102,7 +1102,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "" }, "stringId": "start_text" @@ -1116,7 +1116,7 @@ "viewType": "Text", "textColor": "#AA3CE6", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "" }, "stringId": "end_text" @@ -1190,7 +1190,7 @@ "viewType": "Text", "textColor": "#2A0038", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "" } } @@ -1352,7 +1352,7 @@ "viewType": "Text", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -1377,7 +1377,7 @@ "viewType": "Text", "textColor": "#444444", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "item_0_title_8_KSX", @@ -1445,7 +1445,7 @@ "viewType": "Text", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -1470,7 +1470,7 @@ "viewType": "Text", "textColor": "#444444", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "item_1_title_8_KSX", @@ -1527,7 +1527,7 @@ "viewType": "Text", "textColor": "#2A0038", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] @@ -1585,7 +1585,7 @@ "viewType": "Text", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -1610,7 +1610,7 @@ "viewType": "Text", "textColor": "#444444", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "item_2_title_8_KSX", @@ -1678,7 +1678,7 @@ "viewType": "Text", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -1703,7 +1703,7 @@ "viewType": "Text", "textColor": "#444444", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "item_3_title_8_KSX", @@ -1760,7 +1760,7 @@ "viewType": "Text", "textColor": "#2A0038", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] @@ -1822,7 +1822,7 @@ "viewType": "Text", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "" } } @@ -1907,7 +1907,7 @@ "viewType": "Text", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -2228,7 +2228,7 @@ "viewType": "Text", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -2250,7 +2250,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "Underline", "constraintLinks": { "END": { @@ -2293,7 +2293,7 @@ "textAlign": "Center", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "end": { "layoutId": "parent", @@ -2420,7 +2420,7 @@ }, "textColor": "#FFFFFF", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD", + "fontWeight": "NAVI_BODY_DEMI_BOLD", "isStateFul": true, "isDataMutable": true } @@ -2670,7 +2670,7 @@ "viewType": "Text", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "end": { "layoutId": "parent", @@ -2696,7 +2696,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD", + "fontWeight": "NAVI_BODY_DEMI_BOLD", "constraintLinks": { "end": { "layoutId": "parent", @@ -2764,7 +2764,7 @@ "textAlign": "Start", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" } }, { @@ -2781,7 +2781,7 @@ "textAlign": "Start", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" } } ] @@ -3182,7 +3182,7 @@ "viewType": "Text", "textColor": "#191919", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" } }, { @@ -3285,18 +3285,18 @@ "select": { "viewType": "Text", "textColor": "#1F002A", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" }, "unselect": { "viewType": "Text", "textColor": "#444444", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" } }, "textAlign": "Center", "textColor": "#444444", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "isStateFul": true } } @@ -3381,18 +3381,18 @@ "select": { "viewType": "Text", "textColor": "#1F002A", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" }, "unselect": { "viewType": "Text", "textColor": "#444444", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" } }, "textAlign": "Center", "textColor": "#444444", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "isStateFul": true } } @@ -3477,18 +3477,18 @@ "select": { "viewType": "Text", "textColor": "#1F002A", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" }, "unselect": { "viewType": "Text", "textColor": "#444444", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" } }, "textAlign": "Center", "textColor": "#444444", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "isStateFul": true } } @@ -4237,7 +4237,7 @@ "viewType": "Text", "textColor": "#191919", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" } }, { @@ -4252,7 +4252,7 @@ "viewType": "Text", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" } }, { @@ -4330,7 +4330,7 @@ "viewType": "Text", "textColor": "#FF0000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "isStateFul": true, "isDataMutable": true } @@ -4407,7 +4407,7 @@ "viewType": "Text", "textColor": "#00A300", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "isStateFul": true, "isDataMutable": true } @@ -4517,7 +4517,7 @@ "viewType": "Text", "textColor": "#00A300", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "isStateFul": true, "isDataMutable": true } @@ -4711,7 +4711,7 @@ "viewType": "Text", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "" } } @@ -4796,7 +4796,7 @@ "viewType": "Text", "textColor": "#000000", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -4907,7 +4907,7 @@ "textAlign": "Start", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" } }, { @@ -4924,7 +4924,7 @@ "textAlign": "Start", "textColor": "#4D4D4D", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" } } ] @@ -5063,7 +5063,7 @@ "viewType": "Text", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -5085,7 +5085,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "Underline", "constraintLinks": { "END": { @@ -5128,7 +5128,7 @@ "textAlign": "Center", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "end": { "layoutId": "parent", @@ -5217,7 +5217,7 @@ "viewType": "Text", "textColor": "#FFFFFF", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] @@ -5303,7 +5303,7 @@ "textAlign": "Start", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" } }, { @@ -5320,7 +5320,7 @@ "textAlign": "Start", "textColor": "#4D4D4D", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" } } ] @@ -5359,7 +5359,7 @@ "fontSize": 14, "textColor": "#4D4D4D", "fontFamily": "naviSansFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" }, "stringId": "key_text" }, @@ -5368,7 +5368,7 @@ "fontSize": 14, "textColor": "#4D4D4D", "fontFamily": "naviSansFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" }, "stringId": "value_text" } @@ -5409,7 +5409,7 @@ "fontSize": 14, "textColor": "#4D4D4D", "fontFamily": "naviSansFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" }, "stringId": "key_text" }, @@ -5418,7 +5418,7 @@ "fontSize": 14, "textColor": "#4D4D4D", "fontFamily": "naviSansFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" }, "stringId": "value_text" } @@ -5459,7 +5459,7 @@ "fontSize": 14, "textColor": "#4D4D4D", "fontFamily": "naviSansFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" }, "stringId": "key_text" }, @@ -5468,7 +5468,7 @@ "fontSize": 14, "textColor": "#4D4D4D", "fontFamily": "naviSansFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" }, "stringId": "value_text" } @@ -5609,7 +5609,7 @@ "viewType": "Text", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -5631,7 +5631,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "Underline", "constraintLinks": { "END": { @@ -5674,7 +5674,7 @@ "textAlign": "Center", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "end": { "layoutId": "parent", @@ -5763,7 +5763,7 @@ "viewType": "Text", "textColor": "#FFFFFF", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] @@ -5849,7 +5849,7 @@ "textAlign": "Start", "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" } }, { @@ -5866,7 +5866,7 @@ "textAlign": "Start", "textColor": "#4D4D4D", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" } } ] @@ -5905,7 +5905,7 @@ "fontSize": 14, "textColor": "#4D4D4D", "fontFamily": "naviSansFamily", - "fontWeight": "TT_MEDIUM" + "fontWeight": "NAVI_HEADLINE_REGULAR" }, "stringId": "key_text" }, @@ -5914,7 +5914,7 @@ "fontSize": 14, "textColor": "#4D4D4D", "fontFamily": "naviSansFamily", - "fontWeight": "TT_REGULAR" + "fontWeight": "NAVI_BODY_REGULAR" }, "stringId": "value_text" } @@ -6055,7 +6055,7 @@ "viewType": "Text", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "constraintLinks": { "top": { "layoutId": "parent", @@ -6077,7 +6077,7 @@ "viewType": "Text", "textColor": "#1F002A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_MEDIUM", + "fontWeight": "NAVI_HEADLINE_REGULAR", "textDecoration": "Underline", "constraintLinks": { "END": { @@ -6120,7 +6120,7 @@ "textAlign": "Center", "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "constraintLinks": { "end": { "layoutId": "parent", @@ -6209,7 +6209,7 @@ "viewType": "Text", "textColor": "#FFFFFF", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] diff --git a/android/application-platform/navi-ap/src/main/res/raw/generic_error_bottom_sheet_config.json b/android/application-platform/navi-ap/src/main/res/raw/generic_error_bottom_sheet_config.json index 43cd71f400..834a44cd19 100644 --- a/android/application-platform/navi-ap/src/main/res/raw/generic_error_bottom_sheet_config.json +++ b/android/application-platform/navi-ap/src/main/res/raw/generic_error_bottom_sheet_config.json @@ -57,7 +57,7 @@ "fontSize": 16, "textColor": "#1A1A1A", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_SEMI_BOLD", + "fontWeight": "NAVI_BODY_DEMI_BOLD", "textAlign": "Start", "padding": { "start": "16", @@ -87,7 +87,7 @@ "fontSize": 14, "textColor": "#6B6B6B", "fontFamily": "ttComposeFontFamily", - "fontWeight": "TT_REGULAR", + "fontWeight": "NAVI_BODY_REGULAR", "textAlign": "Start", "padding": { "start": "16", @@ -156,7 +156,7 @@ "fontFamily": "ttComposeFontFamily", "fontSize": 14, "textColor": "#FFFFFF", - "fontWeight": "TT_SEMI_BOLD" + "fontWeight": "NAVI_BODY_DEMI_BOLD" } } ] diff --git a/android/navi-amc/src/main/java/com/navi/amc/common/fragment/OrderStatusFragment.kt b/android/navi-amc/src/main/java/com/navi/amc/common/fragment/OrderStatusFragment.kt index 6f8e2eccea..4bac72a9b6 100644 --- a/android/navi-amc/src/main/java/com/navi/amc/common/fragment/OrderStatusFragment.kt +++ b/android/navi-amc/src/main/java/com/navi/amc/common/fragment/OrderStatusFragment.kt @@ -561,14 +561,14 @@ class OrderStatusFragment : endSpan = 10, spanColor = "#1F002A", fontSize = 14.0, - fontName = "TT_REGULAR" + fontName = "NAVI_BODY_REGULAR" ), NaviSpan( startSpan = 10, endSpan = rewardText.length, spanColor = "#1F002A", fontSize = 14.0, - fontName = "TT_SEMI_BOLD" + fontName = "NAVI_BODY_DEMI_BOLD" ) ) ) diff --git a/android/navi-amc/src/main/java/com/navi/amc/common/viewmodel/CheckerVM.kt b/android/navi-amc/src/main/java/com/navi/amc/common/viewmodel/CheckerVM.kt index 4f3662cc60..a89f9d7ca7 100644 --- a/android/navi-amc/src/main/java/com/navi/amc/common/viewmodel/CheckerVM.kt +++ b/android/navi-amc/src/main/java/com/navi/amc/common/viewmodel/CheckerVM.kt @@ -108,7 +108,7 @@ class CheckerVM @Inject constructor(private val repository: CheckerRepository) : style = listOf( NaviSpan( - fontName = "NAVI_EXTRA_BOLD", + fontName = "NAVI_BODY_DEMI_BOLD", fontSize = 16.0, spanColor = "#191919" ) @@ -120,7 +120,7 @@ class CheckerVM @Inject constructor(private val repository: CheckerRepository) : style = listOf( NaviSpan( - fontName = "NAVI_REGULAR", + fontName = "NAVI_BODY_REGULAR", fontSize = 14.0, spanColor = "#6B6B6B" ) @@ -134,7 +134,7 @@ class CheckerVM @Inject constructor(private val repository: CheckerRepository) : style = listOf( NaviSpan( - fontName = "NAVI_EXTRA_BOLD", + fontName = "NAVI_BODY_DEMI_BOLD", fontSize = 12.0, spanColor = "#1F002A" ) @@ -146,7 +146,7 @@ class CheckerVM @Inject constructor(private val repository: CheckerRepository) : style = listOf( NaviSpan( - fontName = "NAVI_REGULAR", + fontName = "NAVI_BODY_REGULAR", fontSize = 12.0, spanColor = "#6B6B6B" ) @@ -161,7 +161,7 @@ class CheckerVM @Inject constructor(private val repository: CheckerRepository) : style = listOf( NaviSpan( - fontName = "NAVI_REGULAR", + fontName = "NAVI_BODY_REGULAR", fontSize = 12.0, spanColor = "#6B6B6B" ) diff --git a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/viewmodel/FundDetailViewModel.kt b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/viewmodel/FundDetailViewModel.kt index de5ddef59f..49d3383514 100644 --- a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/viewmodel/FundDetailViewModel.kt +++ b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/viewmodel/FundDetailViewModel.kt @@ -104,14 +104,14 @@ class FundDetailViewModel @Inject constructor(private val repository: FundDetail NaviSpan( startSpan = 0, endSpan = 32, - fontName = "NAVI_BOLD", + fontName = "NAVI_HEADLINE_REGULAR", fontSize = 12.0, spanColor = "#000000" ), NaviSpan( startSpan = 32, endSpan = 45, - fontName = "NAVI_BOLD", + fontName = "NAVI_HEADLINE_REGULAR", fontSize = 12.0, spanColor = "#000000", underline = true, diff --git a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/views/FundGraphToolTipView.kt b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/views/FundGraphToolTipView.kt index aeaa32d393..694e1487c3 100644 --- a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/views/FundGraphToolTipView.kt +++ b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/views/FundGraphToolTipView.kt @@ -50,14 +50,14 @@ class FundGraphToolTipView(context: Context, layout: Int) : MarkerView(context, NaviSpan( startSpan = 0, endSpan = 4, - fontName = "NAVI_REGULAR", + fontName = "NAVI_BODY_REGULAR", fontSize = 12.0, spanColor = "#6B6B6B" ), NaviSpan( startSpan = 4, endSpan = 25, - fontName = "NAVI_EXTRA_BOLD", + fontName = "NAVI_BODY_DEMI_BOLD", fontSize = 12.0, spanColor = "#191919" ) @@ -74,7 +74,7 @@ class FundGraphToolTipView(context: Context, layout: Int) : MarkerView(context, NaviSpan( startSpan = 0, endSpan = 30, - fontName = "NAVI_REGULAR", + fontName = "NAVI_BODY_REGULAR", fontSize = 12.0, spanColor = "#191919" ) diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/common/bottom_sheet/TIExplainerBottomSheet.kt b/android/navi-insurance/src/main/java/com/navi/insurance/common/bottom_sheet/TIExplainerBottomSheet.kt index cbc2e3a4f9..5ac83c3031 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/common/bottom_sheet/TIExplainerBottomSheet.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/common/bottom_sheet/TIExplainerBottomSheet.kt @@ -243,7 +243,7 @@ class TIExplainerBottomSheet : BaseBottomSheet(), WidgetCallback { textColor = "#000000", size = 14, lineSpacing = 22, - font = "TT_SEMI_BOLD" + font = "NAVI_BODY_DEMI_BOLD" ) ) } 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 cd687c06de..73594a5bfa 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 @@ -103,7 +103,7 @@ fun H1bacBottomSheetComposable( textFieldData = content.firstQuestion ?: TextFieldData( - font = "TT_SEMI_BOLD", + font = "NAVI_BODY_DEMI_BOLD", size = 16, lineSpacing = 24, text = "What is H1bac reading?", @@ -115,7 +115,7 @@ fun H1bacBottomSheetComposable( textFieldData = content.firstAnswer ?: TextFieldData( - font = "TT_REGULAR", + font = "NAVI_BODY_REGULAR", size = 14, lineSpacing = 22, text = @@ -129,7 +129,7 @@ fun H1bacBottomSheetComposable( textFieldData = content.secondQuestion ?: TextFieldData( - font = "TT_SEMI_BOLD", + font = "NAVI_BODY_DEMI_BOLD", size = 16, lineSpacing = 24, text = "How much does it cost?", @@ -141,7 +141,7 @@ fun H1bacBottomSheetComposable( textFieldData = content.secondAnswer ?: TextFieldData( - font = "TT_REGULAR", + font = "NAVI_BODY_REGULAR", size = 14, lineSpacing = 22, text = "One H1bac test costs upto ₹800 in India.", @@ -149,7 +149,7 @@ fun H1bacBottomSheetComposable( listOf( StyleString( substring = "₹800", - font = "TT_SEMI_BOLD", + font = "NAVI_BODY_DEMI_BOLD", textColor = "#000000" ) ), @@ -186,7 +186,7 @@ fun H1bacBottomSheetComposable( textFieldData = content.boxTitle ?: TextFieldData( - font = "TT_SEMI_BOLD", + font = "NAVI_BODY_DEMI_BOLD", size = 16, lineSpacing = 24, text = "Pay ₹0 for this test", @@ -255,7 +255,9 @@ fun H1bacBottomSheetComposable( textFieldData = content.firstBullet ?: TextFieldData( - font = "TT_REGULAR", // Replace with the actual font key + font = + "NAVI_BODY_REGULAR", // Replace with the actual font + // key size = 14, lineSpacing = 22, text = "Get insured with", @@ -320,7 +322,8 @@ fun H1bacBottomSheetComposable( textFieldData = content.secondBullet ?: TextFieldData( - font = "TT_REGULAR", // Replace with the actual font key + font = + "NAVI_BODY_REGULAR", // Replace with the actual font key size = 14, lineSpacing = 22, text = "Avail your free full body check-up", @@ -361,7 +364,8 @@ fun H1bacBottomSheetComposable( textFieldData = content.thirdBullet ?: TextFieldData( - font = "TT_REGULAR", // Replace with the actual font key + font = + "NAVI_BODY_REGULAR", // Replace with the actual font key size = 14, lineSpacing = 22, text = "Get this test done for free!", @@ -412,7 +416,7 @@ fun H1bacBottomSheetComposable( modifier = Modifier.padding(vertical = 16.dp), textFieldData = TextFieldData( - font = "TT_SEMI_BOLD", + font = "NAVI_BODY_DEMI_BOLD", size = 14, lineSpacing = 22, text = "Go back", @@ -455,7 +459,7 @@ fun H1bacBottomSheetComposable( modifier = Modifier.padding(vertical = 16.dp), textFieldData = TextFieldData( - font = "TT_SEMI_BOLD", + font = "NAVI_BODY_DEMI_BOLD", size = 14, lineSpacing = 22, text = "Explore insurance", diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/NameDobEditTextWidgetComposable.kt b/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/NameDobEditTextWidgetComposable.kt index c8cb9d6ac4..33752ec1ae 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/NameDobEditTextWidgetComposable.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/NameDobEditTextWidgetComposable.kt @@ -137,7 +137,7 @@ fun NameDobEditComposable( textColor = "#FF0000", size = 12, fontWeight = 600, - font = "TT_MEDIUM", + font = "NAVI_HEADLINE_REGULAR", lineSpacing = 16, ) } else { @@ -181,7 +181,7 @@ fun NameDobEditComposable( textColor = "#FF0000", size = 12, fontWeight = 600, - font = "TT_MEDIUM", + font = "NAVI_HEADLINE_REGULAR", lineSpacing = 16, ) } else { 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 00cda13642..e3bdd7a22a 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 @@ -872,7 +872,7 @@ fun GenderRadioGroup( if (option.id == selectedOption?.id) option.itemTitle?.copy( textColor = colorCTAPrimaryHex, - font = "TT_MEDIUM" + font = "NAVI_HEADLINE_REGULAR" ) else option.itemTitle?.copy(textColor = colorTextTertiaryHex), modifier = Modifier.padding(top = LocalDimensions.current.dp12) diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/reusable/PincodeInputComposable.kt b/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/reusable/PincodeInputComposable.kt index dc05d3c419..60ebc96a4b 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/reusable/PincodeInputComposable.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/reusable/PincodeInputComposable.kt @@ -115,7 +115,7 @@ fun CharView(index: Int, text: String, inputSize: Int, isTextFieldFocused: Boole }, size = 24, fontWeight = 700, - font = "TT_SEMI_BOLD", + font = "NAVI_BODY_DEMI_BOLD", alignment = "CENTER" ), modifier = diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/reusable/WheelPicker.kt b/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/reusable/WheelPicker.kt index 2f49a194db..b32bac5f37 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/reusable/WheelPicker.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/reusable/WheelPicker.kt @@ -111,7 +111,7 @@ fun InfiniteItemsPicker( text = getItem(index).title?.text, textColor = colorHiBlueHex, size = 20, - font = "TT_MEDIUM", + font = "NAVI_HEADLINE_REGULAR", lineSpacing = 24 ), ) 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 c9d93f9179..74936a790d 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 @@ -34,7 +34,7 @@ data class PrePurchaseJourneyTypography( TextFieldData( text = "Done", textColor = colorWhiteHex, - font = "TT_MEDIUM", + font = "NAVI_HEADLINE_REGULAR", alignment = "CENTER", size = 14, lineSpacing = 22, @@ -52,7 +52,7 @@ data class PrePurchaseJourneyTypography( textColor = colorSuccessGreenHex, size = 12, fontWeight = 600, - font = "TT_MEDIUM", + font = "NAVI_HEADLINE_REGULAR", lineSpacing = 16, ), val dividerText: TextFieldData = @@ -62,7 +62,7 @@ data class PrePurchaseJourneyTypography( textColor = colorTextTertiaryHex, size = 14, alignment = "CENTER", - font = "REGULAR" + font = "NAVI_BODY_REGULAR" ) ) diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/ui/PreQuoteJourneyViewModel.kt b/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/ui/PreQuoteJourneyViewModel.kt index 7d06d440f0..08e62006b5 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/ui/PreQuoteJourneyViewModel.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/ui/PreQuoteJourneyViewModel.kt @@ -509,7 +509,7 @@ constructor( TextFieldData( text = message.orEmpty(), textColor = "#191919", - font = "TT_MEDIUM", + font = "NAVI_HEADLINE_REGULAR", size = 12, lineSpacing = 18, textDrawableData = diff --git a/android/navi-widgets/src/main/java/com/navi/naviwidgets/models/GridImage Widget.kt b/android/navi-widgets/src/main/java/com/navi/naviwidgets/models/GridImageWidget.kt similarity index 100% rename from android/navi-widgets/src/main/java/com/navi/naviwidgets/models/GridImage Widget.kt rename to android/navi-widgets/src/main/java/com/navi/naviwidgets/models/GridImageWidget.kt diff --git a/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/AutoCarouselCardsPDWidgetComposable.kt b/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/AutoCarouselCardsPDWidgetComposable.kt index 546caf7116..58c8a820ee 100644 --- a/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/AutoCarouselCardsPDWidgetComposable.kt +++ b/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/AutoCarouselCardsPDWidgetComposable.kt @@ -292,7 +292,7 @@ internal fun PageLayout( NaviTextWidgetized( textFieldData = TextFieldData( - font = "TT_MEDIUM", + font = "NAVI_HEADLINE_REGULAR", size = 16, lineSpacing = 24, text = pageData?.descriptionSectionData?.leftSubtitle, diff --git a/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/CardHorizontalAutoCarouselWidgetComposable.kt b/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/CardHorizontalAutoCarouselWidgetComposable.kt index 32cda2c3b6..64aba42b49 100644 --- a/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/CardHorizontalAutoCarouselWidgetComposable.kt +++ b/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/CardHorizontalAutoCarouselWidgetComposable.kt @@ -142,7 +142,7 @@ fun CardItem( textFieldData = data.widgetData?.carouselCardData?.getOrNull(page)?.cardHeader?.title ?: TextFieldData( - font = "TT_MEDIUM", + font = "NAVI_HEADLINE_REGULAR", fontWeight = 400, size = 16, lineSpacing = 24, @@ -167,7 +167,7 @@ fun CardItem( textFieldData = data?.widgetData?.carouselCardData?.getOrNull(page)?.cardBody?.bodyText ?: TextFieldData( - font = "TT_REGULAR", + font = "NAVI_BODY_REGULAR", fontWeight = 400, size = 14, lineSpacing = 22, @@ -189,7 +189,7 @@ fun CardItem( textFieldData = data?.widgetData?.carouselCardData?.getOrNull(page)?.cardBody?.bodyText ?: TextFieldData( - font = "TT_REGULAR", + font = "NAVI_BODY_REGULAR", fontWeight = 400, size = 14, lineSpacing = 22, @@ -230,7 +230,7 @@ fun CardItem( textFieldData = data.widgetData?.carouselCardData?.getOrNull(page)?.cardBody?.button?.text ?: TextFieldData( - font = "TT_SEMI_BOLD", + font = "NAVI_BODY_DEMI_BOLD", size = 14, lineSpacing = 22, text = "Take test", diff --git a/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/CardWithCtaAndImageWidgetComposable.kt b/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/CardWithCtaAndImageWidgetComposable.kt index 3aa32f24f1..0f123fc9cf 100644 --- a/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/CardWithCtaAndImageWidgetComposable.kt +++ b/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/CardWithCtaAndImageWidgetComposable.kt @@ -63,7 +63,7 @@ fun CardWithCtaAndImageWidgetComposable( textFieldData = data?.widgetData?.cardTitle ?: TextFieldData( - font = "TT_SEMI_BOLD", + font = "NAVI_BODY_DEMI_BOLD", size = 14, lineSpacing = 22, text = "How healthy are you?", @@ -85,7 +85,7 @@ fun CardWithCtaAndImageWidgetComposable( textFieldData = data?.widgetData?.cardSubtitle ?: TextFieldData( - font = "TT_REGULAR", + font = "NAVI_BODY_REGULAR", size = 12, lineSpacing = 18, text = "Check your health score\nin 2 min!", diff --git a/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/ResultScreenFooterWidgetComposable.kt b/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/ResultScreenFooterWidgetComposable.kt index f2060b5477..f3a6f4463c 100644 --- a/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/ResultScreenFooterWidgetComposable.kt +++ b/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/ResultScreenFooterWidgetComposable.kt @@ -53,7 +53,7 @@ fun ResultScreenFooterWidgetComposable( textFieldData = data.widgetData?.footerText ?: TextFieldData( - font = "TT_REGULAR", + font = "NAVI_BODY_REGULAR", size = 12, lineSpacing = 18, text = "Health insurance plan starts at only ₹235 /month", diff --git a/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/TitleSubtitleWithIconsWidgetComposable.kt b/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/TitleSubtitleWithIconsWidgetComposable.kt index 62232fcf51..89a3a4564a 100644 --- a/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/TitleSubtitleWithIconsWidgetComposable.kt +++ b/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/TitleSubtitleWithIconsWidgetComposable.kt @@ -101,7 +101,7 @@ fun TitleSubtitleWithIconsWidgetComposable( textFieldData = data.widgetData?.subtitle ?: TextFieldData( - font = "TT_REGULAR", + font = "NAVI_BODY_REGULAR", size = 12, lineSpacing = 18, text = diff --git a/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/TitleWidgetComposable.kt b/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/TitleWidgetComposable.kt index 18106db7ab..eb3a5ba883 100644 --- a/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/TitleWidgetComposable.kt +++ b/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/TitleWidgetComposable.kt @@ -35,7 +35,7 @@ fun TitleWidgetComposable(data: TitleComposableWidget, handleCta: (CtaData) -> U textFieldData = data.widgetData?.title ?: TextFieldData( - font = "TT_SEMI_BOLD", + font = "NAVI_BODY_DEMI_BOLD", size = 16, lineSpacing = 24, text = "", diff --git a/android/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/ComposeDummyWidget.kt b/android/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/ComposeDummyWidget.kt index e1e66dab46..1422d41982 100644 --- a/android/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/ComposeDummyWidget.kt +++ b/android/navi-widgets/src/main/java/com/navi/naviwidgets/widgets/dashboard/ComposeDummyWidget.kt @@ -69,7 +69,7 @@ fun ComposeDummyWidget( text = "HEALTH INSURANCE", textColor = "#4B4968", size = 12, - font = "EXTRA_BOLD" + font = "NAVI_BODY_DEMI_BOLD" ), modifier = Modifier.padding(0.dp, 9.dp), ) @@ -84,7 +84,7 @@ fun ComposeDummyWidget( text = "Premium due", textColor = "#A3A3AB", size = 12, - font = "SEMI_BOLD" + font = "NAVI_BODY_REGULAR" ) ) Text(