[Feat] 4.0 HomeView Design 반영

Domain/Entities/PaperInfo.swift

@@ -7,8 +7,10 @@
 
 import Foundation
 import UIKit
+import CoreTransferable
 
-struct PaperInfo: Identifiable, Hashable {
+struct PaperInfo: Identifiable, Hashable, Codable, Transferable {
+
     let id: UUID
     var title: String
     let thumbnail: Data
@@ -45,6 +47,10 @@ struct PaperInfo: Identifiable, Hashable {
         self.tags = tags
     }
 
+    static var transferRepresentation: some TransferRepresentation {
+        CodableRepresentation(contentType: .text)
+    }
+
     public static var sampleData: Self {
         let url = try! Bundle.main.url(forResource: "Reazy Sample Paper", withExtension: "pdf")!.bookmarkData()
         let thumbnail = UIImage(resource: .testThumbnail).pngData()!

Domain/Entities/Tag.swift

@@ -6,8 +6,10 @@
 //
 
 import Foundation
+import CoreTransferable
 
-struct Tag: DynamicCell {
+struct Tag: DynamicCell, Codable, Transferable {
+
     let id: UUID
     var name: String
 
@@ -20,4 +22,8 @@ struct Tag: DynamicCell {
         let count = self.name.count
         return CGFloat(10 + count * 10)
     }
+
+    static var transferRepresentation: some TransferRepresentation {
+        CodableRepresentation(contentType: .text)
+    }
 }

Presentation/Home/HomeListView.swift

@@ -10,98 +10,16 @@ import SwiftUI
 struct HomeListView: View {
     @EnvironmentObject private var homeViewModel: HomeViewModel
     @Binding var createFolder: Bool
-    @Binding var selectedFolderID: UUID?
     @State private var expandedFolders: Set<UUID> = []
 
-    @State private var isMainSelected: Bool = true
-    @State private var isFavoriteSelected: Bool = false
-    @State private var isTagSelected: Bool = false
+    @State private var selectedCategory: CategorySelection = .main
 
     var body: some View {
         VStack(spacing: 0) {
             VStack(spacing: 0) {
-                RoundedRectangle(cornerRadius: 12)
-                    .foregroundStyle(isMainSelected ? Color(hex: "EFEFF8") : .clear)
-                    .frame(height: 43)
-                    .overlay {
-                        HStack(spacing: 0) {
-                            Image(systemName: isMainSelected ? "text.page.fill" : "text.page")
-                                .font(.system(size: 18))
-                                .foregroundStyle(isMainSelected ? .primary1 : .gray700)
-                                .padding(.trailing, 11)
-
-                            Text("전체")
-                                .reazyFont(isMainSelected ? .button1 : .text1)
-                                .foregroundStyle(isMainSelected ? .primary1 : .gray700)
-
-                            Spacer()
-                        }
-                        .padding(.leading, 20)
-                    }
-                    .onTapGesture {
-                        self.isMainSelected = true
-                        self.isFavoriteSelected = false
-                        self.isTagSelected = false
-                        homeViewModel.isFavoriteSelected = false
-                        homeViewModel.isTagSelected = false
-                    }
-                    .padding(.bottom, 3)
-
-                RoundedRectangle(cornerRadius: 12)
-                    .foregroundStyle(isFavoriteSelected ? Color(hex: "EFEFF8") : .clear)
-                    .frame(height: 43)
-                    .overlay {
-                        HStack(spacing: 0) {
-                            Image(isFavoriteSelected ? "starfill" : "star")
-                                .renderingMode(.template)
-                                .resizable()
-                                .scaledToFit()
-                                .frame(width: 18, height: 18)
-                                .foregroundStyle(isFavoriteSelected ? .primary1 : .gray700)
-                                .padding(.trailing, 11)
-
-                            Text("즐겨찾기")
-                                .reazyFont(isFavoriteSelected ? .button1 : .text1)
-                                .foregroundStyle(isFavoriteSelected ? .primary1 : .gray700)
-
-                            Spacer()
-                        }
-                        .padding(.leading, 20)
-                    }
-                    .onTapGesture {
-                        self.isMainSelected = false
-                        self.isFavoriteSelected = true
-                        self.isTagSelected = false
-                        homeViewModel.isFavoriteSelected = true
-                        homeViewModel.isTagSelected = false
-                    }
-                    .padding(.bottom, 3)
-
-                RoundedRectangle(cornerRadius: 12)
-                    .foregroundStyle(isTagSelected ? Color(hex: "EFEFF8") : .clear)
-                    .frame(height: 43)
-                    .overlay {
-                        HStack(spacing: 0) {
-                            Image(systemName: isTagSelected ? "tag.fill" : "tag")
-                                .font(.system(size: 14))
-                                .foregroundStyle(isTagSelected ? .primary1 : .gray700)
-                                .padding(.trailing, 11)
-
-                            Text("태그")
-                                .reazyFont(isTagSelected ? .button1 : .text1)
-                                .foregroundStyle(isTagSelected ? .primary1 : .gray700)
-
-                            Spacer()
-                        }
-                        .padding(.leading, 20)
-                    }
-                    .onTapGesture {
-                        self.isMainSelected = false
-                        self.isFavoriteSelected = false
-                        self.isTagSelected = true
-                        homeViewModel.isFavoriteSelected = false
-                        homeViewModel.isTagSelected = true
-                    }
+                categoryButton(icon: "text.page", selectedIcon: "text.page.fill", title: "전체", category: .main)
+                categoryButton(image: "star", selectedImage: "starfill", title: "즐겨찾기", category: .favorite)
+                categoryButton(icon: "tag", selectedIcon: "tag.fill", title: "태그", category: .tag)
             }
             .padding(.leading, 10)
             .padding(.trailing, 12)
@@ -133,6 +51,8 @@ struct HomeListView: View {
                     }
                 }
                 .padding(.bottom, 14)
+                .padding(.leading, 20)
+                .padding(.trailing, 6)
 
                 ScrollView {
                     VStack(spacing: 0) {
@@ -144,22 +64,73 @@ struct HomeListView: View {
                                 childFolders: childFolders(of:),
                                 toggleExpansion: toggleExpansion,
                                 hasChildren: hasChildren(folder:),
-                                selectedFolderID: $selectedFolderID
+                                selectedFolderID: $homeViewModel.selectedFolderID,
+                                didSelectFolder: { folderID in
+                                    selectedCategory = .folder(folderID)
+                                    homeViewModel.selectCategory(.folder(folderID))
+                                },
+                                handleDrop: handleDrop(to:droppedItem:)
                             )
                             .padding(.top, 10)
                         }
                     }
                 }
+                .listStyle(PlainListStyle())
+                .scrollContentBackground(.hidden)
+                .background(Color.clear)
             }
-            .padding(.leading, 30)
-            .padding(.trailing, 16)
+            .padding(.leading, 10)
+            .padding(.trailing, 10)
 
             Spacer()
         }
         .padding(.top, 24)
         .background(.primary2)
     }
 
+    private func categoryButton(
+        icon: String? = nil,
+        selectedIcon: String? = nil,
+        image: String? = nil,
+        selectedImage: String? = nil,
+        title: String,
+        category: CategorySelection
+    ) -> some View {
+        RoundedRectangle(cornerRadius: 12)
+            .foregroundStyle(selectedCategory == category ? Color(hex: "EFEFF8") : .clear)
+            .frame(height: 43)
+            .overlay {
+                HStack(spacing: 0) {
+                    if let icon = icon, let selectedIcon = selectedIcon {
+                        Image(systemName: selectedCategory == category ? selectedIcon : icon)
+                            .font(.system(size: 18))
+                            .foregroundStyle(selectedCategory == category ? .primary1 : .gray700)
+                            .padding(.trailing, 11)
+                    } else if let image = image, let selectedImage = selectedImage {
+                        Image(selectedCategory == category ? selectedImage : image)
+                            .renderingMode(.template)
+                            .resizable()
+                            .scaledToFit()
+                            .frame(width: 18, height: 18)
+                            .foregroundStyle(selectedCategory == category ? .primary1 : .gray700)
+                            .padding(.trailing, 11)
+                    }
+
+                    Text(title)
+                        .reazyFont(selectedCategory == category ? .button1 : .text1)
+                        .foregroundStyle(selectedCategory == category ? .primary1 : .gray700)
+
+                    Spacer()
+                }
+                .padding(.leading, 20)
+            }
+            .onTapGesture {
+                selectedCategory = category
+                homeViewModel.selectCategory(category)
+            }
+            .padding(.bottom, 3)
+    }
+
     private var rootFolders: [Folder] {
         homeViewModel.folders.filter { $0.parentFolderID == nil }
     }
@@ -173,10 +144,18 @@ struct HomeListView: View {
     }
 
     private func toggleExpansion(_ folder: Folder) {
-        if expandedFolders.contains(folder.id) {
-            expandedFolders.remove(folder.id)
-        } else {
-            expandedFolders.insert(folder.id)
+        withAnimation {
+            if expandedFolders.contains(folder.id) {
+                expandedFolders.remove(folder.id)
+            } else {
+                expandedFolders.insert(folder.id)
+            }
+        }
+    }
+
+    private func handleDrop(to folderId: UUID, droppedItem: PaperInfo) {
+        DispatchQueue.main.async {
+            homeViewModel.updatePaperLocation(at: droppedItem.id, folderID: folderId)
         }
     }
 }
@@ -190,8 +169,9 @@ private struct FolderListCell: View {
     let childFolders: (UUID) -> [Folder]
     let toggleExpansion: (Folder) -> Void
     let hasChildren: (Folder) -> Bool
-
     @Binding var selectedFolderID: UUID?
+    var didSelectFolder: (UUID) -> Void
+    var handleDrop: (UUID, PaperInfo) -> Void
 
     var body: some View {
         VStack(spacing: 0) {
@@ -205,6 +185,7 @@ private struct FolderListCell: View {
                             .scaledToFit()
                             .frame(width: 11.43, height: 9.13)
                     )
+                    .padding(.leading, 20)
                     .padding(.trailing, 10)
 
                 VStack(spacing: 0) {
@@ -219,15 +200,14 @@ private struct FolderListCell: View {
 
                         if hasChildren(folder) {
                             Button(action: {
-                                withAnimation {
-                                    toggleExpansion(folder)
-                                }
+                                toggleExpansion(folder)
                             }) {
                                 Image(systemName: expandedFolders.contains(folder.id) ? "chevron.down" : "chevron.right")
                                     .font(.system(size: 12, weight: .medium))
                                     .foregroundStyle(.gray600)
                                     .padding(.trailing, 4)
                             }
+                            .padding(.trailing, 10)
                         }
                     }
 
@@ -239,7 +219,14 @@ private struct FolderListCell: View {
             .clipShape(RoundedRectangle(cornerRadius: 12))
             .contentShape(Rectangle())
             .onTapGesture {
-                onTap()
+                didSelectFolder(folder.id)
+            }
+            .dropDestination(for: PaperInfo.self) { droppedItems, location in
+                if let droppedItem = droppedItems.first {
+                    handleDrop(folder.id, droppedItem)
+                    return true
+                }
+                return false
             }
 
             if expandedFolders.contains(folder.id) {
@@ -251,7 +238,9 @@ private struct FolderListCell: View {
                         childFolders: childFolders,
                         toggleExpansion: toggleExpansion,
                         hasChildren: hasChildren,
-                        selectedFolderID: $selectedFolderID
+                        selectedFolderID: $selectedFolderID,
+                        didSelectFolder: didSelectFolder,
+                        handleDrop: handleDrop
                     )
                     .transition(.move(edge: .top).combined(with: .opacity))
                     .padding(.top, 10)
@@ -261,18 +250,11 @@ private struct FolderListCell: View {
             }
         }
     }
-
-    private func onTap() {
-        if selectedFolderID != folder.id {
-            selectedFolderID = folder.id
-        }
-    }
 }
 
 
 #Preview {
     HomeListView(
-        createFolder: .constant(false),
-        selectedFolderID: .constant(nil)
+        createFolder: .constant(false)
     )
 }