mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-11 13:07:40 +01:00
Four asks, plus the fixes two review passes turned up. Removals (all unused): - "Repeat last meal" button, and the reward/temptation-bundling prompt it was the sole trigger for. Replaced with a post-log progress card showing kcal against budget, macros, and the adherence streak. - The multi-item meal builder, on both the gate and the phone. The stored `components` field stays: nothing writes it now, but historical composite entries and the food bank still read it and it is part of the wire format. - Meal photos entirely: 13 files, `imagePath`, the photo filter, the wrapper's /blobs/ route, image_picker, and the CAMERA permission. Reminder false alarms had three real causes, all fixed: - Logging never reconciled notifications, so a reminder sat on screen up to 15 minutes after the meal was logged -- on the phone itself. - The background check never pulled, so a PC-logged meal nagged forever until the app was opened. Now mirrors _cli_gate._should_lock: cheap local check, network only when a slot looks due, then re-check. - Meals before 08:00 / after 22:00 were attributed to no slot at all. New slot_for_log/slotForLog clamps them to the first/last slot, byte-identical across Python and Dart. Deliberately separate from elapsed_slots, which would otherwise make every slot fall due at 23:00. Budget history, so lowering the budget stops rewriting the past: - Forward-only (effective_from, kcal) entries; each day is judged against the budget in force then. Verified live: setting 2000 left a 36-day adherence streak and the whole calendar pixel-identical. - Rides as hist:<date> fields on the existing budget record. crdt_sync merges per-field over the union of field names and both devices push the merged log, so a device that predates the feature relays them untouched -- no coordinated rollout, no second document. - The seed guard tests emptiness, not file presence: _sync can write an empty history after merging with a pre-feature peer, and a presence check would then never seed again, silently reclassifying every past day. One shared source of truth for every piece of data: - Body weight now travels as its own `weight` CRDT field. Inside `value` it was collateral damage of whole-map LWW -- any phone budget edit deleted it, and the protein target with it. - Both halves of the food bank sync. The curated half (foods added without eating them) was the last device-local state. The derived half merges with count as the clock, so LWW means max-count-wins; the log stays authoritative for membership, because a CRDT union never shrinks and a peer's stale copy would otherwise resurrect a deleted food permanently. - Bank adapters honour tombstones, and Dart parses bank records defensively: a cast failure there is an Error, not an Exception, so one malformed remote record would have broken phone sync permanently. _test_guard.py blocks any pathlib write to real user state while pytest is in the process, whatever conftest is loaded. A throwaway test run outside the package conftest destroyed a real GitHub token during this work; this makes that class of accident impossible rather than merely discouraged. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
143 lines
4.8 KiB
Dart
143 lines
4.8 KiB
Dart
/// Post-log feedback card for the log screen: what was just logged, plus
|
|
/// today's standing against the daily budget.
|
|
library;
|
|
|
|
import 'package:diet_guard_app/ui/theme.dart';
|
|
import 'package:flutter/material.dart';
|
|
|
|
/// Everything [TodayProgressCard] renders, computed by the caller.
|
|
///
|
|
/// A plain value object rather than a service lookup so the card stays a
|
|
/// pure function of its inputs -- the log screen already holds the freshly
|
|
/// written log when it builds one of these, so a second read would be both
|
|
/// redundant and a chance to race.
|
|
@immutable
|
|
class TodayProgress {
|
|
/// Creates a [TodayProgress].
|
|
const TodayProgress({
|
|
required this.justLogged,
|
|
required this.consumedKcal,
|
|
required this.budgetKcal,
|
|
required this.proteinG,
|
|
required this.carbsG,
|
|
required this.fatG,
|
|
required this.adherenceStreak,
|
|
});
|
|
|
|
/// Description of the meal that was just logged.
|
|
final String justLogged;
|
|
|
|
/// Today's total calories, including the meal just logged.
|
|
final double consumedKcal;
|
|
|
|
/// The budget in effect *today* (not the schedule -- the card is only ever
|
|
/// about the current day).
|
|
final int budgetKcal;
|
|
|
|
/// Today's total protein, grams.
|
|
final double proteinG;
|
|
|
|
/// Today's total carbohydrate, grams.
|
|
final double carbsG;
|
|
|
|
/// Today's total fat, grams.
|
|
final double fatG;
|
|
|
|
/// Consecutive-day budget-adherence streak, as of today.
|
|
final int adherenceStreak;
|
|
|
|
/// Calories still available today; negative once over budget.
|
|
double get remainingKcal => budgetKcal - consumedKcal;
|
|
|
|
/// Whether today's total has passed the budget.
|
|
bool get isOverBudget => remainingKcal < 0;
|
|
}
|
|
|
|
/// Shows the just-logged meal and today's running budget position.
|
|
///
|
|
/// Replaces the old one-tap-reward prompt: the same slot in the log screen,
|
|
/// but showing information the user actually acts on instead of an
|
|
/// externally-configured URL. Deliberately has no protein *target* -- that
|
|
/// derives from body weight, which only the PC stores (see
|
|
/// `diet_guard/_budget.py`'s `protein_target_g`), so the card reports
|
|
/// protein consumed and leaves targets to the gate's dashboard.
|
|
class TodayProgressCard extends StatelessWidget {
|
|
/// Creates a [TodayProgressCard].
|
|
const TodayProgressCard({required this.progress, super.key});
|
|
|
|
/// The values to display.
|
|
final TodayProgress progress;
|
|
|
|
static String _plural(int count) => count == 1 ? 'day' : 'days';
|
|
|
|
static String _grams(double value) => '${value.round()}g';
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final theme = Theme.of(context);
|
|
final colors = theme.colorScheme;
|
|
final remaining = progress.remainingKcal.abs().round();
|
|
final remainingLabel = progress.isOverBudget
|
|
? '$remaining over'
|
|
: '$remaining left';
|
|
return Container(
|
|
width: double.infinity,
|
|
padding: const EdgeInsets.all(AppSpacing.md),
|
|
decoration: BoxDecoration(
|
|
// Fill-only elevation: the shared design system forbids shadows in
|
|
// dark UI, and mixing a border with a fill on the same surface.
|
|
color: colors.surfaceContainerHigh,
|
|
borderRadius: BorderRadius.circular(AppRadius.md),
|
|
),
|
|
child: Column(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
children: [
|
|
Text(
|
|
'Logged "${progress.justLogged}".',
|
|
style: theme.textTheme.bodyMedium,
|
|
),
|
|
const SizedBox(height: AppSpacing.sm),
|
|
Row(
|
|
crossAxisAlignment: CrossAxisAlignment.baseline,
|
|
textBaseline: TextBaseline.alphabetic,
|
|
children: [
|
|
Text(
|
|
'${progress.consumedKcal.round()} / ${progress.budgetKcal}',
|
|
style: theme.textTheme.titleMedium?.copyWith(
|
|
color: progress.isOverBudget
|
|
? colors.error
|
|
: colors.onSurface,
|
|
),
|
|
),
|
|
const SizedBox(width: AppSpacing.xs),
|
|
Text('kcal', style: theme.textTheme.labelSmall),
|
|
const Spacer(),
|
|
Text(
|
|
remainingLabel,
|
|
style: theme.textTheme.labelMedium?.copyWith(
|
|
color: progress.isOverBudget
|
|
? colors.error
|
|
: colors.onSurfaceVariant,
|
|
),
|
|
),
|
|
],
|
|
),
|
|
const SizedBox(height: AppSpacing.xs),
|
|
Text(
|
|
'P ${_grams(progress.proteinG)} · '
|
|
'C ${_grams(progress.carbsG)} · '
|
|
'F ${_grams(progress.fatG)}',
|
|
style: theme.textTheme.labelSmall,
|
|
),
|
|
const SizedBox(height: AppSpacing.xs),
|
|
Text(
|
|
'Adherence streak: ${progress.adherenceStreak} '
|
|
'${_plural(progress.adherenceStreak)}',
|
|
style: theme.textTheme.labelSmall,
|
|
),
|
|
],
|
|
),
|
|
);
|
|
}
|
|
}
|