Merge branch 'main' into feature-218-reset-password-page-01

SeattleColleges · Dec 2, 2023 · 4ccb519 · 4ccb519
2 parents c9703a2 + 100d999
commit 4ccb519
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/app/src/main/java/com/example/belindas_closet/screen/AddProduct.kt b/app/src/main/java/com/example/belindas_closet/screen/AddProduct.kt
@@ -92,27 +92,27 @@ fun AddProductPage(navController: NavHostController) {
         }
     }
     */
-
+    
     Scaffold(
         modifier = Modifier
             .fillMaxSize(),
         topBar = {
-            /* Back arrow that navigates back to login page */
-            TopAppBar(
-                title = { Text("Home") }, /* todo: change destination where arrow navigates to */
-                navigationIcon = {
-                    IconButton(
-                        onClick = {
-                            navController.navigate(Routes.Home.route) /* Navigate back to home page */
-                        }
-                    ) {
-                        Icon(imageVector = Icons.Default.ArrowBack, contentDescription = "Back")
-                    }
-                },
-                actions = {
-                    IconButton(
-                        onClick = {
-                            // Handle menu icon click
+      /* Back arrow that navigates back to login page */
+          TopAppBar(
+              title = { Text("Back") },
+              navigationIcon = {
+                  IconButton(
+                      onClick = {
+                          navController.popBackStack();
+                      }
+                  ) {
+                      Icon(imageVector = Icons.Default.ArrowBack, contentDescription = "Back")
+                  }
+              },
+                  actions = {
+                      IconButton(
+                          onClick = {
+                              // Handle menu icon click
                         }
                     ) {
                         Icon(imageVector = Icons.Default.Menu, contentDescription = "Menu")
@@ -129,7 +129,6 @@ fun AddProductPage(navController: NavHostController) {
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
 
-
             // uncommented out, testing ci workflow on pr
             item {
                 ProductInfoField(

diff --git a/app/src/main/java/com/example/belindas_closet/screen/Login.kt b/app/src/main/java/com/example/belindas_closet/screen/Login.kt
@@ -297,7 +297,7 @@ fun ErrorDisplay(text: String) {
 @Composable
 fun NSCMascot() {
     Image(
-        painter = painterResource(id = R.drawable.nsc_mascot_blue_cropped),
+        painter = painterResource(id = R.drawable.nsc_mascot_green_cropped),
         contentDescription = stringResource(id = R.string.login_nsc_mascot)
     )
 }

diff --git a/app/src/main/res/drawable/nsc_mascot_green_cropped.png b/app/src/main/res/drawable/nsc_mascot_green_cropped.png
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -12,7 +12,7 @@
     <string name="login_nsc_mascot">North Seattle College Mascot</string>
 
     <!--    Sign Up Screen Strings    -->
-    <string name="signup_title">Resupply</string>
+    <string name="signup_title">Sign Up</string>
     <string name="signup_logo_description">Logo</string>
     <string name="signup_first_name">First Name</string>
     <string name="signup_last_name">Last Name</string>