wzray/tt9
1
0
Fork 0
Code Activity

fixed character case switching issues (#443)

Browse source 
* fixed issues with switching the text case

  * fixed not possible to type currency characters in RTL languages
This commit is contained in:
Dimo Karaivanov 2024-02-27 10:59:19 +02:00 • committed by sspanak
parent 861b3856fd
commit cd7215b6fc
5 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest
android:versionCode="381"
android:versionCode="382"
android:versionName="28.0"
xmlns:android="http://schemas.android.com/apk/res/android">

5
app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java
View file

@ -720,8 +720,7 @@ public class TraditionalT9 extends KeyPadHandler {
// When we are in AUTO mode and the dictionary word is in uppercase,
// the mode would switch to UPPERCASE, but visually, the word would not change.
// This is why we retry, until there is a visual change.
for (int retries = 0; retries < 2 && mLanguage.hasUpperCase(); retries++) {
mInputMode.nextTextCase();
for (int retries = 0; retries < 2 && mInputMode.nextTextCase(); retries++) {
setSuggestions(mInputMode.getSuggestions(), suggestionBar.getCurrentIndex());
textField.setComposingText(suggestionBar.getCurrentSuggestion());
@ -731,7 +730,7 @@ public class TraditionalT9 extends KeyPadHandler {
}
}
// make "abc" and "ABC" separate modes from user perspective
else if (mInputMode instanceof ModeABC && mInputMode.getTextCase() == InputMode.CASE_LOWER && mLanguage.hasUpperCase()) {
else if (mInputMode instanceof ModeABC && mLanguage.hasUpperCase() && mInputMode.getTextCase() == InputMode.CASE_LOWER) {
mInputMode.nextTextCase();
} else {
int nextModeIndex = (allowedInputModes.indexOf(mInputMode.getId()) + 1) % allowedInputModes.size();

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

@ -129,16 +129,6 @@ abstract public class InputMode {
textCase = allowedTextCases.get(0);
}
public boolean nextTextCase() {
if (nextSpecialCharacters()) {
return false;
}
int nextIndex = (allowedTextCases.indexOf(textCase) + 1) % allowedTextCases.size();
textCase = allowedTextCases.get(nextIndex);
return true;
}
/**
* 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.
@ -148,9 +138,10 @@ abstract public class InputMode {
return false;
}
int previousGroup = specialCharSelectedGroup;
int key = digitSequence.charAt(0) - '0';
ArrayList<String> chars = language.getKeyCharacters(key, ++specialCharSelectedGroup);
if (chars.isEmpty() && specialCharSelectedGroup == 1) {
specialCharSelectedGroup = 0;
return false;
@ -162,6 +153,21 @@ abstract public class InputMode {
suggestions.clear();
suggestions.addAll(chars);
return previousGroup != specialCharSelectedGroup;
}
public boolean nextTextCase() {
if (nextSpecialCharacters()) {
return true;
}
if (!language.hasUpperCase() || digitSequence.startsWith(Language.PUNCTUATION_KEY) || digitSequence.startsWith(Language.SPECIAL_CHARS_KEY)) {
return false;
}
int nextIndex = (allowedTextCases.indexOf(textCase) + 1) % allowedTextCases.size();
textCase = allowedTextCases.get(nextIndex);
return true;
}

7
app/src/main/java/io/github/sspanak/tt9/ime/modes/Mode123.java
View file

@ -81,9 +81,7 @@ public class Mode123 extends ModePassthrough {
}
}
@Override
protected boolean nextSpecialCharacters() {
@Override protected boolean nextSpecialCharacters() {
return digitSequence.equals(Language.SPECIAL_CHARS_KEY) && super.nextSpecialCharacters();
}
@ -122,8 +120,7 @@ public class Mode123 extends ModePassthrough {
}
@Override
public void reset() {
@Override public void reset() {
super.reset();
digitSequence = "";
}

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

@ -314,11 +314,6 @@ public class ModePredictive extends InputMode {
return autoTextCase.adjustSuggestionTextCase(new Text(language, word), newTextCase);
}
@Override
protected boolean nextSpecialCharacters() {
return digitSequence.equals(Language.SPECIAL_CHARS_KEY) && super.nextSpecialCharacters();
}
@Override
public void determineNextWordTextCase(Text textBeforeCursor) {
textCase = autoTextCase.determineNextWordTextCase(textCase, textFieldTextCase, textBeforeCursor);
@ -330,6 +325,11 @@ public class ModePredictive extends InputMode {
return (textCase == CASE_UPPER || textCase == CASE_LOWER) ? textCase : CASE_CAPITALIZE;
}
@Override
protected boolean nextSpecialCharacters() {
return digitSequence.equals(Language.SPECIAL_CHARS_KEY) && super.nextSpecialCharacters();
}
@Override
public boolean nextTextCase() {
boolean changed = super.nextTextCase();