Add grid and ruler selections

LinwoodDev · Dec 29, 2024 · 3a49114 · 3a49114
1 parent 4b24340
commit 3a49114
Show file tree

Hide file tree

Showing 15 changed files with 155 additions and 28 deletions.
diff --git a/api/lib/src/models/tool.dart b/api/lib/src/models/tool.dart
@@ -195,7 +195,7 @@ sealed class Tool with _$Tool {
   factory Tool.ruler({
     @Default('') String name,
     @Default('') String displayIcon,
-    @Default(SRGBColor.black) @ColorJsonConverter() SRGBColor gridColor,
+    @ColorJsonConverter() SRGBColor? color,
   }) = RulerTool;
 
   factory Tool.grid({

diff --git a/api/lib/src/models/tool.freezed.dart b/api/lib/src/models/tool.freezed.dart
@@ -2799,7 +2799,7 @@ abstract class _$$RulerToolImplCopyWith<$Res> implements $ToolCopyWith<$Res> {
   $Res call(
       {String name,
       String displayIcon,
-      @ColorJsonConverter() SRGBColor gridColor});
+      @ColorJsonConverter() SRGBColor? color});
 }
 
 /// @nodoc
@@ -2817,7 +2817,7 @@ class __$$RulerToolImplCopyWithImpl<$Res>
   $Res call({
     Object? name = null,
     Object? displayIcon = null,
-    Object? gridColor = null,
+    Object? color = freezed,
   }) {
     return _then(_$RulerToolImpl(
       name: null == name
@@ -2828,10 +2828,10 @@ class __$$RulerToolImplCopyWithImpl<$Res>
           ? _value.displayIcon
           : displayIcon // ignore: cast_nullable_to_non_nullable
               as String,
-      gridColor: null == gridColor
-          ? _value.gridColor
-          : gridColor // ignore: cast_nullable_to_non_nullable
-              as SRGBColor,
+      color: freezed == color
+          ? _value.color
+          : color // ignore: cast_nullable_to_non_nullable
+              as SRGBColor?,
     ));
   }
 }
@@ -2842,7 +2842,7 @@ class _$RulerToolImpl extends RulerTool {
   _$RulerToolImpl(
       {this.name = '',
       this.displayIcon = '',
-      @ColorJsonConverter() this.gridColor = SRGBColor.black,
+      @ColorJsonConverter() this.color,
       final String? $type})
       : $type = $type ?? 'ruler',
         super._();
@@ -2857,16 +2857,15 @@ class _$RulerToolImpl extends RulerTool {
   @JsonKey()
   final String displayIcon;
   @override
-  @JsonKey()
   @ColorJsonConverter()
-  final SRGBColor gridColor;
+  final SRGBColor? color;
 
   @JsonKey(name: 'type')
   final String $type;
 
   @override
   String toString() {
-    return 'Tool.ruler(name: $name, displayIcon: $displayIcon, gridColor: $gridColor)';
+    return 'Tool.ruler(name: $name, displayIcon: $displayIcon, color: $color)';
   }
 
   /// Create a copy of Tool
@@ -2889,7 +2888,7 @@ abstract class RulerTool extends Tool {
   factory RulerTool(
       {final String name,
       final String displayIcon,
-      @ColorJsonConverter() final SRGBColor gridColor}) = _$RulerToolImpl;
+      @ColorJsonConverter() final SRGBColor? color}) = _$RulerToolImpl;
   RulerTool._() : super._();
 
   factory RulerTool.fromJson(Map<String, dynamic> json) =
@@ -2900,7 +2899,7 @@ abstract class RulerTool extends Tool {
   @override
   String get displayIcon;
   @ColorJsonConverter()
-  SRGBColor get gridColor;
+  SRGBColor? get color;
 
   /// Create a copy of Tool
   /// with the given fields replaced by the non-null parameter values.

diff --git a/api/lib/src/models/tool.g.dart b/api/lib/src/models/tool.g.dart
diff --git a/app/lib/cubits/current_index.dart b/app/lib/cubits/current_index.dart
@@ -319,15 +319,16 @@ class CurrentIndexCubit extends Cubit<CurrentIndex> {
     Handler<Tool>? handler;
     bool needsDispose = false;
     if (state.index == index) {
-      handler = fetchHandler<Handler<Tool>>();
+      handler = fetchHandler<Handler<Tool>>(disableTemporary: true);
     } else if (state.toggleableHandlers.containsKey(index)) {
       handler = state.toggleableHandlers[index];
     }
     if (handler == null) {
       List<Tool> tools = const [];
       final blocState = bloc.state;
       if (blocState is DocumentLoaded) tools = blocState.info.tools;
-      handler = Handler.fromTool(tools.elementAtOrNull(index));
+      final tool = tools.elementAtOrNull(index) ?? HandTool();
+      handler = Handler.fromTool(tool);
       needsDispose = true;
     }
     final result = callback(handler);

diff --git a/app/lib/dialogs/import/add.dart b/app/lib/dialogs/import/add.dart
@@ -209,6 +209,16 @@ class _AddDialogState extends State<AddDialog> {
                                 .toLowerCase()
                                 .contains(search.toLowerCase()))
                             .toList();
+                        final view = [
+                          Tool.ruler,
+                          Tool.grid,
+                        ]
+                            .map((e) => e())
+                            .where((e) => e
+                                .getLocalizedName(context)
+                                .toLowerCase()
+                                .contains(search.toLowerCase()))
+                            .toList();
                         return ListView(
                           shrinkWrap: true,
                           children: [
@@ -306,6 +316,14 @@ class _AddDialogState extends State<AddDialog> {
                               ),
                               const SizedBox(height: 16),
                             ],
+                            if (view.isNotEmpty) ...[
+                              _ToolsListView(
+                                isMobile: isMobile,
+                                title: AppLocalizations.of(context).view,
+                                children: view.map(buildTool).toList(),
+                              ),
+                              const SizedBox(height: 16),
+                            ],
                           ],
                         );
                       }),

diff --git a/app/lib/handlers/hand.dart b/app/lib/handlers/hand.dart
@@ -23,6 +23,10 @@ class GeneralHandHandler<T> extends Handler<T> {
       _moved ? SystemMouseCursors.grabbing : SystemMouseCursors.grab;
 }
 
+class FallbackHandler<T extends Tool> extends GeneralHandHandler<T> {
+  FallbackHandler(super.data);
+}
+
 class HandHandler extends GeneralHandHandler<HandTool> {
   HandHandler([HandTool? tool]) : super(tool ?? HandTool());
 }
diff --git a/app/lib/handlers/handler.dart b/app/lib/handlers/handler.dart
@@ -221,7 +221,7 @@ abstract class Handler<T> {
     return Handler.fromTool(tool);
   }
 
-  static Handler<T> fromTool<T extends Tool>(T? tool) {
+  static Handler<T> fromTool<T extends Tool>(T tool) {
     return switch (tool) {
       HandTool() => HandHandler(tool),
       SelectTool() => SelectHandler(tool),
@@ -244,7 +244,7 @@ abstract class Handler<T> {
       AssetTool() => AssetHandler(tool),
       EyeDropperTool() => EyeDropperHandler(tool),
       ExportTool() => ExportHandler(tool),
-      _ => GeneralHandHandler(tool),
+      _ => FallbackHandler<T>(tool),
     } as Handler<T>;
   }
 

diff --git a/app/lib/handlers/import.dart b/app/lib/handlers/import.dart
@@ -61,8 +61,8 @@ class ImportHandler extends Handler<ImportTool> {
             .copyWith(id: createUniqueId()))
         .nonNulls
         .toList()));
-    context.refresh();
-    context.bake();
+    await context.refresh();
+    await context.bake();
   }
 
   @override

diff --git a/app/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb
@@ -626,13 +626,14 @@
   "renderResolution": "Render resolution",
   "translate": "Translate",
   "unencrypted": "Unencrypted",
-  "encrypted": "Decrypted",
+  "encrypted": "Encrypted",
   "encryptDocumentMessage": "Click to encrypt the document",
   "unencryptDocumentMessage": "Click to unencrypt the document",
   "unencrypt": "Unencrypt",
   "encrypt": "Encrypt",
   "encryptWarning": "This will encrypt the document. You will need to remember the password to decrypt it.",
   "unencryptWarning": "This will unencrypt the document. The password will be removed and everyone with access will be able to open it.",
   "confirmPassword": "Confirm password",
-  "passwordMismatch": "The passwords do not match"
+  "passwordMismatch": "The passwords do not match",
+  "action": "Action"
 }
diff --git a/app/lib/selections/selection.dart b/app/lib/selections/selection.dart
@@ -31,10 +31,12 @@ part 'tools/tool.dart';
 part 'tools/hand.dart';
 part 'tools/area.dart';
 part 'tools/eraser.dart';
+part 'tools/grid.dart';
 part 'tools/label.dart';
 part 'tools/laser.dart';
 part 'tools/path_eraser.dart';
 part 'tools/pen.dart';
+part 'tools/ruler.dart';
 part 'tools/shape.dart';
 part 'tools/stamp.dart';
 part 'tools/texture.dart';

diff --git a/app/lib/selections/tools/grid.dart b/app/lib/selections/tools/grid.dart
@@ -0,0 +1,40 @@
+part of '../selection.dart';
+
+class GridToolSelection extends ToolSelection<GridTool> {
+  GridToolSelection(super.selected);
+
+  @override
+  List<Widget> buildProperties(BuildContext context) {
+    return [
+      ...super.buildProperties(context),
+      const SizedBox(height: 8),
+      OffsetPropertyView(
+        title: Text(AppLocalizations.of(context).size),
+        value: Offset(selected.first.xSize, selected.first.ySize),
+        onChanged: (value) => update(
+          context,
+          selected
+              .map((e) => e.copyWith(xSize: value.dx, ySize: value.dy))
+              .toList(),
+        ),
+      ),
+      const SizedBox(height: 8),
+      ColorField(
+        value: selected.first.color,
+        onChanged: (value) => update(
+          context,
+          selected.map((e) => e.copyWith(color: value)).toList(),
+        ),
+        title: Text(LeapLocalizations.of(context).color),
+      ),
+    ];
+  }
+
+  @override
+  Selection insert(dynamic element) {
+    if (element is GridTool) {
+      return GridToolSelection([...selected, element]);
+    }
+    return super.insert(element);
+  }
+}
diff --git a/app/lib/selections/tools/ruler.dart b/app/lib/selections/tools/ruler.dart
@@ -0,0 +1,41 @@
+part of '../selection.dart';
+
+class RulerToolSelection extends ToolSelection<RulerTool> {
+  RulerToolSelection(super.selected);
+
+  @override
+  List<Widget> buildProperties(BuildContext context) {
+    return [
+      ...super.buildProperties(context),
+      ColorField(
+        title: Text(LeapLocalizations.of(context).color),
+        value:
+            selected.first.color?.withValues(a: 255) ?? SRGBColor.transparent,
+        subtitle: selected.first.color == null
+            ? Text(AppLocalizations.of(context).notSet)
+            : null,
+        leading: selected.first.color == null
+            ? null
+            : IconButton(
+                icon: const Icon(PhosphorIconsLight.trash),
+                onPressed: () => update(
+                  context,
+                  selected.map((e) => e.copyWith(color: null)).toList(),
+                ),
+              ),
+        onChanged: (value) => update(
+          context,
+          selected.map((e) => e.copyWith(color: value)).toList(),
+        ),
+      ),
+    ];
+  }
+
+  @override
+  Selection insert(dynamic element) {
+    if (element is RulerTool) {
+      return RulerToolSelection([...selected, element]);
+    }
+    return super.insert(element);
+  }
+}
diff --git a/app/lib/selections/tools/tool.dart b/app/lib/selections/tools/tool.dart
@@ -10,7 +10,9 @@ class ToolSelection<T extends Tool> extends Selection<T> {
         EraserTool e => EraserToolSelection([e]),
         PathEraserTool e => PathEraserToolSelection([e]),
         AreaTool e => AreaToolSelection([e]),
+        GridTool e => GridToolSelection([e]),
         LaserTool e => LaserToolSelection([e]),
+        RulerTool e => RulerToolSelection([e]),
         ShapeTool e => ShapeToolSelection([e]),
         StampTool e => StampToolSelection([e]),
         TextureTool e => TextureToolSelection([e]),

diff --git a/app/lib/services/import.dart b/app/lib/services/import.dart
@@ -229,7 +229,8 @@ class ImportService {
         password = await showDialog<String>(
           context: context,
           builder: (context) => NameDialog(
-            title: AppLocalizations.of(context).password,
+            title: AppLocalizations.of(context).encrypted,
+            hint: AppLocalizations.of(context).password,
             button: AppLocalizations.of(context).open,
             obscureText: true,
           ),

diff --git a/app/lib/visualizer/tool.dart b/app/lib/visualizer/tool.dart
@@ -19,9 +19,16 @@ extension ToolCategoryVisualizer on ToolCategory {
         ToolCategory.normal => PhosphorIcons.paintBrush,
         ToolCategory.import => PhosphorIcons.arrowSquareIn,
         ToolCategory.surface => PhosphorIcons.monitor,
-        ToolCategory.action => PhosphorIcons.arrowClockwise,
+        ToolCategory.action => PhosphorIcons.play,
         ToolCategory.view => PhosphorIcons.eye,
       };
+  String getLocalizedName(BuildContext context) => switch (this) {
+        ToolCategory.normal => AppLocalizations.of(context).normal,
+        ToolCategory.import => AppLocalizations.of(context).import,
+        ToolCategory.surface => AppLocalizations.of(context).surface,
+        ToolCategory.action => AppLocalizations.of(context).action,
+        ToolCategory.view => AppLocalizations.of(context).view,
+      };
 }
 
 extension ToolVisualizer on Tool {