Merge branch 'main' into MoveSelectionToAnotherPage

saber-notes · Jan 16, 2024 · b5c1609 · b5c1609
2 parents bc46c97 + 56784d6
commit b5c1609
Show file tree

Hide file tree

Showing 60 changed files with 93 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -338,8 +338,8 @@ If you like Saber, please consider supporting it by:
 [google_play]: https://play.google.com/store/apps/details?id=com.adilhanney.saber
 [snap]: https://snapcraft.io/saber
 [app_store]: https://apps.apple.com/us/app/saber/id1671523739
-[download_windows]: https://github.com/saber-notes/saber/releases/download/v0.19.1/SaberInstaller_v0.19.1.exe
-[download_appimage]: https://github.com/saber-notes/saber/releases/download/v0.19.1/Saber-0.19.1-x86_64.AppImage
+[download_windows]: https://github.com/saber-notes/saber/releases/download/v0.19.2/SaberInstaller_v0.19.2.exe
+[download_appimage]: https://github.com/saber-notes/saber/releases/download/v0.19.2/Saber-0.19.2-x86_64.AppImage
 
 [nextcloud]: https://nc.saber.adil.hanney.org/
 

diff --git a/flatpak/com.adilhanney.saber.metainfo.xml b/flatpak/com.adilhanney.saber.metainfo.xml
@@ -239,6 +239,11 @@
     </screenshots>
 
     <releases>
+        <release version="0.19.2" type="development" date="2024-01-16">
+            <description>
+                <p>Strokes that had jagged edges have now been smoothed out, particularly ones drawn with a mouse or trackpad.</p>
+            </description>
+        </release>
         <release version="0.19.1" type="development" date="2024-01-09">
             <description>
                 <ul>

diff --git a/installers/desktop_inno_script.iss b/installers/desktop_inno_script.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Saber"
-#define MyAppVersion "0.19.1"
+#define MyAppVersion "0.19.2"
 #define MyAppPublisher "Adil Hanney"
 #define MyAppURL "https://github.com/saber-notes/saber"
 #define MyAppExeName "saber.exe"

diff --git a/lib/components/canvas/_circle_stroke.dart b/lib/components/canvas/_circle_stroke.dart
@@ -93,7 +93,7 @@ class CircleStroke extends Stroke {
         .map((radians) => Offset(cos(radians), sin(radians)))
         .map((unitDir) => unitDir * radius + center)
         .toList();
-    _path = Path()..addPolygon(_polygon, true);
+    _path = Path()..addOval(Rect.fromCircle(center: center, radius: radius));
     _polygonNeedsUpdating = false;
   }
 

diff --git a/lib/components/canvas/_rectangle_stroke.dart b/lib/components/canvas/_rectangle_stroke.dart
@@ -89,7 +89,7 @@ class RectangleStroke extends Stroke {
 
   void _updatePolygon() {
     _polygon = _getPolygon();
-    _path = Path()..addPolygon(_polygon, true);
+    _path = Path()..addRect(rect);
     _polygonNeedsUpdating = false;
   }
 

diff --git a/lib/components/canvas/_stroke.dart b/lib/components/canvas/_stroke.dart
@@ -46,7 +46,7 @@ class Stroke {
 
   void _updatePolygon() {
     _polygon = _getPolygon();
-    _path = Path()..addPolygon(_polygon, true);
+    _path = _getPath();
     _polygonNeedsUpdating = false;
   }
 
@@ -174,6 +174,9 @@ class Stroke {
 
     final minDistance = options.size * thresholdMultiplier;
 
+    // Remove points with null pressure because they were duplicates
+    points.removeWhere((point) => point.pressure == null);
+
     for (int i = 1; i < points.length - 1; i++) {
       final point = points[i];
       final prev = points[i - 1];
@@ -203,8 +206,6 @@ class Stroke {
     if (rememberSimulatedPressure) {
       // Ensure we don't simulate pressure again
       options.simulatePressure = false;
-      // Remove points with null pressure because they were duplicates
-      points.removeWhere((point) => point.pressure == null);
       // Remove points that are too close together
       optimisePoints();
       // Get polygon again with slightly different input
@@ -214,6 +215,29 @@ class Stroke {
     return polygon;
   }
 
+  /// Returns a [Path] that represents the stroke.
+  ///
+  /// If the stroke is not complete,
+  /// the path will just follow the polygon for performance.
+  ///
+  /// If the stroke is complete,
+  /// the path will be a smooth curve between the points.
+  Path _getPath() {
+    if (!options.isComplete) {
+      return Path()..addPolygon(_polygon, true);
+    }
+
+    final path = Path();
+    path.moveTo(_polygon.first.dx, _polygon.first.dy);
+    for (int i = 1; i < _polygon.length - 1; i++) {
+      final p1 = _polygon[i];
+      final p2 = _polygon[i + 1];
+      final mid = (p1 + p2) / 2;
+      path.quadraticBezierTo(p1.dx, p1.dy, mid.dx, mid.dy);
+    }
+    return path..close();
+  }
+
   String toSvgPath(Size pageSize) {
     String toSvgPoint(Offset point) {
       return '${point.dx} '

diff --git a/lib/data/tools/pen.dart b/lib/data/tools/pen.dart
@@ -73,7 +73,9 @@ class Pen extends Tool {
     currentStroke = Stroke(
       color: color,
       pressureEnabled: pressureEnabled,
-      options: options.copyWith(),
+      options: options.copyWith(
+        isComplete: false,
+      ),
       pageIndex: pageIndex,
       penType: runtimeType.toString(),
     );

diff --git a/lib/data/version.dart b/lib/data/version.dart
@@ -2,10 +2,10 @@
 // Run `./scripts/apply_version.sh --help` for more information.
 
 /// The current app version as an ordinal number.
-const int buildNumber = 19010;
+const int buildNumber = 19020;
 
 /// The current app version as a string.
-const String buildName = '0.19.1';
+const String buildName = '0.19.2';
 
 /// The year in which the current version was released.
 const int buildYear = 2024;
diff --git a/metadata/ar/changelogs/19020.txt b/metadata/ar/changelogs/19020.txt
@@ -0,0 +1,2 @@
+وقد تم الآن سلاسة الخنقات التي كانت تحمل حوافاً مزيفة، لا سيما تلك التي تم سحبها مع فأر أو صعقة.
+.
diff --git a/metadata/ar/changelogs/190203.txt b/metadata/ar/changelogs/190203.txt
@@ -0,0 +1 @@
+metadata/ar/changelogs/19020.txt
diff --git a/metadata/cs/changelogs/19020.txt b/metadata/cs/changelogs/19020.txt
@@ -0,0 +1 @@
+Tahy, které měly zubaté okraje, byly nyní vyhlazeny, zejména ty kreslené myší nebo trackpadem.
diff --git a/metadata/cs/changelogs/190203.txt b/metadata/cs/changelogs/190203.txt
@@ -0,0 +1 @@
+metadata/cs/changelogs/19020.txt
diff --git a/metadata/de/changelogs/19020.txt b/metadata/de/changelogs/19020.txt
@@ -0,0 +1,2 @@
+Strokes, die geklemmte Kanten hatten, wurden nun geglättet, insbesondere mit einer Maus oder einem Trackpad gezogen.
+.
diff --git a/metadata/de/changelogs/190203.txt b/metadata/de/changelogs/190203.txt
@@ -0,0 +1 @@
+metadata/de/changelogs/19020.txt
diff --git a/metadata/en-US/changelogs/19020.txt b/metadata/en-US/changelogs/19020.txt
@@ -0,0 +1 @@
+Strokes that had jagged edges have now been smoothed out, particularly ones drawn with a mouse or trackpad.
diff --git a/metadata/en-US/changelogs/190203.txt b/metadata/en-US/changelogs/190203.txt
@@ -0,0 +1 @@
+metadata/en-US/changelogs/19020.txt
diff --git a/metadata/es/changelogs/19020.txt b/metadata/es/changelogs/19020.txt
@@ -0,0 +1 @@
+Los trazos que tenían bordes irregulares ahora se han suavizado, en particular los dibujados con el mouse o el trackpad.
diff --git a/metadata/es/changelogs/190203.txt b/metadata/es/changelogs/190203.txt
@@ -0,0 +1 @@
+metadata/es/changelogs/19020.txt
diff --git a/metadata/fa/changelogs/19020.txt b/metadata/fa/changelogs/19020.txt
@@ -0,0 +1,2 @@
+سکته هایی که لبه های آویزان داشته اند اکنون صاف شده اند، به ویژه آنهایی که با یک ماوس یا ردیاب کشیده شده اند.
+.
diff --git a/metadata/fa/changelogs/190203.txt b/metadata/fa/changelogs/190203.txt
@@ -0,0 +1 @@
+metadata/fa/changelogs/19020.txt
diff --git a/metadata/fr/changelogs/19020.txt b/metadata/fr/changelogs/19020.txt
@@ -0,0 +1 @@
+Les traits aux bords irréguliers ont désormais été lissés, en particulier ceux dessinés avec une souris ou un trackpad.
diff --git a/metadata/fr/changelogs/190203.txt b/metadata/fr/changelogs/190203.txt
@@ -0,0 +1 @@
+metadata/fr/changelogs/19020.txt
diff --git a/metadata/he/changelogs/19020.txt b/metadata/he/changelogs/19020.txt
@@ -0,0 +1 @@
+משיכות עם קצוות משוננים הוחלקו כעת, במיוחד אלה שצוירו באמצעות עכבר או משטח עקיבה.
diff --git a/metadata/he/changelogs/190203.txt b/metadata/he/changelogs/190203.txt
@@ -0,0 +1 @@
+metadata/he/changelogs/19020.txt
diff --git a/metadata/hu/changelogs/19020.txt b/metadata/hu/changelogs/19020.txt
@@ -0,0 +1 @@
+A szaggatott élekkel rendelkező vonásokat most kisimítottuk, különösen az egérrel vagy görgetőpaddal rajzolottakat.
diff --git a/metadata/hu/changelogs/190203.txt b/metadata/hu/changelogs/190203.txt
@@ -0,0 +1 @@
+metadata/hu/changelogs/19020.txt
diff --git a/metadata/it/changelogs/19020.txt b/metadata/it/changelogs/19020.txt
@@ -0,0 +1 @@
+I tratti che presentavano bordi frastagliati ora sono stati smussati, in particolare quelli disegnati con il mouse o il trackpad.
diff --git a/metadata/it/changelogs/190203.txt b/metadata/it/changelogs/190203.txt
@@ -0,0 +1 @@
+metadata/it/changelogs/19020.txt
diff --git a/metadata/ja/changelogs/19020.txt b/metadata/ja/changelogs/19020.txt
@@ -0,0 +1 @@
+特にマウスやトラックパッドで描画されたストロークなど、ギザギザのエッジがあったストロークが滑らかになりました。
diff --git a/metadata/ja/changelogs/190203.txt b/metadata/ja/changelogs/190203.txt
@@ -0,0 +1 @@
+metadata/ja/changelogs/19020.txt
diff --git a/metadata/pt-BR/changelogs/19020.txt b/metadata/pt-BR/changelogs/19020.txt
@@ -0,0 +1,2 @@
+Os traços que tinham bordas irregulares foram alisados, particularmente aqueles desenhados com um mouse ou trackpad.
+.
diff --git a/metadata/pt-BR/changelogs/190203.txt b/metadata/pt-BR/changelogs/190203.txt
@@ -0,0 +1 @@
+metadata/pt-BR/changelogs/19020.txt
diff --git a/metadata/ru/changelogs/19020.txt b/metadata/ru/changelogs/19020.txt
@@ -0,0 +1 @@
+Штрихи с неровными краями теперь сглажены, особенно те, которые нарисованы с помощью мыши или трекпада.
diff --git a/metadata/ru/changelogs/190203.txt b/metadata/ru/changelogs/190203.txt
@@ -0,0 +1 @@
+metadata/ru/changelogs/19020.txt
diff --git a/metadata/tr/changelogs/19020.txt b/metadata/tr/changelogs/19020.txt
@@ -0,0 +1,2 @@
+Şimdi jagged kenarları olan 0.00s, özellikle bir fare ya da izpad ile çizilenler.
+.
diff --git a/metadata/tr/changelogs/190203.txt b/metadata/tr/changelogs/190203.txt
@@ -0,0 +1 @@
+metadata/tr/changelogs/19020.txt
diff --git a/metadata/zh-Hans-CN/changelogs/19020.txt b/metadata/zh-Hans-CN/changelogs/19020.txt
@@ -0,0 +1 @@
+具有锯齿状边缘的笔画现在已被平滑，特别是使用鼠标或触控板绘制的笔画。
diff --git a/metadata/zh-Hans-CN/changelogs/190203.txt b/metadata/zh-Hans-CN/changelogs/190203.txt
@@ -0,0 +1 @@
+metadata/zh-Hans-CN/changelogs/19020.txt
diff --git a/metadata/zh-Hant-TW/changelogs/19020.txt b/metadata/zh-Hant-TW/changelogs/19020.txt
@@ -0,0 +1 @@
+具有鋸齒狀邊緣的筆畫現在已被平滑，特別是使用滑鼠或觸控板繪製的筆畫。
diff --git a/metadata/zh-Hant-TW/changelogs/190203.txt b/metadata/zh-Hant-TW/changelogs/190203.txt
@@ -0,0 +1 @@
+metadata/zh-Hant-TW/changelogs/19020.txt
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 0.19.1+19010
+version: 0.19.2+19020
 
 environment:
   sdk: ">=3.0.0 <4.0.0"

diff --git a/scripts/translate_changelogs.dart b/scripts/translate_changelogs.dart
@@ -119,6 +119,16 @@ void main() async {
     }
 
     // Response might be something like "Invalid request: request (276) exceeds text limit (250)"
+    const failurePrefixes = [
+      'Invalid request: request (',
+      'None is not supported',
+    ];
+    if (failurePrefixes.any(translatedChangelog.startsWith)) {
+      print('${' ' * stepPrefix.length}  ! Translation invalid, skipping...');
+      someTranslationsFailed = true;
+      continue;
+    }
+
     const bullet = '•';
     if (englishChangelog.contains(bullet) &&
         !translatedChangelog.contains(bullet)) {

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -36,7 +36,7 @@ parts:
   saber:
     after: [rustup]
     source: https://github.com/saber-notes/saber.git
-    source-tag: 'v0.19.1'
+    source-tag: 'v0.19.2'
     plugin: flutter
     #build-attributes: [enable-patchelf]
     build-packages:

diff --git a/test/sbn_examples/v17_squiggles.sbn2.dark.png b/test/sbn_examples/v17_squiggles.sbn2.dark.png
diff --git a/test/sbn_examples/v17_squiggles.sbn2.light.png b/test/sbn_examples/v17_squiggles.sbn2.light.png
diff --git a/test/sbn_examples/v18_highlighter.sbn2.dark.png b/test/sbn_examples/v18_highlighter.sbn2.dark.png
diff --git a/test/sbn_examples/v18_highlighter.sbn2.light.png b/test/sbn_examples/v18_highlighter.sbn2.light.png
diff --git a/test/sbn_examples/v18_highlighter.sbn2.pdf.png b/test/sbn_examples/v18_highlighter.sbn2.pdf.png
diff --git a/test/sbn_examples/v18_pencil.sbn2.dark.png b/test/sbn_examples/v18_pencil.sbn2.dark.png
diff --git a/test/sbn_examples/v18_pencil.sbn2.light.png b/test/sbn_examples/v18_pencil.sbn2.light.png
diff --git a/test/sbn_examples/v18_pencil.sbn2.pdf.png b/test/sbn_examples/v18_pencil.sbn2.pdf.png
diff --git a/test/sbn_examples/v19_pens.sbn2 b/test/sbn_examples/v19_pens.sbn2
diff --git a/test/sbn_examples/v19_pens.sbn2.dark.png b/test/sbn_examples/v19_pens.sbn2.dark.png
diff --git a/test/sbn_examples/v19_pens.sbn2.light.png b/test/sbn_examples/v19_pens.sbn2.light.png
diff --git a/test/sbn_examples/v19_pens.sbn2.pdf.png b/test/sbn_examples/v19_pens.sbn2.pdf.png
diff --git a/test/sbn_examples/v6_stress_test_179.sbn.dark.png b/test/sbn_examples/v6_stress_test_179.sbn.dark.png
diff --git a/test/sbn_examples/v6_stress_test_179.sbn.light.png b/test/sbn_examples/v6_stress_test_179.sbn.light.png
diff --git a/test/sbn_examples/v9_single_stroke.sbn.dark.png b/test/sbn_examples/v9_single_stroke.sbn.dark.png
diff --git a/test/sbn_examples/v9_single_stroke.sbn.light.png b/test/sbn_examples/v9_single_stroke.sbn.light.png
diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc
@@ -63,13 +63,13 @@ IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
 #ifdef FLUTTER_BUILD_NUMBER
 #define  VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
 #else
-#define VERSION_AS_NUMBER 0,19,1,0
+#define VERSION_AS_NUMBER 0,19,2,0
 #endif
 
 #ifdef FLUTTER_BUILD_NAME
 #define  VERSION_AS_STRING #FLUTTER_BUILD_NAME
 #else
-#define VERSION_AS_STRING "0.19.1.0"
+#define VERSION_AS_STRING "0.19.2.0"
 #endif
 
 VS_VERSION_INFO VERSIONINFO