[Merge] 'develop' into feature/DO-NOTTO-DO#84

NotToDo/NotToDo/Global/Extensions/UI/UIImage+.swift

@@ -24,7 +24,7 @@ extension UIImage {
 
     static let addNotToDo = UIImage(named: "Home/btn_nottodo")!.withRenderingMode(.alwaysOriginal)
     static let target = UIImage(named: "Home/ic_target")!.withRenderingMode(.alwaysOriginal)
-    static let checkStatusBox = UIImage(named: "Home/checkbox/checkBox")!.withRenderingMode(.alwaysOriginal)
+    static let checkStatusBox = UIImage(named: "Home/checkbox/btn_status_check")!.withRenderingMode(.alwaysOriginal)
     static let checkBox = UIImage(named: "Home/checkbox/btn_check_blank")!.withRenderingMode(.alwaysOriginal)
     static let checkDefault = UIImage(named: "Home/checkbox/Default")!.withRenderingMode(.alwaysOriginal)
     static let checkCircle = UIImage(named: "Home/checkbox/circle")!.withRenderingMode(.alwaysOriginal)

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,6 +233,7 @@ extension HomeMissionCollectionViewCell {
 
         if model.completionStatus == "FINISH" {
             statusButton.setImage(.checkCircle, for: .normal)
+            cancelLineView.isHidden = false
         } else if model.completionStatus == "AMBIGUOUS" {
             statusButton.setImage(.checkTriangle, for: .normal)
         } else {

NotToDo/NotToDo/Resource/Assets/Assets.xcassets/Home/checkbox/checkBox.imageset/Contents.json → NotToDo/NotToDo/Resource/Assets/Assets.xcassets/Home/checkbox/btn_status_check.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "checkBox.png",
+      "filename" : "btn_status_check.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "checkBox@2x.png",
+      "filename" : "btn_status_check@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "checkBox@3x.png",
+      "filename" : "btn_status_check@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }