Improve open items bar button image creation

zotero · Apr 25, 2024 · 0ea653e · 0ea653e
1 parent 08d13a2
commit 0ea653e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/Zotero/Controllers/OpenItemsController.swift b/Zotero/Controllers/OpenItemsController.swift
@@ -479,3 +479,10 @@ extension OpenItemsController {
         viewController.set(userActivity: activity)
     }
 }
+
+extension UIImage {
+    static func openItemsImage(count: Int) -> UIImage? {
+        let count = max(0, count)
+        return count <= 50 ? UIImage(systemName: "\(count).square") : UIImage(systemName: "square.grid.3x3.square")
+    }
+}
diff --git a/Zotero/Scenes/Detail/Items/Views/ItemsViewController.swift b/Zotero/Scenes/Detail/Items/Views/ItemsViewController.swift
@@ -487,8 +487,8 @@ final class ItemsViewController: UIViewController {
     }
 
     private func updateRestoreOpenItemsButton(withCount count: Int) {
-        guard let item = self.navigationItem.rightBarButtonItems?.first(where: { button in RightBarButtonItem(rawValue: button.tag) == .restoreOpenItems }) else { return }
-        item.image = UIImage(systemName: "\(count).square")
+        guard let item = navigationItem.rightBarButtonItems?.first(where: { button in RightBarButtonItem(rawValue: button.tag) == .restoreOpenItems }) else { return }
+        item.image = .openItemsImage(count: count)
     }
 
     private func setupRightBarButtonItems(for state: ItemsState) {
@@ -583,7 +583,7 @@ final class ItemsViewController: UIViewController {
                 }
 
             case .restoreOpenItems:
-                image = UIImage(systemName: "0.square")
+                image = .openItemsImage(count: 0)
                 accessibilityLabel = L10n.Items.restoreOpen
                 primaryAction = UIAction { [weak self] _ in
                     guard let self, let presenter, let controller = controllers.userControllers?.openItemsController, let sessionIdentifier = getSessionIdentifier() else { return }

diff --git a/Zotero/Scenes/Detail/PDF/Views/PDFReaderViewController.swift b/Zotero/Scenes/Detail/PDF/Views/PDFReaderViewController.swift
@@ -107,7 +107,7 @@ class PDFReaderViewController: UIViewController {
         return share
     }()
     private lazy var openItemsButton: UIBarButtonItem = {
-        let openItems = UIBarButtonItem(image: UIImage(systemName: "0.square"), style: .plain, target: nil, action: nil)
+        let openItems = UIBarButtonItem(image: .openItemsImage(count: 0), style: .plain, target: nil, action: nil)
         openItems.isEnabled = true
         openItems.accessibilityLabel = L10n.Accessibility.Pdf.openItems
         openItems.title = L10n.Accessibility.Pdf.openItems
@@ -685,7 +685,7 @@ class PDFReaderViewController: UIViewController {
     private func createRightBarButtonItems(for state: PDFReaderState) -> [UIBarButtonItem] {
         var buttons = [settingsButton, shareButton, searchButton]
         buttons.insert(openItemsButton, at: 1)
-        openItemsButton.image = .init(systemName: "\(state.openItemsCount).square")
+        openItemsButton.image = .openItemsImage(count: state.openItemsCount)
 
         if state.library.metadataEditable {
             buttons.append(toolbarButton)

diff --git a/Zotero/Scenes/General/Views/NoteEditorViewController.swift b/Zotero/Scenes/General/Views/NoteEditorViewController.swift
@@ -101,7 +101,7 @@ final class NoteEditorViewController: UIViewController {
                     item = done
 
                 case .restoreOpenItems:
-                    let openItems = UIBarButtonItem(image: UIImage(systemName: "0.square"), style: .plain, target: nil, action: nil)
+                    let openItems = UIBarButtonItem(image: .openItemsImage(count: 0), style: .plain, target: nil, action: nil)
                     openItems.isEnabled = true
                     openItems.accessibilityLabel = L10n.Accessibility.Pdf.openItems
                     openItems.title = L10n.Accessibility.Pdf.openItems
@@ -129,7 +129,7 @@ final class NoteEditorViewController: UIViewController {
 
             func updateRestoreOpenItemsButton(withCount count: Int) {
                 guard let item = navigationItem.rightBarButtonItems?.first(where: { button in RightBarButtonItem(rawValue: button.tag) == .restoreOpenItems }) else { return }
-                item.image = UIImage(systemName: "\(count).square")
+                item.image = .openItemsImage(count: count)
             }
 
             func forceSaveIfNeeded() {