[Feat] 모아보기 기능 구현 #460
Open
[Feat] 모아보기 기능 구현 #460
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mooninbeom
requested review from
minjung0067,
Dorii0513,
wltnryu and
Bluecho97
mooninbeom
commented
Feb 1, 2025
Comment on lines
+11
to
+23
| struct AnnotationCollection: Identifiable, Equatable { | ||
| let id: String | ||
|
|
||
| let annotation: AnnotationCase | ||
| let commenText: String? | ||
| let contents: AttributedString | ||
| let pageIndex: Int | ||
|
|
||
| enum AnnotationCase: Equatable { | ||
| case highlight | ||
| case comment | ||
| } | ||
| } |
There was a problem hiding this comment.
모아보기 뷰에서 사용되는 Entity 입니다
mooninbeom
commented
Feb 1, 2025
| @@ -18,4 +18,5 @@ extension Notification.Name { | |||
| static let isFigureCaptured = Notification.Name("isFigureCaptured") | |||
| static let isCollectionCaptured = Notification.Name("isCollectionCaptured") | |||
| static let changeHomePaperInfo = Notification.Name("changeHomePaperInfo") | |||
| static let didSelectAnnotationCollection = Notification.Name("didSelectAnnotationCollection") | |||
There was a problem hiding this comment.
PDFView로 Action을 전달하기 위한 Notification 입니다
mooninbeom
commented
Feb 1, 2025
| @@ -236,7 +237,8 @@ extension MainPDFViewModel { | |||
| let highlight = PDFAnnotation(bounds: bounds, forType: .highlight, withProperties: nil) | |||
| highlight.endLineStyle = .none | |||
| highlight.color = highlightColor | |||
|
|
|||
| highlight.contents = "UH|\(selection.string ?? "nil")|\(color.rawValue)|\(id)" | |||
There was a problem hiding this comment.
모아보기에 필요한 정보들(하이라이트 or 코멘트 인지, 선택된 영역의 String, 사용된 color, id값)을
PDFAnnotation 프로퍼티에 저장합니다.
mooninbeom
commented
Feb 1, 2025
| .lineLimit(9) | ||
| } | ||
| .onTapGesture { | ||
| NotificationCenter.default.post(name: .didSelectAnnotationCollection, object: nil, userInfo: ["index": annotation.pageIndex]) |
There was a problem hiding this comment.
NotificationCenter를 통해 PDFView에게 액션을 전달합니다.
해당 페이지로 이동
mooninbeom
commented
Feb 1, 2025
Comment on lines
+24
to
+68
| for i in 0 ..< pageCount { | ||
| guard let page = document.page(at: i) else { continue } | ||
|
|
||
| page.annotations.forEach { annotation in | ||
| switch annotation.markupType { | ||
| case .highlight: | ||
| if let contents = annotation.contents { | ||
| if contents.split(separator: "|")[0] == "UH" || contents.split(separator: "|")[0] == "UC" { | ||
| let id = contents.split(separator: "|").last! | ||
|
|
||
| if id != currentId { | ||
| if !resultText.isEmpty { | ||
| extractAnnotation( | ||
| contents: currentContents, | ||
| body: resultText.replacingOccurrences(of: "\n", with: " "), | ||
| index: i | ||
| ) | ||
| resultText = "" | ||
| } | ||
|
|
||
| currentId = String(id) | ||
| currentContents = contents | ||
| } | ||
|
|
||
| let text = annotation.contents!.split(separator: "|")[1] | ||
| if text == " " { return } | ||
|
|
||
| resultText += text | ||
| } | ||
| } | ||
|
|
||
| default: | ||
| break | ||
| } | ||
| } | ||
|
|
||
| if !resultText.isEmpty { | ||
| extractAnnotation( | ||
| contents: currentContents, | ||
| body: resultText.replacingOccurrences(of: "\n", with: " "), | ||
| index: i | ||
| ) | ||
| resultText = "" | ||
| } | ||
| } |
There was a problem hiding this comment.
현재 PDFDocument의 모든 PDFPage를 순회하여 필요한 PDFAnnotation들의 정보를 갖고와 필터링 한 후 Entity로 변환하여 저장합니다.
mooninbeom
commented
Feb 1, 2025
Comment on lines
+519
to
+525
| if textInputed { | ||
| underline.setValue("UC| |" + newComment.id.uuidString, forAnnotationKey: .contents) | ||
| } else { | ||
| let text = "UC|\(newComment.selectedText)|\(newComment.text)|\(newComment.id.uuidString)" | ||
| underline.contents = text | ||
| textInputed = true | ||
| } |
There was a problem hiding this comment.
Comment에 사용되는 Underline annotation에 정보를 저장합니다.
Dorii0513
requested changes
Feb 2, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
변경 사항
AnnotationCollection엔티티 추가스크린샷 or 영상 링크
팀원에게 전달할 사항(Optional)
close #459