Merge branch 'develop' of https://github.com/Health-Food-Me/Health-Fo…

…od-Me-iOS into feature/Health-Food-Me#205 # Conflicts: # HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj
L-j-h-c · Jul 22, 2022 · e9b04b1 · e9b04b1
2 parents 50e46e9 + b758701
commit e9b04b1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj b/HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj
@@ -2509,7 +2509,7 @@
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.healthFoodMe.releasedf;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE_SPECIFIER = HealthFoodMe_Dev;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;

diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Scrap/ScrapScene/Cells/ScrapCVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Scrap/ScrapScene/Cells/ScrapCVC.swift
@@ -39,6 +39,12 @@ class ScrapCVC: UICollectionViewCell, UICollectionViewRegisterable {
         return btn
     }()
 
+    private var lineView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .helfmeLineGray
+        return view
+    }()
+
     private var storeNameLabel: UILabel = {
         let lb = UILabel()
         lb.textColor = .black
@@ -93,8 +99,8 @@ extension ScrapCVC {
     }
 
     private func setLayout() {
-        contentView.addSubviews(storeImageView, scrapButton, storeNameLabel,
-                                locationLabel)
+        contentView.addSubviews(storeImageView, scrapButton, lineView,
+                                storeNameLabel, locationLabel)
 
         storeImageView.snp.makeConstraints {
             $0.top.equalToSuperview()
@@ -107,6 +113,12 @@ extension ScrapCVC {
             $0.height.width.equalTo(28)
         }
 
+        lineView.snp.makeConstraints {
+            $0.top.equalTo(storeImageView.snp.bottom)
+            $0.leading.trailing.equalToSuperview()
+            $0.height.equalTo(1)
+        }
+
         storeNameLabel.snp.makeConstraints {
             $0.top.equalTo(storeImageView.snp.bottom).offset(5)
             $0.leading.trailing.equalToSuperview().inset(10)