Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change(android,web) Use web-based popup key longpresses #9591

Merged
merged 9 commits into from
Sep 22, 2023
Merged

change(android,web) Use web-based popup key longpresses #9591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f969c13
change(web): Remove Android pendingLongpress
darcywong00 Sep 18, 2023
584053a
change(android/engine): Use web-based longpress
darcywong00 Sep 18, 2023
f58cd50
chore(web): Update background color for Android popup keys
darcywong00 Sep 19, 2023
250b8a6
chore(android): Remove popup code
darcywong00 Sep 19, 2023
d1c12c4
chore(android/engine): Remove key preview layout
darcywong00 Sep 19, 2023
e76936f
fix(web): Revert buildEmbeddedGestureConfig
darcywong00 Sep 19, 2023
8bf0ac0
chore(web): More cleanup
darcywong00 Sep 19, 2023
5a0c1a3
Update android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboard.java
darcywong00 Sep 20, 2023
98660fe
chore(web): Cleanup embeddedGestureConfig
darcywong00 Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 0 additions & 52 deletions android/KMEA/app/src/main/assets/android-host.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,58 +229,12 @@ function updateKMSelectionRange(start, end) {
}

var lastKeyTip = null;
function oskCreateKeyPreview(x,y,w,h,t) {
if(lastKeyTip &&
lastKeyTip.t == t &&
lastKeyTip.x == x &&
lastKeyTip.y == y &&
lastKeyTip.w == w &&
lastKeyTip.h == h) {
return;
}
lastKeyTip = {x:x,y:y,w:w,h:h,t:t};

fragmentToggle = (fragmentToggle + 1) % 100;
var div = document.createElement('div');
div.innerHTML = t;
var dt = div.firstChild.nodeValue;
window.location.hash = 'showKeyPreview-'+fragmentToggle+'+x='+x+'+y='+y+'+w='+w+'+h='+h+'+t='+toHex(dt);
}

function oskClearKeyPreview() {
lastKeyTip = null;
fragmentToggle = (fragmentToggle + 1) % 100;
window.location.hash = 'dismissKeyPreview-'+fragmentToggle;
}

function signalHelpBubbleDismissal() {
fragmentToggle = (fragmentToggle + 1) % 100;
window.location.hash = 'helpBubbleDismissed-'+fragmentToggle;
}

function oskCreatePopup(obj,x,y) {
if(obj != null) {
var i;
var s = '';
var shift = false;
var keyPos = x.toString() + ',' + y.toString();
for(i=0; i<obj.length; i++)
{
// elementID contains the layer and coreID
s=s+obj[i].elementID;
if(obj[i].sp == 1 || obj[i].sp == 2) shift = true;
if(typeof(obj[i].text) != 'undefined' && obj[i].text != null && obj[i].text != '') s=s+':'+toHex(obj[i].text);
if(i < (obj.length -1)) s=s+';'
}
fragmentToggle=(fragmentToggle+1) % 100;
var hash = 'showMore-' + fragmentToggle + '+keyPos=' + keyPos + '+keys=' + s;
if(shift) {
hash = hash + '+font=' + 'SpecialOSK';
}
window.location.hash = hash;
}
}

function suggestionPopup(obj,custom,x,y,w,h) {
if(obj != null) {
var s = JSON.stringify(obj);
Expand Down Expand Up @@ -320,12 +274,6 @@ function showKeyboard() {
keyman.refreshOskLayout();
}

function executePopupKey(keyID, keyText) {
// KMW only needs keyID to process the popup key. keyText merely logged to console
//window.console.log('executePopupKey('+keyID+'); keyText: ' + keyText);
keyman.executePopupKey(keyID);
}

Comment on lines -323 to -328
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re: a recent comment in one of the other threads.

// Cannot make it explicitly async / await on API 21.
function executeHardwareKeystroke(code, shift, lstates, eventModifiers) {
console_debug('executeHardwareKeystroke(code='+code+',shift='+shift+',lstates='+lstates+',eventModifiers='+eventModifiers+')');
Expand Down
111 changes: 0 additions & 111 deletions android/KMEA/app/src/main/java/com/keyman/engine/KMKeyPreviewView.java
View file
Open in desktop

This file was deleted.

Loading