alexandrev-tibco
e15ff93465
- 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
87 lines
3.0 KiB
Swift
87 lines
3.0 KiB
Swift
import SwiftUI
|
|
|
|
struct MealWindowsStepView: View {
|
|
@Binding var selection: Set<MealType>
|
|
var onNext: () -> Void
|
|
|
|
var body: some View {
|
|
VStack(spacing: 24) {
|
|
Text("meal_windows_title")
|
|
.font(.mealMoodH1)
|
|
.foregroundColor(.mealMoodTextPrimary)
|
|
.multilineTextAlignment(.leading)
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
.padding(.horizontal, 24)
|
|
.padding(.top, 12)
|
|
|
|
VStack(spacing: 12) {
|
|
ForEach(MealType.allCases, id: \.self) { mealType in
|
|
SelectionCard(
|
|
icon: mealType.icon,
|
|
title: optionTitle(mealType),
|
|
isSelected: selection.contains(mealType)
|
|
) {
|
|
withAnimation(.spring(response: 0.3)) {
|
|
if selection.contains(mealType) {
|
|
// Keep at least one meal selected.
|
|
if selection.count > 1 {
|
|
selection.remove(mealType)
|
|
}
|
|
} else {
|
|
selection.insert(mealType)
|
|
}
|
|
}
|
|
HapticManager.shared.selection()
|
|
}
|
|
}
|
|
}
|
|
.padding(.horizontal, 24)
|
|
|
|
PrimaryButton(title: String(localized: "onboarding_continue"), action: onNext)
|
|
.padding(.horizontal, 24)
|
|
.padding(.top, 8)
|
|
.padding(.bottom, 40)
|
|
}
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
|
|
}
|
|
|
|
private func optionTitle(_ mealType: MealType) -> String {
|
|
let emoji: String
|
|
switch mealType {
|
|
case .breakfast: emoji = "☕️"
|
|
case .lunch: emoji = "🌞"
|
|
case .snack: emoji = "🍎"
|
|
case .dinner: emoji = "🌙"
|
|
}
|
|
return "\(emoji) \(String(localized: String.LocalizationValue(mealType.localizedKey)))"
|
|
}
|
|
}
|
|
|
|
struct SelectionCard: View {
|
|
let icon: String
|
|
let title: String
|
|
let isSelected: Bool
|
|
let action: () -> Void
|
|
|
|
var body: some View {
|
|
Button(action: action) {
|
|
HStack {
|
|
Text(title)
|
|
.font(.mealMoodBody)
|
|
.foregroundColor(.mealMoodTextPrimary)
|
|
Spacer()
|
|
Image(systemName: isSelected ? "checkmark.circle.fill" : "circle")
|
|
.foregroundColor(isSelected ? .mealMoodCoral : Color(hex: "#C4C4C4"))
|
|
.font(.system(size: 22))
|
|
}
|
|
.padding(16)
|
|
.background(Color.mealMoodSurface)
|
|
.cornerRadius(14)
|
|
.overlay(
|
|
RoundedRectangle(cornerRadius: 14)
|
|
.stroke(isSelected ? Color.mealMoodCoral : Color(hex: "#F0F0F0"), lineWidth: isSelected ? 2 : 1)
|
|
)
|
|
}
|
|
}
|
|
}
|