Selaa lähdekoodia

darktheme UI completed on serverlist screen...

Khubaib 1 vuosi sitten
vanhempi
commit
40bd226fd1

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

@@ -362,7 +362,7 @@ fun ServerSearchItem(
     server: Server,
     navHostController: NavHostController,
     bgColor: Color = Color.White,
-    textColor: Color = colorResource(id = R.color.dark_blue_gray_text),
+    textColor: Color = MaterialTheme.colorScheme.primary,
     isServerCallbackShown: Boolean = true,
     onServerDisable: () -> Unit
 ) {
@@ -404,7 +404,7 @@ fun ServerSearchItem(
     Box(
         modifier = Modifier
             .fillMaxWidth()
-            .background(color = bgColor)
+            .background(color = MaterialTheme.colorScheme.onBackground)
             .padding(bottom = 1.dp)
     ) {
         Row(

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

@@ -71,7 +71,7 @@ fun SplitTunnelingItem(
                 color = MaterialTheme.colorScheme.background
             )
             .padding(bottom = 1.dp),
-        color = if (isSelected) colorResource(id = R.color.split_background)
+        color = if (isSelected) MaterialTheme.colorScheme.surfaceContainer
                 else MaterialTheme.colorScheme.background
 
     ) {
@@ -106,7 +106,7 @@ fun SplitTunnelingItem(
             )
             Text(text = "$app",
                 style = MaterialTheme.typography.bodySmall,
-                color = if (isSelected) colorResource(id = R.color.dark_blue_gray_text)
+                color = if (isSelected) MaterialTheme.colorScheme.primary
                 else MaterialTheme.colorScheme.primary,
                 modifier = Modifier
                     .padding(start = 12.dp, bottom = 18.dp)

+ 9 - 11
app/src/main/java/com/vpn/fastestvpnservice/screens/ServerListScreen.kt

@@ -124,7 +124,6 @@ fun ServerList(
             .background(
                 color = MaterialTheme.colorScheme.background
             )
-
     ) {
         HeaderRowSL(navHostController = navHostController)
         Column(
@@ -161,7 +160,7 @@ fun ServerList(
 
                 TabRow(
                     selectedTabIndex = selectedIndex,
-                    containerColor = Color.White,
+                    containerColor = MaterialTheme.colorScheme.onBackground,
                     modifier = Modifier
                         .fillMaxWidth()
                         .padding(top = 16.dp)
@@ -183,8 +182,8 @@ fun ServerList(
 
 //                        val color = remember { Animatable(Color.White) }
                         var colorTab by remember { mutableStateOf(Color.White) }
-                        colorTab = if (selectedIndex == index) Color(0xFFE9EDF9)
-                        else Color.White
+                        colorTab = if (selectedIndex == index) MaterialTheme.colorScheme.surfaceDim
+                        else MaterialTheme.colorScheme.onBackground
 
 //                        LaunchedEffect(key1 = selectedIndex == index) {
 //                            color.animateTo(
@@ -204,7 +203,8 @@ fun ServerList(
                             unselectedContentColor = Color.White,
                             text = { Text(text = currentTab,
                                 style = MaterialTheme.typography.headlineMedium,
-                                color = colorResource(id = R.color.dark_blue_gray_text),
+                                color = if (selectedIndex == index) MaterialTheme.colorScheme.primary
+                                else MaterialTheme.colorScheme.onTertiary,
                             ) },
                             modifier = Modifier
                                 .padding(
@@ -220,7 +220,6 @@ fun ServerList(
                     }
                 }
 
-
             HorizontalPager(
                 state = pagerState,
                 modifier = Modifier
@@ -847,14 +846,13 @@ fun ColumnScope.ShowSearchBar(
             Text(
                 text = "Search Location",
                 style = MaterialTheme.typography.displaySmall,
-                color = colorResource(id = R.color.dark_blue_gray_text)
+                color = MaterialTheme.colorScheme.primary
             )
         },
         leadingIcon = {
             Icon(
                 painter = painterResource(id = R.drawable.search3x),
                 contentDescription = "Search Icon",
-
                 modifier = Modifier
                     .size(21.dp)
             )
@@ -864,14 +862,14 @@ fun ColumnScope.ShowSearchBar(
                 Icon(
                     painter = painterResource(id = R.drawable.filter3x),
                     contentDescription = "Search Icon",
-                    tint = colorResource(id = R.color.dark_blue_gray_text),
+                    tint = MaterialTheme.colorScheme.primary,
                     modifier = Modifier
                         .size(24.dp)
                 )
             }
         },
         colors = SearchBarDefaults.colors(
-            containerColor = colorResource(id = R.color.white),
+            containerColor = MaterialTheme.colorScheme.onBackground,
             dividerColor = Color.Transparent,
             inputFieldColors = TextFieldDefaults.colors(
                 focusedTextColor = colorResource(id = R.color.dark_blue_gray_text),
@@ -904,7 +902,7 @@ fun ColumnScope.ShowSearchBar(
         ModalBottomSheet(
             onDismissRequest = { isFilter = false },
             sheetState = sheetState,
-            containerColor = MaterialTheme.colorScheme.background
+            containerColor = MaterialTheme.colorScheme.onBackground
         ) {
             Box(modifier = Modifier
                 .background(Color.Transparent)

+ 4 - 0
app/src/main/java/com/vpn/fastestvpnservice/ui/theme/Theme.kt

@@ -42,6 +42,8 @@ private val DarkColorScheme = darkColorScheme(
 
     surface = Color.White,
     surfaceBright = Color.White,
+    surfaceContainer = Color(0x36485e80),
+    surfaceDim = Color(0xFF113289),
 
     background = Color(0xFF121212),
     onBackground = Color(0xFF2d2d2d) // background for dark theme
@@ -66,6 +68,8 @@ private val LightColorScheme = lightColorScheme(
 
     surface = Color(0xFF4071fb), // light_blue_2
     surfaceBright = Color(0xFF36485e), // text_color_dark_gray
+    surfaceContainer = Color(0xFFE9EAEC),
+    surfaceDim = Color(0xFFE9EDF9),
 
     background = Color(0xFFf3f3f3),
     onBackground = Color.White

+ 1 - 0
app/src/main/res/values/colors.xml

@@ -36,6 +36,7 @@
     <color name="switch_gray">#bfbfbb</color>
     <color name="radio_button_blue">#4287f5</color>
     <color name="split_background">#E9EAEC</color>
+    <color name="split_background_dark">#36485e80</color>
     <color name="webview_background">#ECF2FC</color>
 
         <color name="app_color">#000028</color>