From c9a9813403cad3358fd30401f360d8e182b2dd7e Mon Sep 17 00:00:00 2001 From: Michal Rentka Date: Tue, 9 Jan 2024 13:59:11 +0100 Subject: [PATCH] rebase fixes --- .../HTML:EPUB/Views/HtmlEpubReaderViewController.swift | 7 ++++--- .../Scenes/Detail/PDF/Views/PDFReaderViewController.swift | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Zotero/Scenes/Detail/HTML:EPUB/Views/HtmlEpubReaderViewController.swift b/Zotero/Scenes/Detail/HTML:EPUB/Views/HtmlEpubReaderViewController.swift index 8b05eb192..b5b2996fd 100644 --- 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 index 9683b3a8d..4599403ff 100644 --- 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?) }