proper text case adjustment

Author: sspanak

app/src/main/java/io/github/sspanak/tt9/db/mindReading/MindReader.java

@@ -8,11 +8,16 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.RejectedExecutionException;
 
+import io.github.sspanak.tt9.hacks.InputType;
+import io.github.sspanak.tt9.ime.helpers.TextField;
 import io.github.sspanak.tt9.ime.modes.InputMode;
 import io.github.sspanak.tt9.ime.modes.InputModeKind;
+import io.github.sspanak.tt9.ime.modes.helpers.AutoTextCase;
+import io.github.sspanak.tt9.ime.modes.helpers.Sequences;
 import io.github.sspanak.tt9.languages.Language;
 import io.github.sspanak.tt9.languages.LanguageKind;
 import io.github.sspanak.tt9.languages.NaturalLanguage;
+import io.github.sspanak.tt9.languages.exceptions.InvalidLanguageCharactersException;
 import io.github.sspanak.tt9.preferences.settings.SettingsStore;
 import io.github.sspanak.tt9.util.Logger;
 import io.github.sspanak.tt9.util.Text;
@@ -23,6 +28,7 @@ public class MindReader {
 	private static final String LOG_TAG = MindReader.class.getSimpleName();
 
 	// @todo: move these constants to SettingsStatic
+	// @todo: test and maybe set a maximum size for MindReaderNgramList?
 	private static final int MAX_NGRAM_SIZE = 4;
 	private static final int MAX_BIGRAM_SUGGESTIONS = 5;
 	private static final int MAX_TRIGRAM_SUGGESTIONS = 4;
@@ -31,6 +37,7 @@ public class MindReader {
 	static final int DICTIONARY_WORD_SIZE = 16; // in bytes
 	private static final int MAX_DICTIONARY_WORDS = (int) Math.pow(2, DICTIONARY_WORD_SIZE);
 
+	@Nullable private final AutoTextCase autoTextCase;
 	@Nullable private final ExecutorService executor;
 	@Nullable private final SettingsStore settings;
 
@@ -44,11 +51,12 @@ public class MindReader {
 
 
 	public MindReader() {
-		this(null, null);
+		this(null, null, null);
 	}
 
 
-	public MindReader(@Nullable SettingsStore settings, @Nullable ExecutorService executor) {
+	public MindReader(@Nullable SettingsStore settings, @Nullable ExecutorService executor, @Nullable InputType inputType) {
+		this.autoTextCase = settings != null ? new AutoTextCase(settings, new Sequences(), inputType) : null;
 		this.executor = executor;
 		this.settings = settings;
 	}
@@ -63,10 +71,9 @@ public void clearContext() {
 
 
 	@NonNull
-	public ArrayList<String> getCurrentWords(int textCase) {
-		// @todo: use AutoTextCase.adjustParagraphTextCase() here. "before" is the context.
+	public ArrayList<String> getCurrentWords(@Nullable InputMode inputMode, @NonNull TextField textField, @NonNull InputType inputType, int textCase) {
 		final ArrayList<String> copy = new ArrayList<>(words);
-		copy.replaceAll(text -> new Text(wordContext.language, text).toTextCase(textCase));
+		copy.replaceAll(text -> adjustWordTextCase(inputMode, text, inputType.determineTextCase(), textCase, textField));
 		return copy;
 	}
 
@@ -81,6 +88,7 @@ public void guessNext(@NonNull InputMode inputMode, @NonNull Language language,
 
 		loadingId = 0;
 
+		// @todo: this fails for ABC. Fix it!
 		if (setContextSync(inputMode, language, surroundingText, lastWord)) {
 			runInThread(() -> {
 				processContext(inputMode, language, saveContext);
@@ -181,6 +189,29 @@ public void processContext(@Nullable InputMode inputMode, @NonNull Language lang
 	}
 
 
+	private String adjustWordTextCase(@Nullable InputMode inputMode, @NonNull String word, int modeTextCase, int textFieldTextCase, @NonNull TextField textField) {
+		if (autoTextCase == null || wordContext.language == null || settings == null || !settings.isAutoTextCaseOn(inputMode)) {
+			return word;
+		}
+
+		String digitSequence;
+		try {
+			digitSequence = wordContext.language.getDigitSequenceForWord(word);
+		} catch (InvalidLanguageCharactersException e) {
+			return word;
+		}
+
+
+		String context = wordContext.getRaw();
+		if (!new Text(wordContext.language, context).endsWithLetter()) {
+			context += " ";
+		}
+
+		final int newTextCase = autoTextCase.determineNextWordTextCase(wordContext.language, modeTextCase, textFieldTextCase, textField, digitSequence, context);
+		return autoTextCase.adjustSuggestionTextCase(new Text(wordContext.language, word), newTextCase);
+	}
+
+
 	private void changeLanguage(@NonNull Language language) {
 		if (!language.equals(wordContext.language)) {
 			// @todo: save the current dictionary for the previous language

app/src/main/java/io/github/sspanak/tt9/db/mindReading/MindReaderContext.java

@@ -96,6 +96,12 @@ MindReaderNgram[] getEndingNgrams(@NonNull MindReaderDictionary dictionary) {
 	}
 
 
+	@NonNull
+	String getRaw() {
+		return raw.toString();
+	}
+
+
 	/**
 	 * Appends the given word to the current context text, separating it with a space if needed.
 	 * The word is trimmed before appending.

app/src/main/java/io/github/sspanak/tt9/ime/SuggestionHandler.java

@@ -2,6 +2,7 @@
 
 import android.os.Handler;
 import android.os.Looper;
+import android.view.inputmethod.EditorInfo;
 
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
@@ -27,9 +28,9 @@ abstract public class SuggestionHandler extends TypingHandler {
 
 
 	@Override
-	protected void onInit() {
-		super.onInit();
-		mindReader = new MindReader(settings, executor);
+	protected void setInputField(EditorInfo field) {
+		super.setInputField(field);
+		mindReader = new MindReader(settings, executor, inputType);
 	}
 
 
@@ -209,7 +210,7 @@ private void onAfterSuggestionsHandled(@Nullable Runnable callback, @Nullable St
 
 	@NonNull
 	protected ArrayList<String> getCurrentGuesses() {
-		return mindReader.getCurrentWords(mInputMode.getTextCase());
+		return mindReader.getCurrentWords(mInputMode, textField, inputType, mInputMode.getTextCase());
 	}
 
 

app/src/main/java/io/github/sspanak/tt9/ime/VoiceHandler.java

@@ -103,7 +103,7 @@ private void onVoiceInputStarted() {
 
 
 	private String autoCapitalize(String str) {
-		if (autoTextCase == null) {
+		if (autoTextCase == null || !settings.isAutoTextCaseOn(mInputMode)) {
 			return str;
 		}
 

app/src/main/java/io/github/sspanak/tt9/ime/modes/ModeWords.java

@@ -415,6 +415,10 @@ public void determineNextWordTextCase(@Nullable String beforeCursor, int nextDig
 			return;
 		}
 
+		if (!settings.isAutoTextCaseOn(this)) {
+			return;
+		}
+
 		final String nextSequence = nextDigit >= 0 ? digitSequence + nextDigit : digitSequence;
 		textCase = autoTextCase.determineNextWordTextCase(language, textCase, textFieldTextCase, textField, nextSequence, beforeCursor);
 	}

app/src/main/java/io/github/sspanak/tt9/ime/modes/helpers/AutoTextCase.java

@@ -118,10 +118,8 @@ public int determineNextLetterTextCase(@NonNull Language language, int textField
 	 */
 	public int determineNextWordTextCase(@NonNull Language language, int currentTextCase, int textFieldTextCase, @Nullable TextField textField, @Nullable String digitSequence, @Nullable String beforeCursor) {
 		if (
-			// When the setting is off or invalid, don't do any changes.
-			!settings.getAutoTextCasePredictive()
 			// If the user has explicitly selected uppercase, we respect that.
-			|| currentTextCase == InputMode.CASE_UPPER
+			currentTextCase == InputMode.CASE_UPPER
 			// save resources if the language has no uppercase letters
 			|| !language.hasUpperCase()
 		) {

app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsTyping.java

@@ -46,6 +46,12 @@ public boolean getAutoTrimTrailingSpace() {
 		return prefs.getBoolean("auto_trim_trailing_space", true);
 	}
 
+	public boolean isAutoTextCaseOn(@Nullable InputMode mode) {
+		return
+			(InputModeKind.isPredictive(mode) && getAutoTextCasePredictive()) ||
+			(InputModeKind.isABC(mode) && getAutoTextCaseAbc());
+	}
+
 	public boolean isAutoAssistanceOn(@Nullable InputMode mode) {
 		return
 			(getAutoMindReading() && (InputModeKind.isPredictive(mode) || InputModeKind.isABC(mode))) ||