Merge pull request #189 from YAPP-Github/feat/#183-pokit-detail

feat: [2.0.0] 버전 업데이트에 따른 기능 추가 및 수정(카테고리 상세)

Projects/App/Sources/MainTab/MainTabPath.swift

@@ -171,6 +171,11 @@ public extension MainTabFeature {
                 state.path.append(.링크추가및수정(ContentSettingFeature.State(urlText: state.link)))
                 state.link = nil
                 return .none
+
+            case let .path(.element(_, action: .카테고리상세(.delegate(.링크추가(categoryId))))):
+                state.categoryId = categoryId
+                state.path.append(.링크추가및수정(ContentSettingFeature.State()))
+                return .none
 
             /// - 링크추가 및 수정에서 저장하기 눌렀을 때
             case let .path(.element(stackElementId, action: .링크추가및수정(.delegate(.저장하기_완료(contentId))))):

Projects/DSKit/Sources/Components/PokitBottomSheet.swift

@@ -8,13 +8,14 @@
 import SwiftUI
 
 public struct PokitBottomSheet: View {
+    @State
+    private var height: CGFloat
     private let items: [Item]
-    private let height: CGFloat
     private let delegateSend: ((PokitBottomSheet.Delegate) -> Void)?
 
     public init(
         items: [Item],
-        height: CGFloat,
+        height: CGFloat = 0,
         delegateSend: ((PokitBottomSheet.Delegate) -> Void)?
     ) {
         self.items = items
@@ -30,6 +31,16 @@ public struct PokitBottomSheet: View {
         .presentationDetents([.height(height)])
         .pokitPresentationCornerRadius()
         .pokitPresentationBackground()
+        .readHeight()
+        .onPreferenceChange(HeightPreferenceKey.self) { height in
+            if let height {
+                print("height:", height)
+                self.height = height
+            }
+        }
+        .ignoresSafeArea(.all)
+        .padding(.top, 12)
+        .padding(.bottom, -20)
     }
 
     @ViewBuilder
@@ -120,3 +131,18 @@ public extension PokitBottomSheet {
     }
 }
 
+@available(iOS 18.0, *)
+#Preview {
+    @Previewable
+    @State var isPresented: Bool = true
+
+    ZStack {
+        Color.green.ignoresSafeArea()
+    }
+    .sheet(isPresented: $isPresented) {
+        PokitBottomSheet(
+            items: [.share, .edit, .delete],
+            delegateSend: { _ in }
+        )
+    }
+}

Projects/DSKit/Sources/Components/PokitCaution.swift

@@ -10,19 +10,21 @@ import SwiftUI
 public enum CautionType {
     case 카테고리없음
     case 미분류_링크없음
+    case 포킷상세_링크없음
     case 링크없음
     case 즐겨찾기_링크없음
     case 링크부족
     case 알림없음
 
     var image: PokitImage.Character {
         switch self {
-        case .카테고리없음, .링크없음, .즐겨찾기_링크없음, .미분류_링크없음:
-            return .empty
         case .링크부족:
             return .sad
+
         case .알림없음:
             return .pooki
+
+        default: return .empty
         }
     }
 
@@ -32,7 +34,7 @@ public enum CautionType {
             return "저장된 포킷이 없어요!"
         case .미분류_링크없음:
             return "미분류 링크가 없어요!"
-        case .링크없음:
+        case .링크없음, .포킷상세_링크없음:
             return "저장된 링크가 없어요!"
         case .즐겨찾기_링크없음:
             return "즐겨찾기 링크가 없어요!"
@@ -49,6 +51,8 @@ public enum CautionType {
             return "포킷을 생성해 링크를 저장해보세요"
         case .미분류_링크없음:
             return "링크를 포킷에 깔끔하게 분류하셨어요"
+        case .포킷상세_링크없음:
+            return "포킷에 링크를 저장해보세요"
         case .링크없음:
             return "다양한 링크를 한 곳에 저장해보세요"
         case .즐겨찾기_링크없음:
@@ -64,7 +68,7 @@ public enum CautionType {
         switch self {
         case .카테고리없음:
             return "포킷 추가하기"
-        case .미분류_링크없음:
+        case .미분류_링크없음, .포킷상세_링크없음:
             return "링크 추가하기"
         default: return nil
         }

Projects/DSKit/Sources/Modifiers/PokitFloatButtonModifier.swift

@@ -0,0 +1,44 @@
+//
+//  PokitFloatButtonModifier.swift
+//  DSKit
+//
+//  Created by 김민호 on 1/16/25.
+//
+import SwiftUI
+
+private struct PokitFloatButtonModifier: ViewModifier {
+    let action: () -> Void
+
+    func body(content: Content) -> some View {
+        content
+            .overlay(alignment: .bottomTrailing) {
+                Button(action: action) {
+                    Image(.icon(.plus))
+                        .resizable()
+                        .frame(width: 36, height: 36)
+                        .padding(12)
+                        .foregroundStyle(.pokit(.icon(.inverseWh)))
+                        .background {
+                            RoundedRectangle(cornerRadius: 9999, style: .continuous)
+                                .fill(.pokit(.bg(.brand)))
+                        }
+                        .frame(width: 60, height: 60)
+                }
+                .padding(.trailing, 20)
+                .padding(.bottom, 39)
+            }
+    }
+}
+
+public extension View {
+    func pokitFloatButton(action: @escaping () -> Void) -> some View {
+        return self.modifier(PokitFloatButtonModifier(action: action))
+    }
+}
+
+#Preview {
+    ZStack {
+        Color.black.ignoresSafeArea()
+            .pokitFloatButton(action: {})
+    }
+}

Projects/Feature/FeatureCategoryDetail/Sources/CategoryDetailFeature.swift

@@ -40,6 +40,9 @@ public struct CategoryDetailFeature {
         var isFavoriteFiltered: Bool {
             get { domain.condition.isFavoriteFlitered }
         }
+        var isFavoriteCategory: Bool {
+            get { domain.category.isFavorite }
+        }
 
         var sortType: SortType = .최신순
         var categories: IdentifiedArrayOf<BaseCategoryItem>? {
@@ -57,7 +60,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
@@ -83,11 +85,16 @@ public struct CategoryDetailFeature {
             case binding(BindingAction<State>)
             case dismiss
             case pagenation
+
+            /// 즐겨찾기 or 안읽음 버튼 눌렀을 때
+            case 분류_버튼_눌렀을때(SortCollectType)
+            case 정렬_버튼_눌렀을때
+            case 공유_버튼_눌렀을때
             case 카테고리_케밥_버튼_눌렀을때
             case 카테고리_선택_버튼_눌렀을때
             case 카테고리_선택했을때(BaseCategoryItem)
-            case 필터_버튼_눌렀을때
             case 뷰가_나타났을때
+            case 링크_추가_버튼_눌렀을때
         }
 
         public enum InnerAction: Equatable {
@@ -111,14 +118,14 @@ public struct CategoryDetailFeature {
         public enum ScopeAction {
             case categoryBottomSheet(PokitBottomSheet.Delegate)
             case categoryDeleteBottomSheet(PokitDeleteBottomSheet.Delegate)
-            case filterBottomSheet(CategoryFilterSheet.Delegate)
             case contents(IdentifiedActionOf<ContentCardFeature>)
         }
 
         public enum DelegateAction: Equatable {
             case contentItemTapped(BaseContentItem)
             case linkCopyDetected(URL?)
             case 링크수정(contentId: Int)
+            case 링크추가(categoryId: Int)
             case 포킷삭제
             case 포킷수정(BaseCategoryItem)
             case 포킷공유
@@ -174,6 +181,45 @@ 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(
+                    categoryName: state.domain.category.categoryName,
+                    categoryId: state.domain.category.id,
+                    imageURL: state.domain.category.categoryImage.imageURL
+                )
+            )
+            return .none
+
+        case .링크_추가_버튼_눌렀을때:
+            let id = state.category.id
+            return .send(.delegate(.링크추가(categoryId: id)))
+
         case .카테고리_케밥_버튼_눌렀을때:
             return .run { send in await send(.inner(.카테고리_시트_활성화(true))) }
 
@@ -188,10 +234,6 @@ private extension CategoryDetailFeature {
                 await send(.inner(.카테고리_선택_시트_활성화(false)))
             }
 
-        case .필터_버튼_눌렀을때:
-            state.isFilterSheetPresented.toggle()
-            return .none
-
         case .dismiss:
             return .run { _ in await dismiss() }
 
@@ -347,16 +389,6 @@ private extension CategoryDetailFeature {
         /// - 카테고리에 대한 `공유` / `수정` / `삭제` Delegate
         case .categoryBottomSheet(let delegateAction):
             switch delegateAction {
-            case .shareCellButtonTapped:
-                kakaoShareClient.카테고리_카카오톡_공유(
-                    CategoryKaKaoShareModel(
-                        categoryName: state.domain.category.categoryName,
-                        categoryId: state.domain.category.id,
-                        imageURL: state.domain.category.categoryImage.imageURL
-                    )
-                )
-                state.isCategorySheetPresented = false
-                return .none
             case .editCellButtonTapped:
                 return .run { [category = state.category] send in
                     await send(.inner(.카테고리_시트_활성화(false)))
@@ -384,25 +416,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)))