From 8d8f3d35c54223d806a50747f9f7c7049a96304e Mon Sep 17 00:00:00 2001 From: JungDohyeon Date: Tue, 2 Jun 2026 00:18:26 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EA=B3=B5=ED=9C=B4=EC=9D=BC=20=EC=BA=98?= =?UTF-8?q?=EB=A6=B0=EB=8D=94=20=EC=9D=B8=EB=94=94=EC=BC=80=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Calendar/CalendarDayCell.swift | 2 +- .../Calendar/CalendarDayIndicatorView.swift | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Moa/Moa/Features/Home/History/Calendar/Components/Calendar/CalendarDayCell.swift b/Moa/Moa/Features/Home/History/Calendar/Components/Calendar/CalendarDayCell.swift index 3e64771..8505e5b 100644 --- a/Moa/Moa/Features/Home/History/Calendar/Components/Calendar/CalendarDayCell.swift +++ b/Moa/Moa/Features/Home/History/Calendar/Components/Calendar/CalendarDayCell.swift @@ -117,7 +117,7 @@ final class CalendarDayCell: UICollectionViewCell { // 인디케이터 높이 결정 // 월급/휴가 레이블이 있으면 18pt, 근무 점이면 14pt, 없으면 0 - let hasLabel = schedule.events.contains(.payday) || schedule.contentType == .vacation + let hasLabel = schedule.events.contains(.payday) || schedule.events.contains(.publicHoliday) || schedule.contentType == .vacation let hasDot = schedule.contentType == .work && schedule.status != .none if hasLabel { setIndicatorHeight(18) diff --git a/Moa/Moa/Features/Home/History/Calendar/Components/Calendar/CalendarDayIndicatorView.swift b/Moa/Moa/Features/Home/History/Calendar/Components/Calendar/CalendarDayIndicatorView.swift index 68bce96..b33c884 100644 --- a/Moa/Moa/Features/Home/History/Calendar/Components/Calendar/CalendarDayIndicatorView.swift +++ b/Moa/Moa/Features/Home/History/Calendar/Components/Calendar/CalendarDayIndicatorView.swift @@ -65,16 +65,23 @@ final class CalendarDayIndicatorView: UIView { reset() guard let schedule else { return } - let hasPayday = schedule.events.contains(.payday) - let isVacation = schedule.contentType == .vacation - let isWork = schedule.contentType == .work + let hasPayday = schedule.events.contains(.payday) + let hasHoliday = schedule.events.contains(.publicHoliday) + let isVacation = schedule.contentType == .vacation + let isWork = schedule.contentType == .work if hasPayday && isVacation { - showDualLabel(primary: "월급", secondary: "휴가") + showDualLabel(primary: "월급", secondary: "연차") + } else if hasPayday && hasHoliday { + showDualLabel(primary: "월급", secondary: "공휴일") } else if hasPayday { showSingleLabel("월급", color: AppColor.IconAndText.green) + } else if hasHoliday && isVacation { + showSingleLabel("공휴일", color: AppColor.IconAndText.mediumEmphasis) } else if isVacation { - showSingleLabel("휴가", color: AppColor.IconAndText.mediumEmphasis) + showSingleLabel("연차", color: AppColor.IconAndText.mediumEmphasis) + } else if hasHoliday { + showSingleLabel("공휴일", color: AppColor.IconAndText.mediumEmphasis) } else if isWork { switch schedule.status { case .completed: