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 855438d..7a62833 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt @@ -4,11 +4,7 @@ import android.content.ClipboardManager import android.content.Context import android.graphics.Color import android.os.IBinder -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.view.Window -import android.view.WindowManager +import android.view.* import android.widget.TextView import androidx.appcompat.app.AlertDialog import androidx.core.content.res.ResourcesCompat @@ -152,6 +148,7 @@ fun Context.getKeyboardLanguages(): ArrayList { return arrayListOf( RadioItem(LANGUAGE_BENGALI, getKeyboardLanguageText(LANGUAGE_BENGALI)), RadioItem(LANGUAGE_BULGARIAN, getKeyboardLanguageText(LANGUAGE_BULGARIAN)), + RadioItem(LANGUAGE_DANISH, getKeyboardLanguageText(LANGUAGE_DANISH)), RadioItem(LANGUAGE_ENGLISH_QWERTY, getKeyboardLanguageText(LANGUAGE_ENGLISH_QWERTY)), RadioItem(LANGUAGE_ENGLISH_QWERTZ, getKeyboardLanguageText(LANGUAGE_ENGLISH_QWERTZ)), RadioItem(LANGUAGE_ENGLISH_DVORAK, getKeyboardLanguageText(LANGUAGE_ENGLISH_DVORAK)), @@ -159,10 +156,12 @@ fun Context.getKeyboardLanguages(): ArrayList { RadioItem(LANGUAGE_GERMAN, getKeyboardLanguageText(LANGUAGE_GERMAN)), RadioItem(LANGUAGE_GREEK, getKeyboardLanguageText(LANGUAGE_GREEK)), RadioItem(LANGUAGE_LITHUANIAN, getKeyboardLanguageText(LANGUAGE_LITHUANIAN)), + RadioItem(LANGUAGE_NORWEGIAN, getKeyboardLanguageText(LANGUAGE_NORWEGIAN)), RadioItem(LANGUAGE_ROMANIAN, getKeyboardLanguageText(LANGUAGE_ROMANIAN)), RadioItem(LANGUAGE_RUSSIAN, getKeyboardLanguageText(LANGUAGE_RUSSIAN)), RadioItem(LANGUAGE_SLOVENIAN, getKeyboardLanguageText(LANGUAGE_SLOVENIAN)), RadioItem(LANGUAGE_SPANISH, getKeyboardLanguageText(LANGUAGE_SPANISH)), + RadioItem(LANGUAGE_SWEDISH, getKeyboardLanguageText(LANGUAGE_SWEDISH)), RadioItem(LANGUAGE_TURKISH_Q, getKeyboardLanguageText(LANGUAGE_TURKISH_Q)), ) } @@ -171,18 +170,22 @@ fun Context.getKeyboardLanguageText(language: Int): String { return when (language) { LANGUAGE_BENGALI -> getString(R.string.translation_bengali) LANGUAGE_BULGARIAN -> getString(R.string.translation_bulgarian) + 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_GERMAN -> getString(R.string.translation_german) LANGUAGE_GREEK -> getString(R.string.translation_greek) LANGUAGE_LITHUANIAN -> getString(R.string.translation_lithuanian) + LANGUAGE_NORWEGIAN -> getString(R.string.translation_norwegian) LANGUAGE_ROMANIAN -> getString(R.string.translation_romanian) LANGUAGE_RUSSIAN -> getString(R.string.translation_russian) LANGUAGE_SLOVENIAN -> getString(R.string.translation_slovenian) LANGUAGE_SPANISH -> getString(R.string.translation_spanish) + LANGUAGE_SWEDISH -> getString(R.string.translation_swedish) LANGUAGE_TURKISH_Q -> "${getString(R.string.translation_turkish)} (Q)" 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 28fcfed..3045fde 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt @@ -89,6 +89,9 @@ const val LANGUAGE_TURKISH_Q = 10 const val LANGUAGE_LITHUANIAN = 11 const val LANGUAGE_BENGALI = 12 const val LANGUAGE_GREEK = 13 +const val LANGUAGE_NORWEGIAN = 14 +const val LANGUAGE_SWEDISH = 15 +const val LANGUAGE_DANISH = 16 // 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 8709ec3..fc6c529 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt @@ -298,15 +298,18 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL return when (baseContext.config.keyboardLanguage) { LANGUAGE_BENGALI -> R.xml.keys_letters_bengali LANGUAGE_BULGARIAN -> R.xml.keys_letters_bulgarian + 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_GERMAN -> R.xml.keys_letters_german LANGUAGE_GREEK -> R.xml.keys_letters_greek LANGUAGE_LITHUANIAN -> R.xml.keys_letters_lithuanian + LANGUAGE_NORWEGIAN -> R.xml.keys_letters_norwegian LANGUAGE_ROMANIAN -> R.xml.keys_letters_romanian LANGUAGE_RUSSIAN -> R.xml.keys_letters_russian LANGUAGE_SLOVENIAN -> R.xml.keys_letters_slovenian + LANGUAGE_SWEDISH -> R.xml.keys_letters_swedish LANGUAGE_SPANISH -> R.xml.keys_letters_spanish_qwerty LANGUAGE_TURKISH_Q -> R.xml.keys_letters_turkish_q else -> R.xml.keys_letters_english_qwerty diff --git a/app/src/main/res/xml/keys_letters_danish.xml b/app/src/main/res/xml/keys_letters_danish.xml new file mode 100644 index 0000000..f0639a5 --- /dev/null +++ b/app/src/main/res/xml/keys_letters_danish.xml @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/xml/keys_letters_lithuanian.xml b/app/src/main/res/xml/keys_letters_lithuanian.xml index 6ac6345..f27a032 100644 --- a/app/src/main/res/xml/keys_letters_lithuanian.xml +++ b/app/src/main/res/xml/keys_letters_lithuanian.xml @@ -73,7 +73,7 @@ app:topSmallNumber="7" /> + app:keyWidth="10%p" + app:secondaryKeyIcon="@drawable/ic_language_outlined" /> + app:popupKeyboard="@xml/keyboard_popup_template" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/xml/keys_letters_swedish.xml b/app/src/main/res/xml/keys_letters_swedish.xml new file mode 100644 index 0000000..8b2c74c --- /dev/null +++ b/app/src/main/res/xml/keys_letters_swedish.xml @@ -0,0 +1,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/xml/keys_letters_turkish_q.xml b/app/src/main/res/xml/keys_letters_turkish_q.xml index 64ec35d..4c801fa 100644 --- a/app/src/main/res/xml/keys_letters_turkish_q.xml +++ b/app/src/main/res/xml/keys_letters_turkish_q.xml @@ -73,12 +73,12 @@ app:topSmallNumber="7" /> + app:keyWidth="10%p" + app:secondaryKeyIcon="@drawable/ic_language_outlined" /> + app:popupKeyboard="@xml/keyboard_popup_template" />