fenix
/
Simple-Keyboard
mirror of https://github.com/SimpleMobileTools/Simple-Keyboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added English US Dvorak layout 

On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   app/build.gradle
	modified:   app/src/fdroid/res/values/bools.xml
	modified:   app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt
	modified:   app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt
	modified:   app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt
	new file:   app/src/main/res/xml/keys_letters_english_dvorak.xml
This commit is contained in:
Jovier 2022-05-22 17:22:51 -04:00
parent 7ab45a44a7
commit 059487a18b
6 changed files with 143 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -16,8 +16,8 @@ android {
applicationId "com.simplemobiletools.keyboard" applicationId "com.simplemobiletools.keyboard"
minSdk 23 minSdk 23
targetSdk 31 targetSdk 31
versionCode 8 versionCode 7
versionName "5.1.2" versionName "5.1.1"
multiDexEnabled true multiDexEnabled true
setProperty("archivesBaseName", "keyboard") setProperty("archivesBaseName", "keyboard")
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
@ -64,7 +64,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:795a4ae3e3' implementation 'com.github.SimpleMobileTools:Simple-Commons:e5a4973e6a'
kapt 'androidx.room:room-compiler:2.4.2' kapt 'androidx.room:room-compiler:2.4.2'
implementation 'androidx.room:room-runtime:2.4.2' implementation 'androidx.room:room-runtime:2.4.2'

2
app/src/fdroid/res/values/bools.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<bool name="show_donate_in_about">true</bool> <bool name="show_donate_in_about">true</bool>
<bool name="hide_google_relations">true</bool> <bool name="avoid_showing_rating_prompt">true</bool>
<bool name="pretend_thank_you_installed">true</bool> <bool name="pretend_thank_you_installed">true</bool>
</resources> </resources>

4
app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt
View File

@ -112,6 +112,7 @@ class SettingsActivity : SimpleActivity() {
val items = arrayListOf( val items = arrayListOf(
RadioItem(LANGUAGE_ENGLISH_QWERTY, getKeyboardLanguageText(LANGUAGE_ENGLISH_QWERTY)), RadioItem(LANGUAGE_ENGLISH_QWERTY, getKeyboardLanguageText(LANGUAGE_ENGLISH_QWERTY)),
RadioItem(LANGUAGE_ENGLISH_QWERTZ, getKeyboardLanguageText(LANGUAGE_ENGLISH_QWERTZ)), RadioItem(LANGUAGE_ENGLISH_QWERTZ, getKeyboardLanguageText(LANGUAGE_ENGLISH_QWERTZ)),
RadioItem(LANGUAGE_ENGLISH_DVORAK, getKeyboardLanguageText(LANGUAGE_ENGLISH_DVORAK)),
RadioItem(LANGUAGE_FRENCH, getKeyboardLanguageText(LANGUAGE_FRENCH)), RadioItem(LANGUAGE_FRENCH, getKeyboardLanguageText(LANGUAGE_FRENCH)),
RadioItem(LANGUAGE_GERMAN, getKeyboardLanguageText(LANGUAGE_GERMAN)), RadioItem(LANGUAGE_GERMAN, getKeyboardLanguageText(LANGUAGE_GERMAN)),
RadioItem(LANGUAGE_SPANISH, getKeyboardLanguageText(LANGUAGE_SPANISH)), RadioItem(LANGUAGE_SPANISH, getKeyboardLanguageText(LANGUAGE_SPANISH)),
@ -131,7 +132,8 @@ class SettingsActivity : SimpleActivity() {
LANGUAGE_GERMAN -> getString(R.string.translation_german) LANGUAGE_GERMAN -> getString(R.string.translation_german)
LANGUAGE_RUSSIAN -> getString(R.string.translation_russian) LANGUAGE_RUSSIAN -> getString(R.string.translation_russian)
LANGUAGE_ENGLISH_QWERTZ -> "${getString(R.string.translation_english)} (QWERTZ)" LANGUAGE_ENGLISH_QWERTZ -> "${getString(R.string.translation_english)} (QWERTZ)"
LANGUAGE_SPANISH -> getString(R.string.translation_spanish) LANGUAGE_ENGLISH_DVORAK -> "${getString(R.string.translation_english)} (DVORAK)"
LANGUAGE_SPANISH -> getString(R.string.translation_spanish)
else -> "${getString(R.string.translation_english)} (QWERTY)" else -> "${getString(R.string.translation_english)} (QWERTY)"
} }
} }

1
app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt
View File

@ -23,3 +23,4 @@ const val LANGUAGE_FRENCH = 2
const val LANGUAGE_ENGLISH_QWERTZ = 3 const val LANGUAGE_ENGLISH_QWERTZ = 3
const val LANGUAGE_SPANISH = 4 const val LANGUAGE_SPANISH = 4
const val LANGUAGE_GERMAN = 5 const val LANGUAGE_GERMAN = 5
const val LANGUAGE_ENGLISH_DVORAK = 6

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

@ -246,6 +246,7 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
LANGUAGE_FRENCH -> R.xml.keys_letters_french LANGUAGE_FRENCH -> R.xml.keys_letters_french
LANGUAGE_RUSSIAN -> R.xml.keys_letters_russian LANGUAGE_RUSSIAN -> R.xml.keys_letters_russian
LANGUAGE_ENGLISH_QWERTZ -> R.xml.keys_letters_english_qwertz LANGUAGE_ENGLISH_QWERTZ -> R.xml.keys_letters_english_qwertz
LANGUAGE_ENGLISH_DVORAK -> R.xml.keys_letters_english_dvorak
LANGUAGE_SPANISH -> R.xml.keys_letters_spanish_qwerty LANGUAGE_SPANISH -> R.xml.keys_letters_spanish_qwerty
LANGUAGE_GERMAN -> R.xml.keys_letters_german LANGUAGE_GERMAN -> R.xml.keys_letters_german
else -> R.xml.keys_letters_english_qwerty else -> R.xml.keys_letters_english_qwerty

134
app/src/main/res/xml/keys_letters_english_dvorak.xml Normal file
View File

@ -0,0 +1,134 @@
<?xml version="1.0" encoding="utf-8"?>
<Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
<Row>
<Key
app:keyEdgeFlags="left"
app:keyLabel="'"
app:popupCharacters='1!"'
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="1" />
<Key
app:keyLabel=","
app:popupCharacters="<2?"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="2" />
<Key
app:keyLabel="."
app:popupCharacters="3>"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="3" />
<Key
app:keyLabel="p"
app:popupCharacters="4"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="4" />
<Key
app:keyLabel="y"
app:popupCharacters="5"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="5" />
<Key
app:keyLabel="f"
app:popupCharacters="6"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="6" />
<Key
app:keyLabel="g"
app:popupCharacters="7"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="7" />
<Key
app:keyLabel="c"
app:popupCharacters="ć8çç"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="8" />
<Key
app:keyLabel="r"
app:popupCharacters="9"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="9" />
<Key
app:keyEdgeFlags="right"
app:keyLabel="l"
app:popupCharacters="0"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="0" />
</Row>
<Row>
<Key
app:keyEdgeFlags="left"
app:keyLabel="a"
app:popupCharacters="áàâãäåāæą"
app:popupKeyboard="@xml/keyboard_popup_template"/>
<Key
app:keyLabel="o"
app:popupCharacters="őöóôôòõō"
app:popupKeyboard="@xml/keyboard_popup_template"/>/>
<Key app:keyLabel="e"
app:popupCharacters="éèêëēę"
app:popupKeyboard="@xml/keyboard_popup_template"/>/>
<Key app:keyLabel="u"
app:popupCharacters="űúùûüū"
app:popupKeyboard="@xml/keyboard_popup_template"/>/>
<Key app:keyLabel="i"
app:popupCharacters="íìîïī"
app:popupKeyboard="@xml/keyboard_popup_template"/> />
<Key app:keyLabel="d"
app:popupCharacters="ďđ"
app:popupKeyboard="@xml/keyboard_popup_template"/> />
<Key app:keyLabel="h" />
<Key app:keyLabel="t"
app:popupCharacters="ť"
app:popupKeyboard="@xml/keyboard_popup_template"/> />
<Key app:keyLabel="n"
app:popupCharacters="ňńñ"
app:popupKeyboard="@xml/keyboard_popup_template"/> />
<Key
app:keyEdgeFlags="right"
app:keyLabel="s" />
</Row>
<Row>
<Key
app:code="-1"
app:keyEdgeFlags="left"
app:keyIcon="@drawable/ic_caps_outline_vector"
app:keyWidth="15%p" />
<Key app:keyLabel="j" />
<Key app:keyLabel="k" />
<Key app:keyLabel="x" />
<Key app:keyLabel="b" />
<Key app:keyLabel="m" />
<Key app:keyLabel="w" />
<Key app:keyLabel="v" />
<Key
app:code="-5"
app:isRepeatable="true"
app:keyEdgeFlags="right"
app:keyIcon="@drawable/ic_clear_vector"
app:keyWidth="15%p" />
</Row>
<Row>
<Key
app:code="-2"
app:keyEdgeFlags="left"
app:keyLabel="123"
app:keyWidth="15%p" />
<Key
app:keyLabel="q"
app:keyWidth="10%p" />
<Key
app:code="32"
app:isRepeatable="true"
app:keyWidth="50%p" />
<Key
app:keyLabel="z"
app:popupCharacters="źžż"
app:popupKeyboard="@xml/keyboard_popup_template"
app:keyWidth="10%p" />
<Key
app:code="-4"
app:keyEdgeFlags="right"
app:keyIcon="@drawable/ic_enter_vector"
app:keyWidth="15%p" />
</Row>
</Keyboard>