Merge pull request #402 from bounswe/feature/mobile-364

#364 Update sign in and sign up pages
bounswe · Nov 24, 2023 · 784dd13 · 784dd13
2 parents a245301 + 4740242
commit 784dd13
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/resq/mobile/ResQ/app/src/main/java/com/cmpe451/resq/MainActivity.kt b/resq/mobile/ResQ/app/src/main/java/com/cmpe451/resq/MainActivity.kt
@@ -93,7 +93,6 @@ fun NavGraph(
         }
         composable(NavigationItem.Profile.route) {
             ProfileScreen(1, navController) // 1 for now
-
         }
         composable(NavigationItem.Notifications.route) {
             //NotificationsScreen(navController)

diff --git a/resq/mobile/ResQ/app/src/main/java/com/cmpe451/resq/ui/views/screens/LoginScreen.kt b/resq/mobile/ResQ/app/src/main/java/com/cmpe451/resq/ui/views/screens/LoginScreen.kt
@@ -164,7 +164,7 @@ fun LoginScreen(navController: NavController) {
             )
         ) {
             Text(
-                "Login",
+                "Sign in",
                 color = DeepBlue,
                 fontSize = 16.sp
             )
@@ -179,15 +179,15 @@ fun LoginScreen(navController: NavController) {
             modifier = Modifier.fillMaxWidth()
         ) {
             Text(
-                text = "Not Registered Yet? ",
+                text = "Don't have an account? ",
                 style = MaterialTheme.typography.bodySmall,
                 fontSize = 14.sp
                 )
             TextButton(onClick = {
                 navController.navigate(NavigationItem.Register.route)
             }) {
                 Text(
-                    text = "Create an account",
+                    text = "Sign Up",
                     style = MaterialTheme.typography.bodySmall,
                     color = DeepBlue,
                     fontWeight = FontWeight.Medium,
@@ -200,7 +200,7 @@ fun LoginScreen(navController: NavController) {
         if (viewModel.loginResponse.value != null) {
             LaunchedEffect(key1 = viewModel.loginResponse.value) {
                 snackbarHostState.showSnackbar(
-                    message = "Login success",
+                    message = "Sign in success",
                     duration = SnackbarDuration.Short
                 )
             }
@@ -209,7 +209,7 @@ fun LoginScreen(navController: NavController) {
         if (viewModel.errorMessage.value != null) {
             LaunchedEffect(key1 = viewModel.errorMessage.value) {
                 snackbarHostState.showSnackbar(
-                    message = "Login failed: ${viewModel.errorMessage.value}",
+                    message = "Sign in failed: ${viewModel.errorMessage.value}",
                     duration = SnackbarDuration.Short
                 )
             }

diff --git a/resq/mobile/ResQ/app/src/main/java/com/cmpe451/resq/ui/views/screens/RegistrationScreen.kt b/resq/mobile/ResQ/app/src/main/java/com/cmpe451/resq/ui/views/screens/RegistrationScreen.kt
@@ -199,7 +199,7 @@
                 )
             ) {
                 Text(
-                    text = "Create account",
+                    text = "Sign Up",
                     color = DeepBlue,
                     fontSize = 16.sp
                 )
@@ -223,7 +223,7 @@
                     navController.navigate("login")
                 }) {
                     Text(
-                        text = "Log in",
+                        text = "Sign in",
                         style = MaterialTheme.typography.bodySmall,
                         color = DeepBlue,
                         fontWeight = FontWeight.Medium,