Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions EATSSU/App/Resources/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,8 @@
"restaurant.snackCorner" = "Snack Corner";
/// "FACULTY (교직원 전용)"
"restaurant.facultyRestaurant" = "FACULTY (Faculty Only)";
/// "교직원 식당" (칩 등 좁은 곳)
"restaurant.facultyRestaurantShort" = "Faculty";

// MARK: - Review Translation

Expand Down Expand Up @@ -741,3 +743,21 @@
"like.menuSearchEmptySubtitle" = "Try searching for a different menu name!";
/// "2글자 이상 입력해주세요."
"like.menuSearchTooShort" = "Please enter at least 2 characters.";
/// "오늘 식단에서 찜하기"
"like.todayMenuToggle" = "Save from today's menu";
/// "메뉴를 선택해 찜할 수 있어요."
"like.todayMenuHint" = "Select menus to save.";
/// "변경"
"like.change" = "Change";
/// "메뉴 찜하기"
"like.favoriteMenus" = "Save menus";
/// "선택한 %d개 메뉴 찜하기"
"like.favoriteSelectedMenus" = "Save %d selected";
/// "메뉴 변경"
"like.slotSheetTitle" = "Change menu";
/// "식당 종류"
"like.restaurantSection" = "Restaurant";
/// "시간대"
"like.mealTimeSection" = "Meal time";
/// "적용하기"
"like.apply" = "Apply";
20 changes: 20 additions & 0 deletions EATSSU/App/Resources/ja.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,8 @@
"restaurant.snackCorner" = "スナックコーナー";
/// "FACULTY (교직원 전용)"
"restaurant.facultyRestaurant" = "FACULTY(教職員専用)";
/// "교직원 식당" (칩 등 좁은 곳)
"restaurant.facultyRestaurantShort" = "教職員食堂";

// MARK: - Review Translation

Expand Down Expand Up @@ -742,3 +744,21 @@
"like.menuSearchEmptySubtitle" = "別のメニュー名で検索してください!";
/// "2글자 이상 입력해주세요."
"like.menuSearchTooShort" = "2文字以上入力してください。";
/// "오늘 식단에서 찜하기"
"like.todayMenuToggle" = "今日の献立から追加";
/// "메뉴를 선택해 찜할 수 있어요."
"like.todayMenuHint" = "メニューを選んでお気に入りに追加できます。";
/// "변경"
"like.change" = "変更";
/// "메뉴 찜하기"
"like.favoriteMenus" = "お気に入りに追加";
/// "선택한 %d개 메뉴 찜하기"
"like.favoriteSelectedMenus" = "選択した%d件を追加";
/// "메뉴 변경"
"like.slotSheetTitle" = "メニュー変更";
/// "식당 종류"
"like.restaurantSection" = "食堂";
/// "시간대"
"like.mealTimeSection" = "時間帯";
/// "적용하기"
"like.apply" = "適用";
20 changes: 20 additions & 0 deletions EATSSU/App/Resources/ko.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,8 @@
"restaurant.snackCorner" = "스낵 코너";
/// "FACULTY (교직원 전용)"
"restaurant.facultyRestaurant" = "FACULTY (교직원 전용)";
/// "교직원 식당" (칩 등 좁은 곳)
"restaurant.facultyRestaurantShort" = "교직원 식당";

// MARK: - Review Translation

Expand Down Expand Up @@ -742,3 +744,21 @@
"like.menuSearchEmptySubtitle" = "다른 메뉴명으로 검색해주세요!";
/// "2글자 이상 입력해주세요."
"like.menuSearchTooShort" = "2글자 이상 입력해주세요.";
/// "오늘 식단에서 찜하기"
"like.todayMenuToggle" = "오늘 식단에서 찜하기";
/// "메뉴를 선택해 찜할 수 있어요."
"like.todayMenuHint" = "메뉴를 선택해 찜할 수 있어요.";
/// "변경"
"like.change" = "변경";
/// "메뉴 찜하기"
"like.favoriteMenus" = "메뉴 찜하기";
/// "선택한 %d개 메뉴 찜하기"
"like.favoriteSelectedMenus" = "선택한 %d개 메뉴 찜하기";
/// "메뉴 변경"
"like.slotSheetTitle" = "메뉴 변경";
/// "식당 종류"
"like.restaurantSection" = "식당 종류";
/// "시간대"
"like.mealTimeSection" = "시간대";
/// "적용하기"
"like.apply" = "적용하기";
20 changes: 20 additions & 0 deletions EATSSU/App/Resources/vi.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,8 @@
"restaurant.snackCorner" = "Quầy đồ ăn nhẹ";
/// "FACULTY (교직원 전용)"
"restaurant.facultyRestaurant" = "FACULTY (Chỉ dành cho giảng viên/nhân viên)";
/// "교직원 식당" (칩 등 좁은 곳)
"restaurant.facultyRestaurantShort" = "Nhà ăn giảng viên";

// MARK: - Review Translation

Expand Down Expand Up @@ -742,3 +744,21 @@
"like.menuSearchEmptySubtitle" = "Hãy thử tìm bằng tên món ăn khác!";
/// "2글자 이상 입력해주세요."
"like.menuSearchTooShort" = "Vui lòng nhập ít nhất 2 ký tự.";
/// "오늘 식단에서 찜하기"
"like.todayMenuToggle" = "Lưu từ thực đơn hôm nay";
/// "메뉴를 선택해 찜할 수 있어요."
"like.todayMenuHint" = "Chọn món để lưu.";
/// "변경"
"like.change" = "Đổi";
/// "메뉴 찜하기"
"like.favoriteMenus" = "Lưu món";
/// "선택한 %d개 메뉴 찜하기"
"like.favoriteSelectedMenus" = "Lưu %d món đã chọn";
/// "메뉴 변경"
"like.slotSheetTitle" = "Đổi thực đơn";
/// "식당 종류"
"like.restaurantSection" = "Nhà ăn";
/// "시간대"
"like.mealTimeSection" = "Bữa ăn";
/// "적용하기"
"like.apply" = "Áp dụng";
27 changes: 3 additions & 24 deletions EATSSU/App/Sources/Notification/PushRoute.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,8 @@ import UIKit

/// 학식 알림을 눌렀을 때 이동할 학식 화면 (날짜 + 시간대)
struct PushRoute {
/// 학식 탭 시간대 순서 (아침·점심·저녁)
enum MealTime: String {
case morning = "MORNING"
case lunch = "LUNCH"
case dinner = "DINNER"

var tabIndex: Int {
switch self {
case .morning: 0
case .lunch: 1
case .dinner: 2
}
}
}
/// 학식 탭 시간대 (아침·점심·저녁). 찜 탭 "오늘 식단에서 찜하기"와 같은 타입을 쓴다
typealias MealTime = MealTimePart

let date: Date
/// 찜 알림에만 있다. 없으면(일반 학식 알림) 현재 시각 기준 시간대를 그대로 쓴다
Expand All @@ -35,22 +23,13 @@ struct PushRoute {
guard let type = userInfo["type"] as? String,
Self.supportedTypes.contains(type),
let dateString = userInfo["date"] as? String,
let date = Self.dateFormatter.date(from: dateString) else { return nil }
let date = DateFormatter.serverDay.date(from: dateString) else { return nil }
self.date = date
self.mealTime = (userInfo["timePart"] as? String).flatMap(MealTime.init(rawValue:))
self.notificationId = (userInfo["notificationId"] as? String).flatMap(Int.init)
}

private static let supportedTypes: Set<String> = ["MENU_FAVORITE", "DAILY_MENU"]

private static let dateFormatter: DateFormatter = {
let formatter = DateFormatter()
formatter.calendar = Calendar(identifier: .gregorian)
formatter.locale = Locale(identifier: "en_US_POSIX")
formatter.timeZone = .current
formatter.dateFormat = "yyyyMMdd"
return formatter
}()
}

/// 알림을 누른 시점에 화면이 준비돼 있지 않을 수 있어(앱 실행 직후 스플래시·로그인 등) 이동할 곳을 보관했다가 적용한다
Expand Down
33 changes: 33 additions & 0 deletions EATSSU/App/Sources/Presentation/Home/Enum/MealTimePart.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
//
// MealTimePart.swift
// EATSSU
//
// Created by 황상환 on 11/8/26.
//

import Foundation

/// 학식 시간대. rawValue는 서버 `timePart` 값이며 학식 탭 순서(아침·점심·저녁)와 같다
enum MealTimePart: String, CaseIterable {
case morning = "MORNING"
case lunch = "LUNCH"
case dinner = "DINNER"

/// 학식 탭의 시간대 탭 인덱스
var tabIndex: Int {
switch self {
case .morning: 0
case .lunch: 1
case .dinner: 2
}
}

/// 현재 앱 언어의 시간대 이름
var title: String {
switch self {
case .morning: TextLiteral.Home.morning
case .lunch: TextLiteral.Home.lunch
case .dinner: TextLiteral.Home.dinner
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,14 @@ enum Restaurant: String, CaseIterable {
}
}

/// 칩처럼 좁은 곳에 쓰는 이름. 교직원 식당만 "FACULTY (교직원 전용)" 대신 짧은 이름을 쓴다
var shortTitle: String {
switch self {
case .facultyRestaurant: TextLiteral.Restaurant.facultyRestaurantShort
default: title
}
}

/// Firebase Remote Config `cafeteria_information`의 `name`과 매칭하기 위한 한국어 이름
// TODO: Remote Config에 id가 추가되면 이름 대신 id로 매칭하도록 변경
var koreanName: String {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,16 +218,9 @@ final class HomeRestaurantViewController: BaseViewController {

// 날짜를 yyyyMMdd 문자열로 변환
private func changeDateFormat(date: Date) -> String {
return Self.yyyyMMddDateFormatter.string(from: date)
return DateFormatter.serverDay.string(from: date)
}

///"yyyyMMdd 포맷팅하기 위한 DateFormatter 인스턴스
private static let yyyyMMddDateFormatter: DateFormatter = {
let formatter = DateFormatter()
formatter.dateFormat = "yyyyMMdd"
return formatter
}()

/// 스낵코너 메뉴를 비우고 UI를 갱신
private func hideSnackCorner() {
isSelectable = false
Expand Down
41 changes: 41 additions & 0 deletions EATSSU/App/Sources/Presentation/Like/Model/TodayMenuSlot.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
//
// TodayMenuSlot.swift
// EATSSU
//
// Created by 황상환 on 11/8/26.
//

import Foundation

/// "오늘 식단에서 찜하기"에서 고른 식당·시간대
struct TodayMenuSlot: Equatable {
let restaurant: Restaurant
let mealTime: MealTimePart

/// 찜 탭으로 들어왔을 때의 기본값 (기능 명세: 학생식당 · 점심)
static let `default` = TodayMenuSlot(restaurant: .studentRestaurant, mealTime: .lunch)

/// 바텀시트에서 고를 수 있는 식당. 스낵코너는 메뉴가 고정이라 찜 대상이 아니다 (디자인 기준 4곳)
static let selectableRestaurants: [Restaurant] = [
.studentRestaurant, .dodamRestaurant, .dormitoryRestaurant, .facultyRestaurant
]

/// 식당마다 운영하지 않는 시간대가 있다 (기능 명세)
/// 학생식당 저녁 미운영 · 도담식당 아침 미운영 · 기숙사식당 아침 미운영 · 교직원식당 아침·저녁 미운영
static func isAvailable(restaurant: Restaurant, mealTime: MealTimePart) -> Bool {
switch restaurant {
case .studentRestaurant: mealTime != .dinner
case .dodamRestaurant, .dormitoryRestaurant: mealTime != .morning
case .facultyRestaurant, .snackCorner: mealTime == .lunch
}
}

var isAvailable: Bool {
Self.isAvailable(restaurant: restaurant, mealTime: mealTime)
}

/// "학생 식당 · 점심"
var title: String {
"\(restaurant.shortTitle) · \(mealTime.title)"
}
}
Loading
Loading