diff --git a/.github/workflows/release-apk.yml b/.github/workflows/release-apk.yml index b0e4cfd..bded772 100644 --- a/.github/workflows/release-apk.yml +++ b/.github/workflows/release-apk.yml @@ -108,7 +108,9 @@ jobs: run: | flutter build apk --release \ --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 # the debug key if key.properties is misplaced, producing a green build diff --git a/app/lib/main.dart b/app/lib/main.dart index 1be10e1..e9b4af8 100644 --- a/app/lib/main.dart +++ b/app/lib/main.dart @@ -3,6 +3,9 @@ library; import 'dart:async'; + +import 'package:crdt_sync_flutter/crdt_sync_flutter.dart' + show AppErrors, AppErrorsConfig, AppErrorsRouteObserver, installAppErrors; import 'package:diet_guard_app/screens/log_meal_screen.dart'; import 'package:diet_guard_app/services/app_settings_service.dart'; import 'package:diet_guard_app/services/background_tasks.dart'; @@ -10,6 +13,7 @@ import 'package:diet_guard_app/services/body_service.dart'; import 'package:diet_guard_app/services/budget_history_service.dart'; import 'package:diet_guard_app/services/claude_relay_client.dart'; import 'package:diet_guard_app/services/claude_relay_firebase.dart'; +import 'package:diet_guard_app/services/firebase_client.dart' show openFirebase; import 'package:diet_guard_app/services/foodbank_service.dart'; import 'package:diet_guard_app/services/frame_stats.dart'; import 'package:diet_guard_app/services/kuchnia_credential_service.dart'; @@ -23,9 +27,27 @@ import 'package:material_ui/material_ui.dart'; Future main() async { WidgetsFlutterBinding.ensureInitialized(); + // Every error and every wait over 1 s goes to the PC's app-errors ingest, + // which files a board ticket (kuhyx/utils DOCS-app-errors.md). The release + // build passes the versionCode and name as dart-defines (release-apk.yml). + final errors = await installAppErrors( + const AppErrorsConfig( + app: 'diet-guard', + repo: 'kuhyx/diet-guard', + package: 'diet_guard_app', + // 0 unless the release build passes --dart-define=APP_BUILD. + // ignore: avoid_redundant_argument_values + build: int.fromEnvironment('APP_BUILD'), + version: String.fromEnvironment('APP_VERSION'), + ), + ); // Before anything that stamps an Hlc or syncs: until this resolves, the // device id falls back to the pre-migration role constant. - await initSyncDeviceId(); + final deviceId = await initSyncDeviceId(); + errors.connect( + sink: () async => (await openFirebase())?.patchValues, + deviceId: () async => deviceId, + ); await LogStorageService.init(); await AppSettingsService.init(); await BudgetHistoryService.init(); @@ -55,19 +77,25 @@ Future main() async { // coverage:ignore-start if (frameStatsEnabled) startFrameStats(); // coverage:ignore-end - runApp(const DietGuardApp()); + runApp(DietGuardApp(errors: errors)); } /// Root widget for the Diet Guard companion app. class DietGuardApp extends StatelessWidget { /// 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 Widget build(BuildContext context) { return MaterialApp( title: 'Diet Guard', theme: buildAppTheme(), + navigatorObservers: [ + if (errors case final errors?) AppErrorsRouteObserver(errors), + ], home: const LogMealScreen(), ); } diff --git a/app/lib/screens/calendar_screen.dart b/app/lib/screens/calendar_screen.dart index eea8ab7..be16998 100644 --- a/app/lib/screens/calendar_screen.dart +++ b/app/lib/screens/calendar_screen.dart @@ -9,6 +9,7 @@ library; import 'dart:async'; +import 'package:crdt_sync_flutter/crdt_sync_flutter.dart' show WaitWatch; import 'package:diet_guard_app/models/day_status.dart'; import 'package:diet_guard_app/models/period_average.dart'; import 'package:diet_guard_app/screens/history_screen.dart'; @@ -153,7 +154,7 @@ class _CalendarScreenState extends State { @override Widget build(BuildContext context) { if (_loading) { - return const Scaffold(body: Center(child: CircularProgressIndicator())); + return const Scaffold(body: WaitWatch.centered('calendar.load')); } return Scaffold( appBar: AppBar(), diff --git a/app/lib/screens/food_bank_screen.dart b/app/lib/screens/food_bank_screen.dart index 220a611..64cb87d 100644 --- a/app/lib/screens/food_bank_screen.dart +++ b/app/lib/screens/food_bank_screen.dart @@ -8,6 +8,7 @@ library; import 'dart:async'; +import 'package:crdt_sync_flutter/crdt_sync_flutter.dart' show WaitWatch; import 'package:diet_guard_app/models/food_bank_record.dart'; import 'package:diet_guard_app/services/foodbank_service.dart'; import 'package:diet_guard_app/widgets/food_bank/fb_add_entry_dialog.dart'; @@ -183,7 +184,7 @@ class _FoodBankScreenState extends State { ], ), body: all == null - ? const Center(child: CircularProgressIndicator()) + ? const WaitWatch.centered('food_bank.load') : _displayed.isEmpty ? Center( child: Icon( diff --git a/app/lib/screens/github_mirror_screen.dart b/app/lib/screens/github_mirror_screen.dart index 3a57203..aebf61c 100644 --- a/app/lib/screens/github_mirror_screen.dart +++ b/app/lib/screens/github_mirror_screen.dart @@ -8,6 +8,7 @@ library; import 'dart:async'; +import 'package:crdt_sync_flutter/crdt_sync_flutter.dart' show WaitWatch; import 'package:diet_guard_app/services/firebase_client.dart'; import 'package:diet_guard_app/services/github_client_factory.dart'; import 'package:diet_guard_app/services/sync_health.dart'; @@ -100,7 +101,7 @@ class _GitHubMirrorScreenState extends State @override Widget build(BuildContext context) { if (_loading) { - return const Scaffold(body: Center(child: CircularProgressIndicator())); + return const Scaffold(body: WaitWatch.centered('github_mirror.load')); } return Scaffold( // No title and no explanatory paragraph: the code glyph that opened this diff --git a/app/lib/screens/history_screen.dart b/app/lib/screens/history_screen.dart index 004dbc4..dfafb74 100644 --- a/app/lib/screens/history_screen.dart +++ b/app/lib/screens/history_screen.dart @@ -7,6 +7,7 @@ library; import 'dart:async'; +import 'package:crdt_sync_flutter/crdt_sync_flutter.dart' show WaitWatch; import 'package:diet_guard_app/models/food_entry.dart'; import 'package:diet_guard_app/screens/edit_entry_screen.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; @@ -189,7 +190,7 @@ class _HistoryScreenState extends State { ], ), body: allEntries == null - ? const Center(child: CircularProgressIndicator()) + ? const WaitWatch.centered('history.load') : _displayed.isEmpty ? Center( child: Icon( diff --git a/app/lib/screens/settings_kuchnia.dart b/app/lib/screens/settings_kuchnia.dart index 465d2bd..ef97fe9 100644 --- a/app/lib/screens/settings_kuchnia.dart +++ b/app/lib/screens/settings_kuchnia.dart @@ -15,6 +15,7 @@ /// encrypted either. library; +import 'package:crdt_sync_flutter/crdt_sync_flutter.dart' show WaitWatch; import 'package:diet_guard_app/services/kuchnia_client.dart'; import 'package:diet_guard_app/services/kuchnia_credential_service.dart'; import 'package:diet_guard_app/services/kuchnia_import.dart'; @@ -188,9 +189,12 @@ class _KuchniaSettingsSectionState extends State { IconButton.outlined( onPressed: canFetch && !_busy ? _fetch : null, icon: _busy - ? const SizedBox.square( - dimension: 20, - child: CircularProgressIndicator(strokeWidth: 2), + ? const WaitWatch( + operation: 'kuchnia.sync', + child: SizedBox.square( + dimension: 20, + child: CircularProgressIndicator(strokeWidth: 2), + ), ) : const Icon( Icons.local_shipping_outlined, diff --git a/app/lib/widgets/meal_action_row.dart b/app/lib/widgets/meal_action_row.dart index 1629197..f8a51a8 100644 --- a/app/lib/widgets/meal_action_row.dart +++ b/app/lib/widgets/meal_action_row.dart @@ -8,6 +8,7 @@ /// send or log. library; +import 'package:crdt_sync_flutter/crdt_sync_flutter.dart' show WaitWatch; import 'package:diet_guard_app/ui/theme.dart'; import 'package:material_ui/material_ui.dart'; @@ -127,10 +128,13 @@ class MealActionRow extends StatelessWidget { ); Widget _claudeFace() => switch (claude) { - ClaudeButtonState.sending => const SizedBox( - width: 24, - height: 24, - child: CircularProgressIndicator(strokeWidth: 3), + ClaudeButtonState.sending => const WaitWatch( + operation: 'claude.estimate', + child: SizedBox( + width: 24, + height: 24, + child: CircularProgressIndicator(strokeWidth: 3), + ), ), ClaudeButtonState.queued => const Icon( Icons.hourglass_top, diff --git a/app/pubspec.lock b/app/pubspec.lock index 5477e70..468420b 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -166,11 +166,11 @@ packages: dependency: "direct main" description: path: crdt_sync_flutter - ref: "crdt_sync_flutter-v0.8.3" - resolved-ref: "6e3f86ef0d73ba45db975bf03915fecce8a60f98" + ref: "crdt_sync_flutter-v0.9.0" + resolved-ref: dfc5d07f5225ed15609f9709748ed2efd6cc4d1d url: "https://github.com/kuhyx/utils" source: git - version: "0.8.3" + version: "0.9.0" cross_file: dependency: transitive description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index cf5dfb3..87bd870 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: crdt_sync_flutter: git: url: https://github.com/kuhyx/utils - ref: crdt_sync_flutter-v0.8.3 + ref: crdt_sync_flutter-v0.9.0 path: crdt_sync_flutter crypto: 3.0.8 cryptography: 2.9.0