瀏覽代碼

Worked on dark/light mode on server list screen on TV

Khubaib 8 月之前
父節點
當前提交
e39ec27da7

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

@@ -116,7 +116,7 @@ open class MainActivity : DockActivity(), ConnectivityReceiver.ConnectivityRecei
 //                    finish()
 
                 // true false
-                isDarkTheme.value = false
+                isDarkTheme.value = true
                 FastestVPNTheme(isDarkTheme.value) {
 //                        window.statusBarColor = colorResource(id = R.color.blue_text).toArgb()
                     val navController = rememberNavController()

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

@@ -120,13 +120,15 @@ fun ServerItemTV(
                     .border(
                         border = BorderStroke(
                             0.dp,
-                            if (isItemFocused) Color.LightGray else Color.White
+                            if (isItemFocused) MaterialTheme.colorScheme.inverseOnSurface
+                            else MaterialTheme.colorScheme.onBackground
                         ),
                         shape = RoundedCornerShape(4.dp)
                     )
                     .background(
                         shape = RoundedCornerShape(4.dp),
-                        color = if (isItemFocused) Color.LightGray else Color.White
+                        color = if (isItemFocused) MaterialTheme.colorScheme.inverseOnSurface
+                        else MaterialTheme.colorScheme.onBackground
                     )
 //                    .background(if (isItemFocused) Color.LightGray else Color.White)
                     .onFocusChanged {
@@ -169,7 +171,7 @@ fun ServerItemTV(
                 )
                 Text(text = "${server.server_name}",
                     style = MaterialTheme.typography.labelMedium,
-                    color = colorResource(id = R.color.dark_blue_gray_text),
+                    color = MaterialTheme.colorScheme.primary,
                     modifier = Modifier
                         .padding(start = 10.dp, top = 10.dp, end = 10.dp)
                         .align(Alignment.CenterHorizontally)
@@ -177,11 +179,11 @@ fun ServerItemTV(
 //            Spacer(modifier = Modifier.weight(1F))
                 Text(text = "$serverPing ms",
                     style = MaterialTheme.typography.displayMedium,
-                    color = colorResource(id = R.color.dark_blue_gray_text),
+                    color = MaterialTheme.colorScheme.tertiary,
                     modifier = Modifier
                         .padding(end = 0.dp, top = 8.dp)
                         .align(Alignment.CenterHorizontally)
-                        .alpha(0.4f)
+                        .alpha(1f)
                 )
 //            Spacer(modifier = Modifier.weight(1F))
 
@@ -212,7 +214,7 @@ fun ServerItemTV(
                     .width(10.dp)
                     .alpha(1F)
                     ,
-                color = colorResource(id = R.color.background_color_gray)
+                color = MaterialTheme.colorScheme.background
             ) {}
         }
     }

+ 19 - 19
app/src/main/java/com/vpn/fastestvpnservice/screensTV/ServerListScreenTV.kt

@@ -62,7 +62,7 @@ fun ServerListTV(navHostController: NavHostController) {
         modifier = Modifier
             .fillMaxSize()
             .background(
-                color = colorResource(id = R.color.background_color_gray)
+                color = MaterialTheme.colorScheme.background
             )
             .padding(bottom = 0.dp)
 
@@ -75,7 +75,7 @@ fun ServerListTV(navHostController: NavHostController) {
                 textChanged = it
             },
             textStyle = MaterialTheme.typography.customTypography.bodyMedium.copy(
-                color = colorResource(id = R.color.dark_blue_gray_text)
+                color = MaterialTheme.colorScheme.primary
             ),
             modifier = Modifier
                 .padding(top = 60.dp, end = 0.dp)
@@ -85,7 +85,7 @@ fun ServerListTV(navHostController: NavHostController) {
                 .height(50.dp)
                 .border(
                     1.dp,
-                    colorResource(id = R.color.white),
+                    MaterialTheme.colorScheme.onBackground,
                     shape = RoundedCornerShape(24.dp)
                 )
                 .background(color = colorResource(id = R.color.transparent))
@@ -100,7 +100,7 @@ fun ServerListTV(navHostController: NavHostController) {
                 Text(
                     text = "Search Location",
                     style = MaterialTheme.typography.customTypography.titleSmall.copy(
-                        color = colorResource(id = R.color.dark_blue_gray_text),
+                        color = MaterialTheme.colorScheme.primary,
                         fontSize = 14.sp
                     )
                 )
@@ -118,23 +118,23 @@ fun ServerListTV(navHostController: NavHostController) {
                 Icon(
                     painter = painterResource(id = R.drawable.search3x),
                     contentDescription = "Email Logo",
-                    tint = colorResource(id = R.color.dark_blue_gray_text),
+                    tint = MaterialTheme.colorScheme.primary,
                     modifier = Modifier
                         .size(20.dp, 20.dp)
                 )
             },
             maxLines = 1,
             colors = TextFieldDefaults.colors(
-                focusedLabelColor = colorResource(id = R.color.dark_blue_gray_text),
-                unfocusedTextColor = colorResource(id = R.color.dark_blue_gray_text),
-                focusedTextColor = colorResource(id = R.color.dark_blue_gray_text),
-                disabledTextColor = colorResource(id = R.color.dark_blue_gray_text),
-                unfocusedContainerColor = colorResource(id = R.color.white),
-                focusedContainerColor = colorResource(id = R.color.white),
+                focusedLabelColor = MaterialTheme.colorScheme.primary,
+                unfocusedTextColor = MaterialTheme.colorScheme.primary,
+                focusedTextColor = MaterialTheme.colorScheme.primary,
+                disabledTextColor = MaterialTheme.colorScheme.primary,
+                unfocusedContainerColor = MaterialTheme.colorScheme.onBackground,
+                focusedContainerColor = MaterialTheme.colorScheme.onBackground,
                 focusedIndicatorColor = colorResource(id = R.color.transparent),
                 disabledIndicatorColor = colorResource(id = R.color.transparent),
                 unfocusedIndicatorColor = colorResource(id = R.color.transparent),
-                cursorColor = colorResource(id = R.color.dark_blue_gray_text),
+                cursorColor = MaterialTheme.colorScheme.primary,
             ),
             keyboardOptions = KeyboardOptions(
                 keyboardType = KeyboardType.Email,
@@ -163,7 +163,7 @@ fun ServerListTV(navHostController: NavHostController) {
                     Text(
                         text = "Top Locations",
                         style = MaterialTheme.typography.labelLarge,
-                        color = colorResource(id = R.color.dark_blue_gray_text),
+                        color = MaterialTheme.colorScheme.primary,
                         modifier = Modifier
                             .padding(top = 0.dp, start = 0.dp)
                             .focusable()
@@ -182,7 +182,7 @@ fun ServerListTV(navHostController: NavHostController) {
                     Text(
                         text = "Dedicated IP",
                         style = MaterialTheme.typography.labelLarge,
-                        color = colorResource(id = R.color.dark_blue_gray_text),
+                        color = MaterialTheme.colorScheme.primary,
                         modifier = Modifier
                             .padding(top = topPadding, start = 0.dp)
                     )
@@ -200,7 +200,7 @@ fun ServerListTV(navHostController: NavHostController) {
                     Text(
                         text = "Streaming",
                         style = MaterialTheme.typography.labelLarge,
-                        color = colorResource(id = R.color.dark_blue_gray_text),
+                        color = MaterialTheme.colorScheme.primary,
                         modifier = Modifier
                             .padding(top = topPadding, start = 0.dp)
                     )
@@ -218,7 +218,7 @@ fun ServerListTV(navHostController: NavHostController) {
                     Text(
                         text = "D-VPN",
                         style = MaterialTheme.typography.labelLarge,
-                        color = colorResource(id = R.color.dark_blue_gray_text),
+                        color = MaterialTheme.colorScheme.primary,
                         modifier = Modifier
                             .padding(top = topPadding, start = 0.dp)
                     )
@@ -236,7 +236,7 @@ fun ServerListTV(navHostController: NavHostController) {
                     Text(
                         text = "P2P",
                         style = MaterialTheme.typography.labelLarge,
-                        color = colorResource(id = R.color.dark_blue_gray_text),
+                        color = MaterialTheme.colorScheme.primary,
                         modifier = Modifier
                             .padding(top = topPadding, start = 0.dp)
                     )
@@ -379,8 +379,8 @@ fun BoxScope.HeaderRowSL(
     ) {
         Text(text = title,
             style = MaterialTheme.typography.bodyMedium,
-//            color = MaterialTheme.colorScheme.primary,
-            color = colorResource(id = R.color.dark_blue_gray_text),
+            color = MaterialTheme.colorScheme.primary,
+//            color = colorResource(id = R.color.dark_blue_gray_text),
             modifier = Modifier.fillMaxHeight()
         )
     }