-
Notifications
You must be signed in to change notification settings - Fork 300
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 396 - Multiline tool with movable intermediate points #1294
Open
Lenkomotive
wants to merge
70
commits into
Catrobat:develop
Choose a base branch
from
Lenkomotive:PAINTROID-396
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Lenkomotive
force-pushed
the
PAINTROID-396
branch
from
July 4, 2023 17:05
a0bfeac
to
0bc32bf
Compare
Lenkomotive
changed the title
Paintroid 396
Paintroid 396 - Multiline tool with movable intermediate points
Jul 4, 2023
Lenkomotive
force-pushed
the
PAINTROID-396
branch
from
July 9, 2023 12:44
005263c
to
25b9d50
Compare
Lenkomotive
force-pushed
the
PAINTROID-396
branch
2 times, most recently
from
July 27, 2023 20:21
a4c9d45
to
72fd340
Compare
make undo and redo work in new implementation
make undo and redo work in new implementation
refactor last commit
Fix bug were endpoint is not set correctly
still working on undo and colorchange
reworking last commit + implemented redo
some refactoring
Transfer tests from LineTool
check if saving ColorChangedCommand is needed
undo - colorChangedCommand
execute instead of add ColorChangedCommand
add basic implementation for vertex
make vertexshape circular
test DynamicLineTool properties
more testing + undo/redo with vertex
clearing some static analysis errors
fix redo bug and some more static analysis errors
static analysis errors
fix change last vertex by click
rewrite tool based on vertexStack instead of globals
add animations back
fix redo clearing after moving line
Lenkomotive
force-pushed
the
PAINTROID-396
branch
from
September 4, 2023 08:26
5a6b7fa
to
1cef656
Compare
bakicelebi
reviewed
Sep 11, 2023
Paintroid/src/main/java/org/catrobat/paintroid/tools/implementation/DynamicLineTool.kt
Outdated
Show resolved
Hide resolved
bakicelebi
reviewed
Sep 11, 2023
Paintroid/src/main/java/org/catrobat/paintroid/tools/implementation/DynamicLineTool.kt
Outdated
Show resolved
Hide resolved
bakicelebi
reviewed
Sep 11, 2023
Paintroid/src/main/java/org/catrobat/paintroid/tools/implementation/DynamicLineTool.kt
Outdated
Show resolved
Hide resolved
bakicelebi
reviewed
Sep 11, 2023
Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/DefaultCommandManager.kt
Outdated
Show resolved
Hide resolved
bakicelebi
reviewed
Sep 11, 2023
Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/DefaultCommandManager.kt
Outdated
Show resolved
Hide resolved
bakicelebi
reviewed
Sep 11, 2023
Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/DefaultCommandManager.kt
Outdated
Show resolved
Hide resolved
bakicelebi
reviewed
Sep 11, 2023
Paintroid/src/main/java/org/catrobat/paintroid/command/CommandFactory.kt
Show resolved
Hide resolved
bakicelebi
reviewed
Sep 11, 2023
Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/tools/DynamicLineToolTest.kt
Outdated
Show resolved
Hide resolved
bakicelebi
reviewed
Sep 11, 2023
...ndroidTest/java/org/catrobat/paintroid/test/espresso/tools/DynamicLineToolIntegrationTest.kt
Outdated
Show resolved
Hide resolved
bakicelebi
reviewed
Sep 11, 2023
Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/DynamicPathCommand.kt
Show resolved
Hide resolved
bakicelebi
reviewed
Sep 11, 2023
Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/DefaultCommandManager.kt
Outdated
Show resolved
Hide resolved
Lenkomotive
force-pushed
the
PAINTROID-396
branch
from
September 11, 2023 18:25
9f4fc6f
to
9daa735
Compare
Lenkomotive
force-pushed
the
PAINTROID-396
branch
from
September 11, 2023 18:50
401d3a3
to
50cfc22
Compare
add tool to help dialog
adapt ghostpath paint to original paint
bakicelebi
reviewed
Sep 20, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please fix merge conflicts.
Lenkomotive
force-pushed
the
PAINTROID-396
branch
from
September 21, 2023 08:24
65df9cd
to
840d36f
Compare
bakicelebi
approved these changes
Sep 23, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
Lenkomotive
force-pushed
the
PAINTROID-396
branch
from
December 30, 2023 18:04
8f1bf41
to
60dc150
Compare
avoid vertex being outside of drawing surface
Lenkomotive
force-pushed
the
PAINTROID-396
branch
from
December 30, 2023 18:10
60dc150
to
311bff4
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ticket
PAINTROID-396
Description
This pull request introduces the new version of the line tool, termed the "DynamicLineTool." This enhancement empowers users to create shapes by offering mutable vertices that can be added, moved, deleted (soon), and saved. This not only makes for a more versatile tool but also lets users return and modify their work at later stages. This addition caters to those users seeking precise control over their drawings.
Files Introduced
DynamicLineTool.kt:
This is the main implementation of the enhanced line tool. It manages the core functionalities, such as adding, deleting, and modifying vertices. It also handles user interactions, ensuring a seamless user experience.
Vertex.kt:
A representation of individual vertices. It encapsulates properties and methods pertinent to a single vertex, such as its position and any associated metadata.
DynamicPathCommand.kt:
Commands related to the dynamic line's path are defined here. This ensures every action on the dynamic line can be easily saved, undone, or redone.
DynamicPathCommandSerializer.kt:
This facilitates the serialization and deserialization of the dynamic path commands, allowing for the saveable feature of vertices.
DynamicLineToolTest.kt:
Unit tests for the DynamicLineTool, ensuring all its functionalities work as expected.
DynamicLineToolIntegrationTest.kt:
Integration tests for the DynamicLineTool, checking its collaboration with other app components and overall integration into the system.
Additionally, adaptations have been made in the CommandManager and various other files to accommodate the new command structures introduced by the DynamicLineTool.