[fix] #196 검색 ui 변경사항 반영

Author: ShapeKim98

Projects/DSKit/Sources/Components/PokitCalendar.swift

@@ -181,6 +181,7 @@ public struct PokitCalendar: View {
         let isSelected = isStartDate || isEndDate
         let backgoundColor: Color = .pokit(.bg(.brand)).opacity(isSelected ? 1 : isContains ? 0.2 : 0)
         let day = calendar.component(.day, from: date)
+        let isFuture = date > .now
 
         Button {
             dayButtonTapped(
@@ -192,13 +193,14 @@ public struct PokitCalendar: View {
         } label: {
             Text("\(day)")
                 .pokitFont(.b1(.m))
-                .foregroundStyle(isCurrentMonth ? textColor : .pokit(.text(.tertiary)))
+                .foregroundStyle(isCurrentMonth && !isFuture ? textColor : .pokit(.text(.tertiary)))
                 .frame(width: width, height: width)
                 .background {
                     RoundedRectangle(cornerRadius: 8, style: .continuous)
                         .fill(backgoundColor)
                 }
         }
+        .disabled(isFuture)
     }
 
     private func dates(_ date: Date) -> [Date] {

Projects/Feature/FeatureSetting/Sources/Search/PokitSearchFeature.swift

@@ -96,8 +96,8 @@ public struct PokitSearchFeature {
             case 카테고리_버튼_눌렀을때
             case 모아보기_버튼_눌렀을때
             case 기간_버튼_눌렀을때
-            case 카테고리_태그_눌렀을때(category: BaseCategoryItem)
-            case 즐겨찾기_태그_눌렀을때
+            case 카테고리_태그_눌렀을때
+            case 컨텐츠_타입_태그_눌렀을때
             case 안읽음_태그_눌렀을때
             case 전체_삭제_버튼_눌렀을때
             case 정렬_버튼_눌렀을때
@@ -236,17 +236,7 @@ private extension PokitSearchFeature {
             return .send(.inner(.filterBottomSheet(filterType: .contentType)))
 
         case .기간_버튼_눌렀을때:
-            guard
-                state.domain.condition.startDate != nil &&
-                state.domain.condition.endDate != nil
-                /// - 선택된 기간이 없을 경우
-            else { return .send(.inner(.filterBottomSheet(filterType: .date))) }
-            state.domain.condition.startDate = nil
-            state.domain.condition.endDate = nil
-            return .run { send in
-                await send(.inner(.기간_업데이트(startDate: nil, endDate: nil)))
-                await send(.inner(.페이징_초기화), animation: .pokitDissolve)
-            }
+            return .send(.inner(.filterBottomSheet(filterType: .date)))
 
         case .카테고리_버튼_눌렀을때:
             return .send(.inner(.filterBottomSheet(filterType: .pokit)))
@@ -287,20 +277,14 @@ private extension PokitSearchFeature {
 
             return .merge(effectBox)
 
-        case let .카테고리_태그_눌렀을때(category):
-            state.categoryFilter.remove(category)
-            return .run { send in
-                await send(.inner(.카테고리_ID_목록_업데이트))
-                await send(.inner(.페이징_초기화))
-            }
+        case .카테고리_태그_눌렀을때:
+            return .send(.inner(.filterBottomSheet(filterType: .pokit)))
 
-        case .즐겨찾기_태그_눌렀을때:
-            state.domain.condition.favorites = false
-            return .send(.inner(.페이징_초기화))
+        case .컨텐츠_타입_태그_눌렀을때:
+            return .send(.inner(.filterBottomSheet(filterType: .contentType)))
 
         case .안읽음_태그_눌렀을때:
-            state.domain.condition.isRead = false
-            return .send(.inner(.페이징_초기화))
+            return .send(.inner(.filterBottomSheet(filterType: .contentType)))
 
         case .로딩중일때:
             return .send(.async(.컨텐츠_검색_페이징_API))

Projects/Feature/FeatureSetting/Sources/Search/PokitSearchView.swift

@@ -111,28 +111,31 @@ private extension PokitSearchView {
         .padding(.horizontal, 20)
     }
 
+    @ViewBuilder
     var recentSearch: some View {
-        VStack(spacing: 20) {
-            recentSearchTitle
-            
-            if store.isSearching {
-                filterToolbar
-            } else if store.isAutoSaveSearch {
-                if store.recentSearchTexts.isEmpty {
-                    Text("검색 내역이 없습니다.")
+        if store.isSearching {
+            filterToolbar
+        } else {
+            VStack(spacing: 20) {
+                recentSearchTitle
+                
+                if store.isAutoSaveSearch {
+                    if store.recentSearchTexts.isEmpty {
+                        Text("검색 내역이 없습니다.")
+                            .pokitFont(.b3(.r))
+                            .foregroundStyle(.pokit(.text(.tertiary)))
+                            .pokitBlurReplaceTransition(.pokitDissolve)
+                            .padding(.vertical, 5)
+                    } else {
+                        recentSearchList
+                    }
+                } else {
+                    Text("최근 검색 저장 기능이 꺼져있습니다.")
                         .pokitFont(.b3(.r))
                         .foregroundStyle(.pokit(.text(.tertiary)))
                         .pokitBlurReplaceTransition(.pokitDissolve)
                         .padding(.vertical, 5)
-                } else {
-                    recentSearchList
                 }
-            } else {
-                Text("최근 검색 저장 기능이 꺼져있습니다.")
-                    .pokitFont(.b3(.r))
-                    .foregroundStyle(.pokit(.text(.tertiary)))
-                    .pokitBlurReplaceTransition(.pokitDissolve)
-                    .padding(.vertical, 5)
             }
         }
     }
@@ -195,68 +198,64 @@ private extension PokitSearchView {
         )
     }
 
+    @ViewBuilder
     var categoryFilterButton: some View {
-        Group {
-            if store.categoryFilter.isEmpty {
-                PokitIconRChip(
-                    "포킷",
-                    icon: .icon(.arrowDown),
-                    state: .default(.primary),
-                    size: .small,
-                    action: { send(.카테고리_버튼_눌렀을때) }
-                )
-            } else {
-                ForEach(store.categoryFilter) { category in
-                    PokitIconRChip(
-                        category.categoryName,
-                        state: .stroke(.primary),
-                        size: .small,
-                        action: { send(.카테고리_태그_눌렀을때(category: category), animation: .pokitSpring) }
-                    )
-                    .pokitBlurReplaceTransition(.pokitDissolve)
-                }
-            }
+        if store.categoryFilter.isEmpty {
+            PokitIconRChip(
+                "포킷",
+                icon: .icon(.arrowDown),
+                state: .default(.primary),
+                size: .small,
+                action: { send(.카테고리_버튼_눌렀을때) }
+            )
+        } else {
+            let firstName = store.categoryFilter.first?.categoryName ?? ""
+            let text = store.categoryFilter.count == 1
+            ? firstName
+            : firstName + " 외 \(store.categoryFilter.count - 1)"
+            
+            PokitIconRChip(
+                text,
+                icon: .icon(.arrowDown),
+                state: .stroke(.primary),
+                size: .small,
+                action: { send(.카테고리_태그_눌렀을때, animation: .pokitSpring) }
+            )
+            .pokitBlurReplaceTransition(.pokitDissolve)
         }
     }
 
+    @ViewBuilder
     var contentTypeFilterButton: some View {
-        Group {
-            if !store.favoriteFilter && !store.unreadFilter {
-                PokitIconRChip(
-                    "모아보기",
-                    icon: .icon(.arrowDown),
-                    state: .default(.primary),
-                    size: .small,
-                    action: { send(.모아보기_버튼_눌렀을때) }
-                )
-            } else {
-                if store.favoriteFilter {
-                    PokitIconRChip(
-                        "즐겨찾기",
-                        state: .stroke(.primary),
-                        size: .small,
-                        action: { send(.즐겨찾기_태그_눌렀을때, animation: .pokitSpring) }
-                    )
-                    .pokitBlurReplaceTransition(.pokitDissolve)
-                }
-                
-                if store.unreadFilter {
-                    PokitIconRChip(
-                        "안읽음",
-                        state: .stroke(.primary),
-                        size: .small,
-                        action: { send(.안읽음_태그_눌렀을때, animation: .pokitSpring) }
-                    )
-                    .pokitBlurReplaceTransition(.pokitDissolve)
-                }
-            }
+        if !store.favoriteFilter && !store.unreadFilter {
+            PokitIconRChip(
+                "모아보기",
+                icon: .icon(.arrowDown),
+                state: .default(.primary),
+                size: .small,
+                action: { send(.모아보기_버튼_눌렀을때) }
+            )
+        } else {
+            let contentTypes = [
+                store.favoriteFilter ? "즐겨찾기" : nil,
+                store.unreadFilter ? "안읽음" : nil
+            ].compactMap(\.self).joined(separator: ", ")
+            
+            PokitIconRChip(
+                contentTypes,
+                icon: .icon(.arrowDown),
+                state: .stroke(.primary),
+                size: .small,
+                action: { send(.컨텐츠_타입_태그_눌렀을때, animation: .pokitSpring) }
+            )
+            .pokitBlurReplaceTransition(.pokitDissolve)
         }
     }
 
     var dateFilterButton: some View {
         PokitIconRChip(
             store.dateFilterText,
-            icon: store.dateFilterText == "기간" ? .icon(.arrowDown) : .icon(.x),
+            icon: .icon(.arrowDown),
             state: store.dateFilterText == "기간" ? .default(.primary) : .stroke(.primary),
             size: .small,
             action: { send(.기간_버튼_눌렀을때, animation: .pokitSpring) }