rebase fixes

zotero · Jan 9, 2024 · c9a9813 · c9a9813
1 parent 6d3bd32
commit c9a9813
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Zotero/Scenes/Detail/HTML:EPUB/Views/HtmlEpubReaderViewController.swift b/Zotero/Scenes/Detail/HTML:EPUB/Views/HtmlEpubReaderViewController.swift
@@ -50,13 +50,14 @@ class HtmlEpubReaderViewController: UIViewController {
     }
     var isSidebarVisible: Bool { return self.sidebarLeft?.constant == 0 }
     private lazy var toolbarButton: UIBarButtonItem = {
-        let checkbox = CheckboxButton(type: .custom)
-        checkbox.setImage(UIImage(systemName: "pencil.and.outline", withConfiguration: UIImage.SymbolConfiguration(scale: .large)), for: .normal)
+        let checkbox = CheckboxButton(
+            image: UIImage(systemName: "pencil.and.outline", withConfiguration: UIImage.SymbolConfiguration(scale: .large))!,
+            contentInsets: NSDirectionalEdgeInsets(top: 6, leading: 6, bottom: 6, trailing: 6)
+        )
         checkbox.adjustsImageWhenHighlighted = false
         checkbox.scalesLargeContentImage = true
         checkbox.layer.cornerRadius = 4
         checkbox.layer.masksToBounds = true
-        checkbox.contentEdgeInsets = UIEdgeInsets(top: 6, left: 6, bottom: 6, right: 6)
         checkbox.selectedBackgroundColor = Asset.Colors.zoteroBlue.color
         checkbox.selectedTintColor = .white
         checkbox.deselectedTintColor = Asset.Colors.zoteroBlueWithDarkMode.color

diff --git a/Zotero/Scenes/Detail/PDF/Views/PDFReaderViewController.swift b/Zotero/Scenes/Detail/PDF/Views/PDFReaderViewController.swift
@@ -15,6 +15,8 @@ import RxSwift
 
 protocol PDFReaderContainerDelegate: AnyObject {
     var isSidebarVisible: Bool { get }
+    var statusBarHeight: CGFloat { get }
+    var navigationBarHeight: CGFloat { get }
 
     func showSearch(pdfController: PDFViewController, text: String?)
 }