feat: 1.0.6베타 QA 반영

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
@@ -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
         }

Projects/App/Sources/MainTab/MainTabPath.swift

@@ -175,7 +175,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 .검색:

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)
         }
     }
 

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)
             }

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 {

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 {

Projects/DSKit/Sources/Components/PokitListButton.swift

@@ -38,7 +38,7 @@ public struct PokitListButton: View {
             HStack {
                 switch type {
                 case let .default(icon, iconColor),
-                    let .bottomSheet(icon, iconColor),
+                    let .bottomSheet(icon, iconColor, _),
                     let .subText(icon, iconColor, _):
                     Text(title)
                         .pokitFont(.b1(.m))
@@ -76,9 +76,9 @@ public struct PokitListButton: View {
             }
         }
         .padding(.horizontal, 24)
-        .padding(.vertical, 16)
+        .padding(.vertical, 20)
         .background(alignment: .bottom) {
-            if case .bottomSheet = type {
+            if case let .bottomSheet(_, _, isLast) = type, !isLast {
                 Rectangle()
                     .fill(.pokit(.border(.tertiary)))
                     .frame(height: 1)
@@ -90,10 +90,9 @@ public struct PokitListButton: View {
 extension PokitListButton {
     public enum ListButtonType {
         case `default`(icon: PokitImage, iconColor: Color)
-        case bottomSheet(icon: PokitImage, iconColor: Color)
+        case bottomSheet(icon: PokitImage, iconColor: Color, isLast: Bool = false)
         case subText(icon: PokitImage, iconColor: Color, subeText: String)
         case toggle(subeText: String)
-
     }
 }
 

Projects/DSKit/Sources/Components/PokitSelect.swift

@@ -50,11 +50,11 @@ public struct PokitSelect<Item: PokitSelectItem>: View {
         }
         .onChange(of: selectedItem) { onChangedSeletedItem($0) }
         .sheet(isPresented: $showSheet) {
-            listSheet
-                .presentationDragIndicator(.visible)
-                .pokitPresentationCornerRadius()
-                .presentationDetents([.medium])
-                .pokitPresentationBackground()
+                listSheet
+                    .presentationDragIndicator(.visible)
+                    .pokitPresentationCornerRadius()
+                    .presentationDetents([.height(564)])
+                    .pokitPresentationBackground()
         }
     }
 
@@ -115,7 +115,7 @@ public struct PokitSelect<Item: PokitSelectItem>: View {
                         listCellTapped(item)
                     }
                 }
-                .padding(.top, 24)
+                .padding(.top, 12)
                 .padding(.bottom, 20)
             } else {
                 PokitLoading()

Projects/Feature/FeatureContentDetail/Sources/ContentDetail/ContentDetailFeature.swift

@@ -69,10 +69,12 @@ public struct ContentDetailFeature {
             case 삭제_버튼_눌렀을때
             case 삭제확인_버튼_눌렀을때
             case 즐겨찾기_버튼_눌렀을때
+            case 키보드_취소_버튼_눌렀을때
+            case 키보드_완료_버튼_눌렀울때
+
             case 경고시트_해제
 
             case 링크_공유_완료되었을때
-            case 메모포커스_변경되었을때(Bool)
         }
 
         public enum InnerAction: Equatable {
@@ -179,12 +181,12 @@ private extension ContentDetailFeature {
         case .경고시트_해제:
             state.showAlert = false
             return .none
-        case let .메모포커스_변경되었을때(isFocused):
-            guard
-                !isFocused,
-                state.memo != state.domain.content?.memo
-            else { return .none }
+        case .키보드_취소_버튼_눌렀을때:
+            state.memo = state.domain.content?.memo ?? ""
+            return .none
+        case .키보드_완료_버튼_눌렀울때:
             let memo = state.memo
+            guard memo != state.domain.content?.memo else { return .none }
             state.domain.content?.memo = memo
             return .send(.async(.컨텐츠_수정_API))
         }

Projects/Feature/FeatureContentDetail/Sources/ContentDetail/ContentDetailView.swift

@@ -34,8 +34,9 @@ public extension ContentDetailView {
                         VStack(spacing: 0) {
                             contentMemo
 
-                            Divider()
+                            Rectangle()
                                 .foregroundStyle(.pokit(.border(.tertiary)))
+                                .frame(height: 1)
 
                             bottomList(favorites: favorites)
                         }
@@ -56,8 +57,6 @@ public extension ContentDetailView {
                     PokitLinkPopup(type: $store.linkPopup)
                 }
             }
-            .dismissKeyboard(focused: $isFocused)
-            .onChange(of: isFocused) { send(.메모포커스_변경되었을때($0)) }
             .sheet(isPresented: $store.showAlert) {
                 PokitAlert(
                     "링크를 정말 삭제하시겠습니까?",
@@ -110,15 +109,15 @@ private extension ContentDetailView {
     func title(content: BaseContentDetail) -> some View {
         VStack(alignment: .leading, spacing: 8) {
             Group {
-                remindAndBadge(content: content)
-
                 Text(content.title)
                     .pokitFont(.title3)
                     .foregroundStyle(.pokit(.text(.primary)))
                     .multilineTextAlignment(.leading)
                     .lineLimit(2)
 
                 HStack {
+                    remindAndBadge(content: content)
+
                     Spacer()
 
                     Text(content.createdAt)
@@ -128,8 +127,9 @@ private extension ContentDetailView {
             }
             .padding(.horizontal, 20)
 
-            Divider()
+            Rectangle()
                 .foregroundStyle(.pokit(.border(.tertiary)))
+                .frame(height: 1)
                 .padding(.top, 4)
         }
     }
@@ -159,12 +159,29 @@ private extension ContentDetailView {
                 focusState: $isFocused,
                 equals: true
             )
+            .toolbar { keyboardToolBar }
             .frame(minHeight: isFocused ? 164 : 132)
             .animation(.pokitDissolve, value: isFocused)
         }
         .padding(.bottom, 24)
         .padding(.horizontal, 20)
     }
+
+    var keyboardToolBar: some ToolbarContent {
+        ToolbarItemGroup(placement: .keyboard) {
+            Button("취소") {
+                isFocused = false
+                send(.키보드_취소_버튼_눌렀을때)
+            }
+
+            Spacer()
+
+            Button("완료") {
+                isFocused = false
+                send(.키보드_완료_버튼_눌렀울때)
+            }
+        }
+    }
 
     @ViewBuilder
     func bottomList(favorites: Bool) -> some View {
@@ -204,7 +221,8 @@ private extension ContentDetailView {
                 title: "삭제하기",
                 type: .bottomSheet(
                     icon: .icon(.trash),
-                    iconColor: .pokit(.icon(.primary))
+                    iconColor: .pokit(.icon(.primary)),
+                    isLast: true
                 ),
                 action: { send(.삭제_버튼_눌렀을때) }
             )