diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/MainViewOps.java b/app/src/main/java/io/github/sspanak/tt9/ime/MainViewOps.java index 97246a28..48faffe2 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/MainViewOps.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/MainViewOps.java @@ -1,5 +1,8 @@ package io.github.sspanak.tt9.ime; +import androidx.annotation.Nullable; + +import io.github.sspanak.tt9.languages.Language; import io.github.sspanak.tt9.preferences.settings.SettingsStore; abstract public class MainViewOps extends HotkeyHandler { @@ -24,6 +27,11 @@ abstract public class MainViewOps extends HotkeyHandler { return mInputMode.is123() && inputType.isPhoneNumber(); } + @Nullable + public Language getLanguage() { + return mLanguage; + } + public SettingsStore getSettings() { return settings; } diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftBackspaceKey.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftBackspaceKey.java index e9a9a852..e2cb6528 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftBackspaceKey.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftBackspaceKey.java @@ -50,6 +50,6 @@ public class SoftBackspaceKey extends SoftKey { return "Del"; } - return LanguageKind.isRTL(getCurrentLanguage()) ? "⌦" : "⌫"; + return LanguageKind.isRTL(tt9.getLanguage()) ? "⌦" : "⌫"; } } diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKey.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKey.java index 70d81c82..0a7e1814 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKey.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKey.java @@ -12,13 +12,10 @@ import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; -import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.ime.TraditionalT9; -import io.github.sspanak.tt9.languages.Language; -import io.github.sspanak.tt9.languages.LanguageCollection; import io.github.sspanak.tt9.preferences.settings.SettingsStore; import io.github.sspanak.tt9.util.Logger; @@ -169,10 +166,6 @@ public class SoftKey extends androidx.appcompat.widget.AppCompatButton implement return true; } - @Nullable protected Language getCurrentLanguage() { - return LanguageCollection.getLanguage(tt9.getApplicationContext(), tt9.getSettings().getInputLanguage()); - } - /** * getTitle * Generates the name of the key, for example: "OK", "Backspace", "1", etc... diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftNumberKey.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftNumberKey.java index d58b9832..11d973ee 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftNumberKey.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftNumberKey.java @@ -59,10 +59,9 @@ public class SoftNumberKey extends SoftKey { protected String getTitle() { int number = getNumber(getId()); - Language language = getCurrentLanguage(); - if (LanguageKind.isArabic(language) && tt9 != null && !tt9.isInputModeNumeric()) { + if (tt9 != null && !tt9.isInputModeNumeric() && LanguageKind.isArabic(tt9.getLanguage())) { complexLabelTitleSize = SettingsStore.SOFT_KEY_COMPLEX_LABEL_ARABIC_TITLE_SIZE; - return language.getKeyNumber(number); + return tt9.getLanguage().getKeyNumber(number); } else { complexLabelTitleSize = SettingsStore.SOFT_KEY_COMPLEX_LABEL_TITLE_SIZE; return String.valueOf(number); @@ -102,7 +101,7 @@ public class SoftNumberKey extends SoftKey { } // 2-9 - Language language = getCurrentLanguage(); + Language language = tt9.getLanguage(); if (language == null) { Logger.d("SoftNumberKey.getLabel", "Cannot generate a label when the language is NULL."); return ""; diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftPunctuationKey.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftPunctuationKey.java index 2b20908d..4b520c39 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftPunctuationKey.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftPunctuationKey.java @@ -52,7 +52,7 @@ public class SoftPunctuationKey extends SoftKey { } else { if (keyId == R.id.soft_key_punctuation_1) return "!"; if (keyId == R.id.soft_key_punctuation_2) { - return LanguageKind.isArabic(getCurrentLanguage()) ? "؟" : "?"; + return LanguageKind.isArabic(tt9.getLanguage()) ? "؟" : "?"; } }