[Team-08][iOS] Calendar Model 생성 / CollectionView HeaderCell 추가 작업 #75
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 |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| // | ||
| // SearchDayDTO.swift | ||
| // Airbnb | ||
| // | ||
| // Created by 백상휘 on 2022/05/26. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| struct SearchDayDTO { | ||
| let date: Date | ||
| let components: DateComponents | ||
| let day: String | ||
| // 캘린더에서 표시하지 않는 빈칸일 경우 true 입니다. | ||
| let isOccupied: Bool | ||
|
|
||
| let isSelected: Bool = false | ||
| // 선택되었을 시 왼쪽부터 서서히 채워나가는 이펙트를 줌 | ||
| var fadeLeft: Bool = false | ||
| // 선택되었을 시 오른쪽부터 서서히 채워나가는 이펙트를 줌 | ||
| var fadeRight: Bool = false | ||
| } | ||
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 |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| // | ||
| // SearchCalendarModel.swift | ||
| // Airbnb | ||
| // | ||
| // Created by 백상휘 on 2022/05/26. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| class SearchCalendarModel { | ||
|
|
||
| private(set) var localCalendar: Calendar = { | ||
| var calendar = Calendar(identifier: .gregorian) | ||
| calendar.locale = Locale(identifier: "ko_kr") | ||
| return calendar | ||
| }() | ||
|
|
||
| /// 전달되는 기준 날짜를 이용하여 날짜 DTO를 가져온다. | ||
| func getMonthDays(from baseDate: Date) -> CalendarResult { | ||
| generateMonth(from: baseDate, isPrevious: nil) | ||
| } | ||
|
|
||
| /// 전달되는 기준 날짜를 이용하여 다음월 날짜 DTO를 가져온다. | ||
| func getNextMonthDays(from baseDate: Date) -> CalendarResult { | ||
| generateMonth(from: baseDate, isPrevious: false) | ||
| } | ||
|
|
||
| /// 전달되는 기준 날짜를 이용하여 전월 날짜 DTO를 가져온다. | ||
| func getPreviousMonthDays(from baseDate: Date) -> CalendarResult { | ||
| generateMonth(from: baseDate, isPrevious: true) | ||
| } | ||
|
|
||
| private func generateMonth(from baseDate: Date, isPrevious: Bool?) -> CalendarResult { | ||
|
|
||
| var moveNum = 0 | ||
|
|
||
| if let previous = isPrevious { | ||
| moveNum = previous ? -1 : 1 | ||
| } | ||
|
|
||
| guard let dateMonthMoved = localCalendar.date( | ||
| byAdding: .month, | ||
| value: moveNum, | ||
| to: baseDate) | ||
| else { | ||
| return CalendarResult(date: baseDate, result: []) | ||
| } | ||
|
|
||
| var dateComponent = localCalendar.dateComponents([.year,.month,.day,.hour], from: dateMonthMoved) | ||
| dateComponent.day = 2 | ||
| dateComponent.hour = 0 | ||
|
|
||
| guard | ||
| let dateFirstInMonth = localCalendar.date(from: dateComponent), | ||
| let numberOfDays = localCalendar.range( | ||
| of: .day, | ||
| in: .month, | ||
| for: dateFirstInMonth)?.count | ||
| else { | ||
| return CalendarResult(date: baseDate, result: []) | ||
| } | ||
|
|
||
| // Swift는 요일을 0부터 6까지로 매기고, weekday는 1부터 7까지로 매깁니다. | ||
| // 미국 날짜와 한국 날짜는 하루 차이가 납니다. | ||
| // 위와 아래의 사실에 의거하여 2를 뺍니다. | ||
| let weekdayTemp = localCalendar.component(.weekday, from: dateFirstInMonth) - 2 | ||
| let weekday = weekdayTemp < 0 ? 6 : weekdayTemp | ||
|
|
||
| guard var date = localCalendar.date( | ||
| byAdding: .day, | ||
| value: weekday * -1, | ||
| to: dateFirstInMonth) | ||
| else { | ||
| return CalendarResult(date: baseDate, result: []) | ||
| } | ||
|
|
||
| var result = [SearchDayDTO]() | ||
|
|
||
| for day in 1...weekday+numberOfDays { | ||
| result.append( | ||
| SearchDayDTO( | ||
| date: date, | ||
| components: localCalendar.dateComponents([.year,.month,.day], from: date), | ||
| day: (weekday >= day ? "" : "\(day-weekday)"), | ||
| isOccupied: (weekday >= day) | ||
| ) | ||
| ) | ||
|
|
||
| if let targetDate = localCalendar.date(byAdding: .day, value: 1, to: date) { | ||
| date = targetDate | ||
| } | ||
| } | ||
|
|
||
| return CalendarResult(date: dateFirstInMonth, result: result) | ||
| } | ||
| } | ||
|
|
||
| struct CalendarResult { | ||
| let date: Date | ||
| let result: [SearchDayDTO] | ||
| } |
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
Oops, something went wrong.
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.
fadeLeft와 fadeRight가 동시에 true일 경우도 있는 걸까요?👀
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.
말씀 듣고 보니 디자인에는 둘 다 true 일 수 없군요!
fade 라는 것 자체를 enum 타입으로 변경하는 것이 의미 상 맞는 것 같습니다!!