update label of language/ime switch key

Author: dongyuwei

app/src/main/java/rkr/tinykeyboard/inputmethod/SoftKeyboard.java

@@ -52,7 +52,7 @@
 import java.util.concurrent.Executors;
 
 public class SoftKeyboard extends InputMethodService
-        implements KeyboardView.OnKeyboardActionListener  {
+        implements KeyboardView.OnKeyboardActionListener {
 
     private InputMethodManager mInputMethodManager;
 
@@ -61,11 +61,11 @@ public class SoftKeyboard extends InputMethodService
     private int mLastDisplayWidth;
     private boolean mCapsLock;
     private long mLastShiftTime;
-    
+
     private LatinKeyboard mSymbolsKeyboard;
     private LatinKeyboard mSymbolsShiftedKeyboard;
     private LatinKeyboard mQwertyKeyboard;
-    
+
     private LatinKeyboard mCurKeyboard;
 
     private ExecutorService executorService;
@@ -75,9 +75,10 @@ public class SoftKeyboard extends InputMethodService
     private Map<String, List<String>> pinyinMap = new HashMap<>();
     private InputMode inputMode = InputMode.English;
 
-    @Override public void onCreate() {
+    @Override
+    public void onCreate() {
         super.onCreate();
-        mInputMethodManager = (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE);
+        mInputMethodManager = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
 
         if (trie == null) {
             executorService = Executors.newSingleThreadExecutor();
@@ -89,7 +90,8 @@ private void loadDictionaryAsync() {
         executorService.execute(() -> {
             Gson gson = new Gson();
             String jsonString = DictUtil.getContentFromAssets(getApplicationContext(), "google_227800_words.json");
-            Type mapType = new TypeToken<Map<String, Long>>(){}.getType();
+            Type mapType = new TypeToken<Map<String, Long>>() {
+            }.getType();
             Map<String, Long> map = gson.fromJson(jsonString, mapType);
 
             trie = new PatriciaTrie<>();
@@ -98,7 +100,8 @@ private void loadDictionaryAsync() {
             }
 
             String pinyinJson = DictUtil.getContentFromAssets(getApplicationContext(), "cedict.json");
-            Type pinyinType = new TypeToken<Map<String, List<String>>>(){}.getType();
+            Type pinyinType = new TypeToken<Map<String, List<String>>>() {
+            }.getType();
             pinyinMap = gson.fromJson(pinyinJson, pinyinType);
 
             String pinyinTxt = DictUtil.getContentFromAssets(getApplicationContext(), "google_pinyin_rawdict_utf8_65105_freq.txt");
@@ -163,7 +166,8 @@ Context getDisplayContext() {
         return createDisplayContext(wm.getDefaultDisplay());
     }
 
-    @Override public void onInitializeInterface() {
+    @Override
+    public void onInitializeInterface() {
         final Context displayContext = getDisplayContext();
 
         if (mQwertyKeyboard != null) {
@@ -179,7 +183,8 @@ Context getDisplayContext() {
         mSymbolsShiftedKeyboard = new LatinKeyboard(displayContext, R.xml.symbols_shift);
     }
 
-    @Override public View onCreateInputView() {
+    @Override
+    public View onCreateInputView() {
         mInputView = (KeyboardView) getLayoutInflater().inflate(R.layout.input, null);
         mInputView.setOnKeyboardActionListener(this);
         mInputView.setPreviewEnabled(false);
@@ -195,12 +200,13 @@ private void setLatinKeyboard(LatinKeyboard nextKeyboard) {
         mInputView.setKeyboard(nextKeyboard);
     }
 
-    @Override public void onStartInput(EditorInfo attribute, boolean restarting) {
+    @Override
+    public void onStartInput(EditorInfo attribute, boolean restarting) {
         super.onStartInput(attribute, restarting);
 
         // https://issuetracker.google.com/issues/246132117
         setCandidatesViewShown(true);
-        
+
         // We are now going to initialize our state based on the type of
         // text being edited.
         switch (attribute.inputType & InputType.TYPE_MASK_CLASS) {
@@ -211,30 +217,32 @@ private void setLatinKeyboard(LatinKeyboard nextKeyboard) {
                 // no extra features.
                 mCurKeyboard = mSymbolsKeyboard;
                 break;
-                
+
             default:
                 // For all unknown input types, default to the alphabetic
                 // keyboard with no special features.
                 mCurKeyboard = mQwertyKeyboard;
                 updateShiftKeyState(attribute);
         }
-        
+
         // Update the label on the enter key, depending on what the application
         // says it will do.
         mCurKeyboard.setImeOptions(getResources(), attribute.imeOptions);
     }
 
-    @Override public void onFinishInput() {
+    @Override
+    public void onFinishInput() {
         super.onFinishInput();
         compositionText = new StringBuilder();
-        
+
         mCurKeyboard = mQwertyKeyboard;
         if (mInputView != null) {
             mInputView.closing();
         }
     }
-    
-    @Override public void onStartInputView(EditorInfo attribute, boolean restarting) {
+
+    @Override
+    public void onStartInputView(EditorInfo attribute, boolean restarting) {
         super.onStartInputView(attribute, restarting);
         // Apply the selected keyboard to the input view.
         setLatinKeyboard(mCurKeyboard);
@@ -284,7 +292,7 @@ public void onKey(int primaryCode, int[] keyCodes) {
 
     public void onText(CharSequence text) {
     }
-    
+
     private void handleBackspace() {
         keyDownUp(KeyEvent.KEYCODE_DEL);
         updateShiftKeyState(getCurrentInputEditorInfo());
@@ -312,7 +320,7 @@ private void handleShift() {
         if (mInputView == null) {
             return;
         }
-        
+
         Keyboard currentKeyboard = mInputView.getKeyboard();
         if (mQwertyKeyboard == currentKeyboard) {
             // Alphabet keyboard
@@ -328,7 +336,7 @@ private void handleShift() {
             mSymbolsKeyboard.setShifted(false);
         }
     }
-    
+
     private void handleCharacter(int primaryCode) {
         if (isInputViewShown()) {
             if (mInputView.isShifted()) {
@@ -368,7 +376,7 @@ private List<String> getCandidates() {
             }
             return sortedWords;
         } else {
-         return PinyinDict.getCandidates(prefix);
+            return PinyinDict.getCandidates(prefix);
         }
     }
 
@@ -377,6 +385,7 @@ public void reset() {
         candidates = new ArrayList<>();
         updateCandidateViewAndComposingText();
     }
+
     private void commitInput() {
         getCurrentInputConnection().commitText(compositionText.toString(), compositionText.length());
         reset();
@@ -396,7 +405,20 @@ private IBinder getToken() {
 
 
     private void handleLanguageSwitch() {
-        inputMode = inputMode == InputMode.English ? InputMode.Pinyin : InputMode.English;
+        List<Keyboard.Key> keys = mQwertyKeyboard.getKeys();
+        Keyboard.Key switchKey = keys.stream()
+                .filter(key -> key.codes != null && key.codes.length > 0 && key.codes[0] == LatinKeyboard.KEYCODE_LANGUAGE_SWITCH).findFirst().get();
+
+        if (inputMode == InputMode.English) {
+            inputMode = InputMode.Pinyin;
+            switchKey.label = "\uD83C\uDF10中文";
+        } else {
+            inputMode = InputMode.English;
+            switchKey.label = "\uD83C\uDF10En";
+        }
+
+        // Redraw the keyboard with updated labels
+        mInputView.invalidateAllKeys();
     }
 
     private void checkToggleCapsLock() {
@@ -408,10 +430,10 @@ private void checkToggleCapsLock() {
             mLastShiftTime = now;
         }
     }
-    
+
     public void swipeRight() {
     }
-    
+
     public void swipeLeft() {
     }
 
@@ -420,10 +442,10 @@ public void swipeDown() {
 
     public void swipeUp() {
     }
-    
+
     public void onPress(int primaryCode) {
     }
-    
+
     public void onRelease(int primaryCode) {
     }
 }

app/src/main/res/values/dimens.xml

@@ -22,6 +22,6 @@
     <dimen name="key_height">50dp</dimen>
     <dimen name="key_width">10%p</dimen>
     <dimen name="key_width_action">15%p</dimen>
-    <dimen name="key_width_space">40%p</dimen>
+    <dimen name="key_width_space">35%p</dimen>
     <dimen name="key_text_size">18dp</dimen>
 </resources>

app/src/main/res/values/symbols.xml

@@ -3,6 +3,6 @@
     <string name="backspace">←</string>
     <string name="enter">↩</string>
     <string name="search">🔍</string>
-    <string name="language">🌐</string>
+    <string name="language">🌐En</string>
     <string name="shift">⇧</string>
 </resources>

app/src/main/res/xml/qwerty.xml

@@ -62,7 +62,7 @@
     <Row android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="123" android:keyWidth="@dimen/key_width_action"/>
         <Key android:codes="44" android:keyLabel=","/>
-        <Key android:codes="-101" android:keyLabel="@string/language"/>
+        <Key android:codes="-101" android:keyLabel="@string/language" android:keyWidth="@dimen/key_width_action"/>
         <Key android:codes="32" android:keyLabel=" " android:keyWidth="@dimen/key_width_space"/>
         <Key android:codes="46" android:keyLabel="."/>
         <Key android:codes="-4" android:keyLabel="@string/enter" android:keyWidth="@dimen/key_width_action"/>