Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[2.0.3] 피드백 최소글자 수정 및 토큰 키 값 수정 #209

Merged
merged 4 commits into from
May 28, 2024
Merged

[2.0.3] 피드백 최소글자 수정 및 토큰 키 값 수정 #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1397401
[수정] 기존 fcm 키 값이 각자 string으로 관리되어 해당 저장소가 싱크가 맞지 않는 문제, 현 구조에서 당장 수정이…
lgvv May 20, 2024
e4ee096
[수정] 피드백 최소 제한 숫자를 변경
lgvv May 20, 2024
ec4aa44
[수정] 텍스트 수정
lgvv May 20, 2024
fe66b8a
[수정] 버전 및 빌드버전 수정
lgvv May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions KuringApp/KuringApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion package-kuring/Sources/Features/SettingsFeatures/Feedback.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "피드백을 남겨주세요."
Expand Down
2 changes: 1 addition & 1 deletion package-kuring/Sources/Networks/KuringLink/KuringLink.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 6 additions & 0 deletions package-kuring/Sources/PushNotifications/Notifications/Notifications.MessagingDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}
}
}
2 changes: 1 addition & 1 deletion package-kuring/Sources/PushNotifications/Notifications/Notifications.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 1 addition & 9 deletions package-kuring/Sources/UIKit/CommonUI/View.onFetchAllData.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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) {
// 무시
Expand Down
4 changes: 2 additions & 2 deletions package-kuring/Sources/UIKit/SettingsUI/SettingList.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
}
Expand Down