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

[android] Add content description for search toolbar & map zoom buttons #7884

Merged

Conversation

Arthur-GYT
Copy link
Contributor

All is in the title ^^.

@Arthur-GYT
Copy link
Contributor Author

I have a lot of trouble squashing commits...

@biodranik
Copy link
Member

git rebase -i master
# Remove line with regeneration commit
# Change `pick` word to `fixup` or just `f` for every commit in the list except the top one
# Save the file and exit the text editor.

@biodranik
Copy link
Member

And do not merge master branch to your PR, it complicates the rebase.

@Arthur-GYT Arthur-GYT force-pushed the content_description_search_toolbar branch from 6d5a60c to be68a63 Compare April 11, 2024 05:49
@Arthur-GYT
Copy link
Contributor Author

@biodranik It's done ^^.

@Arthur-GYT Arthur-GYT force-pushed the content_description_search_toolbar branch from be68a63 to e013458 Compare April 11, 2024 05:51
@biodranik
Copy link
Member

Looks like you squashed the regeneration commit into your change. It should be a separate commit. We do it to avoid merge conflicts and for easier rebasing (regeneration commit can always be easily removed, and then regenerated again by the script).

@Arthur-GYT Arthur-GYT force-pushed the content_description_search_toolbar branch from bbcb02d to 84ba05c Compare April 11, 2024 06:21
@Arthur-GYT
Copy link
Contributor Author

@biodranik I think it's done

@Arthur-GYT Arthur-GYT force-pushed the content_description_search_toolbar branch 2 times, most recently from a3dc1c9 to df5beea Compare April 12, 2024 14:37
@Arthur-GYT
Copy link
Contributor Author

@biodranik Done ^^

@Arthur-GYT Arthur-GYT force-pushed the content_description_search_toolbar branch from e4a0ddf to 3926483 Compare April 12, 2024 14:41
Copy link
Contributor

@matheusgomesms matheusgomesms left a comment

Choose a reason for hiding this comment

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

PT and PT-BR reviewed (I've already manually edited the locale strings, so no need to regenerate)

data/strings/strings.txt Outdated Show resolved Hide resolved
data/strings/strings.txt Outdated Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
android/app/src/main/res/values-pt-rBR/strings.xml Outdated Show resolved Hide resolved
android/app/src/main/res/values-pt/strings.xml Outdated Show resolved Hide resolved
@Arthur-GYT Arthur-GYT force-pushed the content_description_search_toolbar branch from e37d601 to bf44448 Compare April 15, 2024 16:15
@Arthur-GYT Arthur-GYT closed this Apr 15, 2024
@Arthur-GYT Arthur-GYT force-pushed the content_description_search_toolbar branch from bf44448 to da0babe Compare April 15, 2024 16:18
@Arthur-GYT Arthur-GYT reopened this Apr 15, 2024
@Arthur-GYT Arthur-GYT force-pushed the content_description_search_toolbar branch from a9499c2 to 783942b Compare April 15, 2024 16:32
@Arthur-GYT
Copy link
Contributor Author

@matheusgomesms It's done ^^.

@Jean-BaptisteC
Copy link
Member

Can you rebase your branch to fix conflicts?

@Arthur-GYT Arthur-GYT force-pushed the content_description_search_toolbar branch from 783942b to 369add3 Compare April 21, 2024 18:30
@Arthur-GYT
Copy link
Contributor Author

@Jean-BaptisteC The rebase is done ^^.

Signed-off-by: Arthur-GYT <a.gayot@posteo.com>
Signed-off-by: Arthur-GYT <a.gayot@posteo.com>
Signed-off-by: Arthur-GYT <a.gayot@posteo.com>
@Arthur-GYT Arthur-GYT force-pushed the content_description_search_toolbar branch from 369add3 to 578ea7f Compare April 21, 2024 18:49
@Jean-BaptisteC
Copy link
Member

@biodranik ready to merge

@Jean-BaptisteC Jean-BaptisteC changed the title [android] Add content description for search toolbar & map zoom buttons #7852 [android] Add content description for search toolbar & map zoom buttons Apr 22, 2024
Copy link
Member

@biodranik biodranik left a comment

Choose a reason for hiding this comment

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

Thank you, and sorry for the delay!

@biodranik biodranik merged commit c91add3 into organicmaps:master Apr 22, 2024
7 checks passed
@Arthur-GYT Arthur-GYT deleted the content_description_search_toolbar branch April 23, 2024 04:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants