Merge branch 'develop' into feat/#234

jayn2u · jayn2u · commit eb9a897b6bec · 2025-03-24T17:14:26.000+09:00
diff --git a/EATSSU/App/Sources/Presentation/Home/ViewController/HomeTimeTabmanController.swift b/EATSSU/App/Sources/Presentation/Home/ViewController/HomeTimeTabmanController.swift
@@ -131,8 +131,15 @@ extension HomeTimeTabmanController: PageboyViewControllerDataSource, TMBarDataSo
     }
 
     func setLayoutTabBar(ctBar: TMBar.ButtonBar) {
-        ctBar.backgroundColor = .white
-        ctBar.backgroundView.style = .blur(style: .regular)
+        // 투명도 줄이기 활성화 체크
+        if UIAccessibility.isReduceTransparencyEnabled {
+            ctBar.backgroundView.style = .flat(color: .white)
+            ctBar.backgroundColor = .white.withAlphaComponent(1.0)
+        } else {
+            ctBar.backgroundView.style = .blur(style: .regular)
+            ctBar.backgroundColor = .clear
+        }
+
         ctBar.layout.contentInset = UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 0.0)
         ctBar.buttons.customize { button in
             button.tintColor = .gray700 // 선택 안되어 있을 때
diff --git a/EATSSU/App/Sources/Presentation/Home/ViewController/HomeViewController.swift b/EATSSU/App/Sources/Presentation/Home/ViewController/HomeViewController.swift
@@ -10,7 +10,6 @@ import UIKit
 import EATSSUDesign
 
 import FirebaseAnalytics
-import GoogleMobileAds
 import Moya
 import SnapKit
 
diff --git a/EATSSU/App/Sources/Presentation/MyPage/ViewController/MyReviewViewController.swift b/EATSSU/App/Sources/Presentation/MyPage/ViewController/MyReviewViewController.swift
@@ -26,6 +26,11 @@ final class MyReviewViewController: BaseViewController {
     // MARK: - UI Components
 
     let myReviewView = MyReviewView()
+    
+    init(nickname: String) {
+        self.nickname = nickname
+        super.init(nibName: nil, bundle: nil)
+    }
 
     private lazy var noMyReviewImageView: UIImageView = {
         let imageView = UIImageView()
@@ -76,8 +81,8 @@ final class MyReviewViewController: BaseViewController {
         myReviewView.myReviewTableView.dataSource = self
     }
 
-    func dataBind(nikcname: String) {
-        nickname = nikcname
+    func dataBind(nickname: String) {
+        self.nickname = nickname
     }
 
     private func showFixOrDeleteAlert(reviewID: Int, menuName: String) {
diff --git a/EATSSU/App/Sources/Presentation/Review/View/SeeReview/RateNumberView.swift b/EATSSU/App/Sources/Presentation/Review/View/SeeReview/RateNumberView.swift
@@ -52,7 +52,7 @@ final class RateNumberView: BaseView {
         rateNumberStackView.do {
             $0.axis = .horizontal
             $0.spacing = 3
-            $0.alignment = .top
+            $0.alignment = .center
         }
     }
 
diff --git a/EATSSU/App/Sources/Presentation/Review/View/SeeReview/ReviewTableCell.swift b/EATSSU/App/Sources/Presentation/Review/View/SeeReview/ReviewTableCell.swift
@@ -67,7 +67,8 @@ final class ReviewTableCell: UITableViewCell {
 
     private let userProfileImageView: UIImageView = {
         let imageView = UIImageView()
-        imageView.image = UIImage(named: "userProfile.svg")
+//        imageView.image = UIImage(named: "userProfile.svg")
+        imageView.image = EATSSUDesignAsset.Images.profile.image
         return imageView
     }()
 
@@ -147,7 +148,7 @@ final class ReviewTableCell: UITableViewCell {
         let stackView = UIStackView(arrangedSubviews: [userProfileImageView, infoStackView])
         stackView.axis = .horizontal
         stackView.spacing = 8.adjusted
-        stackView.alignment = .leading
+        stackView.alignment = .center
         return stackView
     }()
 
@@ -199,7 +200,7 @@ final class ReviewTableCell: UITableViewCell {
         }
 
         dateReportStackView.snp.makeConstraints { make in
-            make.top.equalTo(profileStackView)
+            make.centerY.equalTo(profileStackView)
             make.trailing.equalToSuperview().inset(16)
         }
 
@@ -247,7 +248,7 @@ extension ReviewTableCell {
             foodImageView.isHidden = true
         }
 
-        response.isWriter ? sideButton.setImage(ImageLiteral.greySideButton, for: .normal) : sideButton.setTitle("신고", for: .normal)
+        response.isWriter ? sideButton.setImage(EATSSUDesignAsset.Images.icMenu.image, for: .normal) : sideButton.setTitle("신고", for: .normal)
         sideButton.addTarget(self, action: #selector(touchedSideButtonEvent), for: .touchUpInside)
     }
 
@@ -268,7 +269,7 @@ extension ReviewTableCell {
             foodImageView.isHidden = true
         }
         sideButton.addTarget(self, action: #selector(touchedSideButtonEvent), for: .touchUpInside)
-        sideButton.setImage(ImageLiteral.greySideButton, for: .normal)
+        sideButton.setImage(EATSSUDesignAsset.Images.icMenu.image, for: .normal)
         sideButton.setTitle("", for: .normal)
         reviewId = response.reviewID
     }
diff --git a/EATSSU/App/Sources/Presentation/Review/ViewController/SetRateViewController.swift b/EATSSU/App/Sources/Presentation/Review/ViewController/SetRateViewController.swift
@@ -131,13 +131,37 @@ final class SetRateViewController: BaseViewController {
         $0.addGestureRecognizer(tapGesture)
     }
 
+    private lazy var imageContainer = UIView().then {
+        $0.addSubview(selectImageButton)
+        $0.addSubview(imageCountLabel)
+    }
+
     private lazy var selectImageButton = UIButton().then {
-        $0.setImage(UIImage(named: "AddImageButton"), for: .normal)
+        var config = UIButton.Configuration.plain()
+        config.image = EATSSUDesignAsset.Images.addImageButton.image
+        config.contentInsets = NSDirectionalEdgeInsets(top: -5, leading: 0, bottom: 5, trailing: 0)
+
+        $0.configuration = config
         $0.addTarget(self, action: #selector(didSelectedImage), for: .touchUpInside)
+
+        $0.layer.borderWidth = 1
+        $0.layer.borderColor = EATSSUDesignAsset.Color.GrayScale.gray500.color.cgColor
+        $0.layer.cornerRadius = 8
+        $0.clipsToBounds = true
+
+        $0.contentVerticalAlignment = .center
+        $0.contentHorizontalAlignment = .center
+    }
+
+    private let imageCountLabel = UILabel().then {
+        $0.text = "사진 0/1"
+        $0.font = .caption3
+        $0.textColor = EATSSUDesignAsset.Color.GrayScale.gray500.color
+        $0.textAlignment = .center
     }
 
     private let deleteMethodLabel = UILabel().then {
-        $0.text = "이미지 클릭 시, 삭제됩니다"
+        $0.text = "사진 클릭 시, 삭제됩니다"
         $0.font = .caption3
         $0.textColor = EATSSUDesignAsset.Color.GrayScale.gray500.color
     }
@@ -183,6 +207,7 @@ final class SetRateViewController: BaseViewController {
                                 userReviewTextView,
                                 maximumWordLabel,
                                 selectImageButton,
+                                imageCountLabel,
                                 userReviewImageView,
                                 deleteMethodLabel,
                                 nextButton)
@@ -267,6 +292,12 @@ final class SetRateViewController: BaseViewController {
             $0.height.equalTo(60)
         }
 
+        imageCountLabel.snp.makeConstraints {
+            $0.top.equalTo(selectImageButton.snp.bottom).offset(-19)
+            $0.centerX.equalTo(selectImageButton)
+            $0.width.equalTo(selectImageButton)
+        }
+
         userReviewImageView.snp.makeConstraints {
             $0.top.equalTo(maximumWordLabel.snp.bottom).offset(15)
             $0.leading.equalTo(selectImageButton.snp.trailing).offset(13)
@@ -386,6 +417,7 @@ final class SetRateViewController: BaseViewController {
     func didTappedimageView() {
         userReviewImageView.image = nil // 이미지 삭제
         userPickedImage = nil
+        imageCountLabel.text = "사진 0/1"
     }
 
     private func prepareForNextReview() {
@@ -511,6 +543,7 @@ extension SetRateViewController: UIImagePickerControllerDelegate {
         if let image = info[UIImagePickerController.InfoKey.originalImage] as? UIImage {
             userReviewImageView.image = image
             userPickedImage = image
+            imageCountLabel.text = "사진 1/1"
         }
         picker.dismiss(animated: true, completion: nil)
     }
diff --git a/EATSSU/App/Sources/Utility/Application/AppDelegate.swift b/EATSSU/App/Sources/Utility/Application/AppDelegate.swift
@@ -9,15 +9,13 @@ import AuthenticationServices
 import UIKit
 
 import Firebase
-import GoogleMobileAds
 import KakaoSDKCommon
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
     // MARK: - UIApplicationDelegate Methods
 
     func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-        configureGoogleMobileAds()
         setupNotificationPermissions()
         startNetworkMonitoring()
         configureFirebase()
@@ -40,11 +38,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     // MARK: - Private Methods
 
-    /// Google Mobile Ads SDK를 초기화합니다.
-    private func configureGoogleMobileAds() {
-        GADMobileAds.sharedInstance().start(completionHandler: nil)
-    }
-
     /// 푸시 알림 권한을 요청하고 설정을 처리합니다.
     private func setupNotificationPermissions() {
         NotificationManager.shared.requestNotificationPermission { granted in
diff --git a/EATSSU/Project.swift b/EATSSU/Project.swift
@@ -4,10 +4,6 @@ let appInfoPlist: InfoPlist = .extendingDefault(with: [
     // API Keys Settings
     "BASE_URL": "https://$(BASE_URL)",
     "KAKAO API KEY": "$(KAKAO_API_KEY)",
-    "NMFClientId": "$(NMAP_CLIENT_ID)",
-    "GADApplicationIdentifier": "$(GADApplicationIdentifier)",
-    "NSLocationAlwaysUsageDescription": "사용자의 위치를 받습니다.",
-    "UILaunchStoryboardName": "LaunchScreen",
     "CFBundleURLTypes": [
         [
             "CFBundleTypeRole": "Editor",
@@ -104,10 +100,6 @@ let project = Project(
                 .external(name: "KakaoSDKUser"),
                 .external(name: "KakaoSDKCommon"),
                 .external(name: "KakaoSDKTalk"),
-                .external(name: "GoogleMobileAds"),
-                .external(name: "NMapsMap"),
-                .external(name: "FloatingPanel"),
-                .external(name: "AlertKit"),
 
                 // EATSSU 내장 라이브러리
                 .project(target: "EATSSUDesign", path: .relativeToRoot("../EATSSUDesign"), condition: .none),
@@ -145,10 +137,6 @@ let project = Project(
                 .external(name: "KakaoSDKUser"),
                 .external(name: "KakaoSDKCommon"),
                 .external(name: "KakaoSDKTalk"),
-                .external(name: "GoogleMobileAds"),
-                .external(name: "NMapsMap"),
-                .external(name: "FloatingPanel"),
-                .external(name: "AlertKit"),
 
                 // EATSSU 내장 라이브러리
                 .project(target: "EATSSUDesign", path: .relativeToRoot("../EATSSUDesign"), condition: .none),
@@ -160,7 +148,7 @@ let project = Project(
             name: "EATSSUWidget-DEV",
             destinations: [.iPhone],
             product: .appExtension,
-            bundleId: "com.jiwoo.EatSSU.WidgetExtension",
+            bundleId: "com.jiwoo.EatSSU.EatSSUwidget",
             deploymentTargets: widgetDeploymentTarget,
             infoPlist: widgetInfoPlist,
             sources: ["Widget/Sources/**"],
@@ -179,7 +167,7 @@ let project = Project(
             name: "EATSSUWidget-PROD",
             destinations: [.iPhone],
             product: .appExtension,
-            bundleId: "com.jiwoo.EatSSU.WidgetExtension",
+            bundleId: "com.jiwoo.EatSSU.EatSSUwidget",
             deploymentTargets: widgetDeploymentTarget,
             infoPlist: widgetInfoPlist,
             sources: ["Widget/Sources/**"],
diff --git a/EATSSUDesign/EATSSUDesign/Resources/Images.xcassets/AddImageButton.imageset/AddImageButton.svg b/EATSSUDesign/EATSSUDesign/Resources/Images.xcassets/AddImageButton.imageset/AddImageButton.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M28.4375 7.92969H24.5014L22.5586 5.01348C22.4836 4.90101 22.3819 4.80883 22.2626 4.74515C22.1434 4.68146 22.0102 4.64824 21.875 4.64844H13.125C12.9898 4.64824 12.8566 4.68146 12.7374 4.74515C12.6181 4.80883 12.5164 4.90101 12.4414 5.01348L10.4973 7.92969H6.5625C5.76478 7.92969 4.99973 8.24658 4.43566 8.81066C3.87158 9.37473 3.55469 10.1398 3.55469 10.9375V26.25C3.55469 27.0477 3.87158 27.8128 4.43566 28.3768C4.99973 28.9409 5.76478 29.2578 6.5625 29.2578H28.4375C29.2352 29.2578 30.0003 28.9409 30.5643 28.3768C31.1284 27.8128 31.4453 27.0477 31.4453 26.25V10.9375C31.4453 10.1398 31.1284 9.37473 30.5643 8.81066C30.0003 8.24658 29.2352 7.92969 28.4375 7.92969ZM29.8047 26.25C29.8047 26.6126 29.6606 26.9604 29.4042 27.2167C29.1479 27.4731 28.8001 27.6172 28.4375 27.6172H6.5625C6.1999 27.6172 5.85215 27.4731 5.59575 27.2167C5.33935 26.9604 5.19531 26.6126 5.19531 26.25V10.9375C5.19531 10.5749 5.33935 10.2272 5.59575 9.97075C5.85215 9.71436 6.1999 9.57031 6.5625 9.57031H10.9375C11.0727 9.57051 11.2059 9.53729 11.3251 9.47361C11.4444 9.40992 11.5461 9.31774 11.6211 9.20527L13.5639 6.28906H21.4348L23.3789 9.20527C23.4539 9.31774 23.5556 9.40992 23.6749 9.47361C23.7941 9.53729 23.9273 9.57051 24.0625 9.57031H28.4375C28.8001 9.57031 29.1479 9.71436 29.4042 9.97075C29.6606 10.2272 29.8047 10.5749 29.8047 10.9375V26.25ZM17.5 12.3047C16.3643 12.3047 15.2541 12.6415 14.3098 13.2724C13.3655 13.9034 12.6295 14.8002 12.1949 15.8494C11.7603 16.8987 11.6466 18.0532 11.8681 19.1671C12.0897 20.281 12.6366 21.3042 13.4397 22.1072C14.2427 22.9103 15.2659 23.4572 16.3798 23.6787C17.4936 23.9003 18.6482 23.7866 19.6974 23.352C20.7467 22.9174 21.6435 22.1814 22.2745 21.2371C22.9054 20.2928 23.2422 19.1826 23.2422 18.0469C23.2422 16.524 22.6372 15.0634 21.5603 13.9865C20.4835 12.9097 19.0229 12.3047 17.5 12.3047ZM17.5 22.1484C16.6888 22.1484 15.8958 21.9079 15.2213 21.4572C14.5468 21.0065 14.0211 20.3659 13.7107 19.6165C13.4002 18.867 13.319 18.0423 13.4772 17.2467C13.6355 16.4511 14.0261 15.7202 14.5998 15.1466C15.1734 14.573 15.9042 14.1824 16.6998 14.0241C17.4955 13.8659 18.3201 13.9471 19.0696 14.2575C19.8191 14.568 20.4596 15.0937 20.9103 15.7682C21.361 16.4427 21.6016 17.2357 21.6016 18.0469C21.6016 19.1347 21.1694 20.1779 20.4002 20.9471C19.6311 21.7163 18.5878 22.1484 17.5 22.1484Z" fill="#9D9D9D"/>
+</svg>
diff --git a/EATSSUDesign/EATSSUDesign/Resources/Images.xcassets/AddImageButton.imageset/Contents.json b/EATSSUDesign/EATSSUDesign/Resources/Images.xcassets/AddImageButton.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "AddImageButton.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Tuist/Package.swift b/Tuist/Package.swift
@@ -27,9 +27,6 @@ import PackageDescription
             "Firebase": .framework,
             "GoogleAppMeasurement": .framework,
 
-            // Google Ad Mobs
-            "GoogleMobileAds": .framework,
-
             // realm-swift
             "Realm": .framework,
             "RealmSwift": .framework,

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ final class RateNumberView: BaseView {`
`52`	`52`	`rateNumberStackView.do {`
`53`	`53`	`$0.axis = .horizontal`
`54`	`54`	`$0.spacing = 3`
`55`		`- $0.alignment = .top`
	`55`	`+ $0.alignment = .center`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`