varnitgoyal95/super-app
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

NTP-15317 | FontUtil Optimization (#13823)

Browse Source
This commit is contained in:
Shivam Goyal
2024-11-26 19:54:16 +05:30
committed by GitHub
parent 4408f016bf
commit 4bb7b85157
13 changed files with 30 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/app/build.gradle
View File

@@ -15,8 +15,8 @@ plugins {
alias libs.plugins.facebook.react
}
def VERSION_CODE = 453
def VERSION_NAME = "5.25.2"
def VERSION_CODE = 454
def VERSION_NAME = "5.26.0"
android {
namespace 'com.naviapp'

9
android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/ErrorBottomSheetContent.kt
View File

@@ -30,9 +30,8 @@ import com.navi.common.R
import com.navi.common.network.models.GenericErrorResponse
import com.navi.elex.atoms.ElexImage
import com.navi.elex.atoms.ElexText
import com.navi.elex.font.FontWeightEnum
import com.navi.elex.molecules.ElexButtonWithText
import com.navi.elex.utils.FontFamilyEnum
import com.navi.elex.utils.FontWeightEnum
@Composable
fun ErrorBottomSheetContent(errorMessage: GenericErrorResponse? = null, onDismiss: () -> Unit) {
@@ -55,8 +54,7 @@ fun ErrorBottomSheetContent(errorMessage: GenericErrorResponse? = null, onDismis
),
color = Color(0xFF191919),
fontSize = 16.sp,
fontWeight = FontWeightEnum.TT_SEMI_BOLD,
fontFamily = FontFamilyEnum.TT,
fontWeight = FontWeightEnum.NAVI_BODY_DEMI_BOLD,
lineHeight = 24.sp
)
Spacer(Modifier.height(8.dp))
@@ -67,7 +65,6 @@ fun ErrorBottomSheetContent(errorMessage: GenericErrorResponse? = null, onDismis
color = Color(0xFF6B6B6B),
fontSize = 14.sp,
fontWeight = FontWeightEnum.NAVI_BODY_REGULAR,
fontFamily = FontFamilyEnum.TT,
lineHeight = 22.sp
)
Spacer(Modifier.height(32.dp))
@@ -78,7 +75,7 @@ fun ErrorBottomSheetContent(errorMessage: GenericErrorResponse? = null, onDismis
contentPadding = PaddingValues(16.dp),
textColor = Color.White,
fontSize = 14.sp,
fontWeight = FontWeightEnum.TT_SEMI_BOLD,
fontWeight = FontWeightEnum.NAVI_BODY_DEMI_BOLD,
shape = RoundedCornerShape(4.dp),
colors =
ButtonDefaults.buttonColors(

12
android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/NotificationSettingsBottomSheetContent.kt
View File

@@ -28,9 +28,8 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.navi.elex.atoms.ElexText
import com.navi.elex.font.FontWeightEnum
import com.navi.elex.molecules.ElexButtonWithText
import com.navi.elex.utils.FontFamilyEnum
import com.navi.elex.utils.FontWeightEnum
import com.naviapp.R
@Composable
@@ -48,8 +47,7 @@ fun NotificationSettingBottomSheetContent(onDismiss: () -> Unit, onClick: () ->
text = stringResource(R.string.allow_notifications),
color = Color(0xFF191919),
fontSize = 18.sp,
fontWeight = FontWeightEnum.TT_MEDIUM,
fontFamily = FontFamilyEnum.TT,
fontWeight = FontWeightEnum.NAVI_HEADLINE_REGULAR,
lineHeight = 24.sp
)
Row(
@@ -72,8 +70,7 @@ fun NotificationSettingBottomSheetContent(onDismiss: () -> Unit, onClick: () ->
text = stringResource(R.string.app_notifications),
color = Color(0xFF191919),
fontSize = 16.sp,
fontWeight = FontWeightEnum.TT_MEDIUM,
fontFamily = FontFamilyEnum.TT,
fontWeight = FontWeightEnum.NAVI_HEADLINE_REGULAR,
lineHeight = 24.sp
)
ElexText(
@@ -81,7 +78,6 @@ fun NotificationSettingBottomSheetContent(onDismiss: () -> Unit, onClick: () ->
color = Color(0xFF6B6B6B),
fontSize = 12.sp,
fontWeight = FontWeightEnum.NAVI_BODY_REGULAR,
fontFamily = FontFamilyEnum.TT,
lineHeight = 18.sp
)
}
@@ -97,7 +93,7 @@ fun NotificationSettingBottomSheetContent(onDismiss: () -> Unit, onClick: () ->
contentPadding = PaddingValues(vertical = 17.dp),
textColor = Color.White,
fontSize = 14.sp,
fontWeight = FontWeightEnum.TT_SEMI_BOLD,
fontWeight = FontWeightEnum.NAVI_BODY_DEMI_BOLD,
shape = RoundedCornerShape(4.dp),
colors =
ButtonDefaults.buttonColors(

6
android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/PermissionSettingBottomSheet.kt
View File

@@ -33,7 +33,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.navi.elex.atoms.ElexBottomSheet
import com.navi.elex.atoms.ElexText
import com.navi.elex.utils.FontWeightEnum
import com.navi.elex.font.FontWeightEnum
import com.naviapp.appsettings.model.permissionSettings.PermissionSettingsBottomSheetData
@Composable
@@ -60,7 +60,7 @@ fun PermissionSettingBottomSheet(
text = permissionSettingsBottomSheetData.title,
fontSize = 16.sp,
lineHeight = 24.sp,
fontWeight = FontWeightEnum.TT_SEMI_BOLD,
fontWeight = FontWeightEnum.NAVI_BODY_DEMI_BOLD,
color = Color(0xff191919)
)
ElexText(
@@ -96,7 +96,7 @@ fun PermissionSettingBottomSheet(
ElexText(
text = permissionSettingsBottomSheetData.buttonText,
modifier = Modifier.padding(16.dp),
fontWeight = FontWeightEnum.TT_SEMI_BOLD,
fontWeight = FontWeightEnum.NAVI_BODY_DEMI_BOLD,
fontSize = 14.sp,
color = Color(0xffffffff)
)

2
android/app/src/main/java/com/naviapp/appsettings/ui/common/ScreenInformationText.kt
View File

@@ -11,7 +11,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.sp
import com.navi.elex.atoms.ElexText
import com.navi.elex.utils.FontWeightEnum
import com.navi.elex.font.FontWeightEnum
@Composable
fun ScreenInformationText(description: String) {

4
android/app/src/main/java/com/naviapp/appsettings/ui/common/ScreenSectionHeading.kt
View File

@@ -11,7 +11,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.sp
import com.navi.elex.atoms.ElexText
import com.navi.elex.utils.FontWeightEnum
import com.navi.elex.font.FontWeightEnum
@Composable
fun ScreenSectionHeading(heading: String) {
@@ -20,6 +20,6 @@ fun ScreenSectionHeading(heading: String) {
fontSize = 16.sp,
lineHeight = 24.sp,
color = Color(0xff444444),
fontWeight = FontWeightEnum.TT_MEDIUM
fontWeight = FontWeightEnum.NAVI_HEADLINE_REGULAR
)
}

4
android/app/src/main/java/com/naviapp/appsettings/ui/common/ScreenTitle.kt
View File

@@ -11,7 +11,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.sp
import com.navi.elex.atoms.ElexText
import com.navi.elex.utils.FontWeightEnum
import com.navi.elex.font.FontWeightEnum
@Composable
fun ScreenTitle(
@@ -22,6 +22,6 @@ fun ScreenTitle(
fontSize = 24.sp,
lineHeight = 34.sp,
color = Color(0xff191919),
fontWeight = FontWeightEnum.TT_SEMI_BOLD
fontWeight = FontWeightEnum.NAVI_BODY_DEMI_BOLD
)
}

4
android/app/src/main/java/com/naviapp/appsettings/ui/common/ScreenTopBar.kt
View File

@@ -23,7 +23,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.navi.elex.atoms.ElexImage
import com.navi.elex.atoms.ElexText
import com.navi.elex.utils.FontWeightEnum
import com.navi.elex.font.FontWeightEnum
import com.naviapp.R
@Composable
@@ -52,7 +52,7 @@ fun ScreenTopBar(
if (rightActionVisibility)
ElexText(
"HELP",
fontWeight = FontWeightEnum.TT_SEMI_BOLD,
fontWeight = FontWeightEnum.NAVI_BODY_DEMI_BOLD,
fontSize = 14.sp,
lineHeight = 22.sp,
modifier =

4
android/app/src/main/java/com/naviapp/appsettings/ui/common/SwitchableSettingsContainer.kt
View File

@@ -28,7 +28,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.navi.elex.atoms.ElexImage
import com.navi.elex.atoms.ElexText
import com.navi.elex.utils.FontWeightEnum
import com.navi.elex.font.FontWeightEnum
import com.navi.naviwidgets.utils.NaviWidgetIconUtils.getImageFromIconCode
@Composable
@@ -70,7 +70,7 @@ fun SwitchableSetting(
) {
ElexText(
text = title,
fontWeight = FontWeightEnum.TT_MEDIUM,
fontWeight = FontWeightEnum.NAVI_HEADLINE_REGULAR,
fontSize = 16.sp,
lineHeight = 24.sp,
color = Color(0xff191919)

4
android/app/src/main/java/com/naviapp/appsettings/ui/screens/AppSettingsMainScreen.kt
View File

@@ -39,7 +39,7 @@ import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper
import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper.APP_SETTINGS_IN_APP_HANDLER_ENABLED
import com.navi.elex.atoms.ElexImage
import com.navi.elex.atoms.ElexText
import com.navi.elex.utils.FontWeightEnum
import com.navi.elex.font.FontWeightEnum
import com.naviapp.R
import com.naviapp.appsettings.activity.AppSettingsActivity
import com.naviapp.appsettings.analytics.AppSettingsAnalytics
@@ -140,7 +140,7 @@ private fun AppSettingsItemCard(title: String, description: String, onCardClick:
title,
color = Color(0xff191919),
fontSize = 16.sp,
fontWeight = FontWeightEnum.TT_MEDIUM,
fontWeight = FontWeightEnum.NAVI_HEADLINE_REGULAR,
lineHeight = 24.sp
)
ElexText(

8
android/app/src/main/java/com/naviapp/appsettings/ui/screens/NotificationSettingsScreenComponents.kt
View File

@@ -40,7 +40,7 @@ import androidx.lifecycle.compose.LocalLifecycleOwner
import com.navi.base.utils.orFalse
import com.navi.elex.atoms.ElexImage
import com.navi.elex.atoms.ElexText
import com.navi.elex.utils.FontWeightEnum
import com.navi.elex.font.FontWeightEnum
import com.navi.naviwidgets.utils.NaviWidgetIconUtils.ICON_PURPLE_RETRY
import com.navi.naviwidgets.utils.NaviWidgetIconUtils.getImageFromIconCode
import com.naviapp.R
@@ -113,7 +113,7 @@ fun NotificationSettingsContainer(
color = Color(0xff191919),
fontSize = 14.sp,
lineHeight = 22.sp,
fontWeight = FontWeightEnum.TT_MEDIUM,
fontWeight = FontWeightEnum.NAVI_HEADLINE_REGULAR,
textDecoration = TextDecoration.Underline,
modifier =
Modifier.clickable(
@@ -157,7 +157,7 @@ fun ErrorStateComponent(onRetry: () -> Unit) {
) {
ElexText(
stringResource(R.string.unable_to_load),
fontWeight = FontWeightEnum.TT_MEDIUM,
fontWeight = FontWeightEnum.NAVI_HEADLINE_REGULAR,
color = Color(0xff6B6B6B),
fontSize = 16.sp,
lineHeight = 24.sp
@@ -173,7 +173,7 @@ fun ErrorStateComponent(onRetry: () -> Unit) {
) {
ElexText(
stringResource(R.string.retry),
fontWeight = FontWeightEnum.TT_SEMI_BOLD,
fontWeight = FontWeightEnum.NAVI_BODY_DEMI_BOLD,
color = Color(0xFF191919),
fontSize = 14.sp,
lineHeight = 22.sp

4
android/app/src/main/java/com/naviapp/appsettings/ui/screens/PermissionSettingsScreen.kt
View File

@@ -40,7 +40,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.navi.base.utils.isNotNull
import com.navi.base.utils.orFalse
import com.navi.elex.atoms.ElexText
import com.navi.elex.utils.FontWeightEnum
import com.navi.elex.font.FontWeightEnum
import com.naviapp.R
import com.naviapp.appsettings.activity.AppSettingsActivity
import com.naviapp.appsettings.analytics.AppSettingsAnalytics
@@ -121,7 +121,7 @@ fun PermissionSettingsScreen(
color = Color(0xff191919),
fontSize = 14.sp,
lineHeight = 22.sp,
fontWeight = FontWeightEnum.TT_MEDIUM,
fontWeight = FontWeightEnum.NAVI_HEADLINE_REGULAR,
textDecoration = TextDecoration.Underline,
modifier =
Modifier.clickable(

2
android/gradle/libs.versions.toml
View File

@@ -95,7 +95,7 @@ mockk = "1.13.10"
mvel2 = "2.4.15.Final"
navi-adverse = "1.9.0"
navi-alfred = "1.18.1"
navi-elex = "1.4.0"
navi-elex = "1.6.0"
navi-guarddog = "3.10.0"
navi-pulse = "1.12.0"
navi-uitron = "2.1.0"