From b7a0db29df451f224b8cf82ef081ed54bbcb1c92 Mon Sep 17 00:00:00 2001
From: Dimo Karaivanov <doftor.livain@gmail.com>
Date: Thu, 24 Aug 2023 16:16:51 +0300
Subject: [PATCH] added Change Keyboard hotkey

---
 docs/user-manual.md                           |  3 ++
 res/layout/main_numpad.xml                    |  2 +-
 res/values-bg/strings.xml                     |  1 +
 res/values-de/strings.xml                     |  1 +
 res/values-es/strings.xml                     |  1 +
 res/values-fr/strings.xml                     |  1 +
 res/values-it/strings.xml                     |  1 +
 res/values-iw/strings.xml                     |  1 +
 res/values-nl/strings.xml                     |  1 +
 res/values-pt-rBR/strings.xml                 |  1 +
 res/values-ru/strings.xml                     |  1 +
 res/values-uk/strings.xml                     |  1 +
 res/values/strings.xml                        |  1 +
 res/xml/prefs_screen_hotkeys.xml              |  6 ++++
 .../github/sspanak/tt9/ime/KeyPadHandler.java |  5 ++++
 .../github/sspanak/tt9/ime/TraditionalT9.java | 13 ++++++++
 .../github/sspanak/tt9/ime/helpers/Key.java   |  1 +
 .../tt9/preferences/SettingsStore.java        |  5 ++++
 .../tt9/preferences/helpers/Hotkeys.java      |  1 +
 .../items/ItemSetDefaultGlobalKeyboard.java   |  6 ++--
 .../tt9/preferences/items/SectionKeymap.java  |  1 +
 .../preferences/screens/HotkeysScreen.java    |  1 +
 src/io/github/sspanak/tt9/ui/UI.java          | 14 ++++-----
 .../tt9/ui/main/keys/SoftBackspaceKey.java    |  9 +-----
 .../sspanak/tt9/ui/main/keys/SoftKey.java     | 16 ++++++----
 .../tt9/ui/main/keys/SoftKeyInputMode.java    | 30 +++++++++++++++++++
 .../tt9/ui/main/keys/SoftNumberKey.java       |  7 +----
 .../tt9/ui/main/keys/SoftPunctuationKey.java  |  4 +--
 28 files changed, 101 insertions(+), 34 deletions(-)
 create mode 100644 src/io/github/sspanak/tt9/ui/main/keys/SoftKeyInputMode.java

diff --git a/docs/user-manual.md b/docs/user-manual.md
index 15bdadbd..de1cb645 100644
--- a/docs/user-manual.md
+++ b/docs/user-manual.md
@@ -113,6 +113,9 @@ Select the next language, when multiple languages have been enabled from the Set
 #### Settings Key (Default: Hold ✱):
 Open the Settings configuration screen.
 
+#### Change Keyboard Key (Default: _unassigned_):
+Open the Android Change Keyboard dialog where you can select between all installed keyboards.
+
 ## On-screen Keypad
 On touchscreen-only phones, a fully functional on-screen keypad is available. Enable it from Settings -> Appearance -> Show On-Screen Numpad.
 
diff --git a/res/layout/main_numpad.xml b/res/layout/main_numpad.xml
index a362740f..3b475f6b 100644
--- a/res/layout/main_numpad.xml
+++ b/res/layout/main_numpad.xml
@@ -189,7 +189,7 @@
 			android:layout_height="@dimen/numpad_key_height"
 			tools:ignore="HardcodedText">
 
-			<io.github.sspanak.tt9.ui.main.keys.SoftKey
+			<io.github.sspanak.tt9.ui.main.keys.SoftKeyInputMode
 				android:id="@+id/soft_key_input_mode"
 				style="@android:style/Widget.Holo.Button.Borderless"
 				android:layout_width="0dp"
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 2cc03ac5..fda8ecaf 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -35,6 +35,7 @@
 	<string name="key_call">Зелена слушалка</string>
 	<string name="function_add_word_key">Добавяне на нова дума</string>
 	<string name="function_backspace_key">Триене на текст</string>
+	<string name="function_change_keyboard_key">Избор на клавиатура</string>
 	<string name="function_filter_clear_key">Изчистване на филтър</string>
 	<string name="function_filter_suggestions_key">Филтриране на думи</string>
 	<string name="function_previous_suggestion_key">Предишна дума</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index cfc43608..07b54e9b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -22,6 +22,7 @@
 	<string name="dictionary_loading_indeterminate">Lade Wörterbuch</string>
 	<string name="pref_category_keypad">Tastenfeld</string>
 	<string name="char_space">Leerzeichen</string>
+	<string name="function_change_keyboard_key">Tastaturauswahl</string>
 	<string name="char_newline">Neue Zeile</string>
 	<string name="pref_category_setup">Ersteinrichtung</string>
 	<string name="error">Fehler</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 269556ff..a5fa2164 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -53,6 +53,7 @@
 	<string name="pref_category_setup">Configuración inicial</string>
 	<string name="pref_show_soft_numpad">Teclado numérico en pantalla</string>
 	<string name="error">Error</string>
+	<string name="function_change_keyboard_key">Cambiar el teclado</string>
 	<string name="function_filter_clear_key">Limpiar el filtro</string>
 	<string name="function_filter_suggestions_key">Filtrar sugerencias</string>
 	<string name="function_previous_suggestion_key">Sugerencia previa</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 29d37e5f..c7304ffb 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -46,6 +46,7 @@
 	<string name="char_space">Espace</string>
 	<string name="function_add_word_key">Ajouter un mot</string>
 	<string name="function_backspace_key">Retour arrière</string>
+	<string name="function_change_keyboard_key">Changer le clavier</string>
 	<string name="function_filter_clear_key">Supprimer le filtre</string>
 	<string name="function_filter_suggestions_key">Filtrer les mots</string>
 	<string name="function_previous_suggestion_key">Mot précédent</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a1c52e0d..4402a47b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -27,6 +27,7 @@
 	<string name="dictionary_load_cancelled">Caricamento annullato.</string>
 	<string name="pref_category_keypad">Tastiera</string>
 	<string name="char_space">Spazio</string>
+	<string name="function_change_keyboard_key">Cambia la tastiera</string>
 	<string name="setup_keyboard_status">Stato</string>
 	<string name="setup_default_keyboard">Scegli Tastiera predefinita</string>
 	<string name="char_newline">Nuova riga</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index d414f6c5..8a1bc97f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -42,6 +42,7 @@
 
 	<string name="function_add_word_key">לחצן הוספת מילה</string>
 	<string name="function_backspace_key">לחצן מחיקה</string>
+	<string name="function_change_keyboard_key">בחירת מקלדת</string>
 	<string name="function_next_language_key">לחצן למעבר לשפה הבאה</string>
 	<string name="function_next_mode_key">לחצן מצב קלט</string>
 	<string name="function_show_settings_key">לחצן הצגת הגדרות</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4560123f..29b0771c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -21,6 +21,7 @@
 	<string name="dictionary_loading_indeterminate">Woordenboek laden</string>
 	<string name="pref_category_keypad">Toetsenbord</string>
 	<string name="char_space">Spatie</string>
+	<string name="function_change_keyboard_key">Toetsenbordkeuze</string>
 	<string name="char_newline">Nieuwe regel</string>
 	<string name="pref_category_setup">Initiële setup</string>
 	<string name="dictionary_truncating">Verwijderen…</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index daf5067e..1b659721 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -43,6 +43,7 @@
 
 	<string name="function_add_word_key">Adicionar palavra</string>
 	<string name="function_backspace_key">Backspace</string>
+	<string name="function_change_keyboard_key">Mude o teclado</string>
 	<string name="function_next_language_key">Próximo Idioma</string>
 	<string name="function_next_mode_key">Modo de Entrada</string>
 	<string name="function_show_settings_key">Entrar em Configurações</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 250ebb43..0ed81dfc 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -49,6 +49,7 @@
 	<string name="dictionary_missing_go_load_it">Отсутствует словарь для языка «%1$s». Вы можете загрузить его в Настройках.</string>
 	<string name="function_add_word_key">Добавить новое слово</string>
 	<string name="function_backspace_key">Стереть</string>
+	<string name="function_change_keyboard_key">Выбор клавиатуры</string>
 	<string name="function_filter_clear_key">Удалить фильтр</string>
 	<string name="function_filter_suggestions_key">Фильтровать слова</string>
 	<string name="function_previous_suggestion_key">Предыдущее слово</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 3fd4c2f1..4026acd6 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -54,6 +54,7 @@
 	<string name="key_hold_key">(затиснути)</string>
 	<string name="function_add_word_key">Додати нове слово</string>
 	<string name="function_backspace_key">Стерти</string>
+	<string name="function_change_keyboard_key">Вибір клавіатури</string>
 	<string name="function_filter_clear_key">Видалити фільтр</string>
 	<string name="function_filter_suggestions_key">Фільтрувати слова</string>
 	<string name="function_previous_suggestion_key">Попереднє слово</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8bd20fe2..49b88538 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -73,6 +73,7 @@
 
 	<string name="function_add_word_key">Add Word key</string>
 	<string name="function_backspace_key">Backspace key</string>
+	<string name="function_change_keyboard_key">Change Keyboard key</string>
 	<string name="function_filter_clear_key">Clear Filter key</string>
 	<string name="function_filter_suggestions_key">Filter Suggestions key</string>
 	<string name="function_previous_suggestion_key">Previous Suggestion key</string>
diff --git a/res/xml/prefs_screen_hotkeys.xml b/res/xml/prefs_screen_hotkeys.xml
index 0c7409aa..3aed6927 100644
--- a/res/xml/prefs_screen_hotkeys.xml
+++ b/res/xml/prefs_screen_hotkeys.xml
@@ -50,6 +50,12 @@
 		app:layout="@layout/pref_dropdown"
 		app:title="@string/function_next_mode_key" />
 
+	<DropDownPreference
+		app:iconSpaceReserved="false"
+		app:key="key_change_keyboard"
+		app:layout="@layout/pref_dropdown"
+		app:title="@string/function_change_keyboard_key" />
+
 	<DropDownPreference
 		app:iconSpaceReserved="false"
 		app:key="key_show_settings"
diff --git a/src/io/github/sspanak/tt9/ime/KeyPadHandler.java b/src/io/github/sspanak/tt9/ime/KeyPadHandler.java
index 781c4759..abfa4525 100644
--- a/src/io/github/sspanak/tt9/ime/KeyPadHandler.java
+++ b/src/io/github/sspanak/tt9/ime/KeyPadHandler.java
@@ -231,6 +231,10 @@ abstract class KeyPadHandler extends InputMethodService {
 			return onKeyAddWord(validateOnly);
 		}
 
+		if (keyCode == settings.getKeyChangeKeyboard() * (hold ? -1 : 1)) {
+			return onKeyChangeKeyboard(validateOnly);
+		}
+
 		if (keyCode == settings.getKeyFilterClear() * (hold ? -1 : 1)) {
 			return onKeyFilterClear(validateOnly);
 		}
@@ -280,6 +284,7 @@ abstract class KeyPadHandler extends InputMethodService {
 
 	// hotkey handlers
 	abstract protected boolean onKeyAddWord(boolean validateOnly);
+	abstract protected boolean onKeyChangeKeyboard(boolean validateOnly);
 	abstract protected boolean onKeyFilterClear(boolean validateOnly);
 	abstract protected boolean onKeyFilterSuggestions(boolean validateOnly, boolean repeat);
 	abstract protected boolean onKeyNextLanguage(boolean validateOnly);
diff --git a/src/io/github/sspanak/tt9/ime/TraditionalT9.java b/src/io/github/sspanak/tt9/ime/TraditionalT9.java
index 6c04979b..b4ec3d2d 100644
--- a/src/io/github/sspanak/tt9/ime/TraditionalT9.java
+++ b/src/io/github/sspanak/tt9/ime/TraditionalT9.java
@@ -373,6 +373,19 @@ public class TraditionalT9 extends KeyPadHandler {
 	}
 
 
+	public boolean onKeyChangeKeyboard(boolean validateOnly) {
+		if (!isInputViewShown()) {
+			return false;
+		}
+
+		if (!validateOnly) {
+			UI.showChangeKeyboardDialog(this);
+		}
+
+		return true;
+	}
+
+
 	public boolean onKeyFilterClear(boolean validateOnly) {
 		if (isSuggestionViewHidden()) {
 			return false;
diff --git a/src/io/github/sspanak/tt9/ime/helpers/Key.java b/src/io/github/sspanak/tt9/ime/helpers/Key.java
index b7aa610d..7a433fd9 100644
--- a/src/io/github/sspanak/tt9/ime/helpers/Key.java
+++ b/src/io/github/sspanak/tt9/ime/helpers/Key.java
@@ -23,6 +23,7 @@ public class Key {
 	public static boolean isHotkey(SettingsStore settings, int keyCode) {
 		return keyCode == settings.getKeyAddWord()
 			|| keyCode == settings.getKeyBackspace()
+			|| keyCode == settings.getKeyChangeKeyboard()
 			|| keyCode == settings.getKeyFilterClear()
 			|| keyCode == settings.getKeyFilterSuggestions()
 			|| keyCode == settings.getKeyPreviousSuggestion()
diff --git a/src/io/github/sspanak/tt9/preferences/SettingsStore.java b/src/io/github/sspanak/tt9/preferences/SettingsStore.java
index 467b2cb9..48701078 100644
--- a/src/io/github/sspanak/tt9/preferences/SettingsStore.java
+++ b/src/io/github/sspanak/tt9/preferences/SettingsStore.java
@@ -167,6 +167,7 @@ public class SettingsStore {
 	public void setDefaultKeys(
 		int addWord,
 		int backspace,
+		int changeKeyboard,
 		int filterClear,
 		int filterSuggestions,
 		int previousSuggestion,
@@ -178,6 +179,7 @@ public class SettingsStore {
 		prefsEditor
 			.putString(SectionKeymap.ITEM_ADD_WORD, String.valueOf(addWord))
 			.putString(SectionKeymap.ITEM_BACKSPACE, String.valueOf(backspace))
+			.putString(SectionKeymap.ITEM_CHANGE_KEYBOARD, String.valueOf(changeKeyboard))
 			.putString(SectionKeymap.ITEM_FILTER_CLEAR, String.valueOf(filterClear))
 			.putString(SectionKeymap.ITEM_FILTER_SUGGESTIONS, String.valueOf(filterSuggestions))
 			.putString(SectionKeymap.ITEM_PREVIOUS_SUGGESTION, String.valueOf(previousSuggestion))
@@ -203,6 +205,9 @@ public class SettingsStore {
 	public int getKeyBackspace() {
 		return getFunctionKey(SectionKeymap.ITEM_BACKSPACE);
 	}
+	public int getKeyChangeKeyboard() {
+		return getFunctionKey(SectionKeymap.ITEM_CHANGE_KEYBOARD);
+	}
 	public int getKeyFilterClear() {
 		return getFunctionKey(SectionKeymap.ITEM_FILTER_CLEAR);
 	}
diff --git a/src/io/github/sspanak/tt9/preferences/helpers/Hotkeys.java b/src/io/github/sspanak/tt9/preferences/helpers/Hotkeys.java
index 06b32ef2..b24b54de 100644
--- a/src/io/github/sspanak/tt9/preferences/helpers/Hotkeys.java
+++ b/src/io/github/sspanak/tt9/preferences/helpers/Hotkeys.java
@@ -69,6 +69,7 @@ public class Hotkeys {
 		settings.setDefaultKeys(
 			KeyEvent.KEYCODE_STAR,
 			backspace,
+			0, // "change keyboard" is unassigned by default
 			clearFilter,
 			filter,
 			previousSuggestion,
diff --git a/src/io/github/sspanak/tt9/preferences/items/ItemSetDefaultGlobalKeyboard.java b/src/io/github/sspanak/tt9/preferences/items/ItemSetDefaultGlobalKeyboard.java
index 4b89d3a6..31a59d54 100644
--- a/src/io/github/sspanak/tt9/preferences/items/ItemSetDefaultGlobalKeyboard.java
+++ b/src/io/github/sspanak/tt9/preferences/items/ItemSetDefaultGlobalKeyboard.java
@@ -1,11 +1,9 @@
 package io.github.sspanak.tt9.preferences.items;
 
-import android.content.Context;
-import android.view.inputmethod.InputMethodManager;
-
 import androidx.preference.Preference;
 
 import io.github.sspanak.tt9.preferences.PreferencesActivity;
+import io.github.sspanak.tt9.ui.UI;
 
 public class ItemSetDefaultGlobalKeyboard extends ItemClickable {
 	private final PreferencesActivity activity;
@@ -17,7 +15,7 @@ public class ItemSetDefaultGlobalKeyboard extends ItemClickable {
 
 	@Override
 	protected boolean onClick(Preference p) {
-		((InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE)).showInputMethodPicker();
+		UI.showChangeKeyboardDialog(activity);
 		return false;
 	}
 }
diff --git a/src/io/github/sspanak/tt9/preferences/items/SectionKeymap.java b/src/io/github/sspanak/tt9/preferences/items/SectionKeymap.java
index 7dd7d209..95231593 100644
--- a/src/io/github/sspanak/tt9/preferences/items/SectionKeymap.java
+++ b/src/io/github/sspanak/tt9/preferences/items/SectionKeymap.java
@@ -15,6 +15,7 @@ import io.github.sspanak.tt9.preferences.helpers.Hotkeys;
 public class SectionKeymap {
 	public static final String ITEM_ADD_WORD = "key_add_word";
 	public static final String ITEM_BACKSPACE = "key_backspace";
+	public static final String ITEM_CHANGE_KEYBOARD = "key_change_keyboard";
 	public static final String ITEM_FILTER_CLEAR = "key_filter_clear";
 	public static final String ITEM_FILTER_SUGGESTIONS = "key_filter_suggestions";
 	public static final String ITEM_PREVIOUS_SUGGESTION = "key_previous_suggestion";
diff --git a/src/io/github/sspanak/tt9/preferences/screens/HotkeysScreen.java b/src/io/github/sspanak/tt9/preferences/screens/HotkeysScreen.java
index b0a4433d..deb1d210 100644
--- a/src/io/github/sspanak/tt9/preferences/screens/HotkeysScreen.java
+++ b/src/io/github/sspanak/tt9/preferences/screens/HotkeysScreen.java
@@ -21,6 +21,7 @@ public class HotkeysScreen extends BaseScreenFragment {
 		DropDownPreference[] dropDowns = {
 			findPreference(SectionKeymap.ITEM_ADD_WORD),
 			findPreference(SectionKeymap.ITEM_BACKSPACE),
+			findPreference(SectionKeymap.ITEM_CHANGE_KEYBOARD),
 			findPreference(SectionKeymap.ITEM_FILTER_CLEAR),
 			findPreference(SectionKeymap.ITEM_FILTER_SUGGESTIONS),
 			findPreference(SectionKeymap.ITEM_PREVIOUS_SUGGESTION),
diff --git a/src/io/github/sspanak/tt9/ui/UI.java b/src/io/github/sspanak/tt9/ui/UI.java
index 558ac0d4..4b645f34 100644
--- a/src/io/github/sspanak/tt9/ui/UI.java
+++ b/src/io/github/sspanak/tt9/ui/UI.java
@@ -4,6 +4,7 @@ import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Looper;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
 
 import io.github.sspanak.tt9.ime.TraditionalT9;
@@ -20,6 +21,11 @@ public class UI {
 	}
 
 
+	public static void showChangeKeyboardDialog(Context context) {
+		((InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE)).showInputMethodPicker();
+	}
+
+
 	public static void showSettingsScreen(TraditionalT9 tt9) {
 		Intent prefIntent = new Intent(tt9, PreferencesActivity.class);
 		prefIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -63,17 +69,11 @@ public class UI {
 		Toast.makeText(context, resourceId, Toast.LENGTH_LONG).show();
 	}
 
-	public static void toastLongFromAsync(Context context, int resourceId) {
-		if (Looper.myLooper() == null) {
-			Looper.prepare();
-		}
-		toast(context, resourceId);
-	}
-
 	public static void toastLong(Context context, CharSequence msg) {
 		Toast.makeText(context, msg, Toast.LENGTH_LONG).show();
 	}
 
+	@Deprecated
 	public static void toastLongFromAsync(Context context, CharSequence msg) {
 		if (Looper.myLooper() == null) {
 			Looper.prepare();
diff --git a/src/io/github/sspanak/tt9/ui/main/keys/SoftBackspaceKey.java b/src/io/github/sspanak/tt9/ui/main/keys/SoftBackspaceKey.java
index 4a3196e2..5f869ffa 100644
--- a/src/io/github/sspanak/tt9/ui/main/keys/SoftBackspaceKey.java
+++ b/src/io/github/sspanak/tt9/ui/main/keys/SoftBackspaceKey.java
@@ -3,8 +3,6 @@ package io.github.sspanak.tt9.ui.main.keys;
 import android.content.Context;
 import android.util.AttributeSet;
 
-import io.github.sspanak.tt9.Logger;
-
 public class SoftBackspaceKey extends SoftKey {
 
 	public SoftBackspaceKey(Context context) {
@@ -26,12 +24,7 @@ public class SoftBackspaceKey extends SoftKey {
 
 	@Override
 	final protected boolean handleHold() {
-		if (tt9 == null) {
-			Logger.w(getClass().getCanonicalName(), "Traditional T9 handler is not set. Ignoring key press.");
-			return false;
-		}
-
-		return tt9.onBackspace();
+		return validateTT9Handler() && tt9.onBackspace();
 	}
 
 	@Override
diff --git a/src/io/github/sspanak/tt9/ui/main/keys/SoftKey.java b/src/io/github/sspanak/tt9/ui/main/keys/SoftKey.java
index 07bab940..5e0dbf11 100644
--- a/src/io/github/sspanak/tt9/ui/main/keys/SoftKey.java
+++ b/src/io/github/sspanak/tt9/ui/main/keys/SoftKey.java
@@ -99,8 +99,7 @@ public class SoftKey extends androidx.appcompat.widget.AppCompatButton implement
 	 * Repeatedly calls "handleHold()" upon holding the respective SoftKey, to simulate physical keyboard behavior.
 	 */
 	private void repeatOnLongPress() {
-		if (tt9 == null) {
-			Logger.w(getClass().getCanonicalName(), "Traditional T9 handler is not set. Ignoring key press.");
+		if (!validateTT9Handler()) {
 			hold = false;
 			return;
 		}
@@ -132,8 +131,7 @@ public class SoftKey extends androidx.appcompat.widget.AppCompatButton implement
 	}
 
 	protected boolean handleRelease() {
-		if (tt9 == null) {
-			Logger.w(getClass().getCanonicalName(), "Traditional T9 handler is not set. Ignoring key press.");
+		if (!validateTT9Handler()) {
 			return false;
 		}
 
@@ -145,7 +143,6 @@ public class SoftKey extends androidx.appcompat.widget.AppCompatButton implement
 		if (keyId == R.id.soft_key_clear_filter) return tt9.onKeyFilterClear(false);
 		if (keyId == R.id.soft_key_left_arrow) return tt9.onKeyScrollSuggestion(false, true);
 		if (keyId == R.id.soft_key_right_arrow) return tt9.onKeyScrollSuggestion(false, false);
-		if (keyId == R.id.soft_key_input_mode) return tt9.onKeyNextInputMode(false);
 		if (keyId == R.id.soft_key_language) return tt9.onKeyNextLanguage(false);
 		if (keyId == R.id.soft_key_ok) return tt9.onOK();
 		if (keyId == R.id.soft_key_settings) return tt9.onKeyShowSettings(false);
@@ -153,6 +150,15 @@ public class SoftKey extends androidx.appcompat.widget.AppCompatButton implement
 		return false;
 	}
 
+	protected boolean validateTT9Handler() {
+		if (tt9 == null) {
+			Logger.w(getClass().getCanonicalName(), "Traditional T9 handler is not set. Ignoring key press.");
+			return false;
+		}
+
+		return true;
+	}
+
 	/**
 	 * getTitle
 	 * Generates the name of the key, for example: "OK", "Backspace", "1", etc...
diff --git a/src/io/github/sspanak/tt9/ui/main/keys/SoftKeyInputMode.java b/src/io/github/sspanak/tt9/ui/main/keys/SoftKeyInputMode.java
new file mode 100644
index 00000000..f8af1c3f
--- /dev/null
+++ b/src/io/github/sspanak/tt9/ui/main/keys/SoftKeyInputMode.java
@@ -0,0 +1,30 @@
+package io.github.sspanak.tt9.ui.main.keys;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+public class SoftKeyInputMode extends SoftKey {
+		public SoftKeyInputMode(Context context) {
+		super(context);
+	}
+
+	public SoftKeyInputMode(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	public SoftKeyInputMode(Context context, AttributeSet attrs, int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+	}
+
+	@Override
+	protected boolean handleHold() {
+		preventRepeat();
+		return validateTT9Handler() && tt9.onKeyChangeKeyboard(false);
+	}
+
+
+	@Override
+	protected boolean handleRelease() {
+		return validateTT9Handler() && tt9.onKeyNextInputMode(false);
+	}
+}
diff --git a/src/io/github/sspanak/tt9/ui/main/keys/SoftNumberKey.java b/src/io/github/sspanak/tt9/ui/main/keys/SoftNumberKey.java
index 9698dc4a..a698c0bd 100644
--- a/src/io/github/sspanak/tt9/ui/main/keys/SoftNumberKey.java
+++ b/src/io/github/sspanak/tt9/ui/main/keys/SoftNumberKey.java
@@ -40,13 +40,8 @@ public class SoftNumberKey extends SoftKey {
 
 	@Override
 	protected boolean handleRelease() {
-		if (tt9 == null) {
-			Logger.w(getClass().getCanonicalName(), "Traditional T9 handler is not set. Ignoring key press.");
-			return false;
-		}
-
 		int keyCode = Key.numberToCode(getNumber(getId()));
-		if (keyCode < 0) {
+		if (keyCode < 0 || !validateTT9Handler()) {
 			return false;
 		}
 
diff --git a/src/io/github/sspanak/tt9/ui/main/keys/SoftPunctuationKey.java b/src/io/github/sspanak/tt9/ui/main/keys/SoftPunctuationKey.java
index 128010e8..073eeea9 100644
--- a/src/io/github/sspanak/tt9/ui/main/keys/SoftPunctuationKey.java
+++ b/src/io/github/sspanak/tt9/ui/main/keys/SoftPunctuationKey.java
@@ -3,7 +3,6 @@ package io.github.sspanak.tt9.ui.main.keys;
 import android.content.Context;
 import android.util.AttributeSet;
 
-import io.github.sspanak.tt9.Logger;
 import io.github.sspanak.tt9.R;
 import io.github.sspanak.tt9.ime.modes.InputMode;
 
@@ -36,8 +35,7 @@ public class SoftPunctuationKey extends SoftKey {
 
 	@Override
 	protected boolean handleRelease() {
-		if (tt9 == null) {
-			Logger.w(getClass().getCanonicalName(), "Traditional T9 handler is not set. Ignoring key press.");
+		if (!validateTT9Handler()) {
 			return false;
 		}