Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions lib/core/commands/command_factory/command_factory.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import 'package:paintroid/core/commands/command_implementation/graphic/shape/hea
import 'package:paintroid/core/commands/command_implementation/graphic/shape/square_shape_command.dart';
import 'package:paintroid/core/commands/command_implementation/graphic/shape/star_shape_command.dart';
import 'package:paintroid/core/commands/command_implementation/graphic/spray_command.dart';
import 'package:paintroid/core/commands/command_implementation/graphic/fill_command.dart';
import 'package:paintroid/core/commands/command_implementation/graphic/color_changed_command.dart';
import 'package:paintroid/core/commands/path_with_action_history.dart';
import 'package:paintroid/core/enums/shape_style.dart';
Expand Down Expand Up @@ -131,6 +132,10 @@ class CommandFactory {
return SprayCommand(points, paint);
}

FillCommand createFillCommand(List<Offset> points, Paint paint) {
return FillCommand(points, paint);
}

DeleteRegionCommand createDeleteRegionCommand(
ui.Rect region,
) =>
Expand Down
53 changes: 53 additions & 0 deletions lib/core/commands/command_implementation/graphic/fill_command.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
// ignore_for_file: must_be_immutable

import 'dart:ui';

import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:paintroid/core/commands/command_implementation/graphic/graphic_command.dart';
import 'package:paintroid/core/json_serialization/converter/offset_converter.dart';
import 'package:paintroid/core/json_serialization/converter/paint_converter.dart';
import 'package:paintroid/core/json_serialization/versioning/serializer_version.dart';
import 'package:paintroid/core/json_serialization/versioning/version_strategy.dart';

part 'fill_command.g.dart';

@JsonSerializable()
class FillCommand extends GraphicCommand {
final String type;
final int version;

@OffsetConverter()
List<Offset> points;

FillCommand(
this.points,
super.paint, {
this.type = SerializerType.FILL_COMMAND,
int? version,
}) : version =
version ?? VersionStrategyManager.strategy.getFillCommandVersion();

@override
void call(Canvas canvas) {
for (int i = 0; i < points.length; i+=2) {
canvas.drawLine(points[i], points[i+1], paint);
}
}

@override
List<Object?> get props => [paint, points];

@override
Map<String, dynamic> toJson() => _$FillCommandToJson(this);

factory FillCommand.fromJson(Map<String, dynamic> json) {
int version = json['version'] as int;

switch (version) {
case Version.v1:
return _$FillCommandFromJson(json);
default:
return _$FillCommandFromJson(json);
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions lib/core/commands/command_manager/command_manager.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import 'package:paintroid/core/tools/line_tool/vertex_stack.dart';
import 'package:paintroid/core/tools/tool_data.dart';
import 'package:paintroid/core/commands/command_implementation/graphic/spray_command.dart';
import 'package:paintroid/core/commands/command_implementation/graphic/color_changed_command.dart';
import 'package:paintroid/core/commands/command_implementation/graphic/fill_command.dart';

enum ActionType { UNDO, REDO }

Expand Down Expand Up @@ -128,6 +129,8 @@ class CommandManager {
return ToolData.SHAPES;
} else if (command.runtimeType == HeartShapeCommand) {
return ToolData.SHAPES;
} else if (command is FillCommand) {
return ToolData.FILL;
} else if (command is PathCommand) {
if (command.isCursorPath) {
return ToolData.CURSOR;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class SerializerVersion {
static const int STAR_SHAPE_COMMAND_VERSION = Version.v1;
static const int HEART_SHAPE_COMMAND_VERSION = Version.v1;
static const int SPRAY_COMMAND_VERSION = Version.v1;
static const int FILL_COMMAND_VERSION = Version.v1;
static const int CLIPBOARD_COMMAND_VERSION = Version.v1;
static const int DELETE_REGION_COMMAND_VERSION = Version.v1;
static const int COLOR_CHANGED_COMMAND_VERSION = Version.v1;
Expand All @@ -32,6 +33,7 @@ class SerializerType {
static const String STAR_SHAPE_COMMAND = 'StarShapeCommand';
static const String HEART_SHAPE_COMMAND = 'HeartShapeCommand';
static const String SPRAY_COMMAND = 'SprayCommand';
static const String FILL_COMMAND = 'FillCommand';
static const String CLIPBOARD_COMMAND = 'ClipboardCommand';
static const String DELETE_REGION_COMMAND = 'DeleteRegionCommand';
static const String COLOR_CHANGED_COMMAND = 'ColorChangedCommand';
Expand Down
5 changes: 5 additions & 0 deletions lib/core/json_serialization/versioning/version_strategy.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ abstract class IVersionStrategy {

int getSprayCommandVersion();

int getFillCommandVersion();

int getClipboardCommandVersion();

int getDeleteRegionCommandVersion();
Expand Down Expand Up @@ -58,6 +60,9 @@ class ProductionVersionStrategy implements IVersionStrategy {
@override
int getSprayCommandVersion() => SerializerVersion.SPRAY_COMMAND_VERSION;

@override
int getFillCommandVersion() => SerializerVersion.FILL_COMMAND_VERSION;

@override
int getClipboardCommandVersion() =>
SerializerVersion.CLIPBOARD_COMMAND_VERSION;
Expand Down
25 changes: 25 additions & 0 deletions lib/core/providers/object/tools/fill_tool_provider.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:paintroid/core/commands/command_factory/command_factory_provider.dart';
import 'package:paintroid/core/commands/command_manager/command_manager_provider.dart';
import 'package:paintroid/core/commands/graphic_factory/graphic_factory_provider.dart';
import 'package:paintroid/core/providers/state/canvas_state_provider.dart';
import 'package:paintroid/core/enums/tool_types.dart';
import 'package:paintroid/core/tools/implementation/fill_tool.dart';
import 'package:paintroid/core/providers/object/canvas_painter_provider.dart';

part 'fill_tool_provider.g.dart';

@riverpod
class FillToolProvider extends _$FillToolProvider {
@override
FillTool build() {
return FillTool(
type: ToolType.FILL,
commandManager: ref.watch(commandManagerProvider),
commandFactory: ref.watch(commandFactoryProvider),
graphicFactory: ref.watch(graphicFactoryProvider),
canvasStateProvider: ref.watch(canvasStateProvider.notifier),
canvasPainterProvider: ref.watch(canvasPainterProvider.notifier)
);
}
}
26 changes: 26 additions & 0 deletions lib/core/providers/object/tools/fill_tool_provider.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/core/providers/state/canvas_state_provider.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions lib/core/providers/state/toolbox_state_provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import 'package:paintroid/core/providers/object/tools/brush_tool_provider.dart';
import 'package:paintroid/core/providers/object/tools/clipboard_tool_provider.dart';
import 'package:paintroid/core/providers/object/tools/cursor_tool_provider.dart';
import 'package:paintroid/core/providers/object/tools/eraser_tool_provider.dart';
import 'package:paintroid/core/providers/object/tools/fill_tool_provider.dart';
import 'package:paintroid/core/providers/object/tools/hand_tool_provider.dart';
import 'package:paintroid/core/providers/object/tools/line_tool_provider.dart';
import 'package:paintroid/core/providers/object/tools/pipette_tool_provider.dart';
Expand All @@ -16,6 +17,7 @@ import 'package:paintroid/core/providers/object/tools/watercolor_tool_provider.d
import 'package:paintroid/core/providers/state/paint_provider.dart';
import 'package:paintroid/core/providers/state/spray_tool_provider.dart';
import 'package:paintroid/core/providers/state/toolbox_state_data.dart';
import 'package:paintroid/core/tools/implementation/fill_tool.dart';
import 'package:paintroid/core/tools/implementation/spray_tool.dart';
import 'package:paintroid/core/tools/tool_data.dart';
import 'package:paintroid/ui/utils/toast_utils.dart';
Expand Down Expand Up @@ -59,6 +61,10 @@ class ToolBoxStateProvider extends _$ToolBoxStateProvider {
final currentRadius = (state.currentTool as SprayTool).sprayRadius;
ref.read(paintProvider.notifier).updateStrokeWidth(currentRadius);
}
if (state.currentTool is FillTool) {
final prevStrokeSize = (state.currentTool as FillTool).prevStrokeSize;
ref.read(paintProvider.notifier).updateStrokeWidth(prevStrokeSize);
}
switch (data.type) {
case ToolType.BRUSH:
state = state.copyWith(currentTool: ref.read(brushToolProvider));
Expand All @@ -75,6 +81,12 @@ class ToolBoxStateProvider extends _$ToolBoxStateProvider {
case ToolType.LINE:
state = state.copyWith(currentTool: ref.read(lineToolProvider));
break;
case ToolType.FILL:
state = state.copyWith(currentTool: ref.read(fillToolProvider));
final currentStrokeWidth = ref.read(paintProvider).strokeWidth;
(state.currentTool as FillTool).savePrevStrokeSize(currentStrokeWidth);
ref.read(paintProvider.notifier).updateStrokeWidth(1);
break;
case ToolType.SHAPES:
state = state.copyWith(currentTool: ref.read(shapesToolProvider));
ref.read(canvasPainterProvider.notifier).repaint();
Expand Down
2 changes: 1 addition & 1 deletion lib/core/providers/state/toolbox_state_provider.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading