fix: [2.0.0] 2차 QA [2]

Projects/App/ShareExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleName</key>
 	<string>Pokit</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.4</string>
+	<string>1.0.9</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

Projects/App/Sources/MainTab/MainTabFeature.swift

@@ -250,7 +250,7 @@ private extension MainTabFeature {
             state.linkPopup = type
             return .none
         case let .카테고리상세_이동(category):
-            if category.categoryName == "미분류" {
+            if category.categoryName == Constants.미분류 {
                 state.selectedTab = .pokit
                 state.path.removeAll()
                 return .send(.pokit(.delegate(.미분류_카테고리_활성화)))

Projects/DSKit/Resources/Assets.xcassets/character_empty.imageset/Contents.json

@@ -1,15 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "character_empty.png",
+      "filename" : "empty_graphic 1.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "empty_graphic 1@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "empty_graphic 1@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Projects/DSKit/Resources/Assets.xcassets/unpokited.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "unpokited.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "unpokited@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "unpokited@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Projects/DSKit/Sources/Components/PokitBottomButton.swift

@@ -14,17 +14,36 @@ public struct PokitBottomButton: View {
     private let labelText: String
     private let state: PokitButtonStyle.State
     private let size: PokitButtonStyle.Size = .large
+    private let isGradient: Bool
+    private let isKeyboardVisible: Bool
     private let action: () -> Void
 
-    public init(
+    private init(
         _ labelText: String,
         state: PokitButtonStyle.State,
-        isLoading: Binding<Bool> = .constant(false),
+        isLoading: Binding<Bool>,
+        isGradient: Bool,
+        isKeyboardVisible: Bool,
         action: @escaping () -> Void
     ) {
         self.labelText = labelText
         self.state = state
         self._isLoading = isLoading
+        self.isGradient = isGradient
+        self.isKeyboardVisible = isKeyboardVisible
+        self.action = action
+    }
+
+    public init(
+        _ labelText: String,
+        state: PokitButtonStyle.State,
+        action: @escaping () -> Void
+    ) {
+        self.labelText = labelText
+        self.state = state
+        self._isLoading = .constant(false)
+        self.isGradient = false
+        self.isKeyboardVisible = false
         self.action = action
     }
 
@@ -37,7 +56,17 @@ public struct PokitBottomButton: View {
         }
         .disabled(state == .disable)
         .padding(.top, 16)
-//        .padding(.bottom, 36)
+        .padding(.bottom, isKeyboardVisible ? 10 : 36)
+        .background(if: isGradient) {
+            LinearGradient(
+                stops: [
+                    Gradient.Stop(color: .pokit(.bg(.base)).opacity(0), location: 0.00),
+                    Gradient.Stop(color: .pokit(.bg(.base)), location: 0.20),
+                ],
+                startPoint: UnitPoint(x: 0.5, y: 0),
+                endPoint: UnitPoint(x: 0.5, y: 1)
+            )
+        }
     }
 
     private var label: some View {
@@ -71,7 +100,41 @@ public struct PokitBottomButton: View {
                 .stroke(self.state.backgroundStrokeColor, lineWidth: 1)
             }
         }
+        .padding(.horizontal, isGradient ? 20 : 0)
         .animation(.pokitDissolve, value: self.state)
     }
+
+    public func keyboardAnchor(_ isKeyboardVisible: Bool) -> Self {
+        PokitBottomButton(
+            self.labelText,
+            state: self.state,
+            isLoading: self.$isLoading,
+            isGradient: self.isGradient,
+            isKeyboardVisible: isKeyboardVisible,
+            action: self.action
+        )
+    }
+
+    public func gradientBackground() -> Self {
+        PokitBottomButton(
+            self.labelText,
+            state: self.state,
+            isLoading: self.$isLoading,
+            isGradient: true,
+            isKeyboardVisible: self.isKeyboardVisible,
+            action: self.action
+        )
+    }
+
+    public func loading(_ isLoading: Binding<Bool>) -> Self {
+        PokitBottomButton(
+            self.labelText,
+            state: self.state,
+            isLoading: isLoading,
+            isGradient: self.isGradient,
+            isKeyboardVisible: self.isKeyboardVisible,
+            action: self.action
+        )
+    }
 }
 

Projects/DSKit/Sources/Components/PokitCalendar.swift

@@ -181,6 +181,7 @@ public struct PokitCalendar: View {
         let isSelected = isStartDate || isEndDate
         let backgoundColor: Color = .pokit(.bg(.brand)).opacity(isSelected ? 1 : isContains ? 0.2 : 0)
         let day = calendar.component(.day, from: date)
+        let isFuture = date > .now
 
         Button {
             dayButtonTapped(
@@ -192,13 +193,14 @@ public struct PokitCalendar: View {
         } label: {
             Text("\(day)")
                 .pokitFont(.b1(.m))
-                .foregroundStyle(isCurrentMonth ? textColor : .pokit(.text(.tertiary)))
+                .foregroundStyle(isCurrentMonth && !isFuture ? textColor : .pokit(.text(.tertiary)))
                 .frame(width: width, height: width)
                 .background {
                     RoundedRectangle(cornerRadius: 8, style: .continuous)
                         .fill(backgoundColor)
                 }
         }
+        .disabled(isFuture)
     }
 
     private func dates(_ date: Date) -> [Date] {

Projects/DSKit/Sources/Components/PokitCaution.swift

@@ -65,7 +65,7 @@ public enum CautionType {
         case .알림없음:
             return "리마인드 알림을 설정하세요"
         case .추천_링크없음:
-            return ""
+            return "다른 사용자들이 링크를 저장하면\n추천해드릴게요"
         }
     }
 
@@ -101,17 +101,18 @@ public struct PokitCaution: View {
                     .resizable()
                     .aspectRatio(contentMode: .fill)
                     .frame(width: 180, height: 180)
-                    .padding(.bottom, 16)
+                    .padding(.bottom, 8)
 
                 Text(type.title)
                     .pokitFont(.title2)
                     .foregroundStyle(.pokit(.text(.secondary)))
                     .padding(.bottom, 8)
 
                 Text(type.message)
+                    .multilineTextAlignment(.center)
                     .pokitFont(.b2(.m))
                     .foregroundStyle(.pokit(.text(.secondary)))
-                    .padding(.bottom, 16)
+                    .padding(.bottom, 20)
 
                 if let action,
                    let actionTitle = type.actionTitle {
@@ -127,6 +128,9 @@ public struct PokitCaution: View {
 
             Spacer()
         }
+        .padding(.bottom, 80)
+        .frame(maxHeight: .infinity)
+        .padding(.bottom, 92)
     }
 }
 

Projects/DSKit/Sources/Components/PokitLinkCard.swift

@@ -138,7 +138,7 @@ public struct PokitLinkCard<Item: PokitLinkCardItem>: View {
 
     @ViewBuilder
     private func badges() -> some View {
-        let isUnCategorized = link.categoryName == "미분류"
+        let isUnCategorized = link.categoryName == Constants.미분류
 
         HStack(spacing: 6) {
             PokitBadge(

Projects/DSKit/Sources/Components/PokitList.swift

@@ -33,11 +33,7 @@ public struct PokitList<Item: PokitSelectItem>: View {
 
     public var body: some View {
         if list.isEmpty {
-            VStack {
-                PokitCaution(type: .카테고리없음)
-
-                Spacer()
-            }
+            PokitCaution(type: .카테고리없음)
         } else {
             ScrollView {
                 VStack(spacing: 0) {
@@ -59,7 +55,14 @@ public struct PokitList<Item: PokitSelectItem>: View {
             action(item)
         } label: {
             HStack(spacing: 12) {
-                thumbNail(url: item.categoryImage.imageURL)
+                if item.categoryName == Constants.미분류 {
+                    Image(.image(.unpokited))
+                        .resizable()
+                        .aspectRatio(contentMode: .fit)
+                        .frame(width: 60, height: 60)
+                } else {
+                    thumbNail(url: item.categoryImage.imageURL)
+                }
 
                 VStack(alignment: .leading, spacing: 4) {
                     Text(item.categoryName)

Projects/DSKit/Sources/Foundation/PokitImage.swift

@@ -128,6 +128,8 @@ public enum PokitImage {
                 return DSKitAsset.imageFirecracker.swiftUIImage
             case .profile:
                 return DSKitAsset.imageProfile.swiftUIImage
+            case .unpokited:
+                return DSKitAsset.unpokited.swiftUIImage
             }
         }
     }
@@ -195,5 +197,6 @@ public extension PokitImage {
         case confetti
         case firecracker
         case profile
+        case unpokited
     }
 }

Projects/Feature/FeatureCategoryDetail/Sources/CategoryDetailFeature.swift

@@ -201,8 +201,10 @@ private extension CategoryDetailFeature {
         case let .분류_버튼_눌렀을때(type):
             if type == .즐겨찾기 {
                 state.domain.condition.isFavoriteFlitered.toggle()
+                state.domain.condition.isUnreadFlitered = !state.domain.condition.isFavoriteFlitered
             } else {
                 state.domain.condition.isUnreadFlitered.toggle()
+                state.domain.condition.isFavoriteFlitered = !state.domain.condition.isUnreadFlitered
             }
             return .concatenate(
                 .send(.inner(.pagenation_초기화), animation: .pokitDissolve),

Projects/Feature/FeatureCategoryDetail/Sources/CategoryDetailView.swift

@@ -226,24 +226,9 @@ private extension CategoryDetailView {
                         .foregroundStyle(.pokit(.text(.tertiary)))
                         .pokitFont(.b2(.m))
                 } else {
-                    PokitTextButton(
-                        "즐겨찾기",
-                        state: store.isFavoriteFiltered
-                        ? .filled(.primary)
-                        : .default(.secondary),
-                        size: .small,
-                        shape: .round,
-                        action: { send(.분류_버튼_눌렀을때(.즐겨찾기)) }
-                    )
-                    PokitTextButton(
-                        "안읽음",
-                        state: store.isUnreadFiltered
-                        ? .filled(.primary)
-                        : .default(.secondary),
-                        size: .small,
-                        shape: .round,
-                        action: { send(.분류_버튼_눌렀을때(.안읽음)) }
-                    )
+                    favoriteButton
+
+                    unreadButton
                 }
 
                 Spacer()
@@ -257,18 +242,58 @@ private extension CategoryDetailView {
         }
     }
 
+    @ViewBuilder
+    var favoriteButton: some View {
+        if store.isFavoriteFiltered {
+            PokitIconRButton(
+                "즐겨찾기",
+                .icon(.x),
+                state: .filled(.primary),
+                size: .small,
+                shape: .round,
+                action: { send(.분류_버튼_눌렀을때(.즐겨찾기)) }
+            )
+        } else {
+            PokitTextButton(
+                "즐겨찾기",
+                state: .default(.secondary),
+                size: .small,
+                shape: .round,
+                action: { send(.분류_버튼_눌렀을때(.즐겨찾기)) }
+            )
+        }
+    }
+
+    @ViewBuilder
+    var unreadButton: some View {
+        if store.isUnreadFiltered {
+            PokitIconRButton(
+                "안읽음",
+                .icon(.x),
+                state: .filled(.primary),
+                size: .small,
+                shape: .round,
+                action: { send(.분류_버튼_눌렀을때(.안읽음)) }
+            )
+        } else {
+            PokitTextButton(
+                "안읽음",
+                state: .default(.secondary),
+                size: .small,
+                shape: .round,
+                action: { send(.분류_버튼_눌렀을때(.안읽음)) }
+            )
+        }
+    }
+
     var contentScrollView: some View {
         Group {
             if !store.isLoading {
-                if !store.isContentsNotEmpty {
-                    VStack {
-                        PokitCaution(
-                            type: .포킷상세_링크없음,
-                            action: { send(.링크_추가_버튼_눌렀을때) }
-                        )
-
-                        Spacer()
-                    }
+                if store.contents.isEmpty {
+                    PokitCaution(
+                        type: .포킷상세_링크없음,
+                        action: { send(.링크_추가_버튼_눌렀을때) }
+                    )
                 } else {
                     LazyVStack(spacing: 0) {
                         ForEach(

Projects/Feature/FeatureCategoryDetail/Sources/Sheet/CategoryFilterSheet.swift

@@ -113,7 +113,6 @@ private extension CategoryFilterSheet {
                 )
                 }
             )
-            .padding(.bottom, 36)
         }
         .padding(.horizontal, 20)
     }