wzray/tt9
1
0
Fork 0
Code Activity

fixed the suggestions scrolling in the wrong direction in ABC mode, when the system language is RTL

Browse source
This commit is contained in:
sspanak 2024-05-19 15:20:52 +03:00 • committed by Dimo Karaivanov
parent bf91db2bcb
commit 4c1f38f94a
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,8 @@
package io.github.sspanak.tt9.ime; package io.github.sspanak.tt9.ime;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection;
import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.R;
import io.github.sspanak.tt9.db.DictionaryLoader; import io.github.sspanak.tt9.db.DictionaryLoader;
@ -9,11 +11,15 @@ import io.github.sspanak.tt9.ime.modes.InputMode;
import io.github.sspanak.tt9.ime.modes.ModeABC; import io.github.sspanak.tt9.ime.modes.ModeABC;
import io.github.sspanak.tt9.ime.modes.ModePredictive; import io.github.sspanak.tt9.ime.modes.ModePredictive;
import io.github.sspanak.tt9.languages.LanguageCollection; import io.github.sspanak.tt9.languages.LanguageCollection;
import io.github.sspanak.tt9.languages.LanguageKind;
import io.github.sspanak.tt9.preferences.helpers.Hotkeys; import io.github.sspanak.tt9.preferences.helpers.Hotkeys;
import io.github.sspanak.tt9.ui.UI; import io.github.sspanak.tt9.ui.UI;
import io.github.sspanak.tt9.ui.dialogs.AddWordDialog; import io.github.sspanak.tt9.ui.dialogs.AddWordDialog;
public abstract class HotkeyHandler extends TypingHandler { public abstract class HotkeyHandler extends TypingHandler {
private boolean isSystemRTL;
@Override @Override
protected void onInit() { protected void onInit() {
if (settings.areHotkeysInitialized()) { if (settings.areHotkeysInitialized()) {
@ -22,6 +28,13 @@ public abstract class HotkeyHandler extends TypingHandler {
} }
@Override
protected boolean onStart(InputConnection connection, EditorInfo field) {
isSystemRTL = LanguageKind.isRTL(LanguageCollection.getDefault(this));
return super.onStart(connection, field);
}
@Override public boolean onBack() { @Override public boolean onBack() {
return settings.isMainLayoutNumpad(); return settings.isMainLayoutNumpad();
} }
@ -195,6 +208,7 @@ public abstract class HotkeyHandler extends TypingHandler {
return true; return true;
} }
backward = isSystemRTL != backward;
scrollSuggestions(backward); scrollSuggestions(backward);
return true; return true;

4
app/src/main/java/io/github/sspanak/tt9/ime/TypingHandler.java
View file

@ -19,7 +19,6 @@ import io.github.sspanak.tt9.ime.modes.InputMode;
import io.github.sspanak.tt9.ime.modes.ModePredictive; import io.github.sspanak.tt9.ime.modes.ModePredictive;
import io.github.sspanak.tt9.languages.Language; import io.github.sspanak.tt9.languages.Language;
import io.github.sspanak.tt9.languages.LanguageCollection; import io.github.sspanak.tt9.languages.LanguageCollection;
import io.github.sspanak.tt9.languages.LanguageKind;
import io.github.sspanak.tt9.ui.UI; import io.github.sspanak.tt9.ui.UI;
import io.github.sspanak.tt9.util.Text; import io.github.sspanak.tt9.util.Text;
@ -30,7 +29,6 @@ public abstract class TypingHandler extends KeyPadHandler {
@NonNull protected InputType inputType = new InputType(null, null); @NonNull protected InputType inputType = new InputType(null, null);
@NonNull protected TextField textField = new TextField(null, null); @NonNull protected TextField textField = new TextField(null, null);
protected SuggestionOps suggestionOps; protected SuggestionOps suggestionOps;
private boolean isSystemRTL;
// input // input
protected ArrayList<Integer> allowedInputModes = new ArrayList<>(); protected ArrayList<Integer> allowedInputModes = new ArrayList<>();
@ -63,7 +61,6 @@ public abstract class TypingHandler extends KeyPadHandler {
return false; return false;
} }
isSystemRTL = LanguageKind.isRTL(LanguageCollection.getDefault(this));
resetKeyRepeat(); resetKeyRepeat();
mInputMode = getInputMode(); mInputMode = getInputMode();
determineTextCase(); determineTextCase();
@ -354,7 +351,6 @@ public abstract class TypingHandler extends KeyPadHandler {
protected void scrollSuggestions(boolean backward) { protected void scrollSuggestions(boolean backward) {
suggestionOps.cancelDelayedAccept(); suggestionOps.cancelDelayedAccept();
backward = isSystemRTL != backward;
suggestionOps.scrollTo(backward ? -1 : 1); suggestionOps.scrollTo(backward ? -1 : 1);
mInputMode.setWordStem(suggestionOps.getCurrent(), true); mInputMode.setWordStem(suggestionOps.getCurrent(), true);
appHacks.setComposingTextWithHighlightedStem(suggestionOps.getCurrent(), mInputMode); appHacks.setComposingTextWithHighlightedStem(suggestionOps.getCurrent(), mInputMode);