Merge pull request #81 from Team-Clody/fix/#79-release

Fix [#79] 캘린더 셀이 제대로 안 뜨는 문제 해결 (아이폰 13 프로 맥스 기종에서 발생)

Clody_iOS/Clody_iOS/Global/Resources/Assets.xcassets/Image/Calendar/clover0.imageset/Contents.json

@@ -1,19 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "Group 2085664794.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "Group [email protected]",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "Group [email protected]",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "clover0.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {

Clody_iOS/Clody_iOS/Global/Resources/Assets.xcassets/Image/Calendar/clover1.imageset/Contents.json

@@ -1,19 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "Group 2085664795.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "Group [email protected]",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "Group [email protected]",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "clover1.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {

Clody_iOS/Clody_iOS/Global/Resources/Assets.xcassets/Image/Calendar/clover2.imageset/Contents.json

@@ -1,19 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "Group 2085664795.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "Group [email protected]",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "Group [email protected]",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "clover2.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {

Clody_iOS/Clody_iOS/Global/Resources/Assets.xcassets/Image/Calendar/clover3.imageset/Contents.json

@@ -1,19 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "Group 2085664796.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "Group [email protected]",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "Group [email protected]",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "clover3.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {

Clody_iOS/Clody_iOS/Global/Resources/Assets.xcassets/Image/Calendar/clover4.imageset/Contents.json

@@ -1,19 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "Group 2085664796.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "Group [email protected]",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "Group [email protected]",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "clover4.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {

Clody_iOS/Clody_iOS/Global/Resources/Assets.xcassets/Image/Calendar/clover5.imageset/Contents.json

@@ -1,19 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "Group 2085664797.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "Group [email protected]",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "Group [email protected]",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "clover5.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {

Clody_iOS/Clody_iOS/Global/Resources/Assets.xcassets/Image/Calendar/cloverToday.imageset/Contents.json

@@ -1,19 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "btn_clover.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "[email protected]",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "[email protected]",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "cloverToday.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {

Clody_iOS/Clody_iOS/Global/Resources/Assets.xcassets/Image/Calendar/cloverTodayDone.imageset/Contents.json

@@ -1,19 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "ic_todayclover_yet.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "[email protected]",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "[email protected]",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "cloverTodayDone.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {

Clody_iOS/Clody_iOS/Presentation/Calendar/Cells/CalendarDateCell.swift

@@ -16,7 +16,7 @@ final class CalendarDateCell: FSCalendarCell {
     // MARK: - UI Components
 
     private var cloverImageView = UIImageView()
-    var clendarDateLabel = UILabel()
+    var calendarDateLabel = UILabel()
     private let newImageView = UIImageView()
     let backgroundSelectView = UIView()
 
@@ -43,8 +43,8 @@ final class CalendarDateCell: FSCalendarCell {
             $0.contentMode = .scaleAspectFit
         }
 
-        clendarDateLabel.do {
-            $0.attributedText = UIFont.pretendardString(text: "20", style: .detail1_medium)
+        calendarDateLabel.do {
+            $0.attributedText = UIFont.pretendardString(text: "", style: .detail1_medium)
             $0.textColor = .grey05
         }
 
@@ -56,7 +56,7 @@ final class CalendarDateCell: FSCalendarCell {
 
         backgroundSelectView.do {
             $0.backgroundColor = .grey02
-            $0.layer.cornerRadius = ScreenUtils.getHeight(8)
+            $0.layer.cornerRadius = ScreenUtils.getHeight(20) / 2
         }
     }
 
@@ -65,14 +65,14 @@ final class CalendarDateCell: FSCalendarCell {
             cloverImageView,
             newImageView,
             backgroundSelectView,
-            clendarDateLabel
+            calendarDateLabel
         )
     }
 
     func setLayout() {
         cloverImageView.snp.makeConstraints {
             $0.centerX.equalToSuperview()
-            $0.top.equalToSuperview()
+            $0.top.equalToSuperview().inset(ScreenUtils.getHeight(1))
             $0.width.equalTo(ScreenUtils.getWidth(26))
             $0.height.equalTo(ScreenUtils.getHeight(25))
         }
@@ -84,25 +84,24 @@ final class CalendarDateCell: FSCalendarCell {
         }
 
         backgroundSelectView.snp.makeConstraints {
-            $0.bottom.equalToSuperview().inset(ScreenUtils.getHeight(6))
+            $0.top.equalTo(cloverImageView.snp.bottom).offset(ScreenUtils.getHeight(6))
             $0.centerX.equalTo(cloverImageView)
-            $0.horizontalEdges.equalTo(cloverImageView)
-            $0.height.equalTo(ScreenUtils.getHeight(16))
+            $0.leading.equalTo(cloverImageView).offset(-ScreenUtils.getWidth(1))
+            $0.trailing.equalTo(cloverImageView).offset(ScreenUtils.getWidth(1))
+            $0.height.equalTo(ScreenUtils.getHeight(20))
         }
 
-        clendarDateLabel.snp.makeConstraints {
+        calendarDateLabel.snp.makeConstraints {
             $0.center.equalTo(backgroundSelectView)
         }
     }
-
 }
 
 extension CalendarDateCell {
 
     func configure(isToday: Bool, isSelected: Bool, isDeleted: Bool, date: String, data: MonthlyDiary) {
         // 캘린더 분기처리 로직
         cloverImageView.image = UIImage(named: "clover\(data.diaryCount)")
-        clendarDateLabel.textColor = .grey05
         backgroundSelectView.isHidden = true
 
         if data.replyStatus == "READY_NOT_READ" {
@@ -132,15 +131,14 @@ extension CalendarDateCell {
                     cloverImageView.image = (data.replyStatus == "READY_READ") ? UIImage(named: "clover\(data.diaryCount)") : .cloverTodayDone
                 }
             }
-            clendarDateLabel.textColor = .black
         }
 
         // 선택된 날짜 처리
         if isSelected {
             backgroundSelectView.isHidden = false
-            clendarDateLabel.textColor = .white
+            calendarDateLabel.attributedText = UIFont.pretendardString(text: date, style: .detail1_medium, color: .white)
+        } else {
+            calendarDateLabel.attributedText = UIFont.pretendardString(text: date, style: .detail1_medium, color: isToday ? .black : .grey05)
         }
-
-        self.clendarDateLabel.text = date
     }
 }

Clody_iOS/Clody_iOS/Presentation/Calendar/Views/CalendarView.swift

@@ -72,11 +72,11 @@ final class CalendarView: BaseView {
             $0.translatesAutoresizingMaskIntoConstraints = false
             $0.locale = Locale(identifier: "ko_KR")
             $0.headerHeight = 0
-            $0.weekdayHeight = 50
-            $0.rowHeight = 71
+            $0.weekdayHeight = ScreenUtils.getHeight(32)
+            $0.rowHeight = ScreenUtils.getHeight(71)
             $0.scrollEnabled = false
 
-            $0.appearance.weekdayFont = .pretendard(.body3_medium)
+            $0.appearance.weekdayFont = .pretendard(.body4_medium)
             $0.appearance.weekdayTextColor = .grey06
         }
 
@@ -158,7 +158,7 @@ final class CalendarView: BaseView {
 
         calendarNavigationView.snp.makeConstraints {
             $0.top.equalToSuperview()
-            $0.width.equalToSuperview()
+            $0.horizontalEdges.equalToSuperview()
             $0.height.equalTo(ScreenUtils.getHeight(44))
         }
 
@@ -174,9 +174,9 @@ final class CalendarView: BaseView {
         }
 
         mainCalendarView.snp.makeConstraints {
-            $0.top.equalTo(cloverBackgroundView.snp.bottom).offset(ScreenUtils.getHeight(5))
-            $0.horizontalEdges.equalToSuperview().inset(ScreenUtils.getWidth(24))
-            $0.height.equalTo(ScreenUtils.getHeight(399))
+            $0.top.equalTo(cloverBackgroundView.snp.bottom).offset(ScreenUtils.getHeight(6))
+            $0.horizontalEdges.equalToSuperview().inset(24)
+            $0.height.equalTo(ScreenUtils.getHeight(71)*5 + ScreenUtils.getHeight(32))
         }
 
         dividerView.snp.makeConstraints {