diff --git a/CHANGELOG.md b/CHANGELOG.md index 30740ed0..ace00713 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - German QWERTZ layout without dedicated umlaut keys ([#47]) - Portuguese layout ([#133]) +- Dutch layout ([#136]) ### Changed - Updated French AZERTY layout ([#134]) @@ -86,6 +87,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#78]: https://github.com/FossifyOrg/Keyboard/issues/78 [#133]: https://github.com/FossifyOrg/Keyboard/issues/133 [#134]: https://github.com/FossifyOrg/Keyboard/issues/134 +[#136]: https://github.com/FossifyOrg/Keyboard/issues/136 [#157]: https://github.com/FossifyOrg/Keyboard/issues/157 [#202]: https://github.com/FossifyOrg/Keyboard/issues/202 [#222]: https://github.com/FossifyOrg/Keyboard/issues/222 diff --git a/app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt b/app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt index ed9a50a4..d51da0c4 100644 --- a/app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt @@ -48,6 +48,7 @@ import org.fossify.keyboard.helpers.LANGUAGE_CHUVASH import org.fossify.keyboard.helpers.LANGUAGE_CZECH_QWERTY import org.fossify.keyboard.helpers.LANGUAGE_CZECH_QWERTZ import org.fossify.keyboard.helpers.LANGUAGE_DANISH +import org.fossify.keyboard.helpers.LANGUAGE_DUTCH import org.fossify.keyboard.helpers.LANGUAGE_ENGLISH_DVORAK import org.fossify.keyboard.helpers.LANGUAGE_ENGLISH_QWERTZ import org.fossify.keyboard.helpers.LANGUAGE_ESPERANTO @@ -287,6 +288,7 @@ fun Context.getKeyboardLanguageText(language: Int): String { LANGUAGE_CZECH_QWERTY -> "${getString(R.string.translation_czech)} (QWERTY)" LANGUAGE_CZECH_QWERTZ -> "${getString(R.string.translation_czech)} (QWERTZ)" LANGUAGE_DANISH -> getString(R.string.translation_danish) + LANGUAGE_DUTCH -> getString(R.string.translation_dutch) LANGUAGE_ENGLISH_DVORAK -> "${getString(R.string.translation_english)} (DVORAK)" LANGUAGE_ENGLISH_QWERTZ -> "${getString(R.string.translation_english)} (QWERTZ)" LANGUAGE_ESPERANTO -> getString(R.string.translation_esperanto) diff --git a/app/src/main/kotlin/org/fossify/keyboard/helpers/Constants.kt b/app/src/main/kotlin/org/fossify/keyboard/helpers/Constants.kt index c6a6adc0..4c7d8209 100644 --- a/app/src/main/kotlin/org/fossify/keyboard/helpers/Constants.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/helpers/Constants.kt @@ -62,6 +62,7 @@ const val LANGUAGE_ITALIAN = 31 const val LANGUAGE_CZECH_QWERTZ = 32 const val LANGUAGE_GERMAN_QWERTZ = 33 const val LANGUAGE_PORTUGUESE = 34 +const val LANGUAGE_DUTCH = 36 // Keep this sorted val SUPPORTED_LANGUAGES = listOf( @@ -75,6 +76,7 @@ val SUPPORTED_LANGUAGES = listOf( LANGUAGE_CZECH_QWERTY, LANGUAGE_CZECH_QWERTZ, LANGUAGE_DANISH, + LANGUAGE_DUTCH, LANGUAGE_ENGLISH_QWERTY, LANGUAGE_ENGLISH_QWERTZ, LANGUAGE_ENGLISH_DVORAK, diff --git a/app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt b/app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt index 9d7657cb..3fd2346a 100644 --- a/app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt @@ -453,6 +453,7 @@ class SimpleKeyboardIME : InputMethodService(), OnKeyboardActionListener, Shared LANGUAGE_CZECH_QWERTY -> R.xml.keys_letters_czech_qwerty LANGUAGE_CZECH_QWERTZ -> R.xml.keys_letters_czech_qwertz LANGUAGE_DANISH -> R.xml.keys_letters_danish + LANGUAGE_DUTCH -> R.xml.keys_letters_dutch LANGUAGE_ENGLISH_DVORAK -> R.xml.keys_letters_english_dvorak LANGUAGE_ENGLISH_QWERTZ -> R.xml.keys_letters_english_qwertz LANGUAGE_ESPERANTO -> R.xml.keys_letters_esperanto diff --git a/app/src/main/res/xml/keys_letters_dutch.xml b/app/src/main/res/xml/keys_letters_dutch.xml new file mode 100644 index 00000000..e5597eda --- /dev/null +++ b/app/src/main/res/xml/keys_letters_dutch.xml @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +