From 7fa4685c51f2b8b6cb12e395a93efe873dbde1d2 Mon Sep 17 00:00:00 2001 From: sspanak Date: Tue, 13 Aug 2024 13:28:19 +0300 Subject: [PATCH] removed some unused code and resources --- .../db/customWords/CustomWordsImporter.java | 4 +- .../tt9/languages/NaturalLanguage.java | 10 - .../sspanak/tt9/preferences/HelpActivity.java | 1 - .../deleteWords/PreferenceSearchWords.java | 9 - .../PreferenceSearchLanguage.java | 1 - .../screens/main/MainSettingsScreen.java | 7 - .../java/io/github/sspanak/tt9/ui/UI.java | 9 - .../sspanak/tt9/ui/main/MainLayoutTray.java | 2 +- .../tt9/ui/main/keys/SoftKeyTextEdit.java | 9 - .../sspanak/tt9/ui/tray/SuggestionsBar.java | 2 +- .../res/layout/panel_small_text_editing.xml | 222 +++++++++--------- app/src/main/res/values-bg/strings.xml | 2 - app/src/main/res/values-de/strings.xml | 4 +- 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-tr/strings.xml | 2 - app/src/main/res/values-uk/strings.xml | 2 - app/src/main/res/values/strings.xml | 2 - 24 files changed, 113 insertions(+), 191 deletions(-) diff --git a/app/src/main/java/io/github/sspanak/tt9/db/customWords/CustomWordsImporter.java b/app/src/main/java/io/github/sspanak/tt9/db/customWords/CustomWordsImporter.java index 86e87a2d..8c725f89 100644 --- a/app/src/main/java/io/github/sspanak/tt9/db/customWords/CustomWordsImporter.java +++ b/app/src/main/java/io/github/sspanak/tt9/db/customWords/CustomWordsImporter.java @@ -82,9 +82,9 @@ public class CustomWordsImporter extends AbstractFileProcessor { } - public boolean run(@NonNull Activity activity, @NonNull CustomWordFile file) { + public void run(@NonNull Activity activity, @NonNull CustomWordFile file) { this.file = file; - return super.run(activity); + super.run(activity); } diff --git a/app/src/main/java/io/github/sspanak/tt9/languages/NaturalLanguage.java b/app/src/main/java/io/github/sspanak/tt9/languages/NaturalLanguage.java index f217ce85..510b70c5 100644 --- a/app/src/main/java/io/github/sspanak/tt9/languages/NaturalLanguage.java +++ b/app/src/main/java/io/github/sspanak/tt9/languages/NaturalLanguage.java @@ -17,7 +17,6 @@ public class NaturalLanguage extends Language implements Comparable> layout = new ArrayList<>(); private final HashMap characterKeyMap = new HashMap<>(); @@ -184,15 +183,6 @@ public class NaturalLanguage extends Language implements Comparable languageItems = new ArrayList<>(); diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/main/MainSettingsScreen.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/main/MainSettingsScreen.java index 55f4e70d..250ecf96 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/main/MainSettingsScreen.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/main/MainSettingsScreen.java @@ -1,24 +1,17 @@ package io.github.sspanak.tt9.preferences.screens.main; -import android.content.Intent; -import android.net.Uri; - import androidx.preference.Preference; import java.util.ArrayList; import java.util.Arrays; -import java.util.regex.Pattern; -import io.github.sspanak.tt9.BuildConfig; import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.preferences.PreferencesActivity; import io.github.sspanak.tt9.preferences.screens.BaseScreenFragment; -import io.github.sspanak.tt9.util.Logger; import io.github.sspanak.tt9.util.SystemSettings; public class MainSettingsScreen extends BaseScreenFragment { final public static String NAME = "Main"; - private final Pattern releaseVersionRegex = Pattern.compile("^\\d+\\.\\d+$"); public MainSettingsScreen() { init(); } public MainSettingsScreen(PreferencesActivity activity) { init(activity); } diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/UI.java b/app/src/main/java/io/github/sspanak/tt9/ui/UI.java index 92de92b5..b2c49c37 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/UI.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/UI.java @@ -31,15 +31,6 @@ public class UI { ims.startActivity(prefIntent); } - public static void alert(Context context, int titleResource, int messageResource) { - new AlertDialog.Builder(context) - .setTitle(titleResource) - .setMessage(messageResource) - .setCancelable(false) - .setPositiveButton(android.R.string.ok, (dialog, which) -> dialog.cancel()) - .show(); - } - public static void confirm(Context context, String title, String message, String OKLabel, Runnable onOk, Runnable onCancel) { new AlertDialog.Builder(context) .setTitle(title) diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutTray.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutTray.java index f6e023da..5c7cc8e0 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutTray.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutTray.java @@ -136,7 +136,7 @@ class MainLayoutTray extends BaseMainLayout { protected ArrayList getKeys() { if (view != null && keys.isEmpty()) { keys.addAll(getKeysFromContainer(view.findViewById(R.id.main_command_keys))); - keys.addAll(getKeysFromContainer(view.findViewById(R.id.text_editing_keys_small))); + keys.addAll(getKeysFromContainer(view.findViewById(R.id.text_editing_container))); } return keys; } diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyTextEdit.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyTextEdit.java index 216e4060..4c0c7e38 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyTextEdit.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyTextEdit.java @@ -47,13 +47,4 @@ public class SoftKeyTextEdit extends SoftNumberKey { setCompoundDrawables(null, null, null, icon); } } - - private Drawable getIcon(int resId) { - return getResources().getDrawable(resId); - } - - @Override - protected String getSubTitle() { - return super.getSubTitle(); - } } diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/tray/SuggestionsBar.java b/app/src/main/java/io/github/sspanak/tt9/ui/tray/SuggestionsBar.java index 63e58191..38773f7d 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/tray/SuggestionsBar.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/tray/SuggestionsBar.java @@ -265,7 +265,7 @@ public class SuggestionsBar { } - private boolean onTouch(View view, MotionEvent event) { + private boolean onTouch(View v, MotionEvent event) { if (!isEmpty()) { return false; } diff --git a/app/src/main/res/layout/panel_small_text_editing.xml b/app/src/main/res/layout/panel_small_text_editing.xml index a5e10b98..4e371050 100644 --- a/app/src/main/res/layout/panel_small_text_editing.xml +++ b/app/src/main/res/layout/panel_small_text_editing.xml @@ -1,138 +1,132 @@ + + android:layout_height="@dimen/numpad_key_height" + tools:showIn="@layout/main_small"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 04b7ce5b..bd3f3178 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -6,7 +6,6 @@ Зареждане… Няма език Възникна неочаквана грешка. - Неуспешно зареждане на езиковите дефиниции. Добави Преместете показалеца върху дума, за да я добавите към речника. Не може да се въведе празна дума. @@ -123,7 +122,6 @@ Намаляне на звук Усилване на звук Изтриване… - Грешка Да Не Автоматично diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7373be78..9af34bd9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,11 +1,10 @@ TT9 Einstellungen - Laden... + Laden… Keine Sprache Unerwarteter Fehler aufgetreten. - Es ist nicht möglich, Sprachdefinitionen zu laden. Hinzufügen Wort \"%1$s\" zu %2$s hinzufügen? Bewegen Sie den Cursor innerhalb eines Wortes, um es hinzuzufügen. @@ -79,7 +78,6 @@ Ersteinrichtung Große Abgeschlossen - Fehler Ja Nein Automatisch diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index b897f917..bfae2fb8 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,7 +1,6 @@ Configuración de Traditional T9 - Falló al cargar todas las definiciones de idiomas. Agregar ¿Agregar la palabra \"%1$s\" a %2$s? Mueve el cursor dentro de una palabra para añadirla. @@ -73,7 +72,6 @@ Orden de teclas inverso Habilite la configuración si hay 7–8–9 en la primera fila, en lugar de 1–2–3. Configuración inicial - Error Notificaciones del diccionario Recibir notificaciones sobre actualizaciones del diccionario y sobre el progreso de la carga. Lista de comandos diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 640387e5..8bafc96d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -6,7 +6,6 @@ Chargement… Aucun langue Une erreur inattendue s\'est produite. - Impossible de charger aucune définition de langue Ajouter Déplacez le curseur dans un mot pour l\'ajouter. Mot vide non ajouté. @@ -97,7 +96,6 @@ Supprimer les non sélectionnés Configuration initiale Suppression… - Erreur Oui Non Automatique diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9982a66a..14c7e58d 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -7,7 +7,6 @@ Nessuna lingua Si è verificato un errore imprevisto. - Impossibile caricare alcuna definizione di lingua. Aggiungere Aggiungi la parola \"%1$s\" a %2$s? Sposta il cursore dentro un parola per aggiungerla. @@ -79,7 +78,6 @@ Invertire l\'ordine delle chiavi Abilita l\'impostazione se ci sono 7–8–9 sulla prima riga, invece di 1–2–3. Configurazione iniziale - Errore Si No Automatica diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index ce0e58ac..dfa3b184 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -7,7 +7,6 @@ אין שפה אירעה שגיאה לא צפויה. - טעינת הגדרות שפה נכשלה. הוסף האם להוסיף את המילה \"%1$s\" ל-%2$s? הזיזו את הסמן בתוך מילה כדי להוסיף אותה. @@ -96,7 +95,6 @@ שורה חדשה רווח הגדרה ראשונית - שגיאה כן לא אוטומטי diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index aa97eec1..c5f97211 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -3,12 +3,10 @@ „TT9“ nustatymai Didelis Baigta - Klaida Įkeliama… Kalbos nėra Įvyko netikėta klaida. - Nepavyko įkelti kalbos apibrėžimų. Pridėti Pridėti žodį \"%1$s\" į \"%2$s\" žodyną? diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index bea41219..2ea31cef 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -5,7 +5,6 @@ Geen taal Er is een onverwachte fout opgetreden. - Kan geen taaldefinities laden. Toevoegen Voeg woord \"%1$s\" toe aan %2$s? Verplaats de cursor binnen een woord om het toe te voegen. @@ -81,7 +80,6 @@ Verwijderen… Groot Voltooid - Fout Ja Nee Automatisch diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 7e568256..168bc4ec 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -7,7 +7,6 @@ Sem idioma Um erro inesperado aconteceu. - Impossível carregar qualquer definição de idioma. Adicionar Adicionar a palavra \"%1$s\" a %2$s? Mova o cursor dentro de uma palavra para adicioná-la. @@ -95,7 +94,6 @@ Utilize essa opção se você possuir as teclas 7–8–9 na linha de cima, ao invés de 1–2–3. Inverter ordem das teclas Limpar Não Selecionados - Erro Sim Não Automático diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1cc8852d..8c5ab774 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -6,7 +6,6 @@ Загрузка… Нет языка Произошла непредвиденная ошибка. - Не удалось загрузить какое-либо определение языка. Добавить Переместите курсор внутрь слова, чтобы добавить его. Невозможно добавить слово. @@ -96,7 +95,6 @@ Уменьшить громкости Увеличить громкости Удаление… - Ошибка Да Нет Автоматически diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index c1c2784f..d6db88c5 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -5,7 +5,6 @@ Yüklü Dil Yok Beklenmeyen bir hata ile karşılaşıldı. - Tüm dilleri yüklerken hata oluştu. Ekle \"%1$s\" kelimesi %2$s sözlüğe eklensin mi? Ekleme yapmak için imleci eklemek istediğiniz kelimeye götürün. @@ -77,7 +76,6 @@ İlk Kurulum Büyük Tamamlandı - Hata Evet Hayır Otomatik diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 4b761f4e..a33a2668 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -3,12 +3,10 @@ Налаштування TT9 Великий Виконано - Помилка Завантаження… Немає мови Сталася неочікувана помилка. - Не вдалося завантажити всі визначення мов. Додати Додати слово \"%1$s\" в %2$s? diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e12d00ee..b4330113 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,14 +5,12 @@ TT9 TT9 Settings Completed - Error Loading… No Language Search Results No results. Unexpected error occurred. - Failed loading all language definitions. Add Add word \"%1$s\" to %2$s?