Merge branch 'master' into change/mac/12342-remove-always-show-osk

.github/labeler.yml

@@ -20,10 +20,8 @@ common/:
   - common/**
   - resources/**
 
-common/models/: common/models/**
-common/models/types/: common/models/types/**
-common/models/templates/: common/models/templates/**
-common/models/wordbreakers/: common/models/wordbreakers/**
+common/models/templates/: web/src/engine/predictive-text/templates/**
+common/models/wordbreakers/: web/src/engine/predictive-text/wordbreakers/**
 
 common/resources/: resources/**
 common/web/: common/web/**

.gitignore

@@ -183,4 +183,3 @@ lcov.info
 /keyman*.buildinfo
 /keyman*.changes
 /keyman*.tar.?z
-

HISTORY.md

@@ -1,5 +1,42 @@
 # Keyman Version History
 
+## 18.0.109 alpha 2024-09-11
+
+* chore(common): Update history with 17.0.329 stable (#12394)
+* refactor(web): move `model/templates` to `web/src/engine/predictive/text` (#12382)
+* refactor(web): move `common/models` to `web/src/engine/predictive-text` (#12383)
+* refactor(web): move `common/web/utils` to `web/src/engine/common/web-utils/` (#12384)
+
+## 18.0.108 alpha 2024-09-10
+
+* docs(android): Update help docs (#12367)
+* fix(developer): fix building with Ubuntu 24.04 (#12379)
+* refactor(android): Move build-publish.sh to builder script (#12351)
+* fix(android): Separate `publishSentry` Gradle task to publish symbols to Sentry (#12358)
+* refactor(web): move `model/types` to `web/types` (#12370)
+
+## 18.0.107 alpha 2024-09-09
+
+* fix(android): Update Text Size menu icons for RTL support (#12290)
+
+## 18.0.106 alpha 2024-09-06
+
+* feat(windows): add right modifier included in hotkey optional functionality (#12259)
+* fix(android): Skip language counts for lexical-model packages (#12361)
+* docs(web): fix link to documentation page (#12369)
+
+## 18.0.105 alpha 2024-09-05
+
+* chore(common): Fix missing entries in HISTORY.md (#12352)
+* docs(android): Add in-app help for adjusting longpress delay (#12359)
+* fix(mac): avoid crash on startup with macOS 10.15 (Catalina) (#12354)
+* chore(oem/fv): Update to fv_all 13.0 (#12362)
+* feat(windows): Add two new strings for SIL Global name instead of SIL International (#12327)
+
+## 18.0.104 alpha 2024-09-03
+
+* fix(mac): display package info after keyboard installation (#12326)
+
 ## 18.0.103 alpha 2024-09-02
 
 * feat(windows): Remove hotkey related feature flags (#12252)
@@ -25,7 +62,7 @@
 * fix(android): Prioritize certain actions over multi-line for ENTER key (#12315)
 * fix(linux): add `keymanFacename` to .ldml file (#12277)
 * chore(common): Update crowdin strings for Czech (#12316)
-*  (#12313)
+* fix(web): prevent unintuitive space-output blocking for mid-context suggestions (#12313)
 
 ## 18.0.100 alpha 2024-08-28
 
@@ -35,8 +72,8 @@
 
 * feat(web): import the generator for the pred-text wordbreaker's Unicode-property data-table (#10690)
 * feat(web): optimize the wordbreaker data table for filesize and ease of first-load parsing (#10692)
-*  (#12297)
-*  (#12115)
+* fix(web): fixes wordbreaker test import path (#12297)
+* feat(web): enable utf8 charset encoding for the build artifacts (#12115)
 
 ## 18.0.98 alpha 2024-08-26
 
@@ -81,11 +118,11 @@
 
 ## 18.0.93 alpha 2024-08-20
 
-*  (#12188)
+* refactor(web): remove engine/interfaces dependency on engine/js-processor (#12188)
 * fix(web): fix malformed reversion display strings (#12201)
 * feat(android): Add menu to specify long-press delay (#12170)
 * feat(android): Pass longpress delay to KeymanWeb (#12185)
-*  (#12223)
+* fix(core): set mac build version for meson cli build to 10.13 (#12223)
 
 ## 18.0.92 alpha 2024-08-19
 
@@ -741,6 +778,29 @@
 * chore(common): move to 18.0 alpha (#10713)
 * chore: move to 18.0 alpha
 
+## 17.0.329 stable 2024-09-09
+
+* chore(android,ios): Add ojibwa ifinal/rdot keyboards to FirstVoices (#12020)
+* change(web): revert #11174, which loads keyboards before initializing the OSK (#12040)
+* fix(web): unrevert #11258, leaving OSK hidden before instructed to display (#12058)
+* chore(common): use `nvm` to select version of node for builds (#12074)
+* fix(developer): ignore scan code if zero in debugger (#12182)
+* fix(developer): enforce presence of Version field when FollowKeyboardVersion is not set, in package compiler (#12206)
+* fix(developer): enforce presence of kps Info.Description field in info compilers (#12207)
+* fix(web): disable fat-finger data use when mayCorrect = false (#12226)
+* chore(common): allow build agents to automatically select emsdk version, and enable support for 3.1.60+ (#12245)
+* fix(web): fix documentation-keyboard spacebar-text scaling (#12240)
+* fix(core): set mac build version for meson cli build to 10.13 (#12246)
+* change(ios): defer registration of fonts past initialization (#12241)
+* chore(android,ios): Update FirstVoices keyboards to 12.15 (#12301)
+* fix(core): properly support 'other' modifier state with `uint32_t` type (#12285)
+* fix(developer): find last matching key in LDML key bag when building KVK (#12284)
+* fix(android): check in material-stepper as internal Maven dependency (#12324)
+* fix(linux): add `keymanFacename` to .ldml file (#12283)
+* chore(oem/fv): Update to fv_all 13.0 (#12363)
+* fix(mac): avoid crash on startup with macOS 10.15 (Catalina) (#12364)
+* fix(android): skip language counts for lexical-model packages (#12368)
+
 ## 17.0.328 stable 2024-07-27
 
 * fix(web): add nullish test in setOsk (#12041)

VERSION.md

@@ -1 +1 @@
-18.0.104
+18.0.110

android/KMAPro/build.sh

@@ -10,6 +10,8 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "$KEYMAN_ROOT/resources/build/build-help.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
 
+. "$KEYMAN_ROOT/android/KMAPro/build-play-store-notes.inc.sh"
+
 # ################################ Main script ################################
 
 # Definition of global compile constants
@@ -25,6 +27,7 @@ builder_describe "Builds Keyman for Android app." \
   "configure" \
   "build" \
   "test             Runs lint and unit tests." \
+  "publish          Publishes symbols to Sentry and the APK to the Play Store." \
   "--ci             Don't start the Gradle daemon. For CI" \
   "--upload-sentry  Upload to sentry"
 
@@ -109,3 +112,13 @@ if builder_start_action test; then
 
   builder_finish_action success test
 fi
+
+if builder_start_action publish; then
+  # Copy Release Notes
+  generateReleaseNotes
+
+  # Publish symbols and Keyman for Android to Play Store
+  ./gradlew $DAEMON_FLAG publishSentry publishReleaseApk
+
+  builder_finish_action success publish
+fi

android/KMAPro/kMAPro/build.gradle

@@ -105,12 +105,17 @@ android {
 }
 
 // how to configure the sentry android gradle plugin
-sentry {
-    // Disables or enables the automatic configuration of Native symbols
-    uploadNativeSymbols = true
-
-    // Does or doesn't include the source code of native code for Sentry
-    includeNativeSources = true
+task publishSentry {
+    doLast {
+        println 'Publishing Keyman symbols to Sentry'
+        sentry {
+            // Disables or enables the automatic configuration of Native symbols
+            uploadNativeSymbols = true
+
+            // Does or doesn't include the source code of native code for Sentry
+            includeNativeSources = true
+        }
+    }
 }
 
 String env_keys_json_file = System.getenv("keys_json_file")

android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java

@@ -112,7 +112,8 @@ public void onCreate(Bundle savedInstanceState) {
 
     // Number of languages associated with the first keyboard in a keyboard package.
     // lexical-model packages will be 0
-    final int languageCount = kmpProcessor.getLanguageCount(pkgInfo, PackageProcessor.PP_KEYBOARDS_KEY, 0);
+    final int languageCount = (keyboardCount > 0) ?
+      kmpProcessor.getLanguageCount(pkgInfo, PackageProcessor.PP_KEYBOARDS_KEY, 0) : 0;
 
     // Sanity check for keyboard packages
     if (pkgTarget.equals(PackageProcessor.PP_TARGET_KEYBOARDS)) {

android/KMAPro/kMAPro/src/main/res/drawable/textsize_decrease.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+
+    <path android:fillColor="@android:color/white" android:pathData="M0.99,19h2.42l1.27,-3.58h5.65L11.59,19h2.42L8.75,5h-2.5L0.99,19zM5.41,13.39L7.44,7.6h0.12l2.03,5.79H5.41zM23,11v2h-8v-2H23z"/>
+
+</vector>

android/KMAPro/kMAPro/src/main/res/drawable/textsize_increase.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="48dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="48dp">
+
+    <path android:fillColor="@android:color/white" android:pathData="M0.99,19h2.42l1.27,-3.58h5.65L11.59,19h2.42L8.75,5h-2.5L0.99,19zM5.41,13.39L7.44,7.6h0.12l2.03,5.79H5.41zM20,11h3v2h-3v3h-2v-3h-3v-2h3V8h2V11z"/>
+
+</vector>

android/KMAPro/kMAPro/src/main/res/layout/text_size_controller.xml

@@ -15,7 +15,7 @@
         android:layout_marginStart="5dp"
         android:layout_marginEnd="5dp"
         android:contentDescription="@string/ic_text_size_down"
-        android:src="@drawable/ic_action_decrement" />
+        android:src="@drawable/textsize_decrease" />
 
     <SeekBar
         android:id="@+id/seekBar"
@@ -32,6 +32,6 @@
         android:layout_marginStart="5dp"
         android:layout_marginEnd="5dp"
         android:contentDescription="@string/ic_text_size_up"
-        android:src="@drawable/ic_action_increment" />
+        android:src="@drawable/textsize_increase" />
 
 </LinearLayout>

android/KMEA/build.sh

@@ -23,7 +23,7 @@ JUNIT_RESULTS="##teamcity[importData type='junit' path='keyman\android\KMEA\app\
 
 builder_describe "Builds Keyman Engine for Android." \
   "@/web/src/app/webview" \
-  "@/common/web/sentry-manager" \
+  "@/web/src/engine/sentry-manager" \
   "clean" \
   "configure" \
   "build" \
@@ -84,7 +84,7 @@ if builder_start_action build:engine; then
   cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/keymanweb-osk.ttf" "$ENGINE_ASSETS/keymanweb-osk.ttf"
 
   cp "$KEYMAN_ROOT/node_modules/@sentry/browser/build/bundle.min.js" "$ENGINE_ASSETS/sentry.min.js"
-  cp "$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js" "$ENGINE_ASSETS/keyman-sentry.js"
+  cp "$KEYMAN_ROOT/web/src/engine/sentry-manager/build/lib/index.js" "$ENGINE_ASSETS/keyman-sentry.js"
 
   echo "Copying es6-shim polyfill"
   cp "$KEYMAN_ROOT/node_modules/es6-shim/es6-shim.min.js" "$ENGINE_ASSETS/es6-shim.min.js"

android/build.sh

@@ -18,7 +18,7 @@ builder_describe \
   configure \
   build \
   test \
-  "publish                                  Publishes the APKs to the Play Store." \
+  "publish                                  Publishes symbols to Sentry and the APKs to the Play Store." \
   --ci+ \
   --upload-sentry+ \
   ":engine=KMEA                             Keyman Engine for Android" \

android/help/about/privacy.md

@@ -19,7 +19,7 @@ Keyman does not use user accounts, so we are unable to identify which crash repo
 
 ### Developer Information
 
-Keyman is developed and published by SIL International.
+Keyman is developed and published by SIL Global.
 
 You can contact SIL or provide any feedback using the app store.
 

android/help/about/whatsnew.md

@@ -3,3 +3,7 @@ title: What's New
 ---
 
 Here are some of the new features we have added to Keyman 18.0 for Android:
+
+* New menu to adjust longpress delay time (#12170, #12185)
+* Support localizations for right-to-left languages (#12215)
+* Handle additional actions for ENTER key (#12125, #12315)

android/help/basic/config/adjust-longpress-delay.md

@@ -0,0 +1,13 @@
+---
+title: Adjust Longpress Delay - Keyman for Android Help
+---
+
+## Adjust Longpress Delay
+
+This menu is used to adjust the duration for triggering a longpress gesture.
+
+Drag the slider to set the delay between 0.3 seconds to 1.5 seconds.
+
+The default value is 0.5 seconds.
+
+![](../../android_images/longpress-slider.png)

android/help/basic/config/index.md

@@ -44,6 +44,11 @@ Click on this to bring up the Android system configuration for setting Keyman as
 
 Click on this to [adjust the keyboard height](adjust-keyboard-height).
 
+## Adjust longpress delay
+![](../../android_images/ic_timelapse.png)
+
+Click on this to [adjust the delay time](adjust-longpress-delay) for a longpress gesture.
+
 ## Spacebar Caption
 Click on this to [change the displayed keyboard name](spacebar-caption) on the spacebar.