wzray/tt9
1
0
Fork 0
Code Activity

fixed word pair predicitions not working when one of the words contains capital letters

Browse source
This commit is contained in:
sspanak 2024-11-29 15:05:00 +02:00 • committed by Dimo Karaivanov
parent 8ad8f9bd1c
commit 7283b8ae0b
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/io/github/sspanak/tt9/ime/modes/predictions/WordPredictions.java
View file

@ -7,6 +7,7 @@ import io.github.sspanak.tt9.ime.helpers.TextField;
import io.github.sspanak.tt9.languages.EmojiLanguage; import io.github.sspanak.tt9.languages.EmojiLanguage;
import io.github.sspanak.tt9.preferences.settings.SettingsStore; import io.github.sspanak.tt9.preferences.settings.SettingsStore;
import io.github.sspanak.tt9.util.Characters; import io.github.sspanak.tt9.util.Characters;
import io.github.sspanak.tt9.util.TextTools;
public class WordPredictions extends Predictions { public class WordPredictions extends Predictions {
private final TextField textField; private final TextField textField;
@ -274,14 +275,14 @@ public class WordPredictions extends Predictions {
ArrayList<String> rearrangedWords = new ArrayList<>(); ArrayList<String> rearrangedWords = new ArrayList<>();
String penultimateWord = textField.getWordBeforeCursor(language, 1, true); String penultimateWord = textField.getWordBeforeCursor(language, 1, true);
String word = DataStore.getWord2(language, penultimateWord, digitSequence); String pairWord = DataStore.getWord2(language, penultimateWord, digitSequence);
int morePopularIndex = word == null ? -1 : words.indexOf(word); int morePopularIndex = TextTools.indexOfIgnoreCase(words, pairWord);
if (morePopularIndex == -1) { if (morePopularIndex == -1) {
return words; return words;
} }
lastEnforcedTopWord = word; lastEnforcedTopWord = words.get(morePopularIndex);
rearrangedWords.add(word); rearrangedWords.add(lastEnforcedTopWord);
for (int i = 0; i < words.size(); i++) { for (int i = 0; i < words.size(); i++) {
if (i != morePopularIndex) { if (i != morePopularIndex) {

12
app/src/main/java/io/github/sspanak/tt9/util/TextTools.java
View file

@ -2,6 +2,7 @@ package io.github.sspanak.tt9.util;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.TimeZone; import java.util.TimeZone;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -46,6 +47,17 @@ public class TextTools {
} }
public static int indexOfIgnoreCase(List<String> list, String str) {
for (int i = 0, size = list != null && str != null ? list.size() : 0; i < size; i++) {
if (list.get(i).equalsIgnoreCase(str)) {
return i;
}
}
return -1;
}
public static boolean isStartOfSentence(String str) { public static boolean isStartOfSentence(String str) {
return str != null && startOfSentence.matcher(str).find(); return str != null && startOfSentence.matcher(str).find();
} }