Merge pull request #166 from YAPP-Github/feat/#157-feature-update

feat: 1.0.6 버전 업데이트에 따른 기능 추가 및 수정
YAPP-Github · Dec 4, 2024 · bfe5652 · bfe5652
2 parents 28d4bca + 5f42240
commit bfe5652
Show file tree

Hide file tree

Showing 48 changed files with 958 additions and 1,098 deletions.
diff --git a/Projects/App/Sources/MainTab/MainTabFeature.swift b/Projects/App/Sources/MainTab/MainTabFeature.swift
@@ -11,6 +11,7 @@ import FeaturePokit
 import FeatureRemind
 import FeatureContentDetail
 import Domain
+import DSKit
 import Util
 import CoreKit
 
@@ -28,7 +29,7 @@ public struct MainTabFeature {
     public struct State: Equatable {
         var selectedTab: MainTab = .pokit
         var isBottomSheetPresented: Bool = false
-        var isLinkSheetPresented: Bool = false
+        var linkPopup: PokitLinkPopup.PopupType?
         var isErrorSheetPresented: Bool = false
         var link: String?
 
@@ -40,6 +41,7 @@ public struct MainTabFeature {
         @Presents var contentDetail: ContentDetailFeature.State?
         @Shared(.inMemory("SelectCategory")) var categoryId: Int?
         @Shared(.inMemory("PushTapped")) var isPushTapped: Bool = false
+        var savedContentId: Int?
 
         public init() {
             self.pokit = .init()
@@ -64,7 +66,7 @@ public struct MainTabFeature {
         public enum View: Equatable {
             case addButtonTapped
             case addSheetTypeSelected(TabAddSheetType)
-            case linkCopyButtonTapped
+            case 링크팝업_버튼_눌렀을때
             case onAppear
             case onOpenURL(url: URL)
             case 경고_확인버튼_클릭
@@ -75,6 +77,7 @@ public struct MainTabFeature {
             case 공유포킷_이동(sharedCategory: CategorySharing.SharedCategory)
             case 경고_띄움(BaseError)
             case errorSheetPresented(Bool)
+            case 링크팝업_활성화(PokitLinkPopup.PopupType)
         }
         public enum AsyncAction: Equatable {
             case 공유받은_카테고리_조회(categoryId: Int)
@@ -93,6 +96,10 @@ public struct MainTabFeature {
     /// - Reducer Core
     private func core(into state: inout State, action: Action) -> Effect<Action> {
         switch action {
+        case .binding(\.linkPopup):
+            guard state.linkPopup == nil else { return .none }
+            state.savedContentId = nil
+            return .none
         case .binding:
             return .none
         case let .pushAlertTapped(isTapped):
@@ -156,9 +163,8 @@ private extension MainTabFeature {
             case .포킷추가: return .send(.delegate(.포킷추가하기))
             }
 
-        case .linkCopyButtonTapped:
-            state.isLinkSheetPresented = false
-            return .run { send in await send(.delegate(.링크추가하기)) }
+        case .링크팝업_버튼_눌렀을때:
+            return linkPopupButtonTapped(state: &state)
 
         case .onAppear:
             if state.isPushTapped {
@@ -198,7 +204,10 @@ private extension MainTabFeature {
         switch action {
         case let .linkCopySuccess(url):
             guard let url else { return .none }
-            state.isLinkSheetPresented = true
+            state.linkPopup = .link(
+                title: Constants.복사한_링크_저장하기_문구,
+                url: url.absoluteString
+            )
             state.link = url.absoluteString
             return .none
 
@@ -209,6 +218,10 @@ private extension MainTabFeature {
         case let .errorSheetPresented(isPresented):
             state.isErrorSheetPresented = isPresented
             return .none
+
+        case let .링크팝업_활성화(type):
+            state.linkPopup = type
+            return .none
 
         default: return .none
         }
@@ -238,4 +251,19 @@ private extension MainTabFeature {
     func handleDelegateAction(_ action: Action.DelegateAction, state: inout State) -> Effect<Action> {
         return .none
     }
+
+    func linkPopupButtonTapped(state: inout State) -> Effect<Action> {
+        switch state.linkPopup {
+        case .link:
+            state.linkPopup = nil
+            return .send(.delegate(.링크추가하기))
+        case .success:
+            state.linkPopup = nil
+            state.contentDetail = .init(contentId: state.savedContentId)
+            state.savedContentId = nil
+            return .none
+        case .error, .text, .warning, .none:
+            return .none
+        }
+    }
 }
diff --git a/Projects/App/Sources/MainTab/MainTabFeatureView.swift b/Projects/App/Sources/MainTab/MainTabFeatureView.swift
@@ -73,12 +73,10 @@ public extension MainTabView {
                             }
                         }
 
-                        if self.store.isLinkSheetPresented {
+                        if self.store.linkPopup != nil {
                             PokitLinkPopup(
-                                "복사한 링크 저장하기",
-                                isPresented: $store.isLinkSheetPresented,
-                                type: .link(url: self.store.link ?? ""),
-                                action: { send(.linkCopyButtonTapped) }
+                                type: $store.linkPopup,
+                                action: { send(.링크팝업_버튼_눌렀을때, animation: .pokitSpring) }
                             )
                         }
                     }
@@ -94,12 +92,10 @@ private extension MainTabView {
         tabView
             .overlay(alignment: .bottom) {
                 VStack(spacing: 0) {
-                    if store.isLinkSheetPresented {
+                    if store.linkPopup != nil {
                         PokitLinkPopup(
-                            "복사한 링크 저장하기",
-                            isPresented: $store.isLinkSheetPresented,
-                            type: .link(url: store.link ?? ""),
-                            action: { send(.linkCopyButtonTapped) }
+                            type: $store.linkPopup,
+                            action: { send(.링크팝업_버튼_눌렀을때, animation: .pokitSpring) }
                         )
                         .padding(.bottom, 20)
                     }
@@ -265,7 +261,8 @@ private extension MainTabView {
         }
         .padding(.horizontal, 28)
         .onTapGesture {
-            UIImpactFeedbackGenerator(style: .rigid).impactOccurred()
+            UIImpactFeedbackGenerator(style: .light)
+                .impactOccurred()
             store.send(.binding(.set(\.selectedTab, tab)))
         }
     }

diff --git a/Projects/App/Sources/MainTab/MainTabPath.swift b/Projects/App/Sources/MainTab/MainTabPath.swift
@@ -16,6 +16,7 @@ import FeatureContentSetting
 import FeatureContentList
 import FeatureCategorySharing
 import Domain
+import Util
 
 @Reducer
 public struct MainTabPath {
@@ -173,13 +174,17 @@ public extension MainTabFeature {
                 return .none
 
             /// - 링크추가 및 수정에서 저장하기 눌렀을 때
-            case let .path(.element(stackElementId, action: .링크추가및수정(.delegate(.저장하기_완료)))):
+            case let .path(.element(stackElementId, action: .링크추가및수정(.delegate(.저장하기_완료(contentId))))):
+                state.savedContentId = contentId
                 state.path.removeLast()
                 switch state.path.last {
                 case .검색:
-                    return .send(.path(.element(id: stackElementId, action: .검색(.delegate(.컨텐츠_검색)))))
+                    return .merge(
+                        .send(.path(.element(id: stackElementId, action: .검색(.delegate(.컨텐츠_검색))))),
+                        .send(.inner(.링크팝업_활성화(.success(title: Constants.링크_저장_완료_문구))), animation: .pokitSpring)
+                    )
                 default:
-                    return .none
+                    return .send(.inner(.링크팝업_활성화(.success(title: Constants.링크_저장_완료_문구))), animation: .pokitSpring)
                 }
             /// - 각 화면에서 링크 복사 감지했을 때 (링크 추가 및 수정 화면 제외)
             case let .path(.element(_, action: .알림함(.delegate(.linkCopyDetected(url))))),

diff --git a/Projects/CoreKit/Sources/Data/DTO/Category/CategoryEditResponse.swift b/Projects/CoreKit/Sources/Data/DTO/Category/CategoryEditResponse.swift
@@ -35,7 +35,7 @@ extension CategoryImageResponse {
     public static var mock: [Self] = [
         Self(
             imageId: 2312,
-            imageUrl: "https://pokit-storage.s3.ap-northeast-2.amazonaws.com/logo/pokit.png"
+            imageUrl: Constants.기본_썸네일_주소.absoluteString
         ),
         Self(
             imageId: 23122,

diff --git a/Projects/CoreKit/Sources/Data/DTO/Content/ThumbnailRequest.swift b/Projects/CoreKit/Sources/Data/DTO/Content/ThumbnailRequest.swift
@@ -0,0 +1,16 @@
+//
+//  ThumbnailRequest.swift
+//  CoreKit
+//
+//  Created by 김도형 on 12/1/24.
+//
+
+import Foundation
+
+public struct ThumbnailRequest: Encodable {
+    private let thumbnail: String
+
+    public init(thumbnail: String) {
+        self.thumbnail = thumbnail
+    }
+}
diff --git a/Projects/CoreKit/Sources/Data/Network/Content/ContentClient+LiveKey.swift b/Projects/CoreKit/Sources/Data/Network/Content/ContentClient+LiveKey.swift
@@ -50,6 +50,11 @@ extension ContentClient: DependencyKey {
                         condition: condition
                     )
                 )
+            },
+            썸네일_수정: { id, model in
+                try await provider.requestNoBody(
+                    .썸네일_수정(contentId: id, model: model)
+                )
             }
         )
     }()

diff --git a/Projects/CoreKit/Sources/Data/Network/Content/ContentClient+TestKey.swift b/Projects/CoreKit/Sources/Data/Network/Content/ContentClient+TestKey.swift
@@ -17,7 +17,8 @@ extension ContentClient: TestDependencyKey {
             즐겨찾기_취소: { _ in },
             카테고리_내_컨텐츠_목록_조회: { _, _, _ in .mock },
             미분류_카테고리_컨텐츠_조회: { _ in .mock },
-            컨텐츠_검색: { _, _ in .mock }
+            컨텐츠_검색: { _, _ in .mock },
+            썸네일_수정: { _, _ in }
         )
     }()
 }
diff --git a/Projects/CoreKit/Sources/Data/Network/Content/ContentClient.swift b/Projects/CoreKit/Sources/Data/Network/Content/ContentClient.swift
@@ -40,5 +40,9 @@ public struct ContentClient {
         _ pageable: BasePageableRequest,
         _ condition: BaseConditionRequest
     ) async throws -> ContentListInquiryResponse
+    public var 썸네일_수정: @Sendable (
+        _ contentId: String,
+        _ model: ThumbnailRequest
+    ) async throws -> Void
 }
 
diff --git a/Projects/CoreKit/Sources/Data/Network/Content/ContentEndpoint.swift b/Projects/CoreKit/Sources/Data/Network/Content/ContentEndpoint.swift
@@ -27,6 +27,7 @@ public enum ContentEndpoint {
         pageable: BasePageableRequest,
         condition: BaseConditionRequest
     )
+    case 썸네일_수정(contentId: String, model: ThumbnailRequest)
 }
 
 extension ContentEndpoint: TargetType {
@@ -54,6 +55,8 @@ extension ContentEndpoint: TargetType {
             return "/uncategorized"
         case .컨텐츠_검색:
             return ""
+        case let .썸네일_수정(contentId, _):
+            return "/thumbnail/\(contentId)"
         }
     }
 
@@ -68,7 +71,8 @@ extension ContentEndpoint: TargetType {
              .컨텐츠_추가:
             return .post
 
-        case .컨텐츠_수정:
+        case .컨텐츠_수정,
+             .썸네일_수정:
             return .patch
 
         case .카태고리_내_컨텐츠_목록_조회,
@@ -129,6 +133,8 @@ extension ContentEndpoint: TargetType {
                 ],
                 encoding: URLEncoding.default
             )
+        case let .썸네일_수정(_, model):
+            return .requestJSONEncodable(model)
         }
     }
 

diff --git a/Projects/DSKit/Sources/Components/PokitIconLInput.swift b/Projects/DSKit/Sources/Components/PokitIconLInput.swift