Merge branch 'main' into main

lib/pages/editor/editor.dart

@@ -1124,7 +1124,7 @@ class EditorState extends State<Editor> {
       page.backgroundImage = PdfEditorImage(
         id: coreInfo.nextImageId++,
         pdfBytes: pdfBytes,
-        pdfFile: null,
+        pdfFile: pdfFile,
         pdfPage: currentPdfPage,
         pageIndex: coreInfo.pages.length,
         pageSize: pageSize,

packages/onyxsdk_pen/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.2.2
+
+- Improved pub.dev scores
+
+## 1.2.1
+
+- Updated the Onyx SDK
+
 ## 1.2.0
 
 - Added an optional `init` method to improve initial performance on non-Onyx Android devices. See the README for more information.

packages/onyxsdk_pen/android/build.gradle

@@ -56,7 +56,7 @@ android {
     }
 
     dependencies {
-        implementation('com.onyx.android.sdk:onyxsdk-device:1.2.21')
-        implementation('com.onyx.android.sdk:onyxsdk-pen:1.4.4')
+        implementation('com.onyx.android.sdk:onyxsdk-device:1.2.27')
+        implementation('com.onyx.android.sdk:onyxsdk-pen:1.4.8')
     }
 }

packages/onyxsdk_pen/example/.gitignore

@@ -42,3 +42,5 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+pubspec.lock

packages/onyxsdk_pen/pubspec.yaml

@@ -1,6 +1,6 @@
 name: onyxsdk_pen
 description: This plugin integrates the Onyx Pen SDK into Flutter to improve e-ink responsiveness in drawing apps.
-version: 1.2.0
+version: 1.2.2
 homepage: https://github.com/saber-notes/saber/tree/main/packages/onyxsdk_pen
 
 topics:

packages/onyxsdk_pen_dummy/pubspec.yaml

@@ -1,6 +1,8 @@
-name: onyxsdk_pen
+# This name should be replaced with `onyxsdk_pen` by the `patches/remove_proprietary_dependencies.sh` script.
+# This is because the Dart analyzer gets confused because there are two pubspec.yaml files with the name `onyxsdk_pen`.
+name: onyxsdk_pen_dummy
 description: This plugin integrates the Onyx Pen SDK into Flutter to improve e-ink responsiveness in drawing apps.
-version: 1.2.0
+version: 1.2.2
 homepage: https://github.com/saber-notes/saber/tree/main/packages/onyxsdk_pen
 publish_to: 'none'
 

patches/remove_proprietary_dependencies.sh

@@ -10,6 +10,16 @@ else
   sed -i -e 's!/onyxsdk_pen!/onyxsdk_pen_dummy!' pubspec.yaml
 fi
 
+# find "name: onyxsdk_pen_dummy" and replace with "name: onyxsdk_pen"
+echo -n "Patching onyxsdk_pen_dummy to have name onyxsdk_pen: "
+# check if packages/onyxsdk_pen_dummy/pubspec.yaml contains name: onyxsdk_pen_dummy
+if grep -q "name: onyxsdk_pen_dummy" packages/onyxsdk_pen_dummy/pubspec.yaml; then
+  echo "found"
+  sed -i -e 's!name: onyxsdk_pen_dummy!name: onyxsdk_pen!' packages/onyxsdk_pen_dummy/pubspec.yaml
+else
+  echo "already done"
+fi
+
 # remove Onyx maven repo
 echo -n "Removing Onyx,jitpack maven repo: "
 # check if android/build.gradle contains "repo.boox.com"