Implemented cmd+f command to pdf reader and items list (#726)

zotero · Jul 13, 2023 · d4e7fc2 · d4e7fc2
1 parent d2b87bd
commit d4e7fc2
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/Zotero/Scenes/Detail/Items/Views/ItemsViewController.swift b/Zotero/Scenes/Detail/Items/Views/ItemsViewController.swift
@@ -163,6 +163,14 @@ final class ItemsViewController: UIViewController {
         }
     }
 
+    override func pressesBegan(_ presses: Set<UIPress>, with event: UIPressesEvent?) {
+        guard let key = presses.first?.key, key.characters == "f", key.modifierFlags.contains(.command) else {
+            super.pressesBegan(presses, with: event)
+            return
+        }
+        self.searchBarContainer?.searchBar.becomeFirstResponder()
+    }
+
     deinit {
         DDLogInfo("ItemsViewController deinitialized")
     }

diff --git a/Zotero/Scenes/Detail/PDF/Views/PDFDocumentViewController.swift b/Zotero/Scenes/Detail/PDF/Views/PDFDocumentViewController.swift
@@ -112,6 +112,14 @@ final class PDFDocumentViewController: UIViewController {
         self.updatePencilSettingsIfNeeded()
     }
 
+    override func pressesBegan(_ presses: Set<UIPress>, with event: UIPressesEvent?) {
+        guard let controller = self.pdfController, let key = presses.first?.key, key.characters == "f", key.modifierFlags.contains(.command) else {
+            super.pressesBegan(presses, with: event)
+            return
+        }
+        self.parentDelegate?.showSearch(pdfController: controller, text: nil)
+    }
+
     // MARK: - Actions
 
     func focus(page: UInt) {

diff --git a/Zotero/Scenes/Detail/PDF/Views/PDFSearchViewController.swift b/Zotero/Scenes/Detail/PDF/Views/PDFSearchViewController.swift
@@ -51,6 +51,11 @@ final class PDFSearchViewController: UIViewController {
         super.viewDidLoad()
 
         self.setupViews()
+    }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+
         self.searchBar.becomeFirstResponder()
 
         if let text = self.text {
@@ -68,6 +73,14 @@ final class PDFSearchViewController: UIViewController {
         DDLogInfo("PDFSearchViewController deinitialized")
     }
 
+    override func pressesBegan(_ presses: Set<UIPress>, with event: UIPressesEvent?) {
+        guard let key = presses.first?.key, key.keyCode == .keyboardEscape else {
+            super.pressesBegan(presses, with: event)
+            return
+        }
+        self.dismiss(animated: true, completion: nil)
+    }
+
     // MARK: - Actions
 
     private func search(for string: String) {