Add support for keyboard domains (#2308)

* Adds for keyboard domains Set column width as the max of each row Fix keyboard panels column width * Fix delegate name
MozillaReality · Nov 18, 2019 · 61e7f55 · 61e7f55
1 parent 64da0a2
commit 61e7f55
Show file tree

Hide file tree

Showing 45 changed files with 195 additions and 31 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/input/CustomKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/input/CustomKeyboard.java
@@ -20,13 +20,14 @@ public class CustomKeyboard extends Keyboard {
     private Key mEnterKey;
     private Key mSpaceKey;
     private Key mModeChangeKey;
-    private int mMaxColums;
+    private int mMaxColumns;
     private int[] mDisabledKeysIndexes;
 
     public static final int KEYCODE_SYMBOLS_CHANGE = -10;
     public static final int KEYCODE_VOICE_INPUT = -11;
     public static final int KEYCODE_LANGUAGE_CHANGE = -12;
     public static final int KEYCODE_EMOJI = -13;
+    public static final int KEYCODE_DOMAIN = -14;
 
     public CustomKeyboard(Context context, int xmlLayoutResId) {
         super(context, xmlLayoutResId, 0);
@@ -36,7 +37,7 @@ public CustomKeyboard(Context context, int xmlLayoutResId) {
     public CustomKeyboard (Context context, int layoutTemplateResId, CharSequence characters, int columns, int horizontalPadding, int verticalGap) {
         this(context, layoutTemplateResId);
 
-        mMaxColums = columns;
+        mMaxColumns = columns;
 
         int x = 0;
         int y = 0;
@@ -236,7 +237,7 @@ public int[] getShiftKeyIndices() {
     }
 
     public int getMaxColumns() {
-        return mMaxColums;
+        return mMaxColumns;
     }
 
     public void disableKeys(int[] disabledKeyIndexes) {

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/BaseKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/BaseKeyboard.java
@@ -9,6 +9,7 @@
 
 import java.util.Locale;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 public abstract class BaseKeyboard implements KeyboardInterface {
     protected Context mContext;
@@ -51,4 +52,10 @@ public String getModeChangeKeyText() {
     public float getAlphabeticKeyboardWidth() {
         return WidgetPlacement.dpDimension(mContext, R.dimen.keyboard_alphabetic_width);
     }
+
+    @Override
+    public String[] getDomains(String... domains) {
+        return Stream.of(new String[]{".com", ".net", ".org", ".co"}, domains).flatMap(Stream::of)
+                .toArray(String[]::new);
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/DanishKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/DanishKeyboard.java
@@ -65,4 +65,9 @@ public Locale getLocale() {
     public String getSpaceKeyText(String aComposingText) {
         return StringUtils.getStringByLocale(mContext, R.string.settings_language_danish, getLocale());
     }
+
+    @Override
+    public String[] getDomains(String... domains) {
+        return super.getDomains(".dk");
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/DutchKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/DutchKeyboard.java
@@ -65,4 +65,9 @@ public Locale getLocale() {
     public String getSpaceKeyText(String aComposingText) {
         return StringUtils.getStringByLocale(mContext, R.string.settings_language_dutch, getLocale());
     }
+
+    @Override
+    public String[] getDomains(String... domains) {
+        return super.getDomains(".nl");
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/EnglishKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/EnglishKeyboard.java
@@ -10,6 +10,7 @@
 import androidx.annotation.Nullable;
 
 import java.util.Locale;
+import java.util.stream.Stream;
 
 public class EnglishKeyboard extends BaseKeyboard {
     private CustomKeyboard mKeyboard;
@@ -47,4 +48,9 @@ public String getSpaceKeyText(String aComposingText) {
 
         return StringUtils.getStringByLocale(mContext, R.string.settings_language_english, getLocale());
     }
+
+    @Override
+    public String[] getDomains(String... domains) {
+        return super.getDomains(".uk", ".us");
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/FinnishKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/FinnishKeyboard.java
@@ -65,4 +65,9 @@ public Locale getLocale() {
     public String getSpaceKeyText(String aComposingText) {
         return StringUtils.getStringByLocale(mContext, R.string.settings_language_finnish, getLocale());
     }
+
+    @Override
+    public String[] getDomains(String... domains) {
+        return super.getDomains(".fi");
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/FrenchKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/FrenchKeyboard.java
@@ -47,4 +47,9 @@ public Locale getLocale() {
     public String getSpaceKeyText(String aComposingText) {
         return StringUtils.getStringByLocale(mContext, R.string.settings_language_french, getLocale());
     }
+
+    @Override
+    public String[] getDomains(String... domains) {
+        return super.getDomains(".fr");
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/GermanKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/GermanKeyboard.java
@@ -63,4 +63,9 @@ public Locale getLocale() {
     public String getSpaceKeyText(String aComposingText) {
         return StringUtils.getStringByLocale(mContext, R.string.settings_language_german, getLocale());
     }
+
+    @Override
+    public String[] getDomains(String... domains) {
+        return super.getDomains(".de");
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ItalianKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ItalianKeyboard.java
@@ -47,4 +47,9 @@ public Locale getLocale() {
     public String getSpaceKeyText(String aComposingText) {
         return StringUtils.getStringByLocale(mContext, R.string.settings_language_italian, getLocale());
     }
+
+    @Override
+    public String[] getDomains(String... domains) {
+        return super.getDomains(".it");
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/JapaneseKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/JapaneseKeyboard.java
@@ -208,4 +208,9 @@ public void clear() {
         mConverter.init();
     }
 
+    @Override
+    public String[] getDomains(String... domains) {
+        return super.getDomains(".jp");
+    }
+
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/KeyboardInterface.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/KeyboardInterface.java
@@ -40,6 +40,7 @@ public enum Action {
     default boolean usesTextOverride() { return false; }
     String getComposingText(String aComposing, String aCode);
     String getKeyboardTitle();
+    default String[] getDomains(String... domains) { return null; }
     Locale getLocale();
     String getSpaceKeyText(String aComposingText);
     String getEnterKeyText(int aIMEOptions, String aComposingText);

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/KoreanKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/KoreanKeyboard.java
@@ -405,4 +405,9 @@ public Locale getLocale() {
     public String getSpaceKeyText(String aComposingText) {
         return StringUtils.getStringByLocale(mContext, R.string.settings_language_korean, getLocale());
     }
+
+    @Override
+    public String[] getDomains(String... domains) {
+        return super.getDomains(".kr");
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/NorwegianKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/NorwegianKeyboard.java
@@ -65,4 +65,9 @@ public Locale getLocale() {
     public String getSpaceKeyText(String aComposingText) {
         return StringUtils.getStringByLocale(mContext, R.string.settings_language_norwegian, getLocale());
     }
+
+    @Override
+    public String[] getDomains(String... domains) {
+        return super.getDomains(".no");
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/PolishKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/PolishKeyboard.java
@@ -65,4 +65,9 @@ public Locale getLocale() {
     public String getSpaceKeyText(String aComposingText) {
         return StringUtils.getStringByLocale(mContext, R.string.settings_language_polish, getLocale());
     }
+
+    @Override
+    public String[] getDomains(String... domains) {
+        return super.getDomains(".po");
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/RussianKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/RussianKeyboard.java
@@ -65,4 +65,9 @@ public Locale getLocale() {
     public String getSpaceKeyText(String aComposingText) {
         return StringUtils.getStringByLocale(mContext, R.string.settings_language_russian, getLocale());
     }
+
+    @Override
+    public String[] getDomains(String... domains) {
+        return super.getDomains(".ru");
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/SpanishKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/SpanishKeyboard.java
@@ -48,4 +48,9 @@ public Locale getLocale() {
     public String getSpaceKeyText(String aComposingText) {
         return StringUtils.getStringByLocale(mContext, R.string.settings_language_spanish, getLocale());
     }
+
+    @Override
+    public String[] getDomains(String... domains) {
+        return super.getDomains(".es");
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/SwedishKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/SwedishKeyboard.java
@@ -65,4 +65,9 @@ public Locale getLocale() {
     public String getSpaceKeyText(String aComposingText) {
         return StringUtils.getStringByLocale(mContext, R.string.settings_language_swedish, getLocale());
     }
+
+    @Override
+    public String[] getDomains(String... domains) {
+        return super.getDomains(".se");
+    }
 }
diff --git a/...rowser/ui/views/LanguageSelectorView.java → ...rowser/ui/views/KeyboardSelectorView.java b/...rowser/ui/views/LanguageSelectorView.java → ...rowser/ui/views/KeyboardSelectorView.java
@@ -5,6 +5,7 @@
 import android.util.TypedValue;
 import android.widget.FrameLayout;
 import android.widget.GridLayout;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -15,7 +16,7 @@
 import java.util.List;
 
 
-public class LanguageSelectorView extends FrameLayout {
+public class KeyboardSelectorView extends FrameLayout {
     public static class Item {
         public final String title;
         public final Object tag;
@@ -27,37 +28,39 @@ public Item(String aTitle, Object aTag) {
     }
 
     public interface Delegate {
-        void onLanguageClick(Item aItem);
+        void onItemClick(Item aItem);
     }
 
     private GridLayout mLangRowContainer;
     private Delegate mDelegate;
     private List<Item> mItems;
     private List<UITextButton> mButtons = new ArrayList<>();
-    private int mFirstColItemWidth;
-    private int mSecondColItemWidth;
+    private int mDomainColItemWidth;
+    private int mNarrowColItemWidth;
+    private int mWideColItemWidth;
     private static final int kMaxItemsPerColumn = 4;
 
-    public LanguageSelectorView(@NonNull Context context) {
+    public KeyboardSelectorView(@NonNull Context context) {
         super(context);
         initialize();
     }
 
-    public LanguageSelectorView(@NonNull Context context, @Nullable AttributeSet attrs) {
+    public KeyboardSelectorView(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
         initialize();
     }
 
-    public LanguageSelectorView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    public KeyboardSelectorView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         initialize();
     }
 
     private void initialize() {
         inflate(getContext(), R.layout.language_selection, this);
         mLangRowContainer = findViewById(R.id.langRowContainer);
-        mFirstColItemWidth = WidgetPlacement.pixelDimension(getContext(), R.dimen.lang_selector_first_col_item_width);
-        mSecondColItemWidth = WidgetPlacement.pixelDimension(getContext(), R.dimen.lang_selector_second_col_item_width);
+        mDomainColItemWidth = WidgetPlacement.pixelDimension(getContext(), R.dimen.lang_selector_domain_col_item_width);
+        mNarrowColItemWidth = WidgetPlacement.pixelDimension(getContext(), R.dimen.lang_selector_narrow_col_item_width);
+        mWideColItemWidth = WidgetPlacement.pixelDimension(getContext(), R.dimen.lang_selector_wide_col_item_width);
     }
 
     public void setDelegate(Delegate aDelegate) {
@@ -73,14 +76,34 @@ public void setItems(List<Item> aItems) {
         mLangRowContainer.setColumnCount(columns);
         mLangRowContainer.setRowCount(rows);
 
-        int index = 0;
-        for (Item item: aItems) {
+        int[] columnWidth = new int[columns];
+        for (int i=0; i<aItems.size(); i++) {
             GridLayout.LayoutParams params = new GridLayout.LayoutParams();
-            params.width = index < kMaxItemsPerColumn ? mFirstColItemWidth : mSecondColItemWidth;
-            UITextButton button = createLangButton(item);
+            params.width = GridLayout.LayoutParams.WRAP_CONTENT;
+            UITextButton button = createItemButton(aItems.get(i));
+            int padding = button.getPaddingStart() + button.getPaddingEnd();
+            float textWidth = button.getPaint().measureText(aItems.get(i).title) + padding;
+            int column = i/kMaxItemsPerColumn;
+            int width;
+            if (textWidth < mDomainColItemWidth) {
+                width = mDomainColItemWidth;
+            } else if (textWidth < mNarrowColItemWidth) {
+                width = mNarrowColItemWidth;
+            } else  {
+                width = mWideColItemWidth;
+            }
+            if (columnWidth[column] < width) {
+                columnWidth[column] = width;
+            }
             mLangRowContainer.addView(button, params);
             mButtons.add(button);
-            ++index;
+        }
+
+        // Assign widest row width to the whole column rows
+        for (int i=0; i<aItems.size(); i++) {
+            int column = i/kMaxItemsPerColumn;
+            UITextButton button = (UITextButton)mLangRowContainer.getChildAt(i);
+            button.getLayoutParams().width = columnWidth[column];
         }
     }
 
@@ -98,11 +121,11 @@ public List<Item> getItems() {
     private OnClickListener clickHandler = v -> {
         UITextButton button = (UITextButton) v;
         if (mDelegate != null) {
-            mDelegate.onLanguageClick((Item)button.getTag());
+            mDelegate.onItemClick((Item)button.getTag());
         }
     };
 
-    private UITextButton createLangButton(Item aItem) {
+    private UITextButton createItemButton(Item aItem) {
         UITextButton button = new UITextButton(getContext());
         button.setTintColorList(R.drawable.lang_selector_button_color);
         button.setBackground(getContext().getDrawable(R.drawable.lang_selector_button_background));