From 49144a2c49a8d45989ea25ab5769c07845bdbb26 Mon Sep 17 00:00:00 2001 From: Krzysztof kuhy Rudnicki Date: Mon, 16 Nov 2026 09:25:34 +0100 Subject: [PATCH] Move the app to material_ui for Flutter 3.50 Flutter 3.50 deprecates package:flutter/material.dart; 73 deprecation infos failed flutter analyze --fatal-infos, and four Dart pins were behind (crdt_sync_flutter 0.8.2, flutter_local_notifications 23.0.2, github_device_auth 0.5.0, sync_settings_ui 0.8.2). Those UI packages now sit on material_ui, so the app has to as well or their widgets lose MaterialLocalizations. Imports swap one-for-one and dart fix re-sorted the directives; no behaviour change. analyze is clean and all six test shards pass. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01WzxdWWfb63jncj9Lca2jeX --- app/lib/main.dart | 2 +- app/lib/screens/body_screen.dart | 2 +- app/lib/screens/body_screen_data.dart | 2 +- app/lib/screens/calendar_screen.dart | 2 +- app/lib/screens/edit_entry_screen.dart | 2 +- app/lib/screens/food_bank_screen.dart | 2 +- app/lib/screens/github_mirror_screen.dart | 2 +- app/lib/screens/history_screen.dart | 2 +- app/lib/screens/log_meal_actions.dart | 2 +- app/lib/screens/log_meal_fill_mixin.dart | 2 +- app/lib/screens/log_meal_future_mixin.dart | 2 +- app/lib/screens/log_meal_kuchnia_mixin.dart | 2 +- app/lib/screens/log_meal_nav_mixin.dart | 2 +- app/lib/screens/log_meal_screen.dart | 2 +- app/lib/screens/log_meal_sync_mixin.dart | 2 +- app/lib/screens/settings_kuchnia.dart | 2 +- app/lib/screens/settings_screen.dart | 2 +- app/lib/ui/cues.dart | 2 +- app/lib/ui/icon_field.dart | 2 +- app/lib/ui/macro_kind.dart | 2 +- app/lib/ui/source_icon.dart | 2 +- app/lib/ui/theme.dart | 2 +- .../widgets/autocomplete_suggestion_list.dart | 2 +- app/lib/widgets/average_summary_row.dart | 2 +- app/lib/widgets/body/activity_card.dart | 2 +- app/lib/widgets/body/body_section.dart | 2 +- app/lib/widgets/body/body_stats_cards.dart | 2 +- app/lib/widgets/body/body_tile_grid.dart | 2 +- app/lib/widgets/body/dated_value_card.dart | 2 +- app/lib/widgets/body/formula_figure.dart | 2 +- app/lib/widgets/body/goal_card.dart | 2 +- app/lib/widgets/body/goal_icons.dart | 2 +- app/lib/widgets/body/goal_pickers.dart | 2 +- app/lib/widgets/body/profile_card.dart | 2 +- app/lib/widgets/body/week_plan_card.dart | 2 +- app/lib/widgets/body/weight_card.dart | 2 +- app/lib/widgets/body/weight_chart.dart | 2 +- app/lib/widgets/body/workout_kind_icon.dart | 2 +- app/lib/widgets/data_backup_row.dart | 2 +- app/lib/widgets/day_status_calendar.dart | 2 +- app/lib/widgets/fill_all_row.dart | 2 +- app/lib/widgets/filters/filter_chrome.dart | 2 +- app/lib/widgets/filters/filter_fields.dart | 2 +- .../food_bank/fb_add_entry_dialog.dart | 2 +- .../widgets/food_bank/fb_filter_sheet.dart | 2 +- app/lib/widgets/food_bank/fb_record_tile.dart | 2 +- app/lib/widgets/food_bank/fb_tile_grid.dart | 2 +- app/lib/widgets/history/history_filter.dart | 2 +- .../widgets/history/history_filter_sheet.dart | 2 +- .../widgets/history/history_filter_sort.dart | 2 +- app/lib/widgets/history/history_grouping.dart | 2 +- app/lib/widgets/history/history_list.dart | 2 +- app/lib/widgets/log_meal_actions_row.dart | 2 +- app/lib/widgets/log_sound_tile.dart | 2 +- app/lib/widgets/macro_input_row.dart | 2 +- app/lib/widgets/meal_schedule_editor.dart | 2 +- app/lib/widgets/meal_time_dropdown.dart | 2 +- app/lib/widgets/pickers/date_dialog.dart | 2 +- app/lib/widgets/pickers/date_grid.dart | 2 +- app/lib/widgets/pickers/date_selection.dart | 2 +- app/lib/widgets/pickers/month_chips.dart | 2 +- app/lib/widgets/pickers/numeral_cell.dart | 2 +- app/lib/widgets/pickers/numeral_wheel.dart | 2 +- app/lib/widgets/pickers/picker_frame.dart | 2 +- app/lib/widgets/pickers/pickers.dart | 2 +- app/lib/widgets/pickers/time_dialog.dart | 2 +- app/lib/widgets/pickers/time_wheels.dart | 2 +- app/lib/widgets/pickers/year_wheel.dart | 2 +- app/lib/widgets/progress_motion.dart | 2 +- app/lib/widgets/slot_selector_row.dart | 2 +- app/lib/widgets/streak_summary_row.dart | 2 +- app/lib/widgets/sync_health_banner.dart | 2 +- app/lib/widgets/today_progress_card.dart | 2 +- app/pubspec.lock | 67 +++++++++++++------ app/pubspec.yaml | 11 +-- app/test/fill_all_row_test.dart | 2 +- app/test/keyboard_operability_test.dart | 2 +- app/test/label_finders.dart | 2 +- app/test/no_words_body_test.dart | 2 +- app/test/no_words_kuchnia_test.dart | 2 +- app/test/no_words_screens_test.dart | 2 +- app/test/no_words_support.dart | 2 +- app/test/pickers/date_dialog_test.dart | 2 +- app/test/pickers/date_range_dialog_test.dart | 2 +- app/test/pickers/date_selection_test.dart | 2 +- app/test/pickers/no_words_pickers_test.dart | 2 +- app/test/pickers/picker_call_sites_test.dart | 2 +- app/test/pickers/picker_test_support.dart | 2 +- app/test/pickers/time_dialog_test.dart | 2 +- app/test/screens/body_screen_goal_test.dart | 2 +- app/test/screens/body_screen_support.dart | 2 +- app/test/screens/body_screen_test.dart | 2 +- app/test/screens/calendar_screen_test.dart | 2 +- .../edit_entry_screen_foodbank_test.dart | 2 +- app/test/screens/edit_entry_screen_test.dart | 2 +- app/test/screens/fit/fit_screens_test.dart | 2 +- app/test/screens/fit/fit_support.dart | 2 +- .../screens/food_bank/fb_screen_test.dart | 2 +- app/test/screens/food_bank/fb_sheet_test.dart | 2 +- .../github_mirror_device_dialog_test.dart | 2 +- .../github_mirror_device_flow_test.dart | 2 +- .../github_mirror_device_poll_test.dart | 2 +- .../screens/github_mirror_screen_test.dart | 2 +- .../history/history_delete_undo_test.dart | 2 +- .../history/history_filter_criteria_test.dart | 2 +- .../history/history_filter_range_test.dart | 2 +- .../history/history_filter_sheet_test.dart | 2 +- .../history/history_filter_sort_test.dart | 2 +- .../history/history_filter_source_test.dart | 2 +- .../screens/history/history_screen_test.dart | 2 +- .../screens/log_meal_fill_mixin_test.dart | 2 +- app/test/screens/log_meal_haptic_test.dart | 2 +- .../screens/log_meal_kuchnia_mixin_test.dart | 2 +- .../log_meal_prefill_nutrition_test.dart | 2 +- app/test/screens/log_meal_schedule_test.dart | 2 +- .../screens/log_meal_screen_future_test.dart | 2 +- .../screens/log_meal_screen_nav_test.dart | 2 +- .../screens/log_meal_screen_sync_test.dart | 2 +- app/test/screens/log_meal_screen_test.dart | 2 +- app/test/screens/settings_kuchnia_test.dart | 2 +- .../screens/settings_screen_battery_test.dart | 2 +- app/test/screens/settings_screen_test.dart | 2 +- app/test/ui/cues_test.dart | 2 +- app/test/ui/source_icon_test.dart | 2 +- app/test/ui/theme_motion_test.dart | 2 +- .../widgets/average_summary_row_test.dart | 2 +- app/test/widgets/body/body_widgets_test.dart | 2 +- .../body/formula_and_tile_layout_test.dart | 2 +- .../widgets/day_status_calendar_test.dart | 2 +- .../day_status_calendar_test_support.dart | 2 +- .../widgets/food_bank/fb_tile_grid_test.dart | 2 +- .../widgets/log_meal_actions_row_test.dart | 2 +- app/test/widgets/log_sound_tile_test.dart | 2 +- .../widgets/meal_schedule_editor_test.dart | 2 +- app/test/widgets/slot_selector_row_test.dart | 2 +- app/test/widgets/streak_summary_row_test.dart | 2 +- app/test/widgets/sync_health_banner_test.dart | 2 +- .../today_progress_card_motion_test.dart | 2 +- .../widgets/today_progress_card_test.dart | 2 +- 139 files changed, 191 insertions(+), 161 deletions(-) diff --git a/app/lib/main.dart b/app/lib/main.dart index dabe77e..733fb90 100644 --- a/app/lib/main.dart +++ b/app/lib/main.dart @@ -17,7 +17,7 @@ import 'package:diet_guard_app/services/meal_schedule_service.dart'; import 'package:diet_guard_app/services/notification_service.dart'; import 'package:diet_guard_app/services/sync_device_id.dart'; import 'package:diet_guard_app/ui/theme.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; Future main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/app/lib/screens/body_screen.dart b/app/lib/screens/body_screen.dart index f0d8c76..f49cd2e 100644 --- a/app/lib/screens/body_screen.dart +++ b/app/lib/screens/body_screen.dart @@ -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/week_plan_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'; diff --git a/app/lib/screens/body_screen_data.dart b/app/lib/screens/body_screen_data.dart index 00974ed..b7a80dc 100644 --- a/app/lib/screens/body_screen_data.dart +++ b/app/lib/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_steps.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 /// when anything the formulas need is missing. diff --git a/app/lib/screens/calendar_screen.dart b/app/lib/screens/calendar_screen.dart index 8e05ddf..eea8ab7 100644 --- a/app/lib/screens/calendar_screen.dart +++ b/app/lib/screens/calendar_screen.dart @@ -22,8 +22,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/day_status_calendar.dart'; import 'package:diet_guard_app/widgets/streak_summary_row.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; /// Screen showing the budget-adherence calendar, streaks, and budget entry. class CalendarScreen extends StatefulWidget { diff --git a/app/lib/screens/edit_entry_screen.dart b/app/lib/screens/edit_entry_screen.dart index d61b1e3..3126237 100644 --- a/app/lib/screens/edit_entry_screen.dart +++ b/app/lib/screens/edit_entry_screen.dart @@ -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/widgets/autocomplete_suggestion_list.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'; /// Edit screen for an existing [FoodEntry]. diff --git a/app/lib/screens/food_bank_screen.dart b/app/lib/screens/food_bank_screen.dart index 80e4e7e..220a611 100644 --- a/app/lib/screens/food_bank_screen.dart +++ b/app/lib/screens/food_bank_screen.dart @@ -15,7 +15,7 @@ import 'package:diet_guard_app/widgets/food_bank/fb_filter.dart'; import 'package:diet_guard_app/widgets/food_bank/fb_filter_sheet.dart'; import 'package:diet_guard_app/widgets/food_bank/fb_record_tile.dart'; import 'package:diet_guard_app/widgets/food_bank/fb_tile_grid.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Browses every banked food -- log-derived and manually curated -- with /// filtering, sorting, and an add-entry dialog. diff --git a/app/lib/screens/github_mirror_screen.dart b/app/lib/screens/github_mirror_screen.dart index 7aa44b8..3a57203 100644 --- a/app/lib/screens/github_mirror_screen.dart +++ b/app/lib/screens/github_mirror_screen.dart @@ -15,9 +15,9 @@ import 'package:diet_guard_app/services/sync_service.dart'; import 'package:diet_guard_app/services/sync_settings.dart'; import 'package:diet_guard_app/ui/cues.dart'; import 'package:diet_guard_app/ui/theme.dart'; -import 'package:flutter/material.dart'; import 'package:github_device_auth/github_device_auth.dart'; import 'package:http/http.dart' as http; +import 'package:material_ui/material_ui.dart'; part 'github_client_id_dialog.dart'; part 'github_mirror_actions.dart'; diff --git a/app/lib/screens/history_screen.dart b/app/lib/screens/history_screen.dart index 929ddc0..004dbc4 100644 --- a/app/lib/screens/history_screen.dart +++ b/app/lib/screens/history_screen.dart @@ -14,7 +14,7 @@ import 'package:diet_guard_app/widgets/history/history_filter.dart'; import 'package:diet_guard_app/widgets/history/history_filter_sheet.dart'; import 'package:diet_guard_app/widgets/history/history_grouping.dart'; import 'package:diet_guard_app/widgets/history/history_list.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Logged meal history: every entry, grouped by day, filterable and sortable. /// diff --git a/app/lib/screens/log_meal_actions.dart b/app/lib/screens/log_meal_actions.dart index 6ace3d6..f0b658c 100644 --- a/app/lib/screens/log_meal_actions.dart +++ b/app/lib/screens/log_meal_actions.dart @@ -2,7 +2,7 @@ import 'package:diet_guard_app/models/food_suggestion.dart'; import 'package:diet_guard_app/models/nutrition.dart'; import 'package:diet_guard_app/screens/log_meal_progress.dart'; import 'package:diet_guard_app/widgets/macro_input_row.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Writes [suggestion]'s name and macros into the log form's controllers. /// diff --git a/app/lib/screens/log_meal_fill_mixin.dart b/app/lib/screens/log_meal_fill_mixin.dart index 88b8ce5..c3c07c3 100644 --- a/app/lib/screens/log_meal_fill_mixin.dart +++ b/app/lib/screens/log_meal_fill_mixin.dart @@ -13,7 +13,7 @@ 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'; +import 'package:material_ui/material_ui.dart'; /// One fill tap's status (see [CountCue]). typedef FillCue = CountCue; diff --git a/app/lib/screens/log_meal_future_mixin.dart b/app/lib/screens/log_meal_future_mixin.dart index c151b3f..f316a97 100644 --- a/app/lib/screens/log_meal_future_mixin.dart +++ b/app/lib/screens/log_meal_future_mixin.dart @@ -18,7 +18,7 @@ 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:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Adds a future-date meal-log picker to [LogMealScreen]'s state. mixin LogMealFutureMixin on State { diff --git a/app/lib/screens/log_meal_kuchnia_mixin.dart b/app/lib/screens/log_meal_kuchnia_mixin.dart index 750571f..8e44dea 100644 --- a/app/lib/screens/log_meal_kuchnia_mixin.dart +++ b/app/lib/screens/log_meal_kuchnia_mixin.dart @@ -27,7 +27,7 @@ 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'; +import 'package:material_ui/material_ui.dart'; CountCue _cue(String l, CueKind k, [int? n]) => (label: l, kind: k, count: n); diff --git a/app/lib/screens/log_meal_nav_mixin.dart b/app/lib/screens/log_meal_nav_mixin.dart index b456a8d..b563e8d 100644 --- a/app/lib/screens/log_meal_nav_mixin.dart +++ b/app/lib/screens/log_meal_nav_mixin.dart @@ -3,8 +3,8 @@ import 'package:diet_guard_app/screens/calendar_screen.dart'; import 'package:diet_guard_app/screens/food_bank_screen.dart'; import 'package:diet_guard_app/screens/history_screen.dart'; import 'package:diet_guard_app/screens/settings_screen.dart'; -import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; +import 'package:material_ui/material_ui.dart'; /// The five app-bar destinations reachable from [LogMealScreen]. /// diff --git a/app/lib/screens/log_meal_screen.dart b/app/lib/screens/log_meal_screen.dart index 84cf390..dde549e 100644 --- a/app/lib/screens/log_meal_screen.dart +++ b/app/lib/screens/log_meal_screen.dart @@ -26,8 +26,8 @@ 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/sync_health_banner.dart'; import 'package:diet_guard_app/widgets/today_progress_card.dart'; -import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; +import 'package:material_ui/material_ui.dart'; /// Lets the user log one food item, with food-bank autocomplete and /// today's slot status. diff --git a/app/lib/screens/log_meal_sync_mixin.dart b/app/lib/screens/log_meal_sync_mixin.dart index 36404a7..2c743be 100644 --- a/app/lib/screens/log_meal_sync_mixin.dart +++ b/app/lib/screens/log_meal_sync_mixin.dart @@ -13,8 +13,8 @@ import 'package:diet_guard_app/services/meal_schedule_service.dart'; import 'package:diet_guard_app/services/sync_health.dart'; import 'package:diet_guard_app/services/sync_service.dart'; import 'package:diet_guard_app/services/sync_settings.dart'; -import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; +import 'package:material_ui/material_ui.dart'; /// Background-sync and lifecycle behaviour for [LogMealScreen]'s state. /// diff --git a/app/lib/screens/settings_kuchnia.dart b/app/lib/screens/settings_kuchnia.dart index abdb49f..ccdb6de 100644 --- a/app/lib/screens/settings_kuchnia.dart +++ b/app/lib/screens/settings_kuchnia.dart @@ -20,7 +20,7 @@ import 'package:diet_guard_app/services/kuchnia_credential_service.dart'; import 'package:diet_guard_app/services/kuchnia_import.dart'; import 'package:diet_guard_app/ui/cues.dart'; import 'package:diet_guard_app/ui/theme.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// What a delivery fetch reports: a cue [kind], a spoken [label] (never /// painted) and, when dishes were banked, their [count] (painted as a number). diff --git a/app/lib/screens/settings_screen.dart b/app/lib/screens/settings_screen.dart index 09e6959..6f2e1d1 100644 --- a/app/lib/screens/settings_screen.dart +++ b/app/lib/screens/settings_screen.dart @@ -25,9 +25,9 @@ import 'package:diet_guard_app/widgets/data_backup_row.dart'; import 'package:diet_guard_app/widgets/log_sound_tile.dart'; import 'package:diet_guard_app/widgets/meal_schedule_editor.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:http/http.dart' as http; +import 'package:material_ui/material_ui.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:sync_settings_ui/sync_settings_ui.dart'; diff --git a/app/lib/ui/cues.dart b/app/lib/ui/cues.dart index 2728721..b69a78c 100644 --- a/app/lib/ui/cues.dart +++ b/app/lib/ui/cues.dart @@ -8,8 +8,8 @@ import 'dart:async'; import 'dart:math' as math; import 'package:diet_guard_app/ui/theme.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; export 'package:diet_guard_app/ui/icon_field.dart'; diff --git a/app/lib/ui/icon_field.dart b/app/lib/ui/icon_field.dart index 8e41166..b649b5c 100644 --- a/app/lib/ui/icon_field.dart +++ b/app/lib/ui/icon_field.dart @@ -2,8 +2,8 @@ /// spoken label (see [IconField]). library; -import 'package:flutter/material.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. /// diff --git a/app/lib/ui/macro_kind.dart b/app/lib/ui/macro_kind.dart index 69fc985..6105351 100644 --- a/app/lib/ui/macro_kind.dart +++ b/app/lib/ui/macro_kind.dart @@ -5,7 +5,7 @@ /// colour never carries the meaning alone (shape does too). library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// One nutrition field and its non-text identity. enum MacroKind { diff --git a/app/lib/ui/source_icon.dart b/app/lib/ui/source_icon.dart index a15cf88..40dedbb 100644 --- a/app/lib/ui/source_icon.dart +++ b/app/lib/ui/source_icon.dart @@ -2,7 +2,7 @@ /// (`manual`, `food bank`, `catering`) that used to be printed on screen. 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. IconData sourceIcon(String source) => switch (source) { diff --git a/app/lib/ui/theme.dart b/app/lib/ui/theme.dart index b0c395b..29c551d 100644 --- a/app/lib/ui/theme.dart +++ b/app/lib/ui/theme.dart @@ -6,7 +6,7 @@ /// hand-picked, not algorithmically derived from one seed color. 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. ThemeData buildAppTheme() { diff --git a/app/lib/widgets/autocomplete_suggestion_list.dart b/app/lib/widgets/autocomplete_suggestion_list.dart index f2ad8e9..ebea03b 100644 --- a/app/lib/widgets/autocomplete_suggestion_list.dart +++ b/app/lib/widgets/autocomplete_suggestion_list.dart @@ -3,7 +3,7 @@ library; import 'package:diet_guard_app/models/food_suggestion.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. /// diff --git a/app/lib/widgets/average_summary_row.dart b/app/lib/widgets/average_summary_row.dart index 6474de9..da25748 100644 --- a/app/lib/widgets/average_summary_row.dart +++ b/app/lib/widgets/average_summary_row.dart @@ -4,7 +4,7 @@ library; import 'package:diet_guard_app/models/period_average.dart'; import 'package:diet_guard_app/ui/cues.dart'; import 'package:diet_guard_app/ui/macro_kind.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Displays this week's and this month's average kcal/day and their bands. /// diff --git a/app/lib/widgets/body/activity_card.dart b/app/lib/widgets/body/activity_card.dart index 587a835..5274824 100644 --- a/app/lib/widgets/body/activity_card.dart +++ b/app/lib/widgets/body/activity_card.dart @@ -8,7 +8,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/formula_figure.dart'; import 'package:diet_guard_app/widgets/body/workout_kind_icon.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// How many of the newest sessions to list. const int activityListLimit = 10; diff --git a/app/lib/widgets/body/body_section.dart b/app/lib/widgets/body/body_section.dart index 1ca6e9a..22b41fa 100644 --- a/app/lib/widgets/body/body_section.dart +++ b/app/lib/widgets/body/body_section.dart @@ -5,7 +5,7 @@ library; import 'package:diet_guard_app/services/body_calc.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 /// readers and tests and is never painted. diff --git a/app/lib/widgets/body/body_stats_cards.dart b/app/lib/widgets/body/body_stats_cards.dart index 8de20f6..2403291 100644 --- a/app/lib/widgets/body/body_stats_cards.dart +++ b/app/lib/widgets/body/body_stats_cards.dart @@ -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/theme.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 healthy range, an amber or red arrow towards the side it is off by. diff --git a/app/lib/widgets/body/body_tile_grid.dart b/app/lib/widgets/body/body_tile_grid.dart index ea8554d..75ef63c 100644 --- a/app/lib/widgets/body/body_tile_grid.dart +++ b/app/lib/widgets/body/body_tile_grid.dart @@ -3,7 +3,7 @@ library; 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 /// [value] and the [builder] of the full card shown in the sheet. diff --git a/app/lib/widgets/body/dated_value_card.dart b/app/lib/widgets/body/dated_value_card.dart index 6cd512e..c77bb1f 100644 --- a/app/lib/widgets/body/dated_value_card.dart +++ b/app/lib/widgets/body/dated_value_card.dart @@ -8,8 +8,8 @@ import 'package:diet_guard_app/ui/theme.dart'; import 'package:diet_guard_app/widgets/body/body_section.dart'; import 'package:diet_guard_app/widgets/body/weight_chart.dart'; import 'package:diet_guard_app/widgets/pickers/pickers.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; /// Enters/deletes a day's value and charts the history. class DatedValueCard extends StatefulWidget { diff --git a/app/lib/widgets/body/formula_figure.dart b/app/lib/widgets/body/formula_figure.dart index be77b24..ee05c71 100644 --- a/app/lib/widgets/body/formula_figure.dart +++ b/app/lib/widgets/body/formula_figure.dart @@ -4,7 +4,7 @@ library; import 'package:diet_guard_app/services/activity_kcal.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]. const Map formulaIcons = { diff --git a/app/lib/widgets/body/goal_card.dart b/app/lib/widgets/body/goal_card.dart index c27f915..3ed6b75 100644 --- a/app/lib/widgets/body/goal_card.dart +++ b/app/lib/widgets/body/goal_card.dart @@ -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/goal_icons.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. class GoalCard extends StatefulWidget { diff --git a/app/lib/widgets/body/goal_icons.dart b/app/lib/widgets/body/goal_icons.dart index 977e9ff..895793a 100644 --- a/app/lib/widgets/body/goal_icons.dart +++ b/app/lib/widgets/body/goal_icons.dart @@ -4,7 +4,7 @@ library; import 'package:diet_guard_app/services/body_energy.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. IconData directionIcon(String direction) => switch (direction) { diff --git a/app/lib/widgets/body/goal_pickers.dart b/app/lib/widgets/body/goal_pickers.dart index 5ad8583..8803763 100644 --- a/app/lib/widgets/body/goal_pickers.dart +++ b/app/lib/widgets/body/goal_pickers.dart @@ -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/theme.dart'; import 'package:diet_guard_app/widgets/body/goal_icons.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; /// One choice in a picker sheet. typedef PickerOption = ({ diff --git a/app/lib/widgets/body/profile_card.dart b/app/lib/widgets/body/profile_card.dart index 1e644af..2526f7d 100644 --- a/app/lib/widgets/body/profile_card.dart +++ b/app/lib/widgets/body/profile_card.dart @@ -7,8 +7,8 @@ import 'package:diet_guard_app/ui/cues.dart'; import 'package:diet_guard_app/ui/theme.dart'; import 'package:diet_guard_app/widgets/body/body_section.dart'; import 'package:diet_guard_app/widgets/pickers/pickers.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; /// Edits the profile; calls [onSaved] after a successful save. class ProfileCard extends StatefulWidget { diff --git a/app/lib/widgets/body/week_plan_card.dart b/app/lib/widgets/body/week_plan_card.dart index 267c9a7..56c53f1 100644 --- a/app/lib/widgets/body/week_plan_card.dart +++ b/app/lib/widgets/body/week_plan_card.dart @@ -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/theme.dart'; import 'package:diet_guard_app/widgets/body/body_section.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; /// The planner. class WeekPlanCard extends StatefulWidget { diff --git a/app/lib/widgets/body/weight_card.dart b/app/lib/widgets/body/weight_card.dart index 5e51b00..bf4f2ae 100644 --- a/app/lib/widgets/body/weight_card.dart +++ b/app/lib/widgets/body/weight_card.dart @@ -7,7 +7,7 @@ library; import 'package:diet_guard_app/models/body_document.dart'; import 'package:diet_guard_app/services/body_service.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'; diff --git a/app/lib/widgets/body/weight_chart.dart b/app/lib/widgets/body/weight_chart.dart index c17937c..57bac60 100644 --- a/app/lib/widgets/body/weight_chart.dart +++ b/app/lib/widgets/body/weight_chart.dart @@ -7,7 +7,7 @@ library; import 'package:diet_guard_app/ui/cues.dart'; import 'package:diet_guard_app/ui/theme.dart'; import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Selectable chart ranges, `(spoken name, days)`; null days = everything. const List<(String, int?)> weightChartRanges = [ diff --git a/app/lib/widgets/body/workout_kind_icon.dart b/app/lib/widgets/body/workout_kind_icon.dart index 885f6a7..885118b 100644 --- a/app/lib/widgets/body/workout_kind_icon.dart +++ b/app/lib/widgets/body/workout_kind_icon.dart @@ -1,7 +1,7 @@ /// Returns the activity-type icon for [kind]. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Activity kind icons used by _SessionTile (in `activity_card.dart`). IconData kindIcon(String kind) => switch (kind) { diff --git a/app/lib/widgets/data_backup_row.dart b/app/lib/widgets/data_backup_row.dart index 0ae404e..3c38061 100644 --- a/app/lib/widgets/data_backup_row.dart +++ b/app/lib/widgets/data_backup_row.dart @@ -5,8 +5,8 @@ import 'dart:async'; import 'package:data_transfer_flutter/data_transfer_flutter.dart'; import 'package:diet_guard_app/services/data_export.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; /// Suggested file name, identical on every platform. const exportFileName = 'diet-guard-export.json'; diff --git a/app/lib/widgets/day_status_calendar.dart b/app/lib/widgets/day_status_calendar.dart index 8d06dbb..8b67105 100644 --- a/app/lib/widgets/day_status_calendar.dart +++ b/app/lib/widgets/day_status_calendar.dart @@ -3,7 +3,7 @@ library; import 'package:diet_guard_app/models/day_status.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]. /// diff --git a/app/lib/widgets/fill_all_row.dart b/app/lib/widgets/fill_all_row.dart index 743a643..f36d48c 100644 --- a/app/lib/widgets/fill_all_row.dart +++ b/app/lib/widgets/fill_all_row.dart @@ -7,7 +7,7 @@ library; import 'package:diet_guard_app/services/kuchnia_client.dart'; import 'package:diet_guard_app/ui/theme.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Spoken name of the resting button (never painted). const fillAllLabel = 'Fill all with catering'; diff --git a/app/lib/widgets/filters/filter_chrome.dart b/app/lib/widgets/filters/filter_chrome.dart index 469255c..038fda4 100644 --- a/app/lib/widgets/filters/filter_chrome.dart +++ b/app/lib/widgets/filters/filter_chrome.dart @@ -3,7 +3,7 @@ /// glyph and speaks its old caption only through its semantic label. 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. class FilterSheetHeader extends StatelessWidget { diff --git a/app/lib/widgets/filters/filter_fields.dart b/app/lib/widgets/filters/filter_fields.dart index 8eab8d4..6a8b062 100644 --- a/app/lib/widgets/filters/filter_fields.dart +++ b/app/lib/widgets/filters/filter_fields.dart @@ -8,7 +8,7 @@ library; import 'package:diet_guard_app/ui/cues.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. /// diff --git a/app/lib/widgets/food_bank/fb_add_entry_dialog.dart b/app/lib/widgets/food_bank/fb_add_entry_dialog.dart index 777ea20..38457ac 100644 --- a/app/lib/widgets/food_bank/fb_add_entry_dialog.dart +++ b/app/lib/widgets/food_bank/fb_add_entry_dialog.dart @@ -6,7 +6,7 @@ library; import 'package:diet_guard_app/models/food_bank_record.dart'; import 'package:diet_guard_app/ui/cues.dart'; import 'package:diet_guard_app/ui/macro_kind.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Prompts for a new manually-curated food bank entry. /// diff --git a/app/lib/widgets/food_bank/fb_filter_sheet.dart b/app/lib/widgets/food_bank/fb_filter_sheet.dart index 6d06ee1..64ce0c5 100644 --- a/app/lib/widgets/food_bank/fb_filter_sheet.dart +++ b/app/lib/widgets/food_bank/fb_filter_sheet.dart @@ -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_fields.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. /// diff --git a/app/lib/widgets/food_bank/fb_record_tile.dart b/app/lib/widgets/food_bank/fb_record_tile.dart index 8ec163a..a241e34 100644 --- a/app/lib/widgets/food_bank/fb_record_tile.dart +++ b/app/lib/widgets/food_bank/fb_record_tile.dart @@ -3,7 +3,7 @@ library; import 'package:diet_guard_app/models/food_bank_record.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. /// diff --git a/app/lib/widgets/food_bank/fb_tile_grid.dart b/app/lib/widgets/food_bank/fb_tile_grid.dart index ed082fe..2339e55 100644 --- a/app/lib/widgets/food_bank/fb_tile_grid.dart +++ b/app/lib/widgets/food_bank/fb_tile_grid.dart @@ -6,7 +6,7 @@ library; import 'package:diet_guard_app/models/food_bank_record.dart'; import 'package:diet_guard_app/ui/macro_kind.dart'; import 'package:diet_guard_app/ui/theme.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Tiles per row. const int fbGridColumns = 3; diff --git a/app/lib/widgets/history/history_filter.dart b/app/lib/widgets/history/history_filter.dart index a938aee..3c9c231 100644 --- a/app/lib/widgets/history/history_filter.dart +++ b/app/lib/widgets/history/history_filter.dart @@ -5,7 +5,7 @@ /// can each depend on it without depending on one another. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // --------------------------------------------------------------------------- // Filter & sort state diff --git a/app/lib/widgets/history/history_filter_sheet.dart b/app/lib/widgets/history/history_filter_sheet.dart index 14eda3e..d091f05 100644 --- a/app/lib/widgets/history/history_filter_sheet.dart +++ b/app/lib/widgets/history/history_filter_sheet.dart @@ -10,7 +10,7 @@ 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_grouping.dart'; import 'package:diet_guard_app/widgets/pickers/pickers.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The draggable bottom sheet that edits the history filter and sort order. /// diff --git a/app/lib/widgets/history/history_filter_sort.dart b/app/lib/widgets/history/history_filter_sort.dart index 9d955ef..69e8e4c 100644 --- a/app/lib/widgets/history/history_filter_sort.dart +++ b/app/lib/widgets/history/history_filter_sort.dart @@ -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/widgets/filters/filter_chrome.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. /// diff --git a/app/lib/widgets/history/history_grouping.dart b/app/lib/widgets/history/history_grouping.dart index f450ac7..ed65814 100644 --- a/app/lib/widgets/history/history_grouping.dart +++ b/app/lib/widgets/history/history_grouping.dart @@ -7,7 +7,7 @@ library; import 'package:diet_guard_app/models/food_entry.dart'; import 'package:diet_guard_app/services/day_status_service.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 /// [EntryRow]. Sealed so the list's `switch` stays exhaustive. diff --git a/app/lib/widgets/history/history_list.dart b/app/lib/widgets/history/history_list.dart index be0397a..b9cd3c0 100644 --- a/app/lib/widgets/history/history_list.dart +++ b/app/lib/widgets/history/history_list.dart @@ -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/source_icon.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. /// diff --git a/app/lib/widgets/log_meal_actions_row.dart b/app/lib/widgets/log_meal_actions_row.dart index 0ba7d77..c1e1714 100644 --- a/app/lib/widgets/log_meal_actions_row.dart +++ b/app/lib/widgets/log_meal_actions_row.dart @@ -7,7 +7,7 @@ library; import 'package:diet_guard_app/services/kuchnia_client.dart'; import 'package:diet_guard_app/ui/theme.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A delivery button beside the log button. /// diff --git a/app/lib/widgets/log_sound_tile.dart b/app/lib/widgets/log_sound_tile.dart index 32d60cc..2b7352a 100644 --- a/app/lib/widgets/log_sound_tile.dart +++ b/app/lib/widgets/log_sound_tile.dart @@ -1,7 +1,7 @@ import 'dart:async'; 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. class LogSoundTile extends StatefulWidget { diff --git a/app/lib/widgets/macro_input_row.dart b/app/lib/widgets/macro_input_row.dart index 32444c1..22c9ee9 100644 --- a/app/lib/widgets/macro_input_row.dart +++ b/app/lib/widgets/macro_input_row.dart @@ -6,7 +6,7 @@ library; import 'package:diet_guard_app/models/nutrition.dart'; import 'package:diet_guard_app/ui/cues.dart'; import 'package:diet_guard_app/ui/macro_kind.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Text controllers for one macro-entry row, owned by the calling screen so /// it can read/clear/prefill values around the row's lifecycle. diff --git a/app/lib/widgets/meal_schedule_editor.dart b/app/lib/widgets/meal_schedule_editor.dart index b5d9ed8..194855f 100644 --- a/app/lib/widgets/meal_schedule_editor.dart +++ b/app/lib/widgets/meal_schedule_editor.dart @@ -7,7 +7,7 @@ import 'package:diet_guard_app/models/slot.dart'; import 'package:diet_guard_app/ui/icon_field.dart'; import 'package:diet_guard_app/ui/theme.dart'; import 'package:diet_guard_app/widgets/meal_time_dropdown.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Latest minute the *grid* offers for the first meal: 23:30, leaving one /// grid step for a grid-aligned last meal. The clock button can go later, up diff --git a/app/lib/widgets/meal_time_dropdown.dart b/app/lib/widgets/meal_time_dropdown.dart index 8c7e7f3..1b895c0 100644 --- a/app/lib/widgets/meal_time_dropdown.dart +++ b/app/lib/widgets/meal_time_dropdown.dart @@ -7,7 +7,7 @@ import 'package:diet_guard_app/models/meal_schedule.dart'; import 'package:diet_guard_app/models/slot.dart'; import 'package:diet_guard_app/ui/theme.dart'; import 'package:diet_guard_app/widgets/pickers/pickers.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Picks a minute of day, offering the 15-minute grid within /// [minMinute]..[maxMinute], with a clock button beside it that opens a time diff --git a/app/lib/widgets/pickers/date_dialog.dart b/app/lib/widgets/pickers/date_dialog.dart index 56b720f..e7f1bbb 100644 --- a/app/lib/widgets/pickers/date_dialog.dart +++ b/app/lib/widgets/pickers/date_dialog.dart @@ -8,8 +8,8 @@ import 'package:diet_guard_app/widgets/pickers/date_selection.dart'; import 'package:diet_guard_app/widgets/pickers/month_chips.dart'; import 'package:diet_guard_app/widgets/pickers/picker_frame.dart'; import 'package:diet_guard_app/widgets/pickers/year_wheel.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; /// Width of the year wheel beside the grid. const double kYearWheelWidth = 64; diff --git a/app/lib/widgets/pickers/date_grid.dart b/app/lib/widgets/pickers/date_grid.dart index e038084..a421011 100644 --- a/app/lib/widgets/pickers/date_grid.dart +++ b/app/lib/widgets/pickers/date_grid.dart @@ -6,7 +6,7 @@ library; import 'package:diet_guard_app/widgets/pickers/date_selection.dart'; import 'package:diet_guard_app/widgets/pickers/numeral_cell.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Six rows of seven: every month fits, and the dialog never changes height. const int kGridCells = 42; diff --git a/app/lib/widgets/pickers/date_selection.dart b/app/lib/widgets/pickers/date_selection.dart index 1729104..a05ad7b 100644 --- a/app/lib/widgets/pickers/date_selection.dart +++ b/app/lib/widgets/pickers/date_selection.dart @@ -4,7 +4,7 @@ library; import 'dart:math' as math; -import 'package:flutter/material.dart' show DateTimeRange, DateUtils; +import 'package:material_ui/material_ui.dart' show DateTimeRange, DateUtils; /// What the date picker has chosen, and which month it is showing. /// diff --git a/app/lib/widgets/pickers/month_chips.dart b/app/lib/widgets/pickers/month_chips.dart index b5bf5e1..fdf710c 100644 --- a/app/lib/widgets/pickers/month_chips.dart +++ b/app/lib/widgets/pickers/month_chips.dart @@ -2,7 +2,7 @@ library; import 'package:diet_guard_app/widgets/pickers/numeral_cell.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Twelve numeral chips in two rows of six; months wholly outside the bounds /// are dimmed and inert. diff --git a/app/lib/widgets/pickers/numeral_cell.dart b/app/lib/widgets/pickers/numeral_cell.dart index d596fba..8d58bc9 100644 --- a/app/lib/widgets/pickers/numeral_cell.dart +++ b/app/lib/widgets/pickers/numeral_cell.dart @@ -2,7 +2,7 @@ /// equal-width row layout both grids use. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Alpha of a weekend numeral: dimmed, with a dot as the second channel. const double kWeekendAlpha = 0.6; diff --git a/app/lib/widgets/pickers/numeral_wheel.dart b/app/lib/widgets/pickers/numeral_wheel.dart index 8716ca6..e5d4f13 100644 --- a/app/lib/widgets/pickers/numeral_wheel.dart +++ b/app/lib/widgets/pickers/numeral_wheel.dart @@ -5,8 +5,8 @@ import 'package:diet_guard_app/ui/theme.dart'; import 'package:diet_guard_app/widgets/pickers/loop_wheel_delegate.dart'; import 'package:diet_guard_app/widgets/pickers/numeral_cell.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; /// Height of one wheel item. const double kWheelItemExtent = 40; diff --git a/app/lib/widgets/pickers/picker_frame.dart b/app/lib/widgets/pickers/picker_frame.dart index 57437ad..4b4a484 100644 --- a/app/lib/widgets/pickers/picker_frame.dart +++ b/app/lib/widgets/pickers/picker_frame.dart @@ -3,8 +3,8 @@ library; import 'package:diet_guard_app/ui/theme.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; /// Picker chrome. Outside tap and Esc cancel (the dialog route's own /// dismiss); Enter confirms when [canConfirm]. diff --git a/app/lib/widgets/pickers/pickers.dart b/app/lib/widgets/pickers/pickers.dart index 55008df..eb9766c 100644 --- a/app/lib/widgets/pickers/pickers.dart +++ b/app/lib/widgets/pickers/pickers.dart @@ -9,7 +9,7 @@ library; import 'package:diet_guard_app/widgets/pickers/date_dialog.dart'; import 'package:diet_guard_app/widgets/pickers/date_selection.dart'; import 'package:diet_guard_app/widgets/pickers/time_dialog.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Picks one day in [firstDate]..[lastDate]; null when cancelled. /// diff --git a/app/lib/widgets/pickers/time_dialog.dart b/app/lib/widgets/pickers/time_dialog.dart index 078f527..fae0206 100644 --- a/app/lib/widgets/pickers/time_dialog.dart +++ b/app/lib/widgets/pickers/time_dialog.dart @@ -3,7 +3,7 @@ library; import 'package:diet_guard_app/widgets/pickers/picker_frame.dart'; import 'package:diet_guard_app/widgets/pickers/time_wheels.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Pops the chosen [TimeOfDay], always within [minMinute]..[maxMinute]. class TimeDialog extends StatefulWidget { diff --git a/app/lib/widgets/pickers/time_wheels.dart b/app/lib/widgets/pickers/time_wheels.dart index 4d3e403..9ce41dd 100644 --- a/app/lib/widgets/pickers/time_wheels.dart +++ b/app/lib/widgets/pickers/time_wheels.dart @@ -3,7 +3,7 @@ library; import 'package:diet_guard_app/ui/theme.dart'; import 'package:diet_guard_app/widgets/pickers/numeral_wheel.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Width of one time wheel. const double kTimeWheelWidth = 72; diff --git a/app/lib/widgets/pickers/year_wheel.dart b/app/lib/widgets/pickers/year_wheel.dart index c7a1e4b..4b4f52f 100644 --- a/app/lib/widgets/pickers/year_wheel.dart +++ b/app/lib/widgets/pickers/year_wheel.dart @@ -2,7 +2,7 @@ library; import 'package:diet_guard_app/widgets/pickers/numeral_wheel.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Out-of-range years listed beyond each bound, dimmed and inert, so the /// wheel's ends read as limits rather than as a list that just stops. diff --git a/app/lib/widgets/progress_motion.dart b/app/lib/widgets/progress_motion.dart index a0baace..95bc3aa 100644 --- a/app/lib/widgets/progress_motion.dart +++ b/app/lib/widgets/progress_motion.dart @@ -2,7 +2,7 @@ library; import 'package:diet_guard_app/ui/theme.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Fades [child] in and slides it up by [AppSpacing.md] when first built. /// diff --git a/app/lib/widgets/slot_selector_row.dart b/app/lib/widgets/slot_selector_row.dart index 8b91c0b..77376b6 100644 --- a/app/lib/widgets/slot_selector_row.dart +++ b/app/lib/widgets/slot_selector_row.dart @@ -7,7 +7,7 @@ import 'package:diet_guard_app/models/meal_schedule.dart'; import 'package:diet_guard_app/models/slot.dart'; import 'package:diet_guard_app/services/meal_schedule_service.dart'; import 'package:diet_guard_app/ui/theme.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// One row of [ChoiceChip]s, one per today's slot (labelled `HH:MM`). Each /// chip is simultaneously selectable (tap to log for that slot) and diff --git a/app/lib/widgets/streak_summary_row.dart b/app/lib/widgets/streak_summary_row.dart index ca508d4..0d2b2c4 100644 --- a/app/lib/widgets/streak_summary_row.dart +++ b/app/lib/widgets/streak_summary_row.dart @@ -3,7 +3,7 @@ library; import 'package:diet_guard_app/models/day_status.dart'; import 'package:diet_guard_app/ui/theme.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Displays the logging streak, adherence streak, and year-to-date tally. /// diff --git a/app/lib/widgets/sync_health_banner.dart b/app/lib/widgets/sync_health_banner.dart index bf1da1b..9948cd4 100644 --- a/app/lib/widgets/sync_health_banner.dart +++ b/app/lib/widgets/sync_health_banner.dart @@ -3,7 +3,7 @@ library; import 'package:diet_guard_app/services/sync_health.dart'; import 'package:diet_guard_app/ui/theme.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Warns, in place, that meals logged here are not reaching other devices. /// diff --git a/app/lib/widgets/today_progress_card.dart b/app/lib/widgets/today_progress_card.dart index 7d24c6e..0788246 100644 --- a/app/lib/widgets/today_progress_card.dart +++ b/app/lib/widgets/today_progress_card.dart @@ -6,7 +6,7 @@ import 'package:diet_guard_app/models/slot.dart'; import 'package:diet_guard_app/ui/macro_kind.dart'; import 'package:diet_guard_app/ui/theme.dart'; import 'package:diet_guard_app/widgets/progress_motion.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Everything [TodayProgressCard] renders, computed by the caller. /// diff --git a/app/pubspec.lock b/app/pubspec.lock index d19607c..f8015fd 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -133,10 +133,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: @@ -166,11 +166,11 @@ packages: dependency: "direct main" description: path: crdt_sync_flutter - ref: "crdt_sync_flutter-v0.8.1" - resolved-ref: "3225af8365481677d61a8cabec0c0ad4d0407567" + ref: "crdt_sync_flutter-v0.8.2" + resolved-ref: "1962d303336dfe260850466b8ee841033b9ad1ce" url: "https://github.com/kuhyx/utils" source: git - version: "0.8.1" + version: "0.8.2" cross_file: dependency: transitive description: @@ -195,6 +195,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.9.0" + cupertino_ui: + dependency: transitive + description: + name: cupertino_ui + sha256: "369e39a1c5c030a6212589c3da1809920b1c2cfade7b02aade7695bfa4b88c3a" + url: "https://pub.dev" + source: hosted + version: "1.1.6" data_transfer_flutter: dependency: "direct main" description: @@ -405,10 +413,10 @@ packages: dependency: "direct main" description: name: flutter_local_notifications - sha256: "58f9ea245d7194363c05f7a012bbc73291736c2d8b5f555a8e0ea3f9121868b4" + sha256: fac349e7361f80591a0cedff03548f807282c9faee9fc6192763166e5f81def2 url: "https://pub.dev" source: hosted - version: "23.0.1" + version: "23.0.2" flutter_local_notifications_linux: dependency: transitive description: @@ -441,6 +449,11 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.1" + flutter_localizations: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" flutter_secure_storage: dependency: "direct main" description: @@ -503,11 +516,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.0" + resolved-ref: "0ef5461805e8f574de5174c940775e5245d675b3" url: "https://github.com/kuhyx/utils" source: git - version: "0.4.0" + version: "0.5.0" google_account_token: dependency: "direct main" description: @@ -621,6 +634,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: @@ -645,6 +666,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.13.0" + material_ui: + dependency: "direct main" + description: + name: material_ui + sha256: "474c135fd46b56ff1d35ca982155e8863d28fbc6464d1192acf4ee53a738680e" + url: "https://pub.dev" + source: hosted + version: "1.11.0" meta: dependency: transitive description: @@ -926,10 +955,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: @@ -950,11 +979,11 @@ packages: dependency: "direct main" description: path: sync_settings_ui - ref: "sync_settings_ui-v0.7.3" - resolved-ref: "02d9d689e921d80ec155af9903164c3d2d259dce" + ref: "sync_settings_ui-v0.8.2" + resolved-ref: "3225af8365481677d61a8cabec0c0ad4d0407567" url: "https://github.com/kuhyx/utils" source: git - version: "0.7.3" + version: "0.8.2" synchronized: dependency: transitive description: @@ -975,10 +1004,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" timezone: dependency: transitive description: @@ -1071,10 +1100,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: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 356278b..ac044c5 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -2,7 +2,7 @@ name: diet_guard_app description: "Companion phone app for diet_guard: log meals on the go." publish_to: 'none' -version: 1.0.160+1 +version: 1.0.161+1 environment: sdk: ^3.12.2 @@ -18,7 +18,7 @@ dependencies: crdt_sync_flutter: git: url: https://github.com/kuhyx/utils - ref: crdt_sync_flutter-v0.8.1 + ref: crdt_sync_flutter-v0.8.2 path: crdt_sync_flutter crypto: 3.0.8 cryptography: 2.9.0 @@ -32,7 +32,7 @@ dependencies: fl_chart: 1.3.1 flutter: sdk: flutter - flutter_local_notifications: 23.0.1 + flutter_local_notifications: 23.0.2 flutter_secure_storage: 11.2.0 # One-tap sign-in for the sync account. App-side only: crdt_sync stays pure @@ -40,7 +40,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.0 path: github_device_auth # One-tap Google ID token via the framework AccountManager chooser (FOSS). google_account_token: @@ -51,6 +51,7 @@ dependencies: health: 13.3.2 http: 1.6.0 idb_shim: 2.11.3 + material_ui: 1.11.0 path: 1.9.1 path_provider: 2.1.6 permission_handler: 13.0.2 @@ -63,7 +64,7 @@ dependencies: sync_settings_ui: git: url: https://github.com/kuhyx/utils - ref: sync_settings_ui-v0.7.3 + ref: sync_settings_ui-v0.8.2 path: sync_settings_ui url_launcher: 6.3.3 uuid: 4.6.0 diff --git a/app/test/fill_all_row_test.dart b/app/test/fill_all_row_test.dart index 66abe7c..afd0b43 100644 --- a/app/test/fill_all_row_test.dart +++ b/app/test/fill_all_row_test.dart @@ -2,7 +2,7 @@ library; import 'package:diet_guard_app/widgets/fill_all_row.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'label_finders.dart'; diff --git a/app/test/keyboard_operability_test.dart b/app/test/keyboard_operability_test.dart index f51f8fb..04c5954 100644 --- a/app/test/keyboard_operability_test.dart +++ b/app/test/keyboard_operability_test.dart @@ -19,7 +19,7 @@ import 'package:diet_guard_app/services/document_store_io.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; import 'package:diet_guard_app/ui/theme.dart'; import 'package:diet_guard_app/widgets/day_status_calendar.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/semantics.dart'; import 'package:flutter_test/flutter_test.dart'; import 'label_finders.dart'; diff --git a/app/test/label_finders.dart b/app/test/label_finders.dart index c76e672..723ce89 100644 --- a/app/test/label_finders.dart +++ b/app/test/label_finders.dart @@ -4,7 +4,7 @@ library; import 'package:diet_guard_app/ui/cues.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// Finds an [Icon] with this `semanticLabel`. diff --git a/app/test/no_words_body_test.dart b/app/test/no_words_body_test.dart index cb762a7..c12348d 100644 --- a/app/test/no_words_body_test.dart +++ b/app/test/no_words_body_test.dart @@ -2,7 +2,7 @@ // paint no words (only numbers, unit symbols, MET and workout labels). // Workout labels are content only for manual workouts (source == 'manual'). -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'label_finders.dart'; diff --git a/app/test/no_words_kuchnia_test.dart b/app/test/no_words_kuchnia_test.dart index dbef620..9f0a53f 100644 --- a/app/test/no_words_kuchnia_test.dart +++ b/app/test/no_words_kuchnia_test.dart @@ -4,7 +4,7 @@ import 'package:diet_guard_app/screens/log_meal_fill_mixin.dart'; import 'package:diet_guard_app/services/kuchnia_spread.dart'; import 'package:diet_guard_app/ui/cues.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'label_finders.dart'; diff --git a/app/test/no_words_screens_test.dart b/app/test/no_words_screens_test.dart index 2593dc4..eed6dc1 100644 --- a/app/test/no_words_screens_test.dart +++ b/app/test/no_words_screens_test.dart @@ -17,7 +17,7 @@ import 'package:diet_guard_app/services/document_store_io.dart'; import 'package:diet_guard_app/services/foodbank_service.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; import 'package:diet_guard_app/services/meal_schedule_service.dart'; -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'; diff --git a/app/test/no_words_support.dart b/app/test/no_words_support.dart index a2453e1..dc40394 100644 --- a/app/test/no_words_support.dart +++ b/app/test/no_words_support.dart @@ -8,7 +8,7 @@ /// workout labels, typed values) is passed per test as [content]. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// Unit symbols and method acronyms that may sit next to a number. diff --git a/app/test/pickers/date_dialog_test.dart b/app/test/pickers/date_dialog_test.dart index d57815e..f343fc6 100644 --- a/app/test/pickers/date_dialog_test.dart +++ b/app/test/pickers/date_dialog_test.dart @@ -5,7 +5,7 @@ import 'package:diet_guard_app/widgets/pickers/date_dialog.dart'; import 'package:diet_guard_app/widgets/pickers/date_selection.dart'; import 'package:diet_guard_app/widgets/pickers/year_wheel.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/semantics.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/app/test/pickers/date_range_dialog_test.dart b/app/test/pickers/date_range_dialog_test.dart index a4b647a..6ccffff 100644 --- a/app/test/pickers/date_range_dialog_test.dart +++ b/app/test/pickers/date_range_dialog_test.dart @@ -3,7 +3,7 @@ import 'package:diet_guard_app/widgets/pickers/date_dialog.dart'; import 'package:diet_guard_app/widgets/pickers/date_selection.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'; diff --git a/app/test/pickers/date_selection_test.dart b/app/test/pickers/date_selection_test.dart index 66afacd..08e9896 100644 --- a/app/test/pickers/date_selection_test.dart +++ b/app/test/pickers/date_selection_test.dart @@ -1,7 +1,7 @@ // The date picker's selection rules, as plain unit tests. import 'package:diet_guard_app/widgets/pickers/date_selection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; final _first = DateTime(2026, 1, 15); diff --git a/app/test/pickers/no_words_pickers_test.dart b/app/test/pickers/no_words_pickers_test.dart index e159baa..3b8bcf1 100644 --- a/app/test/pickers/no_words_pickers_test.dart +++ b/app/test/pickers/no_words_pickers_test.dart @@ -17,7 +17,7 @@ import 'package:diet_guard_app/widgets/body/profile_card.dart'; 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/meal_time_dropdown.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart'; diff --git a/app/test/pickers/picker_call_sites_test.dart b/app/test/pickers/picker_call_sites_test.dart index 1aef1f8..eaa179f 100644 --- a/app/test/pickers/picker_call_sites_test.dart +++ b/app/test/pickers/picker_call_sites_test.dart @@ -5,7 +5,7 @@ import 'package:diet_guard_app/models/local_time.dart'; import 'package:diet_guard_app/widgets/body/dated_value_card.dart'; import 'package:diet_guard_app/widgets/body/profile_card.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'; diff --git a/app/test/pickers/picker_test_support.dart b/app/test/pickers/picker_test_support.dart index aa5f2bc..e88a951 100644 --- a/app/test/pickers/picker_test_support.dart +++ b/app/test/pickers/picker_test_support.dart @@ -2,7 +2,7 @@ // read back what it popped, and find cells by state rather than by text. import 'package:diet_guard_app/widgets/pickers/numeral_cell.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart'; diff --git a/app/test/pickers/time_dialog_test.dart b/app/test/pickers/time_dialog_test.dart index 0f2864d..4e48e22 100644 --- a/app/test/pickers/time_dialog_test.dart +++ b/app/test/pickers/time_dialog_test.dart @@ -4,7 +4,7 @@ import 'package:diet_guard_app/widgets/pickers/time_dialog.dart'; import 'package:diet_guard_app/widgets/pickers/time_wheels.dart'; import 'package:flutter/gestures.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'; diff --git a/app/test/screens/body_screen_goal_test.dart b/app/test/screens/body_screen_goal_test.dart index 6a87d74..f50c615 100644 --- a/app/test/screens/body_screen_goal_test.dart +++ b/app/test/screens/body_screen_goal_test.dart @@ -3,7 +3,7 @@ import 'package:diet_guard_app/services/body_energy.dart'; import 'package:diet_guard_app/services/body_prefs.dart'; import 'package:diet_guard_app/services/body_service.dart'; import 'package:diet_guard_app/ui/cues.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart'; diff --git a/app/test/screens/body_screen_support.dart b/app/test/screens/body_screen_support.dart index dfff60f..172f065 100644 --- a/app/test/screens/body_screen_support.dart +++ b/app/test/screens/body_screen_support.dart @@ -8,7 +8,7 @@ import 'package:diet_guard_app/services/app_settings_service.dart'; import 'package:diet_guard_app/services/body_service.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; import 'package:diet_guard_app/widgets/body/body_tile_grid.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart'; diff --git a/app/test/screens/body_screen_test.dart b/app/test/screens/body_screen_test.dart index 8f25938..60f32f3 100644 --- a/app/test/screens/body_screen_test.dart +++ b/app/test/screens/body_screen_test.dart @@ -2,7 +2,7 @@ import 'package:diet_guard_app/models/local_time.dart'; import 'package:diet_guard_app/screens/body_screen.dart'; import 'package:diet_guard_app/services/body_service.dart'; import 'package:diet_guard_app/ui/cues.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart'; diff --git a/app/test/screens/calendar_screen_test.dart b/app/test/screens/calendar_screen_test.dart index db2cd7b..7331400 100644 --- a/app/test/screens/calendar_screen_test.dart +++ b/app/test/screens/calendar_screen_test.dart @@ -6,7 +6,7 @@ import 'package:diet_guard_app/screens/history_screen.dart'; import 'package:diet_guard_app/services/app_settings_service.dart'; import 'package:diet_guard_app/services/budget_history_service.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart'; diff --git a/app/test/screens/edit_entry_screen_foodbank_test.dart b/app/test/screens/edit_entry_screen_foodbank_test.dart index 83193ff..5c48eff 100644 --- a/app/test/screens/edit_entry_screen_foodbank_test.dart +++ b/app/test/screens/edit_entry_screen_foodbank_test.dart @@ -7,7 +7,7 @@ import 'package:diet_guard_app/screens/edit_entry_screen.dart'; import 'package:diet_guard_app/screens/history_screen.dart'; import 'package:diet_guard_app/services/foodbank_service.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart'; diff --git a/app/test/screens/edit_entry_screen_test.dart b/app/test/screens/edit_entry_screen_test.dart index 1c909fc..2cfab30 100644 --- a/app/test/screens/edit_entry_screen_test.dart +++ b/app/test/screens/edit_entry_screen_test.dart @@ -7,7 +7,7 @@ import 'package:diet_guard_app/screens/edit_entry_screen.dart'; import 'package:diet_guard_app/screens/history_screen.dart'; import 'package:diet_guard_app/services/foodbank_service.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart'; diff --git a/app/test/screens/fit/fit_screens_test.dart b/app/test/screens/fit/fit_screens_test.dart index 38d96fd..2c6e741 100644 --- a/app/test/screens/fit/fit_screens_test.dart +++ b/app/test/screens/fit/fit_screens_test.dart @@ -21,7 +21,7 @@ import 'package:diet_guard_app/services/log_storage_service.dart'; import 'package:diet_guard_app/services/meal_schedule_service.dart'; import 'package:diet_guard_app/widgets/food_bank/fb_record_tile.dart'; import 'package:diet_guard_app/widgets/today_progress_card.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../label_finders.dart'; diff --git a/app/test/screens/fit/fit_support.dart b/app/test/screens/fit/fit_support.dart index 541b4c2..63d82aa 100644 --- a/app/test/screens/fit/fit_support.dart +++ b/app/test/screens/fit/fit_support.dart @@ -1,6 +1,6 @@ // Shared Pixel 6a geometry helpers for the one-screen (no-scroll) tests. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// Pixel 6a: 1080x2400 px at 2.625 dpr, 132 px status bar, 63 px nav bar. diff --git a/app/test/screens/food_bank/fb_screen_test.dart b/app/test/screens/food_bank/fb_screen_test.dart index 40b4941..2dd8ad1 100644 --- a/app/test/screens/food_bank/fb_screen_test.dart +++ b/app/test/screens/food_bank/fb_screen_test.dart @@ -3,7 +3,7 @@ import 'package:diet_guard_app/screens/food_bank_screen.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_filter_sheet.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../label_finders.dart'; diff --git a/app/test/screens/food_bank/fb_sheet_test.dart b/app/test/screens/food_bank/fb_sheet_test.dart index 6e419b2..dc98578 100644 --- a/app/test/screens/food_bank/fb_sheet_test.dart +++ b/app/test/screens/food_bank/fb_sheet_test.dart @@ -3,7 +3,7 @@ import 'package:diet_guard_app/models/food_entry.dart'; import 'package:diet_guard_app/screens/food_bank_screen.dart'; import 'package:diet_guard_app/services/foodbank_service.dart'; import 'package:diet_guard_app/widgets/food_bank/fb_filter_sheet.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../label_finders.dart'; diff --git a/app/test/screens/github_mirror_device_dialog_test.dart b/app/test/screens/github_mirror_device_dialog_test.dart index 7cf4d7c..fc24a7a 100644 --- a/app/test/screens/github_mirror_device_dialog_test.dart +++ b/app/test/screens/github_mirror_device_dialog_test.dart @@ -8,7 +8,7 @@ import 'package:diet_guard_app/services/budget_history_service.dart'; import 'package:diet_guard_app/services/document_store_io.dart'; import 'package:diet_guard_app/services/foodbank_service.dart'; import 'package:diet_guard_app/services/log_storage_service.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/app/test/screens/github_mirror_device_flow_test.dart b/app/test/screens/github_mirror_device_flow_test.dart index 9f3f544..fa8bd81 100644 --- a/app/test/screens/github_mirror_device_flow_test.dart +++ b/app/test/screens/github_mirror_device_flow_test.dart @@ -7,7 +7,7 @@ import 'package:diet_guard_app/services/budget_history_service.dart'; import 'package:diet_guard_app/services/document_store_io.dart'; import 'package:diet_guard_app/services/foodbank_service.dart'; import 'package:diet_guard_app/services/log_storage_service.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/app/test/screens/github_mirror_device_poll_test.dart b/app/test/screens/github_mirror_device_poll_test.dart index 9d47e6f..5a8cf5b 100644 --- a/app/test/screens/github_mirror_device_poll_test.dart +++ b/app/test/screens/github_mirror_device_poll_test.dart @@ -7,7 +7,7 @@ import 'package:diet_guard_app/services/budget_history_service.dart'; import 'package:diet_guard_app/services/document_store_io.dart'; import 'package:diet_guard_app/services/foodbank_service.dart'; import 'package:diet_guard_app/services/log_storage_service.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/app/test/screens/github_mirror_screen_test.dart b/app/test/screens/github_mirror_screen_test.dart index ce8e6a2..9719dcb 100644 --- a/app/test/screens/github_mirror_screen_test.dart +++ b/app/test/screens/github_mirror_screen_test.dart @@ -8,7 +8,7 @@ import 'package:diet_guard_app/services/document_store_io.dart'; import 'package:diet_guard_app/services/foodbank_service.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; import 'package:diet_guard_app/services/sync_health.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/app/test/screens/history/history_delete_undo_test.dart b/app/test/screens/history/history_delete_undo_test.dart index cef2922..2768ce6 100644 --- a/app/test/screens/history/history_delete_undo_test.dart +++ b/app/test/screens/history/history_delete_undo_test.dart @@ -1,7 +1,7 @@ import 'package:diet_guard_app/models/food_entry.dart'; import 'package:diet_guard_app/screens/history_screen.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../label_finders.dart'; diff --git a/app/test/screens/history/history_filter_criteria_test.dart b/app/test/screens/history/history_filter_criteria_test.dart index 68213d6..6b497f1 100644 --- a/app/test/screens/history/history_filter_criteria_test.dart +++ b/app/test/screens/history/history_filter_criteria_test.dart @@ -1,7 +1,7 @@ import 'package:diet_guard_app/models/food_entry.dart'; import 'package:diet_guard_app/widgets/history/history_filter.dart'; import 'package:diet_guard_app/widgets/history/history_grouping.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'history_test_support.dart'; diff --git a/app/test/screens/history/history_filter_range_test.dart b/app/test/screens/history/history_filter_range_test.dart index 044c60d..a55905f 100644 --- a/app/test/screens/history/history_filter_range_test.dart +++ b/app/test/screens/history/history_filter_range_test.dart @@ -1,7 +1,7 @@ import 'package:diet_guard_app/models/food_entry.dart'; import 'package:diet_guard_app/screens/history_screen.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'history_test_support.dart'; diff --git a/app/test/screens/history/history_filter_sheet_test.dart b/app/test/screens/history/history_filter_sheet_test.dart index 3d043f6..91d1fc6 100644 --- a/app/test/screens/history/history_filter_sheet_test.dart +++ b/app/test/screens/history/history_filter_sheet_test.dart @@ -2,7 +2,7 @@ import 'package:diet_guard_app/models/food_entry.dart'; import 'package:diet_guard_app/screens/history_screen.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; import 'package:diet_guard_app/widgets/history/history_filter_sheet.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../label_finders.dart'; diff --git a/app/test/screens/history/history_filter_sort_test.dart b/app/test/screens/history/history_filter_sort_test.dart index c4455e6..32f9f03 100644 --- a/app/test/screens/history/history_filter_sort_test.dart +++ b/app/test/screens/history/history_filter_sort_test.dart @@ -2,7 +2,7 @@ import 'package:diet_guard_app/models/food_entry.dart'; import 'package:diet_guard_app/screens/history_screen.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; import 'package:diet_guard_app/widgets/history/history_filter_sheet.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../label_finders.dart'; diff --git a/app/test/screens/history/history_filter_source_test.dart b/app/test/screens/history/history_filter_source_test.dart index 87d8b54..9c035ce 100644 --- a/app/test/screens/history/history_filter_source_test.dart +++ b/app/test/screens/history/history_filter_source_test.dart @@ -2,7 +2,7 @@ import 'package:diet_guard_app/models/food_entry.dart'; import 'package:diet_guard_app/screens/history_screen.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; import 'package:diet_guard_app/widgets/history/history_filter_sheet.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../label_finders.dart'; diff --git a/app/test/screens/history/history_screen_test.dart b/app/test/screens/history/history_screen_test.dart index f97ac27..35f4b09 100644 --- a/app/test/screens/history/history_screen_test.dart +++ b/app/test/screens/history/history_screen_test.dart @@ -3,7 +3,7 @@ import 'package:diet_guard_app/screens/history_screen.dart'; import 'package:diet_guard_app/services/budget_history_service.dart'; import 'package:diet_guard_app/services/budget_schedule.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../label_finders.dart'; diff --git a/app/test/screens/log_meal_fill_mixin_test.dart b/app/test/screens/log_meal_fill_mixin_test.dart index 6ea5174..0663d33 100644 --- a/app/test/screens/log_meal_fill_mixin_test.dart +++ b/app/test/screens/log_meal_fill_mixin_test.dart @@ -24,7 +24,7 @@ import 'package:diet_guard_app/services/kuchnia_queue.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; import 'package:diet_guard_app/ui/cues.dart'; import 'package:diet_guard_app/widgets/macro_input_row.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; diff --git a/app/test/screens/log_meal_haptic_test.dart b/app/test/screens/log_meal_haptic_test.dart index 44fed46..c9c3d9c 100644 --- a/app/test/screens/log_meal_haptic_test.dart +++ b/app/test/screens/log_meal_haptic_test.dart @@ -9,7 +9,7 @@ import 'package:diet_guard_app/services/foodbank_service.dart'; import 'package:diet_guard_app/services/log_feedback.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; import 'package:diet_guard_app/services/meal_schedule_service.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'; diff --git a/app/test/screens/log_meal_kuchnia_mixin_test.dart b/app/test/screens/log_meal_kuchnia_mixin_test.dart index 1e4ff10..2fbdad4 100644 --- a/app/test/screens/log_meal_kuchnia_mixin_test.dart +++ b/app/test/screens/log_meal_kuchnia_mixin_test.dart @@ -23,7 +23,7 @@ import 'package:diet_guard_app/screens/log_meal_kuchnia_mixin.dart'; import 'package:diet_guard_app/services/document_store.dart'; import 'package:diet_guard_app/services/kuchnia_queue.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:flutter_test/flutter_test.dart'; /// In-memory store, so these tests need no plugin channel. diff --git a/app/test/screens/log_meal_prefill_nutrition_test.dart b/app/test/screens/log_meal_prefill_nutrition_test.dart index 73ab0f1..e7cd662 100644 --- a/app/test/screens/log_meal_prefill_nutrition_test.dart +++ b/app/test/screens/log_meal_prefill_nutrition_test.dart @@ -15,7 +15,7 @@ import 'package:diet_guard_app/screens/log_meal_kuchnia_mixin.dart'; import 'package:diet_guard_app/services/document_store.dart'; import 'package:diet_guard_app/services/kuchnia_queue.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:flutter_test/flutter_test.dart'; /// In-memory store, so these tests need no plugin channel. diff --git a/app/test/screens/log_meal_schedule_test.dart b/app/test/screens/log_meal_schedule_test.dart index 6ceadf0..c8ce173 100644 --- a/app/test/screens/log_meal_schedule_test.dart +++ b/app/test/screens/log_meal_schedule_test.dart @@ -14,7 +14,7 @@ import 'package:diet_guard_app/services/document_store_io.dart'; import 'package:diet_guard_app/services/foodbank_service.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; import 'package:diet_guard_app/services/meal_schedule_service.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/app/test/screens/log_meal_screen_future_test.dart b/app/test/screens/log_meal_screen_future_test.dart index cd62f7c..0419502 100644 --- a/app/test/screens/log_meal_screen_future_test.dart +++ b/app/test/screens/log_meal_screen_future_test.dart @@ -9,7 +9,7 @@ import 'package:diet_guard_app/services/document_store_io.dart'; import 'package:diet_guard_app/services/foodbank_service.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; import 'package:diet_guard_app/services/meal_schedule_service.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart'; diff --git a/app/test/screens/log_meal_screen_nav_test.dart b/app/test/screens/log_meal_screen_nav_test.dart index 558d85d..bbfd92b 100644 --- a/app/test/screens/log_meal_screen_nav_test.dart +++ b/app/test/screens/log_meal_screen_nav_test.dart @@ -13,7 +13,7 @@ import 'package:diet_guard_app/services/budget_history_service.dart'; import 'package:diet_guard_app/services/document_store_io.dart'; import 'package:diet_guard_app/services/foodbank_service.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart'; diff --git a/app/test/screens/log_meal_screen_sync_test.dart b/app/test/screens/log_meal_screen_sync_test.dart index 3ae2cce..f102125 100644 --- a/app/test/screens/log_meal_screen_sync_test.dart +++ b/app/test/screens/log_meal_screen_sync_test.dart @@ -8,7 +8,7 @@ import 'package:diet_guard_app/models/nutrition.dart'; import 'package:diet_guard_app/screens/log_meal_screen.dart'; import 'package:diet_guard_app/services/foodbank_service.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart'; diff --git a/app/test/screens/log_meal_screen_test.dart b/app/test/screens/log_meal_screen_test.dart index 8d1a79e..04c6151 100644 --- a/app/test/screens/log_meal_screen_test.dart +++ b/app/test/screens/log_meal_screen_test.dart @@ -11,7 +11,7 @@ import 'package:diet_guard_app/services/foodbank_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/widgets/today_progress_card.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart'; diff --git a/app/test/screens/settings_kuchnia_test.dart b/app/test/screens/settings_kuchnia_test.dart index 805565a..180a933 100644 --- a/app/test/screens/settings_kuchnia_test.dart +++ b/app/test/screens/settings_kuchnia_test.dart @@ -17,7 +17,7 @@ import 'package:diet_guard_app/screens/settings_kuchnia.dart'; import 'package:diet_guard_app/services/document_store.dart'; import 'package:diet_guard_app/services/kuchnia_credential_service.dart'; import 'package:diet_guard_app/ui/cues.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart'; diff --git a/app/test/screens/settings_screen_battery_test.dart b/app/test/screens/settings_screen_battery_test.dart index 647026f..5ad6c49 100644 --- a/app/test/screens/settings_screen_battery_test.dart +++ b/app/test/screens/settings_screen_battery_test.dart @@ -9,7 +9,7 @@ import 'package:diet_guard_app/services/firebase_backend.dart'; import 'package:diet_guard_app/services/foodbank_service.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; import 'package:diet_guard_app/ui/cues.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/app/test/screens/settings_screen_test.dart b/app/test/screens/settings_screen_test.dart index 6f19741..628eda0 100644 --- a/app/test/screens/settings_screen_test.dart +++ b/app/test/screens/settings_screen_test.dart @@ -10,7 +10,7 @@ import 'package:diet_guard_app/services/firebase_backend.dart'; import 'package:diet_guard_app/services/foodbank_service.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; import 'package:diet_guard_app/services/meal_schedule_service.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/app/test/ui/cues_test.dart b/app/test/ui/cues_test.dart index 4b88268..1ef5c46 100644 --- a/app/test/ui/cues_test.dart +++ b/app/test/ui/cues_test.dart @@ -3,7 +3,7 @@ library; import 'package:diet_guard_app/ui/cues.dart'; import 'package:diet_guard_app/ui/theme.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'; diff --git a/app/test/ui/source_icon_test.dart b/app/test/ui/source_icon_test.dart index 38c152c..b52c806 100644 --- a/app/test/ui/source_icon_test.dart +++ b/app/test/ui/source_icon_test.dart @@ -1,5 +1,5 @@ import 'package:diet_guard_app/ui/source_icon.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/app/test/ui/theme_motion_test.dart b/app/test/ui/theme_motion_test.dart index 2a6aba5..cfc29fc 100644 --- a/app/test/ui/theme_motion_test.dart +++ b/app/test/ui/theme_motion_test.dart @@ -1,5 +1,5 @@ import 'package:diet_guard_app/ui/theme.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/app/test/widgets/average_summary_row_test.dart b/app/test/widgets/average_summary_row_test.dart index 03f1ac9..dd65ef3 100644 --- a/app/test/widgets/average_summary_row_test.dart +++ b/app/test/widgets/average_summary_row_test.dart @@ -1,6 +1,6 @@ import 'package:diet_guard_app/models/period_average.dart'; import 'package:diet_guard_app/widgets/average_summary_row.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart'; diff --git a/app/test/widgets/body/body_widgets_test.dart b/app/test/widgets/body/body_widgets_test.dart index af4ac9d..8d35096 100644 --- a/app/test/widgets/body/body_widgets_test.dart +++ b/app/test/widgets/body/body_widgets_test.dart @@ -6,7 +6,7 @@ import 'package:diet_guard_app/widgets/body/body_stats_cards.dart'; import 'package:diet_guard_app/widgets/body/week_plan_card.dart'; import 'package:diet_guard_app/widgets/body/weight_chart.dart'; import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../label_finders.dart'; diff --git a/app/test/widgets/body/formula_and_tile_layout_test.dart b/app/test/widgets/body/formula_and_tile_layout_test.dart index 94145c4..95a857b 100644 --- a/app/test/widgets/body/formula_and_tile_layout_test.dart +++ b/app/test/widgets/body/formula_and_tile_layout_test.dart @@ -1,7 +1,7 @@ import 'package:diet_guard_app/models/workout_session.dart'; import 'package:diet_guard_app/widgets/body/activity_card.dart'; import 'package:diet_guard_app/widgets/body/body_tile_grid.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/app/test/widgets/day_status_calendar_test.dart b/app/test/widgets/day_status_calendar_test.dart index 0366939..ef52a1c 100644 --- a/app/test/widgets/day_status_calendar_test.dart +++ b/app/test/widgets/day_status_calendar_test.dart @@ -1,6 +1,6 @@ import 'package:diet_guard_app/models/day_status.dart'; import 'package:diet_guard_app/widgets/day_status_calendar.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'day_status_calendar_test_support.dart'; diff --git a/app/test/widgets/day_status_calendar_test_support.dart b/app/test/widgets/day_status_calendar_test_support.dart index d348092..4c1469a 100644 --- a/app/test/widgets/day_status_calendar_test_support.dart +++ b/app/test/widgets/day_status_calendar_test_support.dart @@ -5,7 +5,7 @@ // is library-private in Dart. import 'package:diet_guard_app/ui/theme.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; // The real app theme, not a bare default MaterialApp -- the widget under diff --git a/app/test/widgets/food_bank/fb_tile_grid_test.dart b/app/test/widgets/food_bank/fb_tile_grid_test.dart index ec5300f..d2c27e2 100644 --- a/app/test/widgets/food_bank/fb_tile_grid_test.dart +++ b/app/test/widgets/food_bank/fb_tile_grid_test.dart @@ -1,6 +1,6 @@ import 'package:diet_guard_app/models/food_bank_record.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'; import 'package:flutter_test/flutter_test.dart'; List _foods(int n, {double count = 0}) => [ diff --git a/app/test/widgets/log_meal_actions_row_test.dart b/app/test/widgets/log_meal_actions_row_test.dart index fd0f5a3..e8f2964 100644 --- a/app/test/widgets/log_meal_actions_row_test.dart +++ b/app/test/widgets/log_meal_actions_row_test.dart @@ -8,7 +8,7 @@ library; import 'package:diet_guard_app/widgets/log_meal_actions_row.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart'; diff --git a/app/test/widgets/log_sound_tile_test.dart b/app/test/widgets/log_sound_tile_test.dart index 632c30e..d05f616 100644 --- a/app/test/widgets/log_sound_tile_test.dart +++ b/app/test/widgets/log_sound_tile_test.dart @@ -8,7 +8,7 @@ import 'package:diet_guard_app/services/foodbank_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/widgets/log_sound_tile.dart'; -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'; diff --git a/app/test/widgets/meal_schedule_editor_test.dart b/app/test/widgets/meal_schedule_editor_test.dart index 57de70e..2793756 100644 --- a/app/test/widgets/meal_schedule_editor_test.dart +++ b/app/test/widgets/meal_schedule_editor_test.dart @@ -2,7 +2,7 @@ import 'package:diet_guard_app/models/meal_schedule.dart'; import 'package:diet_guard_app/widgets/meal_schedule_editor.dart'; import 'package:diet_guard_app/widgets/meal_time_dropdown.dart'; import 'package:diet_guard_app/widgets/pickers/time_dialog.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart'; diff --git a/app/test/widgets/slot_selector_row_test.dart b/app/test/widgets/slot_selector_row_test.dart index eef2702..3386415 100644 --- a/app/test/widgets/slot_selector_row_test.dart +++ b/app/test/widgets/slot_selector_row_test.dart @@ -1,7 +1,7 @@ import 'package:diet_guard_app/models/meal_schedule.dart'; import 'package:diet_guard_app/models/slot.dart'; import 'package:diet_guard_app/widgets/slot_selector_row.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Future _pump( diff --git a/app/test/widgets/streak_summary_row_test.dart b/app/test/widgets/streak_summary_row_test.dart index 6c21f78..a2135e0 100644 --- a/app/test/widgets/streak_summary_row_test.dart +++ b/app/test/widgets/streak_summary_row_test.dart @@ -1,6 +1,6 @@ import 'package:diet_guard_app/models/day_status.dart'; import 'package:diet_guard_app/widgets/streak_summary_row.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart'; diff --git a/app/test/widgets/sync_health_banner_test.dart b/app/test/widgets/sync_health_banner_test.dart index 6fb94cf..92c1f63 100644 --- a/app/test/widgets/sync_health_banner_test.dart +++ b/app/test/widgets/sync_health_banner_test.dart @@ -1,6 +1,6 @@ import 'package:diet_guard_app/services/sync_health.dart'; import 'package:diet_guard_app/widgets/sync_health_banner.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Future pump(WidgetTester tester, SyncHealthStatus? status) => diff --git a/app/test/widgets/today_progress_card_motion_test.dart b/app/test/widgets/today_progress_card_motion_test.dart index 653cd95..aeb42ad 100644 --- a/app/test/widgets/today_progress_card_motion_test.dart +++ b/app/test/widgets/today_progress_card_motion_test.dart @@ -1,5 +1,5 @@ import 'package:diet_guard_app/widgets/today_progress_card.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart'; diff --git a/app/test/widgets/today_progress_card_test.dart b/app/test/widgets/today_progress_card_test.dart index a5d63ad..23e0932 100644 --- a/app/test/widgets/today_progress_card_test.dart +++ b/app/test/widgets/today_progress_card_test.dart @@ -1,5 +1,5 @@ import 'package:diet_guard_app/widgets/today_progress_card.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../label_finders.dart';