Merge branch 'main' into develop

YAPP-Github · Nov 19, 2024 · 58d1143 · 58d1143
2 parents 9f5d97a + 703f0e1
commit 58d1143
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 9 deletions.
diff --git a/Projects/CoreKit/Sources/Data/Network/Remind/RemindClient.swift b/Projects/CoreKit/Sources/Data/Network/Remind/RemindClient.swift
@@ -21,5 +21,4 @@ public struct RemindClient {
     async throws -> UnreadCountResponse
     public var 즐겨찾기_컨텐츠_개수_조회: @Sendable ()
     async throws -> BookmarkCountResponse
-
 }
diff --git a/Projects/Feature/FeatureCategoryDetail/Sources/CategoryDetailFeature.swift b/Projects/Feature/FeatureCategoryDetail/Sources/CategoryDetailFeature.swift
@@ -265,15 +265,13 @@ private extension CategoryDetailFeature {
             state.isPokitDeleteSheetPresented = false
             state.kebobSelectedType = nil
             return .none
-
         case .pagenation_API_반영(let contentList):
             let list = state.domain.contentList.data ?? []
             guard let newList = contentList.data else { return .none }
 
             state.domain.contentList = contentList
             state.domain.contentList.data = list + newList
             newList.forEach { state.contents.append(.init(content: $0)) }
-
             return .none
 
         case .pagenation_초기화:
@@ -310,7 +308,6 @@ private extension CategoryDetailFeature {
                 let contentList = try await contentClient.카테고리_내_컨텐츠_목록_조회(
                     "\(id)", request, conditionRequest
                 ).toDomain()
-
                 pageable.page == 0
                 ? await send(.inner(.카테고리_내_컨텐츠_목록_조회_API_반영(contentList)), animation: .pokitDissolve)
                 : await send(.inner(.pagenation_API_반영(contentList)))

diff --git a/Projects/Feature/FeatureContentList/Sources/ContentList/ContentListFeature.swift b/Projects/Feature/FeatureContentList/Sources/ContentList/ContentListFeature.swift
@@ -37,6 +37,9 @@ public struct ContentListFeature {
         var contentCount: Int {
             get { domain.contentCount }
         }
+        var contentCount: Int {
+            get { domain.contentCount }
+        }
         var isListDescending = true
         /// sheet item
         var bottomSheetItem: BaseContentItem? = nil
@@ -236,6 +239,9 @@ private extension ContentListFeature {
         case let .컨텐츠_개수_업데이트(count):
             state.domain.contentCount = count
             return .none
+        case let .컨텐츠_개수_갱신(count):
+            state.domain.contentCount = count
+            return .none
         }
     }
 

diff --git a/Projects/Feature/FeaturePokit/Sources/PokitRootFeature.swift b/Projects/Feature/FeaturePokit/Sources/PokitRootFeature.swift
@@ -410,7 +410,6 @@ private extension PokitRootFeature {
                     animation: .pokitSpring
                 )
             }
-
         case .카테고리_페이징_재조회_API:
             return .run { [pageable = state.domain.pageable] send in
                 let stream = AsyncThrowingStream<BaseCategoryListInquiry, Error> { continuation in
@@ -520,7 +519,6 @@ private extension PokitRootFeature {
                     /// 🚨 Error Case [1]: 항목을 삭제하려는데 항목이 없을 때
                     return .none
                 }
-
                 return .send(.async(.미분류_카테고리_컨텐츠_삭제_API(contentId: selectedItem.id)), animation: .pokitSpring)
 
             case .folder(.포킷):

diff --git a/Projects/Feature/FeatureSetting/Sources/Search/PokitSearchFeature.swift b/Projects/Feature/FeatureSetting/Sources/Search/PokitSearchFeature.swift
@@ -343,7 +343,6 @@ private extension PokitSearchFeature {
         case .링크_공유_완료되었을때:
             state.shareSheetItem = nil
             return .none
-
         case .로딩중일때:
             return .send(.async(.컨텐츠_검색_페이징_API))
         }
@@ -360,7 +359,6 @@ private extension PokitSearchFeature {
                 state.domain.contentList.data = []
             }
             return .none
-
         case let .기간_업데이트(startDate, endDate):
             let formatter = DateFormat.dateFilter.formatter
 
@@ -529,7 +527,7 @@ private extension PokitSearchFeature {
                     pageableRequest,
                     conditionRequest
                 ).toDomain()
-                
+
                 await send(.inner(.컨텐츠_검색_페이징_API_반영(contentList)))
             }
 

diff --git a/README.md b/README.md
@@ -1,3 +1,76 @@
 # Pokit
+<img src="https://github.com/user-attachments/assets/d51d0c67-0f0b-4ce3-8c73-74992a6b9f0e" alt="6">
 
+<a href="https://apps.apple.com/kr/app/pokit-%ED%8F%AC%ED%82%B7-%EA%B0%84%ED%8E%B8-%EB%A7%81%ED%81%AC-%EC%95%84%EC%B9%B4%EC%9D%B4%EB%B9%99-%EC%95%B1/id6514313808" target="_blank"> <img src="https://github.com/user-attachments/assets/cfb6c288-7b66-4488-98c7-df07de27e8a5" alt="Download_on_the_App_Store_Badge" width="150"></a> <a href="https://play.google.com/store/apps/details?id=pokitmons.pokit" target="_blank"><img src="https://github.com/user-attachments/assets/76d30e5f-7a9c-4fd3-80fc-6e19395bd20a" alt="Google_Play_Store_badge_EN" width="150"></a><br>
 
+## Feature
+<img src="https://github.com/user-attachments/assets/5902a53b-0a69-4866-961c-c9e1c83316e2" alt="b5">
+
+## 아키텍쳐
+
+<img src="https://github.com/user-attachments/assets/452c4a60-f558-46f6-a067-5b210d076762" width=800>
+<img src="https://github.com/user-attachments/assets/36ea9d35-3773-4d63-8477-2645c641dcf6" width=800>
+
+## Dependencies 
+<table style="text-align: center;">
+    <thead>
+        <tr>
+            <th>Used</th>
+            <th>Dependency</th>
+            <th>Version</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>Architecture</td>
+            <td>TCA</td>
+            <td>1.11.0</td>
+        </tr>
+        <tr>
+            <td>Architecture</td>
+            <td>Tuist (Modular Architecture)</td>
+            <td>4.15.0</td>
+        </tr>
+        <tr>
+            <td>Network</td>
+            <td>Moya</td>
+            <td>15.0.0</td>
+        </tr>
+        <tr>
+            <td>UI</td>
+            <td>Nuke</td>
+            <td>12.8.0</td>
+        </tr>
+        <tr>
+            <td>Feat</td>
+            <td>FCM</td>
+            <td>10.28.0</td>
+        </tr>
+        <tr>
+            <td>Feat</td>
+            <td>KakaoSDK</td>
+            <td>2.22.5</td>
+        </tr>
+        <tr>
+            <td>CI/CD</td>
+            <td>Fastlane</td>
+            <td>2.222.0</td>
+        </tr>
+        <tr>
+            <td>CI/CD</td>
+            <td>GitHub Action</td>
+            <td>-</td>
+        </tr>
+    </tbody>
+</table>
+<br>
+
+## 💻 앱 개발 및 배포환경
+- Xcode 15.0
+- SwiftUI, iOS 16.0
+<br>
+
+## ✨ Contributors
+|<img src="https://avatars.githubusercontent.com/u/66459715?v=4" width=180>|<img src="https://avatars.githubusercontent.com/ShapeKim98" width=180>|
+|:-:|:-:|
+|[@stealmh](https://github.com/stealmh)|[@ShapeKim98](https://github.com/ShapeKim98)|