feat: set default pen size to 5

saber-notes · Feb 14, 2024 · 728e4b2 · 728e4b2
1 parent 9581093
commit 728e4b2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/lib/data/tools/pen.dart b/lib/data/tools/pen.dart
@@ -97,13 +97,22 @@ class Pen extends Tool {
     return stroke;
   }
 
-  static StrokeOptions get fountainPenOptions => StrokeOptions();
-  static StrokeOptions get ballpointPenOptions => StrokeOptions();
-  static StrokeOptions get shapePenOptions => StrokeOptions();
-  static StrokeOptions get highlighterOptions => StrokeOptions(
-        size: StrokeOptions.defaultSize * 5,
+  /// The default stroke options.
+  ///
+  /// Note that these are different to the default options in [StrokeOptions]
+  /// e.g. [StrokeOptions.defaultSize] for historical reasons
+  /// (i.e. [StrokeOptions.toJson] does not include default values.)
+  static final defaultOptions = StrokeOptions(
+    size: 5,
+  );
+
+  static StrokeOptions get fountainPenOptions => defaultOptions.copyWith();
+  static StrokeOptions get ballpointPenOptions => defaultOptions.copyWith();
+  static StrokeOptions get shapePenOptions => defaultOptions.copyWith();
+  static StrokeOptions get highlighterOptions => defaultOptions.copyWith(
+        size: 50,
       );
-  static StrokeOptions get pencilOptions => StrokeOptions(
+  static StrokeOptions get pencilOptions => defaultOptions.copyWith(
         streamline: 0.1,
         start: StrokeEndOptions.start(taperEnabled: true),
         end: StrokeEndOptions.end(taperEnabled: true),

diff --git a/test/prefs_test.dart b/test/prefs_test.dart
@@ -30,7 +30,7 @@ void main() {
             PlainPref('testPlainPrefStrokeOptions', defaultValue),
         defaultValue: defaultValue,
         alteredValue: defaultValue.copyWith(
-          size: StrokeOptions.defaultSize / 2,
+          size: defaultValue.size * 2,
         ),
       );
     });