feat(expander): immediate expand & fix revert

Author: LeanBitLab

app/src/main/java/helium314/keyboard/latin/inputlogic/InputLogic.java

@@ -1450,6 +1450,32 @@ private void handleNonSeparatorEvent(final Event event, final SettingsValues set
                 mWordComposer.setCapitalizedModeAtStartComposingTime(inputTransaction.getShiftState());
             }
             setComposingTextInternal(getTextWithUnderline(mWordComposer.getTypedWord()), 1);
+            if (helium314.keyboard.latin.utils.TextExpanderUtils.INSTANCE.isEnabled(mLatinIME)
+                    && helium314.keyboard.latin.utils.TextExpanderUtils.INSTANCE.isImmediateEnabled(mLatinIME)) {
+                final String typedWord = mWordComposer.getTypedWord();
+                final String prefix = helium314.keyboard.latin.utils.TextExpanderUtils.INSTANCE.getPrefix(mLatinIME);
+                if (prefix.isEmpty()) {
+                    final String expanded = helium314.keyboard.latin.utils.TextExpanderUtils.INSTANCE.getExpandedWord(typedWord, mLatinIME);
+                    if (expanded != null) {
+                        commitExpandedText(typedWord, expanded);
+                        resetComposingState(true);
+                    }
+                } else {
+                    final CharSequence textBefore = mConnection.getTextBeforeCursor(50, 0);
+                    if (textBefore != null) {
+                        final String textStr = textBefore.toString();
+                        final String targetSuffix = prefix + typedWord;
+                        if (textStr.toLowerCase(java.util.Locale.US).endsWith(targetSuffix.toLowerCase(java.util.Locale.US))) {
+                            final String expanded = helium314.keyboard.latin.utils.TextExpanderUtils.INSTANCE.getExpandedWord(targetSuffix, mLatinIME);
+                            if (expanded != null) {
+                                mConnection.deleteTextBeforeCursor(prefix.length());
+                                commitExpandedText(targetSuffix, expanded);
+                                resetComposingState(true);
+                            }
+                        }
+                    }
+                }
+            }
         } else {
             final boolean swapWeakSpace = tryStripSpaceAndReturnWhetherShouldSwapInstead(event, inputTransaction);
 
@@ -1640,7 +1666,7 @@ private void handleBackspaceEvent(final Event event, final InputTransaction inpu
                 final String expectedAfter = mLastExpandedText.substring(beforeLen);
                 if (textBefore != null && textBefore.toString().equals(expectedBefore)
                         && textAfter != null && textAfter.toString().equals(expectedAfter)) {
-                    mConnection.deleteSurroundingText(beforeLen, afterLen);
+                    mConnection.setSelection(expectedCursor - beforeLen, expectedCursor + afterLen);
                     mConnection.commitText(mLastShortcutText, 1);
                     mLastExpandedText = null;
                     mLastShortcutText = null;

app/src/main/java/helium314/keyboard/latin/utils/TextExpanderUtils.kt

@@ -15,13 +15,18 @@ import java.util.Locale
 object TextExpanderUtils {
     const val PREF_ENABLED = "pref_text_expander_enabled"
     const val PREF_PREFIX = "pref_text_expander_prefix"
+    const val PREF_IMMEDIATE = "pref_text_expander_immediate"
     const val PREF_DATA = "pref_text_expander_data"
     const val REGEX_PREFIX = "__regex__:"
 
     fun isEnabled(context: Context): Boolean {
         return context.prefs().getBoolean(PREF_ENABLED, false)
     }
 
+    fun isImmediateEnabled(context: Context): Boolean {
+        return context.prefs().getBoolean(PREF_IMMEDIATE, false)
+    }
+
     fun getPrefix(context: Context): String {
         return context.prefs().getString(PREF_PREFIX, "") ?: ""
     }

app/src/main/java/helium314/keyboard/settings/screens/TextExpanderScreen.kt

@@ -79,6 +79,10 @@ fun TextExpanderScreen(onClickBack: () -> Unit) {
         mutableStateOf(TextExpanderUtils.isEnabled(context))
     }
 
+    var isImmediateEnabled by remember {
+        mutableStateOf(TextExpanderUtils.isImmediateEnabled(context))
+    }
+
     var shortcutsMap by remember {
         mutableStateOf(TextExpanderUtils.getShortcuts(context))
     }
@@ -311,6 +315,15 @@ fun TextExpanderScreen(onClickBack: () -> Unit) {
                         onCheckedChange = { isExpanderEnabled = it }
                     )
 
+                    SwitchPreference(
+                        name = "Expand immediately",
+                        key = TextExpanderUtils.PREF_IMMEDIATE,
+                        default = false,
+                        description = "Expand shortcuts immediately without pressing space.",
+                        enabled = isExpanderEnabled,
+                        onCheckedChange = { isImmediateEnabled = it }
+                    )
+
                     // 2. Custom Prefix Configuration
                     OutlinedTextField(
                         value = prefixText,