Version 1.16.3 release

Author: suragch

README.md

@@ -42,7 +42,7 @@ You can import `mongol-library` into your project from jCenter by adding the fol
 
 ```java
 dependencies {
-    implementation 'net.studymongolian:mongol-library:1.16.2'
+    implementation 'net.studymongolian:mongol-library:1.16.3'
 }
 ```
 
@@ -676,6 +676,7 @@ The keyboards are embedded in the keyboard container, which acts as a controller
 
 #### Version changes 
 
+* `1.16.3`: Make hooked Y the default when entering [Vowel + Y + I] using the `ImeContainer`
 * `1.16.2`: Shadow, text view, and edit text bug fixes
 * `1.16.1`: Added ability to set text shadow
 * `1.16.0`: Added ability to stroke text in `MongolTextView` and `MongolLayout`
@@ -746,6 +747,7 @@ The keyboards are embedded in the keyboard container, which acts as a controller
 ## Apps that use this library
 
 * [Demo app](https://github.com/suragch/mongol-library/tree/master/demo-app)
+* [Chimee](https://github.com/suragch/Chimee)
 * [Suryaa](https://github.com/suragch/Suryaa) 
 * [Todo Keyboard](https://github.com/suragch/TodoKeyboard)
 

README.zh-Hans.md

@@ -41,7 +41,7 @@
 
 ```java
 dependencies {
-    implementation 'net.studymongolian:mongol-library:1.16.2'
+    implementation 'net.studymongolian:mongol-library:1.16.3'
 }
 ```
 
@@ -464,6 +464,7 @@ String iyerSuffix = MongolCode.Suffix.IYER;                     // "\u202F\u1822
 ## 使用此库的应用
 
 - [Demo app 演示应用](https://github.com/suragch/mongol-library/tree/master/demo-app)
-- [Suryaa 外语记忆卡篇](https://github.com/suragch/Suryaa) 
+- [Chimee 输入法，文字工具](https://github.com/suragch/Chimee)
+- [Suryaa 蒙外语记忆卡篇](https://github.com/suragch/Suryaa)
 - [Todo 托忒输入法](https://github.com/suragch/TodoKeyboard)
 - *加你的应用。。。*

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         // NOTE: Do not place your application dependencies here; they belong

demo-app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "net.studymongolian.mongollibrarydemo"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 31
-        versionName "1.16.2"
+        versionCode 32
+        versionName "1.16.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

demo-app/release/demo-app-release.apk

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":31,"versionName":"1.16.2","enabled":true,"outputFile":"demo-app-release.apk","fullName":"release","baseName":"release"},"path":"demo-app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":32,"versionName":"1.16.3","enabled":true,"outputFile":"demo-app-release.apk","fullName":"release","baseName":"release"},"path":"demo-app-release.apk","properties":{}}]

demo-app/release/output.json

@@ -13,7 +13,7 @@ ext {
     siteUrl = 'https://github.com/suragch/mongol-library'
     gitUrl = 'https://github.com/suragch/mongol-library.git'
 
-    libraryVersion = '1.16.2'
+    libraryVersion = '1.16.3'
 
     developerId = 'suragch'
     developerName = 'Suragch'
@@ -29,8 +29,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 48
-        versionName "1.16.2"
+        versionCode 49
+        versionName "1.16.3"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

mongol-library/build.gradle

@@ -693,7 +693,7 @@ private void checkForFinishedWord(String textToBeAdded) {
         }
     }
 
-    private void commitText(String text) {
+    protected void commitText(String text) {
         InputConnection ic = getInputConnection();
         if (ic == null) return;
         ic.beginBatchEdit();
@@ -714,12 +714,29 @@ private void commitText(String text) {
             addSpacedPunctuation(ic, text, previousChar);
         } else if (isSingleZwjThatSplitsWord(ic, text)) {
             ic.commitText("" + MongolCode.Uni.ZWJ + SPACE + MongolCode.Uni.ZWJ, 1);
+        } else if (needsHookedYForVowelYI(ic, text)) {
+            ic.commitText("" + MongolCode.Uni.FVS1 + text, 1);
         } else {
             ic.commitText(text, 1);
         }
         ic.endBatchEdit();
     }
 
+    private boolean needsHookedYForVowelYI(InputConnection ic, String text) {
+        // XXX: Note that this makes it practically impossible for users to enter
+        //      spellings like BAYINA for the double long tooth rendering
+        // XXX: Developers can override this by subclassing ImeContainer
+        //      and overriding commitText()
+        if (text.length() != 1
+                || text.charAt(0) != MongolCode.Uni.I)
+            return false;
+        CharSequence previous = ic.getTextBeforeCursor(2, 0);
+        if (TextUtils.isEmpty(previous) || previous.length() != 2)
+            return false;
+        return (MongolCode.isVowel(previous.charAt(0))
+                && previous.charAt(1) == MongolCode.Uni.YA);
+    }
+
     private boolean isSingleZwjThatSplitsWord(InputConnection ic, String text) {
         if (text.length() != 1
                 || text.charAt(0) != MongolCode.Uni.ZWJ)

mongol-library/src/main/java/net/studymongolian/mongollibrary/ImeContainer.java

@@ -1029,12 +1029,6 @@ private List<PopupKeyCandidate> getCandidatesForYA() {
             return candidates;
         }
 
-        PopupKeyCandidate medial_YA_FVS1 = new PopupKeyCandidate(
-                "" + MongolCode.Uni.YA + MongolCode.Uni.FVS1,
-                "" + MongolCode.Uni.ZWJ + MongolCode.Uni.YA + MongolCode.Uni.FVS1 + MongolCode.Uni.ZWJ,
-                "" + MongolCode.Uni.YA + MongolCode.Uni.FVS1 + MongolCode.Uni.ZWJ);
-        candidates.add(medial_YA_FVS1);
-
         return candidates;
     }
 

mongol-library/src/main/java/net/studymongolian/mongollibrary/KeyboardAeiou.java

@@ -796,12 +796,6 @@ private List<PopupKeyCandidate> getCandidatesForY() {
             return candidates;
         }
 
-        PopupKeyCandidate medial_YA_FVS1 = new PopupKeyCandidate(
-                "" + MongolCode.Uni.YA + MongolCode.Uni.FVS1,
-                "" + MongolCode.Uni.ZWJ + MongolCode.Uni.YA + MongolCode.Uni.FVS1 + MongolCode.Uni.ZWJ,
-                "" + MongolCode.Uni.YA + MongolCode.Uni.FVS1 + MongolCode.Uni.ZWJ);
-        candidates.add(medial_YA_FVS1);
-
         return candidates;
     }