Merge pull request #31 from ApptiveDev/dev

[Release] 1.0.14 업데이트

Author: mark77234

KillingPart.xcodeproj/project.pbxproj

@@ -434,7 +434,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = KillingPart/KillingPart.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = GQ89YG5G9R;
 				ENABLE_APP_SANDBOX = YES;
@@ -459,7 +459,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 1.0.13;
+				MARKETING_VERSION = 1.0.14;
 				PRODUCT_BUNDLE_IDENTIFIER = com.killingpoint.killingpart;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;
@@ -479,7 +479,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = KillingPart/KillingPart.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = GQ89YG5G9R;
 				ENABLE_APP_SANDBOX = YES;
@@ -504,7 +504,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 1.0.13;
+				MARKETING_VERSION = 1.0.14;
 				PRODUCT_BUNDLE_IDENTIFIER = com.killingpoint.killingpart;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;

KillingPart/Views/Screens/Main/My/MyCollection/MyCollectionView.swift

@@ -58,29 +58,18 @@ struct MyCollectionView: View {
             }
         }
         .navigationDestination(for: MyCollectionDiaryRoute.self) { route in
-            if let diary = viewModel.myFeeds.first(where: { $0.diaryId == route.diaryId }) {
-                MyCollectionDiary(
-                    diaryId: route.diaryId,
-                    displayTag: viewModel.displayTag,
-                    diary: diary
-                ) { changedDiaryId in
-                    viewModel.removeMyFeedLocally(diaryId: changedDiaryId)
-                    collectionListRenderID = UUID()
-                    Task {
-                        await viewModel.refetchCollectionDataOnFocus()
-                    }
-                }
-            } else {
-                VStack(spacing: AppSpacing.s) {
-                    Image(systemName: "doc.text.magnifyingglass")
-                        .font(.system(size: 24, weight: .semibold))
-                        .foregroundStyle(.white.opacity(0.72))
-                    Text("일기를 찾을 수 없어요.")
-                        .font(AppFont.paperlogy5Medium(size: 14))
-                        .foregroundStyle(.white.opacity(0.82))
+            let diary = viewModel.myFeeds.first(where: { $0.diaryId == route.diaryId }) ?? route.initialDiary
+
+            MyCollectionDiary(
+                diaryId: route.diaryId,
+                displayTag: viewModel.displayTag,
+                diary: diary
+            ) { changedDiaryId in
+                viewModel.removeMyFeedLocally(diaryId: changedDiaryId)
+                collectionListRenderID = UUID()
+                Task {
+                    await viewModel.refetchCollectionDataOnFocus()
                 }
-                .frame(maxWidth: .infinity, maxHeight: .infinity)
-                .background(Color.black.ignoresSafeArea())
             }
         }
     }
@@ -110,7 +99,12 @@ struct MyCollectionView: View {
                 } else {
                     LazyVGrid(columns: feedGridColumns, spacing: AppSpacing.s) {
                         ForEach(viewModel.myFeeds) { feed in
-                            NavigationLink(value: MyCollectionDiaryRoute(diaryId: feed.diaryId)) {
+                            NavigationLink(
+                                value: MyCollectionDiaryRoute(
+                                    diaryId: feed.diaryId,
+                                    initialDiary: feed
+                                )
+                            ) {
                                 MyCollectionFeedCard(
                                     feed: feed,
                                     formattedUpdateDate: viewModel.formattedUpdateDate(from: feed.updateDate)
@@ -228,4 +222,13 @@ private enum MyCollectionScreenTransitionDirection {
 
 private struct MyCollectionDiaryRoute: Hashable {
     let diaryId: Int
+    let initialDiary: DiaryFeedModel
+
+    static func == (lhs: Self, rhs: Self) -> Bool {
+        lhs.diaryId == rhs.diaryId
+    }
+
+    func hash(into hasher: inout Hasher) {
+        hasher.combine(diaryId)
+    }
 }

KillingPart/Views/Screens/Main/My/MyCollection/[diaryId]/MyCollectionDiary.swift

@@ -80,9 +80,7 @@ struct MyCollectionDiary: View {
                                     dismissKeyboard()
                                     Task {
                                         let isSuccess = await viewModel.submitEdit()
-                                        if isSuccess {
-                                            onDiaryChanged?(diaryId)
-                                        }
+                                        guard isSuccess else { return }
                                     }
                                 }
                             )