From 4acecb933dcfd38e74e7f89f4f1b20159bdda650 Mon Sep 17 00:00:00 2001 From: Choyoungjun Date: Mon, 21 Oct 2024 19:16:54 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix=20::=20[#106]=20=EB=8B=B9=ED=95=B4?= =?UTF-8?q?=EB=85=84=EB=8F=84=EA=B0=80=20=EC=95=84=EB=8B=88=EB=8D=94?= =?UTF-8?q?=EB=9D=BC=EB=8F=84=20=EC=BA=98=EB=A6=B0=EB=8D=94=EC=97=90=20?= =?UTF-8?q?=EC=A0=90=EC=9D=B4=20=EB=9C=A8=EB=8A=94=20=EB=B2=84=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scene/Schedule/Component/AcademicScheduleCalneder.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Projects/Presentation/Sources/Scene/Schedule/Component/AcademicScheduleCalneder.swift b/Projects/Presentation/Sources/Scene/Schedule/Component/AcademicScheduleCalneder.swift index ff93859..25ecda0 100644 --- a/Projects/Presentation/Sources/Scene/Schedule/Component/AcademicScheduleCalneder.swift +++ b/Projects/Presentation/Sources/Scene/Schedule/Component/AcademicScheduleCalneder.swift @@ -132,10 +132,10 @@ public class AcademicScheduleCalneder: BaseView, FSCalendarDelegate, FSCalendarD private func getDateEventArray() -> [Date] { var dateArray: [Date] = [] - let currentPageYear = Calendar.current.component(.year, from: calendarView.currentPage) + let currentYear = Calendar.current.component(.year, from: Date()) for date in monthAcademicScheduleData.value { - dateArray.append("\(currentPageYear)-\(date.month)-\(date.day)".toDate(type: .fullDate)) + dateArray.append("\(currentYear)-\(date.month)-\(date.day)".toDate(type: .fullDate)) } return dateArray From 5291a7bf5c700923572d6b87b13a3a4e95c53ba2 Mon Sep 17 00:00:00 2001 From: Choyoungjun Date: Mon, 21 Oct 2024 19:17:18 +0900 Subject: [PATCH 2/3] =?UTF-8?q?refact=20::=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/Scene/Apply/ApplyViewController.swift | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Projects/Presentation/Sources/Scene/Apply/ApplyViewController.swift b/Projects/Presentation/Sources/Scene/Apply/ApplyViewController.swift index 864d101..3c27e10 100644 --- a/Projects/Presentation/Sources/Scene/Apply/ApplyViewController.swift +++ b/Projects/Presentation/Sources/Scene/Apply/ApplyViewController.swift @@ -12,17 +12,14 @@ import DesignSystem public class ApplyViewController: BaseViewController { private lazy var navigationBar = PiCKMainNavigationBar(view: self) - private let applyLabel = PiCKLabel(text: "신청", textColor: .modeBlack, font: .heading4) + private let applyLabel = PiCKLabel( + text: "신청", + textColor: .modeBlack, + font: .heading4 + ) private let applyTabView = PiCKApplyStackView() - public override func attribute() { - super.attribute() - - view.backgroundColor = .background - } public override func configureNavgationBarLayOutSubviews() { - super.configureNavgationBarLayOutSubviews() - navigationController?.isNavigationBarHidden = true } public override func bind() { From ead032ebd4a8265c57bf4538effaeb10b5c96a19 Mon Sep 17 00:00:00 2001 From: Choyoungjun Date: Mon, 21 Oct 2024 19:19:14 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat=20::=20[#106]=20=EC=8B=9C=EA=B0=84?= =?UTF-8?q?=ED=91=9C=20=EA=B8=B0=EB=B3=B8=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/Extension/Image/UIImage+.swift | 1 + .../Cell/TimeTableCollectionViewCell.swift | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Projects/Modules/DesignSystem/Sources/Extension/Image/UIImage+.swift b/Projects/Modules/DesignSystem/Sources/Extension/Image/UIImage+.swift index fb9f5db..2347664 100644 --- a/Projects/Modules/DesignSystem/Sources/Extension/Image/UIImage+.swift +++ b/Projects/Modules/DesignSystem/Sources/Extension/Image/UIImage+.swift @@ -30,6 +30,7 @@ public extension UIImage { static let imageIcon = DesignSystemAsset.Image.image.image static let checkIcon = DesignSystemAsset.Image.check.image static let failIcon = DesignSystemAsset.Image.fail.image + static let defaultTimeTableIcon = DesignSystemAsset.Image.defaultTimeTable2.image // MARK: TabBarIcon static let homeIcon = DesignSystemAsset.Image.homeIcon.image static let schoolMealIcon = DesignSystemAsset.Image.schoolMealIcon.image diff --git a/Projects/Presentation/Sources/Scene/Schedule/TimeTable/Cell/TimeTableCollectionViewCell.swift b/Projects/Presentation/Sources/Scene/Schedule/TimeTable/Cell/TimeTableCollectionViewCell.swift index 0110d96..167dd14 100644 --- a/Projects/Presentation/Sources/Scene/Schedule/TimeTable/Cell/TimeTableCollectionViewCell.swift +++ b/Projects/Presentation/Sources/Scene/Schedule/TimeTable/Cell/TimeTableCollectionViewCell.swift @@ -12,16 +12,25 @@ import DesignSystem public class TimeTableCollectionViewCell: BaseCollectionViewCell { static let identifier = "TimeTableCollectionViewCell" - private let periodLabel = PiCKLabel(textColor: .modeBlack, font: .subTitle2) + private let periodLabel = PiCKLabel( + textColor: .modeBlack, + font: .subTitle2 + ) private let subjectImageView = UIImageView() - private let subjectLabel = PiCKLabel(textColor: .modeBlack, font: .label1) + private let subjectLabel = PiCKLabel( + textColor: .modeBlack, + font: .label1 + ) public override func adapt(model: TimeTableEntityElement) { super.adapt(model: model) self.periodLabel.text = "\(model.period)교시" self.periodLabel.changePointColor(targetString: "\(model.period)", color: .main500) - self.subjectImageView.kf.setImage(with: URL(string: model.subjectImage)!) + self.subjectImageView.kf.setImage( + with: URL(string: model.subjectImage)!, + placeholder: UIImage.defaultTimeTableIcon + ) self.subjectLabel.text = model.subjectName }