release 1.0.8

Projects/App/Resources/Pokit-info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.8</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

Projects/CoreKit/Sources/Data/DTO/Content/ContentDeleteRequest.swift

@@ -0,0 +1,20 @@
+//
+//  ContentDeleteRequest.swift
+//  CoreKit
+//
+//  Created by asobi on 12/30/24.
+//
+
+import Foundation
+/// 미분류 링크 삭제
+public struct ContentDeleteRequest: Encodable {
+    let contentId: [Int]
+
+    public init(contentId: [Int]) {
+        self.contentId = contentId
+    }
+}
+
+extension ContentDeleteRequest {
+    public static let mock: Self = Self(contentId: [551321312,4333333])
+}

Projects/CoreKit/Sources/Data/DTO/Content/ContentMoveRequest.swift

@@ -0,0 +1,21 @@
+//
+//  ContentMoveRequest.swift
+//  CoreKit
+//
+//  Created by 김민호 on 12/29/24.
+//
+import Foundation
+/// 미분류 링크를 카테고리로 이동
+public struct ContentMoveRequest: Encodable {
+    let contentIds: [Int]
+    let categoryId: Int
+
+    public init(contentIds: [Int], categoryId: Int) {
+        self.contentIds = contentIds
+        self.categoryId = categoryId
+    }
+}
+
+extension ContentMoveRequest {
+    public static let mock: Self = Self(contentIds: [123,456], categoryId: 444)
+}

Projects/CoreKit/Sources/Data/DTO/Version/VersionResponse.swift

@@ -8,9 +8,14 @@
 import Foundation
 
 public struct VersionResponse: Decodable {
-    public let recentVersion: String
+    public let results: [VersionDTO]
+}
+
+public struct VersionDTO: Decodable {
+    public let version: String
+    public let trackId: Int
 }
 
 extension VersionResponse {
-    static let mock: Self = Self(recentVersion: "1.0.0")
+    static let mock: Self = Self(results: [VersionDTO(version: "1.0.0", trackId: 2415354644)])
 }

Projects/CoreKit/Sources/Data/Network/Content/ContentClient+LiveKey.swift

@@ -55,6 +55,12 @@ extension ContentClient: DependencyKey {
                 try await provider.requestNoBody(
                     .썸네일_수정(contentId: id, model: model)
                 )
+            },
+            미분류_링크_포킷_이동: { model in
+                try await provider.requestNoBody(.미분류_링크_포킷_이동(model: model))
+            },
+            미분류_링크_삭제: { model in
+                try await provider.requestNoBody(.미분류_링크_삭제(model: model))
             }
         )
     }()

Projects/CoreKit/Sources/Data/Network/Content/ContentClient+TestKey.swift

@@ -18,7 +18,9 @@ extension ContentClient: TestDependencyKey {
             카테고리_내_컨텐츠_목록_조회: { _, _, _ in .mock },
             미분류_카테고리_컨텐츠_조회: { _ in .mock },
             컨텐츠_검색: { _, _ in .mock },
-            썸네일_수정: { _, _ in }
+            썸네일_수정: { _, _ in },
+            미분류_링크_포킷_이동: { _ in },
+            미분류_링크_삭제: { _ in }
         )
     }()
 }

Projects/CoreKit/Sources/Data/Network/Content/ContentClient.swift

@@ -44,5 +44,11 @@ public struct ContentClient {
         _ contentId: String,
         _ model: ThumbnailRequest
     ) async throws -> Void
+    public var 미분류_링크_포킷_이동: @Sendable (
+        _ model: ContentMoveRequest
+    ) async throws -> Void
+    public var 미분류_링크_삭제: @Sendable (
+        _ model: ContentDeleteRequest
+    ) async throws -> Void
 }
 

Projects/CoreKit/Sources/Data/Network/Content/ContentEndpoint.swift

@@ -28,6 +28,8 @@ public enum ContentEndpoint {
         condition: BaseConditionRequest
     )
     case 썸네일_수정(contentId: String, model: ThumbnailRequest)
+    case 미분류_링크_포킷_이동(model: ContentMoveRequest)
+    case 미분류_링크_삭제(model: ContentDeleteRequest)
 }
 
 extension ContentEndpoint: TargetType {
@@ -57,13 +59,18 @@ extension ContentEndpoint: TargetType {
             return ""
         case let .썸네일_수정(contentId, _):
             return "/thumbnail/\(contentId)"
+        case .미분류_링크_포킷_이동:
+            return ""
+        case .미분류_링크_삭제:
+            return "/uncategorized"
         }
     }
 
     public var method: Moya.Method {
         switch self {
         case .컨텐츠_삭제,
-             .즐겨찾기_취소:
+             .즐겨찾기_취소,
+             .미분류_링크_삭제:
             return .put
 
         case .컨텐츠_상세_조회,
@@ -72,7 +79,8 @@ extension ContentEndpoint: TargetType {
             return .post
 
         case .컨텐츠_수정,
-             .썸네일_수정:
+             .썸네일_수정,
+             .미분류_링크_포킷_이동:
             return .patch
 
         case .카태고리_내_컨텐츠_목록_조회,
@@ -135,6 +143,12 @@ extension ContentEndpoint: TargetType {
             )
         case let .썸네일_수정(_, model):
             return .requestJSONEncodable(model)
+
+        case let .미분류_링크_포킷_이동(model):
+            return .requestJSONEncodable(model)
+
+        case let .미분류_링크_삭제(model):
+            return .requestJSONEncodable(model)
         }
     }
 

Projects/CoreKit/Sources/Data/Network/Version/VersionEndpoint.swift

@@ -16,7 +16,9 @@ public enum VersionEndpoint {
 
 extension VersionEndpoint: TargetType {
     public var baseURL: URL {
-        return Constants.serverURL.appendingPathComponent(Constants.versionPath, conformingTo: .url)
+        let bundleID = Bundle.main.bundleIdentifier ?? ""
+        let countryCode = Locale.current.language.region?.identifier ?? ""
+        return URL(string: "https://itunes.apple.com/lookup?bundleId=\(bundleID)&country=\(countryCode)")!
     }
 
     public var path: String {

Projects/DSKit/Sources/Components/PokitLinkCard.swift

@@ -14,7 +14,7 @@ public struct PokitLinkCard<Item: PokitLinkCardItem>: View {
     private let link: Item
     private let state: PokitLinkCard.State
     private let type: PokitLinkCard.CardType
-    private let action: () -> Void
+    private let action: (() -> Void)?
     private let kebabAction: (() -> Void)?
     private let fetchMetaData: (() -> Void)?
     private let favoriteAction: (() -> Void)?
@@ -24,7 +24,7 @@ public struct PokitLinkCard<Item: PokitLinkCardItem>: View {
         link: Item,
         state: PokitLinkCard.State,
         type: PokitLinkCard.CardType = .accept,
-        action: @escaping () -> Void,
+        action: (() -> Void)? = nil,
         kebabAction: (() -> Void)? = nil,
         fetchMetaData: (() -> Void)? = nil,
         favoriteAction: (() -> Void)? = nil,
@@ -42,8 +42,14 @@ public struct PokitLinkCard<Item: PokitLinkCardItem>: View {
 
     public var body: some View {
         VStack(spacing: 20) {
-            Button(action: action) {
-                buttonLabel
+            Group {
+                if let action {
+                    Button(action: { action() }) {
+                        buttonLabel
+                    }
+                } else {
+                    buttonLabel
+                }
             }
             .padding(.top, state == .top ? 0 : 20)
 

Projects/DSKit/Sources/Components/PokitSelect.swift

@@ -50,11 +50,18 @@ public struct PokitSelect<Item: PokitSelectItem>: View {
         }
         .onChange(of: selectedItem) { onChangedSeletedItem($0) }
         .sheet(isPresented: $showSheet) {
-            listSheet
-                .presentationDragIndicator(.visible)
-                .pokitPresentationCornerRadius()
-                .presentationDetents([.height(564)])
-                .pokitPresentationBackground()
+            PokitSelectSheet(
+                list: list,
+                itemSelected: { item in
+                    listDismiss()
+                    action(item)
+                },
+                pokitAddAction: addAction
+            )
+            .presentationDragIndicator(.visible)
+            .pokitPresentationCornerRadius()
+            .presentationDetents([.height(564)])
+            .pokitPresentationBackground()
         }
     }
 
@@ -96,63 +103,6 @@ public struct PokitSelect<Item: PokitSelectItem>: View {
             .animation(.pokitDissolve, value: self.state)
     }
 
-    private var listSheet: some View {
-        Group {
-            if let list {
-                VStack(spacing: 0) {
-                    if let addAction {
-                        addButton {
-                            listDismiss()
-                            addAction()
-                        }
-                    }
-
-                    PokitList(
-                        selectedItem: selectedItem,
-                        list: list
-                    ) { item in
-                        action(item)
-                        listCellTapped(item)
-                    }
-                }
-                .padding(.top, 12)
-                .padding(.bottom, 20)
-            } else {
-                PokitLoading()
-            }
-        }
-    }
-
-    @ViewBuilder
-    private func addButton(
-        action: @escaping () -> Void
-    ) -> some View {
-        Button(action: action) {
-            HStack(spacing: 20) {
-                PokitIconButton(
-                    .icon(.plusR),
-                    state: .default(.secondary),
-                    size: .medium,
-                    shape: .round,
-                    action: action
-                )
-
-                Text("포킷 추가하기")
-                    .pokitFont(.b1(.b))
-                    .foregroundStyle(.pokit(.text(.primary)))
-
-                Spacer()
-            }
-            .padding(.vertical, 22)
-            .padding(.horizontal, 30)
-            .background(alignment: .bottom) {
-                Rectangle()
-                    .fill(.pokit(.border(.tertiary)))
-                    .frame(height: 1)
-            }
-        }
-    }
-
     private func partSelectButtonTapped() {
         showSheet = true
     }

Projects/DSKit/Sources/Components/PokitSelectSheet.swift

@@ -0,0 +1,87 @@
+//
+//  PokitSelectSheet.swift
+//  DSKit
+//
+//  Created by 김민호 on 12/27/24.
+//
+
+import SwiftUI
+import Util
+
+
+public struct PokitSelectSheet<Item: PokitSelectItem>: View {
+    @Binding
+    private var selectedItem: Item?
+
+    private let list: [Item]?
+    private let itemSelected: (Item) -> Void
+    private let pokitAddAction: (() -> Void)?
+
+    public init(
+        list: [Item]?,
+        selectedItem: Binding<Item?> = .constant(nil),
+        itemSelected: @escaping (Item) -> Void,
+        pokitAddAction: (() -> Void)?
+    ) {
+        self.list = list
+        self._selectedItem = selectedItem
+        self.itemSelected = itemSelected
+        self.pokitAddAction = pokitAddAction
+    }
+
+
+    public var body: some View {
+        Group {
+            if let list {
+                VStack(spacing: 0) {
+                    if let pokitAddAction {
+                        addButton {
+                            pokitAddAction()
+                        }
+                    }
+                    PokitList(
+                        selectedItem: selectedItem,
+                        list: list
+                    ) { item in
+                        itemSelected(item)
+                    }
+                }
+                .padding(.top, 12)
+                .padding(.bottom, 20)
+            } else {
+                PokitLoading()
+            }
+        }
+    }
+}
+extension PokitSelectSheet {
+    @ViewBuilder
+    private func addButton(
+        action: @escaping () -> Void
+    ) -> some View {
+        Button(action: action) {
+            HStack(spacing: 20) {
+                PokitIconButton(
+                    .icon(.plusR),
+                    state: .default(.secondary),
+                    size: .medium,
+                    shape: .round,
+                    action: action
+                )
+
+                Text("포킷 추가하기")
+                    .pokitFont(.b1(.b))
+                    .foregroundStyle(.pokit(.text(.primary)))
+
+                Spacer()
+            }
+            .padding(.vertical, 22)
+            .padding(.horizontal, 30)
+            .background(alignment: .bottom) {
+                Rectangle()
+                    .fill(.pokit(.border(.tertiary)))
+                    .frame(height: 1)
+            }
+        }
+    }
+}

Projects/DSKit/Sources/Modifiers/PokitNavigationBarModifier.swift

@@ -31,4 +31,8 @@ public extension View {
     func pokitNavigationBar<Header: View>(@ViewBuilder header: () -> Header) -> some View {
         modifier(PokitNavigationBarModifier(header: header))
     }
+
+    func pokitNavigationBar<Header: View>(_ header: @autoclosure () -> Header) -> some View {
+        modifier(PokitNavigationBarModifier(header: header))
+    }
 }