Refactor PDFReaderState

Author: mvasilak

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<NSString, UIImage>
     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

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,

Zotero/Scenes/Detail/PDF/Views/PDFReaderViewController.swift

@@ -121,7 +121,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)
                     }
                 }
             )
@@ -231,7 +231,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(