Bug fixes

zotero · Feb 19, 2025 · 7de53ae · 7de53ae
1 parent bd208c5
commit 7de53ae
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/Zotero.xcodeproj/project.pbxproj b/Zotero.xcodeproj/project.pbxproj
@@ -392,6 +392,8 @@
 		B30D59592206F60400884C4A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B30D59582206F60400884C4A /* AppDelegate.swift */; };
 		B30D59652206F60500884C4A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B30D59632206F60500884C4A /* LaunchScreen.storyboard */; };
 		B30D597B2206F60500884C4A /* ZoteroUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B30D597A2206F60500884C4A /* ZoteroUITests.swift */; };
+		B30DCEA12D65E99D0084C5D4 /* AnnotationSplitter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3597D0127DA5C280069F019 /* AnnotationSplitter.swift */; };
+		B30DCEA22D65E9A90084C5D4 /* AnnotationsConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3242CCC246ABBAF00D8748F /* AnnotationsConfig.swift */; };
 		B3100918272BF9DC003FC743 /* RWebDavDeletion.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3100917272BF9DC003FC743 /* RWebDavDeletion.swift */; };
 		B310091A272C00BA003FC743 /* CreateWebDavDeletionsDbRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3100919272C00BA003FC743 /* CreateWebDavDeletionsDbRequest.swift */; };
 		B310091B272C0110003FC743 /* CreateWebDavDeletionsDbRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3100919272C00BA003FC743 /* CreateWebDavDeletionsDbRequest.swift */; };
@@ -577,7 +579,6 @@
 		B34A9F6425BF1ABB007C9A4A /* PDFDocumentExporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B34A9F6325BF1ABB007C9A4A /* PDFDocumentExporter.swift */; };
 		B34A9F6825BF1D27007C9A4A /* AnnotationConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B34A9F6725BF1D27007C9A4A /* AnnotationConverter.swift */; };
 		B34ACC7A2514EAAB00040C17 /* AnnotationColorGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B34ACC792514EAAB00040C17 /* AnnotationColorGenerator.swift */; };
-		B34ACC7F2514EB6100040C17 /* AnnotationColorGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B34ACC792514EAAB00040C17 /* AnnotationColorGenerator.swift */; };
 		B34C40F525710B430057D5F5 /* AnnotationEditViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B34C40F325710B430057D5F5 /* AnnotationEditViewController.swift */; };
 		B34C40F625710B430057D5F5 /* AnnotationEditViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B34C40F425710B430057D5F5 /* AnnotationEditViewController.xib */; };
 		B34C40FF25711C990057D5F5 /* ColorPickerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B34C40FD25711C990057D5F5 /* ColorPickerCell.swift */; };
@@ -696,9 +697,7 @@
 		B3593F7A241A76E600760E20 /* CollectionEditState.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3593F73241A76E600760E20 /* CollectionEditState.swift */; };
 		B3593F7C241A76E600760E20 /* CollectionEditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3593F76241A76E600760E20 /* CollectionEditView.swift */; };
 		B3593F7E241A76F400760E20 /* CollectionEditingCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3593F7D241A76F400760E20 /* CollectionEditingCoordinator.swift */; };
-		B3597D0027DA5A5B0069F019 /* AnnotationsConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3242CCC246ABBAF00D8748F /* AnnotationsConfig.swift */; };
 		B3597D0227DA5C280069F019 /* AnnotationSplitter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3597D0127DA5C280069F019 /* AnnotationSplitter.swift */; };
-		B3597D0327DA69220069F019 /* AnnotationSplitter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3597D0127DA5C280069F019 /* AnnotationSplitter.swift */; };
 		B35B473C25F11BCD0023B6F4 /* PDFSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = B35B473B25F11BCD0023B6F4 /* PDFSettings.swift */; };
 		B35C529C26383BDD007BD036 /* ReadAllDownloadedItemsDbRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B35C529B26383BDD007BD036 /* ReadAllDownloadedItemsDbRequest.swift */; };
 		B35C9C082642A0BC0004C47E /* RealmSwift in Frameworks */ = {isa = PBXBuildFile; productRef = B35C9C072642A0BC0004C47E /* RealmSwift */; };
@@ -765,11 +764,8 @@
 		B36FD9AF2A78FB13002D77E8 /* EditAnnotationFontSizeDbRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B36FD9AE2A78FB13002D77E8 /* EditAnnotationFontSizeDbRequest.swift */; };
 		B36FD9B12A7924CB002D77E8 /* FontSizePickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B36FD9B02A7924CB002D77E8 /* FontSizePickerViewController.swift */; };
 		B36FD9B32A7929C8002D77E8 /* FontSizeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B36FD9B22A7929C8002D77E8 /* FontSizeCell.swift */; };
-		B370625E2D5F407100E1722B /* ReaderSettingsState.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3F9A4C22B04D0D800684030 /* ReaderSettingsState.swift */; };
-		B370625F2D5F595600E1722B /* PDFSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = B35B473B25F11BCD0023B6F4 /* PDFSettings.swift */; };
-		B37062612D5F75E200E1722B /* Appearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = B37062602D5F75DF00E1722B /* Appearance.swift */; };
-		B37062622D5F75E200E1722B /* Appearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = B37062602D5F75DF00E1722B /* Appearance.swift */; };
 		B370625D2D5CD7ED00E1722B /* Outline.swift in Sources */ = {isa = PBXBuildFile; fileRef = B370625C2D5CD7EB00E1722B /* Outline.swift */; };
+		B37062612D5F75E200E1722B /* Appearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = B37062602D5F75DF00E1722B /* Appearance.swift */; };
 		B37080532AA7216E006F56B9 /* Localizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B37080512AA72135006F56B9 /* Localizable.swift */; };
 		B371494C25D585EA00D6391E /* RestoreDeletionsSyncAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B340868825D574D6000F4446 /* RestoreDeletionsSyncAction.swift */; };
 		B371494F25D585EF00D6391E /* MarkObjectsAsChangedByUser.swift in Sources */ = {isa = PBXBuildFile; fileRef = B340868C25D579C9000F4446 /* MarkObjectsAsChangedByUser.swift */; };
@@ -1835,8 +1831,8 @@
 		B36FD9AE2A78FB13002D77E8 /* EditAnnotationFontSizeDbRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditAnnotationFontSizeDbRequest.swift; sourceTree = "<group>"; };
 		B36FD9B02A7924CB002D77E8 /* FontSizePickerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FontSizePickerViewController.swift; sourceTree = "<group>"; };
 		B36FD9B22A7929C8002D77E8 /* FontSizeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FontSizeCell.swift; sourceTree = "<group>"; };
-		B37062602D5F75DF00E1722B /* Appearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Appearance.swift; sourceTree = "<group>"; };
 		B370625C2D5CD7EB00E1722B /* Outline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Outline.swift; sourceTree = "<group>"; };
+		B37062602D5F75DF00E1722B /* Appearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Appearance.swift; sourceTree = "<group>"; };
 		B37080512AA72135006F56B9 /* Localizable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Localizable.swift; sourceTree = "<group>"; };
 		B372CEDF2486504600B423AE /* GroupVersionsRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupVersionsRequest.swift; sourceTree = "<group>"; };
 		B372CEE22486512500B423AE /* GroupRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupRequest.swift; sourceTree = "<group>"; };
@@ -5761,7 +5757,6 @@
 				B305676023FC0A0B003304F2 /* Convertible.swift in Sources */,
 				B305676123FC0A0B003304F2 /* Defaults.swift in Sources */,
 				B305676223FC0A0B003304F2 /* DelayIntervals.swift in Sources */,
-				B3597D0327DA69220069F019 /* AnnotationSplitter.swift in Sources */,
 				B305676323FC0A0B003304F2 /* DeletableObject.swift in Sources */,
 				B3E4463D248FBD00007FE8AB /* RLink.swift in Sources */,
 				B3FC7438272195E400F55531 /* WebDavCheckRequest.swift in Sources */,
@@ -5863,7 +5858,6 @@
 				B3868541270DC3AA0068A022 /* WebDavScheme.swift in Sources */,
 				B352FFCC2CBE944400D0887B /* AutoEmptyTrashDbRequest.swift in Sources */,
 				B331F9AF2653CEA00099F6A6 /* ReadGroupDbRequest.swift in Sources */,
-				B370625F2D5F595600E1722B /* PDFSettings.swift in Sources */,
 				B33E8A4B27B6A39100CBC7DE /* CollectionCell.swift in Sources */,
 				B3DDC0CC2667825E00B2DFD1 /* RegularExpression+Extensions.swift in Sources */,
 				B30566EB23FC082A003304F2 /* ObjectsRequest.swift in Sources */,
@@ -5882,8 +5876,6 @@
 				B30566F123FC0845003304F2 /* CheckItemIsChangedDbRequest.swift in Sources */,
 				B3AFB83D2A0CF1EE008C2374 /* EmptyDecodable.swift in Sources */,
 				B36459E42644120D00A0C2C0 /* Color+Extension.swift in Sources */,
-				B370625E2D5F407100E1722B /* ReaderSettingsState.swift in Sources */,
-				B34ACC7F2514EB6100040C17 /* AnnotationColorGenerator.swift in Sources */,
 				B3FE79E42B333030009FBDBD /* DeleteDownloadDbRequest.swift in Sources */,
 				B305670423FC08A6003304F2 /* ReadAllCustomLibrariesDbRequest.swift in Sources */,
 				B30548FB2B331C1A00853966 /* RDownload.swift in Sources */,
@@ -5982,9 +5974,9 @@
 				B305671223FC08C7003304F2 /* ReadUpdatedObjectUpdateParametersDbRequest.swift in Sources */,
 				B30566E423FC081A003304F2 /* LoginRequest.swift in Sources */,
 				B357DEE8241661E500E06153 /* DebugLogFormatter.swift in Sources */,
+				B30DCEA22D65E9A90084C5D4 /* AnnotationsConfig.swift in Sources */,
 				B37F7ABC23955031008A51B4 /* CreateItemRequest.swift in Sources */,
 				B3FC743B272195ED00F55531 /* WebDavWriteRequest.swift in Sources */,
-				B3597D0027DA5A5B0069F019 /* AnnotationsConfig.swift in Sources */,
 				B30566F223FC084A003304F2 /* CreateAttachmentDbRequest.swift in Sources */,
 				B300B33A24292B7300C1FE1E /* RTranslatorMetadata.swift in Sources */,
 				B305672B23FC0916003304F2 /* MarkChangesAsResolvedSyncAction.swift in Sources */,
@@ -6008,6 +6000,7 @@
 				B305671623FC08CF003304F2 /* StoreCollectionsDbRequest.swift in Sources */,
 				B305672923FC0911003304F2 /* LoadPermissionsSyncAction.swift in Sources */,
 				B30566F723FC0855003304F2 /* DeleteItemsFromCollectionDbRequest.swift in Sources */,
+				B30DCEA12D65E99D0084C5D4 /* AnnotationSplitter.swift in Sources */,
 				B30566F323FC084C003304F2 /* CreateCollectionDbRequest.swift in Sources */,
 				B31DFE7E274692C7005CD69B /* FileRequest.swift in Sources */,
 				B371494C25D585EA00D6391E /* RestoreDeletionsSyncAction.swift in Sources */,
@@ -6031,7 +6024,6 @@
 				B3B557182C8860E600BD6325 /* CitationMetadata.swift in Sources */,
 				B305677023FC0A58003304F2 /* Alamofire+RxSwift.swift in Sources */,
 				B330261225DEAD9A00742025 /* RPageIndex.swift in Sources */,
-				B37062622D5F75E200E1722B /* Appearance.swift in Sources */,
 				B305670023FC086B003304F2 /* MarkObjectsAsDeletedDbRequest.swift in Sources */,
 				B34341B7260A49C300093E63 /* ReadCollectionAndLibraryDbRequest.swift in Sources */,
 				B305671023FC08C3003304F2 /* ReadSearchesDbRequest.swift in Sources */,

diff --git a/Zotero/Models/AnnotationsConfig.swift b/Zotero/Models/AnnotationsConfig.swift
@@ -8,9 +8,13 @@
 
 import UIKit
 
+#if MAINAPP
 import PSPDFKit
+#endif
 
 struct AnnotationsConfig {
+    static let positionSizeLimit = 65000
+    #if MAINAPP
     static let defaultActiveColor = "#ffd400"
     static let allColors: [String] = ["#ffd400", "#ff6666", "#5fb236", "#2ea8e5", "#a28ae5", "#e56eee", "#f19837", "#aaaaaa", "#000000"]
     static let typesWithColorVariation: [AnnotationType?] = [.none, .highlight, .underline]
@@ -40,7 +44,6 @@ struct AnnotationsConfig {
     }
     // Size of note annotation in PDF document.
     static let noteAnnotationSize: CGSize = CGSize(width: 22, height: 22)
-    static let positionSizeLimit = 65000
     static let supported: PSPDFKit.Annotation.Kind = [.note, .highlight, .square, .ink, .underline, .freeText]
 
     static func colors(for type: AnnotationType) -> [String] {
@@ -66,4 +69,5 @@ struct AnnotationsConfig {
         }
         return map
     }
+    #endif
 }
diff --git a/Zotero/Models/Database/Database.swift b/Zotero/Models/Database/Database.swift
@@ -131,6 +131,7 @@ struct Database {
     }
 
     private static func correctAnnotationColors(migration: Migration) {
+        #if MAINAPP
         let colorVariationMap = AnnotationsConfig.colorVariationMap
         migration.enumerateObjects(ofType: RItem.className()) { oldObject, newObject in
             guard let oldObject,
@@ -161,6 +162,7 @@ struct Database {
             }
             newObject["changes"] = newChanges
         }
+        #endif
     }
 
     private static func extractAnnotationTypeFromItems(migration: Migration) {

diff --git a/Zotero/Models/DeletableObject.swift b/Zotero/Models/DeletableObject.swift
@@ -90,6 +90,7 @@ extension RItem: Deletable {
     }
 
     private func cleanupAnnotationFiles() {
+        #if MAINAPP
         guard let parentKey = parent?.key, let libraryId = libraryId else { return }
 
         let light = Files.annotationPreview(annotationKey: key, pdfKey: parentKey, libraryId: libraryId, appearance: .light)
@@ -99,6 +100,7 @@ extension RItem: Deletable {
         NotificationCenter.default.post(name: .attachmentDeleted, object: light)
         NotificationCenter.default.post(name: .attachmentDeleted, object: dark)
         NotificationCenter.default.post(name: .attachmentDeleted, object: sepia)
+        #endif
     }
 
     private func cleanupAttachmentFiles() {
@@ -114,10 +116,12 @@ extension RItem: Deletable {
             // Delete attachment directory
             NotificationCenter.default.post(name: .attachmentDeleted, object: Files.attachmentDirectory(in: libraryId, key: self.key))
 
+            #if MAINAPP
             if contentType == "application/pdf" {
                 // This is a PDF file, remove all annotations and thumbnails.
                 NotificationCenter.default.post(name: .attachmentDeleted, object: Files.annotationPreviews(for: self.key, libraryId: libraryId))
             }
+            #endif
         }
     }
 }

diff --git a/Zotero/Models/Files.swift b/Zotero/Models/Files.swift
@@ -118,6 +118,8 @@ struct Files {
         return FileData(rootPath: Files.appGroupPath, relativeComponents: ["styles"], name: name, ext: "csl")
     }
 
+    #if MAINAPP
+
     // MARK: - PDF
 
     static func pdfToShare(filename: String, key: String) -> File {
@@ -186,6 +188,8 @@ struct Files {
         return FileData.directory(rootPath: Files.appGroupPath, relativeComponents: ["annotations"])
     }
 
+    #endif
+
     // MARK: - Share extension
 
     static func shareExtensionDownload(key: String, ext: String) -> File {