wzray/tt9
1
0
Fork 0
Code Activity

removed unnecessary language object

Browse source
This commit is contained in:
sspanak 2024-10-01 20:41:06 +03:00 • committed by Dimo Karaivanov
parent 0e66f82738
commit 14e7224981
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/io/github/sspanak/tt9/ime/modes/InputMode.java
View file

@ -170,30 +170,29 @@ abstract public class InputMode {
* This is used in nextTextCase() for switching to the next set of characters. Obviously, * This is used in nextTextCase() for switching to the next set of characters. Obviously,
* special chars do not have a text case, but we use this trick to alternate the char groups. * special chars do not have a text case, but we use this trick to alternate the char groups.
*/ */
protected boolean nextSpecialCharacters() { return nextSpecialCharacters(language); } protected boolean nextSpecialCharacters() {
protected boolean nextSpecialCharacters(Language altLanguage) {
int previousGroup = specialCharSelectedGroup; int previousGroup = specialCharSelectedGroup;
specialCharSelectedGroup++; specialCharSelectedGroup++;
return return
loadSpecialCharacters(altLanguage) // validates specialCharSelectedGroup loadSpecialCharacters() // validates specialCharSelectedGroup
&& previousGroup != specialCharSelectedGroup; // verifies validation has passed && previousGroup != specialCharSelectedGroup; // verifies validation has passed
} }
protected boolean loadSpecialCharacters(Language altLanguage) { protected boolean loadSpecialCharacters() {
if (altLanguage == null || digitSequence.isEmpty()) { if (language == null || digitSequence.isEmpty()) {
return false; return false;
} }
int key = digitSequence.charAt(0) - '0'; int key = digitSequence.charAt(0) - '0';
ArrayList<String> chars = settings.getOrderedKeyChars(altLanguage, key, specialCharSelectedGroup); ArrayList<String> chars = settings.getOrderedKeyChars(language, key, specialCharSelectedGroup);
if (chars.isEmpty() && specialCharSelectedGroup == 1) { if (chars.isEmpty() && specialCharSelectedGroup == 1) {
specialCharSelectedGroup = 0; specialCharSelectedGroup = 0;
return false; return false;
} else if (chars.isEmpty()) { } else if (chars.isEmpty()) {
specialCharSelectedGroup = 0; specialCharSelectedGroup = 0;
chars = settings.getOrderedKeyChars(altLanguage, key, specialCharSelectedGroup); chars = settings.getOrderedKeyChars(language, key, specialCharSelectedGroup);
} }
suggestions.clear(); suggestions.clear();

6
app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePredictive.java
View file

@ -293,7 +293,7 @@ public class ModePredictive extends InputMode {
*/ */
private boolean loadStaticSuggestions() { private boolean loadStaticSuggestions() {
if (digitSequence.equals(NaturalLanguage.PUNCTUATION_KEY) || digitSequence.equals(NaturalLanguage.SPECIAL_CHARS_KEY)) { if (digitSequence.equals(NaturalLanguage.PUNCTUATION_KEY) || digitSequence.equals(NaturalLanguage.SPECIAL_CHARS_KEY)) {
loadSpecialCharacters(language); loadSpecialCharacters();
onSuggestionsUpdated.run(); onSuggestionsUpdated.run();
return true; return true;
} else if (!digitSequence.equals(EmojiLanguage.CUSTOM_EMOJI_SEQUENCE) && digitSequence.startsWith(EmojiLanguage.EMOJI_SEQUENCE)) { } else if (!digitSequence.equals(EmojiLanguage.CUSTOM_EMOJI_SEQUENCE) && digitSequence.startsWith(EmojiLanguage.EMOJI_SEQUENCE)) {
@ -313,14 +313,14 @@ public class ModePredictive extends InputMode {
@Override @Override
protected boolean loadSpecialCharacters(Language altLanguage) { protected boolean loadSpecialCharacters() {
int number = digitSequence.charAt(0) - '0'; int number = digitSequence.charAt(0) - '0';
if (KEY_CHARACTERS.size() > number) { if (KEY_CHARACTERS.size() > number) {
suggestions.clear(); suggestions.clear();
suggestions.addAll(KEY_CHARACTERS.get(number)); suggestions.addAll(KEY_CHARACTERS.get(number));
return true; return true;
} else { } else {
return super.loadSpecialCharacters(language); return super.loadSpecialCharacters();
} }
} }