Keyboard updates: Polish, Danish UIS-6 and bug fixing (#1890)

* Keyboard updated

Added Danish and Polish and updated the Spec to UIS-6_Keyboard_021

* Added Danish and Polish to display and voice languages

* Fixed spacebar strings for polish and Danish

* Updated Polski language string

Author: keianhzo

app/src/common/shared/org/mozilla/vrbrowser/input/CustomKeyboard.java

@@ -10,7 +10,6 @@
 import android.content.res.XmlResourceParser;
 import android.inputmethodservice.Keyboard;
 import android.view.KeyEvent;
-import android.view.inputmethod.EditorInfo;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -22,6 +21,7 @@ public class CustomKeyboard extends Keyboard {
     private Key mSpaceKey;
     private Key mModeChangeKey;
     private int mMaxColums;
+    private int[] mDisabledKeysIndexes;
 
     public static final int KEYCODE_SYMBOLS_CHANGE = -10;
     public static final int KEYCODE_VOICE_INPUT = -11;
@@ -235,7 +235,23 @@ public int[] getShiftKeyIndices() {
         }
     }
 
-    public int getMaxColums() {
+    public int getMaxColumns() {
         return mMaxColums;
     }
+
+    public void disableKeys(int[] disabledKeyIndexes) {
+        mDisabledKeysIndexes = disabledKeyIndexes;
+    }
+
+    public boolean isKeyEnabled(int keyIndex) {
+        if (mDisabledKeysIndexes != null) {
+            for (int key : mDisabledKeysIndexes) {
+                if (key == keyIndex) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
 }

app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ChinesePinyinKeyboard.java

@@ -197,7 +197,7 @@ public Locale getLocale() {
     @Override
     public String getSpaceKeyText(String aComposingText) {
         if (aComposingText == null || aComposingText.trim().isEmpty()) {
-            return mContext.getString(R.string.pinyin_spacebar_space);
+            return StringUtils.getStringByLocale(mContext, R.string.settings_language_simplified_chinese, getLocale());
         } else {
             return mContext.getString(R.string.pinyin_spacebar_selection);
         }

app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ChineseZhuyinKeyboard.java

@@ -153,7 +153,7 @@ public Locale getLocale() {
     @Override
     public String getSpaceKeyText(String aComposingText) {
         if (aComposingText == null || aComposingText.trim().isEmpty()) {
-            return mContext.getString(R.string.zhuyin_spacebar_space);
+            return StringUtils.getStringByLocale(mContext, R.string.settings_language_traditional_chinese, getLocale());
         } else {
             return mContext.getString(R.string.zhuyin_spacebar_selection);
         }

app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/DanishKeyboard.java

@@ -0,0 +1,68 @@
+package org.mozilla.vrbrowser.ui.keyboards;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.mozilla.vrbrowser.R;
+import org.mozilla.vrbrowser.input.CustomKeyboard;
+import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement;
+import org.mozilla.vrbrowser.utils.StringUtils;
+
+import java.util.Locale;
+
+public class DanishKeyboard extends BaseKeyboard {
+    private CustomKeyboard mKeyboard;
+    private CustomKeyboard mSymbolsKeyboard;
+    private Locale mLocale;
+
+    public DanishKeyboard(Context aContext) {
+        super(aContext);
+        mLocale = new Locale("da", "DK");
+    }
+
+    @NonNull
+    @Override
+    public CustomKeyboard getAlphabeticKeyboard() {
+        if (mKeyboard == null) {
+            mKeyboard = new CustomKeyboard(mContext.getApplicationContext(), R.xml.keyboard_qwerty_danish);
+        }
+        return mKeyboard;
+    }
+
+    @Nullable
+    @Override
+    public CustomKeyboard getSymbolsKeyboard() {
+        if (mSymbolsKeyboard == null) {
+            mSymbolsKeyboard = new CustomKeyboard(mContext.getApplicationContext(), R.xml.keyboard_symbols_danish);
+        }
+        return mSymbolsKeyboard;
+    }
+
+    @Override
+    public float getAlphabeticKeyboardWidth() {
+        return WidgetPlacement.dpDimension(mContext, R.dimen.keyboard_alphabetic_width_danish);
+    }
+
+    @Nullable
+    @Override
+    public CandidatesResult getCandidates(String aText) {
+        return null;
+    }
+
+    @Override
+    public String getKeyboardTitle() {
+        return StringUtils.getStringByLocale(mContext, R.string.settings_language_danish, getLocale());
+    }
+
+    @Override
+    public Locale getLocale() {
+        return mLocale;
+    }
+
+    @Override
+    public String getSpaceKeyText(String aComposingText) {
+        return StringUtils.getStringByLocale(mContext, R.string.settings_language_danish, getLocale());
+    }
+}

app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/EnglishKeyboard.java

@@ -42,4 +42,9 @@ public String getKeyboardTitle() {
     public Locale getLocale() {
         return Locale.ENGLISH;
     }
+    @Override
+    public String getSpaceKeyText(String aComposingText) {
+
+        return StringUtils.getStringByLocale(mContext, R.string.settings_language_english, getLocale());
+    }
 }

app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/FrenchKeyboard.java

@@ -42,4 +42,9 @@ public String getKeyboardTitle() {
     public Locale getLocale() {
         return Locale.FRENCH;
     }
+
+    @Override
+    public String getSpaceKeyText(String aComposingText) {
+        return StringUtils.getStringByLocale(mContext, R.string.settings_language_french, getLocale());
+    }
 }

app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/GermanKeyboard.java

@@ -58,4 +58,9 @@ public String getKeyboardTitle() {
     public Locale getLocale() {
         return Locale.GERMAN;
     }
+
+    @Override
+    public String getSpaceKeyText(String aComposingText) {
+        return StringUtils.getStringByLocale(mContext, R.string.settings_language_german, getLocale());
+    }
 }

app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ItalianKeyboard.java

@@ -42,4 +42,9 @@ public String getKeyboardTitle() {
     public Locale getLocale() {
         return Locale.ITALIAN;
     }
+
+    @Override
+    public String getSpaceKeyText(String aComposingText) {
+        return StringUtils.getStringByLocale(mContext, R.string.settings_language_italian, getLocale());
+    }
 }

app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/JapaneseKeyboard.java

@@ -183,7 +183,7 @@ public Locale getLocale() {
     @Override
     public String getSpaceKeyText(String aComposingText) {
         if (aComposingText == null || aComposingText.trim().isEmpty()) {
-            return mContext.getString(R.string.japanese_spacebar_space);
+            return StringUtils.getStringByLocale(mContext, R.string.settings_language_japanese, getLocale());
         } else {
             return mContext.getString(R.string.japanese_spacebar_selection);
         }

app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/KoreanKeyboard.java

@@ -400,4 +400,9 @@ public String getKeyboardTitle() {
     public Locale getLocale() {
         return Locale.KOREAN;
     }
+
+    @Override
+    public String getSpaceKeyText(String aComposingText) {
+        return StringUtils.getStringByLocale(mContext, R.string.settings_language_korean, getLocale());
+    }
 }