From 1397401d70e79fc19b9377682e40b6a794374930 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Mon, 20 May 2024 22:51:26 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EA=B8=B0=EC=A1=B4?= =?UTF-8?q?=20fcm=20=ED=82=A4=20=EA=B0=92=EC=9D=B4=20=EA=B0=81=EC=9E=90=20?= =?UTF-8?q?string=EC=9C=BC=EB=A1=9C=20=EA=B4=80=EB=A6=AC=EB=90=98=EC=96=B4?= =?UTF-8?q?=20=ED=95=B4=EB=8B=B9=20=EC=A0=80=EC=9E=A5=EC=86=8C=EA=B0=80=20?= =?UTF-8?q?=EC=8B=B1=ED=81=AC=EA=B0=80=20=EB=A7=9E=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C,=20=ED=98=84=20=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=EC=97=90=EC=84=9C=20=EB=8B=B9=EC=9E=A5=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=EC=9D=B4=20=EC=96=B4=EB=A0=A4=EC=9B=8C=EC=84=9C=20?= =?UTF-8?q?=EC=9A=B0=EC=84=A0=EC=9D=80=20=ED=82=A4=20=EA=B0=92=EC=9D=84=20?= =?UTF-8?q?=ED=86=B5=EC=9D=BC=ED=95=98=EB=8A=94=20=EB=B0=A9=ED=96=A5?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/Networks/KuringLink/KuringLink.swift | 2 +- .../Notifications.MessagingDelegate.swift | 6 ++++++ .../Notifications/Notifications.swift | 2 +- .../Sources/UIKit/CommonUI/View.onFetchAllData.swift | 10 +--------- 4 files changed, 9 insertions(+), 11 deletions(-) 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) { // 무시 From e4ee096bf98ce1005af0cdf861aaa21b8ebd2421 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Mon, 20 May 2024 23:34:18 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=ED=94=BC=EB=93=9C?= =?UTF-8?q?=EB=B0=B1=20=EC=B5=9C=EC=86=8C=20=EC=A0=9C=ED=95=9C=20=EC=88=AB?= =?UTF-8?q?=EC=9E=90=EB=A5=BC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-kuring/Sources/Features/SettingsFeatures/Feedback.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 = "피드백을 남겨주세요." From ec4aa4424f29087e43d3d4f76473704f83df71ca Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Mon, 20 May 2024 23:37:50 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=ED=85=8D=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-kuring/Sources/UIKit/SettingsUI/SettingList.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) } From fe66b8a3519c3b8f89990c73be9474415fd175ff Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Mon, 20 May 2024 23:39:19 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EB=B2=84=EC=A0=84?= =?UTF-8?q?=20=EB=B0=8F=20=EB=B9=8C=EB=93=9C=EB=B2=84=EC=A0=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KuringApp/KuringApp.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 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;