update of additional samples to iink 2.1.1

Author: Yuntaek Rim

README.md

@@ -8,7 +8,7 @@ This repository comes in addition with further advanced Android examples that de
 
 ## Installation
 
-1. Clone the examples repository  `git clone https://github.com/MyScript/iink_sdk-additional-examples-android.git`.
+1. Clone the examples repository `git clone https://github.com/MyScript/iink_sdk-additional-examples-android.git`.
 
 2. If you already have a certificate go to next step, else claim to receive the free license to start develop your application by following the first steps of [Getting Started](https://developer.myscript.com/getting-started).
 
@@ -31,14 +31,14 @@ This repository provides you with an additional set of ready-to-use examples bas
  <img src="batch.gif" alt="batch sample" width="302">
 </div>
 
-NB: you will retrieve data converted in your device internal storage : Android\data\com.myscript.iink.samples.batchmode\files
+NB: you will retrieve data converted in your device internal storage: `Android/data/com.myscript.iink.samples.batchmode/files`
 
 2. The exercise assessment illustrates the case when you want to use several writing areas each one for a specific purpose in your application. It is thus using multiple editors, one per writing area, as each one has a different purpose:
 - First one is dedicated to "Math" content types
-- Second one  is dedicated to "Math" content types but with user defined gramar which is dynamically loaded at start.
+- Second one is dedicated to "Math" content types but with a user defined grammar which is dynamically loaded at start.
 - Third one is dedicated to "Text" content types
-- Fourth one  is dedicated to "Diagram" content types
-- Fifth one  is dedicated to "Draw" content types
+- Fourth one is dedicated to "Diagram" content types
+- Fifth one is dedicated to "Draw" content types
 
 <div align="center">
  <img src="assessment.gif" alt="assessment sample" width="302">
@@ -52,7 +52,7 @@ NB: you will retrieve data converted in your device internal storage : Android\d
             val partType = "Raw Content" // change to "Text Document" if you want to test
 ~~~
 <div align="center">
- <img src="search-sample.gif" alt="search sample"  width="302">
+ <img src="search-sample.gif" alt="search sample" width="302">
 </div>
 
 ## Documentation

UIReferenceImplementation/build.gradle

@@ -3,13 +3,15 @@ plugins {
 }
 
 android {
-    compileSdkVersion project.ext.compileSdkVersion
+    namespace 'com.myscript.iink.uireferenceimplementation'
+
+    compileSdk project.ext.compileSdk
 
     defaultConfig {
-        minSdkVersion project.ext.minSdkVersion
-        targetSdkVersion project.ext.targetSdkVersion
-        versionCode 2010
-        versionName '2.0.1'
+        minSdk project.ext.minSdk
+        targetSdk project.ext.targetSdk
+        versionCode 2110
+        versionName '2.1.1'
 
         vectorDrawables.useSupportLibrary true
     }
@@ -18,5 +20,7 @@ android {
 dependencies {
     implementation "androidx.appcompat:appcompat:${project.ext.appcompatVersion}"
     implementation "com.google.code.gson:gson:${project.ext.gsonVersion}"
+    // iink SDK.
+    // once iink wil be published we will use this
     api "com.myscript:iink:${project.ext.iinkVersionName}"
 }

UIReferenceImplementation/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="com.myscript.iink.uireferenceimplementation" />
+<manifest/>

UIReferenceImplementation/src/main/assets/fonts/MyScriptInter-Bold.otf

@@ -0,0 +1,43 @@
+package com.myscript.iink.uireferenceimplementation;
+
+import com.myscript.iink.ContentSelection;
+import com.myscript.iink.Editor;
+
+/**
+ * Describes the actions available for a given selection or block.
+ *
+ * @since 2.0
+ */
+public enum ContextualActions {
+    /**
+     * Add block
+     */
+    ADD_BLOCK,
+    /**
+     * Remove block or selection
+     */
+    REMOVE,
+    /**
+     * Convert.
+     * @see Editor#getSupportedTargetConversionStates(ContentSelection)
+     */
+    CONVERT,
+    /**
+     * Copy block or selection
+     */
+    COPY,
+    /**
+     * Paste current copy
+     */
+    PASTE,
+    /**
+     * Export.
+     * @see Editor#getSupportedExportMimeTypes(ContentSelection)
+     */
+    EXPORT,
+    /**
+     * Format text.
+     * @see Editor#getSupportedTextFormats(ContentSelection)
+     */
+    FORMAT_TEXT
+}

UIReferenceImplementation/src/main/assets/fonts/MyScriptInter-Regular.otf

@@ -5,7 +5,6 @@
 import com.myscript.iink.ContentBlock;
 import com.myscript.iink.ContentPart;
 import com.myscript.iink.ContentSelection;
-import com.myscript.iink.ContextualActions;
 import com.myscript.iink.Editor;
 
 import java.util.EnumSet;
@@ -32,7 +31,7 @@ public static EnumSet<ContextualActions> getAvailableActionsForBlock(@NonNull Ed
             boolean onTextDocument = "Text Document".equals(part != null ? part.getType() : null);
             boolean blockIsEmpty = editor.isEmpty(block);
 
-            boolean displayAddBlock = editor.getSupportedAddBlockTypes().length > 0 && isRootBlock;
+            boolean displayAddBlock = editor.getSupportedAddBlockTypes().length > 0 && (!onTextDocument || isRootBlock);
             boolean displayRemove = !isRootBlock;
             boolean displayCopy = !isRootBlock || !onTextDocument;
             boolean displayConvert = !blockIsEmpty && editor.getSupportedTargetConversionStates(block).length > 0;

UIReferenceImplementation/src/main/assets/fonts/STIX-Italic.otf

@@ -37,9 +37,7 @@ public class EditorView extends FrameLayout implements IRenderTarget, InputContr
   @NonNull
   private final OfflineSurfaceManager offlineSurfaceManager;
   @Nullable
-  private IRenderView renderView;
-  @Nullable
-  private IRenderView[] layerViews;
+  private LayerView layerView;
 
   private Map<String, Typeface> typefaceMap = new HashMap<>();
 
@@ -70,46 +68,22 @@ protected void onFinishInflate()
     for (int i = 0, count = getChildCount(); i < count; ++i)
     {
       View view = getChildAt(i);
-      if (view instanceof IRenderView)
+      if (view instanceof LayerView)
       {
-        IRenderView renderView = (IRenderView) view;
-        if (renderView.isSingleLayerView())
-        {
-          if (layerViews == null)
-            layerViews = new IRenderView[2];
-          if (renderView.getType() == LayerType.MODEL)
-            layerViews[0] = renderView;
-          else if (renderView.getType() == LayerType.CAPTURE)
-          {
-            layerViews[1] = renderView;
-          }
-          else
-          {
-            throw new RuntimeException("Unknown layer view type");
-          }
-        }
-        else
-        {
-          this.renderView = renderView;
-        }
+        layerView = (LayerView) view;
 
-        renderView.setRenderTarget(this);
+        layerView.setRenderTarget(this);
         if (editor != null)
         {
-          renderView.setEditor(editor);
+          layerView.setEditor(editor);
         }
         if (imageLoader != null)
         {
-          renderView.setImageLoader(imageLoader);
+          layerView.setImageLoader(imageLoader);
         }
 
-        renderView.setCustomTypefaces(typefaceMap);
-
-        if (view instanceof LayerView)
-        {
-          LayerView layerView = (LayerView) view;
-          layerView.setOfflineSurfaceManager(offlineSurfaceManager);
-        }
+        layerView.setCustomTypefaces(typefaceMap);
+        layerView.setOfflineSurfaceManager(offlineSurfaceManager);
       }
     }
   }
@@ -125,19 +99,9 @@ public void setEditor(@Nullable Editor editor)
     if (editor != null)
     {
       renderer = editor.getRenderer();
-      if (renderView != null)
+      if (layerView != null)
       {
-        renderView.setEditor(editor);
-      }
-      else if (layerViews != null)
-      {
-        for (IRenderView layerView : layerViews)
-        {
-          if (layerView != null)
-          {
-            layerView.setEditor(editor);
-          }
-        }
+        layerView.setEditor(editor);
       }
       if (viewWidth > 0 && viewHeight > 0)
       {
@@ -168,17 +132,9 @@ public void setImageLoader(ImageLoader imageLoader)
     this.imageLoader = imageLoader;
 
     // transfer image loader to render views
-    if (renderView != null)
-    {
-      renderView.setImageLoader(imageLoader);
-    }
-    else if (layerViews != null)
+    if (layerView != null)
     {
-      for (IRenderView layerView : layerViews)
-      {
-        if (layerView != null)
-          layerView.setImageLoader(imageLoader);
-      }
+      layerView.setImageLoader(imageLoader);
     }
   }
 
@@ -193,10 +149,10 @@ public void setTypefaces(@NonNull Map<String, Typeface> typefaceMap)
     for (int i = 0, count = getChildCount(); i < count; ++i)
     {
       View view = getChildAt(i);
-      if (view instanceof IRenderView)
+      if (view instanceof LayerView)
       {
-        IRenderView renderView = (IRenderView) view;
-        renderView.setCustomTypefaces(typefaceMap);
+        LayerView layerView = (LayerView) view;
+        layerView.setCustomTypefaces(typefaceMap);
       }
     }
   }
@@ -239,19 +195,9 @@ public final void invalidate(@NonNull Renderer renderer, int x, int y, int width
     if (width <= 0 || height <= 0)
       return;
 
-    if (renderView != null)
+    if (layerView != null)
     {
-      renderView.update(renderer, x, y, width, height, layers);
-    }
-    else if (layerViews != null)
-    {
-      for (LayerType type : layers)
-      {
-        int layerID = (type == LayerType.MODEL) ? 0 : 1;
-        IRenderView layerView = layerViews[layerID];
-        if (layerView != null)
-          layerView.update(renderer, x, y, width, height, layers);
-      }
+      layerView.update(renderer, x, y, width, height, layers);
     }
   }
 
@@ -331,10 +277,6 @@ public void showScrollbars()
     editor.clampViewOffset(bottomRightPx);
     float pageHeightPx = bottomRightPx.y - topLeftPx.y + viewHeightPx;
     float pageWidthPx = bottomRightPx.x - topLeftPx.x + viewWidthPx;
-    for (IRenderView layerView : layerViews)
-    {
-      if (layerView instanceof LayerView && layerView.getType() == LayerType.MODEL)
-        ((LayerView) layerView).setScrollbar(renderer, viewWidthPx, (int) pageWidthPx, (int) topLeftPx.x, viewHeightPx, (int) pageHeightPx, (int) topLeftPx.y);
-    }
+    layerView.setScrollbar(renderer, viewWidthPx, (int) pageWidthPx, (int) topLeftPx.x, viewHeightPx, (int) pageHeightPx, (int) topLeftPx.y);
   }
 }