Browse Source

Worked on dark/light mode on Account, Favorite, Custom Bottom Bar screens on TV

Khubaib 8 months ago
parent
commit
91215c69c3

+ 1 - 1
app/src/main/java/com/vpn/fastestvpnservice/customItems/ServerItemTV.kt

@@ -456,7 +456,7 @@ fun FavoriteServerItemTV(
             )
 
             Text(text = server.server_name!!,
-                color = colorResource(id = R.color.dark_blue_gray_text),
+                color = MaterialTheme.colorScheme.primary,
                 style = MaterialTheme.typography.labelMedium,
                 modifier = Modifier
                     .padding(start = 16.dp, bottom = 18.dp)

+ 11 - 10
app/src/main/java/com/vpn/fastestvpnservice/navigation/CustomBottomBarTV.kt

@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.Surface
 import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -188,7 +189,7 @@ fun BottomBarNavTV(
     Box(
         modifier = Modifier
             .fillMaxWidth()
-            .background(colorResource(id = R.color.background_color_gray)),
+            .background(MaterialTheme.colorScheme.background),
         contentAlignment = Alignment.Center
     ) {
         val iconSize = 45.dp
@@ -197,13 +198,13 @@ fun BottomBarNavTV(
                 .height(55.dp)
                 .fillMaxWidth(fraction = 0.4f)
                 .padding(horizontal = 0.dp)
-                .background(colorResource(id = R.color.background_color_gray)),
+                .background(MaterialTheme.colorScheme.background),
             horizontalArrangement = Arrangement.SpaceBetween,
             verticalAlignment = Alignment.CenterVertically
         ) {
             Surface(
                 color = if (isFirstItemFocused.value) Color.LightGray
-                else colorResource(id = R.color.background_color_gray),
+                else MaterialTheme.colorScheme.background,
                 modifier = Modifier
                     .focusRequester(focusRequester1)
                     .onFocusChanged {
@@ -223,7 +224,7 @@ fun BottomBarNavTV(
                     }
             ) {
                 val color = if (selectedItemIndex.value == 0) colorResource(id = R.color.blue_text)
-                else colorResource(id = R.color.dark_blue_gray_text)
+                else MaterialTheme.colorScheme.primary
                 val alpha = if (selectedItemIndex.value == 0) 1f else 0.5f
                 Icon(
                     painter = painterResource(id = screens[0].icon),
@@ -236,7 +237,7 @@ fun BottomBarNavTV(
                 )
             }
             Surface(
-                color = if (isSecondItemFocused.value) Color.LightGray else colorResource(id = R.color.background_color_gray),
+                color = if (isSecondItemFocused.value) Color.LightGray else MaterialTheme.colorScheme.background,
                 modifier = Modifier
                     .focusRequester(focusRequester2)
                     .onFocusChanged {
@@ -256,7 +257,7 @@ fun BottomBarNavTV(
                     }
             ) {
                 val color = if (selectedItemIndex.value == 1) colorResource(id = R.color.blue_text)
-                else colorResource(id = R.color.dark_blue_gray_text)
+                else MaterialTheme.colorScheme.primary
                 val alpha = if (selectedItemIndex.value == 1) 1f else 0.5f
                 Icon(
                     painter = painterResource(id = screens[1].icon),
@@ -270,7 +271,7 @@ fun BottomBarNavTV(
             }
             Surface(
                 color = if (isThirdItemFocused.value) Color.LightGray else
-                    colorResource(id = R.color.background_color_gray),
+                    MaterialTheme.colorScheme.background,
                 modifier = Modifier
                     .focusRequester(focusRequester3)
                     .onFocusChanged {
@@ -290,7 +291,7 @@ fun BottomBarNavTV(
                     }
             ) {
                 val color = if (selectedItemIndex.value == 2) colorResource(id = R.color.blue_text)
-                else colorResource(id = R.color.dark_blue_gray_text)
+                else MaterialTheme.colorScheme.primary
                 val alpha = if (selectedItemIndex.value == 2) 1f else 0.5f
                 Icon(
                     painter = painterResource(id = screens[2].icon),
@@ -304,7 +305,7 @@ fun BottomBarNavTV(
             }
             Surface(
                 color = if (isFourthItemFocused.value) Color.LightGray else
-                    colorResource(id = R.color.background_color_gray),
+                    MaterialTheme.colorScheme.background,
                 modifier = Modifier
                     .focusRequester(focusRequester4)
                     .onFocusChanged {
@@ -323,7 +324,7 @@ fun BottomBarNavTV(
                     }
             ) {
                 val color = if (selectedItemIndex.value == 3) colorResource(id = R.color.blue_text)
-                else colorResource(id = R.color.dark_blue_gray_text)
+                else MaterialTheme.colorScheme.primary
                 val alpha = if (selectedItemIndex.value == 3) 1f else 0.5f
                 Icon(
                     painter = painterResource(id = screens[3].icon),

+ 5 - 5
app/src/main/java/com/vpn/fastestvpnservice/screensTV/AccountScreenTV.kt

@@ -478,7 +478,7 @@ fun ColumnScope.AddRowAccountIconTV(
             .fillMaxWidth()
             .padding(top = 5.dp)
             .background(
-                if (isRowFocused) colorResource(id = R.color.grey_password_field)
+                if (isRowFocused) MaterialTheme.colorScheme.secondaryContainer
                 else MaterialTheme.colorScheme.onBackground,
                 shape = RoundedCornerShape(4.dp)
             )
@@ -594,7 +594,7 @@ fun BoxScope.LogoutDialogTV(
     var isButtonFocused2 by remember { mutableStateOf(false) }
 
     Surface(
-        color = colorResource(id = R.color.white),
+        color = MaterialTheme.colorScheme.onBackground,
         modifier = Modifier
             .background(Color.Transparent)
             .fillMaxWidth()
@@ -605,17 +605,17 @@ fun BoxScope.LogoutDialogTV(
             verticalArrangement = Arrangement.Top,
             horizontalAlignment = Alignment.CenterHorizontally,
             modifier = Modifier
-                .background(Color.White)
+                .background(MaterialTheme.colorScheme.onBackground)
         ) {
             Log.d("islogoutClicked", "AlertDialog")
 
             Text(text = title,
-                color = colorResource(id = R.color.dark_blue_gray_text),
+                color = MaterialTheme.colorScheme.primary,
                 style = MaterialTheme.typography.bodyMedium,
                 modifier = Modifier.padding(top = 45.dp)
             )
             Text(text = desc,
-                color = colorResource(id = R.color.dark_blue_gray_text),
+                color = MaterialTheme.colorScheme.primary,
                 style = MaterialTheme.typography.labelSmall,
                 maxLines = 2,
                 modifier = Modifier.padding(top = 26.dp)

+ 1 - 1
app/src/main/java/com/vpn/fastestvpnservice/screensTV/HomeScreenTV.kt

@@ -368,7 +368,7 @@ fun HomeTV(
 
     Column(
         modifier = Modifier
-            .background(colorResource(id = R.color.background_color_gray))
+            .background(MaterialTheme.colorScheme.background)
             .fillMaxSize(),
     ) {
         if (isServerDialog.value) {

+ 2 - 2
app/src/main/java/com/vpn/fastestvpnservice/screensTV/accountScreensAll/FavoriteScreenTV.kt

@@ -53,7 +53,7 @@ fun FavoriteServersTV(navHostController: NavHostController) {
     Box(
         modifier = Modifier
             .fillMaxSize()
-            .background(colorResource(id = R.color.background_color_gray))
+            .background(MaterialTheme.colorScheme.background)
     )
     {
         HeaderRowFSTV(navHostController = navHostController)
@@ -136,7 +136,7 @@ fun BoxScope.HeaderRowFSTV(
         color = colorResource(id = R.color.transparent)
     ) {
         Text(text = "Favorite Servers",
-            color = colorResource(id = R.color.dark_blue_gray_text),
+            color = MaterialTheme.colorScheme.primary,
             style = MaterialTheme.typography.bodyMedium,
             modifier = Modifier.fillMaxHeight()