From 2f781807a67e13fdda1c2eddcca1ca57ecc313d0 Mon Sep 17 00:00:00 2001 From: Miltiadis Vasilakis Date: Thu, 9 May 2024 10:11:24 +0300 Subject: [PATCH] Refactor PDFReaderState --- Zotero/Scenes/Detail/PDF/Models/PDFReaderState.swift | 6 +++--- Zotero/Scenes/Detail/PDF/PDFCoordinator.swift | 2 +- .../Scenes/Detail/PDF/Views/PDFReaderViewController.swift | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Zotero/Scenes/Detail/PDF/Models/PDFReaderState.swift b/Zotero/Scenes/Detail/PDF/Models/PDFReaderState.swift index 2b1692be1..37cc80eef 100644 --- a/Zotero/Scenes/Detail/PDF/Models/PDFReaderState.swift +++ b/Zotero/Scenes/Detail/PDF/Models/PDFReaderState.swift @@ -68,7 +68,7 @@ struct PDFReaderState: ViewModelState { let key: String let parentKey: String? let document: PSPDFKit.Document - let activityTitle: String? + let title: String? let previewCache: NSCache let commentFont: UIFont let userId: Int @@ -131,7 +131,7 @@ struct PDFReaderState: ViewModelState { url: URL, key: String, parentKey: String?, - activityTitle: String?, + title: String?, libraryId: LibraryIdentifier, initialPage: Int?, preselectedAnnotationKey: String?, @@ -146,7 +146,7 @@ struct PDFReaderState: ViewModelState { self.parentKey = parentKey self.document = Document(url: url) document.overrideClass(PSPDFKit.AnnotationManager.self, with: AnnotationManager.self) - self.activityTitle = activityTitle + self.title = title self.previewCache = NSCache() self.commentFont = PDFReaderLayout.annotationLayout.font self.userId = userId diff --git a/Zotero/Scenes/Detail/PDF/PDFCoordinator.swift b/Zotero/Scenes/Detail/PDF/PDFCoordinator.swift index 386d09536..29f5b7fe1 100644 --- a/Zotero/Scenes/Detail/PDF/PDFCoordinator.swift +++ b/Zotero/Scenes/Detail/PDF/PDFCoordinator.swift @@ -135,7 +135,7 @@ final class PDFCoordinator: Coordinator { url: self.url, key: self.key, parentKey: self.parentKey, - activityTitle: try? controllers.userControllers?.dbStorage.perform(request: ReadFilenameDbRequest(libraryId: libraryId, key: key), on: .main), + title: try? controllers.userControllers?.dbStorage.perform(request: ReadFilenameDbRequest(libraryId: libraryId, key: key), on: .main), libraryId: self.libraryId, initialPage: self.page, preselectedAnnotationKey: self.preselectedAnnotationKey, diff --git a/Zotero/Scenes/Detail/PDF/Views/PDFReaderViewController.swift b/Zotero/Scenes/Detail/PDF/Views/PDFReaderViewController.swift index 7a303bf14..27f891a5a 100644 --- a/Zotero/Scenes/Detail/PDF/Views/PDFReaderViewController.swift +++ b/Zotero/Scenes/Detail/PDF/Views/PDFReaderViewController.swift @@ -123,7 +123,7 @@ class PDFReaderViewController: UIViewController { if changedCurrentItem { close(dismiss: false) } else if openItemsChanged { - openItemsController.setOpenItemsUserActivity(from: self, libraryId: viewModel.state.library.identifier, title: viewModel.state.activityTitle) + openItemsController.setOpenItemsUserActivity(from: self, libraryId: viewModel.state.library.identifier, title: viewModel.state.title) } } ) @@ -233,7 +233,7 @@ class PDFReaderViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - openItemsController.setOpenItemsUserActivity(from: self, libraryId: viewModel.state.library.identifier, title: viewModel.state.activityTitle) + openItemsController.setOpenItemsUserActivity(from: self, libraryId: viewModel.state.library.identifier, title: viewModel.state.title) view.backgroundColor = .systemGray6 // Create intraDocumentNavigationHandler before setting up views, as it may be called by a child view controller, before view has finished loading. intraDocumentNavigationHandler = IntraDocumentNavigationButtonsHandler(