applied dark them on OnBoarding Screens..

app/src/main/java/com/vpn/fastestvpnservice/helpers/BasePreferenceHelper.kt

@@ -38,7 +38,7 @@ class BasePreferenceHelper(private val context: Context) : PreferencesHelper() {
         removePreference(context, KEY_FILENAME, TV_SPLIT_CLASS)
         removePreference(context, KEY_FILENAME, KEY_ADBLOCK_SWITCH)
         removePreference(context, KEY_FILENAME, KEY_ISLOGGEDIN)
-        removePreference(context, KEY_FILENAME, THEME)
+//        removePreference(context, KEY_FILENAME, THEME)
         removePreference(context, KEY_FILENAME, KEY_ISCONNECT)
         removePreference(context, KEY_FILENAME, KEY_SPLIT_POS)
         removePreference(context, KEY_FILENAME, FILTER)
@@ -378,7 +378,7 @@ class BasePreferenceHelper(private val context: Context) : PreferencesHelper() {
 
     fun getTheme(): String {
         return try {
-            getStringPreference(context, KEY_FILENAME, THEME)
+            getStringPreference(context, KEY_FILENAME, THEME, themesList[0])
         } catch (ex: Exception) {
             themesList[0]
         }

app/src/main/java/com/vpn/fastestvpnservice/helpers/PreferencesHelper.java

@@ -18,12 +18,17 @@ public class PreferencesHelper {
     }
 
     protected String getStringPreference(Context context, String prefsName, String key) {
-
         SharedPreferences preferences = context.getSharedPreferences(prefsName, Activity.MODE_PRIVATE);
         String value = preferences.getString(key, "");
         return value;
     }
 
+    protected String getStringPreference(Context context, String prefsName, String key, String defValue) {
+        SharedPreferences preferences = context.getSharedPreferences(prefsName, Activity.MODE_PRIVATE);
+        String value = preferences.getString(key, defValue);
+        return value;
+    }
+
     protected void putBooleanPreference(Context context, String prefsName, String key, boolean value) {
 
         SharedPreferences preferences = context.getSharedPreferences(prefsName, Activity.MODE_PRIVATE);

app/src/main/java/com/vpn/fastestvpnservice/screens/ForgotPassword.kt

@@ -69,6 +69,7 @@ import androidx.compose.ui.unit.sp
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import com.vpn.fastestvpnservice.R
+import com.vpn.fastestvpnservice.beans.isDarkTheme
 import com.vpn.fastestvpnservice.sealedClass.Screen
 import com.vpn.fastestvpnservice.ui.theme.customTypography
 
@@ -81,7 +82,7 @@ fun ForgotPassword(navHostController: NavHostController) {
     Box(
         modifier = Modifier
             .paint(
-                painter = painterResource(id = R.drawable.bg_img3),
+                painter = painterResource(id = if (isDarkTheme.value) R.drawable.bg_app else R.drawable.bg_img3),
                 contentScale = ContentScale.FillBounds)
 //            .background(
 //                if (isSystemInDarkTheme()) Color.Black
@@ -237,8 +238,8 @@ fun ForgotPassword(navHostController: NavHostController) {
                 shape = RoundedCornerShape(15.dp),
 //            border = BorderStroke(25.dp, colorResource(id = R.color.black)),
                 colors = ButtonDefaults.buttonColors(
-                    contentColor = colorResource(id = R.color.light_blue),
-                    containerColor = colorResource(id = R.color.white),
+                    contentColor = MaterialTheme.colorScheme.primaryContainer,
+                    containerColor = MaterialTheme.colorScheme.onSecondaryContainer,
                 ),
             )
             {

app/src/main/java/com/vpn/fastestvpnservice/screens/LoginScreen.kt

@@ -113,6 +113,7 @@ import com.vpn.fastestvpnservice.beans.DataResponse
 import com.vpn.fastestvpnservice.beans.Server
 import com.vpn.fastestvpnservice.beans.UserResponse
 import com.vpn.fastestvpnservice.beans.filterList
+import com.vpn.fastestvpnservice.beans.isDarkTheme
 import com.vpn.fastestvpnservice.beans.themesList
 import com.vpn.fastestvpnservice.constants.smartConnect
 import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
@@ -153,7 +154,7 @@ fun Login(navHostController: NavHostController) {
                 modifier = Modifier
                     .fillMaxSize()
                     .paint(
-                        painter = painterResource(id = R.drawable.bg_img3),
+                        painter = painterResource(id = if (isDarkTheme.value) R.drawable.bg_app else R.drawable.bg_img3),
                         contentScale = ContentScale.FillBounds
                     )
                     .alpha(if (readOnly == true) 0.6F else 1F)
@@ -281,7 +282,7 @@ fun Login(navHostController: NavHostController) {
                         colorResource(id = R.color.red)
                     }
                     else {
-                        colorResource(id = R.color.grey_password_field)
+                        MaterialTheme.colorScheme.secondaryContainer
                     }
 
                     TextField(
@@ -328,8 +329,8 @@ fun Login(navHostController: NavHostController) {
                         maxLines = 1,
                         colors = TextFieldDefaults.colors(
                             focusedLabelColor = Color.Blue,
-                            unfocusedContainerColor = colorResource(id = R.color.grey_password_field),
-                            focusedContainerColor = colorResource(id = R.color.grey_password_field),
+                            unfocusedContainerColor = MaterialTheme.colorScheme.secondaryContainer,
+                            focusedContainerColor = MaterialTheme.colorScheme.secondaryContainer,
                             focusedIndicatorColor = colorResource(id = R.color.transparent),
                             disabledIndicatorColor = colorResource(id = R.color.transparent),
                             unfocusedIndicatorColor = colorResource(id = R.color.transparent),
@@ -609,8 +610,8 @@ fun BoxScope.SignInButton(
         shape = RoundedCornerShape(15.dp),
 //            border = BorderStroke(25.dp, colorResource(id = R.color.black)),
         colors = ButtonDefaults.buttonColors(
-            contentColor = colorResource(id = R.color.blue_text),
-            containerColor = colorResource(id = R.color.white),
+            contentColor = MaterialTheme.colorScheme.primaryContainer,
+            containerColor = MaterialTheme.colorScheme.onSecondaryContainer,
         ),
     )
     {
@@ -640,7 +641,7 @@ fun BoxScope.SignInButton(
                     prefHelper.saveAvailableProtocols(it.available_protocols)
                     prefHelper.saveXPlatformToken(it.userinfo?.email + "_" + System.currentTimeMillis())
                     prefHelper.saveAdBlockState(false)
-                    prefHelper.saveTheme(themesList[0])
+//                    prefHelper.saveTheme(themesList[0])
                     prefHelper.saveFilterList(filterList[0])
                     prefHelper.saveSmartList(smartConnect[0])
 

app/src/main/java/com/vpn/fastestvpnservice/screens/SignUpScreen.kt

@@ -91,6 +91,7 @@ import androidx.navigation.compose.rememberNavController
 import com.vpn.fastestvpnservice.R
 import com.vpn.fastestvpnservice.beans.Server
 import com.vpn.fastestvpnservice.beans.filterList
+import com.vpn.fastestvpnservice.beans.isDarkTheme
 import com.vpn.fastestvpnservice.beans.themesList
 import com.vpn.fastestvpnservice.constants.smartConnect
 import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
@@ -127,7 +128,7 @@ fun SignUp(navHostController: NavHostController) {
             Box(
                 modifier = Modifier
                     .paint(
-                        painter = painterResource(id = R.drawable.bg_img3),
+                        painter = painterResource(id = if (isDarkTheme.value) R.drawable.bg_app else R.drawable.bg_img3),
                         contentScale = ContentScale.FillBounds
                     )
                     .alpha(if (isSignUpEnabled!!) 0.6F else 1F)
@@ -286,7 +287,7 @@ fun SignUp(navHostController: NavHostController) {
                     val colorPass = if (showErrorPass1 || showErrorPass2) {
                         colorResource(id = R.color.red)
                     } else {
-                        colorResource(id = R.color.grey_password_field)
+                        MaterialTheme.colorScheme.secondaryContainer
                     }
 
                     TextField(
@@ -331,8 +332,8 @@ fun SignUp(navHostController: NavHostController) {
                         maxLines = 1,
                         colors = TextFieldDefaults.colors(
                             focusedLabelColor = Color.Blue,
-                            unfocusedContainerColor = colorResource(id = R.color.grey_password_field),
-                            focusedContainerColor = colorResource(id = R.color.grey_password_field),
+                            unfocusedContainerColor = MaterialTheme.colorScheme.secondaryContainer,
+                            focusedContainerColor = MaterialTheme.colorScheme.secondaryContainer,
                             focusedIndicatorColor = colorResource(id = R.color.transparent),
                             disabledIndicatorColor = colorResource(id = R.color.transparent),
                             unfocusedIndicatorColor = colorResource(id = R.color.transparent),
@@ -666,8 +667,8 @@ fun BoxScope.SignUpButton(
         shape = RoundedCornerShape(15.dp),
 //            border = BorderStroke(25.dp, colorResource(id = R.color.black)),
         colors = ButtonDefaults.buttonColors(
-            contentColor = colorResource(id = R.color.light_blue),
-            containerColor = colorResource(id = R.color.white),
+            contentColor = MaterialTheme.colorScheme.primaryContainer,
+            containerColor = MaterialTheme.colorScheme.onSecondaryContainer,
         ),
     )
     {
@@ -712,7 +713,7 @@ fun BoxScope.SignUpButton(
                     prefHelper.saveAvailableProtocols(it.available_protocols)
                     prefHelper.saveXPlatformToken(it.userinfo?.email + "_" + System.currentTimeMillis())
                     prefHelper.saveAdBlockState(false)
-                    prefHelper.saveTheme(themesList[0])
+//                    prefHelper.saveTheme(themesList[0])
                     prefHelper.saveFilterList(filterList[0])
                     prefHelper.saveSmartList(smartConnect[0])
 

app/src/main/java/com/vpn/fastestvpnservice/screens/SplashScreen.kt

@@ -50,6 +50,7 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import com.vpn.fastestvpnservice.R
 import com.vpn.fastestvpnservice.beans.Server
+import com.vpn.fastestvpnservice.beans.isDarkTheme
 import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
 import com.vpn.fastestvpnservice.sealedClass.Screen
 import com.vpn.fastestvpnservice.viewmodels.ServerListViewModel
@@ -67,7 +68,7 @@ fun Splash(navHostController: NavHostController) {
 
     Box(modifier = Modifier
         .paint(
-            painter = painterResource(id = R.drawable.bg_img3),
+            painter = painterResource(id = if (isDarkTheme.value) R.drawable.bg_app else R.drawable.bg_img3),
             contentScale = ContentScale.FillBounds
         )
 //        .background(if (isSystemInDarkTheme()) Color.Black

app/src/main/java/com/vpn/fastestvpnservice/screens/StartedScreen.kt

@@ -47,6 +47,7 @@ import androidx.compose.ui.unit.sp
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import com.vpn.fastestvpnservice.R
+import com.vpn.fastestvpnservice.beans.isDarkTheme
 import com.vpn.fastestvpnservice.sealedClass.Screen
 import com.vpn.fastestvpnservice.ui.theme.customTypography
 import com.vpn.fastestvpnservice.ui.theme.outfitFontFamily
@@ -61,7 +62,7 @@ fun Started(navHostController: NavHostController) {
         modifier = Modifier
             .fillMaxSize()
             .paint(
-                painter = painterResource(id = R.drawable.bg_img3),
+                painter = painterResource(id = if (isDarkTheme.value) R.drawable.bgapp_dark else R.drawable.bg_img3),
                 contentScale = ContentScale.FillBounds
             )
 //            .background(
@@ -141,8 +142,8 @@ fun Started(navHostController: NavHostController) {
 
                     shape = RoundedCornerShape(15.dp),
                     colors = ButtonDefaults.buttonColors(
-                        contentColor = colorResource(id = R.color.light_blue),
-                        containerColor = colorResource(id = R.color.white),
+                        contentColor = MaterialTheme.colorScheme.primaryContainer,
+                        containerColor = MaterialTheme.colorScheme.onSecondaryContainer,
                     ),
                 )
                 {

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

@@ -28,9 +28,13 @@ private val DarkColorScheme = darkColorScheme(
     primary = Color.White,
     onPrimary = Color.Black,
     onPrimaryContainer = Color.Black,
+    primaryContainer = Color.White,
 
     secondary = Color.White,
     onSecondary = Color.White,
+    onSecondaryContainer = Color(0xFF113289), // lightNavy
+    secondaryContainer = Color(0xFF1D326B),
+
     tertiary = Color.White,
     onTertiary = Color(0xFFc1c1bd),
 
@@ -43,9 +47,13 @@ private val LightColorScheme = lightColorScheme(
     primary = Color(0xFF0d1a2a),    // darkBlueGrey
     onPrimary = Color.White,
     onPrimaryContainer = Color(0xFFECF2FC),
+    primaryContainer = Color(0xFF3B6AEE), // blue_text
 
     secondary = Color.Black,
     onSecondary = Color(0xFF0d1b2a),
+    onSecondaryContainer = Color.White,
+    secondaryContainer = Color(0xFF738CD2), // grey_password_field
+
     tertiary = Color(0xFF2952c3),
     onTertiary = Color(0xFF0d1a2a),
 

app/src/main/res/drawable/bg_app.xml

@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="375dp"
-    android:height="812dp"
+    android:width="200dp"
+    android:height="200dp"
     android:viewportWidth="375"
     android:viewportHeight="812">
   <path
@@ -13,8 +13,8 @@
           android:endY="812"
           android:endX="0"
           android:type="linear">
-        <item android:offset="0" android:color="#FF0D2571"/>
-        <item android:offset="1" android:color="#FF061237"/>
+        <item android:offset="0" android:color="#2952c3"/>
+        <item android:offset="1" android:color="#0b215c"/>
       </gradient>
     </aapt:attr>
   </path>

app/src/main/res/values/colors.xml

@@ -9,6 +9,7 @@
     <color name="white">#FFFFFFFF</color>
     <color name="red">#fb4040</color>
     <color name="light_blue">#3B6AEE</color>
+    <color name="lightNavy">#113289</color>
     <color name="light_blue_2">#4071fb</color>
     <color name="blue_text">#2952c3</color>
     <color name="dark_blue_icon">#294DB4</color>
@@ -16,8 +17,10 @@
     <color name="yellow">#FEC32D</color>
     <color name="appYellow">#fec32b</color>
     <color name="light_grey">#ACBDED</color>
+    <color name="goldenYellow">#fec32b</color>
     <color name="transparent">#00000000</color>
     <color name="grey_password_field">#738CD2</color>
+    <color name="password_field_dark">#1D326B</color>
     <color name="gray_icon">#858C93</color>
     <color name="yellow_text">#fec32b</color>
     <color name="background_color_gray2">#F7F7FA</color>