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
3 changes: 2 additions & 1 deletion apps/ios/Cook/Model/CloudKitSchema.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
// 版本 2 新增 FridgeItem,版本 3 新增 PrivateRecipeRecord。
// 已初始化旧版本的开发设备需要重新建结构。
// 版本 4 为 FridgeItem 添加日期依据、生产日期与储存建议(均可选)。
static let version = 4
// 版本 5 新增 FridgeCategory 及 FridgeItem 的可选分类键。
static let version = 5
/// 成功后记下 version。要强制重建(比如在 Console 里 Reset 了 Development),启动参数加 `-cloudkit.schemaInitialized 0`
static let doneKey = "cloudkit.schemaInitialized"
/// UI 测试在真机上跑时设置这个环境变量,跳过初始化
Expand Down
119 changes: 119 additions & 0 deletions apps/ios/Cook/Model/FridgeCategory.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
import CookCore
import Foundation
import SwiftData

/// 分类独立于库存,吃完最后一份食材后仍可继续使用该分类。
@Model
final class FridgeCategory {
var identifier: UUID = UUID()
var name: String = ""

init(name: String) {
self.name = name
}

static func nameError(_ name: String, takenNames: [String]) -> String? {
if name.isEmpty { return "请输入分类名称。" }
if name.count > 24 { return "分类名称最多 24 个字。" }
if (FridgeBuiltInCategory.allCases.map(\.title) + ["自动归类"] + takenNames).contains(where: {
$0.compare(name, options: [.caseInsensitive, .widthInsensitive]) == .orderedSame
}) {
return "已经有同名分类了。"
}
return nil
}
}

enum FridgeBuiltInCategory: String, CaseIterable {
case fruit, vegetable, meat, staple, uncategorized

var title: String {
switch self {
case .fruit: return "水果"
case .vegetable: return "蔬菜"
case .meat: return "肉和蛋"
case .staple: return "主食"
case .uncategorized: return "未分类"
}
}

static func automatic(for name: String, in food: FoodCatalog) -> Self {
if FridgeFruit(rawValue: name) != nil { return .fruit }
if food.vegetable.contains(where: { $0.name == name }) { return .vegetable }
if food.meat.contains(where: { $0.name == name }) { return .meat }
if food.staple.contains(where: { $0.name == name }) { return .staple }
return .uncategorized
}
}

enum FridgeCategoryChoice: Hashable {
case automatic
case builtIn(FridgeBuiltInCategory)
case custom(UUID)

init(storedKey: String?) {
if let key = storedKey, let category = FridgeBuiltInCategory(rawValue: key) {
self = .builtIn(category)
} else if let key = storedKey, let identifier = UUID(uuidString: key) {
self = .custom(identifier)
} else {
self = .automatic
}
}

var storedKey: String? {
switch self {
case .automatic: return nil
case let .builtIn(category): return category.rawValue
case let .custom(identifier): return identifier.uuidString
}
}

/// 分类删除后保留食材;原分类不存在时和旧记录一样自动归类。
func available(in categories: [FridgeCategory]) -> Self {
if case let .custom(identifier) = self, !categories.contains(where: { $0.identifier == identifier }) {
return .automatic
}
return self
}

func resolved(for name: String, in food: FoodCatalog, custom categories: [FridgeCategory]) -> Self {
let choice = available(in: categories)
return choice == .automatic ? .builtIn(.automatic(for: name, in: food)) : choice
}
}

/// 冰箱快选独立于菜谱食材词典,只有已有储存依据的水果才提供专属天数。
enum FridgeFruit: String, CaseIterable, Identifiable {
case blueberry = "蓝莓"
case watermelon = "西瓜"
case apple = "苹果"
case strawberry = "草莓"
case raspberry = "树莓"
case blackberry = "黑莓"
case banana = "香蕉"
case grape = "葡萄"
case orange = "橙子"
case pineapple = "菠萝"
case peach = "桃"
case nectarine = "油桃"
case pear = "梨"

var id: String { rawValue }

var emoji: String {
switch self {
case .blueberry: return "🫐"
case .watermelon: return "🍉"
case .apple: return "🍎"
case .strawberry: return "🍓"
case .raspberry, .blackberry: return "🫐"
case .banana: return "🍌"
case .grape: return "🍇"
case .orange: return "🍊"
case .pineapple: return "🍍"
case .peach, .nectarine: return "🍑"
case .pear: return "🍐"
}
}
}
5 changes: 2 additions & 3 deletions apps/ios/Cook/Model/FridgeIntake.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,13 @@ struct ProduceStorageAdvice: Equatable {
let source: URL

static let source = URL(string: "https://extension.umaine.edu/food-health/2025/05/29/storing-and-washing-fresh-fruits-and-vegetables/")!
static let fruitNames = ["草莓", "蓝莓", "树莓", "黑莓", "桃", "油桃", "梨", "苹果"]
static let names = fruitNames + ["西兰花", "胡萝卜", "白萝卜", "玉米", "黄瓜", "茄子", "生菜", "菠菜", "青菜", "青椒", "西葫芦", "豆角", "荷兰豆"]
static let names = FridgeFruit.allCases.map(\.rawValue) + ["西兰花", "胡萝卜", "白萝卜", "玉米", "黄瓜", "茄子", "生菜", "菠菜", "青菜", "青椒", "西葫芦", "豆角", "荷兰豆"]

/// 取公开储存建议区间的较短端,完整蔬果与切开蔬果分别计算。
/// 不覆盖既有通用 shelf-life 数据;没有已核对条目的种类返回 nil。
static func recommendation(for name: String, cut: Bool = false) -> Self? {
if cut {
guard names.contains(name) || ["番茄", "香蕉", "葡萄", "橙子", "菠萝", "西瓜", "土豆", "洋葱", "菌菇"].contains(name) else { return nil }
guard names.contains(name) || ["番茄", "土豆", "洋葱", "菌菇"].contains(name) else { return nil }
// 切开不会延长完整食材的建议时间,例如蓝莓原本只建议 2 天。
let days = min(name == "番茄" ? 2 : 3, recommendation(for: name)?.days ?? 3)
return Self(days: days, condition: "切开后及时密封冷藏,保持 4℃ 或以下;从切开当天起算。", source: source)
Expand Down
22 changes: 11 additions & 11 deletions apps/ios/Cook/Model/Persistence.swift
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ final class FridgeItem {
var productionDate: Date?
var expiryBasisRaw: String?
var storageAdvice: String?
/// nil 表示按食材自动归类;也用于没有分类字段的旧记录。
var categoryKey: String?
var createdAt: Date = Date()
var updatedAt: Date = Date()
var deletedAt: Date?
Expand All @@ -117,6 +119,12 @@ final class FridgeItem {
updatedAt = addedAt
}

convenience init(name: String, days: Int, at date: Date, calendar: Calendar = .current) {
let today = calendar.startOfDay(for: date)
let expiryDay = calendar.date(byAdding: .day, value: days, to: today) ?? today
self.init(name: name, addedAt: date, expiresAt: FridgeDay.stored(expiryDay, calendar: calendar))
}

/// 到期那天在当前时区的 0 点,算剩几天、排提醒和选日期都用它
func expiryDay(in calendar: Calendar = .current) -> Date {
FridgeDay.local(expiresAt, calendar: calendar)
Expand All @@ -126,7 +134,7 @@ final class FridgeItem {
}

enum Persistence {
static let models: [any PersistentModel.Type] = [Favorite.self, HistoryEntry.self, Preferences.self, FridgeItem.self, PrivateRecipeRecord.self]
static let models: [any PersistentModel.Type] = [Favorite.self, HistoryEntry.self, Preferences.self, FridgeItem.self, PrivateRecipeRecord.self, FridgeCategory.self]

/// 软删除的记录保留多久,过期后真正删掉
static let tombstoneLifetime: TimeInterval = 30 * 24 * 60 * 60
Expand Down Expand Up @@ -187,7 +195,7 @@ extension ModelContext {

/// 先保存已有修改,确保失败回滚只撤销本次操作,不抹掉其他页面的待保存数据。
/// 读取和保存错误均交给调用方显示;不得把读取失败当成「没有收藏」。
private func saveUserChange<T>(save: (ModelContext) throws -> Void, _ change: () throws -> T) throws -> T {
func saveUserChange<T>(save: (ModelContext) throws -> Void = { try $0.save() }, _ change: () throws -> T) throws -> T {
if hasChanges { try save(self) }
do {
let result = try change()
Expand Down Expand Up @@ -331,9 +339,7 @@ extension ModelContext {
/// 放进冰箱,到期日按放入那天加上默认天数
@discardableResult
func addToFridge(_ name: String, days: Int, at date: Date = Date(), calendar: Calendar = .current) -> FridgeItem {
let today = calendar.startOfDay(for: date)
let expiryDay = calendar.date(byAdding: .day, value: days, to: today) ?? today
let item = FridgeItem(name: name, addedAt: date, expiresAt: FridgeDay.stored(expiryDay, calendar: calendar))
let item = FridgeItem(name: name, days: days, at: date, calendar: calendar)
insert(item)
try? save()
return item
Expand All @@ -349,12 +355,6 @@ extension ModelContext {
try? save()
}

func setExpiry(_ item: FridgeItem, to date: Date, calendar: Calendar = .current) {
item.expiresAt = FridgeDay.stored(date, calendar: calendar)
item.updatedAt = Date()
try? save()
}

private func purgeFridgeTombstones(now: Date) {
let removed = (try? fetch(FetchDescriptor<FridgeItem>(predicate: #Predicate<FridgeItem> { $0.deletedAt != nil }))) ?? []
for item in removed {
Expand Down
169 changes: 169 additions & 0 deletions apps/ios/Cook/Views/FridgeCategoryViews.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
import SwiftData
import SwiftUI

struct FridgeCategoryPicker: View {
@Query(sort: \FridgeCategory.name) private var categories: [FridgeCategory]
@State private var creating = false
@Binding var selection: FridgeCategoryChoice
var automaticTitle: String?

var body: some View {
Picker("分类", selection: availableSelection) {
Text(automaticTitle.map { "自动归类(\($0))" } ?? "自动归类").tag(FridgeCategoryChoice.automatic)
ForEach(FridgeBuiltInCategory.allCases, id: \.self) { category in
Text(category.title).tag(FridgeCategoryChoice.builtIn(category))
}
ForEach(categories) { category in
Text(category.name).tag(FridgeCategoryChoice.custom(category.identifier))
}
}
.accessibilityIdentifier("fridge.category.picker")
Button("新建分类", systemImage: "plus") { creating = true }
.sheet(isPresented: $creating) {
FridgeCategoryEditor { selection = .custom($0.identifier) }
}
}

private var availableSelection: Binding<FridgeCategoryChoice> {
Binding(get: { selection.available(in: categories) }, set: { selection = $0 })
}
}

struct FridgeCategoryManager: View {
@Environment(\.modelContext) private var context
@Environment(\.dismiss) private var dismiss
@Query(sort: \FridgeCategory.name) private var categories: [FridgeCategory]
@State private var editor: EditorRoute?
@State private var deleting: FridgeCategory?
@State private var saveError = false

private enum EditorRoute: Identifiable {
case new, edit(FridgeCategory)

var id: ID {
switch self {
case .new: return .new
case let .edit(category): return .edit(category.identifier)
}
}

enum ID: Hashable { case new, edit(UUID) }
}

var body: some View {
NavigationStack {
List {
Section("自定义分类") {
ForEach(categories) { category in
Button(category.name) { editor = .edit(category) }
.foregroundStyle(.primary)
.accessibilityHint("重命名分类")
.swipeActions(allowsFullSwipe: false) {
Button("删除", systemImage: "trash", role: .destructive) { deleting = category }
}
}
Button("新建分类", systemImage: "plus") { editor = .new }
}
}
.navigationTitle("管理分类")
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .confirmationAction) { Button("完成") { dismiss() } }
}
.sheet(item: $editor) { route in
switch route {
case .new: FridgeCategoryEditor()
case let .edit(category): FridgeCategoryEditor(category: category)
}
}
.alert("删除分类?", isPresented: Binding(get: { deleting != nil }, set: { if !$0 { deleting = nil } }), presenting: deleting) { category in
Button("删除分类", role: .destructive) { delete(category) }
Button("取消", role: .cancel) {}
} message: { category in
Text("“\(category.name)”里的食材会保留,并恢复自动归类。")
}
.fridgeSaveError(isPresented: $saveError)
}
}

private func delete(_ category: FridgeCategory) {
do {
try context.saveUserChange { context.delete(category) }
} catch {
saveError = true
}
}
}

private struct FridgeCategoryEditor: View {
@Environment(\.dismiss) private var dismiss
@Environment(\.modelContext) private var context
@Query private var categories: [FridgeCategory]
@State private var name: String
@State private var saveError = false
private let category: FridgeCategory?
private let onSave: (FridgeCategory) -> Void

init(category: FridgeCategory? = nil, onSave: @escaping (FridgeCategory) -> Void = { _ in }) {
self.category = category
self.onSave = onSave
_name = State(initialValue: category?.name ?? "")
}

private var cleanName: String { name.trimmingCharacters(in: .whitespacesAndNewlines) }

private var nameError: String? {
FridgeCategory.nameError(cleanName, takenNames: categories.filter { $0.identifier != category?.identifier }.map(\.name))
}

var body: some View {
NavigationStack {
Form {
Section {
TextField("分类名称", text: $name, prompt: Text("例如:早餐、零食"))
.accessibilityIdentifier("fridge.category.name")
.submitLabel(.done)
.onSubmit(save)
} footer: {
if !cleanName.isEmpty, let nameError { Text(nameError) }
}
}
.navigationTitle(category == nil ? "新建分类" : "重命名分类")
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .cancellationAction) { Button("取消") { dismiss() } }
ToolbarItem(placement: .confirmationAction) { Button("保存", action: save).disabled(nameError != nil) }
}
.fridgeSaveError(isPresented: $saveError)
}
}

private func save() {
guard nameError == nil else { return }
do {
let saved = try context.saveUserChange {
if let category {
category.name = cleanName
return category
}
let created = FridgeCategory(name: cleanName)
context.insert(created)
return created
}
onSave(saved)
dismiss()
} catch {
saveError = true
}
}
}

extension View {
func fridgeSaveError(isPresented: Binding<Bool>) -> some View {
alert("未能保存修改", isPresented: isPresented) {
Button("好") {}
} message: {
Text("请检查设备的可用储存空间后重试。")
}
}
}
Loading
Loading