From 6b8674310d2e1be8f873dc590945ba870ff68080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benedikt=20M=C3=BCller?= Date: Wed, 12 Jan 2022 15:35:13 +0100 Subject: [PATCH 1/2] WebViewController: Actually display back/forward/share buttons --- Unwrap/Activities/Web/WebViewController.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Unwrap/Activities/Web/WebViewController.swift b/Unwrap/Activities/Web/WebViewController.swift index 7bc9b6e0..964229f4 100644 --- a/Unwrap/Activities/Web/WebViewController.swift +++ b/Unwrap/Activities/Web/WebViewController.swift @@ -55,6 +55,7 @@ class WebViewController: UIViewController, WKUIDelegate, WKNavigationDelegate { refreshButton = UIBarButtonItem(barButtonSystemItem: .refresh, target: internalWebView, action: #selector(internalWebView.reload)) navigationItem.setRightBarButton(refreshButton, animated: true) + navigationItem.setLeftBarButtonItems(toolbarItems, animated: true) // All three of these become disabled immediately when page loading starts, so we need the below so they don't start active then immediately deactivate. backButton.isEnabled = false From a3b39d566adc5ed96d0385c2732ac2585dceeae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benedikt=20M=C3=BCller?= Date: Wed, 12 Jan 2022 15:40:16 +0100 Subject: [PATCH 2/2] Fix whitespace --- Unwrap/Activities/Web/WebViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Unwrap/Activities/Web/WebViewController.swift b/Unwrap/Activities/Web/WebViewController.swift index 964229f4..ffe56cbf 100644 --- a/Unwrap/Activities/Web/WebViewController.swift +++ b/Unwrap/Activities/Web/WebViewController.swift @@ -55,7 +55,7 @@ class WebViewController: UIViewController, WKUIDelegate, WKNavigationDelegate { refreshButton = UIBarButtonItem(barButtonSystemItem: .refresh, target: internalWebView, action: #selector(internalWebView.reload)) navigationItem.setRightBarButton(refreshButton, animated: true) - navigationItem.setLeftBarButtonItems(toolbarItems, animated: true) + navigationItem.setLeftBarButtonItems(toolbarItems, animated: true) // All three of these become disabled immediately when page loading starts, so we need the below so they don't start active then immediately deactivate. backButton.isEnabled = false