alexandrev/FamilyMealPlanner
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

2.0: breakfast and snack meal types across the app

Browse Source 
- MealType gains breakfast/snack (chronological order drives slot/row order).
- AppSettings.activeMealTypes: single source of truth for enabled meals, backed
  by new optional enabledMealTypesRaw with legacy mealWindows fallback —
  additive migration, keeps pre-2.0 installs and iCloud snapshots working.
  Legacy field kept coherent by the setter. time(for:) resolves per-meal event
  times (breakfast 8:00 / snack 17:00 defaults on old stores).
- Replaced the 5 duplicated mealWindows→[MealType] derivations (slot sync,
  default plan creation, week calendar, export view) with activeMealTypes.
- CalendarService: per-type event names and times.
- Export styles: per-type accent colors and gradients.
- Widget: generic meals list (N rows) instead of hardcoded lunch/dinner;
  compact families fall back to main meals when >2 are active.
- Settings: 4 meal toggles (min 1) replace the 3-option picker.
- Onboarding: meal step is now multi-select over the 4 types.
- iCloud sync: enabledMealTypesRaw synced (optional, pre-2.0 compatible).
- Localized breakfast/snack in all 6 languages.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BkanrydYtrme8wipTzWssG
This commit is contained in:
alexandrev-tibco
2026-07-12 18:00:50 +02:00
parent 98230c732d
commit e15ff93465
20 changed files with 322 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MealMood/Views/Home/HomeView.swift
+5
View File
@@ -211,6 +211,11 @@ struct HomeView: View {
let plan = ensureCurrentWeekPlanExists(settings: settings) else { return }
viewModel.reconcileSlotsIfNeeded(plan: plan, settings: settings, context: context)
}
.onChange(of: settings?.enabledMealTypesRaw) { _, _ in
guard let settings = settings,
let plan = ensureCurrentWeekPlanExists(settings: settings) else { return }
viewModel.reconcileSlotsIfNeeded(plan: plan, settings: settings, context: context)
}
.onChange(of: settings?.mealWindows) { _, _ in
guard let settings = settings,
let plan = ensureCurrentWeekPlanExists(settings: settings) else { return }
MealMood/Views/Home/WeekCalendarView.swift
+1 -5
View File
@@ -22,11 +22,7 @@ struct WeekCalendarView: View {
}
private var mealTypes: [MealType] {
switch settings.mealWindowsEnum {
case .dinnerOnly: return [.dinner]
case .lunchOnly: return [.lunch]
case .both: return [.lunch, .dinner]
}
settings.activeMealTypes
}
var body: some View {
MealMood/Views/Home/WeekPlanShareView.swift
+25 -11
View File
@@ -45,11 +45,7 @@ struct WeekPlanShareView: View {
}
private var mealTypes: [MealType] {
switch settings.mealWindowsEnum {
case .dinnerOnly: return [.dinner]
case .lunchOnly: return [.lunch]
case .both: return [.lunch, .dinner]
}
settings.activeMealTypes
}
private var exportStyle: WeekExportStyle {
@@ -389,11 +385,11 @@ struct WeekPlanShareView: View {
HStack(spacing: 14) {
Image(systemName: mealType.icon)
.font(.system(size: 42, weight: .medium))
.foregroundColor(mealType == .lunch ? Color(hex: "#C85E2A") : Color(hex: "#27604A"))
.foregroundColor(mealTypeAccent(mealType))
.frame(width: 56)
Text(mealTypeLabel(mealType).uppercased(with: locale))
.font(.system(size: 42, weight: .bold, design: .serif))
.foregroundColor(mealType == .lunch ? Color(hex: "#C85E2A") : Color(hex: "#27604A"))
.foregroundColor(mealTypeAccent(mealType))
}
Text(dishName(day: day, mealType: mealType))
.font(.system(size: 62, weight: .medium, design: .serif))
@@ -497,7 +493,17 @@ struct WeekPlanShareView: View {
}
private func mealTypeLabel(_ mealType: MealType) -> String {
mealType == .lunch ? String(localized: "lunch") : String(localized: "dinner")
String(localized: String.LocalizationValue(mealType.localizedKey))
}
/// Accent color per meal row in the vertical/school styles.
private func mealTypeAccent(_ mealType: MealType) -> Color {
switch mealType {
case .breakfast: return Color(hex: "#B07C2B")
case .lunch: return Color(hex: "#C85E2A")
case .snack: return Color(hex: "#7B5EA7")
case .dinner: return Color(hex: "#27604A")
}
}
private func dishName(day: Int, mealType: MealType) -> String {
@@ -526,9 +532,17 @@ struct WeekPlanShareView: View {
}
private func gridMealCell(_ title: String, icon: String, mealType: MealType) -> some View {
let background = mealType == .lunch ?
LinearGradient(colors: [Color(hex: "#FFE2C8"), Color(hex: "#FFD4B2")], startPoint: .topLeading, endPoint: .bottomTrailing) :
LinearGradient(colors: [Color(hex: "#D7EFE7"), Color(hex: "#C2E7DB")], startPoint: .topLeading, endPoint: .bottomTrailing)
let background: LinearGradient
switch mealType {
case .breakfast:
background = LinearGradient(colors: [Color(hex: "#FFEFC9"), Color(hex: "#FFE5A9")], startPoint: .topLeading, endPoint: .bottomTrailing)
case .lunch:
background = LinearGradient(colors: [Color(hex: "#FFE2C8"), Color(hex: "#FFD4B2")], startPoint: .topLeading, endPoint: .bottomTrailing)
case .snack:
background = LinearGradient(colors: [Color(hex: "#EBE0F5"), Color(hex: "#DFD0EF")], startPoint: .topLeading, endPoint: .bottomTrailing)
case .dinner:
background = LinearGradient(colors: [Color(hex: "#D7EFE7"), Color(hex: "#C2E7DB")], startPoint: .topLeading, endPoint: .bottomTrailing)
}
return HStack(spacing: 8) {
Image(systemName: icon)
Text(title)