Skip to content

Commit

Permalink
Merge pull request #9645 from keymanapp/chore/merge-master-into-windo…
Browse files Browse the repository at this point in the history
…ws-upgrades

chore: merge master into windows-upgrades 📲
  • Loading branch information
rc-swag authored Sep 29, 2023
2 parents 6ba5fb4 + 4d2dd47 commit 891d321
Show file tree
Hide file tree
Showing 232 changed files with 4,082 additions and 2,967 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deb-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
path: artifacts

- name: Build
uses: sillsdev/gha-ubuntu-packaging@4f3a013ec28f4defc2b3d6ecb04c98815cd9de25 # v0.9
uses: sillsdev/gha-ubuntu-packaging@1f4b7e7eacb8c82a4d874ee2c371b9bfef7e16ea # v1.0
with:
dist: "${{ matrix.dist }}"
platform: "${{ matrix.arch }}"
Expand Down
47 changes: 47 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,52 @@
# Keyman Version History

## 17.0.182 alpha 2023-09-28

* chore(web): builds that output to web/build/publish should also clean it (#9613)
* chore(linux): Dynamically choose display number (#9629)
* docs(linux): Update sample tasks.json for Linux (#9634)
* chore(common): Add Crowdin strings for Mon (#9550)
* fix(developer): only include mobile touch platform in basic project (#9549)
* fix(windows): fix the ellipsis for longer text on buttons (#9638)

## 17.0.181 alpha 2023-09-26

* chore: workaround npm/cli#3466 when bundling internal deps (#9536)
* chore(linux): Check and restart background processes (#9608)

## 17.0.180 alpha 2023-09-25

* fix(linux): Fix detection of unit tests (#9606)

## 17.0.179 alpha 2023-09-22

* chore(resources): ldml: update to keyboard3 (#9588)
* change(android,web) Use web-based popup key longpresses (#9591)

## 17.0.178 alpha 2023-09-21

* fix(linux): Correctly open files linked from help page (#9601)
* chore(linux): Fix bugs, add dependency and update documentation (#9602)

## 17.0.177 alpha 2023-09-20

* chore(linux): Add coverage action to `ibus-keyman/build.sh` (#9583)
* docs(common): Fix documentation for `builder_describe_internal_dependency` (#9582)

## 17.0.176 alpha 2023-09-19

* chore(oem/fv/android): Update Gradle to 7.4 (#9590)
* refactor(linux): Rename defines to clarify purpose ️ (#9584)
* (#9560)

## 17.0.175 alpha 2023-09-18

* chore(linux): Split startup process (#9570)

## 17.0.174 alpha 2023-09-16

* refactor(linux): Reformat file (#9569)

## 17.0.173 alpha 2023-09-13

* chore(common): Update to Unicode 15.1 (#9555)
Expand Down
2 changes: 1 addition & 1 deletion VERSION.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17.0.174
17.0.183
164 changes: 164 additions & 0 deletions android/KMAPro/kMAPro/src/main/res/values-mnw-rMM/strings.xml

Large diffs are not rendered by default.

52 changes: 0 additions & 52 deletions android/KMEA/app/src/main/assets/android-host.js
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);
}

// 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
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public static final DisplayLanguageType[] getDisplayLanguages(Context context) {
new DisplayLanguageType("ckl-NG", "Kibaku"),
new DisplayLanguageType("mfi-NG", "Mandara (Wandala)"),
new DisplayLanguageType("mrt-NG", "Marghi"),
new DisplayLanguageType("mnw-MM", "မန် (Mon)"),
new DisplayLanguageType("nl-NL", "Nederlands (Dutch)"),
new DisplayLanguageType("ann", "Obolo"),
new DisplayLanguageType("pl-PL", "Polski (Polish)"),
Expand Down
111 changes: 0 additions & 111 deletions android/KMEA/app/src/main/java/com/keyman/engine/KMKeyPreviewView.java

This file was deleted.

Loading

0 comments on commit 891d321

Please sign in to comment.