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 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01WzxdWWfb63jncj9Lca2jeX
This commit is contained in:
Krzysztof Rudnicki 2026-11-16 09:25:34 +01:00
parent dfd60d4f7b
commit 49144a2c49
139 changed files with 191 additions and 161 deletions

View File

@ -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<void> main() async {
WidgetsFlutterBinding.ensureInitialized();

View File

@ -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';

View File

@ -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.

View File

@ -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 {

View File

@ -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].

View File

@ -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.

View File

@ -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';

View File

@ -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.
///

View File

@ -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.
///

View File

@ -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;

View File

@ -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<T extends StatefulWidget> on State<T> {

View File

@ -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);

View File

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

View File

@ -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.

View File

@ -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.
///

View File

@ -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).

View File

@ -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';

View File

@ -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';

View File

@ -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.
///

View File

@ -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 {

View File

@ -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) {

View File

@ -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() {

View File

@ -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.
///

View File

@ -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.
///

View File

@ -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;

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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 {

View File

@ -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<String, IconData> formulaIcons = {

View File

@ -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 {

View File

@ -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) {

View File

@ -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 = ({

View File

@ -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 {

View File

@ -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 {

View File

@ -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';

View File

@ -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 = [

View File

@ -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) {

View File

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

View File

@ -3,7 +3,7 @@ library;
import 'package:diet_guard_app/models/day_status.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';
/// Monthly calendar widget that colors each day by its [DayStatus].
///

View File

@ -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';

View File

@ -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 {

View File

@ -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.
///

View File

@ -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.
///

View File

@ -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.
///

View File

@ -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.
///

View File

@ -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;

View File

@ -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

View File

@ -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.
///

View File

@ -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.
///

View File

@ -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.

View File

@ -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.
///

View File

@ -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.
///

View File

@ -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 {

View File

@ -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.

View File

@ -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

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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.
///

View File

@ -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.

View File

@ -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;

View File

@ -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;

View File

@ -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].

View File

@ -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.
///

View File

@ -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 {

View File

@ -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;

View File

@ -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.

View File

@ -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.
///

View File

@ -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

View File

@ -3,7 +3,7 @@ library;
import 'package:diet_guard_app/models/day_status.dart';
import 'package:diet_guard_app/ui/theme.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';
/// Displays the logging streak, adherence streak, and year-to-date tally.
///

View File

@ -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.
///

View File

@ -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.
///

View File

@ -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:

View File

@ -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

View File

@ -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';

View File

@ -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';

View File

@ -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`.

View File

@ -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';

View File

@ -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';

View File

@ -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';

View File

@ -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.

View File

@ -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';

View File

@ -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';

View File

@ -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);

View File

@ -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';

View File

@ -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';

View File

@ -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';

View File

@ -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';

View File

@ -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';

View File

@ -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';

View File

@ -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';

View File

@ -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';

View File

@ -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';

View File

@ -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';

View File

@ -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';

View File

@ -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.

View File

@ -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';

View File

@ -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';

View File

@ -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';

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