canvas: wrap in OnyxSdkPenArea

android/app/build.gradle

@@ -55,7 +55,7 @@ android {
         applicationId "com.adilhanney.saber"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
-        minSdkVersion 18
+        minSdkVersion 23
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -85,7 +85,10 @@ android {
         }
     }
 
-
+    packagingOptions {
+        pickFirst 'lib/*/libc++_shared.so'
+        pickFirst 'androidsupportmultidexversion.txt'
+    }
 }
 
 flutter {

android/app/src/main/AndroidManifest.xml

@@ -18,7 +18,8 @@
         android:allowBackup="false"
         android:fullBackupContent="false"
         android:launchMode="singleTask"
-        tools:targetApi="donut">
+        tools:targetApi="donut"
+        tools:replace="android:label,android:allowBackup">
         <activity
             android:name=".MainActivity"
             android:exported="true"

android/build.gradle

@@ -15,6 +15,13 @@ allprojects {
     repositories {
         google()
         mavenCentral()
+        maven {
+            url "https://jitpack.io"
+        }
+        maven {
+            url "http://repo.boox.com/repository/maven-public/"
+            allowInsecureProtocol true
+        }
     }
 }
 

lib/components/canvas/canvas.dart

@@ -1,5 +1,6 @@
 
 import 'package:flutter/material.dart';
+import 'package:onyxsdk_pen/onyxsdk_pen_area.dart';
 import 'package:saber/components/canvas/color_extensions.dart';
 import 'package:saber/data/editor/editor_core_info.dart';
 import 'package:saber/data/editor/page.dart';
@@ -45,14 +46,16 @@ class Canvas extends StatelessWidget {
             )],
           ),
           child: !placeholder ? ClipRect(
-            child: InnerCanvas(
-              key: innerCanvasKey,
-              pageIndex: pageIndex,
-              width: pageSize.width,
-              height: pageSize.height,
-              textEditing: textEditing,
-              coreInfo: coreInfo,
-              currentStroke: currentStroke,
+            child: OnyxSdkPenArea(
+              child: InnerCanvas(
+                key: innerCanvasKey,
+                pageIndex: pageIndex,
+                width: pageSize.width,
+                height: pageSize.height,
+                textEditing: textEditing,
+                coreInfo: coreInfo,
+                currentStroke: currentStroke,
+              ),
             ),
           ) : SizedBox(
             width: pageSize.width,

pubspec.lock

@@ -675,6 +675,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.1"
+  onyxsdk_pen:
+    dependency: "direct main"
+    description:
+      path: "packages/onyxsdk_pen"
+      relative: true
+    source: path
+    version: "0.0.1"
   open_as_default:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -136,6 +136,9 @@ dependencies:
 
   flutter_localized_locales: ^2.0.3
 
+  onyxsdk_pen:
+    path: packages/onyxsdk_pen
+
 dev_dependencies:
   test: ^1.21.4
   flutter_test: