mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-21 21:22:18 +01:00
Compare commits
59 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 88da2564a1 | |||
| a9f82f52d2 | |||
| da147f3325 | |||
| 70c5d034a8 | |||
| e942404213 | |||
| 7c13ec3de9 | |||
| 624ae47cfd | |||
| 2589c664ec | |||
| e0a4f71953 | |||
| 1190e2d079 | |||
| 9d63c33fa7 | |||
| 6c2c365a69 | |||
| 3cd04e60dc | |||
| a79b0175d5 | |||
| abd8793e60 | |||
| d56edbc413 | |||
| 9a0cc89941 | |||
| 51a31579c8 | |||
| 5add5fa55f | |||
| ffd30b0476 | |||
| 893eea4901 | |||
| eec847bb6c | |||
| 0c76dfd839 | |||
| 801d7a0199 | |||
| 86e702b5e2 | |||
| 9663738843 | |||
| 0fbedaeecf | |||
| 1c2fb2e451 | |||
| 098ed29ec7 | |||
| c02d9b2ea4 | |||
| 801a0b4bab | |||
| a936d07a7e | |||
| 03b6a455cb | |||
| b0c556b745 | |||
| 26d6a68ac0 | |||
| e6322f7f3e | |||
| 642467dc1d | |||
| 6cd3470502 | |||
| 3d8d358abd | |||
| a3d089fee3 | |||
| 3ce43b56df | |||
| 15a0899119 | |||
| eb6a9cf8c3 | |||
| 49144a2c49 | |||
| dfd60d4f7b | |||
| f793545468 | |||
| 76d4e58641 | |||
| 617e1ec879 | |||
| 649a324f8a | |||
| 4eca59bac9 | |||
| f4b4a034b7 | |||
| 57d304600e | |||
| ded7486244 | |||
| 8068205d0c | |||
| 91a9ee5295 | |||
| 0982565fdc | |||
| 957ddc7ddc | |||
| e7ef648757 | |||
| dc2799e36a |
62
.github/workflows/dependency-freshness.yml
vendored
62
.github/workflows/dependency-freshness.yml
vendored
@ -1,62 +0,0 @@
|
|||||||
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
|
|
||||||
14
.github/workflows/pre-commit.yml
vendored
14
.github/workflows/pre-commit.yml
vendored
@ -25,14 +25,14 @@ jobs:
|
|||||||
skip: ""
|
skip: ""
|
||||||
- group: rest
|
- group: rest
|
||||||
hooks: ""
|
hooks: ""
|
||||||
skip: mypy,pylint
|
skip: mypy,pylint,dependency-freshness
|
||||||
name: pre-commit (${{ matrix.group }})
|
name: pre-commit (${{ matrix.group }})
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
# The file-length, md-naming and dependency-freshness hooks delegate to
|
# The file-length and md-naming hooks delegate to the shared gates in
|
||||||
# the shared gates in kuhyx/utils, which a runner does not have at
|
# kuhyx/utils, which a runner does not have at $HOME/src/utils. Only
|
||||||
# $HOME/src/utils. Only the rest group runs them.
|
# the rest group runs them.
|
||||||
- name: Check out the shared gates
|
- name: Check out the shared gates
|
||||||
if: matrix.group == 'rest'
|
if: matrix.group == 'rest'
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
@ -59,9 +59,9 @@ jobs:
|
|||||||
# mypy and pylint bring their own hook environments, so they need only
|
# mypy and pylint bring their own hook environments, so they need only
|
||||||
# pre-commit. The rest group's language: system patch-targets hook
|
# pre-commit. The rest group's language: system patch-targets hook
|
||||||
# imports diet_guard and every patched module (requests, gatelock,
|
# imports diet_guard and every patched module (requests, gatelock,
|
||||||
# crdt_sync, freedays, mcp, pydantic), and dependency-freshness needs
|
# crdt_sync, freedays, mcp, pydantic) -- so it keeps the full
|
||||||
# pyyaml and packaging -- so it keeps the full requirements.txt. That
|
# requirements.txt. That install used to run in the one job, with plain
|
||||||
# install used to run in the one job, with plain pip, for ~24 s.
|
# pip, for ~24 s.
|
||||||
- name: Install pre-commit and the system hooks' imports
|
- name: Install pre-commit and the system hooks' imports
|
||||||
run: |
|
run: |
|
||||||
if [[ "${{ matrix.group }}" == rest ]]; then
|
if [[ "${{ matrix.group }}" == rest ]]; then
|
||||||
|
|||||||
6
.github/workflows/release-apk.yml
vendored
6
.github/workflows/release-apk.yml
vendored
@ -60,7 +60,7 @@ jobs:
|
|||||||
|
|
||||||
- uses: subosito/flutter-action@v2
|
- uses: subosito/flutter-action@v2
|
||||||
with:
|
with:
|
||||||
flutter-version: 3.47.9
|
flutter-version: 3.50.1
|
||||||
channel: stable
|
channel: stable
|
||||||
cache: true
|
cache: true
|
||||||
|
|
||||||
@ -108,7 +108,9 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
flutter build apk --release \
|
flutter build apk --release \
|
||||||
--build-name="${{ steps.ver.outputs.semver }}" \
|
--build-name="${{ steps.ver.outputs.semver }}" \
|
||||||
--build-number="${{ steps.vc.outputs.code }}"
|
--build-number="${{ steps.vc.outputs.code }}" \
|
||||||
|
--dart-define=APP_BUILD="${{ steps.vc.outputs.code }}" \
|
||||||
|
--dart-define=APP_VERSION="${{ steps.ver.outputs.semver }}"
|
||||||
|
|
||||||
# Fail closed. `findByName("release") ?: debug` silently falls back to
|
# Fail closed. `findByName("release") ?: debug` silently falls back to
|
||||||
# the debug key if key.properties is misplaced, producing a green build
|
# the debug key if key.properties is misplaced, producing a green build
|
||||||
|
|||||||
@ -29,7 +29,7 @@ repos:
|
|||||||
args: [--pytest-test-first]
|
args: [--pytest-test-first]
|
||||||
# Shared fakes and fixtures, not test modules. Split out of conftest.py
|
# 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.
|
# 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)\.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|claude_redirects|claude_fakes|claude_worker_fakes)\.py$
|
||||||
- id: check-ast
|
- id: check-ast
|
||||||
- id: mixed-line-ending
|
- id: mixed-line-ending
|
||||||
args: [--fix=lf]
|
args: [--fix=lf]
|
||||||
@ -96,6 +96,10 @@ repos:
|
|||||||
rev: v3.3.2
|
rev: v3.3.2
|
||||||
hooks:
|
hooks:
|
||||||
- id: pylint
|
- 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:
|
args:
|
||||||
- --rcfile=pyproject.toml
|
- --rcfile=pyproject.toml
|
||||||
- --fail-under=10
|
- --fail-under=10
|
||||||
@ -107,10 +111,14 @@ repos:
|
|||||||
# direct URLs for one distribution, so any pin that drifts from
|
# direct URLs for one distribution, so any pin that drifts from
|
||||||
# the manifest becomes an unresolvable hook environment rather
|
# the manifest becomes an unresolvable hook environment rather
|
||||||
# than merely an old one.
|
# than merely an old one.
|
||||||
- gatelock @ git+https://github.com/kuhyx/utils@gatelock-v0.12.0#subdirectory=gatelock
|
- gatelock @ git+https://github.com/kuhyx/utils@gatelock-v0.16.0#subdirectory=gatelock
|
||||||
- crdt-sync @ git+https://github.com/kuhyx/utils@crdt-sync-v0.9.2#subdirectory=crdt-sync
|
- 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.0#subdirectory=freedays
|
- freedays @ git+https://github.com/kuhyx/utils@freedays-v0.4.3#subdirectory=freedays
|
||||||
- sickdays @ git+https://github.com/kuhyx/utils@sickdays-v0.3.0#subdirectory=sickdays
|
- sickdays @ git+https://github.com/kuhyx/utils@sickdays-v0.5.5#subdirectory=sickdays
|
||||||
|
- kuhy-credit @ git+https://github.com/kuhyx/utils@kuhy-credit-v0.3.0#subdirectory=kuhy_credit
|
||||||
|
- 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
|
||||||
- mcp>=2,<3
|
- mcp>=2,<3
|
||||||
- pydantic
|
- pydantic
|
||||||
- defusedxml==0.7.1
|
- defusedxml==0.7.1
|
||||||
@ -167,48 +175,96 @@ repos:
|
|||||||
require_serial: true
|
require_serial: true
|
||||||
stages: [manual]
|
stages: [manual]
|
||||||
- id: ci-mirror-flutter-test-1
|
- id: ci-mirror-flutter-test-1
|
||||||
name: CI mirror 5 (flutter test 1/6)
|
name: CI mirror 5 (flutter test 1/12)
|
||||||
entry: bash scripts/ci_mirror.sh flutter-test --shard 0/6
|
entry: bash scripts/ci_mirror.sh flutter-test --shard 0/12
|
||||||
language: system
|
language: system
|
||||||
pass_filenames: false
|
pass_filenames: false
|
||||||
always_run: true
|
always_run: true
|
||||||
require_serial: true
|
require_serial: true
|
||||||
stages: [manual]
|
stages: [manual]
|
||||||
- id: ci-mirror-flutter-test-2
|
- id: ci-mirror-flutter-test-2
|
||||||
name: CI mirror 6 (flutter test 2/6)
|
name: CI mirror 6 (flutter test 2/12)
|
||||||
entry: bash scripts/ci_mirror.sh flutter-test --shard 1/6
|
entry: bash scripts/ci_mirror.sh flutter-test --shard 1/12
|
||||||
language: system
|
language: system
|
||||||
pass_filenames: false
|
pass_filenames: false
|
||||||
always_run: true
|
always_run: true
|
||||||
require_serial: true
|
require_serial: true
|
||||||
stages: [manual]
|
stages: [manual]
|
||||||
- id: ci-mirror-flutter-test-3
|
- id: ci-mirror-flutter-test-3
|
||||||
name: CI mirror 7 (flutter test 3/6)
|
name: CI mirror 7 (flutter test 3/12)
|
||||||
entry: bash scripts/ci_mirror.sh flutter-test --shard 2/6
|
entry: bash scripts/ci_mirror.sh flutter-test --shard 2/12
|
||||||
language: system
|
language: system
|
||||||
pass_filenames: false
|
pass_filenames: false
|
||||||
always_run: true
|
always_run: true
|
||||||
require_serial: true
|
require_serial: true
|
||||||
stages: [manual]
|
stages: [manual]
|
||||||
- id: ci-mirror-flutter-test-4
|
- id: ci-mirror-flutter-test-4
|
||||||
name: CI mirror 8 (flutter test 4/6)
|
name: CI mirror 8 (flutter test 4/12)
|
||||||
entry: bash scripts/ci_mirror.sh flutter-test --shard 3/6
|
entry: bash scripts/ci_mirror.sh flutter-test --shard 3/12
|
||||||
language: system
|
language: system
|
||||||
pass_filenames: false
|
pass_filenames: false
|
||||||
always_run: true
|
always_run: true
|
||||||
require_serial: true
|
require_serial: true
|
||||||
stages: [manual]
|
stages: [manual]
|
||||||
- id: ci-mirror-flutter-test-5
|
- id: ci-mirror-flutter-test-5
|
||||||
name: CI mirror 9 (flutter test 5/6)
|
name: CI mirror 9 (flutter test 5/12)
|
||||||
entry: bash scripts/ci_mirror.sh flutter-test --shard 4/6
|
entry: bash scripts/ci_mirror.sh flutter-test --shard 4/12
|
||||||
language: system
|
language: system
|
||||||
pass_filenames: false
|
pass_filenames: false
|
||||||
always_run: true
|
always_run: true
|
||||||
require_serial: true
|
require_serial: true
|
||||||
stages: [manual]
|
stages: [manual]
|
||||||
- id: ci-mirror-flutter-test-6
|
- id: ci-mirror-flutter-test-6
|
||||||
name: CI mirror 10 (flutter test 6/6)
|
name: CI mirror 10 (flutter test 6/12)
|
||||||
entry: bash scripts/ci_mirror.sh flutter-test --shard 5/6
|
entry: bash scripts/ci_mirror.sh flutter-test --shard 5/12
|
||||||
|
language: system
|
||||||
|
pass_filenames: false
|
||||||
|
always_run: true
|
||||||
|
require_serial: true
|
||||||
|
stages: [manual]
|
||||||
|
- id: ci-mirror-flutter-test-7
|
||||||
|
name: CI mirror 11 (flutter test 7/12)
|
||||||
|
entry: bash scripts/ci_mirror.sh flutter-test --shard 6/12
|
||||||
|
language: system
|
||||||
|
pass_filenames: false
|
||||||
|
always_run: true
|
||||||
|
require_serial: true
|
||||||
|
stages: [manual]
|
||||||
|
- id: ci-mirror-flutter-test-8
|
||||||
|
name: CI mirror 12 (flutter test 8/12)
|
||||||
|
entry: bash scripts/ci_mirror.sh flutter-test --shard 7/12
|
||||||
|
language: system
|
||||||
|
pass_filenames: false
|
||||||
|
always_run: true
|
||||||
|
require_serial: true
|
||||||
|
stages: [manual]
|
||||||
|
- id: ci-mirror-flutter-test-9
|
||||||
|
name: CI mirror 13 (flutter test 9/12)
|
||||||
|
entry: bash scripts/ci_mirror.sh flutter-test --shard 8/12
|
||||||
|
language: system
|
||||||
|
pass_filenames: false
|
||||||
|
always_run: true
|
||||||
|
require_serial: true
|
||||||
|
stages: [manual]
|
||||||
|
- id: ci-mirror-flutter-test-10
|
||||||
|
name: CI mirror 14 (flutter test 10/12)
|
||||||
|
entry: bash scripts/ci_mirror.sh flutter-test --shard 9/12
|
||||||
|
language: system
|
||||||
|
pass_filenames: false
|
||||||
|
always_run: true
|
||||||
|
require_serial: true
|
||||||
|
stages: [manual]
|
||||||
|
- id: ci-mirror-flutter-test-11
|
||||||
|
name: CI mirror 15 (flutter test 11/12)
|
||||||
|
entry: bash scripts/ci_mirror.sh flutter-test --shard 10/12
|
||||||
|
language: system
|
||||||
|
pass_filenames: false
|
||||||
|
always_run: true
|
||||||
|
require_serial: true
|
||||||
|
stages: [manual]
|
||||||
|
- id: ci-mirror-flutter-test-12
|
||||||
|
name: CI mirror 16 (flutter test 12/12)
|
||||||
|
entry: bash scripts/ci_mirror.sh flutter-test --shard 11/12
|
||||||
language: system
|
language: system
|
||||||
pass_filenames: false
|
pass_filenames: false
|
||||||
always_run: true
|
always_run: true
|
||||||
@ -274,7 +330,7 @@ repos:
|
|||||||
# patch target statically so a stale path fails the commit instead.
|
# patch target statically so a stale path fails the commit instead.
|
||||||
- id: patch-targets
|
- id: patch-targets
|
||||||
name: test patch targets resolve
|
name: test patch targets resolve
|
||||||
entry: python3 scripts/check_patch_targets.py
|
entry: python3 scripts/check_patch_targets.py diet_guard
|
||||||
language: system
|
language: system
|
||||||
pass_filenames: false
|
pass_filenames: false
|
||||||
files: ^diet_guard/
|
files: ^diet_guard/
|
||||||
|
|||||||
131
AGENTS.md
131
AGENTS.md
@ -1,51 +1,57 @@
|
|||||||
# CLAUDE.md — diet_guard
|
# CLAUDE.md — diet_guard
|
||||||
|
|
||||||
A log-to-unlock gate. Every ~15 min `diet-guard-gate.timer` checks whether a
|
A log-to-unlock gate. Every ~15 min `diet-guard-gate.timer` checks whether a meal slot (08:00,
|
||||||
meal slot (08:00, 12:00, 16:00, 20:00 by default — the schedule is
|
12:00, 16:00, 20:00 by default — the schedule is user-configurable, see below) elapsed unlogged; if
|
||||||
user-configurable, see below) elapsed unlogged; if so it opens a
|
so it opens a fullscreen Tk window that blocks the desktop until the user logs what they ate. It
|
||||||
fullscreen Tk window that blocks the desktop until the user logs what they
|
also tracks a daily calorie/macro budget, seeded from biometrics at `init` and freely editable
|
||||||
ate. It also tracks a daily calorie/macro budget, seeded from biometrics at
|
afterward on either device. A History tab (`_gatelock_calendar.py`) and the phone's Calendar screen
|
||||||
`init` and freely editable afterward on either device. A History tab
|
show adherence, streaks, a YTD tally and weekly/monthly averages, all derived from `_daystatus.py` /
|
||||||
(`_gatelock_calendar.py`) and the phone's Calendar screen show adherence,
|
`day_status_service.dart` and `_averages.py` / `average_service.dart`.
|
||||||
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
|
`docs/DOCS-design.md` holds the original spec (slot timing, the Tue/Wed/Thu catch-up rule).
|
||||||
catch-up rule).
|
|
||||||
|
|
||||||
## Commands
|
## Commands
|
||||||
|
|
||||||
- One sync tick: `python -m diet_guard sync`
|
- One sync tick: `python -m diet_guard sync`
|
||||||
- Averages: `python -m diet_guard averages`; Body: `body`, `weight KG`, `profile`, `plan-week`
|
- 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`
|
- 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`
|
- 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`
|
- 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: `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)
|
- test-changed: `scripts/test_changed.sh` (maps py and app/ dart changes to their tests, no coverage)
|
||||||
- lint: `pre-commit run --all-files`
|
- lint: `pre-commit run --all-files`
|
||||||
- coverage: `python -m pytest -n auto -p no:sugar -q` (writes coverage.lcov)
|
- 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`
|
- coverage-gaps: `coverage-gaps coverage.lcov`
|
||||||
|
|
||||||
## Scheduling
|
## Scheduling
|
||||||
|
|
||||||
`diet-guard-gate.timer` is wall-clock (`OnCalendar=*-*-* *:00/15:00`,
|
`diet-guard-gate.timer` is wall-clock (`OnCalendar=*-*-* *:00/15:00`, `Persistent=true`), not
|
||||||
`Persistent=true`), not boot-relative — a boot-relative timer collided with
|
boot-relative — a boot-relative timer collided with fullscreen games grabbing input.
|
||||||
fullscreen games grabbing input. `diet-guard-gate.service` is `Type=oneshot`
|
`diet-guard-gate.service` is `Type=oneshot` and exits 0 at once when no lock is due (free/sick day:
|
||||||
and exits 0 at once when no lock is due (free/sick day: [docs/DOCS-sick-days.md](docs/DOCS-sick-days.md)).
|
[docs/DOCS-sick-days.md](docs/DOCS-sick-days.md)). Needs `DISPLAY`/`XAUTHORITY`; see the unit file
|
||||||
Needs `DISPLAY`/`XAUTHORITY`; see the unit file and `wait_for_display()`.
|
and `wait_for_display()`.
|
||||||
|
|
||||||
## Cross-device sync
|
## Cross-device sync
|
||||||
|
|
||||||
A sync tick pulls every other device's log from `kuhyx/syncs`
|
A sync tick pulls every other device's log from `kuhyx/syncs` (`diet-guard-sync/`, dumb file storage
|
||||||
(`diet-guard-sync/`, dumb file storage via the REST Contents API), merges
|
via the REST Contents API), merges (`_sync_merge.merge_logs`: union by `id`, tombstone wins, legacy
|
||||||
(`_sync_merge.merge_logs`: union by `id`, tombstone wins, legacy
|
`(time, desc)` dedup), **re-signs every persisted entry**, rebuilds the food bank, pushes back.
|
||||||
`(time, desc)` dedup), **re-signs every persisted entry**, rebuilds the food
|
|
||||||
bank, pushes back.
|
|
||||||
|
|
||||||
**On the PC, sync is event-driven — there is no periodic timer.** The old
|
**End-to-end encrypted** (since 2026-11-12, `_sync_e2e.py` / `app/lib/services/sync_e2e.dart`):
|
||||||
`diet-guard-sync.timer` (~15 min) was deleted: it paid a network round-trip on
|
everything lives on `diet-guard-sync/devices-e2e` (revs `revs-e2e`, header `diet-guard-sync/e2e`),
|
||||||
every idle tick to approximate the two moments state actually changes here.
|
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.
|
||||||
|
|
||||||
- **Before a lock** — `_cli_gate._should_lock` runs the cheap local
|
- **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
|
`gate_is_due()` first and pulls *only* when a lock is otherwise due, so a
|
||||||
@ -109,19 +115,18 @@ every idle tick to approximate the two moments state actually changes here.
|
|||||||
|
|
||||||
## Production dependency installation
|
## Production dependency installation
|
||||||
|
|
||||||
`diet-guard-gate.service` runs `/usr/bin/python`, **not** a venv. Any new
|
`diet-guard-gate.service` runs `/usr/bin/python`, **not** a venv. Any new non-stdlib dependency must
|
||||||
non-stdlib dependency must go into system Python's user site-packages:
|
go into system Python's user site-packages:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
/usr/bin/python3 -m pip install --user --break-system-packages -e .
|
/usr/bin/python3 -m pip install --user --break-system-packages -e .
|
||||||
```
|
```
|
||||||
|
|
||||||
Verify against `/usr/bin/python3 -c "import <dep>"`, not the dev venv.
|
Verify against `/usr/bin/python3 -c "import <dep>"`, not the dev venv. Installing only into `.venv`
|
||||||
Installing only into `.venv` caused a 3-day production outage (2026-06-19).
|
caused a 3-day production outage (2026-06-19).
|
||||||
|
|
||||||
Run `install.sh` from a **durable** clone (`~/src/diet-guard`), never a scratch
|
Run `install.sh` from a **durable** clone (`~/src/diet-guard`), never a scratch dir — it does `pip
|
||||||
dir — it does `pip install -e`, so the clone must persist for `git pull` to
|
install -e`, so the clone must persist for `git pull` to reach the running service.
|
||||||
reach the running service.
|
|
||||||
|
|
||||||
## Operational gotchas
|
## Operational gotchas
|
||||||
|
|
||||||
@ -156,16 +161,14 @@ reach the running service.
|
|||||||
|
|
||||||
## The companion app's desktop target is a web build
|
## The companion app's desktop target is a web build
|
||||||
|
|
||||||
`app/` builds for **Android** and **web** only. There is no `app/linux/` —
|
`app/` builds for **Android** and **web** only. There is no `app/linux/` — Flutter's GTK embedder
|
||||||
Flutter's GTK embedder manages ~20fps at 3840x2160 where the same Dart in
|
manages ~20fps at 3840x2160 where the same Dart in Chrome sustains ~144fps
|
||||||
Chrome sustains ~144fps (`~/src/todo/docs/DOCS-desktop-performance-findings.md`). The
|
(`~/src/todo/docs/DOCS-desktop-performance-findings.md`). The desktop app is the web build served by
|
||||||
desktop app is the web build served by `bin/diet_guard_desktop.dart` in a
|
`bin/diet_guard_desktop.dart` in a Chrome `--app` window.
|
||||||
Chrome `--app` window.
|
|
||||||
|
|
||||||
Enforced by `app/test/repo_invariants_test.dart`: no `app/linux/`, `dart:io`
|
Enforced by `app/test/repo_invariants_test.dart`: no `app/linux/`, `dart:io` only in `*_io.dart`
|
||||||
only in `*_io.dart` seams and `lib/desktop/`, port 8732 and the
|
seams and `lib/desktop/`, port 8732 and the `diet-guard-desktop` Chrome profile pinned (IndexedDB is
|
||||||
`diet-guard-desktop` Chrome profile pinned (IndexedDB is keyed by origin, so
|
keyed by origin, so changing either hides the entire local food log).
|
||||||
changing either hides the entire local food log).
|
|
||||||
|
|
||||||
- Branch on `kIsWeb` *before* any `Platform.is…`, which itself throws on web.
|
- 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
|
`dart:io` does not fail a web compile — it throws at runtime, so the symptom
|
||||||
@ -178,19 +181,17 @@ changing either hides the entire local food log).
|
|||||||
|
|
||||||
## The meal schedule
|
## The meal schedule
|
||||||
|
|
||||||
Slots are **minutes of day**: a first meal and a last meal (any `HH:MM`) and
|
Slots are **minutes of day**: a first meal and a last meal (any `HH:MM`) and how many meals fall
|
||||||
how many meals fall between them; interior slots round to the 15-min grid.
|
between them; interior slots round to the 15-min grid. Default `(480, 1200, 4)` is the old hardcoded
|
||||||
Default `(480, 1200, 4)` is the old hardcoded 08/12/16/20. The load-bearing
|
08/12/16/20. The load-bearing rules (integer-only arithmetic, the additive `slot`+`slot_min` /
|
||||||
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
|
||||||
`f`/`l`/`n`+`fm`/`lm` wire, the count clamp, the `last + 120 min` cutoff,
|
satisfaction), the forward-only history, and the two edit surfaces are in
|
||||||
nearest-slot satisfaction), the forward-only history, and the two edit
|
[docs/DOCS-meal-schedule.md](docs/DOCS-meal-schedule.md) — read it before touching `_slots.py` /
|
||||||
surfaces are in [docs/DOCS-meal-schedule.md](docs/DOCS-meal-schedule.md) —
|
`_slot_wire.py` / `slot.dart`.
|
||||||
read it before touching `_slots.py` / `_slot_wire.py` / `slot.dart`.
|
|
||||||
|
|
||||||
## Averages (`_averages.py` / `average_service.dart`)
|
## Averages (`_averages.py` / `average_service.dart`)
|
||||||
|
|
||||||
Three load-bearing rules; changing any silently changes what "under budget"
|
Three load-bearing rules; changing any silently changes what "under budget" means:
|
||||||
means:
|
|
||||||
|
|
||||||
- **Denominator is logged days, not elapsed days.** An unlogged day is not a
|
- **Denominator is logged days, not elapsed days.** An unlogged day is not a
|
||||||
zero-kcal day.
|
zero-kcal day.
|
||||||
@ -200,10 +201,9 @@ means:
|
|||||||
week" is empty on a Monday, and reports `no logged days yet` rather than a
|
week" is empty on a Monday, and reports `no logged days yet` rather than a
|
||||||
fake average.
|
fake average.
|
||||||
|
|
||||||
Band boundaries reuse `_daystatus.OVER_BUDGET_YELLOW_CEILING` /
|
Band boundaries reuse `_daystatus.OVER_BUDGET_YELLOW_CEILING` / `kOverBudgetYellowCeiling` **by
|
||||||
`kOverBudgetYellowCeiling` **by import, not by copy**. The MCP `get_averages`
|
import, not by copy**. The MCP `get_averages` tool drops `avg_budget` (budget secrecy on the network
|
||||||
tool drops `avg_budget` (budget secrecy on the network only); the CLI, gate and
|
only); the CLI, gate and phone show both.
|
||||||
phone show both.
|
|
||||||
|
|
||||||
## Do NOT
|
## Do NOT
|
||||||
|
|
||||||
@ -217,18 +217,18 @@ phone show both.
|
|||||||
(`2.5.round() == 3`), so a float path silently desyncs the two devices —
|
(`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
|
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.
|
can never be satisfied, i.e. a permanent lock. Integer `//` and `~/` only.
|
||||||
- Don't re-add the meal builder, "repeat last meal", the reward prompt, or
|
- Don't re-add the meal builder, "repeat last meal" or the reward prompt
|
||||||
**meal photos** — all removed deliberately, enforced by
|
(removed deliberately, `app/test/repo_invariants_test.dart`). A meal photo is
|
||||||
`app/test/repo_invariants_test.dart`. Photos also took `image_picker`, the
|
transient input to Claude only (2026-11-17): never stored, on a `FoodEntry`
|
||||||
blob stores, the `/blobs/` route and the `CAMERA` permission; re-adding them
|
or synced; the invariants test asserts no image bytes reach a record.
|
||||||
means syncing image blobs too.
|
|
||||||
- Don't strip the `components` field: nothing writes it, but historical
|
- 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
|
composite entries and the food bank read it, and it is part of the sync wire
|
||||||
format.
|
format.
|
||||||
- Don't let the catering import log unattended (delivered ≠ eaten), don't let
|
- Catering logs itself since 2026-11-17 (kuhy overrode "delivered ≠ eaten":
|
||||||
its Python and Dart halves drift (one shared fixture gates them), and don't
|
"LOG EVEN WITHOUT TAP"): v5 ids `kuchnia:<date>:<dishId>`, undo tombstones.
|
||||||
make the synced password machine-local — the phone could not then fetch.
|
Don't let its Python and Dart halves drift (shared fixtures) or make the
|
||||||
[docs](docs/DOCS-kuchnia-wikinga.md), [phone](docs/DOCS-kuchnia-wikinga-phone.md).
|
synced password machine-local. [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 add a dependency without the production install-path check above.
|
||||||
- Don't reintroduce a seal/`chattr +i` on the budget file.
|
- 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
|
- Don't re-add a Linux embedder target, and don't change the wrapper's port or
|
||||||
@ -240,8 +240,7 @@ phone show both.
|
|||||||
## Flutter/Dart AI rules
|
## Flutter/Dart AI rules
|
||||||
|
|
||||||
_Vendored from [flutter/flutter docs/rules/rules.md](https://github.com/flutter/flutter/blob/main/docs/rules/rules.md)
|
_Vendored from [flutter/flutter docs/rules/rules.md](https://github.com/flutter/flutter/blob/main/docs/rules/rules.md)
|
||||||
via `~/.claude/CLAUDE.md` Flutter AI tooling setup. Re-fetch periodically.
|
via `~/.claude/CLAUDE.md`. Re-fetch periodically. Split across five files for the 250-line cap._
|
||||||
Split across five files to stay under the 250-line cap._
|
|
||||||
|
|
||||||
- [Language, style and architecture](docs/DOCS-flutter-rules-language.md)
|
- [Language, style and architecture](docs/DOCS-flutter-rules-language.md)
|
||||||
- [Architecture, lint rules, state and data](docs/DOCS-flutter-rules-state-and-data.md)
|
- [Architecture, lint rules, state and data](docs/DOCS-flutter-rules-state-and-data.md)
|
||||||
|
|||||||
30
DOCS-lock-order.md
Normal file
30
DOCS-lock-order.md
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
# Lock order
|
||||||
|
|
||||||
|
When several locks are due at once, gatelock shows the one with the highest
|
||||||
|
rank first. Each lower lock waits, with no window, until every higher lock has
|
||||||
|
been cleared. kuhy fixed this order on 2026-11-21:
|
||||||
|
|
||||||
|
| Order | Lock | gatelock app | Rank | Repo |
|
||||||
|
|---|---|---|---|---|
|
||||||
|
| 1 | workout | screen_locker | 200 | screen-locker |
|
||||||
|
| 2 | book | book_guard | 175 | book-guard |
|
||||||
|
| 3 | tutor | tutor_gate | 150 | tutor |
|
||||||
|
| 4 | diet | diet_guard | 130 | diet-guard |
|
||||||
|
| 5 | focus | focus_guard | 128 | focus-guard |
|
||||||
|
| 6 | leetcode | leetcode_guard | 125 | leetcode-guard |
|
||||||
|
|
||||||
|
LeetCode goes last. Each rank is a literal in its own repo, not a
|
||||||
|
`gatelock.RANK_*` constant, so changing one does not need a gatelock release.
|
||||||
|
Every repo keeps a copy of this file, and its tests fail when its own number
|
||||||
|
differs from its row here. Change the rank, this table and the copies in the
|
||||||
|
other repos together.
|
||||||
|
|
||||||
|
Not in the table:
|
||||||
|
|
||||||
|
- The wake alarm (300) outranks everything.
|
||||||
|
- The evening chain (`gatelock.evening_chain`) runs its rungs one at a time,
|
||||||
|
in the order book, tutor, LeetCode. Its book rung locks at 150, which ties
|
||||||
|
the tutor. Ranks only order locks that are due at the same moment.
|
||||||
|
- All of these lock with a global grab and VT switching disabled, so no
|
||||||
|
higher rank is ever a weaker lock. `gatelock/scripts/verify_all_lockers.py`
|
||||||
|
checks this order on a private X server.
|
||||||
@ -87,6 +87,15 @@ 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
|
Then restart Claude Code in this repo and approve the project MCP server
|
||||||
(registered in `.mcp.json`).
|
(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
|
## Development
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
|||||||
@ -19,6 +19,12 @@
|
|||||||
only, foreground only: no READ_HEALTH_DATA_IN_BACKGROUND, so the
|
only, foreground only: no READ_HEALTH_DATA_IN_BACKGROUND, so the
|
||||||
WorkManager isolate never reads Health Connect. -->
|
WorkManager isolate never reads Health Connect. -->
|
||||||
<uses-permission android:name="android.permission.health.READ_STEPS"/>
|
<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
|
<!-- Deliberately NOT requesting SCHEDULE_EXACT_ALARM: the background
|
||||||
check is a 15-minute WorkManager periodic task, not exact alarms
|
check is a 15-minute WorkManager periodic task, not exact alarms
|
||||||
(more robust against OEM background-kill; +/-15 min is accepted, see
|
(more robust against OEM background-kill; +/-15 min is accepted, see
|
||||||
|
|||||||
@ -1,4 +1,7 @@
|
|||||||
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
|
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
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
# This newDsl flag was added by the Flutter template
|
# This newDsl flag was added by the Flutter template
|
||||||
android.newDsl=false
|
android.newDsl=false
|
||||||
|
|||||||
@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
|
|||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.2-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.1-all.zip
|
||||||
|
|||||||
35
app/lib/desktop/error_page.dart
Normal file
35
app/lib/desktop/error_page.dart
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
/// 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
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -19,6 +19,7 @@ library;
|
|||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:diet_guard_app/desktop/error_page.dart' show isNavigation;
|
||||||
import 'package:http/http.dart' as http;
|
import 'package:http/http.dart' as http;
|
||||||
|
|
||||||
/// GitHub's REST API base, which [GitHubProxy] fronts.
|
/// GitHub's REST API base, which [GitHubProxy] fronts.
|
||||||
@ -177,8 +178,13 @@ class GitHubProxy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void _passThrough(HttpRequest request, http.Response response) {
|
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
|
request.response
|
||||||
..statusCode = response.statusCode
|
|
||||||
..headers.contentType = ContentType.json
|
..headers.contentType = ContentType.json
|
||||||
..add(response.bodyBytes);
|
..add(response.bodyBytes);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -24,6 +24,7 @@ import 'dart:io';
|
|||||||
import 'package:crdt_sync/crdt_sync.dart';
|
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/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/desktop/github_proxy.dart';
|
||||||
import 'package:diet_guard_app/services/desktop_wrapper.dart';
|
import 'package:diet_guard_app/services/desktop_wrapper.dart';
|
||||||
import 'package:path/path.dart' as p;
|
import 'package:path/path.dart' as p;
|
||||||
@ -91,6 +92,7 @@ class WrapperServer {
|
|||||||
} on Exception {
|
} on Exception {
|
||||||
request.response.statusCode = HttpStatus.internalServerError;
|
request.response.statusCode = HttpStatus.internalServerError;
|
||||||
}
|
}
|
||||||
|
paintErrorIcon(request);
|
||||||
await request.response.close();
|
await request.response.close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,11 +3,17 @@
|
|||||||
library;
|
library;
|
||||||
|
|
||||||
import 'dart:async';
|
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/screens/log_meal_screen.dart';
|
||||||
import 'package:diet_guard_app/services/app_settings_service.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/background_tasks.dart';
|
||||||
import 'package:diet_guard_app/services/body_service.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/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/foodbank_service.dart';
|
||||||
import 'package:diet_guard_app/services/frame_stats.dart';
|
import 'package:diet_guard_app/services/frame_stats.dart';
|
||||||
import 'package:diet_guard_app/services/kuchnia_credential_service.dart';
|
import 'package:diet_guard_app/services/kuchnia_credential_service.dart';
|
||||||
@ -17,13 +23,31 @@ 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/notification_service.dart';
|
||||||
import 'package:diet_guard_app/services/sync_device_id.dart';
|
import 'package:diet_guard_app/services/sync_device_id.dart';
|
||||||
import 'package:diet_guard_app/ui/theme.dart';
|
import 'package:diet_guard_app/ui/theme.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
Future<void> main() async {
|
Future<void> main() async {
|
||||||
WidgetsFlutterBinding.ensureInitialized();
|
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
|
// Before anything that stamps an Hlc or syncs: until this resolves, the
|
||||||
// device id falls back to the pre-migration role constant.
|
// device id falls back to the pre-migration role constant.
|
||||||
await initSyncDeviceId();
|
final deviceId = await initSyncDeviceId();
|
||||||
|
errors.connect(
|
||||||
|
sink: () async => (await openFirebase())?.patchValues,
|
||||||
|
deviceId: () async => deviceId,
|
||||||
|
);
|
||||||
await LogStorageService.init();
|
await LogStorageService.init();
|
||||||
await AppSettingsService.init();
|
await AppSettingsService.init();
|
||||||
await BudgetHistoryService.init();
|
await BudgetHistoryService.init();
|
||||||
@ -32,6 +56,8 @@ Future<void> main() async {
|
|||||||
await KuchniaCredentialService.init();
|
await KuchniaCredentialService.init();
|
||||||
await BodyService.init();
|
await BodyService.init();
|
||||||
await KuchniaQueueService.init();
|
await KuchniaQueueService.init();
|
||||||
|
// The sparkle button's transport; until this line it fails closed.
|
||||||
|
claudeRelay = RtdbClaudeRelay.firebase();
|
||||||
final notifications = await NotificationService.init();
|
final notifications = await NotificationService.init();
|
||||||
// Deliberately *not* awaited before the first frame: the browser's
|
// Deliberately *not* awaited before the first frame: the browser's
|
||||||
// `Notification.requestPermission()` does not complete until the user
|
// `Notification.requestPermission()` does not complete until the user
|
||||||
@ -51,19 +77,25 @@ Future<void> main() async {
|
|||||||
// coverage:ignore-start
|
// coverage:ignore-start
|
||||||
if (frameStatsEnabled) startFrameStats();
|
if (frameStatsEnabled) startFrameStats();
|
||||||
// coverage:ignore-end
|
// coverage:ignore-end
|
||||||
runApp(const DietGuardApp());
|
runApp(DietGuardApp(errors: errors));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Root widget for the Diet Guard companion app.
|
/// Root widget for the Diet Guard companion app.
|
||||||
class DietGuardApp extends StatelessWidget {
|
class DietGuardApp extends StatelessWidget {
|
||||||
/// Creates the [DietGuardApp] root widget.
|
/// Creates the [DietGuardApp] root widget.
|
||||||
const DietGuardApp({super.key});
|
const DietGuardApp({this.errors, super.key});
|
||||||
|
|
||||||
|
/// App-wide error reporting; null in widget tests.
|
||||||
|
final AppErrors? errors;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return MaterialApp(
|
return MaterialApp(
|
||||||
title: 'Diet Guard',
|
title: 'Diet Guard',
|
||||||
theme: buildAppTheme(),
|
theme: buildAppTheme(),
|
||||||
|
navigatorObservers: [
|
||||||
|
if (errors case final errors?) AppErrorsRouteObserver(errors),
|
||||||
|
],
|
||||||
home: const LogMealScreen(),
|
home: const LogMealScreen(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -20,6 +20,7 @@ class KuchniaDish {
|
|||||||
required this.grams,
|
required this.grams,
|
||||||
required this.priority,
|
required this.priority,
|
||||||
required this.slotLabel,
|
required this.slotLabel,
|
||||||
|
this.dishId = '',
|
||||||
});
|
});
|
||||||
|
|
||||||
/// The dish itself (`menuMealName`), e.g. "Kaszotto grzybowe...".
|
/// The dish itself (`menuMealName`), e.g. "Kaszotto grzybowe...".
|
||||||
@ -52,6 +53,17 @@ class KuchniaDish {
|
|||||||
/// The caterer's slot label ("Śniadanie", "Obiad", ...), for display only.
|
/// The caterer's slot label ("Śniadanie", "Obiad", ...), for display only.
|
||||||
final String slotLabel;
|
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.
|
/// The curated-bank record for this dish.
|
||||||
///
|
///
|
||||||
/// Mirrors `_kuchnia_import.dish_to_record`. `count` is 0: the bank's count
|
/// Mirrors `_kuchnia_import.dish_to_record`. `count` is 0: the bank's count
|
||||||
|
|||||||
@ -29,7 +29,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/profile_card.dart';
|
||||||
import 'package:diet_guard_app/widgets/body/week_plan_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:diet_guard_app/widgets/body/weight_card.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
export 'package:diet_guard_app/screens/body_screen_data.dart';
|
export 'package:diet_guard_app/screens/body_screen_data.dart';
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@ 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_service.dart';
|
||||||
import 'package:diet_guard_app/services/body_steps.dart';
|
import 'package:diet_guard_app/services/body_steps.dart';
|
||||||
import 'package:diet_guard_app/services/log_storage_service.dart';
|
import 'package:diet_guard_app/services/log_storage_service.dart';
|
||||||
import 'package:flutter/material.dart' show IconData, Icons;
|
import 'package:material_ui/material_ui.dart' show IconData, Icons;
|
||||||
|
|
||||||
/// Builds the person from the stored profile and newest weight, or null
|
/// Builds the person from the stored profile and newest weight, or null
|
||||||
/// when anything the formulas need is missing.
|
/// when anything the formulas need is missing.
|
||||||
|
|||||||
@ -9,6 +9,7 @@ library;
|
|||||||
|
|
||||||
import 'dart:async';
|
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/day_status.dart';
|
||||||
import 'package:diet_guard_app/models/period_average.dart';
|
import 'package:diet_guard_app/models/period_average.dart';
|
||||||
import 'package:diet_guard_app/screens/history_screen.dart';
|
import 'package:diet_guard_app/screens/history_screen.dart';
|
||||||
@ -22,8 +23,8 @@ 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/average_summary_row.dart';
|
||||||
import 'package:diet_guard_app/widgets/day_status_calendar.dart';
|
import 'package:diet_guard_app/widgets/day_status_calendar.dart';
|
||||||
import 'package:diet_guard_app/widgets/streak_summary_row.dart';
|
import 'package:diet_guard_app/widgets/streak_summary_row.dart';
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Screen showing the budget-adherence calendar, streaks, and budget entry.
|
/// Screen showing the budget-adherence calendar, streaks, and budget entry.
|
||||||
class CalendarScreen extends StatefulWidget {
|
class CalendarScreen extends StatefulWidget {
|
||||||
@ -153,7 +154,7 @@ class _CalendarScreenState extends State<CalendarScreen> {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
if (_loading) {
|
if (_loading) {
|
||||||
return const Scaffold(body: Center(child: CircularProgressIndicator()));
|
return const Scaffold(body: WaitWatch.centered('calendar.load'));
|
||||||
}
|
}
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(),
|
appBar: AppBar(),
|
||||||
|
|||||||
@ -11,7 +11,7 @@ import 'package:diet_guard_app/services/log_storage_service.dart';
|
|||||||
import 'package:diet_guard_app/ui/cues.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/autocomplete_suggestion_list.dart';
|
||||||
import 'package:diet_guard_app/widgets/macro_input_row.dart';
|
import 'package:diet_guard_app/widgets/macro_input_row.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:uuid/uuid.dart';
|
import 'package:uuid/uuid.dart';
|
||||||
|
|
||||||
/// Edit screen for an existing [FoodEntry].
|
/// Edit screen for an existing [FoodEntry].
|
||||||
|
|||||||
@ -8,6 +8,7 @@ library;
|
|||||||
|
|
||||||
import 'dart:async';
|
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/models/food_bank_record.dart';
|
||||||
import 'package:diet_guard_app/services/foodbank_service.dart';
|
import 'package:diet_guard_app/services/foodbank_service.dart';
|
||||||
import 'package:diet_guard_app/widgets/food_bank/fb_add_entry_dialog.dart';
|
import 'package:diet_guard_app/widgets/food_bank/fb_add_entry_dialog.dart';
|
||||||
@ -15,7 +16,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_filter_sheet.dart';
|
||||||
import 'package:diet_guard_app/widgets/food_bank/fb_record_tile.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:diet_guard_app/widgets/food_bank/fb_tile_grid.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Browses every banked food -- log-derived and manually curated -- with
|
/// Browses every banked food -- log-derived and manually curated -- with
|
||||||
/// filtering, sorting, and an add-entry dialog.
|
/// filtering, sorting, and an add-entry dialog.
|
||||||
@ -183,7 +184,7 @@ class _FoodBankScreenState extends State<FoodBankScreen> {
|
|||||||
],
|
],
|
||||||
),
|
),
|
||||||
body: all == null
|
body: all == null
|
||||||
? const Center(child: CircularProgressIndicator())
|
? const WaitWatch.centered('food_bank.load')
|
||||||
: _displayed.isEmpty
|
: _displayed.isEmpty
|
||||||
? Center(
|
? Center(
|
||||||
child: Icon(
|
child: Icon(
|
||||||
|
|||||||
@ -8,6 +8,7 @@ library;
|
|||||||
|
|
||||||
import 'dart:async';
|
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/firebase_client.dart';
|
||||||
import 'package:diet_guard_app/services/github_client_factory.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_health.dart';
|
||||||
@ -15,9 +16,9 @@ import 'package:diet_guard_app/services/sync_service.dart';
|
|||||||
import 'package:diet_guard_app/services/sync_settings.dart';
|
import 'package:diet_guard_app/services/sync_settings.dart';
|
||||||
import 'package:diet_guard_app/ui/cues.dart';
|
import 'package:diet_guard_app/ui/cues.dart';
|
||||||
import 'package:diet_guard_app/ui/theme.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:github_device_auth/github_device_auth.dart';
|
||||||
import 'package:http/http.dart' as http;
|
import 'package:http/http.dart' as http;
|
||||||
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
part 'github_client_id_dialog.dart';
|
part 'github_client_id_dialog.dart';
|
||||||
part 'github_mirror_actions.dart';
|
part 'github_mirror_actions.dart';
|
||||||
@ -100,7 +101,7 @@ class _GitHubMirrorScreenState extends State<GitHubMirrorScreen>
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
if (_loading) {
|
if (_loading) {
|
||||||
return const Scaffold(body: Center(child: CircularProgressIndicator()));
|
return const Scaffold(body: WaitWatch.centered('github_mirror.load'));
|
||||||
}
|
}
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
// No title and no explanatory paragraph: the code glyph that opened this
|
// No title and no explanatory paragraph: the code glyph that opened this
|
||||||
|
|||||||
@ -7,6 +7,7 @@ library;
|
|||||||
|
|
||||||
import 'dart:async';
|
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/models/food_entry.dart';
|
||||||
import 'package:diet_guard_app/screens/edit_entry_screen.dart';
|
import 'package:diet_guard_app/screens/edit_entry_screen.dart';
|
||||||
import 'package:diet_guard_app/services/log_storage_service.dart';
|
import 'package:diet_guard_app/services/log_storage_service.dart';
|
||||||
@ -14,7 +15,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_filter_sheet.dart';
|
||||||
import 'package:diet_guard_app/widgets/history/history_grouping.dart';
|
import 'package:diet_guard_app/widgets/history/history_grouping.dart';
|
||||||
import 'package:diet_guard_app/widgets/history/history_list.dart';
|
import 'package:diet_guard_app/widgets/history/history_list.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Logged meal history: every entry, grouped by day, filterable and sortable.
|
/// Logged meal history: every entry, grouped by day, filterable and sortable.
|
||||||
///
|
///
|
||||||
@ -189,7 +190,7 @@ class _HistoryScreenState extends State<HistoryScreen> {
|
|||||||
],
|
],
|
||||||
),
|
),
|
||||||
body: allEntries == null
|
body: allEntries == null
|
||||||
? const Center(child: CircularProgressIndicator())
|
? const WaitWatch.centered('history.load')
|
||||||
: _displayed.isEmpty
|
: _displayed.isEmpty
|
||||||
? Center(
|
? Center(
|
||||||
child: Icon(
|
child: Icon(
|
||||||
|
|||||||
@ -2,12 +2,11 @@ import 'package:diet_guard_app/models/food_suggestion.dart';
|
|||||||
import 'package:diet_guard_app/models/nutrition.dart';
|
import 'package:diet_guard_app/models/nutrition.dart';
|
||||||
import 'package:diet_guard_app/screens/log_meal_progress.dart';
|
import 'package:diet_guard_app/screens/log_meal_progress.dart';
|
||||||
import 'package:diet_guard_app/widgets/macro_input_row.dart';
|
import 'package:diet_guard_app/widgets/macro_input_row.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Writes [suggestion]'s name and macros into the log form's controllers.
|
/// 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, mirroring
|
/// Split out of `log_meal_screen.dart` for the repo's 250-line cap.
|
||||||
/// `log_meal_kuchnia_mixin.dart`'s `fillControllersFromDish`.
|
|
||||||
void fillControllersFromSuggestion(
|
void fillControllersFromSuggestion(
|
||||||
FoodSuggestion suggestion,
|
FoodSuggestion suggestion,
|
||||||
TextEditingController desc,
|
TextEditingController desc,
|
||||||
@ -32,7 +31,8 @@ Nutrition nutritionFromControllers(MacroControllers macros, String source) =>
|
|||||||
source: source,
|
source: source,
|
||||||
);
|
);
|
||||||
|
|
||||||
/// The five destination buttons in [LogMealScreen]'s app bar.
|
/// The destination buttons in [LogMealScreen]'s app bar, after [leading]
|
||||||
|
/// (the date picker).
|
||||||
///
|
///
|
||||||
/// Split out of `log_meal_screen.dart` for the repo's 250-line cap. Returned
|
/// 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
|
/// as a list to be spread into `AppBar.actions`, so the bar's structure and
|
||||||
@ -43,7 +43,9 @@ List<Widget> logMealAppBarActions({
|
|||||||
required VoidCallback onCalendar,
|
required VoidCallback onCalendar,
|
||||||
required VoidCallback onSettings,
|
required VoidCallback onSettings,
|
||||||
required VoidCallback onBody,
|
required VoidCallback onBody,
|
||||||
|
List<Widget> leading = const [],
|
||||||
}) => [
|
}) => [
|
||||||
|
...leading,
|
||||||
IconButton(
|
IconButton(
|
||||||
icon: const Icon(Icons.monitor_weight, semanticLabel: 'Body'),
|
icon: const Icon(Icons.monitor_weight, semanticLabel: 'Body'),
|
||||||
onPressed: onBody,
|
onPressed: onBody,
|
||||||
|
|||||||
137
app/lib/screens/log_meal_claude_mixin.dart
Normal file
137
app/lib/screens/log_meal_claude_mixin.dart
Normal file
@ -0,0 +1,137 @@
|
|||||||
|
/// 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());
|
||||||
|
}
|
||||||
89
app/lib/screens/log_meal_due_mixin.dart
Normal file
89
app/lib/screens/log_meal_due_mixin.dart
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
/// 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));
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,131 +0,0 @@
|
|||||||
/// 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:diet_guard_app/ui/cues.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
|
|
||||||
/// One fill tap's status (see [CountCue]).
|
|
||||||
typedef FillCue = CountCue;
|
|
||||||
|
|
||||||
/// The cue for a tap's [outcome]: dishes logged (ok + N), a proposal of
|
|
||||||
/// [armed] dishes (info + N), or nothing done (warn + 0: no delivery, every
|
|
||||||
/// slot taken, or the fetch failed).
|
|
||||||
FillCue fillCue(FillOutcome outcome, {required int armed}) {
|
|
||||||
final written = outcome.written.length;
|
|
||||||
final label = outcome.message;
|
|
||||||
if (written > 0) return (label: label, kind: CueKind.ok, count: written);
|
|
||||||
if (armed > 0) return (label: label, kind: CueKind.info, count: armed);
|
|
||||||
return (label: label, kind: CueKind.warn, count: 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// 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 [cue] as a status cue (its label is only spoken). Supplied by the
|
|
||||||
/// screen.
|
|
||||||
void showFillStatus(FillCue cue);
|
|
||||||
|
|
||||||
/// 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((
|
|
||||||
label: 'Fill all failed: $error',
|
|
||||||
kind: CueKind.error,
|
|
||||||
count: null,
|
|
||||||
));
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!mounted) return;
|
|
||||||
setState(() {});
|
|
||||||
if (outcome == null) return;
|
|
||||||
if (outcome.written.isNotEmpty) {
|
|
||||||
await _afterFill(outcome.written, later: day != null);
|
|
||||||
}
|
|
||||||
if (!mounted) return;
|
|
||||||
showFillStatus(fillCue(outcome, armed: fillFlow.armedCount));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Disarms a proposal without writing anything.
|
|
||||||
void onFillCancel() {
|
|
||||||
fillFlow.cancel();
|
|
||||||
showFillStatus((
|
|
||||||
label: 'Fill all cancelled — nothing logged.',
|
|
||||||
kind: CueKind.info,
|
|
||||||
count: null,
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// 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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -3,10 +3,7 @@
|
|||||||
/// Its own file because `log_meal_screen.dart` is at the repo's 250-line cap.
|
/// 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
|
/// Scoped to dates strictly after today: the date picker's `firstDate` is
|
||||||
/// tomorrow. Today's own not-yet-due slots keep using the screen's existing
|
/// tomorrow.
|
||||||
/// [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;
|
library;
|
||||||
|
|
||||||
import 'package:diet_guard_app/models/food_entry.dart';
|
import 'package:diet_guard_app/models/food_entry.dart';
|
||||||
@ -15,9 +12,9 @@ import 'package:diet_guard_app/models/meal_schedule.dart';
|
|||||||
import 'package:diet_guard_app/models/slot.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/log_storage_service.dart';
|
||||||
import 'package:diet_guard_app/services/meal_schedule_service.dart';
|
import 'package:diet_guard_app/services/meal_schedule_service.dart';
|
||||||
import 'package:diet_guard_app/ui/theme.dart';
|
import 'package:diet_guard_app/widgets/pickers/pickers.dart';
|
||||||
import 'package:diet_guard_app/widgets/slot_selector_row.dart';
|
import 'package:diet_guard_app/widgets/slot_selector_row.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Adds a future-date meal-log picker to [LogMealScreen]'s state.
|
/// Adds a future-date meal-log picker to [LogMealScreen]'s state.
|
||||||
mixin LogMealFutureMixin<T extends StatefulWidget> on State<T> {
|
mixin LogMealFutureMixin<T extends StatefulWidget> on State<T> {
|
||||||
@ -51,7 +48,7 @@ mixin LogMealFutureMixin<T extends StatefulWidget> on State<T> {
|
|||||||
Future<void> _pickFutureDate() async {
|
Future<void> _pickFutureDate() async {
|
||||||
final today = DateTime.now();
|
final today = DateTime.now();
|
||||||
final tomorrow = DateTime(today.year, today.month, today.day + 1);
|
final tomorrow = DateTime(today.year, today.month, today.day + 1);
|
||||||
final picked = await showDatePicker(
|
final picked = await pickDate(
|
||||||
context: context,
|
context: context,
|
||||||
firstDate: tomorrow,
|
firstDate: tomorrow,
|
||||||
lastDate: tomorrow.add(const Duration(days: 365)),
|
lastDate: tomorrow.add(const Duration(days: 365)),
|
||||||
@ -84,64 +81,58 @@ mixin LogMealFutureMixin<T extends StatefulWidget> on State<T> {
|
|||||||
onLogDateChanged();
|
onLogDateChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The "When" row: a "Log for later" button, or the picked date with a
|
/// The app bar's date actions: the picker (leftmost icon) and, once a date
|
||||||
/// button to change it and one to clear back to today.
|
/// is picked, a way back to today. A picked date tints the picker gold with
|
||||||
Widget buildWhenRow(BuildContext context) {
|
/// a small dot; no text is painted.
|
||||||
|
List<Widget> buildDateActions(BuildContext context) {
|
||||||
final date = _futureDate;
|
final date = _futureDate;
|
||||||
final scheme = Theme.of(context).colorScheme;
|
final gold = Theme.of(context).colorScheme.primary;
|
||||||
return Row(
|
return [
|
||||||
children: [
|
IconButton(
|
||||||
// Today is the default and shows nothing; only a picked date (data)
|
// Not Icons.calendar_month: the bar's own "Calendar" nav button uses
|
||||||
// is shown, marked by the calendar glyph.
|
// that, and two on screen make `find.byIcon` ambiguous.
|
||||||
if (date != null) ...[
|
icon: Stack(
|
||||||
Icon(
|
clipBehavior: Clip.none,
|
||||||
Icons.event,
|
children: [
|
||||||
size: 18,
|
Icon(
|
||||||
color: scheme.onSurfaceVariant,
|
Icons.edit_calendar,
|
||||||
semanticLabel: 'Log date',
|
color: date == null ? null : gold,
|
||||||
),
|
semanticLabel: date == null ? 'Log for later' : 'Change date',
|
||||||
const SizedBox(width: AppSpacing.xs),
|
),
|
||||||
],
|
if (date != null)
|
||||||
Expanded(
|
Positioned(
|
||||||
child: date == null ? const SizedBox() : Text(localDateKey(date)),
|
top: -1,
|
||||||
|
right: -1,
|
||||||
|
child: Container(
|
||||||
|
key: const ValueKey('log-date-badge'),
|
||||||
|
width: 8,
|
||||||
|
height: 8,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: gold,
|
||||||
|
shape: BoxShape.circle,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
|
onPressed: _pickFutureDate,
|
||||||
|
),
|
||||||
|
if (date != null)
|
||||||
IconButton(
|
IconButton(
|
||||||
// Not Icons.calendar_month: the app bar's own "Calendar" nav button
|
icon: const Icon(Icons.close, semanticLabel: 'Back to today'),
|
||||||
// already uses that, and a second one on screen makes
|
onPressed: resetFutureLog,
|
||||||
// `find.byIcon` ambiguous for widget tests (and taps) alike.
|
|
||||||
icon: Icon(
|
|
||||||
Icons.date_range,
|
|
||||||
size: 18,
|
|
||||||
semanticLabel: date == null ? 'Log for later' : 'Change date',
|
|
||||||
),
|
|
||||||
onPressed: _pickFutureDate,
|
|
||||||
),
|
),
|
||||||
if (date != null)
|
];
|
||||||
IconButton(
|
|
||||||
icon: const Icon(Icons.close, semanticLabel: 'Back to today'),
|
|
||||||
onPressed: resetFutureLog,
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The slot row to show: [futureDate]'s own (driven by that date's logged
|
/// The slot row for a picked future date, else nothing.
|
||||||
/// slots) when a future date is picked, otherwise today's, built from the
|
///
|
||||||
/// screen's own state and [onTodaySlotSelected].
|
/// Today has no slot row any more: the screen derives today's slot (the
|
||||||
Widget buildSlotRow({
|
/// oldest due one, else the nearest). A *future* date has no due slots to
|
||||||
required Set<int> loggedSlots,
|
/// derive from, so the row survives for exactly that case.
|
||||||
required int? selectedSlot,
|
Widget buildSlotRow() {
|
||||||
required ValueChanged<int?> onTodaySlotSelected,
|
|
||||||
}) {
|
|
||||||
final date = _futureDate;
|
final date = _futureDate;
|
||||||
if (date == null) {
|
if (date == null) return const SizedBox.shrink();
|
||||||
return SlotSelectorRow(
|
|
||||||
now: DateTime.now(),
|
|
||||||
loggedSlots: loggedSlots,
|
|
||||||
selectedSlot: selectedSlot,
|
|
||||||
onSlotSelected: onTodaySlotSelected,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return SlotSelectorRow(
|
return SlotSelectorRow(
|
||||||
now: DateTime(date.year, date.month, date.day),
|
now: DateTime(date.year, date.month, date.day),
|
||||||
schedule: _futureSchedule,
|
schedule: _futureSchedule,
|
||||||
|
|||||||
@ -1,248 +0,0 @@
|
|||||||
/// 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/ui/cues.dart';
|
|
||||||
import 'package:diet_guard_app/widgets/macro_input_row.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
|
|
||||||
CountCue _cue(String l, CueKind k, [int? n]) => (label: l, kind: k, count: n);
|
|
||||||
|
|
||||||
/// 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 the cue to show (a spoken line, a glyph kind and a dish count),
|
|
||||||
/// or null when a dish was prefilled and the form speaks for itself.
|
|
||||||
Future<CountCue?> loadDeliveryOnTap() async {
|
|
||||||
if (!KuchniaQueueService.isInitialized) {
|
|
||||||
return _cue('Catering is not ready yet.', CueKind.warn);
|
|
||||||
}
|
|
||||||
final logged = await LogStorageService.instance.todayEntries();
|
|
||||||
if (!mounted) return null;
|
|
||||||
final result = await refreshDelivery(DateTime.now());
|
|
||||||
if (!mounted) return null;
|
|
||||||
if (!result.ok) return _cue(result.reason!, CueKind.error);
|
|
||||||
if (result.dishes.isEmpty) {
|
|
||||||
return _cue('No delivery today.', CueKind.warn, 0);
|
|
||||||
}
|
|
||||||
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 _cue('All delivered dishes are already logged.', CueKind.ok, 0);
|
|
||||||
}
|
|
||||||
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);
|
|
||||||
CountCue? cue;
|
|
||||||
try {
|
|
||||||
cue = await loadDeliveryOnTap();
|
|
||||||
} finally {
|
|
||||||
if (mounted) setState(() => deliveryBusy = false);
|
|
||||||
}
|
|
||||||
if (!mounted || cue == null) return;
|
|
||||||
// The outcome sentence stays as the spoken label; the snackbar paints
|
|
||||||
// the dish glyph in the kind's tint plus the count (0 = none to log).
|
|
||||||
showCueSnack(
|
|
||||||
context,
|
|
||||||
kind: cue.kind,
|
|
||||||
semanticLabel: cue.label,
|
|
||||||
icon: Icons.restaurant,
|
|
||||||
count: cue.count,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// 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.';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
82
app/lib/screens/log_meal_logged_mixin.dart
Normal file
82
app/lib/screens/log_meal_logged_mixin.dart
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
/// 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 [];
|
||||||
|
|
||||||
|
/// The latest open-or-resume chain. Tests await it instead of guessing how
|
||||||
|
/// long real file I/O takes (a fixed sleep flaked under load).
|
||||||
|
@visibleForTesting
|
||||||
|
Future<void> openChain = Future<void>.value();
|
||||||
|
|
||||||
|
/// 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) {
|
||||||
|
startOpenChain();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
super.didChangeAppLifecycleState(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Starts [onOpenedOrResumed] and keeps its future in [openChain].
|
||||||
|
void startOpenChain() => openChain = onOpenedOrResumed();
|
||||||
|
|
||||||
|
/// 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();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -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/food_bank_screen.dart';
|
||||||
import 'package:diet_guard_app/screens/history_screen.dart';
|
import 'package:diet_guard_app/screens/history_screen.dart';
|
||||||
import 'package:diet_guard_app/screens/settings_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:http/http.dart' as http;
|
||||||
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// The five app-bar destinations reachable from [LogMealScreen].
|
/// The five app-bar destinations reachable from [LogMealScreen].
|
||||||
///
|
///
|
||||||
|
|||||||
@ -1,44 +1,54 @@
|
|||||||
/// Single-food meal logging screen -- the app's primary, done-criterion
|
/// 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."
|
/// 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;
|
library;
|
||||||
|
|
||||||
import 'dart:async';
|
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/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_actions.dart';
|
||||||
import 'package:diet_guard_app/screens/log_meal_fill_mixin.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_future_mixin.dart';
|
import 'package:diet_guard_app/screens/log_meal_future_mixin.dart';
|
||||||
import 'package:diet_guard_app/screens/log_meal_kuchnia_mixin.dart';
|
import 'package:diet_guard_app/screens/log_meal_logged_mixin.dart';
|
||||||
import 'package:diet_guard_app/screens/log_meal_nav_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_progress.dart';
|
||||||
import 'package:diet_guard_app/screens/log_meal_sync_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/foodbank_service.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_feedback.dart';
|
||||||
import 'package:diet_guard_app/services/log_storage_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/meal_photo_source.dart';
|
||||||
import 'package:diet_guard_app/ui/cues.dart';
|
import 'package:diet_guard_app/ui/cues.dart';
|
||||||
import 'package:diet_guard_app/ui/theme.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/autocomplete_suggestion_list.dart';
|
||||||
import 'package:diet_guard_app/widgets/fill_all_row.dart';
|
import 'package:diet_guard_app/widgets/logged_meal_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/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/sync_health_banner.dart';
|
||||||
import 'package:diet_guard_app/widgets/today_progress_card.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:http/http.dart' as http;
|
||||||
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Lets the user log one food item, with food-bank autocomplete and
|
/// Lets the user log one food item, with food-bank autocomplete.
|
||||||
/// today's slot status.
|
|
||||||
class LogMealScreen extends StatefulWidget {
|
class LogMealScreen extends StatefulWidget {
|
||||||
/// Creates a [LogMealScreen].
|
/// Creates a [LogMealScreen].
|
||||||
const LogMealScreen({super.key, this.httpClient});
|
const LogMealScreen({super.key, this.httpClient, this.relay, this.photos});
|
||||||
|
|
||||||
/// Injectable HTTP client for auto-sync; tests pass a [MockClient].
|
/// Injectable HTTP client for auto-sync; tests pass a [MockClient].
|
||||||
/// Production leaves this null so [GitHubClient] builds a real one.
|
|
||||||
final http.Client? httpClient;
|
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
|
@override
|
||||||
State<LogMealScreen> createState() => _LogMealScreenState();
|
State<LogMealScreen> createState() => _LogMealScreenState();
|
||||||
}
|
}
|
||||||
@ -47,66 +57,59 @@ class _LogMealScreenState extends State<LogMealScreen>
|
|||||||
with
|
with
|
||||||
WidgetsBindingObserver,
|
WidgetsBindingObserver,
|
||||||
LogMealSyncMixin<LogMealScreen>,
|
LogMealSyncMixin<LogMealScreen>,
|
||||||
|
LogMealDueMixin<LogMealScreen>,
|
||||||
|
LogMealLoggedMixin<LogMealScreen>,
|
||||||
LogMealNavMixin<LogMealScreen>,
|
LogMealNavMixin<LogMealScreen>,
|
||||||
LogMealKuchniaMixin<LogMealScreen>,
|
|
||||||
LogMealFutureMixin<LogMealScreen>,
|
LogMealFutureMixin<LogMealScreen>,
|
||||||
LogMealFillMixin<LogMealScreen> {
|
LogMealClaudeMixin<LogMealScreen> {
|
||||||
@override
|
@override
|
||||||
http.Client? get syncHttpClient => widget.httpClient;
|
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 TextEditingController _descController = TextEditingController();
|
||||||
final MacroControllers _macros = MacroControllers();
|
final MacroControllers _macros = MacroControllers();
|
||||||
List<FoodSuggestion> _suggestions = const [];
|
|
||||||
@override
|
@override
|
||||||
int? selectedSlot;
|
TextEditingController get claudeDesc => _descController;
|
||||||
|
@override
|
||||||
|
MacroControllers get claudeMacros => _macros;
|
||||||
|
List<FoodSuggestion> _suggestions = const [];
|
||||||
String _source = 'manual';
|
String _source = 'manual';
|
||||||
CueState? _cue; // painted as a tinted icon, never as text
|
CueState? _cue; // painted as a tinted icon, never as text
|
||||||
TodayProgress? _progress;
|
TodayProgress? _progress;
|
||||||
|
|
||||||
void _setCue(CueKind kind, String? label, [int? count]) {
|
|
||||||
_cue = label == null ? null : CueState.next(_cue, kind, label, count);
|
|
||||||
_progress = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
WidgetsBinding.instance.addObserver(this);
|
WidgetsBinding.instance.addObserver(this);
|
||||||
_descController.addListener(_onDescChanged);
|
_descController.addListener(_onDescChanged);
|
||||||
_macros.addListenerToAll(_onMacroEdited);
|
_macros.addListenerToAll(_onMacroEdited);
|
||||||
selectedSlot = slotForLog(DateTime.now(), MealScheduleService.current);
|
|
||||||
unawaited(refreshSlots());
|
|
||||||
unawaited(_onDescChanged());
|
unawaited(_onDescChanged());
|
||||||
// Read health before the first sync finishes, so a device that stalled in
|
// Health first, so a device that stalled earlier says so before a tick.
|
||||||
// a previous session says so immediately rather than only after a tick.
|
|
||||||
unawaited(refreshSyncHealth());
|
unawaited(refreshSyncHealth());
|
||||||
unawaited(autoSync());
|
startOpenChain();
|
||||||
// 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
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
WidgetsBinding.instance.removeObserver(this);
|
WidgetsBinding.instance.removeObserver(this);
|
||||||
|
disposeClaude();
|
||||||
|
restoreStatusBar();
|
||||||
_descController.dispose();
|
_descController.dispose();
|
||||||
_macros.dispose();
|
_macros.dispose();
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
void _onMacroEdited() {
|
void _onMacroEdited() {
|
||||||
if (_source == 'food bank') {
|
if (_source == 'food bank') setState(() => _source = 'manual');
|
||||||
setState(() => _source = 'manual');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Re-runs the food-bank search and dismisses the previous progress card.
|
/// Re-runs the food-bank search and dismisses the previous progress card,
|
||||||
///
|
/// only while the field is non-empty: [_onLogMeal]'s own `clear()` fires
|
||||||
/// The card is cleared only when the field is non-empty because
|
/// this listener too, and would otherwise race it and null the new card.
|
||||||
/// [_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 {
|
Future<void> _onDescChanged() async {
|
||||||
final matches = await FoodBankService.instance.search(_descController.text);
|
final matches = await FoodBankService.instance.search(_descController.text);
|
||||||
if (!mounted) return;
|
if (!mounted) return;
|
||||||
@ -116,16 +119,6 @@ class _LogMealScreenState extends State<LogMealScreen>
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
|
||||||
TextEditingController get descController => _descController;
|
|
||||||
@override
|
|
||||||
MacroControllers get macroControllers => _macros;
|
|
||||||
@override
|
|
||||||
void onDishPrefilled() => setState(() => _source = 'catering');
|
|
||||||
@override
|
|
||||||
void showFillStatus(FillCue cue) =>
|
|
||||||
setState(() => _setCue(cue.kind, cue.label, cue.count));
|
|
||||||
|
|
||||||
void _onSuggestionSelected(FoodSuggestion suggestion) {
|
void _onSuggestionSelected(FoodSuggestion suggestion) {
|
||||||
fillControllersFromSuggestion(suggestion, _descController, _macros);
|
fillControllersFromSuggestion(suggestion, _descController, _macros);
|
||||||
setState(() {
|
setState(() {
|
||||||
@ -136,17 +129,14 @@ class _LogMealScreenState extends State<LogMealScreen>
|
|||||||
|
|
||||||
Future<void> _onLogMeal() async {
|
Future<void> _onLogMeal() async {
|
||||||
final desc = _descController.text.trim();
|
final desc = _descController.text.trim();
|
||||||
if (desc.isEmpty) {
|
if (desc.isEmpty) return;
|
||||||
setState(() => _setCue(CueKind.error, 'Type what you ate first.'));
|
final target = resolveLogTarget(targetSlot);
|
||||||
return;
|
|
||||||
}
|
|
||||||
final target = resolveLogTarget(selectedSlot);
|
|
||||||
if (target.error != null) {
|
if (target.error != null) {
|
||||||
setState(() => _setCue(CueKind.error, target.error));
|
setState(() => _cue = CueState.next(_cue, CueKind.error, target.error!));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// On the tap, before the write/sync: waiting for them is just latency.
|
LogFeedback.mealLogged(); // on the tap, before the write
|
||||||
LogFeedback.mealLogged();
|
unawaited(withdrawClaude()); // else Claude would log it a second time
|
||||||
final entry = await LogStorageService.instance.logMeal(
|
final entry = await LogStorageService.instance.logMeal(
|
||||||
desc,
|
desc,
|
||||||
nutritionFromControllers(_macros, _source),
|
nutritionFromControllers(_macros, _source),
|
||||||
@ -160,89 +150,99 @@ class _LogMealScreenState extends State<LogMealScreen>
|
|||||||
_macros.clear();
|
_macros.clear();
|
||||||
setState(() {
|
setState(() {
|
||||||
_source = 'manual';
|
_source = 'manual';
|
||||||
selectedSlot = slotForLog(DateTime.now(), MealScheduleService.current);
|
photo = null; // else a stale photo keeps the sparkle lit
|
||||||
|
claudeState = ClaudeButtonState.idle;
|
||||||
});
|
});
|
||||||
await refreshSlots();
|
await refreshSlots();
|
||||||
if (!mounted) return;
|
if (!mounted) return;
|
||||||
// The second `prefillNextDish` caller. Without it every dish after the
|
showLogged([LoggedMeal(entry, LoggedOrigin.local)]);
|
||||||
// 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(() {
|
setState(() {
|
||||||
_setCue(CueKind.info, queueStatusLine);
|
_cue = null;
|
||||||
_progress = buildTodayProgress(log, logged: entry);
|
_progress = buildTodayProgress(log, logged: entry);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
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(
|
return Scaffold(
|
||||||
appBar: AppBar(
|
appBar: due
|
||||||
// No title: the app's identity is the launcher icon, and the five
|
? null
|
||||||
// destination glyphs fill the bar.
|
: AppBar(
|
||||||
actions: [
|
actions: logMealAppBarActions(
|
||||||
...logMealAppBarActions(
|
onFoodBank: onOpenFoodBank,
|
||||||
onFoodBank: onOpenFoodBank,
|
onHistory: onOpenHistory,
|
||||||
onHistory: onOpenHistory,
|
onCalendar: onOpenCalendar,
|
||||||
onCalendar: onOpenCalendar,
|
onSettings: onOpenSettings,
|
||||||
onSettings: onOpenSettings,
|
onBody: onOpenBody,
|
||||||
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!),
|
||||||
|
],
|
||||||
|
],
|
||||||
),
|
),
|
||||||
],
|
|
||||||
),
|
|
||||||
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),
|
|
||||||
IconField(
|
|
||||||
controller: _descController,
|
|
||||||
icon: Icons.fastfood,
|
|
||||||
semanticLabel: '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: _cue carries a validation complaint or
|
|
||||||
// queue note, _progress the post-log summary; the two may stack
|
|
||||||
// only after a log that leaves dishes queued.
|
|
||||||
if (_cue != null) ...[
|
|
||||||
const SizedBox(height: AppSpacing.sm),
|
|
||||||
_cue!.widget,
|
|
||||||
],
|
|
||||||
if (_progress != null) ...[
|
|
||||||
const SizedBox(height: AppSpacing.sm),
|
|
||||||
TodayProgressCard(progress: _progress!),
|
|
||||||
],
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
import 'dart:developer';
|
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/background_tasks.dart';
|
||||||
import 'package:diet_guard_app/services/due_slot_check.dart';
|
import 'package:diet_guard_app/services/due_slot_check.dart';
|
||||||
import 'package:diet_guard_app/services/firebase_client.dart';
|
import 'package:diet_guard_app/services/firebase_client.dart';
|
||||||
@ -9,12 +8,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/github_client_factory.dart';
|
||||||
import 'package:diet_guard_app/services/health_steps.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/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_health.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_service.dart';
|
||||||
import 'package:diet_guard_app/services/sync_settings.dart';
|
import 'package:diet_guard_app/services/sync_settings.dart';
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:http/http.dart' as http;
|
import 'package:http/http.dart' as http;
|
||||||
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Background-sync and lifecycle behaviour for [LogMealScreen]'s state.
|
/// Background-sync and lifecycle behaviour for [LogMealScreen]'s state.
|
||||||
///
|
///
|
||||||
@ -35,12 +34,6 @@ mixin LogMealSyncMixin<T extends StatefulWidget> on State<T>
|
|||||||
/// The slots that already carry a logged meal today.
|
/// The slots that already carry a logged meal today.
|
||||||
Set<int> loggedSlots = {};
|
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.
|
/// The screen's injected HTTP client, or null to use the default.
|
||||||
///
|
///
|
||||||
/// Declared abstract so the mixin stays independent of the widget's own
|
/// Declared abstract so the mixin stays independent of the widget's own
|
||||||
@ -76,6 +69,7 @@ mixin LogMealSyncMixin<T extends StatefulWidget> on State<T>
|
|||||||
Future<void> autoSync() async {
|
Future<void> autoSync() async {
|
||||||
if (autoSyncing) return;
|
if (autoSyncing) return;
|
||||||
autoSyncing = true;
|
autoSyncing = true;
|
||||||
|
bool? landed; // null until the sync itself ran
|
||||||
try {
|
try {
|
||||||
final settings = await SyncSettings.load();
|
final settings = await SyncSettings.load();
|
||||||
// Either backend counts. `isConfigured` means "has a GitHub token", so
|
// Either backend counts. `isConfigured` means "has a GitHub token", so
|
||||||
@ -95,17 +89,19 @@ mixin LogMealSyncMixin<T extends StatefulWidget> on State<T>
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final client = createGitHubClient(settings, httpClient: syncHttpClient);
|
final client = createGitHubClient(settings, httpClient: syncHttpClient);
|
||||||
try {
|
landed = await attemptSync(() async {
|
||||||
// Foreground only (this mixin is UI), and never prompts: fresh
|
try {
|
||||||
// Health Connect steps ride along in this tick's body.json.
|
// Foreground only (this mixin is UI), and never prompts: fresh
|
||||||
await refreshSteps();
|
// Health Connect steps ride along in this tick's body.json.
|
||||||
await runSync(await syncBackend(client));
|
await refreshSteps();
|
||||||
await SyncHealth.recordSuccess();
|
await runSync(await syncBackend(client));
|
||||||
} finally {
|
} finally {
|
||||||
client.close();
|
client.close();
|
||||||
}
|
}
|
||||||
|
});
|
||||||
if (!mounted) return;
|
if (!mounted) return;
|
||||||
await refreshSlots();
|
// Outside attemptSync: a refresh error is no sync failure.
|
||||||
|
if (landed) await refreshSlots();
|
||||||
await refreshSyncHealth();
|
await refreshSyncHealth();
|
||||||
} on Object catch (error, stackTrace) {
|
} on Object catch (error, stackTrace) {
|
||||||
// Best-effort, but never silent: this swallowed the reason a desktop
|
// Best-effort, but never silent: this swallowed the reason a desktop
|
||||||
@ -118,7 +114,9 @@ mixin LogMealSyncMixin<T extends StatefulWidget> on State<T>
|
|||||||
error: error,
|
error: error,
|
||||||
stackTrace: stackTrace,
|
stackTrace: stackTrace,
|
||||||
);
|
);
|
||||||
await SyncHealth.recordFailure();
|
// attemptSync already recorded the sync's own outcome; only a failure
|
||||||
|
// before it (loading settings) is one here.
|
||||||
|
if (landed == null) await SyncHealth.recordFailure();
|
||||||
if (mounted) await refreshSyncHealth();
|
if (mounted) await refreshSyncHealth();
|
||||||
} finally {
|
} finally {
|
||||||
autoSyncing = false;
|
autoSyncing = false;
|
||||||
@ -174,21 +172,12 @@ mixin LogMealSyncMixin<T extends StatefulWidget> on State<T>
|
|||||||
setState(() => loggedSlots = logged);
|
setState(() => loggedSlots = logged);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Rebuilds the slot row after the settings screen pops.
|
/// Re-derives the due slots after the settings screen pops.
|
||||||
///
|
///
|
||||||
/// The meal-schedule editor lives in settings, and [SlotSelectorRow] reads
|
/// The meal-schedule editor lives in settings, and which slots are due (and
|
||||||
/// `MealScheduleService.current` at build time, so refreshing is enough to
|
/// so whether the screen is in due mode) reads `MealScheduleService.current`
|
||||||
/// re-derive the row -- but the selected slot also has to be recomputed,
|
/// at refresh time. Found on the phone: without this the settings preview
|
||||||
/// since the minute it referred to may no longer be a checkpoint at all.
|
/// and the overdue reminder both updated while the screen behind them kept
|
||||||
///
|
/// the old checkpoints until the app was restarted.
|
||||||
/// Found on the phone: without this the settings preview and the overdue
|
Future<void> onScheduleMayHaveChanged() => refreshSlots();
|
||||||
/// 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);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -15,12 +15,13 @@
|
|||||||
/// encrypted either.
|
/// encrypted either.
|
||||||
library;
|
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_client.dart';
|
||||||
import 'package:diet_guard_app/services/kuchnia_credential_service.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/services/kuchnia_import.dart';
|
||||||
import 'package:diet_guard_app/ui/cues.dart';
|
import 'package:diet_guard_app/ui/cues.dart';
|
||||||
import 'package:diet_guard_app/ui/theme.dart';
|
import 'package:diet_guard_app/ui/theme.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// What a delivery fetch reports: a cue [kind], a spoken [label] (never
|
/// What a delivery fetch reports: a cue [kind], a spoken [label] (never
|
||||||
/// painted) and, when dishes were banked, their [count] (painted as a number).
|
/// painted) and, when dishes were banked, their [count] (painted as a number).
|
||||||
@ -40,9 +41,9 @@ class FetchOutcome {
|
|||||||
|
|
||||||
/// Fetches today's delivery and reports what was banked.
|
/// Fetches today's delivery and reports what was banked.
|
||||||
///
|
///
|
||||||
/// Deliberately "banked", not "logged": a delivered meal is not an eaten
|
/// Deliberately "banked", not "logged": the explicit fetch only fills the
|
||||||
/// meal, so the dishes land in the food bank and the user still taps to log
|
/// food bank; logging is the log screen's auto-log (`kuchnia_autolog.dart`).
|
||||||
/// each one. Top-level so the settings screen can pass it without growing.
|
/// Top-level so the settings screen can pass it without growing.
|
||||||
Future<FetchOutcome> fetchTodaysDelivery() async {
|
Future<FetchOutcome> fetchTodaysDelivery() async {
|
||||||
final result = await refreshDelivery(DateTime.now());
|
final result = await refreshDelivery(DateTime.now());
|
||||||
if (!result.ok) return FetchOutcome(CueKind.error, result.reason!);
|
if (!result.ok) return FetchOutcome(CueKind.error, result.reason!);
|
||||||
@ -188,9 +189,12 @@ class _KuchniaSettingsSectionState extends State<KuchniaSettingsSection> {
|
|||||||
IconButton.outlined(
|
IconButton.outlined(
|
||||||
onPressed: canFetch && !_busy ? _fetch : null,
|
onPressed: canFetch && !_busy ? _fetch : null,
|
||||||
icon: _busy
|
icon: _busy
|
||||||
? const SizedBox.square(
|
? const WaitWatch(
|
||||||
dimension: 20,
|
operation: 'kuchnia.sync',
|
||||||
child: CircularProgressIndicator(strokeWidth: 2),
|
child: SizedBox.square(
|
||||||
|
dimension: 20,
|
||||||
|
child: CircularProgressIndicator(strokeWidth: 2),
|
||||||
|
),
|
||||||
)
|
)
|
||||||
: const Icon(
|
: const Icon(
|
||||||
Icons.local_shipping_outlined,
|
Icons.local_shipping_outlined,
|
||||||
|
|||||||
@ -6,6 +6,8 @@ library;
|
|||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
|
|
||||||
import 'package:crdt_sync/crdt_sync.dart';
|
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/models/meal_schedule.dart';
|
||||||
import 'package:diet_guard_app/screens/github_mirror_screen.dart';
|
import 'package:diet_guard_app/screens/github_mirror_screen.dart';
|
||||||
import 'package:diet_guard_app/screens/settings_kuchnia.dart';
|
import 'package:diet_guard_app/screens/settings_kuchnia.dart';
|
||||||
@ -15,6 +17,7 @@ import 'package:diet_guard_app/services/firebase_backend.dart';
|
|||||||
import 'package:diet_guard_app/services/firebase_client.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/google_sign_in_backend.dart';
|
||||||
import 'package:diet_guard_app/services/meal_schedule_service.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/cues.dart';
|
||||||
import 'package:diet_guard_app/ui/macro_kind.dart';
|
import 'package:diet_guard_app/ui/macro_kind.dart';
|
||||||
import 'package:diet_guard_app/ui/theme.dart';
|
import 'package:diet_guard_app/ui/theme.dart';
|
||||||
@ -22,9 +25,10 @@ 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/log_sound_tile.dart';
|
||||||
import 'package:diet_guard_app/widgets/meal_schedule_editor.dart';
|
import 'package:diet_guard_app/widgets/meal_schedule_editor.dart';
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:http/http.dart' as http;
|
import 'package:http/http.dart' as http;
|
||||||
|
import 'package:kuhy_credit/kuhy_credit.dart';
|
||||||
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:permission_handler/permission_handler.dart';
|
import 'package:permission_handler/permission_handler.dart';
|
||||||
import 'package:sync_settings_ui/sync_settings_ui.dart';
|
import 'package:sync_settings_ui/sync_settings_ui.dart';
|
||||||
|
|
||||||
@ -47,8 +51,7 @@ class SettingsScreen extends StatefulWidget {
|
|||||||
this.firebaseFactory,
|
this.firebaseFactory,
|
||||||
});
|
});
|
||||||
|
|
||||||
/// Injectable HTTP client for the linked [GitHubMirrorScreen]; tests pass
|
/// HTTP client for the linked [GitHubMirrorScreen]; tests pass [MockClient].
|
||||||
/// a [MockClient].
|
|
||||||
final http.Client? httpClient;
|
final http.Client? httpClient;
|
||||||
|
|
||||||
/// Injectable battery-optimization-exemption request; tests pass a fake.
|
/// Injectable battery-optimization-exemption request; tests pass a fake.
|
||||||
@ -68,14 +71,10 @@ class SettingsScreen extends StatefulWidget {
|
|||||||
/// Reads the stored Firebase account. Injected for the same reason as
|
/// Reads the stored Firebase account. Injected for the same reason as
|
||||||
/// [googleFirebaseFactory]: the keystore is a platform channel.
|
/// [googleFirebaseFactory]: the keystore is a platform channel.
|
||||||
///
|
///
|
||||||
/// Deliberately backed by [storedAccount], not [loadAccount]: the shared
|
/// Backed by [storedAccount], not [loadAccount]: the shared screen reads
|
||||||
/// `SyncSettingsScreen` uses this single closure both to display the
|
/// the account back right after a Google sign-in, and [loadAccount]'s
|
||||||
/// status and to read back the account right after a Google sign-in.
|
/// desktop fallback throws on Android (seen on the phone as "Google sign-in
|
||||||
/// [loadAccount]'s desktop-wrapper fallback resolves to `file:///` on
|
/// failed"). See the keystore-only read in [firebase_backend.dart].
|
||||||
/// Android and throws -- verified on the phone, where it turned a
|
|
||||||
/// successful sign-in into "Google sign-in failed". `storedAccount` is the
|
|
||||||
/// keystore-only read [firebase_backend.dart] documents for exactly this
|
|
||||||
/// read-back case.
|
|
||||||
final Future<FirebaseAccount?> Function()? accountLoader;
|
final Future<FirebaseAccount?> Function()? accountLoader;
|
||||||
|
|
||||||
/// Persists the account. See [accountLoader].
|
/// Persists the account. See [accountLoader].
|
||||||
@ -191,6 +190,15 @@ class _SettingsScreenState extends State<SettingsScreen>
|
|||||||
trailing: const Icon(Icons.chevron_right),
|
trailing: const Icon(Icons.chevron_right),
|
||||||
onTap: () => unawaited(_openSyncSettings()),
|
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.
|
// Legacy mirror: muted tint marks it as the secondary path.
|
||||||
ListTile(
|
ListTile(
|
||||||
contentPadding: EdgeInsets.zero,
|
contentPadding: EdgeInsets.zero,
|
||||||
@ -229,6 +237,10 @@ class _SettingsScreenState extends State<SettingsScreen>
|
|||||||
const SizedBox(height: 16),
|
const SizedBox(height: 16),
|
||||||
Align(alignment: Alignment.centerLeft, child: _status),
|
Align(alignment: Alignment.centerLeft, child: _status),
|
||||||
],
|
],
|
||||||
|
const SizedBox(height: 24),
|
||||||
|
const Divider(),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
const Align(alignment: Alignment.centerLeft, child: KuhyCredit()),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@ -15,6 +15,7 @@ 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/kuchnia_credential_service.dart';
|
||||||
import 'package:diet_guard_app/services/log_storage_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/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_device_id.dart';
|
||||||
import 'package:diet_guard_app/services/sync_health.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_service.dart';
|
||||||
@ -90,21 +91,14 @@ Future<bool> backgroundSyncPush({http.Client? httpClient}) async {
|
|||||||
return true; // nothing to push; don't retry
|
return true; // nothing to push; don't retry
|
||||||
}
|
}
|
||||||
final client = createGitHubClient(settings, httpClient: httpClient);
|
final client = createGitHubClient(settings, httpClient: httpClient);
|
||||||
try {
|
// Never silent: attemptSync records the outcome, the only signal that a
|
||||||
await runSync(await syncBackend(client));
|
// background push failed. False -> WorkManager retries with backoff.
|
||||||
await SyncHealth.recordSuccess();
|
final landed = await attemptSync(() async {
|
||||||
return true;
|
try {
|
||||||
} on Exception catch (error, stackTrace) {
|
await runSync(await syncBackend(client));
|
||||||
// Never silent: this is the only signal that a background push failed.
|
} finally {
|
||||||
log(
|
client.close();
|
||||||
'diet_guard background sync failed',
|
}
|
||||||
level: 1000,
|
});
|
||||||
error: error,
|
return landed;
|
||||||
stackTrace: stackTrace,
|
|
||||||
);
|
|
||||||
await SyncHealth.recordFailure();
|
|
||||||
return false; // offline / transient error -> retry with backoff
|
|
||||||
} finally {
|
|
||||||
client.close();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
156
app/lib/services/claude_relay_client.dart
Normal file
156
app/lib/services/claude_relay_client.dart
Normal file
@ -0,0 +1,156 @@
|
|||||||
|
/// 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();
|
||||||
49
app/lib/services/claude_relay_fake.dart
Normal file
49
app/lib/services/claude_relay_fake.dart
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
/// 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
201
app/lib/services/claude_relay_firebase.dart
Normal file
201
app/lib/services/claude_relay_firebase.dart
Normal file
@ -0,0 +1,201 @@
|
|||||||
|
/// 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
150
app/lib/services/claude_relay_rtdb.dart
Normal file
150
app/lib/services/claude_relay_rtdb.dart
Normal file
@ -0,0 +1,150 @@
|
|||||||
|
/// 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
144
app/lib/services/claude_relay_wire.dart
Normal file
144
app/lib/services/claude_relay_wire.dart
Normal file
@ -0,0 +1,144 @@
|
|||||||
|
/// 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');
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -6,10 +6,10 @@
|
|||||||
/// is never deleted or overwritten, each id is its own record, and two
|
/// 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.
|
/// devices that mint a key at the same moment both keep both.
|
||||||
///
|
///
|
||||||
/// NOTE: the synced copy sits in Firebase RTDB in plaintext, so Firebase can
|
/// The synced copy is end-to-end encrypted under the shared crdt-sync
|
||||||
/// read these keys (and therefore the sealed login in any export it could get
|
/// passphrase (`sync_e2e.dart`), on `diet-guard-sync/devices-e2e`. The old
|
||||||
/// hold of) until crdt E2E lands. `export_keys` must move under that
|
/// plaintext `diet-guard-sync/devices/<id>/export_keys.json` nodes are
|
||||||
/// encryption too: `~/src/utils/TODO-crdt-e2e-encryption.md`.
|
/// copied over once and then neither read nor written by this app.
|
||||||
library;
|
library;
|
||||||
|
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
|
|||||||
@ -8,6 +8,7 @@ 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/firebase_client.dart';
|
||||||
import 'package:diet_guard_app/services/github_client_factory.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_device_id.dart';
|
||||||
|
import 'package:diet_guard_app/services/sync_e2e.dart';
|
||||||
import 'package:diet_guard_app/services/sync_settings.dart';
|
import 'package:diet_guard_app/services/sync_settings.dart';
|
||||||
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
|
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
|
||||||
|
|
||||||
@ -31,7 +32,7 @@ Future<void> pullExportKeys() async {
|
|||||||
final client = createGitHubClient(await SyncSettings.load());
|
final client = createGitHubClient(await SyncSettings.load());
|
||||||
try {
|
try {
|
||||||
await syncExportKeys(
|
await syncExportKeys(
|
||||||
await syncBackend(client),
|
await openDietGuardStore(await syncBackend(client)),
|
||||||
keyring: defaultKeyring(),
|
keyring: defaultKeyring(),
|
||||||
devicesDir: syncDevicesDir,
|
devicesDir: syncDevicesDir,
|
||||||
);
|
);
|
||||||
|
|||||||
@ -1,8 +1,9 @@
|
|||||||
/// The `export_keys` document: the keyring as a crdt_sync log.
|
/// 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
|
/// One record per key id, never deleted, so the merge is a plain union and
|
||||||
/// concurrent mints on two devices both survive. See `export_keyring.dart`
|
/// concurrent mints on two devices both survive. [syncExportKeys] must be
|
||||||
/// for the plaintext-at-Firebase caveat.
|
/// handed the end-to-end encrypted store (`sync_e2e.dart`): these are the
|
||||||
|
/// keys that open every export.
|
||||||
library;
|
library;
|
||||||
|
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
@ -70,6 +71,7 @@ Future<void> syncExportKeys(
|
|||||||
deviceId: id,
|
deviceId: id,
|
||||||
legacyDeviceId: deviceId == null ? legacySyncDeviceId : null,
|
legacyDeviceId: deviceId == null ? legacySyncDeviceId : null,
|
||||||
pathPrefix: devicesDir,
|
pathPrefix: devicesDir,
|
||||||
|
revsPath: syncRevsDir,
|
||||||
localLog: _toLog(await keyring.all(), id),
|
localLog: _toLog(await keyring.all(), id),
|
||||||
encode: (log) => jsonEncode({
|
encode: (log) => jsonEncode({
|
||||||
for (final entry in log.entries) entry.key: entry.value.toJson(),
|
for (final entry in log.entries) entry.key: entry.value.toJson(),
|
||||||
|
|||||||
107
app/lib/services/kuchnia_autolog.dart
Normal file
107
app/lib/services/kuchnia_autolog.dart
Normal file
@ -0,0 +1,107 @@
|
|||||||
|
/// 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 [];
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -3,10 +3,12 @@
|
|||||||
/// The Dart mirror of `diet_guard/_kuchnia_log.py`'s `fill_plan` and
|
/// The Dart mirror of `diet_guard/_kuchnia_log.py`'s `fill_plan` and
|
||||||
/// `log_dishes`. KEEP IN SYNC, gated by the shared parity fixture.
|
/// `log_dishes`. KEEP IN SYNC, gated by the shared parity fixture.
|
||||||
///
|
///
|
||||||
/// **Nothing here runs without an explicit confirm tap.** A delivered meal is
|
/// **Delivered counts as eaten (override, 2026-11-17).** The old rule was "a
|
||||||
/// not an eaten meal: logging unattended would let the delivery note satisfy
|
/// delivered meal is not an eaten meal, so nothing logs without a confirm
|
||||||
/// the very checkpoints the gate exists to enforce. [logDishes] is only ever
|
/// tap". kuhy overrode it ("LOG EVEN WITHOUT TAP"): [logDishes] is now also
|
||||||
/// reached from the second tap of `FillAllFlow`.
|
/// 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.
|
||||||
library;
|
library;
|
||||||
|
|
||||||
import 'package:diet_guard_app/models/food_entry.dart';
|
import 'package:diet_guard_app/models/food_entry.dart';
|
||||||
@ -15,6 +17,7 @@ import 'package:diet_guard_app/models/local_time.dart';
|
|||||||
import 'package:diet_guard_app/models/nutrition.dart';
|
import 'package:diet_guard_app/models/nutrition.dart';
|
||||||
import 'package:diet_guard_app/models/slot.dart';
|
import 'package:diet_guard_app/models/slot.dart';
|
||||||
import 'package:diet_guard_app/services/kuchnia_spread.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/log_storage_service.dart';
|
||||||
import 'package:diet_guard_app/services/meal_schedule_service.dart';
|
import 'package:diet_guard_app/services/meal_schedule_service.dart';
|
||||||
|
|
||||||
@ -98,25 +101,34 @@ Future<Set<int>> loggedSlotsOn(LogStorageService store, DateTime day) async {
|
|||||||
/// (a "Log for later" date, strictly after today) each dish is stamped at its
|
/// (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.
|
/// 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.
|
/// Returns the dishes actually written, in order.
|
||||||
Future<List<SlottedDish>> logDishes(
|
Future<List<SlottedDish>> logDishes(
|
||||||
List<SlottedDish> chosen, {
|
List<SlottedDish> chosen, {
|
||||||
LogStorageService? storage,
|
LogStorageService? storage,
|
||||||
DateTime? day,
|
DateTime? day,
|
||||||
|
String Function(SlottedDish item)? idFor,
|
||||||
}) async {
|
}) async {
|
||||||
final store = storage ?? LogStorageService.instance;
|
final store = storage ?? LogStorageService.instance;
|
||||||
final seen = {
|
final seen = {
|
||||||
for (final entry in await dayEntries(store, day))
|
for (final entry in await dayEntries(store, day))
|
||||||
_dedupKey(entry.desc, entry.slotMinute),
|
_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>[];
|
final written = <SlottedDish>[];
|
||||||
for (final item in chosen) {
|
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);
|
final key = _dedupKey(item.dish.name, item.slot);
|
||||||
if (!seen.add(key)) continue;
|
if (!seen.add(key)) continue;
|
||||||
await store.logMeal(
|
await store.logMeal(
|
||||||
item.dish.name,
|
item.dish.name,
|
||||||
dishNutrition(item.dish),
|
dishNutrition(item.dish),
|
||||||
slotMinute: item.slot,
|
slotMinute: item.slot,
|
||||||
|
id: id,
|
||||||
when: day == null
|
when: day == null
|
||||||
? null
|
? null
|
||||||
: DateTime(
|
: DateTime(
|
||||||
|
|||||||
@ -4,12 +4,10 @@
|
|||||||
/// fail-closed boundary: every [KuchniaError] is turned into a reason string
|
/// fail-closed boundary: every [KuchniaError] is turned into a reason string
|
||||||
/// here, so no caller can be broken by a catering outage.
|
/// here, so no caller can be broken by a catering outage.
|
||||||
///
|
///
|
||||||
/// **Nothing is ever logged from here.** A delivered meal is not an eaten
|
/// **Nothing is logged from here: this only banks.** Dishes land in the
|
||||||
/// meal: dishes land in the *curated* bank and the user still taps to log
|
/// *curated* bank. Logging them is `kuchnia_autolog.dart`'s job, which kuhy
|
||||||
/// each one. If the import logged automatically, the gate would satisfy its
|
/// allowed without a tap on 2026-11-17 ("LOG EVEN WITHOUT TAP"; it was
|
||||||
/// own checkpoint from a delivery note, and the log would record what the
|
/// "delivered is not eaten" before), under deterministic ids with an undo.
|
||||||
/// 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
|
/// 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
|
/// the log on every meal, so anything written there would vanish at the next
|
||||||
|
|||||||
@ -74,6 +74,15 @@ bool energyIsConsistent(double kcal, double protein, double carbs, double fat) {
|
|||||||
return (derived - kcal).abs() <= kuchniaEnergyTolerance * kcal;
|
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.
|
/// Builds one dish, or null when the entry is unusable.
|
||||||
///
|
///
|
||||||
/// [fallbackPriority] is the 1-based payload position, used when
|
/// [fallbackPriority] is the 1-based payload position, used when
|
||||||
@ -113,6 +122,7 @@ KuchniaDish? parseMeal(Object? meal, int fallbackPriority) {
|
|||||||
grams: grams,
|
grams: grams,
|
||||||
priority: priority,
|
priority: priority,
|
||||||
slotLabel: rawLabel is String ? rawLabel.trim() : '',
|
slotLabel: rawLabel is String ? rawLabel.trim() : '',
|
||||||
|
dishId: _mealId(meal['deliveryMealId']),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
/// The day's delivered dishes, offered to the log form one at a time.
|
/// The day's delivered dishes, offered to the log form one at a time.
|
||||||
///
|
///
|
||||||
/// **A delivered meal is not an eaten meal.** This queue only ever *prefills*
|
/// **Since 2026-11-17 the log screen no longer prefills from this queue**: a
|
||||||
/// the form; the user still taps to log each dish. Nothing here writes a log
|
/// delivered dish logs itself when its slot is due (`kuchnia_autolog.dart`;
|
||||||
/// entry, and nothing here may start doing so -- the gate would then satisfy
|
/// kuhy overrode "delivered is not eaten", "LOG EVEN WITHOUT TAP"). What
|
||||||
/// its own checkpoint from a delivery note, and the log would record what the
|
/// remains here is the offer/mark bookkeeping and the fetched-today marker.
|
||||||
/// courier dropped off rather than what was eaten.
|
/// The queue itself still writes no log entry.
|
||||||
///
|
///
|
||||||
/// Two things are load-bearing:
|
/// Two things are load-bearing:
|
||||||
///
|
///
|
||||||
|
|||||||
55
app/lib/services/log_entry_lookup.dart
Normal file
55
app/lib/services/log_entry_lookup.dart
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
/// 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -10,6 +10,7 @@ import 'package:diet_guard_app/models/nutrition.dart';
|
|||||||
import 'package:diet_guard_app/models/slot.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.dart';
|
||||||
import 'package:diet_guard_app/services/document_store_factory.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:diet_guard_app/services/meal_schedule_service.dart';
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:uuid/uuid.dart';
|
import 'package:uuid/uuid.dart';
|
||||||
@ -39,10 +40,8 @@ class LogStorageService {
|
|||||||
|
|
||||||
final DocumentStore _store;
|
final DocumentStore _store;
|
||||||
|
|
||||||
/// Initializes the singleton against the platform document store: files in
|
/// Initializes the singleton against the platform document store (files on
|
||||||
/// the app's documents directory on Android (phone-sandboxed; no
|
/// Android, IndexedDB in the browser-hosted desktop app).
|
||||||
/// external-storage permission needed), IndexedDB in the browser-hosted
|
|
||||||
/// desktop app.
|
|
||||||
static Future<LogStorageService> init() async {
|
static Future<LogStorageService> init() async {
|
||||||
if (_instance != null) return _instance!;
|
if (_instance != null) return _instance!;
|
||||||
final svc = LogStorageService._(await openDocumentStore());
|
final svc = LogStorageService._(await openDocumentStore());
|
||||||
@ -88,8 +87,7 @@ class LogStorageService {
|
|||||||
|
|
||||||
/// Persists the full log to the store, mirroring `_state._write_log`.
|
/// Persists the full log to the store, mirroring `_state._write_log`.
|
||||||
///
|
///
|
||||||
/// Atomicity against a concurrent reader is the store's job (see
|
/// Atomicity against a concurrent reader is the store's job.
|
||||||
/// `FileDocumentStore.write`'s temp-file-and-rename), not this method's.
|
|
||||||
Future<void> writeLog(DayLog log) async {
|
Future<void> writeLog(DayLog log) async {
|
||||||
final encoded = <String, Object?>{
|
final encoded = <String, Object?>{
|
||||||
for (final mapEntry in log.entries)
|
for (final mapEntry in log.entries)
|
||||||
@ -98,27 +96,34 @@ class LogStorageService {
|
|||||||
await _store.write(documentName, jsonEncode(encoded));
|
await _store.write(documentName, jsonEncode(encoded));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Appends a signed-on-PC-eventually entry for [desc] to [when]'s day (or
|
/// Appends an entry for [desc] to [when]'s day (today's when null).
|
||||||
/// today's, when [when] is null).
|
|
||||||
///
|
///
|
||||||
/// Mirrors `_state.log_meal`: always assigns a fresh `id`, never computes
|
/// Mirrors `_state.log_meal`: never computes an `hmac` (the phone never
|
||||||
/// an `hmac` (the phone never holds the shared key -- the PC re-signs on
|
/// holds the key; the PC re-signs on merge). [when] pre-logs a future
|
||||||
/// merge, see Milestone 3). [when] lets a caller pre-log a meal against a
|
/// date/slot and must not be in the past. [slotMinute] is a minute of day
|
||||||
/// future date/slot; must not be in the past. [slotMinute] is the slot's
|
/// (`slotForLog`'s result), never an hour.
|
||||||
/// 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.
|
||||||
Future<FoodEntry> logMeal(
|
Future<FoodEntry> logMeal(
|
||||||
String desc,
|
String desc,
|
||||||
Nutrition nutrition, {
|
Nutrition nutrition, {
|
||||||
int? slotMinute,
|
int? slotMinute,
|
||||||
List<MealComponent>? components,
|
List<MealComponent>? components,
|
||||||
DateTime? when,
|
DateTime? when,
|
||||||
|
String? id,
|
||||||
}) async {
|
}) async {
|
||||||
if (when != null && when.isBefore(DateTime.now())) {
|
if (when != null && when.isBefore(DateTime.now())) {
|
||||||
throw ArgumentError.value(when, 'when', 'cannot log a meal in the past');
|
throw ArgumentError.value(when, 'when', 'cannot log a meal in the past');
|
||||||
}
|
}
|
||||||
final now = when ?? DateTime.now();
|
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(
|
final entry = FoodEntry(
|
||||||
id: const Uuid().v4(),
|
id: id ?? const Uuid().v4(),
|
||||||
time: isoLocalSeconds(now),
|
time: isoLocalSeconds(now),
|
||||||
desc: desc,
|
desc: desc,
|
||||||
grams: nutrition.grams,
|
grams: nutrition.grams,
|
||||||
@ -130,7 +135,6 @@ class LogStorageService {
|
|||||||
slotMinute: slotMinute,
|
slotMinute: slotMinute,
|
||||||
components: components,
|
components: components,
|
||||||
);
|
);
|
||||||
final log = await readLog();
|
|
||||||
log.putIfAbsent(localDateKey(now), () => []).add(entry);
|
log.putIfAbsent(localDateKey(now), () => []).add(entry);
|
||||||
await writeLog(log);
|
await writeLog(log);
|
||||||
return entry;
|
return entry;
|
||||||
@ -165,9 +169,6 @@ class LogStorageService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Returns every non-tombstoned entry across all days, newest first.
|
/// 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 {
|
Future<List<FoodEntry>> allEntriesNewestFirst() async {
|
||||||
final log = await readLog();
|
final log = await readLog();
|
||||||
final entries =
|
final entries =
|
||||||
@ -183,7 +184,7 @@ class LogStorageService {
|
|||||||
return entries;
|
return entries;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Returns today's total calories, mirrors `_state.today_total_kcal`.
|
/// Today's total calories, mirrors `_state.today_total_kcal`.
|
||||||
Future<double> todayTotalKcal() async {
|
Future<double> todayTotalKcal() async {
|
||||||
final entries = await todayEntries();
|
final entries = await todayEntries();
|
||||||
var total = 0.0;
|
var total = 0.0;
|
||||||
|
|||||||
8
app/lib/services/meal_photo_cleanup.dart
Normal file
8
app/lib/services/meal_photo_cleanup.dart
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
/// 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';
|
||||||
11
app/lib/services/meal_photo_cleanup_io.dart
Normal file
11
app/lib/services/meal_photo_cleanup_io.dart
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
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.
|
||||||
|
}
|
||||||
|
}
|
||||||
2
app/lib/services/meal_photo_cleanup_web.dart
Normal file
2
app/lib/services/meal_photo_cleanup_web.dart
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
/// Web has no cache file: the picker returns an in-memory blob.
|
||||||
|
Future<void> discardPickedFile(String path) async {}
|
||||||
76
app/lib/services/meal_photo_source.dart
Normal file
76
app/lib/services/meal_photo_source.dart
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
/// 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -24,6 +24,20 @@ class LocalNotificationsBackend implements NotificationBackend {
|
|||||||
android: AndroidInitializationSettings('@mipmap/ic_launcher'),
|
android: AndroidInitializationSettings('@mipmap/ic_launcher'),
|
||||||
);
|
);
|
||||||
await plugin.initialize(settings: settings);
|
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.
|
/// Requests Android 13+'s runtime `POST_NOTIFICATIONS` permission.
|
||||||
|
|||||||
42
app/lib/services/sync_attempt.dart
Normal file
42
app/lib/services/sync_attempt.dart
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
/// 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;
|
||||||
|
}
|
||||||
@ -14,16 +14,24 @@ import 'package:diet_guard_app/services/wake_alarm_weights.dart';
|
|||||||
|
|
||||||
/// Runs the Body sync against [client], under [devicesDir].
|
/// 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
|
/// No-ops when [BodyService] is uninitialised (a widget test, or an isolate
|
||||||
/// that never loaded it), so it can neither publish nor clobber anything.
|
/// that never loaded it), so it can neither publish nor clobber anything.
|
||||||
Future<void> syncBody(RemoteStore client, {required String devicesDir}) async {
|
Future<void> syncBody(
|
||||||
|
RemoteStore client, {
|
||||||
|
required String devicesDir,
|
||||||
|
RemoteStore? wakeAlarm,
|
||||||
|
}) async {
|
||||||
if (!BodyService.isInitialized) return;
|
if (!BodyService.isInitialized) return;
|
||||||
await ingestWakeAlarmWeights(client);
|
if (wakeAlarm != null) await ingestWakeAlarmWeights(wakeAlarm);
|
||||||
final merged = await syncLog(
|
final merged = await syncLog(
|
||||||
client: client,
|
client: client,
|
||||||
deviceId: currentSyncDeviceId,
|
deviceId: currentSyncDeviceId,
|
||||||
legacyDeviceId: legacySyncDeviceId,
|
legacyDeviceId: legacySyncDeviceId,
|
||||||
pathPrefix: devicesDir,
|
pathPrefix: devicesDir,
|
||||||
|
revsPath: syncRevsDir,
|
||||||
localLog: bodyToLog(BodyService.instance.document),
|
localLog: bodyToLog(BodyService.instance.document),
|
||||||
encode: encodeBodyForPush,
|
encode: encodeBodyForPush,
|
||||||
decode: parseRemoteBody,
|
decode: parseRemoteBody,
|
||||||
|
|||||||
@ -5,8 +5,14 @@ import 'package:diet_guard_app/services/github_client_factory.dart';
|
|||||||
import 'package:shared_preferences/shared_preferences.dart';
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
import 'package:uuid/uuid.dart';
|
import 'package:uuid/uuid.dart';
|
||||||
|
|
||||||
/// Where every device's synced files live on the remote.
|
/// Where every device's synced files live on the remote: the end-to-end
|
||||||
const syncDevicesDir = 'diet-guard-sync/devices';
|
/// 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';
|
||||||
|
|
||||||
/// SharedPreferences key holding this install's device id.
|
/// SharedPreferences key holding this install's device id.
|
||||||
///
|
///
|
||||||
|
|||||||
102
app/lib/services/sync_e2e.dart
Normal file
102
app/lib/services/sync_e2e.dart
Normal file
@ -0,0 +1,102 @@
|
|||||||
|
/// 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -24,6 +24,7 @@ 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_body.dart';
|
||||||
import 'package:diet_guard_app/services/sync_budget_local.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_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.dart';
|
||||||
import 'package:diet_guard_app/services/sync_merge_kuchnia.dart';
|
import 'package:diet_guard_app/services/sync_merge_kuchnia.dart';
|
||||||
import 'package:diet_guard_app/services/sync_state_factory.dart';
|
import 'package:diet_guard_app/services/sync_state_factory.dart';
|
||||||
@ -32,10 +33,19 @@ const String _devicesDir = syncDevicesDir;
|
|||||||
|
|
||||||
/// Runs one full sync tick: pull, merge, persist, push.
|
/// 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
|
/// Returns the merged log as it now sits on disk locally. Propagates any
|
||||||
/// [GitHubSyncError] from the client for the caller (auto-sync / the manual
|
/// [GitHubSyncError] from the client for the caller (auto-sync / the manual
|
||||||
/// "Sync now" action) to decide how to report.
|
/// "Sync now" action) to decide how to report.
|
||||||
Future<DayLog> runSync(RemoteStore client, {SyncStateStore? stateStore}) async {
|
Future<DayLog> runSync(
|
||||||
|
RemoteStore backend, {
|
||||||
|
SyncStateStore? stateStore,
|
||||||
|
}) async {
|
||||||
|
final client = await openDietGuardStore(backend);
|
||||||
|
final wakeAlarm = await openWakeAlarmStore(backend);
|
||||||
final logService = LogStorageService.instance;
|
final logService = LogStorageService.instance;
|
||||||
final local = await logService.readLog();
|
final local = await logService.readLog();
|
||||||
|
|
||||||
@ -44,6 +54,7 @@ Future<DayLog> runSync(RemoteStore client, {SyncStateStore? stateStore}) async {
|
|||||||
deviceId: currentSyncDeviceId,
|
deviceId: currentSyncDeviceId,
|
||||||
legacyDeviceId: legacySyncDeviceId,
|
legacyDeviceId: legacySyncDeviceId,
|
||||||
pathPrefix: _devicesDir,
|
pathPrefix: _devicesDir,
|
||||||
|
revsPath: syncRevsDir,
|
||||||
localLog: dayLogToLog(local),
|
localLog: dayLogToLog(local),
|
||||||
encode: encodeLogForPush,
|
encode: encodeLogForPush,
|
||||||
decode: parseRemoteLog,
|
decode: parseRemoteLog,
|
||||||
@ -65,7 +76,7 @@ Future<DayLog> runSync(RemoteStore client, {SyncStateStore? stateStore}) async {
|
|||||||
await _syncManualBank(client);
|
await _syncManualBank(client);
|
||||||
await _syncKuchniaCredential(client);
|
await _syncKuchniaCredential(client);
|
||||||
await _syncExportKeys(client);
|
await _syncExportKeys(client);
|
||||||
await syncBody(client, devicesDir: _devicesDir);
|
await syncBody(client, devicesDir: _devicesDir, wakeAlarm: wakeAlarm);
|
||||||
return merged;
|
return merged;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -80,6 +91,7 @@ Future<void> _syncFoodBank(RemoteStore client) async {
|
|||||||
deviceId: currentSyncDeviceId,
|
deviceId: currentSyncDeviceId,
|
||||||
legacyDeviceId: legacySyncDeviceId,
|
legacyDeviceId: legacySyncDeviceId,
|
||||||
pathPrefix: _devicesDir,
|
pathPrefix: _devicesDir,
|
||||||
|
revsPath: syncRevsDir,
|
||||||
localLog: foodBankToLog(await FoodBankService.instance.readBank()),
|
localLog: foodBankToLog(await FoodBankService.instance.readBank()),
|
||||||
encode: encodeFoodBankForPush,
|
encode: encodeFoodBankForPush,
|
||||||
decode: parseRemoteFoodBank,
|
decode: parseRemoteFoodBank,
|
||||||
@ -102,6 +114,7 @@ Future<void> _syncManualBank(RemoteStore client) async {
|
|||||||
deviceId: currentSyncDeviceId,
|
deviceId: currentSyncDeviceId,
|
||||||
legacyDeviceId: legacySyncDeviceId,
|
legacyDeviceId: legacySyncDeviceId,
|
||||||
pathPrefix: _devicesDir,
|
pathPrefix: _devicesDir,
|
||||||
|
revsPath: syncRevsDir,
|
||||||
localLog: manualBankToLog(local),
|
localLog: manualBankToLog(local),
|
||||||
encode: encodeManualBankForPush,
|
encode: encodeManualBankForPush,
|
||||||
decode: parseRemoteManualBank,
|
decode: parseRemoteManualBank,
|
||||||
@ -118,6 +131,7 @@ Future<void> _syncBudget(RemoteStore client) async {
|
|||||||
deviceId: currentSyncDeviceId,
|
deviceId: currentSyncDeviceId,
|
||||||
legacyDeviceId: legacySyncDeviceId,
|
legacyDeviceId: legacySyncDeviceId,
|
||||||
pathPrefix: _devicesDir,
|
pathPrefix: _devicesDir,
|
||||||
|
revsPath: syncRevsDir,
|
||||||
localLog: localBudgetLog(),
|
localLog: localBudgetLog(),
|
||||||
encode: encodeBudgetForPush,
|
encode: encodeBudgetForPush,
|
||||||
decode: parseRemoteBudget,
|
decode: parseRemoteBudget,
|
||||||
@ -149,8 +163,7 @@ Future<void> _syncExportKeys(RemoteStore client) async {
|
|||||||
///
|
///
|
||||||
/// The phone runs its own catering importer, so it cannot fetch anything until
|
/// 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
|
/// the panel password reaches it -- that is the whole reason this credential
|
||||||
/// syncs at all. It is plaintext on the wire, like the rest of the synced
|
/// syncs at all. Sealed end-to-end like the rest of the synced state.
|
||||||
/// state; see `sync_merge_kuchnia.dart`.
|
|
||||||
///
|
///
|
||||||
/// A device that has no credential contributes an empty log, so it neither
|
/// 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
|
/// blocks nor clobbers a peer's real value -- it relays it. Mirrors
|
||||||
@ -162,6 +175,7 @@ Future<void> _syncKuchniaCredential(RemoteStore client) async {
|
|||||||
deviceId: currentSyncDeviceId,
|
deviceId: currentSyncDeviceId,
|
||||||
legacyDeviceId: legacySyncDeviceId,
|
legacyDeviceId: legacySyncDeviceId,
|
||||||
pathPrefix: _devicesDir,
|
pathPrefix: _devicesDir,
|
||||||
|
revsPath: syncRevsDir,
|
||||||
localLog: credentialToLog(
|
localLog: credentialToLog(
|
||||||
KuchniaCredentialService.username,
|
KuchniaCredentialService.username,
|
||||||
KuchniaCredentialService.password,
|
KuchniaCredentialService.password,
|
||||||
|
|||||||
@ -1,7 +1,8 @@
|
|||||||
/// Morning weigh-ins from the wake-alarm app, as Body weight candidates.
|
/// Morning weigh-ins from the wake-alarm app, as Body weight candidates.
|
||||||
///
|
///
|
||||||
/// The wake-alarm phone app publishes
|
/// The wake-alarm phone app publishes
|
||||||
/// `wake-alarm-sync/devices/<id>/alarm.json`: a crdt_sync Log whose
|
/// `wake-alarm-sync/devices-e2e/<id>/alarm.json` (end-to-end encrypted, read
|
||||||
|
/// through wake-alarm's own `EncryptingStore`): a crdt_sync Log whose
|
||||||
/// `alarm` record carries `fields[name] = [value, hlc]`. Two fields hold
|
/// `alarm` record carries `fields[name] = [value, hlc]`. Two fields hold
|
||||||
/// weights:
|
/// weights:
|
||||||
///
|
///
|
||||||
@ -25,7 +26,7 @@ import 'package:diet_guard_app/services/body_service.dart';
|
|||||||
import 'package:diet_guard_app/services/sync_merge_body.dart';
|
import 'package:diet_guard_app/services/sync_merge_body.dart';
|
||||||
|
|
||||||
/// Where the wake-alarm app publishes, one directory per device.
|
/// Where the wake-alarm app publishes, one directory per device.
|
||||||
const wakeAlarmDevicesDir = 'wake-alarm-sync/devices';
|
const wakeAlarmDevicesDir = 'wake-alarm-sync/devices-e2e';
|
||||||
|
|
||||||
const _latestField = 'latest_weight_kg';
|
const _latestField = 'latest_weight_kg';
|
||||||
const _sessionsField = 'morning_sessions';
|
const _sessionsField = 'morning_sessions';
|
||||||
|
|||||||
@ -8,8 +8,8 @@ import 'dart:async';
|
|||||||
import 'dart:math' as math;
|
import 'dart:math' as math;
|
||||||
|
|
||||||
import 'package:diet_guard_app/ui/theme.dart';
|
import 'package:diet_guard_app/ui/theme.dart';
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
export 'package:diet_guard_app/ui/icon_field.dart';
|
export 'package:diet_guard_app/ui/icon_field.dart';
|
||||||
|
|
||||||
|
|||||||
@ -2,8 +2,8 @@
|
|||||||
/// spoken label (see [IconField]).
|
/// spoken label (see [IconField]).
|
||||||
library;
|
library;
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:flutter/services.dart';
|
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.
|
/// A bordered text field whose caption is an icon plus a spoken label.
|
||||||
///
|
///
|
||||||
@ -26,6 +26,7 @@ class IconField extends StatelessWidget {
|
|||||||
this.onSubmitted,
|
this.onSubmitted,
|
||||||
this.autofocus = false,
|
this.autofocus = false,
|
||||||
this.autocorrect = true,
|
this.autocorrect = true,
|
||||||
|
this.fontSize,
|
||||||
super.key,
|
super.key,
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -41,6 +42,9 @@ class IconField extends StatelessWidget {
|
|||||||
/// Whether the keyboard may autocorrect (false for e-mails and secrets).
|
/// Whether the keyboard may autocorrect (false for e-mails and secrets).
|
||||||
final bool autocorrect;
|
final bool autocorrect;
|
||||||
|
|
||||||
|
/// Text size of the typed value; the theme's when null.
|
||||||
|
final double? fontSize;
|
||||||
|
|
||||||
/// Painted caption.
|
/// Painted caption.
|
||||||
final IconData icon;
|
final IconData icon;
|
||||||
|
|
||||||
@ -89,6 +93,7 @@ class IconField extends StatelessWidget {
|
|||||||
inputFormatters: inputFormatters,
|
inputFormatters: inputFormatters,
|
||||||
autofocus: autofocus,
|
autofocus: autofocus,
|
||||||
autocorrect: autocorrect,
|
autocorrect: autocorrect,
|
||||||
|
style: fontSize == null ? null : TextStyle(fontSize: fontSize),
|
||||||
enableSuggestions: autocorrect,
|
enableSuggestions: autocorrect,
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
prefixIcon: ExcludeSemantics(child: Icon(icon, color: iconColor)),
|
prefixIcon: ExcludeSemantics(child: Icon(icon, color: iconColor)),
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
/// colour never carries the meaning alone (shape does too).
|
/// colour never carries the meaning alone (shape does too).
|
||||||
library;
|
library;
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// One nutrition field and its non-text identity.
|
/// One nutrition field and its non-text identity.
|
||||||
enum MacroKind {
|
enum MacroKind {
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
/// (`manual`, `food bank`, `catering`) that used to be printed on screen.
|
/// (`manual`, `food bank`, `catering`) that used to be printed on screen.
|
||||||
library;
|
library;
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Icon for a stored entry `source` value; unknown values get a neutral dot.
|
/// Icon for a stored entry `source` value; unknown values get a neutral dot.
|
||||||
IconData sourceIcon(String source) => switch (source) {
|
IconData sourceIcon(String source) => switch (source) {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
/// hand-picked, not algorithmically derived from one seed color.
|
/// hand-picked, not algorithmically derived from one seed color.
|
||||||
library;
|
library;
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Builds the app's single dark `ThemeData` from the shared token set.
|
/// Builds the app's single dark `ThemeData` from the shared token set.
|
||||||
ThemeData buildAppTheme() {
|
ThemeData buildAppTheme() {
|
||||||
@ -195,6 +195,9 @@ abstract final class AppWidth {
|
|||||||
/// value reads as a layout error rather than an affordance.
|
/// value reads as a layout error rather than an affordance.
|
||||||
static const double field = 420;
|
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.
|
/// 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
|
/// 700px, i.e. 768 minus typical window chrome: the supported floor is a
|
||||||
|
|||||||
@ -3,12 +3,12 @@ library;
|
|||||||
|
|
||||||
import 'package:diet_guard_app/models/food_suggestion.dart';
|
import 'package:diet_guard_app/models/food_suggestion.dart';
|
||||||
import 'package:diet_guard_app/ui/macro_kind.dart';
|
import 'package:diet_guard_app/ui/macro_kind.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// A tappable list of [FoodSuggestion]s, each filling the form on tap.
|
/// A tappable list of [FoodSuggestion]s, each filling the form on tap.
|
||||||
///
|
///
|
||||||
/// When [compact] is true, only the top 3 suggestions render as compact
|
/// When [compact] is true, only the top [compactLimit] suggestions render as
|
||||||
/// single-line rows, with a "N more" button opening the full list in a
|
/// compact single-line rows, with a "N more" button opening the full list in a
|
||||||
/// bottom sheet so nothing becomes unreachable.
|
/// bottom sheet so nothing becomes unreachable.
|
||||||
class AutocompleteSuggestionList extends StatelessWidget {
|
class AutocompleteSuggestionList extends StatelessWidget {
|
||||||
/// Creates an [AutocompleteSuggestionList] for [suggestions].
|
/// Creates an [AutocompleteSuggestionList] for [suggestions].
|
||||||
@ -16,6 +16,8 @@ class AutocompleteSuggestionList extends StatelessWidget {
|
|||||||
required this.suggestions,
|
required this.suggestions,
|
||||||
required this.onSelected,
|
required this.onSelected,
|
||||||
this.compact = false,
|
this.compact = false,
|
||||||
|
this.compactLimit = 3,
|
||||||
|
this.reserveHeight = false,
|
||||||
super.key,
|
super.key,
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -29,7 +31,16 @@ class AutocompleteSuggestionList extends StatelessWidget {
|
|||||||
/// of the full unbounded list.
|
/// of the full unbounded list.
|
||||||
final bool compact;
|
final bool compact;
|
||||||
|
|
||||||
static const int _compactLimit = 3;
|
/// 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;
|
||||||
|
|
||||||
Future<void> _showMore(BuildContext context) async {
|
Future<void> _showMore(BuildContext context) async {
|
||||||
await showModalBottomSheet<void>(
|
await showModalBottomSheet<void>(
|
||||||
@ -48,6 +59,15 @@ class AutocompleteSuggestionList extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
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 (suggestions.isEmpty) return const SizedBox.shrink();
|
||||||
if (!compact) {
|
if (!compact) {
|
||||||
return ListView.builder(
|
return ListView.builder(
|
||||||
@ -70,7 +90,7 @@ class AutocompleteSuggestionList extends StatelessWidget {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
final shown = suggestions.take(_compactLimit).toList();
|
final shown = suggestions.take(compactLimit).toList();
|
||||||
final remaining = suggestions.length - shown.length;
|
final remaining = suggestions.length - shown.length;
|
||||||
return Column(
|
return Column(
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
|||||||
@ -4,7 +4,7 @@ library;
|
|||||||
import 'package:diet_guard_app/models/period_average.dart';
|
import 'package:diet_guard_app/models/period_average.dart';
|
||||||
import 'package:diet_guard_app/ui/cues.dart';
|
import 'package:diet_guard_app/ui/cues.dart';
|
||||||
import 'package:diet_guard_app/ui/macro_kind.dart';
|
import 'package:diet_guard_app/ui/macro_kind.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Displays this week's and this month's average kcal/day and their bands.
|
/// Displays this week's and this month's average kcal/day and their bands.
|
||||||
///
|
///
|
||||||
|
|||||||
@ -7,7 +7,8 @@ import 'package:diet_guard_app/ui/macro_kind.dart';
|
|||||||
import 'package:diet_guard_app/ui/theme.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/body_section.dart';
|
||||||
import 'package:diet_guard_app/widgets/body/formula_figure.dart';
|
import 'package:diet_guard_app/widgets/body/formula_figure.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:diet_guard_app/widgets/body/workout_kind_icon.dart';
|
||||||
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// How many of the newest sessions to list.
|
/// How many of the newest sessions to list.
|
||||||
const int activityListLimit = 10;
|
const int activityListLimit = 10;
|
||||||
@ -185,7 +186,22 @@ class _SessionTile extends StatelessWidget {
|
|||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Text('${session.day} ${session.label}'),
|
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(
|
Row(
|
||||||
children: [
|
children: [
|
||||||
Icon(
|
Icon(
|
||||||
|
|||||||
@ -5,7 +5,7 @@ library;
|
|||||||
|
|
||||||
import 'package:diet_guard_app/services/body_calc.dart';
|
import 'package:diet_guard_app/services/body_calc.dart';
|
||||||
import 'package:diet_guard_app/ui/theme.dart';
|
import 'package:diet_guard_app/ui/theme.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// A card with [children] stacked in it; [semanticLabel] names it for screen
|
/// A card with [children] stacked in it; [semanticLabel] names it for screen
|
||||||
/// readers and tests and is never painted.
|
/// readers and tests and is never painted.
|
||||||
|
|||||||
@ -6,7 +6,7 @@ import 'package:diet_guard_app/ui/cues.dart';
|
|||||||
import 'package:diet_guard_app/ui/macro_kind.dart';
|
import 'package:diet_guard_app/ui/macro_kind.dart';
|
||||||
import 'package:diet_guard_app/ui/theme.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/body_section.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// The BMI band as glyph + colour (never colour alone): a green check inside
|
/// 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.
|
/// the healthy range, an amber or red arrow towards the side it is off by.
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
library;
|
library;
|
||||||
|
|
||||||
import 'package:diet_guard_app/ui/theme.dart';
|
import 'package:diet_guard_app/ui/theme.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// One tile: a big [icon] (spoken as [semanticLabel]), an optional headline
|
/// One tile: a big [icon] (spoken as [semanticLabel]), an optional headline
|
||||||
/// [value] and the [builder] of the full card shown in the sheet.
|
/// [value] and the [builder] of the full card shown in the sheet.
|
||||||
|
|||||||
@ -7,8 +7,9 @@ import 'package:diet_guard_app/ui/cues.dart';
|
|||||||
import 'package:diet_guard_app/ui/theme.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/body_section.dart';
|
||||||
import 'package:diet_guard_app/widgets/body/weight_chart.dart';
|
import 'package:diet_guard_app/widgets/body/weight_chart.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:diet_guard_app/widgets/pickers/pickers.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Enters/deletes a day's value and charts the history.
|
/// Enters/deletes a day's value and charts the history.
|
||||||
class DatedValueCard extends StatefulWidget {
|
class DatedValueCard extends StatefulWidget {
|
||||||
@ -80,7 +81,7 @@ class _DatedValueCardState extends State<DatedValueCard> {
|
|||||||
String _fmt(double value) => '${oneDecimal(value)} ${widget.unit}';
|
String _fmt(double value) => '${oneDecimal(value)} ${widget.unit}';
|
||||||
|
|
||||||
Future<void> _pickDay() async {
|
Future<void> _pickDay() async {
|
||||||
final picked = await showDatePicker(
|
final picked = await pickDate(
|
||||||
context: context,
|
context: context,
|
||||||
firstDate: DateTime(2000),
|
firstDate: DateTime(2000),
|
||||||
lastDate: DateTime.now(),
|
lastDate: DateTime.now(),
|
||||||
|
|||||||
@ -4,7 +4,7 @@ library;
|
|||||||
|
|
||||||
import 'package:diet_guard_app/services/activity_kcal.dart';
|
import 'package:diet_guard_app/services/activity_kcal.dart';
|
||||||
import 'package:diet_guard_app/ui/theme.dart';
|
import 'package:diet_guard_app/ui/theme.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// One distinct glyph per entry of [activityFormulas].
|
/// One distinct glyph per entry of [activityFormulas].
|
||||||
const Map<String, IconData> formulaIcons = {
|
const Map<String, IconData> formulaIcons = {
|
||||||
|
|||||||
@ -16,7 +16,7 @@ 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/body_section.dart';
|
||||||
import 'package:diet_guard_app/widgets/body/goal_icons.dart';
|
import 'package:diet_guard_app/widgets/body/goal_icons.dart';
|
||||||
import 'package:diet_guard_app/widgets/body/goal_pickers.dart';
|
import 'package:diet_guard_app/widgets/body/goal_pickers.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// The goal row and its answer.
|
/// The goal row and its answer.
|
||||||
class GoalCard extends StatefulWidget {
|
class GoalCard extends StatefulWidget {
|
||||||
|
|||||||
@ -4,7 +4,7 @@ library;
|
|||||||
|
|
||||||
import 'package:diet_guard_app/services/body_energy.dart';
|
import 'package:diet_guard_app/services/body_energy.dart';
|
||||||
import 'package:diet_guard_app/widgets/body/formula_figure.dart';
|
import 'package:diet_guard_app/widgets/body/formula_figure.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Lose = down arrow, maintain = level bar, gain = up arrow.
|
/// Lose = down arrow, maintain = level bar, gain = up arrow.
|
||||||
IconData directionIcon(String direction) => switch (direction) {
|
IconData directionIcon(String direction) => switch (direction) {
|
||||||
|
|||||||
@ -9,8 +9,8 @@ import 'package:diet_guard_app/services/body_energy.dart';
|
|||||||
import 'package:diet_guard_app/ui/cues.dart';
|
import 'package:diet_guard_app/ui/cues.dart';
|
||||||
import 'package:diet_guard_app/ui/theme.dart';
|
import 'package:diet_guard_app/ui/theme.dart';
|
||||||
import 'package:diet_guard_app/widgets/body/goal_icons.dart';
|
import 'package:diet_guard_app/widgets/body/goal_icons.dart';
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// One choice in a picker sheet.
|
/// One choice in a picker sheet.
|
||||||
typedef PickerOption = ({
|
typedef PickerOption = ({
|
||||||
|
|||||||
@ -6,8 +6,9 @@ import 'package:diet_guard_app/services/body_service.dart';
|
|||||||
import 'package:diet_guard_app/ui/cues.dart';
|
import 'package:diet_guard_app/ui/cues.dart';
|
||||||
import 'package:diet_guard_app/ui/theme.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/body_section.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:diet_guard_app/widgets/pickers/pickers.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Edits the profile; calls [onSaved] after a successful save.
|
/// Edits the profile; calls [onSaved] after a successful save.
|
||||||
class ProfileCard extends StatefulWidget {
|
class ProfileCard extends StatefulWidget {
|
||||||
@ -46,7 +47,7 @@ class _ProfileCardState extends State<ProfileCard> {
|
|||||||
Future<void> _pickBirth() async {
|
Future<void> _pickBirth() async {
|
||||||
final now = DateTime.now();
|
final now = DateTime.now();
|
||||||
final initial = DateTime.tryParse(_birth ?? '') ?? DateTime(now.year - 30);
|
final initial = DateTime.tryParse(_birth ?? '') ?? DateTime(now.year - 30);
|
||||||
final picked = await showDatePicker(
|
final picked = await pickDate(
|
||||||
context: context,
|
context: context,
|
||||||
firstDate: DateTime(1900),
|
firstDate: DateTime(1900),
|
||||||
lastDate: now,
|
lastDate: now,
|
||||||
|
|||||||
@ -10,8 +10,8 @@ import 'package:diet_guard_app/ui/cues.dart';
|
|||||||
import 'package:diet_guard_app/ui/macro_kind.dart';
|
import 'package:diet_guard_app/ui/macro_kind.dart';
|
||||||
import 'package:diet_guard_app/ui/theme.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/body_section.dart';
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// The planner.
|
/// The planner.
|
||||||
class WeekPlanCard extends StatefulWidget {
|
class WeekPlanCard extends StatefulWidget {
|
||||||
|
|||||||
@ -7,7 +7,7 @@ library;
|
|||||||
import 'package:diet_guard_app/models/body_document.dart';
|
import 'package:diet_guard_app/models/body_document.dart';
|
||||||
import 'package:diet_guard_app/services/body_service.dart';
|
import 'package:diet_guard_app/services/body_service.dart';
|
||||||
import 'package:diet_guard_app/widgets/body/dated_value_card.dart';
|
import 'package:diet_guard_app/widgets/body/dated_value_card.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
export 'package:diet_guard_app/widgets/body/dated_value_card.dart';
|
export 'package:diet_guard_app/widgets/body/dated_value_card.dart';
|
||||||
|
|
||||||
|
|||||||
@ -7,7 +7,7 @@ library;
|
|||||||
import 'package:diet_guard_app/ui/cues.dart';
|
import 'package:diet_guard_app/ui/cues.dart';
|
||||||
import 'package:diet_guard_app/ui/theme.dart';
|
import 'package:diet_guard_app/ui/theme.dart';
|
||||||
import 'package:fl_chart/fl_chart.dart';
|
import 'package:fl_chart/fl_chart.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Selectable chart ranges, `(spoken name, days)`; null days = everything.
|
/// Selectable chart ranges, `(spoken name, days)`; null days = everything.
|
||||||
const List<(String, int?)> weightChartRanges = [
|
const List<(String, int?)> weightChartRanges = [
|
||||||
|
|||||||
13
app/lib/widgets/body/workout_kind_icon.dart
Normal file
13
app/lib/widgets/body/workout_kind_icon.dart
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
/// 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,
|
||||||
|
};
|
||||||
@ -5,8 +5,8 @@ import 'dart:async';
|
|||||||
|
|
||||||
import 'package:data_transfer_flutter/data_transfer_flutter.dart';
|
import 'package:data_transfer_flutter/data_transfer_flutter.dart';
|
||||||
import 'package:diet_guard_app/services/data_export.dart';
|
import 'package:diet_guard_app/services/data_export.dart';
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Suggested file name, identical on every platform.
|
/// Suggested file name, identical on every platform.
|
||||||
const exportFileName = 'diet-guard-export.json';
|
const exportFileName = 'diet-guard-export.json';
|
||||||
|
|||||||
@ -3,7 +3,7 @@ library;
|
|||||||
|
|
||||||
import 'package:diet_guard_app/models/day_status.dart';
|
import 'package:diet_guard_app/models/day_status.dart';
|
||||||
import 'package:diet_guard_app/ui/theme.dart';
|
import 'package:diet_guard_app/ui/theme.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Monthly calendar widget that colors each day by its [DayStatus].
|
/// Monthly calendar widget that colors each day by its [DayStatus].
|
||||||
///
|
///
|
||||||
|
|||||||
@ -1,93 +0,0 @@
|
|||||||
/// 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';
|
|
||||||
|
|
||||||
/// Spoken name of the resting button (never painted).
|
|
||||||
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: _face(context, armed),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
if (armed) ...[
|
|
||||||
const SizedBox(width: AppSpacing.sm),
|
|
||||||
IconButton(
|
|
||||||
onPressed: busy ? null : onCancel,
|
|
||||||
icon: const Icon(Icons.close, semanticLabel: 'Cancel'),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Resting glyph; spinner while busy; double check + count once armed.
|
|
||||||
Widget _face(BuildContext context, bool armed) {
|
|
||||||
if (busy) {
|
|
||||||
return const SizedBox(
|
|
||||||
width: 18,
|
|
||||||
height: 18,
|
|
||||||
child: CircularProgressIndicator(strokeWidth: 2),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (!armed) {
|
|
||||||
return const Icon(Icons.playlist_add_check, semanticLabel: fillAllLabel);
|
|
||||||
}
|
|
||||||
final success =
|
|
||||||
(Theme.of(context).extension<AppStatusColors>() ?? AppStatusColors.dark)
|
|
||||||
.success;
|
|
||||||
return Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
|
||||||
children: [
|
|
||||||
Icon(Icons.done_all, color: success, semanticLabel: 'Confirm'),
|
|
||||||
const SizedBox(width: AppSpacing.xs),
|
|
||||||
Text('$armedCount'),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -3,7 +3,7 @@
|
|||||||
/// glyph and speaks its old caption only through its semantic label.
|
/// glyph and speaks its old caption only through its semantic label.
|
||||||
library;
|
library;
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Top row of a filter sheet: one clear-everything icon, right-aligned.
|
/// Top row of a filter sheet: one clear-everything icon, right-aligned.
|
||||||
class FilterSheetHeader extends StatelessWidget {
|
class FilterSheetHeader extends StatelessWidget {
|
||||||
|
|||||||
@ -8,7 +8,7 @@ library;
|
|||||||
|
|
||||||
import 'package:diet_guard_app/ui/cues.dart';
|
import 'package:diet_guard_app/ui/cues.dart';
|
||||||
import 'package:diet_guard_app/ui/macro_kind.dart';
|
import 'package:diet_guard_app/ui/macro_kind.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// The free-text search-by-name field in the filter sheet.
|
/// The free-text search-by-name field in the filter sheet.
|
||||||
///
|
///
|
||||||
|
|||||||
@ -6,7 +6,7 @@ library;
|
|||||||
import 'package:diet_guard_app/models/food_bank_record.dart';
|
import 'package:diet_guard_app/models/food_bank_record.dart';
|
||||||
import 'package:diet_guard_app/ui/cues.dart';
|
import 'package:diet_guard_app/ui/cues.dart';
|
||||||
import 'package:diet_guard_app/ui/macro_kind.dart';
|
import 'package:diet_guard_app/ui/macro_kind.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Prompts for a new manually-curated food bank entry.
|
/// Prompts for a new manually-curated food bank entry.
|
||||||
///
|
///
|
||||||
|
|||||||
@ -9,7 +9,7 @@ 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_chrome.dart';
|
||||||
import 'package:diet_guard_app/widgets/filters/filter_fields.dart';
|
import 'package:diet_guard_app/widgets/filters/filter_fields.dart';
|
||||||
import 'package:diet_guard_app/widgets/food_bank/fb_filter.dart';
|
import 'package:diet_guard_app/widgets/food_bank/fb_filter.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// The draggable bottom sheet that edits the food bank's filter and sort order.
|
/// The draggable bottom sheet that edits the food bank's filter and sort order.
|
||||||
///
|
///
|
||||||
|
|||||||
@ -3,7 +3,7 @@ library;
|
|||||||
|
|
||||||
import 'package:diet_guard_app/models/food_bank_record.dart';
|
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/macro_kind.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// One banked food: its name, macros, and how often it has been logged.
|
/// One banked food: its name, macros, and how often it has been logged.
|
||||||
///
|
///
|
||||||
|
|||||||
@ -6,7 +6,7 @@ library;
|
|||||||
import 'package:diet_guard_app/models/food_bank_record.dart';
|
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/macro_kind.dart';
|
||||||
import 'package:diet_guard_app/ui/theme.dart';
|
import 'package:diet_guard_app/ui/theme.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Tiles per row.
|
/// Tiles per row.
|
||||||
const int fbGridColumns = 3;
|
const int fbGridColumns = 3;
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
/// can each depend on it without depending on one another.
|
/// can each depend on it without depending on one another.
|
||||||
library;
|
library;
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Filter & sort state
|
// Filter & sort state
|
||||||
|
|||||||
@ -9,7 +9,8 @@ import 'package:diet_guard_app/widgets/filters/filter_fields.dart';
|
|||||||
import 'package:diet_guard_app/widgets/history/history_filter.dart';
|
import 'package:diet_guard_app/widgets/history/history_filter.dart';
|
||||||
import 'package:diet_guard_app/widgets/history/history_filter_sort.dart';
|
import 'package:diet_guard_app/widgets/history/history_filter_sort.dart';
|
||||||
import 'package:diet_guard_app/widgets/history/history_grouping.dart';
|
import 'package:diet_guard_app/widgets/history/history_grouping.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:diet_guard_app/widgets/pickers/pickers.dart';
|
||||||
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// The draggable bottom sheet that edits the history filter and sort order.
|
/// The draggable bottom sheet that edits the history filter and sort order.
|
||||||
///
|
///
|
||||||
@ -111,7 +112,7 @@ class FilterSheet extends StatelessWidget {
|
|||||||
],
|
],
|
||||||
),
|
),
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
final picked = await showDateRangePicker(
|
final picked = await pickDateRange(
|
||||||
context: context,
|
context: context,
|
||||||
firstDate: DateTime(2020),
|
firstDate: DateTime(2020),
|
||||||
lastDate: DateTime.now().add(const Duration(days: 1)),
|
lastDate: DateTime.now().add(const Duration(days: 1)),
|
||||||
|
|||||||
@ -10,7 +10,7 @@ import 'package:diet_guard_app/ui/macro_kind.dart';
|
|||||||
import 'package:diet_guard_app/ui/source_icon.dart';
|
import 'package:diet_guard_app/ui/source_icon.dart';
|
||||||
import 'package:diet_guard_app/widgets/filters/filter_chrome.dart';
|
import 'package:diet_guard_app/widgets/filters/filter_chrome.dart';
|
||||||
import 'package:diet_guard_app/widgets/history/history_filter.dart';
|
import 'package:diet_guard_app/widgets/history/history_filter.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// The known `source` values an entry can carry, in display order.
|
/// The known `source` values an entry can carry, in display order.
|
||||||
///
|
///
|
||||||
|
|||||||
@ -7,7 +7,7 @@ library;
|
|||||||
import 'package:diet_guard_app/models/food_entry.dart';
|
import 'package:diet_guard_app/models/food_entry.dart';
|
||||||
import 'package:diet_guard_app/services/day_status_service.dart';
|
import 'package:diet_guard_app/services/day_status_service.dart';
|
||||||
import 'package:diet_guard_app/widgets/history/history_filter.dart';
|
import 'package:diet_guard_app/widgets/history/history_filter.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// One row in the flattened history list: either a [DayHeader] or an
|
/// One row in the flattened history list: either a [DayHeader] or an
|
||||||
/// [EntryRow]. Sealed so the list's `switch` stays exhaustive.
|
/// [EntryRow]. Sealed so the list's `switch` stays exhaustive.
|
||||||
|
|||||||
@ -12,7 +12,7 @@ import 'package:diet_guard_app/ui/cues.dart';
|
|||||||
import 'package:diet_guard_app/ui/macro_kind.dart';
|
import 'package:diet_guard_app/ui/macro_kind.dart';
|
||||||
import 'package:diet_guard_app/ui/source_icon.dart';
|
import 'package:diet_guard_app/ui/source_icon.dart';
|
||||||
import 'package:diet_guard_app/widgets/history/history_grouping.dart';
|
import 'package:diet_guard_app/widgets/history/history_grouping.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// The history list: a flat [ListView] over pre-grouped day headers and rows.
|
/// The history list: a flat [ListView] over pre-grouped day headers and rows.
|
||||||
///
|
///
|
||||||
|
|||||||
@ -1,95 +0,0 @@
|
|||||||
/// The log form's action row: load today's delivery, then log the meal.
|
|
||||||
///
|
|
||||||
/// Its own file because `log_meal_screen.dart` sits at the repo's 250-line
|
|
||||||
/// ceiling; lifting the whole row rather than just the delivery button keeps
|
|
||||||
/// both controls' layout in one place and returns budget to the screen.
|
|
||||||
library;
|
|
||||||
|
|
||||||
import 'package:diet_guard_app/services/kuchnia_client.dart';
|
|
||||||
import 'package:diet_guard_app/ui/theme.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
|
|
||||||
/// A delivery button beside the log button.
|
|
||||||
///
|
|
||||||
/// The delivery control mirrors the PC lock screen's "🍱 Today's delivery":
|
|
||||||
/// standing in the kitchen, there must be something to tap. It stays visible
|
|
||||||
/// and enabled even when there is nothing to load — the outcome arrives as a
|
|
||||||
/// message rather than as a disabled button, because a disabled control gives
|
|
||||||
/// no way to retry after a late delivery and a hidden one reads as broken.
|
|
||||||
class LogMealActionsRow extends StatelessWidget {
|
|
||||||
/// Creates the action row.
|
|
||||||
const LogMealActionsRow({
|
|
||||||
required this.onLoadDelivery,
|
|
||||||
required this.onLog,
|
|
||||||
this.deliveryBusy = false,
|
|
||||||
this.dishesQueued = 0,
|
|
||||||
this.canFetchDelivery,
|
|
||||||
super.key,
|
|
||||||
});
|
|
||||||
|
|
||||||
/// Loads today's delivery and prefills the first/next dish.
|
|
||||||
final Future<void> Function() onLoadDelivery;
|
|
||||||
|
|
||||||
/// Writes the current form as a log entry.
|
|
||||||
final VoidCallback onLog;
|
|
||||||
|
|
||||||
/// Whether a delivery fetch is in flight; disables the button meanwhile so
|
|
||||||
/// a second tap cannot start a concurrent login against the caterer.
|
|
||||||
final bool deliveryBusy;
|
|
||||||
|
|
||||||
/// How many delivered dishes are still queued, shown as the PC's
|
|
||||||
/// "(N more to go)" so the user knows the walk is not finished.
|
|
||||||
final int dishesQueued;
|
|
||||||
|
|
||||||
/// Whether the platform can fetch at all. Defaults to
|
|
||||||
/// [kuchniaFetchSupported] — false on web, where the desktop build runs and
|
|
||||||
/// the caterer's panel blocks browser requests, so the control is hidden
|
|
||||||
/// rather than shipped dead.
|
|
||||||
final bool? canFetchDelivery;
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final canFetch = canFetchDelivery ?? kuchniaFetchSupported;
|
|
||||||
return Row(
|
|
||||||
children: [
|
|
||||||
// Expanded so the delivery button takes the slack and pushes the log
|
|
||||||
// button right; the queue is a numeral next to the icon, so there is
|
|
||||||
// no wide label to clip. While fetching the icon becomes a spinner.
|
|
||||||
if (canFetch)
|
|
||||||
Expanded(
|
|
||||||
child: OutlinedButton(
|
|
||||||
onPressed: deliveryBusy ? null : onLoadDelivery,
|
|
||||||
child: Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
|
||||||
children: [
|
|
||||||
if (deliveryBusy)
|
|
||||||
const SizedBox(
|
|
||||||
width: 18,
|
|
||||||
height: 18,
|
|
||||||
child: CircularProgressIndicator(strokeWidth: 2),
|
|
||||||
)
|
|
||||||
else
|
|
||||||
const Icon(
|
|
||||||
Icons.restaurant,
|
|
||||||
semanticLabel: "Load today's catering delivery",
|
|
||||||
),
|
|
||||||
if (dishesQueued > 0) ...[
|
|
||||||
const SizedBox(width: AppSpacing.xs),
|
|
||||||
Text('$dishesQueued'),
|
|
||||||
],
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
// No Spacer when the delivery button is present: it is a flex child
|
|
||||||
// too and would split the free space with the Expanded above.
|
|
||||||
if (!canFetch) const Spacer(),
|
|
||||||
const SizedBox(width: AppSpacing.sm),
|
|
||||||
FilledButton(
|
|
||||||
onPressed: onLog,
|
|
||||||
child: const Icon(Icons.check_circle, semanticLabel: 'Log meal'),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
|
|
||||||
import 'package:diet_guard_app/services/app_settings_service.dart';
|
import 'package:diet_guard_app/services/app_settings_service.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// Opt-out switch for the log cue, which ships on.
|
/// Opt-out switch for the log cue, which ships on.
|
||||||
class LogSoundTile extends StatefulWidget {
|
class LogSoundTile extends StatefulWidget {
|
||||||
|
|||||||
101
app/lib/widgets/logged_meal_row.dart
Normal file
101
app/lib/widgets/logged_meal_row.dart
Normal file
@ -0,0 +1,101 @@
|
|||||||
|
/// One meal the screen logged for the user: where it came from, what it is,
|
||||||
|
/// and a plain round undo.
|
||||||
|
library;
|
||||||
|
|
||||||
|
import 'package:diet_guard_app/models/food_entry.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';
|
||||||
|
|
||||||
|
/// How the entry got logged; picks the leading glyph.
|
||||||
|
enum LoggedOrigin {
|
||||||
|
/// Claude read the text and/or photo (sparkle).
|
||||||
|
claude,
|
||||||
|
|
||||||
|
/// The delivered catering dish logged itself (restaurant).
|
||||||
|
catering,
|
||||||
|
|
||||||
|
/// The check button (check).
|
||||||
|
local,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A logged meal and the way it got logged.
|
||||||
|
@immutable
|
||||||
|
class LoggedMeal {
|
||||||
|
/// Creates the pair.
|
||||||
|
const LoggedMeal(this.entry, this.origin);
|
||||||
|
|
||||||
|
/// The entry that was written.
|
||||||
|
final FoodEntry entry;
|
||||||
|
|
||||||
|
/// How it got logged.
|
||||||
|
final LoggedOrigin origin;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Name, kcal and macro figures, and an undo button (no countdown).
|
||||||
|
class LoggedMealRow extends StatelessWidget {
|
||||||
|
/// Creates the row.
|
||||||
|
const LoggedMealRow({required this.meal, required this.onUndo, super.key});
|
||||||
|
|
||||||
|
/// The meal shown.
|
||||||
|
final LoggedMeal meal;
|
||||||
|
|
||||||
|
/// Tombstones the entry.
|
||||||
|
final VoidCallback onUndo;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final theme = Theme.of(context);
|
||||||
|
final entry = meal.entry;
|
||||||
|
final (icon, color) = switch (meal.origin) {
|
||||||
|
LoggedOrigin.claude => (Icons.auto_awesome, theme.colorScheme.primary),
|
||||||
|
LoggedOrigin.catering => (
|
||||||
|
Icons.restaurant,
|
||||||
|
theme.colorScheme.onSurfaceVariant,
|
||||||
|
),
|
||||||
|
LoggedOrigin.local => (
|
||||||
|
Icons.check_circle,
|
||||||
|
(theme.extension<AppStatusColors>() ?? AppStatusColors.dark).success,
|
||||||
|
),
|
||||||
|
};
|
||||||
|
String n(double v) => v.round().toString();
|
||||||
|
return Padding(
|
||||||
|
padding: const EdgeInsets.only(top: AppSpacing.sm),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
Icon(icon, color: color),
|
||||||
|
const SizedBox(width: AppSpacing.sm),
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(entry.desc, maxLines: 1, overflow: TextOverflow.ellipsis),
|
||||||
|
Wrap(
|
||||||
|
spacing: AppSpacing.sm,
|
||||||
|
children: [
|
||||||
|
MacroFigure(
|
||||||
|
kind: MacroKind.kcal,
|
||||||
|
value: n(entry.kcal),
|
||||||
|
size: 16,
|
||||||
|
),
|
||||||
|
MacroFigure(
|
||||||
|
kind: MacroKind.protein,
|
||||||
|
value: n(entry.proteinG),
|
||||||
|
),
|
||||||
|
MacroFigure(kind: MacroKind.carbs, value: n(entry.carbsG)),
|
||||||
|
MacroFigure(kind: MacroKind.fat, value: n(entry.fatG)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
IconButton.filledTonal(
|
||||||
|
constraints: const BoxConstraints.tightFor(width: 48, height: 48),
|
||||||
|
onPressed: onUndo,
|
||||||
|
icon: const Icon(Icons.undo, semanticLabel: 'Undo'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user