Skip to content

Commit b2e0445

Browse files
tibbitibbi
authored
Merge pull request #46 from JovierCujoh/main
Added US English Dvorak layout
2 parents 90dbf82 + 4fd8a20 commit b2e0445

File tree

4 files changed

+144
-0
lines changed

4 files changed

+144
-0
lines changed

‎app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ class SettingsActivity : SimpleActivity() {
112112
val items = arrayListOf(
113113
RadioItem(LANGUAGE_ENGLISH_QWERTY, getKeyboardLanguageText(LANGUAGE_ENGLISH_QWERTY)),
114114
RadioItem(LANGUAGE_ENGLISH_QWERTZ, getKeyboardLanguageText(LANGUAGE_ENGLISH_QWERTZ)),
115+
RadioItem(LANGUAGE_ENGLISH_DVORAK, getKeyboardLanguageText(LANGUAGE_ENGLISH_DVORAK)),
115116
RadioItem(LANGUAGE_FRENCH, getKeyboardLanguageText(LANGUAGE_FRENCH)),
116117
RadioItem(LANGUAGE_GERMAN, getKeyboardLanguageText(LANGUAGE_GERMAN)),
117118
RadioItem(LANGUAGE_SPANISH, getKeyboardLanguageText(LANGUAGE_SPANISH)),
@@ -131,6 +132,7 @@ class SettingsActivity : SimpleActivity() {
131132
LANGUAGE_GERMAN -> getString(R.string.translation_german)
132133
LANGUAGE_RUSSIAN -> getString(R.string.translation_russian)
133134
LANGUAGE_ENGLISH_QWERTZ -> "${getString(R.string.translation_english)} (QWERTZ)"
135+
LANGUAGE_ENGLISH_DVORAK -> "${getString(R.string.translation_english)} (DVORAK)"
134136
LANGUAGE_SPANISH -> getString(R.string.translation_spanish)
135137
else -> "${getString(R.string.translation_english)} (QWERTY)"
136138
}

‎app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ const val LANGUAGE_FRENCH = 2
2323
const val LANGUAGE_ENGLISH_QWERTZ = 3
2424
const val LANGUAGE_SPANISH = 4
2525
const val LANGUAGE_GERMAN = 5
26+
const val LANGUAGE_ENGLISH_DVORAK = 6

‎app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
246246
LANGUAGE_FRENCH -> R.xml.keys_letters_french
247247
LANGUAGE_RUSSIAN -> R.xml.keys_letters_russian
248248
LANGUAGE_ENGLISH_QWERTZ -> R.xml.keys_letters_english_qwertz
249+
LANGUAGE_ENGLISH_DVORAK -> R.xml.keys_letters_english_dvorak
249250
LANGUAGE_SPANISH -> R.xml.keys_letters_spanish_qwerty
250251
LANGUAGE_GERMAN -> R.xml.keys_letters_german
251252
else -> R.xml.keys_letters_english_qwerty

‎app/src/main/res/xml/keys_letters_english_dvorak.xml‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
3+
<Row>
4+
<Key
5+
app:keyEdgeFlags="left"
6+
app:keyLabel="'"
7+
app:popupCharacters='1!"'
8+
app:popupKeyboard="@xml/keyboard_popup_template"
9+
app:topSmallNumber="1" />
10+
<Key
11+
app:keyLabel=","
12+
app:popupCharacters="&lt;2?"
13+
app:popupKeyboard="@xml/keyboard_popup_template"
14+
app:topSmallNumber="2" />
15+
<Key
16+
app:keyLabel="."
17+
app:popupCharacters="3>"
18+
app:popupKeyboard="@xml/keyboard_popup_template"
19+
app:topSmallNumber="3" />
20+
<Key
21+
app:keyLabel="p"
22+
app:popupCharacters="4"
23+
app:popupKeyboard="@xml/keyboard_popup_template"
24+
app:topSmallNumber="4" />
25+
<Key
26+
app:keyLabel="y"
27+
app:popupCharacters="5"
28+
app:popupKeyboard="@xml/keyboard_popup_template"
29+
app:topSmallNumber="5" />
30+
<Key
31+
app:keyLabel="f"
32+
app:popupCharacters="6"
33+
app:popupKeyboard="@xml/keyboard_popup_template"
34+
app:topSmallNumber="6" />
35+
<Key
36+
app:keyLabel="g"
37+
app:popupCharacters="7"
38+
app:popupKeyboard="@xml/keyboard_popup_template"
39+
app:topSmallNumber="7" />
40+
<Key
41+
app:keyLabel="c"
42+
app:popupCharacters="ć8çç"
43+
app:popupKeyboard="@xml/keyboard_popup_template"
44+
app:topSmallNumber="8" />
45+
<Key
46+
app:keyLabel="r"
47+
app:popupCharacters="9"
48+
app:popupKeyboard="@xml/keyboard_popup_template"
49+
app:topSmallNumber="9" />
50+
<Key
51+
app:keyEdgeFlags="right"
52+
app:keyLabel="l"
53+
app:popupCharacters="0"
54+
app:popupKeyboard="@xml/keyboard_popup_template"
55+
app:topSmallNumber="0" />
56+
</Row>
57+
<Row>
58+
<Key
59+
app:keyEdgeFlags="left"
60+
app:keyLabel="a"
61+
app:popupCharacters="áàâãäåāæą"
62+
app:popupKeyboard="@xml/keyboard_popup_template" />
63+
<Key
64+
app:keyLabel="o"
65+
app:popupCharacters="őöóôôòõō"
66+
app:popupKeyboard="@xml/keyboard_popup_template" />
67+
<Key
68+
app:keyLabel="e"
69+
app:popupCharacters="éèêëēę"
70+
app:popupKeyboard="@xml/keyboard_popup_template" />
71+
<Key
72+
app:keyLabel="u"
73+
app:popupCharacters="űúùûüū"
74+
app:popupKeyboard="@xml/keyboard_popup_template" />
75+
<Key
76+
app:keyLabel="i"
77+
app:popupCharacters="íìîïī"
78+
app:popupKeyboard="@xml/keyboard_popup_template" />
79+
<Key
80+
app:keyLabel="d"
81+
app:popupCharacters="ďđ"
82+
app:popupKeyboard="@xml/keyboard_popup_template" />
83+
<Key app:keyLabel="h" />
84+
<Key
85+
app:keyLabel="t"
86+
app:popupCharacters="ť"
87+
app:popupKeyboard="@xml/keyboard_popup_template" />
88+
<Key
89+
app:keyLabel="n"
90+
app:popupCharacters="ňńñ"
91+
app:popupKeyboard="@xml/keyboard_popup_template" />
92+
<Key
93+
app:keyEdgeFlags="right"
94+
app:keyLabel="s" />
95+
</Row>
96+
<Row>
97+
<Key
98+
app:code="-1"
99+
app:keyEdgeFlags="left"
100+
app:keyIcon="@drawable/ic_caps_outline_vector"
101+
app:keyWidth="15%p" />
102+
<Key app:keyLabel="j" />
103+
<Key app:keyLabel="k" />
104+
<Key app:keyLabel="x" />
105+
<Key app:keyLabel="b" />
106+
<Key app:keyLabel="m" />
107+
<Key app:keyLabel="w" />
108+
<Key app:keyLabel="v" />
109+
<Key
110+
app:code="-5"
111+
app:isRepeatable="true"
112+
app:keyEdgeFlags="right"
113+
app:keyIcon="@drawable/ic_clear_vector"
114+
app:keyWidth="15%p" />
115+
</Row>
116+
<Row>
117+
<Key
118+
app:code="-2"
119+
app:keyEdgeFlags="left"
120+
app:keyLabel="123"
121+
app:keyWidth="15%p" />
122+
<Key
123+
app:keyLabel="q"
124+
app:keyWidth="10%p" />
125+
<Key
126+
app:code="32"
127+
app:isRepeatable="true"
128+
app:keyWidth="50%p" />
129+
<Key
130+
app:keyLabel="z"
131+
app:keyWidth="10%p"
132+
app:popupCharacters="źžż"
133+
app:popupKeyboard="@xml/keyboard_popup_template" />
134+
<Key
135+
app:code="-4"
136+
app:keyEdgeFlags="right"
137+
app:keyIcon="@drawable/ic_enter_vector"
138+
app:keyWidth="15%p" />
139+
</Row>
140+
</Keyboard>

0 commit comments

Comments
 (0)