Merge pull request #168 from YAPP-Github/feat/#167-qa-241207

feat: 1.0.6베타 QA 반영
YAPP-Github · Dec 12, 2024 · e843c11 · e843c11
2 parents bfe5652 + 9384699
commit e843c11
Show file tree

Hide file tree

Showing 24 changed files with 236 additions and 201 deletions.
diff --git a/Projects/App/ShareExtension/Sources/ShareRootFeature.swift b/Projects/App/ShareExtension/Sources/ShareRootFeature.swift
@@ -106,10 +106,10 @@ struct ShareRootFeature {
     func handleAsyncAction(_ action: Action.AsyncAction, state: inout State) -> Effect<Action> {
         switch action {
         case .URL_파싱_수행:
-            guard let item = state.context?.inputItems.first as? NSExtensionItem,
-                  let itemProvider = item.attachments?.first else {
-                return .none
-            }
+            guard
+                let item = state.context?.inputItems.first as? NSExtensionItem,
+                let itemProvider = item.attachments?.first
+            else { return .none }
 
             return .run { send in
                 var urlItem: (any NSSecureCoding)? = nil

diff --git a/Projects/App/Sources/AppDelegate/AppDelegateFeature.swift b/Projects/App/Sources/AppDelegate/AppDelegateFeature.swift
@@ -60,7 +60,8 @@ public struct AppDelegateFeature {
                             let setting = await self.userNotifications.getNotificationSettings()
                             switch setting.authorizationStatus {
                             case .authorized, .notDetermined:
-                                guard try await self.userNotifications.requestAuthorization([.alert, .sound])
+                                guard
+                                    try await self.userNotifications.requestAuthorization([.alert, .sound])
                                 else { return }
                             default: return
                             }

diff --git a/Projects/App/Sources/MainTab/MainTabFeature.swift b/Projects/App/Sources/MainTab/MainTabFeature.swift
@@ -41,7 +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?
+        var categoryOfSavedContent: BaseCategoryItem?
 
         public init() {
             self.pokit = .init()
@@ -78,6 +78,7 @@ public struct MainTabFeature {
             case 경고_띄움(BaseError)
             case errorSheetPresented(Bool)
             case 링크팝업_활성화(PokitLinkPopup.PopupType)
+            case 카테고리상세_이동(category: BaseCategoryItem)
         }
         public enum AsyncAction: Equatable {
             case 공유받은_카테고리_조회(categoryId: Int)
@@ -98,7 +99,7 @@ public struct MainTabFeature {
         switch action {
         case .binding(\.linkPopup):
             guard state.linkPopup == nil else { return .none }
-            state.savedContentId = nil
+            state.categoryOfSavedContent = nil
             return .none
         case .binding:
             return .none
@@ -183,15 +184,15 @@ private extension MainTabFeature {
                 }
             )
         case .onOpenURL(url: let url):
-            guard let components = URLComponents(url: url, resolvingAgainstBaseURL: false) else {
-                return .none
-            }
+            guard
+                let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
+            else { return .none }
 
             let queryItems = components.queryItems ?? []
-            guard let categoryIdString = queryItems.first(where: { $0.name == "categoryId" })?.value,
-                  let categoryId = Int(categoryIdString) else {
-                return .none
-            }
+            guard
+                let categoryIdString = queryItems.first(where: { $0.name == "categoryId" })?.value,
+                let categoryId = Int(categoryIdString)
+            else { return .none }
 
             return .send(.async(.공유받은_카테고리_조회(categoryId: categoryId)))
         case .경고_확인버튼_클릭:
@@ -222,7 +223,14 @@ private extension MainTabFeature {
         case let .링크팝업_활성화(type):
             state.linkPopup = type
             return .none
-
+        case let .카테고리상세_이동(category):
+            if category.categoryName == "미분류" {
+                state.selectedTab = .pokit
+                state.path.removeAll()
+                return .send(.pokit(.delegate(.미분류_카테고리_활성화)))
+            }
+            state.path.append(.카테고리상세(.init(category: category)))
+            return .none
         default: return .none
         }
     }
@@ -259,9 +267,9 @@ private extension MainTabFeature {
             return .send(.delegate(.링크추가하기))
         case .success:
             state.linkPopup = nil
-            state.contentDetail = .init(contentId: state.savedContentId)
-            state.savedContentId = nil
-            return .none
+            guard let category = state.categoryOfSavedContent else { return .none }
+            state.categoryOfSavedContent = nil
+            return .send(.inner(.카테고리상세_이동(category: category)))
         case .error, .text, .warning, .none:
             return .none
         }

diff --git a/Projects/App/Sources/MainTab/MainTabPath.swift b/Projects/App/Sources/MainTab/MainTabPath.swift
@@ -141,8 +141,10 @@ public extension MainTabFeature {
             case .contentDetail(.presented(.delegate(.즐겨찾기_갱신_완료))),
                  .contentDetail(.presented(.delegate(.컨텐츠_조회_완료))),
                  .contentDetail(.presented(.delegate(.컨텐츠_삭제_완료))):
-                guard let stackElementId = state.path.ids.last,
-                      let lastPath = state.path.last else {
+                guard
+                    let stackElementId = state.path.ids.last,
+                    let lastPath = state.path.last
+                else {
                     switch state.selectedTab {
                     case .pokit:
                         return .send(.pokit(.delegate(.미분류_카테고리_컨텐츠_조회)))
@@ -175,7 +177,7 @@ public extension MainTabFeature {
 
             /// - 링크추가 및 수정에서 저장하기 눌렀을 때
             case let .path(.element(stackElementId, action: .링크추가및수정(.delegate(.저장하기_완료(contentId))))):
-                state.savedContentId = contentId
+                state.categoryOfSavedContent = contentId
                 state.path.removeLast()
                 switch state.path.last {
                 case .검색:

diff --git a/Projects/CoreKit/Sources/CoreNetwork/TokenInterceptor.swift b/Projects/CoreKit/Sources/CoreNetwork/TokenInterceptor.swift
@@ -44,16 +44,20 @@ public final class TokenInterceptor: RequestInterceptor {
         dueTo error: Error,
         completion: @escaping (RetryResult) -> Void
     ) {
-        guard let response = request.task?.response as? HTTPURLResponse,
-              response.statusCode == 401 else {
+        guard
+            let response = request.task?.response as? HTTPURLResponse,
+            response.statusCode == 401
+        else {
             completion(.doNotRetryWithError(error))
             return
         }
 
         print("🚀 Retry: statusCode: \(response.statusCode)")
 
-        guard keychain.read(.accessToken) != nil,
-              let refreshToken = keychain.read(.refreshToken) else {
+        guard
+            keychain.read(.accessToken) != nil,
+            let refreshToken = keychain.read(.refreshToken)
+        else {
             deleteAllToken()
             completion(.doNotRetryWithError(error))
             return

diff --git a/Projects/CoreKit/Sources/Data/Client/KakaoSDK/Share/KakaoShareClient+LiveKey.swift b/Projects/CoreKit/Sources/Data/Client/KakaoSDK/Share/KakaoShareClient+LiveKey.swift
@@ -45,14 +45,16 @@ extension KakaoShareClient: DependencyKey {
                     buttons: [button]
                 )
 
-                guard ShareApi.isKakaoTalkSharingAvailable(),
-                      let templateJsonData = try? SdkJSONEncoder.custom.encode(template),
-                      let templateJsonObject = SdkUtils.toJsonObject(templateJsonData) else {
+                guard
+                    ShareApi.isKakaoTalkSharingAvailable(),
+                    let templateJsonData = try? SdkJSONEncoder.custom.encode(template),
+                    let templateJsonObject = SdkUtils.toJsonObject(templateJsonData)
+                else {
                     /// 🚨 Error Case [1]: 카카오톡 미설치
-                    guard let url = URL(string: "itms-apps://itunes.apple.com/app/id362057947"),
-                          UIApplication.shared.canOpenURL(url) else {
-                        return
-                    }
+                    guard
+                        let url = URL(string: "itms-apps://itunes.apple.com/app/id362057947"),
+                        UIApplication.shared.canOpenURL(url)
+                    else { return }
 
                     UIApplication.shared.open(url, options: [:], completionHandler: nil)
                     return

diff --git a/Projects/CoreKit/Sources/Data/Client/SocialLogin/Controller/AppleLoginController.swift b/Projects/CoreKit/Sources/Data/Client/SocialLogin/Controller/AppleLoginController.swift
@@ -33,22 +33,28 @@ public final class AppleLoginController: NSObject, ASAuthorizationControllerDele
         controller: ASAuthorizationController,
         didCompleteWithAuthorization authorization: ASAuthorization
     ) {
-        guard let credential = authorization.credential as? ASAuthorizationAppleIDCredential else {
+        guard
+            let credential = authorization.credential as? ASAuthorizationAppleIDCredential
+        else {
             continuation?.resume(throwing: SocialLoginError.invalidCredential)
             continuation = nil
             return
         }
 
 
-        guard let tokenData = credential.identityToken,
-              let token = String(data: tokenData, encoding: .utf8) else {
+        guard
+            let tokenData = credential.identityToken,
+            let token = String(data: tokenData, encoding: .utf8)
+        else {
             continuation?.resume(throwing: SocialLoginError.appleLoginError(.invalidIdentityToken))
             continuation = nil
             return
         }
 
-        guard let authorizationCode = credential.authorizationCode,
-              let codeString = String(data: authorizationCode, encoding: .utf8) else {
+        guard
+            let authorizationCode = credential.authorizationCode,
+            let codeString = String(data: authorizationCode, encoding: .utf8)
+        else {
             continuation?.resume(throwing: SocialLoginError.appleLoginError(.invalidAuthorizationCode))
             continuation = nil
             return

diff --git a/Projects/DSKit/Sources/Components/PokitBadge.swift b/Projects/DSKit/Sources/Components/PokitBadge.swift
@@ -19,20 +19,14 @@ public struct PokitBadge: View {
             .background {
                 RoundedRectangle(cornerRadius: 4, style: .continuous)
                     .fill(backgroundColor)
-                    .overlay {
-                        if state == .unRead {
-                            RoundedRectangle(cornerRadius: 4, style: .continuous)
-                                .stroke(.pokit(.border(.brand)), lineWidth: 1)
-                        }
-                    }
             }
     }
 
     private var backgroundColor: Color {
         switch self.state {
         case .default, .small, .memo, .member: return .pokit(.bg(.primary))
         case .unCategorized: return .pokit(.color(.grayScale(._50)))
-        case .unRead: return .pokit(.bg(.base))
+        case .unRead: return Color(red: 1, green: 0.95, blue: 0.92)
         }
     }
 

diff --git a/Projects/DSKit/Sources/Components/PokitCalendar.swift b/Projects/DSKit/Sources/Components/PokitCalendar.swift
@@ -208,13 +208,13 @@ public struct PokitCalendar: View {
             let year = calendar.component(.year, from: date)
             let month = calendar.component(.month, from: date)
 
-            guard let range = calendar.range(
-                of: .day,
-                in: .month,
-                for: date
-            ) else {
-                return dates
-            }
+            guard
+                let range = calendar.range(
+                    of: .day,
+                    in: .month,
+                    for: date
+                )
+            else { return dates }
 
             dates = range.map { day in
                 var components = DateComponents()
@@ -255,13 +255,13 @@ public struct PokitCalendar: View {
                 return dates
             }
 
-            guard let monthRange = calendar.range(
-                of: .day,
-                in: .month,
-                for: monthDate
-            ) else {
-                return dates
-            }
+            guard
+                let monthRange = calendar.range(
+                    of: .day,
+                    in: .month,
+                    for: monthDate
+                )
+            else { return dates }
 
             let monthDays = Array(monthRange).suffix(firstWeekday - 1)
 
@@ -369,25 +369,24 @@ public struct PokitCalendar: View {
     }
 
     private func beforeButtonTapped() {
-        guard let date = calendar.date(
-            byAdding: .month,
-            value: -1,
-            to: currentDate
-        ) else {
-            return
-        }
+        guard
+            let date = calendar.date(
+                byAdding: .month,
+                value: -1,
+                to: currentDate
+            ) else { return }
 
         self.page = formatter.string(from: date)
     }
 
     private func nextButtonTapped() {
-        guard let date = calendar.date(
-            byAdding: .month,
-            value: 1,
-            to: currentDate
-        ) else {
-            return
-        }
+        guard
+            let date = calendar.date(
+                byAdding: .month,
+                value: 1,
+                to: currentDate
+            )
+        else { return }
 
         self.page = formatter.string(from: date)
     }

diff --git a/Projects/DSKit/Sources/Components/PokitLinkCard.swift b/Projects/DSKit/Sources/Components/PokitLinkCard.swift
@@ -135,16 +135,16 @@ public struct PokitLinkCard<Item: PokitLinkCardItem>: View {
         let isUnCategorized = link.categoryName == "미분류"
 
         HStack(spacing: 6) {
-            if let isRead = link.isRead, !isRead {
-                PokitBadge(state: .unRead)
-            }
-
             PokitBadge(
                 state: isUnCategorized
                 ? .unCategorized
                 : .default(link.categoryName)
             )
 
+            if let isRead = link.isRead, !isRead {
+                PokitBadge(state: .unRead)
+            }
+
             if let memo = link.memo, !memo.isEmpty {
                 PokitBadge(state: .memo)
             }

diff --git a/Projects/DSKit/Sources/Components/PokitLinkPreview.swift b/Projects/DSKit/Sources/Components/PokitLinkPreview.swift
@@ -7,6 +7,7 @@
 
 import SwiftUI
 
+import Util
 import NukeUI
 
 public struct PokitLinkPreview: View {
@@ -33,7 +34,6 @@ public struct PokitLinkPreview: View {
         }
     }
 
-
     private var buttonLabel: some View {
         HStack(spacing: 16) {
             Group {
@@ -54,18 +54,13 @@ public struct PokitLinkPreview: View {
         .background {
             RoundedRectangle(cornerRadius: 12, style: .continuous)
                 .fill(.pokit(.bg(.base)))
+                .shadow(color: .black.opacity(0.06), radius: 3, x: 2, y: 2)
         }
         .overlay {
             RoundedRectangle(cornerRadius: 12, style: .continuous)
                 .stroke(.pokit(.border(.tertiary)), lineWidth: 1)
         }
-        .shadow(color: .black.opacity(0.06), radius: 3, x: 2, y: 2)
-        .onAppear {
-            withAnimation {
-                UINotificationFeedbackGenerator()
-                    .notificationOccurred(.success)
-            }
-        }
+        .onChange(of: imageURL, perform: onChangeImageURL)
     }
 
     @MainActor
@@ -134,6 +129,13 @@ public struct PokitLinkPreview: View {
         else { return }
         openURL(url)
     }
+
+    private func onChangeImageURL(_ imageURL: String?) {
+        guard imageURL != nil else { return }
+        let isError = title == Constants.제목을_입력해주세요_문구
+        UINotificationFeedbackGenerator()
+            .notificationOccurred(isError ? .error : .success)
+    }
 }
 
 #Preview {

diff --git a/Projects/DSKit/Sources/Components/PokitList.swift b/Projects/DSKit/Sources/Components/PokitList.swift
@@ -81,7 +81,7 @@ public struct PokitList<Item: PokitSelectItem>: View {
 
                 Spacer()
             }
-            .padding(.vertical, 18)
+            .padding(.vertical, 12)
             .padding(.horizontal, 20)
             .background {
                 if isSelected {