From b0f15168f67e949946983b566740e3223c98b96a Mon Sep 17 00:00:00 2001
From: sspanak <doftor.livain@gmail.com>
Date: Thu, 4 Apr 2024 21:09:27 +0300
Subject: [PATCH] new hotkey support

  * added support for new hardware keys: Escape, Channel Up, Channel Down;

  * removed the holding options for the keys that are typically found on a computer keyboard, such as F1-F4, Num+, Num-, etc

  * added hold support for other keys
---
 .../github/sspanak/tt9/ime/helpers/Key.java   |  4 ++-
 .../tt9/preferences/helpers/Hotkeys.java      | 34 ++++++++++++-------
 app/src/main/res/values-bg/strings.xml        |  2 ++
 app/src/main/res/values-de/strings.xml        |  2 ++
 app/src/main/res/values-es/strings.xml        |  2 ++
 app/src/main/res/values-fr/strings.xml        |  2 ++
 app/src/main/res/values-it/strings.xml        |  2 ++
 app/src/main/res/values-iw/strings.xml        |  2 ++
 app/src/main/res/values-lt/strings.xml        |  2 ++
 app/src/main/res/values-nl/strings.xml        |  2 ++
 app/src/main/res/values-pt-rBR/strings.xml    |  2 ++
 app/src/main/res/values-ru/strings.xml        |  2 ++
 app/src/main/res/values-uk/strings.xml        |  2 ++
 app/src/main/res/values/strings.xml           |  2 ++
 14 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/helpers/Key.java b/app/src/main/java/io/github/sspanak/tt9/ime/helpers/Key.java
index 1d84b4c6..fa0ebb59 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/helpers/Key.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/helpers/Key.java
@@ -50,7 +50,9 @@ public class Key {
 	}
 
 
-	public static boolean isBack(int keyCode) { return keyCode == KeyEvent.KEYCODE_BACK; }
+	public static boolean isBack(int keyCode) {
+		return keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_ESCAPE;
+	}
 
 
 	public static boolean isPoundOrStar(int keyCode) {
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/helpers/Hotkeys.java b/app/src/main/java/io/github/sspanak/tt9/preferences/helpers/Hotkeys.java
index c4b5c3d0..49a21b40 100644
--- a/app/src/main/java/io/github/sspanak/tt9/preferences/helpers/Hotkeys.java
+++ b/app/src/main/java/io/github/sspanak/tt9/preferences/helpers/Hotkeys.java
@@ -149,14 +149,23 @@ public class Hotkeys {
 		add(KeyEvent.KEYCODE_CALL, R.string.key_call, true);
 
 		addIfDeviceHasKey(KeyEvent.KEYCODE_BACK, R.string.key_back, false);
-		addIfDeviceHasKey(KeyEvent.KEYCODE_F1, "F1", true);
-		addIfDeviceHasKey(KeyEvent.KEYCODE_F2, "F2", true);
-		addIfDeviceHasKey(KeyEvent.KEYCODE_F3, "F3", true);
-		addIfDeviceHasKey(KeyEvent.KEYCODE_F4, "F4", true);
+
+		addIfDeviceHasKey(KeyEvent.KEYCODE_F1, "F1", false);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_F2, "F2", false);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_F3, "F3", false);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_F4, "F4", false);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_F5, "F5", false);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_F6, "F6", false);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_F7, "F7", false);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_F8, "F8", false);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_F9, "F9", false);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_F10, "F10", false);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_F11, "F11", false);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_F12, "F12", false);
 
 		addIfDeviceHasKey(KeyEvent.KEYCODE_MENU, R.string.key_menu, true);
-		addIfDeviceHasKey(KeyEvent.KEYCODE_SOFT_LEFT, R.string.key_soft_left, false);
-		addIfDeviceHasKey(KeyEvent.KEYCODE_SOFT_RIGHT, R.string.key_soft_right, false);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_SOFT_LEFT, R.string.key_soft_left, true);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_SOFT_RIGHT, R.string.key_soft_right, true);
 
 		add(KeyEvent.KEYCODE_POUND, "#", true);
 		add(KeyEvent.KEYCODE_STAR, "✱", true);
@@ -166,14 +175,15 @@ public class Hotkeys {
 		addIfDeviceHasKey(KeyEvent.KEYCODE_DPAD_LEFT, R.string.key_dpad_left, false);
 		addIfDeviceHasKey(KeyEvent.KEYCODE_DPAD_RIGHT, R.string.key_dpad_right, false);
 
-		addIfDeviceHasKey(KeyEvent.KEYCODE_NUMPAD_ADD, "Num +", true);
-		addIfDeviceHasKey(KeyEvent.KEYCODE_NUMPAD_SUBTRACT, "Num -", true);
-		addIfDeviceHasKey(KeyEvent.KEYCODE_NUMPAD_MULTIPLY, "Num *", true);
-		addIfDeviceHasKey(KeyEvent.KEYCODE_NUMPAD_DIVIDE, "Num /", true);
-		addIfDeviceHasKey(KeyEvent.KEYCODE_NUMPAD_DOT, "Num .", true);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_NUMPAD_ADD, "Num +", false);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_NUMPAD_SUBTRACT, "Num -", false);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_NUMPAD_MULTIPLY, "Num *", false);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_NUMPAD_DIVIDE, "Num /", false);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_NUMPAD_DOT, "Num .", false);
 
+		addIfDeviceHasKey(KeyEvent.KEYCODE_CHANNEL_DOWN, R.string.key_channel_down, false);
+		addIfDeviceHasKey(KeyEvent.KEYCODE_CHANNEL_UP, R.string.key_channel_up, false);
 		addIfDeviceHasKey(KeyEvent.KEYCODE_VOLUME_DOWN, R.string.key_volume_down, false);
 		addIfDeviceHasKey(KeyEvent.KEYCODE_VOLUME_UP, R.string.key_volume_up, false);
-
 	}
 }
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index fb9067a1..59767738 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -96,6 +96,8 @@
 	<string name="pref_upside_down_keys_summary">Включете настройката, ако на първият ред са 7–8–9, вместо 1–2–3.</string>
 	<string name="dictionary_truncate_unselected">Изтрий неизбраните</string>
 	<string name="pref_category_setup">Начална настройка</string>
+	<string name="key_channel_down">Предишен канал</string>
+	<string name="key_channel_up">Следващ канал</string>
 	<string name="key_volume_down">Намаляне на звук</string>
 	<string name="key_volume_up">Усилване на звук</string>
 	<string name="dictionary_truncating">Изтриване…</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1f6b7c55..95004aca 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -45,6 +45,8 @@
 	<string name="setup_default_keyboard">Standardtastatur auswählen</string>
 	<string name="setup_tt9_on">%1$s ist aktiviert</string>
 	<string name="setup_tt9_off">%1$s ist deaktiviert</string>
+	<string name="key_channel_down">Vorheriger Kanal</string>
+	<string name="key_channel_up">Nächster Kanal</string>
 	<string name="char_newline">Neue Zeile</string>
 	<string name="pref_category_setup">Ersteinrichtung</string>
 	<string name="completed">Abgeschlossen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1215574c..e47ceb1c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -78,6 +78,8 @@
 	<string name="key_hold_key">Espera</string>
 	<string name="key_back">Volver</string>
 	<string name="key_call">Llamar</string>
+	<string name="key_channel_down">Canal anterior</string>
+	<string name="key_channel_up">Siguiente canal</string>
 	<string name="key_volume_down">Bajar volumen</string>
 	<string name="key_volume_up">Subir Volumen</string>
 	<string name="pref_dark_theme_yes">Sí</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 3a20c4a5..2b9973c8 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -69,6 +69,8 @@
 	<string name="setup_tt9_on">%1$s est activé</string>
 	<string name="setup_tt9_off">%1$s est désactivé</string>
 	<string name="setup_click_here_to_enable">Cliquez ici pour activer TT9 dans les paramètres Android.</string>
+	<string name="key_channel_down">Chaîne précédente</string>
+	<string name="key_channel_up">Chaîne suivante</string>
 	<string name="char_newline">Nouvelle ligne</string>
 	<string name="pref_double_zero_char">Caractère lorsque «0» est appuyé deux fois</string>
 	<string name="pref_upside_down_keys">Inverser l\'ordre des clés</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 7edbc857..24820ec0 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -47,6 +47,8 @@
 	<string name="setup_default_keyboard">Seleziona la tastiera predefinita</string>
 	<string name="setup_tt9_on">%1$s è abilitato</string>
 	<string name="setup_tt9_off">%1$s è disabilitato</string>
+	<string name="key_channel_down">Canale precedente</string>
+	<string name="key_channel_up">Prossimo canale</string>
 	<string name="char_newline">Nuova riga</string>
 	<string name="pref_upside_down_keys">Invertire l\'ordine delle chiavi</string>
 	<string name="pref_upside_down_keys_summary">Abilita l\'impostazione se ci sono 7–8–9 sulla prima riga, invece di 1–2–3.</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index f8c274a4..088679b0 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -72,6 +72,8 @@
 	<string name="key_back">חזור</string>
 	<string name="key_call">חיוג</string>
 
+	<string name="key_channel_down">הערוץ הקודם</string>
+	<string name="key_channel_up">הערוץ הבא</string>
 	<string name="char_newline">שורה חדשה</string>
 	<string name="char_space">רווח</string>
 	<string name="pref_category_setup">הגדרה ראשונית</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 479693a0..cbdffb38 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -87,6 +87,8 @@
 	<string name="key_hold_key">(laikyti nusp.)</string>
 	<string name="key_back">Atgal mygtukas</string>
 	<string name="key_call">Skambinti mygtukas</string>
+	<string name="key_channel_down">Ankstesnis kanalas</string>
+	<string name="key_channel_up">Sekantis kanalas</string>
 	<string name="key_volume_down">Sumažinti garsą mygt.</string>
 	<string name="key_volume_up">Padidinti garsą mygt.</string>
 
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 9995ca5f..d867be9c 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -46,6 +46,8 @@
 	<string name="setup_default_keyboard">Standaardtoetsenbord selecteren</string>
 	<string name="setup_tt9_on">%1$s is ingeschakeld</string>
 	<string name="setup_tt9_off">%1$s is uitgeschakeld</string>
+	<string name="key_channel_down">Vorige kanaal</string>
+	<string name="key_channel_up">Volgende kanaal</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/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 1ea678c1..bda31b9b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -70,6 +70,8 @@
 	<string name="key_back">Voltar</string>
 	<string name="key_call">Chamada</string>
 
+	<string name="key_channel_down">Canal anterior</string>
+	<string name="key_channel_up">Próximo canal</string>
 	<string name="char_newline">Nova Linha</string>
 	<string name="char_space">Espaço</string>
 	<string name="pref_upside_down_keys_summary">Utilize essa opção se você possuir as teclas 7–8–9 na linha de cima, ao invés de 1–2–3.</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 60ded2d5..7de20c0d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -78,6 +78,8 @@
 	<string name="pref_upside_down_keys_summary">Используйте настройку, если в первом ряду 7–8–9 вместо 1–2–3.</string>
 	<string name="dictionary_truncate_unselected">Удалить невыбранные</string>
 	<string name="pref_category_setup">Начальная настройка</string>
+	<string name="key_channel_down">Предыдущий канал</string>
+	<string name="key_channel_up">Следующий канал</string>
 	<string name="key_volume_down">Уменьшить громкости</string>
 	<string name="key_volume_up">Увеличить громкости</string>
 	<string name="dictionary_truncating">Удаление…</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 2da11f80..30b308a1 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -112,6 +112,8 @@
 	<string name="key_hold_key">(тримати)</string>
 	<string name="key_back">Назад</string>
 	<string name="key_call">Подзвонити</string>
+	<string name="key_channel_down">Попередній канал</string>
+	<string name="key_channel_up">Наступний канал</string>
 	<string name="key_volume_down">Гучність вниз</string>
 	<string name="key_volume_up">Гучність вверх</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3ca33a7b..070932c4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -128,6 +128,8 @@
 	<string name="key_none" translatable="false">--</string>
 	<string name="key_back">Back</string>
 	<string name="key_call">Call</string>
+	<string name="key_channel_down">Previous Channel</string>
+	<string name="key_channel_up">Next Channel</string>
 	<string name="key_dpad_up" translatable="false">▲</string>
 	<string name="key_dpad_down" translatable="false">▼</string>
 	<string name="key_dpad_left" translatable="false">◀</string>