선호 학과 정보 저장

SNUTT-2022/SNUTT/AppState/AppEnvironment.swift

@@ -129,7 +129,7 @@ extension AppEnvironment {
         let timetableService = TimetableService(appState: appState, webRepositories: webRepositories, localRepositories: localRepositories)
         let userService = UserService(appState: appState, webRepositories: webRepositories, localRepositories: localRepositories)
         let lectureService = LectureService(appState: appState, webRepositories: webRepositories, localRepositories: localRepositories)
-        let searchService = SearchService(appState: appState, webRepositories: webRepositories)
+        let searchService = SearchService(appState: appState, webRepositories: webRepositories, localRepositories: localRepositories)
         let globalUIService = GlobalUIService(appState: appState, localRepositories: localRepositories, webRepositories: webRepositories)
         let courseBookService = CourseBookService(appState: appState, webRepositories: webRepositories)
         let authService = AuthService(appState: appState, webRepositories: webRepositories, localRepositories: localRepositories)

SNUTT-2022/SNUTT/AppState/States/SearchState.swift

@@ -12,6 +12,7 @@ class SearchState {
     @Published var isFilterOpen = false
     @Published var searchTagList: SearchTagList?
     @Published var selectedTagList: [SearchTag] = []
+    @Published var pinnedTagList: [SearchTag] = []
     @Published var selectedTimeRange: [SearchTimeMaskDto] = []
 
     @Published var displayMode: SearchDisplayMode = .search

SNUTT-2022/SNUTT/Assets/Assets.xcassets/Icons/department.xmark.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "exit@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "exit@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

SNUTT-2022/SNUTT/Repositories/UserDefaultsRepository.swift

@@ -20,6 +20,7 @@ enum STDefaultsKey: String {
     case userDto
     case fcmToken
     case preferredColorScheme
+    case recentDepartmentTags
 
     case currentTimetable
     case timetableConfig

SNUTT-2022/SNUTT/Services/SearchService.swift

@@ -28,11 +28,16 @@ protocol SearchServiceProtocol: Sendable {
 struct SearchService: SearchServiceProtocol {
     var appState: AppState
     var webRepositories: AppEnvironment.WebRepositories
+    var localRepositories: AppEnvironment.LocalRepositories
 
     var searchRepository: SearchRepositoryProtocol {
         webRepositories.searchRepository
     }
 
+    var userDefaultsRepository: UserDefaultsRepositoryProtocol {
+        localRepositories.userDefaultsRepository
+    }
+
     var searchState: SearchState {
         appState.search
     }
@@ -61,11 +66,27 @@ struct SearchService: SearchServiceProtocol {
         let dto = try await searchRepository.fetchTags(quarter: quarter)
         let model = SearchTagList(from: dto)
         appState.search.searchTagList = model
+        guard let recentTagNames = userDefaultsRepository.get([String].self, key: .recentDepartmentTags) else { return }
+        appState.search.pinnedTagList = model?.tagList.filter { $0.type == .department && recentTagNames.contains($0.text) } ?? []
+    }
+
+    private func _saveDepartmentTagsToUserDefaults(from tagList: [SearchTag]) async throws {
+        let departmentTags = tagList.filter { tag in tag.type == .department &&
+            !appState.search.pinnedTagList.contains { $0.text == tag.text }
+        }
+        var updatedTags = appState.search.pinnedTagList + departmentTags
+        if updatedTags.count > 5 {
+            updatedTags = Array(updatedTags.suffix(5))
+        }
+        appState.search.pinnedTagList = updatedTags
+        let savedTags = updatedTags.map { $0.text }
+        userDefaultsRepository.set([String].self, key: .recentDepartmentTags, value: savedTags)
     }
 
     private func _fetchSearchResult() async throws {
         guard let currentTimetable = timetableState.current else { return }
         let tagList = searchState.selectedTagList
+        try await _saveDepartmentTagsToUserDefaults(from: tagList)
         let timeList = tagList.contains(where: { $0.type == .time && TimeType(rawValue: $0.text) == .range }) ? searchState.selectedTimeRange : nil
         let excludedTimeList = tagList.contains(where: { $0.type == .time && TimeType(rawValue: $0.text) == .empty }) ? currentTimetable.timeMask : nil
         let offset = searchState.perPage * searchState.pageNum

SNUTT-2022/SNUTT/ViewModels/FilterSheetViewModel.swift

@@ -10,6 +10,7 @@ import SwiftUI
 class FilterSheetViewModel: BaseViewModel, ObservableObject {
     @Published var selectedTagList: [SearchTag] = []
     @Published var searchTagList: SearchTagList?
+    @Published var pinnedTagList: [SearchTag] = []
     @Published private var _selectedTimeRange: [SearchTimeMaskDto] = []
     @Published private var _isFilterOpen: Bool = false
 
@@ -36,6 +37,7 @@ class FilterSheetViewModel: BaseViewModel, ObservableObject {
         appState.search.$selectedTagList.assign(to: &$selectedTagList)
         appState.search.$selectedTimeRange.assign(to: &$_selectedTimeRange)
         appState.search.$searchTagList.assign(to: &$searchTagList)
+        appState.search.$pinnedTagList.assign(to: &$pinnedTagList)
         appState.search.$isFilterOpen.assign(to: &$_isFilterOpen)
     }
 
@@ -63,4 +65,9 @@ class FilterSheetViewModel: BaseViewModel, ObservableObject {
     func isSelected(tag: SearchTag) -> Bool {
         return appState.search.selectedTagList.contains(where: { $0.id == tag.id })
     }
+
+    func removePin(tag: SearchTag) {
+        guard let index = appState.search.pinnedTagList.firstIndex(where: { $0.id == tag.id }) else { return }
+        appState.search.pinnedTagList.remove(at: index)
+    }
 }

SNUTT-2022/SNUTT/Views/Components/FilterSheetContent.swift

         })) 
 func sheetGesture(_ translation: Binding<CGFloat>, dismiss: @escaping @MainActor () -> Void) -> some View { 
     if #available(iOS 18.0, *) { 
         gesture(SheetGestureRecognizer(translation: translation, dismiss: dismiss)) 
     } else { 
         highPriorityGesture(DragGesture().onChanged({ value in 
             translation.wrappedValue = value.translation.width 
         }).onEnded({ value in 
             translation.wrappedValue = 0 
             if value.velocity.width < -300 || value.translation.width < -100 { 
                 dismiss() 
             } 
         })) 
@@ -43,53 +43,17 @@ struct FilterSheetContent: View {
                 .padding(.horizontal, 10)
                 .padding(.vertical, 5)
 
-                Divider()
-
                 ScrollView {
                     LazyVStack {
-                        Group {
-                            ForEach(viewModel.filterTags(with: selectedCategory)) { tag in
-                                Button {
-                                    viewModel.toggle(tag)
-                                } label: {
-                                    HStack(alignment: .top) {
-                                        Image("checkmark.circle.\(viewModel.isSelected(tag: tag) ? "tick" : "untick")")
-                                            .resizable()
-                                            .scaledToFit()
-                                            .frame(width: 16)
-                                            .padding(.trailing, 3)
-                                        VStack(alignment: .leading, spacing: 6) {
-                                            Text(tag.text)
-                                                .font(STFont.regular14.font)
-                                                .frame(maxWidth: .infinity, alignment: .leading)
-                                                .contentShape(Rectangle())
-
-                                            if tag.text == TimeType.range.rawValue {
-                                                Group {
-                                                    if !$viewModel.selectedTimeRange.isEmpty {
-                                                        Text(viewModel.selectedTimeRange.map {
-                                                            $0.preciseTimeString
-                                                        }.joined(separator: "\n"))
-                                                            .underline()
-                                                            .lineSpacing(4)
-                                                    } else {
-                                                        Text("눌러서 선택하기")
-                                                            .underline()
-                                                    }
-                                                }
-                                                .font(STFont.regular12.font)
-                                                .foregroundColor(STColor.darkGray)
-                                                .onTapGesture { isTimeRangeSheetOpen = true }
-                                            }
-                                        }
-                                    }
-                                    .padding(.horizontal, 20)
-                                    .padding(.vertical, 7)
-                                }
-                                .buttonStyle(.plain)
+                        if selectedCategory == .department {
+                            ForEach(viewModel.pinnedTagList) {
+                                tag in FilterTagButton(tag: tag, isPinned: true, viewModel: viewModel, isTimeRangeSheetOpen: $isTimeRangeSheetOpen)
                             }
+                            Divider()
+                        }
+                        ForEach(viewModel.filterTags(with: selectedCategory)) { tag in
+                            FilterTagButton(tag: tag, isPinned: false, viewModel: viewModel, isTimeRangeSheetOpen: $isTimeRangeSheetOpen)
                         }
-                        .frame(maxWidth: .infinity)
                     }
                 }
                 .id(selectedCategory) // rerender on change of category
@@ -133,6 +97,58 @@ struct FilterSheetContent: View {
     }
 }
 
+struct FilterTagButton: View {
+    let tag: SearchTag
+    let isPinned: Bool
+    @ObservedObject var viewModel: FilterSheetViewModel
+    @Binding var isTimeRangeSheetOpen: Bool
+
+    var body: some View {
+        Button {
+            viewModel.toggle(tag)
+        } label: {
+            HStack(alignment: .top) {
+                Image("checkmark.circle.\(viewModel.isSelected(tag: tag) ? "tick" : "untick")")
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: 16)
+                    .padding(.trailing, 3)
+                VStack(alignment: .leading, spacing: 6) {
+                    Text(tag.text)
+                        .font(STFont.regular14.font)
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                        .contentShape(Rectangle())
+
+                    if tag.text == TimeType.range.rawValue {
+                        Group {
+                            if !viewModel.selectedTimeRange.isEmpty {
+                                Text(viewModel.selectedTimeRange.map {
+                                    $0.preciseTimeString
+                                }.joined(separator: "\n"))
+                                    .underline()
+                                    .lineSpacing(4)
+                            } else {
+                                Text("눌러서 선택하기")
+                                    .underline()
+                            }
+                        }
+                        .font(STFont.regular12.font)
+                        .foregroundColor(STColor.darkGray)
+                        .onTapGesture { isTimeRangeSheetOpen = true }
+                    }
+                }
+                if isPinned {
+                    Image("department.xmark")
+                        .onTapGesture { viewModel.removePin(tag: tag) }
+                }
+            }
+            .padding(.horizontal, 20)
+            .padding(.vertical, 7)
+        }
+        .buttonStyle(.plain)
+    }
+}
+
 #if DEBUG
     struct FilterSheetContent_Previews: PreviewProvider {
         static var previews: some View {