[Fix] feature/Health-Food-Me#302 누락 부분 반영

HealthFoodMe/HealthFoodMe/Global/Literals/ImageLiterals.swift

@@ -63,6 +63,7 @@ struct ImageLiterals {
 
     struct HamburgerBar {
         static let editNameBtn = UIImage(named: "btn_edit")
+        static let needLoginBtn = UIImage(named: "btn_more_restaurant")
     }
 
     struct Auth {

HealthFoodMe/HealthFoodMe/Global/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -150,6 +150,66 @@
       "scale" : "1x",
       "size" : "1024x1024"
     },
+    {
+      "filename" : "16.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "32.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "32.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "64.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "128.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "256.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "256.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "512.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "512.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
+    },
+    {
+      "filename" : "1024.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512"
+    },
     {
       "filename" : "48.png",
       "idiom" : "watch",
@@ -225,6 +285,13 @@
       "size" : "51x51",
       "subtype" : "45mm"
     },
+    {
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "54x54",
+      "subtype" : "49mm"
+    },
     {
       "filename" : "172.png",
       "idiom" : "watch",
@@ -257,70 +324,17 @@
       "subtype" : "45mm"
     },
     {
-      "filename" : "1024.png",
-      "idiom" : "watch-marketing",
-      "scale" : "1x",
-      "size" : "1024x1024"
-    },
-    {
-      "filename" : "16.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "32.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "32.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "64.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "128.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "256.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "256.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "512.png",
-      "idiom" : "mac",
+      "idiom" : "watch",
+      "role" : "quickLook",
       "scale" : "2x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "512.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
+      "size" : "129x129",
+      "subtype" : "49mm"
     },
     {
       "filename" : "1024.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
+      "idiom" : "watch-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {

HealthFoodMe/HealthFoodMe/Global/Resources/Assets.xcassets/HamburgerBar/btn_more_restaurant.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "btn_edit.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "btn_edit@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "btn_edit@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

HealthFoodMe/HealthFoodMe/Presentation/Detail/MainDetailScene/VC/MainDetailVC.swift

@@ -145,7 +145,8 @@ extension MainDetailVC {
         }), for: .touchUpInside)
         scrapButtonInstance = scrapButton
 
-        reviewWriteCTAButton.layer.cornerRadius = 20
+        let reviewWriteButtonWidth = UIScreen.main.bounds.width * (335 / 375)
+        reviewWriteCTAButton.layer.cornerRadius = reviewWriteButtonWidth * (44/335) / 2
 
         self.navigationItem.leftBarButtonItem = UIBarButtonItem(customView: backButton)
         self.navigationItem.rightBarButtonItem = UIBarButtonItem(customView: scrapButton)

HealthFoodMe/HealthFoodMe/Presentation/Detail/MenuTabScene/Views/MenuView.swift

@@ -52,7 +52,7 @@ final class MenuView: UIView {
         let lb = UILabel()
         lb.textColor = .helfmeBlack
         lb.numberOfLines = 2
-        lb.font = .NotoBold(size: 14)
+        lb.font = .NotoBold(size: 15)
         return lb
     }()
 
@@ -170,6 +170,7 @@ extension MenuView {
             make.leading.equalTo(menuImageView.snp.trailing).offset(20)
             make.trailing.equalToSuperview().inset(97)
             make.centerY.equalTo(menuImageView.snp.centerY)
+            make.width.equalTo(UIScreen.main.bounds.width * 103)
         }
 
         kcalView.addSubview(kcalStackView)

HealthFoodMe/HealthFoodMe/Presentation/Detail/ReviewTabScene/Cells/BlogReview/BlogReviewCVC.swift

@@ -19,15 +19,15 @@ class BlogReviewCVC: UICollectionViewCell, UICollectionViewRegisterable {
     private lazy var blogReviewTitleLabel: UILabel = {
         let lb = UILabel()
         lb.textColor = .helfmeBlack
-        lb.font = UIFont.NotoBold(size: 14)
+        lb.font = UIFont.NotoBold(size: 15)
 
         return lb
     }()
 
     private lazy var blogReviewContentsLabel: UILabel = {
         let lb = UILabel()
         lb.textColor = .helfmeBlack
-        lb.font = UIFont.NotoRegular(size: 12)
+        lb.font = UIFont.NotoRegular(size: 13)
         lb.numberOfLines = 3
         return lb
     }()

HealthFoodMe/HealthFoodMe/Presentation/Detail/ReviewTabScene/Cells/Review/ReviewCVC.swift

@@ -350,7 +350,7 @@ extension ReviewCVC: UICollectionViewDataSource {
             guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: TagCVC.className, for: indexPath) as? TagCVC else { return UICollectionViewCell() }
             if let data = cellViewModel {
                 cell.setData(tagData: data.tagList[indexPath.row])
-                cell.layer.borderWidth = 1
+                cell.layer.borderWidth = 0.5
                 cell.layer.borderColor = UIColor.mainRed.cgColor
                 cell.layer.cornerRadius = 11
                 cell.layer.masksToBounds = true

HealthFoodMe/HealthFoodMe/Presentation/Detail/ReviewWriteScene/VC/ReviewWriteVC.swift

@@ -105,7 +105,7 @@ final class ReviewWriteVC: UIViewController, UIScrollViewDelegate {
         let btn = UIButton()
         btn.setTitle(I18N.Detail.Review.tagGood, for: .normal)
         btn.setTitleColor(UIColor.helfmeGray2, for: UIControl.State.normal)
-        btn.titleLabel?.font = .NotoRegular(size: 14)
+        btn.titleLabel?.font = .NotoMedium(size: 14)
         btn.backgroundColor = .helfmeWhite
         btn.layer.borderColor = UIColor.helfmeGray2.cgColor
         btn.layer.borderWidth = 0.5
@@ -119,7 +119,7 @@ final class ReviewWriteVC: UIViewController, UIScrollViewDelegate {
         let btn = UIButton()
         btn.setTitle(I18N.Detail.Review.tagSoso, for: .normal)
         btn.setTitleColor(UIColor.helfmeGray2, for: UIControl.State.normal)
-        btn.titleLabel?.font = .NotoRegular(size: 14)
+        btn.titleLabel?.font = .NotoMedium(size: 14)
         btn.backgroundColor = .helfmeWhite
         btn.layer.borderColor = UIColor.helfmeGray2.cgColor
         btn.layer.borderWidth = 0.5
@@ -133,7 +133,7 @@ final class ReviewWriteVC: UIViewController, UIScrollViewDelegate {
         let btn = UIButton()
         btn.setTitle(I18N.Detail.Review.tagBad, for: .normal)
         btn.setTitleColor(UIColor.helfmeGray2, for: UIControl.State.normal)
-        btn.titleLabel?.font = .NotoRegular(size: 14)
+        btn.titleLabel?.font = .NotoMedium(size: 14)
         btn.backgroundColor = .helfmeWhite
         btn.layer.borderColor = UIColor.helfmeGray2.cgColor
         btn.layer.borderWidth = 0.5
@@ -181,7 +181,7 @@ final class ReviewWriteVC: UIViewController, UIScrollViewDelegate {
         let btn = UIButton()
         btn.setTitle(I18N.Detail.Review.tagNoBurden, for: .normal)
         btn.setTitleColor(UIColor.helfmeGray2, for: UIControl.State.normal)
-        btn.titleLabel?.font = .NotoRegular(size: 14)
+        btn.titleLabel?.font = .NotoMedium(size: 14)
         btn.backgroundColor = .helfmeWhite
         btn.layer.borderColor = UIColor.helfmeGray2.cgColor
         btn.layer.borderWidth = 0.5
@@ -195,7 +195,7 @@ final class ReviewWriteVC: UIViewController, UIScrollViewDelegate {
         let btn = UIButton()
         btn.setTitle(I18N.Detail.Review.tagEasy, for: .normal)
         btn.setTitleColor(UIColor.helfmeGray2, for: UIControl.State.normal)
-        btn.titleLabel?.font = .NotoRegular(size: 14)
+        btn.titleLabel?.font = .NotoMedium(size: 14)
         btn.backgroundColor = .helfmeWhite
         btn.layer.borderColor = UIColor.helfmeGray2.cgColor
         btn.layer.borderWidth = 0.5
@@ -209,7 +209,7 @@ final class ReviewWriteVC: UIViewController, UIScrollViewDelegate {
         let btn = UIButton()
         btn.setTitle(I18N.Detail.Review.tagStrong, for: .normal)
         btn.setTitleColor(UIColor.helfmeGray2, for: UIControl.State.normal)
-        btn.titleLabel?.font = .NotoRegular(size: 14)
+        btn.titleLabel?.font = .NotoMedium(size: 14)
         btn.backgroundColor = .helfmeWhite
         btn.layer.borderColor = UIColor.helfmeGray2.cgColor
         btn.layer.borderWidth = 0.5
@@ -291,7 +291,7 @@ final class ReviewWriteVC: UIViewController, UIScrollViewDelegate {
         let lb = UILabel()
         lb.text = I18N.Detail.Review.questionPhotoOption
         lb.textColor = .helfmeGray2
-        lb.font = .NotoRegular(size: 10)
+        lb.font = .NotoBold(size: 12)
         return lb
     }()
 

HealthFoodMe/HealthFoodMe/Presentation/Map/HamburgerBarScene/HamburgerBarVC.swift

@@ -289,11 +289,6 @@ extension HamburgerBarVC {
             make.trailing.equalTo(hamburgerBarView).inset(10)
         }
 
-//        editNameButton.snp.makeConstraints { make in
-//            make.centerY.equalTo(nickNameStackView.snp.centerY)
-//            make.leading.equalTo(nickNameStackView.snp.trailing).offset(8)
-//        }
-
         dividingLineViews[0].snp.makeConstraints { make in
             make.width.equalTo(hamburgerBarView)
             make.top.equalTo(helloStackView.snp.bottom).offset(38)
@@ -303,7 +298,7 @@ extension HamburgerBarVC {
 
         storeButtonStackView.snp.makeConstraints { make in
             make.top.equalTo(dividingLineViews[0].snp.bottom).offset(28)
-            make.leading.equalTo(hamburgerBarView).inset(20)
+            make.leading.trailing.equalTo(hamburgerBarView).inset(20)
         }
 
         dividingLineViews[1].snp.makeConstraints { make in

HealthFoodMe/HealthFoodMe/Presentation/Map/MyReviewScene/Cells/MyReviewCVC.swift

@@ -92,7 +92,7 @@ class MyReviewCVC: UICollectionViewCell, UICollectionViewRegisterable {
         let bt = UIButton()
         bt.titleLabel?.font = .NotoRegular(size: 10)
         bt.setTitle("편집", for: .normal)
-        bt.setTitleColor(UIColor.helfmeGray2, for: .normal)
+        bt.setTitleColor(UIColor.helfmeGray1, for: .normal)
         bt.addAction(UIAction(handler: { _ in
             self.delegate?.editButtonTapped(reviewId: self.reviewId, restaurantName: self.restaurantName, score: self.starScore, tagList: self.tagList, content: self.content, image: self.image)
         }), for: .touchUpInside)
@@ -101,7 +101,7 @@ class MyReviewCVC: UICollectionViewCell, UICollectionViewRegisterable {
 
     private let verticalView: UIView = {
         let view = UIView()
-        view.backgroundColor = .helfmeGray1.withAlphaComponent(0.3)
+        view.backgroundColor = .helfmeLineGray.withAlphaComponent(0.3)
         view.snp.makeConstraints { make in
             make.height.equalTo(12)
             make.width.equalTo(1)
@@ -113,7 +113,7 @@ class MyReviewCVC: UICollectionViewCell, UICollectionViewRegisterable {
         let bt = UIButton()
         bt.titleLabel?.font = .NotoRegular(size: 10)
         bt.setTitle("삭제", for: .normal)
-        bt.setTitleColor(UIColor.helfmeGray2, for: .normal)
+        bt.setTitleColor(UIColor.helfmeGray1, for: .normal)
         bt.addAction(UIAction(handler: { _ in
             self.delegate?.deleteButtonTapped(reviewId: self.reviewId)
         }), for: .touchUpInside)
@@ -255,7 +255,7 @@ extension MyReviewCVC {
         }
 
         reviewPhotoCV.snp.makeConstraints { make in
-            make.top.equalTo(tagCV.snp.bottom).offset(10)
+            make.top.equalTo(tagCV.snp.bottom).offset(12)
             make.leading.equalToSuperview()
             make.height.equalTo(width * (105/375))
             make.width.equalToSuperview()
@@ -320,7 +320,7 @@ extension MyReviewCVC {
         contentView.addSubviews(reviewPhotoCV)
 
         reviewPhotoCV.snp.remakeConstraints { make in
-            make.top.equalTo(tagCV.snp.bottom).offset(10)
+            make.top.equalTo(tagCV.snp.bottom).offset(12)
             make.leading.equalToSuperview()
             make.height.equalTo(width * (105/375))
             make.width.equalToSuperview()
@@ -337,7 +337,7 @@ extension MyReviewCVC {
         reviewPhotoCV.isHidden = false
 
         reviewPhotoCV.snp.remakeConstraints { make in
-            make.top.equalTo(tagCV.snp.bottom).offset(10)
+            make.top.equalTo(tagCV.snp.bottom).offset(12)
             make.leading.equalToSuperview()
             make.height.equalTo(width * (105/375))
             make.width.equalToSuperview()
@@ -444,7 +444,7 @@ extension MyReviewCVC: UICollectionViewDataSource {
             guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: TagCVC.className, for: indexPath) as? TagCVC else { return UICollectionViewCell() }
             if let data = cellViewModel {
                 cell.setData(tagData: data.tagList[indexPath.row])
-                cell.layer.borderWidth = 1
+                cell.layer.borderWidth = 0.5
                 cell.layer.borderColor = UIColor.mainRed.cgColor
                 cell.layer.cornerRadius = 11
                 cell.layer.masksToBounds = true