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.

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

Fix/misc/auth map extract strings #335

Merged
merged 5 commits into from
Dec 19, 2024

Conversation

taghizadlaura
Copy link
Contributor

@taghizadlaura taghizadlaura commented Dec 18, 2024

Sign In, Sign Up, and Map texts in strings.xml

Description

This PR introduces string resources for the Sign In, Sign Up, and Map screens to improve readability and maintainability across the app. It ensures the content of these screens is easily managed through the strings.xml file. This update closes issue #334 (and part of #328).

Changes

  • Added string resources for Sign In, Sign Up, and Map screens, including instructions, button text, toast messages, and other UI-related text.
  • Updated the respective screens (SignInScreen, SignUpScreen, MapScreen) to use the newly added string resources, ensuring consistency and ease of maintenance.

Files

Added

  • No files added.

Modified

  • SignInScreen.kt (updated to use string resources from strings.xml)
  • SignUpScreen.kt (updated to use string resources from strings.xml)
  • MapScreen.kt (updated to use string resources from strings.xml)
  • res/values/strings.xml (new strings added for Sign In, Sign Up, and Map)

Removed

  • No files removed.

Dependencies Added

  • No new dependencies added.

Testing

The Sign In, Sign Up, and Map screens have been updated to ensure the correct string resources are being used. Relevant tests have been adjusted to verify proper usage of the new resources.

- Add string resources for SignInScreen (instruction, button text, toast messages) to `strings.xml`.
- Refactor SignInScreen to use the newly added string resources.
- Update tests to verify usage of the correct string resources.
- Add string resources for SignUpScreen (instruction, button text, toast messages) to `strings.xml`.
- Refactor SignUpScreen to use the newly added string resources.
- Update tests to verify usage of the correct string resources.
- Add string resources for MapScreen (screen title, marker title, tile URLs, and tile names) to `strings.xml`.
- Refactor MapScreen to use the newly added string resources.
- Update tests to verify usage of the correct string resources.
@taghizadlaura taghizadlaura added the clean up Clean up of already written code label Dec 18, 2024
@taghizadlaura taghizadlaura self-assigned this Dec 18, 2024
@taghizadlaura taghizadlaura linked an issue Dec 18, 2024 that may be closed by this pull request
Copy link
Contributor

@lazarinibruno lazarinibruno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I verified that the text in the Sign In, Sign Up, and Map screens is correct. I noticed a small error:

image

There should be a space between both sentences.

Moreover, I think it is best if you wait until I merge #303 because it introduces lots of changes in the Map screen.

@francelu
Copy link
Contributor

Moreover, I think it is best if you wait until I merge #303 because it introduces lots of changes in the Map screen.

@lazarinibruno
I don't think it's a good idea, since we have to move on. In addition, I had requested changes which still have to be implemented / approved for which I won't have time before this evening.

Moreover, during this morning's meeting, we said that this task will include a lot of changes. Hence, we will have to merge carefully anyway (before or after your other merge).

Add a space in the correct string.xml text (sign_in_no_account_text and sign_up_already_account_text)
# Conflicts:
#	app/src/main/res/values/strings.xml
Copy link
Contributor

@coaguila coaguila left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@lazarinibruno lazarinibruno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@taghizadlaura taghizadlaura merged commit 3969efc into main Dec 19, 2024
3 checks passed
@taghizadlaura taghizadlaura deleted the fix/misc/auth-map-extract-strings branch December 19, 2024 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clean up Clean up of already written code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

SignIn/SignUp/Map texts in string.xml
4 participants