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

chore(ios): the easy conversion parts

Browse source
This commit is contained in:
jahorton 2022-06-24 09:31:36 +07:00
parent f6841333a2
commit 71bd07d381
2 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ios/keyman/Keyman/Keyman/Classes/KMWebBrowser/WebBrowserViewController.swift
View file

@ -7,10 +7,10 @@
//
import KeymanEngine
import UIKit
import WebKit
class WebBrowserViewController: UIViewController, UIWebViewDelegate, UIAlertViewDelegate {
@IBOutlet var webView: UIWebView!
class WebBrowserViewController: UIViewController, WKNavigationDelegate, UIAlertViewDelegate {
@IBOutlet var webView: WKWebView!
@IBOutlet var navBar: UINavigationBar!
@IBOutlet var toolBar: UIToolbar!
@IBOutlet var navBarTopConstraint: NSLayoutConstraint!
@ -51,7 +51,7 @@ class WebBrowserViewController: UIViewController, UIWebViewDelegate, UIAlertView
observer: self,
function: WebBrowserViewController.keyboardPickerDismissed)
webView.delegate = self
webView.navigationDelegate = self
webView.scalesPageToFit = true
if #available(iOS 13.0, *) {
@ -113,7 +113,7 @@ class WebBrowserViewController: UIViewController, UIWebViewDelegate, UIAlertView
let lastUrlStr = userData.object(forKey: webBrowserLastURLKey) as? String ?? "https://www.google.com/"
if let url = URL(string: lastUrlStr) {
let request = URLRequest(url: url)
webView.loadRequest(request)
webView.load(request)
}
}
@ -154,7 +154,7 @@ class WebBrowserViewController: UIViewController, UIWebViewDelegate, UIAlertView
url = URL(string: "http://\(urlString)") ?? url
}
let request = URLRequest(url: url)
webView.loadRequest(request)
webView.load(request)
}
func loadSearchString(_ searchString: String) {
@ -201,9 +201,10 @@ class WebBrowserViewController: UIViewController, UIWebViewDelegate, UIAlertView
dismiss(animated: true, completion: nil)
}
func webView(_ webView: UIWebView,
shouldStartLoadWith request: URLRequest,
navigationType: UIWebView.NavigationType) -> Bool {
func webView(_ webView: WKWebView,
decidePolicyFor navigationAction: WKNavigationAction,
decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) -> Void {
let request = navigationAction.request
if request.url?.lastPathComponent.hasSuffix(".kmp") ?? false {
// Can't have the browser auto-download with no way to select a different page.
// Can't just ignore it, either, as the .kmp may result from a redirect from
@ -213,7 +214,7 @@ class WebBrowserViewController: UIViewController, UIWebViewDelegate, UIAlertView
userData.synchronize()
// The user is trying to download a .kmp, but the standard
// UIWebView can't handle it properly.
// WKWebView can't handle it properly.
ResourceDownloadManager.shared.downloadRawKMP(from: request.url!) { file, error in
// do something!
@ -234,24 +235,26 @@ class WebBrowserViewController: UIViewController, UIWebViewDelegate, UIAlertView
}
}
return false
decisionHandler(WKNavigationActionPolicy.cancel)
return
}
updateAddress(request)
return true
decisionHandler(WKNavigationActionPolicy.allow)
return
}
func webViewDidStartLoad(_ webView: UIWebView) {
func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
UIApplication.shared.isNetworkActivityIndicatorVisible = true
updateButtons()
}
func webViewDidFinishLoad(_ webView: UIWebView) {
func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
UIApplication.shared.isNetworkActivityIndicatorVisible = false
appendCSSFontFamily()
updateButtons()
}
func webView(_ webView: UIWebView, didFailLoadWithError error: Error) {
func webView(_ webView: WKWebView, didFailNavigation error: Error) {
UIApplication.shared.isNetworkActivityIndicatorVisible = false
updateButtons()

8
ios/keyman/Keyman/Keyman/Classes/KMWebBrowser/WebBrowserViewController.xib
View file

@ -32,10 +32,14 @@
<constraint firstAttribute="height" constant="44" id="qmb-kf-rzZ"/>
</constraints>
</navigationBar>
<webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="b82-37-gRv">
<wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="b82-37-gRv">
<rect key="frame" x="0.0" y="44" width="320" height="480"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</webView>
<wkWebViewConfiguration key="configuration">
<audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" none="YES"/>
<wkPreferences key="preferences"/>
</wkWebViewConfiguration>
</wkWebView>
<toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="e8W-i1-0tJ">
<rect key="frame" x="0.0" y="524" width="320" height="44"/>
<items>