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
index 9bfa1b5e..3ca072da 100644
--- 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
index 1bcad58d..0f8eac15 100644
--- 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
new file mode 100644
index 00000000..9e5bae2d
Binary files /dev/null and b/app/src/main/res/drawable/nsc_mascot_green_cropped.png differ
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ce61d571..4adb4e13 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,7 +12,7 @@
North Seattle College Mascot
- Resupply
+ Sign Up
Logo
First Name
Last Name