Pull request #80: [HWG] Adding switch between chinese and english.

Merge in SDK/iink_sdk-additional-examples-android from hwg-chinese to master

* commit 'f7e3fdf5c71354ce776cfb7aec3bd7ce17117524':
  [HWG] Update profile preview spinner style
  [HWG] Adding chinese profile pictures
  [HWG] Let iink handle spaces.
  [HWG] Crash fix
  [HWG] Add user spaces
  [HWG] Switch from predifined profile enum to index
  [HWG] Fixed gesture recognition
  [HWG] Disabling shape to improve chinese recognition
  [HWG] Improving profile list display
  [HWG] Only 10 profiles for chinese
  [HWG] Adding chinese res download
  [HWG] Updating conf
  [HWG] Adding reset random seed
  [HWG] Default text size to 4 in chinese
  [HWG] Fixing chinese profile numbering
  [HWG] Safer gesture disabling
  [HWG] Recognition should be in chinese now.
  [HWG] Menu with numbers for chinese profile.
  [HWG] Adding switch between chinese and english.

Author: yannchevalier

samples/hwgeneration/build.gradle

@@ -3,6 +3,8 @@ plugins {
     id 'kotlin-android'
 }
 
+ext.additionalLanguages = ["zh_CN"]
+
 android {
     namespace 'com.myscript.iink.samples.hwgeneration'
 

samples/hwgeneration/src/main/assets/parts/interactivity.json

@@ -2,26 +2,20 @@
   "raw-content": {
     "session-time": 100,
     "classification": {
-      "types": [ "text", "shape", "drawing" ]
+      "types": [ "text", "drawing" ]
     },
     "recognition": {
-      "types": [ "text", "shape", "math" ]
+      "types": [ "text" ]
     },
     "convert": {
       "shape-on-hold": true,
-      "types": [ "text", "shape", "math" ]
-    },
-    "shape": {
-      "snap-axis": [ "triangle", "rectangle", "rhombus", "parallelogram", "ellipse" ]
+      "types": [ "text" ]
     },
     "eraser": {
       "erase-precisely": false,
       "dynamic-radius": true
     },
     "auto-connection": true,
-    "interactive-blocks": {
-      "feedback": [ "math" ]
-    },
     "pen": {
       "gestures": [ "scratch-out", "strike-through", "surround", "long-press" ]
     },

samples/hwgeneration/src/main/java/com/myscript/iink/samples/hwgeneration/EditorViewModel.kt

@@ -107,7 +107,13 @@ class EditorViewModel(application: Application) : AndroidViewModel(application)
         override fun onJoin(editor: Editor, tool: PointerTool?, gestureStrokeId: String, before: NativeObjectHandle<ContentSelection>, after: NativeObjectHandle<ContentSelection>): GestureAction = GestureAction.APPLY_GESTURE
         override fun onInsert(editor: Editor, tool: PointerTool?, gestureStrokeId: String, before: NativeObjectHandle<ContentSelection>, after: NativeObjectHandle<ContentSelection>): GestureAction = GestureAction.APPLY_GESTURE
         override fun onStrikethrough(editor: Editor, tool: PointerTool?, gestureStrokeId: String, selection: NativeObjectHandle<ContentSelection>): GestureAction = GestureAction.APPLY_GESTURE
-        override fun onScratch(editor: Editor, tool: PointerTool?, gestureStrokeId: String, selection: NativeObjectHandle<ContentSelection>): GestureAction = GestureAction.APPLY_GESTURE
+        override fun onScratch(editor: Editor, tool: PointerTool?, gestureStrokeId: String, selection: NativeObjectHandle<ContentSelection>): GestureAction {
+            return if (isWriting.value == true) {
+                GestureAction.IGNORE
+            } else {
+                GestureAction.APPLY_GESTURE
+            }
+        }
     }
 
     private var contentPackage: ContentPackage? = null
@@ -153,6 +159,9 @@ class EditorViewModel(application: Application) : AndroidViewModel(application)
 
                     val configuration = context.assets.open("parts/interactivity.json").bufferedReader().use(Reader::readText)
                     editor.configuration.inject(configuration)
+
+                    editor.configuration.setString("lang", "zh_CN")
+
                     editor.part = contentPart
                     editor.setGestureHandler(gestureHandler)
 
@@ -205,6 +214,7 @@ class EditorViewModel(application: Application) : AndroidViewModel(application)
     }
 
     fun setSelectionMode(enabled: Boolean) {
+        editor?.waitForIdle()
         if (enabled) {
             editor?.toolController?.setToolForType(PointerType.PEN, PointerTool.SELECTOR)
         } else {
@@ -236,9 +246,6 @@ class EditorViewModel(application: Application) : AndroidViewModel(application)
         if (_isWriting.value == true) return
 
         viewModelScope.launch(Dispatchers.Default) {
-            val previousGestureConf = editor.configuration.getBoolean("gesture.enable")
-            editor.configuration.setBoolean("gesture.enable", false)
-
             setSelectionMode(false)
 
             withContext(Dispatchers.Main) {
@@ -279,8 +286,6 @@ class EditorViewModel(application: Application) : AndroidViewModel(application)
                 }
             }
 
-            editor.configuration.setBoolean("gesture.enable", previousGestureConf)
-
             withContext(Dispatchers.Main) {
                 _isWriting.value = false
             }

samples/hwgeneration/src/main/java/com/myscript/iink/samples/hwgeneration/GenerationViewModel.kt

@@ -17,7 +17,6 @@ import com.myscript.iink.HandwritingResult
 import com.myscript.iink.IHandwritingGeneratorListener
 import com.myscript.iink.MimeType
 import com.myscript.iink.PointerEvent
-import com.myscript.iink.PredefinedHandwritingProfileId
 import com.myscript.iink.graphics.Transform
 import com.myscript.iink.samples.hwgeneration.None.word
 import kotlinx.coroutines.Dispatchers
@@ -40,23 +39,28 @@ data class Message(
 }
 
 data class GenerationProfile(
-    val id: PredefinedHandwritingProfileId = PredefinedHandwritingProfileId.DEFAULT,
+    val index: Int = 0,
     val profilePath: String? = null) {
 
     companion object {
-        fun fromId(id: PredefinedHandwritingProfileId): GenerationProfile {
+        fun fromId(id: Int): GenerationProfile {
             return GenerationProfile(id, null)
         }
 
         fun fromPath(path: String): GenerationProfile {
-            return GenerationProfile(PredefinedHandwritingProfileId.DEFAULT, path)
+            return GenerationProfile(-1, path)
         }
     }
 }
 
+enum class HWGLanguage {
+    ENGLISH,
+    CHINESE
+}
+
 class GenerationViewModel(application: Application, private val engine: Engine) : AndroidViewModel(application) {
 
-    private val generator: HandwritingGenerator
+    private var generator: HandwritingGenerator? = null
 
     private val _isGenerating = MutableLiveData(false)
     val isGenerating: LiveData<Boolean>
@@ -70,34 +74,60 @@ class GenerationViewModel(application: Application, private val engine: Engine)
     val hwrResults: LiveData<List<HWRResult>>
         get() = _hwrResults
 
-    private var _message = MutableLiveData<Message?>(null)
+    private val _message = MutableLiveData<Message?>(null)
     val message: LiveData<Message?>
         get() = _message
 
+    private val _language = MutableLiveData(DEFAULT_LANGUAGE)
+    val language: LiveData<HWGLanguage>
+        get() = _language
+
     init {
         _isGenerating.value = false
 
-        generator = engine.createHandwritingGenerator()
+        setLanguage(DEFAULT_LANGUAGE)
     }
 
     private interface HWResultListener {
         fun onResult(result: HWRResult)
     }
 
+    fun setLanguage(language: HWGLanguage) {
+        if (generator != null && _language.value == language) return
+
+        generator?.cancel()
+
+        engine.configuration.apply {
+            when (language) {
+                HWGLanguage.ENGLISH -> setString("handwriting-generation.init.resource","en-hw-gen.res")
+                HWGLanguage.CHINESE -> setString("handwriting-generation.init.resource","zh-hw-gen.res")
+            }
+        }
+        generator = engine.createHandwritingGenerator()
+
+        viewModelScope.launch(Dispatchers.Main) {
+            _language.value = language
+        }
+    }
+
     fun cancel() {
-        generator.cancel()
+        generator?.cancel()
         viewModelScope.launch(Dispatchers.Main) {
             _isGenerating.value = false
             _hwrResults.value = emptyList()
         }
     }
 
     fun getProfiles(): List<GenerationProfile> {
+        val generator = generator ?: return emptyList()
+
         val userProfiles = File(getApplication<Application>().filesDir, PROFILE_FOLDER).listFiles()?.map { file ->
             GenerationProfile.fromPath(file.absolutePath)
         } ?: emptyList()
 
-        val predefinedProfiles = PredefinedHandwritingProfileId.entries.toList().map {
+        var predefinedProfiles = generator.createHandwritingProfileBuilder().predefinedProfileCount.let { count ->
+            (0 until count).toList()
+        }.map {
             GenerationProfile.fromId(it)
         }
 
@@ -113,6 +143,8 @@ class GenerationViewModel(application: Application, private val engine: Engine)
     }
 
     private fun buildProfileInternal(selection: ContentSelection? = null, iinkFile: File? = null) {
+        val generator = generator ?: return
+
         viewModelScope.launch(Dispatchers.Main) {
             _isProfileBuilding.value = true
 
@@ -147,14 +179,14 @@ class GenerationViewModel(application: Application, private val engine: Engine)
         }
     }
 
-    fun generateHandwriting(inputSentence: String, generationProfile: GenerationProfile, inputTextSize: Float, inputX: Float, inputY: Float, width: Float, transform: Transform) {
+    fun generateHandwriting(inputSentence: String, generationProfile: GenerationProfile, inputTextSize: Float, inputX: Float, inputY: Float, width: Float, transform: Transform, forceRandomSeed: Boolean = false) {
         if (inputSentence.isEmpty()) return
 
         viewModelScope.launch(Dispatchers.Main) {
             _isGenerating.value = true
 
             withContext(Dispatchers.IO) {
-                generate(inputSentence, generationProfile, inputTextSize, inputX, inputY, width, transform, object : HWResultListener {
+                generate(inputSentence, generationProfile, inputTextSize, inputX, inputY, width, transform, forceRandomSeed, object : HWResultListener {
                     override fun onResult(result: HWRResult) {
                         viewModelScope.launch(Dispatchers.Main) {
                             val previousList: MutableList<HWRResult> = _hwrResults.value?.toMutableList() ?: mutableListOf()
@@ -168,20 +200,22 @@ class GenerationViewModel(application: Application, private val engine: Engine)
         }
     }
 
-    private fun generate(sentence: String, generationProfile: GenerationProfile, textSize: Float, xOffset: Float, yOffset: Float, width: Float, transform: Transform, listener: HWResultListener): HWRResult {
+    private fun generate(sentence: String, generationProfile: GenerationProfile, textSize: Float, xOffset: Float, yOffset: Float, width: Float, transform: Transform, forceRandomSeed: Boolean, listener: HWResultListener): HWRResult {
+        val generator = generator ?: return None
+
         val builder = generator.createHandwritingProfileBuilder()
 
         val profile = if (generationProfile.profilePath != null && File(generationProfile.profilePath).exists()) {
             builder.load(generationProfile.profilePath)
         } else {
-            builder.createFromId(generationProfile.id)
+            builder.getPredefinedProfileAt(generationProfile.index)
         }
 
         val indexLock = Any()
         var currentPointerEventIndex = 0
         var wordIndex = 0
 
-        val words = sentence.split(" ").filter { it.isNotEmpty() }
+        val words = sentence.split(" ").map { "$it " }
 
         generator.setListener(object: IHandwritingGeneratorListener {
             override fun onPartialResult(generator: HandwritingGenerator, result: HandwritingResult) {
@@ -201,7 +235,9 @@ class GenerationViewModel(application: Application, private val engine: Engine)
         })
 
         generator.start("Text", profile, engine.createParameterSet().apply {
-            setBoolean("handwriting-generation.session.force-new-line", false)
+            setBoolean("handwriting-generation.session.preserve-new-line", language.value != HWGLanguage.CHINESE)
+
+            setNumber("handwriting-generation.session.seed", if (forceRandomSeed) 0L else -1)
 
             val invertTransform = Transform(transform).apply {
                 invert()
@@ -252,6 +288,8 @@ class GenerationViewModel(application: Application, private val engine: Engine)
         private const val LINE_GAP_RATIO = 3
 
         private const val PROFILE_FOLDER = "profiles"
+
+        private val DEFAULT_LANGUAGE = HWGLanguage.ENGLISH
     }
 }