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

PAINTROID-415 Keep zoom level and placement after applying the Transform tool #1087

Merged
merged 1 commit into from
Jun 2, 2022
Merged

PAINTROID-415 Keep zoom level and placement after applying the Transform tool #1087

merged 1 commit into from
Jun 2, 2022

Conversation

Electronix1337
Copy link
Contributor

@Electronix1337 Electronix1337 commented May 9, 2022 •
edited
Loading

Fixed bug where zoom level and placement were reset after clicking checkmark when using Transformtool. Now zoom level and placement stays the same when transforming via checkmark.

Also deleted and simplified some tests which are not needed anymore and added a test which checks desired behavior.

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

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

@AneiMakovec AneiMakovec self-assigned this May 10, 2022
AneiMakovec
AneiMakovec approved these changes May 10, 2022
View reviewed changes
Copy link
Contributor

@AneiMakovec AneiMakovec left a comment

Choose a reason for hiding this comment

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

ok

@AneiMakovec AneiMakovec removed their assignment May 10, 2022
wslany
wslany requested changes May 16, 2022
View reviewed 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.

Please also keep the placement of the selected area.
image
image

@Electronix1337 Electronix1337 force-pushed the PAINTROID-415_keep_zoom_level_and_placement_after_applying_transform_tool branch 6 times, most recently from b8192db to bac8ae3 Compare May 23, 2022 14:10
AneiMakovec
AneiMakovec approved these changes May 24, 2022
View reviewed changes
Copy link
Contributor

@AneiMakovec AneiMakovec left a comment

Choose a reason for hiding this comment

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

Works as expected. Placement of selected area is kept.

@Electronix1337
PAINTROID-415
cd14f24 
Fixed bug where zoom level and placement were reset after clicking checkmark when using Transformtool. Now zoom level and placement stays the same when transforming via checkmark.
@Electronix1337 Electronix1337 force-pushed the PAINTROID-415_keep_zoom_level_and_placement_after_applying_transform_tool branch from bac8ae3 to cd14f24 Compare June 2, 2022 08:56
@wslany wslany merged commit 9a0d8f7 into Catrobat:develop Jun 2, 2022
@wslany
Copy link
Member

wslany commented Jun 2, 2022

Thanks!!

goschale added a commit to goschale/Paintroid that referenced this pull request Jul 5, 2022
@goschale
Squashed commit of the following:
dc28273 
commit bf26e71
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Mon Jul 4 13:26:03 2022 +0200

    added test and removed unnecessary stuff

commit 7b621ff
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Mon Jul 4 13:15:59 2022 +0200

    path correction

commit 84be6c2
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Mon Jul 4 13:05:56 2022 +0200

    updated to debian:bullsyeve, latest ruby version and fastlane

commit 0f83cef
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Fri Jun 24 10:59:10 2022 +0200

    dockerfile changed to docker hub download

commit c317049
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Fri Jun 24 10:51:02 2022 +0200

    update jenkinsfile.releaseAPK

commit 56bba15
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Fri Jun 24 10:38:48 2022 +0200

    logcat test

commit 0fc9f4f
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Thu Jun 23 13:23:15 2022 +0200

    root dir

commit ab9fc7f
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Thu Jun 23 13:06:47 2022 +0200

    touch file

commit 280c329
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Thu Jun 23 12:51:44 2022 +0200

    changed path, again

commit 9405962
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Thu Jun 23 12:12:40 2022 +0200

    corrected path

commit 9d32622
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Thu Jun 23 12:06:46 2022 +0200

    txt not text

commit da3f69a
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Thu Jun 23 11:01:18 2022 +0200

    logcat path reduced

commit c29aed2
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Thu Jun 23 10:43:06 2022 +0200

    changed log to post action

commit 1c7b343
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Thu Jun 23 10:41:44 2022 +0200

    failing tests removed

commit 6af0b73
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Thu Jun 23 10:23:17 2022 +0200

    path correction Paintroid directory

commit 5dd7aa7
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Thu Jun 23 10:22:08 2022 +0200

    file creation and move changed

commit 205af86
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Thu Jun 23 10:18:18 2022 +0200

    Revert "removed UI tests for better building"

    This reverts commit 93c7493.

commit 4068ddc
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Thu Jun 23 10:17:29 2022 +0200

    Revert "Revert "remove failing tests for pipeline test""

    This reverts commit 31d759c.

commit 31d759c
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Thu Jun 23 10:16:25 2022 +0200

    Revert "remove failing tests for pipeline test"

    This reverts commit fc18989.

commit 93c7493
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Thu Jun 23 09:52:40 2022 +0200

    removed UI tests for better building

commit bc950ff
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Thu Jun 23 09:04:10 2022 +0200

    corrected path

commit 07cea6e
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Wed Jun 22 12:37:06 2022 +0200

    removed failing test and changes path of logcat

commit 92f9a06
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Wed Jun 22 11:48:24 2022 +0200

    added logcat output

commit fc18989
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Tue Jun 14 11:24:01 2022 +0200

    remove failing tests for pipeline test

commit 62af1df
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Mon Jun 13 22:07:00 2022 +0200

    deactivated failing tests and version var for docker

commit 0481d83
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Fri Jun 10 15:13:34 2022 +0200

    changes emulator call for background execution

commit 4d4d534
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Fri Jun 10 12:28:06 2022 +0200

    a point too much

commit 1f3dd47
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Fri Jun 10 12:20:10 2022 +0200

    error for mainactivity changed

commit e2fc817
Merge: 3380702 240adfb
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Fri Jun 10 12:06:16 2022 +0200

    Merge remote-tracking branch 'tobstream/PAINTROID-221_migrate_away_from_jcenter' into DEVOPS-686

commit 3380702
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Fri Jun 10 12:02:02 2022 +0200

    tobstream add

commit 5da9bb4
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Fri Jun 10 11:48:23 2022 +0200

    JenkinsFile Backslashed

commit fc18641
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Fri Jun 10 11:34:52 2022 +0200

    dockerfile update and Jenkinsfile skip gradle plugin

commit 240adfb
Author: Tobias Stangl <tobias.stangl@student.tugraz.at>
Date:   Wed May 25 11:16:57 2022 +0200

    PAINTROID-221 migrate away from JCenter

commit 5a2c023
Author: Julian Jautz <63667997+JulianJautz@users.noreply.github.com>
Date:   Mon Jun 6 15:27:08 2022 +0200

    PAINTROID-291: color changes cannot be un/redone (Catrobat#1044)

    * color changes weren't considered as commands and not added to CommandManager
    * implemented a ColorChangedCommand
    * ColorChangedCommand is added to CommandManager when color is selected in ColorPickerDialog
    * adapted undo/redo behaviour in line tool to work with ColorCommands
    * ColorChangedCommmand are not saved in catrobat file
    *access to UI have to be done in main thread -> crashes on Android Versions 6, 7 and 7.1

    Co-authored-by: Julian Raphael Jautz <julian.jautz@student.tugraz.at>

commit dae5e52
Author: Wolfgang Slany <1747888+wslany@users.noreply.github.com>
Date:   Fri Jun 3 01:35:30 2022 +0200

    Version name and version code update for v2.9.1

commit 52af881
Merge: 17d8c9d f840b66
Author: Wolfgang Slany <1747888+wslany@users.noreply.github.com>
Date:   Fri Jun 3 01:29:33 2022 +0200

    Merge pull request Catrobat#1105 from Catrobat/l10n_colorpicker_crowdin_action

    New Colorpicker Crowdin translations by Github Action

commit 17d8c9d
Merge: 5b86b2f 49f264f
Author: Wolfgang Slany <1747888+wslany@users.noreply.github.com>
Date:   Fri Jun 3 01:26:00 2022 +0200

    Merge pull request Catrobat#1102 from Catrobat/l10n_crowdin_action

    New Crowdin translations by Github Action

commit 5b86b2f
Author: SebastianGrief <sebastian.grief@student.tugraz.at>
Date:   Fri Jun 3 00:53:32 2022 +0200

    PAINTROID-427: Very high frequency crash hotfix (Catrobat#1111)

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

    * PAINTROID-427 Very high frequency crash hotfix

commit 9a0d8f7
Merge: 537bd84 cd14f24
Author: Wolfgang Slany <1747888+wslany@users.noreply.github.com>
Date:   Thu Jun 2 12:53:45 2022 +0200

    Merge pull request Catrobat#1087 from Electronix1337/PAINTROID-415_keep_zoom_level_and_placement_after_applying_transform_tool

    PAINTROID-415 Keep zoom level and placement after applying the Transform tool

commit cd14f24
Author: Michael Tiefnig <michael.tiefnig@student.tugraz.at>
Date:   Mon May 9 14:35:29 2022 +0200

    PAINTROID-415

    Fixed bug where zoom level and placement were reset after clicking checkmark when using Transformtool. Now zoom level and placement stays the same when transforming via checkmark.

commit 537bd84
Merge: b3a4287 4f32aa7
Author: Wolfgang Slany <1747888+wslany@users.noreply.github.com>
Date:   Thu Jun 2 10:23:22 2022 +0200

    Merge pull request Catrobat#1103 from ThorstenBandel/PAINTROID-423_Fix_paintroid_filenames

    PAINTROID-423 Fix paintroid filenames

commit f840b66
Author: Crowdin Bot <support+bot@crowdin.com>
Date:   Thu Jun 2 02:04:58 2022 +0000

    New Crowdin translations by Github Action

commit 49f264f
Author: Crowdin Bot <support+bot@crowdin.com>
Date:   Thu Jun 2 00:52:53 2022 +0000

    New Crowdin translations by Github Action

commit 4f32aa7
Author: Thorsten Bandel <thorsten.bandel@student.tugraz.at>
Date:   Mon May 23 15:18:17 2022 +0200

    PAINTROID-423 Fix paintroid filenames

commit b3a4287
Merge: 8abd3d6 268a175
Author: ThorstenB <37836636+ThorstenBandel@users.noreply.github.com>
Date:   Tue May 31 23:09:53 2022 +0200

    Merge pull request Catrobat#1109 from CodeChamp-SS/PAINTROID-426

    PAINTROID-426 fixed very high frequency crash in the Smudge Tool

commit 268a175
Author: Saarthak Seth <saarthakseth@gmail.com>
Date:   Wed Jun 1 00:10:12 2022 +0530

    PAINTROID-426 fixed crash in the Smudge Tool and removed the git status operator from all other places as well

commit 3275f52
Author: Alexander Gosch <a.gosch@student.tugraz.at>
Date:   Fri May 27 09:17:18 2022 +0200

    added android command lines tools to dockerfile

commit 934b89a
Author: Tobias Stangl <tobias.stangl@student.tugraz.at>
Date:   Wed May 25 11:16:57 2022 +0200

    PAINTROID-221 migrate away from JCenter

commit 8abd3d6
Merge: a733d52 a75a804
Author: Wolfgang Slany <1747888+wslany@users.noreply.github.com>
Date:   Sun May 22 10:35:04 2022 +0200

    Version name and version code update for v2.9.0

commit a75a804
Author: Wolfgang Slany <1747888+wslany@users.noreply.github.com>
Date:   Sun May 22 08:24:54 2022 +0200

    Version name and version code update for v2.9.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AneiMakovec AneiMakovec AneiMakovec approved these changes

@wslany wslany wslany 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
@Electronix1337 @wslany @AneiMakovec