Add Dvorak keyboard layout option (#1)

src/java/KP2ASoftkeyboard_AS/app/src/main/java/keepass2android/softkeyboard/KeyboardSwitcher.java

@@ -69,6 +69,9 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
 
     public static final String DEFAULT_LAYOUT_ID = "4";
     public static final String PREF_KEYBOARD_LAYOUT = "pref_keyboard_layout_20100902";
+    public static final String PREF_KEY_LAYOUT = "pref_key_layout";
+    public static final String KEY_LAYOUT_QWERTY = "qwerty";
+    public static final String KEY_LAYOUT_DVORAK = "dvorak";
     private static final int[] THEMES = new int [] {
         R.layout.input_basic, R.layout.input_basic_highcontrast, R.layout.input_stone_normal,
         R.layout.input_stone_bold, R.layout.input_gingerbread};
@@ -86,6 +89,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
     private static final int[] KBD_SYMBOLS_SHIFT = new int[] {
         R.xml.kbd_symbols_shift, R.xml.kbd_symbols_shift_black};
     private static final int[] KBD_QWERTY = new int[] {R.xml.kbd_qwerty, R.xml.kbd_qwerty_black};
+    private static final int[] KBD_DVORAK = new int[] {R.xml.kbd_dvorak, R.xml.kbd_dvorak_black};
 
     private static final int[] KBD_KP2A = new int[] {R.xml.kbd_kp2a, R.xml.kbd_kp2a_black};
 
@@ -141,6 +145,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
     private Locale mInputLocale;
 
     private int mLayoutId;
+    private String mKeyLayout;
 
     private static final KeyboardSwitcher sInstance = new KeyboardSwitcher();
 
@@ -158,6 +163,7 @@ public static void init(KP2AKeyboard ims) {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ims);
         sInstance.mLayoutId = Integer.valueOf(
                 prefs.getString(PREF_KEYBOARD_LAYOUT, DEFAULT_LAYOUT_ID));
+        sInstance.mKeyLayout = prefs.getString(PREF_KEY_LAYOUT, KEY_LAYOUT_QWERTY);
         sInstance.updateSettingsKeyState(prefs);
         prefs.registerOnSharedPreferenceChangeListener(sInstance);
 
@@ -321,7 +327,8 @@ private KeyboardId getKeyboardId(int mode, int imeOptions, boolean isSymbols) {
             }
         }
         // TODO: generalize for any KeyboardId
-        int keyboardRowsResId = KBD_QWERTY[charColorId];
+        int[] alphaKbd = KEY_LAYOUT_DVORAK.equals(mKeyLayout) ? KBD_DVORAK : KBD_QWERTY;
+        int keyboardRowsResId = alphaKbd[charColorId];
 
         switch (mode) {
     		case MODE_KP2A:
@@ -569,6 +576,9 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
         if (PREF_KEYBOARD_LAYOUT.equals(key)) {
             changeLatinKeyboardView(
                     Integer.valueOf(sharedPreferences.getString(key, DEFAULT_LAYOUT_ID)), false);
+        } else if (PREF_KEY_LAYOUT.equals(key)) {
+            mKeyLayout = sharedPreferences.getString(key, KEY_LAYOUT_QWERTY);
+            setKeyboardMode(mMode, mImeOptions, mPreferSymbols);
         } else if (LatinIMESettings.PREF_SETTINGS_KEY.equals(key)) {
             updateSettingsKeyState(sharedPreferences);
             recreateInputView();

src/java/KP2ASoftkeyboard_AS/app/src/main/java/keepass2android/softkeyboard/LatinKeyboard.java

@@ -144,7 +144,9 @@ public LatinKeyboard(Context context, int xmlLayoutResId, int mode) {
         sSpacebarVerticalCorrection = res.getDimensionPixelOffset(
                 R.dimen.spacebar_vertical_correction);
         mIsAlphaKeyboard = xmlLayoutResId == R.xml.kbd_qwerty
-                || xmlLayoutResId == R.xml.kbd_qwerty_black;
+                || xmlLayoutResId == R.xml.kbd_qwerty_black
+                || xmlLayoutResId == R.xml.kbd_dvorak
+                || xmlLayoutResId == R.xml.kbd_dvorak_black;
         // The index of space key is available only after Keyboard constructor has finished.
         mSpaceKeyIndexArray = new int[] { indexOf(KP2AKeyboard.KEYCODE_SPACE) };
         initializeNumberHintResources(context);

src/java/KP2ASoftkeyboard_AS/app/src/main/res/values/donottranslate-altchars.xml

@@ -43,4 +43,6 @@
     <string name="alternates_for_cyrillic_soft_sign"></string>
     <string name="alternates_for_a_umlaut"></string>
     <string name="alternates_for_o_umlaut"></string>
+    <string name="alternates_for_apostrophe">\u2018\u2019\u201C\u201D\u0060\u00B4"</string>
+    <string name="alternates_for_semicolon">:</string>
 </resources>

src/java/KP2ASoftkeyboard_AS/app/src/main/res/values/strings.xml

@@ -373,6 +373,19 @@
     <string name="subtype_mode_keyboard">keyboard</string>
     <string name="subtype_mode_voice">voice</string>
 
+    <!-- Key layout preference -->
+    <string name="pref_key_layout_title">Key layout</string>
+    <string name="pref_key_layout_qwerty" translatable="false">QWERTY</string>
+    <string name="pref_key_layout_dvorak" translatable="false">Dvorak</string>
+    <string-array name="key_layout_entries" translatable="false">
+        <item>@string/pref_key_layout_qwerty</item>
+        <item>@string/pref_key_layout_dvorak</item>
+    </string-array>
+    <string-array name="key_layout_entry_values" translatable="false">
+        <item>qwerty</item>
+        <item>dvorak</item>
+    </string-array>
+
     <!-- Title for Latin keyboard debug settings activity / dialog -->
     <string name="english_ime_debug_settings" translatable="false">Android keyboard Debug settings</string>
     <string name="prefs_debug_mode" translatable="false">Debug Mode</string>