fonts added on all screens..

app/src/main/java/com/vpn/fastestvpnservice/customItems/CountryItem.kt

@@ -192,23 +192,20 @@ fun CountryItem(server: Server, category: String, navHostController: NavHostCont
                                         )
                                 )
                                 Text(text = server.country!!,
-                                    style = TextStyle(
-                                        fontSize = 16.sp,
-                                        color = MaterialTheme.colorScheme.primary
-                                    ),
+                                    style = MaterialTheme.typography.labelMedium,
+                                    color = MaterialTheme.colorScheme.primary,
                                     modifier = Modifier
                                         .padding(start = 16.dp, bottom = 18.dp)
                                         .align(Alignment.CenterVertically)
                                 )
                                 Spacer(modifier = Modifier.weight(1F))
                                 Text(text = "${locationsSize} locations",
-                                    style = TextStyle(
-                                        fontSize = 16.sp,
-                                        color = colorResource(id = R.color.blue_text)
-                                    ),
+                                    style = MaterialTheme.typography.bodySmall,
+                                    color = colorResource(id = R.color.dark_blue_gray_text),
                                     modifier = Modifier
                                         .padding(end = 30.dp, bottom = 18.dp)
                                         .align(Alignment.CenterVertically)
+                                        .alpha(0.4F)
                                 )
 //            Spacer(modifier = Modifier.weight(1F))
 
@@ -277,7 +274,6 @@ fun CountryItem(server: Server, category: String, navHostController: NavHostCont
                                     isServerServerClicked = true
 //                                    navHostController.popBackStack()
                                 }
-
                         ) {
                             val icon = if (server.enable == 1) Utils.getDrawable(context, server.iso)
                             else Utils.getDrawableGray(context, server.iso)
@@ -297,10 +293,8 @@ fun CountryItem(server: Server, category: String, navHostController: NavHostCont
                             )
                             val serverTitle = if (category.lowercase().toString() == "servers") server.country else server.server_name
                             Text(text = serverTitle!!,
-                                style = TextStyle(
-                                    fontSize = 16.sp,
-                                    color = MaterialTheme.colorScheme.primary
-                                ),
+                                style = MaterialTheme.typography.labelMedium,
+                                color = MaterialTheme.colorScheme.primary,
                                 modifier = Modifier
                                     .padding(start = 16.dp, bottom = 18.dp)
                                     .align(Alignment.CenterVertically)
@@ -309,11 +303,9 @@ fun CountryItem(server: Server, category: String, navHostController: NavHostCont
                             val pings = server.ping
                             Text(
                                 text = "${server.ping} ms",
-                                style = TextStyle(
-                                    fontSize = 16.sp,
-                                    color = colorResource(id = R.color.blue_text)
-                                ),
-                                modifier = Modifier
+                                style = MaterialTheme.typography.displayMedium,
+                                color = colorResource(id = R.color.blue_text),
+                                        modifier = Modifier
                                     .padding(end = 30.dp, bottom = 18.dp)
                                     .align(Alignment.CenterVertically)
                             )
@@ -434,10 +426,8 @@ fun ColumnScope.ExpandableRow(server: ArrayList<Server>, navHostController: NavH
                             }
                     ) {
                         Text(text = serverInfo.server_name!!,
-                            style = TextStyle(
-                                fontSize = 16.sp,
-                                color = MaterialTheme.colorScheme.onSecondary
-                            ),
+                            style = MaterialTheme.typography.labelMedium,
+                            color = MaterialTheme.colorScheme.onSecondary,
                             modifier = Modifier
                                 .padding(start = 16.dp, bottom = 0.dp)
                                 .align(Alignment.CenterVertically)
@@ -448,12 +438,8 @@ fun ColumnScope.ExpandableRow(server: ArrayList<Server>, navHostController: NavH
 //                        serverListViewModel.calculatePing(server)
 
                         Text(text = "${serverInfo.ping} ms",
-                            style = TextStyle(
-                                fontSize = 16.sp,
-                                color = colorResource(id = R.color.blue_text),
-                                lineHeight = 30.sp,
-                                textAlign = TextAlign.Right
-                            ),
+                            style = MaterialTheme.typography.displayMedium,
+                            color = colorResource(id = R.color.blue_text),
                             modifier = Modifier
                                 .padding(start = 0.dp, end = 30.dp)
                                 .align(Alignment.CenterVertically)

app/src/main/java/com/vpn/fastestvpnservice/customItems/NotificationItem.kt

@@ -13,6 +13,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -30,10 +31,9 @@ fun NotificationItem(item: Notification) {
         ) {
             Text(
                 text = item.title,
-                style = TextStyle(
-                    fontSize = 16.sp,
-                    color = MaterialTheme.colorScheme.primary
-                ),
+                color = MaterialTheme.colorScheme.primary,
+                style = MaterialTheme.typography.labelMedium,
+                textAlign = TextAlign.Start,
                 modifier = Modifier
                     .padding(start = 16.dp, bottom = 5.dp)
                     .fillMaxWidth(),
@@ -41,10 +41,9 @@ fun NotificationItem(item: Notification) {
             )
             Text(
                 text = item.html,
-                style = TextStyle(
-                    fontSize = 16.sp,
-                    color = MaterialTheme.colorScheme.primary
-                ),
+                color = MaterialTheme.colorScheme.primary,
+                style = MaterialTheme.typography.labelMedium,
+                textAlign = TextAlign.Start,
                 modifier = Modifier
                     .padding(start = 16.dp, bottom = 0.dp)
                     .fillMaxWidth(),

app/src/main/java/com/vpn/fastestvpnservice/customItems/ServerItem.kt

@@ -150,20 +150,16 @@ fun ServerItem(server: Server, navHostController: NavHostController) {
                     )
             )
             Text(text = server.server_name!!,
-                style = TextStyle(
-                    fontSize = 16.sp,
-                    color = MaterialTheme.colorScheme.primary
-                ),
+                style = MaterialTheme.typography.labelMedium,
+                color = MaterialTheme.colorScheme.primary,
                 modifier = Modifier
                     .padding(start = 16.dp, bottom = 18.dp)
                     .align(Alignment.CenterVertically)
                 )
             Spacer(modifier = Modifier.weight(1F))
             Text(text = "${server.ping} ms",
-                style = TextStyle(
-                    fontSize = 16.sp,
-                    color = colorResource(id = R.color.blue_text)
-                ),
+                style = MaterialTheme.typography.displayMedium,
+                color = colorResource(id = R.color.blue_text),
                 modifier = Modifier
                     .padding(end = 30.dp, bottom = 18.dp)
                     .align(Alignment.CenterVertically)
@@ -326,20 +322,16 @@ fun FavoriteServerItem(server: Server, navHostController: NavHostController) {
             )
 
             Text(text = server.server_name!!,
-                style = TextStyle(
-                    fontSize = 16.sp,
-                    color = MaterialTheme.colorScheme.primary
-                ),
+                color = MaterialTheme.colorScheme.primary,
+                style = MaterialTheme.typography.labelMedium,
                 modifier = Modifier
                     .padding(start = 16.dp, bottom = 18.dp)
                     .align(Alignment.CenterVertically)
             )
             Spacer(modifier = Modifier.weight(1F))
             Text(text = "${server.ping} ms",
-                style = TextStyle(
-                    fontSize = 16.sp,
-                    color = colorResource(id = R.color.blue_text)
-                ),
+                color = colorResource(id = R.color.blue_text),
+                style = MaterialTheme.typography.displayMedium,
                 modifier = Modifier
                     .padding(end = 30.dp, bottom = 18.dp)
                     .align(Alignment.CenterVertically)
@@ -477,20 +469,16 @@ fun ServerSearchItem(server: Server, navHostController: NavHostController) {
                     )
             )
             Text(text = server.server_name!!,
-                style = TextStyle(
-                    fontSize = 16.sp,
-                    color = colorResource(id = R.color.dark_blue_gray_text)
-                ),
+                color = colorResource(id = R.color.dark_blue_gray_text),
+                style = MaterialTheme.typography.labelMedium,
                 modifier = Modifier
                     .padding(start = 16.dp, bottom = 18.dp)
                     .align(Alignment.CenterVertically)
             )
             Spacer(modifier = Modifier.weight(1F))
             Text(text = "${server.ping} ms",
-                style = TextStyle(
-                    fontSize = 16.sp,
-                    color = colorResource(id = R.color.blue_text)
-                ),
+                color = colorResource(id = R.color.blue_text),
+                style = MaterialTheme.typography.displayMedium,
                 modifier = Modifier
                     .padding(end = 30.dp, bottom = 18.dp)
                     .align(Alignment.CenterVertically)

app/src/main/java/com/vpn/fastestvpnservice/customItems/SplitTunnelingItem.kt

@@ -105,11 +105,9 @@ fun SplitTunnelingItem(
                     .size(40.dp)
             )
             Text(text = "$app",
-                style = TextStyle(
-                    fontSize = 14.sp,
-                    color = if (isSelected) colorResource(id = R.color.dark_blue_gray_text)
-                            else MaterialTheme.colorScheme.primary
-                ),
+                style = MaterialTheme.typography.bodySmall,
+                color = if (isSelected) colorResource(id = R.color.dark_blue_gray_text)
+                else MaterialTheme.colorScheme.primary,
                 modifier = Modifier
                     .padding(start = 12.dp, bottom = 18.dp)
                     .align(Alignment.CenterVertically)

app/src/main/java/com/vpn/fastestvpnservice/customItems/SubscriptionDataItem.kt

@@ -83,21 +83,16 @@ fun SubscriptionDataItem(item: Features) {
                     .padding(start = 16.dp)
             ) {
                 Text(text = item.title!!,
-                    style = TextStyle(
-                        fontSize = 16.sp,
-                        fontWeight = FontWeight.Medium,
-                        color = MaterialTheme.colorScheme.primary
-                    ),
+                    color = MaterialTheme.colorScheme.primary,
+                    style = MaterialTheme.typography.titleSmall,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
                     modifier = Modifier
                         .padding(start = 0.dp, bottom = 0.dp)
                 )
                 Text(text = item.details!!,
-                    style = TextStyle(
-                        fontSize = 14.sp,
-                        color = MaterialTheme.colorScheme.primary
-                    ),
+                    color = MaterialTheme.colorScheme.primary,
+                    style = MaterialTheme.typography.bodySmall,
                     maxLines = 2,
                     overflow = TextOverflow.Ellipsis,
                     modifier = Modifier

app/src/main/java/com/vpn/fastestvpnservice/customItems/SubscriptionPackageItem.kt

@@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -47,6 +48,7 @@ import androidx.navigation.compose.rememberNavController
 import com.vpn.fastestvpnservice.R
 import com.vpn.fastestvpnservice.beans.SubscriptionPackageList
 import com.vpn.fastestvpnservice.beans.subscriptionPackageList
+import com.vpn.fastestvpnservice.ui.theme.customTypography2
 import com.vpn.fastestvpnservice.viewmodels.SubscriptionViewModel
 import kotlinx.coroutines.launch
 import java.util.Random
@@ -158,29 +160,20 @@ fun SubscriptionPackageItem(item: SubscriptionPackageList, position: Int,
                     .fillMaxWidth()
             ) {
                 Text(text = item.packageDuration,
-                    style = TextStyle(
-                        color = if (item.isSelected.value) colorResource(
-                            id = R.color.blue_text) else colorResource(
-                            id = R.color.dark_blue_gray_text),
-                        fontSize = 18.sp,
-                        fontStyle = FontStyle.Normal,
-                        fontWeight = FontWeight.Medium
-                    ),
+                    color = if (item.isSelected.value) colorResource(
+                        id = R.color.blue_text) else colorResource(
+                        id = R.color.dark_blue_gray_text),
+                    style = MaterialTheme.typography.titleMedium,
                     maxLines = 1,
                     modifier = Modifier
                         .padding(start = 0.dp, end = 0.dp)
                         .alpha(if (item.isSelected.value) 1F else 0.6F)
                 )
                 Text(text = item.price,
-                    style = TextStyle(
-                        color = if (item.isSelected.value) colorResource(
-                            id = R.color.light_blue_2) else colorResource(
-                            id = R.color.text_color_dark_gray),
-                        fontSize = 20.sp,
-                        fontStyle = FontStyle.Normal,
-                        fontWeight = FontWeight.SemiBold,
-                        textAlign = TextAlign.Right
-                    ),
+                    color = if (item.isSelected.value) colorResource(
+                        id = R.color.light_blue_2) else colorResource(
+                        id = R.color.text_color_dark_gray),
+                    style = MaterialTheme.typography.customTypography2.labelLarge,
                     maxLines = 1,
                     modifier = Modifier
                         .padding(start = 0.dp, end = 0.dp)
@@ -188,22 +181,15 @@ fun SubscriptionPackageItem(item: SubscriptionPackageList, position: Int,
                 )
             }
             Text(text = item.planType,
-                style = TextStyle(
-                    color = colorResource(id = R.color.dark_blue_gray_text),
-                    fontSize = 14.sp,
-                    fontStyle = FontStyle.Normal,
-                    fontWeight = FontWeight.Medium,
-                ),
+                color = colorResource(id = R.color.dark_blue_gray_text),
+                style = MaterialTheme.typography.bodyLarge,
                 maxLines = 1,
                 modifier = Modifier
                     .padding(top = 6.dp, end = 0.dp)
             )
             Text(text = item.desc,
-                style = TextStyle(
-                    color = colorResource(id = R.color.dark_blue_gray_text),
-                    fontSize = 14.sp,
-                    fontStyle = FontStyle.Normal,
-                ),
+                color = colorResource(id = R.color.dark_blue_gray_text),
+                style = MaterialTheme.typography.bodySmall,
                 maxLines = 1,
                 modifier = Modifier
                     .padding(top = 8.dp, end = 0.dp),

app/src/main/java/com/vpn/fastestvpnservice/screens/LoginScreen.kt

@@ -636,6 +636,7 @@ fun BoxScope.SignInButton(
                     prefHelper.saveAvailableProtocols(it.available_protocols)
                     prefHelper.saveXPlatformToken(it.userinfo?.email + "_" + System.currentTimeMillis())
                     prefHelper.saveAdBlockState(false)
+                    prefHelper.saveTheme(themesList[0])
 
                     it.servers?.let {
                         prefHelper.saveServerData(it)

app/src/main/java/com/vpn/fastestvpnservice/screens/ServerListScreen.kt

@@ -85,6 +85,7 @@ import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
 import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.AddTextSettings
 import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.onServer
 import com.vpn.fastestvpnservice.sealedClass.Screen
+import com.vpn.fastestvpnservice.ui.theme.customTypography2
 import com.vpn.fastestvpnservice.viewmodels.SearchListViewModel
 import com.vpn.fastestvpnservice.viewmodels.ServerListViewModel
 import com.vpn.fastestvpnservice.viewmodels.SplashViewModel
@@ -170,11 +171,8 @@ fun ServerList(
                         selectedContentColor = Color.White,
                         unselectedContentColor = Color.White,
                         text = { Text(text = currentTab,
-                            style = TextStyle(
-                                color = colorResource(id = R.color.dark_blue_gray_text),
-                                fontSize = 14.sp,
-                                textAlign = TextAlign.Center
-                            )
+                            style = MaterialTheme.typography.headlineMedium,
+                            color = colorResource(id = R.color.dark_blue_gray_text),
                             ) },
                         modifier = Modifier
                             .padding(
@@ -252,14 +250,9 @@ fun BoxScope.HeaderRowSL(
         color = colorResource(id = R.color.transparent)
     ) {
         Text(text = "Select Location",
-            style = TextStyle(
-                fontSize = 18.sp,
-                color = MaterialTheme.colorScheme.primary,
-                textAlign = TextAlign.Center,
-                fontWeight = FontWeight.Medium
-            ),
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.primary,
             modifier = Modifier.fillMaxHeight()
-
         )
     }
 }
@@ -364,10 +357,8 @@ fun ColumnScope.ShowRecommendedList(
                             .size(19.dp)
                     )
                     Text(text = "Favorite Location",
-                        style = TextStyle(
-                            fontSize = 16.sp,
-                            color = MaterialTheme.colorScheme.primary
-                        ),
+                        style = MaterialTheme.typography.titleSmall,
+                        color = MaterialTheme.colorScheme.primary,
                         modifier = Modifier
                             .padding(start = 16.dp, bottom = 0.dp)
                             .align(Alignment.CenterVertically)
@@ -413,10 +404,8 @@ fun ColumnScope.ShowRecommendedList(
                             .size(19.dp)
                     )
                     Text(text = "Smart Location",
-                        style = TextStyle(
-                            fontSize = 16.sp,
-                            color = MaterialTheme.colorScheme.primary
-                        ),
+                        style = MaterialTheme.typography.titleSmall,
+                        color = MaterialTheme.colorScheme.primary,
                         modifier = Modifier
                             .padding(start = 16.dp, bottom = 0.dp)
                             .align(Alignment.CenterVertically)
@@ -455,10 +444,8 @@ fun ColumnScope.ShowRecommendedList(
                             .size(19.dp)
                     )
                     Text(text = "Recent Location",
-                        style = TextStyle(
-                            fontSize = 16.sp,
-                            color = MaterialTheme.colorScheme.primary
-                        ),
+                        style = MaterialTheme.typography.titleSmall,
+                        color = MaterialTheme.colorScheme.primary,
                         modifier = Modifier
                             .padding(start = 16.dp, bottom = 0.dp)
                             .align(Alignment.CenterVertically)
@@ -500,10 +487,8 @@ fun ColumnScope.ShowRecommendedList(
                             .size(19.dp)
                     )
                     Text(text = "Recommended Location",
-                        style = TextStyle(
-                            fontSize = 16.sp,
-                            color = MaterialTheme.colorScheme.primary
-                        ),
+                        style = MaterialTheme.typography.titleSmall,
+                        color = MaterialTheme.colorScheme.primary,
                         modifier = Modifier
                             .padding(start = 16.dp, bottom = 0.dp)
                             .align(Alignment.CenterVertically)
@@ -565,7 +550,7 @@ fun ColumnScope.ShowAllLocationsList(
         indicator = { selectedTab ->
             TabRowDefaults.Indicator(
                 modifier = Modifier.tabIndicatorOffset(selectedTab[selectedIndex]),
-                color = colorResource(id = R.color.blue_text)
+                color = colorResource(id = R.color.light_blue_2)
             )
         },
 //                                divider = {}
@@ -577,7 +562,7 @@ fun ColumnScope.ShowAllLocationsList(
 
                 color =
                     if (selectedIndex == index1)
-                        Color(0xFF2952c3)
+                        colorResource(id = R.color.light_blue_2)
                     else MaterialTheme.colorScheme.primary
                 alpha = if (selectedIndex == index1)
                     1F else 0.5F
@@ -618,11 +603,8 @@ fun ColumnScope.ShowAllLocationsList(
                 text = {
                     Text(
                         text = locationTab.name!!,
-                        style = TextStyle(
-                            color = color,
-                            fontSize = 14.sp,
-                            textAlign = TextAlign.Center,
-                        ),
+                        style = MaterialTheme.typography.customTypography2.labelMedium,
+                        color = color,
                         modifier = Modifier
                             .fillMaxWidth()
                             .alpha(alpha)
@@ -747,10 +729,8 @@ fun ColumnScope.ShowHeaderItem(
     ) {
         Text(
             text = serverTitle,
-            style = TextStyle(
-                fontSize = 16.sp,
-                color = MaterialTheme.colorScheme.primary
-            ),
+            style = MaterialTheme.typography.titleSmall,
+            color = MaterialTheme.colorScheme.primary,
             modifier = Modifier
                 .padding(start = 0.dp, bottom = 0.dp)
                 .align(Alignment.CenterVertically)
@@ -851,12 +831,8 @@ fun ColumnScope.ShowSearchBar(
         placeholder = {
             Text(
                 text = "Search Location",
-                style = TextStyle(
-                    fontSize = 14.sp,
-                    color = colorResource(id = R.color.dark_blue_gray_text)
-                ),
-                modifier = Modifier
-
+                style = MaterialTheme.typography.displaySmall,
+                color = colorResource(id = R.color.dark_blue_gray_text)
             )
         },
         leadingIcon = {
@@ -930,7 +906,8 @@ fun ColumnScope.ShowSearchBar(
                         size = 18.sp,
                         color = MaterialTheme.colorScheme.primary,
                         bottomPadding = 20.dp,
-                        startPadding = 16.dp
+                        startPadding = 16.dp,
+                        style = MaterialTheme.typography.titleMedium
                     )
                     filterList.forEach { filter ->
                         Row(
@@ -965,10 +942,8 @@ fun ColumnScope.ShowSearchBar(
                             )
                             Text(text = filter,
                                 modifier = Modifier.padding(start = 12.dp),
-                                style = TextStyle(
-                                    fontSize = 14.sp,
-                                    color = MaterialTheme.colorScheme.primary
-                                )
+                                color = MaterialTheme.colorScheme.primary,
+                                style = MaterialTheme.typography.bodySmall
                             )
                         }
                     }

app/src/main/java/com/vpn/fastestvpnservice/screens/SignUpScreen.kt

@@ -88,6 +88,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import com.vpn.fastestvpnservice.R
+import com.vpn.fastestvpnservice.beans.themesList
 import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
 import com.vpn.fastestvpnservice.sealedClass.Screen
 import com.vpn.fastestvpnservice.ui.theme.customTypography
@@ -707,6 +708,7 @@ fun BoxScope.SignUpButton(
                     prefHelper.saveAvailableProtocols(it.available_protocols)
                     prefHelper.saveXPlatformToken(it.userinfo?.email + "_" + System.currentTimeMillis())
                     prefHelper.saveAdBlockState(false)
+                    prefHelper.saveTheme(themesList[0])
 
                     it.servers?.let {
                         prefHelper.saveServerData(it)

app/src/main/java/com/vpn/fastestvpnservice/screens/accountScreensAll/ChangePasswordScreen.kt

@@ -64,6 +64,7 @@ import androidx.navigation.compose.rememberNavController
 import com.vpn.fastestvpnservice.R
 import com.vpn.fastestvpnservice.beans.subscriptionPackageList
 import com.vpn.fastestvpnservice.customItems.getSelectedPosition
+import com.vpn.fastestvpnservice.ui.theme.customTypography2
 
 @Composable
 fun ChangePassword(navHostController: NavHostController) {
@@ -147,10 +148,7 @@ fun ColumnScope.TextFieldCurrPass() {
             passwordChanged = it
         },
 
-        textStyle = TextStyle(
-            fontSize = 20.sp,
-            color = colorResource(id = R.color.dark_blue_gray_text),
-            ),
+        textStyle = MaterialTheme.typography.customTypography2.bodyMedium,
         modifier = Modifier
             .padding(start = 15.dp, end = 15.dp)
             .align(Alignment.Start)
@@ -169,12 +167,10 @@ fun ColumnScope.TextFieldCurrPass() {
 //                        color = colorResource(id = R.color.white))
 //                },
         label = {
-            androidx.compose.material3.Text(text = "Current Password",
-                style = TextStyle(
-                    colorResource(id = R.color.dark_blue_gray_text),
-                    fontSize = 16.sp,
-                    textAlign = TextAlign.Center
-                    )
+            Text(
+                text = "Current Password",
+                color = colorResource(id = R.color.dark_blue_gray_text),
+                style = MaterialTheme.typography.labelMedium
             )
         },
         leadingIcon = {
@@ -506,12 +502,8 @@ fun BoxScope.HeaderRowCP(navHostController: NavHostController) {
         color = colorResource(id = R.color.transparent)
     ) {
         Text(text = "Change Password",
-            style = TextStyle(
-                fontSize = 18.sp,
-                color = MaterialTheme.colorScheme.primary,
-                textAlign = TextAlign.Center,
-                fontWeight = FontWeight.Medium
-            ),
+            color = MaterialTheme.colorScheme.primary,
+            style = MaterialTheme.typography.bodyMedium,
             modifier = Modifier.fillMaxHeight()
 
         )

app/src/main/java/com/vpn/fastestvpnservice/screens/accountScreensAll/FavoriteServersScreen.kt

@@ -145,12 +145,8 @@ fun BoxScope.HeaderRowFS(
         color = colorResource(id = R.color.transparent)
     ) {
         Text(text = "Favorite Servers",
-            style = TextStyle(
-                fontSize = 18.sp,
-                color = MaterialTheme.colorScheme.primary,
-                textAlign = TextAlign.Center,
-                fontWeight = FontWeight.Medium
-            ),
+            color = MaterialTheme.colorScheme.primary,
+            style = MaterialTheme.typography.bodyMedium,
             modifier = Modifier.fillMaxHeight()
 
         )

app/src/main/java/com/vpn/fastestvpnservice/screens/accountScreensAll/SubscriptionScreen.kt

@@ -90,6 +90,7 @@ import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
 import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.OnLifecycleEvent
 import com.vpn.fastestvpnservice.sealedClass.Screen
 import com.vpn.fastestvpnservice.ui.theme.FastestVPNTheme
+import com.vpn.fastestvpnservice.ui.theme.customTypography2
 import com.vpn.fastestvpnservice.utils.Utils
 import com.vpn.fastestvpnservice.viewmodels.BillingViewModel
 import com.vpn.fastestvpnservice.viewmodels.SubscriptionViewModel
@@ -163,11 +164,8 @@ fun SubscriptionScreen(navHostController: NavHostController, activity: Component
                 .background(Color.Transparent)
         ) {
             Text(text = "Upgrade Your Account",
-                style = TextStyle(
-                    color = MaterialTheme.colorScheme.primary,
-                    fontSize = 18.sp,
-                    fontWeight = FontWeight.Medium
-                )
+                color = MaterialTheme.colorScheme.primary,
+                style = MaterialTheme.typography.titleMedium
             )
 
             Column(
@@ -259,13 +257,8 @@ fun SubscriptionScreen(navHostController: NavHostController, activity: Component
         )
         {
             Text(text = "Subscribe",
-                style = TextStyle(
-                    color = colorResource(id = R.color.white),
-                    textAlign = TextAlign.Center,
-                    fontSize = 20.sp,
-                    fontWeight = FontWeight.SemiBold,
-                    fontStyle = FontStyle.Normal
-                )
+                color = colorResource(id = R.color.white),
+                style = MaterialTheme.typography.customTypography2.bodySmall
             )
         }
     }
@@ -322,12 +315,8 @@ fun BoxScope.HeaderRowSS(navHostController: NavHostController) {
         color = colorResource(id = R.color.transparent)
     ) {
         Text(text = "Subscription",
-            style = TextStyle(
-                fontSize = 18.sp,
-                color = MaterialTheme.colorScheme.primary,
-                textAlign = TextAlign.Center,
-                fontWeight = FontWeight.Medium
-            ),
+            color = MaterialTheme.colorScheme.primary,
+            style = MaterialTheme.typography.bodyMedium,
             modifier = Modifier.fillMaxHeight()
         )
     }

app/src/main/java/com/vpn/fastestvpnservice/screens/bottomNavBarScreens/AccountScreen.kt

@@ -262,13 +262,8 @@ fun Account(navHostController: NavHostController,
 fun ColumnScope.AddTextAccount(text: String, size: TextUnit, color: Color) {
     Text(
         text = text,
-        style = TextStyle(
-            fontSize = size,
-            color = color,
-            textAlign = TextAlign.Center,
-            fontStyle = FontStyle.Normal,
-            fontWeight = FontWeight.Medium,
-        ),
+        color = color,
+        style = MaterialTheme.typography.headlineLarge
     )
 }
 
@@ -288,12 +283,8 @@ fun ColumnScope.AddRowAccount(title: String, subTitle: String) {
             color = Color.Transparent
         ) {
             Text(text = title,
-                style = TextStyle(
-                    color = MaterialTheme.colorScheme.primary,
-                    fontSize = 14.sp,
-                    fontStyle = FontStyle.Normal,
-                    fontWeight = FontWeight.Medium
-                ),
+                color = MaterialTheme.colorScheme.primary,
+                style = MaterialTheme.typography.bodyLarge,
                 maxLines = 1,
                 modifier = Modifier
                     .padding(start = 10.dp, end = 0.dp)
@@ -310,13 +301,8 @@ fun ColumnScope.AddRowAccount(title: String, subTitle: String) {
 
         ) {
             Text(text = subTitle,
-                style = TextStyle(
-                    color = MaterialTheme.colorScheme.primary,
-                    fontSize = 14.sp,
-                    fontStyle = FontStyle.Normal,
-                    fontWeight = FontWeight.Medium,
-                    textAlign = TextAlign.Right,
-                ),
+                color = MaterialTheme.colorScheme.primary,
+                style = MaterialTheme.typography.bodySmall,
                 maxLines = 1,
                 modifier = Modifier
                     .padding(start = 0.dp, end = 0.dp)
@@ -369,12 +355,8 @@ fun ColumnScope.AddRowAccountIcon(
             color = Color.Transparent
         ) {
             Text(text = text,
-                style = TextStyle(
-                    color = MaterialTheme.colorScheme.primary,
-                    fontSize = 16.sp,
-                    fontStyle = FontStyle.Normal,
-                    fontWeight = FontWeight.Medium
-                ),
+                color = MaterialTheme.colorScheme.primary,
+                style = MaterialTheme.typography.titleSmall,
                 maxLines = 2,
                 modifier = Modifier
                     .padding(start = 20.dp, end = 0.dp)
@@ -434,21 +416,13 @@ fun BoxScope.LogoutDialog(
             Log.d("islogoutClicked", "AlertDialog")
 
             Text(text = title,
-                style = TextStyle(
-                    fontSize = 18.sp,
-                    textAlign = TextAlign.Center,
-                    fontWeight = FontWeight.Medium,
-                    color = MaterialTheme.colorScheme.primary
-                ),
+                color = MaterialTheme.colorScheme.primary,
+                style = MaterialTheme.typography.bodyMedium,
                 modifier = Modifier.padding(top = 45.dp)
             )
             Text(text = desc,
-                style = TextStyle(
-                    fontSize = 18.sp,
-                    textAlign = TextAlign.Center,
-                    color = MaterialTheme.colorScheme.primary,
-                    lineHeight = 30.sp
-                ),
+                color = MaterialTheme.colorScheme.primary,
+                style = MaterialTheme.typography.labelSmall,
                 maxLines = 2,
                 modifier = Modifier.padding(top = 26.dp)
             )
@@ -481,7 +455,8 @@ fun BoxScope.LogoutDialog(
                     ),
                 )
                 {
-                    Text(text = "No", fontSize = 20.sp)
+                    Text(text = "No",
+                        style = MaterialTheme.typography.labelLarge)
                     Log.d("test_button", "RowScope")
                 }
 
@@ -521,7 +496,8 @@ fun BoxScope.LogoutDialog(
 //                                    colorResource(id = R.color.gray_icon))
                 )
                 {
-                    Text(text = "Yes", fontSize = 20.sp)
+                    Text(text = "Yes",
+                        style = MaterialTheme.typography.labelLarge)
                     Log.d("test_button", "RowScope")
 
 //                    val logoutResponse = accountViewModel.liveDataLogout.observeAsState().value

app/src/main/java/com/vpn/fastestvpnservice/screens/bottomNavBarScreens/HelpScreen.kt

@@ -158,12 +158,8 @@ fun ColumnScope.AddRow(
             color = Color.Transparent
         ) {
             Text(text = text,
-                style = TextStyle(
-                    color = MaterialTheme.colorScheme.primary,
-                    fontSize = 16.sp,
-                    fontStyle = FontStyle.Normal,
-                    fontWeight = FontWeight.Medium
-                ),
+                color = MaterialTheme.colorScheme.primary,
+                style = MaterialTheme.typography.titleSmall,
                 maxLines = 2,
                 modifier = Modifier
                     .padding(start = 20.dp, end = 0.dp)
@@ -201,13 +197,8 @@ fun ColumnScope.AddRow(
 fun ColumnScope.AddTextHelp(text: String, size: TextUnit, color: Color) {
     Text(
         text = text,
-        style = TextStyle(
-            fontSize = size,
-            color = color,
-            textAlign = TextAlign.Center,
-            fontStyle = FontStyle.Normal,
-            fontWeight = FontWeight.Medium,
-        ),
+        color = color,
+        style = MaterialTheme.typography.headlineLarge,
     )
 }
 

app/src/main/java/com/vpn/fastestvpnservice/screens/bottomNavBarScreens/SettingsScreen.kt

@@ -131,7 +131,8 @@ fun Settings(navHostController: NavHostController) {
             AddTextSettings(
                 text = "Settings",
                 size = 28.sp,
-                color = MaterialTheme.colorScheme.primary
+                color = MaterialTheme.colorScheme.primary,
+                style = MaterialTheme.typography.headlineLarge
             )
             AddRowSettingsColumn(
                 icon = R.drawable.vpn_protocols3x,
@@ -142,6 +143,11 @@ fun Settings(navHostController: NavHostController) {
 //                icon = R.drawable.autoconnect3x,
 //                text = "Auto Connect"
 //            )
+            AddRowSettings(
+                icon = R.drawable.autoconnect3x,
+                text = "Auto Connect",
+                onClick = {}
+            )
             AddRowSettingsSmart(
                 icon = R.drawable.smart_connect3x,
                 text = "Smart Connect",
@@ -221,12 +227,8 @@ fun ColumnScope.AddRowSwitch(icon: Int, text: String) {
             color = Color.Transparent
         ) {
             Text(text = text,
-                style = TextStyle(
-                    color = MaterialTheme.colorScheme.primary,
-                    fontSize = 16.sp,
-                    fontStyle = FontStyle.Normal,
-                    fontWeight = FontWeight.Medium
-                ),
+                style = MaterialTheme.typography.titleSmall,
+                color = MaterialTheme.colorScheme.primary,
                 maxLines = 1,
                 modifier = Modifier
                     .padding(start = 20.dp, end = 0.dp)
@@ -304,12 +306,8 @@ fun ColumnScope.AddRowSettings(
             color = Color.Transparent
         ) {
             Text(text = text,
-                style = TextStyle(
-                    color = MaterialTheme.colorScheme.primary,
-                    fontSize = 16.sp,
-                    fontStyle = FontStyle.Normal,
-                    fontWeight = FontWeight.Medium
-                ),
+                style = MaterialTheme.typography.titleSmall,
+                color = MaterialTheme.colorScheme.primary,
                 maxLines = 1,
                 modifier = Modifier
                     .padding(start = 20.dp, end = 0.dp)
@@ -394,12 +392,8 @@ fun ColumnScope.AddRowSettingsColumn(
         ) {
             Column {
                 Text(text = text,
-                    style = TextStyle(
-                        color = MaterialTheme.colorScheme.primary,
-                        fontSize = 16.sp,
-                        fontStyle = FontStyle.Normal,
-                        fontWeight = FontWeight.Medium
-                    ),
+                    color = MaterialTheme.colorScheme.primary,
+                    style = MaterialTheme.typography.titleSmall,
                     maxLines = 1,
                     modifier = Modifier
                         .padding(start = 20.dp, end = 0.dp)
@@ -407,12 +401,8 @@ fun ColumnScope.AddRowSettingsColumn(
                 )
                 Spacer(modifier = Modifier.height(2.dp))
                 Text(text = selectedProtocol,
-                    style = TextStyle(
-                        color = MaterialTheme.colorScheme.primary,
-                        fontSize = 12.sp,
-                        fontStyle = FontStyle.Normal,
-                        fontWeight = FontWeight.Medium
-                    ),
+                    style = MaterialTheme.typography.headlineSmall,
+                    color = MaterialTheme.colorScheme.primary,
                     maxLines = 1,
                     modifier = Modifier
                         .padding(start = 20.dp, end = 0.dp)
@@ -464,7 +454,8 @@ fun ColumnScope.AddRowSettingsColumn(
                             size = 18.sp,
                             color = MaterialTheme.colorScheme.primary,
                             bottomPadding = 15.dp,
-                            startPadding = 16.dp
+                            startPadding = 16.dp,
+                            style = MaterialTheme.typography.titleMedium
                         )
                         protocols.forEach { protocol ->
                             Row(
@@ -497,11 +488,9 @@ fun ColumnScope.AddRowSettingsColumn(
                                     )
                                 Text(text = protocol,
                                     modifier = Modifier.padding(start = 12.dp),
-                                    style = TextStyle(
-                                        fontSize = 14.sp,
-                                        color = MaterialTheme.colorScheme.primary
-                                    )
-                                    )
+                                    color = MaterialTheme.colorScheme.primary,
+                                    style = MaterialTheme.typography.bodySmall
+                                )
                             }
                         }
                     }
@@ -560,12 +549,8 @@ fun AddRowDarkLightTheme(
             color = Color.Transparent
         ) {
             Text(text = text,
-                style = TextStyle(
-                    color = MaterialTheme.colorScheme.primary,
-                    fontSize = 16.sp,
-                    fontStyle = FontStyle.Normal,
-                    fontWeight = FontWeight.Medium
-                ),
+                style = MaterialTheme.typography.titleMedium,
+                color = MaterialTheme.colorScheme.primary,
                 maxLines = 1,
                 modifier = Modifier
                     .padding(start = 20.dp, end = 0.dp)
@@ -621,7 +606,8 @@ fun AddRowDarkLightTheme(
                         size = 18.sp,
                         color = MaterialTheme.colorScheme.primary,
                         bottomPadding = 20.dp,
-                        startPadding = 16.dp
+                        startPadding = 16.dp,
+                        style = MaterialTheme.typography.titleSmall
                     )
                     themesList.forEach { theme ->
 
@@ -643,6 +629,7 @@ fun AddRowDarkLightTheme(
                                             Log.d("test_theme", "false: -> $systemTheme")
                                             isDarkTheme.value = selectedtheme.value == themesList[2]
                                         }
+                                        isThemeSheetOpen = false
                                     },
                                 )
 //                                    .indication(
@@ -670,7 +657,7 @@ fun AddRowDarkLightTheme(
                                         Log.d("test_theme", "false: -> $systemTheme")
                                         isDarkTheme.value = selectedtheme.value == themesList[2]
                                     }
-
+                                    isThemeSheetOpen = false
                                 },
                                 colors = RadioButtonDefaults.colors(
                                     selectedColor = colorResource(id = R.color.radio_button_blue),
@@ -678,10 +665,8 @@ fun AddRowDarkLightTheme(
                             )
                             Text(text = theme,
                                 modifier = Modifier.padding(start = 12.dp),
-                                style = TextStyle(
-                                    fontSize = 14.sp,
-                                    color = MaterialTheme.colorScheme.primary
-                                )
+                                style = MaterialTheme.typography.bodySmall,
+                                color = MaterialTheme.colorScheme.primary
                             )
                         }
                     }
@@ -743,12 +728,8 @@ fun ColumnScope.AddRowSettingsSmart(
                 color = Color.Transparent
             ) {
                 Text(text = text,
-                    style = TextStyle(
-                        color = MaterialTheme.colorScheme.primary,
-                        fontSize = 16.sp,
-                        fontStyle = FontStyle.Normal,
-                        fontWeight = FontWeight.Medium
-                    ),
+                    style = MaterialTheme.typography.titleSmall,
+                    color = MaterialTheme.colorScheme.primary,
                     maxLines = 1,
                     modifier = Modifier
                         .padding(start = 20.dp, end = 0.dp)
@@ -803,7 +784,8 @@ fun ColumnScope.AddRowSettingsSmart(
                         size = 18.sp,
                         color = MaterialTheme.colorScheme.primary,
                         bottomPadding = 20.dp,
-                        startPadding = 16.dp
+                        startPadding = 16.dp,
+                        style = MaterialTheme.typography.titleMedium
                     )
                     smartConnect.forEach { smart ->
                         Row(
@@ -836,10 +818,8 @@ fun ColumnScope.AddRowSettingsSmart(
                             )
                             Text(text = smart,
                                 modifier = Modifier.padding(start = 12.dp),
-                                style = TextStyle(
-                                    fontSize = 14.sp,
-                                    color = MaterialTheme.colorScheme.primary
-                                )
+                                color = MaterialTheme.colorScheme.primary,
+                                style = MaterialTheme.typography.bodySmall
                             )
                         }
                     }
@@ -855,17 +835,13 @@ fun ColumnScope.AddTextSettings(
     size: TextUnit,
     color: Color,
     bottomPadding: Dp = 0.dp,
-    startPadding: Dp = 0.dp
+    startPadding: Dp = 0.dp,
+    style: TextStyle
 ) {
     Text(
         text = text,
-        style = TextStyle(
-            fontSize = size,
-            color = color,
-            textAlign = TextAlign.Center,
-            fontStyle = FontStyle.Normal,
-            fontWeight = FontWeight.Medium,
-        ),
+        style = style,
+        color = color,
         modifier = Modifier.padding(bottom = bottomPadding, start = startPadding)
 
     )

app/src/main/java/com/vpn/fastestvpnservice/screens/helpScreensAll/AboutScreen.kt

@@ -175,12 +175,8 @@ fun BoxScope.ShowHeaderAbout(navHostController: NavHostController) {
         color = colorResource(id = R.color.transparent)
     ) {
         Text(text = "About Fastest VPN",
-            style = TextStyle(
-                fontSize = 18.sp,
-                color = colorResource(id = R.color.dark_blue_gray_text),
-                textAlign = TextAlign.Center,
-                fontWeight = FontWeight.Medium
-            ),
+            color = colorResource(id = R.color.dark_blue_gray_text),
+            style = MaterialTheme.typography.bodyMedium,
             modifier = Modifier.fillMaxHeight()
 
         )

app/src/main/java/com/vpn/fastestvpnservice/screens/helpScreensAll/CustomerSupportScreen.kt

@@ -20,6 +20,7 @@ import androidx.compose.material.IconButton
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -164,12 +165,8 @@ fun BoxScope.ShowHeaderCS(navHostController: NavHostController) {
         color = colorResource(id = R.color.transparent)
     ) {
         Text(text = "Customer Support",
-            style = TextStyle(
-                fontSize = 18.sp,
-                color = colorResource(id = R.color.dark_blue_gray_text),
-                textAlign = TextAlign.Center,
-                fontWeight = FontWeight.Medium
-            ),
+            color = colorResource(id = R.color.dark_blue_gray_text),
+            style = MaterialTheme.typography.bodyMedium,
             modifier = Modifier.fillMaxHeight()
 
         )

app/src/main/java/com/vpn/fastestvpnservice/screens/helpScreensAll/FAQScreen.kt

@@ -197,12 +197,8 @@ fun BoxScope.ShowExpandList(
         color = colorResource(id = R.color.transparent)
     ) {
         Text(text = "FAQ",
-            style = TextStyle(
-                fontSize = 18.sp,
-                color = colorResource(id = R.color.dark_blue_gray_text),
-                textAlign = TextAlign.Center,
-                fontWeight = FontWeight.Medium
-            ),
+            color = colorResource(id = R.color.dark_blue_gray_text),
+            style = MaterialTheme.typography.bodyMedium,
             modifier = Modifier.fillMaxHeight()
 
         )

app/src/main/java/com/vpn/fastestvpnservice/screens/helpScreensAll/PrivacyPolicyScreen.kt

@@ -168,12 +168,8 @@ fun BoxScope.ShowHeaderPP(navHostController: NavHostController) {
         color = colorResource(id = R.color.transparent)
     ) {
         Text(text = "Privacy Policy",
-            style = TextStyle(
-                fontSize = 18.sp,
-                color = colorResource(id = R.color.dark_blue_gray_text),
-                textAlign = TextAlign.Center,
-                fontWeight = FontWeight.Medium
-            ),
+            color = colorResource(id = R.color.dark_blue_gray_text),
+            style = MaterialTheme.typography.bodyMedium,
             modifier = Modifier.fillMaxHeight()
 
         )

app/src/main/java/com/vpn/fastestvpnservice/screens/helpScreensAll/TermsAndConditionsScreen.kt

@@ -180,12 +180,8 @@ fun BoxScope.ShowHeaderTnC(
         color = colorResource(id = R.color.transparent)
     ) {
         Text(text = "Terms and Conditions",
-            style = TextStyle(
-                fontSize = 18.sp,
-                color = colorResource(id = R.color.dark_blue_gray_text),
-                textAlign = TextAlign.Center,
-                fontWeight = FontWeight.Medium
-            ),
+            color = colorResource(id = R.color.dark_blue_gray_text),
+            style = MaterialTheme.typography.bodyMedium,
             modifier = Modifier.fillMaxHeight()
 
         )

app/src/main/java/com/vpn/fastestvpnservice/screens/settingsScreenAll/NotificationsScreen.kt

@@ -102,12 +102,8 @@ fun BoxScope.HeaderRowNS(navHostController: NavHostController) {
         color = colorResource(id = R.color.transparent)
     ) {
         Text(text = "Notifications",
-            style = TextStyle(
-                fontSize = 18.sp,
-                color = MaterialTheme.colorScheme.primary,
-                textAlign = TextAlign.Center,
-                fontWeight = FontWeight.Medium
-            ),
+            color = MaterialTheme.colorScheme.primary,
+            style = MaterialTheme.typography.bodyMedium,
             modifier = Modifier.fillMaxHeight()
 
         )

app/src/main/java/com/vpn/fastestvpnservice/screens/settingsScreenAll/SplitTunneling.kt

@@ -94,12 +94,8 @@ fun SplitTunneling(navHostController: NavHostController) {
                     .fillMaxWidth()
             ) {
                 Text(text = "While VPN is Connected",
-                    style = TextStyle(
-                        fontSize = 16.sp,
-                        lineHeight = 20.sp,
-                        fontWeight = FontWeight.Medium,
-                        color = MaterialTheme.colorScheme.primary
-                    ),
+                    style = MaterialTheme.typography.titleSmall,
+                    color = MaterialTheme.colorScheme.primary
                     )
 //                IconButton(onClick = {
 //                    isExpanded = !isExpanded
@@ -176,10 +172,8 @@ fun ColumnScope.ShowRadioButtons() {
                 Text(
                     text = list,
                     modifier = Modifier.padding(start = 12.dp),
-                    style = TextStyle(
-                        fontSize = 14.sp,
-                        color = MaterialTheme.colorScheme.primary
-                    )
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.primary
                 )
             }
         }
@@ -362,12 +356,8 @@ fun BoxScope.HeaderRowST(navHostController: NavHostController) {
         color = colorResource(id = R.color.transparent)
     ) {
         Text(text = "Split Tunneling",
-            style = TextStyle(
-                fontSize = 18.sp,
-                color = MaterialTheme.colorScheme.primary,
-                textAlign = TextAlign.Center,
-                fontWeight = FontWeight.Medium
-            ),
+            color = MaterialTheme.colorScheme.primary,
+            style = MaterialTheme.typography.bodyMedium,
             modifier = Modifier.fillMaxHeight()
 
         )

app/src/main/java/com/vpn/fastestvpnservice/ui/theme/Type.kt

@@ -234,4 +234,30 @@ val Typography.customTypography2: Typography
             fontSize = 12.sp,
             color = colorResource(id = R.color.dark_blue_gray_text)
         ),
+        labelMedium = TextStyle(
+            fontFamily = outfitFontFamily,
+            fontWeight = FontWeight.Normal,
+            fontSize = 14.sp,
+            textAlign = TextAlign.Right
+        ),
+        labelLarge = TextStyle(
+            fontFamily = outfitFontFamily,
+            fontWeight = FontWeight.SemiBold,
+            fontSize = 20.sp,
+            textAlign = TextAlign.Right
+        ),
+        bodySmall = TextStyle(
+            fontFamily = outfitFontFamily,
+            fontWeight = FontWeight.SemiBold,
+            fontSize = 20.sp,
+            textAlign = TextAlign.Center
+        ),
+        bodyMedium = TextStyle(
+            fontFamily = outfitFontFamily,
+            fontWeight = FontWeight.Normal,
+            fontSize = 14.sp,
+            lineHeight = 22.sp,
+            letterSpacing = 0.21.sp,
+            color = colorResource(id = R.color.dark_blue_gray_text)
+        )
     )

app/src/main/res/values/themes.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.FastestVPN" parent="android:Theme.Material.NoActionBar" >
+    <style name="Theme.FastestVPN" parent="android:Theme.Material.Light.NoActionBar" >
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowBackground">@color/light_blue</item>
     </style>