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

Jump to bottom

CATROID-1416 "Find/search" in Scripts should ignore trailing spaces #4535

Merged
merged 1 commit into from
May 18, 2022
Merged

CATROID-1416 "Find/search" in Scripts should ignore trailing spaces #4535

merged 1 commit into from
May 18, 2022

Conversation

devsebastian
Copy link
Contributor

@devsebastian devsebastian commented May 6, 2022 •
edited
Loading

  1. Ticket 1: https://jira.catrob.at/browse/CATROID-1416 -> cc19d76
  2. Ticket 2: https://jira.catrob.at/browse/CATROID-1415 -> 70f39df

Also:

  1. added support to start search on pressing the enter key on the soft keyboard
  2. Changed enter key icon to search instead of "next".
    -> 22308cb

Your checklist for this pull request

Please review the contributing guidelines and wiki pages of this repository.

  • Include the name of the Jira ticket in the PR’s title
  • Include a summary of the changes plus the relevant context
  • Choose the proper base branch (develop)
  • Confirm that the changes follow the project’s coding guidelines
  • Verify that the changes generate no compiler or linter warnings
  • Perform a self-review of the changes
  • Verify to commit no other files than the intentionally changed ones
  • Include reasonable and readable tests verifying the added or changed behavior
  • Confirm that new and existing unit tests pass locally
  • Check that the commits’ message style matches the project’s guideline
  • Stick to the project’s gitflow workflow
  • Verify that your changes do not have any conflicts with the base branch
  • After the PR, verify that all CI checks have passed
  • Post a message in the catroid-stage or catroid-ide Slack channel and ask for a code reviewer

@devsebastian devsebastian force-pushed the CATROID-1416 branch 2 times, most recently from a91a0fe to 5bf63cc Compare May 10, 2022 18:42
Walcho1125
Walcho1125 requested changes May 14, 2022
View reviewed changes
Copy link
Contributor

@Walcho1125 Walcho1125 left a comment

Choose a reason for hiding this comment

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

Looks good to me, however please make sure to update all File headers to "2010-2022" and that there is only one commit on the PR!

@devsebastian devsebastian force-pushed the CATROID-1416 branch 2 times, most recently from 63cd830 to 30df96f Compare May 17, 2022 05:35
Walcho1125
Walcho1125 requested changes May 17, 2022
View reviewed changes
catroid/src/androidTest/java/org/catrobat/catroid/test/stage/SearchParameterTest.java Outdated
@@ -1,6 +1,6 @@
/*
* Catroid: An on-device visual programming system for Android devices
* Copyright (C) 2010-2021 The Catrobat Team
* Copyright (C) 2010-2022sc The Catrobat Team
Copy link
Contributor

Choose a reason for hiding this comment

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

please remove the accidently added "sc"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oops sorry for the mixup. fixed it now

Walcho1125
Walcho1125 approved these changes May 18, 2022
View reviewed changes
Copy link
Contributor

@Walcho1125 Walcho1125 left a comment

Choose a reason for hiding this comment

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

Looks good!

@wslany wslany merged commit 7a35eb3 into Catrobat:develop May 18, 2022
@wslany
Copy link
Member

wslany commented May 18, 2022

Thanks!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Walcho1125 Walcho1125 Walcho1125 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@devsebastian @wslany @Walcho1125