Upgrading to iink 4.0

Author: yannchevalier

Diff for: samples/UIReferenceImplementation/src/main/java/com/myscript/iink/uireferenceimplementation/Canvas.java

@@ -19,6 +19,7 @@
 import com.myscript.iink.GLRenderer;
 import com.myscript.iink.ParameterSet;
 import com.myscript.iink.graphics.Color;
+import com.myscript.iink.graphics.ExtraBrushStyle;
 import com.myscript.iink.graphics.FillRule;
 import com.myscript.iink.graphics.ICanvas;
 import com.myscript.iink.graphics.IPath;
@@ -481,14 +482,14 @@ public boolean isExtraBrushSupported(@NonNull String brushName)
 
   @Override
   public void drawStrokeWithExtraBrush(@NonNull InkPoints[] vInkPoints, int temporaryPoints,
-                                       float strokeWidth, @NonNull String brushName, boolean fullStroke, long id)
+                                       @NonNull ExtraBrushStyle style, boolean fullStroke, long id)
   {
     Objects.requireNonNull(canvas);
 
-    if (!isExtraBrushSupported(brushName))
+    if (!isExtraBrushSupported(style.brushName))
       return;
 
-    if (vInkPoints.length == 0 || vInkPoints[0].x.length == 0 || strokeWidth <= 0.f || android.graphics.Color.alpha(fillPaint.getColor()) == 0)
+    if (vInkPoints.length == 0 || vInkPoints[0].x.length == 0 || style.strokeWidth <= 0.f || android.graphics.Color.alpha(fillPaint.getColor()) == 0)
       return;
 
     if (!glRenderer.isInitialized())
@@ -503,14 +504,14 @@ public void drawStrokeWithExtraBrush(@NonNull InkPoints[] vInkPoints, int tempor
       canvas.setMatrix(null); // GLRenderer works with pixels
       fillPaint.setXfermode(xferModeSrcOver);
 
-      PointF strokeOrigin = glRenderer.drawStroke(vInkPoints, temporaryPoints, transformValues, brushName, fullStroke, id, strokeWidth, fillPaint);
+      PointF strokeOrigin = glRenderer.drawStroke(vInkPoints, temporaryPoints, transformValues, style, fillPaint, fullStroke, id);
       Bitmap strokeBitmap = glRenderer.saveStroke();
       if (strokeBitmap != null)
         canvas.drawBitmap(strokeBitmap, strokeOrigin.x, strokeOrigin.y, fillPaint);
 
       if (temporaryPoints > 0 && vInkPoints.length == 1)
       {
-        PointF temporaryOrigin = glRenderer.drawTemporary(vInkPoints, temporaryPoints, transformValues, brushName, strokeWidth, fillPaint);
+        PointF temporaryOrigin = glRenderer.drawTemporary(vInkPoints, temporaryPoints, transformValues, style, fillPaint);
         Bitmap temporaryBitmap = glRenderer.saveTemporary();
         if (temporaryBitmap != null)
           canvas.drawBitmap(temporaryBitmap, temporaryOrigin.x, temporaryOrigin.y, fillPaint);

Diff for: samples/UIReferenceImplementation/src/main/java/com/myscript/iink/uireferenceimplementation/ContextualActions.java

@@ -36,8 +36,18 @@ public enum ContextualActions {
      */
     EXPORT,
     /**
-     * Format text.
+     * Change Text blocks format.
      * @see Editor#getSupportedTextFormats(ContentSelection)
      */
-    FORMAT_TEXT
+    FORMAT_TEXT,
+    /**
+     * Change selection mode.
+     * @see Editor#getAvailableSelectionModes()
+     */
+    SELECTION_MODE,
+    /**
+     * Change selection type.
+     * @see Editor#getAvailableSelectionTypes(ContentSelection)
+     */
+    SELECTION_TYPE
 }

Diff for: samples/UIReferenceImplementation/src/main/java/com/myscript/iink/uireferenceimplementation/ContextualActionsHelper.java

@@ -5,6 +5,7 @@
 import com.myscript.iink.ContentBlock;
 import com.myscript.iink.ContentPart;
 import com.myscript.iink.ContentSelection;
+import com.myscript.iink.ContentSelectionMode;
 import com.myscript.iink.Editor;
 
 import java.util.EnumSet;
@@ -37,6 +38,8 @@ public static EnumSet<ContextualActions> getAvailableActionsForBlock(@NonNull Ed
             boolean displayConvert = !blockIsEmpty && editor.getSupportedTargetConversionStates(block).length > 0;
             boolean displayExport = editor.getSupportedExportMimeTypes(block).length > 0;
             boolean displayFormatText = editor.getSupportedTextFormats(block).size() > 0;
+            boolean displaySelectionMode = editor.getAvailableSelectionModes().size() > 0;
+            boolean displaySelectionType = editor.getAvailableSelectionTypes(block).length > 0;
 
             if (displayAddBlock) actions.add(ContextualActions.ADD_BLOCK);
             if (displayRemove) actions.add(ContextualActions.REMOVE);
@@ -45,6 +48,8 @@ public static EnumSet<ContextualActions> getAvailableActionsForBlock(@NonNull Ed
             if (isRootBlock) actions.add(ContextualActions.PASTE);
             if (displayExport) actions.add(ContextualActions.EXPORT);
             if (displayFormatText) actions.add(ContextualActions.FORMAT_TEXT);
+            if (displaySelectionMode) actions.add(ContextualActions.SELECTION_MODE);
+            if (displaySelectionType) actions.add(ContextualActions.SELECTION_TYPE);
         }
         return actions;
     }
@@ -57,12 +62,16 @@ public static EnumSet<ContextualActions> getAvailableActionsForSelection(@NonNul
         boolean displayConvert = editor.getSupportedTargetConversionStates(selection).length > 0;
         boolean displayExport = editor.getSupportedExportMimeTypes(selection).length > 0;
         boolean displayFormatText = selection != null && !editor.getSupportedTextFormats(selection).isEmpty();
+        boolean displaySelectionMode = editor.getAvailableSelectionModes().size() > 0;
+        boolean displaySelectionType = editor.getAvailableSelectionTypes(selection).length > 0;
 
         actions.add(ContextualActions.REMOVE);
         if (displayConvert) actions.add(ContextualActions.CONVERT);
         actions.add(ContextualActions.COPY);
         if (displayExport) actions.add(ContextualActions.EXPORT);
         if (displayFormatText) actions.add(ContextualActions.FORMAT_TEXT);
+        if (displaySelectionMode) actions.add(ContextualActions.SELECTION_MODE);
+        if (displaySelectionType) actions.add(ContextualActions.SELECTION_TYPE);
 
         return actions;
     }

Diff for: samples/UIReferenceImplementation/src/main/java/com/myscript/iink/uireferenceimplementation/FontMetricsProvider.java

@@ -184,6 +184,7 @@ public synchronized GlyphMetrics[] getGlyphMetrics(Text text, TextSpan[] spans)
 
       int typefaceStyle = FontUtils.getTypefaceStyle(style);
       int fontSize = Math.round(y_mm2px(style.getFontSize()));
+      fontSize = Math.max(fontSize, 1);
       int start = text.getGlyphBeginAt(spans[i].beginPosition);
       int end = text.getGlyphEndAt(spans[i].endPosition - 1);
 

Diff for: samples/UIReferenceImplementation/src/main/java/com/myscript/iink/uireferenceimplementation/InputController.java

@@ -114,9 +114,10 @@ private boolean handleOnTouchForPointer(MotionEvent event, int actionMask, int p
   {
     final int pointerId = event.getPointerId(pointerIndex);
     final int pointerType = event.getToolType(pointerIndex);
+    final int historySize = event.getHistorySize();
+    final boolean useTiltInfo = pointerType == MotionEvent.TOOL_TYPE_STYLUS;
 
     int inputMode = getInputMode();
-
     if (inputMode == INPUT_MODE_FORCE_PEN)
     {
       iinkPointerType = PointerType.PEN;
@@ -131,13 +132,9 @@ else if (inputMode == INPUT_MODE_FORCE_TOUCH)
       {
         case MotionEvent.TOOL_TYPE_STYLUS:
           if (inputMode == INPUT_MODE_ERASER)
-          {
             iinkPointerType = PointerType.ERASER;
-          }
           else
-          {
             iinkPointerType = PointerType.PEN;
-          }
           break;
         case MotionEvent.TOOL_TYPE_FINGER:
         case MotionEvent.TOOL_TYPE_MOUSE:
@@ -150,71 +147,99 @@ else if (inputMode == INPUT_MODE_FORCE_TOUCH)
     }
 
     if (isScalingEnabled)
-    {
       scaleGestureDetector.onTouchEvent(event);
-    }
 
     if (iinkPointerType == PointerType.TOUCH)
-    {
       gestureDetector.onTouchEvent(event);
-    }
-
-    int historySize = event.getHistorySize();
 
     switch (actionMask)
     {
-      // ACTION_POINTER_DOWN is "A non-primary pointer has gone down", this is called only when a pointer is already on the touch.
+      // ACTION_POINTER_DOWN is "A non-primary pointer has gone down", only called when a pointer is already on the touchscreen.
       case MotionEvent.ACTION_POINTER_DOWN:
+      {
         isMultiFingerTouch = true;
         if (previousPointerId != -1)
         {
           editor.pointerCancel(previousPointerId);
           previousPointerId = -1;
         }
         return true;
-
+      }
       case MotionEvent.ACTION_DOWN:
+      {
         previousPointerId = pointerId;
         isMultiFingerTouch = false;
         // Request unbuffered events for tools that require low capture latency
         ToolController toolController = editor.getToolController();
         PointerTool tool = toolController.getToolForType(iinkPointerType);
         if (tool == PointerTool.PEN || tool == PointerTool.HIGHLIGHTER)
           editorView.requestUnbufferedDispatch(event);
+
         try
         {
-          editor.pointerDown(event.getX(pointerIndex), event.getY(pointerIndex), eventTimeOffset + event.getEventTime(), event.getPressure(), iinkPointerType, pointerId);
+          if (useTiltInfo)
+            editor.pointerDown(event.getX(pointerIndex), event.getY(pointerIndex), eventTimeOffset + event.getEventTime(),
+                event.getPressure(), event.getAxisValue(MotionEvent.AXIS_TILT, pointerIndex), event.getAxisValue(MotionEvent.AXIS_ORIENTATION, pointerIndex), iinkPointerType, pointerId);
+          else
+            editor.pointerDown(event.getX(pointerIndex), event.getY(pointerIndex), eventTimeOffset + event.getEventTime(), event.getPressure(), iinkPointerType, pointerId);
         }
-        catch(UnsupportedOperationException e) {
+        catch (UnsupportedOperationException e) {
           // Special case: pointerDown already called, discard previous and retry
           editor.pointerCancel(pointerId);
-          editor.pointerDown(event.getX(pointerIndex), event.getY(pointerIndex), eventTimeOffset + event.getEventTime(), event.getPressure(), iinkPointerType, pointerId);
+          if (useTiltInfo)
+            editor.pointerDown(event.getX(pointerIndex), event.getY(pointerIndex), eventTimeOffset + event.getEventTime(),
+                event.getPressure(), event.getAxisValue(MotionEvent.AXIS_TILT, pointerIndex), event.getAxisValue(MotionEvent.AXIS_ORIENTATION, pointerIndex), iinkPointerType, pointerId);
+          else
+            editor.pointerDown(event.getX(pointerIndex), event.getY(pointerIndex), eventTimeOffset + event.getEventTime(), event.getPressure(), iinkPointerType, pointerId);
         }
         return true;
-
+      }
       case MotionEvent.ACTION_MOVE:
+      {
         if (isMultiFingerTouch)
           return true;
 
         if (historySize > 0)
         {
           PointerEvent[] pointerEvents = new PointerEvent[historySize + 1];
-          for (int i = 0; i < historySize; ++i)
-            pointerEvents[i] = new PointerEvent(PointerEventType.MOVE, event.getHistoricalX(pointerIndex, i), event.getHistoricalY(pointerIndex, i), eventTimeOffset + event.getHistoricalEventTime(i), event.getHistoricalPressure(pointerIndex, i), iinkPointerType, pointerId);
-          pointerEvents[historySize] = new PointerEvent(PointerEventType.MOVE, event.getX(pointerIndex), event.getY(pointerIndex), eventTimeOffset + event.getEventTime(), event.getPressure(), iinkPointerType, pointerId);
+          if (useTiltInfo)
+          {
+            for (int i = 0; i < historySize; ++i)
+            {
+              pointerEvents[i] = new PointerEvent(PointerEventType.MOVE, event.getHistoricalX(pointerIndex, i), event.getHistoricalY(pointerIndex, i), eventTimeOffset + event.getHistoricalEventTime(i),
+                  event.getHistoricalPressure(pointerIndex, i), event.getHistoricalAxisValue(MotionEvent.AXIS_TILT, pointerIndex, i), event.getHistoricalAxisValue(MotionEvent.AXIS_ORIENTATION, pointerIndex, i), iinkPointerType, pointerId);
+            }
+            pointerEvents[historySize] = new PointerEvent(PointerEventType.MOVE, event.getX(pointerIndex), event.getY(pointerIndex), eventTimeOffset + event.getEventTime(),
+                event.getPressure(), event.getAxisValue(MotionEvent.AXIS_TILT, pointerIndex), event.getAxisValue(MotionEvent.AXIS_ORIENTATION, pointerIndex), iinkPointerType, pointerId);
+          }
+          else
+          {
+            for (int i = 0; i < historySize; ++i)
+            {
+              pointerEvents[i] = new PointerEvent(PointerEventType.MOVE, event.getHistoricalX(pointerIndex, i), event.getHistoricalY(pointerIndex, i), eventTimeOffset + event.getHistoricalEventTime(i),
+                  event.getHistoricalPressure(pointerIndex, i), iinkPointerType, pointerId);
+            }
+            pointerEvents[historySize] = new PointerEvent(PointerEventType.MOVE, event.getX(pointerIndex), event.getY(pointerIndex), eventTimeOffset + event.getEventTime(), event.getPressure(), iinkPointerType, pointerId);
+          }
           editor.pointerEvents(pointerEvents, true);
         }
-        else
+        else // no history
         {
-          editor.pointerMove(event.getX(pointerIndex), event.getY(pointerIndex), eventTimeOffset + event.getEventTime(), event.getPressure(), iinkPointerType, pointerId);
+          if (useTiltInfo)
+            editor.pointerMove(event.getX(pointerIndex), event.getY(pointerIndex), eventTimeOffset + event.getEventTime(),
+                event.getPressure(), event.getAxisValue(MotionEvent.AXIS_TILT, pointerIndex), event.getAxisValue(MotionEvent.AXIS_ORIENTATION, pointerIndex), iinkPointerType, pointerId);
+          else
+            editor.pointerMove(event.getX(pointerIndex), event.getY(pointerIndex), eventTimeOffset + event.getEventTime(), event.getPressure(), iinkPointerType, pointerId);
         }
         return true;
-
-      // ACTION_POINTER_UP is "A non-primary pointer has gone up", at least one finger is still on the touch.
+      }
+      // ACTION_POINTER_UP is "A non-primary pointer has gone up", at least one finger is still on the touchscreen.
       case MotionEvent.ACTION_POINTER_UP:
+      {
         return true;
-
+      }
       case MotionEvent.ACTION_UP:
+      {
         if (isMultiFingerTouch)
         {
           isMultiFingerTouch = false;
@@ -223,17 +248,37 @@ else if (inputMode == INPUT_MODE_FORCE_TOUCH)
         if (historySize > 0)
         {
           PointerEvent[] pointerEvents = new PointerEvent[historySize];
-          for (int i = 0; i < historySize; ++i)
-            pointerEvents[i] = new PointerEvent(PointerEventType.MOVE, event.getHistoricalX(pointerIndex, i), event.getHistoricalY(pointerIndex, i), eventTimeOffset + event.getHistoricalEventTime(i), event.getHistoricalPressure(pointerIndex, i), iinkPointerType, pointerId);
+          if (useTiltInfo)
+          {
+            for (int i = 0; i < historySize; ++i)
+            {
+              pointerEvents[i] = new PointerEvent(PointerEventType.MOVE, event.getHistoricalX(pointerIndex, i), event.getHistoricalY(pointerIndex, i), eventTimeOffset + event.getHistoricalEventTime(i),
+                  event.getHistoricalPressure(pointerIndex, i), event.getHistoricalAxisValue(MotionEvent.AXIS_TILT, pointerIndex, i), event.getHistoricalAxisValue(MotionEvent.AXIS_ORIENTATION, pointerIndex, i), iinkPointerType, pointerId);
+            }
+          }
+          else
+          {
+            for (int i = 0; i < historySize; ++i)
+            {
+              pointerEvents[i] = new PointerEvent(PointerEventType.MOVE, event.getHistoricalX(pointerIndex, i), event.getHistoricalY(pointerIndex, i), eventTimeOffset + event.getHistoricalEventTime(i),
+                  event.getHistoricalPressure(pointerIndex, i), iinkPointerType, pointerId);
+            }
+          }
           editor.pointerEvents(pointerEvents, true);
         }
-        editor.pointerUp(event.getX(pointerIndex), event.getY(pointerIndex), eventTimeOffset + event.getEventTime(), event.getPressure(), iinkPointerType, pointerId);
-        return true;
+        if (useTiltInfo)
+          editor.pointerUp(event.getX(pointerIndex), event.getY(pointerIndex), eventTimeOffset + event.getEventTime(),
+              event.getPressure(), event.getAxisValue(MotionEvent.AXIS_TILT, pointerIndex), event.getAxisValue(MotionEvent.AXIS_ORIENTATION, pointerIndex), iinkPointerType, pointerId);
+        else
+          editor.pointerUp(event.getX(pointerIndex), event.getY(pointerIndex), eventTimeOffset + event.getEventTime(), event.getPressure(), iinkPointerType, pointerId);
 
+        return true;
+      }
       case MotionEvent.ACTION_CANCEL:
+      {
         editor.pointerCancel(pointerId);
         return true;
-
+      }
       default:
         return false;
     }

Diff for: samples/UIReferenceImplementation/src/main/java/com/myscript/iink/uireferenceimplementation/SmartGuideView.java

@@ -311,12 +311,15 @@ public void setEditor(@Nullable Editor editor)
       Engine engine = editor.getEngine();
 
       exportParams = engine.createParameterSet();
-      exportParams.setBoolean("export.jiix.text.words", true);
-      exportParams.setBoolean("export.jiix.strokes", false);
       exportParams.setBoolean("export.jiix.bounding-box", false);
       exportParams.setBoolean("export.jiix.glyphs", false);
       exportParams.setBoolean("export.jiix.primitives", false);
-      exportParams.setBoolean("export.jiix.chars", false);
+      exportParams.setBoolean("export.jiix.strokes", false);
+      exportParams.setBoolean("export.jiix.text.chars", false);
+      exportParams.setBoolean("export.jiix.text.lines", false);
+      exportParams.setBoolean("export.jiix.text.spans", false);
+      exportParams.setBoolean("export.jiix.text.structure", false);
+      exportParams.setBoolean("export.jiix.text.words", true);
 
       importParams = engine.createParameterSet();
       importParams.setString("diagram.import.jiix.action", "update");
@@ -330,7 +333,6 @@ public void setEditor(@Nullable Editor editor)
       fadeOutOtherDelay = configuration.getNumber("smart-guide.fade-out-delay.other", SMART_GUIDE_FADE_OUT_DELAY_OTHER_DEFAULT).intValue();
       removeHighlightDelay = configuration.getNumber("smart-guide.highlight-removal-delay", SMART_GUIDE_HIGHLIGHT_REMOVAL_DELAY_DEFAULT).intValue();
     }
-
   }
 
   public void setMenuListener(@Nullable MenuListener moreMenuListener)
@@ -408,7 +410,7 @@ public void contentChanged(@NonNull Editor editor, String[] blockIds)
       }
       else
       {
-        return;
+        update(null, UpdateCause.EDIT);
       }
     }
 

Diff for: samples/build.gradle

@@ -33,15 +33,19 @@ subprojects {
                 def resourcesURL = gradle.ext.iinkResourcesURL
                 def sourceUrls = ["${resourcesURL}/myscript-iink-recognition-diagram.zip",
                                   "${resourcesURL}/myscript-iink-recognition-raw-content.zip",
+                                  "${resourcesURL}/myscript-iink-recognition-raw-content2.zip",
                                   "${resourcesURL}/myscript-iink-recognition-math.zip",
+                                  "${resourcesURL}/myscript-iink-recognition-math2.zip",
                                   "${resourcesURL}/myscript-iink-recognition-text-en_US.zip"]
                 def targetDir = new File(proj.projectDir, "src/main/assets/")
                 def diagramConf = new File(targetDir, "conf/diagram.conf")
                 def rawContentConf = new File(targetDir, "conf/raw-content.conf")
+                def rawContent2Conf = new File(targetDir, "conf/raw-content2.conf")
                 def mathConf = new File(targetDir, "conf/math.conf")
+                def math2Conf = new File(targetDir, "conf/math2.conf")
                 def textConf = new File(targetDir, "conf/en_US.conf")
 
-                if (!diagramConf.exists() || !rawContentConf.exists() || !mathConf.exists() || !textConf.exists()) {
+                if (!diagramConf.exists() || !rawContentConf.exists() || !rawContent2Conf.exists() || !mathConf.exists() || !math2Conf.exists() || !textConf.exists()) {
                     def tmpAssetsDir = new File(proj.projectDir, "tmp-assets/")
                     def zipDir = new File(tmpAssetsDir, "zips")
 
@@ -68,10 +72,12 @@ subprojects {
                 def targetDir = new File(proj.projectDir, "src/main/assets/")
                 def diagramConf = new File(targetDir, "conf/diagram.conf")
                 def rawContentConf = new File(targetDir, "conf/raw-content.conf")
+                def rawContent2Conf = new File(targetDir, "conf/raw-content2.conf")
                 def mathConf = new File(targetDir, "conf/math.conf")
+                def math2Conf = new File(targetDir, "conf/math2.conf")
                 def textConf = new File(targetDir, "conf/en_US.conf")
 
-                if (!diagramConf.exists() || !rawContentConf.exists() || !mathConf.exists() || !textConf.exists()) {
+                if (!diagramConf.exists() || !rawContentConf.exists() || !rawContent2Conf.exists() || !mathConf.exists() || !math2Conf.exists() || !textConf.exists()) {
                     def tmpAssetsDir = new File(proj.projectDir, "tmp-assets/")
 
                     if (!tmpAssetsDir.isDirectory())