wzray/tt9
1
0
Fork 0
Code Activity

fixed again Backspace swiping deleting too many characters

Browse source
This commit is contained in:
sspanak 2024-10-23 17:14:52 +03:00 • committed by Dimo Karaivanov
parent 3a2d805b24
commit 45285828e0
2 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyBackspace.java
View file

@ -1,6 +1,7 @@
package io.github.sspanak.tt9.ui.main.keys;
import android.content.Context;
import android.os.Handler;
import android.util.AttributeSet;
import android.view.KeyEvent;
@ -11,6 +12,7 @@ import io.github.sspanak.tt9.ui.Vibration;
public class SoftKeyBackspace extends SwipeableKey {
private int repeat = 0;
private final Handler waitForSwipe = new Handler();
public SoftKeyBackspace(Context context) {
super(context);
@ -61,7 +63,15 @@ public class SoftKeyBackspace extends SwipeableKey {
@Override
final protected boolean handlePress() {
super.handlePress();
return deleteText();
waitForSwipe.postDelayed(this::handlePressDebounced, 15);
return true;
}
private void handlePressDebounced() {
if (notSwiped()) {
deleteText();
}
}
@ -80,6 +90,12 @@ public class SoftKeyBackspace extends SwipeableKey {
}
@Override
protected void handleStartSwipeX(float position, float delta) {
waitForSwipe.removeCallbacksAndMessages(null);
}
@Override
protected void handleEndSwipeX(float position, float delta) {
if (validateTT9Handler()) {
@ -88,16 +104,13 @@ public class SoftKeyBackspace extends SwipeableKey {
}
private boolean deleteText() {
private void deleteText() {
if (validateTT9Handler() && !tt9.onBackspace(repeat)) {
// Limited or special numeric field (e.g. formatted money or dates) cannot always return
// the text length, therefore onBackspace() seems them as empty and does nothing. This results
// in fallback to the default hardware key action. Here we simulate the hardware BACKSPACE.
tt9.sendDownUpKeyEvents(KeyEvent.KEYCODE_DEL);
return true;
}
return false;
}

5
app/src/main/java/io/github/sspanak/tt9/util/Text.java
View file

@ -175,12 +175,13 @@ public class Text extends TextTools {
boolean endsWithWhitespaceBlock = Character.isWhitespace(lastChar) && Character.isWhitespace(penultimateChar);
boolean endsWithPunctuationBlock = (lastChar == '.' || lastChar == ',') && (penultimateChar == '.' || penultimateChar == ',');
for (int i = text.length() - 1; i >= 0; i--) {
for (int i = text.length() - 1, firstChar = 1; i >= 0; i--, firstChar = 0) {
char currentChar = text.charAt(i);
if (
(endsWithPunctuationBlock && currentChar != '.' && currentChar != ',')
|| (endsWithWhitespaceBlock && !Character.isWhitespace(currentChar))
|| (!endsWithWhitespaceBlock && !endsWithPunctuationBlock && (Character.isWhitespace(currentChar) || currentChar == '.' || currentChar == ','))
|| (!endsWithWhitespaceBlock && !endsWithPunctuationBlock && firstChar == 0 && Character.isWhitespace(currentChar))
) {
return i + 1;
}