Merge pull request #92 from ApptiveDev/dev

[Release] 1.2.3 업데이트

Author: mark77234

KillingPart.xcodeproj/project.pbxproj

@@ -448,7 +448,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = KillingPart/KillingPart.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 36;
+				CURRENT_PROJECT_VERSION = 38;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = GQ89YG5G9R;
 				ENABLE_APP_SANDBOX = YES;
@@ -473,7 +473,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.2.0;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.killingpoint.killingpart;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;
@@ -493,7 +493,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = KillingPart/KillingPart.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 36;
+				CURRENT_PROJECT_VERSION = 38;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = GQ89YG5G9R;
 				ENABLE_APP_SANDBOX = YES;
@@ -518,7 +518,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.2.0;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.killingpoint.killingpart;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;

KillingPart/Assets.xcassets/ic_killingpart_dark.imageset/Contents.json

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

KillingPart/Assets.xcassets/ic_killingpart_dark.imageset/ic_killingpart_dark 1.png

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x20",
+          "green" : "0x1E",
+          "red" : "0x1D"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x20",
+          "green" : "0x1E",
+          "red" : "0x1D"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KillingPart/Assets.xcassets/ic_killingpart_dark.imageset/ic_killingpart_dark 2.png

@@ -40,6 +40,7 @@ struct DiaryFeedModel: Decodable, Identifiable {
     let username: String?
     let tag: String?
     let profileImageUrl: String?
+    let isMyPick: Bool?
 
     var id: Int { diaryId }
 
@@ -216,7 +217,8 @@ struct UserDiaryFeedModel: Decodable, Identifiable {
             userId: user.userId,
             username: user.username,
             tag: user.tag,
-            profileImageUrl: user.profileImageUrl
+            profileImageUrl: user.profileImageUrl,
+            isMyPick: user.isMyPick
         )
     }
 }
@@ -549,7 +551,8 @@ private struct CalendarDiaryFeedResponse: Decodable {
             userId: 0,
             username: nil,
             tag: nil,
-            profileImageUrl: nil
+            profileImageUrl: nil,
+            isMyPick: nil
         )
     }
 
@@ -617,7 +620,8 @@ extension DiaryFeedModel {
             userId: userId,
             username: username,
             tag: tag,
-            profileImageUrl: profileImageUrl
+            profileImageUrl: profileImageUrl,
+            isMyPick: isMyPick
         )
     }
 }

KillingPart/Assets.xcassets/ic_killingpart_dark.imageset/ic_killingpart_dark.png

@@ -12,8 +12,10 @@ final class AppDelegate: NSObject, UIApplicationDelegate {
         FirebaseApp.configure()
         UNUserNotificationCenter.current().delegate = self
         Messaging.messaging().delegate = self
-        print("[FCM][1] Firebase 초기화 완료, 알림 권한 요청 시작")
-        requestNotificationAuthorization()
+        if let remotePayload = launchOptions?[.remoteNotification] as? [AnyHashable: Any] {
+            FCMManager.shared.handleLaunchRemoteNotification(remotePayload)
+        }
+        print("[FCM][1] Firebase 초기화 완료")
         return true
     }
 
@@ -45,27 +47,6 @@ final class AppDelegate: NSObject, UIApplicationDelegate {
         completionHandler(.newData)
     }
 
-    private func requestNotificationAuthorization() {
-        UNUserNotificationCenter.current().getNotificationSettings { settings in
-            print("[FCM][2] 현재 알림 권한 상태: \(settings.authorizationStatus.debugDescription)")
-        }
-
-        UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .badge, .sound]) { granted, error in
-            if let error {
-                print("[FCM][2] ❌ 알림 권한 요청 오류: \(error.localizedDescription)")
-                return
-            }
-            print("[FCM][2] 알림 권한 \(granted ? "✅ 허용" : "❌ 거부")")
-            if granted {
-                DispatchQueue.main.async {
-                    print("[FCM][2] APNs 등록 요청 시작")
-                    UIApplication.shared.registerForRemoteNotifications()
-                }
-            } else {
-                print("[FCM][2] ⚠️ 권한 거부 — 설정 앱에서 알림을 허용해야 합니다")
-            }
-        }
-    }
 }
 
 extension AppDelegate: UNUserNotificationCenterDelegate {
@@ -108,16 +89,3 @@ extension AppDelegate: MessagingDelegate {
         FCMManager.shared.didReceiveToken(token)
     }
 }
-
-private extension UNAuthorizationStatus {
-    var debugDescription: String {
-        switch self {
-        case .notDetermined: return "notDetermined"
-        case .denied:        return "denied ❌"
-        case .authorized:    return "authorized ✅"
-        case .provisional:   return "provisional"
-        case .ephemeral:     return "ephemeral"
-        @unknown default:    return "unknown"
-        }
-    }
-}

KillingPart/Assets.xcassets/kpGray900.colorset/Contents.json

@@ -4,4 +4,5 @@ extension Notification.Name {
     static let authenticationSessionExpired = Notification.Name("authenticationSessionExpired")
     static let diaryCreated = Notification.Name("diaryCreated")
     static let navigateToPlayKillingPart = Notification.Name("navigateToPlayKillingPart")
+    static let didTapPushAlarm = Notification.Name("didTapPushAlarm")
 }

KillingPart/Models/DiaryModel.swift

@@ -5,6 +5,7 @@ protocol DiaryServicing {
     func fetchStoredDiaries(page: Int, size: Int) async throws -> StoredDiaryFeedsResponse
     func fetchMyFeeds(page: Int, size: Int) async throws -> MyDiaryFeedsResponse
     func fetchRandomDiaries() async throws -> RandomDiaryFeedsResponse
+    func fetchDiary(diaryId: Int) async throws -> DiaryFeedModel
     func fetchUserFeeds(userId: Int, page: Int, size: Int) async throws -> UserDiaryFeedsResponse
     func fetchDiaryLikeUsers(diaryId: Int, searchCond: String?, page: Int, size: Int) async throws -> UserSearchResponse
     func createDiary(request: DiaryCreateRequest) async throws -> DiaryCreateResult
@@ -142,6 +143,21 @@ struct DiaryService: DiaryServicing {
         }
     }
 
+    func fetchDiary(diaryId: Int) async throws -> DiaryFeedModel {
+        do {
+            let request = APIRequest(
+                path: "/diaries/\(diaryId)",
+                method: .get,
+                requiresAuthorization: true
+            )
+
+            return try await apiClient.request(request, responseType: DiaryFeedModel.self)
+        } catch {
+            if isRequestCancelled(error) { throw error }
+            throw mapError(error)
+        }
+    }
+
     func fetchUserFeeds(
         userId: Int,
         page: Int = Self.defaultPage,