Skip to content

Commit f3f590f

Browse files
committed
Same as last two commits. Sorry for "commit spam".
On branch main Your branch is up to date with 'origin/main'. Changes to be committed: modified: app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt modified: app/src/main/res/xml/keys_letters_english_dvorak.xml
1 parent e27f435 commit f3f590f

File tree

2 files changed

+36
-30
lines changed

2 files changed

+36
-30
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +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
249+
LANGUAGE_ENGLISH_DVORAK -> R.xml.keys_letters_english_dvorak
250250
LANGUAGE_SPANISH -> R.xml.keys_letters_spanish_qwerty
251251
LANGUAGE_GERMAN -> R.xml.keys_letters_german
252252
else -> R.xml.keys_letters_english_qwerty

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

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
app:topSmallNumber="1" />
1010
<Key
1111
app:keyLabel=","
12-
app:popupCharacters="<2?"
12+
app:popupCharacters="<2?"
1313
app:popupKeyboard="@xml/keyboard_popup_template"
1414
app:topSmallNumber="2" />
1515
<Key
1616
app:keyLabel="."
17-
app:popupCharacters="3>"
17+
app:popupCharacters="3>"
1818
app:popupKeyboard="@xml/keyboard_popup_template"
1919
app:topSmallNumber="3" />
2020
<Key
@@ -57,32 +57,38 @@
5757
<Row>
5858
<Key
5959
app:keyEdgeFlags="left"
60-
app:keyLabel="a"
61-
app:popupCharacters="áàâãäåāæą"
62-
app:popupKeyboard="@xml/keyboard_popup_template"/>
60+
app:keyLabel="a"
61+
app:popupCharacters="áàâãäåāæą"
62+
app:popupKeyboard="@xml/keyboard_popup_template"/>
6363
<Key
64-
app:keyLabel="o"
65-
app:popupCharacters="őöóôôòõō"
66-
app:popupKeyboard="@xml/keyboard_popup_template"/>/>
67-
<Key app:keyLabel="e"
68-
app:popupCharacters="éèêëēę"
69-
app:popupKeyboard="@xml/keyboard_popup_template"/>/>
70-
<Key app:keyLabel="u"
71-
app:popupCharacters="űúùûüū"
72-
app:popupKeyboard="@xml/keyboard_popup_template"/>/>
73-
<Key app:keyLabel="i"
74-
app:popupCharacters="íìîïī"
75-
app:popupKeyboard="@xml/keyboard_popup_template"/> />
76-
<Key app:keyLabel="d"
77-
app:popupCharacters="ďđ"
78-
app:popupKeyboard="@xml/keyboard_popup_template"/> />
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"/> />
7983
<Key app:keyLabel="h" />
80-
<Key app:keyLabel="t"
81-
app:popupCharacters="ť"
82-
app:popupKeyboard="@xml/keyboard_popup_template"/> />
83-
<Key app:keyLabel="n"
84-
app:popupCharacters="ňńñ"
85-
app:popupKeyboard="@xml/keyboard_popup_template"/> />
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"/> />
8692
<Key
8793
app:keyEdgeFlags="right"
8894
app:keyLabel="s" />
@@ -121,9 +127,9 @@
121127
app:isRepeatable="true"
122128
app:keyWidth="50%p" />
123129
<Key
124-
app:keyLabel="z"
125-
app:popupCharacters="źžż"
126-
app:popupKeyboard="@xml/keyboard_popup_template"
130+
app:keyLabel="z"
131+
app:popupCharacters="źžż"
132+
app:popupKeyboard="@xml/keyboard_popup_template"
127133
app:keyWidth="10%p" />
128134
<Key
129135
app:code="-4"

0 commit comments

Comments
 (0)