From 059487a18b3df9f46cc6cf3208a00180d3550e84 Mon Sep 17 00:00:00 2001 From: Jovier Date: Sun, 22 May 2022 17:22:51 -0400 Subject: [PATCH] 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 --- app/build.gradle | 6 +- app/src/fdroid/res/values/bools.xml | 2 +- .../keyboard/activities/SettingsActivity.kt | 4 +- .../keyboard/helpers/Constants.kt | 1 + .../keyboard/services/SimpleKeyboardIME.kt | 1 + .../res/xml/keys_letters_english_dvorak.xml | 134 ++++++++++++++++++ 6 files changed, 143 insertions(+), 5 deletions(-) create mode 100644 app/src/main/res/xml/keys_letters_english_dvorak.xml diff --git a/app/build.gradle b/app/build.gradle index dc81cdc9..5c122c5b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.simplemobiletools.keyboard" minSdk 23 targetSdk 31 - versionCode 8 - versionName "5.1.2" + versionCode 7 + versionName "5.1.1" multiDexEnabled true setProperty("archivesBaseName", "keyboard") vectorDrawables.useSupportLibrary = true @@ -64,7 +64,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:795a4ae3e3' + implementation 'com.github.SimpleMobileTools:Simple-Commons:e5a4973e6a' kapt 'androidx.room:room-compiler:2.4.2' implementation 'androidx.room:room-runtime:2.4.2' diff --git a/app/src/fdroid/res/values/bools.xml b/app/src/fdroid/res/values/bools.xml index ac02880e..0c20600e 100644 --- a/app/src/fdroid/res/values/bools.xml +++ b/app/src/fdroid/res/values/bools.xml @@ -1,6 +1,6 @@ true - true + true true diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt index 7720606a..c98e0c08 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt @@ -112,6 +112,7 @@ class SettingsActivity : SimpleActivity() { val items = arrayListOf( RadioItem(LANGUAGE_ENGLISH_QWERTY, getKeyboardLanguageText(LANGUAGE_ENGLISH_QWERTY)), RadioItem(LANGUAGE_ENGLISH_QWERTZ, getKeyboardLanguageText(LANGUAGE_ENGLISH_QWERTZ)), + RadioItem(LANGUAGE_ENGLISH_DVORAK, getKeyboardLanguageText(LANGUAGE_ENGLISH_DVORAK)), RadioItem(LANGUAGE_FRENCH, getKeyboardLanguageText(LANGUAGE_FRENCH)), RadioItem(LANGUAGE_GERMAN, getKeyboardLanguageText(LANGUAGE_GERMAN)), RadioItem(LANGUAGE_SPANISH, getKeyboardLanguageText(LANGUAGE_SPANISH)), @@ -131,7 +132,8 @@ class SettingsActivity : SimpleActivity() { LANGUAGE_GERMAN -> getString(R.string.translation_german) LANGUAGE_RUSSIAN -> getString(R.string.translation_russian) 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)" } } diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt index 97b4e7eb..8dec168f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt @@ -23,3 +23,4 @@ const val LANGUAGE_FRENCH = 2 const val LANGUAGE_ENGLISH_QWERTZ = 3 const val LANGUAGE_SPANISH = 4 const val LANGUAGE_GERMAN = 5 +const val LANGUAGE_ENGLISH_DVORAK = 6 diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt index f8b7ab8d..a14c6550 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt @@ -246,6 +246,7 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL LANGUAGE_FRENCH -> R.xml.keys_letters_french LANGUAGE_RUSSIAN -> R.xml.keys_letters_russian 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_GERMAN -> R.xml.keys_letters_german else -> R.xml.keys_letters_english_qwerty diff --git a/app/src/main/res/xml/keys_letters_english_dvorak.xml b/app/src/main/res/xml/keys_letters_english_dvorak.xml new file mode 100644 index 00000000..38b1015d --- /dev/null +++ b/app/src/main/res/xml/keys_letters_english_dvorak.xml @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + /> + /> + /> + /> + /> + + /> + /> + + + + + + + + + + + + + + + + + + + + +