erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-16 12:47:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

fix(android): further selection tweaks

Browse source
This commit is contained in:
Marc Durdin 2022-02-23 15:07:58 +11:00
parent c389ad0df8
commit 9ba4b9645c
2 changed files with 40 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/KMEA/app/src/main/assets/android-host.js
View file

@ -1,4 +1,4 @@
let _debug = 0;
var _debug = 1;
// Android harness attachment
if(window.parent && window.parent.jsInterface && !window.jsInterface) {
@ -224,7 +224,7 @@ function updateKMSelectionRange(start, end) {
var selDirection = 'forward';
if(start > end) {
let e0 = end;
var e0 = end;
end = start;
start = e0;
selDirection = 'backward';

59
android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMManager.java
View file

@ -2719,25 +2719,29 @@ public final class KMManager {
}
}
} else {
if(start == end) {
for (int i = 0; i < deleteLeft; i++) {
CharSequence chars = textView.getText().subSequence(0, start);
if (chars != null && chars.length() > 0) {
char c = chars.charAt(start - 1);
InAppKeyboardShouldIgnoreTextChange = true;
InAppKeyboardShouldIgnoreSelectionChange = true;
if (Character.isLowSurrogate(c)) {
textView.getText().delete(start - 2, end);
} else {
textView.getText().delete(start - 1, end);
}
start = textView.getSelectionStart();
end = textView.getSelectionEnd();
if(start != end) {
// Delete the selection
InAppKeyboardShouldIgnoreTextChange = true;
InAppKeyboardShouldIgnoreSelectionChange = true;
textView.getText().delete(start, end);
textView.setSelection(start);
end = start;
}
for (int i = 0; i < deleteLeft; i++) {
CharSequence chars = textView.getText().subSequence(0, start);
if (chars != null && chars.length() > 0) {
char c = chars.charAt(start - 1);
InAppKeyboardShouldIgnoreTextChange = true;
InAppKeyboardShouldIgnoreSelectionChange = true;
if (Character.isLowSurrogate(c)) {
textView.getText().delete(start - 2, end);
} else {
textView.getText().delete(start - 1, end);
}
start = textView.getSelectionStart();
end = textView.getSelectionEnd();
}
} else {
Log.w(TAG, "Unexpected request to selection");
}
if (s.length() > 0) {
@ -2802,6 +2806,7 @@ public final class KMManager {
// This annotation is required in Jelly Bean and later:
@JavascriptInterface
public void insertText(final int dn, final String s, final int dr) {
// TODO: Unify in-app and system insertText
Handler mainLoop = new Handler(Looper.getMainLooper());
mainLoop.post(new Runnable() {
public void run() {
@ -2826,11 +2831,19 @@ public final class KMManager {
ic.beginBatchEdit();
int deleteLeft = dn;
// Delete any existing selected text.
ExtractedText icText = ic.getExtractedText(new ExtractedTextRequest(), 0);
if (icText != null) { // This can be null if the input connection becomes invalid.
int start = icText.startOffset + icText.selectionStart;
int end = icText.startOffset + icText.selectionEnd;
if (end < start) {
// Swap start/end for backward selection
int temp = start;
start = end;
end = temp;
}
if (end > start) {
if (s.length() == 0) {
ic.setSelection(start, start);
@ -2842,6 +2855,10 @@ public final class KMManager {
ic.setSelection(start, start);
ic.deleteSurroundingText(0, end - start);
}
// KeymanWeb tells us how to delete the selection, but we don't
// want to do that twice
deleteLeft = 0;
}
}
@ -2852,8 +2869,8 @@ public final class KMManager {
}
// Perform left-deletions
if (dn > 0) {
performLeftDeletions(ic, dn);
if (deleteLeft > 0) {
performLeftDeletions(ic, deleteLeft);
}
// Perform right-deletions
@ -2888,8 +2905,8 @@ public final class KMManager {
}
/*
// TODO: Chromium has a bug where deleteSurroundingText deletes an entire grapheme cluster
// instead of one code-point. See Chromium issue #1024738
// Chromium up until version M81 had a bug where deleteSurroundingText deletes an entire
// grapheme cluster instead of one code-point. See Chromium issue #1024738
// https://bugs.chromium.org/p/chromium/issues/detail?id=1024738
//
// We'll retrieve up to (dn*2+16) characters before the cursor to collect enough characters