Dark/Light Mode completed on Login screen TV

app/src/main/java/com/vpn/fastestvpnservice/MainActivity.kt

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

app/src/main/java/com/vpn/fastestvpnservice/screensTV/LoginScreenTV.kt

@@ -111,7 +111,7 @@ fun LoginTV(navHostController: NavHostController) {
                 modifier = Modifier
                     .fillMaxSize()
                     .paint(
-                        painter = painterResource(id = if (isDarkTheme.value) R.drawable.bg_app_light else R.drawable.bg_app_light),
+                        painter = painterResource(id = if (isDarkTheme.value) R.drawable.bg_app else R.drawable.bg_app_light),
                         contentScale = ContentScale.FillBounds
                     ))
             {
@@ -208,7 +208,7 @@ fun LoginTV(navHostController: NavHostController) {
                         colors = TextFieldDefaults.colors(
                             focusedLabelColor = Color.Blue,
                             unfocusedContainerColor = colorResource(id = R.color.transparent),
-                            focusedContainerColor = colorResource(id = R.color.lightNavy),
+                            focusedContainerColor = MaterialTheme.colorScheme.onSurface,
                             focusedIndicatorColor = colorResource(id = R.color.transparent),
                             disabledIndicatorColor = colorResource(id = R.color.transparent),
                             unfocusedIndicatorColor = colorResource(id = R.color.transparent),
@@ -274,7 +274,7 @@ fun LoginTV(navHostController: NavHostController) {
                         colors = TextFieldDefaults.colors(
                             focusedLabelColor = Color.Blue,
                             unfocusedContainerColor = colorResource(id = R.color.transparent),
-                            focusedContainerColor = colorResource(id = R.color.lightNavy),
+                            focusedContainerColor = MaterialTheme.colorScheme.onSurface,
 //                            focusedContainerColor = MaterialTheme.colorScheme.secondaryContainer,
                             focusedIndicatorColor = colorResource(id = R.color.transparent),
                             disabledIndicatorColor = colorResource(id = R.color.transparent),
@@ -388,10 +388,10 @@ fun ColumnScope.LoginButtonTV(
             ),
         colors = ButtonDefaults.colors(
             contentColor = if (isButtonFocused) colorResource(id = R.color.blue_text) else colorResource(id = R.color.white),
-            containerColor = if (isButtonFocused) colorResource(id = R.color.white) else colorResource(id = R.color.lightNavy),
-            pressedContainerColor = if (isButtonFocused) colorResource(id = R.color.white) else colorResource(id = R.color.lightNavy),
-            focusedContainerColor = if (isButtonFocused) colorResource(id = R.color.white) else colorResource(id = R.color.lightNavy),
-            disabledContainerColor = if (isButtonFocused) colorResource(id = R.color.white) else colorResource(id = R.color.lightNavy),
+            containerColor = if (isButtonFocused) colorResource(id = R.color.white) else MaterialTheme.colorScheme.onSurface,
+            pressedContainerColor = if (isButtonFocused) colorResource(id = R.color.white) else MaterialTheme.colorScheme.onSurface,
+            focusedContainerColor = if (isButtonFocused) colorResource(id = R.color.white) else MaterialTheme.colorScheme.onSurface,
+            disabledContainerColor = if (isButtonFocused) colorResource(id = R.color.white) else MaterialTheme.colorScheme.onSurface,
         ),
 //        border = ButtonDefaults.border(
 //            border = Border(
@@ -409,7 +409,7 @@ fun ColumnScope.LoginButtonTV(
                 .background(MaterialTheme.colorScheme.onSecondaryContainer),
             colors = SurfaceDefaults.colors(
                 contentColor = if (isButtonFocused) colorResource(id = R.color.blue_text) else colorResource(id = R.color.white),
-                containerColor = if (isButtonFocused) colorResource(id = R.color.white) else colorResource(id = R.color.lightNavy),
+                containerColor = if (isButtonFocused) colorResource(id = R.color.white) else MaterialTheme.colorScheme.onSurface,
             )
         ) {
             Text(

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

@@ -45,6 +45,8 @@ private val DarkColorScheme = darkColorScheme(
     surfaceContainerHighest = Color(0xFF2d2d2d),
     surfaceContainerLowest = Color(0xFF113289),
 
+    onSurface = Color(0xFF738CD2),
+
     background = Color(0xFF121212),
     onBackground = Color(0xFF2d2d2d) // background for dark theme
 )
@@ -76,6 +78,7 @@ private val LightColorScheme = lightColorScheme(
     surfaceTint = Color(0xFFa61c3c), // maroon_text
     surfaceContainerHighest = Color(0xFFbfbfbb),
     surfaceContainerLowest = Color(0xFF17AA5D),
+    onSurface = Color(0xFF113289), // light_navy
 
     background = Color(0xFFf3f3f3),
     onBackground = Color.White