erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-27 18:57:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #6836 from keymanapp/chore/ios/wkwebview-for-infoview

Browse source 
chore(ios): modernizes app-help's internals
This commit is contained in:
Joshua Horton 2022-06-27 08:26:25 +07:00 • committed by GitHub
commit bcfd822baa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ios/keyman/Keyman/Keyman/Classes/InfoViewController/InfoViewController.swift
View file

@ -7,18 +7,18 @@
//
import KeymanEngine
import UIKit
import WebKit
import Reachability
class InfoViewController: UIViewController, UIWebViewDelegate {
@IBOutlet var webView: UIWebView!
class InfoViewController: UIViewController, WKNavigationDelegate {
@IBOutlet var webView: WKWebView!
@IBOutlet var backButton: UIBarButtonItem!
@IBOutlet var forwardButton: UIBarButtonItem!
private var networkReachable: Reachability?
private var exitClosure: (() -> Void)? = nil;
private var exitClosure: (() -> Void)?
convenience init(exitClosure: @escaping () -> Void) {
if UIDevice.current.userInterfaceIdiom == .phone {
@ -33,7 +33,7 @@ class InfoViewController: UIViewController, UIWebViewDelegate {
override func viewDidLoad() {
super.viewDidLoad()
extendedLayoutIncludesOpaqueBars = true
webView?.delegate = self
webView?.navigationDelegate = self
NotificationCenter.default.addObserver(self, selector: #selector(self.networkStatusChanged),
name: NSNotification.Name.reachabilityChanged, object: nil)
@ -54,17 +54,17 @@ class InfoViewController: UIViewController, UIWebViewDelegate {
forwardButton.isEnabled = webView.canGoForward
}
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
updateButtons()
}
func webView(_ webView: UIWebView, didFailLoadWithError error: Error) {
func webView(_ webView: WKWebView, didFailNavigation error: Error) {
UIApplication.shared.isNetworkActivityIndicatorVisible = false
updateButtons()
log.debug(error)
@ -91,7 +91,7 @@ class InfoViewController: UIViewController, UIWebViewDelegate {
// Safari won't recognize the contents without the .html ending.
let filePath = offlineHelpBundle.path(forResource: "index", ofType: "html", inDirectory: nil)
webView.loadRequest(URLRequest(url: URL.init(fileURLWithPath: filePath!)))
webView.load(URLRequest(url: URL.init(fileURLWithPath: filePath!)))
}
// Currently unused, as we haven't yet added a toggle to allow users to choose online
@ -99,7 +99,7 @@ class InfoViewController: UIViewController, UIWebViewDelegate {
private func loadFromServer() {
let appVersion = Version.current.majorMinor
let url = "\(KeymanHosts.HELP_KEYMAN_COM)/products/iphone-and-ipad/\(appVersion.plainString)/"
webView.loadRequest(URLRequest(url: URL(string: url)!))
webView.load(URLRequest(url: URL(string: url)!))
log.debug("Info page URL: \(url)")
}
}

8
ios/keyman/Keyman/Keyman/Classes/InfoViewController/InfoViewController_iPad.xib
View file

@ -21,10 +21,14 @@
<rect key="frame" x="0.0" y="0.0" width="768" height="974"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="46">
<wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="46">
<rect key="frame" x="0.0" y="0.0" width="768" height="924"/>
<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="fsh-gd-wpz">
<rect key="frame" x="0.0" y="924" width="768" height="50"/>
<items>

8
ios/keyman/Keyman/Keyman/Classes/InfoViewController/InfoViewController_iPhone.xib
View file

@ -26,10 +26,14 @@
<rect key="frame" x="0.0" y="804" width="428" height="34"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
<webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="38">
<wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="38">
<rect key="frame" x="0.0" y="0.0" width="428" height="755"/>
<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="DPl-QD-inD">
<rect key="frame" x="0.0" y="755" width="428" height="49"/>
<items>

12
ios/keyman/Keyman/Keyman/Classes/SetUpViewController/SetUpViewController.swift
View file

@ -7,12 +7,12 @@
//
import KeymanEngine
import UIKit
import WebKit
import Reachability
// TODO: Refactor common functionality from InfoViewController
class SetUpViewController: UIViewController, UIWebViewDelegate {
@IBOutlet var webView: UIWebView!
class SetUpViewController: UIViewController, WKNavigationDelegate {
@IBOutlet var webView: WKWebView!
private var networkReachable: Reachability?
@ -27,7 +27,7 @@ class SetUpViewController: UIViewController, UIWebViewDelegate {
let doneButton = navBar?.topItem?.rightBarButtonItem
doneButton?.target = self
doneButton?.action = #selector(self.dismissView)
webView?.delegate = self
webView?.navigationDelegate = self
NotificationCenter.default.addObserver(self, selector: #selector(self.networkStatusChanged),
name: NSNotification.Name.reachabilityChanged, object: nil)
@ -66,14 +66,14 @@ class SetUpViewController: UIViewController, UIWebViewDelegate {
let filePath = offlineHelpBundle.path(forResource: "installing-system-keyboard",
ofType: "html",
inDirectory: "start")
webView.loadRequest(URLRequest(url: URL.init(fileURLWithPath: filePath!)))
webView.load(URLRequest(url: URL.init(fileURLWithPath: filePath!)))
}
private func loadFromServer() {
let appVersion = Version.current.majorMinor
let url = "\(KeymanHosts.HELP_KEYMAN_COM)/products/iphone-and-ipad/\(appVersion.plainString)"
+ "/start/installing-system-keyboard?embed=ios"
webView.loadRequest(URLRequest(url: URL(string: url)!))
webView.load(URLRequest(url: URL(string: url)!))
log.debug("Set up page URL: \(url)")
}
}

8
ios/keyman/Keyman/Keyman/Classes/SetUpViewController/SetUpViewController.xib
View file

@ -28,10 +28,14 @@
</navigationItem>
</items>
</navigationBar>
<webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hiW-6P-SIQ">
<wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hiW-6P-SIQ">
<rect key="frame" x="0.0" y="64" width="320" height="504"/>
<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>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>