fixed back button always disabled for PWAs, cleaned up colors

Author: xtools-at

ios-pwa-wrapper.xcodeproj/xcuserdata/kzb.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -10,5 +10,23 @@
 			<integer>0</integer>
 		</dict>
 	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>2D504BEA1FA100E20019B279</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>2D504C011FA100E20019B279</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>2D504C0C1FA100E20019B279</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
 </dict>
 </plist>

ios-pwa-wrapper/AppDelegate.swift

@@ -19,7 +19,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Override point for customization after application launch.
 
         // Change Navigation style
-        UINavigationBar.appearance().barTintColor = primaryColor
+        UINavigationBar.appearance().barTintColor = navigationBarColor
         UINavigationBar.appearance().titleTextAttributes = [NSAttributedStringKey.foregroundColor: navigationTitleColor]
         UINavigationBar.appearance().largeTitleTextAttributes = [NSAttributedStringKey.foregroundColor: navigationTitleColor]
         UIBarButtonItem.appearance().tintColor = navigationButtonColor

ios-pwa-wrapper/Constants.swift

@@ -6,34 +6,30 @@
 //  Copyright © 2017 Martin Kainzbauer. All rights reserved.
 //
 
-//import Foundation
 import UIKit
 
 // Basic App-/WebView-configuration
 let appTitle = "iOS PWA Wrapper"
-let webAppUrl = URL(string: "https://www.duckduckgo.com")
-let allowedOrigin = "duckduckgo.com"
+let webAppUrl = URL(string: "https://www.leasingrechnen.at")
+let allowedOrigin = "leasingrechnen.at"
 let menuButtonJavascript = """
-    document.querySelector('body').remove();
+    $('.button-collapse').sideNav('show');
 """
 let useCustomUserAgent = false
 let useUserAgentPostfix = true
-let customUserAgent = "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A356"
+let customUserAgent = "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0_1 like Mac OS X) AppleWebKit/604.2.10 (KHTML, like Gecko) Mobile/15A8401"
 let userAgentPostfix = "iOSApp"
 
-
 // Settings
 let changeAppTitleToPageTitle = false
 let forceLargeTitle = false
 
-// Colors
+// Colors & Styles
 let useLightStatusBarStyle = true
-let primaryColor = getColorFromHex(hex: 0xF44336, alpha: 1.0)
-let primaryColorDark = getColorFromHex(hex: 0xD32F2F, alpha: 1.0)
-let primaryColorLight = getColorFromHex(hex: 0xE57373, alpha: 1.0)
-let progressBarColor = getColorFromHex(hex: 0x4CAF50, alpha: 1.0)
+let navigationBarColor = getColorFromHex(hex: 0xF44336, alpha: 1.0)
 let navigationButtonColor = getColorFromHex(hex: 0xFFFFFF, alpha: 1.0)
 let navigationTitleColor = getColorFromHex(hex: 0xFFFFFF, alpha: 1.0)
+let progressBarColor = getColorFromHex(hex: 0x4CAF50, alpha: 1.0)
 
 // Color Helper function
 func getColorFromHex(hex: UInt, alpha: CGFloat) -> UIColor {

ios-pwa-wrapper/ViewController.swift

@@ -35,6 +35,9 @@ class ViewController: UIViewController {
     @IBAction func onLeftButtonClick(_ sender: Any) {
         if (webView.canGoBack) {
             webView.goBack()
+        } else {
+            // exit app
+            UIControl().sendAction(#selector(URLSessionTask.suspend), to: UIApplication.shared, for: nil)
         }
     }
     // open menu in page
@@ -45,7 +48,8 @@ class ViewController: UIViewController {
     // Observers for updating UI
     override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
         if (keyPath == #keyPath(WKWebView.isLoading)) {
-            leftButton.isEnabled = webView.canGoBack
+            // does not fire for PWAs if links are clicked
+            // leftButton.isEnabled = webView.canGoBack
         }
         if (keyPath == #keyPath(WKWebView.estimatedProgress)) {
             progressBar.progress = Float(webView.estimatedProgress)
@@ -64,6 +68,8 @@ class ViewController: UIViewController {
 
         // settings
         webView.allowsBackForwardNavigationGestures = true
+        webView.configuration.ignoresViewportScaleLimits = false
+        webView.configuration.preferences.javaScriptEnabled = true
         // user agent
         if (useCustomUserAgent) {
             webView.customUserAgent = customUserAgent
@@ -89,8 +95,8 @@ class ViewController: UIViewController {
     // call after WebView has been initialized
     func setupUI() {
         // UI elements
-        leftButton.isEnabled = false
-        progressBar = UIProgressView(frame: CGRect(x: 0, y: 0, width: webViewContainer.frame.width, height: 50))
+        // leftButton.isEnabled = false
+        progressBar = UIProgressView(frame: CGRect(x: 0, y: 0, width: webViewContainer.frame.width, height: 40))
         progressBar.autoresizingMask = [.flexibleWidth]
         progressBar.progress = 0.0
         progressBar.tintColor = progressBarColor
@@ -142,14 +148,6 @@ extension ViewController: WKNavigationDelegate {
         alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
         present(alert, animated: true, completion: nil)
     }
-    // didFail
-    func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
-        // show offline screen
-        // @TODO
-        let alert = UIAlertController(title: "You're offline", message: "didFail", preferredStyle: .alert)
-        alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
-        present(alert, animated: true, completion: nil)
-    }
 }
 
 // WebView additional handlers