[MERGE] : merge CalendarPage to dev

MeYouMeYou/CalendarPage/CalendarCollectionViewCell.swift

@@ -14,7 +14,7 @@ class CalendarCollectionViewCell: UICollectionViewCell {
     private var calendarPostTitle: UILabel = {
         var label = UILabel()
         label.text = "empty"
-        label.font = UIFont.boldSystemFont(ofSize: 20)
+        label.font = UIFont.boldSystemFont(ofSize: 10)
         return label
     }()
 
@@ -28,7 +28,7 @@ class CalendarCollectionViewCell: UICollectionViewCell {
     }
 
     private func configureUI() {
-        contentView.backgroundColor = UIColor(named: "CustomBackgroundColor")
+        contentView.backgroundColor = UIColor(named: "PrimaryColor")
         contentView.layer.cornerRadius = Constant.cornerRadius
 
         contentView.addSubview(calendarPostTitle)

MeYouMeYou/CalendarPage/CalendarViewController.swift

@@ -14,6 +14,17 @@ class CalendarViewController: UIViewController {
     private let viewModel = CalendarViewModel()
 
     // MARK: Property
+
+    private var addAnniversaryButton: UIButton = {
+        var button = UIButton()
+        button.setTitle(" 기념일 추가 ", for: .normal)
+        button.titleLabel?.font = UIFont.boldSystemFont(ofSize: 24)
+        button.backgroundColor = UIColor(named: "PrimaryColor")
+        button.layer.cornerRadius = 12
+        button.layer.borderWidth = 0
+        return button
+    }()
+
     private var calendarDdayLabel: UILabel = {
         var label = UILabel()
         label.text = "  D-Day 101  "
@@ -55,7 +66,7 @@ class CalendarViewController: UIViewController {
         calendar.appearance.weekdayFont = UIFont.systemFont(ofSize: 12)
         calendar.appearance.weekdayTextColor = .black
 
-        //
+        // 선택된 날짜
         calendar.appearance.selectionColor = UIColor(named: "SubPrimaryColor")
 
         // 날짜 UI 설정
@@ -65,27 +76,60 @@ class CalendarViewController: UIViewController {
         calendar.appearance.subtitleTodayColor = .black
         calendar.appearance.todayColor = UIColor(named: "PrimaryColor")
 
+        // 다중 선택 활성화
+        calendar.allowsMultipleSelection = true
+
         // 토요일 라벨의 textColor를 blue로 설정
         calendar.calendarWeekdayView.weekdayLabels[5].textColor = .blue
         // 일요일 라벨의 textColor를 red로 설정
         calendar.calendarWeekdayView.weekdayLabels.last!.textColor = .red
         return calendar
     }()
 
-    private var calendarCollectionView: UICollectionView = {
-        var layout = UICollectionViewFlowLayout()
-        var view = UICollectionView(frame: .zero, collectionViewLayout: layout)
-        layout.itemSize = CGSize(
-            width: (UIScreen.main.bounds.width / 2) - 40, height: (UIScreen.main.bounds.width / 2) - 40)
-        layout.minimumLineSpacing = 20
-        layout.minimumInteritemSpacing = 20
-        layout.scrollDirection = .horizontal
-        view.contentInset = UIEdgeInsets(top: 0, left: 20, bottom: 0, right: 20)
-        view.layer.cornerRadius = Constant.cornerRadius
+    // 시작 날짜와 종료 날짜를 저장할 변수를 선언합니다.
+    var startDate: Date?
+    var endDate: Date?
+
+    var postView: UIView = {
+        var view = UIView()
         view.backgroundColor = UIColor(named: "SubPrimaryColor")
+        view.layer.cornerRadius = Constant.cornerRadius
+        return view
+    }()
+
+    var postImageView: UIImageView = {
+        var view = UIImageView()
+        view.image = UIImage(named: "dummy")
+        view.contentMode = .scaleAspectFill
+        view.clipsToBounds = true
+        view.layer.cornerRadius = Constant.calendarBasicMargin
         return view
     }()
 
+    var postTitleLabel: UILabel = {
+        var label = UILabel()
+        label.text = "준영"
+        label.font = UIFont.systemFont(ofSize: 24)
+        return label
+    }()
+
+    var likeButton: UIImageView = {
+        var view = UIImageView()
+        view.image = UIImage(systemName: "heart.fill")
+        view.tintColor = .systemRed
+        return view
+    }()
+
+    var postContentLabel: UILabel = {
+        var label = UILabel()
+        label.text = "내용"
+        label.font = UIFont.systemFont(ofSize: 12)
+        label.backgroundColor = UIColor(named: "CustomBackgroundColor")
+        label.clipsToBounds = true
+        label.layer.cornerRadius = Constant.cornerRadius
+        return label
+    }()
+
     // MARK: LifeCycle
 
     override func viewDidLoad() {
@@ -95,12 +139,38 @@ class CalendarViewController: UIViewController {
         setCollectionView()
     }
 
+    lazy private var calendarCollectionView: UICollectionView = {
+        var layout = UICollectionViewFlowLayout()
+        var view = UICollectionView(frame: .zero, collectionViewLayout: layout)
+        layout.itemSize = CGSize(
+            width: UIScreen.main.bounds.width * 0.21, height: UIScreen.main.bounds.height * 0.05)
+        layout.minimumLineSpacing = 5
+        layout.scrollDirection = .horizontal
+        layout.collectionView?.isPagingEnabled = false
+        view.decelerationRate = UIScrollView.DecelerationRate.fast
+        view.backgroundColor = UIColor(named: "SubPrimaryColor")
+        view.showsHorizontalScrollIndicator = false
+        return view
+    }()
+
     private func configureUI() {
         view.backgroundColor = UIColor(named: "CustomBackgroundColor")
 
+        view.addSubview(addAnniversaryButton)
         view.addSubview(calendarDdayLabel)
         view.addSubview(calendarView)
-        view.addSubview(calendarCollectionView)
+
+        view.addSubview(postView)
+        postView.addSubview(postImageView)
+        postView.addSubview(likeButton)
+        postView.addSubview(postTitleLabel)
+        postView.addSubview(postContentLabel)
+        postView.addSubview(calendarCollectionView)
+
+        addAnniversaryButton.snp.makeConstraints {
+            $0.top.equalTo(view.safeAreaLayoutGuide)
+            $0.leading.equalTo(view.safeAreaLayoutGuide).inset(Constant.calendarBasicMargin)
+        }
 
         calendarDdayLabel.snp.makeConstraints {
             $0.top.equalTo(view.safeAreaLayoutGuide)
@@ -112,11 +182,43 @@ class CalendarViewController: UIViewController {
             $0.leading.trailing.equalTo(view.safeAreaLayoutGuide).inset(Constant.calendarBasicMargin)
         }
 
-        calendarCollectionView.snp.makeConstraints {
+        postView.snp.makeConstraints {
             $0.top.equalTo(calendarView.snp.bottom).inset(-Constant.calendarBasicMargin)
-            $0.leading.trailing.equalTo(view.safeAreaLayoutGuide).inset(Constant.calendarBasicMargin)
-            $0.bottom.equalTo(view.safeAreaLayoutGuide).inset(Constant.calendarBasicMargin)
-            $0.height.equalTo(200)
+            $0.leading.trailing.bottom.equalTo(view.safeAreaLayoutGuide).inset(Constant.calendarBasicMargin)
+            $0.height.equalTo(UIScreen.main.bounds.height * 0.25)
+        }
+
+        postImageView.snp.makeConstraints {
+            $0.leading.equalTo(postView).inset(10)
+            $0.centerY.equalTo(postView)
+            $0.width.equalTo(150)
+            $0.height.equalTo(180)
+        }
+
+        likeButton.snp.makeConstraints {
+            $0.top.trailing.equalTo(postView).inset(10)
+            $0.width.height.equalTo(40)
+        }
+
+        postTitleLabel.snp.makeConstraints {
+            $0.top.equalTo(postImageView)
+            $0.leading.equalTo(postImageView.snp.trailing).inset(-10)
+            $0.trailing.equalTo(likeButton.snp.leading).inset(-10)
+        }
+
+        postContentLabel.snp.makeConstraints {
+            $0.top.equalTo(postTitleLabel.snp.bottom).inset(-10)
+            $0.leading.equalTo(postImageView.snp.trailing).inset(-10)
+            $0.trailing.equalTo(postView).inset(10)
+            $0.height.equalTo(80)
+        }
+
+        calendarCollectionView.snp.makeConstraints {
+            $0.top.equalTo(postContentLabel.snp.bottom).inset(-10)
+            $0.leading.equalTo(postImageView.snp.trailing).inset(-10)
+            $0.trailing.equalTo(postView).inset(10)
+            $0.bottom.equalTo(postImageView)
+            $0.height.equalTo(UIScreen.main.bounds.height * 0.05)
         }
     }
 
@@ -129,23 +231,6 @@ class CalendarViewController: UIViewController {
     }
 }
 
-// SwiftUI를 활용한 미리보기
-struct CalendarViewController_Previews: PreviewProvider {
-    static var previews: some View {
-        CalendarVCReprsentable().edgesIgnoringSafeArea(.all)
-    }
-}
-
-struct CalendarVCReprsentable: UIViewControllerRepresentable {
-    func makeUIViewController(context: Context) -> UIViewController {
-        let calendarVC = CalendarViewController()
-        return UINavigationController(rootViewController: calendarVC)
-    }
-
-    func updateUIViewController(_ uiViewController: UIViewControllerType, context: Context) {}
-    typealias UIViewControllerType = UIViewController
-}
-
 extension CalendarViewController: UICollectionViewDelegate, UICollectionViewDataSource {
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         return viewModel.getPostCount()
@@ -154,7 +239,10 @@ extension CalendarViewController: UICollectionViewDelegate, UICollectionViewData
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath)
     -> UICollectionViewCell {
         guard let cell = calendarCollectionView.dequeueReusableCell(
-            withReuseIdentifier: CalendarCollectionViewCell.identifier, for: indexPath) as? CalendarCollectionViewCell else { return UICollectionViewCell() }
+            withReuseIdentifier: CalendarCollectionViewCell.identifier, for: indexPath)
+                as? CalendarCollectionViewCell else {
+            return UICollectionViewCell()
+        }
         cell.bind(viewModel.getPost()[indexPath.row])
         return cell
     }
@@ -186,17 +274,105 @@ extension CalendarViewController: FSCalendarDelegate, FSCalendarDataSource, FSCa
         }
     }
 
-    // 일요일에 해당되는 모든 날짜의 색상 red로 변경
+    // 요일별 색상 설정
     func calendar(_ calendar: FSCalendar, appearance: FSCalendarAppearance, titleDefaultColorFor date: Date)
     -> UIColor? {
         let day = Calendar.current.component(.weekday, from: date) - 1
 
-        if Calendar.current.shortWeekdaySymbols[day] == "Sun" {
+        if Calendar.current.shortWeekdaySymbols[day] == "일" {
             return .systemRed
-        } else if Calendar.current.shortWeekdaySymbols[day] == "Sat" {
+        } else if Calendar.current.shortWeekdaySymbols[day] == "토" {
             return .systemBlue
         } else {
             return .label
         }
     }
+
+    // 날짜를 선택할 때 호출되는 delegate 메서드입니다.
+    func calendar(_ calendar: FSCalendar, didSelect date: Date, at monthPosition: FSCalendarMonthPosition) {
+        if startDate == nil {
+            // 시작 날짜를 선택합니다.
+
+            startDate = date
+            endDate = date
+        } else if startDate != nil && endDate == startDate {
+            // 종료 날짜를 선택합니다.
+            endDate = date
+        } else {
+            // 이미 범위가 선택된 경우, 다시 시작 날짜를 선택합니다.
+            startDate = date
+            endDate = date
+            // 선택된 날짜 초기화
+
+            for date in calendar.selectedDates {
+                calendarView.deselect(date)
+            }
+
+        }
+
+        // 선택한 범위 내의 모든 날짜를 선택합니다.
+        if let startDate = startDate, let endDate = endDate {
+            selectDatesInRange(startDate: startDate, endDate: endDate)
+        }
+    }
+
+    // 선택한 범위 내의 모든 날짜를 선택하는 함수입니다.
+    func selectDatesInRange(startDate: Date, endDate: Date) {
+        // startDate와 endDate 사이의 모든 날짜를 선택합니다.
+        var currentDate = startDate
+        while currentDate <= endDate {
+            calendarView.select(currentDate)
+            currentDate = Calendar.current.date(byAdding: .day, value: 1, to: currentDate)!
+        }
+
+        // 선택된 범위의 스타일을 변경합니다.
+        calendarView.appearance.selectionColor = UIColor(named: "SubPrimaryColor")
+        calendarView.reloadData()
+    }
+}
+
+extension CalendarViewController: UIScrollViewDelegate {
+    func scrollViewWillEndDragging(
+        _ scrollView: UIScrollView,
+        withVelocity velocity: CGPoint,
+        targetContentOffset: UnsafeMutablePointer<CGPoint>) {
+            guard let layout = self.calendarCollectionView.collectionViewLayout as? UICollectionViewFlowLayout else {
+                return
+            }
+            // CollectionView Item Size
+            let cellWidthIncludingSpacing = layout.itemSize.width + layout.minimumLineSpacing
+
+            // 이동한 x좌표 값과 item의 크기를 비교 후 페이징 값 설정
+            let estimatedIndex = scrollView.contentOffset.x / cellWidthIncludingSpacing
+            let index: Int
+
+            // 스크롤 방향 체크
+            // item 절반 사이즈 만큼 스크롤로 판단하여 올림, 내림 처리
+            if velocity.x > 0 {
+                index = Int(ceil(estimatedIndex))
+            } else if velocity.x < 0 {
+                index = Int(floor(estimatedIndex))
+            } else {
+                index = Int(round(estimatedIndex))
+            }
+            // 위 코드를 통해 페이징 될 좌표 값을 targetContentOffset에 대입
+            targetContentOffset.pointee = CGPoint(x: CGFloat(index) * cellWidthIncludingSpacing - 20, y: 0)
+        }
+}
+
+// SwiftUI를 활용한 미리보기
+struct CalendarViewController_Previews: PreviewProvider {
+    static var previews: some View {
+        CalendarVCReprsentable().edgesIgnoringSafeArea(.all)
+    }
+}
+
+struct CalendarVCReprsentable: UIViewControllerRepresentable {
+    func makeUIViewController(context: Context) -> UIViewController {
+        let calendarVC = CalendarViewController()
+        return UINavigationController(rootViewController: calendarVC)
+    }
+
+    func updateUIViewController(_ uiViewController: UIViewControllerType, context: Context) {}
+    typealias UIViewControllerType = UIViewController
 }