diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/CommandHandler.java b/app/src/main/java/io/github/sspanak/tt9/ime/CommandHandler.java index d44e148b..b722ab20 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/CommandHandler.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/CommandHandler.java @@ -154,7 +154,6 @@ abstract public class CommandHandler extends TextEditingHandler { determineTextCase(); } - suggestionOps.setInputMode(mInputMode); settings.saveInputMode(mInputMode.getId()); } diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/TypingHandler.java b/app/src/main/java/io/github/sspanak/tt9/ime/TypingHandler.java index 4ffc0344..fd808bd1 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/TypingHandler.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/TypingHandler.java @@ -73,7 +73,6 @@ public abstract class TypingHandler extends KeyPadHandler { mInputMode = determineInputMode(); determineTextCase(); suggestionOps.set(null); - suggestionOps.setInputMode(mInputMode); return true; } @@ -91,7 +90,6 @@ public abstract class TypingHandler extends KeyPadHandler { // changing the TextField and notifying all interested classes is an atomic operation appHacks = new AppHacks(inputType, textField, textSelection); suggestionOps.setTextField(textField); - suggestionOps.setInputMode(mInputMode); } diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/UiHandler.java b/app/src/main/java/io/github/sspanak/tt9/ime/UiHandler.java index ffb07ee6..1ae729c5 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/UiHandler.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/UiHandler.java @@ -56,7 +56,7 @@ abstract class UiHandler extends AbstractHandler { protected void setStatusIcon(InputMode mode, Language language) { - int resId = new StatusIcon(this, settings, mode, language).resourceId; + int resId = new StatusIcon(settings, mode, language).resourceId; if (resId == 0) { hideStatusIcon(); } else { diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/helpers/SuggestionOps.java b/app/src/main/java/io/github/sspanak/tt9/ime/helpers/SuggestionOps.java index 9f5d9a02..48a7d8c0 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/helpers/SuggestionOps.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/helpers/SuggestionOps.java @@ -8,10 +8,8 @@ import androidx.annotation.Nullable; import java.util.ArrayList; -import io.github.sspanak.tt9.ime.modes.InputMode; import io.github.sspanak.tt9.languages.Language; import io.github.sspanak.tt9.languages.LanguageKind; -import io.github.sspanak.tt9.languages.NullLanguage; import io.github.sspanak.tt9.preferences.settings.SettingsStore; import io.github.sspanak.tt9.ui.main.ResizableMainView; import io.github.sspanak.tt9.ui.tray.SuggestionsBar; @@ -23,9 +21,6 @@ public class SuggestionOps { @NonNull private final Handler delayedAcceptHandler; @NonNull private final ConsumerCompat onDelayedAccept; - @Nullable private InputMode inputMode; - @NonNull private Language language; - @Nullable private final SettingsStore settings; @Nullable protected SuggestionsBar suggestionBar; @NonNull private TextField textField; @@ -34,8 +29,6 @@ public class SuggestionOps { delayedAcceptHandler = new Handler(Looper.getMainLooper()); this.onDelayedAccept = onDelayedAccept != null ? onDelayedAccept : s -> {}; - language = new NullLanguage(); - this.settings = settings; this.textField = textField != null ? textField : new TextField(null, null, null); if (settings != null && mainView != null && onSuggestionClick != null) { @@ -43,16 +36,9 @@ public class SuggestionOps { } } - - public void setInputMode(@Nullable InputMode inputMode) { - this.inputMode = inputMode; - } - - - public void setLanguage(@Nullable Language language) { - this.language = language == null ? new NullLanguage() : language; + public void setLanguage(@Nullable Language newLanguage) { if (suggestionBar != null) { - suggestionBar.setRTL(LanguageKind.isRTL(language)); + suggestionBar.setRTL(LanguageKind.isRTL(newLanguage)); } } diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/InputModeKind.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/InputModeKind.java index c365b4a0..f08bdef4 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/InputModeKind.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/InputModeKind.java @@ -32,8 +32,4 @@ public class InputModeKind { mode.getId() == InputMode.MODE_KATAKANA ); } - - public static boolean isCheonjiin(InputMode mode) { - return mode != null && mode.getClass().equals(ModeCheonjiin.class); - } } 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 76fa91cb..6c2295c3 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 @@ -1,7 +1,6 @@ package io.github.sspanak.tt9.ime.modes; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import java.util.ArrayList; @@ -56,15 +55,15 @@ class Mode123 extends ModePassthrough { private void setDefaultSpecialCharacters() { Language english = LanguageCollection.getByLocale("en"); KEY_CHARACTERS.add( - TextTools.removeLettersFromList(orderCharsForNumericField(settings.getOrderedKeyChars(english, 0), null)) + TextTools.removeLettersFromList(orderCharsForNumericField(settings.getOrderedKeyChars(english, 0))) ); KEY_CHARACTERS.add( - TextTools.removeLettersFromList(orderCharsForNumericField(settings.getOrderedKeyChars(english, 1), null)) + TextTools.removeLettersFromList(orderCharsForNumericField(settings.getOrderedKeyChars(english, 1))) ); } - private ArrayList orderCharsForNumericField(@NonNull ArrayList unordered, @Nullable ArrayList o) { + private ArrayList orderCharsForNumericField(@NonNull ArrayList unordered) { ArrayList ordered = new ArrayList<>(); if (unordered.contains(".")) { diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModeBopomofo.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModeBopomofo.java index 9d7b86d8..473a0cfc 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModeBopomofo.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModeBopomofo.java @@ -88,7 +88,7 @@ public class ModeBopomofo extends ModePinyin { } - /******************************* ACCEPT WORDS *********************************/ + /* ****************************** ACCEPT WORDS *********************************/ /** * In Bopomofo mode, the 0-key is not Spacebar, so we do not rely on the parents to handle accepting diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/helpers/AutoSpace.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/helpers/AutoSpace.java index 81956a92..8ef37b54 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/helpers/AutoSpace.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/helpers/AutoSpace.java @@ -135,8 +135,6 @@ public class AutoSpace { * Similar to "shouldAddAfterPunctuation()", but determines whether to add a space after words. */ private boolean shouldAddAfterWord(boolean isWordAcceptedManually, String previousChars, Text nextChars, int nextKey) { - char firstNextChar = nextChars.isEmpty() ? 0 : nextChars.toString().charAt(0); - return isWordAcceptedManually // Do not add space when auto-accepting words, because it feels very confusing when typing. && isLanguageWithAlphabet diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/PopupBuilder.java b/app/src/main/java/io/github/sspanak/tt9/ui/PopupBuilder.java index 597e5daa..eed30bfd 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/PopupBuilder.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/PopupBuilder.java @@ -115,8 +115,12 @@ public class PopupBuilder { } - public Dialog show() { - return DeviceInfo.AT_LEAST_ANDROID_12 ? builder12.show() : builderLegacy.show(); + public void show() { + if (DeviceInfo.AT_LEAST_ANDROID_12) { + builder12.show(); + } else { + builderLegacy.show(); + } } diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/StatusIcon.java b/app/src/main/java/io/github/sspanak/tt9/ui/StatusIcon.java index 948edca4..1ed5e85a 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/StatusIcon.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/StatusIcon.java @@ -1,7 +1,5 @@ package io.github.sspanak.tt9.ui; -import android.content.Context; - import androidx.annotation.Nullable; import java.util.HashMap; @@ -17,11 +15,11 @@ public class StatusIcon { public final int resourceId; - public StatusIcon(@Nullable Context ctx, @Nullable SettingsStore settings, @Nullable InputMode mode, @Nullable Language language) { + public StatusIcon(@Nullable SettingsStore settings, @Nullable InputMode mode, @Nullable Language language) { if (ICONS.isEmpty()) { generateIconsCache(); } - resourceId = resolveResourcePerMode(ctx, settings, mode, language); + resourceId = resolveResourcePerMode(settings, mode, language); } @@ -33,7 +31,7 @@ public class StatusIcon { private void generateIconsCache() { ICONS.put("ic_lang_alefbet", R.drawable.ic_lang_alefbet);ICONS.put("ic_lang_alefbet", R.drawable.ic_lang_alefbet);ICONS.put("ic_lang_alfabeta_lo", R.drawable.ic_lang_alfabeta_lo);ICONS.put("ic_lang_alfabeta_up", R.drawable.ic_lang_alfabeta_up);ICONS.put("ic_lang_alifba", R.drawable.ic_lang_alifba);ICONS.put("ic_lang_alifba", R.drawable.ic_lang_alifba);ICONS.put("ic_lang_ar", R.drawable.ic_lang_ar);ICONS.put("ic_lang_bg_cp", R.drawable.ic_lang_bg_cp);ICONS.put("ic_lang_bg_lo", R.drawable.ic_lang_bg_lo);ICONS.put("ic_lang_bg_up", R.drawable.ic_lang_bg_up);ICONS.put("ic_lang_br_cp", R.drawable.ic_lang_br_cp);ICONS.put("ic_lang_br_lo", R.drawable.ic_lang_br_lo);ICONS.put("ic_lang_br_up", R.drawable.ic_lang_br_up);ICONS.put("ic_lang_ca_cp", R.drawable.ic_lang_ca_cp);ICONS.put("ic_lang_ca_lo", R.drawable.ic_lang_ca_lo);ICONS.put("ic_lang_ca_up", R.drawable.ic_lang_ca_up);ICONS.put("ic_lang_cyrillic_lo", R.drawable.ic_lang_cyrillic_lo);ICONS.put("ic_lang_cyrillic_lo", R.drawable.ic_lang_cyrillic_lo);ICONS.put("ic_lang_cyrillic_lo", R.drawable.ic_lang_cyrillic_lo);ICONS.put("ic_lang_cyrillic_up", R.drawable.ic_lang_cyrillic_up);ICONS.put("ic_lang_cyrillic_up", R.drawable.ic_lang_cyrillic_up);ICONS.put("ic_lang_cyrillic_up", R.drawable.ic_lang_cyrillic_up);ICONS.put("ic_lang_cz_cp", R.drawable.ic_lang_cz_cp);ICONS.put("ic_lang_cz_lo", R.drawable.ic_lang_cz_lo);ICONS.put("ic_lang_cz_up", R.drawable.ic_lang_cz_up);ICONS.put("ic_lang_da_cp", R.drawable.ic_lang_da_cp);ICONS.put("ic_lang_da_lo", R.drawable.ic_lang_da_lo);ICONS.put("ic_lang_da_up", R.drawable.ic_lang_da_up);ICONS.put("ic_lang_de_cp", R.drawable.ic_lang_de_cp);ICONS.put("ic_lang_de_lo", R.drawable.ic_lang_de_lo);ICONS.put("ic_lang_de_up", R.drawable.ic_lang_de_up);ICONS.put("ic_lang_el_cp", R.drawable.ic_lang_el_cp);ICONS.put("ic_lang_el_lo", R.drawable.ic_lang_el_lo);ICONS.put("ic_lang_el_up", R.drawable.ic_lang_el_up);ICONS.put("ic_lang_en_cp", R.drawable.ic_lang_en_cp);ICONS.put("ic_lang_en_lo", R.drawable.ic_lang_en_lo);ICONS.put("ic_lang_en_up", R.drawable.ic_lang_en_up);ICONS.put("ic_lang_es_cp", R.drawable.ic_lang_es_cp);ICONS.put("ic_lang_es_lo", R.drawable.ic_lang_es_lo);ICONS.put("ic_lang_es_up", R.drawable.ic_lang_es_up);ICONS.put("ic_lang_et_cp", R.drawable.ic_lang_et_cp);ICONS.put("ic_lang_et_lo", R.drawable.ic_lang_et_lo);ICONS.put("ic_lang_et_up", R.drawable.ic_lang_et_up);ICONS.put("ic_lang_fa", R.drawable.ic_lang_fa);ICONS.put("ic_lang_fr_cp", R.drawable.ic_lang_fr_cp);ICONS.put("ic_lang_fr_lo", R.drawable.ic_lang_fr_lo);ICONS.put("ic_lang_fr_up", R.drawable.ic_lang_fr_up);ICONS.put("ic_lang_ga_cp", R.drawable.ic_lang_ga_cp);ICONS.put("ic_lang_ga_lo", R.drawable.ic_lang_ga_lo);ICONS.put("ic_lang_ga_up", R.drawable.ic_lang_ga_up);ICONS.put("ic_lang_gu", R.drawable.ic_lang_gu);ICONS.put("ic_lang_gu_abc", R.drawable.ic_lang_gu_abc);ICONS.put("ic_lang_he", R.drawable.ic_lang_he);ICONS.put("ic_lang_hi", R.drawable.ic_lang_hi);ICONS.put("ic_lang_hi_abc", R.drawable.ic_lang_hi_abc);ICONS.put("ic_lang_hn_cp", R.drawable.ic_lang_hn_cp);ICONS.put("ic_lang_hn_lo", R.drawable.ic_lang_hn_lo);ICONS.put("ic_lang_hn_up", R.drawable.ic_lang_hn_up);ICONS.put("ic_lang_hr_cp", R.drawable.ic_lang_hr_cp);ICONS.put("ic_lang_hr_lo", R.drawable.ic_lang_hr_lo);ICONS.put("ic_lang_hr_up", R.drawable.ic_lang_hr_up);ICONS.put("ic_lang_id_cp", R.drawable.ic_lang_id_cp);ICONS.put("ic_lang_id_lo", R.drawable.ic_lang_id_lo);ICONS.put("ic_lang_id_up", R.drawable.ic_lang_id_up);ICONS.put("ic_lang_it_cp", R.drawable.ic_lang_it_cp);ICONS.put("ic_lang_it_lo", R.drawable.ic_lang_it_lo);ICONS.put("ic_lang_it_up", R.drawable.ic_lang_it_up);ICONS.put("ic_lang_ji", R.drawable.ic_lang_ji);ICONS.put("ic_lang_kanji", R.drawable.ic_lang_kanji);ICONS.put("ic_lang_ko", R.drawable.ic_lang_ko);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_lo", R.drawable.ic_lang_latin_lo);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_latin_up", R.drawable.ic_lang_latin_up);ICONS.put("ic_lang_lt_cp", R.drawable.ic_lang_lt_cp);ICONS.put("ic_lang_lt_lo", R.drawable.ic_lang_lt_lo);ICONS.put("ic_lang_lt_up", R.drawable.ic_lang_lt_up);ICONS.put("ic_lang_lv_cp", R.drawable.ic_lang_lv_cp);ICONS.put("ic_lang_lv_lo", R.drawable.ic_lang_lv_lo);ICONS.put("ic_lang_lv_up", R.drawable.ic_lang_lv_up);ICONS.put("ic_lang_mg_cp", R.drawable.ic_lang_mg_cp);ICONS.put("ic_lang_mg_lo", R.drawable.ic_lang_mg_lo);ICONS.put("ic_lang_mg_up", R.drawable.ic_lang_mg_up);ICONS.put("ic_lang_nl_cp", R.drawable.ic_lang_nl_cp);ICONS.put("ic_lang_nl_lo", R.drawable.ic_lang_nl_lo);ICONS.put("ic_lang_nl_up", R.drawable.ic_lang_nl_up);ICONS.put("ic_lang_no_cp", R.drawable.ic_lang_no_cp);ICONS.put("ic_lang_no_lo", R.drawable.ic_lang_no_lo);ICONS.put("ic_lang_no_up", R.drawable.ic_lang_no_up);ICONS.put("ic_lang_pl_cp", R.drawable.ic_lang_pl_cp);ICONS.put("ic_lang_pl_lo", R.drawable.ic_lang_pl_lo);ICONS.put("ic_lang_pl_up", R.drawable.ic_lang_pl_up);ICONS.put("ic_lang_pt_cp", R.drawable.ic_lang_pt_cp);ICONS.put("ic_lang_pt_lo", R.drawable.ic_lang_pt_lo);ICONS.put("ic_lang_pt_up", R.drawable.ic_lang_pt_up);ICONS.put("ic_lang_ro_cp", R.drawable.ic_lang_ro_cp);ICONS.put("ic_lang_ro_lo", R.drawable.ic_lang_ro_lo);ICONS.put("ic_lang_ro_up", R.drawable.ic_lang_ro_up);ICONS.put("ic_lang_ru_cp", R.drawable.ic_lang_ru_cp);ICONS.put("ic_lang_ru_lo", R.drawable.ic_lang_ru_lo);ICONS.put("ic_lang_ru_up", R.drawable.ic_lang_ru_up);ICONS.put("ic_lang_sl_cp", R.drawable.ic_lang_sl_cp);ICONS.put("ic_lang_sl_lo", R.drawable.ic_lang_sl_lo);ICONS.put("ic_lang_sl_up", R.drawable.ic_lang_sl_up);ICONS.put("ic_lang_su_cp", R.drawable.ic_lang_su_cp);ICONS.put("ic_lang_su_lo", R.drawable.ic_lang_su_lo);ICONS.put("ic_lang_su_up", R.drawable.ic_lang_su_up);ICONS.put("ic_lang_sv_cp", R.drawable.ic_lang_sv_cp);ICONS.put("ic_lang_sv_lo", R.drawable.ic_lang_sv_lo);ICONS.put("ic_lang_sv_up", R.drawable.ic_lang_sv_up);ICONS.put("ic_lang_sw_cp", R.drawable.ic_lang_sw_cp);ICONS.put("ic_lang_sw_lo", R.drawable.ic_lang_sw_lo);ICONS.put("ic_lang_sw_up", R.drawable.ic_lang_sw_up);ICONS.put("ic_lang_th", R.drawable.ic_lang_th);ICONS.put("ic_lang_th_abc", R.drawable.ic_lang_th_abc);ICONS.put("ic_lang_tifinagh", R.drawable.ic_lang_tifinagh);ICONS.put("ic_lang_tm_cp", R.drawable.ic_lang_tm_cp);ICONS.put("ic_lang_tm_lo", R.drawable.ic_lang_tm_lo);ICONS.put("ic_lang_tm_tifinagh", R.drawable.ic_lang_tm_tifinagh);ICONS.put("ic_lang_tm_up", R.drawable.ic_lang_tm_up);ICONS.put("ic_lang_tr_cp", R.drawable.ic_lang_tr_cp);ICONS.put("ic_lang_tr_lo", R.drawable.ic_lang_tr_lo);ICONS.put("ic_lang_tr_up", R.drawable.ic_lang_tr_up);ICONS.put("ic_lang_uk_cp", R.drawable.ic_lang_uk_cp);ICONS.put("ic_lang_uk_lo", R.drawable.ic_lang_uk_lo);ICONS.put("ic_lang_uk_up", R.drawable.ic_lang_uk_up);ICONS.put("ic_lang_vi_cp", R.drawable.ic_lang_vi_cp);ICONS.put("ic_lang_vi_lo", R.drawable.ic_lang_vi_lo);ICONS.put("ic_lang_vi_up", R.drawable.ic_lang_vi_up);ICONS.put("ic_lang_zh_pinyin", R.drawable.ic_lang_zh_pinyin); } - private int resolveResourcePerMode(@Nullable Context ctx, @Nullable SettingsStore settings, @Nullable InputMode mode, @Nullable Language language) { + private int resolveResourcePerMode(@Nullable SettingsStore settings, @Nullable InputMode mode, @Nullable Language language) { if (language == null || mode == null || settings == null || InputModeKind.isPassthrough(mode) || !settings.isStatusIconEnabled()) { return 0; } diff --git a/app/src/main/java/io/github/sspanak/tt9/util/colors/SystemColor.java b/app/src/main/java/io/github/sspanak/tt9/util/colors/SystemColor.java index 20fd5a41..138d9dbe 100644 --- a/app/src/main/java/io/github/sspanak/tt9/util/colors/SystemColor.java +++ b/app/src/main/java/io/github/sspanak/tt9/util/colors/SystemColor.java @@ -3,10 +3,6 @@ package io.github.sspanak.tt9.util.colors; public class SystemColor { protected int color; - protected SystemColor(int color) { - this.color = color; - } - public SystemColor() { color = 0; } diff --git a/app/src/main/java/io/github/sspanak/tt9/util/sys/SystemSettings.java b/app/src/main/java/io/github/sspanak/tt9/util/sys/SystemSettings.java index 829c1b84..bdce8a12 100644 --- a/app/src/main/java/io/github/sspanak/tt9/util/sys/SystemSettings.java +++ b/app/src/main/java/io/github/sspanak/tt9/util/sys/SystemSettings.java @@ -73,7 +73,7 @@ public class SystemSettings { /** * Even though the background changes automatically on Android 15, thanks to edge-to-edge, * the text/icon color remains the device default. This function allows us to change it. - * @see: the only working solution. + * {@code @see:} the only working solution. */ public static void setNavigationBarDarkTheme(@Nullable Window window, boolean dark) { if (!DeviceInfo.AT_LEAST_ANDROID_11) {