From f65fd29139b04cd0c28af45bad340cee5ae2258e Mon Sep 17 00:00:00 2001 From: sspanak Date: Mon, 18 Mar 2024 18:49:47 +0200 Subject: [PATCH] fixed code style errors reported by Android Studio --- .../main/java/io/github/sspanak/tt9/db/SlowQueryStats.java | 2 +- app/src/main/java/io/github/sspanak/tt9/db/WordStore.java | 5 ----- .../io/github/sspanak/tt9/db/exporter/AbstractExporter.java | 5 ----- .../github/sspanak/tt9/db/exporter/CustomWordsExporter.java | 1 - .../java/io/github/sspanak/tt9/db/sqlite/Migration.java | 4 ++-- .../main/java/io/github/sspanak/tt9/ime/TraditionalT9.java | 4 ++-- .../github/sspanak/tt9/ime/helpers/InputModeValidator.java | 4 ++-- .../java/io/github/sspanak/tt9/ime/helpers/TextField.java | 2 +- .../main/java/io/github/sspanak/tt9/ime/modes/Mode123.java | 2 +- .../github/sspanak/tt9/ime/modes/helpers/AutoTextCase.java | 1 - .../io/github/sspanak/tt9/preferences/SettingsStore.java | 2 +- .../preferences/screens/debug/ItemInputHandlingMode.java | 2 +- .../screens/deleteWords/PreferenceDeletableWord.java | 1 - .../tt9/preferences/screens/hotkeys/SectionKeymap.java | 2 -- .../io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java | 2 +- .../java/io/github/sspanak/tt9/ui/main/MainLayoutSmall.java | 2 +- .../java/io/github/sspanak/tt9/ui/tray/SuggestionsBar.java | 6 +++--- app/src/main/res/layout/pref_deletable_word.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-iw/strings.xml | 2 +- app/src/main/res/values-lt/strings.xml | 4 ++-- 21 files changed, 21 insertions(+), 36 deletions(-) diff --git a/app/src/main/java/io/github/sspanak/tt9/db/SlowQueryStats.java b/app/src/main/java/io/github/sspanak/tt9/db/SlowQueryStats.java index 8b104bac..8273daaf 100644 --- a/app/src/main/java/io/github/sspanak/tt9/db/SlowQueryStats.java +++ b/app/src/main/java/io/github/sspanak/tt9/db/SlowQueryStats.java @@ -57,7 +57,7 @@ public class SlowQueryStats { } long averageTime = totalQueries == 0 ? 0 : totalQueryTime / totalQueries; - long slowAverageTime = slowQueries.size() == 0 ? 0 : slowQueryTotalTime / slowQueries.size(); + long slowAverageTime = slowQueries.isEmpty() ? 0 : slowQueryTotalTime / slowQueries.size(); return "Queries: " + totalQueries + ". Average time: " + averageTime + " ms." + diff --git a/app/src/main/java/io/github/sspanak/tt9/db/WordStore.java b/app/src/main/java/io/github/sspanak/tt9/db/WordStore.java index 28659f77..09104a19 100644 --- a/app/src/main/java/io/github/sspanak/tt9/db/WordStore.java +++ b/app/src/main/java/io/github/sspanak/tt9/db/WordStore.java @@ -102,11 +102,6 @@ public class WordStore { } - public boolean exists(Language language) { - return language != null && checkOrNotify() && readOps.exists(sqlite.getDb(), language.getId()); - } - - public void remove(ArrayList languageIds) { if (!checkOrNotify()) { return; diff --git a/app/src/main/java/io/github/sspanak/tt9/db/exporter/AbstractExporter.java b/app/src/main/java/io/github/sspanak/tt9/db/exporter/AbstractExporter.java index 5972ff55..55f8f46b 100644 --- a/app/src/main/java/io/github/sspanak/tt9/db/exporter/AbstractExporter.java +++ b/app/src/main/java/io/github/sspanak/tt9/db/exporter/AbstractExporter.java @@ -32,11 +32,6 @@ public abstract class AbstractExporter { private String statusMessage = ""; - public static AbstractExporter getInstance() { - throw new RuntimeException("Not Implemented"); - } - - private void writeAndroid10(Activity activity) throws Exception { final String fileName = generateFileName(); outputFile = getOutputDir() + File.pathSeparator + fileName; diff --git a/app/src/main/java/io/github/sspanak/tt9/db/exporter/CustomWordsExporter.java b/app/src/main/java/io/github/sspanak/tt9/db/exporter/CustomWordsExporter.java index beb13632..f270309f 100644 --- a/app/src/main/java/io/github/sspanak/tt9/db/exporter/CustomWordsExporter.java +++ b/app/src/main/java/io/github/sspanak/tt9/db/exporter/CustomWordsExporter.java @@ -12,7 +12,6 @@ import io.github.sspanak.tt9.db.sqlite.SQLiteOpener; public class CustomWordsExporter extends AbstractExporter { private static CustomWordsExporter customWordsExporterSelf; - public static final String LOG_TAG = "dictionary_export"; private static final String BASE_FILE_NAME = "tt9-added-words-export-"; public static CustomWordsExporter getInstance() { diff --git a/app/src/main/java/io/github/sspanak/tt9/db/sqlite/Migration.java b/app/src/main/java/io/github/sspanak/tt9/db/sqlite/Migration.java index 78bf5d0b..7376f661 100644 --- a/app/src/main/java/io/github/sspanak/tt9/db/sqlite/Migration.java +++ b/app/src/main/java/io/github/sspanak/tt9/db/sqlite/Migration.java @@ -8,8 +8,8 @@ class Migration { ) }; - String query; - boolean mayFail; + final String query; + final boolean mayFail; private Migration(String query, boolean mayFail) { this.query = query; this.mayFail = mayFail; diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java b/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java index 59ac704e..8408c438 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java @@ -443,7 +443,7 @@ public class TraditionalT9 extends KeyPadHandler { cancelAutoAccept(); String filter; - if (repeat && !suggestionBar.getSuggestion(1).equals("")) { + if (repeat && !suggestionBar.getSuggestion(1).isEmpty()) { filter = suggestionBar.getSuggestion(1); } else { filter = getComposingText(); @@ -703,7 +703,7 @@ public class TraditionalT9 extends KeyPadHandler { maxLength = maxLength > 0 ? Math.min(maxLength, mInputMode.getSequenceLength()) : mInputMode.getSequenceLength(); String text = suggestionBar.getCurrentSuggestion(); - if (text.length() > 0 && text.length() > maxLength) { + if (!text.isEmpty() && text.length() > maxLength) { text = text.substring(0, maxLength); } diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/helpers/InputModeValidator.java b/app/src/main/java/io/github/sspanak/tt9/ime/helpers/InputModeValidator.java index 0447a64e..dc03b438 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/helpers/InputModeValidator.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/helpers/InputModeValidator.java @@ -16,7 +16,7 @@ public class InputModeValidator { for (Language lang : validLanguages) { validLanguageIds.add(lang.getId()); } - if (validLanguageIds.size() == 0) { + if (validLanguageIds.isEmpty()) { validLanguageIds.add(LanguageCollection.getDefault(context).getId()); Logger.e("validateEnabledLanguages", "The language list seems to be corrupted. Resetting to first language only."); } @@ -46,7 +46,7 @@ public class InputModeValidator { newModeId = oldModeId; } else if (allowedModes.contains(InputMode.MODE_ABC)) { newModeId = InputMode.MODE_ABC; - } else if (allowedModes.size() > 0) { + } else if (!allowedModes.isEmpty()) { newModeId = allowedModes.get(0); } diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/helpers/TextField.java b/app/src/main/java/io/github/sspanak/tt9/ime/helpers/TextField.java index a66f9943..7c916ddb 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/helpers/TextField.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/helpers/TextField.java @@ -262,7 +262,7 @@ public class TextField { */ public void setComposingTextWithHighlightedStem(CharSequence word, String stem, boolean highlightMore) { setComposingText( - stem.length() > 0 ? highlightText(word, 0, stem.length(), highlightMore) : word + stem.isEmpty() ? word : highlightText(word, 0, stem.length(), highlightMore) ); } diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/Mode123.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/Mode123.java index c33924e1..dc649f40 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/Mode123.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/Mode123.java @@ -89,7 +89,7 @@ public class Mode123 extends ModePassthrough { reset(); digitSequence = String.valueOf(number); - if (hold && number < KEY_CHARACTERS.size() && KEY_CHARACTERS.get(number).size() > 0) { + if (hold && number < KEY_CHARACTERS.size() && !KEY_CHARACTERS.get(number).isEmpty()) { suggestions.addAll(KEY_CHARACTERS.get(number)); } else { autoAcceptTimeout = 0; diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/helpers/AutoTextCase.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/helpers/AutoTextCase.java index 76abfba1..78f47655 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/helpers/AutoTextCase.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/helpers/AutoTextCase.java @@ -2,7 +2,6 @@ package io.github.sspanak.tt9.ime.modes.helpers; import io.github.sspanak.tt9.languages.Text; import io.github.sspanak.tt9.ime.modes.InputMode; -import io.github.sspanak.tt9.languages.Language; import io.github.sspanak.tt9.preferences.SettingsStore; public class AutoTextCase { diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/SettingsStore.java b/app/src/main/java/io/github/sspanak/tt9/preferences/SettingsStore.java index 64149ef8..cec04b0d 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/SettingsStore.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/SettingsStore.java @@ -99,7 +99,7 @@ public class SettingsStore { validLanguageIds.add(langId); } - if (validLanguageIds.size() == 0) { + if (validLanguageIds.isEmpty()) { Logger.w("saveEnabledLanguageIds", "Refusing to save an empty language list"); return; } diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/debug/ItemInputHandlingMode.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/debug/ItemInputHandlingMode.java index ad5c0369..dd53da83 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/debug/ItemInputHandlingMode.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/debug/ItemInputHandlingMode.java @@ -14,7 +14,7 @@ public class ItemInputHandlingMode extends ItemDropDown { public static final String NAME = "pref_input_handling_mode"; - private SettingsStore settings; + private final SettingsStore settings; ItemInputHandlingMode(DropDownPreference item, SettingsStore settings) { super(item); diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/deleteWords/PreferenceDeletableWord.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/deleteWords/PreferenceDeletableWord.java index 6d93a00f..0213d710 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/deleteWords/PreferenceDeletableWord.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/deleteWords/PreferenceDeletableWord.java @@ -8,7 +8,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceViewHolder; import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.db.WordStoreAsync; diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/hotkeys/SectionKeymap.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/hotkeys/SectionKeymap.java index 3c963115..a29b4960 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/hotkeys/SectionKeymap.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/hotkeys/SectionKeymap.java @@ -1,7 +1,5 @@ package io.github.sspanak.tt9.preferences.screens.hotkeys; -import android.content.Context; - import androidx.preference.DropDownPreference; import java.util.ArrayList; diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java index 30476b99..f660ec66 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java @@ -58,7 +58,7 @@ class MainLayoutNumpad extends BaseMainLayout { @Override protected ArrayList getKeys() { - if (keys != null && keys.size() > 0) { + if (keys != null && !keys.isEmpty()) { return keys; } diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutSmall.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutSmall.java index 4d9a87a5..5d0d1d4d 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutSmall.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutSmall.java @@ -59,7 +59,7 @@ class MainLayoutSmall extends BaseMainLayout { @Override protected ArrayList getKeys() { - if (view != null && (keys == null || keys.size() == 0)) { + if (view != null && (keys == null || keys.isEmpty())) { keys = getKeysFromContainer(view.findViewById(R.id.main_soft_keys)); } return keys; 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 18389a3b..3c50a784 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 @@ -91,7 +91,7 @@ public class SuggestionsBar { public boolean isEmpty() { - return suggestions.size() == 0; + return suggestions.isEmpty(); } @@ -216,8 +216,8 @@ public class SuggestionsBar { private void ecoSetBackground(List newSuggestions) { int newSuggestionsSize = newSuggestions != null ? newSuggestions.size() : 0; if ( - (newSuggestionsSize == 0 && suggestions.size() == 0) - || (newSuggestionsSize > 0 && suggestions.size() > 0) + (newSuggestionsSize == 0 && suggestions.isEmpty()) + || (newSuggestionsSize > 0 && !suggestions.isEmpty()) ) { return; } diff --git a/app/src/main/res/layout/pref_deletable_word.xml b/app/src/main/res/layout/pref_deletable_word.xml index 60ca012f..3345cbe5 100644 --- a/app/src/main/res/layout/pref_deletable_word.xml +++ b/app/src/main/res/layout/pref_deletable_word.xml @@ -16,7 +16,7 @@ android:text="✕" android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView" android:textSize="@dimen/soft_key_icon_size" - tools:ignore="HardcodedText" /> + tools:ignore="HardcodedText,RtlSymmetry" /> Configuración de Traditional T9 Falló al cargar todas las definiciones de idiomas. - Agregar palabra + Agregar ¿Agregar la palabra \"%1$s\" a %2$s? Mueve el cursor dentro de una palabra para añadirla. Palabra en blanco no agregada. diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index f21c66b8..9a961783 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -97,5 +97,5 @@ הייצוא הושלם המילים יוצאות ל: \"%1$s\". מייצא CSV… - מייצא CSV (%1$s)... + מייצא CSV (%1$s)… diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 688bd62b..ffdfaa4c 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -75,8 +75,8 @@ Būsena Pasirinkite numatytąją klaviatūrą - „Traditional T9“ yra įjungtas - „Traditional T9“ yra išjungtas + „%1$s“ yra įjungtas + „%1$s“ yra išjungtas Spauskite čia norėdami įjungti „TT9“ per „Android“ nustatymus. (laikyti nusp.)