luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-06-11 00:49:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

enable language switch when sliding upwards on space

Browse source
This commit is contained in:
Helium314 2023-09-12 22:53:14 +02:00
parent 131a813a54
commit b68bfcfd4c
5 changed files with 55 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

51
app/src/main/java/org/dslul/openboard/inputmethod/keyboard/PointerTracker.java
View file

@ -23,6 +23,7 @@ import android.content.res.TypedArray;
import android.os.SystemClock;
import android.util.Log;
import android.view.MotionEvent;
import android.view.inputmethod.InputMethodSubtype;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -39,14 +40,17 @@ import org.dslul.openboard.inputmethod.keyboard.internal.PointerTrackerQueue;
import org.dslul.openboard.inputmethod.keyboard.internal.TimerProxy;
import org.dslul.openboard.inputmethod.keyboard.internal.TypingTimeRecorder;
import org.dslul.openboard.inputmethod.latin.R;
import org.dslul.openboard.inputmethod.latin.RichInputMethodManager;
import org.dslul.openboard.inputmethod.latin.common.Constants;
import org.dslul.openboard.inputmethod.latin.common.CoordinateUtils;
import org.dslul.openboard.inputmethod.latin.common.InputPointers;
import org.dslul.openboard.inputmethod.latin.define.DebugFlags;
import org.dslul.openboard.inputmethod.latin.settings.Settings;
import org.dslul.openboard.inputmethod.latin.settings.SettingsValues;
import org.dslul.openboard.inputmethod.latin.utils.ResourceUtils;
import java.util.ArrayList;
import java.util.List;
public final class PointerTracker implements PointerTrackerQueue.Element,
BatchInputArbiterListener {
@ -54,7 +58,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element,
private static final boolean DEBUG_EVENT = false;
private static final boolean DEBUG_MOVE_EVENT = false;
private static final boolean DEBUG_LISTENER = false;
private static boolean DEBUG_MODE = DebugFlags.DEBUG_ENABLED || DEBUG_EVENT;
private static final boolean DEBUG_MODE = DebugFlags.DEBUG_ENABLED || DEBUG_EVENT;
static final class PointerTrackerParams {
public final boolean mKeySelectionByDraggingFinger;
@ -83,11 +87,11 @@ public final class PointerTracker implements PointerTrackerQueue.Element,
}
}
private static GestureEnabler sGestureEnabler = new GestureEnabler();
private static final GestureEnabler sGestureEnabler = new GestureEnabler();
// Parameters for pointer handling.
private static PointerTrackerParams sParams;
private static int sPointerStep = (int)(10.0 * Resources.getSystem().getDisplayMetrics().density);
private static final int sPointerStep = (int)(10.0 * Resources.getSystem().getDisplayMetrics().density);
private static GestureStrokeRecognitionParams sGestureStrokeRecognitionParams;
private static GestureStrokeDrawingParams sGestureStrokeDrawingParams;
private static boolean sNeedsPhantomSuddenMoveEventHack;
@ -132,8 +136,10 @@ public final class PointerTracker implements PointerTrackerQueue.Element,
private int mLastY;
private int mStartX;
private int mStartY;
private int mPreviousY;
private long mStartTime;
private boolean mCursorMoved = false;
private boolean mLanguageSlideStarted = false;
// true if keyboard layout has been changed.
private boolean mKeyboardLayoutHasBeenChanged;
@ -715,6 +721,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element,
setPressedKeyGraphics(key, eventTime);
mStartX = x;
mStartY = y;
mPreviousY = y;
mStartTime = System.currentTimeMillis();
}
}
@ -915,12 +922,33 @@ public final class PointerTracker implements PointerTrackerQueue.Element,
private void onMoveEventInternal(final int x, final int y, final long eventTime) {
final Key oldKey = mCurrentKey;
final SettingsValues sv = Settings.getInstance().getCurrent();
if (oldKey != null && oldKey.getCode() == Constants.CODE_SPACE && Settings.getInstance().getCurrent().mSpaceTrackpadEnabled) {
//Pointer slider
int steps = (x - mStartX) / sPointerStep;
final int longpressTimeout = 2 * Settings.getInstance().getCurrent().mKeyLongpressTimeout / MULTIPLIER_FOR_LONG_PRESS_TIMEOUT_IN_SLIDING_INPUT;
if (steps != 0 && mStartTime + longpressTimeout < System.currentTimeMillis()) {
if (oldKey != null && oldKey.getCode() == Constants.CODE_SPACE) {
int dX = x - mStartX;
int dY = y - mStartY;
// language switch: upwards movement
if (!mCursorMoved && sv.mSpaceLanguageSlide && -dY > abs(dX) && dY / sPointerStep != 0) {
List<InputMethodSubtype> subtypes = RichInputMethodManager.getInstance().getMyEnabledInputMethodSubtypeList(false);
if (subtypes.size() > 1) { // only allow if we have more than one subtype
mLanguageSlideStarted = true;
if (abs(y - mPreviousY) / sPointerStep < 4)
// we want large enough steps between switches
return;
// decide next or previous dependent on up or down
InputMethodSubtype current = RichInputMethodManager.getInstance().getCurrentSubtype().getRawSubtype();
int wantedIndex = (subtypes.indexOf(current) + ((y - mPreviousY > 0) ? 1 : -1)) % subtypes.size();
if (wantedIndex < 0) wantedIndex += subtypes.size();
KeyboardSwitcher.getInstance().switchToSubtype(subtypes.get(wantedIndex));
mPreviousY = y;
return;
}
}
// Pointer slider: sideways movement
int steps = dX / sPointerStep;
final int longpressTimeout = 2 * sv.mKeyLongpressTimeout / MULTIPLIER_FOR_LONG_PRESS_TIMEOUT_IN_SLIDING_INPUT;
if (sv.mSpaceTrackpadEnabled && !mLanguageSlideStarted && steps != 0 && mStartTime + longpressTimeout < System.currentTimeMillis()) {
mCursorMoved = true;
mStartX += steps * sPointerStep;
sListener.onMovePointer(steps);
@ -928,8 +956,8 @@ public final class PointerTracker implements PointerTrackerQueue.Element,
return;
}
if (oldKey != null && oldKey.getCode() == Constants.CODE_DELETE && Settings.getInstance().getCurrent().mDeleteSwipeEnabled) {
//Delete slider
if (oldKey != null && oldKey.getCode() == Constants.CODE_DELETE && sv.mDeleteSwipeEnabled) {
// Delete slider
int steps = (x - mStartX) / sPointerStep;
if (abs(steps) > 2 || (mCursorMoved && steps != 0)) {
sTimerProxy.cancelKeyTimersOf(this);
@ -1030,8 +1058,9 @@ public final class PointerTracker implements PointerTrackerQueue.Element,
return;
}
if (mCursorMoved) {
if (mCursorMoved || mLanguageSlideStarted) {
mCursorMoved = false;
mLanguageSlideStarted = false;
return;
}

1
app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java
View file

@ -118,6 +118,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
public static final String PREF_SHOW_HINTS = "pref_show_hints";
public static final String PREF_SPACE_TO_CHANGE_LANG = "prefs_long_press_keyboard_to_change_lang";
public static final String PREF_SPACE_LANGUAGE_SLIDE = "pref_space_language_slide";
public static final String PREF_ENABLE_CLIPBOARD_HISTORY = "pref_enable_clipboard_history";
public static final String PREF_CLIPBOARD_HISTORY_RETENTION_TIME = "pref_clipboard_history_retention_time";

2
app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsValues.java
View file

@ -77,6 +77,7 @@ public class SettingsValues {
public final boolean mShowsNumberRow;
public final boolean mShowsHints;
public final boolean mSpaceForLangChange;
public final boolean mSpaceLanguageSlide;
public final boolean mShowsEmojiKey;
public final boolean mShowsClipboardKey;
public final boolean mUsePersonalizedDicts;
@ -168,6 +169,7 @@ public class SettingsValues {
mShowsNumberRow = prefs.getBoolean(Settings.PREF_SHOW_NUMBER_ROW, false);
mShowsHints = prefs.getBoolean(Settings.PREF_SHOW_HINTS, true);
mSpaceForLangChange = prefs.getBoolean(Settings.PREF_SPACE_TO_CHANGE_LANG, true);
mSpaceLanguageSlide = prefs.getBoolean(Settings.PREF_SPACE_LANGUAGE_SLIDE, false);
mShowsEmojiKey = prefs.getBoolean(Settings.PREF_SHOW_EMOJI_KEY, false);
mShowsClipboardKey = prefs.getBoolean(Settings.PREF_SHOW_CLIPBOARD_KEY, false);
mUsePersonalizedDicts = prefs.getBoolean(Settings.PREF_KEY_USE_PERSONALIZED_DICTS, true);

8
app/src/main/res/values/strings.xml
View file

@ -172,6 +172,12 @@
<string name="delete_swipe_summary">Perform a swipe from the delete key to select and remove bigger portions of text at once</string>
<!-- Preferences item for enabling trackpad space key -->
<string name="space_trackpad">Space bar trackpad</string>
<!-- Description for "space_trackpad" option. -->
<string name="space_trackpad_summary">Swipe on the spacebar to move the cursor</string>
<!-- Preferences item for enabling subtype / language switch on sliding upwards space key -->
<string name="space_language_slide">Space bar language slide</string>
<!-- Description for "space_language_slide" option. -->
<string name="space_language_slide_summary">Swipe upwards on the spacebar to change the language</string>
<!-- Preferences item for choosing secondary language -->
<string name="secondary_locale">Multilingual typing</string>
<!-- Preferences item for loading an external gesture typing library -->
@ -185,8 +191,6 @@
<string name="load_gesture_library_button_load">Load library</string>
<!-- Button text for deleting gesture library -->
<string name="load_gesture_library_button_delete">Delete library</string>
<!-- Description for "space_trackpad" option. -->
<string name="space_trackpad_summary">Swipe on the spacebar to move the cursor</string>
<!-- Preferences item for enabling inserting more spaces key -->
<string name="autospace_after_punctuation">Autospace after punctuation</string>
<!-- Description for "insert_more_spaces" option. -->

6
app/src/main/res/xml/prefs_screen_advanced.xml
View file

@ -70,6 +70,12 @@
android:summary="@string/space_trackpad_summary"
android:defaultValue="true" />
<SwitchPreferenceCompat
android:key="pref_space_language_slide"
android:title="@string/space_language_slide"
android:summary="@string/space_language_slide_summary"
android:defaultValue="false" />
<SwitchPreferenceCompat
android:key="pref_delete_swipe"
android:title="@string/delete_swipe"