Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

belindas-closet-android_4_216_finishing-tasks-for-belindas #217

Merged
merged 7 commits into from
Nov 30, 2023
Merged

belindas-closet-android_4_216_finishing-tasks-for-belindas #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
09c2be8
Change “resupply” to “sign up” on Sign Up Page
Nov 29, 2023
61f50db
Change frog color to green on Sign In Page
Nov 29, 2023
a9b50cd
Remove product name textbox from Add Product Page
Nov 29, 2023
e89336c
Merge branch 'main' into chore-216-finishing-tasks-for-belindas-01
brinkbrink Nov 30, 2023
30b71e7
Merge branch 'main' into chore-216-finishing-tasks-for-belindas-01
brinkbrink Nov 30, 2023
77eae1a
Merge branch 'main' into chore-216-finishing-tasks-for-belindas-01
heosman Nov 30, 2023
9749d1b
Update AddProduct.kt
Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/src/main/java/com/example/belindas_closet/screen/AddProduct.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ fun AddProductPage(navController: NavHostController) {
horizontalAlignment = Alignment.CenterHorizontally
) {


// uncommented out, testing ci workflow on pr
item {
ProductInfoField(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/example/belindas_closet/screen/Login.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
}
Expand Down
Binary file added app/src/main/res/drawable/nsc_mascot_green_cropped.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down