diff options
| -rw-r--r-- | res/values/arrays.xml | 2 | ||||
| -rw-r--r-- | res/xml/method.xml | 2 | ||||
| -rw-r--r-- | res/xml/qwertz_de.xml | 40 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/Config.java | 17 |
4 files changed, 52 insertions, 9 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 7dc5a96..5519c80 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -15,6 +15,7 @@ <item>qwerty_tr</item> <item>ru_jcuken</item> <item>qwertz</item> + <item>qwertz_de</item> <item>qwertz_hu</item> <item>bgph1</item> <item>dvorak</item> @@ -40,6 +41,7 @@ <item>QWERTY (Türkçe)</item> <item>ЙЦУКЕН (Русский)</item> <item>QWERTZ</item> + <item>QWERTZ (Deutsch)</item> <item>QWERTZ (Hungarian)</item> <item>Bulgarian (Phonetic Traditional)</item> <item>Dvorak</item> diff --git a/res/xml/method.xml b/res/xml/method.xml index f22b3f0..9ce5ed7 100644 --- a/res/xml/method.xml +++ b/res/xml/method.xml @@ -3,7 +3,7 @@ <subtype android:label="%s" android:languageTag="bg" android:imeSubtypeLocale="bg_BG" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=bgph1,extra_keys=€"/> <subtype android:label="%s" android:languageTag="bn" android:imeSubtypeLocale="bn_BD" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=৳"/> <subtype android:label="%s" android:languageTag="hi" android:imeSubtypeLocale="hi_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=hindi,extra_keys=₹"/> - <subtype android:label="%s" android:languageTag="de" android:imeSubtypeLocale="de_DE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwertz,extra_keys=accent_trema|ß|€"/> + <subtype android:label="%s" android:languageTag="de" android:imeSubtypeLocale="de_DE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwertz_de,extra_keys=accent_trema|ß|€"/> <subtype android:label="%s" android:languageTag="en-GB" android:imeSubtypeLocale="en_GB" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=£|€"/> <subtype android:label="%s" android:languageTag="en-US" android:imeSubtypeLocale="en_US" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty"/> <subtype android:label="%s" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_es,extra_keys=accent_grave|accent_aigu|accent_tilde|accent_trema|€"/> diff --git a/res/xml/qwertz_de.xml b/res/xml/qwertz_de.xml new file mode 100644 index 0000000..2181716 --- /dev/null +++ b/res/xml/qwertz_de.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<keyboard> + <row> + <key key0="q" key2="1" key4="esc"/> + <key key0="w" key1="^" key2="2" key3=""" key4="\@"/> + <key key0="e" key1="§" key2="3" key3="!" key4="€"/> + <key key0="r" key2="4" key3="$" key4="f11_placeholder"/> + <key key0="t" key2="5" key3="%" key4="f12_placeholder"/> + <key key0="z" key2="6" key3="&"/> + <key key0="u" key2="7" key3="{" key4="}"/> + <key key0="i" key2="8" key3="[" key4="]"/> + <key key0="o" key2="9" key3="(" key4=")"/> + <key key0="p" key2="0" key3="="/> + <key key0="ü" key3="\?"/> + </row> + <row> + <key key0="a" key2="tab"/> + <key key0="s" key1="`" key3="ß"/> + <key key0="d"/> + <key key0="f" key1="~"/> + <key key0="g" key3="-"/> + <key key0="h" key3="+"/> + <key key0="j" key3="*"/> + <key key0="k" key3="/"/> + <key key0="l" key1="'" key3="\\"/> + <key key0="ö" key3="\#"/> + <key key0="ä"/> + </row> + <row> + <key width="1.5" key0="shift" key2="loc capslock"/> + <key shift="0.5" key0="y" key1=">" key2="|" key3="<"/> + <key key0="x"/> + <key key0="c"/> + <key key0="v"/> + <key key0="b" key1=";" key3=","/> + <key key0="n" key1=":" key3="."/> + <key key0="m" key1="_"/> + <key shift="0.5" width="1.5" key0="backspace" key2="delete"/> + </row> +</keyboard> diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java index ad79920..a016fb1 100644 --- a/srcs/juloo.keyboard2/Config.java +++ b/srcs/juloo.keyboard2/Config.java @@ -254,27 +254,28 @@ final class Config { case "azerty": return R.xml.azerty; case "bangla": return R.xml.bangla; - case "hindi": return R.xml.hindi; case "bgph1": return R.xml.local_bgph1; case "bone": return R.xml.bone; case "colemak": return R.xml.colemak; case "dvorak": return R.xml.dvorak; + case "hindi": return R.xml.hindi; + case "jcuken_ua": return R.xml.jcuken_ua; case "neo2": return R.xml.neo2; - case "qwerty_es": return R.xml.qwerty_es; + case "qwerty": return R.xml.qwerty; case "qwerty_el": return R.xml.qwerty_el; + case "qwerty_es": return R.xml.qwerty_es; case "qwerty_hu": return R.xml.qwerty_hu; case "qwerty_ko": return R.xml.qwerty_ko; case "qwerty_lv": return R.xml.qwerty_lv; - case "qwerty_pt": return R.xml.qwerty_pt; - case "qwerty_tr": return R.xml.qwerty_tr; - case "qwerty": return R.xml.qwerty; case "qwerty_no": return R.xml.qwerty_no; + case "qwerty_pt": return R.xml.qwerty_pt; case "qwerty_sv_se": return R.xml.qwerty_sv_se; - case "qwertz_hu": return R.xml.qwertz_hu; - case "qwertz_cs": return R.xml.qwertz_cs; + case "qwerty_tr": return R.xml.qwerty_tr; case "qwertz": return R.xml.qwertz; + case "qwertz_cs": return R.xml.qwertz_cs; + case "qwertz_de": return R.xml.qwertz_de; + case "qwertz_hu": return R.xml.qwertz_hu; case "ru_jcuken": return R.xml.local_ru_jcuken; - case "jcuken_ua": return R.xml.jcuken_ua; default: return R.xml.qwerty; // The config might store an invalid layout, don't crash } } |