Browse Source

Worked on Splash, Login screen on TV for dark/light mode

Khubaib 8 months ago
parent
commit
f450d12eda

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

@@ -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 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,
+            containerColor = if (isButtonFocused) colorResource(id = R.color.white) else MaterialTheme.colorScheme.onSurfaceVariant,
+            pressedContainerColor = if (isButtonFocused) colorResource(id = R.color.white) else MaterialTheme.colorScheme.onSurfaceVariant,
+            focusedContainerColor = if (isButtonFocused) colorResource(id = R.color.white) else MaterialTheme.colorScheme.onSurfaceVariant,
+            disabledContainerColor = if (isButtonFocused) colorResource(id = R.color.white) else MaterialTheme.colorScheme.onSurfaceVariant,
         ),
 //        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 MaterialTheme.colorScheme.onSurface,
+                containerColor = if (isButtonFocused) colorResource(id = R.color.white) else MaterialTheme.colorScheme.onSurfaceVariant,
             )
         ) {
             Text(

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

@@ -54,7 +54,7 @@ fun SplashTV(navHostController: NavHostController) {
 
     Box(modifier = Modifier
         .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
         )
         .fillMaxSize(),

+ 3 - 1
app/src/main/java/com/vpn/fastestvpnservice/ui/theme/Theme.kt

@@ -45,7 +45,8 @@ private val DarkColorScheme = darkColorScheme(
     surfaceContainerHighest = Color(0xFF2d2d2d),
     surfaceContainerLowest = Color(0xFF113289),
 
-    onSurface = Color(0xFF738CD2),
+    onSurface = Color(0xFF1D326B),
+    onSurfaceVariant = Color(0xFF0d1a2a),
 
     background = Color(0xFF121212),
     onBackground = Color(0xFF2d2d2d) // background for dark theme
@@ -79,6 +80,7 @@ private val LightColorScheme = lightColorScheme(
     surfaceContainerHighest = Color(0xFFbfbfbb),
     surfaceContainerLowest = Color(0xFF17AA5D),
     onSurface = Color(0xFF113289), // light_navy
+    onSurfaceVariant = Color(0xFF113289), // light_navy
 
     background = Color(0xFFf3f3f3),
     onBackground = Color.White