From 3a747c2e5134deb612d5062add13b3d066cbf410 Mon Sep 17 00:00:00 2001 From: Krzysztof kuhy Rudnicki Date: Tue, 17 Nov 2026 23:07:58 +0100 Subject: [PATCH] Report errors and slow waits to the board crdt_sync_flutter 0.9.0's installAppErrors in main(): uncaught errors and every spinner shown over 1 s (WaitWatch: sync.run, mirror.test) upload to RTDB /todo/errors/ with the versionCode, where the PC app-errors ingest files board tickets (kuhyx/utils DOCS-app-errors.md). The app moves to material_ui first: sync_settings_ui 0.8.x and design_system 0.4.x sit on it, and Flutter 3.50 deprecates flutter/material. Pins: crdt_sync 0.14.1, csf 0.9.0, ssui 0.8.3, gda 0.5.1, design_system 0.4.1, image 4.13.1, mcp_dart 2.4.4. file_picker stays 13.3.3, held by data_transfer_flutter 0.2.2 (allowlisted, self-clearing). appRoute takes a route name so each report names its screen; the release build passes APP_BUILD/APP_VERSION. Nothing new on screen. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/release-apk.yml | 4 +- dependency-freshness.allowlist.yaml | 13 +++ lib/main.dart | 31 ++++++- lib/sync/e2e_passphrase_path.dart | 1 + lib/ui/app_route.dart | 14 ++- lib/ui/attachment_picking.dart | 2 +- lib/ui/capture_app_bar.dart | 14 ++- lib/ui/capture_confirm_mark.dart | 2 +- lib/ui/capture_screen.dart | 2 +- lib/ui/capture_screen_sync.dart | 2 + lib/ui/capture_status.dart | 2 +- lib/ui/capture_status_footer.dart | 2 +- lib/ui/cloud_images_settings.dart | 9 +- lib/ui/confirm_delete.dart | 2 +- lib/ui/cue_snack.dart | 2 +- lib/ui/empty_notes_cue.dart | 2 +- lib/ui/enum_glyphs.dart | 2 +- lib/ui/github_mirror_screen.dart | 14 ++- lib/ui/image_attach.dart | 2 +- lib/ui/images/attachment_strip.dart | 2 +- lib/ui/images/file_embed.dart | 2 +- lib/ui/images/image_embed.dart | 8 +- lib/ui/images/image_viewer_screen.dart | 2 +- lib/ui/markdown_view.dart | 2 +- lib/ui/note_actions_sheet.dart | 2 +- lib/ui/note_date_range_field.dart | 2 +- lib/ui/note_detail_screen.dart | 2 +- lib/ui/note_editor.dart | 2 +- lib/ui/note_editor_chrome.dart | 2 +- lib/ui/note_editor_document.dart | 2 +- lib/ui/note_editor_raw_field.dart | 2 +- lib/ui/note_editor_step_page.dart | 2 +- lib/ui/note_editor_wizard.dart | 2 +- lib/ui/note_form.dart | 2 +- lib/ui/note_form_chrome_gate.dart | 2 +- lib/ui/note_grid_tile.dart | 2 +- lib/ui/note_meta_row.dart | 2 +- lib/ui/note_sheet_details.dart | 2 +- lib/ui/note_task_details.dart | 2 +- lib/ui/note_tile.dart | 2 +- lib/ui/notes_assign_flow.dart | 2 +- lib/ui/notes_filter_sheet.dart | 2 +- lib/ui/notes_grid.dart | 2 +- lib/ui/notes_list_body.dart | 2 +- lib/ui/notes_list_navigation.dart | 3 +- lib/ui/notes_list_screen.dart | 2 +- lib/ui/notes_selection_bar.dart | 2 +- lib/ui/repo_picker_sheet.dart | 2 +- lib/ui/settings_screen.dart | 4 +- lib/ui/status_cue.dart | 2 +- lib/ui/template_glyphs.dart | 2 +- lib/ui/text_free_localizations.dart | 2 +- pubspec.lock | 93 +++++++++++++------ pubspec.yaml | 20 ++-- test/app_errors_probe_test.dart | 85 +++++++++++++++++ test/capture_screen_advanced_test.dart | 2 +- test/capture_screen_created_by_test.dart | 2 +- test/capture_screen_editing_test.dart | 2 +- test/capture_screen_harness.dart | 2 +- test/capture_screen_lifecycle_test.dart | 2 +- test/capture_screen_sync_test.dart | 2 +- test/confirm_delete_test.dart | 2 +- test/github_mirror_device_flow_test.dart | 2 +- test/github_mirror_harness.dart | 2 +- test/github_mirror_screen_test.dart | 2 +- test/markdown_view_test.dart | 2 +- test/motion/capture_confirmation_test.dart | 2 +- test/motion/motion_tokens_test.dart | 2 +- test/note_detail_screen_test.dart | 2 +- test/note_editor_guided_test.dart | 2 +- test/note_editor_harness.dart | 2 +- test/note_editor_modes_test.dart | 2 +- test/note_editor_wizard_test.dart | 2 +- test/notes_grid_geometry_test.dart | 2 +- test/notes_grid_test.dart | 2 +- test/notes_list_assign_test.dart | 2 +- test/notes_list_claude_toggle_test.dart | 2 +- test/notes_list_filter_test.dart | 2 +- test/notes_list_focus_test.dart | 2 +- test/notes_list_harness.dart | 2 +- test/notes_list_one_list_test.dart | 2 +- test/notes_list_repo_filter_test.dart | 2 +- test/notes_list_screen_test.dart | 2 +- test/notes_list_select_test.dart | 2 +- test/settings_screen_backup_test.dart | 2 +- test/settings_screen_e2e_lock_test.dart | 2 +- test/settings_screen_harness.dart | 2 +- test/settings_screen_test.dart | 2 +- test/text_free_guard.dart | 2 +- test/text_free_list_test.dart | 2 +- test/text_free_localizations_test.dart | 2 +- test/text_free_screens_test.dart | 2 +- test/theme_test.dart | 2 +- test/ui_images/attach_files_test.dart | 2 +- test/ui_images/attachment_picking_test.dart | 2 +- test/ui_images/capture_images_test.dart | 2 +- .../ui_images/cloud_images_settings_test.dart | 2 +- .../detail_and_misc_images_test.dart | 2 +- test/ui_images/file_embed_test.dart | 2 +- test/ui_images/image_attach_test.dart | 2 +- test/ui_images/image_embed_test.dart | 2 +- test/ui_images/note_editor_images_test.dart | 2 +- 102 files changed, 343 insertions(+), 146 deletions(-) create mode 100644 dependency-freshness.allowlist.yaml create mode 100644 test/app_errors_probe_test.dart diff --git a/.github/workflows/release-apk.yml b/.github/workflows/release-apk.yml index 81fe521..7d4fc71 100644 --- a/.github/workflows/release-apk.yml +++ b/.github/workflows/release-apk.yml @@ -110,7 +110,9 @@ jobs: flutter build apk --release \ --target-platform android-arm64 \ --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/dependency-freshness.allowlist.yaml b/dependency-freshness.allowlist.yaml new file mode 100644 index 0000000..bfaa6fe --- /dev/null +++ b/dependency-freshness.allowlist.yaml @@ -0,0 +1,13 @@ +# todo's own additions to the fleet-wide allowlist +# (~/src/utils/dependency-freshness.allowlist.yaml). + +exceptions: + - ecosystem: pub + package: file_picker + pinned: "13.3.3" + latest_known: "13.4.0" + reason: >- + sync_settings_ui 0.8.3 depends on data_transfer_flutter 0.2.2, which + exact-pins file_picker 13.3.3, so pub cannot resolve 13.4.0 here + (checked 2026-11-17). Lifts the day data_transfer_flutter bumps it. + blocked_by: "transitive:data_transfer_flutter@0.2.2" diff --git a/lib/main.dart b/lib/main.dart index 1700c4d..a4e257d 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,8 +1,10 @@ // coverage:ignore-file // App bootstrap: opens the platform's note store and calls runApp. Exercised // end-to-end by running the app, not unit tests. +import 'package:crdt_sync_flutter/crdt_sync_flutter.dart' + show AppErrors, AppErrorsConfig, AppErrorsRouteObserver, installAppErrors; import 'package:design_system/design_system.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/analytics/analytics_service.dart'; import 'package:todo/attachments/image_store.dart'; import 'package:todo/attachments/image_store_scope.dart'; @@ -10,17 +12,36 @@ import 'package:todo/data/app_settings.dart'; import 'package:todo/data/note_repository.dart'; import 'package:todo/data/repository_factory.dart'; import 'package:todo/frame_stats.dart'; +import 'package:todo/sync/firebase_client.dart' show openFirebase; import 'package:todo/ui/capture_screen.dart'; import 'package:todo/ui/text_free_localizations.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: 'todo', + repo: 'kuhyx/todo-app', + package: 'todo', + // 0 unless the build passes --dart-define=APP_BUILD. + // ignore: avoid_redundant_argument_values + build: int.fromEnvironment('APP_BUILD'), + version: String.fromEnvironment('APP_VERSION'), + ), + ); installFrameStats(); // Where the log lives, and whether a legacy sqlite DB needs importing, is // platform-specific and resolved by a conditional import: `dart:io` cannot be // imported at all in a web compile, and the desktop app is now a web build. final repository = await openRepository(); + errors.connect( + sink: () async => (await openFirebase())?.patchValues, + deviceId: () async => repository.nodeId, + ); final appSettings = ValueNotifier(await AppSettings.load()); final analytics = AnalyticsService(nodeId: repository.nodeId); // App storage + direct dufs on Android; the wrapper's /images on desktop. @@ -32,6 +53,7 @@ Future main() async { appSettings: appSettings, analytics: analytics, imageStore: imageStore, + errors: errors, ), ); } @@ -46,6 +68,7 @@ class TodoApp extends StatelessWidget { required this.appSettings, required this.analytics, required this.imageStore, + this.errors, super.key, }); @@ -63,6 +86,9 @@ class TodoApp extends StatelessWidget { /// The single, app-wide store for attached images. final ImageStore imageStore; + /// App-wide error reporting; null in widget tests. + final AppErrors? errors; + @override Widget build(BuildContext context) { // Above MaterialApp so pushed routes (note detail) see it too. @@ -73,6 +99,9 @@ class TodoApp extends StatelessWidget { localizationsDelegates: kTextFreeLocalizations, theme: buildLightTheme(), darkTheme: buildDarkTheme(), + navigatorObservers: [ + if (errors case final errors?) AppErrorsRouteObserver(errors), + ], home: CaptureScreen( repository: repository, appSettings: appSettings, diff --git a/lib/sync/e2e_passphrase_path.dart b/lib/sync/e2e_passphrase_path.dart index 9e58f7f..ec33425 100644 --- a/lib/sync/e2e_passphrase_path.dart +++ b/lib/sync/e2e_passphrase_path.dart @@ -5,4 +5,5 @@ /// transitive `dart:ui`. library; +/// The route the wrapper serves the passphrase on, once. const kSyncE2ePassphrasePath = '/sync-e2e-passphrase'; diff --git a/lib/ui/app_route.dart b/lib/ui/app_route.dart index ff373f8..2bc476f 100644 --- a/lib/ui/app_route.dart +++ b/lib/ui/app_route.dart @@ -1,7 +1,7 @@ /// The one page route every screen is pushed with. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A route for [builder] that switches screens instantly: no fade, no slide. /// @@ -10,11 +10,17 @@ import 'package:flutter/material.dart'; /// thread and a 260-300 ms frame stall on every tab switch and note open. /// The same instant switch applies on the phone. The context is unused but /// kept so every call site stays as it was. -Route appRoute(BuildContext _, WidgetBuilder builder) => - _AppPageRoute(builder: builder); +/// +/// [name] is a route pattern (`/notes/detail`), never an id or a title: the +/// app-errors reporter stamps it on every report made on that screen. +Route appRoute(BuildContext _, WidgetBuilder builder, {String? name}) => + _AppPageRoute( + builder: builder, + settings: RouteSettings(name: name), + ); class _AppPageRoute extends MaterialPageRoute { - _AppPageRoute({required super.builder}); + _AppPageRoute({required super.builder, super.settings}); @override Duration get transitionDuration => Duration.zero; diff --git a/lib/ui/attachment_picking.dart b/lib/ui/attachment_picking.dart index afd269d..2cf7891 100644 --- a/lib/ui/attachment_picking.dart +++ b/lib/ui/attachment_picking.dart @@ -5,8 +5,8 @@ library; import 'package:file_picker/file_picker.dart' show FilePicker; import 'package:file_selector/file_selector.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; +import 'package:material_ui/material_ui.dart'; export 'package:file_selector/file_selector.dart' show XFile; diff --git a/lib/ui/capture_app_bar.dart b/lib/ui/capture_app_bar.dart index 52eb0f0..a0efb61 100644 --- a/lib/ui/capture_app_bar.dart +++ b/lib/ui/capture_app_bar.dart @@ -4,8 +4,9 @@ /// screen still owns every action; this just lays the row out. library; +import 'package:crdt_sync_flutter/crdt_sync_flutter.dart' show WaitWatch; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note_repository.dart'; import 'package:todo/frame_stats.dart'; @@ -93,10 +94,13 @@ class CaptureAppBar extends StatelessWidget implements PreferredSizeWidget { IconButton( onPressed: syncing ? null : onSync, icon: syncing - ? const SizedBox( - width: 18, - height: 18, - child: CircularProgressIndicator(strokeWidth: 2), + ? const WaitWatch( + operation: 'sync.run', + child: SizedBox( + width: 18, + height: 18, + child: CircularProgressIndicator(strokeWidth: 2), + ), ) : const Icon(Icons.sync, semanticLabel: 'Sync'), ), diff --git a/lib/ui/capture_confirm_mark.dart b/lib/ui/capture_confirm_mark.dart index 160770a..a6faf26 100644 --- a/lib/ui/capture_confirm_mark.dart +++ b/lib/ui/capture_confirm_mark.dart @@ -3,7 +3,7 @@ library; import 'package:design_system/design_system.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Plays once each time [captured] changes value. class CaptureConfirmMark extends StatefulWidget { diff --git a/lib/ui/capture_screen.dart b/lib/ui/capture_screen.dart index 45acab1..a0b2e58 100644 --- a/lib/ui/capture_screen.dart +++ b/lib/ui/capture_screen.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:http/http.dart' as http; +import 'package:material_ui/material_ui.dart'; import 'package:todo/analytics/analytics_event.dart'; import 'package:todo/analytics/analytics_service.dart'; import 'package:todo/attachments/image_store_scope.dart'; diff --git a/lib/ui/capture_screen_sync.dart b/lib/ui/capture_screen_sync.dart index 09f9d19..d8a41dc 100644 --- a/lib/ui/capture_screen_sync.dart +++ b/lib/ui/capture_screen_sync.dart @@ -75,6 +75,7 @@ extension _CaptureSyncBehaviour on _CaptureScreenState { analytics: widget.analytics, httpClient: widget.httpClient, ), + name: '/settings', ), ); if (!mounted) return; @@ -94,6 +95,7 @@ extension _CaptureSyncBehaviour on _CaptureScreenState { repository: widget.repository, appSettings: widget.appSettings, ), + name: '/notes', ), ); } diff --git a/lib/ui/capture_status.dart b/lib/ui/capture_status.dart index 4375f13..032b605 100644 --- a/lib/ui/capture_status.dart +++ b/lib/ui/capture_status.dart @@ -6,7 +6,7 @@ /// library-scoped. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:todo/sync/sync_service.dart'; diff --git a/lib/ui/capture_status_footer.dart b/lib/ui/capture_status_footer.dart index 52755b1..45aa3d8 100644 --- a/lib/ui/capture_status_footer.dart +++ b/lib/ui/capture_status_footer.dart @@ -5,7 +5,7 @@ library; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/ui/capture_status.dart'; diff --git a/lib/ui/cloud_images_settings.dart b/lib/ui/cloud_images_settings.dart index 962b4cf..69f2b12 100644 --- a/lib/ui/cloud_images_settings.dart +++ b/lib/ui/cloud_images_settings.dart @@ -10,10 +10,9 @@ library; import 'dart:async'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:http/http.dart' as http; - +import 'package:material_ui/material_ui.dart'; import 'package:todo/attachments/image_password_store.dart'; import 'package:todo/attachments/image_store_api.dart'; import 'package:todo/attachments/image_store_scope.dart'; @@ -39,7 +38,11 @@ class CloudImagesTile extends StatelessWidget { leading: const Icon(Icons.cloud, semanticLabel: 'Cloud images'), trailing: const Icon(Icons.chevron_right), onTap: () => Navigator.of(context).push( - appRoute(context, (_) => CloudImagesScreen(httpClient: httpClient)), + appRoute( + context, + (_) => CloudImagesScreen(httpClient: httpClient), + name: '/settings/images', + ), ), ); } diff --git a/lib/ui/confirm_delete.dart b/lib/ui/confirm_delete.dart index b1405ec..4eea2f4 100644 --- a/lib/ui/confirm_delete.dart +++ b/lib/ui/confirm_delete.dart @@ -6,8 +6,8 @@ /// and the barrier answer "no", and the confirm glyph wears the error colour. library; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; /// Asks whether to delete a note; true only when the delete glyph is pressed. Future confirmDeleteNote(BuildContext context) async { diff --git a/lib/ui/cue_snack.dart b/lib/ui/cue_snack.dart index cf60f37..a18ffc6 100644 --- a/lib/ui/cue_snack.dart +++ b/lib/ui/cue_snack.dart @@ -7,7 +7,7 @@ library; import 'package:design_system/design_system.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; const Duration _toastDuration = Duration(seconds: 3); const Duration _errorDuration = Duration(seconds: 5); diff --git a/lib/ui/empty_notes_cue.dart b/lib/ui/empty_notes_cue.dart index babd913..a4d5c9c 100644 --- a/lib/ui/empty_notes_cue.dart +++ b/lib/ui/empty_notes_cue.dart @@ -1,7 +1,7 @@ /// The notes list's empty state as a picture, not a sentence. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A large muted glyph: an empty inbox when there are no notes at all, a /// crossed-out filter when the current filter hides every note (the filter diff --git a/lib/ui/enum_glyphs.dart b/lib/ui/enum_glyphs.dart index 0867c0e..5a02ba8 100644 --- a/lib/ui/enum_glyphs.dart +++ b/lib/ui/enum_glyphs.dart @@ -4,7 +4,7 @@ /// The enum's `label` survives only as the spoken (semantics) label. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note.dart'; import 'package:todo/ui/note_grid_tile.dart'; diff --git a/lib/ui/github_mirror_screen.dart b/lib/ui/github_mirror_screen.dart index 0d2f642..0b01656 100644 --- a/lib/ui/github_mirror_screen.dart +++ b/lib/ui/github_mirror_screen.dart @@ -1,9 +1,10 @@ import 'dart:async'; import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:crdt_sync_flutter/crdt_sync_flutter.dart' show WaitWatch; import 'package:github_device_auth/github_device_auth.dart'; import 'package:http/http.dart' as http; +import 'package:material_ui/material_ui.dart'; import 'package:todo/analytics/analytics_service.dart'; import 'package:todo/data/app_settings.dart'; import 'package:todo/data/note_repository.dart'; @@ -222,10 +223,13 @@ class _GitHubMirrorScreenState extends State { IconButton.outlined( onPressed: _testing ? null : _test, icon: _testing - ? const SizedBox( - width: 16, - height: 16, - child: CircularProgressIndicator(strokeWidth: 2), + ? const WaitWatch( + operation: 'mirror.test', + child: SizedBox( + width: 16, + height: 16, + child: CircularProgressIndicator(strokeWidth: 2), + ), ) : const Icon( Icons.wifi_tethering, diff --git a/lib/ui/image_attach.dart b/lib/ui/image_attach.dart index 756455a..172dde8 100644 --- a/lib/ui/image_attach.dart +++ b/lib/ui/image_attach.dart @@ -9,7 +9,7 @@ library; import 'dart:typed_data'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/attachments/image_store_api.dart'; import 'package:todo/attachments/image_store_scope.dart'; diff --git a/lib/ui/images/attachment_strip.dart b/lib/ui/images/attachment_strip.dart index 7617ff7..393efd7 100644 --- a/lib/ui/images/attachment_strip.dart +++ b/lib/ui/images/attachment_strip.dart @@ -1,5 +1,5 @@ import 'package:design_system/design_system.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/images/attachment_links.dart'; import 'package:todo/ui/images/file_embed.dart'; diff --git a/lib/ui/images/file_embed.dart b/lib/ui/images/file_embed.dart index 77d5a27..d3319b4 100644 --- a/lib/ui/images/file_embed.dart +++ b/lib/ui/images/file_embed.dart @@ -3,7 +3,7 @@ library; import 'package:design_system/design_system.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/attachments/image_store_api.dart'; import 'package:todo/attachments/image_store_scope.dart'; diff --git a/lib/ui/images/image_embed.dart b/lib/ui/images/image_embed.dart index 630969b..ad92d6e 100644 --- a/lib/ui/images/image_embed.dart +++ b/lib/ui/images/image_embed.dart @@ -2,7 +2,7 @@ /// saying why it is not here yet. Tapping opens it full screen. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/attachments/image_store_api.dart'; import 'package:todo/attachments/image_store_scope.dart'; @@ -42,7 +42,11 @@ class ImageEmbed extends StatelessWidget { onTap: source is MissingImageSource ? null : () => Navigator.of(context).push( - appRoute(context, (_) => ImageViewerScreen(source: source)), + appRoute( + context, + (_) => ImageViewerScreen(source: source), + name: '/image', + ), ), child: ClipRRect( borderRadius: BorderRadius.circular(8), diff --git a/lib/ui/images/image_viewer_screen.dart b/lib/ui/images/image_viewer_screen.dart index 89567e4..471eb36 100644 --- a/lib/ui/images/image_viewer_screen.dart +++ b/lib/ui/images/image_viewer_screen.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/attachments/image_store_api.dart'; import 'package:todo/ui/images/image_embed.dart'; diff --git a/lib/ui/markdown_view.dart b/lib/ui/markdown_view.dart index ed4eab4..ad7f1c7 100644 --- a/lib/ui/markdown_view.dart +++ b/lib/ui/markdown_view.dart @@ -1,5 +1,5 @@ import 'package:design_system/design_system.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/images/attachment_links.dart'; import 'package:todo/ui/images/file_embed.dart'; diff --git a/lib/ui/note_actions_sheet.dart b/lib/ui/note_actions_sheet.dart index bc93374..89ffe29 100644 --- a/lib/ui/note_actions_sheet.dart +++ b/lib/ui/note_actions_sheet.dart @@ -6,7 +6,7 @@ library; import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note.dart'; import 'package:todo/data/note_template.dart'; import 'package:todo/ui/confirm_delete.dart'; diff --git a/lib/ui/note_date_range_field.dart b/lib/ui/note_date_range_field.dart index 31a26c8..a4929bd 100644 --- a/lib/ui/note_date_range_field.dart +++ b/lib/ui/note_date_range_field.dart @@ -7,7 +7,7 @@ library; import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Glyph for "created" (a note added), shared by the filter and sort menus. const IconData kCreatedIcon = Icons.post_add; diff --git a/lib/ui/note_detail_screen.dart b/lib/ui/note_detail_screen.dart index cfe6683..0e9e745 100644 --- a/lib/ui/note_detail_screen.dart +++ b/lib/ui/note_detail_screen.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/app_settings.dart'; import 'package:todo/data/note.dart'; import 'package:todo/data/note_repository.dart'; diff --git a/lib/ui/note_editor.dart b/lib/ui/note_editor.dart index 581313a..a317d86 100644 --- a/lib/ui/note_editor.dart +++ b/lib/ui/note_editor.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note.dart'; import 'package:todo/data/note_template.dart'; diff --git a/lib/ui/note_editor_chrome.dart b/lib/ui/note_editor_chrome.dart index 2ad8f46..12c206a 100644 --- a/lib/ui/note_editor_chrome.dart +++ b/lib/ui/note_editor_chrome.dart @@ -6,7 +6,7 @@ /// built in Preview and Raw. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note_template.dart'; import 'package:todo/ui/note_editor_mode.dart'; diff --git a/lib/ui/note_editor_document.dart b/lib/ui/note_editor_document.dart index 7577b41..a1ff188 100644 --- a/lib/ui/note_editor_document.dart +++ b/lib/ui/note_editor_document.dart @@ -12,7 +12,7 @@ /// [body] and the editor shows the raw field instead. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note_template.dart'; diff --git a/lib/ui/note_editor_raw_field.dart b/lib/ui/note_editor_raw_field.dart index d4f3ac6..4709a52 100644 --- a/lib/ui/note_editor_raw_field.dart +++ b/lib/ui/note_editor_raw_field.dart @@ -5,7 +5,7 @@ library; import 'package:design_system/design_system.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A full-height plain-text field for the note's assembled Markdown. class NoteEditorRawField extends StatelessWidget { diff --git a/lib/ui/note_editor_step_page.dart b/lib/ui/note_editor_step_page.dart index 7365f75..d9812e7 100644 --- a/lib/ui/note_editor_step_page.dart +++ b/lib/ui/note_editor_step_page.dart @@ -12,7 +12,7 @@ library; import 'package:design_system/design_system.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note_template.dart'; import 'package:todo/ui/motion.dart'; diff --git a/lib/ui/note_editor_wizard.dart b/lib/ui/note_editor_wizard.dart index 108e309..b70bb2a 100644 --- a/lib/ui/note_editor_wizard.dart +++ b/lib/ui/note_editor_wizard.dart @@ -9,7 +9,7 @@ /// make sense before there is anything to guide. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note.dart'; import 'package:todo/data/note_template.dart'; diff --git a/lib/ui/note_form.dart b/lib/ui/note_form.dart index ba71a71..5d9c5d8 100644 --- a/lib/ui/note_form.dart +++ b/lib/ui/note_form.dart @@ -8,7 +8,7 @@ /// defaults to false. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note.dart'; import 'package:todo/data/note_template.dart'; diff --git a/lib/ui/note_form_chrome_gate.dart b/lib/ui/note_form_chrome_gate.dart index 7fdaea5..6d28ca8 100644 --- a/lib/ui/note_form_chrome_gate.dart +++ b/lib/ui/note_form_chrome_gate.dart @@ -5,7 +5,7 @@ /// lives here so both surfaces resolve visibility by the same rule. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Holds the editor's chrome-visibility signal and resolves it against /// advanced mode. diff --git a/lib/ui/note_grid_tile.dart b/lib/ui/note_grid_tile.dart index 029c8c3..323e91a 100644 --- a/lib/ui/note_grid_tile.dart +++ b/lib/ui/note_grid_tile.dart @@ -2,7 +2,7 @@ library; import 'package:design_system/design_system.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note.dart'; import 'package:todo/data/note_template.dart'; diff --git a/lib/ui/note_meta_row.dart b/lib/ui/note_meta_row.dart index 68dd2be..a380fa5 100644 --- a/lib/ui/note_meta_row.dart +++ b/lib/ui/note_meta_row.dart @@ -5,7 +5,7 @@ /// two cannot drift apart. Public only because Dart privacy is library-scoped. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note.dart'; import 'package:todo/ui/enum_glyphs.dart'; diff --git a/lib/ui/note_sheet_details.dart b/lib/ui/note_sheet_details.dart index c2862f3..4003583 100644 --- a/lib/ui/note_sheet_details.dart +++ b/lib/ui/note_sheet_details.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note.dart'; import 'package:todo/images/attachment_links.dart'; diff --git a/lib/ui/note_task_details.dart b/lib/ui/note_task_details.dart index 30d83b0..ae3f929 100644 --- a/lib/ui/note_task_details.dart +++ b/lib/ui/note_task_details.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note.dart'; /// Read-only repo-task fields of [note]; empty for a plain idea. diff --git a/lib/ui/note_tile.dart b/lib/ui/note_tile.dart index b2c34e7..38cd208 100644 --- a/lib/ui/note_tile.dart +++ b/lib/ui/note_tile.dart @@ -4,7 +4,7 @@ /// Dart privacy is library-scoped. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note.dart'; import 'package:todo/data/note_template.dart'; diff --git a/lib/ui/notes_assign_flow.dart b/lib/ui/notes_assign_flow.dart index 78041b1..10514ca 100644 --- a/lib/ui/notes_assign_flow.dart +++ b/lib/ui/notes_assign_flow.dart @@ -4,7 +4,7 @@ /// assign never starts a task. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note_repository.dart'; import 'package:todo/data/repo_assign.dart'; diff --git a/lib/ui/notes_filter_sheet.dart b/lib/ui/notes_filter_sheet.dart index 5810e0e..187c6bb 100644 --- a/lib/ui/notes_filter_sheet.dart +++ b/lib/ui/notes_filter_sheet.dart @@ -6,7 +6,7 @@ /// `_NotesListScreenState._openFilters`. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note.dart'; import 'package:todo/data/note_repository.dart'; diff --git a/lib/ui/notes_grid.dart b/lib/ui/notes_grid.dart index c9be91b..fbe6359 100644 --- a/lib/ui/notes_grid.dart +++ b/lib/ui/notes_grid.dart @@ -1,7 +1,7 @@ import 'dart:math' as math; import 'package:design_system/design_system.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note.dart'; import 'package:todo/ui/note_grid_tile.dart'; diff --git a/lib/ui/notes_list_body.dart b/lib/ui/notes_list_body.dart index 1f21afe..de4d41d 100644 --- a/lib/ui/notes_list_body.dart +++ b/lib/ui/notes_list_body.dart @@ -3,7 +3,7 @@ /// Split out of `notes_list_screen.dart` for file size. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note.dart'; import 'package:todo/ui/note_tile.dart'; diff --git a/lib/ui/notes_list_navigation.dart b/lib/ui/notes_list_navigation.dart index 5b65f12..76e4167 100644 --- a/lib/ui/notes_list_navigation.dart +++ b/lib/ui/notes_list_navigation.dart @@ -5,7 +5,7 @@ /// context, the note, and the store. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/app_settings.dart'; import 'package:todo/data/note.dart'; @@ -32,6 +32,7 @@ Future openNote( repository: repository, appSettings: appSettings, ), + name: '/notes/detail', ), ); } diff --git a/lib/ui/notes_list_screen.dart b/lib/ui/notes_list_screen.dart index f48be14..856c0b0 100644 --- a/lib/ui/notes_list_screen.dart +++ b/lib/ui/notes_list_screen.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/app_settings.dart'; import 'package:todo/data/note.dart'; diff --git a/lib/ui/notes_selection_bar.dart b/lib/ui/notes_selection_bar.dart index db9de24..2f49a3e 100644 --- a/lib/ui/notes_selection_bar.dart +++ b/lib/ui/notes_selection_bar.dart @@ -3,7 +3,7 @@ library; import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note.dart'; import 'package:todo/ui/note_grid_tile.dart'; diff --git a/lib/ui/repo_picker_sheet.dart b/lib/ui/repo_picker_sheet.dart index bdc153d..bddd7e2 100644 --- a/lib/ui/repo_picker_sheet.dart +++ b/lib/ui/repo_picker_sheet.dart @@ -1,7 +1,7 @@ /// Bottom sheet picking the repo selected notes are assigned to. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/repo_assign.dart'; diff --git a/lib/ui/settings_screen.dart b/lib/ui/settings_screen.dart index 3e7bcb1..c06be2f 100644 --- a/lib/ui/settings_screen.dart +++ b/lib/ui/settings_screen.dart @@ -4,8 +4,8 @@ import 'package:crdt_sync/crdt_sync.dart'; import 'package:crdt_sync_flutter/crdt_sync_flutter.dart' show E2ePassphraseButton; import 'package:file_selector/file_selector.dart'; -import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; +import 'package:material_ui/material_ui.dart'; import 'package:sync_settings_ui/sync_settings_ui.dart'; import 'package:todo/analytics/analytics_event.dart'; import 'package:todo/analytics/analytics_service.dart'; @@ -198,6 +198,7 @@ class _SettingsScreenState extends State { googleAvailable: widget.googleAvailable ?? googleSignInSupported, backup: BackupSlot(label: 'notes', export: _export, import: _import), ), + name: '/settings/sync', ), ); } @@ -215,6 +216,7 @@ class _SettingsScreenState extends State { firebaseFactory: widget.firebaseFactory, stateStore: widget.stateStore, ), + name: '/settings/github', ), ); } diff --git a/lib/ui/status_cue.dart b/lib/ui/status_cue.dart index de0f342..0d93dad 100644 --- a/lib/ui/status_cue.dart +++ b/lib/ui/status_cue.dart @@ -1,7 +1,7 @@ /// A screen's latest result as a glyph in place of a status sentence. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// One result: what to paint, whether it is a failure, and the old /// sentence, kept as the spoken label only. diff --git a/lib/ui/template_glyphs.dart b/lib/ui/template_glyphs.dart index 5c391ba..254ee27 100644 --- a/lib/ui/template_glyphs.dart +++ b/lib/ui/template_glyphs.dart @@ -5,7 +5,7 @@ /// the editor paints around them is a glyph; the label and helper are spoken. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:todo/data/note_template.dart'; diff --git a/lib/ui/text_free_localizations.dart b/lib/ui/text_free_localizations.dart index 1da01e8..89f0074 100644 --- a/lib/ui/text_free_localizations.dart +++ b/lib/ui/text_free_localizations.dart @@ -9,7 +9,7 @@ library; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// English Material strings with every button tooltip blanked. class TextFreeMaterialLocalizations extends DefaultMaterialLocalizations { diff --git a/pubspec.lock b/pubspec.lock index e61ea01..a6b8eee 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -77,10 +77,10 @@ packages: dependency: transitive description: name: clock - sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + sha256: e51d50bca3217c9a9fa2b41a30e4a38971133f5f9ec7a3d57bae095007f1d28e url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.3" code_assets: dependency: transitive description: @@ -109,20 +109,20 @@ packages: dependency: "direct main" description: path: crdt_sync_dart - ref: "crdt_sync_dart-v0.14.0" - resolved-ref: "84343aec2dd07c38cba40690c3b5f2c84ae9cdf6" + ref: "crdt_sync_dart-v0.14.1" + resolved-ref: edd0f7a7882cb1d3904932ba94faa282d08165df url: "https://github.com/kuhyx/utils" source: git - version: "0.14.0" + version: "0.14.1" crdt_sync_flutter: dependency: "direct main" description: path: crdt_sync_flutter - ref: "crdt_sync_flutter-v0.8.0" - resolved-ref: e5990c9c15761934110f955529bc1d68479b06ff + ref: "crdt_sync_flutter-v0.9.0" + resolved-ref: dfc5d07f5225ed15609f9709748ed2efd6cc4d1d url: "https://github.com/kuhyx/utils" source: git - version: "0.8.0" + version: "0.9.0" cross_file: dependency: transitive description: @@ -155,6 +155,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.0" + cupertino_ui: + dependency: transitive + description: + name: cupertino_ui + sha256: c3eaf7f5bdfee36deb0b14a4cbf7602f1b6b8d8b8576b81f38fc08c25881c94c + url: "https://pub.dev" + source: hosted + version: "1.1.7" data_transfer_flutter: dependency: transitive description: @@ -176,11 +184,11 @@ packages: dependency: "direct main" description: path: design_system - ref: "design_system-v0.3.1" - resolved-ref: "8dfc4fb55ff5f5091e34e118f3134138cc83b8a3" + ref: "design_system-v0.4.1" + resolved-ref: "422a5e53d975b7a1cbeadeb4e29ab0965bfc4bec" url: "https://github.com/kuhyx/utils" source: git - version: "0.3.1" + version: "0.4.1" dev_build: dependency: transitive description: @@ -346,6 +354,11 @@ packages: url: "https://pub.dev" source: hosted version: "0.14.4" + flutter_localizations: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -416,11 +429,11 @@ packages: dependency: "direct main" description: path: github_device_auth - ref: "github_device_auth-v0.4.0" - resolved-ref: "3084080d744c348a217727e26a6be838e7d5a4ff" + ref: "github_device_auth-v0.5.1" + resolved-ref: da1d7c0692e2e402ae4944f2425b36a55ad43e9c url: "https://github.com/kuhyx/utils" source: git - version: "0.4.0" + version: "0.5.1" glob: dependency: transitive description: @@ -474,10 +487,10 @@ packages: dependency: "direct main" description: name: image - sha256: "89ed75b2f8231fe676808c5564f9590d728024ded7ac782a7ed8474f1c95b72a" + sha256: bc13f61f0f5cb77936e78ae5dae3800f442718dac5d2bc4654f03c239230ed0c url: "https://pub.dev" source: hosted - version: "4.12.0" + version: "4.13.1" image_picker: dependency: "direct main" description: @@ -542,6 +555,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.2" + intl: + dependency: transitive + description: + name: intl + sha256: "1ca20c894b1717686a2319b8548763d812bc0aabdac580420a44c5178c57a867" + url: "https://pub.dev" + source: hosted + version: "0.20.3" jni: dependency: transitive description: @@ -590,6 +611,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" + listen: + dependency: transitive + description: + name: listen + sha256: "47501a08016a43fcad79252439d723f50f14f88fa7bfd8a177e0a417e5c9e1f2" + url: "https://pub.dev" + source: hosted + version: "1.0.1" logging: dependency: transitive description: @@ -614,14 +643,22 @@ packages: url: "https://pub.dev" source: hosted version: "0.13.0" + material_ui: + dependency: "direct main" + description: + name: material_ui + sha256: a6b19012df437a356cbc01f8ea22a105e07194c47c9a6009da0032a0ce35c4ab + url: "https://pub.dev" + source: hosted + version: "1.11.1" mcp_dart: dependency: "direct main" description: name: mcp_dart - sha256: af0b2e25412f70440c881314a0b70a56ef87fd090b3eb71f31c356313096e6f5 + sha256: "0fdd953006edb8bce24d31f2d36d5c4acc89009e1331417955d3e77560cdb77b" url: "https://pub.dev" source: hosted - version: "2.4.3" + version: "2.4.4" meta: dependency: transitive description: @@ -999,10 +1036,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + sha256: "277654b3034d17ac6f9f1cb5595db011b1d5d41e8806866db28e0abaa101c490" url: "https://pub.dev" source: hosted - version: "1.12.1" + version: "1.12.2" stream_channel: dependency: transitive description: @@ -1023,11 +1060,11 @@ packages: dependency: "direct main" description: path: sync_settings_ui - ref: "sync_settings_ui-v0.7.2" - resolved-ref: "4567e7ca3042e683befdf6697ace1c8be9c829fc" + ref: "sync_settings_ui-v0.8.3" + resolved-ref: dde5566b2c6eb38a8e1e58a4252925f3baca8ad1 url: "https://github.com/kuhyx/utils" source: git - version: "0.7.2" + version: "0.8.3" synchronized: dependency: transitive description: @@ -1048,10 +1085,10 @@ packages: dependency: transitive description: name: test_api - sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11" + sha256: "0a10344e901e5b2e63819567951cb6a06673ed6b84f40462188ff5a0c41f371f" url: "https://pub.dev" source: hosted - version: "0.7.12" + version: "0.7.14" typed_data: dependency: transitive description: @@ -1136,10 +1173,10 @@ packages: dependency: transitive description: name: vector_math - sha256: f36f9f3be64c6198714492bb455c11056e33e2f85d9a0b676a48301e44fdcf47 + sha256: fa49e1674cb84acb900141714e6c6e1f9ae099827c24d141430ff6819db4e1bc url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.4.4" very_good_analysis: dependency: "direct dev" description: @@ -1206,4 +1243,4 @@ packages: version: "3.1.3" sdks: dart: ">=3.13.0 <4.0.0" - flutter: ">=3.44.0" + flutter: ">=3.47.0" diff --git a/pubspec.yaml b/pubspec.yaml index 1d48f6a..19aaa5d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.95+1 +version: 1.0.96+1 environment: sdk: ^3.12.2 @@ -33,12 +33,12 @@ dependencies: crdt_sync: git: url: https://github.com/kuhyx/utils - ref: crdt_sync_dart-v0.14.0 + ref: crdt_sync_dart-v0.14.1 path: crdt_sync_dart crdt_sync_flutter: git: url: https://github.com/kuhyx/utils - ref: crdt_sync_flutter-v0.8.0 + ref: crdt_sync_flutter-v0.9.0 path: crdt_sync_flutter # The following adds the Cupertino Icons font to your application. @@ -50,7 +50,7 @@ dependencies: design_system: git: url: https://github.com/kuhyx/utils - ref: design_system-v0.3.1 + ref: design_system-v0.4.1 path: design_system file_picker: 13.3.3 file_selector: 1.1.0 @@ -64,7 +64,7 @@ dependencies: github_device_auth: git: url: https://github.com/kuhyx/utils - ref: github_device_auth-v0.4.0 + ref: github_device_auth-v0.5.1 path: github_device_auth # One-tap Google ID token via the framework AccountManager chooser (FOSS, # no Play Services sign-in SDK). Used by the sync backend in lib/sync/. @@ -77,12 +77,16 @@ dependencies: idb_shim: 2.11.3 # Re-encodes attached images (resize, EXIF strip) in pure Dart, so the # phone and the desktop wrapper share one code path. - image: 4.12.0 + image: 4.13.1 # Camera + gallery picks for image attachments on Android. image_picker: 1.2.4 + # Flutter 3.50 deprecates package:flutter/material.dart; the shared UI + # packages (design_system, sync_settings_ui) sit on material_ui, so the app + # must too or their widgets lose MaterialLocalizations. + material_ui: 1.11.1 # The todo MCP server (lib/mcp/): Streamable HTTP transport + tool # registry. Only mcp/todo_mcp.dart imports it; the app never does. - mcp_dart: 2.4.3 + mcp_dart: 2.4.4 # Hands an attached non-image file to whichever Android app opens its # type (FileProvider intent). Adds no permissions to the manifest. open_file: 4.0.0 @@ -102,7 +106,7 @@ dependencies: sync_settings_ui: git: url: https://github.com/kuhyx/utils - ref: sync_settings_ui-v0.7.2 + ref: sync_settings_ui-v0.8.3 path: sync_settings_ui url_launcher: 6.3.3 uuid: 4.6.0 diff --git a/test/app_errors_probe_test.dart b/test/app_errors_probe_test.dart new file mode 100644 index 0000000..b74d3a4 --- /dev/null +++ b/test/app_errors_probe_test.dart @@ -0,0 +1,85 @@ +// Proves the shared app-errors reporter end to end inside the test runner: +// one uncaught error and one wait over a second each become exactly one +// uploaded entry, and both carry the build. The sink writes to a file in +// place of RTDB so the probe needs no network. +import 'dart:convert'; +import 'dart:io'; +import 'dart:ui'; + +import 'package:crdt_sync_flutter/crdt_sync_flutter.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +void main() { + late FlutterExceptionHandler? savedFlutter; + late ErrorCallback? savedAsync; + late Directory dir; + + setUp(() { + SharedPreferences.setMockInitialValues({}); + savedFlutter = FlutterError.onError; + savedAsync = PlatformDispatcher.instance.onError; + dir = Directory.systemTemp.createTempSync('app_errors_probe'); + }); + + tearDown(() { + FlutterError.onError = savedFlutter; + PlatformDispatcher.instance.onError = savedAsync; + AppErrors.instance = null; + dir.deleteSync(recursive: true); + }); + + testWidgets('one error and one 2 s wait upload with the build', (t) async { + // The deliberate error must not fail the test, so the handler the + // reporter chains to is a no-op. + FlutterError.onError = (_) {}; + final errors = await installAppErrors( + const AppErrorsConfig( + app: 'todo', + repo: 'kuhyx/todo-app', + package: 'todo', + build: 4242, + version: '1.2.3', + ), + ); + final out = File('${dir.path}/sink.jsonl'); + final uploader = errors.connect( + sink: () async => + (path, values) async => out.writeAsStringSync( + '${jsonEncode({'path': path, 'values': values})}\n', + mode: FileMode.append, + ), + deviceId: () async => 'probe-device', + startDelay: Duration.zero, + ); + + FlutterError.onError!( + FlutterErrorDetails(exception: StateError('probe boom')), + ); + + await t.pumpWidget( + const WaitWatch(operation: 'probe.wait', child: SizedBox()), + ); + await t.runAsync(() => Future.delayed(const Duration(seconds: 2))); + await t.pumpWidget(const SizedBox()); + + await t.runAsync(uploader.flush); + uploader.dispose(); + + final entries = [ + for (final line in out.readAsLinesSync()) + for (final v + in ((jsonDecode(line) as Map)['values'] as Map).values.cast()) + v, + ]; + final kinds = entries.map((e) => e['kind']).toList()..sort(); + expect(kinds, ['perf.slow', 'uncaught.flutter']); + expect(entries.map((e) => e['build']).toSet(), {4242}); + expect(entries.map((e) => e['repo']).toSet(), {'kuhyx/todo-app'}); + final slow = entries.firstWhere((e) => e['kind'] == 'perf.slow'); + expect(slow['operation'], 'probe.wait'); + expect(slow['durationMs'] as int, greaterThanOrEqualTo(2000)); + }); +} diff --git a/test/capture_screen_advanced_test.dart b/test/capture_screen_advanced_test.dart index 9258d74..80dd183 100644 --- a/test/capture_screen_advanced_test.dart +++ b/test/capture_screen_advanced_test.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:http/testing.dart'; diff --git a/test/capture_screen_created_by_test.dart b/test/capture_screen_created_by_test.dart index 0b6a286..337acfc 100644 --- a/test/capture_screen_created_by_test.dart +++ b/test/capture_screen_created_by_test.dart @@ -1,5 +1,5 @@ // A note typed into the app is stamped created_by kuhy. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'capture_screen_harness.dart'; diff --git a/test/capture_screen_editing_test.dart b/test/capture_screen_editing_test.dart index 827ea9a..76560c5 100644 --- a/test/capture_screen_editing_test.dart +++ b/test/capture_screen_editing_test.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:http/testing.dart'; diff --git a/test/capture_screen_harness.dart b/test/capture_screen_harness.dart index 96403af..7e1347e 100644 --- a/test/capture_screen_harness.dart +++ b/test/capture_screen_harness.dart @@ -11,7 +11,7 @@ library; import 'dart:convert'; import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:http/testing.dart'; diff --git a/test/capture_screen_lifecycle_test.dart b/test/capture_screen_lifecycle_test.dart index c2b30c4..3180ff8 100644 --- a/test/capture_screen_lifecycle_test.dart +++ b/test/capture_screen_lifecycle_test.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:http/testing.dart'; diff --git a/test/capture_screen_sync_test.dart b/test/capture_screen_sync_test.dart index 042692d..cbaf86d 100644 --- a/test/capture_screen_sync_test.dart +++ b/test/capture_screen_sync_test.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:http/testing.dart'; diff --git a/test/confirm_delete_test.dart b/test/confirm_delete_test.dart index 18b7d72..cf39329 100644 --- a/test/confirm_delete_test.dart +++ b/test/confirm_delete_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/ui/confirm_delete.dart'; diff --git a/test/github_mirror_device_flow_test.dart b/test/github_mirror_device_flow_test.dart index 1d32f70..e5932d0 100644 --- a/test/github_mirror_device_flow_test.dart +++ b/test/github_mirror_device_flow_test.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; diff --git a/test/github_mirror_harness.dart b/test/github_mirror_harness.dart index 8bf5fa7..be4742d 100644 --- a/test/github_mirror_harness.dart +++ b/test/github_mirror_harness.dart @@ -8,7 +8,7 @@ library; import 'dart:convert'; import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; diff --git a/test/github_mirror_screen_test.dart b/test/github_mirror_screen_test.dart index 06c7f8d..106571d 100644 --- a/test/github_mirror_screen_test.dart +++ b/test/github_mirror_screen_test.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; diff --git a/test/markdown_view_test.dart b/test/markdown_view_test.dart index ba57bf7..0b6fe4f 100644 --- a/test/markdown_view_test.dart +++ b/test/markdown_view_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/ui/markdown_view.dart'; diff --git a/test/motion/capture_confirmation_test.dart b/test/motion/capture_confirmation_test.dart index c11752d..493b4f3 100644 --- a/test/motion/capture_confirmation_test.dart +++ b/test/motion/capture_confirmation_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/ui/capture_confirm_mark.dart'; diff --git a/test/motion/motion_tokens_test.dart b/test/motion/motion_tokens_test.dart index 3953f56..103bf3b 100644 --- a/test/motion/motion_tokens_test.dart +++ b/test/motion/motion_tokens_test.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'dart:io'; import 'package:design_system/design_system.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/ui/app_route.dart'; diff --git a/test/note_detail_screen_test.dart b/test/note_detail_screen_test.dart index e110ebb..af8180d 100644 --- a/test/note_detail_screen_test.dart +++ b/test/note_detail_screen_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/data/app_settings.dart'; diff --git a/test/note_editor_guided_test.dart b/test/note_editor_guided_test.dart index def6726..6e1e9df 100644 --- a/test/note_editor_guided_test.dart +++ b/test/note_editor_guided_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/data/note.dart'; import 'package:todo/data/note_template.dart'; diff --git a/test/note_editor_harness.dart b/test/note_editor_harness.dart index 86e10db..0afa4e1 100644 --- a/test/note_editor_harness.dart +++ b/test/note_editor_harness.dart @@ -5,7 +5,7 @@ /// collect it and fail on the missing `main()`. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/data/note.dart'; import 'package:todo/data/note_template.dart'; diff --git a/test/note_editor_modes_test.dart b/test/note_editor_modes_test.dart index b80110f..c5b1d52 100644 --- a/test/note_editor_modes_test.dart +++ b/test/note_editor_modes_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/data/note.dart'; import 'package:todo/data/note_template.dart'; diff --git a/test/note_editor_wizard_test.dart b/test/note_editor_wizard_test.dart index 6d8573d..e6711e8 100644 --- a/test/note_editor_wizard_test.dart +++ b/test/note_editor_wizard_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/data/note.dart'; import 'package:todo/data/note_template.dart'; diff --git a/test/notes_grid_geometry_test.dart b/test/notes_grid_geometry_test.dart index 6756c40..f774f68 100644 --- a/test/notes_grid_geometry_test.dart +++ b/test/notes_grid_geometry_test.dart @@ -2,7 +2,7 @@ /// status bar or the navigation bar, no overflow, scrolls only past a screen. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/data/note.dart'; import 'package:todo/ui/note_grid_tile.dart'; diff --git a/test/notes_grid_test.dart b/test/notes_grid_test.dart index 0b88431..1b06326 100644 --- a/test/notes_grid_test.dart +++ b/test/notes_grid_test.dart @@ -1,7 +1,7 @@ /// What the narrow notes grid shows and does, apart from its geometry. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/data/note.dart'; import 'package:todo/ui/note_grid_tile.dart'; diff --git a/test/notes_list_assign_test.dart b/test/notes_list_assign_test.dart index 541fab8..b295f37 100644 --- a/test/notes_list_assign_test.dart +++ b/test/notes_list_assign_test.dart @@ -1,7 +1,7 @@ /// Assign-to-repo from the selection bar: picker, move, refusal. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/data/note.dart'; diff --git a/test/notes_list_claude_toggle_test.dart b/test/notes_list_claude_toggle_test.dart index 351f327..9142a50 100644 --- a/test/notes_list_claude_toggle_test.dart +++ b/test/notes_list_claude_toggle_test.dart @@ -1,6 +1,6 @@ // Claude-made notes: hidden by default, an eye toggle shows them, the choice // is remembered per device, and human notes always sort first. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:todo/data/app_settings.dart'; diff --git a/test/notes_list_filter_test.dart b/test/notes_list_filter_test.dart index 4a5455f..6bd8e38 100644 --- a/test/notes_list_filter_test.dart +++ b/test/notes_list_filter_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/data/note.dart'; import 'package:todo/data/note_repository.dart'; diff --git a/test/notes_list_focus_test.dart b/test/notes_list_focus_test.dart index 90dba6e..c2a48a7 100644 --- a/test/notes_list_focus_test.dart +++ b/test/notes_list_focus_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/ui/note_detail_screen.dart'; diff --git a/test/notes_list_harness.dart b/test/notes_list_harness.dart index d535e06..05229a2 100644 --- a/test/notes_list_harness.dart +++ b/test/notes_list_harness.dart @@ -5,7 +5,7 @@ /// collect it and fail on the missing `main()`. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/data/app_settings.dart'; import 'package:todo/data/note.dart'; diff --git a/test/notes_list_one_list_test.dart b/test/notes_list_one_list_test.dart index ac3fafa..232975a 100644 --- a/test/notes_list_one_list_test.dart +++ b/test/notes_list_one_list_test.dart @@ -1,6 +1,6 @@ // One list: ideas and repo notes together, one row each, repo searchable, and a filter // sheet that fits a Pixel 6a screen without scrolling. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/data/note.dart'; diff --git a/test/notes_list_repo_filter_test.dart b/test/notes_list_repo_filter_test.dart index e9cea46..ae7d477 100644 --- a/test/notes_list_repo_filter_test.dart +++ b/test/notes_list_repo_filter_test.dart @@ -1,6 +1,6 @@ // Repo tasks in the notes list: no source filter at all, and their fields // read-only in the note sheet. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/data/note.dart'; import 'package:todo/ui/notes_list_defaults.dart'; diff --git a/test/notes_list_screen_test.dart b/test/notes_list_screen_test.dart index e7a6b65..3ec11bc 100644 --- a/test/notes_list_screen_test.dart +++ b/test/notes_list_screen_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/data/note.dart'; import 'package:todo/data/note_repository.dart'; diff --git a/test/notes_list_select_test.dart b/test/notes_list_select_test.dart index 419f31a..18bb79c 100644 --- a/test/notes_list_select_test.dart +++ b/test/notes_list_select_test.dart @@ -1,7 +1,7 @@ /// Multi-select on the notes list: mode, toggling, bulk status/priority. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/data/note.dart'; diff --git a/test/settings_screen_backup_test.dart b/test/settings_screen_backup_test.dart index 0c56513..aae4978 100644 --- a/test/settings_screen_backup_test.dart +++ b/test/settings_screen_backup_test.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:crdt_sync/crdt_sync.dart'; import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:http/testing.dart'; diff --git a/test/settings_screen_e2e_lock_test.dart b/test/settings_screen_e2e_lock_test.dart index db2c883..6c26746 100644 --- a/test/settings_screen_e2e_lock_test.dart +++ b/test/settings_screen_e2e_lock_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/sync/run_sync.dart'; diff --git a/test/settings_screen_harness.dart b/test/settings_screen_harness.dart index fd3b45b..cfa250f 100644 --- a/test/settings_screen_harness.dart +++ b/test/settings_screen_harness.dart @@ -10,7 +10,7 @@ import 'dart:io'; import 'package:crdt_sync/crdt_sync.dart'; import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:http/testing.dart'; diff --git a/test/settings_screen_test.dart b/test/settings_screen_test.dart index a982421..74527a0 100644 --- a/test/settings_screen_test.dart +++ b/test/settings_screen_test.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:crdt_sync/crdt_sync.dart'; import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:http/testing.dart'; diff --git a/test/text_free_guard.dart b/test/text_free_guard.dart index fcaa170..5bbb706 100644 --- a/test/text_free_guard.dart +++ b/test/text_free_guard.dart @@ -5,7 +5,7 @@ /// Deliberately NOT named `*_test.dart`: it is a helper with no `main()`. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; final RegExp _word = RegExp('[A-Za-z]{2,}'); diff --git a/test/text_free_list_test.dart b/test/text_free_list_test.dart index e5a8154..ceab919 100644 --- a/test/text_free_list_test.dart +++ b/test/text_free_list_test.dart @@ -2,7 +2,7 @@ /// app-written is painted, only note content, numbers and glyphs. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/data/note.dart'; diff --git a/test/text_free_localizations_test.dart b/test/text_free_localizations_test.dart index 307903b..14442f3 100644 --- a/test/text_free_localizations_test.dart +++ b/test/text_free_localizations_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/ui/text_free_localizations.dart'; diff --git a/test/text_free_screens_test.dart b/test/text_free_screens_test.dart index d362063..45df6b0 100644 --- a/test/text_free_screens_test.dart +++ b/test/text_free_screens_test.dart @@ -2,7 +2,7 @@ /// screens: nothing app-written is painted, only typed content and numbers. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:http/testing.dart'; diff --git a/test/theme_test.dart b/test/theme_test.dart index a1699de..980350b 100644 --- a/test/theme_test.dart +++ b/test/theme_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:design_system/design_system.dart'; diff --git a/test/ui_images/attach_files_test.dart b/test/ui_images/attach_files_test.dart index bf9c8bf..bfd0196 100644 --- a/test/ui_images/attach_files_test.dart +++ b/test/ui_images/attach_files_test.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/attachments/image_store_api.dart'; import 'package:todo/attachments/image_store_scope.dart'; diff --git a/test/ui_images/attachment_picking_test.dart b/test/ui_images/attachment_picking_test.dart index 1e1e43a..1a1fff2 100644 --- a/test/ui_images/attachment_picking_test.dart +++ b/test/ui_images/attachment_picking_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/ui/attachment_picking.dart'; diff --git a/test/ui_images/capture_images_test.dart b/test/ui_images/capture_images_test.dart index 9080df7..cc50d6b 100644 --- a/test/ui_images/capture_images_test.dart +++ b/test/ui_images/capture_images_test.dart @@ -1,6 +1,6 @@ import 'dart:typed_data'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/data/app_settings.dart'; import 'package:todo/data/note.dart'; diff --git a/test/ui_images/cloud_images_settings_test.dart b/test/ui_images/cloud_images_settings_test.dart index ffeb8d0..dc9a0ab 100644 --- a/test/ui_images/cloud_images_settings_test.dart +++ b/test/ui_images/cloud_images_settings_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; diff --git a/test/ui_images/detail_and_misc_images_test.dart b/test/ui_images/detail_and_misc_images_test.dart index 5c6a3f3..d3b2e86 100644 --- a/test/ui_images/detail_and_misc_images_test.dart +++ b/test/ui_images/detail_and_misc_images_test.dart @@ -1,6 +1,6 @@ import 'dart:typed_data'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/attachments/image_store_scope.dart'; import 'package:todo/data/app_settings.dart'; diff --git a/test/ui_images/file_embed_test.dart b/test/ui_images/file_embed_test.dart index 9a88da1..8a790cf 100644 --- a/test/ui_images/file_embed_test.dart +++ b/test/ui_images/file_embed_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/attachments/image_store_api.dart'; import 'package:todo/attachments/image_store_scope.dart'; diff --git a/test/ui_images/image_attach_test.dart b/test/ui_images/image_attach_test.dart index c927d0e..9bcf471 100644 --- a/test/ui_images/image_attach_test.dart +++ b/test/ui_images/image_attach_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:typed_data'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/attachments/image_store_api.dart'; import 'package:todo/attachments/image_store_scope.dart'; diff --git a/test/ui_images/image_embed_test.dart b/test/ui_images/image_embed_test.dart index 5f76dba..f8e82a3 100644 --- a/test/ui_images/image_embed_test.dart +++ b/test/ui_images/image_embed_test.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:image/image.dart' as img; import 'package:todo/attachments/image_store_scope.dart'; diff --git a/test/ui_images/note_editor_images_test.dart b/test/ui_images/note_editor_images_test.dart index 86dbd6f..4c29acc 100644 --- a/test/ui_images/note_editor_images_test.dart +++ b/test/ui_images/note_editor_images_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:todo/data/note.dart'; import 'package:todo/data/note_template.dart';