[#275] 앱 영어 지원 추가 & 마이페이지 리뉴얼

EATSSU/App/Sources/Notification/NotificationManager.swift

@@ -119,25 +119,26 @@ class NotificationManager {
     }
 
     // MARK: - Error Types
+
     enum NotificationError: Error {
         case permissionDenied
         case unknown
-        
+
         var message: String {
             switch self {
             case .permissionDenied:
-                return "알림 권한 필요"
+                return TextLiteral.Notification.permissionDeniedMessage
             case .unknown:
-                return "알 수 없는 오류"
+                return TextLiteral.Notification.unknownErrorMessage
             }
         }
-        
+
         var description: String {
             switch self {
             case .permissionDenied:
-                return "알림을 받으려면 설정에서 알림 권한을 허용해주세요."
+                return TextLiteral.Notification.permissionDeniedDescription
             case .unknown:
-                return "다시 시도해주세요."
+                return TextLiteral.Notification.unknownErrorDescription
             }
         }
     }

EATSSU/App/Sources/Presentation/Auth/View/LoginView.swift

@@ -19,31 +19,30 @@ final class LoginView: BaseUIView {
         imageView.image = EATSSUDesignAsset.Images.authLogo.image
         return imageView
     }()
-
-    private let logoSubTitle: UIImageView = {
-        let imageView = UIImageView()
-        imageView.image = EATSSUDesignAsset.Images.authSubTitle.image
-        return imageView
-    }()
-
-    let appleLoginButton: UIButton = {
-        let button = UIButton()
-        button.setImage(EATSSUDesignAsset.Images.appleLoginButton.image, for: .normal)
-        return button
-    }()
-
-    let kakaoLoginButton: UIButton = {
-        let button = UIButton()
-        button.setImage(EATSSUDesignAsset.Images.kakaoLoginButton.image, for: .normal)
-        return button
+
+    private let logoSubTitle: UILabel = {
+        let label = UILabel()
+        label.font = .header2
+        label.attributedText = TextLiteral.Common.logoSubTitle.logoHighlightedLastWord(
+            baseColor: .black,
+            highlightColor: .primary
+        )
+        return label
     }()
-
+
+    let appleLoginButton = SocialLoginButton(type: .apple)
+
+    let kakaoLoginButton = SocialLoginButton(type: .kakao)
+
     let lookingWithNoSignInButton: UIButton = {
-        let button = UIButton()
-        button.setImage(EATSSUDesignAsset.Images.lookAroundButton.image, for: .normal)
+        let button = UIButton(type: .system)
+        button.setTitle(TextLiteral.Auth.lookingWithNoSignIn, for: .normal)
+        button.setTitleColor(.gray400, for: .normal)
+        button.titleLabel?.font = .body2
+        button.backgroundColor = .clear
         return button
     }()
-
+    
     private var lastLoginTooltipView: LastLoginTooltipView?
 
     override func configureUI() {
@@ -69,11 +68,13 @@ final class LoginView: BaseUIView {
 
         appleLoginButton.snp.makeConstraints {
             $0.centerX.equalToSuperview()
+            $0.horizontalEdges.equalToSuperview().inset(45)
             $0.bottom.equalTo(self.safeAreaLayoutGuide).inset(151)
         }
 
         kakaoLoginButton.snp.makeConstraints {
             $0.centerX.equalToSuperview()
+            $0.horizontalEdges.equalToSuperview().inset(45)
             $0.bottom.equalTo(self.safeAreaLayoutGuide).inset(90)
         }
 

EATSSU/App/Sources/Presentation/Home/ViewController/HomeRestaurantViewController.swift

@@ -360,9 +360,10 @@ extension HomeRestaurantViewController: UITableViewDataSource {
         }
 
         let restaurantName = sectionHeaderRestaurant[section]
+        let koreanName = koreanRestaurantName(from: restaurantName)
         header.titleLabel.text = restaurantName
 
-        if let info = RestaurantInfoData.restaurantInfoData.first(where: { $0.name == restaurantName }) {
+        if let info = RestaurantInfoData.restaurantInfoData.first(where: { $0.name == koreanName }) {
             var container = AttributeContainer()
             container.font = EATSSUDesignFontFamily.Pretendard.medium.font(size: 10)
             header.infoButton.configuration?.attributedTitle = AttributedString(info.location, attributes: container)
@@ -390,6 +391,25 @@ extension HomeRestaurantViewController: UITableViewDataSource {
 
         return header
     }
+
+    // TODO: - 추후 삭제 필요: RestaurantInfoData 관련 Firebase 반환 값에서 id 추가로 받아서 이름 말고 id로 매칭하는 방식으로 변경 필요
+
+    private func koreanRestaurantName(from name: String) -> String {
+        switch name {
+        case TextLiteral.Restaurant.dodamRestaurant:
+            return "도담 식당"
+        case TextLiteral.Restaurant.studentRestaurant:
+            return "학생 식당"
+        case TextLiteral.Restaurant.snackCorner:
+            return "스낵 코너"
+        case TextLiteral.Restaurant.dormitoryRestaurant:
+            return "기숙사 식당"
+        case TextLiteral.Restaurant.facultyRestaurant:
+            return "FACULTY (교직원 전용)"
+        default:
+            return name
+        }
+    }
 }
 
 // MARK: - UITableViewDelegate

EATSSU/App/Sources/Presentation/Home/ViewController/RestaurantInfoViewController.swift

@@ -39,8 +39,26 @@ final class RestaurantInfoViewController: BaseViewController {
 extension RestaurantInfoViewController: RestaurantInfoDelegate {
     func didTappedRestaurantInfo(restaurantName: String) {
         restaurantInfoView.restaurantNameLabel.text = restaurantName
-        if let restaurantInfo = RestaurantInfoData.restaurantInfoData.first(where: { $0.name == restaurantName }) {
+        let koreanName = koreanRestaurantName(from: restaurantName)
+        if let restaurantInfo = RestaurantInfoData.restaurantInfoData.first(where: { $0.name == koreanName }) {
             restaurantInfoView.bind(data: restaurantInfo)
         }
     }
+
+    private func koreanRestaurantName(from name: String) -> String {
+        switch name {
+        case TextLiteral.Restaurant.dodamRestaurant:
+            return "도담 식당"
+        case TextLiteral.Restaurant.studentRestaurant:
+            return "학생 식당"
+        case TextLiteral.Restaurant.snackCorner:
+            return "스낵 코너"
+        case TextLiteral.Restaurant.dormitoryRestaurant:
+            return "기숙사 식당"
+        case TextLiteral.Restaurant.facultyRestaurant:
+            return "FACULTY (교직원 전용)"
+        default:
+            return name
+        }
+    }
 }

EATSSU/App/Sources/Presentation/MyPage/Enum/MyPageLabels.swift

@@ -7,29 +7,65 @@
 
 import Foundation
 
-/// "마이파이지"에서 확인할 수 있는 서비스 리스트
-enum MyPageLabels: Int {
-    /// 푸시 알림 설정
-    case NotificationSetting = 0
-
-    /// 내 정보
-    case MyInfo
+/// "마이페이지"에서 확인할 수 있는 서비스 리스트
+enum MyPageLabels {
+    case notificationSetting
+    case myInfo
+    case myReview
+    case inquiry
+    case creators
+    case instagram
+    case languageSetting
+    case termsAndPolicy
+    case logout
 
-    /// 내 리뷰
-    case MyReview
-
-    /// 문의하기
-    case Inquiry
-
-    /// 서비스 이용약관
-    case TermsOfUse
-
-    /// 개인정보 이용약관
-    case PrivacyTermsOfUse
-
-    /// 만든사람들
-    case Creator
-
-    /// 로그아웃
-    case Logout
+    var title: String {
+        switch self {
+        case .notificationSetting:
+            return TextLiteral.MyPage.pushNotificationSetting
+        case .myInfo:
+            return TextLiteral.MyPage.myInfo
+        case .myReview:
+            return TextLiteral.MyPage.myReview
+        case .inquiry:
+            return TextLiteral.MyPage.inquiry
+        case .creators:
+            return TextLiteral.MyPage.creators
+        case .instagram:
+            return TextLiteral.MyPage.instagram
+        case .languageSetting:
+            return TextLiteral.MyPage.languageSetting
+        case .termsAndPolicy:
+            return TextLiteral.MyPage.termsAndPolicy
+        case .logout:
+            return TextLiteral.MyPage.logout
+        }
+    }
+
+    var subtitle: String? {
+        switch self {
+        case .notificationSetting:
+            return TextLiteral.MyPage.pushNotificationDescription
+        default:
+            return nil
+        }
+    }
+
+    var rightText: String? {
+        switch self {
+        case .languageSetting:
+            return TextLiteral.MyPage.currentLanguage
+        default:
+            return nil
+        }
+    }
+
+    var showsDisclosure: Bool {
+        switch self {
+        case .notificationSetting, .logout:
+            return false
+        default:
+            return true
+        }
+    }
 }

EATSSU/App/Sources/Presentation/MyPage/Enum/MyPageTableMetric.swift

@@ -0,0 +1,25 @@
+//
+//  MyPageTableMetric.swift
+//  EATSSU
+//
+//  Created by jeongminji on 5/3/26.
+//
+
+import Foundation
+
+enum MyPageTableMetric {
+    static let normalRowHeight: CGFloat = 48
+    static let notificationRowHeight: CGFloat = 74
+    static let headerHeight: CGFloat = 18
+    static let footerHeight: CGFloat = 16
+
+    static func rowHeight(for item: MyPageLabels) -> CGFloat {
+        switch item {
+        case .notificationSetting:
+            return notificationRowHeight
+
+        default:
+            return normalRowHeight
+        }
+    }
+}

EATSSU/App/Sources/Presentation/MyPage/Model/MyPageSectionData.swift

@@ -0,0 +1,44 @@
+//
+//  MyPageSectionData.swift
+//  EATSSU
+//
+//  Created by jeongminji on 5/3/26.
+//
+
+import Foundation
+
+struct MyPageSectionData {
+    let headerTitle: String
+    let items: [MyPageLabels]
+}
+
+extension MyPageSectionData {
+    static var sections: [MyPageSectionData] {
+        [
+            MyPageSectionData(
+                headerTitle: TextLiteral.MyPage.activitySection,
+                items: [
+                    .notificationSetting,
+                    .myInfo,
+                    .myReview
+                ]
+            ),
+            MyPageSectionData(
+                headerTitle: TextLiteral.MyPage.serviceInfoSection,
+                items: [
+                    .inquiry,
+                    .creators,
+                    .instagram
+                ]
+            ),
+            MyPageSectionData(
+                headerTitle: TextLiteral.MyPage.etcSection,
+                items: [
+                    .languageSetting,
+                    .termsAndPolicy,
+                    .logout
+                ]
+            )
+        ]
+    }
+}