From 059487a18b3df9f46cc6cf3208a00180d3550e84 Mon Sep 17 00:00:00 2001 From: Jovier Date: Sun, 22 May 2022 17:22:51 -0400 Subject: [PATCH 1/7] 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 dc81cdc..5c122c5 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 ac02880..0c20600 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 7720606..c98e0c0 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 97b4e7e..8dec168 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 f8b7ab8..a14c655 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 0000000..38b1015 --- /dev/null +++ b/app/src/main/res/xml/keys_letters_english_dvorak.xml @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + /> + /> + /> + /> + /> + + /> + /> + + + + + + + + + + + + + + + + + + + + + From f35e7a668d8708a44b0cc7c7d55a97548ccfb947 Mon Sep 17 00:00:00 2001 From: Jovier Date: Sun, 22 May 2022 17:34:29 -0400 Subject: [PATCH 2/7] Fixed gradle version number, dependency implementation, and bool value. 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 --- app/build.gradle | 6 +++--- app/src/fdroid/res/values/bools.xml | 2 +- .../keyboard/activities/SettingsActivity.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5c122c5..dc81cdc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.simplemobiletools.keyboard" minSdk 23 targetSdk 31 - versionCode 7 - versionName "5.1.1" + versionCode 8 + versionName "5.1.2" multiDexEnabled true setProperty("archivesBaseName", "keyboard") vectorDrawables.useSupportLibrary = true @@ -64,7 +64,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:e5a4973e6a' + implementation 'com.github.SimpleMobileTools:Simple-Commons:795a4ae3e3' 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 0c20600..ac02880 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 c98e0c0..0a1ef3d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt @@ -132,7 +132,7 @@ 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_ENGLISH_DVORAK -> "${getString(R.string.translation_english)} (DVORAK)" + LANGUAGE_ENGLISH_DVORAK -> "${getString(R.string.translation_english)} (DVORAK)" LANGUAGE_SPANISH -> getString(R.string.translation_spanish) else -> "${getString(R.string.translation_english)} (QWERTY)" } From 552ce4e1148c04125708d2622d573bcac2799541 Mon Sep 17 00:00:00 2001 From: Jovier Date: Sun, 22 May 2022 18:46:53 -0400 Subject: [PATCH 3/7] Replaced Tabs with Spaces at "RadioItem(LANGUAGE_ENGLISH_DVORAK, getKeyboardLanguageText(LANGUAGE_ENGLISH_DVORAK))" in app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt On branch main Your branch is up to date with 'origin/main'. Changes to be committed: modified: app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt --- .../simplemobiletools/keyboard/activities/SettingsActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0a1ef3d..2b6e559 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt @@ -112,7 +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_ENGLISH_DVORAK, getKeyboardLanguageText(LANGUAGE_ENGLISH_DVORAK)), RadioItem(LANGUAGE_FRENCH, getKeyboardLanguageText(LANGUAGE_FRENCH)), RadioItem(LANGUAGE_GERMAN, getKeyboardLanguageText(LANGUAGE_GERMAN)), RadioItem(LANGUAGE_SPANISH, getKeyboardLanguageText(LANGUAGE_SPANISH)), From e27f4351be198d9f4b0ac01efe8ead28572dda98 Mon Sep 17 00:00:00 2001 From: Jovier Date: Sun, 22 May 2022 18:52:45 -0400 Subject: [PATCH 4/7] Same as last commit On branch main Your branch is up to date with 'origin/main'. Changes to be committed: modified: app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt --- .../simplemobiletools/keyboard/activities/SettingsActivity.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 2b6e559..407e129 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt @@ -132,8 +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_ENGLISH_DVORAK -> "${getString(R.string.translation_english)} (DVORAK)" - 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)" } } From f3f590f021134a7387e79ce4b1e860f087f19581 Mon Sep 17 00:00:00 2001 From: Jovier Date: Sun, 22 May 2022 18:58:04 -0400 Subject: [PATCH 5/7] 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 --- .../keyboard/services/SimpleKeyboardIME.kt | 2 +- .../res/xml/keys_letters_english_dvorak.xml | 64 ++++++++++--------- 2 files changed, 36 insertions(+), 30 deletions(-) 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 a14c655..8b37488 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt @@ -246,7 +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_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 index 38b1015..adc82dd 100644 --- a/app/src/main/res/xml/keys_letters_english_dvorak.xml +++ b/app/src/main/res/xml/keys_letters_english_dvorak.xml @@ -9,12 +9,12 @@ app:topSmallNumber="1" /> + app:keyLabel="a" + app:popupCharacters="áàâãäåāæą" + app:popupKeyboard="@xml/keyboard_popup_template"/> /> - /> - /> - /> - /> + app:keyLabel="o" + app:popupCharacters="őöóôôòõō" + app:popupKeyboard="@xml/keyboard_popup_template"/>/> + /> + /> + /> + /> - /> - /> + /> + /> @@ -121,9 +127,9 @@ app:isRepeatable="true" app:keyWidth="50%p" /> Date: Wed, 8 Jun 2022 21:00:14 +0200 Subject: [PATCH 6/7] Update keys_letters_english_dvorak.xml --- .../main/res/xml/keys_letters_english_dvorak.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/xml/keys_letters_english_dvorak.xml b/app/src/main/res/xml/keys_letters_english_dvorak.xml index adc82dd..fe6a6f8 100644 --- a/app/src/main/res/xml/keys_letters_english_dvorak.xml +++ b/app/src/main/res/xml/keys_letters_english_dvorak.xml @@ -9,7 +9,7 @@ app:topSmallNumber="1" /> /> + app:popupKeyboard="@xml/keyboard_popup_template"/> /> + app:popupKeyboard="@xml/keyboard_popup_template"/> /> + app:popupKeyboard="@xml/keyboard_popup_template"/> /> + app:popupKeyboard="@xml/keyboard_popup_template"/> /> + app:popupKeyboard="@xml/keyboard_popup_template"/> /> + app:popupKeyboard="@xml/keyboard_popup_template"/> /> + app:popupKeyboard="@xml/keyboard_popup_template"/> From 4fd8a2083d302268ff4228b6692aa0866691c3e1 Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Wed, 8 Jun 2022 21:01:53 +0200 Subject: [PATCH 7/7] fixing some style --- .../res/xml/keys_letters_english_dvorak.xml | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/app/src/main/res/xml/keys_letters_english_dvorak.xml b/app/src/main/res/xml/keys_letters_english_dvorak.xml index fe6a6f8..3da740e 100644 --- a/app/src/main/res/xml/keys_letters_english_dvorak.xml +++ b/app/src/main/res/xml/keys_letters_english_dvorak.xml @@ -59,36 +59,36 @@ app:keyEdgeFlags="left" app:keyLabel="a" app:popupCharacters="áàâãäåāæą" - app:popupKeyboard="@xml/keyboard_popup_template"/> - + - + - + - + - + + app:popupKeyboard="@xml/keyboard_popup_template" /> - - + + app:popupKeyboard="@xml/keyboard_popup_template" /> @@ -128,9 +128,9 @@ app:keyWidth="50%p" /> + app:popupKeyboard="@xml/keyboard_popup_template" />