Unify path eraser and eraser in one tool, closes #1130

Author: CodeDoctorDE

api/lib/src/converter/note.dart

@@ -254,6 +254,10 @@ NoteData _migrate(NoteData noteData, FileMetadata metadata) {
 
     void updateTool(Map? item) {
       if (item == null) return;
+      if (item['type'] == 'pathEraser') {
+        item['type'] = 'eraser';
+        item['mode'] = 'path';
+      }
       final property = item['property'] as Map?;
       switch (item['type']) {
         case 'pen':

api/lib/src/models/tool.dart

@@ -63,6 +63,8 @@ enum HitElementMode {
   }
 }
 
+enum EraserMode { stroke, path }
+
 @Freezed(equal: false)
 sealed class Tool with _$Tool {
   Tool._();
@@ -127,20 +129,12 @@ sealed class Tool with _$Tool {
     @Default('') String name,
     @Default('') String displayIcon,
     @IdJsonConverter() String? id,
+    @Default(EraserMode.stroke) EraserMode mode,
     @Default(5) double strokeWidth,
     @Default(HitElementMode.touchAnywhere) HitElementMode hitElementMode,
     @Default(false) bool eraseElements,
   }) = EraserTool;
 
-  factory Tool.pathEraser({
-    @Default('') String name,
-    @Default('') String displayIcon,
-    @IdJsonConverter() String? id,
-    @Default(5) double strokeWidth,
-    @Default(HitElementMode.touchAnywhere) HitElementMode hitElementMode,
-    @Default(false) bool eraseElements,
-  }) = PathEraserTool;
-
   factory Tool.collection({
     @Default('') String name,
     @Default('') String displayIcon,
@@ -290,7 +284,6 @@ sealed class Tool with _$Tool {
     LabelTool() => ToolCategory.normal,
     PenTool() => ToolCategory.normal,
     EraserTool() => ToolCategory.normal,
-    PathEraserTool() => ToolCategory.normal,
     CollectionTool() => ToolCategory.normal,
     AreaTool() => ToolCategory.normal,
     LaserTool() => ToolCategory.normal,

api/lib/src/models/tool.freezed.dart

@@ -21,7 +21,8 @@ void main() {
       expect(info!.tools.length, 10);
       expect(info.tools[0], isA<SelectTool>());
       expect(info.tools[1], isA<PenTool>());
-      expect(info.tools[2], isA<PathEraserTool>());
+      expect(info.tools[2], isA<EraserTool>());
+      expect((info.tools[2] as EraserTool).mode, EraserMode.path);
       expect(info.tools[3], isA<UndoTool>());
       expect(info.tools[4], isA<RedoTool>());
       expect(info.tools[5], isA<AreaTool>());

api/lib/src/models/tool.g.dart

@@ -253,9 +253,11 @@ class _AddDialogState extends State<AddDialog> {
                       () => Tool.select(mode: SelectMode.rectangle),
                       Tool.pen,
                       Tool.laser,
-                      Tool.pathEraser,
                       Tool.label,
-                      Tool.eraser,
+                      ...EraserMode.values.map(
+                        (e) =>
+                            () => Tool.eraser(mode: e),
+                      ),
                       Tool.area,
                       Tool.presentation,
                       Tool.polygon,