Browse Source

set color of snackbar for different scenarios on onBoarding screens

Khubaib 1 year ago
parent
commit
e499cfe3a0

+ 10 - 11
app/src/main/java/com/vpn/fastestvpnservice/screens/LoginScreen.kt

@@ -112,7 +112,7 @@ fun Login(navHostController: NavHostController) {
     val context = LocalContext.current
     val context = LocalContext.current
     val basePreferenceHelper = BasePreferenceHelper(context)
     val basePreferenceHelper = BasePreferenceHelper(context)
     val snackBarState = remember { SnackbarHostState() }
     val snackBarState = remember { SnackbarHostState() }
-    val coroutineScope = rememberCoroutineScope()
+    val snackBarStateRed = remember { SnackbarHostState() }
 
 
     Scaffold(
     Scaffold(
         content = { padding ->
         content = { padding ->
@@ -136,6 +136,8 @@ fun Login(navHostController: NavHostController) {
                     },
                     },
             ) {
             ) {
                 ShowCustomSnackBar(snackBarState, R.color.yellow_text, R.color.dark_blue_gray_text)
                 ShowCustomSnackBar(snackBarState, R.color.yellow_text, R.color.dark_blue_gray_text)
+                ShowCustomSnackBar(snackBarStateRed, R.color.Red, R.color.white)
+
                 if (loginViewModel.liveDataLoginStatus.value == true) {
                 if (loginViewModel.liveDataLoginStatus.value == true) {
                     var progress by remember { mutableFloatStateOf(0.1F) }
                     var progress by remember { mutableFloatStateOf(0.1F) }
 
 
@@ -159,11 +161,6 @@ fun Login(navHostController: NavHostController) {
                     )
                     )
                 }
                 }
 
 
-//                LaunchedEffect(key1 = Unit) {
-//                    Log.d("test_snackbar", "sb $showErrorEmail")
-//
-//                }
-
                 Image(
                 Image(
                     painter = painterResource(
                     painter = painterResource(
                         id = R.drawable.fastestapp_logo3x),
                         id = R.drawable.fastestapp_logo3x),
@@ -409,7 +406,8 @@ fun Login(navHostController: NavHostController) {
                             showErrorPass2 = it
                             showErrorPass2 = it
                         },
                         },
                         showErrorPass2,
                         showErrorPass2,
-                        snackBarState
+                        snackBarState,
+                        snackBarStateRed
                     )
                     )
                     Row (
                     Row (
                         modifier = Modifier
                         modifier = Modifier
@@ -491,7 +489,8 @@ fun ColumnScope.SignInButton(
     isErrorPass: Boolean,
     isErrorPass: Boolean,
     showErrorPass2: (Boolean) -> Unit,
     showErrorPass2: (Boolean) -> Unit,
     isErrorPass2: Boolean,
     isErrorPass2: Boolean,
-    snackBarState: SnackbarHostState
+    snackBarState: SnackbarHostState,
+    snackBarStateRed: SnackbarHostState
 ) {
 ) {
     val scaffoldState = rememberScaffoldState()
     val scaffoldState = rememberScaffoldState()
     val coroutineScope = rememberCoroutineScope()
     val coroutineScope = rememberCoroutineScope()
@@ -550,19 +549,19 @@ fun ColumnScope.SignInButton(
             if (!isErrors) {
             if (!isErrors) {
 //                            ShowErrorRow(errorText = "Email is Empty")
 //                            ShowErrorRow(errorText = "Email is Empty")
                 coroutineScope.launch {
                 coroutineScope.launch {
-                    snackBarState.showSnackbar("Email is Empty")
+                    snackBarStateRed.showSnackbar("Email is Empty")
                 }
                 }
             }
             }
             else if (!isError1) {
             else if (!isError1) {
 //                            ShowErrorRow(errorText = "Password is Empty")
 //                            ShowErrorRow(errorText = "Password is Empty")
                 coroutineScope.launch {
                 coroutineScope.launch {
-                    snackBarState.showSnackbar("Password is Empty")
+                    snackBarStateRed.showSnackbar("Password is Empty")
                 }
                 }
             }
             }
             else if (!isError2) {
             else if (!isError2) {
 //                            ShowErrorRow(errorText = "Should be 3 or more!")
 //                            ShowErrorRow(errorText = "Should be 3 or more!")
                 coroutineScope.launch {
                 coroutineScope.launch {
-                    snackBarState.showSnackbar("Password should be 3 or more!")
+                    snackBarStateRed.showSnackbar("Password should be 3 or more!")
                 }
                 }
             }
             }
 
 

+ 11 - 6
app/src/main/java/com/vpn/fastestvpnservice/screens/SignUpScreen.kt

@@ -110,6 +110,7 @@ fun SignUp(navHostController: NavHostController) {
     var showErrorPass1 by remember { mutableStateOf(false) }
     var showErrorPass1 by remember { mutableStateOf(false) }
     var showErrorPass2 by remember { mutableStateOf(false) }
     var showErrorPass2 by remember { mutableStateOf(false) }
     val snackBarState = remember { SnackbarHostState() }
     val snackBarState = remember { SnackbarHostState() }
+    val snackBarStateRed = remember { SnackbarHostState() }
 
 
     Scaffold(
     Scaffold(
         content = { padding ->
         content = { padding ->
@@ -131,6 +132,8 @@ fun SignUp(navHostController: NavHostController) {
                     ,
                     ,
             ) {
             ) {
                 ShowCustomSnackBar(snackBarState, R.color.yellow_text, R.color.dark_blue_gray_text)
                 ShowCustomSnackBar(snackBarState, R.color.yellow_text, R.color.dark_blue_gray_text)
+                ShowCustomSnackBar(snackBarStateRed, R.color.Red, R.color.white)
+
                 if (signUpViewModel.liveDataSignUpStatus.value == true) {
                 if (signUpViewModel.liveDataSignUpStatus.value == true) {
                     var progress by remember { mutableFloatStateOf(0.1F) }
                     var progress by remember { mutableFloatStateOf(0.1F) }
 
 
@@ -502,7 +505,8 @@ fun SignUp(navHostController: NavHostController) {
                                 showErrorEmail2 = it
                                 showErrorEmail2 = it
                             },
                             },
                             showErrorEmail2,
                             showErrorEmail2,
-                            snackBarState
+                            snackBarState,
+                            snackBarStateRed
                         )
                         )
 
 
                         Row(
                         Row(
@@ -594,7 +598,8 @@ fun ColumnScope.SignUpButton(
     isErrorPass2: Boolean,
     isErrorPass2: Boolean,
     showErrorEmail2: (Boolean) -> Unit,
     showErrorEmail2: (Boolean) -> Unit,
     isErrorEmail2: Boolean,
     isErrorEmail2: Boolean,
-    snackBarState: SnackbarHostState
+    snackBarState: SnackbarHostState,
+    snackBarStateRed: SnackbarHostState
 ) {
 ) {
     val loginViewModel: LoginViewModel = viewModel()
     val loginViewModel: LoginViewModel = viewModel()
     val context = LocalContext.current
     val context = LocalContext.current
@@ -652,25 +657,25 @@ fun ColumnScope.SignUpButton(
             if (!isErrors) {
             if (!isErrors) {
 //                            ShowErrorRow(errorText = "Email is Empty")
 //                            ShowErrorRow(errorText = "Email is Empty")
                 coroutineScope.launch {
                 coroutineScope.launch {
-                    snackBarState.showSnackbar("Email is Empty")
+                    snackBarStateRed.showSnackbar("Email is Empty")
                 }
                 }
             }
             }
             else if (!isErrors4) {
             else if (!isErrors4) {
 //                            ShowErrorRow(errorText = "Email format incorrect")
 //                            ShowErrorRow(errorText = "Email format incorrect")
                 coroutineScope.launch {
                 coroutineScope.launch {
-                    snackBarState.showSnackbar("Email format incorrect")
+                    snackBarStateRed.showSnackbar("Email format incorrect")
                 }
                 }
             }
             }
             else if (!isErrors2) {
             else if (!isErrors2) {
 //                            ShowErrorRow(errorText = "Password is Empty")
 //                            ShowErrorRow(errorText = "Password is Empty")
                 coroutineScope.launch {
                 coroutineScope.launch {
-                    snackBarState.showSnackbar("Password is Empty")
+                    snackBarStateRed.showSnackbar("Password is Empty")
                 }
                 }
             }
             }
             else if (!isError3) {
             else if (!isError3) {
 //                            ShowErrorRow(errorText = "Should be 3 or more!")
 //                            ShowErrorRow(errorText = "Should be 3 or more!")
                 coroutineScope.launch {
                 coroutineScope.launch {
-                    snackBarState.showSnackbar("Password should be 3 or more!")
+                    snackBarStateRed.showSnackbar("Password should be 3 or more!")
                 }
                 }
             }
             }