[feat] #187 관심사 선택 시트 추가

ShapeKim98 · ShapeKim98 · commit ad594f5f1f28 · 2025-02-22T23:59:38.000+09:00
diff --git a/Projects/Domain/Sources/Base/BaseInterest.swift b/Projects/Domain/Sources/Base/BaseInterest.swift
@@ -7,11 +7,19 @@
 
 import Foundation
 
-public struct BaseInterest: Equatable, Identifiable {
+public struct BaseInterest: Equatable, Identifiable, Hashable {
     public let id = UUID()
     public let code: String
     public let description: String
     
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(code)
+    }
+    
+    public static func ==(lhs: BaseInterest, rhs: BaseInterest) -> Bool {
+        lhs.code == rhs.code
+    }
+    
     public init(code: String, description: String) {
         self.code = code
         self.description = description
diff --git a/Projects/Domain/Sources/Recommend/Recommend.swift b/Projects/Domain/Sources/Recommend/Recommend.swift
@@ -12,6 +12,7 @@ public struct Recommend: Equatable {
     /// 콘텐츠 목록
     public var contentList: BaseContentListInquiry
     public var pageable: BasePageable
+    public var myInterests: [BaseInterest]
     public var interests: [BaseInterest]
     
     public init() {
@@ -25,6 +26,7 @@ public struct Recommend: Equatable {
             page: 0, size: 10,
             sort: ["createdAt,desc"]
         )
+        self.myInterests = []
         self.interests = []
     }
 }
diff --git a/Projects/Feature/FeatureRecommend/Sources/Recommend/RecommendFeature.swift b/Projects/Feature/FeatureRecommend/Sources/Recommend/RecommendFeature.swift
@@ -37,14 +37,17 @@ public struct RecommendFeature {
             array.append(contentsOf: list)
             return array
         }
-        var interestList: IdentifiedArrayOf<BaseInterest> {
+        var myInterestList: IdentifiedArrayOf<BaseInterest> {
             var array = IdentifiedArrayOf<BaseInterest>()
-            array.append(contentsOf: domain.interests)
+            array.append(contentsOf: domain.myInterests)
             return array
         }
         var isLoading: Bool = true
         var selectedInterest: BaseInterest?
         var shareContent: BaseContentItem?
+        var interests: [BaseInterest] { domain.interests }
+        var showKeywordSheet: Bool = false
+        var selectedInterestList = Set<BaseInterest>()
     }
     
     /// - Action
@@ -68,6 +71,8 @@ public struct RecommendFeature {
             case 신고하기_버튼_눌렀을때(BaseContentItem)
             case 전체보기_버튼_눌렀을때(ScrollViewProxy)
             case 관심사_버튼_눌렀을때(BaseInterest, ScrollViewProxy)
+            case 관심사_편집_버튼_눌렀을때
+            case 키워드_선택_버튼_눌렀을때
             case 링크_공유_완료되었을때
             case 검색_버튼_눌렀을때
             case 알림_버튼_눌렀을때
@@ -78,12 +83,14 @@ public struct RecommendFeature {
             case 추천_조회_API_반영(BaseContentListInquiry)
             case 추천_조회_페이징_API_반영(BaseContentListInquiry)
             case 유저_관심사_조회_API_반영([BaseInterest])
+            case 관심사_조회_API_반영([BaseInterest])
         }
         
         public enum AsyncAction: Equatable {
             case 추천_조회_API
             case 추천_조회_페이징_API
             case 유저_관심사_조회_API
+            case 관심사_조회_API
         }
         
         public enum ScopeAction: Equatable { case doNothing }
@@ -182,6 +189,11 @@ private extension RecommendFeature {
         case let .추천_컨텐츠_눌렀을때(urlString):
             guard let url = URL(string: urlString) else { return .none }
             return .run { _ in await openURL(url) }
+        case .관심사_편집_버튼_눌렀을때:
+            return shared(.async(.관심사_조회_API), state: &state)
+        case .키워드_선택_버튼_눌렀을때:
+            state.showKeywordSheet = false
+            return .none
         }
     }
     
@@ -201,7 +213,12 @@ private extension RecommendFeature {
             state.isLoading = false
             return .none
         case let .유저_관심사_조회_API_반영(interests):
+            state.domain.myInterests = interests
+            interests.forEach { state.selectedInterestList.insert($0) }
+            return .none
+        case let .관심사_조회_API_반영(interests):
             state.domain.interests = interests
+            state.showKeywordSheet = true
             return .none
         }
     }
@@ -234,6 +251,11 @@ private extension RecommendFeature {
                 let interests = try await userClient.유저_관심사_목록_조회().map { $0.toDomian() }
                 await send(.inner(.유저_관심사_조회_API_반영(interests)))
             }
+        case .관심사_조회_API:
+            return .run { send in
+                let interests = try await userClient.관심사_목록_조회().map { $0.toDomian() }
+                await send(.inner(.관심사_조회_API_반영(interests)))
+            }
         }
     }
     
diff --git a/Projects/Feature/FeatureRecommend/Sources/Recommend/RecommendKeywordBottomSheet.swift b/Projects/Feature/FeatureRecommend/Sources/Recommend/RecommendKeywordBottomSheet.swift
@@ -0,0 +1,122 @@
+//
+//  RecommendKeywordBottomSheet.swift
+//  FeatureRecommend
+//
+//  Created by 김도형 on 2/22/25.
+//
+
+import SwiftUI
+
+import Domain
+import DSKit
+import Util
+
+struct RecommendKeywordBottomSheet: View {
+    @Binding
+    private var selectedInterests: Set<BaseInterest>
+    @State
+    private var height: CGFloat = 0
+    
+    private let interests: [BaseInterest]
+    private let action: () -> Void
+    
+    init(
+        selectedInterests: Binding<Set<BaseInterest>>,
+        interests: [BaseInterest],
+        action: @escaping () -> Void
+    ) {
+        self._selectedInterests = selectedInterests
+        self.interests = interests
+        self.action = action
+    }
+    
+    
+    var body: some View {
+        VStack(spacing: 0) {
+            title
+                .padding(.top, 52)
+                .pokitMaxWidth()
+            
+            fieldsFlow
+                .padding(.top, 36)
+                .padding(.bottom, 40)
+            
+            PokitBottomButton(
+                "키워드 선택",
+                state: selectedInterests.count == 0 ? .disable : .filled(.primary),
+                action: action
+            )
+            .pokitMaxWidth()
+        }
+        .padding(.horizontal, 20)
+        .background(.pokit(.bg(.base)))
+        .pokitPresentationCornerRadius()
+        .pokitPresentationBackground()
+        .presentationDragIndicator(.visible)
+        .readHeight()
+        .onPreferenceChange(HeightPreferenceKey.self) { height in
+            if let height {
+                self.height = height
+            }
+        }
+        .presentationDetents([.height(height)])
+        .ignoresSafeArea(edges: [.bottom, .top])
+    }
+}
+
+//MARK: - Configure View
+extension RecommendKeywordBottomSheet {
+    private var title: some View {
+        HStack {
+            VStack(alignment: .leading, spacing: 12) {
+                Text("관심 키워드를 선택해 주세요")
+                    .pokitFont(.title1)
+                    .foregroundStyle(.pokit(.text(.primary)))
+                
+                Text("최대 3개의 관심 키워드를 선택하시면\n관련 링크가 추천됩니다")
+                    .pokitFont(.title3)
+                    .foregroundStyle(.pokit(.text(.secondary)))
+            }
+            
+            Spacer()
+        }
+    }
+    
+    private var fieldsFlow: some View {
+        PokitFlowLayout(rowSpacing: 12, colSpacing: 10) {
+            ForEach(interests, id: \.self) { field in
+                let isSelected = selectedInterests.contains(field)
+                let isMaxCount = selectedInterests.count >= 3
+                
+                PokitTextChip(
+                    field.description,
+                    state: isSelected
+                    ? .filled(.primary)
+                    : isMaxCount ? .disable : .default(.primary),
+                    size: .medium
+                ) {
+                    if isSelected {
+                        selectedInterests.remove(field)
+                    } else {
+                        selectedInterests.insert(field)
+                    }
+                }
+            }
+            .animation(.pokitDissolve, value: selectedInterests)
+        }
+    }
+}
+
+@available(iOS 18.0, *)
+#Preview {
+    @Previewable
+    @State
+    var selectedInterests = Set<BaseInterest>()
+    
+    RecommendKeywordBottomSheet(
+        selectedInterests: $selectedInterests,
+        interests: BaseInterestType.allCases.map {
+            BaseInterest(code: "", description: $0.title)
+        }
+    ) {  }
+}
diff --git a/Projects/Feature/FeatureRecommend/Sources/Recommend/RecommendView.swift b/Projects/Feature/FeatureRecommend/Sources/Recommend/RecommendView.swift
@@ -42,6 +42,13 @@ public extension RecommendView {
                 }
             }
             .task { await send(.onAppear).finish() }
+            .sheet(isPresented: $store.showKeywordSheet) {
+                RecommendKeywordBottomSheet(
+                    selectedInterests: $store.selectedInterestList,
+                    interests: store.interests,
+                    action: { send(.키워드_선택_버튼_눌렀을때) }
+                )
+            }
         }
     }
 }
@@ -68,7 +75,7 @@ private extension RecommendView {
             state: .default(.secondary),
             size: .small,
             shape: .round,
-            action: { }
+            action: { send(.관심사_편집_버튼_눌렀을때) }
         )
         .padding([.leading, .vertical], 8)
         .padding(.trailing, 20)
@@ -110,7 +117,7 @@ private extension RecommendView {
             }
             .id("전체보기")
             
-            ForEach(store.interestList) { interest in
+            ForEach(store.myInterestList) { interest in
                 let isSelected = store.selectedInterest == interest
                 
                 PokitTextButton(
diff --git a/Projects/Feature/FeatureRecommendDemo/Sources/FeatureRecommendDemoApp.swift b/Projects/Feature/FeatureRecommendDemo/Sources/FeatureRecommendDemoApp.swift
@@ -23,11 +23,7 @@ struct FeatureRecommendDemoApp: App {
             )) {
                 RecommendView(store: .init(
                     initialState: .init(),
-                    reducer: { RecommendFeature()._printChanges() },
-                    withDependencies: {
-                        $0[ContentClient.self] = .testValue
-                        $0[UserClient.self] = .testValue
-                    }
+                    reducer: { RecommendFeature()._printChanges() }
                 ))
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ public struct Recommend: Equatable {`
`12`	`12`	`/// 콘텐츠 목록`
`13`	`13`	`public var contentList: BaseContentListInquiry`
`14`	`14`	`public var pageable: BasePageable`
	`15`	`+ public var myInterests: [BaseInterest]`
`15`	`16`	`public var interests: [BaseInterest]`
`16`	`17`
`17`	`18`	`public init() {`
`@@ -25,6 +26,7 @@ public struct Recommend: Equatable {`
`25`	`26`	`page: 0, size: 10,`
`26`	`27`	`sort: ["createdAt,desc"]`
`27`	`28`	`)`
	`29`	`+ self.myInterests = []`
`28`	`30`	`self.interests = []`
`29`	`31`	`}`
`30`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,13 @@ public extension RecommendView {`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`.task { await send(.onAppear).finish() }`
	`45`	`+ .sheet(isPresented: $store.showKeywordSheet) {`
	`46`	`+ RecommendKeywordBottomSheet(`
	`47`	`+ selectedInterests: $store.selectedInterestList,`
	`48`	`+ interests: store.interests,`
	`49`	`+ action: { send(.키워드_선택_버튼_눌렀을때) }`
	`50`	`+ )`
	`51`	`+ }`
`45`	`52`	`}`
`46`	`53`	`}`
`47`	`54`	`}`
`@@ -68,7 +75,7 @@ private extension RecommendView {`
`68`	`75`	`state: .default(.secondary),`
`69`	`76`	`size: .small,`
`70`	`77`	`shape: .round,`
`71`		`- action: { }`
	`78`	`+ action: { send(.관심사_편집_버튼_눌렀을때) }`
`72`	`79`	`)`
`73`	`80`	`.padding([.leading, .vertical], 8)`
`74`	`81`	`.padding(.trailing, 20)`
`@@ -110,7 +117,7 @@ private extension RecommendView {`
`110`	`117`	`}`
`111`	`118`	`.id("전체보기")`
`112`	`119`
`113`		`- ForEach(store.interestList) { interest in`
	`120`	`+ ForEach(store.myInterestList) { interest in`
`114`	`121`	`let isSelected = store.selectedInterest == interest`
`115`	`122`
`116`	`123`	`PokitTextButton(`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,7 @@ struct FeatureRecommendDemoApp: App {`
`23`	`23`	`)) {`
`24`	`24`	`RecommendView(store: .init(`
`25`	`25`	`initialState: .init(),`
`26`		`- reducer: { RecommendFeature()._printChanges() },`
`27`		`- withDependencies: {`
`28`		`- $0[ContentClient.self] = .testValue`
`29`		`- $0[UserClient.self] = .testValue`
`30`		`- }`
	`26`	`+ reducer: { RecommendFeature()._printChanges() }`
`31`	`27`	`))`
`32`	`28`	`}`
`33`	`29`	`}`