Compare commits

..

No commits in common. "main" and "v1.0.137-build.219" have entirely different histories.

375 changed files with 4792 additions and 20083 deletions

2
.fvmrc
View File

@ -1,3 +1,3 @@
{
"flutter": "3.50.0"
"flutter": "3.47.9"
}

View File

@ -0,0 +1,62 @@
name: dependency freshness
# Every dependency on its ecosystem's newest STABLE release, enforced on push
# as well as at commit time. The local pre-commit hook only sees the manifests
# in a commit and can be skipped entirely by a fresh clone that never ran
# `pre-commit install`; this runs `--all` over the whole repo.
#
# `--strict` is CI-only. Offline the gate degrades to its cached answer and
# passes, because `--no-verify` is banned locally and a hook that hard-failed
# on a flaky connection would leave no way to commit. A runner is always
# online, so here an undeterminable answer is a real failure.
#
# Expect this to go red for reasons this repo's commit did not cause: an
# upstream release overnight is enough. That is the chosen behaviour -- the
# alternative is a gate that only notices staleness when someone remembers to
# look.
on:
push:
branches: [main]
pull_request:
workflow_dispatch:
jobs:
dependency-freshness:
name: dependencies on newest stable
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
# The gate lives in the shared utils repo so every repo resolves the
# same "latest stable" the same way. Checking it out beats vendoring a
# copy, which is exactly how a gate and its survey start disagreeing.
- name: Check out the shared gate
uses: actions/checkout@v4
with:
repository: kuhyx/utils
path: .utils
# "3.x", never a pinned minor: the Python target IS the interpreter the
# gate runs under (registries/toolchain.python_installed), so a runner
# held a release behind this machine reports a repo's `requires-python`
# as excluding "latest" while the same check passes locally. flax-docs-mcp
# hit exactly that -- `>=3.14` green here, red on a 3.13 runner.
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: Install the gate's two runtime dependencies
run: python -m pip install --upgrade pyyaml packaging
- name: Cache registry lookups
uses: actions/cache@v4
with:
path: ~/.cache/dep-freshness
key: dep-freshness-${{ hashFiles('**/pubspec.yaml', '**/pyproject.toml',
'**/requirements*.txt', '**/package.json', '**/Cargo.toml', '**/go.mod') }}
restore-keys: dep-freshness-
- name: Every dependency is on newest stable
run: bash .utils/scripts/check_dependency_freshness.sh --all --strict

View File

@ -25,14 +25,14 @@ jobs:
skip: ""
- group: rest
hooks: ""
skip: mypy,pylint,dependency-freshness
skip: mypy,pylint
name: pre-commit (${{ matrix.group }})
steps:
- uses: actions/checkout@v4
# The file-length and md-naming hooks delegate to the shared gates in
# kuhyx/utils, which a runner does not have at $HOME/src/utils. Only
# the rest group runs them.
# The file-length, md-naming and dependency-freshness hooks delegate to
# the shared gates in kuhyx/utils, which a runner does not have at
# $HOME/src/utils. Only the rest group runs them.
- name: Check out the shared gates
if: matrix.group == 'rest'
uses: actions/checkout@v4
@ -59,9 +59,9 @@ jobs:
# mypy and pylint bring their own hook environments, so they need only
# pre-commit. The rest group's language: system patch-targets hook
# imports diet_guard and every patched module (requests, gatelock,
# crdt_sync, freedays, mcp, pydantic) -- so it keeps the full
# requirements.txt. That install used to run in the one job, with plain
# pip, for ~24 s.
# crdt_sync, freedays, mcp, pydantic), and dependency-freshness needs
# pyyaml and packaging -- so it keeps the full requirements.txt. That
# install used to run in the one job, with plain pip, for ~24 s.
- name: Install pre-commit and the system hooks' imports
run: |
if [[ "${{ matrix.group }}" == rest ]]; then

View File

@ -60,7 +60,7 @@ jobs:
- uses: subosito/flutter-action@v2
with:
flutter-version: 3.50.0
flutter-version: 3.47.9
channel: stable
cache: true
@ -108,9 +108,7 @@ jobs:
run: |
flutter build apk --release \
--build-name="${{ steps.ver.outputs.semver }}" \
--build-number="${{ steps.vc.outputs.code }}" \
--dart-define=APP_BUILD="${{ steps.vc.outputs.code }}" \
--dart-define=APP_VERSION="${{ steps.ver.outputs.semver }}"
--build-number="${{ steps.vc.outputs.code }}"
# Fail closed. `findByName("release") ?: debug` silently falls back to
# the debug key if key.properties is misplaced, producing a green build

View File

@ -29,7 +29,7 @@ repos:
args: [--pytest-test-first]
# Shared fakes and fixtures, not test modules. Split out of conftest.py
# and test_sync.py only because those files passed the 250-line cap.
exclude: ^diet_guard/tests/_(tk_fakes(_containers|_canvas)?|gate_layout_probe|gate_focus_probe|gate_measurement|gate_keyboard_probe|gate_fixtures|sync_fakes|kuchnia_fakes|state_redirects|claude_redirects|claude_fakes|claude_worker_fakes)\.py$
exclude: ^diet_guard/tests/_(tk_fakes(_containers|_canvas)?|gate_layout_probe|gate_focus_probe|gate_measurement|gate_keyboard_probe|gate_fixtures|sync_fakes|kuchnia_fakes|state_redirects)\.py$
- id: check-ast
- id: mixed-line-ending
args: [--fix=lf]
@ -96,10 +96,6 @@ repos:
rev: v3.3.2
hooks:
- id: pylint
# pre-commit itself runs on 3.15 and `python3` resolves to it; this
# pylint's --jobs=4 pickles with dill, which crashes there
# (no `co_lnotab`). The repo targets 3.14.
language_version: python3.14
args:
- --rcfile=pyproject.toml
- --fail-under=10
@ -111,13 +107,10 @@ repos:
# direct URLs for one distribution, so any pin that drifts from
# the manifest becomes an unresolvable hook environment rather
# than merely an old one.
- gatelock @ git+https://github.com/kuhyx/utils@gatelock-v0.16.0#subdirectory=gatelock
- crdt-sync @ git+https://github.com/kuhyx/utils@crdt-sync-v0.11.1#subdirectory=crdt-sync
- freedays @ git+https://github.com/kuhyx/utils@freedays-v0.4.3#subdirectory=freedays
- sickdays @ git+https://github.com/kuhyx/utils@sickdays-v0.5.5#subdirectory=sickdays
- rtdb-relay @ git+https://github.com/kuhyx/utils@rtdb-relay-v0.2.1#subdirectory=rtdb_relay
- claude-agent-sdk==0.2.184
- httpx==0.28.1
- gatelock @ git+https://github.com/kuhyx/utils@gatelock-v0.12.0#subdirectory=gatelock
- crdt-sync @ git+https://github.com/kuhyx/utils@crdt-sync-v0.9.2#subdirectory=crdt-sync
- freedays @ git+https://github.com/kuhyx/utils@freedays-v0.4.0#subdirectory=freedays
- sickdays @ git+https://github.com/kuhyx/utils@sickdays-v0.3.0#subdirectory=sickdays
- mcp>=2,<3
- pydantic
- defusedxml==0.7.1
@ -281,7 +274,7 @@ repos:
# patch target statically so a stale path fails the commit instead.
- id: patch-targets
name: test patch targets resolve
entry: python3 scripts/check_patch_targets.py diet_guard
entry: python3 scripts/check_patch_targets.py
language: system
pass_filenames: false
files: ^diet_guard/

131
AGENTS.md
View File

@ -1,57 +1,51 @@
# CLAUDE.md — diet_guard
A log-to-unlock gate. Every ~15 min `diet-guard-gate.timer` checks whether a meal slot (08:00,
12:00, 16:00, 20:00 by default — the schedule is user-configurable, see below) elapsed unlogged; if
so it opens a fullscreen Tk window that blocks the desktop until the user logs what they ate. It
also tracks a daily calorie/macro budget, seeded from biometrics at `init` and freely editable
afterward on either device. A History tab (`_gatelock_calendar.py`) and the phone's Calendar screen
show adherence, streaks, a YTD tally and weekly/monthly averages, all derived from `_daystatus.py` /
`day_status_service.dart` and `_averages.py` / `average_service.dart`.
A log-to-unlock gate. Every ~15 min `diet-guard-gate.timer` checks whether a
meal slot (08:00, 12:00, 16:00, 20:00 by default — the schedule is
user-configurable, see below) elapsed unlogged; if so it opens a
fullscreen Tk window that blocks the desktop until the user logs what they
ate. It also tracks a daily calorie/macro budget, seeded from biometrics at
`init` and freely editable afterward on either device. A History tab
(`_gatelock_calendar.py`) and the phone's Calendar screen show adherence,
streaks, a YTD tally and weekly/monthly averages, all derived from
`_daystatus.py` / `day_status_service.dart` and `_averages.py` /
`average_service.dart`.
`docs/DOCS-design.md` holds the original spec (slot timing, the Tue/Wed/Thu catch-up rule).
`docs/DOCS-design.md` holds the original spec (slot timing, the Tue/Wed/Thu
catch-up rule).
## Commands
- One sync tick: `python -m diet_guard sync`
- Averages: `python -m diet_guard averages`; Body: `body`, `weight KG`, `profile`, `plan-week`
- Prune dead sync peers (dry run): `python -m diet_guard prune-peers`
- "Send to Claude" worker: `python -m diet_guard claude-worker` ([relay](docs/DOCS-claude-relay.md), [screen](docs/DOCS-log-screen.md))
- Install: `bash install.sh` (production); app: `cd app && bash install_arch.sh`; run app: `bash run.sh`; phone: `flutter build apk --release`
- run: `python -m diet_guard gate --demo`
- test: `python -m pytest -n auto -p no:sugar -q` (python, 100% branch bar from pyproject) then `cd app && flutter test --reporter=compact`
- test-changed: `scripts/test_changed.sh` (maps py and app/ dart changes to their tests, no coverage)
- lint: `pre-commit run --all-files`
- coverage: `python -m pytest -n auto -p no:sugar -q` (writes coverage.lcov)
- deploy: `bash scripts/deploy.sh` (pull ~/src/diet-guard, system-Python install, desktop app; health-checked)
- coverage-gaps: `coverage-gaps coverage.lcov`
## Scheduling
`diet-guard-gate.timer` is wall-clock (`OnCalendar=*-*-* *:00/15:00`, `Persistent=true`), not
boot-relative — a boot-relative timer collided with fullscreen games grabbing input.
`diet-guard-gate.service` is `Type=oneshot` and exits 0 at once when no lock is due (free/sick day:
[docs/DOCS-sick-days.md](docs/DOCS-sick-days.md)). Needs `DISPLAY`/`XAUTHORITY`; see the unit file
and `wait_for_display()`.
`diet-guard-gate.timer` is wall-clock (`OnCalendar=*-*-* *:00/15:00`,
`Persistent=true`), not boot-relative — a boot-relative timer collided with
fullscreen games grabbing input. `diet-guard-gate.service` is `Type=oneshot`
and exits 0 at once when no lock is due (free/sick day: [docs/DOCS-sick-days.md](docs/DOCS-sick-days.md)).
Needs `DISPLAY`/`XAUTHORITY`; see the unit file and `wait_for_display()`.
## Cross-device sync
A sync tick pulls every other device's log from `kuhyx/syncs` (`diet-guard-sync/`, dumb file storage
via the REST Contents API), merges (`_sync_merge.merge_logs`: union by `id`, tombstone wins, legacy
`(time, desc)` dedup), **re-signs every persisted entry**, rebuilds the food bank, pushes back.
A sync tick pulls every other device's log from `kuhyx/syncs`
(`diet-guard-sync/`, dumb file storage via the REST Contents API), merges
(`_sync_merge.merge_logs`: union by `id`, tombstone wins, legacy
`(time, desc)` dedup), **re-signs every persisted entry**, rebuilds the food
bank, pushes back.
**End-to-end encrypted** (since 2026-11-12, `_sync_e2e.py` / `app/lib/services/sync_e2e.dart`):
everything lives on `diet-guard-sync/devices-e2e` (revs `revs-e2e`, header `diet-guard-sync/e2e`),
fields sealed with a key from the shared passphrase (`~/.config/crdt-sync/password`; keystore + lock
icon in Settings on the phone). Record ids, tombstones and clocks stay clear, so the food banks' ids
(food names) are visible. The old plaintext `diet-guard-sync/devices` (and its `export_keys.json`
keyring) is copied over and never written or deleted. Locked = `SyncError` / `SyncLockedException`:
nothing is pulled or pushed. The PC keeps its derived key and copy memo in
`~/.local/share/diet_guard/e2e`. The wake-alarm weigh-ins come from `wake-alarm-sync/devices-e2e`
(own header).
**On the PC, sync is event-driven — there is no periodic timer.** The old `diet-guard-sync.timer`
(~15 min) was deleted: it paid a network round-trip on every idle tick to approximate the two
moments state actually changes here.
**On the PC, sync is event-driven — there is no periodic timer.** The old
`diet-guard-sync.timer` (~15 min) was deleted: it paid a network round-trip on
every idle tick to approximate the two moments state actually changes here.
- **Before a lock** — `_cli_gate._should_lock` runs the cheap local
`gate_is_due()` first and pulls *only* when a lock is otherwise due, so a
@ -115,18 +109,19 @@ moments state actually changes here.
## Production dependency installation
`diet-guard-gate.service` runs `/usr/bin/python`, **not** a venv. Any new non-stdlib dependency must
go into system Python's user site-packages:
`diet-guard-gate.service` runs `/usr/bin/python`, **not** a venv. Any new
non-stdlib dependency must go into system Python's user site-packages:
```bash
/usr/bin/python3 -m pip install --user --break-system-packages -e .
```
Verify against `/usr/bin/python3 -c "import <dep>"`, not the dev venv. Installing only into `.venv`
caused a 3-day production outage (2026-06-19).
Verify against `/usr/bin/python3 -c "import <dep>"`, not the dev venv.
Installing only into `.venv` caused a 3-day production outage (2026-06-19).
Run `install.sh` from a **durable** clone (`~/src/diet-guard`), never a scratch dir — it does `pip
install -e`, so the clone must persist for `git pull` to reach the running service.
Run `install.sh` from a **durable** clone (`~/src/diet-guard`), never a scratch
dir — it does `pip install -e`, so the clone must persist for `git pull` to
reach the running service.
## Operational gotchas
@ -161,14 +156,16 @@ install -e`, so the clone must persist for `git pull` to reach the running servi
## The companion app's desktop target is a web build
`app/` builds for **Android** and **web** only. There is no `app/linux/` — Flutter's GTK embedder
manages ~20fps at 3840x2160 where the same Dart in Chrome sustains ~144fps
(`~/src/todo/docs/DOCS-desktop-performance-findings.md`). The desktop app is the web build served by
`bin/diet_guard_desktop.dart` in a Chrome `--app` window.
`app/` builds for **Android** and **web** only. There is no `app/linux/` —
Flutter's GTK embedder manages ~20fps at 3840x2160 where the same Dart in
Chrome sustains ~144fps (`~/src/todo/docs/DOCS-desktop-performance-findings.md`). The
desktop app is the web build served by `bin/diet_guard_desktop.dart` in a
Chrome `--app` window.
Enforced by `app/test/repo_invariants_test.dart`: no `app/linux/`, `dart:io` only in `*_io.dart`
seams and `lib/desktop/`, port 8732 and the `diet-guard-desktop` Chrome profile pinned (IndexedDB is
keyed by origin, so changing either hides the entire local food log).
Enforced by `app/test/repo_invariants_test.dart`: no `app/linux/`, `dart:io`
only in `*_io.dart` seams and `lib/desktop/`, port 8732 and the
`diet-guard-desktop` Chrome profile pinned (IndexedDB is keyed by origin, so
changing either hides the entire local food log).
- Branch on `kIsWeb` *before* any `Platform.is…`, which itself throws on web.
`dart:io` does not fail a web compile — it throws at runtime, so the symptom
@ -181,17 +178,19 @@ keyed by origin, so changing either hides the entire local food log).
## The meal schedule
Slots are **minutes of day**: a first meal and a last meal (any `HH:MM`) and how many meals fall
between them; interior slots round to the 15-min grid. Default `(480, 1200, 4)` is the old hardcoded
08/12/16/20. The load-bearing rules (integer-only arithmetic, the additive `slot`+`slot_min` /
`f`/`l`/`n`+`fm`/`lm` wire, the count clamp, the `last + 120 min` cutoff, nearest-slot
satisfaction), the forward-only history, and the two edit surfaces are in
[docs/DOCS-meal-schedule.md](docs/DOCS-meal-schedule.md) — read it before touching `_slots.py` /
`_slot_wire.py` / `slot.dart`.
Slots are **minutes of day**: a first meal and a last meal (any `HH:MM`) and
how many meals fall between them; interior slots round to the 15-min grid.
Default `(480, 1200, 4)` is the old hardcoded 08/12/16/20. The load-bearing
rules (integer-only arithmetic, the additive `slot`+`slot_min` /
`f`/`l`/`n`+`fm`/`lm` wire, the count clamp, the `last + 120 min` cutoff,
nearest-slot satisfaction), the forward-only history, and the two edit
surfaces are in [docs/DOCS-meal-schedule.md](docs/DOCS-meal-schedule.md) —
read it before touching `_slots.py` / `_slot_wire.py` / `slot.dart`.
## Averages (`_averages.py` / `average_service.dart`)
Three load-bearing rules; changing any silently changes what "under budget" means:
Three load-bearing rules; changing any silently changes what "under budget"
means:
- **Denominator is logged days, not elapsed days.** An unlogged day is not a
zero-kcal day.
@ -201,9 +200,10 @@ Three load-bearing rules; changing any silently changes what "under budget" mean
week" is empty on a Monday, and reports `no logged days yet` rather than a
fake average.
Band boundaries reuse `_daystatus.OVER_BUDGET_YELLOW_CEILING` / `kOverBudgetYellowCeiling` **by
import, not by copy**. The MCP `get_averages` tool drops `avg_budget` (budget secrecy on the network
only); the CLI, gate and phone show both.
Band boundaries reuse `_daystatus.OVER_BUDGET_YELLOW_CEILING` /
`kOverBudgetYellowCeiling` **by import, not by copy**. The MCP `get_averages`
tool drops `avg_budget` (budget secrecy on the network only); the CLI, gate and
phone show both.
## Do NOT
@ -217,18 +217,18 @@ only); the CLI, gate and phone show both.
(`2.5.round() == 3`), so a float path silently desyncs the two devices —
and a slot one device offers while the other does not is a checkpoint that
can never be satisfied, i.e. a permanent lock. Integer `//` and `~/` only.
- Don't re-add the meal builder, "repeat last meal" or the reward prompt
(removed deliberately, `app/test/repo_invariants_test.dart`). A meal photo is
transient input to Claude only (2026-11-17): never stored, on a `FoodEntry`
or synced; the invariants test asserts no image bytes reach a record.
- Don't re-add the meal builder, "repeat last meal", the reward prompt, or
**meal photos** — all removed deliberately, enforced by
`app/test/repo_invariants_test.dart`. Photos also took `image_picker`, the
blob stores, the `/blobs/` route and the `CAMERA` permission; re-adding them
means syncing image blobs too.
- Don't strip the `components` field: nothing writes it, but historical
composite entries and the food bank read it, and it is part of the sync wire
format.
- Catering logs itself since 2026-11-17 (kuhy overrode "delivered ≠ eaten":
"LOG EVEN WITHOUT TAP"): v5 ids `kuchnia:<date>:<dishId>`, undo tombstones.
Don't let its Python and Dart halves drift (shared fixtures) or make the
synced password machine-local. [docs](docs/DOCS-kuchnia-wikinga.md),
[phone](docs/DOCS-kuchnia-wikinga-phone.md).
- Don't let the catering import log unattended (delivered ≠ eaten), don't let
its Python and Dart halves drift (one shared fixture gates them), and don't
make the synced password machine-local — the phone could not then fetch.
[docs](docs/DOCS-kuchnia-wikinga.md), [phone](docs/DOCS-kuchnia-wikinga-phone.md).
- Don't add a dependency without the production install-path check above.
- Don't reintroduce a seal/`chattr +i` on the budget file.
- Don't re-add a Linux embedder target, and don't change the wrapper's port or
@ -240,7 +240,8 @@ only); the CLI, gate and phone show both.
## Flutter/Dart AI rules
_Vendored from [flutter/flutter docs/rules/rules.md](https://github.com/flutter/flutter/blob/main/docs/rules/rules.md)
via `~/.claude/CLAUDE.md`. Re-fetch periodically. Split across five files for the 250-line cap._
via `~/.claude/CLAUDE.md` Flutter AI tooling setup. Re-fetch periodically.
Split across five files to stay under the 250-line cap._
- [Language, style and architecture](docs/DOCS-flutter-rules-language.md)
- [Architecture, lint rules, state and data](docs/DOCS-flutter-rules-state-and-data.md)

View File

@ -87,15 +87,6 @@ bash scripts/setup_mcp.sh # create the venv and install diet_guard[mcp]
Then restart Claude Code in this repo and approve the project MCP server
(registered in `.mcp.json`).
## Error reports
Every uncaught, thread or Tk callback error, and any freeze of the gate window
over 1 s, goes to the shared app-errors spool as app `diet-guard-gate`
through `gatelock.error_report` (`diet_guard/_errors.py`, installed by the
CLI). The PC's `app-errors` timer turns each one into a ticket on the
todoImplementer board (kuhyx/utils `DOCS-app-errors.md`). Nothing shows on
screen. The Flutter app reports on its own, as `diet-guard`.
## Development
```bash

View File

@ -19,12 +19,6 @@
only, foreground only: no READ_HEALTH_DATA_IN_BACKGROUND, so the
WorkManager isolate never reads Health Connect. -->
<uses-permission android:name="android.permission.health.READ_STEPS"/>
<!-- Camera for the meal photo sent to Claude (meal_photo_source.dart); the
runtime permission is requested before the camera opens. A photo is
transient input: it is never stored or synced. Not every device has a
camera, and the gallery path works without one. -->
<uses-permission android:name="android.permission.CAMERA"/>
<uses-feature android:name="android.hardware.camera" android:required="false"/>
<!-- Deliberately NOT requesting SCHEDULE_EXACT_ALARM: the background
check is a 15-minute WorkManager periodic task, not exact alarms
(more robust against OEM background-kill; +/-15 min is accepted, see

View File

@ -1,7 +1,4 @@
org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G -XX:ReservedCodeCacheSize=256m -XX:+UseSerialGC -XX:TieredStopAtLevel=1
org.gradle.caching=true
org.gradle.parallel=true
kotlin.compiler.execution.strategy=in-process
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
android.useAndroidX=true
# This newDsl flag was added by the Flutter template
android.newDsl=false

View File

@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.2-all.zip

View File

@ -1,35 +0,0 @@
/// A wordless page for an error the window itself loaded: Chrome would
/// otherwise paint its own "This page isn't working" sentences over an
/// empty error body. Only the title carries the app's name (OS-level label).
library;
import 'dart:io';
/// HTML page with only an icon — no words painted by the browser.
const String errorIconPage =
'<!doctype html><html><head><meta charset="utf-8"> '
'<title>Diet Guard</title> '
'<style>html,body{margin:0;height:100%; '
'background:#211D1B;display:flex;align-items:center; '
'justify-content:center}</style></head><body> '
'<svg width="96" height="96" viewBox="0 0 24 24" fill="none" '
'stroke="#A39892" stroke-width="2" stroke-linecap="round" '
'aria-hidden="true"><circle cx="12" cy="12" r="9"/> '
'<line x1="5.6" y1="18.4" x2="18.4" y2="5.6"/></svg></body></html>';
/// Whether [request] is the window loading a page, not the app's fetch().
bool isNavigation(HttpRequest request) =>
request.headers.value('sec-fetch-mode') == 'navigate';
/// Replaces an error answer to a page load with [errorIconPage]. Does
/// nothing for fetch() calls, successes, or a response already written.
void paintErrorIcon(HttpRequest request) {
final response = request.response;
if (!isNavigation(request) || response.statusCode < 400) return;
try {
response.headers.contentType = ContentType.html;
response.write(errorIconPage);
} on Exception {
return; // body already sent: leave it alone
}
}

View File

@ -19,7 +19,6 @@ library;
import 'dart:convert';
import 'dart:io';
import 'package:diet_guard_app/desktop/error_page.dart' show isNavigation;
import 'package:http/http.dart' as http;
/// GitHub's REST API base, which [GitHubProxy] fronts.
@ -178,13 +177,8 @@ class GitHubProxy {
}
void _passThrough(HttpRequest request, http.Response response) {
request.response.statusCode = response.statusCode;
if (isNavigation(request)) {
// Top-level navigation (window load) must not paint error JSON; the app's
// own fetch() calls never send 'navigate', so they still get the body.
return;
}
request.response
..statusCode = response.statusCode
..headers.contentType = ContentType.json
..add(response.bodyBytes);
}

View File

@ -24,7 +24,6 @@ import 'dart:io';
import 'package:crdt_sync/crdt_sync.dart';
import 'package:diet_guard_app/desktop/content_types.dart' as content_types;
import 'package:diet_guard_app/desktop/error_page.dart';
import 'package:diet_guard_app/desktop/github_proxy.dart';
import 'package:diet_guard_app/services/desktop_wrapper.dart';
import 'package:path/path.dart' as p;
@ -92,7 +91,6 @@ class WrapperServer {
} on Exception {
request.response.statusCode = HttpStatus.internalServerError;
}
paintErrorIcon(request);
await request.response.close();
}
}

View File

@ -3,17 +3,11 @@
library;
import 'dart:async';
import 'package:crdt_sync_flutter/crdt_sync_flutter.dart'
show AppErrors, AppErrorsConfig, AppErrorsRouteObserver, installAppErrors;
import 'package:diet_guard_app/screens/log_meal_screen.dart';
import 'package:diet_guard_app/services/app_settings_service.dart';
import 'package:diet_guard_app/services/background_tasks.dart';
import 'package:diet_guard_app/services/body_service.dart';
import 'package:diet_guard_app/services/budget_history_service.dart';
import 'package:diet_guard_app/services/claude_relay_client.dart';
import 'package:diet_guard_app/services/claude_relay_firebase.dart';
import 'package:diet_guard_app/services/firebase_client.dart' show openFirebase;
import 'package:diet_guard_app/services/foodbank_service.dart';
import 'package:diet_guard_app/services/frame_stats.dart';
import 'package:diet_guard_app/services/kuchnia_credential_service.dart';
@ -23,31 +17,13 @@ import 'package:diet_guard_app/services/meal_schedule_service.dart';
import 'package:diet_guard_app/services/notification_service.dart';
import 'package:diet_guard_app/services/sync_device_id.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized();
// Every error and every wait over 1 s goes to the PC's app-errors ingest,
// which files a board ticket (kuhyx/utils DOCS-app-errors.md). The release
// build passes the versionCode and name as dart-defines (release-apk.yml).
final errors = await installAppErrors(
const AppErrorsConfig(
app: 'diet-guard',
repo: 'kuhyx/diet-guard',
package: 'diet_guard_app',
// 0 unless the release build passes --dart-define=APP_BUILD.
// ignore: avoid_redundant_argument_values
build: int.fromEnvironment('APP_BUILD'),
version: String.fromEnvironment('APP_VERSION'),
),
);
// Before anything that stamps an Hlc or syncs: until this resolves, the
// device id falls back to the pre-migration role constant.
final deviceId = await initSyncDeviceId();
errors.connect(
sink: () async => (await openFirebase())?.patchValues,
deviceId: () async => deviceId,
);
await initSyncDeviceId();
await LogStorageService.init();
await AppSettingsService.init();
await BudgetHistoryService.init();
@ -56,8 +32,6 @@ Future<void> main() async {
await KuchniaCredentialService.init();
await BodyService.init();
await KuchniaQueueService.init();
// The sparkle button's transport; until this line it fails closed.
claudeRelay = RtdbClaudeRelay.firebase();
final notifications = await NotificationService.init();
// Deliberately *not* awaited before the first frame: the browser's
// `Notification.requestPermission()` does not complete until the user
@ -77,25 +51,19 @@ Future<void> main() async {
// coverage:ignore-start
if (frameStatsEnabled) startFrameStats();
// coverage:ignore-end
runApp(DietGuardApp(errors: errors));
runApp(const DietGuardApp());
}
/// Root widget for the Diet Guard companion app.
class DietGuardApp extends StatelessWidget {
/// Creates the [DietGuardApp] root widget.
const DietGuardApp({this.errors, super.key});
/// App-wide error reporting; null in widget tests.
final AppErrors? errors;
const DietGuardApp({super.key});
@override
Widget build(BuildContext context) {
return MaterialApp(
title: 'Diet Guard',
theme: buildAppTheme(),
navigatorObservers: [
if (errors case final errors?) AppErrorsRouteObserver(errors),
],
home: const LogMealScreen(),
);
}

View File

@ -20,7 +20,6 @@ class KuchniaDish {
required this.grams,
required this.priority,
required this.slotLabel,
this.dishId = '',
});
/// The dish itself (`menuMealName`), e.g. "Kaszotto grzybowe...".
@ -53,17 +52,6 @@ class KuchniaDish {
/// The caterer's slot label ("Śniadanie", "Obiad", ...), for display only.
final String slotLabel;
/// The panel's own id for this meal (`deliveryMealId`), as a string, or ''
/// when the payload carried none.
///
/// Never written to the bank record or the log: it only feeds [autologKey].
final String dishId;
/// The dish half of the auto-log entry id: [dishId], else [bankKey].
///
/// Mirrors the fixture `tests/fixtures/kuchnia_autolog_ids.json`.
String get autologKey => dishId.isNotEmpty ? dishId : bankKey;
/// The curated-bank record for this dish.
///
/// Mirrors `_kuchnia_import.dish_to_record`. `count` is 0: the bank's count

View File

@ -18,8 +18,6 @@ import 'package:diet_guard_app/services/body_prefs.dart';
import 'package:diet_guard_app/services/body_service.dart';
import 'package:diet_guard_app/services/health_steps.dart';
import 'package:diet_guard_app/services/log_storage_service.dart';
import 'package:diet_guard_app/ui/cues.dart';
import 'package:diet_guard_app/ui/macro_kind.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:diet_guard_app/widgets/body/activity_card.dart';
import 'package:diet_guard_app/widgets/body/body_section.dart';
@ -29,7 +27,7 @@ import 'package:diet_guard_app/widgets/body/goal_card.dart';
import 'package:diet_guard_app/widgets/body/profile_card.dart';
import 'package:diet_guard_app/widgets/body/week_plan_card.dart';
import 'package:diet_guard_app/widgets/body/weight_card.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
export 'package:diet_guard_app/screens/body_screen_data.dart';
@ -111,13 +109,22 @@ class _BodyScreenState extends State<BodyScreen> {
final (exercise, _, _) = bodyExercise(body, bio, today);
final tiles = _tiles(body, bio, exercise);
return Scaffold(
appBar: AppBar(),
appBar: AppBar(title: const Text('Body')),
body: Padding(
padding: const EdgeInsets.all(AppSpacing.md),
child: Center(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: AppWidth.prose),
child: BodyTileGrid(tiles: tiles),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
BodyTileGrid(tiles: tiles),
const SizedBox(height: AppSpacing.sm),
BodyNote(
'Age ${bodyAgeText(body, today)} · synced with the PC.',
),
],
),
),
),
),
@ -152,12 +159,8 @@ class _BodyScreenState extends State<BodyScreen> {
) {
final weight = body.latestWeight?.$2;
final bodyFat = body.latestBodyFat?.$2;
final age = bodyAgeText(body, DateTime.now());
final profile = BodyTileSpec(
semanticLabel: 'Profile',
icon: Icons.person,
value: age,
valueIcon: age == null ? null : Icons.cake,
title: 'Profile',
builder: (_) => ProfileCard(onSaved: _onChanged),
);
final goal = bio == null
@ -171,65 +174,45 @@ class _BodyScreenState extends State<BodyScreen> {
return [
if (_profileAtTop) profile,
BodyTileSpec(
semanticLabel: 'Daily calorie target',
icon: Icons.flag,
value: goal == null ? null : '$goal',
valueIcon: goal == null ? null : MacroKind.kcal.icon,
title: 'Daily calorie target',
value: goal == null ? null : '$goal kcal',
builder: (_) => bio == null
? BodySection(
semanticLabel: 'Daily calorie target',
children: [
Row(
children: [
for (final icon in bodyMissingIcons(body))
StatusCue(
kind: CueKind.warn,
icon: icon,
semanticLabel: bodyMissingNote(body),
),
],
),
],
title: 'Daily calorie target',
children: [BodyNote(bodyMissingNote(body))],
)
: GoalCard(bio: bio, exercise: exercise, bodyFatPct: bodyFat),
),
BodyTileSpec(
semanticLabel: 'Weight',
icon: Icons.monitor_weight,
title: 'Weight',
value: weight == null ? null : formatKg(weight),
builder: (_) => WeightCard(onChanged: _onChanged),
),
if (bio != null) ...[
BodyTileSpec(
semanticLabel: 'BMI',
icon: Icons.accessibility_new,
title: 'BMI',
value: oneDecimal(bmiReport(bio).bmi),
builder: (_) => BmiCard(bio: bio),
),
BodyTileSpec(
semanticLabel: 'Ideal weight',
icon: Icons.balance,
title: 'Ideal weight',
builder: (_) => IdealWeightCard(bio: bio),
),
BodyTileSpec(
semanticLabel: 'Resting metabolism (BMR)',
icon: Icons.bedtime,
value: whole(tableBmr(bio, bodyFat).value!),
valueIcon: MacroKind.kcal.icon,
title: 'Resting metabolism (BMR)',
value: '${whole(tableBmr(bio, bodyFat).value!)} kcal',
builder: (_) => BmrCard(bio: bio, bodyFatPct: bodyFat),
),
],
BodyTileSpec(
semanticLabel: 'Activity',
icon: Icons.directions_run,
title: 'Activity',
builder: (_) => ValueListenableBuilder<bool>(
valueListenable: _canConnectSteps,
builder: (_, canConnect, _) => _activityCard(canConnect: canConnect),
),
),
BodyTileSpec(
semanticLabel: 'Week planner',
icon: Icons.calendar_view_week,
title: 'Week planner (info only)',
builder: (_) => WeekPlanCard(
defaultTarget: AppSettingsService.dailyKcalGoal,
logged: _logged,
@ -237,8 +220,7 @@ class _BodyScreenState extends State<BodyScreen> {
),
if (!_profileAtTop) profile,
BodyTileSpec(
semanticLabel: 'Body fat',
icon: Icons.percent,
title: 'Body fat',
value: bodyFat == null ? null : '${oneDecimal(bodyFat)} %',
builder: (_) => BodyFatCard(onChanged: _onChanged),
),

View File

@ -6,7 +6,6 @@ import 'package:diet_guard_app/services/body_calc.dart';
import 'package:diet_guard_app/services/body_service.dart';
import 'package:diet_guard_app/services/body_steps.dart';
import 'package:diet_guard_app/services/log_storage_service.dart';
import 'package:material_ui/material_ui.dart' show IconData, Icons;
/// Builds the person from the stored profile and newest weight, or null
/// when anything the formulas need is missing.
@ -62,16 +61,7 @@ Map<String, double> kcalByDay(DayLog log) => {
.fold<double>(0, (sum, food) => sum + food.kcal),
};
/// Glyphs of the inputs still missing (profile, weight), in the order the
/// user should supply them; the visible counterpart of [bodyMissingNote].
List<IconData> bodyMissingIcons(BodyService body) => [
if (body.birth == null || body.heightCm == null || body.sex == null)
Icons.person,
if (body.latestWeight == null) Icons.monitor_weight,
];
/// Spoken reason the numbers are missing (screen readers, tests; never
/// painted).
/// Why the numbers are missing.
String bodyMissingNote(BodyService body) {
if (body.latestWeight == null && body.birth == null) {
return 'Set your profile and enter your weight to see BMI, ideal '
@ -81,8 +71,8 @@ String bodyMissingNote(BodyService body) {
return 'Set your profile (birth date, height, sex) to see the numbers.';
}
/// The age in whole years, or null while no birth date is stored.
String? bodyAgeText(BodyService body, DateTime today) {
/// The age line value.
String bodyAgeText(BodyService body, DateTime today) {
final birth = DateTime.tryParse(body.birth ?? '');
return birth == null ? null : '${ageOn(birth, today)}';
return birth == null ? 'unknown' : '${ageOn(birth, today)}';
}

View File

@ -9,7 +9,6 @@ library;
import 'dart:async';
import 'package:crdt_sync_flutter/crdt_sync_flutter.dart' show WaitWatch;
import 'package:diet_guard_app/models/day_status.dart';
import 'package:diet_guard_app/models/period_average.dart';
import 'package:diet_guard_app/screens/history_screen.dart';
@ -18,13 +17,11 @@ import 'package:diet_guard_app/services/average_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/ui/cues.dart';
import 'package:diet_guard_app/ui/macro_kind.dart';
import 'package:diet_guard_app/widgets/average_summary_row.dart';
import 'package:diet_guard_app/widgets/day_status_calendar.dart';
import 'package:diet_guard_app/widgets/streak_summary_row.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:material_ui/material_ui.dart';
/// Screen showing the budget-adherence calendar, streaks, and budget entry.
class CalendarScreen extends StatefulWidget {
@ -154,10 +151,11 @@ class _CalendarScreenState extends State<CalendarScreen> {
@override
Widget build(BuildContext context) {
if (_loading) {
return const Scaffold(body: WaitWatch.centered('calendar.load'));
return const Scaffold(body: Center(child: CircularProgressIndicator()));
}
final theme = Theme.of(context);
return Scaffold(
appBar: AppBar(),
appBar: AppBar(title: const Text('Calendar')),
body: SingleChildScrollView(
padding: const EdgeInsets.all(16),
child: Column(
@ -170,10 +168,11 @@ class _CalendarScreenState extends State<CalendarScreen> {
if (_budgetStatus != null)
Padding(
padding: const EdgeInsets.only(top: 4),
child: StatusCue(
key: ValueKey(_budgetStatus),
kind: _budgetError ? CueKind.error : CueKind.ok,
semanticLabel: _budgetStatus!,
child: Text(
_budgetStatus!,
style: TextStyle(
color: _budgetError ? theme.colorScheme.error : null,
),
),
),
const SizedBox(height: 12),
@ -216,11 +215,7 @@ class _BudgetRow extends StatelessWidget {
return Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
MacroKind.kcal.icon,
color: MacroKind.kcal.color,
semanticLabel: 'Daily budget (kcal)',
),
const Text('Daily budget (kcal):'),
const SizedBox(width: 8),
SizedBox(
width: 90,
@ -235,10 +230,7 @@ class _BudgetRow extends StatelessWidget {
const SizedBox(width: 8),
FilledButton(
onPressed: onEditOrSave,
child: Icon(
editing ? Icons.check : Icons.edit,
semanticLabel: editing ? 'Save' : 'Edit',
),
child: Text(editing ? 'Save' : 'Edit'),
),
],
);

View File

@ -8,10 +8,9 @@ import 'package:diet_guard_app/models/food_suggestion.dart';
import 'package:diet_guard_app/models/nutrition.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/ui/cues.dart';
import 'package:diet_guard_app/widgets/autocomplete_suggestion_list.dart';
import 'package:diet_guard_app/widgets/macro_input_row.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
import 'package:uuid/uuid.dart';
/// Edit screen for an existing [FoodEntry].
@ -36,7 +35,6 @@ class _EditEntryScreenState extends State<EditEntryScreen> {
List<FoodSuggestion> _suggestions = const [];
String _source = 'manual';
String? _status;
int _rejections = 0;
@override
void initState() {
@ -82,7 +80,9 @@ class _EditEntryScreenState extends State<EditEntryScreen> {
}
Future<void> _onDescChanged() async {
final matches = await FoodBankService.instance.search(_descController.text);
final matches = await FoodBankService.instance.search(
_descController.text,
);
if (!mounted) return;
setState(() => _suggestions = matches);
}
@ -104,10 +104,7 @@ class _EditEntryScreenState extends State<EditEntryScreen> {
Future<void> _onSave() async {
final desc = _descController.text.trim();
if (desc.isEmpty) {
setState(() {
_status = 'Description cannot be empty.';
_rejections++;
});
setState(() => _status = 'Description cannot be empty.');
return;
}
final nutrition = nutritionForPortion(
@ -145,16 +142,17 @@ class _EditEntryScreenState extends State<EditEntryScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(),
appBar: AppBar(title: const Text('Edit meal')),
body: SingleChildScrollView(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
IconField(
icon: Icons.restaurant,
semanticLabel: 'What did you eat?',
TextField(
controller: _descController,
decoration: const InputDecoration(
labelText: 'What did you eat?',
),
),
ConstrainedBox(
constraints: const BoxConstraints(maxHeight: 240),
@ -170,20 +168,12 @@ class _EditEntryScreenState extends State<EditEntryScreen> {
width: double.infinity,
child: ElevatedButton(
onPressed: _onSave,
child: const Icon(Icons.check, semanticLabel: 'Save'),
child: const Text('Save'),
),
),
if (_status != null) ...[
const SizedBox(height: 12),
// New key per rejection so a repeat error shakes again.
Align(
alignment: Alignment.centerLeft,
child: StatusCue(
key: ValueKey(_rejections),
kind: CueKind.error,
semanticLabel: _status!,
),
),
Text(_status!),
],
],
),

View File

@ -8,7 +8,6 @@ library;
import 'dart:async';
import 'package:crdt_sync_flutter/crdt_sync_flutter.dart' show WaitWatch;
import 'package:diet_guard_app/models/food_bank_record.dart';
import 'package:diet_guard_app/services/foodbank_service.dart';
import 'package:diet_guard_app/widgets/food_bank/fb_add_entry_dialog.dart';
@ -16,7 +15,7 @@ import 'package:diet_guard_app/widgets/food_bank/fb_filter.dart';
import 'package:diet_guard_app/widgets/food_bank/fb_filter_sheet.dart';
import 'package:diet_guard_app/widgets/food_bank/fb_record_tile.dart';
import 'package:diet_guard_app/widgets/food_bank/fb_tile_grid.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
/// Browses every banked food -- log-derived and manually curated -- with
/// filtering, sorting, and an add-entry dialog.
@ -154,16 +153,15 @@ class _FoodBankScreenState extends State<FoodBankScreen> {
final all = _allEntries;
return Scaffold(
appBar: AppBar(
title: const Text('Food Bank'),
actions: [
if (all != null)
Stack(
alignment: Alignment.center,
children: [
IconButton(
icon: const Icon(
Icons.filter_list,
semanticLabel: 'Filter & sort',
),
icon: const Icon(Icons.filter_list),
tooltip: 'Filter & sort',
onPressed: _openFilterSheet,
),
if (_filter.isActive)
@ -184,22 +182,22 @@ class _FoodBankScreenState extends State<FoodBankScreen> {
],
),
body: all == null
? const WaitWatch.centered('food_bank.load')
? const Center(child: CircularProgressIndicator())
: _displayed.isEmpty
? Center(
child: Icon(
all.isEmpty ? Icons.restaurant_menu : Icons.filter_list_off,
size: 64,
color: Theme.of(context).colorScheme.outline,
semanticLabel: all.isEmpty
? 'Food bank is empty.'
child: Text(
all.isEmpty
? 'Food bank is empty.\n'
'Log meals to populate it, or add entries manually.'
: 'No entries match the current filter.',
textAlign: TextAlign.center,
),
)
: FbTileGrid(records: _displayed, onOpen: _openDetail),
floatingActionButton: FloatingActionButton(
onPressed: _openAddDialog,
child: const Icon(Icons.add, semanticLabel: 'Add manual entry'),
tooltip: 'Add manual entry',
child: const Icon(Icons.add),
),
);
}

View File

@ -28,27 +28,54 @@ class _ClientIdSetupDialogState extends State<_ClientIdSetupDialog> {
@override
Widget build(BuildContext context) {
// Icon-only: the setup steps (open github.com/settings/developers, make
// an OAuth App with Device Flow, paste its client id) live in the repo
// docs, not on screen.
return AlertDialog(
content: IconField(
icon: Icons.apps,
semanticLabel: 'Client ID',
controller: _controller,
autofocus: true,
title: const Text('One-time GitHub setup needed'),
content: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
'Diet Guard signs in via a GitHub OAuth App (no password '
'typed into this app). You only have to set this up once:',
),
const SizedBox(height: 12),
const Text(
'1. On any device, open '
'github.com/settings/developers → "New OAuth App".\n'
'2. Name/Homepage/Callback URL can be anything (device flow '
"doesn't use the callback) — e.g. "
'"Diet Guard" and your GitHub profile URL.\n'
'3. Check "Enable Device Flow", then click "Register '
'application".\n'
"4. Copy the Client ID shown on the app's page and paste it "
'below.',
),
const SizedBox(height: 12),
const Text(
'When you connect below, log in with the GitHub account that '
'has write access to kuhyx/syncs.',
),
const SizedBox(height: 16),
TextField(
controller: _controller,
autofocus: true,
decoration: const InputDecoration(labelText: 'Client ID'),
),
],
),
),
actions: [
IconButton(
TextButton(
onPressed: () => Navigator.of(context).pop(),
icon: const Icon(Icons.close, semanticLabel: 'Cancel'),
child: const Text('Cancel'),
),
IconButton.filled(
FilledButton(
onPressed: () {
final id = _controller.text.trim();
if (id.isNotEmpty) Navigator.of(context).pop(id);
},
icon: const Icon(Icons.arrow_forward, semanticLabel: 'Continue'),
child: const Text('Continue'),
),
],
);

View File

@ -21,7 +21,7 @@ mixin _GitHubMirrorActions on State<GitHubMirrorScreen> {
TextEditingController get _clientIdController;
bool _busy = false;
Widget? _status;
String? _status;
String _storedToken = '';
SyncSettings _currentSettings() {
final typed = _tokenController.text.trim();
@ -37,18 +37,9 @@ mixin _GitHubMirrorActions on State<GitHubMirrorScreen> {
clientId: _clientIdController.text.trim(),
);
}
/// Shows the outcome as an icon cue; [semanticLabel] is spoken, never
/// painted.
void _showCue(CueKind kind, String semanticLabel) {
void _showMessage(String message) {
if (!mounted) return;
setState(
() => _status = StatusCue(
key: UniqueKey(),
kind: kind,
semanticLabel: semanticLabel,
),
);
setState(() => _status = message);
}
Future<void> _connectGitHub() async {
@ -78,12 +69,12 @@ mixin _GitHubMirrorActions on State<GitHubMirrorScreen> {
_storedToken = token;
if (SyncSettings.exposesTokenValue) _tokenController.text = token;
});
_showCue(CueKind.info, 'Connected — syncing…');
_showMessage('Connected — syncing…');
await _currentSettings().save();
await _syncAfterConnect();
}
} on Exception catch (e) {
_showCue(CueKind.error, 'Could not start device flow: $e');
_showMessage('Could not start device flow: $e');
} finally {
auth.close();
}
@ -97,10 +88,10 @@ mixin _GitHubMirrorActions on State<GitHubMirrorScreen> {
try {
await runSync(await syncBackend(client));
await SyncHealth.recordSuccess();
_showCue(CueKind.ok, 'Connected and synced.');
_showMessage('Connected and synced.');
} on Exception catch (e) {
await SyncHealth.recordFailure();
_showCue(CueKind.error, 'Connected, but sync failed: $e');
_showMessage('Connected, but sync failed: $e');
} finally {
client.close();
}
@ -111,7 +102,7 @@ mixin _GitHubMirrorActions on State<GitHubMirrorScreen> {
await _currentSettings().save();
if (!mounted) return;
setState(() => _busy = false);
_showCue(CueKind.ok, 'Saved.');
_showMessage('Saved.');
}
Future<void> _testConnection() async {
@ -120,13 +111,11 @@ mixin _GitHubMirrorActions on State<GitHubMirrorScreen> {
final client = createGitHubClient(settings, httpClient: widget.httpClient);
try {
final ok = await client.canAccessRepo();
if (ok) {
_showCue(CueKind.ok, 'GitHub connection OK.');
} else {
_showCue(CueKind.error, 'GitHub connection failed.');
}
_showMessage(
ok ? 'GitHub connection OK.' : 'GitHub connection failed.',
);
} on Exception catch (e) {
_showCue(CueKind.error, 'GitHub connection failed: $e');
_showMessage('GitHub connection failed: $e');
} finally {
client.close();
if (mounted) setState(() => _busy = false);
@ -144,10 +133,10 @@ mixin _GitHubMirrorActions on State<GitHubMirrorScreen> {
// *because* the banner told them syncing had stopped, so a successful
// run here must dismiss the warning it caused.
await SyncHealth.recordSuccess();
_showCue(CueKind.ok, 'Synced.');
_showMessage('Synced.');
} on Exception catch (e) {
await SyncHealth.recordFailure();
_showCue(CueKind.error, 'Sync failed: $e');
_showMessage('Sync failed: $e');
} finally {
client.close();
if (mounted) setState(() => _busy = false);

View File

@ -8,17 +8,15 @@ library;
import 'dart:async';
import 'package:crdt_sync_flutter/crdt_sync_flutter.dart' show WaitWatch;
import 'package:diet_guard_app/services/firebase_client.dart';
import 'package:diet_guard_app/services/github_client_factory.dart';
import 'package:diet_guard_app/services/sync_health.dart';
import 'package:diet_guard_app/services/sync_service.dart';
import 'package:diet_guard_app/services/sync_settings.dart';
import 'package:diet_guard_app/ui/cues.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:flutter/material.dart';
import 'package:github_device_auth/github_device_auth.dart';
import 'package:http/http.dart' as http;
import 'package:material_ui/material_ui.dart';
part 'github_client_id_dialog.dart';
part 'github_mirror_actions.dart';
@ -96,86 +94,107 @@ class _GitHubMirrorScreenState extends State<GitHubMirrorScreen>
/// The token as loaded, so a platform that cannot display it (web) still
/// round-trips it instead of blanking it on the next save.
/// Runs the OAuth device flow and, on success, fills in the token field.
@override
Widget build(BuildContext context) {
if (_loading) {
return const Scaffold(body: WaitWatch.centered('github_mirror.load'));
return const Scaffold(body: Center(child: CircularProgressIndicator()));
}
return Scaffold(
// No title and no explanatory paragraph: the code glyph that opened this
// screen names it, and the connect button is self-evident.
appBar: AppBar(),
// Centred and capped at the prose width so fields do not span the
// whole window on the desktop surface.
appBar: AppBar(title: const Text('Advanced sync (GitHub)')),
// Centred and capped at the prose width -- see settings_screen.dart's
// note on why: on the desktop surface an uncapped ListView spanned the
// full window, so explanatory paragraphs ran far past the readable
// line-length limit.
body: Center(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: AppWidth.prose),
child: ListView(
padding: const EdgeInsets.all(16),
children: [
Text(
'Syncs still mirror to GitHub until every device has moved '
'to Firebase. Authorize in your browser — no token to '
'paste.',
style: Theme.of(context).textTheme.bodySmall,
),
const SizedBox(height: 12),
Align(
alignment: Alignment.centerLeft,
child: IconButton.filled(
child: FilledButton.icon(
onPressed: _connectGitHub,
icon: const Icon(
Icons.login,
semanticLabel: 'Connect GitHub',
),
icon: const Icon(Icons.login),
label: const Text('Connect GitHub'),
),
),
const SizedBox(height: 16),
IconField(
icon: Icons.person_outline,
semanticLabel: 'GitHub owner',
TextField(
controller: _ownerController,
decoration: const InputDecoration(labelText: 'GitHub owner'),
),
const SizedBox(height: 8),
IconField(
icon: Icons.folder_outlined,
semanticLabel: 'Repo',
TextField(
controller: _repoController,
decoration: const InputDecoration(labelText: 'Repo'),
),
const SizedBox(height: 8),
IconField(
icon: Icons.apps,
semanticLabel: 'OAuth App client id',
TextField(
controller: _clientIdController,
decoration: const InputDecoration(
labelText: 'OAuth App client id',
helperText: 'Needed for the Connect GitHub button',
),
),
const SizedBox(height: 8),
IconField(
icon: Icons.key,
semanticLabel: 'Personal access token (fallback)',
TextField(
controller: _tokenController,
obscure: true,
obscureText: true,
decoration: InputDecoration(
labelText: 'Personal access token (fallback)',
// Both wrapper hints are web-only; a VM test always takes
// the null branch.
// coverage:ignore-start
helperText: SyncSettings.exposesTokenValue
? null
: _storedToken.isEmpty
? 'Stored by the desktop wrapper, never by the browser'
: 'A token is stored by the desktop wrapper; type '
'here only to replace it',
// coverage:ignore-end
helperMaxLines: 2,
),
),
const SizedBox(height: 16),
Wrap(
spacing: 8,
children: [
IconButton.filled(
ElevatedButton(
onPressed: _busy ? null : _save,
icon: const Icon(Icons.check, semanticLabel: 'Save'),
child: const Text('Save'),
),
// Tests the GitHub connection only (a canAccessRepo call);
// it says nothing about Firebase.
IconButton.outlined(
OutlinedButton(
onPressed: _busy ? null : _testConnection,
icon: const Icon(
Icons.network_check,
semanticLabel: 'Test GitHub connection',
),
// Named for what it actually does: _testConnection builds
// a GitHub client and calls canAccessRepo(). It says
// nothing about Firebase, and the bare label implied
// otherwise.
child: const Text('Test GitHub connection'),
),
IconButton.filled(
ElevatedButton(
onPressed: _busy ? null : _syncNow,
icon: const Icon(Icons.sync, semanticLabel: 'Sync now'),
child: const Text('Sync now'),
),
],
),
if (_status != null) ...[
const SizedBox(height: 16),
Align(alignment: Alignment.centerLeft, child: _status),
Text(_status!, style: Theme.of(context).textTheme.bodyMedium),
],
],
),

View File

@ -7,7 +7,6 @@ library;
import 'dart:async';
import 'package:crdt_sync_flutter/crdt_sync_flutter.dart' show WaitWatch;
import 'package:diet_guard_app/models/food_entry.dart';
import 'package:diet_guard_app/screens/edit_entry_screen.dart';
import 'package:diet_guard_app/services/log_storage_service.dart';
@ -15,7 +14,7 @@ import 'package:diet_guard_app/widgets/history/history_filter.dart';
import 'package:diet_guard_app/widgets/history/history_filter_sheet.dart';
import 'package:diet_guard_app/widgets/history/history_grouping.dart';
import 'package:diet_guard_app/widgets/history/history_list.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
/// Logged meal history: every entry, grouped by day, filterable and sortable.
///
@ -160,16 +159,15 @@ class _HistoryScreenState extends State<HistoryScreen> {
final allEntries = _allEntries;
return Scaffold(
appBar: AppBar(
title: const Text('History'),
actions: [
if (allEntries != null)
Stack(
alignment: Alignment.center,
children: [
IconButton(
icon: const Icon(
Icons.filter_list,
semanticLabel: 'Filter & sort',
),
icon: const Icon(Icons.filter_list),
tooltip: 'Filter & sort',
onPressed: _openFilterSheet,
),
if (_filter.isActive)
@ -190,14 +188,11 @@ class _HistoryScreenState extends State<HistoryScreen> {
],
),
body: allEntries == null
? const WaitWatch.centered('history.load')
? const Center(child: CircularProgressIndicator())
: _displayed.isEmpty
? Center(
child: Icon(
allEntries.isEmpty ? Icons.restaurant : Icons.filter_list_off,
size: 64,
color: Theme.of(context).colorScheme.outline,
semanticLabel: allEntries.isEmpty
child: Text(
allEntries.isEmpty
? 'Nothing logged yet.'
: 'No entries match the current filter.',
),

View File

@ -2,11 +2,12 @@ import 'package:diet_guard_app/models/food_suggestion.dart';
import 'package:diet_guard_app/models/nutrition.dart';
import 'package:diet_guard_app/screens/log_meal_progress.dart';
import 'package:diet_guard_app/widgets/macro_input_row.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
/// Writes [suggestion]'s name and macros into the log form's controllers.
///
/// Split out of `log_meal_screen.dart` for the repo's 250-line cap.
/// Split out of `log_meal_screen.dart` for the repo's 250-line cap, mirroring
/// `log_meal_kuchnia_mixin.dart`'s `fillControllersFromDish`.
void fillControllersFromSuggestion(
FoodSuggestion suggestion,
TextEditingController desc,
@ -31,8 +32,7 @@ Nutrition nutritionFromControllers(MacroControllers macros, String source) =>
source: source,
);
/// The destination buttons in [LogMealScreen]'s app bar, after [leading]
/// (the date picker).
/// The five destination buttons in [LogMealScreen]'s app bar.
///
/// Split out of `log_meal_screen.dart` for the repo's 250-line cap. Returned
/// as a list to be spread into `AppBar.actions`, so the bar's structure and
@ -43,27 +43,30 @@ List<Widget> logMealAppBarActions({
required VoidCallback onCalendar,
required VoidCallback onSettings,
required VoidCallback onBody,
List<Widget> leading = const [],
}) => [
...leading,
IconButton(
icon: const Icon(Icons.monitor_weight, semanticLabel: 'Body'),
icon: const Icon(Icons.monitor_weight),
tooltip: 'Body',
onPressed: onBody,
),
IconButton(
icon: const Icon(Icons.restaurant_menu, semanticLabel: 'Food bank'),
icon: const Icon(Icons.restaurant_menu),
tooltip: 'Food bank',
onPressed: onFoodBank,
),
IconButton(
icon: const Icon(Icons.history, semanticLabel: 'History'),
icon: const Icon(Icons.history),
tooltip: 'History',
onPressed: onHistory,
),
IconButton(
icon: const Icon(Icons.calendar_month, semanticLabel: 'Calendar'),
icon: const Icon(Icons.calendar_month),
tooltip: 'Calendar',
onPressed: onCalendar,
),
IconButton(
icon: const Icon(Icons.settings, semanticLabel: 'Sync settings'),
icon: const Icon(Icons.settings),
tooltip: 'Sync settings',
onPressed: onSettings,
),
];

View File

@ -1,137 +0,0 @@
/// The sparkle button: send the typed text and/or photo to Claude.
///
/// Its own file because `log_meal_screen.dart` is at the repo's 250-line
/// ceiling. The transport is behind [ClaudeRelayClient]; this only drives the
/// button's states and shows the meal Claude logged.
///
/// The photo lives in [photo] for one send and nowhere else.
library;
import 'dart:async';
import 'dart:typed_data';
import 'package:diet_guard_app/screens/log_meal_due_mixin.dart';
import 'package:diet_guard_app/screens/log_meal_future_mixin.dart';
import 'package:diet_guard_app/screens/log_meal_logged_mixin.dart';
import 'package:diet_guard_app/screens/log_meal_sync_mixin.dart';
import 'package:diet_guard_app/services/claude_relay_client.dart';
import 'package:diet_guard_app/services/log_entry_lookup.dart';
import 'package:diet_guard_app/services/log_storage_service.dart';
import 'package:diet_guard_app/services/meal_photo_source.dart';
import 'package:diet_guard_app/widgets/logged_meal_row.dart';
import 'package:diet_guard_app/widgets/macro_input_row.dart';
import 'package:diet_guard_app/widgets/meal_action_row.dart';
import 'package:material_ui/material_ui.dart';
/// Photo attach and the Claude send, for the log screen's state.
mixin LogMealClaudeMixin<T extends StatefulWidget>
on
LogMealSyncMixin<T>,
LogMealDueMixin<T>,
LogMealLoggedMixin<T>,
LogMealFutureMixin<T> {
/// The relay this screen sends through. Supplied by the screen.
ClaudeRelayClient get relay;
/// Where photos come from. Supplied by the screen.
MealPhotoSource get photoSource;
/// The food field. Supplied by the screen.
TextEditingController get claudeDesc;
/// The macro fields. Supplied by the screen.
MacroControllers get claudeMacros;
/// The sparkle button's state.
ClaudeButtonState claudeState = ClaudeButtonState.idle;
/// The attached photo's JPEG bytes, or null. Never stored or synced.
Uint8List? photo;
StreamSubscription<ClaudeRelayEvent>? _relaySub;
String? _pendingRid;
/// Whether there is something to send (a description or a photo).
bool get canSend =>
futureDate == null &&
(claudeDesc.text.trim().isNotEmpty || photo != null);
/// Attaches a photo from [origin]; backing out keeps the current one.
Future<void> attachPhoto(PhotoOrigin origin) async {
final bytes = await photoSource.pick(origin);
if (!mounted || bytes == null) return;
setState(() => photo = bytes);
}
/// Drops the attached photo.
void removePhoto() => setState(() => photo = null);
/// Sends the form to Claude and follows the request's events.
void sendToClaude() {
if (!canSend) return;
final request = ClaudeRelayRequest(
requestId: newRequestId(),
slotMinute: targetSlot,
mode: dueMode ? ClaudeRelayMode.due : ClaudeRelayMode.normal,
text: claudeDesc.text.trim(),
photoJpeg: photo,
);
unawaited(_relaySub?.cancel());
_pendingRid = request.requestId;
setState(() => claudeState = ClaudeButtonState.sending);
_relaySub = relay.send(request).listen((e) => unawaited(_onEvent(e)));
}
Future<void> _onEvent(ClaudeRelayEvent event) async {
if (!mounted) return;
switch (event) {
case ClaudeRelayQueued():
setState(() => claudeState = ClaudeButtonState.queued);
case ClaudeRelayLocked():
_pendingRid = null;
setState(() => claudeState = ClaudeButtonState.locked);
case ClaudeRelayFailed():
_pendingRid = null;
setState(() => claudeState = ClaudeButtonState.error);
case ClaudeRelayLogged(:final entry):
_pendingRid = null;
// The worker logged it under the request id; the sync would deliver
// the same record, so this only shows it now and never doubles it.
final stored = await LogStorageService.instance.addIfAbsent(entry);
if (!mounted) return;
claudeDesc.clear();
claudeMacros.clear();
setState(() {
claudeState = ClaudeButtonState.idle;
photo = null;
});
showLogged([LoggedMeal(stored, LoggedOrigin.claude)]);
await publishAfterLog();
await refreshSlots();
}
}
/// Withdraws a request that is still in flight or queued, because the user
/// just logged the meal here instead.
///
/// Unclaimed: the node is deleted and the stream dropped. Already claimed
/// (the PC is mid-estimate): the meal will be logged, so the stream stays
/// open and its row shows with an undo rather than the entry turning up
/// unseen after the next sync. That race is accepted, see
/// `docs/DOCS-claude-relay.md`.
Future<void> withdrawClaude() async {
final rid = _pendingRid;
final waiting =
claudeState == ClaudeButtonState.sending ||
claudeState == ClaudeButtonState.queued;
if (rid == null || !waiting) return;
if (await relay.cancel(rid)) {
_pendingRid = null;
await _relaySub?.cancel();
}
}
/// Cancels the event subscription; call from `dispose`. A request still
/// queued on the PC reaches this phone through sync instead.
void disposeClaude() => unawaited(_relaySub?.cancel());
}

View File

@ -1,89 +0,0 @@
/// Due mode: some slot has elapsed with nothing logged.
///
/// The log screen then strips everything that is not "log this meal now" (the
/// app bar, sync banner, date row), hides the Android status bar, and targets
/// the oldest due slot with both the check and the sparkle. Its own file
/// because `log_meal_screen.dart` is at the repo's 250-line ceiling.
///
/// Slot arithmetic is not touched here: due slots come from `missingSlots`
/// and the nearest-slot rule from `slotForLog`, both in `models/slot.dart`.
library;
import 'dart:async';
import 'package:diet_guard_app/models/slot.dart';
import 'package:diet_guard_app/screens/log_meal_sync_mixin.dart';
import 'package:diet_guard_app/services/meal_schedule_service.dart';
import 'package:flutter/services.dart';
import 'package:material_ui/material_ui.dart';
/// The clock the log screen reads for "which slots are due".
///
/// A hook rather than a constructor argument so the whole screen suite can pin
/// it once (`flutter_test_config.dart` pins 07:00, before the first slot);
/// otherwise every nav and slot test would pass at night and fail by day, once
/// due mode hides the app bar.
@visibleForTesting
DateTime Function() logMealClock = DateTime.now;
/// Shows or hides the Android status bar.
///
/// `main.dart` sets no system-UI mode, so "visible" is the platform default:
/// both bars shown. [hidden] true is sticky-immersive; false puts both back.
@visibleForTesting
Future<void> Function({required bool hidden}) setStatusBarHidden = _setBars;
Future<void> _setBars({required bool hidden}) => hidden
? SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky)
: SystemChrome.setEnabledSystemUIMode(
SystemUiMode.manual,
overlays: SystemUiOverlay.values,
);
/// Due-mode state and slot targeting for the log screen's state.
mixin LogMealDueMixin<T extends StatefulWidget> on LogMealSyncMixin<T> {
/// Whether the first read of today's log has finished. Until then the
/// screen draws neither mode, so it never flashes the app bar and drops it.
bool slotsLoaded = false;
bool _statusBarHidden = false;
/// What the screen reads as "now" (see [logMealClock]).
DateTime get screenNow => logMealClock();
/// Elapsed slots with nothing logged, oldest first.
List<int> get dueSlots =>
missingSlots(screenNow, loggedSlots, MealScheduleService.current);
/// Whether the screen is in due mode.
bool get dueMode => slotsLoaded && dueSlots.isNotEmpty;
/// The slot a log or a send lands in: the oldest due slot, else the slot
/// nearest [screenNow] (`slotForLog`).
int get targetSlot => dueSlots.isNotEmpty
? dueSlots.first
: slotForLog(screenNow, MealScheduleService.current);
@override
Future<void> refreshSlots() async {
await super.refreshSlots();
if (!mounted) return;
setState(() => slotsLoaded = true);
await syncStatusBar();
}
/// Hides the status bar while in due mode and restores it on exit.
Future<void> syncStatusBar() async {
final hide = dueMode;
if (hide == _statusBarHidden) return;
_statusBarHidden = hide;
await setStatusBarHidden(hidden: hide);
}
/// Puts the status bar back; call from `dispose`.
void restoreStatusBar() {
if (!_statusBarHidden) return;
_statusBarHidden = false;
unawaited(setStatusBarHidden(hidden: false));
}
}

View File

@ -0,0 +1,105 @@
/// Wires "Fill all with catering" into the log form.
///
/// Its own file because `log_meal_screen.dart` and
/// `log_meal_kuchnia_mixin.dart` are both at the repo's 250-line ceiling. The
/// rule lives in `kuchnia_fill.dart` and the two-tap state in
/// `kuchnia_fill_flow.dart`; this only connects them to the screen.
library;
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_sync_mixin.dart';
import 'package:diet_guard_app/services/kuchnia_fill_flow.dart';
import 'package:diet_guard_app/services/kuchnia_queue.dart';
import 'package:diet_guard_app/services/kuchnia_spread.dart';
import 'package:flutter/material.dart';
/// Drives the screen's [FillAllFlow] and tidies the screen after a fill.
mixin LogMealFillMixin<T extends StatefulWidget>
on LogMealSyncMixin<T>, LogMealKuchniaMixin<T>, LogMealFutureMixin<T> {
/// The flow behind the button. Per-screen, so leaving the screen drops an
/// armed proposal along with it.
FillAllFlow fillFlow = FillAllFlow();
/// Shows [message] in the form's status line. Supplied by the screen.
void showFillStatus(String message);
/// A proposal belongs to the date it was fetched for; picking another (or
/// going back to today) must not leave "Confirm (N)" offering it.
@override
void onLogDateChanged() {
super.onLogDateChanged();
fillFlow.cancel();
}
/// Runs one tap: the first proposes, a second on the same day confirms.
/// Fills the "Log for later" date when one is picked, else today.
Future<void> onFillAll() async {
final day = futureDate;
final pending = fillFlow.tap(day: day);
setState(() {}); // show the busy label while the fetch/writes run
final FillOutcome? outcome;
try {
outcome = await pending;
} on Exception catch (error) {
if (!mounted) return;
setState(() {});
// A confirm can fail partway through its writes. Whatever did land is
// a real meal, so it is published like any other rather than waiting
// for the next tick, and the user is told the batch did not finish.
await publishAfterLog();
await refreshSlots();
if (mounted) showFillStatus('Fill all failed: $error');
return;
}
if (!mounted) return;
setState(() {});
if (outcome == null) return;
if (outcome.written.isNotEmpty) {
await _afterFill(outcome.written, later: day != null);
}
if (!mounted) return;
showFillStatus(outcome.message);
}
/// Disarms a proposal without writing anything.
void onFillCancel() {
fillFlow.cancel();
showFillStatus('Fill all cancelled — nothing logged.');
}
/// Publishes the batch once and drops the filled dishes from the delivery
/// queue, so "Today's delivery (N more to go)" and the prefilled form do
/// not keep offering meals that were just logged.
///
/// A [later] fill logged another day's delivery: today's queue and form are
/// left alone, and the screen goes back to today, as after a manual
/// "Log for later" -- the picked day's slot row would otherwise be stale.
Future<void> _afterFill(
List<SlottedDish> written, {
required bool later,
}) async {
if (later) {
resetFutureLog();
await publishAfterLog();
await refreshSlots();
return;
}
if (KuchniaQueueService.isInitialized) {
for (final item in written) {
KuchniaQueueService.instance.markLogged(item.dish);
}
}
final offered = offeredDish;
if (offered != null &&
written.any((item) => item.dish.bankKey == offered.bankKey)) {
// The prefilled dish was just logged by the fill; leaving it in the
// form would invite a second, duplicate submit.
descController.clear();
macroControllers.clear();
}
prefillNextDish();
await publishAfterLog();
await refreshSlots();
}
}

View File

@ -3,7 +3,10 @@
/// Its own file because `log_meal_screen.dart` is at the repo's 250-line cap.
///
/// Scoped to dates strictly after today: the date picker's `firstDate` is
/// tomorrow.
/// tomorrow. Today's own not-yet-due slots keep using the screen's existing
/// [SlotSelectorRow] (driven by the real `DateTime.now()`), so this mixin
/// never has to reproduce its "due" (red) coloring, which is meaningless for
/// a day that hasn't started.
library;
import 'package:diet_guard_app/models/food_entry.dart';
@ -12,9 +15,9 @@ import 'package:diet_guard_app/models/meal_schedule.dart';
import 'package:diet_guard_app/models/slot.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/widgets/pickers/pickers.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:diet_guard_app/widgets/slot_selector_row.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
/// Adds a future-date meal-log picker to [LogMealScreen]'s state.
mixin LogMealFutureMixin<T extends StatefulWidget> on State<T> {
@ -48,7 +51,7 @@ mixin LogMealFutureMixin<T extends StatefulWidget> on State<T> {
Future<void> _pickFutureDate() async {
final today = DateTime.now();
final tomorrow = DateTime(today.year, today.month, today.day + 1);
final picked = await pickDate(
final picked = await showDatePicker(
context: context,
firstDate: tomorrow,
lastDate: tomorrow.add(const Duration(days: 365)),
@ -81,58 +84,51 @@ mixin LogMealFutureMixin<T extends StatefulWidget> on State<T> {
onLogDateChanged();
}
/// The app bar's date actions: the picker (leftmost icon) and, once a date
/// is picked, a way back to today. A picked date tints the picker gold with
/// a small dot; no text is painted.
List<Widget> buildDateActions(BuildContext context) {
/// The "When" row: a "Log for later" button, or the picked date with a
/// button to change it and one to clear back to today.
Widget buildWhenRow(BuildContext context) {
final date = _futureDate;
final gold = Theme.of(context).colorScheme.primary;
return [
IconButton(
// Not Icons.calendar_month: the bar's own "Calendar" nav button uses
// that, and two on screen make `find.byIcon` ambiguous.
icon: Stack(
clipBehavior: Clip.none,
children: [
Icon(
Icons.edit_calendar,
color: date == null ? null : gold,
semanticLabel: date == null ? 'Log for later' : 'Change date',
),
if (date != null)
Positioned(
top: -1,
right: -1,
child: Container(
key: const ValueKey('log-date-badge'),
width: 8,
height: 8,
decoration: BoxDecoration(
color: gold,
shape: BoxShape.circle,
),
),
),
],
final scheme = Theme.of(context).colorScheme;
return Row(
children: [
Icon(Icons.event, size: 18, color: scheme.onSurfaceVariant),
const SizedBox(width: AppSpacing.xs),
Expanded(child: Text(date == null ? 'Today' : localDateKey(date))),
TextButton.icon(
// Not Icons.calendar_month: the app bar's own "Calendar" nav button
// already uses that, and a second one on screen makes
// `find.byIcon` ambiguous for widget tests (and taps) alike.
icon: const Icon(Icons.date_range, size: 18),
label: Text(date == null ? 'Log for later' : 'Change date'),
onPressed: _pickFutureDate,
),
onPressed: _pickFutureDate,
),
if (date != null)
IconButton(
icon: const Icon(Icons.close, semanticLabel: 'Back to today'),
onPressed: resetFutureLog,
),
];
if (date != null)
IconButton(
icon: const Icon(Icons.close),
tooltip: 'Back to today',
onPressed: resetFutureLog,
),
],
);
}
/// The slot row for a picked future date, else nothing.
///
/// Today has no slot row any more: the screen derives today's slot (the
/// oldest due one, else the nearest). A *future* date has no due slots to
/// derive from, so the row survives for exactly that case.
Widget buildSlotRow() {
/// The slot row to show: [futureDate]'s own (driven by that date's logged
/// slots) when a future date is picked, otherwise today's, built from the
/// screen's own state and [onTodaySlotSelected].
Widget buildSlotRow({
required Set<int> loggedSlots,
required int? selectedSlot,
required ValueChanged<int?> onTodaySlotSelected,
}) {
final date = _futureDate;
if (date == null) return const SizedBox.shrink();
if (date == null) {
return SlotSelectorRow(
now: DateTime.now(),
loggedSlots: loggedSlots,
selectedSlot: selectedSlot,
onSlotSelected: onTodaySlotSelected,
);
}
return SlotSelectorRow(
now: DateTime(date.year, date.month, date.day),
schedule: _futureSchedule,

View File

@ -0,0 +1,235 @@
/// Offers the day's delivered catering dishes to the log form.
///
/// Its own file because `log_meal_screen.dart` is at the repo's 250-line
/// ceiling.
///
/// **A delivered meal is not an eaten meal.** This only ever *prefills* the
/// form -- the user still taps "Log" for each dish. Nothing here writes a log
/// entry, and nothing here may start doing so: the gate would then satisfy its
/// own checkpoint from a delivery note, and the log would record what the
/// courier dropped off rather than what was eaten.
///
/// [prefillNextDish] is called from **two** places: once when the delivery
/// first arrives, and again after every successful submit. That second caller
/// is the load-bearing one. On the PC it briefly did not exist, which made the
/// "(N more to go)" promise a dead letter -- every dish after the first stayed
/// queued behind another click. `kuchnia_queue_test.dart` asserts the state
/// transition rather than "a dish was offered", because the latter passes
/// while this misbehaves.
library;
import 'package:diet_guard_app/models/kuchnia_dish.dart';
import 'package:diet_guard_app/models/slot.dart';
import 'package:diet_guard_app/services/kuchnia_import.dart';
import 'package:diet_guard_app/services/kuchnia_queue.dart';
import 'package:diet_guard_app/services/kuchnia_spread.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/widgets/macro_input_row.dart';
import 'package:flutter/material.dart';
/// Writes [dish]'s name and macros into the log form's controllers.
///
/// Free function rather than a mixin method so the numeric formatting is
/// testable without pumping a widget.
///
/// Clears every macro field first, mirroring `_gatelock_delivery.py`'s
/// `self._clear_inputs()`. Dropping that step is what corrupted a real log
/// entry on 2026-08-23: a dish carries *per-portion* macros and leaves
/// [MacroControllers.perGrams] untouched, so a `100` left behind by an
/// earlier food-bank pick made `nutritionForPortion` read them as *per-100g*
/// and scale them by `grams / 100` -- 472 kcal logged as 1217.8.
///
/// The clear is a single call covering all six controllers rather than a
/// `perGrams.clear()` line here, so a seventh field added later cannot be
/// forgotten at this call site; `MacroControllers.clear()` is enumerated by
/// its own test.
void fillControllersFromDish(
KuchniaDish dish,
TextEditingController desc,
MacroControllers macros,
) {
macros.clear();
desc.text = dish.name;
final (grams, values) = dishFieldValues(dish);
macros.kcal.text = values.$1;
macros.protein.text = values.$2;
macros.carbs.text = values.$3;
macros.fat.text = values.$4;
macros.grams.text = grams;
}
/// Wires the catering queue into a log form.
mixin LogMealKuchniaMixin<T extends StatefulWidget> on State<T> {
/// The dish currently prefilled from the delivery, if any.
KuchniaDish? offeredDish;
/// How many delivered dishes still need logging, including the offered one.
///
/// The offered dish counts: it is prefilled, not logged, and the user has
/// still to tap for it. Excluding it made the line read "0 more" while a
/// real dish sat in the form.
int get dishesStillQueued => KuchniaQueueService.remaining;
/// The form's description field. Supplied by the screen.
TextEditingController get descController;
/// The form's macro fields. Supplied by the screen.
MacroControllers get macroControllers;
/// Called after the form is filled, so the screen can mark the source.
void onDishPrefilled() {}
/// Fills the form's fields from [dish].
///
/// Concrete here rather than an abstract hook: every implementation would be
/// the same three lines, and the screen file has no budget to spare.
void fillFormFromDish(KuchniaDish dish) {
fillControllersFromDish(dish, descController, macroControllers);
onDishPrefilled();
}
/// Loads today's delivery, guarded so it costs at most one walk per day.
///
/// Goes through [KuchniaQueueService.refreshOnce] rather than
/// `refreshDelivery`: this is an *automatic* trigger and can fire after
/// every meal, and each unguarded refresh is a login plus three requests
/// against a third party. The settings button is the explicit ask that
/// always goes and looks.
Future<void> loadDeliveryOnce({Set<String> alreadyLogged = const {}}) async {
if (!KuchniaQueueService.isInitialized) return;
final result = await KuchniaQueueService.refreshOnce(DateTime.now());
if (!mounted || result.dishes.isEmpty) return;
// Ordered by the caterer's own meal priority, against the *user's*
// schedule -- not a hardcoded four slots. A dish offered for a slot the
// user's schedule does not have is a checkpoint that can never be met.
final ordered = dishesInSlotOrder(
result.dishes,
daySlots(MealScheduleService.current),
);
KuchniaQueueService.instance.offer(ordered, alreadyLogged: alreadyLogged);
prefillNextDish();
}
/// Loads today's delivery, skipping dishes already logged today.
///
/// The skip matters across devices: a dish logged on the PC must not be
/// offered again here, and the food log is the only record of that.
Future<void> loadTodaysDelivery() async {
final logged = await LogStorageService.instance.todayEntries();
if (!mounted) return;
await loadDeliveryOnce(
alreadyLogged: {
for (final entry in logged) entry.desc.trim().toLowerCase(),
},
);
}
/// Loads today's delivery on an **explicit** user tap, unguarded.
///
/// Deliberately [refreshDelivery], not [KuchniaQueueService.refreshOnce]:
/// per `docs/kuchnia-wikinga.md`'s Triggers table, a user who asks gets a
/// look, the same as the CLI and the settings button. The guard exists to
/// rate-limit *automatic* triggers, and applying it here would make the
/// button silently do nothing for the rest of the day after the startup
/// load — the failure that has nothing to tap in the kitchen.
///
/// Still skips dishes already logged today (a dish logged on the PC must
/// not be re-offered) and still records the fetch, so a successful tap
/// also spares the automatic path a second walk.
///
/// Returns a line to show the user, or null when a dish was prefilled and
/// the form speaks for itself.
Future<String?> loadDeliveryOnTap() async {
if (!KuchniaQueueService.isInitialized) return 'Catering is not ready yet.';
final logged = await LogStorageService.instance.todayEntries();
if (!mounted) return null;
final result = await refreshDelivery(DateTime.now());
if (!mounted) return null;
if (!result.ok) return result.reason;
if (result.dishes.isEmpty) return 'No delivery today.';
await KuchniaQueueService.instance.recordFetched(DateTime.now());
if (!mounted) return null;
final ordered = dishesInSlotOrder(
result.dishes,
daySlots(MealScheduleService.current),
);
KuchniaQueueService.instance.offer(
ordered,
alreadyLogged: {
for (final entry in logged) entry.desc.trim().toLowerCase(),
},
);
if (KuchniaQueueService.next == null) {
return 'All delivered dishes are already logged.';
}
prefillNextDish();
return null;
}
/// Whether an explicit delivery fetch is in flight.
///
/// Only guards against a double tap opening two logins at once -- it is not
/// the daily guard, which an explicit tap deliberately bypasses.
bool deliveryBusy = false;
/// Runs [loadDeliveryOnTap] and shows its outcome as a SnackBar.
///
/// Lives here rather than on the screen because `log_meal_screen.dart` is at
/// the 250-line cap, and this is the mixin's own behaviour anyway.
Future<void> loadDeliveryAndReport() async {
setState(() => deliveryBusy = true);
String? message;
try {
message = await loadDeliveryOnTap();
} finally {
if (mounted) setState(() => deliveryBusy = false);
}
if (!mounted || message == null) return;
ScaffoldMessenger.of(
context,
).showSnackBar(SnackBar(content: Text(message)));
}
/// Prefills the form with the next queued dish, if there is one.
///
/// Safe to call when the queue is empty: it simply clears the offer.
void prefillNextDish() {
final dish = KuchniaQueueService.next;
if (dish == null) {
if (offeredDish != null) setState(() => offeredDish = null);
return;
}
setState(() => offeredDish = dish);
fillFormFromDish(dish);
}
/// Drops the just-logged dish and immediately offers the next one.
///
/// Call this from the submit handler *after* the entry is written. This is
/// the second caller that keeps the queue alive across a submit.
void advanceQueueAfterLog(String loggedDesc) {
final dish = offeredDish;
if (dish == null) return;
if (dish.name.trim().toLowerCase() != loggedDesc.trim().toLowerCase()) {
// The user edited the description into something else, so the offered
// dish was not what they logged. Leave it queued rather than silently
// marking a dish eaten that never was.
return;
}
KuchniaQueueService.instance.markLogged(dish);
offeredDish = null;
prefillNextDish();
}
/// A short line naming what is still queued, or null when nothing is.
///
/// The leftover matters: the caterer's five meals against four default slots
/// means at least one dish is still queued when the last slot is logged. It
/// is already banked, so it is named rather than dropped silently.
String? get queueStatusLine {
final left = dishesStillQueued;
if (left <= 0) return null;
return '$left more delivered ${left == 1 ? 'dish' : 'dishes'} to log.';
}
}

View File

@ -1,74 +0,0 @@
/// The meals the screen logged for the user, shown below the action row with
/// an undo, plus the catering auto-log that fills the first of them.
///
/// The rows stay until the next meal is logged. Undo tombstones that one entry
/// by id (`deleteEntry`, never `undoLastToday`: several rows can be on screen,
/// and an auto-logged dish is not necessarily the newest entry), so the
/// deterministic catering id keeps blocking a re-log on the next open.
library;
import 'dart:async';
import 'package:diet_guard_app/screens/log_meal_due_mixin.dart';
import 'package:diet_guard_app/screens/log_meal_sync_mixin.dart';
import 'package:diet_guard_app/services/kuchnia_autolog.dart';
import 'package:diet_guard_app/services/log_storage_service.dart';
import 'package:diet_guard_app/widgets/logged_meal_row.dart';
import 'package:material_ui/material_ui.dart';
/// Logged-meal rows, undo and the catering auto-log.
mixin LogMealLoggedMixin<T extends StatefulWidget>
on LogMealSyncMixin<T>, LogMealDueMixin<T> {
/// The rows under the action row, oldest first.
List<LoggedMeal> loggedRows = const [];
/// Replaces the rows with [meals]: a new log retires the previous ones.
void showLogged(List<LoggedMeal> meals) {
if (mounted) setState(() => loggedRows = meals);
}
/// Tombstones [meal]'s entry, drops its row and republishes.
Future<void> undoLogged(LoggedMeal meal) async {
final id = meal.entry.id;
if (id == null) return;
setState(() => loggedRows = [...loggedRows]..remove(meal));
await LogStorageService.instance.deleteEntry(id);
await publishAfterLog();
await refreshSlots();
}
/// Logs the delivered dishes of the due slots, no tap needed.
///
/// The old rule "a delivered meal is not an eaten meal" was overridden by
/// kuhy on 2026-11-17 ("LOG EVEN WITHOUT TAP"). Safe to call repeatedly: the
/// ids are deterministic (see `kuchnia_autolog.dart`).
Future<void> autoLogCatering() async {
if (!dueMode) return;
final entries = await KuchniaAutoLog.instance.logDue(dueSlots);
if (!mounted || entries.isEmpty) return;
showLogged([for (final e in entries) LoggedMeal(e, LoggedOrigin.catering)]);
await publishAfterLog();
await refreshSlots();
}
@override
void didChangeAppLifecycleState(AppLifecycleState state) {
// A resume does what an open does, with one sync (autoSync is
// single-flight, so calling super too would let the auto-log run before
// the pull finished). Pause still pushes through the sync mixin.
if (state == AppLifecycleState.resumed) {
unawaited(onOpenedOrResumed());
return;
}
super.didChangeAppLifecycleState(state);
}
/// What a fresh open or a resume does: show the screen from the local log,
/// pull what other devices logged, then auto-log what is still due.
Future<void> onOpenedOrResumed() async {
unawaited(refreshSlots());
await autoSync();
await refreshSlots();
await autoLogCatering();
}
}

View File

@ -3,8 +3,8 @@ import 'package:diet_guard_app/screens/calendar_screen.dart';
import 'package:diet_guard_app/screens/food_bank_screen.dart';
import 'package:diet_guard_app/screens/history_screen.dart';
import 'package:diet_guard_app/screens/settings_screen.dart';
import 'package:flutter/material.dart';
import 'package:http/http.dart' as http;
import 'package:material_ui/material_ui.dart';
/// The five app-bar destinations reachable from [LogMealScreen].
///

View File

@ -1,54 +1,43 @@
/// 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."
///
/// Two modes. **Due mode** (a slot elapsed with nothing logged) shows only
/// what logging needs: the food field, suggestions, macros and the action row,
/// with the status bar hidden. **Normal mode** adds the app bar, the sync
/// banner and the date row. Either way the action row is photo / Claude /
/// log, and the field never moves between states.
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_claude_mixin.dart';
import 'package:diet_guard_app/screens/log_meal_due_mixin.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_logged_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/claude_relay_client.dart';
import 'package:diet_guard_app/services/foodbank_service.dart';
import 'package:diet_guard_app/services/log_feedback.dart';
import 'package:diet_guard_app/services/log_storage_service.dart';
import 'package:diet_guard_app/services/meal_photo_source.dart';
import 'package:diet_guard_app/ui/cues.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/logged_meal_row.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/meal_action_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;
import 'package:material_ui/material_ui.dart';
/// Lets the user log one food item, with food-bank autocomplete.
/// 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, this.relay, this.photos});
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;
/// Where the sparkle button sends; the app-wide [claudeRelay] when null.
final ClaudeRelayClient? relay;
/// Where photos come from; the camera/gallery picker when null.
final MealPhotoSource? photos;
@override
State<LogMealScreen> createState() => _LogMealScreenState();
}
@ -57,28 +46,20 @@ class _LogMealScreenState extends State<LogMealScreen>
with
WidgetsBindingObserver,
LogMealSyncMixin<LogMealScreen>,
LogMealDueMixin<LogMealScreen>,
LogMealLoggedMixin<LogMealScreen>,
LogMealNavMixin<LogMealScreen>,
LogMealKuchniaMixin<LogMealScreen>,
LogMealFutureMixin<LogMealScreen>,
LogMealClaudeMixin<LogMealScreen> {
LogMealFillMixin<LogMealScreen> {
@override
http.Client? get syncHttpClient => widget.httpClient;
@override
ClaudeRelayClient get relay => widget.relay ?? claudeRelay;
@override
late final MealPhotoSource photoSource =
widget.photos ?? ImagePickerPhotoSource();
final TextEditingController _descController = TextEditingController();
final MacroControllers _macros = MacroControllers();
@override
TextEditingController get claudeDesc => _descController;
@override
MacroControllers get claudeMacros => _macros;
List<FoodSuggestion> _suggestions = const [];
@override
int? selectedSlot;
String _source = 'manual';
CueState? _cue; // painted as a tinted icon, never as text
String? _status;
TodayProgress? _progress;
@override
@ -87,29 +68,39 @@ class _LogMealScreenState extends State<LogMealScreen>
WidgetsBinding.instance.addObserver(this);
_descController.addListener(_onDescChanged);
_macros.addListenerToAll(_onMacroEdited);
selectedSlot = slotForLog(DateTime.now(), MealScheduleService.current);
unawaited(refreshSlots());
unawaited(_onDescChanged());
// Health first, so a device that stalled earlier says so before a tick.
// 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(onOpenedOrResumed());
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);
disposeClaude();
restoreStatusBar();
_descController.dispose();
_macros.dispose();
super.dispose();
}
void _onMacroEdited() {
if (_source == 'food bank') setState(() => _source = 'manual');
if (_source == 'food bank') {
setState(() => _source = 'manual');
}
}
/// Re-runs the food-bank search and dismisses the previous progress card,
/// only while the field is non-empty: [_onLogMeal]'s own `clear()` fires
/// this listener too, and would otherwise race it and null the new card.
/// 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;
@ -119,6 +110,18 @@ class _LogMealScreenState extends State<LogMealScreen>
});
}
@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(() {
@ -129,14 +132,23 @@ class _LogMealScreenState extends State<LogMealScreen>
Future<void> _onLogMeal() async {
final desc = _descController.text.trim();
if (desc.isEmpty) return;
final target = resolveLogTarget(targetSlot);
if (target.error != null) {
setState(() => _cue = CueState.next(_cue, CueKind.error, target.error!));
if (desc.isEmpty) {
setState(() {
_status = 'Type what you ate first.';
_progress = null;
});
return;
}
LogFeedback.mealLogged(); // on the tap, before the write
unawaited(withdrawClaude()); // else Claude would log it a second time
final target = resolveLogTarget(selectedSlot);
if (target.error != null) {
setState(() {
_status = target.error;
_progress = null;
});
return;
}
// On the tap, before the write/sync: waiting for them is just latency.
LogFeedback.mealLogged();
final entry = await LogStorageService.instance.logMeal(
desc,
nutritionFromControllers(_macros, _source),
@ -150,99 +162,87 @@ class _LogMealScreenState extends State<LogMealScreen>
_macros.clear();
setState(() {
_source = 'manual';
photo = null; // else a stale photo keeps the sparkle lit
claudeState = ClaudeButtonState.idle;
selectedSlot = slotForLog(DateTime.now(), MealScheduleService.current);
});
await refreshSlots();
if (!mounted) return;
showLogged([LoggedMeal(entry, LoggedOrigin.local)]);
// 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(() {
_cue = null;
_status = queueStatusLine;
_progress = buildTodayProgress(log, logged: entry);
});
}
@override
Widget build(BuildContext context) {
if (!slotsLoaded) return const Scaffold();
final due = dueMode;
// Dimmed while Claude works, but never moved: nothing is added around it.
final busy = claudeState == ClaudeButtonState.sending;
// Hard rule: nothing sits under the keyboard, so the extras collapse.
final typing = MediaQuery.viewInsetsOf(context).bottom > 0;
final dim = busy || claudeState == ClaudeButtonState.queued;
return Scaffold(
appBar: due
? null
: AppBar(
actions: logMealAppBarActions(
onFoodBank: onOpenFoodBank,
onHistory: onOpenHistory,
onCalendar: onOpenCalendar,
onSettings: onOpenSettings,
onBody: onOpenBody,
leading: buildDateActions(context),
),
),
body: SafeArea(
child: SingleChildScrollView(
padding: const EdgeInsets.all(AppSpacing.md),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (!due) SyncHealthBanner(status: syncHealth),
buildSlotRow(),
Opacity(
opacity: dim ? 0.5 : 1,
child: IgnorePointer(
ignoring: busy,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
IconField(
controller: _descController,
icon: Icons.fastfood,
semanticLabel: 'What did you eat?',
onChanged: (_) => setState(() {}),
),
AutocompleteSuggestionList(
suggestions: _suggestions,
onSelected: _onSuggestionSelected,
compact: true,
compactLimit: due ? 2 : 3,
reserveHeight: due,
),
const SizedBox(height: AppSpacing.sm),
MacroInputRow(controllers: _macros, compact: true),
],
),
),
),
const SizedBox(height: AppSpacing.sm),
MealActionRow(
claude: claudeState,
photoAttached: photo != null,
canSend: canSend,
canLog: _descController.text.trim().isNotEmpty,
onPhoto: () => unawaited(attachPhoto(PhotoOrigin.camera)),
onGallery: () => unawaited(attachPhoto(PhotoOrigin.gallery)),
onRemovePhoto: removePhoto,
onSend: sendToClaude,
onLog: _onLogMeal,
),
if (!typing)
for (final meal in loggedRows)
LoggedMealRow(meal: meal, onUndo: () => undoLogged(meal)),
if (_cue != null) ...[
const SizedBox(height: AppSpacing.sm),
_cue!.widget,
],
if (_progress != null && !due && !typing) ...[
const SizedBox(height: AppSpacing.sm),
TodayProgressCard(progress: _progress!),
],
],
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!),
],
],
),
),
);

View File

@ -1,6 +1,7 @@
import 'dart:async';
import 'dart:developer';
import 'package:diet_guard_app/models/slot.dart';
import 'package:diet_guard_app/services/background_tasks.dart';
import 'package:diet_guard_app/services/due_slot_check.dart';
import 'package:diet_guard_app/services/firebase_client.dart';
@ -8,12 +9,12 @@ import 'package:diet_guard_app/services/foodbank_service.dart';
import 'package:diet_guard_app/services/github_client_factory.dart';
import 'package:diet_guard_app/services/health_steps.dart';
import 'package:diet_guard_app/services/log_storage_service.dart';
import 'package:diet_guard_app/services/sync_attempt.dart';
import 'package:diet_guard_app/services/meal_schedule_service.dart';
import 'package:diet_guard_app/services/sync_health.dart';
import 'package:diet_guard_app/services/sync_service.dart';
import 'package:diet_guard_app/services/sync_settings.dart';
import 'package:flutter/material.dart';
import 'package:http/http.dart' as http;
import 'package:material_ui/material_ui.dart';
/// Background-sync and lifecycle behaviour for [LogMealScreen]'s state.
///
@ -34,6 +35,12 @@ mixin LogMealSyncMixin<T extends StatefulWidget> on State<T>
/// The slots that already carry a logged meal today.
Set<int> loggedSlots = {};
/// The slot the screen is currently logging for.
///
/// Owned by the screen's own state; declared here so
/// [onScheduleMayHaveChanged] can re-derive it when the schedule changes.
abstract int? selectedSlot;
/// The screen's injected HTTP client, or null to use the default.
///
/// Declared abstract so the mixin stays independent of the widget's own
@ -69,7 +76,6 @@ mixin LogMealSyncMixin<T extends StatefulWidget> on State<T>
Future<void> autoSync() async {
if (autoSyncing) return;
autoSyncing = true;
bool? landed; // null until the sync itself ran
try {
final settings = await SyncSettings.load();
// Either backend counts. `isConfigured` means "has a GitHub token", so
@ -89,19 +95,17 @@ mixin LogMealSyncMixin<T extends StatefulWidget> on State<T>
return;
}
final client = createGitHubClient(settings, httpClient: syncHttpClient);
landed = await attemptSync(() async {
try {
// Foreground only (this mixin is UI), and never prompts: fresh
// Health Connect steps ride along in this tick's body.json.
await refreshSteps();
await runSync(await syncBackend(client));
} finally {
client.close();
}
});
try {
// Foreground only (this mixin is UI), and never prompts: fresh
// Health Connect steps ride along in this tick's body.json.
await refreshSteps();
await runSync(await syncBackend(client));
await SyncHealth.recordSuccess();
} finally {
client.close();
}
if (!mounted) return;
// Outside attemptSync: a refresh error is no sync failure.
if (landed) await refreshSlots();
await refreshSlots();
await refreshSyncHealth();
} on Object catch (error, stackTrace) {
// Best-effort, but never silent: this swallowed the reason a desktop
@ -114,9 +118,7 @@ mixin LogMealSyncMixin<T extends StatefulWidget> on State<T>
error: error,
stackTrace: stackTrace,
);
// attemptSync already recorded the sync's own outcome; only a failure
// before it (loading settings) is one here.
if (landed == null) await SyncHealth.recordFailure();
await SyncHealth.recordFailure();
if (mounted) await refreshSyncHealth();
} finally {
autoSyncing = false;
@ -172,12 +174,21 @@ mixin LogMealSyncMixin<T extends StatefulWidget> on State<T>
setState(() => loggedSlots = logged);
}
/// Re-derives the due slots after the settings screen pops.
/// Rebuilds the slot row after the settings screen pops.
///
/// The meal-schedule editor lives in settings, and which slots are due (and
/// so whether the screen is in due mode) reads `MealScheduleService.current`
/// at refresh time. Found on the phone: without this the settings preview
/// and the overdue reminder both updated while the screen behind them kept
/// the old checkpoints until the app was restarted.
Future<void> onScheduleMayHaveChanged() => refreshSlots();
/// The meal-schedule editor lives in settings, and [SlotSelectorRow] reads
/// `MealScheduleService.current` at build time, so refreshing is enough to
/// re-derive the row -- but the selected slot also has to be recomputed,
/// since the minute it referred to may no longer be a checkpoint at all.
///
/// Found on the phone: without this the settings preview and the overdue
/// reminder both updated while the row behind them kept the old four
/// checkpoints until the app was restarted.
Future<void> onScheduleMayHaveChanged() async {
await refreshSlots();
if (!mounted) return;
setState(() {
selectedSlot = slotForLog(DateTime.now(), MealScheduleService.current);
});
}
}

View File

@ -7,18 +7,11 @@
part of 'settings_screen.dart';
mixin _SettingsKcalGoal on State<SettingsScreen> {
/// The latest outcome as an icon cue; null until something happened.
Widget? _status;
String? _status;
void _showCue(CueKind kind, String semanticLabel) {
void _showMessage(String message) {
if (!mounted) return;
setState(
() => _status = StatusCue(
key: UniqueKey(),
kind: kind,
semanticLabel: semanticLabel,
),
);
setState(() => _status = message);
}
Timer? _kcalGoalDebounce;
@ -57,13 +50,13 @@ mixin _SettingsKcalGoal on State<SettingsScreen> {
() => Permission.ignoreBatteryOptimizations.request();
try {
final status = await request();
if (status.isGranted) {
_showCue(CueKind.ok, 'Battery optimization exemption granted.');
} else {
_showCue(CueKind.warn, 'Exemption not granted.');
}
_showMessage(
status.isGranted
? 'Battery optimization exemption granted.'
: 'Exemption not granted -- notifications may be delayed.',
);
} on Exception catch (e) {
_showCue(CueKind.error, 'Could not request exemption: $e');
_showMessage('Could not request exemption: $e');
}
}
}

View File

@ -15,43 +15,24 @@
/// encrypted either.
library;
import 'package:crdt_sync_flutter/crdt_sync_flutter.dart' show WaitWatch;
import 'package:diet_guard_app/services/kuchnia_client.dart';
import 'package:diet_guard_app/services/kuchnia_credential_service.dart';
import 'package:diet_guard_app/services/kuchnia_import.dart';
import 'package:diet_guard_app/ui/cues.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:material_ui/material_ui.dart';
/// What a delivery fetch reports: a cue [kind], a spoken [label] (never
/// painted) and, when dishes were banked, their [count] (painted as a number).
class FetchOutcome {
/// Creates an outcome.
const FetchOutcome(this.kind, this.label, {this.count});
/// Icon/colour of the cue.
final CueKind kind;
/// Spoken description; never painted.
final String label;
/// Dishes banked, shown as a bare number next to the cue.
final int? count;
}
import 'package:flutter/material.dart';
/// Fetches today's delivery and reports what was banked.
///
/// Deliberately "banked", not "logged": the explicit fetch only fills the
/// food bank; logging is the log screen's auto-log (`kuchnia_autolog.dart`).
/// Top-level so the settings screen can pass it without growing.
Future<FetchOutcome> fetchTodaysDelivery() async {
/// Deliberately says "banked", not "logged": a delivered meal is not an eaten
/// meal, so the dishes land in the food bank and the user still taps to log
/// each one. Top-level so the settings screen can pass it without growing.
Future<String> fetchTodaysDelivery() async {
final result = await refreshDelivery(DateTime.now());
if (!result.ok) return FetchOutcome(CueKind.error, result.reason!);
if (result.dishes.isEmpty) {
return const FetchOutcome(CueKind.warn, 'No delivery found for today.');
}
if (!result.ok) return result.reason!;
if (result.dishes.isEmpty) return 'No delivery found for today.';
final count = result.dishes.length;
return FetchOutcome(CueKind.ok, '$count dishes added', count: count);
return '$count ${count == 1 ? 'dish' : 'dishes'} added to your food bank. '
'Log them from the meal screen when you eat them.';
}
/// Credential fields plus, on Android, a "fetch today's delivery" action.
@ -62,14 +43,18 @@ class KuchniaSettingsSection extends StatefulWidget {
/// button is replaced by a one-line explanation rather than silently
/// vanishing. [onFetch] defaults to the real fetch. Both are injectable so a
/// widget test can drive the section without a network or a platform check.
const KuchniaSettingsSection({this.canFetch, this.onFetch, super.key});
const KuchniaSettingsSection({
this.canFetch,
this.onFetch,
super.key,
});
/// Whether this platform can reach the catering panel; null means ask.
final bool? canFetch;
/// Fetches today's delivery and returns a status line; null means the real
/// one.
final Future<FetchOutcome> Function()? onFetch;
final Future<String> Function()? onFetch;
@override
State<KuchniaSettingsSection> createState() => _KuchniaSettingsSectionState();
@ -84,7 +69,7 @@ class _KuchniaSettingsSectionState extends State<KuchniaSettingsSection> {
);
bool _obscured = true;
bool _busy = false;
Widget? _status;
String? _status;
@override
void dispose() {
@ -100,13 +85,7 @@ class _KuchniaSettingsSectionState extends State<KuchniaSettingsSection> {
_password.text,
);
if (!mounted) return;
setState(
() => _status = StatusCue(
key: UniqueKey(),
kind: CueKind.ok,
semanticLabel: 'Saved. It will sync to your other devices.',
),
);
setState(() => _status = 'Saved. It will sync to your other devices.');
}
Future<void> _fetch() async {
@ -114,65 +93,62 @@ class _KuchniaSettingsSectionState extends State<KuchniaSettingsSection> {
_busy = true;
_status = null;
});
final outcome = await (widget.onFetch ?? fetchTodaysDelivery)();
final message = await (widget.onFetch ?? fetchTodaysDelivery)();
if (!mounted) return;
setState(() {
_busy = false;
_status = Row(
mainAxisSize: MainAxisSize.min,
spacing: AppSpacing.sm,
children: [
StatusCue(
key: UniqueKey(),
kind: outcome.kind,
semanticLabel: outcome.label,
),
if (outcome.count != null) Text('${outcome.count}'),
],
);
_status = message;
});
}
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final canFetch = widget.canFetch ?? kuchniaFetchSupported;
// The section owns its own leading divider so the settings screen needs a
// single line for it -- that file sits on the repo's 250-line ceiling.
// No heading or blurb: the delivery truck on the fetch button names it.
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(height: 24),
const Divider(),
const SizedBox(height: 8),
Text('Kuchnia Wikinga', style: theme.textTheme.titleMedium),
const SizedBox(height: 4),
Text(
"Your catering panel login, so this device can look up the day's "
'delivered dishes and their macros. Stored and synced in plain '
'text, like the rest of your synced data.',
style: theme.textTheme.bodySmall,
),
const SizedBox(height: 12),
ConstrainedBox(
constraints: const BoxConstraints(maxWidth: AppWidth.field),
child: IconField(
icon: Icons.alternate_email,
semanticLabel: 'Panel e-mail',
child: TextField(
controller: _username,
keyboardType: TextInputType.emailAddress,
autocorrect: false,
decoration: const InputDecoration(labelText: 'Panel e-mail'),
onSubmitted: (_) => _save(),
),
),
const SizedBox(height: 12),
ConstrainedBox(
constraints: const BoxConstraints(maxWidth: AppWidth.field),
child: IconField(
icon: Icons.key,
semanticLabel: 'Panel password',
child: TextField(
controller: _password,
obscure: _obscured,
obscureText: _obscured,
autocorrect: false,
onSubmitted: (_) => _save(),
suffix: IconButton(
icon: Icon(
_obscured ? Icons.visibility : Icons.visibility_off,
semanticLabel: _obscured ? 'Show password' : 'Hide password',
enableSuggestions: false,
decoration: InputDecoration(
labelText: 'Panel password',
suffixIcon: IconButton(
icon: Icon(_obscured ? Icons.visibility : Icons.visibility_off),
tooltip: _obscured ? 'Show password' : 'Hide password',
onPressed: () => setState(() => _obscured = !_obscured),
),
onPressed: () => setState(() => _obscured = !_obscured),
),
onSubmitted: (_) => _save(),
),
),
const SizedBox(height: 12),
@ -180,30 +156,29 @@ class _KuchniaSettingsSectionState extends State<KuchniaSettingsSection> {
spacing: 8,
runSpacing: 8,
children: [
IconButton.filled(
onPressed: _save,
icon: const Icon(Icons.check, semanticLabel: 'Save login'),
),
// Browser builds show the button greyed out: the panel blocks
// browser requests, and the disabled state is the cue.
IconButton.outlined(
onPressed: canFetch && !_busy ? _fetch : null,
icon: _busy
? const WaitWatch(
operation: 'kuchnia.sync',
child: SizedBox.square(
dimension: 20,
child: CircularProgressIndicator(strokeWidth: 2),
),
)
: const Icon(
Icons.local_shipping_outlined,
semanticLabel: "Fetch today's delivery",
),
),
FilledButton(onPressed: _save, child: const Text('Save login')),
if (canFetch)
OutlinedButton.icon(
onPressed: _busy ? null : _fetch,
icon: const Icon(Icons.restaurant),
label: Text(
_busy ? 'Fetching…' : "Fetch today's delivery",
),
),
],
),
if (_status != null) ...[const SizedBox(height: 8), _status!],
if (!canFetch) ...[
const SizedBox(height: 8),
Text(
'Android only — the catering panel blocks browser requests. Your '
'login still syncs to your phone from here.',
style: theme.textTheme.bodySmall,
),
],
if (_status != null) ...[
const SizedBox(height: 8),
Text(_status!, style: theme.textTheme.bodyMedium),
],
],
);
}

View File

@ -6,8 +6,6 @@ library;
import 'dart:async';
import 'package:crdt_sync/crdt_sync.dart';
import 'package:crdt_sync_flutter/crdt_sync_flutter.dart'
show E2ePassphraseButton;
import 'package:diet_guard_app/models/meal_schedule.dart';
import 'package:diet_guard_app/screens/github_mirror_screen.dart';
import 'package:diet_guard_app/screens/settings_kuchnia.dart';
@ -17,17 +15,14 @@ import 'package:diet_guard_app/services/firebase_backend.dart';
import 'package:diet_guard_app/services/firebase_client.dart';
import 'package:diet_guard_app/services/google_sign_in_backend.dart';
import 'package:diet_guard_app/services/meal_schedule_service.dart';
import 'package:diet_guard_app/services/sync_e2e.dart';
import 'package:diet_guard_app/ui/cues.dart';
import 'package:diet_guard_app/ui/macro_kind.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:diet_guard_app/widgets/data_backup_row.dart';
import 'package:diet_guard_app/widgets/log_sound_tile.dart';
import 'package:diet_guard_app/widgets/meal_schedule_editor.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:http/http.dart' as http;
import 'package:material_ui/material_ui.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:sync_settings_ui/sync_settings_ui.dart';
@ -154,26 +149,30 @@ class _SettingsScreenState extends State<SettingsScreen>
@override
Widget build(BuildContext context) {
return Scaffold(
// No title: the gear that opened this screen already names it.
appBar: AppBar(),
// Capped at the prose width so fields do not span a ~1366px window.
appBar: AppBar(title: const Text('Settings')),
// Capped at the prose width: on the ~1366px desktop window the
// paragraphs below ran ~180 chars/line, twice tokens.md rule 21's limit.
body: Center(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: AppWidth.prose),
child: ListView(
padding: const EdgeInsets.all(16),
children: [
Text('Nutrition', style: Theme.of(context).textTheme.titleMedium),
const SizedBox(height: 8),
// A four-digit number: capped so the field does not read as a
// layout error by spanning the whole column.
ConstrainedBox(
constraints: const BoxConstraints(maxWidth: AppWidth.field),
child: IconField(
icon: MacroKind.kcal.icon,
iconColor: MacroKind.kcal.color,
semanticLabel: 'Daily kcal goal',
child: TextField(
controller: _kcalGoalController,
keyboardType: TextInputType.number,
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
decoration: const InputDecoration(
labelText: 'Daily kcal goal',
helperText: 'Shown in the history day summary',
suffixText: 'kcal',
),
onChanged: _onKcalGoalChanged,
),
),
@ -187,30 +186,15 @@ class _SettingsScreenState extends State<SettingsScreen>
const Divider(),
ListTile(
contentPadding: EdgeInsets.zero,
leading: const Icon(
Icons.cloud_sync_outlined,
semanticLabel: 'Sync settings',
),
title: const Text('Sync settings'),
subtitle: const Text('Firebase sync'),
trailing: const Icon(Icons.chevron_right),
onTap: () => unawaited(_openSyncSettings()),
),
// End-to-end encryption passphrase: closed lock while the last
// sync found no usable key, so nothing syncs until it is set.
ValueListenableBuilder<bool>(
valueListenable: syncLocked,
builder: (_, locked, _) => ListTile(
contentPadding: EdgeInsets.zero,
leading: E2ePassphraseButton(locked: locked),
),
),
// Legacy mirror: muted tint marks it as the secondary path.
ListTile(
contentPadding: EdgeInsets.zero,
leading: Icon(
Icons.code,
color: Theme.of(context).colorScheme.onSurfaceVariant,
semanticLabel: 'Advanced sync (GitHub)',
),
title: const Text('Advanced sync (GitHub)'),
subtitle: const Text('Cutover mirror — not recommended'),
trailing: const Icon(Icons.chevron_right),
onTap: () => unawaited(_openGitHubMirror()),
),
@ -219,27 +203,42 @@ class _SettingsScreenState extends State<SettingsScreen>
.dailyKcalGoal
.toString(),
),
const SizedBox(height: 24),
const Divider(),
const SizedBox(height: 8),
Text(
'Notifications',
style: Theme.of(context).textTheme.titleMedium,
),
const SizedBox(height: 4),
Text(
_isAndroid
? 'A background check nags you every ~15 min if a '
'meal slot is overdue. Aggressive OEM battery '
'optimization (MIUI, some Samsung configs) can '
'delay this well past 15 min -- request an '
'exemption for reliable nagging.'
: 'A check runs every 5 min while this window is open and '
'notifies you about an overdue meal slot. A browser '
'cannot run anything once the window is closed -- on '
'the PC the real backstop is the diet_guard gate, '
'which locks the screen instead.',
style: Theme.of(context).textTheme.bodySmall,
),
// Battery-optimization exemption is Android-only, and
// `permission_handler` has no web implementation at all;
// the row would throw rather than degrade in the browser.
if (_isAndroid) ...[
const SizedBox(height: 24),
const Divider(),
const SizedBox(height: 8),
Align(
alignment: Alignment.centerLeft,
child: IconButton.outlined(
onPressed: _requestBatteryExemption,
icon: const Icon(
Icons.battery_alert,
semanticLabel: 'Disable battery optimization',
),
),
const SizedBox(height: 12),
OutlinedButton.icon(
onPressed: _requestBatteryExemption,
icon: const Icon(Icons.battery_alert),
label: const Text('Disable battery optimization'),
),
],
if (_status != null) ...[
const SizedBox(height: 16),
Align(alignment: Alignment.centerLeft, child: _status),
Text(_status!, style: Theme.of(context).textTheme.bodyMedium),
],
],
),

View File

@ -22,6 +22,13 @@ export 'package:diet_guard_app/models/workout_session.dart';
/// Formula names, in display order.
const List<String> activityFormulas = ['MET', 'ACSM', 'Per-km'];
/// The methods explained, shown under the Activity card.
const String methodsNote =
'MET = standard activity values x your weight x time. '
'ACSM = American College of Sports Medicine running/walking equation '
'from your speed. Per-km = ~0.9 kcal per kg per km running, ~0.5 '
'walking. All are energy above resting.';
/// Measured activity averages at most the last two full weeks.
const int maxWindowDays = 14;

View File

@ -15,7 +15,6 @@ import 'package:diet_guard_app/services/github_client_factory.dart';
import 'package:diet_guard_app/services/kuchnia_credential_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/services/sync_attempt.dart';
import 'package:diet_guard_app/services/sync_device_id.dart';
import 'package:diet_guard_app/services/sync_health.dart';
import 'package:diet_guard_app/services/sync_service.dart';
@ -91,14 +90,21 @@ Future<bool> backgroundSyncPush({http.Client? httpClient}) async {
return true; // nothing to push; don't retry
}
final client = createGitHubClient(settings, httpClient: httpClient);
// Never silent: attemptSync records the outcome, the only signal that a
// background push failed. False -> WorkManager retries with backoff.
final landed = await attemptSync(() async {
try {
await runSync(await syncBackend(client));
} finally {
client.close();
}
});
return landed;
try {
await runSync(await syncBackend(client));
await SyncHealth.recordSuccess();
return true;
} on Exception catch (error, stackTrace) {
// Never silent: this is the only signal that a background push failed.
log(
'diet_guard background sync failed',
level: 1000,
error: error,
stackTrace: stackTrace,
);
await SyncHealth.recordFailure();
return false; // offline / transient error -> retry with backoff
} finally {
client.close();
}
}

View File

@ -31,6 +31,16 @@ const List<(double, String)> _bmiBands = [
];
const String _topBand = 'obese class III';
/// BMI Prime explained, shown under the numbers on both surfaces.
const String bmiPrimeNote =
'BMI Prime = BMI / 25: 1.00 is the top of the healthy range, '
'so 1.02 means 2% above it.';
/// Trefethen's BMI explained, shown under the numbers on both surfaces.
const String trefethenNote =
"Trefethen's new BMI = 1.3 x kg / m^2.5: corrects classic BMI, which "
'over-reads tall people and under-reads short ones.';
/// The lean-mass formula the calorie table switches to with a body fat %.
const String katchMcArdle = 'Katch-McArdle';

View File

@ -1,156 +0,0 @@
/// The phone's side of the Claude relay: what the sparkle button sends and
/// what comes back.
///
/// The screen only talks to this interface; `claude_relay_firebase.dart` is the
/// real transport (Firebase RTDB, end-to-end encrypted) and
/// `claude_relay_fake.dart` the test double. The wire is
/// `docs/DOCS-claude-relay.md` plus `tests/fixtures/claude_relay_contract.json`.
///
/// A `Stream`, not a `Future`: the PC may be off, so a request can sit
/// [ClaudeRelayQueued] for hours before the same stream delivers
/// [ClaudeRelayLogged]. Terminal events end the stream; [ClaudeRelayQueued]
/// does not.
///
/// **The request id is a ULID** (`rtdb_relay` never serves another key shape)
/// and **the entry id is derived from it**: `uuid5(namespace, rid)`, computed
/// here by [claudeEntryId] exactly as the PC does. So the phone knows the id
/// of the entry before Claude has answered, a logged result is checked against
/// it, and undo is a tombstone on that id.
///
/// **Photos are transient input.** `photoJpeg` lives in memory for one send:
/// it is never stored on the phone, never put on a `FoodEntry`, and never part
/// of a synced meal record (`repo_invariants_photo_test.dart` enforces it).
library;
import 'dart:math';
import 'dart:typed_data';
import 'package:diet_guard_app/models/food_entry.dart';
import 'package:uuid/uuid.dart';
/// The UUID namespace the PC derives entry ids in (`entry_id_namespace` in the
/// contract fixture).
const claudeEntryNamespace = '5d9c1a40-6f0e-5c3e-9b57-d1e7a3c0b2f4';
/// The id of the entry the PC logs for request [requestId].
String claudeEntryId(String requestId) =>
const Uuid().v5(claudeEntryNamespace, requestId);
const _crockford = '0123456789ABCDEFGHJKMNPQRSTVWXYZ';
/// A fresh ULID: 48 bits of [now] in ms, then 80 random bits, 26 characters of
/// Crockford base32. [random] is injectable for tests.
String newRequestId({DateTime? now, Random? random}) {
final rng = random ?? Random.secure();
var ms = (now ?? DateTime.now()).millisecondsSinceEpoch;
final out = List<String>.filled(26, '0');
for (var i = 9; i >= 0; i--) {
out[i] = _crockford[ms % 32];
ms ~/= 32;
}
for (var i = 10; i < 26; i++) {
out[i] = _crockford[rng.nextInt(32)];
}
return out.join();
}
/// How the PC picks the slot: the oldest due slot, or the nearest to
/// [ClaudeRelayRequest.slotMinute].
enum ClaudeRelayMode {
/// The phone is in due mode.
due,
/// Nothing is due.
normal,
}
/// One send: the text and/or photo, and the slot the meal belongs to.
class ClaudeRelayRequest {
/// Creates a request; at least one of [text] and [photoJpeg] is non-empty.
const ClaudeRelayRequest({
required this.requestId,
required this.slotMinute,
this.mode = ClaudeRelayMode.normal,
this.text = '',
this.photoJpeg,
});
/// A ULID (see [newRequestId]); the entry id is [claudeEntryId] of it.
final String requestId;
/// The slot minute the phone would log against now (`client_slot_min`).
final int slotMinute;
/// Whether the phone is in due mode.
final ClaudeRelayMode mode;
/// What the user typed, trimmed; may be empty when a photo is attached.
final String text;
/// The photo as a JPEG of at most 1024 px, or null.
final Uint8List? photoJpeg;
}
/// What the relay reports about one [ClaudeRelayRequest].
sealed class ClaudeRelayEvent {
const ClaudeRelayEvent();
}
/// The PC is offline; the request is stored and will run later (not terminal).
final class ClaudeRelayQueued extends ClaudeRelayEvent {
/// Creates the event.
const ClaudeRelayQueued();
}
/// Claude logged the meal (terminal). `entry.id == claudeEntryId(rid)`.
final class ClaudeRelayLogged extends ClaudeRelayEvent {
/// Creates the event for [entry].
const ClaudeRelayLogged(this.entry);
/// The entry the worker wrote.
final FoodEntry entry;
}
/// Sync is locked (no passphrase), so nothing can be sent (terminal).
final class ClaudeRelayLocked extends ClaudeRelayEvent {
/// Creates the event.
const ClaudeRelayLocked();
}
/// The send failed (terminal); [reason] is for logs, never painted.
final class ClaudeRelayFailed extends ClaudeRelayEvent {
/// Creates the event.
const ClaudeRelayFailed(this.reason);
/// Why it failed.
final String reason;
}
/// Sends a meal to Claude through the relay.
abstract interface class ClaudeRelayClient {
/// Sends [request]; the stream carries zero or more [ClaudeRelayQueued]
/// then one terminal event, and never throws (failures are events).
Stream<ClaudeRelayEvent> send(ClaudeRelayRequest request);
/// Withdraws [requestId] if no worker has claimed it yet; true when it is
/// gone. False means it was already claimed (or the call failed), and the
/// meal will be logged: the stream keeps listening so the row still shows.
Future<bool> cancel(String requestId);
}
/// The stand-in until a transport is wired: every send fails closed.
class UnconfiguredClaudeRelayClient implements ClaudeRelayClient {
/// Creates the stand-in.
const UnconfiguredClaudeRelayClient();
@override
Stream<ClaudeRelayEvent> send(ClaudeRelayRequest request) =>
Stream.value(const ClaudeRelayFailed('relay not configured'));
@override
Future<bool> cancel(String requestId) async => true;
}
/// The client the screen uses unless it is handed one; `main.dart` assigns the
/// real transport.
ClaudeRelayClient claudeRelay = const UnconfiguredClaudeRelayClient();

View File

@ -1,49 +0,0 @@
/// A controllable [ClaudeRelayClient] for tests and the unwired app.
library;
import 'dart:async';
import 'package:diet_guard_app/services/claude_relay_client.dart';
/// Records every request and lets the test emit the events by hand.
///
/// [emit] pushes to the most recent send's stream; a terminal event closes it,
/// as a real client's would.
class FakeClaudeRelayClient implements ClaudeRelayClient {
/// Every request sent, oldest first.
final List<ClaudeRelayRequest> sent = [];
/// Events replayed on each send before the stream waits for [emit].
final List<ClaudeRelayEvent> script = [];
/// Request ids passed to [cancel], oldest first.
final List<String> cancelled = [];
/// What [cancel] answers: true = withdrawn before any claim.
bool cancelResult = true;
StreamController<ClaudeRelayEvent>? _open;
@override
Stream<ClaudeRelayEvent> send(ClaudeRelayRequest request) {
sent.add(request);
final controller = StreamController<ClaudeRelayEvent>();
_open = controller;
script.forEach(emit);
return controller.stream;
}
/// Delivers [event] to the open stream; a terminal one closes it.
void emit(ClaudeRelayEvent event) {
final controller = _open;
if (controller == null || controller.isClosed) return;
controller.add(event);
if (event is! ClaudeRelayQueued) unawaited(controller.close());
}
@override
Future<bool> cancel(String requestId) async {
cancelled.add(requestId);
return cancelResult;
}
}

View File

@ -1,201 +0,0 @@
/// The real [ClaudeRelayClient]: requests and answers through Firebase RTDB,
/// end-to-end encrypted, served by the PC's `claude-worker`.
///
/// One send: seal the request with the existing E2E key (header
/// `diet-guard-sync/e2e`, the key the log sync already uses), PUT it under
/// `requests/<ULID>/req`, then watch the node. No claim after
/// [claimWindow] means the PC is offline: [ClaudeRelayQueued], and the same
/// stream keeps waiting. The worker's sealed `result` becomes
/// [ClaudeRelayLogged] or [ClaudeRelayFailed], and the phone then deletes the
/// request node as `docs/DOCS-claude-relay.md` asks.
///
/// **Fail closed, visibly.** A locked key is [ClaudeRelayLocked]; a request
/// that breaks the contract, a transport that keeps failing, a result that
/// does not open or carries an entry id the phone did not derive, and a wait
/// past [maxWait] are all [ClaudeRelayFailed]. Nothing is ever shown as
/// logged unless a valid sealed result says so.
///
/// Polling, not a stream: the node's child keys (no values, so the photo is
/// never re-read) are listed every second, then every 5 s once the wait is
/// long. The phone is a foreground client here; a queued request that outlives
/// the screen reaches the log through the normal sync instead.
library;
import 'dart:async';
import 'dart:developer';
import 'package:crdt_sync/crdt_sync.dart';
import 'package:diet_guard_app/services/claude_relay_client.dart';
import 'package:diet_guard_app/services/claude_relay_rtdb.dart';
import 'package:diet_guard_app/services/claude_relay_wire.dart';
import 'package:diet_guard_app/services/firebase_backend.dart';
import 'package:diet_guard_app/services/firebase_client.dart';
import 'package:diet_guard_app/services/sync_device_id.dart';
import 'package:diet_guard_app/services/sync_e2e.dart';
const _fastPoll = Duration(seconds: 1);
const _slowPoll = Duration(seconds: 5);
const _slowAfter = Duration(seconds: 30);
const _maxPollFailures = 3;
/// [ClaudeRelayClient] over RTDB.
class RtdbClaudeRelay implements ClaudeRelayClient {
/// Creates the client; every dependency is injectable for tests.
RtdbClaudeRelay({
required this.openNodes,
required this.openCipher,
required this.deviceId,
DateTime Function()? now,
Future<void> Function(Duration)? delay,
this.claimWindow = const Duration(seconds: 3),
this.maxWait = const Duration(minutes: 15),
}) : _now = now ?? DateTime.now,
_delay = delay ?? Future<void>.delayed;
/// The app's real transport: Firebase session, E2E key from the keystore.
///
/// Everything resolves at send time, so building it in `main` costs nothing
/// and a device that signs in later just works.
factory RtdbClaudeRelay.firebase() {
FirebaseRestClient? client;
Future<FirebaseRestClient> session() async => client ??=
await openFirebase() ??
(throw const RelayTransportError('not signed in to Firebase'));
return RtdbClaudeRelay(
openNodes: () async {
final auth = (await session()).auth;
return RtdbNodes(
databaseUrl: kProject.databaseUrl,
idToken: auth.idToken,
);
},
openCipher: () => session().then(openDietGuardCipher),
deviceId: () => currentSyncDeviceId,
);
}
/// Opens the node access, throwing [RelayTransportError] when unavailable.
final Future<RelayNodes> Function() openNodes;
/// Opens the E2E cipher, throwing [SyncLockedException] when locked.
final Future<E2eCipher> Function() openCipher;
/// This phone's sync device id, sent as `dev`.
final String Function() deviceId;
/// How long an unclaimed request waits before it reads as queued.
final Duration claimWindow;
/// How long one send waits for an answer before it fails.
final Duration maxWait;
final DateTime Function() _now;
final Future<void> Function(Duration) _delay;
@override
Stream<ClaudeRelayEvent> send(ClaudeRelayRequest request) async* {
final problem = relayBodyProblem(relayBody(request));
if (problem != null) {
yield ClaudeRelayFailed('bad request: $problem');
return;
}
final RelayNodes nodes;
final E2eCipher cipher;
try {
cipher = await openCipher();
nodes = await openNodes();
final unit = await sealRequest(
cipher,
request,
device: deviceId(),
nowMs: _now().millisecondsSinceEpoch,
);
await nodes.put('${requestNode(request.requestId)}/req', unit);
} on SyncLockedException {
yield const ClaudeRelayLocked();
return;
} on Object catch (error, stackTrace) {
log(
'claude relay send failed',
level: 1000,
error: error,
stackTrace: stackTrace,
);
yield const ClaudeRelayFailed('could not send');
return;
}
yield* _await(nodes, cipher, request.requestId);
}
Stream<ClaudeRelayEvent> _await(
RelayNodes nodes,
E2eCipher cipher,
String rid,
) async* {
final node = requestNode(rid);
final started = _now();
var queued = false;
var failures = 0;
while (true) {
final waited = _now().difference(started);
if (waited > maxWait) {
yield const ClaudeRelayFailed('no answer in time');
return;
}
try {
final keys = await nodes.keys(node);
failures = 0;
if (keys.contains('result')) {
final result = await openResult(
cipher,
rid,
await nodes.get('$node/result'),
);
await _tidy(nodes, node);
yield result;
return;
}
if (keys.isEmpty) {
yield const ClaudeRelayFailed('request vanished');
return;
}
if (!queued && !keys.contains('claim') && waited >= claimWindow) {
queued = true;
yield const ClaudeRelayQueued();
}
} on Object catch (error, stackTrace) {
log(
'claude relay poll failed',
level: 900,
error: error,
stackTrace: stackTrace,
);
if (++failures >= _maxPollFailures) {
yield const ClaudeRelayFailed('connection lost');
return;
}
}
await _delay(waited < _slowAfter ? _fastPoll : _slowPoll);
}
}
/// Deletes the answered request node. Best effort: the worker also sweeps
/// answered nodes after 24 h, so a failure costs nothing but a few bytes.
Future<void> _tidy(RelayNodes nodes, String node) async {
try {
await nodes.delete(node);
} on Object catch (error) {
log('claude relay cleanup failed', level: 900, error: error);
}
}
@override
Future<bool> cancel(String requestId) async {
try {
return await (await openNodes()).deleteUnclaimed(requestNode(requestId));
} on Object catch (error) {
log('claude relay cancel failed', level: 900, error: error);
return false;
}
}
}

View File

@ -1,150 +0,0 @@
/// Raw Realtime Database nodes for the relay, over REST.
///
/// The sync client (`FirebaseRestClient`) stores text blobs as string leaves;
/// the relay's units are JSON objects with a server-time sibling, so it needs
/// the node itself. Plain HTTPS like the sync client, so it works on Android
/// and in the browser-hosted desktop app alike.
library;
import 'dart:convert';
import 'package:http/http.dart' as http;
/// A relay call failed on the network or was refused. The message never holds
/// a URL: its query carries the ID token.
class RelayTransportError implements Exception {
/// Creates the error.
const RelayTransportError(this.message);
/// What went wrong, safe to log.
final String message;
@override
String toString() => 'RelayTransportError: $message';
}
/// The four node operations the relay needs.
abstract interface class RelayNodes {
/// The JSON value at [path], or null when absent.
Future<Object?> get(String path);
/// The child keys of [path] (no values), empty when absent.
Future<Set<String>> keys(String path);
/// Replaces the node at [path] with [value].
Future<void> put(String path, Object value);
/// Deletes the node at [path].
Future<void> delete(String path);
/// Deletes [path] only while it holds neither a `claim` nor a `result`,
/// atomically: the delete carries the node's ETag, so a worker claiming it
/// in between turns the delete into a refusal. True when it is gone.
Future<bool> deleteUnclaimed(String path);
}
/// [RelayNodes] over the Realtime Database REST API.
class RtdbNodes implements RelayNodes {
/// Creates the client; [idToken] mints the token each request carries.
RtdbNodes({
required String databaseUrl,
required this.idToken,
http.Client? client,
String namespace = '',
}) : _base = databaseUrl.endsWith('/')
? databaseUrl.substring(0, databaseUrl.length - 1)
: databaseUrl,
_prefix = namespace.isEmpty ? '' : '$namespace/',
_http = client ?? http.Client();
/// Supplies a fresh Firebase ID token.
final Future<String> Function() idToken;
final String _base;
final String _prefix;
final http.Client _http;
Future<Uri> _uri(String path, [Map<String, String> query = const {}]) async =>
Uri.parse(
'$_base/$_prefix$path.json',
).replace(queryParameters: {'auth': await idToken(), ...query});
Future<http.Response> _send(
String what,
Future<http.Response> Function(Uri uri) call,
String path, [
Map<String, String> query = const {},
]) async {
try {
return await call(await _uri(path, query));
} on http.ClientException catch (error) {
throw RelayTransportError('network error $what: ${error.message}');
}
}
Never _refuse(String what, http.Response res) =>
throw RelayTransportError('$what refused: HTTP ${res.statusCode}');
bool _ok(http.Response res) => res.statusCode >= 200 && res.statusCode < 300;
@override
Future<Object?> get(String path) async {
final res = await _send('reading', _http.get, path);
if (!_ok(res)) _refuse('reading', res);
return jsonDecode(res.body);
}
@override
Future<Set<String>> keys(String path) async {
final res = await _send('listing', _http.get, path, {'shallow': 'true'});
if (!_ok(res)) _refuse('listing', res);
final decoded = jsonDecode(res.body);
return decoded is Map ? decoded.keys.cast<String>().toSet() : {};
}
@override
Future<void> put(String path, Object value) async {
final res = await _send(
'writing',
(uri) => _http.put(uri, body: jsonEncode(value)),
path,
);
if (!_ok(res)) _refuse('writing', res);
}
@override
Future<void> delete(String path) async {
final res = await _send('deleting', _http.delete, path);
if (!_ok(res)) _refuse('deleting', res);
}
@override
Future<bool> deleteUnclaimed(String path) async {
// `X-Firebase-ETag` makes the read return the node's ETag; a claim or a
// result written afterwards changes it, and `if-match` then answers 412.
// A full read, not a shallow one: the ETag of a shallow answer is not
// guaranteed to cover the children, and this path is rare.
final read = await _send(
'reading',
(uri) => _http.get(uri, headers: {'X-Firebase-ETag': 'true'}),
path,
);
if (!_ok(read)) _refuse('reading', read);
final node = jsonDecode(read.body);
if (node == null) return true;
if (node is Map &&
(node.containsKey('claim') || node.containsKey('result'))) {
return false;
}
final etag = read.headers['etag'];
if (etag == null) return false;
final res = await _send(
'deleting',
(uri) => _http.delete(uri, headers: {'if-match': etag}),
path,
);
if (res.statusCode == 412) return false;
if (!_ok(res)) _refuse('deleting', res);
return true;
}
}

View File

@ -1,144 +0,0 @@
/// The relay's wire format: sealing a request, opening a result.
///
/// Mirrors `docs/DOCS-claude-relay.md` sections 1 to 3 and is gated by
/// `tests/fixtures/claude_relay_contract.json`. A unit is
/// `{"_e2e": <blob>, <clear siblings>}`; the blob is crdt_sync's [E2eCipher]
/// over compact JSON with the unit's full path as AAD, so a blob copied to
/// another path does not open. Both the request (photo included) and the
/// result are sealed: no food text or image is ever in clear.
library;
import 'dart:convert';
import 'package:crdt_sync/crdt_sync.dart';
import 'package:diet_guard_app/models/food_entry.dart';
import 'package:diet_guard_app/services/claude_relay_client.dart';
/// The relay's root `R`; its header is the existing `diet-guard-sync/e2e`.
const relayRoot = 'diet-guard-sync/claude-e2e';
/// Largest base64 photo the worker accepts, in characters.
const relayPhotoB64Max = 600000;
/// Longest description the worker accepts, in characters after trimming.
const relayTextMax = 2000;
/// The node of request [rid].
String requestNode(String rid) => '$relayRoot/requests/$rid';
/// Returns why [body] breaks the contract, or null when it is valid.
///
/// The same rules the worker enforces (`bad_request`), checked here first so a
/// request that can only fail never leaves the phone.
String? relayBodyProblem(Map<String, Object?> body) {
final text = body['text'];
final photo = body['photo_jpeg_b64'];
if (text == null && photo == null) return 'nothing to estimate';
if (text != null) {
if (text is! String) return 'text is not a string';
final length = text.trim().runes.length;
if (length < 1 || length > relayTextMax) return 'text length';
}
if (photo != null) {
if (photo is! String || photo.length > relayPhotoB64Max) {
return 'photo size';
}
try {
final bytes = base64.decode(photo);
if (bytes.length < 2 || bytes[0] != 0xFF || bytes[1] != 0xD8) {
return 'photo is not a jpeg';
}
} on FormatException {
return 'photo is not base64';
}
}
final slot = body['client_slot_min'];
if (slot is! int || slot < 0 || slot > 1439) return 'slot';
if (body['mode'] != 'due' && body['mode'] != 'normal') return 'mode';
return null;
}
/// The request's `body` object.
Map<String, Object?> relayBody(ClaudeRelayRequest request) => {
if (request.text.trim().isNotEmpty) 'text': request.text.trim(),
if (request.photoJpeg != null)
'photo_jpeg_b64': base64.encode(request.photoJpeg!),
'client_slot_min': request.slotMinute,
'mode': request.mode.name,
};
/// The sealed `req` unit for [request], ready to PUT.
///
/// `created` is the server's clock, not the phone's: it drives the worker's
/// 24 h expiry, and a phone clock can be wrong.
Future<Map<String, Object?>> sealRequest(
E2eCipher cipher,
ClaudeRelayRequest request, {
required String device,
required int nowMs,
}) async {
final plain = {
'kind': 'meal',
'dev': device,
'sent_at': nowMs,
'body': relayBody(request),
};
return {
'_e2e': await cipher.seal(
jsonEncode(plain),
path: '${requestNode(request.requestId)}/req',
),
'created': {'.sv': 'timestamp'},
};
}
/// Opens the `result` unit of [rid] into the event the screen shows.
///
/// Fail closed: anything that is not exactly a logged meal for this request,
/// with the entry id the phone derived itself, is a [ClaudeRelayFailed].
Future<ClaudeRelayEvent> openResult(
E2eCipher cipher,
String rid,
Object? node,
) async {
try {
if (node is! Map || node['_e2e'] is! String) {
return const ClaudeRelayFailed('result is not a sealed unit');
}
final plain =
jsonDecode(
await cipher.open(
node['_e2e'] as String,
path: '${requestNode(rid)}/result',
),
)
as Map<String, dynamic>;
if (plain['id'] != rid) return const ClaudeRelayFailed('result id');
if (plain['ok'] != true || plain['status'] != 'logged') {
return ClaudeRelayFailed('${plain['error_code'] ?? 'error'}');
}
if (plain['entry_id'] != claudeEntryId(rid)) {
return const ClaudeRelayFailed('entry id mismatch');
}
return ClaudeRelayLogged(
FoodEntry(
id: plain['entry_id'] as String,
time: plain['time'] as String,
desc: plain['desc'] as String,
grams: (plain['grams'] as num).toDouble(),
kcal: (plain['kcal'] as num).toDouble(),
proteinG: (plain['protein_g'] as num).toDouble(),
carbsG: (plain['carbs_g'] as num).toDouble(),
fatG: (plain['fat_g'] as num).toDouble(),
source: 'claude',
slotMinute: plain['slot_min'] as int?,
),
);
} on E2eDecryptError {
return const ClaudeRelayFailed('result did not open');
} on Object {
// A wrong type or a missing field in a result is a bad answer, not a
// crash; the meal is not shown as logged.
return const ClaudeRelayFailed('result is malformed');
}
}

View File

@ -6,10 +6,10 @@
/// is never deleted or overwritten, each id is its own record, and two
/// devices that mint a key at the same moment both keep both.
///
/// The synced copy is end-to-end encrypted under the shared crdt-sync
/// passphrase (`sync_e2e.dart`), on `diet-guard-sync/devices-e2e`. The old
/// plaintext `diet-guard-sync/devices/<id>/export_keys.json` nodes are
/// copied over once and then neither read nor written by this app.
/// NOTE: the synced copy sits in Firebase RTDB in plaintext, so Firebase can
/// read these keys (and therefore the sealed login in any export it could get
/// hold of) until crdt E2E lands. `export_keys` must move under that
/// encryption too: `~/src/utils/TODO-crdt-e2e-encryption.md`.
library;
import 'dart:convert';

View File

@ -8,7 +8,6 @@ import 'package:diet_guard_app/services/export_keyring_sync.dart';
import 'package:diet_guard_app/services/firebase_client.dart';
import 'package:diet_guard_app/services/github_client_factory.dart';
import 'package:diet_guard_app/services/sync_device_id.dart';
import 'package:diet_guard_app/services/sync_e2e.dart';
import 'package:diet_guard_app/services/sync_settings.dart';
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
@ -32,7 +31,7 @@ Future<void> pullExportKeys() async {
final client = createGitHubClient(await SyncSettings.load());
try {
await syncExportKeys(
await openDietGuardStore(await syncBackend(client)),
await syncBackend(client),
keyring: defaultKeyring(),
devicesDir: syncDevicesDir,
);

View File

@ -1,9 +1,8 @@
/// The `export_keys` document: the keyring as a crdt_sync log.
///
/// One record per key id, never deleted, so the merge is a plain union and
/// concurrent mints on two devices both survive. [syncExportKeys] must be
/// handed the end-to-end encrypted store (`sync_e2e.dart`): these are the
/// keys that open every export.
/// concurrent mints on two devices both survive. See `export_keyring.dart`
/// for the plaintext-at-Firebase caveat.
library;
import 'dart:convert';
@ -71,7 +70,6 @@ Future<void> syncExportKeys(
deviceId: id,
legacyDeviceId: deviceId == null ? legacySyncDeviceId : null,
pathPrefix: devicesDir,
revsPath: syncRevsDir,
localLog: _toLog(await keyring.all(), id),
encode: (log) => jsonEncode({
for (final entry in log.entries) entry.key: entry.value.toJson(),

View File

@ -1,107 +0,0 @@
/// Logs the delivered catering dishes of the due slots, without a tap.
///
/// kuhy overrode the old "delivered is not eaten, so never log unattended"
/// rule on 2026-11-17 ("LOG EVEN WITHOUT TAP"). The screen calls [logDue] when
/// it opens or resumes with a slot due; the plan is the fill-all plan
/// (`assignSlots` by the caterer's `mealPriority`, `fillPlan` over occupied
/// slots) minus the confirm tap, restricted to the due slots.
///
/// **Ids are deterministic** so a repeat open and every other device collapse
/// to one entry on merge: UUID v5 over the RFC 4122 URL namespace of
/// `kuchnia:<delivery date YYYY-MM-DD>:<dish key>`. The shared fixture
/// `tests/fixtures/kuchnia_autolog_ids.json` pins them for both languages.
/// An undone dish keeps its tombstone, so it is never logged a second time.
///
/// The fetch is a third-party login, so the day's dishes are cached in memory
/// and a failed or empty fetch is retried at most every [retryAfter].
/// `KuchniaQueueService.refreshOnce` cannot serve here: after the first clean
/// fetch of the day it returns nothing, and slots that fall due later would
/// never see their dish.
library;
import 'package:diet_guard_app/models/food_entry.dart';
import 'package:diet_guard_app/models/kuchnia_dish.dart';
import 'package:diet_guard_app/models/local_time.dart';
import 'package:diet_guard_app/models/slot.dart';
import 'package:diet_guard_app/services/kuchnia_fill.dart';
import 'package:diet_guard_app/services/kuchnia_fill_flow.dart';
import 'package:diet_guard_app/services/kuchnia_import.dart';
import 'package:diet_guard_app/services/kuchnia_spread.dart';
import 'package:diet_guard_app/services/log_entry_lookup.dart';
import 'package:diet_guard_app/services/log_storage_service.dart';
import 'package:diet_guard_app/services/meal_schedule_service.dart';
import 'package:flutter/foundation.dart' show visibleForTesting;
import 'package:uuid/uuid.dart';
/// The id of the entry that logs [dish] for [deliveryDate] (`YYYY-MM-DD`).
String kuchniaAutologId(String deliveryDate, KuchniaDish dish) => const Uuid()
.v5(Namespace.url.value, 'kuchnia:$deliveryDate:${dish.autologKey}');
/// Logs delivered dishes for due slots. One per process is plenty.
class KuchniaAutoLog {
/// Creates the service; every dependency is injectable for tests.
KuchniaAutoLog({
DeliveryFetch? fetch,
DateTime Function()? now,
this.retryAfter = const Duration(minutes: 10),
}) : _fetch = fetch ?? refreshDelivery,
_now = now ?? DateTime.now;
/// The process-wide instance the screen uses.
static KuchniaAutoLog instance = KuchniaAutoLog();
/// Minimum gap between fetches that found nothing or failed.
final Duration retryAfter;
final DeliveryFetch _fetch;
final DateTime Function() _now;
String? _cachedDay;
List<KuchniaDish> _cachedDishes = const [];
DateTime? _lastEmptyFetch;
Future<List<FoodEntry>>? _inFlight;
/// Forgets the cache, so the next call fetches again (tests, day change).
@visibleForTesting
void reset() {
_cachedDay = null;
_cachedDishes = const [];
_lastEmptyFetch = null;
}
/// Logs the dishes assigned to [dueSlots]; returns the entries it wrote.
///
/// Single-flight: a second call while one runs joins it, so an open and a
/// resume racing each other cannot interleave two read-modify-writes.
Future<List<FoodEntry>> logDue(List<int> dueSlots) =>
_inFlight ??= _run(dueSlots).whenComplete(() => _inFlight = null);
Future<List<FoodEntry>> _run(List<int> dueSlots) async {
if (dueSlots.isEmpty) return const [];
final today = _now();
final dayKey = localDateKey(today);
final dishes = await _dishesFor(today, dayKey);
if (dishes.isEmpty) return const [];
final store = LogStorageService.instance;
final slots = daySlots(MealScheduleService.history.forDay(dayKey));
final plan = fillPlan(
assignSlots(dishes, slots),
await loggedSlotsOn(store, today),
).where((item) => dueSlots.contains(item.slot)).toList();
String idFor(SlottedDish item) => kuchniaAutologId(dayKey, item.dish);
final written = await logDishes(plan, storage: store, idFor: idFor);
return [for (final item in written) ?await store.findEntry(idFor(item))];
}
Future<List<KuchniaDish>> _dishesFor(DateTime today, String dayKey) async {
if (_cachedDay == dayKey) return _cachedDishes;
final last = _lastEmptyFetch;
if (last != null && _now().difference(last) < retryAfter) return const [];
final result = await _fetch(today);
if (result.ok && result.dishes.isNotEmpty) {
_cachedDay = dayKey;
return _cachedDishes = result.dishes;
}
_lastEmptyFetch = _now();
return const [];
}
}

View File

@ -3,12 +3,10 @@
/// The Dart mirror of `diet_guard/_kuchnia_log.py`'s `fill_plan` and
/// `log_dishes`. KEEP IN SYNC, gated by the shared parity fixture.
///
/// **Delivered counts as eaten (override, 2026-11-17).** The old rule was "a
/// delivered meal is not an eaten meal, so nothing logs without a confirm
/// tap". kuhy overrode it ("LOG EVEN WITHOUT TAP"): [logDishes] is now also
/// reached unattended from `kuchnia_autolog.dart`, which logs the dishes of the
/// slots that are due when the app opens. Every such entry has a deterministic
/// id and shows an undo row, so a skipped or binned meal is one tap to remove.
/// **Nothing here runs without an explicit confirm tap.** A delivered meal is
/// not an eaten meal: logging unattended would let the delivery note satisfy
/// the very checkpoints the gate exists to enforce. [logDishes] is only ever
/// reached from the second tap of `FillAllFlow`.
library;
import 'package:diet_guard_app/models/food_entry.dart';
@ -17,7 +15,6 @@ import 'package:diet_guard_app/models/local_time.dart';
import 'package:diet_guard_app/models/nutrition.dart';
import 'package:diet_guard_app/models/slot.dart';
import 'package:diet_guard_app/services/kuchnia_spread.dart';
import 'package:diet_guard_app/services/log_entry_lookup.dart';
import 'package:diet_guard_app/services/log_storage_service.dart';
import 'package:diet_guard_app/services/meal_schedule_service.dart';
@ -101,34 +98,25 @@ Future<Set<int>> loggedSlotsOn(LogStorageService store, DateTime day) async {
/// (a "Log for later" date, strictly after today) each dish is stamped at its
/// slot's time on that day; without it, now -- as a manual log is.
///
/// [idFor] gives each dish a deterministic entry id (see
/// `kuchniaAutologId`); a dish whose id is already in the log is skipped.
///
/// Returns the dishes actually written, in order.
Future<List<SlottedDish>> logDishes(
List<SlottedDish> chosen, {
LogStorageService? storage,
DateTime? day,
String Function(SlottedDish item)? idFor,
}) async {
final store = storage ?? LogStorageService.instance;
final seen = {
for (final entry in await dayEntries(store, day))
_dedupKey(entry.desc, entry.slotMinute),
};
// Tombstones included: an undone auto-logged dish must stay undone.
final knownIds = idFor == null ? const <String>{} : await store.allEntryIds();
final written = <SlottedDish>[];
for (final item in chosen) {
final id = idFor?.call(item);
if (id != null && knownIds.contains(id)) continue;
final key = _dedupKey(item.dish.name, item.slot);
if (!seen.add(key)) continue;
await store.logMeal(
item.dish.name,
dishNutrition(item.dish),
slotMinute: item.slot,
id: id,
when: day == null
? null
: DateTime(

View File

@ -4,10 +4,12 @@
/// fail-closed boundary: every [KuchniaError] is turned into a reason string
/// here, so no caller can be broken by a catering outage.
///
/// **Nothing is logged from here: this only banks.** Dishes land in the
/// *curated* bank. Logging them is `kuchnia_autolog.dart`'s job, which kuhy
/// allowed without a tap on 2026-11-17 ("LOG EVEN WITHOUT TAP"; it was
/// "delivered is not eaten" before), under deterministic ids with an undo.
/// **Nothing is ever logged from here.** A delivered meal is not an eaten
/// meal: dishes land in the *curated* bank and the user still taps to log
/// each one. If the import logged automatically, the gate would satisfy its
/// own checkpoint from a delivery note, and the log would record what the
/// courier dropped off rather than what was eaten -- skipped, shared and
/// binned meals included.
///
/// Imports go **only** to the curated bank. The derived bank is rebuilt from
/// the log on every meal, so anything written there would vanish at the next

View File

@ -74,15 +74,6 @@ bool energyIsConsistent(double kcal, double protein, double carbs, double fat) {
return (derived - kcal).abs() <= kuchniaEnergyTolerance * kcal;
}
/// The panel's meal id as a string, or '' when absent or not a string/int.
///
/// A bool is not an id; Dart's `is int` already excludes it, matching Python.
String _mealId(Object? raw) {
if (raw is int) return raw.toString();
if (raw is String) return raw.trim();
return '';
}
/// Builds one dish, or null when the entry is unusable.
///
/// [fallbackPriority] is the 1-based payload position, used when
@ -122,7 +113,6 @@ KuchniaDish? parseMeal(Object? meal, int fallbackPriority) {
grams: grams,
priority: priority,
slotLabel: rawLabel is String ? rawLabel.trim() : '',
dishId: _mealId(meal['deliveryMealId']),
);
}

View File

@ -1,10 +1,10 @@
/// The day's delivered dishes, offered to the log form one at a time.
///
/// **Since 2026-11-17 the log screen no longer prefills from this queue**: a
/// delivered dish logs itself when its slot is due (`kuchnia_autolog.dart`;
/// kuhy overrode "delivered is not eaten", "LOG EVEN WITHOUT TAP"). What
/// remains here is the offer/mark bookkeeping and the fetched-today marker.
/// The queue itself still writes no log entry.
/// **A delivered meal is not an eaten meal.** This queue only ever *prefills*
/// the form; the user still taps to log each dish. Nothing here writes a log
/// entry, and nothing here may start doing so -- the gate would then satisfy
/// its own checkpoint from a delivery note, and the log would record what the
/// courier dropped off rather than what was eaten.
///
/// Two things are load-bearing:
///

View File

@ -1,55 +0,0 @@
/// Id lookups over the food log, tombstones included.
///
/// Split out of `log_storage_service.dart` for the repo's 250-line cap.
library;
import 'package:diet_guard_app/models/food_entry.dart';
import 'package:diet_guard_app/models/local_time.dart';
import 'package:diet_guard_app/services/log_storage_service.dart';
/// Returns the entry with [id] anywhere in [log], deleted or not, else null.
///
/// Tombstones count on purpose: an entry the user undid must keep blocking
/// its own id, or a repeat open would log it again.
FoodEntry? findEntryById(DayLog log, String id) {
for (final entries in log.values) {
for (final entry in entries) {
if (entry.id == id) return entry;
}
}
return null;
}
/// Id-keyed writes and reads on [LogStorageService].
extension LogEntryLookup on LogStorageService {
/// The entry with [id], deleted or not, else null.
Future<FoodEntry?> findEntry(String id) async =>
findEntryById(await readLog(), id);
/// Every id in the log, tombstones included.
Future<Set<String>> allEntryIds() async => {
for (final entries in (await readLog()).values)
for (final entry in entries) ?entry.id,
};
/// Adds [entry] unless one with its id exists (live or tombstoned), and
/// returns whichever copy the log holds.
///
/// For an entry another device wrote under an id chosen here, such as a
/// Claude-logged meal: the sync merge delivers the same record, so this only
/// shows it a tick earlier and can never double it.
Future<FoodEntry> addIfAbsent(FoodEntry entry) async {
final log = await readLog();
final id = entry.id;
if (id != null) {
final existing = findEntryById(log, id);
if (existing != null) return existing;
}
final dayKey = entry.time.length >= 10
? entry.time.substring(0, 10)
: localDateKey(DateTime.now());
log.putIfAbsent(dayKey, () => []).add(entry);
await writeLog(log);
return entry;
}
}

View File

@ -10,7 +10,6 @@ import 'package:diet_guard_app/models/nutrition.dart';
import 'package:diet_guard_app/models/slot.dart';
import 'package:diet_guard_app/services/document_store.dart';
import 'package:diet_guard_app/services/document_store_factory.dart';
import 'package:diet_guard_app/services/log_entry_lookup.dart';
import 'package:diet_guard_app/services/meal_schedule_service.dart';
import 'package:flutter/foundation.dart';
import 'package:uuid/uuid.dart';
@ -40,8 +39,10 @@ class LogStorageService {
final DocumentStore _store;
/// Initializes the singleton against the platform document store (files on
/// Android, IndexedDB in the browser-hosted desktop app).
/// Initializes the singleton against the platform document store: files in
/// the app's documents directory on Android (phone-sandboxed; no
/// external-storage permission needed), IndexedDB in the browser-hosted
/// desktop app.
static Future<LogStorageService> init() async {
if (_instance != null) return _instance!;
final svc = LogStorageService._(await openDocumentStore());
@ -87,7 +88,8 @@ class LogStorageService {
/// Persists the full log to the store, mirroring `_state._write_log`.
///
/// Atomicity against a concurrent reader is the store's job.
/// Atomicity against a concurrent reader is the store's job (see
/// `FileDocumentStore.write`'s temp-file-and-rename), not this method's.
Future<void> writeLog(DayLog log) async {
final encoded = <String, Object?>{
for (final mapEntry in log.entries)
@ -96,34 +98,27 @@ class LogStorageService {
await _store.write(documentName, jsonEncode(encoded));
}
/// Appends an entry for [desc] to [when]'s day (today's when null).
/// Appends a signed-on-PC-eventually entry for [desc] to [when]'s day (or
/// today's, when [when] is null).
///
/// Mirrors `_state.log_meal`: never computes an `hmac` (the phone never
/// holds the key; the PC re-signs on merge). [when] pre-logs a future
/// date/slot and must not be in the past. [slotMinute] is a minute of day
/// (`slotForLog`'s result), never an hour.
///
/// A caller-chosen [id] makes the write idempotent: an entry already
/// carrying it (live or tombstoned) is returned and nothing is written.
/// Mirrors `_state.log_meal`: always assigns a fresh `id`, never computes
/// an `hmac` (the phone never holds the shared key -- the PC re-signs on
/// merge, see Milestone 3). [when] lets a caller pre-log a meal against a
/// future date/slot; must not be in the past. [slotMinute] is the slot's
/// minute of day (`slotForLog`'s result), never an hour.
Future<FoodEntry> logMeal(
String desc,
Nutrition nutrition, {
int? slotMinute,
List<MealComponent>? components,
DateTime? when,
String? id,
}) async {
if (when != null && when.isBefore(DateTime.now())) {
throw ArgumentError.value(when, 'when', 'cannot log a meal in the past');
}
final now = when ?? DateTime.now();
final log = await readLog();
if (id != null) {
final existing = findEntryById(log, id);
if (existing != null) return existing;
}
final entry = FoodEntry(
id: id ?? const Uuid().v4(),
id: const Uuid().v4(),
time: isoLocalSeconds(now),
desc: desc,
grams: nutrition.grams,
@ -135,6 +130,7 @@ class LogStorageService {
slotMinute: slotMinute,
components: components,
);
final log = await readLog();
log.putIfAbsent(localDateKey(now), () => []).add(entry);
await writeLog(log);
return entry;
@ -169,6 +165,9 @@ class LogStorageService {
}
/// Returns every non-tombstoned entry across all days, newest first.
///
/// Backs the history screen -- the only place that needs to see more than
/// "today".
Future<List<FoodEntry>> allEntriesNewestFirst() async {
final log = await readLog();
final entries =
@ -184,7 +183,7 @@ class LogStorageService {
return entries;
}
/// Today's total calories, mirrors `_state.today_total_kcal`.
/// Returns today's total calories, mirrors `_state.today_total_kcal`.
Future<double> todayTotalKcal() async {
final entries = await todayEntries();
var total = 0.0;

View File

@ -1,8 +0,0 @@
/// Deletes the cache file `image_picker` leaves behind.
///
/// `dart:io` stays behind the platform seam (see `repo_invariants_test.dart`):
/// the io half deletes, the web half has no file to delete.
library;
export 'meal_photo_cleanup_io.dart'
if (dart.library.js_interop) 'meal_photo_cleanup_web.dart';

View File

@ -1,11 +0,0 @@
import 'dart:io';
/// Deletes the picked file at [path]; a failure is not worth a crash.
Future<void> discardPickedFile(String path) async {
try {
await File(path).delete();
} on FileSystemException {
// Already gone, or not ours to delete: the bytes were read, which is all
// that mattered.
}
}

View File

@ -1,2 +0,0 @@
/// Web has no cache file: the picker returns an in-memory blob.
Future<void> discardPickedFile(String path) async {}

View File

@ -1,76 +0,0 @@
/// Where a meal photo comes from. A photo is transient input to Claude: the
/// bytes live in memory for one send and are never stored, put on a
/// `FoodEntry` or synced.
library;
import 'dart:typed_data';
import 'package:diet_guard_app/services/meal_photo_cleanup.dart';
import 'package:flutter/foundation.dart' show kIsWeb, visibleForTesting;
import 'package:image_picker/image_picker.dart';
import 'package:permission_handler/permission_handler.dart';
/// Which picker the user asked for.
enum PhotoOrigin {
/// Take a new photo (a tap on the photo button).
camera,
/// Choose an existing one (a long press).
gallery,
}
/// Hands back a photo as JPEG bytes, or null when the user backed out.
abstract interface class MealPhotoSource {
/// Picks one photo from [origin].
Future<Uint8List?> pick(PhotoOrigin origin);
}
/// The longest edge the photo is scaled to before it leaves the phone.
const mealPhotoMaxEdge = 1024.0;
/// [MealPhotoSource] on `image_picker`.
class ImagePickerPhotoSource implements MealPhotoSource {
/// Creates the source; the three seams default to the real plugins.
ImagePickerPhotoSource({
@visibleForTesting Future<XFile?> Function(ImageSource source)? pickFile,
@visibleForTesting Future<bool> Function()? requestCamera,
@visibleForTesting Future<void> Function(String path)? discard,
}) : _pickFile = pickFile ?? _pickWithPlugin,
_requestCamera = requestCamera ?? _requestCameraPermission,
_discard = discard ?? discardPickedFile;
final Future<XFile?> Function(ImageSource source) _pickFile;
final Future<bool> Function() _requestCamera;
final Future<void> Function(String path) _discard;
static Future<XFile?> _pickWithPlugin(ImageSource source) =>
ImagePicker().pickImage(
source: source,
maxWidth: mealPhotoMaxEdge,
maxHeight: mealPhotoMaxEdge,
imageQuality: 85,
);
/// `permission_handler` has no web implementation; the browser asks for
/// the camera itself when the picker opens.
static Future<bool> _requestCameraPermission() async {
if (kIsWeb) return true;
return (await Permission.camera.request()).isGranted;
}
@override
Future<Uint8List?> pick(PhotoOrigin origin) async {
// The runtime permission comes first: launching the camera intent without
// it fails on Android, and the failure names nothing.
if (origin == PhotoOrigin.camera && !await _requestCamera()) return null;
final file = await _pickFile(
origin == PhotoOrigin.camera ? ImageSource.camera : ImageSource.gallery,
);
if (file == null) return null;
final bytes = await file.readAsBytes();
// The plugin leaves the scaled JPEG in the app cache; the bytes are all
// that is needed, so the file goes the moment they are read.
await _discard(file.path);
return bytes;
}
}

View File

@ -20,9 +20,8 @@ abstract class NotificationBackend {
/// of the app.
Future<bool?> requestPermission();
/// Posts (or replaces) the notification for [slot], titled with the slot's
/// clock time and carrying no body text.
Future<void> show(int slot, String title);
/// Posts (or replaces) the notification for [slot].
Future<void> show(int slot, String title, String body);
/// Removes the notification for [slot], if one is showing.
Future<void> cancel(int slot);

View File

@ -15,8 +15,7 @@ class LocalNotificationsBackend implements NotificationBackend {
final FlutterLocalNotificationsPlugin plugin;
static const _channelId = 'diet_guard_due_slot';
// The app's proper name, same as the launcher label (no descriptive text).
static const _channelName = 'DietGuard';
static const _channelName = 'Meal reminders';
@override
Future<void> initialize() async {
@ -24,20 +23,6 @@ class LocalNotificationsBackend implements NotificationBackend {
android: AndroidInitializationSettings('@mipmap/ic_launcher'),
);
await plugin.initialize(settings: settings);
// Re-create the channel so Android renames it if an install still shows
// the old "Meal reminders" label.
await plugin
.resolvePlatformSpecificImplementation<
AndroidFlutterLocalNotificationsPlugin
>()
?.createNotificationChannel(
const AndroidNotificationChannel(
_channelId,
_channelName,
importance: Importance.high,
),
);
}
/// Requests Android 13+'s runtime `POST_NOTIFICATIONS` permission.
@ -62,7 +47,7 @@ class LocalNotificationsBackend implements NotificationBackend {
Future.value();
@override
Future<void> show(int slot, String title) async {
Future<void> show(int slot, String title, String body) async {
const details = NotificationDetails(
android: AndroidNotificationDetails(
_channelId,
@ -71,7 +56,12 @@ class LocalNotificationsBackend implements NotificationBackend {
priority: Priority.high,
),
);
await plugin.show(id: slot, title: title, notificationDetails: details);
await plugin.show(
id: slot,
title: title,
body: body,
notificationDetails: details,
);
}
@override

View File

@ -36,13 +36,13 @@ class WebNotificationBackend implements NotificationBackend {
}
@override
Future<void> show(int slot, String title) async {
Future<void> show(int slot, String title, String body) async {
// Posting without permission throws; a silent no-op matches this
// service's degrade-quietly stance everywhere else.
if (!_granted) return;
_shown[slot] = web.Notification(
title,
web.NotificationOptions(tag: 'diet_guard_slot_$slot'),
web.NotificationOptions(body: body, tag: 'diet_guard_slot_$slot'),
);
}

View File

@ -86,9 +86,11 @@ class NotificationService {
await _backend.cancel(id);
}
for (final slot in due) {
// The title is only the overdue slot's clock time (a number from the
// user's own schedule); the launcher icon is the second channel.
await _backend.show(slot, slotLabel(slot));
await _backend.show(
slot,
'Meal not logged',
"You haven't logged your ${slotLabel(slot)} meal yet.",
);
}
}
}

View File

@ -1,42 +0,0 @@
/// Runs one sync and records its outcome for the "not syncing" banner.
///
/// The banner said "Not syncing" on a phone whose sync looked fine, and the
/// release build keeps no log that could say why (see `sync_health.dart`).
/// So a failure here also goes to the board through the app-wide reporter:
/// the next one files its own ticket with the exception that caused it.
/// Inside a WorkManager isolate no reporter is installed, so a background
/// failure is only recorded, not filed.
///
/// Only the sync itself is timed in: screen refreshes after a landed sync
/// run outside, so their errors never mark a working sync as failed.
library;
import 'dart:developer';
import 'package:crdt_sync_flutter/crdt_sync_flutter.dart' show AppErrors;
import 'package:diet_guard_app/services/sync_health.dart';
/// Runs [sync]; records success, or failure plus a `sync.failed` report.
///
/// Returns whether the sync landed. Never throws.
Future<bool> attemptSync(Future<void> Function() sync) async {
try {
await sync();
} on Object catch (error, stackTrace) {
log(
'diet_guard sync failed',
level: 1000,
error: error,
stackTrace: stackTrace,
);
AppErrors.instance?.reporter.report(
'sync.failed',
error,
stack: stackTrace,
);
await SyncHealth.recordFailure();
return false;
}
await SyncHealth.recordSuccess();
return true;
}

View File

@ -14,24 +14,16 @@ import 'package:diet_guard_app/services/wake_alarm_weights.dart';
/// Runs the Body sync against [client], under [devicesDir].
///
/// [wakeAlarm] is wake-alarm's own encrypted store; null (locked, or not
/// opened) skips the weigh-in ingest and nothing else.
///
/// No-ops when [BodyService] is uninitialised (a widget test, or an isolate
/// that never loaded it), so it can neither publish nor clobber anything.
Future<void> syncBody(
RemoteStore client, {
required String devicesDir,
RemoteStore? wakeAlarm,
}) async {
Future<void> syncBody(RemoteStore client, {required String devicesDir}) async {
if (!BodyService.isInitialized) return;
if (wakeAlarm != null) await ingestWakeAlarmWeights(wakeAlarm);
await ingestWakeAlarmWeights(client);
final merged = await syncLog(
client: client,
deviceId: currentSyncDeviceId,
legacyDeviceId: legacySyncDeviceId,
pathPrefix: devicesDir,
revsPath: syncRevsDir,
localLog: bodyToLog(BodyService.instance.document),
encode: encodeBodyForPush,
decode: parseRemoteBody,

View File

@ -5,14 +5,8 @@ import 'package:diet_guard_app/services/github_client_factory.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:uuid/uuid.dart';
/// Where every device's synced files live on the remote: the end-to-end
/// encrypted twin of the old plaintext `diet-guard-sync/devices` (see
/// `sync_e2e.dart`; `E2eLayout.of` derives the same names).
const syncDevicesDir = 'diet-guard-sync/devices-e2e';
/// Where peers publish their (keyed) revisions, apart from the old
/// plaintext `diet-guard-sync/revs` the E2E copy fingerprints.
const syncRevsDir = 'diet-guard-sync/revs-e2e';
/// Where every device's synced files live on the remote.
const syncDevicesDir = 'diet-guard-sync/devices';
/// SharedPreferences key holding this install's device id.
///

View File

@ -1,102 +0,0 @@
/// End-to-end encryption of everything this app syncs.
///
/// Every blob under `diet-guard-sync/devices-e2e` (food log, banks, budget,
/// catering credential, Body, export keyring) is sealed with a key derived
/// from the shared crdt-sync passphrase kept in the OS keystore; Firebase and
/// the GitHub mirror only see record ids, tombstones and clocks. The
/// wake-alarm weigh-ins live on their own prefix with their own header, so
/// they get a second store over the same backend.
///
/// Fail closed: without a usable key nothing is pulled or pushed. The old
/// plaintext `diet-guard-sync/devices` is copied over on open (picking up
/// writes from builds not yet migrated) and never written or deleted here.
/// Mirrors `diet_guard/_sync_e2e.py`.
library;
import 'dart:developer';
import 'package:crdt_sync/crdt_sync.dart';
import 'package:crdt_sync_flutter/crdt_sync_flutter.dart'
show openEncryptedStoreFromKeystore;
import 'package:flutter/foundation.dart';
/// The plaintext prefix every pre-E2E build wrote; only the copy reads it.
const legacyDevicesDir = 'diet-guard-sync/devices';
/// Where the wake-alarm app published before E2E.
const legacyWakeAlarmDir = 'wake-alarm-sync/devices';
/// Argon2id cost for a header this device creates; only tests lower it.
@visibleForTesting
Argon2Params e2eArgon2Params = Argon2Params.recommended;
/// Whether the last open found no usable key, for the lock button.
final ValueNotifier<bool> syncLocked = ValueNotifier<bool>(false);
/// Thrown instead of syncing when end-to-end encryption has no usable key.
class SyncLockedException implements Exception {
/// Creates the exception for [reason].
const SyncLockedException(this.reason);
/// Why the store is locked.
final E2eLockReason reason;
@override
String toString() => 'sync locked (${reason.name})';
}
Future<E2eState> _open(RemoteStore backend, String oldPrefix) =>
openEncryptedStoreFromKeystore(
store: backend,
oldPrefix: oldPrefix,
params: e2eArgon2Params,
);
/// The encrypted diet_guard store over [backend], the outermost store.
///
/// Throws [SyncLockedException] when locked, so no caller can fall through
/// to a plaintext sync.
Future<RemoteStore> openDietGuardStore(RemoteStore backend) async {
final state = await _open(backend, legacyDevicesDir);
syncLocked.value = state is! E2eReady;
if (state is E2eReady) return state.store;
throw SyncLockedException(
state is E2eLocked ? state.reason : E2eLockReason.badHeader,
);
}
/// The cipher of the diet_guard E2E key, for units outside the log sync (the
/// Claude relay seals its requests with it).
///
/// Throws [SyncLockedException] when there is no usable key, same as
/// [openDietGuardStore]. The relay lives under `diet-guard-sync/claude-e2e`,
/// whose header path is the existing `diet-guard-sync/e2e`: one passphrase,
/// one salt, one key.
Future<E2eCipher> openDietGuardCipher(RemoteStore backend) async {
final state = await _open(backend, legacyDevicesDir);
syncLocked.value = state is! E2eReady;
if (state is E2eReady) return state.store.key.cipher(acceptPlaintext: false);
throw SyncLockedException(
state is E2eLocked ? state.reason : E2eLockReason.badHeader,
);
}
/// The encrypted wake-alarm store over [backend], or null when locked or
/// unreachable.
///
/// Its weigh-ins are optional input to the diet sync, so nothing here may
/// fail the tick: a lock or a transport error skips only the ingest.
Future<RemoteStore?> openWakeAlarmStore(RemoteStore backend) async {
try {
final state = await _open(backend, legacyWakeAlarmDir);
return state is E2eReady ? state.store : null;
} on Object catch (error, stackTrace) {
log(
'wake-alarm store unavailable; skipping weigh-ins',
level: 900,
error: error,
stackTrace: stackTrace,
);
return null;
}
}

View File

@ -53,7 +53,8 @@ abstract final class SyncHealth {
_recordFailure(SyncFailureKind.unconfigured);
/// Marks a tick that had a backend but failed to publish.
static Future<void> recordFailure() => _recordFailure(SyncFailureKind.failed);
static Future<void> recordFailure() =>
_recordFailure(SyncFailureKind.failed);
static Future<void> _recordFailure(SyncFailureKind kind) =>
_withPrefs((prefs) => prefs.setString(_kFailureKind, kind.name));
@ -154,16 +155,6 @@ class SyncHealthStatus {
return 'Not syncing since ${_ago(since)}. Meals stay on this device.';
}
/// Compact elapsed time (`5h`, `2d`) for a numeral beside the banner's
/// glyph; null when it has not been at least an hour or never succeeded.
String? get agoShort {
final last = lastSuccess;
if (last == null) return null;
final since = now.difference(last);
if (since < const Duration(hours: 1)) return null;
return since.inDays >= 1 ? '${since.inDays}d' : '${since.inHours}h';
}
static String _ago(Duration since) {
if (since.inDays >= 1) {
return '${since.inDays}d ago';

View File

@ -24,7 +24,6 @@ import 'package:diet_guard_app/services/log_storage_service.dart';
import 'package:diet_guard_app/services/sync_body.dart';
import 'package:diet_guard_app/services/sync_budget_local.dart';
import 'package:diet_guard_app/services/sync_device_id.dart';
import 'package:diet_guard_app/services/sync_e2e.dart';
import 'package:diet_guard_app/services/sync_merge.dart';
import 'package:diet_guard_app/services/sync_merge_kuchnia.dart';
import 'package:diet_guard_app/services/sync_state_factory.dart';
@ -33,19 +32,10 @@ const String _devicesDir = syncDevicesDir;
/// Runs one full sync tick: pull, merge, persist, push.
///
/// [backend] is the outermost raw store (the Firebase/GitHub mirror);
/// everything goes through its end-to-end encrypted view, and a locked
/// device throws [SyncLockedException] before a single read or write.
///
/// Returns the merged log as it now sits on disk locally. Propagates any
/// [GitHubSyncError] from the client for the caller (auto-sync / the manual
/// "Sync now" action) to decide how to report.
Future<DayLog> runSync(
RemoteStore backend, {
SyncStateStore? stateStore,
}) async {
final client = await openDietGuardStore(backend);
final wakeAlarm = await openWakeAlarmStore(backend);
Future<DayLog> runSync(RemoteStore client, {SyncStateStore? stateStore}) async {
final logService = LogStorageService.instance;
final local = await logService.readLog();
@ -54,7 +44,6 @@ Future<DayLog> runSync(
deviceId: currentSyncDeviceId,
legacyDeviceId: legacySyncDeviceId,
pathPrefix: _devicesDir,
revsPath: syncRevsDir,
localLog: dayLogToLog(local),
encode: encodeLogForPush,
decode: parseRemoteLog,
@ -76,7 +65,7 @@ Future<DayLog> runSync(
await _syncManualBank(client);
await _syncKuchniaCredential(client);
await _syncExportKeys(client);
await syncBody(client, devicesDir: _devicesDir, wakeAlarm: wakeAlarm);
await syncBody(client, devicesDir: _devicesDir);
return merged;
}
@ -91,7 +80,6 @@ Future<void> _syncFoodBank(RemoteStore client) async {
deviceId: currentSyncDeviceId,
legacyDeviceId: legacySyncDeviceId,
pathPrefix: _devicesDir,
revsPath: syncRevsDir,
localLog: foodBankToLog(await FoodBankService.instance.readBank()),
encode: encodeFoodBankForPush,
decode: parseRemoteFoodBank,
@ -114,7 +102,6 @@ Future<void> _syncManualBank(RemoteStore client) async {
deviceId: currentSyncDeviceId,
legacyDeviceId: legacySyncDeviceId,
pathPrefix: _devicesDir,
revsPath: syncRevsDir,
localLog: manualBankToLog(local),
encode: encodeManualBankForPush,
decode: parseRemoteManualBank,
@ -131,7 +118,6 @@ Future<void> _syncBudget(RemoteStore client) async {
deviceId: currentSyncDeviceId,
legacyDeviceId: legacySyncDeviceId,
pathPrefix: _devicesDir,
revsPath: syncRevsDir,
localLog: localBudgetLog(),
encode: encodeBudgetForPush,
decode: parseRemoteBudget,
@ -163,7 +149,8 @@ Future<void> _syncExportKeys(RemoteStore client) async {
///
/// The phone runs its own catering importer, so it cannot fetch anything until
/// the panel password reaches it -- that is the whole reason this credential
/// syncs at all. Sealed end-to-end like the rest of the synced state.
/// syncs at all. It is plaintext on the wire, like the rest of the synced
/// state; see `sync_merge_kuchnia.dart`.
///
/// A device that has no credential contributes an empty log, so it neither
/// blocks nor clobbers a peer's real value -- it relays it. Mirrors
@ -175,7 +162,6 @@ Future<void> _syncKuchniaCredential(RemoteStore client) async {
deviceId: currentSyncDeviceId,
legacyDeviceId: legacySyncDeviceId,
pathPrefix: _devicesDir,
revsPath: syncRevsDir,
localLog: credentialToLog(
KuchniaCredentialService.username,
KuchniaCredentialService.password,

View File

@ -1,8 +1,7 @@
/// Morning weigh-ins from the wake-alarm app, as Body weight candidates.
///
/// The wake-alarm phone app publishes
/// `wake-alarm-sync/devices-e2e/<id>/alarm.json` (end-to-end encrypted, read
/// through wake-alarm's own `EncryptingStore`): a crdt_sync Log whose
/// `wake-alarm-sync/devices/<id>/alarm.json`: a crdt_sync Log whose
/// `alarm` record carries `fields[name] = [value, hlc]`. Two fields hold
/// weights:
///
@ -26,7 +25,7 @@ import 'package:diet_guard_app/services/body_service.dart';
import 'package:diet_guard_app/services/sync_merge_body.dart';
/// Where the wake-alarm app publishes, one directory per device.
const wakeAlarmDevicesDir = 'wake-alarm-sync/devices-e2e';
const wakeAlarmDevicesDir = 'wake-alarm-sync/devices';
const _latestField = 'latest_weight_kg';
const _sessionsField = 'morning_sessions';

View File

@ -1,246 +0,0 @@
/// Text-free status cues: tinted icon + shake + haptic instead of sentences.
///
/// Every cue carries its meaning twice (icon shape AND colour) and exposes
/// the old sentence only as a screen-reader label, never as visible text.
library;
import 'dart:async';
import 'dart:math' as math;
import 'package:diet_guard_app/ui/theme.dart';
import 'package:flutter/services.dart';
import 'package:material_ui/material_ui.dart';
export 'package:diet_guard_app/ui/icon_field.dart';
/// What a [StatusCue] reports.
enum CueKind {
/// Something worked.
ok(Icons.check_circle),
/// Neutral information.
info(Icons.info),
/// Caution, e.g. nothing to do or only partly done.
warn(Icons.warning_amber_rounded),
/// Something failed or the input was rejected.
error(Icons.error);
const CueKind(this.icon);
/// Default glyph for this kind.
final IconData icon;
/// Tint for this kind from the active theme.
Color tint(BuildContext context) {
final scheme = Theme.of(context).colorScheme;
final status =
Theme.of(context).extension<AppStatusColors>() ?? AppStatusColors.dark;
return switch (this) {
CueKind.ok => status.success,
CueKind.info => scheme.onSurfaceVariant,
CueKind.warn => status.warning,
CueKind.error => scheme.error,
};
}
}
/// A tinted icon chip that replaces a status sentence.
///
/// [CueKind.error] shakes (~3 swings, skipped when the platform asks for
/// reduced motion) and fires a heavy haptic; [CueKind.ok] fires a light one.
/// [semanticLabel] is announced as a live region and is never painted.
class StatusCue extends StatefulWidget {
/// Creates a cue of [kind]; [icon] overrides the kind's default glyph.
const StatusCue({
required this.kind,
required this.semanticLabel,
this.icon,
this.count,
super.key,
});
/// Meaning of the cue.
final CueKind kind;
/// Spoken description (screen readers, tests); never painted.
final String semanticLabel;
/// Optional glyph replacing [CueKind.icon].
final IconData? icon;
/// Optional numeral painted beside the glyph (e.g. dishes logged).
final int? count;
@override
State<StatusCue> createState() => _StatusCueState();
}
class _StatusCueState extends State<StatusCue>
with SingleTickerProviderStateMixin {
late final AnimationController _shake = AnimationController(
vsync: this,
duration: AppDuration.slow * 2,
);
@override
void initState() {
super.initState();
unawaited(_announce());
}
Future<void> _announce() async {
switch (widget.kind) {
case CueKind.error:
await HapticFeedback.heavyImpact();
if (mounted && !MediaQuery.disableAnimationsOf(context)) {
await _shake.forward();
}
case CueKind.ok:
await HapticFeedback.lightImpact();
case CueKind.info || CueKind.warn:
break;
}
}
@override
void dispose() {
_shake.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
final tint = widget.kind.tint(context);
return Semantics(
liveRegion: true,
label: widget.semanticLabel,
child: ExcludeSemantics(
child: AnimatedBuilder(
animation: _shake,
builder: (context, child) => Transform.translate(
offset: Offset(math.sin(_shake.value * 6 * math.pi) * 8, 0),
child: child,
),
child: DecoratedBox(
decoration: BoxDecoration(
color: tint.withValues(alpha: 0.16),
borderRadius: BorderRadius.circular(AppRadius.md),
border: Border.all(color: tint),
),
child: Padding(
padding: const EdgeInsets.all(AppSpacing.sm),
child: _GlyphCount(
widget.icon ?? widget.kind.icon,
tint,
widget.count,
),
),
),
),
),
);
}
}
/// Shows an icon-only snackbar; [onUndo] adds an undo arrow inside it.
///
/// `SnackBarAction` can only carry text, so the undo is an [IconButton].
void showCueSnack(
BuildContext context, {
required CueKind kind,
required String semanticLabel,
IconData? icon,
int? count,
VoidCallback? onUndo,
}) {
final messenger = ScaffoldMessenger.of(context)..hideCurrentSnackBar();
final tint = kind.tint(context);
messenger.showSnackBar(
SnackBar(
content: Semantics(
liveRegion: true,
label: semanticLabel,
child: Row(
children: [
ExcludeSemantics(
child: _GlyphCount(icon ?? kind.icon, tint, count),
),
const Spacer(),
if (onUndo != null)
IconButton(
icon: const Icon(Icons.undo, semanticLabel: 'Undo'),
onPressed: () {
messenger.hideCurrentSnackBar();
onUndo();
},
),
],
),
),
),
);
}
/// A status to show: `label` is only spoken; the `kind` glyph and the
/// `count` numeral (null = glyph only) are what is painted.
typedef CountCue = ({String label, CueKind kind, int? count});
/// One screen's current status cue; [seq] re-keys the widget so an identical
/// consecutive status still shakes/pulses again.
@immutable
class CueState {
/// Creates the successor of [previous] carrying [kind] and [label].
CueState.next(CueState? previous, this.kind, this.label, [this.count])
: seq = (previous?.seq ?? 0) + 1;
/// Meaning.
final CueKind kind;
/// Spoken description; never painted.
final String label;
/// Optional numeral painted beside the glyph.
final int? count;
/// Monotonic counter used as the widget key.
final int seq;
/// The left-aligned cue widget for this state.
Widget get widget => Align(
alignment: Alignment.centerLeft,
child: StatusCue(
key: ValueKey(seq),
kind: kind,
semanticLabel: label,
count: count,
),
);
}
/// A tinted glyph, followed by [count] when there is one.
class _GlyphCount extends StatelessWidget {
const _GlyphCount(this.icon, this.tint, this.count);
final IconData icon;
final Color tint;
final int? count;
@override
Widget build(BuildContext context) {
final n = count;
if (n == null) return Icon(icon, color: tint);
return Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(icon, color: tint),
const SizedBox(width: AppSpacing.xs),
Text(
'$n',
style: TextStyle(color: tint, fontWeight: FontWeight.w700),
),
],
);
}
}

View File

@ -1,134 +0,0 @@
/// An icon-captioned text field: the glyph is painted, the words are only a
/// spoken label (see [IconField]).
library;
import 'package:flutter/services.dart';
import 'package:material_ui/material_ui.dart';
/// A bordered text field whose caption is an icon plus a spoken label.
///
/// Replaces `InputDecoration(labelText: ...)`: the glyph is painted, the
/// words exist only for screen readers, tests and flutter-web-drive.
class IconField extends StatelessWidget {
/// Creates a field captioned by [icon].
const IconField({
required this.icon,
required this.semanticLabel,
this.controller,
this.keyboardType,
this.obscure = false,
this.suffix,
this.onChanged,
this.dense = false,
this.fieldKey,
this.iconColor,
this.inputFormatters,
this.onSubmitted,
this.autofocus = false,
this.autocorrect = true,
this.fontSize,
super.key,
});
/// Input formatters, e.g. digits only.
final List<TextInputFormatter>? inputFormatters;
/// Called when the user submits from the keyboard.
final ValueChanged<String>? onSubmitted;
/// Whether the field grabs focus when it first appears.
final bool autofocus;
/// Whether the keyboard may autocorrect (false for e-mails and secrets).
final bool autocorrect;
/// Text size of the typed value; the theme's when null.
final double? fontSize;
/// Painted caption.
final IconData icon;
/// Tint of [icon]; the theme's default when null.
final Color? iconColor;
/// Spoken caption; never painted.
final String semanticLabel;
/// Backing controller.
final TextEditingController? controller;
/// Keyboard type.
final TextInputType? keyboardType;
/// Hides the typed characters.
final bool obscure;
/// Trailing widget, e.g. a visibility toggle.
final Widget? suffix;
/// Change callback.
final ValueChanged<String>? onChanged;
/// Compact vertical padding.
final bool dense;
/// Key given to the inner [TextField].
final Key? fieldKey;
@override
Widget build(BuildContext context) {
// MergeSemantics folds the spoken label into the TextField's own node:
// a bare `Semantics(textField: true)` wrapper produced a second,
// disabled textbox beside the real one, so drivers tapped the dead one.
return MergeSemantics(
child: Semantics(
label: semanticLabel,
child: TextField(
key: fieldKey,
controller: controller,
keyboardType: keyboardType,
obscureText: obscure,
onChanged: onChanged,
onSubmitted: onSubmitted,
inputFormatters: inputFormatters,
autofocus: autofocus,
autocorrect: autocorrect,
style: fontSize == null ? null : TextStyle(fontSize: fontSize),
enableSuggestions: autocorrect,
decoration: InputDecoration(
prefixIcon: ExcludeSemantics(child: Icon(icon, color: iconColor)),
prefixIconConstraints: dense
? const BoxConstraints(minWidth: 32, minHeight: 32)
: null,
suffixIcon: suffix,
isDense: dense,
),
),
),
);
}
}
/// Gives [child] a spoken name without painting any text.
///
/// Wraps `Semantics(label:)`; keeping the string on a `semanticLabel:` line
/// lets line-based text scanners recognise it as accessibility metadata even
/// after the formatter splits `Semantics(` from its arguments.
class SpokenLabel extends StatelessWidget {
/// Creates a labelled wrapper around [child].
const SpokenLabel({
required this.semanticLabel,
required this.child,
super.key,
});
/// Spoken name; never painted.
final String semanticLabel;
/// The widget being named.
final Widget child;
@override
Widget build(BuildContext context) =>
Semantics(label: semanticLabel, container: true, child: child);
}

View File

@ -1,80 +0,0 @@
/// Shape + colour vocabulary for the nutrition fields, so a field or figure
/// is recognised by its glyph instead of a "P"/"C"/"F"/"kcal" word.
///
/// Protein is a green circle, carbs an amber triangle, fat a blue square;
/// colour never carries the meaning alone (shape does too).
library;
import 'package:material_ui/material_ui.dart';
/// One nutrition field and its non-text identity.
enum MacroKind {
/// Reference weight the typed macros are stated for.
perGrams(Icons.scale, Color(0xFFAAA09A), 'per (g)', 'per'),
/// Energy.
kcal(Icons.bolt, Color(0xFFE08A3C), 'kcal', 'kcal'),
/// Protein.
protein(Icons.circle, Color(0xFF8A9A3C), 'protein g', 'P'),
/// Carbohydrate.
carbs(Icons.change_history, Color(0xFFE0A63C), 'carbs g', 'C'),
/// Fat.
fat(Icons.square, Color(0xFF6C9BD1), 'fat g', 'F'),
/// Portion weight actually eaten.
eaten(Icons.rice_bowl, Color(0xFFAAA09A), 'eaten (g)', 'eaten');
const MacroKind(this.icon, this.color, this._long, this._short);
/// Painted glyph.
final IconData icon;
/// Glyph tint.
final Color color;
final String _long;
final String _short;
/// Spoken name; the long form unless [compact].
String semanticLabel({required bool compact}) => compact ? _short : _long;
}
/// A glyph + number pair, e.g. a green circle and `12`.
class MacroFigure extends StatelessWidget {
/// Creates a figure for [kind] showing [grams] (or [value] verbatim).
const MacroFigure({
required this.kind,
required this.value,
this.size = 12,
super.key,
});
/// Which nutrient.
final MacroKind kind;
/// The number to show, already formatted.
final String value;
/// Glyph size.
final double size;
@override
Widget build(BuildContext context) {
return Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
kind.icon,
color: kind.color,
size: size,
semanticLabel: kind.semanticLabel(compact: false),
),
const SizedBox(width: 3),
Text(value),
],
);
}
}

View File

@ -1,33 +0,0 @@
/// Glyph for where a log entry came from, replacing the stored source word
/// (`manual`, `food bank`, `catering`) that used to be printed on screen.
library;
import 'package:material_ui/material_ui.dart';
/// Icon for a stored entry `source` value; unknown values get a neutral dot.
IconData sourceIcon(String source) => switch (source) {
'manual' => Icons.edit,
'food bank' => Icons.restaurant_menu,
'catering' => Icons.local_shipping,
_ => Icons.circle_outlined,
};
/// A small painted [sourceIcon] that still speaks the stored source value.
class SourceMark extends StatelessWidget {
/// Creates a mark for [source].
const SourceMark(this.source, {this.size = 14, super.key});
/// Stored source value.
final String source;
/// Glyph size.
final double size;
@override
Widget build(BuildContext context) => Icon(
sourceIcon(source),
size: size,
color: Theme.of(context).colorScheme.onSurfaceVariant,
semanticLabel: source,
);
}

View File

@ -6,7 +6,7 @@
/// hand-picked, not algorithmically derived from one seed color.
library;
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
/// Builds the app's single dark `ThemeData` from the shared token set.
ThemeData buildAppTheme() {
@ -195,9 +195,6 @@ abstract final class AppWidth {
/// value reads as a layout error rather than an affordance.
static const double field = 420;
/// 440px — cap for a date/time picker dialog (7 day columns + year wheel).
static const double picker = 440;
/// Viewport height below which the layout should switch to its compact form.
///
/// 700px, i.e. 768 minus typical window chrome: the supported floor is a

View File

@ -2,13 +2,12 @@
library;
import 'package:diet_guard_app/models/food_suggestion.dart';
import 'package:diet_guard_app/ui/macro_kind.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
/// A tappable list of [FoodSuggestion]s, each filling the form on tap.
///
/// When [compact] is true, only the top [compactLimit] suggestions render as
/// compact single-line rows, with a "N more" button opening the full list in a
/// When [compact] is true, only the top 3 suggestions render as compact
/// single-line rows, with a "N more" button opening the full list in a
/// bottom sheet so nothing becomes unreachable.
class AutocompleteSuggestionList extends StatelessWidget {
/// Creates an [AutocompleteSuggestionList] for [suggestions].
@ -16,8 +15,6 @@ class AutocompleteSuggestionList extends StatelessWidget {
required this.suggestions,
required this.onSelected,
this.compact = false,
this.compactLimit = 3,
this.reserveHeight = false,
super.key,
});
@ -31,16 +28,7 @@ class AutocompleteSuggestionList extends StatelessWidget {
/// of the full unbounded list.
final bool compact;
/// How many rows a compact list shows before its "more" button.
final int compactLimit;
/// Whether a compact list always occupies [dueBlockHeight], empty or full,
/// so nothing below it shifts as suggestions come and go (due mode).
final bool reserveHeight;
/// Height of the block that holds a compact list of two rows plus the
/// "more" button; due mode reserves it so nothing below shifts.
static const double dueBlockHeight = 120;
static const int _compactLimit = 3;
Future<void> _showMore(BuildContext context) async {
await showModalBottomSheet<void>(
@ -59,15 +47,6 @@ class AutocompleteSuggestionList extends StatelessWidget {
@override
Widget build(BuildContext context) {
final list = _list(context);
if (!reserveHeight) return list;
return SizedBox(
height: dueBlockHeight,
child: Align(alignment: Alignment.topLeft, child: list),
);
}
Widget _list(BuildContext context) {
if (suggestions.isEmpty) return const SizedBox.shrink();
if (!compact) {
return ListView.builder(
@ -78,19 +57,15 @@ class AutocompleteSuggestionList extends StatelessWidget {
return ListTile(
dense: true,
title: Text(suggestion.name),
subtitle: Align(
alignment: Alignment.centerLeft,
child: MacroFigure(
kind: MacroKind.kcal,
value: suggestion.nutrition.kcal.toStringAsFixed(0),
),
subtitle: Text(
'${suggestion.nutrition.kcal.toStringAsFixed(0)} kcal',
),
onTap: () => onSelected(suggestion),
);
},
);
}
final shown = suggestions.take(compactLimit).toList();
final shown = suggestions.take(_compactLimit).toList();
final remaining = suggestions.length - shown.length;
return Column(
mainAxisSize: MainAxisSize.min,
@ -101,34 +76,17 @@ class AutocompleteSuggestionList extends StatelessWidget {
onTap: () => onSelected(suggestion),
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 4),
child: Row(
children: [
Flexible(
child: Text(
suggestion.name,
overflow: TextOverflow.ellipsis,
),
),
const SizedBox(width: 8),
MacroFigure(
kind: MacroKind.kcal,
value: suggestion.nutrition.kcal.toStringAsFixed(0),
),
],
child: Text(
'${suggestion.name} · '
'${suggestion.nutrition.kcal.toStringAsFixed(0)} kcal',
overflow: TextOverflow.ellipsis,
),
),
),
if (remaining > 0)
TextButton(
onPressed: () => _showMore(context),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.more_horiz, semanticLabel: 'More'),
const SizedBox(width: 4),
Text('+$remaining'),
],
),
child: Text('$remaining more'),
),
],
);

View File

@ -2,23 +2,23 @@
library;
import 'package:diet_guard_app/models/period_average.dart';
import 'package:diet_guard_app/ui/cues.dart';
import 'package:diet_guard_app/ui/macro_kind.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
/// Displays this week's and this month's average kcal/day and their bands.
///
/// Mirrors `_calendar_view.py`'s `averages_text`, minus the words: each period
/// is a calendar glyph, the average as a number, and the band as a tinted
/// icon (check = under, warning = slightly over, error = very over, dash =
/// no data) so colour is never the only channel.
/// Mirrors `_calendar_view.py`'s `averages_text`: "Avg/day (to yesterday):
/// week NNNN kcal (band) · month NNNN kcal (band)".
///
/// Both periods stop at yesterday, so this line does not swing every time a
/// meal is logged today -- it answers "how has this week gone", not "how am I
/// doing right now", which is what the Today progress card is for.
class AverageSummaryRow extends StatelessWidget {
/// Creates an [AverageSummaryRow].
const AverageSummaryRow({required this.week, required this.month, super.key});
const AverageSummaryRow({
required this.week,
required this.month,
super.key,
});
/// The current ISO week's average, through yesterday.
final PeriodAverage week;
@ -26,72 +26,18 @@ class AverageSummaryRow extends StatelessWidget {
/// The current calendar month's average, through yesterday.
final PeriodAverage month;
@override
Widget build(BuildContext context) {
return Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
_PeriodFigure(
period: week,
icon: Icons.calendar_view_week,
semanticLabel: 'week',
),
const SizedBox(width: 24),
_PeriodFigure(
period: month,
icon: Icons.calendar_view_month,
semanticLabel: 'month',
),
],
);
}
}
class _PeriodFigure extends StatelessWidget {
const _PeriodFigure({
required this.period,
required this.icon,
required this.semanticLabel,
});
final PeriodAverage period;
final IconData icon;
final String semanticLabel;
(CueKind, IconData) get _band => switch (period.band) {
null => (CueKind.info, Icons.remove_circle_outline),
AverageBand.under => (CueKind.ok, Icons.check_circle),
AverageBand.slightlyOver => (CueKind.warn, Icons.warning_amber_rounded),
AverageBand.veryOver => (CueKind.error, Icons.error),
};
@override
Widget build(BuildContext context) {
final (kind, bandIcon) = _band;
static String _part(PeriodAverage period) {
final avg = period.avgKcal;
final style = Theme.of(context).textTheme.bodySmall;
return Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(icon, size: 16, semanticLabel: semanticLabel),
const SizedBox(width: 4),
Icon(
bandIcon,
size: 16,
color: kind.tint(context),
semanticLabel: bandLabel(period.band),
),
if (avg != null) ...[
const SizedBox(width: 4),
Icon(
MacroKind.kcal.icon,
size: 14,
color: MacroKind.kcal.color,
semanticLabel: 'kcal',
),
Text('${avg.round()}', style: style),
],
],
if (avg == null) return bandLabel(period.band);
return '${avg.round()} kcal (${bandLabel(period.band)})';
}
@override
Widget build(BuildContext context) {
return Text(
'Avg/day (to yesterday): week ${_part(week)} · month ${_part(month)}',
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.bodySmall,
);
}
}

View File

@ -2,13 +2,9 @@
library;
import 'package:diet_guard_app/services/activity_kcal.dart';
import 'package:diet_guard_app/ui/cues.dart';
import 'package:diet_guard_app/ui/macro_kind.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:diet_guard_app/services/body_steps.dart';
import 'package:diet_guard_app/widgets/body/body_section.dart';
import 'package:diet_guard_app/widgets/body/formula_figure.dart';
import 'package:diet_guard_app/widgets/body/workout_kind_icon.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
/// How many of the newest sessions to list.
const int activityListLimit = 10;
@ -59,118 +55,48 @@ class ActivityCard extends StatelessWidget {
final lastDay = steps.isEmpty
? null
: steps.keys.reduce((a, b) => a.compareTo(b) > 0 ? a : b);
final muted = Theme.of(context).colorScheme.onSurfaceVariant;
return BodySection(
semanticLabel: 'Activity',
title: 'Activity',
children: [
if (sessions == null && steps.isEmpty)
const StatusCue(
kind: CueKind.info,
icon: Icons.directions_run,
semanticLabel: 'No activity data yet -- published by the PC.',
),
const BodyNote('No activity data yet -- published by the PC.'),
if (means != null) ...[
Row(
children: [
Icon(
Icons.date_range,
size: 18,
color: muted,
semanticLabel: 'Mean daily exercise, last $window full days:',
),
const SizedBox(width: AppSpacing.xs),
Text('$window'),
],
),
BodyNote('Mean daily exercise, last $window full days:'),
for (final name in activityFormulas)
_FormulaRow(name, whole(means[name] ?? 0)),
BodyStatRow(name, '${whole(means[name] ?? 0)} kcal/day'),
],
if (lastDay != null && stepKcal != null)
Padding(
padding: const EdgeInsets.symmetric(vertical: AppSpacing.xs),
child: Row(
children: [
Icon(
Icons.directions_walk,
size: 18,
color: muted,
semanticLabel: 'Steps outside workouts',
),
const SizedBox(width: AppSpacing.xs),
Text('${steps[lastDay]} $lastDay'),
const Spacer(),
Icon(Icons.add, size: 16, color: muted),
MacroFigure(
kind: MacroKind.kcal,
value: whole(stepKcal),
size: 16,
),
],
),
BodyNote(
'Steps outside workouts: ${steps[lastDay]} on $lastDay; above '
'$stepBaseline/day they add ${whole(stepKcal)} kcal/day '
'(included above).',
),
if (onConnectSteps != null)
Align(
alignment: Alignment.centerLeft,
child: OutlinedButton(
child: OutlinedButton.icon(
icon: const Icon(Icons.directions_walk),
label: const Text('Connect Health Connect steps'),
onPressed: onConnectSteps,
child: const Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
Icons.directions_walk,
semanticLabel: 'Connect Health Connect steps',
),
Icon(Icons.link),
],
),
),
),
if (sessions != null && kg == null)
const StatusCue(
kind: CueKind.warn,
icon: Icons.monitor_weight,
semanticLabel: 'Enter your weight to estimate exercise kcal.',
),
const BodyNote('Enter your weight to estimate exercise kcal.'),
if (sessions != null && kg != null) ...[
const Divider(),
if (newest.isEmpty)
const StatusCue(
kind: CueKind.info,
icon: Icons.event_busy,
semanticLabel: 'No workouts in the last 28 days.',
),
const BodyNote('No workouts in the last 28 days.'),
for (final session in newest.take(activityListLimit))
_SessionTile(result: sessionKcal(session, kg)),
if (newest.isNotEmpty)
const BodyNote('~ = no distance, MET estimate used instead.'),
const BodyNote(methodsNote),
],
],
);
}
}
/// A formula's glyph on the left, its kcal figure on the right.
class _FormulaRow extends StatelessWidget {
const _FormulaRow(this.name, this.value);
final String name;
final String value;
@override
Widget build(BuildContext context) => Padding(
padding: const EdgeInsets.symmetric(vertical: AppSpacing.xs / 2),
child: Row(
children: [
Expanded(
child: Align(
alignment: Alignment.centerLeft,
child: FormulaGlyph(name),
),
),
MacroFigure(kind: MacroKind.kcal, value: value, size: 16),
],
),
);
}
class _SessionTile extends StatelessWidget {
const _SessionTile({required this.result});
@ -180,67 +106,22 @@ class _SessionTile extends StatelessWidget {
Widget build(BuildContext context) {
final session = result.session;
final km = session.km;
final muted = Theme.of(context).colorScheme.onSurfaceVariant;
return Padding(
padding: const EdgeInsets.symmetric(vertical: AppSpacing.xs),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Text(session.day),
const SizedBox(width: AppSpacing.sm),
Icon(
kindIcon(session.kind),
size: 16,
color: muted,
semanticLabel: session.label,
),
if (session.source == 'manual') ...[
const SizedBox(width: AppSpacing.sm),
Flexible(child: Text(session.label)),
],
],
),
Row(
children: [
Icon(
Icons.timer_outlined,
size: 16,
color: muted,
semanticLabel: 'minutes',
),
Text(' ${whole(session.minutes)}'),
if (km != null) ...[
const SizedBox(width: AppSpacing.md),
Icon(Icons.route, size: 16, color: muted, semanticLabel: 'km'),
Text(' ${oneDecimal(km)}'),
],
const SizedBox(width: AppSpacing.md),
Icon(
MacroKind.kcal.icon,
size: 16,
color: MacroKind.kcal.color,
semanticLabel: 'kcal',
),
const SizedBox(width: AppSpacing.xs),
Expanded(
child: Wrap(
spacing: AppSpacing.sm,
children: [
for (final name in activityFormulas)
FormulaFigure(
name,
whole(result.kcal[name]!),
fallback: result.fallback.contains(name),
),
],
),
),
],
),
],
final distance = km == null ? '' : ', ${oneDecimal(km)} km';
final kcal = [
for (final name in activityFormulas)
_formulaKcal(name, result.kcal[name]!, result.fallback.contains(name)),
].join(' · ');
return ListTile(
dense: true,
contentPadding: EdgeInsets.zero,
title: Text('${session.day} ${session.label}'),
subtitle: Text(
'${whole(session.minutes)} min$distance\n$kcal kcal',
),
isThreeLine: true,
);
}
}
String _formulaKcal(String name, double kcal, bool fallback) =>
'$name ${whole(kcal)}${fallback ? '~' : ''}';

View File

@ -1,74 +1,52 @@
/// A card, the building block of every Body screen section, plus the
/// icon-led stat rows the cards are made of. No headings: the overview tile
/// that opened the sheet already says what it is.
/// A titled card, the building block of every Body screen section.
library;
import 'package:diet_guard_app/services/body_calc.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
/// A card with [children] stacked in it; [semanticLabel] names it for screen
/// readers and tests and is never painted.
/// A card with a title row and [children] stacked below it.
class BodySection extends StatelessWidget {
/// Creates a section.
const BodySection({
required this.semanticLabel,
required this.title,
required this.children,
super.key,
});
/// Spoken name of the section.
final String semanticLabel;
/// Section heading.
final String title;
/// Section content.
final List<Widget> children;
@override
Widget build(BuildContext context) {
return Semantics(
container: true,
label: semanticLabel,
child: Card(
margin: const EdgeInsets.only(bottom: AppSpacing.md),
child: Padding(
padding: const EdgeInsets.all(AppSpacing.md),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: children,
),
final theme = Theme.of(context);
return Card(
margin: const EdgeInsets.only(bottom: AppSpacing.md),
child: Padding(
padding: const EdgeInsets.all(AppSpacing.md),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(title, style: theme.textTheme.titleMedium),
const SizedBox(height: AppSpacing.sm),
...children,
],
),
),
);
}
}
/// One line of a stats card: a leading mark on the left, a value on the right.
///
/// The mark is either a formula name ([BodyStatRow.named]: a proper noun such
/// as Devine or ACSM, shown as is) or an icon ([BodyStatRow.icon]).
/// A label on the left, a value on the right; one line of a stats card.
class BodyStatRow extends StatelessWidget {
/// A row led by a formula's proper name.
const BodyStatRow.named(this.name, this.value, {this.color, super.key})
: icon = null,
semanticLabel = null;
/// Creates a row.
const BodyStatRow(this.label, this.value, {this.color, super.key});
/// A row led by [icon], spoken as [semanticLabel].
const BodyStatRow.icon(
IconData this.icon,
String this.semanticLabel,
this.value, {
this.color,
super.key,
}) : name = null;
/// Proper-noun lead, or null when an icon leads.
final String? name;
/// Icon lead, or null when a name leads.
final IconData? icon;
/// Spoken description of [icon].
final String? semanticLabel;
/// What the value is.
final String label;
/// The formatted value.
final String value;
@ -78,19 +56,11 @@ class BodyStatRow extends StatelessWidget {
@override
Widget build(BuildContext context) {
final lead = icon;
return Padding(
padding: const EdgeInsets.symmetric(vertical: AppSpacing.xs / 2),
child: Row(
children: [
Expanded(
child: lead == null
? Text(name!)
: Align(
alignment: Alignment.centerLeft,
child: Icon(lead, size: 20, semanticLabel: semanticLabel),
),
),
Expanded(child: Text(label)),
Text(
value,
style: TextStyle(
@ -104,8 +74,28 @@ class BodyStatRow extends StatelessWidget {
}
}
/// `74.99` -> `"75.0 kg"`, null -> a dash. Half-up, like the PC.
String formatKg(double? kg) => kg == null ? '—' : '${oneDecimal(kg)} kg';
/// A muted one-line explanation (missing data, notes).
class BodyNote extends StatelessWidget {
/// Creates a note.
const BodyNote(this.text, {super.key});
/// The note.
final String text;
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
return Text(
text,
style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
),
);
}
}
/// `74.99` -> `"75.0 kg"`, null -> `"n/a"`. Half-up, like the PC.
String formatKg(double? kg) => kg == null ? 'n/a' : '${oneDecimal(kg)} kg';
/// [value] to one decimal, rounded half-up like the PC prints it.
String oneDecimal(double value) => halfUp(value, 1).toStringAsFixed(1);

View File

@ -2,25 +2,8 @@
library;
import 'package:diet_guard_app/services/body_calc.dart';
import 'package:diet_guard_app/ui/cues.dart';
import 'package:diet_guard_app/ui/macro_kind.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:diet_guard_app/widgets/body/body_section.dart';
import 'package:material_ui/material_ui.dart';
/// The BMI band as glyph + colour (never colour alone): a green check inside
/// the healthy range, an amber or red arrow towards the side it is off by.
(IconData, CueKind) bmiBandCue(String category) {
if (category == 'normal') return (Icons.check_circle, CueKind.ok);
if (category.contains('thinness')) {
return (Icons.trending_down, CueKind.warn);
}
if (category.startsWith('overweight')) {
return (Icons.trending_up, CueKind.warn);
}
if (category.startsWith('obese')) return (Icons.trending_up, CueKind.error);
return (Icons.help_outline, CueKind.info);
}
import 'package:flutter/material.dart';
/// BMI, BMI Prime, Trefethen's BMI and the WHO category.
class BmiCard extends StatelessWidget {
@ -34,40 +17,30 @@ class BmiCard extends StatelessWidget {
Widget build(BuildContext context) {
final report = bmiReport(bio);
final (low, high) = healthyRange(bio);
final (icon, kind) = bmiBandCue(report.category);
final tint = kind.tint(context);
final normal = report.category == 'normal';
return BodySection(
semanticLabel: 'BMI',
title: 'BMI',
children: [
Row(
children: [
Icon(icon, color: tint, semanticLabel: report.category),
const SizedBox(width: AppSpacing.sm),
Text(
oneDecimal(report.bmi),
style: Theme.of(
context,
).textTheme.headlineMedium?.copyWith(color: tint),
),
],
BodyStatRow(
'BMI',
oneDecimal(report.bmi),
color: normal ? null : Theme.of(context).colorScheme.error,
),
const SizedBox(height: AppSpacing.sm),
BodyStatRow.named(
'BMI Prime',
halfUp(report.prime, 2).toStringAsFixed(2),
),
BodyStatRow.named('Trefethen', oneDecimal(report.trefethen)),
BodyStatRow.icon(
Icons.favorite,
BodyStatRow('Category', report.category),
BodyStatRow('BMI Prime', halfUp(report.prime, 2).toStringAsFixed(2)),
BodyStatRow('Trefethen (new BMI)', oneDecimal(report.trefethen)),
BodyStatRow(
'Healthy weight for your height (BMI 18.5-24.9)',
'${oneDecimal(low)}-${oneDecimal(high)} kg',
),
const BodyNote(bmiPrimeNote),
const BodyNote(trefethenNote),
],
);
}
}
/// Every ideal-weight formula; a dash where one is undefined.
/// Every ideal-weight formula; `n/a` where one is undefined.
class IdealWeightCard extends StatelessWidget {
/// Creates the card for [bio].
const IdealWeightCard({required this.bio, super.key});
@ -78,25 +51,25 @@ class IdealWeightCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
final formulas = idealWeights(bio);
final undefined = formulas.any((f) => f.value == null);
final summary = idealSummary(formulas);
return BodySection(
semanticLabel: 'Ideal weight',
title: 'Ideal weight',
children: [
for (final formula in formulas)
BodyStatRow.named(formula.name, formatKg(formula.value)),
BodyStatRow(formula.name, formatKg(formula.value)),
if (summary != null) ...[
const Divider(),
BodyStatRow.icon(
Icons.functions,
'Average of all',
formatKg(summary.$1),
),
BodyStatRow.icon(
Icons.swap_horiz,
BodyStatRow('Average of all', formatKg(summary.$1)),
BodyStatRow(
'Ideal range',
'${oneDecimal(summary.$2)}-${oneDecimal(summary.$3)} kg',
),
],
if (undefined)
const BodyNote(
'Devine, Robinson and Miller are undefined below 152.4 cm.',
),
],
);
}
@ -116,29 +89,14 @@ class BmrCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
return BodySection(
semanticLabel: 'Resting metabolism (BMR)',
title: 'Resting metabolism (BMR)',
children: [
for (final formula in bmrFormulas(bio, bodyFatPct))
Padding(
padding: const EdgeInsets.symmetric(vertical: AppSpacing.xs / 2),
child: Row(
children: [
Expanded(child: Text(formula.name)),
if (formula.value == null)
Icon(
Icons.percent,
size: 18,
color: CueKind.warn.tint(context),
semanticLabel: 'n/a -- log a body-fat %',
)
else
MacroFigure(
kind: MacroKind.kcal,
value: whole(formula.value!),
size: 16,
),
],
),
BodyStatRow(
formula.name,
formula.value == null
? 'n/a -- log a body-fat %'
: '${whole(formula.value!)} kcal',
),
],
);

View File

@ -1,34 +1,22 @@
/// The Body screen's overview: two-column icon tiles that fit one phone
/// The Body screen's overview: two-column metric tiles that fit one phone
/// screen. Tapping a tile opens the section's full card in a bottom sheet.
library;
import 'package:diet_guard_app/ui/theme.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
/// One tile: a big [icon] (spoken as [semanticLabel]), an optional headline
/// [value] and the [builder] of the full card shown in the sheet.
/// One tile: a section [title], an optional headline [value], and the
/// [builder] of the full card shown in the sheet.
class BodyTileSpec {
/// Creates a tile spec.
const BodyTileSpec({
required this.semanticLabel,
required this.icon,
required this.builder,
this.value,
this.valueIcon,
});
const BodyTileSpec({required this.title, required this.builder, this.value});
/// Spoken name of the section; never painted.
final String semanticLabel;
/// The section's glyph.
final IconData icon;
/// Section name, the same text the full card carries.
final String title;
/// Headline number for the tile (null when the section has none).
final String? value;
/// Small glyph in front of [value] (e.g. a bolt for kcal).
final IconData? valueIcon;
/// Builds the full card for the sheet.
final WidgetBuilder builder;
}
@ -88,58 +76,33 @@ class _Tile extends StatelessWidget {
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final value = spec.value;
final valueIcon = spec.valueIcon;
return Card(
margin: EdgeInsets.zero,
child: Semantics(
button: true,
label: spec.semanticLabel,
child: InkWell(
onTap: () => _open(context),
borderRadius: BorderRadius.circular(AppRadius.md),
child: Padding(
padding: const EdgeInsets.all(AppSpacing.sm),
child: Row(
children: [
ExcludeSemantics(
child: Icon(
spec.icon,
size: 36,
color: theme.colorScheme.onSurfaceVariant,
child: InkWell(
onTap: () => _open(context),
borderRadius: BorderRadius.circular(AppRadius.md),
child: Padding(
padding: const EdgeInsets.all(AppSpacing.sm),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
spec.title,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: theme.textTheme.bodyMedium,
),
if (spec.value != null)
Text(
spec.value!,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: theme.textTheme.titleMedium?.copyWith(
color: theme.colorScheme.primary,
),
),
// The whole space beside the glyph goes to the value; it
// scales down instead of ellipsizing ("70.0 kg" must show).
Expanded(
child: Align(
alignment: Alignment.centerRight,
child: FittedBox(
fit: BoxFit.scaleDown,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
if (valueIcon != null)
Icon(
valueIcon,
size: 18,
color: theme.colorScheme.primary,
),
if (value != null)
Text(
value,
maxLines: 1,
style: theme.textTheme.titleMedium?.copyWith(
color: theme.colorScheme.primary,
),
),
],
),
),
),
),
],
),
],
),
),
),

View File

@ -1,230 +0,0 @@
/// Dated-value entry card: save or delete any day, undo a delete, and chart
/// the history. Shared by weight and body fat (see `weight_card.dart`).
library;
import 'package:diet_guard_app/models/local_time.dart';
import 'package:diet_guard_app/ui/cues.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:diet_guard_app/widgets/body/body_section.dart';
import 'package:diet_guard_app/widgets/body/weight_chart.dart';
import 'package:diet_guard_app/widgets/pickers/pickers.dart';
import 'package:flutter/services.dart';
import 'package:material_ui/material_ui.dart';
/// Enters/deletes a day's value and charts the history.
class DatedValueCard extends StatefulWidget {
/// Creates the card.
const DatedValueCard({
required this.semanticLabel,
required this.fieldSemanticLabel,
required this.icon,
required this.unit,
required this.min,
required this.max,
required this.latest,
required this.series,
required this.onSave,
required this.onDelete,
required this.onChanged,
super.key,
});
/// Spoken name of the card; never painted.
final String semanticLabel;
/// Spoken name of the input; never painted.
final String fieldSemanticLabel;
/// Glyph captioning the input.
final IconData icon;
/// Unit suffix (`kg`, `%`).
final String unit;
/// Smallest accepted value.
final double min;
/// Largest accepted value.
final double max;
/// Newest `(day, value)`, or null.
final (String, double)? latest;
/// Every live `(day, value)`, oldest first.
final List<(String, double)> series;
/// Writes a value for a day.
final Future<void> Function(String day, double value) onSave;
/// Deletes a day.
final Future<void> Function(String day) onDelete;
/// Called once a value has been written or deleted.
final VoidCallback onChanged;
@override
State<DatedValueCard> createState() => _DatedValueCardState();
}
class _DatedValueCardState extends State<DatedValueCard> {
final _value = TextEditingController();
String _day = localDateKey(DateTime.now());
Widget? _status;
(String, double)? _undo;
@override
void dispose() {
_value.dispose();
super.dispose();
}
String _fmt(double value) => '${oneDecimal(value)} ${widget.unit}';
Future<void> _pickDay() async {
final picked = await pickDate(
context: context,
firstDate: DateTime(2000),
lastDate: DateTime.now(),
initialDate: DateTime.parse(_day),
);
if (picked == null || !mounted) return;
setState(() => _day = localDateKey(picked));
}
Future<void> _save() async {
final value = double.tryParse(_value.text.replaceAll(',', '.'));
if (value == null || value < widget.min || value > widget.max) {
setState(
() => _status = StatusCue(
key: UniqueKey(),
kind: CueKind.error,
icon: widget.icon,
semanticLabel:
'${widget.semanticLabel} must be ${whole(widget.min)}-'
'${whole(widget.max)} ${widget.unit}.',
),
);
return;
}
await widget.onSave(_day, value);
if (!mounted) return;
_value.clear();
setState(() {
_undo = null;
_status = StatusCue(
key: UniqueKey(),
kind: CueKind.ok,
semanticLabel: 'Saved ${_fmt(value)} for $_day.',
);
});
widget.onChanged();
}
/// Deletes at once; the undo arrow restores the value that was there.
Future<void> _delete() async {
final day = _day;
final removed = [
for (final point in widget.series)
if (point.$1 == day) point,
];
await widget.onDelete(day);
if (!mounted) return;
setState(() {
_undo = removed.isEmpty ? null : removed.first;
_status = StatusCue(
key: UniqueKey(),
kind: CueKind.ok,
icon: Icons.delete_outline,
semanticLabel: 'Deleted $day.',
);
});
widget.onChanged();
}
Future<void> _restore() async {
final undo = _undo;
if (undo == null) return;
await widget.onSave(undo.$1, undo.$2);
if (!mounted) return;
setState(() {
_undo = null;
_status = null;
});
widget.onChanged();
}
@override
Widget build(BuildContext context) {
final latest = widget.latest;
final scheme = Theme.of(context).colorScheme;
final undo = _undo;
return BodySection(
semanticLabel: widget.semanticLabel,
children: [
Row(
children: [
const Icon(Icons.update, size: 18, semanticLabel: 'Latest'),
const SizedBox(width: AppSpacing.xs),
if (latest == null)
Icon(Icons.block, size: 18, color: scheme.outline)
else
// Scales down instead of clipping on a narrow sheet.
Flexible(
child: FittedBox(
fit: BoxFit.scaleDown,
child: Text('${_fmt(latest.$2)} ${latest.$1}', maxLines: 1),
),
),
],
),
Row(
children: [
Expanded(
child: IconField(
icon: widget.icon,
semanticLabel: widget.fieldSemanticLabel,
controller: _value,
keyboardType: const TextInputType.numberWithOptions(
decimal: true,
),
inputFormatters: [
FilteringTextInputFormatter.allow(RegExp('[0-9.,]')),
],
),
),
TextButton(
onPressed: _pickDay,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [const Icon(Icons.event, size: 18), Text(' $_day')],
),
),
],
),
Row(
children: [
if (_status != null) _status! else const SizedBox.shrink(),
if (undo != null)
IconButton(
onPressed: _restore,
icon: const Icon(Icons.undo, semanticLabel: 'Undo'),
),
const Spacer(),
IconButton(
icon: const Icon(
Icons.delete_outline,
semanticLabel: 'Delete this day',
),
onPressed: _delete,
),
IconButton.filled(
onPressed: _save,
icon: const Icon(Icons.check, semanticLabel: 'Save'),
),
],
),
WeightChart(series: widget.series),
],
);
}
}

View File

@ -1,65 +0,0 @@
/// A kcal formula shown as a glyph + number; its proper name is only the
/// glyph's spoken label.
library;
import 'package:diet_guard_app/services/activity_kcal.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:material_ui/material_ui.dart';
/// One distinct glyph per entry of [activityFormulas].
const Map<String, IconData> formulaIcons = {
'MET': Icons.speed,
'ACSM': Icons.functions,
'Per-km': Icons.straighten,
};
/// The glyph for formula [name], spoken as the formula's proper name.
class FormulaGlyph extends StatelessWidget {
/// Creates a glyph for [name].
const FormulaGlyph(this.name, {this.size = 16, super.key});
/// The formula's proper name (a key of [formulaIcons]).
final String name;
/// Glyph size.
final double size;
// The proper name is spoken only: a tooltip paints on long-press.
@override
Widget build(BuildContext context) => Icon(
formulaIcons[name],
size: size,
color: Theme.of(context).colorScheme.onSurfaceVariant,
semanticLabel: name,
);
}
/// Glyph + number (a trailing `~` marks a figure that reuses the MET value).
class FormulaFigure extends StatelessWidget {
/// Creates a figure.
const FormulaFigure(
this.name,
this.value, {
this.fallback = false,
super.key,
});
/// The formula's proper name.
final String name;
/// The formatted kcal number.
final String value;
/// Whether the figure is a fallback to the MET value.
final bool fallback;
@override
Widget build(BuildContext context) => Row(
mainAxisSize: MainAxisSize.min,
children: [
FormulaGlyph(name),
const SizedBox(width: AppSpacing.xs),
Text(fallback ? '$value~' : value),
],
);
}

View File

@ -1,7 +1,6 @@
/// The Body screen's top line as marks instead of a sentence: direction
/// arrow, amount, unit, per-period calendar, activity glyph, then a bolt and
/// the daily kcal answer. Every mark is tappable and opens a picker; the
/// choice is saved (and synced) immediately. Informational only.
/// The Body screen's top line: "To [lose] [0.5] [kg] / [week] on
/// [Moderate] eat 2019 kcal". Every bracket is tappable and opens a picker;
/// the choice is saved (and synced) immediately. Informational only.
library;
import 'dart:async';
@ -10,15 +9,12 @@ import 'package:diet_guard_app/services/body_calc.dart';
import 'package:diet_guard_app/services/body_energy.dart';
import 'package:diet_guard_app/services/body_prefs.dart';
import 'package:diet_guard_app/services/body_service.dart';
import 'package:diet_guard_app/ui/cues.dart';
import 'package:diet_guard_app/ui/macro_kind.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:diet_guard_app/widgets/body/body_section.dart';
import 'package:diet_guard_app/widgets/body/goal_icons.dart';
import 'package:diet_guard_app/widgets/body/goal_pickers.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
/// The goal row and its answer.
/// The goal sentence and its answer.
class GoalCard extends StatefulWidget {
/// Creates the card.
const GoalCard({
@ -51,59 +47,26 @@ class _GoalCardState extends State<GoalCard> {
await setGoal(BodyService.instance, picked);
}
/// A bordered, tappable mark spoken as [spoken]; [child] is its look.
Widget _choice(
String spoken,
Widget child,
Future<Goal?> Function(BuildContext, Goal) picker,
) {
Widget _choice(String text, Future<Goal?> Function(BuildContext, Goal) p) {
final scheme = Theme.of(context).colorScheme;
return Semantics(
button: true,
label: spoken,
child: InkWell(
onTap: () => unawaited(_pick(picker)),
borderRadius: BorderRadius.circular(AppRadius.sm),
child: Container(
padding: const EdgeInsets.symmetric(
horizontal: AppSpacing.sm,
vertical: AppSpacing.xs,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(AppRadius.sm),
border: Border.all(color: scheme.outline),
),
child: ExcludeSemantics(
child: DefaultTextStyle.merge(
style: TextStyle(
color: scheme.primary,
fontWeight: FontWeight.w600,
),
child: IconTheme.merge(
data: IconThemeData(color: scheme.primary),
child: child,
),
),
return InkWell(
onTap: () => unawaited(_pick(p)),
borderRadius: BorderRadius.circular(AppRadius.sm),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: AppSpacing.xs),
child: Text(
text,
style: TextStyle(
color: scheme.primary,
fontWeight: FontWeight.w600,
decoration: TextDecoration.underline,
decorationColor: scheme.primary,
),
),
),
);
}
Widget _iconChoice(
String spoken,
IconData icon,
Future<Goal?> Function(BuildContext, Goal) picker, {
String? caption,
}) => _choice(
spoken,
Row(
mainAxisSize: MainAxisSize.min,
children: [Icon(icon), if (caption != null) Text(caption)],
),
picker,
);
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
@ -113,81 +76,51 @@ class _GoalCardState extends State<GoalCard> {
final tdee = target.tdee;
final maintain = _goal.direction == 'maintain';
return BodySection(
semanticLabel: 'Daily calorie target',
title: 'Daily calorie target',
children: [
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
spacing: AppSpacing.sm,
runSpacing: AppSpacing.sm,
runSpacing: AppSpacing.xs,
children: [
_iconChoice(
_goal.direction,
directionIcon(_goal.direction),
pickDirection,
),
const Text('To'),
_choice(_goal.direction, pickDirection),
if (!maintain) ...[
_choice(
formatG(_goal.amount),
Text(formatG(_goal.amount)),
pickAmount,
),
_choice(_goal.weightUnit, Text(_goal.weightUnit), pickWeightUnit),
_iconChoice(
_goal.timeUnit,
timeUnitIcon(_goal.timeUnit),
pickTimeUnit,
),
_choice(formatG(_goal.amount), pickAmount),
_choice(_goal.weightUnit, pickWeightUnit),
const Text('/'),
_choice(_goal.timeUnit, pickTimeUnit),
],
_iconChoice(
activityLabel(_goal.activity),
activityIcon(_goal.activity),
pickActivity,
caption: activityCaption(_goal.activity),
),
if (kcal != null)
Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(MacroKind.kcal.icon, color: theme.colorScheme.primary),
Text(
'$kcal',
style: theme.textTheme.headlineMedium?.copyWith(
color: theme.colorScheme.primary,
fontWeight: FontWeight.w700,
),
),
],
const Text('on'),
_choice(activityLabel(_goal.activity), pickActivity),
if (kcal != null) ...[
const Text('eat '),
Text(
'$kcal',
style: theme.textTheme.headlineMedium?.copyWith(
color: theme.colorScheme.primary,
fontWeight: FontWeight.w700,
),
),
const Text(' kcal'),
],
],
),
const SizedBox(height: AppSpacing.sm),
if (kcal == null)
const StatusCue(
kind: CueKind.warn,
icon: Icons.directions_run,
semanticLabel: 'no workouts published yet (the PC publishes them).',
),
const BodyNote('no workouts published yet (the PC publishes them).'),
if (target.belowFloor)
const StatusCue(
kind: CueKind.error,
icon: Icons.vertical_align_bottom,
semanticLabel: 'That is below the $minTargetKcal kcal floor.',
Text(
'That is below the $minTargetKcal kcal floor.',
style: TextStyle(color: theme.colorScheme.error),
),
if (tdee != null)
Row(
children: [
Icon(
Icons.balance,
size: 18,
color: theme.colorScheme.onSurfaceVariant,
semanticLabel: 'Maintenance',
),
const SizedBox(width: AppSpacing.xs),
MacroFigure(kind: MacroKind.kcal, value: whole(tdee), size: 16),
const SizedBox(width: AppSpacing.sm),
Text(target.bmrName),
],
BodyNote(
'Maintenance ${whole(tdee)} kcal (${target.bmrName} resting '
'burn x activity); 1 kg of fat = ${formatG(kcalPerKg)} kcal.',
),
const BodyNote(
'Informational only — the budget is never changed from here.',
),
],
);
}

View File

@ -1,45 +0,0 @@
/// Glyphs for the goal's enumerations (direction, time unit, activity), so
/// the goal reads as a row of icons and numbers instead of a sentence.
library;
import 'package:diet_guard_app/services/body_energy.dart';
import 'package:diet_guard_app/widgets/body/formula_figure.dart';
import 'package:material_ui/material_ui.dart';
/// Lose = down arrow, maintain = level bar, gain = up arrow.
IconData directionIcon(String direction) => switch (direction) {
'lose' => Icons.south,
'gain' => Icons.north,
_ => Icons.drag_handle,
};
/// Day / week / month / year as calendar views of growing span.
IconData timeUnitIcon(String unit) => switch (unit) {
'day' => Icons.calendar_view_day,
'week' => Icons.calendar_view_week,
'month' => Icons.calendar_view_month,
_ => Icons.event_repeat,
};
/// The five levels ramp from a chair to a barbell; a measured choice wears
/// its formula's glyph (the same one the Activity sheet shows next to kcal).
IconData activityIcon(String key) => switch (key) {
'sedentary' => Icons.chair,
'light' => Icons.directions_walk,
'moderate' => Icons.directions_bike,
'very' => Icons.directions_run,
'extra' => Icons.fitness_center,
_ when key.startsWith(measuredPrefix) =>
formulaIcons[key.substring(measuredPrefix.length)] ?? Icons.speed,
_ => Icons.speed,
};
/// Numeric caption under an activity icon: the TDEE multiplier of a level.
/// Null for a measured formula (its glyph names it; the proper name is only
/// spoken) and for an unknown key.
String? activityCaption(String key) {
for (final level in activityLevels) {
if (level.key == key) return formatG(level.factor);
}
return null;
}

View File

@ -1,141 +1,71 @@
/// The pickers behind each tappable mark of the goal row.
/// The pickers behind each tappable word of the goal sentence.
///
/// Each returns the edited [Goal], or null when dismissed. Options are icons
/// (plus a number or proper name where one exists); the spoken name of every
/// option is its semantic label.
/// Each returns the edited [Goal], or null when dismissed.
library;
import 'package:diet_guard_app/services/body_energy.dart';
import 'package:diet_guard_app/ui/cues.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:diet_guard_app/widgets/body/goal_icons.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:material_ui/material_ui.dart';
/// One choice in a picker sheet.
typedef PickerOption = ({
String value,
String spoken,
IconData icon,
String? caption,
});
Future<String?> _sheet(
BuildContext context,
List<PickerOption> options,
String title,
List<(String, String, String?)> options,
String selected,
) => showModalBottomSheet<String>(
context: context,
builder: (context) => SafeArea(
child: Padding(
padding: const EdgeInsets.all(AppSpacing.md),
child: Wrap(
spacing: AppSpacing.sm,
runSpacing: AppSpacing.sm,
children: [
for (final option in options)
_OptionButton(
option: option,
selected: option.value == selected,
onTap: () => Navigator.of(context).pop(option.value),
),
],
),
child: ListView(
shrinkWrap: true,
children: [
ListTile(title: Text(title)),
for (final (value, label, subtitle) in options)
ListTile(
title: Text(label),
subtitle: subtitle == null ? null : Text(subtitle),
selected: value == selected,
trailing: value == selected ? const Icon(Icons.check) : null,
onTap: () => Navigator.of(context).pop(value),
),
],
),
),
);
class _OptionButton extends StatelessWidget {
const _OptionButton({
required this.option,
required this.selected,
required this.onTap,
});
final PickerOption option;
final bool selected;
final VoidCallback onTap;
@override
Widget build(BuildContext context) {
final scheme = Theme.of(context).colorScheme;
final tint = selected ? scheme.primary : scheme.onSurfaceVariant;
return Semantics(
button: true,
selected: selected,
label: option.spoken,
child: InkWell(
onTap: onTap,
borderRadius: BorderRadius.circular(AppRadius.md),
child: Container(
width: 72,
padding: const EdgeInsets.all(AppSpacing.sm),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(AppRadius.md),
border: Border.all(
color: selected ? scheme.primary : scheme.outline,
),
color: selected ? scheme.primary.withValues(alpha: 0.16) : null,
),
child: ExcludeSemantics(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Icon(option.icon, color: tint, size: 28),
if (option.caption != null)
Text(
option.caption!,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(color: tint),
),
if (selected)
Icon(Icons.check, size: 14, color: scheme.primary),
],
),
),
),
),
);
}
}
/// Lose / maintain / gain.
Future<Goal?> pickDirection(BuildContext context, Goal goal) async {
final value = await _sheet(context, [
for (final d in directions)
(value: d, spoken: d, icon: directionIcon(d), caption: null),
final value = await _sheet(context, 'Direction', [
for (final d in directions) (d, d, null),
], goal.direction);
return value == null ? null : goal.copyWith(direction: value);
}
/// Kilograms, pounds, grams or stones (the unit symbols are the captions).
/// Kilograms, pounds, grams or stones.
Future<Goal?> pickWeightUnit(BuildContext context, Goal goal) async {
final value = await _sheet(context, [
for (final u in weightUnits.keys)
(value: u, spoken: u, icon: Icons.scale, caption: u),
final value = await _sheet(context, 'Weight unit', [
for (final u in weightUnits.keys) (u, u, null),
], goal.weightUnit);
return value == null ? null : goal.copyWith(weightUnit: value);
}
/// Per day, week, month or year.
Future<Goal?> pickTimeUnit(BuildContext context, Goal goal) async {
final value = await _sheet(context, [
for (final u in timeUnits.keys)
(value: u, spoken: u, icon: timeUnitIcon(u), caption: null),
final value = await _sheet(context, 'Per', [
for (final u in timeUnits.keys) (u, u, null),
], goal.timeUnit);
return value == null ? null : goal.copyWith(timeUnit: value);
}
/// The five levels, then the three measured formulas.
Future<Goal?> pickActivity(BuildContext context, Goal goal) async {
final value = await _sheet(context, [
final meaning = {for (final l in activityLevels) l.key: l.meaning};
final value = await _sheet(context, 'Activity', [
for (final key in activityChoices)
(
value: key,
spoken: activityLabel(key),
icon: activityIcon(key),
caption: activityCaption(key),
key,
activityLabel(key),
meaning[key] ?? 'BMR x 1.2 + your real workouts and steps',
),
], goal.activity);
return value == null ? null : goal.copyWith(activity: value);
@ -165,7 +95,6 @@ class _AmountDialogState extends State<_AmountDialog> {
late final _controller = TextEditingController(
text: formatG(widget.goal.amount),
);
bool _rejected = false;
@override
void dispose() {
@ -175,17 +104,14 @@ class _AmountDialogState extends State<_AmountDialog> {
void _submit() {
final typed = double.tryParse(_controller.text.replaceAll(',', '.'));
if (typed != null && typed >= 0) {
Navigator.of(context).pop(typed);
return;
}
setState(() => _rejected = true);
if (typed != null && typed >= 0) Navigator.of(context).pop(typed);
}
@override
Widget build(BuildContext context) {
final goal = widget.goal;
return AlertDialog(
title: Text('How much (${goal.weightUnit} / ${goal.timeUnit})'),
content: Column(
mainAxisSize: MainAxisSize.min,
children: [
@ -200,29 +126,23 @@ class _AmountDialogState extends State<_AmountDialog> {
),
],
),
IconField(
icon: Icons.edit,
semanticLabel: 'Other amount',
TextField(
controller: _controller,
decoration: const InputDecoration(labelText: 'Other amount'),
keyboardType: const TextInputType.numberWithOptions(decimal: true),
inputFormatters: [
FilteringTextInputFormatter.allow(RegExp('[0-9.,]')),
],
onSubmitted: (_) => _submit(),
),
if (_rejected)
const StatusCue(kind: CueKind.error, semanticLabel: 'not a number'),
],
),
actions: [
IconButton(
TextButton(
onPressed: () => Navigator.of(context).pop(),
icon: const Icon(Icons.close, semanticLabel: 'Cancel'),
),
IconButton.filled(
onPressed: _submit,
icon: const Icon(Icons.check, semanticLabel: 'OK'),
child: const Text('Cancel'),
),
FilledButton(onPressed: _submit, child: const Text('OK')),
],
);
}

View File

@ -3,12 +3,10 @@ library;
import 'package:diet_guard_app/models/local_time.dart';
import 'package:diet_guard_app/services/body_service.dart';
import 'package:diet_guard_app/ui/cues.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:diet_guard_app/widgets/body/body_section.dart';
import 'package:diet_guard_app/widgets/pickers/pickers.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:material_ui/material_ui.dart';
/// Edits the profile; calls [onSaved] after a successful save.
class ProfileCard extends StatefulWidget {
@ -26,7 +24,7 @@ class _ProfileCardState extends State<ProfileCard> {
final _height = TextEditingController();
String? _birth;
String? _sex;
Widget? _status;
String? _status;
@override
void initState() {
@ -47,7 +45,7 @@ class _ProfileCardState extends State<ProfileCard> {
Future<void> _pickBirth() async {
final now = DateTime.now();
final initial = DateTime.tryParse(_birth ?? '') ?? DateTime(now.year - 30);
final picked = await pickDate(
final picked = await showDatePicker(
context: context,
firstDate: DateTime(1900),
lastDate: now,
@ -61,14 +59,7 @@ class _ProfileCardState extends State<ProfileCard> {
Future<void> _save() async {
final height = double.tryParse(_height.text.replaceAll(',', '.'));
if (height == null || height < 50 || height > 260) {
setState(
() => _status = StatusCue(
key: UniqueKey(),
kind: CueKind.error,
icon: Icons.height,
semanticLabel: 'Height must be 50-260 cm.',
),
);
setState(() => _status = 'Height must be 50-260 cm.');
return;
}
await BodyService.instance.setProfile(
@ -77,45 +68,28 @@ class _ProfileCardState extends State<ProfileCard> {
sex: _sex,
);
if (!mounted) return;
setState(
() => _status = StatusCue(
key: UniqueKey(),
kind: CueKind.ok,
semanticLabel: 'Saved.',
),
);
setState(() => _status = 'Saved.');
widget.onSaved();
}
@override
Widget build(BuildContext context) {
final scheme = Theme.of(context).colorScheme;
final birth = _birth;
final status = _status;
return BodySection(
semanticLabel: 'Profile',
title: 'Profile',
children: [
Align(
alignment: Alignment.centerLeft,
child: TextButton(
onPressed: _pickBirth,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
Icons.cake,
color: birth == null ? scheme.error : null,
semanticLabel: 'Birth date',
),
if (birth != null) Text(' $birth'),
],
Row(
children: [
Expanded(child: Text('Born: ${_birth ?? 'not set'}')),
TextButton.icon(
icon: const Icon(Icons.cake),
label: const Text('Birth date'),
onPressed: _pickBirth,
),
),
],
),
IconField(
icon: Icons.height,
semanticLabel: 'Height (cm)',
TextField(
controller: _height,
decoration: const InputDecoration(labelText: 'Height (cm)'),
keyboardType: const TextInputType.numberWithOptions(decimal: true),
inputFormatters: [
FilteringTextInputFormatter.allow(RegExp('[0-9.,]')),
@ -123,16 +97,9 @@ class _ProfileCardState extends State<ProfileCard> {
),
const SizedBox(height: AppSpacing.sm),
SegmentedButton<String>(
showSelectedIcon: false,
segments: const [
ButtonSegment(
value: 'm',
icon: Icon(Icons.male, semanticLabel: 'Male'),
),
ButtonSegment(
value: 'f',
icon: Icon(Icons.female, semanticLabel: 'Female'),
),
ButtonSegment(value: 'm', label: Text('Male')),
ButtonSegment(value: 'f', label: Text('Female')),
],
selected: {?_sex},
emptySelectionAllowed: true,
@ -142,11 +109,8 @@ class _ProfileCardState extends State<ProfileCard> {
const SizedBox(height: AppSpacing.sm),
Row(
children: [
if (status != null) Expanded(child: status) else const Spacer(),
IconButton.filled(
onPressed: _save,
icon: const Icon(Icons.check, semanticLabel: 'Save profile'),
),
Expanded(child: BodyNote(_status ?? 'Syncs to the PC.')),
FilledButton(onPressed: _save, child: const Text('Save profile')),
],
),
],

View File

@ -4,14 +4,11 @@
/// day overrides it (a planned feast on Saturday too).
library;
import 'package:diet_guard_app/services/body_energy.dart';
import 'package:diet_guard_app/services/week_plan.dart';
import 'package:diet_guard_app/ui/cues.dart';
import 'package:diet_guard_app/ui/macro_kind.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:diet_guard_app/widgets/body/body_section.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:material_ui/material_ui.dart';
/// The planner.
class WeekPlanCard extends StatefulWidget {
@ -56,7 +53,8 @@ class _WeekPlanCardState extends State<WeekPlanCard> {
Widget build(BuildContext context) {
final target = int.tryParse(_target.text) ?? widget.defaultTarget;
final typed = <int, int>{
for (var i = 0; i < 7; i++) i: ?int.tryParse(_days[i].text),
for (var i = 0; i < 7; i++)
i: ?int.tryParse(_days[i].text),
};
final plan = planWeek(
widget.today ?? DateTime.now(),
@ -66,39 +64,41 @@ class _WeekPlanCardState extends State<WeekPlanCard> {
);
final scheme = Theme.of(context).colorScheme;
return BodySection(
semanticLabel: 'Week planner',
title: 'Week planner (info only)',
children: [
SpokenLabel(
semanticLabel: 'Weekly average target (kcal/day)',
child: TextField(
controller: _target,
decoration: InputDecoration(
prefixIcon: ExcludeSemantics(
child: Icon(MacroKind.kcal.icon, color: MacroKind.kcal.color),
),
hintText: '${widget.defaultTarget}',
),
keyboardType: TextInputType.number,
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
onChanged: (_) => setState(() {}),
TextField(
controller: _target,
decoration: InputDecoration(
labelText: 'Weekly average target (kcal/day)',
hintText: '${widget.defaultTarget}',
),
keyboardType: TextInputType.number,
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
onChanged: (_) => setState(() {}),
),
const SizedBox(height: AppSpacing.sm),
for (var i = 0; i < 7; i++)
Row(
children: [
// Day of month, not a weekday word: rows run Monday..Sunday.
SizedBox(width: 32, child: Text(plan.days[i].day.substring(8))),
SizedBox(width: 48, child: Text(plan.days[i].weekday)),
Expanded(
child: _DayFigure(plan.days[i], belowFloor: plan.belowFloor),
child: Text(
'${plan.days[i].kcal} kcal ${_sourceLabel(plan.days[i])}',
style: TextStyle(
color: plan.days[i].source == 'plan' && plan.belowFloor
? scheme.error
: null,
),
),
),
SizedBox(
width: 96,
child: IconField(
icon: Icons.rice_bowl,
semanticLabel: 'ate…',
child: TextField(
controller: _days[i],
dense: true,
decoration: const InputDecoration(
hintText: 'ate…',
isDense: true,
),
keyboardType: TextInputType.number,
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
onChanged: (_) => setState(() {}),
@ -107,86 +107,26 @@ class _WeekPlanCardState extends State<WeekPlanCard> {
],
),
const SizedBox(height: AppSpacing.sm),
_Summary(plan, scheme),
BodyNote(_summary(plan)),
],
);
}
}
/// A day's kcal with a glyph for where the number came from.
class _DayFigure extends StatelessWidget {
const _DayFigure(this.day, {required this.belowFloor});
String _sourceLabel(DayPlan day) => switch (day.source) {
'typed' => '(typed)',
'logged' => '(logged)',
'unlogged' => '(not logged -- type it)',
_ => '(plan)',
};
final DayPlan day;
final bool belowFloor;
@override
Widget build(BuildContext context) {
final scheme = Theme.of(context).colorScheme;
final (icon, spoken) = switch (day.source) {
'typed' => (Icons.edit, '(typed)'),
'logged' => (Icons.check, '(logged)'),
'unlogged' => (Icons.help_outline, '(not logged -- type it)'),
_ => (Icons.insights, '(plan)'),
};
final bad = day.source == 'plan' && belowFloor;
final unlogged = day.source == 'unlogged';
final tint = bad
? scheme.error
: unlogged
? CueKind.warn.tint(context)
: null;
return Row(
children: [
MacroFigure(kind: MacroKind.kcal, value: '${day.kcal}', size: 16),
const SizedBox(width: AppSpacing.sm),
Icon(icon, size: 16, color: tint, semanticLabel: spoken),
],
);
}
}
/// What to eat on the open days, or the finished week's average.
class _Summary extends StatelessWidget {
const _Summary(this.plan, this.scheme);
final WeekPlan plan;
final ColorScheme scheme;
@override
Widget build(BuildContext context) {
final per = plan.perRemaining;
if (per == null) {
return Row(
children: [
Icon(
Icons.check_circle,
color: CueKind.ok.tint(context),
semanticLabel: 'Every day is known: week average',
),
const SizedBox(width: AppSpacing.xs),
MacroFigure(kind: MacroKind.kcal, value: whole(plan.weekAvg)),
],
);
}
return Row(
children: [
const Icon(Icons.restaurant, size: 18, semanticLabel: 'Eat'),
const SizedBox(width: AppSpacing.xs),
MacroFigure(kind: MacroKind.kcal, value: '$per'),
const SizedBox(width: AppSpacing.md),
const Icon(Icons.flag_outlined, size: 18, semanticLabel: 'average'),
const SizedBox(width: AppSpacing.xs),
Text('${plan.targetAvg}'),
if (plan.belowFloor) ...[
const SizedBox(width: AppSpacing.md),
const StatusCue(
kind: CueKind.error,
icon: Icons.vertical_align_bottom,
semanticLabel: 'below the $minTargetKcal kcal floor',
),
],
],
);
String _summary(WeekPlan plan) {
final per = plan.perRemaining;
if (per == null) {
return 'Every day is known: week average '
'${whole(plan.weekAvg)} kcal.';
}
final floor = plan.belowFloor ? ' -- below the 1200 kcal floor!' : '';
return 'Eat $per kcal on each open day to average '
'${plan.targetAvg}$floor';
}

View File

@ -5,11 +5,12 @@
library;
import 'package:diet_guard_app/models/body_document.dart';
import 'package:diet_guard_app/models/local_time.dart';
import 'package:diet_guard_app/services/body_service.dart';
import 'package:diet_guard_app/widgets/body/dated_value_card.dart';
import 'package:material_ui/material_ui.dart';
export 'package:diet_guard_app/widgets/body/dated_value_card.dart';
import 'package:diet_guard_app/widgets/body/body_section.dart';
import 'package:diet_guard_app/widgets/body/weight_chart.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
/// Weight: 20-400 kg; wake-alarm weigh-ins land here too.
class WeightCard extends StatelessWidget {
@ -23,12 +24,12 @@ class WeightCard extends StatelessWidget {
Widget build(BuildContext context) {
final body = BodyService.instance;
return DatedValueCard(
semanticLabel: 'Weight',
fieldSemanticLabel: 'Weight (kg)',
icon: Icons.monitor_weight,
title: 'Weight',
fieldLabel: 'Weight (kg)',
unit: 'kg',
min: 20,
max: 400,
hint: 'Morning weigh-ins from wake-alarm appear here.',
latest: body.latestWeight,
series: body.weightSeries,
onSave: body.setWeight,
@ -50,12 +51,12 @@ class BodyFatCard extends StatelessWidget {
Widget build(BuildContext context) {
final body = BodyService.instance;
return DatedValueCard(
semanticLabel: 'Body fat',
fieldSemanticLabel: 'Body fat (%)',
icon: Icons.percent,
title: 'Body fat',
fieldLabel: 'Body fat (%)',
unit: '%',
min: minBodyFat,
max: maxBodyFat,
hint: 'With a body fat %, targets use the lean-mass (Katch-McArdle) BMR.',
latest: body.latestBodyFat,
series: body.bodyFatSeries,
onSave: body.setBodyFat,
@ -64,3 +65,150 @@ class BodyFatCard extends StatelessWidget {
);
}
}
/// Enters/deletes a day's value and charts the history.
class DatedValueCard extends StatefulWidget {
/// Creates the card.
const DatedValueCard({
required this.title,
required this.fieldLabel,
required this.unit,
required this.min,
required this.max,
required this.hint,
required this.latest,
required this.series,
required this.onSave,
required this.onDelete,
required this.onChanged,
super.key,
});
/// Section heading.
final String title;
/// Input label.
final String fieldLabel;
/// Unit suffix (`kg`, `%`).
final String unit;
/// Smallest accepted value.
final double min;
/// Largest accepted value.
final double max;
/// Note shown until something is saved.
final String hint;
/// Newest `(day, value)`, or null.
final (String, double)? latest;
/// Every live `(day, value)`, oldest first.
final List<(String, double)> series;
/// Writes a value for a day.
final Future<void> Function(String day, double value) onSave;
/// Deletes a day.
final Future<void> Function(String day) onDelete;
/// Called once a value has been written or deleted.
final VoidCallback onChanged;
@override
State<DatedValueCard> createState() => _DatedValueCardState();
}
class _DatedValueCardState extends State<DatedValueCard> {
final _value = TextEditingController();
String _day = localDateKey(DateTime.now());
String? _status;
@override
void dispose() {
_value.dispose();
super.dispose();
}
String _fmt(double value) => '${oneDecimal(value)} ${widget.unit}';
Future<void> _pickDay() async {
final picked = await showDatePicker(
context: context,
firstDate: DateTime(2000),
lastDate: DateTime.now(),
initialDate: DateTime.parse(_day),
);
if (picked == null || !mounted) return;
setState(() => _day = localDateKey(picked));
}
Future<void> _save() async {
final value = double.tryParse(_value.text.replaceAll(',', '.'));
if (value == null || value < widget.min || value > widget.max) {
setState(
() => _status =
'${widget.title} must be ${whole(widget.min)}-'
'${whole(widget.max)} ${widget.unit}.',
);
return;
}
await widget.onSave(_day, value);
if (!mounted) return;
_value.clear();
setState(() => _status = 'Saved ${_fmt(value)} for $_day.');
widget.onChanged();
}
Future<void> _delete() async {
await widget.onDelete(_day);
if (!mounted) return;
setState(() => _status = 'Deleted $_day.');
widget.onChanged();
}
@override
Widget build(BuildContext context) {
final latest = widget.latest;
return BodySection(
title: widget.title,
children: [
BodyStatRow(
'Latest',
latest == null ? 'none yet' : '${_fmt(latest.$2)} (${latest.$1})',
),
Row(
children: [
Expanded(
child: TextField(
controller: _value,
decoration: InputDecoration(labelText: widget.fieldLabel),
keyboardType: const TextInputType.numberWithOptions(
decimal: true,
),
inputFormatters: [
FilteringTextInputFormatter.allow(RegExp('[0-9.,]')),
],
),
),
TextButton(onPressed: _pickDay, child: Text(_day)),
],
),
Row(
children: [
Expanded(child: BodyNote(_status ?? widget.hint)),
IconButton(
icon: const Icon(Icons.delete_outline),
tooltip: 'Delete this day',
onPressed: _delete,
),
FilledButton(onPressed: _save, child: const Text('Save')),
],
),
WeightChart(series: widget.series),
],
);
}
}

View File

@ -4,12 +4,11 @@
/// drawn to scale rather than evenly spaced.
library;
import 'package:diet_guard_app/ui/cues.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:fl_chart/fl_chart.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
/// Selectable chart ranges, `(spoken name, days)`; null days = everything.
/// Selectable chart ranges, `(label, days)`; null days = everything.
const List<(String, int?)> weightChartRanges = [
('30d', 30),
('90d', 90),
@ -62,19 +61,11 @@ class _WeightChartState extends State<WeightChart> {
Wrap(
spacing: AppSpacing.sm,
children: [
for (final (spoken, days) in weightChartRanges)
SpokenLabel(
semanticLabel: spoken,
child: ChoiceChip(
// Days as a bare numeral; "everything" as the infinity glyph.
label: ExcludeSemantics(
child: days == null
? const Icon(Icons.all_inclusive, size: 18)
: Text('$days'),
),
selected: _days == days,
onSelected: (_) => setState(() => _days = days),
),
for (final (label, days) in weightChartRanges)
ChoiceChip(
label: Text(label),
selected: _days == days,
onSelected: (_) => setState(() => _days = days),
),
],
),
@ -82,14 +73,7 @@ class _WeightChartState extends State<WeightChart> {
SizedBox(
height: 200,
child: points.length < 2
? Center(
child: Icon(
Icons.show_chart,
size: 64,
color: Theme.of(context).colorScheme.outline,
semanticLabel: 'Need two readings for a graph.',
),
)
? const Center(child: Text('Need two readings for a graph.'))
: _chart(context, points),
),
],

View File

@ -1,13 +0,0 @@
/// Returns the activity-type icon for [kind].
library;
import 'package:material_ui/material_ui.dart';
/// Activity kind icons used by _SessionTile (in `activity_card.dart`).
IconData kindIcon(String kind) => switch (kind) {
'run' => Icons.directions_run,
'walk' => Icons.directions_walk,
'cycle' => Icons.directions_bike,
'strength' => Icons.fitness_center,
_ => Icons.sports,
};

View File

@ -5,8 +5,8 @@ import 'dart:async';
import 'package:data_transfer_flutter/data_transfer_flutter.dart';
import 'package:diet_guard_app/services/data_export.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:material_ui/material_ui.dart';
/// Suggested file name, identical on every platform.
const exportFileName = 'diet-guard-export.json';

View File

@ -3,7 +3,7 @@ library;
import 'package:diet_guard_app/models/day_status.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
/// Monthly calendar widget that colors each day by its [DayStatus].
///
@ -46,6 +46,23 @@ class DayStatusCalendar extends StatelessWidget {
/// outside the displayed month is never tappable regardless.
final void Function(DateTime day)? onDaySelected;
static const _weekHeaders = ['Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa', 'Su'];
static const _monthNames = [
'January',
'February',
'March',
'April',
'May',
'June',
'July',
'August',
'September',
'October',
'November',
'December',
];
String _dateKey(int year, int m, int day) =>
'$year-${m.toString().padLeft(2, '0')}-${day.toString().padLeft(2, '0')}';
@ -112,18 +129,13 @@ class DayStatusCalendar extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
IconButton(
icon: Icon(
Icons.chevron_left,
color: scheme.onSurfaceVariant,
semanticLabel: 'Previous month',
),
icon: Icon(Icons.chevron_left, color: scheme.onSurfaceVariant),
visualDensity: VisualDensity.compact,
padding: EdgeInsets.zero,
onPressed: onPrevMonth,
),
// Numeric month/year: a month name would be written chrome.
Text(
'${m.toString().padLeft(2, '0')} · $year',
'${_monthNames[m - 1]} $year',
style: TextStyle(
color: scheme.onSurface,
fontWeight: FontWeight.bold,
@ -131,11 +143,7 @@ class DayStatusCalendar extends StatelessWidget {
),
),
IconButton(
icon: Icon(
Icons.chevron_right,
color: scheme.onSurfaceVariant,
semanticLabel: 'Next month',
),
icon: Icon(Icons.chevron_right, color: scheme.onSurfaceVariant),
visualDensity: VisualDensity.compact,
padding: EdgeInsets.zero,
onPressed: onNextMonth,
@ -145,23 +153,25 @@ class DayStatusCalendar extends StatelessWidget {
const SizedBox(height: AppSpacing.xs + 2),
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
// Weekday names are gone: seven dots mark the Monday-first
// columns, the two weekend ones in the accent colour.
children: [
for (var col = 0; col < 7; col++)
SizedBox(
width: 30,
child: Center(
child: Icon(
Icons.circle,
size: col >= 5 ? 8 : 5,
color: col >= 5
? scheme.primary
: scheme.onSurfaceVariant,
children: _weekHeaders
.map(
(h) => SizedBox(
width: 30,
child: Text(
h,
textAlign: TextAlign.center,
// Two-letter day abbreviations are UI chrome (like a
// badge/tag), deliberately kept below the 16px body
// floor rather than forced to grow past their slot.
style: TextStyle(
color: scheme.onSurfaceVariant,
fontSize: AppTextSize.label - 2,
fontWeight: FontWeight.bold,
),
),
),
),
],
)
.toList(),
),
const SizedBox(height: AppSpacing.xs),
...List.generate(rows, (row) {
@ -208,10 +218,9 @@ class DayStatusCalendar extends StatelessWidget {
// and no semantics for a screen reader. InkWell is a focus
// stop and is activated by Enter/Space.
final date = DateTime(year, m, day);
final semanticLabel = 'View $day/$m/$year';
return Semantics(
button: true,
label: semanticLabel,
label: 'View $day/$m/$year',
child: InkWell(
onTap: () => onDaySelected!(date),
customBorder: const CircleBorder(),

View File

@ -0,0 +1,77 @@
/// The log form's "Fill all with catering" row: one button, plus Cancel while
/// a proposal is armed.
///
/// Its own row rather than a third control in [LogMealActionsRow]: that row is
/// already full on a narrow phone, and "✓ Confirm (N)" must stay legible.
library;
import 'package:diet_guard_app/services/kuchnia_client.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:flutter/material.dart';
/// Resting label, mirroring the PC gate's "🍱 Fill all".
const fillAllLabel = '🍱 Fill all with catering';
/// Fill-all button; relabels to "✓ Confirm (N)" once a proposal is armed.
class FillAllRow extends StatelessWidget {
/// Creates the row.
const FillAllRow({
required this.onFill,
required this.onCancel,
this.busy = false,
this.armedCount = 0,
this.canFetchDelivery,
super.key,
});
/// First tap proposes, second tap confirms.
final Future<void> Function() onFill;
/// Disarms a proposal without writing anything.
final VoidCallback onCancel;
/// Disables both controls while a fetch or the confirm's writes run.
final bool busy;
/// How many dishes the armed proposal would log; 0 when none is armed.
final int armedCount;
/// Whether the platform can fetch at all. Defaults to
/// [kuchniaFetchSupported] -- false on web, where the caterer's panel blocks
/// browser requests -- so the row is hidden there, like the delivery button.
final bool? canFetchDelivery;
@override
Widget build(BuildContext context) {
if (!(canFetchDelivery ?? kuchniaFetchSupported)) {
return const SizedBox.shrink();
}
final armed = armedCount > 0;
return Row(
children: [
Expanded(
child: OutlinedButton(
onPressed: busy ? null : onFill,
child: FittedBox(
fit: BoxFit.scaleDown,
child: Text(_label(armed), maxLines: 1),
),
),
),
if (armed) ...[
const SizedBox(width: AppSpacing.sm),
TextButton(
onPressed: busy ? null : onCancel,
child: const Text('Cancel'),
),
],
],
);
}
String _label(bool armed) {
if (busy) return 'Working…';
if (armed) return '✓ Confirm ($armedCount)';
return fillAllLabel;
}
}

View File

@ -1,124 +0,0 @@
/// Icon-only chrome shared by the history and food-bank filter sheets: the
/// clear control, the apply bar and the sort chooser. Each control paints a
/// glyph and speaks its old caption only through its semantic label.
library;
import 'package:material_ui/material_ui.dart';
/// Top row of a filter sheet: one clear-everything icon, right-aligned.
class FilterSheetHeader extends StatelessWidget {
/// Creates a header whose clear icon calls [onClear].
const FilterSheetHeader({required this.onClear, super.key});
/// Called when the clear icon is pressed.
final VoidCallback onClear;
@override
Widget build(BuildContext context) => Padding(
padding: const EdgeInsets.fromLTRB(16, 4, 8, 0),
child: Align(
alignment: Alignment.centerRight,
child: IconButton(
icon: const Icon(Icons.filter_list_off, semanticLabel: 'Clear all'),
onPressed: onClear,
),
),
);
}
/// Bottom bar of a filter sheet: one full-width check button.
class FilterApplyBar extends StatelessWidget {
/// Creates an apply bar that calls [onApply].
const FilterApplyBar({required this.onApply, super.key});
/// Called when the check is pressed.
final VoidCallback onApply;
@override
Widget build(BuildContext context) => Padding(
padding: const EdgeInsets.all(16),
child: SizedBox(
width: double.infinity,
child: ElevatedButton(
onPressed: onApply,
child: const Icon(Icons.check, semanticLabel: 'Apply'),
),
),
);
}
/// One choice in a [SortChoiceRow]: a glyph, its tint and its spoken name.
class SortOption<T> {
/// Creates an option selecting [value].
const SortOption(this.value, this.icon, this.semanticLabel, {this.color});
/// The value reported when chosen.
final T value;
/// Painted glyph.
final IconData icon;
/// Spoken name; never painted.
final String semanticLabel;
/// Glyph tint; the theme default when null.
final Color? color;
}
/// Icon chips for the sort field plus an arrow for the direction.
class SortChoiceRow<T> extends StatelessWidget {
/// Creates a chooser over [options] with [selected] active.
const SortChoiceRow({
required this.options,
required this.selected,
required this.ascending,
required this.onChanged,
super.key,
});
/// Choices in display order.
final List<SortOption<T>> options;
/// The active choice.
final T selected;
/// Whether the sort runs ascending.
final bool ascending;
/// Called with the new field and direction.
final void Function({required T field, required bool asc}) onChanged;
@override
Widget build(BuildContext context) {
return Row(
children: [
Expanded(
child: Wrap(
spacing: 8,
runSpacing: 4,
children: [
for (final o in options)
ChoiceChip(
label: Icon(
o.icon,
size: 18,
color: o.color,
semanticLabel: o.semanticLabel,
),
selected: selected == o.value,
onSelected: (_) => onChanged(field: o.value, asc: ascending),
),
],
),
),
IconButton(
icon: Icon(
ascending ? Icons.arrow_upward : Icons.arrow_downward,
semanticLabel: ascending ? 'Ascending' : 'Descending',
),
onPressed: () => onChanged(field: selected, asc: !ascending),
),
],
);
}
}

View File

@ -6,11 +6,9 @@
/// screen owns the other's controls.
library;
import 'package:diet_guard_app/ui/cues.dart';
import 'package:diet_guard_app/ui/macro_kind.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
/// The free-text search-by-name field in the filter sheet.
/// The free-text "search by name" field in the filter sheet.
///
/// Stateful only to own its [TextEditingController]; the query itself lives in
/// the screen's [HistoryFilter].
@ -46,11 +44,13 @@ class NameSearchFieldState extends State<NameSearchField> {
@override
Widget build(BuildContext context) {
return IconField(
icon: Icons.search,
semanticLabel: 'Search by name',
return TextField(
controller: _controller,
dense: true,
decoration: const InputDecoration(
labelText: 'Search by name',
prefixIcon: Icon(Icons.search),
isDense: true,
),
onChanged: widget.onChanged,
);
}
@ -112,7 +112,7 @@ class SliderSelectedLabel extends StatelessWidget {
class FilterRangeRow extends StatelessWidget {
/// Creates a range row bounded by [maxValue].
const FilterRangeRow({
required this.kind,
required this.label,
required this.sliderKey,
required this.maxValue,
required this.min,
@ -123,8 +123,8 @@ class FilterRangeRow extends StatelessWidget {
super.key,
});
/// Which nutrient this range filters; its glyph heads the row.
final MacroKind kind;
/// Section heading, e.g. `Protein range (g)`.
final String label;
/// Widget key on the slider itself, so tests can drive one row.
final Key sliderKey;
@ -158,14 +158,7 @@ class FilterRangeRow extends StatelessWidget {
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Align(
alignment: Alignment.centerLeft,
child: Icon(
kind.icon,
color: kind.color,
semanticLabel: kind.semanticLabel(compact: false),
),
),
Text(label, style: Theme.of(context).textTheme.labelLarge),
if (showEndpointLabels)
SliderEndpointLabels(lo: '0', hi: '${maxValue.round()}$unit'),
RangeSlider(

View File

@ -4,9 +4,7 @@
library;
import 'package:diet_guard_app/models/food_bank_record.dart';
import 'package:diet_guard_app/ui/cues.dart';
import 'package:diet_guard_app/ui/macro_kind.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
/// Prompts for a new manually-curated food bank entry.
///
@ -55,50 +53,49 @@ class AddEntryDialogState extends State<AddEntryDialog> {
);
}
Widget _field(MacroKind kind, TextEditingController ctrl) => Padding(
Widget _field(String label, TextEditingController ctrl) => Padding(
padding: const EdgeInsets.only(bottom: 8),
child: IconField(
icon: kind.icon,
iconColor: kind.color,
semanticLabel: kind.semanticLabel(compact: false),
child: TextField(
controller: ctrl,
keyboardType: const TextInputType.numberWithOptions(decimal: true),
dense: true,
decoration: InputDecoration(labelText: label, isDense: true),
),
);
@override
Widget build(BuildContext context) {
return AlertDialog(
title: const Text('Add to food bank'),
content: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Padding(
padding: const EdgeInsets.only(bottom: 8),
child: IconField(
icon: Icons.restaurant,
semanticLabel: 'Name',
child: TextField(
controller: _name,
dense: true,
decoration: const InputDecoration(
labelText: 'Name',
isDense: true,
),
),
),
_field(MacroKind.perGrams, _grams),
_field(MacroKind.kcal, _kcal),
_field(MacroKind.protein, _protein),
_field(MacroKind.carbs, _carbs),
_field(MacroKind.fat, _fat),
_field('Reference grams', _grams),
_field('Kcal', _kcal),
_field('Protein (g)', _protein),
_field('Carbs (g)', _carbs),
_field('Fat (g)', _fat),
],
),
),
actions: [
IconButton(
TextButton(
onPressed: () => Navigator.of(context).pop(),
icon: const Icon(Icons.close, semanticLabel: 'Cancel'),
child: const Text('Cancel'),
),
ElevatedButton(
onPressed: _save,
child: const Icon(Icons.check, semanticLabel: 'Save to bank'),
child: const Text('Save to bank'),
),
],
);

View File

@ -4,12 +4,9 @@
/// range rows come from `widgets/filters/`, shared with the history sheet.
library;
import 'package:diet_guard_app/ui/cues.dart';
import 'package:diet_guard_app/ui/macro_kind.dart';
import 'package:diet_guard_app/widgets/filters/filter_chrome.dart';
import 'package:diet_guard_app/widgets/filters/filter_fields.dart';
import 'package:diet_guard_app/widgets/food_bank/fb_filter.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
/// The draggable bottom sheet that edits the food bank's filter and sort order.
///
@ -66,35 +63,6 @@ class FbFilterSheet extends StatelessWidget {
/// Called when the user clears every criterion.
final VoidCallback onClear;
static final List<SortOption<FbSortField>> _sortOptions = [
const SortOption(FbSortField.count, Icons.repeat, 'Usage count'),
const SortOption(FbSortField.name, Icons.sort_by_alpha, 'Name'),
SortOption(
FbSortField.kcal,
MacroKind.kcal.icon,
'Kcal',
color: MacroKind.kcal.color,
),
SortOption(
FbSortField.protein,
MacroKind.protein.icon,
'Protein',
color: MacroKind.protein.color,
),
SortOption(
FbSortField.carbs,
MacroKind.carbs.icon,
'Carbs',
color: MacroKind.carbs.color,
),
SortOption(
FbSortField.fat,
MacroKind.fat.icon,
'Fat',
color: MacroKind.fat.color,
),
];
@override
Widget build(BuildContext context) {
return DraggableScrollableSheet(
@ -103,17 +71,35 @@ class FbFilterSheet extends StatelessWidget {
maxChildSize: 0.95,
builder: (context, scroll) => Column(
children: [
FilterSheetHeader(onClear: onClear),
Padding(
padding: const EdgeInsets.fromLTRB(16, 12, 8, 0),
child: Row(
children: [
Expanded(
child: Text(
'Filter & Sort',
style: Theme.of(context).textTheme.titleMedium,
),
),
TextButton(
onPressed: onClear,
child: const Text('Clear all'),
),
],
),
),
const Divider(),
Expanded(
child: ListView(
controller: scroll,
padding: const EdgeInsets.all(16),
children: [
IconField(
icon: Icons.search,
semanticLabel: 'Search by name',
dense: true,
TextField(
decoration: const InputDecoration(
labelText: 'Search by name',
prefixIcon: Icon(Icons.search),
isDense: true,
),
controller: TextEditingController(text: filter.nameQuery)
..selection = TextSelection.collapsed(
offset: filter.nameQuery.length,
@ -125,7 +111,7 @@ class FbFilterSheet extends StatelessWidget {
),
const SizedBox(height: 16),
FilterRangeRow(
kind: MacroKind.kcal,
label: 'Kcal range',
sliderKey: const Key('fb-kcal-range-slider'),
maxValue: maxKcal,
min: filter.minKcal,
@ -138,7 +124,7 @@ class FbFilterSheet extends StatelessWidget {
},
),
FilterRangeRow(
kind: MacroKind.protein,
label: 'Protein range (g)',
sliderKey: const Key('fb-protein-range-slider'),
maxValue: maxProtein,
min: filter.minProtein,
@ -152,7 +138,7 @@ class FbFilterSheet extends StatelessWidget {
},
),
FilterRangeRow(
kind: MacroKind.carbs,
label: 'Carbs range (g)',
sliderKey: const Key('fb-carbs-range-slider'),
maxValue: maxCarbs,
min: filter.minCarbs,
@ -166,7 +152,7 @@ class FbFilterSheet extends StatelessWidget {
},
),
FilterRangeRow(
kind: MacroKind.fat,
label: 'Fat range (g)',
sliderKey: const Key('fb-fat-range-slider'),
maxValue: maxFat,
min: filter.minFat,
@ -179,16 +165,74 @@ class FbFilterSheet extends StatelessWidget {
onFilterChanged(filter);
},
),
SortChoiceRow<FbSortField>(
options: _sortOptions,
selected: sortField,
ascending: ascending,
onChanged: onSortChanged,
Text(
'Sort by',
style: Theme.of(context).textTheme.labelLarge,
),
const SizedBox(height: 4),
Row(
children: [
Expanded(
child: DropdownButton<FbSortField>(
isExpanded: true,
value: sortField,
items: const [
DropdownMenuItem(
value: FbSortField.count,
child: Text('Usage count'),
),
DropdownMenuItem(
value: FbSortField.name,
child: Text('Name'),
),
DropdownMenuItem(
value: FbSortField.kcal,
child: Text('Kcal'),
),
DropdownMenuItem(
value: FbSortField.protein,
child: Text('Protein'),
),
DropdownMenuItem(
value: FbSortField.carbs,
child: Text('Carbs'),
),
DropdownMenuItem(
value: FbSortField.fat,
child: Text('Fat'),
),
],
onChanged: (v) {
if (v != null) {
onSortChanged(field: v, asc: ascending);
}
},
),
),
const SizedBox(width: 8),
IconButton(
icon: Icon(
ascending ? Icons.arrow_upward : Icons.arrow_downward,
),
tooltip: ascending ? 'Ascending' : 'Descending',
onPressed: () =>
onSortChanged(field: sortField, asc: !ascending),
),
],
),
],
),
),
FilterApplyBar(onApply: onApply),
Padding(
padding: const EdgeInsets.all(16),
child: SizedBox(
width: double.infinity,
child: ElevatedButton(
onPressed: onApply,
child: const Text('Apply'),
),
),
),
],
),
);

View File

@ -2,13 +2,9 @@
library;
import 'package:diet_guard_app/models/food_bank_record.dart';
import 'package:diet_guard_app/ui/macro_kind.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
/// One banked food: its name, macros, and how often it has been logged.
///
/// Macros are glyph + number pairs; the reference weight carries the scale
/// glyph, the use count keeps its `×N` numeral.
class RecordTile extends StatelessWidget {
/// Creates a [RecordTile] for [record].
const RecordTile(this.record, {super.key});
@ -18,23 +14,19 @@ class RecordTile extends StatelessWidget {
@override
Widget build(BuildContext context) {
String n(double v) => v.toStringAsFixed(0);
final macros =
'P ${record.proteinG.toStringAsFixed(0)} g '
'C ${record.carbsG.toStringAsFixed(0)} g '
'F ${record.fatG.toStringAsFixed(0)} g';
final per = record.grams > 0
? ' per ${record.grams.toStringAsFixed(0)} g'
: '';
return ListTile(
title: Text(record.desc),
subtitle: Wrap(
spacing: 12,
children: [
MacroFigure(kind: MacroKind.kcal, value: n(record.kcal)),
if (record.grams > 0)
MacroFigure(kind: MacroKind.perGrams, value: '${n(record.grams)}g'),
MacroFigure(kind: MacroKind.protein, value: '${n(record.proteinG)}g'),
MacroFigure(kind: MacroKind.carbs, value: '${n(record.carbsG)}g'),
MacroFigure(kind: MacroKind.fat, value: '${n(record.fatG)}g'),
],
),
subtitle: Text('${record.kcal.toStringAsFixed(0)} kcal$per · $macros'),
trailing: record.count > 0
? Text(
'×${n(record.count)}',
'×${record.count.toStringAsFixed(0)}',
style: Theme.of(context).textTheme.bodySmall,
)
: null,

View File

@ -4,9 +4,8 @@
library;
import 'package:diet_guard_app/models/food_bank_record.dart';
import 'package:diet_guard_app/ui/macro_kind.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
/// Tiles per row.
const int fbGridColumns = 3;
@ -60,13 +59,11 @@ class FbTile extends StatelessWidget {
Row(
children: [
Expanded(
child: Align(
alignment: Alignment.centerLeft,
child: MacroFigure(
kind: MacroKind.kcal,
value: record.kcal.toStringAsFixed(0),
size: 14,
),
child: Text(
'${record.kcal.toStringAsFixed(0)} kcal',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: theme.textTheme.bodySmall,
),
),
if (record.count > 0)

Some files were not shown because too many files have changed in this diff Show More