Skip to content

Commit e0c2778

Browse files
authored
Merge pull request #9644 from keymanapp/chore/merge-master-into-package-metadata
chore: merge master into package-metadata 🎺
2 parents 99663ce + d99388f commit e0c2778

File tree

230 files changed

+4010
-2966
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+4010
-2966
lines changed

.github/workflows/deb-packaging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
path: artifacts
120120

121121
- name: Build
122-
uses: sillsdev/gha-ubuntu-packaging@4f3a013ec28f4defc2b3d6ecb04c98815cd9de25 # v0.9
122+
uses: sillsdev/gha-ubuntu-packaging@1f4b7e7eacb8c82a4d874ee2c371b9bfef7e16ea # v1.0
123123
with:
124124
dist: "${{ matrix.dist }}"
125125
platform: "${{ matrix.arch }}"

HISTORY.md

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,52 @@
11
# Keyman Version History
22

3+
## 17.0.182 alpha 2023-09-28
4+
5+
* chore(web): builds that output to web/build/publish should also clean it (#9613)
6+
* chore(linux): Dynamically choose display number (#9629)
7+
* docs(linux): Update sample tasks.json for Linux (#9634)
8+
* chore(common): Add Crowdin strings for Mon (#9550)
9+
* fix(developer): only include mobile touch platform in basic project (#9549)
10+
* fix(windows): fix the ellipsis for longer text on buttons (#9638)
11+
12+
## 17.0.181 alpha 2023-09-26
13+
14+
* chore: workaround npm/cli#3466 when bundling internal deps (#9536)
15+
* chore(linux): Check and restart background processes (#9608)
16+
17+
## 17.0.180 alpha 2023-09-25
18+
19+
* fix(linux): Fix detection of unit tests (#9606)
20+
21+
## 17.0.179 alpha 2023-09-22
22+
23+
* chore(resources): ldml: update to keyboard3 (#9588)
24+
* change(android,web) Use web-based popup key longpresses (#9591)
25+
26+
## 17.0.178 alpha 2023-09-21
27+
28+
* fix(linux): Correctly open files linked from help page (#9601)
29+
* chore(linux): Fix bugs, add dependency and update documentation (#9602)
30+
31+
## 17.0.177 alpha 2023-09-20
32+
33+
* chore(linux): Add coverage action to `ibus-keyman/build.sh` (#9583)
34+
* docs(common): Fix documentation for `builder_describe_internal_dependency` (#9582)
35+
36+
## 17.0.176 alpha 2023-09-19
37+
38+
* chore(oem/fv/android): Update Gradle to 7.4 (#9590)
39+
* refactor(linux): Rename defines to clarify purpose ️ (#9584)
40+
* (#9560)
41+
42+
## 17.0.175 alpha 2023-09-18
43+
44+
* chore(linux): Split startup process (#9570)
45+
46+
## 17.0.174 alpha 2023-09-16
47+
48+
* refactor(linux): Reformat file (#9569)
49+
350
## 17.0.173 alpha 2023-09-13
451

552
* chore(common): Update to Unicode 15.1 (#9555)

VERSION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
17.0.174
1+
17.0.183

android/KMAPro/kMAPro/src/main/res/values-mnw-rMM/strings.xml

Lines changed: 164 additions & 0 deletions
Large diffs are not rendered by default.

android/KMEA/app/src/main/assets/android-host.js

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -229,58 +229,12 @@ function updateKMSelectionRange(start, end) {
229229
}
230230

231231
var lastKeyTip = null;
232-
function oskCreateKeyPreview(x,y,w,h,t) {
233-
if(lastKeyTip &&
234-
lastKeyTip.t == t &&
235-
lastKeyTip.x == x &&
236-
lastKeyTip.y == y &&
237-
lastKeyTip.w == w &&
238-
lastKeyTip.h == h) {
239-
return;
240-
}
241-
lastKeyTip = {x:x,y:y,w:w,h:h,t:t};
242-
243-
fragmentToggle = (fragmentToggle + 1) % 100;
244-
var div = document.createElement('div');
245-
div.innerHTML = t;
246-
var dt = div.firstChild.nodeValue;
247-
window.location.hash = 'showKeyPreview-'+fragmentToggle+'+x='+x+'+y='+y+'+w='+w+'+h='+h+'+t='+toHex(dt);
248-
}
249-
250-
function oskClearKeyPreview() {
251-
lastKeyTip = null;
252-
fragmentToggle = (fragmentToggle + 1) % 100;
253-
window.location.hash = 'dismissKeyPreview-'+fragmentToggle;
254-
}
255232

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

261-
function oskCreatePopup(obj,x,y) {
262-
if(obj != null) {
263-
var i;
264-
var s = '';
265-
var shift = false;
266-
var keyPos = x.toString() + ',' + y.toString();
267-
for(i=0; i<obj.length; i++)
268-
{
269-
// elementID contains the layer and coreID
270-
s=s+obj[i].elementID;
271-
if(obj[i].sp == 1 || obj[i].sp == 2) shift = true;
272-
if(typeof(obj[i].text) != 'undefined' && obj[i].text != null && obj[i].text != '') s=s+':'+toHex(obj[i].text);
273-
if(i < (obj.length -1)) s=s+';'
274-
}
275-
fragmentToggle=(fragmentToggle+1) % 100;
276-
var hash = 'showMore-' + fragmentToggle + '+keyPos=' + keyPos + '+keys=' + s;
277-
if(shift) {
278-
hash = hash + '+font=' + 'SpecialOSK';
279-
}
280-
window.location.hash = hash;
281-
}
282-
}
283-
284238
function suggestionPopup(obj,custom,x,y,w,h) {
285239
if(obj != null) {
286240
var s = JSON.stringify(obj);
@@ -320,12 +274,6 @@ function showKeyboard() {
320274
keyman.refreshOskLayout();
321275
}
322276

323-
function executePopupKey(keyID, keyText) {
324-
// KMW only needs keyID to process the popup key. keyText merely logged to console
325-
//window.console.log('executePopupKey('+keyID+'); keyText: ' + keyText);
326-
keyman.executePopupKey(keyID);
327-
}
328-
329277
// Cannot make it explicitly async / await on API 21.
330278
function executeHardwareKeystroke(code, shift, lstates, eventModifiers) {
331279
console_debug('executeHardwareKeystroke(code='+code+',shift='+shift+',lstates='+lstates+',eventModifiers='+eventModifiers+')');

android/KMEA/app/src/main/java/com/keyman/engine/DisplayLanguages.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public static final DisplayLanguageType[] getDisplayLanguages(Context context) {
5858
new DisplayLanguageType("ckl-NG", "Kibaku"),
5959
new DisplayLanguageType("mfi-NG", "Mandara (Wandala)"),
6060
new DisplayLanguageType("mrt-NG", "Marghi"),
61+
new DisplayLanguageType("mnw-MM", "မန် (Mon)"),
6162
new DisplayLanguageType("nl-NL", "Nederlands (Dutch)"),
6263
new DisplayLanguageType("ann", "Obolo"),
6364
new DisplayLanguageType("pl-PL", "Polski (Polish)"),

android/KMEA/app/src/main/java/com/keyman/engine/KMKeyPreviewView.java

Lines changed: 0 additions & 111 deletions
This file was deleted.

0 commit comments

Comments
 (0)