[Team-08][iOS] 숙박인원 입력 뷰 생성, 캘린더 뷰 개선 및 버그 수정

iOS/Airbnb/Airbnb/Search/Model/CalendarModel.swift → iOS/Airbnb/Airbnb/Search/Calendar/Model/CalendarAYearModel.swift

@@ -7,11 +7,29 @@
 
 import Foundation
 
-class CalendarModel {
+protocol CalenderModelProtocol {
+    var checkinDayIndex: IndexPath? { get set }
+    var checkoutDayIndex: IndexPath? { get set }
+    var month: [Month] { get }
+    var onUpdate: ([Day]) -> Void { get set }
+    var onUpdateBeforeDays: ([Day]) -> Void { get set }
+    var numberOfWeeksInBaseDate: Int { get }
+    func validateCheckDate(at indexPath: IndexPath)
+    func getLastDate(at path: IndexPath) -> Date?
+    func getADay(at path: IndexPath) -> Day
+}
+
+class CalendarAYearModel: CalenderModelProtocol {
 
     var checkinDayIndex: IndexPath? {
         didSet {
-            guard let checkinDayIndex = checkinDayIndex else { return }
+            guard let checkinDayIndex = checkinDayIndex else {
+                guard let beforeDays = beforeDays else { return }
+                beforeDays.forEach {
+                    $0.fadeState = .none
+                }
+                return self.onUpdateBeforeDays(beforeDays)
+            }
             let currentDays = getDays(fromIndex: checkinDayIndex, toIndex: checkoutDayIndex)
             self.beforeDays = currentDays
         }
@@ -25,7 +43,7 @@ class CalendarModel {
             self.beforeDays = currentDays
         }
     }
-
+    
     private var beforeDays: [Day]? {
         willSet {
             guard let beforeDays = beforeDays else { return }
@@ -35,13 +53,19 @@ class CalendarModel {
                     beforeDays[i].fadeState = .none
                 }
             }
+            else if newValue.count == 1 {
+                beforeDays.forEach {
+                    $0.fadeState = .none
+                }
+            }
+            self.onUpdateBeforeDays(beforeDays)
         }
         didSet {
             guard let beforeDays = beforeDays else { return }
             self.onUpdate(beforeDays)
         }
     }
-
+    
 
     private var baseDate: Date {
         didSet {
@@ -56,15 +80,11 @@ class CalendarModel {
     }
 
     var onUpdate: ([Day]) -> Void = { _ in }
-
+    var onUpdateBeforeDays: ([Day]) -> Void = { _ in }
 
-    let calendar: Calendar = Calendar.current
+    private let calendar: Calendar = Calendar.current
 
-    private lazy var dateFormatter: DateFormatter = {
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat = "d"
-        return dateFormatter
-    }()
+    private lazy var dateFormatter = DateFormatter.formatting(from: "d")
 
     init(baseDate: Date) {
         self.baseDate = baseDate
@@ -132,31 +152,7 @@ enum CalendarDateError: Error {
     case monthMetadataError
 }
 
-extension CalendarModel {
-    func shinghaSayMakeDays(for baseDate: Date) -> [Date?] {
-        let component = calendar.dateComponents([.year, .month], from: baseDate)
-        guard let firstDate = calendar.date(from: component),
-              let nextMonthDate = calendar.date(byAdding: .month, value: 1, to: firstDate), // 7월 1일
-              let lastDate = calendar.date(byAdding: .day, value: -1, to: nextMonthDate) else {
-                  return []
-              }
-        let startComponent = calendar.dateComponents([.day, .weekday], from: firstDate)
-        let lastComponent = calendar.dateComponents([.day, .weekday], from: lastDate)
-        guard let lastday = lastComponent.day,
-              let startWeekDay = startComponent.weekday,
-              let lastWeekDay = lastComponent.weekday else {
-                  return []
-              }
-        var dates: [Date?] = (0..<lastday).map { addDay in
-            calendar.date(byAdding: .day, value: addDay, to: firstDate)
-        }
-        (0..<startWeekDay - 1).forEach { _ in dates.insert(nil, at: 0) }
-        (lastWeekDay - 1..<6).forEach { _ in dates.append(nil) }
-        return dates
-    }
-}
-
-extension CalendarModel {
+extension CalendarAYearModel {
     func validateCheckDate(at indexPath: IndexPath) {
         if let checkinDayIndex = checkinDayIndex {
             if checkinDayIndex <= indexPath {
@@ -176,13 +172,13 @@ extension CalendarModel {
     }
 }
 
-private extension CalendarModel {
+private extension CalendarAYearModel {
     func getDays(fromIndex: IndexPath, toIndex: IndexPath? = nil) -> [Day] {
         let indexes = generateIndexes(fromIndex: fromIndex, toIndex: toIndex)
         let days = indexes.compactMap {
             month[$0.section].result[$0.row]
         }
-
+        
         return drawingDays(days: days)
     }
 
@@ -195,7 +191,7 @@ private extension CalendarModel {
             } else {
                 let sections = Array(fromIndex.section...toIndex.section)
                 var result: [IndexPath] = []
-
+                
                 sections.enumerated().forEach { offset, value in
                     let numberOfDays = month[value].count
                     switch offset {
@@ -238,3 +234,23 @@ private extension CalendarModel {
         }
     }
 }
+
+extension CalendarAYearModel {
+    func getLastDate(at path: IndexPath) -> Date? {
+        return month[path.section].result.last?.date
+    }
+
+    func getADay(at path: IndexPath) -> Day {
+        let month = self.month[path.section].result
+        let day = month[path.row]
+        return day
+    }
+}
+
+extension DateFormatter {
+    static func formatting(from text: String) -> DateFormatter {
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = text
+        return dateFormatter
+    }
+}

iOS/Airbnb/Airbnb/Search/Calendar/View/CalendarHearderView.swift

@@ -19,11 +19,7 @@ class CalendarHearderView: UICollectionReusableView {
         }
     }
 
-    private lazy var dateFormatter: DateFormatter = {
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat = "yyyy년 M월"
-        return dateFormatter
-    }()
+    private lazy var dateFormatter = DateFormatter.formatting(from: "yyyy년 M월")
 
     private let yearMonthLabel: UILabel = {
         let label = UILabel()

iOS/Airbnb/Airbnb/Search/Calendar/View/CalendarViewCell.swift

@@ -19,7 +19,8 @@ class CalendarViewCell: UICollectionViewCell {
                 updateSelectionStatus()
             } else {
                 selectionBackgroundView.isHidden = true
-                fadeStateView.isHidden = true
+                leftFadeBackgroundView.isHidden = true
+                rightFadeBackgroundView.isHidden = true
             }
         }
     }
@@ -33,7 +34,15 @@ class CalendarViewCell: UICollectionViewCell {
         return view
     }()
 
-    private var fadeStateView: UIView = {
+    private lazy var leftFadeBackgroundView: UIView = {
+        let view = UIView()
+        view.translatesAutoresizingMaskIntoConstraints = false
+        view.clipsToBounds = true
+        view.backgroundColor = UIColor.getGrayScale(.Grey6)
+        return view
+    }()
+
+    private lazy var rightFadeBackgroundView: UIView = {
         let view = UIView()
         view.translatesAutoresizingMaskIntoConstraints = false
         view.clipsToBounds = true
@@ -62,7 +71,8 @@ class CalendarViewCell: UICollectionViewCell {
 
         isAccessibilityElement = true
         accessibilityTraits = .button
-        contentView.addSubview(fadeStateView)
+        contentView.addSubview(leftFadeBackgroundView)
+        contentView.addSubview(rightFadeBackgroundView)
         contentView.addSubview(selectionBackgroundView)
         contentView.addSubview(numberLabel)
 
@@ -80,21 +90,26 @@ class CalendarViewCell: UICollectionViewCell {
         let size = traitCollection.horizontalSizeClass == .compact ?
         min(min(frame.width, frame.height) - 10, 60) : 45
 
-        NSLayoutConstraint.activate([
-            numberLabel.centerYAnchor.constraint(equalTo: centerYAnchor),
-            numberLabel.centerXAnchor.constraint(equalTo: centerXAnchor),
-
-            selectionBackgroundView.centerYAnchor
-                .constraint(equalTo: numberLabel.centerYAnchor),
-            selectionBackgroundView.centerXAnchor
-                .constraint(equalTo: numberLabel.centerXAnchor),
-            selectionBackgroundView.widthAnchor.constraint(equalToConstant: size),
-            selectionBackgroundView.heightAnchor
-                .constraint(equalTo: selectionBackgroundView.widthAnchor)
-        ])
+        numberLabel.snp.makeConstraints {
+            $0.center.equalToSuperview()
+        }
+
+        selectionBackgroundView.snp.makeConstraints {
+            $0.center.equalTo(numberLabel)
+            $0.width.equalTo(size)
+            $0.height.equalTo(selectionBackgroundView.snp.width)
+        }
+
+        leftFadeBackgroundView.snp.makeConstraints {
+            $0.top.bottom.equalToSuperview().inset(3)
+            $0.trailing.equalToSuperview()
+            $0.width.equalToSuperview().dividedBy(2)
+        }
 
-        fadeStateView.snp.makeConstraints {
-            $0.edges.equalToSuperview().inset(-1)
+        rightFadeBackgroundView.snp.makeConstraints {
+            $0.top.bottom.equalToSuperview().inset(3)
+            $0.leading.equalToSuperview()
+            $0.width.equalToSuperview().dividedBy(2)
         }
 
         selectionBackgroundView.layer.cornerRadius = size / 2
@@ -105,29 +120,30 @@ class CalendarViewCell: UICollectionViewCell {
         super.prepareForReuse()
         numberLabel.text = nil
         selectionBackgroundView.isHidden = true
-        fadeStateView.isHidden = true
+        leftFadeBackgroundView.isHidden = true
+        rightFadeBackgroundView.isHidden = true
     }
 
     func tabGenerated(for day: Day) {
-        if !day.isBeforeToday {
-            prepareForReuse()
-            self.day = day
-        }
+        guard !day.isBeforeToday else { return }
+        prepareForReuse()
+        self.day = day
     }
-
+    
 }
 
 // MARK: - Appearance
+// TODO: - Refactorying으로 중복되는 코드를 줄일 수 있으면 줄이자.
 private extension CalendarViewCell {
 
     func updateSelectionStatus() {
         guard let day = day else { return }
 
         switch day.fadeState {
         case .left:
-            fallthrough
+            applyLeftSelectedStyle()
         case .right:
-            applySelectedStyle()
+            applyRightSelectedStyle()
         case .fill:
             applyFadeStyle()
         case .none:
@@ -144,13 +160,24 @@ private extension CalendarViewCell {
         return isCompact && (smallWidth || widthGreaterThanHeight)
     }
 
-    private func applySelectedStyle() {
+    private func applyLeftSelectedStyle() {
+        accessibilityTraits.insert(.selected)
+        accessibilityHint = nil
+
+        numberLabel.textColor = isSmallScreenSize ? .systemRed : .white
+        selectionBackgroundView.isHidden = isSmallScreenSize
+        rightFadeBackgroundView.isHidden = true
+        leftFadeBackgroundView.isHidden = false
+    }
+
+    private func applyRightSelectedStyle() {
         accessibilityTraits.insert(.selected)
         accessibilityHint = nil
 
         numberLabel.textColor = isSmallScreenSize ? .systemRed : .white
         selectionBackgroundView.isHidden = isSmallScreenSize
-        fadeStateView.isHidden = true
+        rightFadeBackgroundView.isHidden = false
+        leftFadeBackgroundView.isHidden = true
     }
 
     private func applyDefaultStyle() {
@@ -160,12 +187,14 @@ private extension CalendarViewCell {
 
         numberLabel.textColor = day.isBeforeToday ? .secondaryLabel : .label
         selectionBackgroundView.isHidden = true
-        fadeStateView.isHidden = true
+        leftFadeBackgroundView.isHidden = true
+        rightFadeBackgroundView.isHidden = true
     }
 
     private func applyFadeStyle() {
-        fadeStateView.isHidden = false
         numberLabel.textColor = .label
         selectionBackgroundView.isHidden = true
+        leftFadeBackgroundView.isHidden = false
+        rightFadeBackgroundView.isHidden = false
     }
 }