-
Notifications
You must be signed in to change notification settings - Fork 1
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.
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
Feat [#360] 3차 스프린트 건의사항 반영 #361
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -248,8 +248,10 @@ extension YELLOTabBarController { | |
case .success(let data): | ||
guard let data = data.data else { return } | ||
if data.isAvailable && self.notificationReadCount == 0 { | ||
// 다시 보지 않기 버튼을 안눌렀거나 이전 공지와 현재 공지의 title이 다른 경우에만 표시 | ||
if !UserDefaults.standard.bool(forKey: "isTapped") || UserDefaults.standard.string(forKey: "notificationTitle") != data.title { | ||
// 다시 보지 않기 버튼을 안눌렀거나 하루가 지났거나 이전 공지와 현재 공지의 title이 다른 경우에만 표시 | ||
if !UserDefaults.standard.bool(forKey: "isTapped") || | ||
self.hasDayPassed(from: UserDefaults.standard.object(forKey: "whenTapped") as? Date ?? Date()) || | ||
UserDefaults.standard.string(forKey: "notificationTitle") != data.title { | ||
self.userNotificationView.frame = self.view.bounds | ||
self.userNotificationView.autoresizingMask = [.flexibleWidth, .flexibleHeight] | ||
self.userNotificationView.notificationImageView.kfSetImage(url: data.imageUrl) | ||
|
@@ -273,6 +275,17 @@ extension YELLOTabBarController { | |
purchaseSubscribeNeed() | ||
} | ||
|
||
// 하루 지났는지 확인하는 함수 | ||
func hasDayPassed(from date: Date) -> Bool { | ||
let calendar = Calendar.current | ||
let currentDate = Date() | ||
|
||
let startOfToday = calendar.startOfDay(for: currentDate) | ||
let startOfTappedDate = calendar.startOfDay(for: date) | ||
|
||
return calendar.dateComponents([.day], from: startOfTappedDate, to: startOfToday).day ?? 0 > 0 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 여기서 혹시 0>0은 bool 값으로 보내주는 건가요? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. (day ?? 0 ) > 0 으로 봐주시면 될 것 같습니다 !! |
||
} | ||
|
||
/// 구독 연장 여부 서버통신 | ||
func purchaseSubscribeNeed() { | ||
NetworkService.shared.purchaseService.purchaseSubscibeNeed { result in | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
P5. 진짜진짜 의견인데
whenTapped
보다는TapDate
와 같이 명사 형태가 좋을 것 같습니다!isTapped
는 bool형이라 변수명이 저 형태였던 것 같아요There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
헉 넵 반영하겠습니다 !!