add Thai kbd (final?)

.gitignore

@@ -1,4 +1,5 @@
 notes.txt
+/other
 /files
 /misc
 tmp/

leankeykeyboard/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "org.liskovsoft.leankeykeyboard.pro"
         minSdkVersion project.properties.minSdkVersion
         targetSdkVersion project.properties.targetSdkVersion
-        versionCode 53
+        versionCode 56
-        versionName "4.3.3"
+        versionName "4.3.6"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

leankeykeyboard/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
     <uses-feature android:name="android.hardware.microphone" android:required="false"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
-    <application android:banner="@drawable/banner_app" android:label="LeanKey Keyboard Pro" android:icon="@drawable/ic_launcher" tools:targetApi="21">
+    <application android:banner="@drawable/banner_app" android:label="@string/ime_name" android:icon="@drawable/ic_launcher" tools:targetApi="21">
         <activity android:launchMode="singleTop" android:name="com.liskovsoft.inputchooser.SettingsActivity">
             <meta-data android:name="package" android:value="com.android.settings"/>
             <meta-data android:name="class" android:value="com.android.settings.Settings"/>
@@ -15,7 +15,7 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
             </intent-filter>
         </activity>
-        <service android:label="LeanKey Keyboard" android:name="com.google.leanback.ime.LeanbackImeService" android:permission="android.permission.BIND_INPUT_METHOD">
+        <service android:label="@string/ime_service_name" android:name="com.google.leanback.ime.LeanbackImeService" android:permission="android.permission.BIND_INPUT_METHOD">
             <intent-filter>
                 <action android:name="android.view.InputMethod"/>
             </intent-filter>

leankeykeyboard/src/main/java/com/google/android/leanback/ime/LeanbackKeyboardContainer.java

@@ -66,7 +66,6 @@ public class LeanbackKeyboardContainer {
     public static final int DIRECTION_LEFT = 1;
     public static final int DIRECTION_RIGHT = 4;
     private Keyboard mAbcKeyboard;
-    private Keyboard mAbcKeyboardRU;
     private Button mActionButtonView;
     private final float mAlphaIn;
     private final float mAlphaOut;
@@ -318,7 +317,9 @@ public class LeanbackKeyboardContainer {
     }
 
     /**
-     * All keyboard settings applied here
+     * Init currently displayed keyboard<br/>
+     * Note: all keyboard settings applied here<br/>
+     * Note: this method is called constantly on new field
      * @param resources resources (not used)
      * @param info current ime attributes
      */
@@ -1120,6 +1121,7 @@ public class LeanbackKeyboardContainer {
         LeanbackKeyboardView keyboardView = mMainKeyboardView;
         Keyboard keyboard = mKeyboardManager.getNextKeyboard();
         mInitialMainKeyboard = keyboard;
+        mAbcKeyboard = keyboard;
         keyboardView.setKeyboard(keyboard);
 
         showRunOnceDialog();

leankeykeyboard/src/main/res/values/arrays.xml

@@ -15,6 +15,7 @@
     <string-array name="additional_languages">
         <item>Russian|ru</item>
         <item>Ukrainian|uk</item>
+        <item>Thai|th</item>
         <item>Hebrew|he</item>
         <item>Arabic|ar</item>
         <item>Bulgarian|bg</item>

leankeykeyboard/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="ime_name">LeanKey Keyboard</string>
+    <string name="ime_name">LeanKey Keyboard Pro</string>
-    <string name="ime_service_name">LeanKey Keyboard</string>
+    <string name="ime_service_name">LeanKey Keyboard Pro</string>
     <string name="word_separators">" .,;:!?
 ()[]*&amp;@{}/&lt;>_+=|"</string>
     <string name="label_go_key">Go</string>

leankeykeyboard/src/main/res/xml/accent_a_th.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="ี" />
+        <Key android:keyLabel="๊" />
+        <Key android:keyLabel="ร" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_c_th.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="็" />
+        <Key android:keyLabel="่" />
+        <Key android:keyLabel="๋" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_d_th.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="ย" />
+        <Key android:keyLabel="บ" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_e_th.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="๓" />
+        <Key android:keyLabel="๔" />
+        <Key android:keyLabel="ุ" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_f_th.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="ฐ" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_g_th.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="ล" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_h_th.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="ฅ" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_i_th.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="๙" />
+        <Key android:keyLabel="ๆ" />
+        <Key android:keyLabel="๐" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_j_th.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="ฃ" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_k_th.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="ฟ" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_o_th.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="ไ" />
+        <Key android:keyLabel="ำ" />
+        <Key android:keyLabel="ฎ" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_p2_th.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="ธ" />
+        <Key android:keyLabel="ั" />
+        <Key android:keyLabel="ํ" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_p_th.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="พ" />
+        <Key android:keyLabel="ฑ" />
+        <Key android:keyLabel="ะ" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_q_th.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="ฝ" />
+        <Key android:keyLabel="ฦ" />
+        <Key android:keyLabel="๑" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_r_th.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="3641" />
+        <Key android:keyLabel="3638" />
+        <Key android:keyLabel="3662" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_s_th.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="ณ" />
+        <Key android:keyLabel="น" />
+        <Key android:keyLabel="ฯ" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_t_th.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="ค" />
+        <Key android:keyLabel="๕" />
+        <Key android:keyLabel="ต" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_u_th.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="ข" />
+        <Key android:keyLabel="๘" />
+        <Key android:keyLabel="ช" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_w_th.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="๒" />
+        <Key android:keyLabel="ภ" />
+        <Key android:keyLabel="๓" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_x_th.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="ด" />
+        <Key android:keyLabel="ฌ" />
+        <Key android:keyLabel="้" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_y_th.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="๖" />
+        <Key android:keyLabel="จ" />
+        <Key android:keyLabel="๗" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/accent_z_th.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:keyLabel="ฆ" />
+        <Key android:keyLabel="ก" />
+        <Key android:keyLabel="ฏ" />
+    </Row>
+</Keyboard>

leankeykeyboard/src/main/res/xml/qwerty_th.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Thai keyboard -->
+    <!-- https://en.wikipedia.org/wiki/Thai_(Unicode_block) -->
+    <Row android:rowEdgeFlags="top">
+        <Key android:codes="49" android:popupKeyboard="@xml/shift_1" android:keyEdgeFlags="left" android:keyLabel="1" />
+        <Key android:codes="50" android:popupKeyboard="@xml/shift_2" android:keyLabel="2" />
+        <Key android:codes="51" android:popupKeyboard="@xml/shift_3" android:keyLabel="3" />
+        <Key android:codes="52" android:popupKeyboard="@xml/shift_4" android:keyLabel="4" />
+        <Key android:codes="53" android:popupKeyboard="@xml/shift_5" android:keyLabel="5" />
+        <Key android:codes="54" android:popupKeyboard="@xml/shift_6" android:keyLabel="6" />
+        <Key android:codes="55" android:popupKeyboard="@xml/shift_7" android:keyLabel="7" />
+        <Key android:codes="56" android:popupKeyboard="@xml/shift_8" android:keyLabel="8" />
+        <Key android:codes="57" android:popupKeyboard="@xml/shift_9" android:keyLabel="9" />
+        <Key android:codes="48" android:popupKeyboard="@xml/shift_0" android:keyLabel="0" />
+        <Key android:codes="-5" android:keyEdgeFlags="right"         android:keyLabel="@string/keyboardview_keycode_delete" android:keyIcon="@drawable/ic_ime_delete" />
+    </Row>
+    <Row>
+        <Key android:popupKeyboard="@xml/accent_q_th"  android:keyLabel="ฝ" android:keyEdgeFlags="left" />
+        <Key android:popupKeyboard="@xml/accent_w_th"  android:keyLabel="๒" />
+        <Key android:popupKeyboard="@xml/accent_e_th"  android:keyLabel="๓" />
+        <Key android:popupKeyboard="@xml/accent_r_th"  android:keyLabel="ู" />
+        <Key android:popupKeyboard="@xml/accent_t_th"  android:keyLabel="ค" />
+        <Key android:popupKeyboard="@xml/accent_y_th"  android:keyLabel="๖" />
+        <Key android:popupKeyboard="@xml/accent_u_th"  android:keyLabel="ข" />
+        <Key android:popupKeyboard="@xml/accent_i_th"  android:keyLabel="๙" />
+        <Key android:popupKeyboard="@xml/accent_o_th"  android:keyLabel="ไ" />
+        <Key android:popupKeyboard="@xml/accent_p_th"  android:keyLabel="พ" />
+        <Key android:popupKeyboard="@xml/accent_p2_th" android:keyLabel="ธ" android:keyEdgeFlags="right" />
+    </Row>
+    <Row>
+        <Key android:popupKeyboard="@xml/accent_a_th"  android:keyLabel="ี" android:keyEdgeFlags="left" />
+        <Key android:popupKeyboard="@xml/accent_s_th"  android:keyLabel="ณ" />
+        <Key android:popupKeyboard="@xml/accent_d_th"  android:keyLabel="ย" />
+        <Key android:popupKeyboard="@xml/accent_f_th"  android:keyLabel="ฐ" />
+        <Key android:popupKeyboard="@xml/accent_g_th"  android:keyLabel="ล" />
+        <Key android:popupKeyboard="@xml/accent_h_th"  android:keyLabel="ฅ" />
+        <Key android:popupKeyboard="@xml/accent_j_th"  android:keyLabel="ฃ" />
+        <Key                                           android:keyLabel="ฟ" />
+        <Key                                           android:keyLabel="ฤ" />
+        <Key                                           android:keyLabel="ห" />
+        <Key                                           android:keyLabel="ş" android:keyEdgeFlags="right" />
+    </Row>
+    <Row>
+        <Key android:popupKeyboard="@xml/accent_z_th"  android:keyLabel="ฆ" android:keyEdgeFlags="left" />
+        <Key android:popupKeyboard="@xml/accent_x_th"  android:keyLabel="ด" />
+        <Key android:popupKeyboard="@xml/accent_c_th"  android:keyLabel="็" />
+        <Key                                           android:keyLabel="า" />
+        <Key                                           android:keyLabel="ษ" />
+        <Key                                           android:keyLabel="ส" />
+        <Key                                           android:keyLabel="ศ" />
+        <Key                                           android:keyLabel="ว" />
+        <Key                                           android:keyLabel="ซ" />
+        <Key                                           android:keyLabel="ง" />
+        <Key                                           android:keyLabel="," android:keyEdgeFlags="right" />
+    </Row>
+    <Row android:rowEdgeFlags="bottom">
+        <Key android:codes="-2" android:keyEdgeFlags="left" android:keyLabel="@string/keyboardview_keycode_mode_change" android:keyIcon="@drawable/ic_ime_symbols" />
+        <Key android:codes="-1" android:keyLabel="@string/keyboardview_keycode_shift" android:keyIcon="@drawable/ic_ime_shift_off" />
+        <Key android:codes="-9" android:keyLabel="@string/keyboardview_keycode_lang" android:keyIcon="@drawable/ic_ime_world" />
+        <Key android:keyWidth="@dimen/space_key_width" android:codes="32" android:keyLabel="@string/keyboardview_keycode_space" android:keyIcon="@drawable/ic_ime_space_th" />
+        <Key android:codes="-3" android:keyLabel="@string/keyboardview_keycode_left" android:keyIcon="@drawable/ic_ime_left_arrow" />
+        <Key android:codes="-4" android:keyEdgeFlags="right" android:keyLabel="@string/keyboardview_keycode_right" android:keyIcon="@drawable/ic_ime_right_arrow" />
+    </Row>
+</Keyboard>