From 961120ff9e87088f93fb3b934b5a37999b622762 Mon Sep 17 00:00:00 2001
From: James Magahern <jmagahern@apple.com>
Date: Tue, 10 Nov 2020 16:41:19 -0600
Subject: [PATCH] Keyboard shortcuts: increase/decrease font size, refresh

---
 App/AppDelegate.swift                        |  7 +++++++
 App/Browser View/BrowserViewController.swift | 20 ++++++++++++++++----
 App/KeyboardShortcuts.swift                  |  3 +++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/App/AppDelegate.swift b/App/AppDelegate.swift
index 98f8330..625d3ba 100644
--- a/App/AppDelegate.swift
+++ b/App/AppDelegate.swift
@@ -79,6 +79,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 title: "Find on Page",
                 action: #selector(ShortcutResponder.findOnPage)
             ),
+            
+            // Refresh
+            UIKeyCommand(
+                modifiers: [.command], input: "R",
+                title: "Refresh",
+                action: #selector(ShortcutResponder.refresh)
+            ),
         ]
     }
     
diff --git a/App/Browser View/BrowserViewController.swift b/App/Browser View/BrowserViewController.swift
index f74c864..3dc7969 100644
--- a/App/Browser View/BrowserViewController.swift	
+++ b/App/Browser View/BrowserViewController.swift	
@@ -198,13 +198,13 @@ class BrowserViewController: UIViewController, WKNavigationDelegate, WKUIDelegat
             let label = documentControls.fontSizeAdjustView.labelView
             label.text = numberFormatter.string(for: tab.webView._viewScale)
             
-            documentControls.fontSizeAdjustView.decreaseSizeButton.addAction(UIAction(handler: { [unowned self] _ in
-                tab.webView._viewScale -= 0.10
+            documentControls.fontSizeAdjustView.decreaseSizeButton.addAction(UIAction(handler: { [unowned self] sender in
+                self.decreaseSize(sender)
                 label.text = numberFormatter.string(for: tab.webView._viewScale)
             }), for: .touchUpInside)
             
-            documentControls.fontSizeAdjustView.increaseSizeButton.addAction(UIAction(handler: { [unowned self] _ in
-                tab.webView._viewScale += 0.10
+            documentControls.fontSizeAdjustView.increaseSizeButton.addAction(UIAction(handler: { [unowned self] sender in
+                self.increaseSize(sender)
                 label.text = numberFormatter.string(for: tab.webView._viewScale)
             }), for: .touchUpInside)
             
@@ -615,4 +615,16 @@ class BrowserViewController: UIViewController, WKNavigationDelegate, WKUIDelegat
         browserView.setFindOnPageVisible(true, animated: true)
         findOnPageController.findOnPageView.textField.becomeFirstResponder()
     }
+    
+    func refresh(_ sender: Any?) {
+        webView.reload()
+    }
+    
+    override func increaseSize(_ sender: Any?) {
+        tab.webView._viewScale += 0.10
+    }
+    
+    override func decreaseSize(_ sender: Any?) {
+        tab.webView._viewScale -= 0.10
+    }
 }
diff --git a/App/KeyboardShortcuts.swift b/App/KeyboardShortcuts.swift
index 1d00c75..1cb47a5 100644
--- a/App/KeyboardShortcuts.swift
+++ b/App/KeyboardShortcuts.swift
@@ -32,4 +32,7 @@ protocol ShortcutResponder: class {
     
     @objc
     optional func findOnPage(_ sender: Any?)
+    
+    @objc
+    optional func refresh(_ sender: Any?)
 }