From 46549f2120ba4d5ef3fd8e7f8db3b7fb17f40ba8 Mon Sep 17 00:00:00 2001 From: Kim Minjae Date: Fri, 21 Jul 2023 19:49:44 +0900 Subject: [PATCH] =?UTF-8?q?[FIX]=20=EC=BB=A4=EB=A6=AC=ED=81=98=EB=9F=BC=20?= =?UTF-8?q?=EC=A3=BC=EC=B0=A8=EB=B3=84=EC=97=90=EC=84=9C=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=84=A3=EA=B8=B0(#113)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LionHeart-iOS.xcodeproj/project.pbxproj | 4 ++ ...lumArticleByWeekRowZeroTableViewCell.swift | 12 ++-- .../Model/CurriculumWeekBackgroundDummy.swift | 59 +++++++++++++++++++ 3 files changed, 70 insertions(+), 5 deletions(-) create mode 100644 LionHeart-iOS/LionHeart-iOS/Scenes/Curriculum/Model/CurriculumWeekBackgroundDummy.swift diff --git a/LionHeart-iOS/LionHeart-iOS.xcodeproj/project.pbxproj b/LionHeart-iOS/LionHeart-iOS.xcodeproj/project.pbxproj index 3bea3fec..0cd7f7b0 100644 --- a/LionHeart-iOS/LionHeart-iOS.xcodeproj/project.pbxproj +++ b/LionHeart-iOS/LionHeart-iOS.xcodeproj/project.pbxproj @@ -98,6 +98,7 @@ B5C6A2BE2A5DE6590021BE5E /* GeneralTitleTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C6A2BD2A5DE6590021BE5E /* GeneralTitleTableViewCell.swift */; }; B5C6A2C22A5DEA1B0021BE5E /* CopyRightTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C6A2C12A5DEA1B0021BE5E /* CopyRightTableViewCell.swift */; }; B5C6A2C82A5EF4EB0021BE5E /* ArticleDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C6A2C72A5EF4EB0021BE5E /* ArticleDetail.swift */; }; + B5F323E92A6A8F0000047869 /* CurriculumWeekBackgroundDummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F323E82A6A8F0000047869 /* CurriculumWeekBackgroundDummy.swift */; }; C00780B72A5FFE0E0043EB36 /* UILabel+.swift in Sources */ = {isa = PBXBuildFile; fileRef = C00780B62A5FFE0E0043EB36 /* UILabel+.swift */; }; C00780BA2A60149D0043EB36 /* LHTodayArticleTitle.swift in Sources */ = {isa = PBXBuildFile; fileRef = C00780B92A60149D0043EB36 /* LHTodayArticleTitle.swift */; }; C06E381B2A65346700B00600 /* UserDefaultToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = C06E381A2A65346700B00600 /* UserDefaultToken.swift */; }; @@ -305,6 +306,7 @@ B5C6A2BD2A5DE6590021BE5E /* GeneralTitleTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralTitleTableViewCell.swift; sourceTree = ""; }; B5C6A2C12A5DEA1B0021BE5E /* CopyRightTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopyRightTableViewCell.swift; sourceTree = ""; }; B5C6A2C72A5EF4EB0021BE5E /* ArticleDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleDetail.swift; sourceTree = ""; }; + B5F323E82A6A8F0000047869 /* CurriculumWeekBackgroundDummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurriculumWeekBackgroundDummy.swift; sourceTree = ""; }; C00780B62A5FFE0E0043EB36 /* UILabel+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+.swift"; sourceTree = ""; }; C00780B92A60149D0043EB36 /* LHTodayArticleTitle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LHTodayArticleTitle.swift; sourceTree = ""; }; C06E381A2A65346700B00600 /* UserDefaultToken.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultToken.swift; sourceTree = ""; }; @@ -1360,6 +1362,7 @@ children = ( F4490C062A5CEEA300A6D9D7 /* CurriculumDummyData.swift */, F4DB30AF2A611C9700413EB9 /* CurriculumListByWeekData.swift */, + B5F323E82A6A8F0000047869 /* CurriculumWeekBackgroundDummy.swift */, ); path = Model; sourceTree = ""; @@ -1589,6 +1592,7 @@ B59892EC2A5B94E100CE1FEB /* UIApplication+.swift in Sources */, 4AE19A172A65864F00C1DB7E /* BookmarkService.swift in Sources */, 4AE19A1A2A65886100C1DB7E /* BookmarkReponse.swift in Sources */, + B5F323E92A6A8F0000047869 /* CurriculumWeekBackgroundDummy.swift in Sources */, C0DF039F2A5CABC10037F740 /* GetPregnancyViewController.swift in Sources */, C0DF035F2A5A9C330037F740 /* ArticleListByWeekViewController.swift in Sources */, F4DB30BC2A61691F00413EB9 /* CurriculumArticleByWeekRowZeroTableViewCell.swift in Sources */, diff --git a/LionHeart-iOS/LionHeart-iOS/Scenes/Curriculum/Cells/CurriculumArticleByWeekRowZeroTableViewCell.swift b/LionHeart-iOS/LionHeart-iOS/Scenes/Curriculum/Cells/CurriculumArticleByWeekRowZeroTableViewCell.swift index 58a0bcf6..ef0b6d47 100644 --- a/LionHeart-iOS/LionHeart-iOS/Scenes/Curriculum/Cells/CurriculumArticleByWeekRowZeroTableViewCell.swift +++ b/LionHeart-iOS/LionHeart-iOS/Scenes/Curriculum/Cells/CurriculumArticleByWeekRowZeroTableViewCell.swift @@ -11,20 +11,22 @@ import UIKit import SnapKit final class CurriculumArticleByWeekRowZeroTableViewCell: UITableViewCell, TableViewCellRegisterDequeueProtocol { - + var inputData: Int? { didSet { guard let inputData else { return } //inputData는 row가 0부터인데 주차정보는 4주차부터 시작이므로 +4를 해줌 + weekLabel.text = "\(inputData)주차" - + weekBackGroundImageView.image = WeekBackgroundImage.dummy()[inputData-4].weekBackgroundImage + } } private enum Size { static let weekBackGroundImageSize: CGFloat = 200 / 375 } - + private let weekBackGroundImageView: UIImageView = { let imageView = UIImageView() imageView.backgroundColor = .designSystem(.gray500) @@ -37,7 +39,7 @@ final class CurriculumArticleByWeekRowZeroTableViewCell: UITableViewCell, TableV button.setImage(ImageLiterals.Curriculum.arrowLeftWeek, for: .normal) button.addButtonAction { _ in - NotificationCenter.default.post(name: NSNotification.Name("leftButton"), + NotificationCenter.default.post(name: NSNotification.Name("leftButton"), object: nil) } return button @@ -72,7 +74,7 @@ final class CurriculumArticleByWeekRowZeroTableViewCell: UITableViewCell, TableV }() private let curriculumAndWeekStackView: UIStackView = { - let stackView = UIStackView() + let stackView = UIStackView() stackView.spacing = 2 stackView.distribution = .fill stackView.axis = .vertical diff --git a/LionHeart-iOS/LionHeart-iOS/Scenes/Curriculum/Model/CurriculumWeekBackgroundDummy.swift b/LionHeart-iOS/LionHeart-iOS/Scenes/Curriculum/Model/CurriculumWeekBackgroundDummy.swift new file mode 100644 index 00000000..4dbf73fe --- /dev/null +++ b/LionHeart-iOS/LionHeart-iOS/Scenes/Curriculum/Model/CurriculumWeekBackgroundDummy.swift @@ -0,0 +1,59 @@ +// +// CurriculumWeekBackgroundDummy.swift +// LionHeart-iOS +// +// Created by 김민재 on 2023/07/21. +// + +import UIKit + +struct WeekBackgroundImage: AppData { + let weekBackgroundImage: UIImage +} + +extension WeekBackgroundImage { + static func dummy() -> [WeekBackgroundImage] { + return [WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week4Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week5Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week6Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week7Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week8Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week9Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week10Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week11Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week12Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week13Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week14Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week15Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week16Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week17Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week18Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week19Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week20Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week21Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week22Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week23Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week24Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week25Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week26Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week27Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week28Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week29Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week30Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week31Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week32Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week33Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week34Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week35Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week36Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week37Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week38Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week39Image), + WeekBackgroundImage(weekBackgroundImage: ImageLiterals.Curriculum.week40Image) + + + + ] + + } +}