mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-21 20:02:18 +01:00
Some checks failed
dependency freshness / dependencies on newest stable (push) Has been cancelled
file-length / file length <= 250 lines (push) Has been cancelled
md-naming / markdown naming convention (push) Has been cancelled
pre-commit / pre-commit (${{ matrix.group }}) (mypy, mypy, ) (push) Has been cancelled
pre-commit / pre-commit (${{ matrix.group }}) (pylint, pylint, ) (push) Has been cancelled
pre-commit / pre-commit (${{ matrix.group }}) (rest, , mypy,pylint) (push) Has been cancelled
Tests / test (push) Has been cancelled
release-apk / release (APK) (push) Has been cancelled
repo-contract / repo contract (push) Has been cancelled
Fill all with catering always fetched and filled today, so picking 24.10 on 23.10 reported "No catering delivery today." FillAllFlow.tap now takes the picked day: fetch, slot schedule, occupancy and dedup all resolve against it, and logDishes stamps each dish at its slot time on that day. - A plan only confirms onto the day it was proposed for; changing the date (or back to today) disarms it. - A later-day fill leaves today's delivery queue and prefill alone and returns the form to today, as a manual "Log for later" does. - Only today's fetch records the single-day "already fetched" marker; recording a later date would skip that day's automatic fetch. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VwYgigocPkPWa73QZRtU38
248 lines
8.5 KiB
Dart
248 lines
8.5 KiB
Dart
/// Single-food meal logging screen -- the app's primary, done-criterion
|
|
/// screen: "I can open the diet app on my phone and fill meal I ate."
|
|
library;
|
|
|
|
import 'dart:async';
|
|
|
|
import 'package:crdt_sync/crdt_sync.dart';
|
|
import 'package:diet_guard_app/models/food_suggestion.dart';
|
|
import 'package:diet_guard_app/models/slot.dart';
|
|
import 'package:diet_guard_app/screens/log_meal_actions.dart';
|
|
import 'package:diet_guard_app/screens/log_meal_fill_mixin.dart';
|
|
import 'package:diet_guard_app/screens/log_meal_future_mixin.dart';
|
|
import 'package:diet_guard_app/screens/log_meal_kuchnia_mixin.dart';
|
|
import 'package:diet_guard_app/screens/log_meal_nav_mixin.dart';
|
|
import 'package:diet_guard_app/screens/log_meal_progress.dart';
|
|
import 'package:diet_guard_app/screens/log_meal_sync_mixin.dart';
|
|
import 'package:diet_guard_app/services/foodbank_service.dart';
|
|
import 'package:diet_guard_app/services/log_storage_service.dart';
|
|
import 'package:diet_guard_app/services/meal_schedule_service.dart';
|
|
import 'package:diet_guard_app/ui/theme.dart';
|
|
import 'package:diet_guard_app/widgets/autocomplete_suggestion_list.dart';
|
|
import 'package:diet_guard_app/widgets/fill_all_row.dart';
|
|
import 'package:diet_guard_app/widgets/log_meal_actions_row.dart';
|
|
import 'package:diet_guard_app/widgets/macro_input_row.dart';
|
|
import 'package:diet_guard_app/widgets/sync_health_banner.dart';
|
|
import 'package:diet_guard_app/widgets/today_progress_card.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:http/http.dart' as http;
|
|
|
|
/// Lets the user log one food item, with food-bank autocomplete and
|
|
/// today's slot status.
|
|
class LogMealScreen extends StatefulWidget {
|
|
/// Creates a [LogMealScreen].
|
|
const LogMealScreen({super.key, this.httpClient});
|
|
|
|
/// Injectable HTTP client for auto-sync; tests pass a [MockClient].
|
|
/// Production leaves this null so [GitHubClient] builds a real one.
|
|
final http.Client? httpClient;
|
|
|
|
@override
|
|
State<LogMealScreen> createState() => _LogMealScreenState();
|
|
}
|
|
|
|
class _LogMealScreenState extends State<LogMealScreen>
|
|
with
|
|
WidgetsBindingObserver,
|
|
LogMealSyncMixin<LogMealScreen>,
|
|
LogMealNavMixin<LogMealScreen>,
|
|
LogMealKuchniaMixin<LogMealScreen>,
|
|
LogMealFutureMixin<LogMealScreen>,
|
|
LogMealFillMixin<LogMealScreen> {
|
|
@override
|
|
http.Client? get syncHttpClient => widget.httpClient;
|
|
|
|
final TextEditingController _descController = TextEditingController();
|
|
final MacroControllers _macros = MacroControllers();
|
|
List<FoodSuggestion> _suggestions = const [];
|
|
@override
|
|
int? selectedSlot;
|
|
String _source = 'manual';
|
|
String? _status;
|
|
TodayProgress? _progress;
|
|
|
|
@override
|
|
void initState() {
|
|
super.initState();
|
|
WidgetsBinding.instance.addObserver(this);
|
|
_descController.addListener(_onDescChanged);
|
|
_macros.addListenerToAll(_onMacroEdited);
|
|
selectedSlot = slotForLog(DateTime.now(), MealScheduleService.current);
|
|
unawaited(refreshSlots());
|
|
unawaited(_onDescChanged());
|
|
// Read health before the first sync finishes, so a device that stalled in
|
|
// a previous session says so immediately rather than only after a tick.
|
|
unawaited(refreshSyncHealth());
|
|
unawaited(autoSync());
|
|
// After autoSync so a dish already logged on the PC is known before the
|
|
// queue is built, and guarded so this costs at most one walk per day.
|
|
unawaited(loadTodaysDelivery());
|
|
}
|
|
|
|
@override
|
|
void dispose() {
|
|
WidgetsBinding.instance.removeObserver(this);
|
|
_descController.dispose();
|
|
_macros.dispose();
|
|
super.dispose();
|
|
}
|
|
|
|
void _onMacroEdited() {
|
|
if (_source == 'food bank') {
|
|
setState(() => _source = 'manual');
|
|
}
|
|
}
|
|
|
|
/// Re-runs the food-bank search and dismisses the previous progress card.
|
|
///
|
|
/// The card is cleared only when the field is non-empty because
|
|
/// [_onLogMeal]'s own `clear()` fires this listener too: without the guard
|
|
/// the two async chains race and the clear can null the card right after
|
|
/// [_onLogMeal] set it, so it never appears on device (in-memory test
|
|
/// stores resolve fast enough to hide this).
|
|
Future<void> _onDescChanged() async {
|
|
final matches = await FoodBankService.instance.search(_descController.text);
|
|
if (!mounted) return;
|
|
setState(() {
|
|
_suggestions = matches;
|
|
if (_descController.text.isNotEmpty) _progress = null;
|
|
});
|
|
}
|
|
|
|
@override
|
|
TextEditingController get descController => _descController;
|
|
@override
|
|
MacroControllers get macroControllers => _macros;
|
|
@override
|
|
void onDishPrefilled() => setState(() => _source = 'catering');
|
|
@override
|
|
void showFillStatus(String message) => setState(() {
|
|
_status = message;
|
|
_progress = null;
|
|
});
|
|
|
|
void _onSuggestionSelected(FoodSuggestion suggestion) {
|
|
fillControllersFromSuggestion(suggestion, _descController, _macros);
|
|
setState(() {
|
|
_source = 'food bank';
|
|
_suggestions = const [];
|
|
});
|
|
}
|
|
|
|
Future<void> _onLogMeal() async {
|
|
final desc = _descController.text.trim();
|
|
if (desc.isEmpty) {
|
|
setState(() {
|
|
_status = 'Type what you ate first.';
|
|
_progress = null;
|
|
});
|
|
return;
|
|
}
|
|
final target = resolveLogTarget(selectedSlot);
|
|
if (target.error != null) {
|
|
setState(() {
|
|
_status = target.error;
|
|
_progress = null;
|
|
});
|
|
return;
|
|
}
|
|
await LogStorageService.instance.logMeal(
|
|
desc,
|
|
nutritionFromControllers(_macros, _source),
|
|
slotMinute: target.slot,
|
|
when: target.when,
|
|
);
|
|
resetFutureLog();
|
|
final log = await publishAfterLog();
|
|
if (!mounted) return;
|
|
_descController.clear();
|
|
_macros.clear();
|
|
setState(() {
|
|
_source = 'manual';
|
|
selectedSlot = slotForLog(DateTime.now(), MealScheduleService.current);
|
|
});
|
|
await refreshSlots();
|
|
if (!mounted) return;
|
|
// The second `prefillNextDish` caller. Without it every dish after the
|
|
// first stays queued behind another tap and the "N more to log" line
|
|
// becomes a dead letter -- the exact regression the PC gate once shipped.
|
|
advanceQueueAfterLog(desc);
|
|
setState(() {
|
|
_status = queueStatusLine;
|
|
_progress = buildTodayProgress(log);
|
|
});
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Scaffold(
|
|
appBar: AppBar(
|
|
title: const Text('Diet Guard'),
|
|
actions: [
|
|
...logMealAppBarActions(
|
|
onFoodBank: onOpenFoodBank,
|
|
onHistory: onOpenHistory,
|
|
onCalendar: onOpenCalendar,
|
|
onSettings: onOpenSettings,
|
|
onBody: onOpenBody,
|
|
),
|
|
],
|
|
),
|
|
body: SingleChildScrollView(
|
|
padding: const EdgeInsets.all(AppSpacing.md),
|
|
child: Column(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
children: [
|
|
SyncHealthBanner(status: syncHealth),
|
|
buildWhenRow(context),
|
|
const SizedBox(height: 8),
|
|
buildSlotRow(
|
|
loggedSlots: loggedSlots,
|
|
selectedSlot: selectedSlot,
|
|
onTodaySlotSelected: (slot) =>
|
|
setState(() => selectedSlot = slot),
|
|
),
|
|
const SizedBox(height: 8),
|
|
TextField(
|
|
controller: _descController,
|
|
decoration: const InputDecoration(labelText: 'What did you eat?'),
|
|
),
|
|
AutocompleteSuggestionList(
|
|
suggestions: _suggestions,
|
|
onSelected: _onSuggestionSelected,
|
|
compact: true,
|
|
),
|
|
const SizedBox(height: 8),
|
|
MacroInputRow(controllers: _macros, compact: true),
|
|
const SizedBox(height: 8),
|
|
LogMealActionsRow(
|
|
onLoadDelivery: loadDeliveryAndReport,
|
|
onLog: _onLogMeal,
|
|
deliveryBusy: deliveryBusy,
|
|
dishesQueued: dishesStillQueued,
|
|
),
|
|
const SizedBox(height: AppSpacing.sm),
|
|
FillAllRow(
|
|
onFill: onFillAll,
|
|
onCancel: onFillCancel,
|
|
busy: fillFlow.busy || deliveryBusy,
|
|
armedCount: fillFlow.armedCount,
|
|
),
|
|
// Mutually exclusive: _status carries a validation complaint,
|
|
// _progress the post-log summary. A successful log clears one
|
|
// and sets the other, so the two never stack.
|
|
if (_status != null) ...[
|
|
const SizedBox(height: AppSpacing.sm),
|
|
Text(_status!),
|
|
],
|
|
if (_progress != null) ...[
|
|
const SizedBox(height: AppSpacing.sm),
|
|
TodayProgressCard(progress: _progress!),
|
|
],
|
|
],
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|