Skip to content

Commit 13e154f

Browse files
committed
fix(ios): bundle in KMW's globe-hint.css
Pretty much just what the title says; it's been silently missing this whole time. This doesn't fix iOS keyboard's display by itself, but it is a prerequisite for the full solution offered by #16136. Build-bot: skip build:ios Test-bot: skip
1 parent 64abd5b commit 13e154f

4 files changed

Lines changed: 8 additions & 2 deletions

File tree

ios/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ samples/KMSample2/KeymanEngine.xcframework
1313
samples/KMSample2/build
1414
engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keymanios.js
1515
engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keymanweb-osk.ttf
16+
engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/globe-hint.css
1617
engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/kmwosk.css
1718
engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keyman.js.map
1819
engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keymanweb-webview.js

ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ extension KeymanWebViewController {
182182
}
183183
view = nil
184184
}
185-
185+
186186
func languageMenuPosition(_ completion: @escaping (CGRect) -> Void) {
187187
webView!.evaluateJavaScript("langMenuPos();") { result, _ in
188188
guard let result = result as? String, !result.isEmpty else {

ios/engine/KMEI/KeymanEngine/Classes/Resource Management/Storage.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,10 @@ extension Storage {
245245
resourceName: "kmwosk.css",
246246
dstDir: baseDir,
247247
excludeFromBackup: true)
248+
try Storage.copy(from: bundle,
249+
resourceName: "globe-hint.css",
250+
dstDir: baseDir,
251+
excludeFromBackup: true)
248252
try Storage.copy(from: bundle,
249253
resourceName: "keymanweb-osk.ttf",
250254
dstDir: baseDir,

ios/engine/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ function update_bundle ( ) {
102102
KMW_PRODUCT="$KEYMAN_ROOT/web/build/app/webview/$CONFIG"
103103
KMW_RESOURCES="$KEYMAN_ROOT/web/build/app/resources"
104104

105-
#Copy over the relevant resources! It's easiest to do if we navigate to the resulting folder.
105+
# Copy over the relevant resources! It's easiest to do if we navigate to the resulting folder.
106+
cp "$KMW_RESOURCES/osk/globe-hint.css" "$BUNDLE_PATH/globe-hint.css"
106107
cp "$KMW_RESOURCES/osk/kmwosk.css" "$BUNDLE_PATH/kmwosk.css"
107108
cp "$KMW_RESOURCES/osk/keymanweb-osk.ttf" "$BUNDLE_PATH/keymanweb-osk.ttf"
108109
cp "$KMW_PRODUCT/keymanweb-webview.js" "$BUNDLE_PATH/keymanweb-webview.js"

0 commit comments

Comments
 (0)