ref: move more stuff into sbn package

adil192 · adil192 · commit 417702957f72 · 2026-02-15T22:26:45.000Z
diff --git a/lib/components/canvas/_circle_stroke.dart b/lib/components/canvas/_circle_stroke.dart
@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:one_dollar_unistroke_recognizer/one_dollar_unistroke_recognizer.dart';
 import 'package:perfect_freehand/perfect_freehand.dart';
 import 'package:saber/components/canvas/_stroke.dart';
-import 'package:saber/data/editor/page.dart';
+import 'package:sbn/has_size.dart';
 
 class CircleStroke extends Stroke {
   Offset center;
diff --git a/lib/components/canvas/_rectangle_stroke.dart b/lib/components/canvas/_rectangle_stroke.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:one_dollar_unistroke_recognizer/one_dollar_unistroke_recognizer.dart';
 import 'package:perfect_freehand/perfect_freehand.dart';
 import 'package:saber/components/canvas/_stroke.dart';
-import 'package:saber/data/editor/page.dart';
+import 'package:sbn/has_size.dart';
 
 class RectangleStroke extends Stroke {
   Rect rect;
diff --git a/lib/components/canvas/_stroke.dart b/lib/components/canvas/_stroke.dart
@@ -8,10 +8,10 @@ import 'package:one_dollar_unistroke_recognizer/one_dollar_unistroke_recognizer.
 import 'package:perfect_freehand/perfect_freehand.dart';
 import 'package:saber/components/canvas/_circle_stroke.dart';
 import 'package:saber/components/canvas/_rectangle_stroke.dart';
-import 'package:saber/data/editor/page.dart';
 import 'package:saber/data/extensions/list_extensions.dart';
 import 'package:saber/data/extensions/point_extensions.dart';
-import 'package:saber/data/tools/_tool.dart';
+import 'package:sbn/has_size.dart';
+import 'package:sbn/tool_id.dart';
 
 class Stroke {
   static final log = Logger('Stroke');
diff --git a/lib/components/canvas/canvas.dart b/lib/components/canvas/canvas.dart
@@ -9,6 +9,7 @@ import 'package:saber/data/editor/page.dart';
 import 'package:saber/data/tools/_tool.dart';
 import 'package:saber/data/tools/pen.dart';
 import 'package:saber/data/tools/select.dart';
+import 'package:sbn/tool_id.dart';
 
 class Canvas extends StatelessWidget {
   const Canvas({
diff --git a/lib/components/canvas/inner_canvas.dart b/lib/components/canvas/inner_canvas.dart
@@ -8,11 +8,11 @@ import 'package:saber/components/canvas/_stroke.dart';
 import 'package:saber/components/canvas/canvas_image.dart';
 import 'package:saber/components/canvas/image/editor_image.dart';
 import 'package:saber/data/editor/editor_core_info.dart';
-import 'package:saber/data/editor/quill_styles.dart';
 import 'package:saber/data/prefs.dart';
 import 'package:saber/data/tools/select.dart';
 import 'package:saber/i18n/strings.g.dart';
 import 'package:sbn/canvas_background_pattern.dart';
+import 'package:sbn/quill_styles.dart';
 
 class InnerCanvas extends StatefulWidget {
   const InnerCanvas({
diff --git a/lib/components/nextcloud/enc_login_step.dart b/lib/components/nextcloud/enc_login_step.dart
@@ -6,11 +6,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:logging/logging.dart';
 import 'package:saber/components/misc/faq.dart';
-import 'package:saber/components/theming/font_fallbacks.dart';
 import 'package:saber/data/nextcloud/errors.dart';
 import 'package:saber/data/nextcloud/nextcloud_client_extension.dart';
 import 'package:saber/data/prefs.dart';
 import 'package:saber/i18n/strings.g.dart';
+import 'package:sbn/font_fallbacks.dart';
 import 'package:yaru/yaru.dart';
 
 class EncLoginStep extends StatefulWidget {
diff --git a/lib/components/settings/settings_directory_selector.dart b/lib/components/settings/settings_directory_selector.dart
@@ -5,11 +5,11 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:saber/components/theming/adaptive_alert_dialog.dart';
-import 'package:saber/components/theming/font_fallbacks.dart';
 import 'package:saber/data/file_manager/file_manager.dart';
 import 'package:saber/data/nextcloud/saber_syncer.dart';
 import 'package:saber/data/prefs.dart';
 import 'package:saber/i18n/strings.g.dart';
+import 'package:sbn/font_fallbacks.dart';
 
 class SettingsDirectorySelector extends StatelessWidget {
   const SettingsDirectorySelector({
diff --git a/lib/components/theming/saber_theme.dart b/lib/components/theming/saber_theme.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:saber/components/theming/font_fallbacks.dart';
 import 'package:saber/components/theming/yaru_builder.dart';
 import 'package:saber/data/prefs.dart';
+import 'package:sbn/font_fallbacks.dart';
 import 'package:yaru/yaru.dart';
 
 abstract class SaberTheme {
diff --git a/lib/data/editor/editor_core_info.dart b/lib/data/editor/editor_core_info.dart
@@ -19,6 +19,7 @@ import 'package:saber/data/prefs.dart';
 import 'package:saber/data/tools/stroke_properties.dart';
 import 'package:saber/pages/editor/editor.dart';
 import 'package:sbn/canvas_background_pattern.dart';
+import 'package:sbn/has_size.dart';
 import 'package:sbn/read_only_reason.dart';
 import 'package:worker_manager/worker_manager.dart';
 
diff --git a/lib/data/editor/editor_history.dart b/lib/data/editor/editor_history.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_quill/flutter_quill.dart';
 import 'package:saber/components/canvas/_stroke.dart';
 import 'package:saber/components/canvas/image/editor_image.dart';
-import 'package:saber/data/editor/_color_change.dart';
 import 'package:saber/data/editor/page.dart';
+import 'package:sbn/color_change.dart';
 
 class EditorHistory {
   static const maxHistoryLength = 100;
diff --git a/lib/data/editor/page.dart b/lib/data/editor/page.dart
@@ -12,14 +12,10 @@ import 'package:saber/components/canvas/inner_canvas.dart';
 import 'package:saber/components/canvas/pencil_shader.dart';
 import 'package:saber/data/editor/editor_exporter.dart';
 import 'package:saber/data/tools/laser_pointer.dart';
+import 'package:sbn/has_size.dart';
 
 typedef CanvasKey = GlobalKey<State<InnerCanvas>>;
 
-class HasSize {
-  const HasSize(this.size);
-  final Size size;
-}
-
 class EditorPage extends ChangeNotifier implements HasSize {
   static const double defaultWidth = 1000;
   static const double defaultHeight = defaultWidth * 1.4;
diff --git a/lib/data/prefs.dart b/lib/data/prefs.dart
@@ -11,10 +11,10 @@ import 'package:saber/data/codecs/base64_codec.dart';
 import 'package:saber/data/codecs/quota_codec.dart';
 import 'package:saber/data/flavor_config.dart';
 import 'package:saber/data/sentry/sentry_consent.dart';
-import 'package:saber/data/tools/_tool.dart';
 import 'package:saber/data/tools/highlighter.dart';
 import 'package:saber/data/tools/pen.dart';
 import 'package:sbn/canvas_background_pattern.dart';
+import 'package:sbn/tool_id.dart';
 import 'package:stow/stow.dart';
 import 'package:stow_codecs/stow_codecs.dart';
 import 'package:stow_plain/stow_plain.dart';
diff --git a/lib/data/tools/_tool.dart b/lib/data/tools/_tool.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/foundation.dart';
-import 'package:logging/logging.dart';
 import 'package:saber/data/prefs.dart';
-import 'package:stow_codecs/stow_codecs.dart';
+import 'package:sbn/tool_id.dart';
 
 abstract class Tool {
   @protected
@@ -21,53 +20,3 @@ class _TextEditingTool extends Tool {
   @override
   ToolId get toolId => .textEditing;
 }
-
-/// An enum of all available tools.
-/// Note that the pens must be ordered in z-axis order,
-/// e.g. so that the highlighter is always below the rest.
-enum ToolId {
-  highlighter('Highlighter'),
-  fountainPen('fountainPen'),
-  ballpointPen('ballpointPen'),
-  pencil('Pencil'),
-  shapePen('ShapePen'),
-  eraser('Eraser'),
-  select('Select'),
-  textEditing('TextEditingTool'),
-  laserPointer('LaserPointer');
-
-  final String id;
-  const ToolId(this.id);
-
-  static const codec = EnumCodec(values);
-
-  static final _log = Logger('ToolId');
-
-  /// Before using this enum, we used the (runtimeType).toString()
-  /// as the identifier for pens.
-  /// This function converts those old identifiers to the new [ToolId]s.
-  static ToolId parsePenType(String? penType, {required ToolId fallback}) {
-    if (penType == null) {
-      return fallback;
-    }
-    if (penType == 'Pen') {
-      return .fountainPen;
-    }
-    for (final toolId in ToolId.values) {
-      if (penType == toolId.id) {
-        return toolId;
-      }
-    }
-    if (kDebugMode) {
-      throw ArgumentError.value(
-        penType,
-        'penType',
-        'Unknown pen type: `$penType`.',
-      );
-    }
-    _log.warning(
-      'Unknown pen type: `$penType`, using fallback `${fallback.id}`.',
-    );
-    return fallback;
-  }
-}
diff --git a/lib/data/tools/eraser.dart b/lib/data/tools/eraser.dart
@@ -3,6 +3,7 @@ import 'dart:ui';
 import 'package:saber/components/canvas/_stroke.dart';
 
 import 'package:saber/data/tools/_tool.dart';
+import 'package:sbn/tool_id.dart';
 
 double square(double x) => x * x;
 double sqrDistanceBetween(Offset p1, Offset p2) =>
diff --git a/lib/data/tools/laser_pointer.dart b/lib/data/tools/laser_pointer.dart
@@ -7,6 +7,7 @@ import 'package:saber/data/editor/page.dart';
 import 'package:saber/data/extensions/list_extensions.dart';
 import 'package:saber/data/tools/_tool.dart';
 import 'package:saber/data/tools/pen.dart';
+import 'package:sbn/tool_id.dart';
 
 class LaserPointer extends Tool {
   LaserPointer._();
diff --git a/lib/data/tools/pen.dart b/lib/data/tools/pen.dart
@@ -8,6 +8,7 @@ import 'package:saber/data/tools/_tool.dart';
 import 'package:saber/data/tools/highlighter.dart';
 import 'package:saber/data/tools/pencil.dart';
 import 'package:saber/i18n/strings.g.dart';
+import 'package:sbn/tool_id.dart';
 
 class Pen extends Tool {
   @protected
diff --git a/lib/data/tools/select.dart b/lib/data/tools/select.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:saber/components/canvas/_stroke.dart';
 import 'package:saber/components/canvas/image/editor_image.dart';
 import 'package:saber/data/tools/_tool.dart';
+import 'package:sbn/tool_id.dart';
 
 class Select extends Tool {
   Select._();
diff --git a/lib/pages/editor/editor.dart b/lib/pages/editor/editor.dart
@@ -30,7 +30,6 @@ import 'package:saber/components/toolbar/color_bar.dart';
 import 'package:saber/components/toolbar/editor_bottom_sheet.dart';
 import 'package:saber/components/toolbar/editor_page_manager.dart';
 import 'package:saber/components/toolbar/toolbar.dart';
-import 'package:saber/data/editor/_color_change.dart';
 import 'package:saber/data/editor/editor_core_info.dart';
 import 'package:saber/data/editor/editor_exporter.dart';
 import 'package:saber/data/editor/editor_history.dart';
@@ -50,6 +49,7 @@ import 'package:saber/data/tools/select.dart';
 import 'package:saber/data/tools/shape_pen.dart';
 import 'package:saber/i18n/strings.g.dart';
 import 'package:saber/pages/home/whiteboard.dart';
+import 'package:sbn/color_change.dart';
 import 'package:screenshot/screenshot.dart';
 import 'package:super_clipboard/super_clipboard.dart';
 
diff --git a/lib/pages/logs.dart b/lib/pages/logs.dart
@@ -4,8 +4,8 @@ import 'package:flutter/services.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:logging/logging.dart';
 import 'package:saber/components/theming/adaptive_icon.dart';
-import 'package:saber/components/theming/font_fallbacks.dart';
 import 'package:saber/i18n/strings.g.dart';
+import 'package:sbn/font_fallbacks.dart';
 
 final logsHistory = _LogsHistory();
 
diff --git a/packages/sbn/lib/color_change.dart b/packages/sbn/lib/color_change.dart
diff --git a/packages/sbn/lib/font_fallbacks.dart b/packages/sbn/lib/font_fallbacks.dart
diff --git a/packages/sbn/lib/has_size.dart b/packages/sbn/lib/has_size.dart
@@ -0,0 +1,6 @@
+import 'package:flutter/material.dart';
+
+class HasSize {
+  const HasSize(this.size);
+  final Size size;
+}
diff --git a/packages/sbn/lib/quill_styles.dart b/packages/sbn/lib/quill_styles.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_quill/flutter_quill.dart';
-import 'package:saber/components/theming/font_fallbacks.dart';
+import 'package:sbn/font_fallbacks.dart';
 
 typedef _ArgRecord = ({bool invert, Color secondary, int lineHeight});
 
diff --git a/packages/sbn/lib/tool_id.dart b/packages/sbn/lib/tool_id.dart
@@ -0,0 +1,53 @@
+import 'package:flutter/foundation.dart';
+import 'package:logging/logging.dart';
+import 'package:stow_codecs/stow_codecs.dart';
+
+/// An enum of all available tools.
+/// Note that the pens must be ordered in z-axis order,
+/// e.g. so that the highlighter is always below the rest.
+enum ToolId {
+  highlighter('Highlighter'),
+  fountainPen('fountainPen'),
+  ballpointPen('ballpointPen'),
+  pencil('Pencil'),
+  shapePen('ShapePen'),
+  eraser('Eraser'),
+  select('Select'),
+  textEditing('TextEditingTool'),
+  laserPointer('LaserPointer');
+
+  final String id;
+  const ToolId(this.id);
+
+  static const codec = EnumCodec(values);
+
+  static final _log = Logger('ToolId');
+
+  /// Before using this enum, we used the (runtimeType).toString()
+  /// as the identifier for pens.
+  /// This function converts those old identifiers to the new [ToolId]s.
+  static ToolId parsePenType(String? penType, {required ToolId fallback}) {
+    if (penType == null) {
+      return fallback;
+    }
+    if (penType == 'Pen') {
+      return .fountainPen;
+    }
+    for (final toolId in ToolId.values) {
+      if (penType == toolId.id) {
+        return toolId;
+      }
+    }
+    if (kDebugMode) {
+      throw ArgumentError.value(
+        penType,
+        'penType',
+        'Unknown pen type: `$penType`.',
+      );
+    }
+    _log.warning(
+      'Unknown pen type: `$penType`, using fallback `${fallback.id}`.',
+    );
+    return fallback;
+  }
+}
diff --git a/packages/sbn/pubspec.yaml b/packages/sbn/pubspec.yaml
@@ -9,6 +9,9 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  flutter_quill: ^11.5.0
+  logging: ^1.3.0
+  stow_codecs: ^1.4.0
 
 dev_dependencies:
   flutter_test:
diff --git a/test/stroke_shift_test.dart b/test/stroke_shift_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:perfect_freehand/perfect_freehand.dart';
 import 'package:saber/components/canvas/_stroke.dart';
-import 'package:saber/data/editor/page.dart';
+import 'package:sbn/has_size.dart';
 
 void main() {
   test('Stroke.shift(offset)', () {
diff --git a/test/stroke_svg_test.dart b/test/stroke_svg_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:perfect_freehand/perfect_freehand.dart';
 import 'package:saber/components/canvas/_stroke.dart';
-import 'package:saber/data/editor/page.dart';
+import 'package:sbn/has_size.dart';
 
 const _pageSize = Size(100, 100);
 const _penSize = 1.0;
diff --git a/test/tools_eraser_test.dart b/test/tools_eraser_test.dart
@@ -4,8 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:perfect_freehand/perfect_freehand.dart';
 import 'package:saber/components/canvas/_stroke.dart';
-import 'package:saber/data/editor/page.dart';
 import 'package:saber/data/tools/eraser.dart';
+import 'package:sbn/has_size.dart';
 
 final _options = StrokeOptions(
   size: 1, // small size so we have more precision in test
diff --git a/test/tools_select_test.dart b/test/tools_select_test.dart
@@ -4,8 +4,8 @@ import 'package:perfect_freehand/perfect_freehand.dart';
 import 'package:saber/components/canvas/_asset_cache.dart';
 import 'package:saber/components/canvas/_stroke.dart';
 import 'package:saber/components/canvas/image/editor_image.dart';
-import 'package:saber/data/editor/page.dart';
 import 'package:saber/data/tools/select.dart';
+import 'package:sbn/has_size.dart';
 
 void main() {
   group('Select tool', () {
