wzray/tt9
1
0
Fork 0
Code Activity

regression: fixed the text case not being preserved when changing the language

Browse source
This commit is contained in:
sspanak 2025-06-12 12:37:57 +03:00 • committed by Dimo Karaivanov
parent b26aba2273
commit 252c3e557d
3 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/io/github/sspanak/tt9/ime/CommandHandler.java
View file

@ -187,12 +187,9 @@ abstract public class CommandHandler extends TextEditingHandler {
settings.setDefaultCharOrder(mLanguage, false); // initialize default order, if missing settings.setDefaultCharOrder(mLanguage, false); // initialize default order, if missing
// for languages that do not have ABC or Predictive, make sure we remain in valid state // for languages that do not have ABC or Predictive, make sure we remain in valid state
final String digits = mInputMode.getSequence(); mInputMode = InputMode
mInputMode = InputMode.getInstance(settings, mLanguage, inputType, textField, determineInputModeId()); .getInstance(settings, mLanguage, inputType, textField, determineInputModeId())
if (!InputModeKind.isNumeric(mInputMode)) { .copy(mInputMode);
mInputMode.setSequence(digits);
mInputMode.determineNextWordTextCase(-1);
}
getSuggestions(null); getSuggestions(null);
setStatusIcon(mInputMode, mLanguage); setStatusIcon(mInputMode, mLanguage);

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

@ -79,6 +79,20 @@ abstract public class InputMode {
} }
} }
public InputMode copy(InputMode other) {
if (other == null || InputModeKind.isNumeric(this) || InputModeKind.isNumeric(other)) {
return this;
}
autoAcceptTimeout = -1;
textCase = other.textCase;
setSequence(other.digitSequence);
return this;
}
// Key handlers. Return "true" when handling the key or "false", when is nothing to do. // Key handlers. Return "true" when handling the key or "false", when is nothing to do.
public boolean onBackspace() { return false; } public boolean onBackspace() { return false; }
abstract public boolean onNumber(int number, boolean hold, int repeat); abstract public boolean onNumber(int number, boolean hold, int repeat);

2
app/src/main/java/io/github/sspanak/tt9/util/Text.java
View file

@ -165,7 +165,7 @@ public class Text extends TextTools {
public boolean isUpperCase() { public boolean isUpperCase() {
return language != null && text != null && text.toUpperCase(language.getLocale()).equals(text); return language != null && text != null && language.hasUpperCase() && text.toUpperCase(language.getLocale()).equals(text);
} }