Create cursor_tool object and provider. #117
Open
Conversation
This file contains hidden or 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
…for cursor and add unit/integration tests
There was a problem hiding this comment.
Pull Request Overview
This PR introduces a new CursorTool, its provider, integrates it into the toolbox state and painter, and adds corresponding unit & integration tests, plus minor UI painter and iOS project config updates.
- Added
CursorToolimplementation and provider, and wired it intoToolBoxStateProvider&CommandPainter - Added comprehensive unit tests (
cursor_tool_test.dart) and integration tests (cursor_tool_test.dart) - Updated
CanvasPainterto render the cursor icon and adjusted iOS scheme/project for GPU validation and pod resource copying
Reviewed Changes
Copilot reviewed 12 out of 13 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| test/unit/tools/cursor_tool_test.dart | Added unit tests covering cursor positioning and drawing behavior |
| test/integration/cursor_tool_test.dart | Added integration tests for cursor tool interactions |
| lib/ui/pages/workspace_page/components/drawing_surface/canvas_painter.dart | Render cursor icon instead of const Stack |
| lib/core/tools/tool.dart | Changed Tool constructor from const to non-const |
| lib/core/tools/implementation/cursor_tool.dart | New CursorTool implementation |
| lib/core/providers/state/toolbox_state_provider.dart | Integrated ToolType.CURSOR into toolbox state |
| lib/core/providers/object/tools/cursor_tool_provider.dart | Added Riverpod provider for CursorTool |
| lib/core/commands/command_painter.dart | Draw cursor icon in the painter switch |
| ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme | Enabled GPU validation |
| ios/Runner.xcodeproj/project.pbxproj | Added pod resource copy build phase |
Comments suppressed due to low confidence (4)
test/integration/cursor_tool_test.dart:50
- The test block for testID 1 and the test block for testID 2 are identical. Consider removing one of the duplicate tests to reduce redundancy and speed up CI.
if (testID == -1 || testID == 1) {
lib/ui/pages/workspace_page/components/drawing_surface/canvas_painter.dart:24
- [nitpick] Removing the
constqualifier from theStackprevents compile-time optimizations. If the children are immutable, consider restoringconst Stackto improve rendering performance.
child: Stack(
lib/core/tools/tool.dart:15
- [nitpick] The constructor was changed from
const Toolto non-const; since all fields arefinal, you could reintroduceconsthere to allow compile-time instantiation and improve code clarity.
Tool({
ios/Runner.xcodeproj/project.pbxproj:272
- This appears to add a duplicate '[CP] Copy Pods Resources' build phase, which can lead to duplicated resource copies or build confusion. Consider removing or merging with the existing phase.
CE347BAC542BC77A1AF7E630 /* [CP] Copy Pods Resources */ = {
| @@ -77,6 +78,9 @@ class ToolBoxStateProvider extends _$ToolBoxStateProvider { | |||
| (state.currentTool as SprayTool).updateSprayRadius(currentStrokeWidth); | |||
| ref.read(paintProvider.notifier).updateStrokeWidth(SPRAY_TOOL_RADIUS); | |||
| break; | |||
| case ToolType.CURSOR: | |||
| state = state.copyWith(currentTool: ref.read(cursorToolProvider)); | |||
There was a problem hiding this comment.
When selecting the cursor tool, the paint stroke width isn’t updated. You may need to call ref.read(paintProvider.notifier).updateStrokeWidth(...) with the cursor’s stroke width to ensure drawing uses the correct thickness.
Suggested change
| state = state.copyWith(currentTool: ref.read(cursorToolProvider)); | |
| state = state.copyWith(currentTool: ref.read(cursorToolProvider)); | |
| ref.read(paintProvider.notifier).updateStrokeWidth(1.0); // Default stroke width for cursor |
Copilot uses AI. Check for mistakes.
Lenkomotive
requested changes
Jul 8, 2025
There was a problem hiding this comment.
Overall good work:
- pls check out the redo/undo function and how it works in other tools. I noticed some inconsistency and also redoing to a line which was drawn by a cursor should also switch back to cursor tool. Might need to look at the PathCommand.
- pls use the Catrobat PR-template and check if you have ticked all the boxes.
| @@ -21,7 +21,7 @@ class CanvasPainter extends ConsumerWidget { | |||
| foregroundDecoration: const BoxDecoration( | |||
| border: Border.fromBorderSide(BorderSide(width: 0.5)), | |||
| ), | |||
| child: const Stack( | |||
| child: Stack( | |||
| @@ -11,7 +12,7 @@ abstract class Tool { | |||
| final bool hasAddFunctionality; | |||
| final bool hasFinalizeFunctionality; | |||
|
|
|||
| const Tool({ | |||
| Tool({ | |||
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.
Please enter a short description of your pull request and add a reference to the Jira ticket.
New Features and Enhancements
Refactorings and Bug Fixes
Checklist
Your checklist for this pull request
Please review the contributing guidelines and wiki pages of this repository.