[Feat] 모아보기 기능 구현

Domain/Entities/AnnotationCollection.swift

@@ -0,0 +1,23 @@
+//
+//  AnnotationCollection.swift
+//  Reazy
+//
+//  Created by 문인범 on 2/1/25.
+//
+
+import Foundation
+
+
+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
+    }
+}

Presentation/Helper/NotificationCenter + Extension.swift

@@ -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")
 }

Presentation/MainPDF/ViewModel/MainPDFViewModel.swift

@@ -131,7 +131,10 @@ extension MainPDFViewModel {
 
             // 각 페이지의 모든 주석을 반복하며 밑줄과 코멘트 아이콘 지우기
             for annotation in page.annotations {
-                if annotation.value(forAnnotationKey: .contents) != nil {
+//                if annotation.value(forAnnotationKey: .contents) != nil {
+//                    page.removeAnnotation(annotation)
+//                }
+                if let a = annotation.contents, a.split(separator: "|")[0] != "UH" {
                     page.removeAnnotation(annotation)
                 }
             }
@@ -206,6 +209,7 @@ extension MainPDFViewModel {
         guard let page = selections.first?.pages.first else { return }
 
         let highlightColor = color.uiColor
+        let id = UUID()
 
         selections.forEach { selection in
 
@@ -236,7 +240,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)"
+
             page.addAnnotation(highlight)
             pdfDrawer.annotationHistory.append((action: .add(highlight), annotation: highlight, page: page))
         }

Presentation/OriginalPaper/Menus/Collection/AnnotationCollectionCell.swift

@@ -0,0 +1,75 @@
+//
+//  AnnotationCollectionCell.swift
+//  Reazy
+//
+//  Created by 문인범 on 1/31/25.
+//
+
+import SwiftUI
+
+
+struct AnnotationCollectionCell: View {
+    let annotation: AnnotationCollection
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            if annotation.annotation == .comment {
+                HStack(spacing: 0) {
+                    Rectangle()
+                        .foregroundStyle(.point4)
+                        .frame(width: 1, height: 35)
+                        .padding(.trailing, 8)
+
+                    Text(annotation.commenText ?? "알 수 없음")
+                        .font(.custom(ReazyFontType.pretendardMediumFont, size: 12))
+                        .foregroundStyle(.point4)
+                        .lineSpacing(5)
+                        .lineLimit(2)
+                }
+                .padding(.bottom, 12)
+            }
+
+            Text(annotation.contents)
+                .lineSpacing(5)
+                .lineLimit(9)
+        }
+        .onTapGesture {
+            NotificationCenter.default.post(name: .didSelectAnnotationCollection, object: nil, userInfo: ["index": annotation.pageIndex])
+        }
+    }
+}
+
+
+
+#Preview {
+    var attributedString = AttributedString(stringLiteral: "테스트 컨텐츠입니다. 테스트 컨텐츠입니다.테스트 컨텐츠입니다.테스트 컨텐츠입니다.테스트 컨텐츠입니다.")
+
+    let attributes: AttributeContainer = .init([
+        .backgroundColor: UIColor.red,
+        .font: UIFont.init(name: ReazyFontType.pretendardRegularFont, size: 12)!,
+    ])
+
+    attributedString.setAttributes(attributes)
+
+    let highlight = AnnotationCollection(
+        id: "",
+        annotation: .highlight,
+        commenText: nil,
+        contents: attributedString,
+        pageIndex: 0
+    )
+
+    let comment = AnnotationCollection(
+        id: "",
+        annotation: .comment,
+        commenText: "테스트 코멘트 입니다.테스트 코멘트 입니다.",
+        contents: "테스트 컨텐츠입니다. 테스트 컨텐츠입니다.테스트 컨텐츠입니다.테스트 컨텐츠입니다.테스트 컨텐츠입니다.",
+        pageIndex: 0
+    )
+
+    return Group {
+        AnnotationCollectionCell(annotation: highlight)
+        Divider()
+        AnnotationCollectionCell(annotation: comment)
+    }
+}

Presentation/OriginalPaper/Menus/Collection/AnnotationCollectionView.swift

@@ -0,0 +1,38 @@
+//
+//  AnnotationCollectionView.swift
+//  Reazy
+//
+//  Created by 문인범 on 1/31/25.
+//
+
+import SwiftUI
+
+
+struct AnnotationCollectionView: View {
+    @StateObject private var viewModel: AnnotationCollectionViewModel = .init()
+
+    var body: some View {
+        ScrollView {
+            VStack {
+                ForEach(viewModel.annotations) { annotation in
+                    AnnotationCollectionCell(annotation: annotation)
+
+                    divider
+                        .padding(.vertical, 16)
+                }
+            }
+            .padding(.top, 20)
+            .padding(.horizontal, 24)
+        }
+        .onAppear {
+            viewModel.fetchData()
+        }
+    }
+
+
+    private var divider: some View {
+        Rectangle()
+            .foregroundStyle(.gray500)
+            .frame(height: 1)
+    }
+}

Presentation/OriginalPaper/Menus/Collection/AnnotationCollectionViewModel.swift

@@ -0,0 +1,120 @@
+//
+//  AnnotationCollectionViewModel.swift
+//  Reazy
+//
+//  Created by 문인범 on 1/31/25.
+//
+
+import Foundation
+import UIKit
+
+
+final class AnnotationCollectionViewModel: ObservableObject {
+    @Published public var annotations: [AnnotationCollection] = []
+
+
+    public func fetchData() {
+        guard let document = PDFSharedData.shared.document else { return }
+        let pageCount = document.pageCount
+
+        var resultText = ""
+        var currentId = ""
+        var currentContents = ""
+
+        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 = ""
+            }
+        }
+    }
+
+
+
+    private func extractAnnotation(contents: String, body: String, index: Int) {
+        let splitedContents = contents.split(separator: "|")
+
+        let id = splitedContents.last!
+
+        switch splitedContents[0] == "UH" {
+        case true:
+            guard let color = HighlightColors(rawValue: String(splitedContents[2])) else { break }
+            var attributedString = AttributedString(body)
+            let container = AttributeContainer([
+                .backgroundColor: color.uiColor,
+                .font: UIFont(name: "Pretendard-Regular", size: 12)!
+            ])
+
+            attributedString.setAttributes(container)
+
+            let annotation = AnnotationCollection(
+                id: String(id),
+                annotation: .highlight,
+                commenText: nil,
+                contents: attributedString,
+                pageIndex: index
+            )
+
+            self.annotations.append(annotation)
+        case false:
+            let commentText = splitedContents[2]
+
+            var attributedString = AttributedString(commentText)
+            let container = AttributeContainer([
+                .font: UIFont(name: "Pretendard-Medium", size: 12)!,
+                .foregroundColor: UIColor.point2,
+            ])
+
+            attributedString.setAttributes(container)
+
+            let annotation = AnnotationCollection(
+                id: String(id),
+                annotation: .comment,
+                commenText: body,
+                contents: attributedString,
+                pageIndex: index
+            )
+
+            self.annotations.append(annotation)
+        }
+    }
+}

Presentation/OriginalPaper/Menus/Comment/ViewModel/CommentViewModel.swift

@@ -485,6 +485,8 @@ extension CommentViewModel {
     }
 
     func drawUnderline(newComment: Comment) {
+        var textInputed = false
+
         for index in newComment.pages {
             guard let page = document?.page(at: index) else { continue }
 
@@ -514,7 +516,13 @@ extension CommentViewModel {
 
                 let underline = lineAnnotation(bounds: bounds, forType: .line, withProperties: nil)
 
-                underline.setValue(newComment.id.uuidString, forAnnotationKey: .contents)
+                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
+                }
                 page.addAnnotation(underline)
             }
         }

Presentation/OriginalPaper/Menus/MenuView.swift

@@ -16,12 +16,18 @@ struct MenuView: View {
             HStack(spacing: 0) {
                 TabButton(title: "목차", selectedTab: $selectedTab)
                 TabButton(title: "페이지", selectedTab: $selectedTab)
+                TabButton(title: "주석", selectedTab: $selectedTab)
             }
 
-            if selectedTab == "목차" {
+            switch selectedTab {
+            case "목차":
                 IndexView()
-            } else {
+            case "페이지":
                 PageListView()
+            case "주석":
+                AnnotationCollectionView()
+            default:
+                EmptyView()
             }
         }
     }
@@ -41,7 +47,7 @@ struct TabButton: View {
                 Text(title)
                     .reazyFont(selectedTab == title ? .body3 : .text5)
                     .foregroundStyle(selectedTab == title ? .primary1 : .gray600)
-                    .frame(width: 126, height: 36)
+                    .frame(width: 84, height: 36)
 
                 Rectangle()
                     .frame(height: 2)

Presentation/OriginalPaper/OriginalViewController.swift

@@ -387,6 +387,15 @@ extension OriginalViewController {
                 }
                 .store(in: &self.cancellable)
         }
+
+        NotificationCenter.default.publisher(for: .didSelectAnnotationCollection)
+            .sink { [weak self] noti in
+                guard let index = noti.userInfo?["index"] as? Int,
+                      let page = self?.mainPDFView.document?.page(at: index) else { return }
+
+                self?.mainPDFView.go(to: page)
+            }
+            .store(in: &self.cancellable)
     }
 }
 
@@ -452,7 +461,9 @@ extension OriginalViewController: UIGestureRecognizerDelegate {
             commentViewModel.isMenuTapped = false
 
             if viewModel.isCommentTapped, let buttonID = tappedAnnotation.contents {
-                viewModel.selectedComments = commentViewModel.comments.filter { $0.buttonId.uuidString == buttonID }
+                let a = buttonID.split(separator: "|")
+
+                viewModel.selectedComments = commentViewModel.comments.filter { $0.buttonId.uuidString == (a.count > 1 ? a.last! : a[0]) }
                 commentViewModel.setCommentPosition(selectedComments: viewModel.selectedComments, pdfView: mainPDFView)
             }
             viewModel.setHighlight(selectedComments: viewModel.selectedComments, isTapped: viewModel.isCommentTapped)