erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-09 18:35:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1924 from keymanapp/ios-modelless-inapp-banner

Browse source 
[iOS] Fixes banner display misalignments.
This commit is contained in:
Joshua Horton 2019-08-02 14:04:13 +07:00 • committed by GitHub
commit aa1df337b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ios/engine/KMEI/KeymanEngine/Classes/KeymanWebViewController.swift
View file

@ -301,6 +301,11 @@ extension KeymanWebViewController {
setBannerHeight(to: InputViewController.topBarHeight)
}
func showBanner(_ display: Bool) {
log.debug("Changing banner's alwaysShow property to \(display).")
webView?.evaluateJavaScript("showBanner(\(display ? "true" : "false"))", completionHandler: nil)
}
func setBannerImage(to path: String) {
bannerImgPath = path // Save the path in case delayed initializaiton is needed.
log.debug("Banner image path: '\(path).'")
@ -512,12 +517,9 @@ extension KeymanWebViewController: KeymanWebDelegate {
log.info("Loaded keyboard.")
// Now that we've loaded the keyboard page fully, perform any in-page needed init.
setBannerImage(to: bannerImgPath)
resizeKeyboard()
setDeviceType(UIDevice.current.userInterfaceIdiom)
let shouldReloadKeyboard = Manager.shared.shouldReloadKeyboard
var newKb = Defaults.keyboard
if Manager.shared.currentKeyboardID == nil && !shouldReloadKeyboard {
@ -533,6 +535,17 @@ extension KeymanWebViewController: KeymanWebDelegate {
_ = Manager.shared.setKeyboard(newKb)
}
if Manager.shared.isSystemKeyboard {
showBanner(true)
} else {
// TODO: Set banner to visible / not visible based on the toggle in Settings.
// Problem: we need access to the banner image path there. It's only set for the system keyboard variant!
showBanner(false)
}
setBannerImage(to: bannerImgPath)
// Reset the keyboard's size.
keyboardSize = kbSize
fixLayout()
NotificationCenter.default.post(name: Notifications.keyboardLoaded, object: self, value: newKb)

2
ios/engine/KMEI/KeymanEngine/Classes/Manager.swift
View file

@ -308,6 +308,8 @@ public class Manager: NSObject, HTTPDownloadDelegate, UIGestureRecognizerDelegat
_ = Manager.shared.registerLexicalModel(first_model)
}
inputViewController.fixLayout()
return true
}

22
ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keyboard.html
View file

@ -28,11 +28,6 @@
var oskHeight = 0;
var oskWidth = 0;
var bannerOptions = {
'alwaysShow': true,
'imagePath': '' // Need to route the actual banner image here.
};
window.addEventListener('load', init, false);
function init() {
@ -49,14 +44,17 @@
kmw['beepKeyboard'] = beepKeyboard;
kmw['setActiveElement']('ta');
kmw.osk.banner.setOptions(bannerOptions);
//});
}
function showBanner(flag) {
console.log("Setting banner display for dictionaryless keyboards to " + flag);
keyman.osk.banner.setOptions({'alwaysShow': flag});
}
function setBannerImage(path) {
bannerOptions['imagePath'] = path;
var kmw=window['keyman'];
kmw.osk.banner.setOptions(bannerOptions);
kmw.osk.banner.setOptions({"imagePath": path});
}
function setBannerHeight(h) {
@ -85,7 +83,7 @@
function setOskHeight(height) {
var kmw=window['keyman'];
oskHeight = height - kmw.osk.banner.height;
oskHeight = height;
kmw.osk.show(true);
kmw['correctOSKTextSize']();
}
@ -105,7 +103,11 @@
}
function getOskHeight() {
return oskHeight;
var height = oskHeight;
if(keyman.osk.banner._activeType != 'blank') {
height = height - keyman.osk.banner.height;
}
return height;
}
var keyboardOffset = 0;