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

PAINTROID-388 import images via overflow menu #1116

Conversation

Tscheppe
Copy link
Contributor

@Tscheppe Tscheppe commented Jun 8, 2022

Added Submenu in Load Image in the overflow menu to replace the image and to import a image to the current layer

https://jira.catrob.at/browse/PAINTROID-388

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 #paintroid Slack channel and ask for a code reviewer

@Tscheppe Tscheppe force-pushed the PAINTROID-388_import_images_via_overflow_menu branch 5 times, most recently from 73f2f10 to ae354a3 Compare June 8, 2022 16:45
Copy link
Contributor

@Electronix1337 Electronix1337 left a comment

Choose a reason for hiding this comment

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

I think you have to change some other tests too, as they are failing on Jenkins as well as locally. For instance the test testLoadWithoutChange() in OpenedFromPocketCodeNewImageTest.java file fails, but I tried adding
onView(withText(R.string.menu_replace_image)).perform(click());
after clicking on load image and then the tests passes. So please check locally which tests are failing and fix them.

@Tscheppe Tscheppe force-pushed the PAINTROID-388_import_images_via_overflow_menu branch 3 times, most recently from ef3c57d to 22d7bf1 Compare June 13, 2022 13:53
@Tscheppe Tscheppe force-pushed the PAINTROID-388_import_images_via_overflow_menu branch from 1ed4e93 to e340dd0 Compare June 22, 2022 15:25
Copy link
Contributor

@Electronix1337 Electronix1337 left a comment

Choose a reason for hiding this comment

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

LGTM, even though on my local machine most of the MenuFileActivityIntegrationTest fail, this should not happen due to these changes.

Copy link
Member

@wslany wslany left a comment

Choose a reason for hiding this comment

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

Thanks!

@wslany wslany merged commit 368c2b4 into Catrobat:develop Jul 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants