mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-11 13:27:39 +01:00
Krzysztof kuhy Rudnicki
cbbebee79b
Three independent cleanups ahead of the configurable meal schedule.
Pills: the row was a `Wrap`, so pills dropped onto a second line as soon as
they outgrew the width -- which they do even at four. Measured: a logged chip
is ~124px at Material defaults, so four need 522px against ~330px of phone
width. Now a `FittedBox(scaleDown)` over a `Row`, which scales the row down
uniformly, plus compact chip density so there is less to scale away.
A `Row` of `Expanded` children was the obvious alternative and is wrong: it
imposes a tight width, and a Chip narrower than avatar+padding+label clips its
label rather than shrinking -- measured at 10px per label, about one character,
while throwing no overflow error. The new regression test therefore asserts
both a shared baseline and a legible label width; it was confirmed to fail on
the old `Wrap` ("chip wrapped to a second line at 320.0") rather than passing
vacuously.
Card: the `Logged "<meal>".` line restated the description the user had just
typed. Removed, along with `TodayProgress.justLogged`, which nothing else read.
The kcal position, macros and streak stay.
refactor_claude_todo.md: the 250-line file-splitting refactor it tracked is
done -- `scripts/check_file_length.sh --all` exits 0 and an independent sweep
finds nothing over the cap. DESIGN_AUDIT_TODO.md is a separate, still-open
effort and stays.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0159b4E5hh512jYUeaJVNxfM
36 lines
1.4 KiB
Dart
36 lines
1.4 KiB
Dart
import 'package:diet_guard_app/models/food_entry.dart';
|
|
import 'package:diet_guard_app/models/local_time.dart';
|
|
import 'package:diet_guard_app/services/app_settings_service.dart';
|
|
import 'package:diet_guard_app/services/budget_history_service.dart';
|
|
import 'package:diet_guard_app/services/day_status_service.dart';
|
|
import 'package:diet_guard_app/services/log_storage_service.dart';
|
|
import 'package:diet_guard_app/widgets/today_progress_card.dart';
|
|
import 'package:flutter/widgets.dart';
|
|
|
|
/// Reads a macro field as a number, treating blank or unparsable as zero.
|
|
double parseMacroField(TextEditingController controller) =>
|
|
double.tryParse(controller.text.trim()) ?? 0;
|
|
|
|
/// Summarises today from the log just written.
|
|
///
|
|
/// Takes the already-read [log] rather than re-reading, so the card can
|
|
/// never disagree with the write that produced it.
|
|
TodayProgress buildTodayProgress(DayLog log) {
|
|
final budget = AppSettingsService.dailyKcalGoal;
|
|
final today = localDateKey(DateTime.now());
|
|
final entries = (log[today] ?? const <FoodEntry>[])
|
|
.where((entry) => !entry.deleted)
|
|
.toList();
|
|
final macros = sumMacros(entries);
|
|
return TodayProgress(
|
|
consumedKcal: sumKcal(entries),
|
|
budgetKcal: budget,
|
|
proteinG: macros.proteinG,
|
|
carbsG: macros.carbsG,
|
|
fatG: macros.fatG,
|
|
adherenceStreak: adherenceStreak(
|
|
statusMap(log, schedule: BudgetHistoryService.schedule),
|
|
),
|
|
);
|
|
}
|