Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: zotero/zotero-ios
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a607962689c73afac08a839640c22cc3a5d4d0d0
Choose a base ref
..
head repository: zotero/zotero-ios
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: db16b14cf60776c60134c31b156e4bd2557d8400
Choose a head ref
Showing with 810 additions and 413 deletions.
  1. +2 −2 .github/workflows/run-tests.yml
  2. +1 −1 ZShare/Controllers/RedirectWebViewHandler.swift
  3. +5 −0 ZShare/ZShare-Bridging-Header.h
  4. +53 −22 Zotero.xcodeproj/project.pbxproj
  5. +8 −8 Zotero.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
  6. +1 −1 Zotero.xcodeproj/xcshareddata/xcschemes/ZShare.xcscheme
  7. +1 −1 Zotero.xcodeproj/xcshareddata/xcschemes/Zotero.xcscheme
  8. BIN Zotero/Assets/Assets.xcassets/AppIcon.appiconset/1024x1024-Dark.png
  9. +0 −1 Zotero/Assets/en.lproj/Localizable.strings
  10. +2 −2 Zotero/Controllers/API/Alamofire+RxSwift.swift
  11. +1 −1 Zotero/Controllers/API/ApiOperation.swift
  12. +43 −9 Zotero/Controllers/AnnotationColorGenerator.swift
  13. +2 −2 Zotero/Controllers/AnnotationConverter.swift
  14. +17 −2 Zotero/Controllers/Architecture/Coordinator.swift
  15. +29 −10 Zotero/Controllers/Attachment Downloader/AttachmentDownloader.swift
  16. +1 −1 Zotero/Controllers/Attachment Downloader/RemoteAttachmentDownloadOperation.swift
  17. +3 −13 Zotero/Controllers/Attachment Downloader/RemoteAttachmentDownloader.swift
  18. +2 −0 Zotero/Controllers/Controllers.swift
  19. +12 −18 Zotero/Controllers/Database/Requests/CreateAttachmentDbRequest.swift
  20. +1 −1 Zotero/Controllers/Database/Requests/SplitAnnotationsDbRequest.swift
  21. +2 −3 Zotero/Controllers/IdentifierLookupController.swift
  22. +8 −26 Zotero/Controllers/Sync/SyncActions/UploadFixSyncAction.swift
  23. +0 −3 Zotero/Controllers/Sync/SyncController.swift
  24. +28 −0 Zotero/Controllers/ZoteroURIConverter.swift
  25. +1 −1 Zotero/Extensions/AsynchronousOperation.swift
  26. +1 −1 Zotero/Extensions/CoreGraphics+Extensions.swift
  27. +0 −2 Zotero/Extensions/Localizable.swift
  28. +16 −0 Zotero/Extensions/NSDecimalNumber+Rounding.h
  29. +19 −0 Zotero/Extensions/NSDecimalNumber+Rounding.m
  30. +8 −4 Zotero/Extensions/Rounding+Extensions.swift
  31. +16 −0 Zotero/Models/AnnotationPreview.swift
  32. +9 −9 Zotero/Models/AnnotationsConfig.swift
  33. +11 −0 Zotero/Models/Attachment.swift
  34. +16 −0 Zotero/Models/CitationMetadata.swift
  35. +0 −1 Zotero/Models/ConflictResolution.swift
  36. +38 −4 Zotero/Models/Database/Database.swift
  37. +2 −0 Zotero/Models/Defaults.swift
  38. +4 −1 Zotero/Models/KeyboardData.swift
  39. +16 −42 Zotero/Scenes/AppCoordinator.swift
  40. +13 −1 Zotero/Scenes/Detail/DetailCoordinator.swift
  41. +1 −1 Zotero/Scenes/Detail/ItemDetail/Models/ItemDetailState.swift
  42. +1 −1 Zotero/Scenes/Detail/ItemDetail/Views/ItemDetailTitleContentView.swift
  43. +1 −1 Zotero/Scenes/Detail/Items/ViewModels/ItemsActionHandler.swift
  44. +1 −0 Zotero/Scenes/Detail/PDF/Models/PDFReaderAction.swift
  45. +4 −0 Zotero/Scenes/Detail/PDF/Models/PDFReaderState.swift
  46. +13 −7 Zotero/Scenes/Detail/PDF/PDFCoordinator.swift
  47. +51 −49 Zotero/Scenes/Detail/PDF/ViewModels/PDFReaderActionHandler.swift
  48. +1 −1 Zotero/Scenes/Detail/PDF/Views/AnnotationToolbarViewController.swift
  49. +207 −85 Zotero/Scenes/Detail/PDF/Views/PDFDocumentViewController.swift
  50. +0 −1 Zotero/Scenes/General/Models/NoteEditorAction.swift
  51. +0 −9 Zotero/Scenes/General/Models/NoteEditorState.swift
  52. +48 −1 Zotero/Scenes/General/NoteEditorCoordinator.swift
  53. +31 −59 Zotero/Scenes/General/ViewModels/NoteEditorActionHandler.swift
  54. +52 −3 Zotero/Scenes/General/Views/NoteEditorViewController.swift
  55. +5 −0 Zotero/Zotero-Bridging-Header.h
  56. +1 −1 note-editor
  57. +1 −1 scripts/bundle_note_editor.sh
4 changes: 2 additions & 2 deletions .github/workflows/run-tests.yml
View file
Original file line number Diff line number Diff line change
@@ -14,8 +14,8 @@ jobs:
runs-on: macos-14
strategy:
matrix:
xcode: ["15.3"]
ios_version: ["17.4"]
xcode: ["16.0"]
ios_version: ["18.0"]
device_name: ["iPhone 15"]

steps:
2 changes: 1 addition & 1 deletion ZShare/Controllers/RedirectWebViewHandler.swift
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
//

import UIKit
import WebKit
@preconcurrency import WebKit

import CocoaLumberjackSwift
import RxSwift
5 changes: 5 additions & 0 deletions ZShare/ZShare-Bridging-Header.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
//
// Use this file to import your target's public headers that you would like to expose to Swift.
//

#import "NSDecimalNumber+Rounding.h"
Loading