From 17a444930554899abc4fd3b6a9f8fc39afffbd01 Mon Sep 17 00:00:00 2001 From: GeonWoo <56182112+lgvv@users.noreply.github.com> Date: Tue, 28 May 2024 21:32:47 +0900 Subject: [PATCH] =?UTF-8?q?[2.0.3]=20=ED=94=BC=EB=93=9C=EB=B0=B1=20?= =?UTF-8?q?=EC=B5=9C=EC=86=8C=EA=B8=80=EC=9E=90=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EB=B0=8F=20=ED=86=A0=ED=81=B0=20=ED=82=A4=20=EA=B0=92=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(#209)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KuringApp/KuringApp.xcodeproj/project.pbxproj | 4 ++-- .../Sources/Features/SettingsFeatures/Feedback.swift | 2 +- .../Sources/Networks/KuringLink/KuringLink.swift | 2 +- .../Notifications.MessagingDelegate.swift | 6 ++++++ .../Notifications/Notifications.swift | 2 +- .../Sources/UIKit/CommonUI/View.onFetchAllData.swift | 10 +--------- .../Sources/UIKit/SettingsUI/SettingList.swift | 4 ++-- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/KuringApp/KuringApp.xcodeproj/project.pbxproj b/KuringApp/KuringApp.xcodeproj/project.pbxproj index cefa2986..6cf151a8 100644 --- a/KuringApp/KuringApp.xcodeproj/project.pbxproj +++ b/KuringApp/KuringApp.xcodeproj/project.pbxproj @@ -390,7 +390,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CODE_SIGN_ENTITLEMENTS = KuringApp/KuringApp.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 202405151220; + CURRENT_PROJECT_VERSION = 202405192210; DEVELOPMENT_ASSET_PATHS = "\"KuringApp/Preview Content\""; DEVELOPMENT_TEAM = 38PD5AHVVF; ENABLE_PREVIEWS = YES; @@ -425,7 +425,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CODE_SIGN_ENTITLEMENTS = KuringApp/KuringApp.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 202405151220; + CURRENT_PROJECT_VERSION = 202405192210; DEVELOPMENT_ASSET_PATHS = "\"KuringApp/Preview Content\""; DEVELOPMENT_TEAM = 38PD5AHVVF; ENABLE_PREVIEWS = YES; diff --git a/package-kuring/Sources/Features/SettingsFeatures/Feedback.swift b/package-kuring/Sources/Features/SettingsFeatures/Feedback.swift index 1ad3c606..24845869 100644 --- a/package-kuring/Sources/Features/SettingsFeatures/Feedback.swift +++ b/package-kuring/Sources/Features/SettingsFeatures/Feedback.swift @@ -12,7 +12,7 @@ import ComposableArchitecture public struct FeedbackFeature { @ObservableState public struct State: Equatable { - public let minLimit: Int = 4 + public let minLimit: Int = 5 public let maxLimit: Int = 256 /// TextEditor 의 placeholder public let placeholder: String = "피드백을 남겨주세요." diff --git a/package-kuring/Sources/Networks/KuringLink/KuringLink.swift b/package-kuring/Sources/Networks/KuringLink/KuringLink.swift index 8be97a76..1616dc69 100644 --- a/package-kuring/Sources/Networks/KuringLink/KuringLink.swift +++ b/package-kuring/Sources/Networks/KuringLink/KuringLink.swift @@ -40,7 +40,7 @@ public struct KuringLink { return iosVersion }() - @AppStorage("com.kuring.sdk.token.fcm") + @AppStorage("com.kuring.sdk.v2.token.fcm") static var fcmToken: String = "" static var testableFCMToken: String = "cZSHjO4_bUjirvsrxWzig5:APA91bHPojABL5oEXi5AcjJ8v4Vcp3KpJfFUD_3b-HhfV8m23_R6czJa3PwqcVqBZSHBb2t7Z3odUeD0cFKaMSkMmrGxTqyjJPfEZVfTPvmewV-xiMTWbrk-QKuc4Nrxd_BhEArO7Svo" diff --git a/package-kuring/Sources/PushNotifications/Notifications/Notifications.MessagingDelegate.swift b/package-kuring/Sources/PushNotifications/Notifications/Notifications.MessagingDelegate.swift index c0afb5eb..8b6053f2 100644 --- a/package-kuring/Sources/PushNotifications/Notifications/Notifications.MessagingDelegate.swift +++ b/package-kuring/Sources/PushNotifications/Notifications/Notifications.MessagingDelegate.swift @@ -19,6 +19,12 @@ extension Notifications: MessagingDelegate { if self.fcmToken != fcmToken { self.fcmToken = fcmToken + + // 토큰 값이 다른 경우에만 해당 API 호출 + @Dependency(\.kuringLink) var kuringLink + Task(priority: .background) { + try? await kuringLink.registerAuthorization() + } } } } diff --git a/package-kuring/Sources/PushNotifications/Notifications/Notifications.swift b/package-kuring/Sources/PushNotifications/Notifications/Notifications.swift index 0c41b33f..c15d3710 100644 --- a/package-kuring/Sources/PushNotifications/Notifications/Notifications.swift +++ b/package-kuring/Sources/PushNotifications/Notifications/Notifications.swift @@ -20,7 +20,7 @@ public class Notifications: NSObject, UIApplicationDelegate { @AppStorage("com.kuring.sdk.notification.custom") static var isCustomNotificationEnabled: Bool = true - @AppStorage("com.kuring.sdk.token.fcm.v2") + @AppStorage("com.kuring.sdk.v2.token.fcm") var fcmToken: String = "" func onTapRemoteNotification(with userInfo: [String: Any]) throws { diff --git a/package-kuring/Sources/UIKit/CommonUI/View.onFetchAllData.swift b/package-kuring/Sources/UIKit/CommonUI/View.onFetchAllData.swift index d1a5745c..1e7d7003 100644 --- a/package-kuring/Sources/UIKit/CommonUI/View.onFetchAllData.swift +++ b/package-kuring/Sources/UIKit/CommonUI/View.onFetchAllData.swift @@ -11,7 +11,7 @@ struct KuringLinkFetcher: ViewModifier { @State private var showsNetworkError: Bool = false @Dependency(\.kuringLink) private var kuringLink - @AppStorage("com.kuring.sdk.token.fcm.v2") + @AppStorage("com.kuring.sdk.v2.token.fcm") var fcmToken: String = "" let onRequest: () -> Void @@ -27,14 +27,6 @@ struct KuringLinkFetcher: ViewModifier { // 앱 설치 초기에 뒤늦게 FCM 토큰을 발급 받는 경우 guard !newValue.isEmpty else { return } Task { await request() } - - // 토큰 값이 다른 경우에만 해당 API 호출 - if oldValue != newValue { - Task(priority: .background) { - try? await kuringLink.registerAuthorization() - } - } - } .alert("앗! 인터넷 연결이 좋지 않아요!", isPresented: $showsNetworkError) { // 무시 diff --git a/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift b/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift index 20a2200e..e9908d0d 100644 --- a/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift +++ b/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift @@ -44,7 +44,7 @@ public struct SettingList: View { HStack(spacing: 0) { leadingItemView("icon_rocket", "앱 버전") Spacer() - Text("2.0.0") + Text("2.0.3") .font(.system(size: 16, weight: .medium)) .kerning(0.15) .foregroundStyle(Color.Kuring.body) @@ -85,7 +85,7 @@ public struct SettingList: View { } header: { headerView("정보") } footer: { - Text("Designed by 이소영, 김예은.\nDeveloped by 이재성, 이건우, 박성수.\nManaged by 조병관, 채수빈") + Text("Designed by 김예은, 이소영.\nDeveloped by 박성수, 이건우, 최효원.\nManaged by 김병진, 조병관, 채수빈") .font(.footnote) .foregroundStyle(Color.Kuring.caption1) }