fixing bugs in backspace key, and some changes in settings screen

AshiVered · Aug 5, 2022 · 564ecab · 564ecab
1 parent 63867c0
commit 564ecab
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 22 deletions.
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
@@ -37,7 +37,7 @@
 	<string name="updating_database_unavailable">Wörterbuch-Datenbank wird aktualisiert. Worteingabe momentan nicht verfügbar.</string>
 
 	<string name="pref_lang_title">Sprachen…</string>
-	<string name="pref_help">"Hilfe anzeigen</string>
+	<string name="pref_help">"Github</string>
 	<string name="pref_loaddict">Wörterbuch laden</string>
 	<string name="pref_loaduserdict">Benutzerwörterbuch laden</string>
 	<string name="pref_nukedict">Wörterbuch löschen</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
@@ -37,7 +37,7 @@
 	<string name="updating_database_unavailable">Actualizando base de datos del diccionario, el ingreso de palabras no estará disponible de momento.</string>
 
 	<string name="pref_lang_title">Soporte multilenguaje…</string>
-	<string name="pref_help">"Mostrar ayuda</string>
+	<string name="pref_help">"Github</string>
 	<string name="pref_loaddict">Cargar diccionario</string>
 	<string name="pref_loaduserdict">Cargar diccionario de usuario</string>
 

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
@@ -37,7 +37,7 @@
 	<string name="updating_database_unavailable">Mise à jour de la base de données du dictionnaire, mots disponibles.</string>
 
 	<string name="pref_lang_title">Support multilingue…</string>
-	<string name="pref_help">"Afficher l\'aide</string>
+	<string name="pref_help">"Github</string>
 	<string name="pref_loaddict">Charger le dictionnaire</string>
 	<string name="pref_loaduserdict">Charger le dictionnaire utilisateur</string>
 	<string name="pref_nukedict">Détruire le dictionnaire</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
@@ -37,7 +37,7 @@
     <string name="updating_database_unavailable">Aggiornamento database dizionario, inserimento parole non disponibile al momento.</string>
 
     <string name="pref_lang_title">Supporto multilingue…</string>
-    <string name="pref_help">"Mostra aiuto</string>
+    <string name="pref_help">"Github</string>
     <string name="pref_loaddict">Carica dizionario</string>
     <string name="pref_loaduserdict">Carica dizionario utente</string>
     <string name="pref_nukedict">Elimina dizionario</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
@@ -43,7 +43,7 @@
     <string name="pref_savingbackup">Сохранение словаря…</string>
     <string name="pref_testfunc">Test func</string>
     <string name="ricon_desc">Hold Icon</string>
-    <string name="pref_help">О программе</string>
+    <string name="pref_help">Github</string>
     <string name="symbol_next">Следующая страница</string>
     <string name="symbol_prev">Предыдущая страница</string>
 

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
@@ -43,7 +43,7 @@
     <string name="pref_savingbackup">Збереження словника…</string>
     <string name="pref_testfunc">Test func</string>
     <string name="ricon_desc">Hold Icon</string>
-    <string name="pref_help">Про програму</string>
+    <string name="pref_help">Github</string>
     <string name="symbol_next">Наступне</string>
     <string name="symbol_prev">Попереднє</string>
 

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string translatable="false" name="help_url">https://github.com/Clam-/TraditionalT9/wiki/Traditional-T9-keypad-IME-for-Android</string>
+	<string translatable="false" name="help_url">https://github.com/AshiVered/QinBoard-T9</string>
 	<string name="app_name">QinBoard T9</string>
 	<string name="ime_name">QinBoard T9</string>
 	<string name="ime_number">Numbers</string>
@@ -38,7 +38,7 @@
 	<string name="updating_database_unavailable">Updating dictionary database, word input unavailable at this time.</string>
 
 	<string name="pref_lang_title">Multilingual support…</string>
-	<string name="pref_help">"Show help</string>
+	<string name="pref_help">"Github</string>
 	<string name="pref_loaddict">Load dictionary</string>
 	<string name="pref_loaduserdict">Load user dictionary</string>
 	<string translatable="false" name="pref_loaduserdictdesc">SDcard/traditionalt9/user.lang.dict (lang: en/ru/de/fr)</string>

diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- WHEN ADDING NEW SETTING KEY THAT STORES VALUE, ADD KEY AND QUERY TO T9DB -->
 <Settings>
-	<Setting title="@string/pref_help" id="help" />
 	<SettingList
 		id="pref_inputmode"
 		title="@string/pref_inputmode"
@@ -15,22 +14,10 @@
 		entries="@array/pref_lang_titles"
 		entryValues="@array/pref_lang_values"
 		title="@string/pref_lang_title" />
-	<SettingCheck
-		id="pref_mode_notify"
-		title="@string/pref_mode_notify"
-		summary="@string/pref_mode_notify_subtitle"
-		defaultValue="false"
-		/>
 	<Setting title="@string/pref_loaddict" id="loaddict"/>
 	<Setting title="@string/pref_loaduserdict" summary="@string/pref_loaduserdictdesc" id="loaduserdict"/>
 	<Setting title="@string/pref_nukedict" id="nukedict"/>
 	<Setting title="@string/pref_backupdict" id="backupdict"/>
 	<Setting title="@string/pref_restoredict" id="restoredict"/>
-	<Setting title="@string/pref_reloadKeys" summary="@string/pref_reloadKeysSum" id="reloadKeys"/>
-	<SettingCheck
-		id="pref_keyMap"
-		title="@string/pref_keyRemap"
-		summary="@string/pref_keyRemapSum"
-		defaultValue="false"
-		/>
+	<Setting title="@string/pref_help" id="help" />
 </Settings>
diff --git a/src/org/nyanya/android/traditionalt9/TraditionalT9.java b/src/org/nyanya/android/traditionalt9/TraditionalT9.java
@@ -569,6 +569,7 @@ private boolean onKeyDown_(int keyCode, KeyEvent event) {
 				if (lastOne.toString().equals("")) {
 					hideWindow();
 					handleClose();
+					ic.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK));
 					return true;
 				}
 			}