[fix] #183 정렬기능 수정

내부 필터 시트에서 작동하던 기능 외부로 이전

Author: stealmh

Projects/Feature/FeatureCategoryDetail/Sources/CategoryDetailFeature.swift

@@ -57,7 +57,6 @@ public struct CategoryDetailFeature {
         var isCategorySheetPresented: Bool = false
         var isCategorySelectSheetPresented: Bool = false
         var isPokitDeleteSheetPresented: Bool = false
-        var isFilterSheetPresented: Bool = false
         /// pagenation
         var hasNext: Bool {
             domain.contentList.hasNext
@@ -84,11 +83,13 @@ public struct CategoryDetailFeature {
             case dismiss
             case pagenation
 
+            /// 즐겨찾기 or 안읽음 버튼 눌렀을 때
+            case 분류_버튼_눌렀을때(SortCollectType)
+            case 정렬_버튼_눌렀을때
             case 공유_버튼_눌렀을때
             case 카테고리_케밥_버튼_눌렀을때
             case 카테고리_선택_버튼_눌렀을때
             case 카테고리_선택했을때(BaseCategoryItem)
-            case 필터_버튼_눌렀을때
             case 뷰가_나타났을때
             case 링크_추가_버튼_눌렀을때
         }
@@ -114,7 +115,6 @@ public struct CategoryDetailFeature {
         public enum ScopeAction {
             case categoryBottomSheet(PokitBottomSheet.Delegate)
             case categoryDeleteBottomSheet(PokitDeleteBottomSheet.Delegate)
-            case filterBottomSheet(CategoryFilterSheet.Delegate)
             case contents(IdentifiedActionOf<ContentCardFeature>)
         }
 
@@ -178,6 +178,31 @@ private extension CategoryDetailFeature {
         case .binding:
             return .none
 
+        case .정렬_버튼_눌렀을때:
+            state.sortType = state.sortType == .최신순
+            ? .오래된순
+            : .최신순
+            
+            state.domain.pageable.sort = [
+                state.sortType == .최신순 ? "createdAt,desc" : "createdAt,asc"
+            ]
+            
+            return .concatenate(
+                .send(.inner(.pagenation_초기화), animation: .pokitDissolve),
+                .send(.async(.카테고리_내_컨텐츠_목록_조회_API))
+            )
+            
+        case let .분류_버튼_눌렀을때(type):
+            if type == .즐겨찾기 {
+                state.domain.condition.isFavoriteFlitered.toggle()
+            } else {
+                state.domain.condition.isUnreadFlitered.toggle()
+            }
+            return .concatenate(
+                .send(.inner(.pagenation_초기화), animation: .pokitDissolve),
+                .send(.async(.카테고리_내_컨텐츠_목록_조회_API))
+            )
+            
         case .공유_버튼_눌렀을때:
             kakaoShareClient.카테고리_카카오톡_공유(
                 CategoryKaKaoShareModel(
@@ -206,10 +231,6 @@ private extension CategoryDetailFeature {
                 await send(.inner(.카테고리_선택_시트_활성화(false)))
             }
 
-        case .필터_버튼_눌렀을때:
-            state.isFilterSheetPresented.toggle()
-            return .none
-            
         case .dismiss:
             return .run { _ in await dismiss() }
 
@@ -365,8 +386,6 @@ private extension CategoryDetailFeature {
         /// - 카테고리에 대한 `공유` / `수정` / `삭제` Delegate
         case .categoryBottomSheet(let delegateAction):
             switch delegateAction {
-            case .shareCellButtonTapped:
-                return .none
             case .editCellButtonTapped:
                 return .run { [category = state.category] send in
                     await send(.inner(.카테고리_시트_활성화(false)))
@@ -394,25 +413,6 @@ private extension CategoryDetailFeature {
                     try await categoryClient.카테고리_삭제(categoryId)
                 }
             }
-        /// - 필터 버튼을 눌렀을 때
-        case .filterBottomSheet(let delegateAction):
-            switch delegateAction {
-            case .dismiss:
-                state.isFilterSheetPresented.toggle()
-                return .none
-            case let .확인_버튼_눌렀을때(type, bookMarkSelected, unReadSelected):
-                state.isFilterSheetPresented.toggle()
-                state.domain.pageable.sort = [
-                    type == .최신순 ? "createdAt,desc" : "createdAt,asc"
-                ]
-                state.sortType = type
-                state.domain.condition.isFavoriteFlitered = bookMarkSelected
-                state.domain.condition.isUnreadFlitered = unReadSelected
-                return .concatenate(
-                    .send(.inner(.pagenation_초기화), animation: .pokitDissolve),
-                    .send(.async(.카테고리_내_컨텐츠_목록_조회_API))
-                )
-            }
 
         case let .contents(.element(id: _, action: .delegate(.컨텐츠_항목_케밥_버튼_눌렀을때(content)))):
             return .send(.delegate(.contentItemTapped(content)))

Projects/Feature/FeatureCategoryDetail/Sources/CategoryDetailView.swift

@@ -64,14 +64,6 @@ public extension CategoryDetailView {
                     delegateSend: { store.send(.scope(.categoryDeleteBottomSheet($0))) }
                 )
             }
-            .sheet(isPresented: $store.isFilterSheetPresented) {
-                CategoryFilterSheet(
-                    sortType: $store.sortType,
-                    isBookMarkSelected: store.isFavoriteFiltered,
-                    isUnreadSeleected: store.isUnreadFiltered,
-                    delegateSend: { store.send(.scope(.filterBottomSheet($0))) }
-                )
-            }
             .task { await send(.뷰가_나타났을때).finish() }
         }
     }
@@ -172,24 +164,28 @@ private extension CategoryDetailView {
         HStack(spacing: 8) {
             PokitTextButton(
                 "즐겨찾기",
-                state: .filled(.primary),
+                state: store.isFavoriteFiltered
+                ? .filled(.primary)
+                : .default(.secondary),
                 size: .small,
                 shape: .round,
-                action: {}
+                action: { send(.분류_버튼_눌렀을때(.즐겨찾기)) }
             )
             PokitTextButton(
                 "안읽음",
-                state: .filled(.primary),
+                state: store.isUnreadFiltered
+                ? .filled(.primary)
+                : .default(.secondary),
                 size: .small,
                 shape: .round,
-                action: {}
+                action: { send(.분류_버튼_눌렀을때(.안읽음)) }
             )
 
             Spacer()
             PokitIconLTextLink(
-                "최신순",
+                store.sortType.title,
                 icon: .icon(.align),
-                action: {}
+                action: { send(.정렬_버튼_눌렀을때) }
             )
             .contentTransition(.numericText())
         }