Add option for no automatic spaces

Author: abb128

java/res/values/strings-uix.xml

@@ -451,9 +451,10 @@
 
     <!-- Automatic space insertion -->
     <string name="typing_settings_auto_space_mode">Automatic spaces mode</string>
-    <string name="typing_settings_auto_space_mode_auto">Automatically insert spaces after punctuation or after inserting suggestions</string>
-    <string name="typing_settings_auto_space_mode_suggestions">Automatically insert spaces only after inserting suggestions</string>
-    <string name="typing_settings_auto_space_mode_legacy">Do not automatically insert any spaces (legacy mode)</string>
+    <string name="typing_settings_auto_space_mode_auto2">Immediate space after suggestions &amp; punctuation</string>
+    <string name="typing_settings_auto_space_mode_suggestions2">Immediate space after suggestions</string>
+    <string name="typing_settings_auto_space_mode_legacy2">Delayed space after suggestions (legacy mode)</string>
+    <string name="typing_settings_auto_space_mode_none2">Disabled (not recommended)</string>
 
     <!-- Misc keyboard settings -->
     <string name="keyboard_settings_title">Keyboard</string>

java/src/org/futo/inputmethod/latin/inputlogic/InputLogic.java

@@ -292,6 +292,27 @@ public InputTransaction onTextInput(final SettingsValues settingsValues, final E
         return inputTransaction;
     }
 
+    /** Only used when automatic spaces is set to NONE */
+    private void insertSuggestionAndKeepComposing(final SettingsValues settingsValues,
+                                                  final String word,
+                                                  final boolean updateSuggestions) {
+        final boolean needToUpdateSuggestionStrip = updateSuggestions && word != mWordComposer.getTypedWord();
+
+        if(word.indexOf(' ') != -1 || mWordComposer.isBatchMode()) {
+            commitChosenWord(settingsValues, word, LastComposedWord.COMMIT_TYPE_MANUAL_PICK,
+                    LastComposedWord.NOT_A_SEPARATOR, 1);
+            mLastComposedWord.deactivate();
+            resetComposingWord(settingsValues, false);
+        } else {
+            final int[] codePoints = StringUtils.toCodePointArray(word);
+            mWordComposer.setComposingWord(codePoints,
+                    mImeHelper.getCodepointCoordinates(codePoints));
+            setComposingTextInternal(word, 1);
+        }
+
+        if(needToUpdateSuggestionStrip) postUpdateSuggestionStrip(SuggestedWords.INPUT_STYLE_TYPING);
+    }
+
     /**
      * A suggestion was picked from the suggestion strip.
      * @param settingsValues the current values of the settings.
@@ -365,6 +386,14 @@ public InputTransaction onPickSuggestionManually(final SettingsValues settingsVa
             return inputTransaction;
         }
 
+        // The logic for no auto-spaces is a little different, we need to stay in composing
+        // state. If the suggestion has spaces in it, then we have to compose the final word.
+        if(settingsValues.mAltSpacesMode == Settings.SPACES_MODE_NONE) {
+            insertSuggestionAndKeepComposing(settingsValues, suggestion, true);
+            mConnection.endBatchEdit();
+            return inputTransaction;
+        }
+
         commitChosenWord(settingsValues, suggestion, LastComposedWord.COMMIT_TYPE_MANUAL_PICK,
                 LastComposedWord.NOT_A_SEPARATOR, suggestionInfo.isKindOf(SuggestedWordInfo.KIND_TYPED) ? 3 : 1);
         mConnection.endBatchEdit();
@@ -621,7 +650,7 @@ public void onStartBatchInput(final SettingsValues settingsValues,
                 || settingsValues.isUsuallyFollowedBySpace(codePointBeforeCursor)) {
             final boolean autoShiftHasBeenOverriden = keyboardSwitcher.getKeyboardShiftMode() !=
                     getCurrentAutoCapsState(settingsValues);
-            mSpaceState = SpaceState.PHANTOM;
+            if(settingsValues.mAltSpacesMode != Settings.SPACES_MODE_NONE) mSpaceState = SpaceState.PHANTOM;
             if (!autoShiftHasBeenOverriden) {
                 // When we change the space state, we need to update the shift state of the
                 // keyboard unless it has been overridden manually. This is happening for example
@@ -943,7 +972,7 @@ private void handleNonSeparatorEvent(final Event event, final SettingsValues set
             insertAutomaticSpaceIfOptionsAndTextAllow(settingsValues);
         }
 
-        if (mWordComposer.isCursorFrontOrMiddleOfComposingWord()) {
+        if (mWordComposer.isCursorFrontOrMiddleOfComposingWord() || mWordComposer.isBatchMode()) {
             // If we are in the middle of a recorrection, we need to commit the recorrection
             // first so that we can insert the character at the current cursor position.
             // We also need to unlearn the original word that is now being corrected.
@@ -2036,7 +2065,7 @@ private void revertCommit(final InputTransaction inputTransaction,
         if (inputTransaction.mSettingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces) {
             mConnection.commitText(textToCommit, 1);
             if (usePhantomSpace) {
-                mSpaceState = SpaceState.PHANTOM;
+                if(settingsValues.mAltSpacesMode != Settings.SPACES_MODE_NONE) mSpaceState = SpaceState.PHANTOM;
             }
         } else {
             // For languages without spaces, we revert the typed string but the cursor is flush
@@ -2353,7 +2382,7 @@ private void insertOrSetPhantomSpace(final SettingsValues settingsValues) {
 
             mSpaceState = SpaceState.ANTIPHANTOM;
             sendKeyCodePoint(settingsValues, Constants.CODE_SPACE);
-        } else {
+        } else if(settingsValues.mAltSpacesMode != Settings.SPACES_MODE_NONE) {
             mSpaceState = SpaceState.PHANTOM;
         }
     }
@@ -2378,7 +2407,7 @@ public void onUpdateTailBatchInputCompleted(final SettingsValues settingsValues,
         setComposingTextInternal(batchInputText, 1);
         mConnection.endBatchEdit();
         // Space state must be updated before calling updateShiftState
-        mSpaceState = SpaceState.PHANTOM;
+        if(settingsValues.mAltSpacesMode != Settings.SPACES_MODE_NONE) mSpaceState = SpaceState.PHANTOM;
         keyboardSwitcher.requestUpdatingShiftState(getCurrentAutoCapsState(settingsValues));
 
         updateUiInputState();

java/src/org/futo/inputmethod/latin/settings/Settings.java

@@ -132,6 +132,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
     public static final int BACKSPACE_MODE_WORDS = 1; // Long-press backspace and swipe backspace removes entire words
 
     public static final String PREF_ALT_SPACES_MODE = "pref_alt_spaces";
+    public static final int SPACES_MODE_NONE = -1; // No phantom spaces, no antiphantom
     public static final int SPACES_MODE_LEGACY = 0; // Only use phantom spaces
     public static final int SPACES_MODE_SUGGESTIONS = 1; // Use antiphantom for suggestion, none for punctuation
     public static final int SPACES_MODE_ALL = 2; // Use antiphantom for all

java/src/org/futo/inputmethod/latin/uix/settings/pages/Typing.kt

@@ -619,9 +619,10 @@ val LongPressMenu = UserSettingsMenu(
 private fun AutoSpacesSetting() {
     val altSpacesMode = useSharedPrefsInt(Settings.PREF_ALT_SPACES_MODE, Settings.DEFAULT_ALT_SPACES_MODE)
     val autoSpaceModes = mapOf(
-        Settings.SPACES_MODE_ALL to stringResource(R.string.typing_settings_auto_space_mode_auto),
-        Settings.SPACES_MODE_SUGGESTIONS to stringResource(R.string.typing_settings_auto_space_mode_suggestions),
-        Settings.SPACES_MODE_LEGACY to stringResource(R.string.typing_settings_auto_space_mode_legacy)
+        Settings.SPACES_MODE_ALL to stringResource(R.string.typing_settings_auto_space_mode_auto2),
+        Settings.SPACES_MODE_SUGGESTIONS to stringResource(R.string.typing_settings_auto_space_mode_suggestions2),
+        Settings.SPACES_MODE_LEGACY to stringResource(R.string.typing_settings_auto_space_mode_legacy2),
+        Settings.SPACES_MODE_NONE to stringResource(R.string.typing_settings_auto_space_mode_none2),
     )
     DropDownPickerSettingItem(
         label = stringResource(R.string.typing_settings_auto_space_mode),