chore: prettify dart tool parametrization in canvas

Author: zinstack625

lib/components/canvas/canvas.dart

@@ -47,40 +47,40 @@ class Canvas extends StatelessWidget {
   final double currentScale;
   final bool placeholder;
 
-  int toolToOnyx(Tool currentTool) {
-    if (placeholder) return 5;
+  OnyxStrokeStyle getOnyxTool(Tool currentTool) {
+    if (placeholder) return OnyxStrokeStyle.pen;
     if (currentTool is Pencil) {
-      return 3;
+      return OnyxStrokeStyle.pencil;
     } else if (currentTool is Highlighter) {
-      return 4;
+      return OnyxStrokeStyle.marker;
     } else if (currentTool is Eraser) {
-      return 1;
+      return OnyxStrokeStyle.disabled;
     } else if (currentTool is Select) {
-      return 1;
+      return OnyxStrokeStyle.pen;
     } else if (currentTool is LaserPointer) {
-      return 1;
+      return OnyxStrokeStyle.pen;
     } else if (currentTool is Pen) {
-      if (currentTool.isPressureEnabled()) {
-        return 2;
+      if (currentTool.pressureEnabled) {
+        return OnyxStrokeStyle.brush;
       } else {
-        return 1;
+        return OnyxStrokeStyle.pen;
       }
     } else {
-      return 5;
+      return OnyxStrokeStyle.pen;
     }
   }
 
-  int getColor() {
+  int getOnyxColor() {
       if (currentTool is Pen) {
         return (currentTool as Pen).color.toARGB32();
       } else {
         return Colors.black.toARGB32();
       }
   }
-  double getWidth() {
+  double getOnyxWidth() {
       if (currentTool is Pen) {
-        double baseSize = (currentTool as Pen).getSize() * currentScale;
-        if ((currentTool as Pen).isPressureEnabled()) {
+        double baseSize = (currentTool as Pen).options.size * currentScale;
+        if ((currentTool as Pen).pressureEnabled) {
           return baseSize;
         } else {
           return baseSize * 2;
@@ -112,9 +112,9 @@ class Canvas extends StatelessWidget {
                     height: page.size.height,
                     child: OnyxSdkPenArea(
                       refreshDelay: const Duration(seconds: 1),
-                      strokeStyle: toolToOnyx(currentTool),
-                      strokeColor: getColor(),
-                      strokeWidth: getWidth(),
+                      strokeStyle: getOnyxTool(currentTool),
+                      strokeColor: getOnyxColor(),
+                      strokeWidth: getOnyxWidth(),
                       child: InnerCanvas(
                         key: page.innerCanvasKey,
                         pageIndex: pageIndex,

packages/onyxsdk_pen/lib/onyxsdk_pen_area.dart

@@ -7,12 +7,24 @@ import 'package:flutter/services.dart';
 
 import 'onyxsdk_pen_platform_interface.dart';
 
+enum OnyxStrokeStyle {
+  fountainPen(0),
+  pen(1),
+  brush(2),
+  pencil(3),
+  marker(4),
+  disabled(5);
+
+  const OnyxStrokeStyle(this.value);
+  final int value;
+}
+
 /// Renders a native Android view which uses the Onyx SDK to draw on the screen.
 class OnyxSdkPenArea extends StatefulWidget {
   const OnyxSdkPenArea({
     super.key,
     this.refreshDelay = const Duration(seconds: 1),
-    this.strokeStyle = 0,
+    this.strokeStyle = OnyxStrokeStyle.fountainPen,
     this.strokeColor = 0,
     this.strokeWidth = 3.0,
     required this.child,
@@ -24,7 +36,7 @@ class OnyxSdkPenArea extends StatefulWidget {
   /// is still writing, which will make the screen get stuck in a half-drawn
   /// state.
   final Duration refreshDelay;
-  final int strokeStyle;
+  final OnyxStrokeStyle strokeStyle;
   final int strokeColor;
   final double strokeWidth;
 
@@ -71,7 +83,7 @@ class _OnyxSdkPenAreaState extends State<OnyxSdkPenArea> with WidgetsBindingObse
   /// Parameters to pass to the platform side
   late final creationParams = <String, dynamic>{
     "refreshDelayMs": widget.refreshDelay.inMilliseconds,
-    "strokeStyle": widget.strokeStyle,
+    "strokeStyle": widget.strokeStyle.value,
     "strokeColor": widget.strokeColor,
     "strokeWidth": widget.strokeWidth,
   };
@@ -85,7 +97,7 @@ class _OnyxSdkPenAreaState extends State<OnyxSdkPenArea> with WidgetsBindingObse
     super.didUpdateWidget(oldWidget);
 
     creationParams['refreshDelayMs'] = widget.refreshDelay.inMilliseconds;
-    creationParams['strokeStyle'] = widget.strokeStyle;
+    creationParams['strokeStyle'] = widget.strokeStyle.value;
     creationParams['strokeColor'] = widget.strokeColor;
     creationParams['strokeWidth'] = widget.strokeWidth;
     channel.invokeMethod('updateStroke', creationParams).catchError((e) {});