darktheme completed on all screens...

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

@@ -372,17 +372,17 @@ fun Home(navHostController: NavHostController, activity: ComponentActivity) {
             contentScale = ContentScale.FillBounds,
         )
 
-        if (!isDarkTheme.value) {
             Image(
                 modifier = Modifier
                     .fillMaxWidth()
                     .align(Alignment.TopStart)
-                    .padding(top = 50.dp),
+                    .padding(top = 50.dp)
+                    .alpha(if (isDarkTheme.value) 0.1F else 0.6F),
                 painter = painterResource(id = R.drawable.map_home3x),
                 contentDescription = "Home Map",
                 contentScale = ContentScale.FillWidth,
             )
-        }
+
 
         if (isServerDialog.value) {
             ShowServerDialog(
@@ -426,13 +426,15 @@ fun Home(navHostController: NavHostController, activity: ComponentActivity) {
         {
             if (isConnect == App.CONNECTED) {
                 Image(
-                    painter = painterResource(id = R.drawable.iv_connect),
+                    painter = if (isDarkTheme.value) painterResource(id = R.drawable.iv_connect_dark)
+                    else painterResource(id = R.drawable.iv_connect),
                     contentDescription = "Home Map",
                     contentScale = ContentScale.FillWidth,
                 )
             } else {
                 Image(
-                    painter = painterResource(id = R.drawable.iv_disconnect),
+                    painter = if (isDarkTheme.value) painterResource(id = R.drawable.iv_disconnect_dark)
+                    else painterResource(id = R.drawable.iv_disconnect),
                     contentDescription = "Home Map",
                     contentScale = ContentScale.FillWidth,
                 )
@@ -511,7 +513,7 @@ fun Home(navHostController: NavHostController, activity: ComponentActivity) {
                 AddText(
                     text = "Connected",
                     size = 18.sp,
-                    color = colorResource(id = R.color.light_blue_2),
+                    color = MaterialTheme.colorScheme.surfaceContainerHigh,
                     style = MaterialTheme.typography.customTypography.displaySmall
                 )
             }
@@ -519,7 +521,7 @@ fun Home(navHostController: NavHostController, activity: ComponentActivity) {
                 AddText(
                     text = "Disconnected",
                     size = 18.sp,
-                    color = colorResource(id = R.color.maroon_text),
+                    color = MaterialTheme.colorScheme.surfaceTint,
                     style = MaterialTheme.typography.customTypography.displaySmall
                 )
             }
@@ -527,7 +529,7 @@ fun Home(navHostController: NavHostController, activity: ComponentActivity) {
                 AddText(
                     text = "Connecting...",
                     size = 18.sp,
-                    color = colorResource(id = R.color.maroon_text),
+                    color = MaterialTheme.colorScheme.surfaceTint,
                     style = MaterialTheme.typography.customTypography.displaySmall
                 )
             }
@@ -545,114 +547,115 @@ fun Home(navHostController: NavHostController, activity: ComponentActivity) {
             ) {
                 /* Smart Connect Box*/
                 if (isConnect == App.CONNECTED) {
-                    Box(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(16.dp)
-                            .padding(top = 0.dp)
-                            .height(110.dp)
-//                    .border(
-//                        border = BorderStroke(0.dp, Color.Blue),
-//                        shape = RoundedCornerShape(28.dp)
-//                    )
-                            .background(
-                                color = Color.Transparent
-                            ),
-//            contentAlignment = Alignment.TopCenter,
-                    ) {
-                        Row(
-                            modifier = Modifier
-                                .padding(0.dp)
-                                .background(Color.Transparent),
-                            horizontalArrangement = Arrangement.SpaceAround,
-                            verticalAlignment = Alignment.CenterVertically
-                        ) {
-                            Surface(
-                                modifier = Modifier
-                                    .weight(1f)
-                                    .background(Color.Transparent)
-                                    .fillMaxHeight()
-                                    .padding(end = 5.dp),
-                                shape = RoundedCornerShape(24.dp)
-
-                            ) {
-                                Column(
-                                    modifier = Modifier
-                                        .background(Color.White),
-                                    verticalArrangement = Arrangement.SpaceEvenly,
-                                    horizontalAlignment = Alignment.CenterHorizontally
-                                ) {
-                                    Image(
-                                        painter = painterResource(id = R.drawable.greenarrow3x),
-                                        contentDescription = "Green Arrow",
-                                        modifier = Modifier
-                                            .size(30.dp)
-                                    )
-                                    Text(
-                                        text = "Download",
-                                        style = MaterialTheme.typography.customTypography.displayMedium,
-                                        modifier = Modifier.alpha(0.6F)
-                                    )
-                                    Row(
-                                        horizontalArrangement = Arrangement.SpaceAround,
-                                        verticalAlignment = Alignment.CenterVertically
-                                    ) {
-                                        Text(
-                                            text = "30.68",
-                                            style = MaterialTheme.typography.customTypography.displayLarge
-                                        )
-                                        Text(
-                                            text = "  MB/S",
-                                            style = MaterialTheme.typography.customTypography2.labelSmall,
-                                            modifier = Modifier.alpha(0.5F)
-                                        )
-                                    }
-                                }
-                            }
-                            Surface(
-                                modifier = Modifier
-                                    .weight(1f)
-                                    .background(Color.Transparent)
-                                    .fillMaxHeight()
-                                    .padding(start = 5.dp),
-                                shape = RoundedCornerShape(24.dp)
-                            ) {
-                                Column(
-                                    modifier = Modifier
-                                        .background(Color.White),
-                                    verticalArrangement = Arrangement.SpaceEvenly,
-                                    horizontalAlignment = Alignment.CenterHorizontally
-                                ) {
-                                    Image(
-                                        painter = painterResource(id = R.drawable.yellowarrow3x),
-                                        contentDescription = "Green Arrow",
-                                        modifier = Modifier
-                                            .size(30.dp)
-                                    )
-                                    Text(
-                                        text = "Upload",
-                                        style = MaterialTheme.typography.customTypography.displayMedium,
-                                        modifier = Modifier.alpha(0.6F)
-                                    )
-                                    Row(
-                                        horizontalArrangement = Arrangement.SpaceAround,
-                                        verticalAlignment = Alignment.CenterVertically
-                                    ) {
-                                        Text(
-                                            text = "12.11",
-                                            style = MaterialTheme.typography.customTypography.displayLarge
-
-                                        )
-                                        Text(
-                                            text = "  MB/S",
-                                            style = MaterialTheme.typography.customTypography2.labelSmall,
-                                            modifier = Modifier.alpha(0.5F)
-                                        )
-                                    }
-                                }
-                            }
-                        }
-                    }
+
+                    /* Commenting so far because It's remaining... */
+//                    Box(
+//                        modifier = Modifier
+//                            .fillMaxWidth()
+//                            .padding(16.dp)
+//                            .padding(top = 0.dp)
+//                            .height(110.dp)
+////                    .border(
+////                        border = BorderStroke(0.dp, Color.Blue),
+////                        shape = RoundedCornerShape(28.dp)
+////                    )
+//                            .background(
+//                                color = Color.Transparent
+//                            ),
+//                    ) {
+//                        Row(
+//                            modifier = Modifier
+//                                .padding(0.dp)
+//                                .background(Color.Transparent),
+//                            horizontalArrangement = Arrangement.SpaceAround,
+//                            verticalAlignment = Alignment.CenterVertically
+//                        ) {
+//                            Surface(
+//                                modifier = Modifier
+//                                    .weight(1f)
+//                                    .background(Color.Transparent)
+//                                    .fillMaxHeight()
+//                                    .padding(end = 5.dp),
+//                                shape = RoundedCornerShape(24.dp)
+//
+//                            ) {
+//                                Column(
+//                                    modifier = Modifier
+//                                        .background(Color.White),
+//                                    verticalArrangement = Arrangement.SpaceEvenly,
+//                                    horizontalAlignment = Alignment.CenterHorizontally
+//                                ) {
+//                                    Image(
+//                                        painter = painterResource(id = R.drawable.greenarrow3x),
+//                                        contentDescription = "Green Arrow",
+//                                        modifier = Modifier
+//                                            .size(30.dp)
+//                                    )
+//                                    Text(
+//                                        text = "Download",
+//                                        style = MaterialTheme.typography.customTypography.displayMedium,
+//                                        modifier = Modifier.alpha(0.6F)
+//                                    )
+//                                    Row(
+//                                        horizontalArrangement = Arrangement.SpaceAround,
+//                                        verticalAlignment = Alignment.CenterVertically
+//                                    ) {
+//                                        Text(
+//                                            text = "30.68",
+//                                            style = MaterialTheme.typography.customTypography.displayLarge
+//                                        )
+//                                        Text(
+//                                            text = "  MB/S",
+//                                            style = MaterialTheme.typography.customTypography2.labelSmall,
+//                                            modifier = Modifier.alpha(0.5F)
+//                                        )
+//                                    }
+//                                }
+//                            }
+//                            Surface(
+//                                modifier = Modifier
+//                                    .weight(1f)
+//                                    .background(Color.Transparent)
+//                                    .fillMaxHeight()
+//                                    .padding(start = 5.dp),
+//                                shape = RoundedCornerShape(24.dp)
+//                            ) {
+//                                Column(
+//                                    modifier = Modifier
+//                                        .background(Color.White),
+//                                    verticalArrangement = Arrangement.SpaceEvenly,
+//                                    horizontalAlignment = Alignment.CenterHorizontally
+//                                ) {
+//                                    Image(
+//                                        painter = painterResource(id = R.drawable.yellowarrow3x),
+//                                        contentDescription = "Green Arrow",
+//                                        modifier = Modifier
+//                                            .size(30.dp)
+//                                    )
+//                                    Text(
+//                                        text = "Upload",
+//                                        style = MaterialTheme.typography.customTypography.displayMedium,
+//                                        modifier = Modifier.alpha(0.6F)
+//                                    )
+//                                    Row(
+//                                        horizontalArrangement = Arrangement.SpaceAround,
+//                                        verticalAlignment = Alignment.CenterVertically
+//                                    ) {
+//                                        Text(
+//                                            text = "12.11",
+//                                            style = MaterialTheme.typography.customTypography.displayLarge
+//
+//                                        )
+//                                        Text(
+//                                            text = "  MB/S",
+//                                            style = MaterialTheme.typography.customTypography2.labelSmall,
+//                                            modifier = Modifier.alpha(0.5F)
+//                                        )
+//                                    }
+//                                }
+//                            }
+//                        }
+//                    }
                 }
                 else {
                     Box(
@@ -662,14 +665,13 @@ fun Home(navHostController: NavHostController, activity: ComponentActivity) {
                             .padding(top = 0.dp)
                             .height(120.dp)
                             .border(
-                                border = BorderStroke(2.dp, Color.White),
+                                border = BorderStroke(2.dp, MaterialTheme.colorScheme.onBackground),
                                 shape = RoundedCornerShape(28.dp)
                             )
                             .background(
                                 shape = RoundedCornerShape(28.dp),
-                                color = Color.White
+                                color = MaterialTheme.colorScheme.onBackground
                             ),
-//            contentAlignment = Alignment.TopCenter,
                     ) {
                         AddRowSmart(navHostController, basePreferenceHelper, context)
                         var smartServer = basePreferenceHelper.getSmartServerObject()
@@ -733,12 +735,12 @@ fun Home(navHostController: NavHostController, activity: ComponentActivity) {
                             .padding(bottom = 0.dp)
                             .height(70.dp)
                             .border(
-                                border = BorderStroke(2.dp, Color.White),
+                                border = BorderStroke(2.dp, MaterialTheme.colorScheme.onBackground),
                                 shape = RoundedCornerShape(28.dp)
                             )
                             .background(
                                 shape = RoundedCornerShape(28.dp),
-                                color = Color.White
+                                color = MaterialTheme.colorScheme.onBackground
                             ),
                         contentAlignment = Alignment.CenterStart,
                     ) {
@@ -1114,13 +1116,13 @@ fun BoxScope.AddRowSmart(
         ) {
             ColumnText(
                 text = selectedSmartList,
-                color = colorResource(id = R.color.blue_text),
+                color = MaterialTheme.colorScheme.surfaceContainerLow,
                 size = 12.sp,
                 style = MaterialTheme.typography.customTypography.headlineSmall
             )
             ColumnText(
                 text = "${selectedServer?.server_name}",
-                color = colorResource(id = R.color.dark_blue_gray_text),
+                color = MaterialTheme.colorScheme.primary,
                 size = 16.sp,
                 style = MaterialTheme.typography.labelMedium
             )
@@ -1132,7 +1134,9 @@ fun BoxScope.AddRowSmart(
         ) {
             ClickableText(
                 text = AnnotatedString("Change"),
-                style = MaterialTheme.typography.customTypography.headlineMedium,
+                style = MaterialTheme.typography.customTypography.headlineMedium.copy(
+                    MaterialTheme.colorScheme.surfaceContainerLow
+                ),
                 onClick = {
                     navHostController.navigate(
                         Screen.ServerList.route
@@ -1188,7 +1192,7 @@ fun BoxScope.AddRowSelectServer(navHostController: NavHostController) {
         ) {
             Text(text = "See All Locations",
                 style = MaterialTheme.typography.labelMedium,
-                color = colorResource(id = R.color.dark_blue_gray_text),
+                color = MaterialTheme.colorScheme.primary,
                 maxLines = 2,
                 modifier = Modifier
                     .padding(start = 12.dp, end = 0.dp)
@@ -1204,10 +1208,11 @@ fun BoxScope.AddRowSelectServer(navHostController: NavHostController) {
             Image(
                 painter = painterResource(id = R.drawable.frontarrow3x),
                 contentDescription = "Front_Arrow",
+                colorFilter = ColorFilter.tint(colorResource(id = R.color.gray_icon)),
                 modifier = Modifier
                     .padding(start = 0.dp, end = 5.dp)
                     .size(10.dp, 18.dp)
-                    .weight(1f)
+                    .weight(1f),
             )
         }
 
@@ -1248,12 +1253,14 @@ private fun getEnableProtocols(protocol_name: String, prefHelper: BasePreference
 
 @Composable
 fun pinkBackground(): Painter{
-    return painterResource(id = R.drawable.pinkbackground3x) 
+    return if (isDarkTheme.value) painterResource(id = R.drawable.darkpinkbackground)
+    else painterResource(id = R.drawable.pinkbackground3x)
 }
 
 @Composable
 fun blueBackground(): Painter{
-    return painterResource(id = R.drawable.bluebackground3x)
+    return if (isDarkTheme.value) painterResource(id = R.drawable.darkbluebackground)
+        else painterResource(id = R.drawable.bluebackground3x)
 }
 
 @Preview(showSystemUi = true, uiMode = Configuration.UI_MODE_NIGHT_NO)

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

@@ -282,10 +282,10 @@ fun ColumnScope.AddRowSwitch(icon: Int, text: String) {
                 modifier = Modifier.scale(0.8F),
                 colors = SwitchDefaults.colors(
                     checkedThumbColor = Color.White,
-                    checkedTrackColor = colorResource(id = R.color.switch_green),
-                    uncheckedThumbColor = Color.White,
-                    uncheckedTrackColor = colorResource(id = R.color.switch_gray),
-                    uncheckedBorderColor = colorResource(id = R.color.switch_gray)
+                    checkedTrackColor = MaterialTheme.colorScheme.surfaceContainerLowest,
+                    uncheckedThumbColor = MaterialTheme.colorScheme.onSecondaryContainer,
+                    uncheckedTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
+                    uncheckedBorderColor = MaterialTheme.colorScheme.surfaceContainerHighest
                 ),
                 thumbContent = {
 

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

@@ -44,6 +44,11 @@ private val DarkColorScheme = darkColorScheme(
     surfaceBright = Color.White,
     surfaceContainer = Color(0x36485e80),
     surfaceDim = Color(0xFF113289),
+    surfaceContainerLow = Color(0xFF858C93),
+    surfaceContainerHigh = Color(0xFFfec32b),
+    surfaceTint = Color.White,
+    surfaceContainerHighest = Color(0xFF2d2d2d),
+    surfaceContainerLowest = Color(0xFF113289),
 
     background = Color(0xFF121212),
     onBackground = Color(0xFF2d2d2d) // background for dark theme
@@ -70,6 +75,11 @@ private val LightColorScheme = lightColorScheme(
     surfaceBright = Color(0xFF36485e), // text_color_dark_gray
     surfaceContainer = Color(0xFFE9EAEC),
     surfaceDim = Color(0xFFE9EDF9),
+    surfaceContainerLow = Color(0xFF3B6AEE), // blue_text
+    surfaceContainerHigh = Color(0xFF4071fb), // light_blue_2
+    surfaceTint = Color(0xFFa61c3c), // maroon_text
+    surfaceContainerHighest = Color(0xFFbfbfbb),
+    surfaceContainerLowest = Color(0xFF17AA5D),
 
     background = Color(0xFFf3f3f3),
     onBackground = Color.White