From 897ae97cdef07960119fab6ea102de4c8c8824ff Mon Sep 17 00:00:00 2001 From: JdM Date: Sat, 3 Jun 2023 19:24:22 +0200 Subject: [PATCH 1/7] Creating a french_bepo key file --- .../main/res/xml/keys_letters_french_bepo.xml | 179 ++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 app/src/main/res/xml/keys_letters_french_bepo.xml diff --git a/app/src/main/res/xml/keys_letters_french_bepo.xml b/app/src/main/res/xml/keys_letters_french_bepo.xml new file mode 100644 index 0000000..eb24dd6 --- /dev/null +++ b/app/src/main/res/xml/keys_letters_french_bepo.xml @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a5fedc8ade215675aa1472af46e3bf25637746ab Mon Sep 17 00:00:00 2001 From: JdM Date: Sat, 3 Jun 2023 19:44:36 +0200 Subject: [PATCH 2/7] rename key_letters_french to key_letters_french_azerty --- .../simplemobiletools/keyboard/services/SimpleKeyboardIME.kt | 2 +- .../{keys_letters_french.xml => keys_letters_french_azerty.xml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename app/src/main/res/xml/{keys_letters_french.xml => keys_letters_french_azerty.xml} (100%) 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 fc6c529..54a1052 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt @@ -301,7 +301,7 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL LANGUAGE_DANISH -> R.xml.keys_letters_danish LANGUAGE_ENGLISH_DVORAK -> R.xml.keys_letters_english_dvorak LANGUAGE_ENGLISH_QWERTZ -> R.xml.keys_letters_english_qwertz - LANGUAGE_FRENCH -> R.xml.keys_letters_french + LANGUAGE_FRENCH -> R.xml.keys_letters_french_azerty LANGUAGE_GERMAN -> R.xml.keys_letters_german LANGUAGE_GREEK -> R.xml.keys_letters_greek LANGUAGE_LITHUANIAN -> R.xml.keys_letters_lithuanian diff --git a/app/src/main/res/xml/keys_letters_french.xml b/app/src/main/res/xml/keys_letters_french_azerty.xml similarity index 100% rename from app/src/main/res/xml/keys_letters_french.xml rename to app/src/main/res/xml/keys_letters_french_azerty.xml From ae33ab91a7b766c70a5157ef3c9406d04534ee9b Mon Sep 17 00:00:00 2001 From: JdM Date: Sat, 3 Jun 2023 19:46:00 +0200 Subject: [PATCH 3/7] rename LANGUAGE_FRENCH to LANGUAGE_FRENCH_AZERTY --- .../com/simplemobiletools/keyboard/extensions/Context.kt | 4 ++-- .../com/simplemobiletools/keyboard/helpers/Constants.kt | 2 +- .../simplemobiletools/keyboard/services/SimpleKeyboardIME.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt index 7a62833..91406f8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt @@ -152,7 +152,7 @@ fun Context.getKeyboardLanguages(): ArrayList { 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_FRENCH_AZERTY, getKeyboardLanguageText(LANGUAGE_FRENCH_AZERTY)), RadioItem(LANGUAGE_GERMAN, getKeyboardLanguageText(LANGUAGE_GERMAN)), RadioItem(LANGUAGE_GREEK, getKeyboardLanguageText(LANGUAGE_GREEK)), RadioItem(LANGUAGE_LITHUANIAN, getKeyboardLanguageText(LANGUAGE_LITHUANIAN)), @@ -173,7 +173,7 @@ fun Context.getKeyboardLanguageText(language: Int): String { LANGUAGE_DANISH -> getString(R.string.translation_danish) LANGUAGE_ENGLISH_DVORAK -> "${getString(R.string.translation_english)} (DVORAK)" LANGUAGE_ENGLISH_QWERTZ -> "${getString(R.string.translation_english)} (QWERTZ)" - LANGUAGE_FRENCH -> getString(R.string.translation_french) + LANGUAGE_FRENCH_AZERTY -> getString(R.string.translation_french) LANGUAGE_GERMAN -> getString(R.string.translation_german) LANGUAGE_GREEK -> getString(R.string.translation_greek) LANGUAGE_LITHUANIAN -> getString(R.string.translation_lithuanian) 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 3045fde..0ea8c4a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt @@ -77,7 +77,7 @@ const val ITEM_CLIP = 1 const val LANGUAGE_ENGLISH_QWERTY = 0 const val LANGUAGE_RUSSIAN = 1 -const val LANGUAGE_FRENCH = 2 +const val LANGUAGE_FRENCH_AZERTY = 2 const val LANGUAGE_ENGLISH_QWERTZ = 3 const val LANGUAGE_SPANISH = 4 const val LANGUAGE_GERMAN = 5 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 54a1052..9fe00be 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt @@ -301,7 +301,7 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL LANGUAGE_DANISH -> R.xml.keys_letters_danish LANGUAGE_ENGLISH_DVORAK -> R.xml.keys_letters_english_dvorak LANGUAGE_ENGLISH_QWERTZ -> R.xml.keys_letters_english_qwertz - LANGUAGE_FRENCH -> R.xml.keys_letters_french_azerty + LANGUAGE_FRENCH_AZERTY_AZERTY -> R.xml.keys_letters_french_azerty LANGUAGE_GERMAN -> R.xml.keys_letters_german LANGUAGE_GREEK -> R.xml.keys_letters_greek LANGUAGE_LITHUANIAN -> R.xml.keys_letters_lithuanian From bbba02e87bc17a1119759f42a374f848395b98ee Mon Sep 17 00:00:00 2001 From: JdM Date: Sat, 3 Jun 2023 19:46:24 +0200 Subject: [PATCH 4/7] fix typing error --- .../simplemobiletools/keyboard/services/SimpleKeyboardIME.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9fe00be..9ca238b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt @@ -301,7 +301,7 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL LANGUAGE_DANISH -> R.xml.keys_letters_danish LANGUAGE_ENGLISH_DVORAK -> R.xml.keys_letters_english_dvorak LANGUAGE_ENGLISH_QWERTZ -> R.xml.keys_letters_english_qwertz - LANGUAGE_FRENCH_AZERTY_AZERTY -> R.xml.keys_letters_french_azerty + LANGUAGE_FRENCH_AZERTY -> R.xml.keys_letters_french_azerty LANGUAGE_GERMAN -> R.xml.keys_letters_german LANGUAGE_GREEK -> R.xml.keys_letters_greek LANGUAGE_LITHUANIAN -> R.xml.keys_letters_lithuanian From 8879e8a0dc82e2b5ab239b69ac3f77f5076fe20f Mon Sep 17 00:00:00 2001 From: JdM Date: Sat, 3 Jun 2023 20:37:53 +0200 Subject: [PATCH 5/7] =?UTF-8?q?Added=20B=C3=89PO=20keyboard=20layouts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simplemobiletools/keyboard/extensions/Context.kt | 4 +++- .../com/simplemobiletools/keyboard/helpers/Constants.kt | 1 + .../simplemobiletools/keyboard/services/SimpleKeyboardIME.kt | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt index 91406f8..f5ea032 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt @@ -153,6 +153,7 @@ fun Context.getKeyboardLanguages(): ArrayList { RadioItem(LANGUAGE_ENGLISH_QWERTZ, getKeyboardLanguageText(LANGUAGE_ENGLISH_QWERTZ)), RadioItem(LANGUAGE_ENGLISH_DVORAK, getKeyboardLanguageText(LANGUAGE_ENGLISH_DVORAK)), RadioItem(LANGUAGE_FRENCH_AZERTY, getKeyboardLanguageText(LANGUAGE_FRENCH_AZERTY)), + RadioItem(LANGUAGE_FRENCH_BEPO, getKeyboardLanguageText(LANGUAGE_FRENCH_BEPO)), RadioItem(LANGUAGE_GERMAN, getKeyboardLanguageText(LANGUAGE_GERMAN)), RadioItem(LANGUAGE_GREEK, getKeyboardLanguageText(LANGUAGE_GREEK)), RadioItem(LANGUAGE_LITHUANIAN, getKeyboardLanguageText(LANGUAGE_LITHUANIAN)), @@ -173,7 +174,8 @@ fun Context.getKeyboardLanguageText(language: Int): String { LANGUAGE_DANISH -> getString(R.string.translation_danish) LANGUAGE_ENGLISH_DVORAK -> "${getString(R.string.translation_english)} (DVORAK)" LANGUAGE_ENGLISH_QWERTZ -> "${getString(R.string.translation_english)} (QWERTZ)" - LANGUAGE_FRENCH_AZERTY -> getString(R.string.translation_french) + LANGUAGE_FRENCH_AZERTY -> "${getString(R.string.translation_french)} (AZERTY)" + LANGUAGE_FRENCH_BEPO -> "${getString(R.string.translation_french)} (BEPO)" LANGUAGE_GERMAN -> getString(R.string.translation_german) LANGUAGE_GREEK -> getString(R.string.translation_greek) LANGUAGE_LITHUANIAN -> getString(R.string.translation_lithuanian) 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 0ea8c4a..9c8a912 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt @@ -92,6 +92,7 @@ const val LANGUAGE_GREEK = 13 const val LANGUAGE_NORWEGIAN = 14 const val LANGUAGE_SWEDISH = 15 const val LANGUAGE_DANISH = 16 +const val LANGUAGE_FRENCH_BEPO = 17 // keyboard height multiplier options const val KEYBOARD_HEIGHT_MULTIPLIER_SMALL = 1 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 9ca238b..a59de39 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt @@ -302,6 +302,7 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL LANGUAGE_ENGLISH_DVORAK -> R.xml.keys_letters_english_dvorak LANGUAGE_ENGLISH_QWERTZ -> R.xml.keys_letters_english_qwertz LANGUAGE_FRENCH_AZERTY -> R.xml.keys_letters_french_azerty + LANGUAGE_FRENCH_BEPO -> R.xml.keys_letters_french_bepo LANGUAGE_GERMAN -> R.xml.keys_letters_german LANGUAGE_GREEK -> R.xml.keys_letters_greek LANGUAGE_LITHUANIAN -> R.xml.keys_letters_lithuanian From ab4125a8f104d8b784d85e52d29f53cc9ea2013b Mon Sep 17 00:00:00 2001 From: JdM Date: Sat, 3 Jun 2023 20:54:25 +0200 Subject: [PATCH 6/7] =?UTF-8?q?Fixed=20b=C3=A9po=20letter=20width=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/xml/keys_letters_french_bepo.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/xml/keys_letters_french_bepo.xml b/app/src/main/res/xml/keys_letters_french_bepo.xml index eb24dd6..7534aa7 100644 --- a/app/src/main/res/xml/keys_letters_french_bepo.xml +++ b/app/src/main/res/xml/keys_letters_french_bepo.xml @@ -43,7 +43,7 @@ app:topSmallNumber="1" /> + app:keyLabel="a" + app:popupCharacters="áàâãäåāæą" + app:popupKeyboard="@xml/keyboard_popup_template" /> + app:keyIcon="@drawable/ic_caps_outline_vector" /> + app:keyIcon="@drawable/ic_clear_vector" /> Date: Sun, 11 Jun 2023 11:40:37 +0000 Subject: [PATCH 7/7] change the top row to select the number by default --- app/src/main/res/xml/keys_letters_french_bepo.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/xml/keys_letters_french_bepo.xml b/app/src/main/res/xml/keys_letters_french_bepo.xml index 7534aa7..0df57fb 100644 --- a/app/src/main/res/xml/keys_letters_french_bepo.xml +++ b/app/src/main/res/xml/keys_letters_french_bepo.xml @@ -43,17 +43,17 @@ app:topSmallNumber="1" />