erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-11-02 09:07:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #16142 from keymanapp/fix/ios/bundle-globe-hint

Browse source
This commit is contained in:
Joshua Horton 2026-07-01 21:56:42 +07:00 • committed by GitHub
commit ef6f1bac76
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ios/.gitignore vendored
View file

@ -13,6 +13,7 @@ samples/KMSample2/KeymanEngine.xcframework
samples/KMSample2/build
engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keymanios.js
engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keymanweb-osk.ttf
engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/globe-hint.css
engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/kmwosk.css
engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keyman.js.map
engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keymanweb-webview.js

2
ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
View file

@ -182,7 +182,7 @@ extension KeymanWebViewController {
}
view = nil
}
func languageMenuPosition(_ completion: @escaping (CGRect) -> Void) {
webView!.evaluateJavaScript("langMenuPos();") { result, _ in
guard let result = result as? String, !result.isEmpty else {

4
ios/engine/KMEI/KeymanEngine/Classes/Resource Management/Storage.swift
View file

@ -245,6 +245,10 @@ extension Storage {
resourceName: "kmwosk.css",
dstDir: baseDir,
excludeFromBackup: true)
try Storage.copy(from: bundle,
resourceName: "globe-hint.css",
dstDir: baseDir,
excludeFromBackup: true)
try Storage.copy(from: bundle,
resourceName: "keymanweb-osk.ttf",
dstDir: baseDir,

3
ios/engine/build.sh
View file

@ -102,7 +102,8 @@ function update_bundle ( ) {
KMW_PRODUCT="$KEYMAN_ROOT/web/build/app/webview/$CONFIG"
KMW_RESOURCES="$KEYMAN_ROOT/web/build/app/resources"
#Copy over the relevant resources! It's easiest to do if we navigate to the resulting folder.
# Copy relevant KeymanWeb resources; this list is also in Storage.swift
cp "$KMW_RESOURCES/osk/globe-hint.css" "$BUNDLE_PATH/globe-hint.css"
cp "$KMW_RESOURCES/osk/kmwosk.css" "$BUNDLE_PATH/kmwosk.css"
cp "$KMW_RESOURCES/osk/keymanweb-osk.ttf" "$BUNDLE_PATH/keymanweb-osk.ttf"
cp "$KMW_PRODUCT/keymanweb-webview.js" "$BUNDLE_PATH/keymanweb-webview.js"