Merge branch 'develop' of https://github.com/YAPP-Github/Pokit-iOS in…

…to develop

.github/workflows/appstore_release.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Set up Xcode
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: latest-stable
+        xcode-version: '16.1'
 
     - uses: shimataro/ssh-key-action@v2
       with:

.github/workflows/build_test.yml

@@ -20,7 +20,7 @@ jobs:
     - name: Set up Xcode
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: latest-stable
+        xcode-version: '16.1'
 
     - uses: shimataro/ssh-key-action@v2
       with:

.github/workflows/testflight_release.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Set up Xcode
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: latest-stable
+        xcode-version: '16.1'
 
     - uses: shimataro/ssh-key-action@v2
       with:

Makefile

@@ -17,8 +17,7 @@ test:
 	make clean
 	make download
 	tuist install
-	tuist cache
-	TUIST_DEVELOPMENT_TEAM=$(DEVELOPMENT_TEAM) tuist generate App
+	TUIST_DEVELOPMENT_TEAM=$(DEVELOPMENT_TEAM) tuist generate App --verbose
 
 clean:
 	tuist clean

Projects/App/Project.swift

@@ -26,7 +26,7 @@ let shareExtensionTarget: Target = .target(
     resources: ["ShareExtension/Resources/**"],
     entitlements: .file(path: .relativeToRoot("Projects/App/ShareExtension/ShareExtension.entitlements")),
     dependencies: [
-        .project(target: "FeatureLogin", path: .relativeToRoot("Projects/Feature")),
+        .project(target: "FeatureIntro", path: .relativeToRoot("Projects/Feature")),
         .project(target: "FeatureContentSetting", path: .relativeToRoot("Projects/Feature")),
         .project(target: "FeatureCategorySetting", path: .relativeToRoot("Projects/Feature"))
     ],

Projects/App/Resources/LaunchScreen.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23086.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23076"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -17,18 +17,20 @@
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" ambiguous="YES" image="logo_pokit" translatesAutoresizingMaskIntoConstraints="NO" id="N4N-la-jgc">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="logo_pokit" translatesAutoresizingMaskIntoConstraints="NO" id="N4N-la-jgc">
                                 <rect key="frame" x="79" y="313" width="235" height="72"/>
                                 <color key="tintColor" name="text/inverseWh"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="72" id="9zI-nL-qB4"/>
+                                    <constraint firstAttribute="height" constant="72" id="ZJY-IM-p0S"/>
+                                    <constraint firstAttribute="width" constant="235" id="zXd-Y5-GFp"/>
                                 </constraints>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
                         <color key="backgroundColor" name="orange/700"/>
                         <constraints>
-                            <constraint firstItem="N4N-la-jgc" firstAttribute="top" secondItem="Bcu-3y-fUS" secondAttribute="top" constant="254" id="kHx-5E-p7o"/>
+                            <constraint firstItem="N4N-la-jgc" firstAttribute="top" secondItem="Bcu-3y-fUS" secondAttribute="top" constant="254" id="5x5-8D-gix"/>
+                            <constraint firstItem="N4N-la-jgc" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="zAv-Q1-gIH"/>
                         </constraints>
                     </view>
                 </viewController>
@@ -40,7 +42,7 @@
     <resources>
         <image name="logo_pokit" width="235" height="72"/>
         <namedColor name="orange/700">
-            <color red="0.99607843137254903" green="0.51764705882352946" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+            <color red="0.99607843137254903" green="0.51764705882352946" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="text/inverseWh">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>

Projects/App/Resources/Pokit-info.plist

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

Projects/App/ShareExtension/Sources/ShareRootFeature.swift

@@ -9,7 +9,7 @@ import UIKit
 import UniformTypeIdentifiers
 
 import ComposableArchitecture
-import FeatureLogin
+import FeatureIntro
 import FeatureContentSetting
 import FeatureCategorySetting
 import CoreKit

Projects/App/ShareExtension/Sources/ShareRootView.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 
 import ComposableArchitecture
-import FeatureLogin
+import FeatureIntro
 import FeatureContentSetting
 import FeatureCategorySetting
 import DSKit

Projects/App/Sources/MainTab/MainTabPath.swift

@@ -83,9 +83,7 @@ public extension MainTabFeature {
                  let .path(.element(_, action: .카테고리상세(.delegate(.포킷수정(category))))):
                 state.path.append(.포킷추가및수정(PokitCategorySettingFeature.State(
                     type: .수정,
-                    categoryId: category.id,
-                    categoryImage: category.categoryImage,
-                    categoryName: category.categoryName
+                    category: category
                 )))
                 return .none
 
@@ -196,6 +194,10 @@ public extension MainTabFeature {
                  let .path(.element(_, action: .포킷추가및수정(.delegate(.linkCopyDetected(url))))),
                  let .path(.element(_, action: .링크목록(.delegate(.linkCopyDetected(url))))):
                 return .run { send in await send(.inner(.linkCopySuccess(url)), animation: .pokitSpring) }
+            /// 바텀메세지
+            case let .pokit(.delegate(.linkPopup(text))):
+                state.linkPopup = .text(title: text)
+                return .none
             /// 링크목록 `안읽음`
             case .remind(.delegate(.링크목록_안읽음)):
                 state.path.append(.링크목록(ContentListFeature.State(contentType: .unread)))
@@ -231,14 +233,24 @@ public extension MainTabFeature {
                 return .none
 
             case let .path(.element(_, action: .링크공유(.delegate(.공유받은_카테고리_추가(sharedCategory))))):
-                state.path.append(.포킷추가및수정(PokitCategorySettingFeature.State(
-                    type: .공유추가,
-                    categoryId: sharedCategory.categoryId,
+                let category = BaseCategoryItem(
+                    id: sharedCategory.categoryId,
+                    userId: 0,
+                    categoryName: sharedCategory.categoryName,
                     categoryImage: BaseCategoryImage(
                         imageId: sharedCategory.categoryImageId,
                         imageURL: sharedCategory.categoryImageUrl
                     ),
-                    categoryName: sharedCategory.categoryName
+                    contentCount: sharedCategory.contentCount,
+                    createdAt: "",
+                    openType: .공개,
+                    keywordType: .default,
+                    userCount: 0,
+                    isFavorite: false
+                )
+                state.path.append(.포킷추가및수정(PokitCategorySettingFeature.State(
+                    type: .공유추가,
+                    category: category
                 )))
                 return .none
             case .path(.element(_, action: .알림함(.delegate(.alertBoxDismiss)))):

Projects/App/Sources/Root/RootFeature.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 import ComposableArchitecture
-import FeatureLogin
+import FeatureIntro
 import CoreKit
 
 @Reducer

Projects/App/Sources/Root/RootView.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 
 import ComposableArchitecture
-import FeatureLogin
+import FeatureIntro
 import DSKit
 
 public struct RootView: View {

Projects/CoreKit/Sources/Data/DTO/Category/CategoryEditRequest.swift

@@ -10,9 +10,18 @@ import Foundation
 public struct CategoryEditRequest: Encodable {
     public let categoryName: String
     public let categoryImageId: Int
+    public let openType: String
+    public let keywordType: String
 
-    public init(categoryName: String, categoryImageId: Int) {
+    public init(
+        categoryName: String,
+        categoryImageId: Int,
+        openType: String,
+        keywordType: String
+    ) {
         self.categoryName = categoryName
         self.categoryImageId = categoryImageId
+        self.openType = openType
+        self.keywordType = keywordType
     }
 }

Projects/CoreKit/Sources/Data/DTO/Category/CategoryListInquiryResponse.swift

@@ -25,6 +25,10 @@ public struct CategoryItemInquiryResponse: Decodable {
     public let categoryImage: CategoryImageResponse
     public let contentCount: Int
     public let createdAt: String
+    public let openType: String
+    public let keywordType: String
+    public let userCount: Int
+    public let isFavorite: Bool
 }
 /// Sort
 public struct ItemInquirySortResponse: Decodable {
@@ -45,7 +49,11 @@ public extension CategoryItemInquiryResponse {
             imageUrl: Constants.mockImageUrl
         ),
         contentCount: 90,
-        createdAt: ""
+        createdAt: "",
+        openType: "PRIVATE",
+        keywordType: "스포츠/레저",
+        userCount: 0,
+        isFavorite: false
     )
 }
 
@@ -61,7 +69,11 @@ extension CategoryListInquiryResponse {
                     imageUrl: Constants.mockImageUrl
                 ),
                 contentCount: 90,
-                createdAt: ""
+                createdAt: "",
+                openType: "PRIVATE",
+                keywordType: "스포츠/레저",
+                userCount: 0,
+                isFavorite: false
             ),
             CategoryItemInquiryResponse(
                 categoryId: 2,
@@ -72,7 +84,11 @@ extension CategoryListInquiryResponse {
                     imageUrl: Constants.mockImageUrl
                 ),
                 contentCount: 90,
-                createdAt: ""
+                createdAt: "",
+                openType: "PUBLIC",
+                keywordType: "스포츠/레저",
+                userCount: 1,
+                isFavorite: false
             ),
             CategoryItemInquiryResponse(
                 categoryId: 3,
@@ -83,7 +99,11 @@ extension CategoryListInquiryResponse {
                     imageUrl: Constants.mockImageUrl
                 ),
                 contentCount: 90,
-                createdAt: ""
+                createdAt: "",
+                openType: "PUBLIC",
+                keywordType: "스포츠/레저",
+                userCount: 5,
+                isFavorite: false
             )
         ],
         page: 1,

Projects/CoreKit/Sources/Data/DTO/Category/CopiedCategoryRequest.swift

@@ -11,14 +11,20 @@ public struct CopiedCategoryRequest: Encodable {
     public let originCategoryId: Int
     public var categoryName: String
     public var categoryImageId: Int
+    public let keyword: String
+    public let openType: String
 
     public init(
         originCategoryId: Int,
         categoryName: String,
-        categoryImageId: Int
+        categoryImageId: Int,
+        keyword: String,
+        openType: String
     ) {
         self.originCategoryId = originCategoryId
         self.categoryName = categoryName
         self.categoryImageId = categoryImageId
+        self.keyword = keyword
+        self.openType = openType
     }
 }

Projects/CoreKit/Sources/Data/Network/Category/CategoryClient+LiveKey.swift

@@ -21,8 +21,14 @@ extension CategoryClient: DependencyKey {
             카테고리_수정: { id, model in
                 try await provider.request(.카테고리_수정(categoryId: id, model: model))
             },
-            카테고리_목록_조회: { model, categoryFilter in
-                try await provider.request(.카테고리_목록_조회(model: model, filterUncategorized: categoryFilter))
+            카테고리_목록_조회: { model, categoryFilter, favoriteFilter in
+                try await provider.request(
+                    .카테고리_목록_조회(
+                        model: model,
+                        filterUncategorized: categoryFilter,
+                        filterFavoriteCategorized: favoriteFilter
+                    )
+                )
             },
             카테고리_생성: { model in
                 try await provider.request(.카테고리생성(model: model))

Projects/CoreKit/Sources/Data/Network/Category/CategoryClient+TestKey.swift

@@ -12,7 +12,7 @@ extension CategoryClient: TestDependencyKey {
         Self(
             카테고리_삭제: { _ in },
             카테고리_수정: { _, _ in .mock },
-            카테고리_목록_조회: { _, _ in .mock },
+            카테고리_목록_조회: { _, _, _ in .mock },
             카테고리_생성: { _ in .mock },
             카테고리_프로필_목록_조회: { CategoryImageResponse.mock },
             유저_카테고리_개수_조회: { .mock },

Projects/CoreKit/Sources/Data/Network/Category/CategoryClient.swift

@@ -14,7 +14,11 @@ public struct CategoryClient {
         _ categoryId: Int,
         _ model: CategoryEditRequest
     ) async throws -> CategoryEditResponse
-    public var 카테고리_목록_조회: @Sendable (_ model: BasePageableRequest, _ filterUncategorized: Bool) async throws -> CategoryListInquiryResponse
+    public var 카테고리_목록_조회: @Sendable (
+        _ model: BasePageableRequest,
+        _ filterUncategorized: Bool,
+        _ filterFavoriteCategorized: Bool
+    ) async throws -> CategoryListInquiryResponse
     public var 카테고리_생성: @Sendable (
         _ model: CategoryEditRequest
     ) async throws -> CategoryEditResponse

Projects/CoreKit/Sources/Data/Network/Category/CategoryEndpoint.swift

@@ -13,7 +13,7 @@ import Moya
 public enum CategoryEndpoint {
     case 카테고리_삭제(categoryId: Int)
     case 카테고리_수정(categoryId: Int, model: CategoryEditRequest)
-    case 카테고리_목록_조회(model: BasePageableRequest, filterUncategorized: Bool)
+    case 카테고리_목록_조회(model: BasePageableRequest, filterUncategorized: Bool, filterFavoriteCategorized: Bool)
     case 카테고리생성(model: CategoryEditRequest)
     case 카테고리_프로필_목록_조회
     case 유저_카테고리_개수_조회
@@ -25,7 +25,13 @@ public enum CategoryEndpoint {
 
 extension CategoryEndpoint: TargetType {
     public var baseURL: URL {
-        return Constants.serverURL.appendingPathComponent(Constants.categoryPath, conformingTo: .url)
+        switch self {
+        case .카테고리_목록_조회, .카테고리생성, .카테고리_수정, .공유받은_카테고리_저장:
+            return Constants.serverURL.appendingPathComponent(Constants.categoryPathV2, conformingTo: .url)
+
+        default:
+            return Constants.serverURL.appendingPathComponent(Constants.categoryPath, conformingTo: .url)
+        }
     }
 
     public var path: String {
@@ -77,13 +83,14 @@ extension CategoryEndpoint: TargetType {
             return .requestPlain
         case let .카테고리_수정(_, model):
             return .requestJSONEncodable(model)
-        case let .카테고리_목록_조회(model, categorized):
+        case let .카테고리_목록_조회(model, categorized, favoriteCategorized):
             return .requestParameters(
                 parameters: [
                     "page": model.page,
                     "size": model.size,
                     "sort": model.sort.map { String($0) }.joined(separator: ","),
-                    "filterUncategorized": categorized
+                    "filterUncategorized": categorized,
+                    "filterFavorite": favoriteCategorized
                 ],
                 encoding: URLEncoding.default
             )