From 962baadaaa05145bc13b019e597fe9e99d163c47 Mon Sep 17 00:00:00 2001 From: yungu0010 Date: Fri, 13 Jan 2023 18:18:31 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[FIX]=20#94=20-=20=EC=95=A0=EB=A7=A4?= =?UTF-8?q?=ED=95=B4=EC=9D=BC=20=EB=95=8C=20=EC=B7=A8=EC=86=8C=EC=84=A0=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Cells/HomeMissionCollectionViewCell.swift | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/NotToDo/NotToDo/Presentation/HomeScene/Cells/HomeMissionCollectionViewCell.swift b/NotToDo/NotToDo/Presentation/HomeScene/Cells/HomeMissionCollectionViewCell.swift index d2e4a79..7d6c276 100644 --- a/NotToDo/NotToDo/Presentation/HomeScene/Cells/HomeMissionCollectionViewCell.swift +++ b/NotToDo/NotToDo/Presentation/HomeScene/Cells/HomeMissionCollectionViewCell.swift @@ -34,6 +34,7 @@ final class HomeMissionCollectionViewCell: UICollectionViewCell { private let goalView = UIView() private let goalTitleLabel = UILabel() private let goalLabel = UILabel() + private let cancelLineView = UIView() private let solutionStackview = UIStackView() private var firstSolusionView = UIImageView() @@ -113,6 +114,11 @@ extension HomeMissionCollectionViewCell { } headerView.clipsToBounds = false + + cancelLineView.do { + $0.backgroundColor = .nottodoGray1 + $0.isHidden = true + } } private func setLayout() { @@ -124,7 +130,7 @@ extension HomeMissionCollectionViewCell { meatballView.addSubview(meatballButton) headerView.addSubviews(statusButton, statusButtonView, situationLabel, missionTitleLabel, goalView, goalTitleLabel, meatballButton, - meatballView) + meatballView, cancelLineView) addSubviews(headerBackView, solutionStackview) headerBackView.snp.makeConstraints { @@ -209,6 +215,13 @@ extension HomeMissionCollectionViewCell { $0.leading.equalToSuperview().inset(22.adjusted) } } + + cancelLineView.snp.makeConstraints { + $0.height.equalTo(1.adjusted) + $0.leading.equalTo(situationLabel.snp.leading).offset(-8.adjusted) + $0.trailing.equalTo(missionTitleLabel.snp.trailing).offset(11.adjusted) + $0.centerY.equalTo(missionTitleLabel.snp.centerY) + } } func configure(_ model: DailyMissionResponseDTO) { @@ -220,8 +233,10 @@ extension HomeMissionCollectionViewCell { if model.completionStatus == "FINISH" { statusButton.setImage(.checkCircle, for: .normal) + cancelLineView.isHidden = false } else if model.completionStatus == "AMBIGUOUS" { statusButton.setImage(.checkTriangle, for: .normal) + cancelLineView.isHidden = true } else { statusButton.setImage(.checkDefault, for: .normal) } From 24ff5a3601c585b55bb653f1a50208210b958014 Mon Sep 17 00:00:00 2001 From: yungu0010 Date: Fri, 13 Jan 2023 18:22:41 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[FIX]=20#94=20-=20=EC=95=A0=EB=A7=A4?= =?UTF-8?q?=ED=95=B4=20=EC=83=81=ED=83=9C=20=EC=8B=9C=20=EC=B7=A8=EC=86=8C?= =?UTF-8?q?=EC=84=A0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HomeScene/Cells/HomeMissionCollectionViewCell.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/NotToDo/NotToDo/Presentation/HomeScene/Cells/HomeMissionCollectionViewCell.swift b/NotToDo/NotToDo/Presentation/HomeScene/Cells/HomeMissionCollectionViewCell.swift index 7d6c276..97d2c78 100644 --- a/NotToDo/NotToDo/Presentation/HomeScene/Cells/HomeMissionCollectionViewCell.swift +++ b/NotToDo/NotToDo/Presentation/HomeScene/Cells/HomeMissionCollectionViewCell.swift @@ -239,6 +239,7 @@ extension HomeMissionCollectionViewCell { cancelLineView.isHidden = true } else { statusButton.setImage(.checkDefault, for: .normal) + cancelLineView.isHidden = false } }