From fee0079dc94b866e7966b777b726d3a3ebb44cab Mon Sep 17 00:00:00 2001 From: pankaj-basnet <165250380+pankaj-basnet@users.noreply.github.com> Date: Tue, 1 Sep 2026 12:10:46 +0545 Subject: [PATCH 1/3] material ui: post-flutter-3.47 imports, dart fix applied --- analysis_options.yaml | 7 + integration_test/make_screenshots_test.dart | 2 +- lib/core/app_settings_notifier.dart | 2 +- lib/core/colors.dart | 2 +- lib/core/consts.dart | 2 +- lib/core/dashboard.dart | 2 +- lib/core/error_dialogs.dart | 2 +- lib/core/form_screen.dart | 2 +- lib/core/form_validators.dart | 2 +- lib/core/home_tabs_screen.dart | 2 +- lib/core/json.dart | 2 +- lib/core/keys.dart | 2 +- lib/core/misc.dart | 2 +- lib/core/powersync_unreachable_screen.dart | 2 +- .../settings_dashboard_widgets_screen.dart | 2 +- lib/core/snackbar.dart | 2 +- lib/core/splash_screen.dart | 2 +- lib/core/update_app_screen.dart | 2 +- lib/core/update_server_screen.dart | 2 +- lib/core/wide_screen_wrapper.dart | 2 +- lib/core/widgets/about.dart | 2 +- lib/core/widgets/app_bar.dart | 2 +- lib/core/widgets/async_value_widget.dart | 2 +- lib/core/widgets/cards.dart | 2 +- lib/core/widgets/confirm_delete_dialog.dart | 2 +- lib/core/widgets/core.dart | 2 +- lib/core/widgets/dashboard/calendar.dart | 2 +- .../dashboard/widgets/measurements.dart | 2 +- .../dashboard/widgets/nothing_found.dart | 2 +- .../widgets/dashboard/widgets/nutrition.dart | 2 +- .../widgets/dashboard/widgets/routines.dart | 2 +- .../widgets/dashboard/widgets/trophies.dart | 2 +- .../widgets/dashboard/widgets/weight.dart | 2 +- lib/core/widgets/datetime_input.dart | 2 +- lib/core/widgets/decimal_input.dart | 2 +- lib/core/widgets/error.dart | 2 +- lib/core/widgets/form_submit_button.dart | 2 +- lib/core/widgets/image.dart | 2 +- lib/core/widgets/language_dropdown.dart | 2 +- lib/core/widgets/legend.dart | 2 +- lib/core/widgets/log_overview.dart | 2 +- lib/core/widgets/object_gone_redirect.dart | 2 +- lib/core/widgets/progress_indicator.dart | 2 +- .../widgets/server_config_warning_dialog.dart | 2 +- lib/core/widgets/svg_icon.dart | 2 +- lib/core/widgets/sync_status_dialog.dart | 2 +- lib/core/widgets/text_prompt.dart | 2 +- lib/core/widgets/wger_image.dart | 2 +- .../converters/time_of_day_converter.dart | 2 +- lib/database/powersync/database.dart | 2 +- lib/database/powersync/tables/nutrition.dart | 2 +- lib/features/account/widgets/forms.dart | 2 +- lib/features/account/widgets/settings.dart | 2 +- .../widgets/settings/certs_not_verified.dart | 2 +- .../settings/dashboard_visibility.dart | 2 +- .../widgets/settings/data_privacy.dart | 2 +- .../account/widgets/settings/health_sync.dart | 2 +- .../account/widgets/settings/image_cache.dart | 2 +- .../account/widgets/settings/language.dart | 2 +- .../account/widgets/settings/theme.dart | 2 +- .../widgets/settings/verbose_logging.dart | 2 +- lib/features/auth/screens/auth_screen.dart | 2 +- .../auth/screens/auto_login_error_screen.dart | 2 +- .../auth/screens/mfa_challenge_screen.dart | 2 +- .../auth/widgets/advanced_footer.dart | 2 +- lib/features/auth/widgets/advanced_sheet.dart | 2 +- lib/features/auth/widgets/auth_card.dart | 2 +- .../auth/widgets/auth_mode_switch_link.dart | 2 +- .../auth/widgets/confirm_password_field.dart | 2 +- lib/features/auth/widgets/email_field.dart | 2 +- lib/features/auth/widgets/password_field.dart | 2 +- .../auth/widgets/refresh_token_field.dart | 2 +- lib/features/auth/widgets/server_field.dart | 2 +- lib/features/auth/widgets/username_field.dart | 2 +- .../auth/widgets/web_handoff_link.dart | 2 +- .../models/exercise_submission_images.dart | 2 +- .../screens/add_exercise_screen.dart | 2 +- .../exercises/screens/exercise_screen.dart | 2 +- .../exercises/screens/exercises_screen.dart | 2 +- lib/features/exercises/validators.dart | 2 +- .../add_exercise_dropdown_button.dart | 2 +- .../add_exercise_multiselect_button.dart | 2 +- .../add_exercise/add_exercise_text_area.dart | 2 +- .../add_exercise/image_details_form.dart | 2 +- .../add_exercise/license_info_widget.dart | 2 +- .../mixins/image_picker_mixin.dart | 2 +- .../widgets/add_exercise/preview_images.dart | 2 +- .../add_exercise/steps/step_1_basics.dart | 2 +- .../add_exercise/steps/step_2_variations.dart | 2 +- .../steps/step_3_description.dart | 2 +- .../steps/step_4_translations.dart | 2 +- .../add_exercise/steps/step_5_images.dart | 2 +- .../add_exercise/steps/step_6_overview.dart | 2 +- .../exercises/widgets/autocompleter.dart | 2 +- .../widgets/detail/aliases_section.dart | 2 +- .../detail/category_equipment_row.dart | 2 +- .../widgets/detail/description_section.dart | 2 +- .../widgets/detail/images_section.dart | 2 +- .../widgets/detail/muscles_section.dart | 2 +- .../widgets/detail/notes_section.dart | 2 +- .../widgets/detail/variations_section.dart | 2 +- .../widgets/detail/videos_section.dart | 2 +- .../widgets/exercise_filter_dialog.dart | 2 +- lib/features/exercises/widgets/exercises.dart | 2 +- .../exercises/widgets/filter_modal.dart | 2 +- .../exercises/widgets/filter_row.dart | 2 +- lib/features/exercises/widgets/forms.dart | 2 +- lib/features/exercises/widgets/images.dart | 2 +- lib/features/exercises/widgets/list_tile.dart | 2 +- lib/features/exercises/widgets/videos.dart | 2 +- .../gallery/screens/gallery_screen.dart | 2 +- lib/features/gallery/widgets/forms.dart | 2 +- lib/features/gallery/widgets/overview.dart | 2 +- lib/features/measurements/charts/colors.dart | 2 +- lib/features/measurements/charts/data.dart | 2 +- lib/features/measurements/charts/series.dart | 2 +- .../models/measurement_calculation.dart | 2 +- .../models/measurement_category.dart | 2 +- .../measurement_categories_screen.dart | 2 +- .../measurement_category_sort_screen.dart | 2 +- .../screens/measurement_entries_screen.dart | 2 +- .../measurements/screens/weight_screen.dart | 2 +- .../widgets/calculation_mark.dart | 2 +- .../widgets/calculation_params.dart | 2 +- .../measurements/widgets/categories.dart | 2 +- .../measurements/widgets/categories_card.dart | 2 +- .../widgets/chart_range_selector.dart | 2 +- .../widgets/charts/bar_chart.dart | 2 +- .../widgets/charts/chart_painting.dart | 2 +- .../widgets/charts/distribution_chart.dart | 2 +- .../measurements/widgets/charts/fl_axes.dart | 2 +- .../widgets/charts/heatmap_chart.dart | 2 +- .../widgets/charts/line_chart.dart | 2 +- .../widgets/charts/overall_change.dart | 2 +- .../widgets/charts/spark_charts.dart | 2 +- .../widgets/charts/stacked_bar_chart.dart | 2 +- .../measurements/widgets/entries.dart | 2 +- .../measurements/widgets/forms/category.dart | 2 +- .../measurements/widgets/forms/entry.dart | 2 +- .../widgets/forms/group_entry.dart | 2 +- .../measurements/widgets/helpers.dart | 2 +- .../measurements/widgets/measurement_fab.dart | 2 +- .../widgets/measurement_tile.dart | 2 +- .../measurements/widgets/metric_picker.dart | 2 +- .../measurements/widgets/weight_form.dart | 2 +- lib/features/nutrition/models/meal.dart | 2 +- .../screens/ingredient_detail_screen.dart | 2 +- .../nutrition/screens/ingredients_screen.dart | 2 +- .../nutrition/screens/log_meal_screen.dart | 2 +- .../nutrition/screens/log_meals_screen.dart | 2 +- .../screens/nutritional_diary_screen.dart | 2 +- .../screens/nutritional_plan_screen.dart | 2 +- .../screens/nutritional_plans_screen.dart | 2 +- lib/features/nutrition/widgets/charts.dart | 2 +- lib/features/nutrition/widgets/forms.dart | 2 +- lib/features/nutrition/widgets/helpers.dart | 2 +- .../nutrition/widgets/ingredient_dialogs.dart | 2 +- .../widgets/ingredient_filter_dialog.dart | 2 +- .../widgets/ingredient_filter_row.dart | 2 +- .../nutrition/widgets/ingredient_images.dart | 2 +- .../widgets/ingredient_list_tile.dart | 2 +- .../widgets/macro_nutrients_table.dart | 2 +- lib/features/nutrition/widgets/meal.dart | 2 +- .../nutrition/widgets/nutri_score_badge.dart | 2 +- .../nutrition/widgets/nutrition_tile.dart | 2 +- .../nutrition/widgets/nutrition_tiles.dart | 2 +- .../widgets/nutritional_diary_detail.dart | 2 +- .../widgets/nutritional_diary_table.dart | 2 +- .../widgets/nutritional_plan_detail.dart | 2 +- .../widgets/nutritional_plans_list.dart | 2 +- .../nutrition/widgets/plan_weight_chart.dart | 2 +- lib/features/nutrition/widgets/widgets.dart | 2 +- lib/features/routines/models/log.dart | 2 +- lib/features/routines/models/session.dart | 2 +- .../routines/providers/gym_state.dart | 2 +- .../routines/providers/plate_weights.dart | 2 +- lib/features/routines/screens/gym_mode.dart | 2 +- .../routines/screens/routine_edit_screen.dart | 2 +- .../routines/screens/routine_list_screen.dart | 2 +- .../routines/screens/routine_logs_screen.dart | 2 +- .../routines/screens/routine_screen.dart | 2 +- .../screens/settings_plates_screen.dart | 2 +- lib/features/routines/widgets/app_bar.dart | 2 +- lib/features/routines/widgets/charts.dart | 2 +- lib/features/routines/widgets/day.dart | 2 +- lib/features/routines/widgets/forms/day.dart | 2 +- .../routines/widgets/forms/repetitions.dart | 2 +- lib/features/routines/widgets/forms/rir.dart | 2 +- .../routines/widgets/forms/routine.dart | 2 +- .../routines/widgets/forms/session.dart | 2 +- lib/features/routines/widgets/forms/slot.dart | 2 +- .../routines/widgets/forms/slot_entry.dart | 2 +- .../routines/widgets/forms/weight.dart | 2 +- .../widgets/gym_mode/elapsed_time.dart | 2 +- .../widgets/gym_mode/exercise_overview.dart | 2 +- .../routines/widgets/gym_mode/gym_mode.dart | 2 +- .../routines/widgets/gym_mode/log_page.dart | 2 +- .../routines/widgets/gym_mode/navigation.dart | 2 +- .../widgets/gym_mode/session_page.dart | 2 +- .../routines/widgets/gym_mode/start_page.dart | 2 +- .../routines/widgets/gym_mode/summary.dart | 2 +- .../routines/widgets/gym_mode/timer.dart | 2 +- .../widgets/gym_mode/workout_menu.dart | 2 +- .../widgets/logs/day_logs_container.dart | 2 +- .../widgets/logs/exercise_log_chart.dart | 2 +- .../logs/exercises_expansion_card.dart | 2 +- .../widgets/logs/log_delete_dialog.dart | 2 +- .../widgets/logs/log_edit_dialog.dart | 2 +- .../widgets/logs/log_overview_routine.dart | 2 +- .../routines/widgets/logs/muscle_groups.dart | 2 +- .../routines/widgets/logs/session_info.dart | 2 +- .../routines/widgets/plate_calculator.dart | 2 +- .../routines/widgets/routine_detail.dart | 2 +- .../routines/widgets/routine_edit.dart | 2 +- .../routines/widgets/routines_list.dart | 2 +- lib/features/routines/widgets/slot.dart | 2 +- .../trophies/screens/trophy_screen.dart | 2 +- .../trophies/widgets/trophies_overview.dart | 2 +- lib/main.dart | 2 +- lib/theme/dynamic_color.dart | 2 +- lib/theme/theme.dart | 2 +- pubspec.lock | 196 ++++++++++-------- pubspec.yaml | 3 +- test/core/app_settings_notifier_test.dart | 2 +- test/core/colors_test.dart | 2 +- test/core/error_dialogs_test.dart | 2 +- test/core/errors_test.dart | 2 +- test/core/form_validators_test.dart | 2 +- test/core/formatting_test.dart | 2 +- test/core/json_test.dart | 2 +- test/core/locale_test.dart | 2 +- test/core/recovery_screens_test.dart | 2 +- test/core/widgets/app_bar_test.dart | 2 +- .../core/widgets/dashboard/calendar_test.dart | 2 +- .../dashboard_trophies_widget_test.dart | 2 +- .../dashboard/widgets/routines_test.dart | 2 +- .../dashboard/widgets/weight_test.dart | 2 +- test/core/widgets/datetime_input_test.dart | 2 +- test/core/widgets/decimal_input_test.dart | 2 +- test/core/widgets/error_test.dart | 2 +- .../core/widgets/form_submit_button_test.dart | 2 +- test/core/widgets/log_overview_test.dart | 2 +- .../widgets/object_gone_redirect_test.dart | 2 +- test/core/widgets/svg_icon_test.dart | 2 +- .../core/widgets/sync_status_dialog_test.dart | 2 +- .../time_of_day_converter_test.dart | 2 +- test/features/account/widgets/forms_test.dart | 2 +- .../settings/certs_not_verified_test.dart | 2 +- .../settings/dashboard_visibility_test.dart | 2 +- .../widgets/settings/health_sync_test.dart | 2 +- .../account/widgets/settings_test.dart | 2 +- .../auth/screens/auth_screen_test.dart | 2 +- .../screens/mfa_challenge_screen_test.dart | 2 +- .../screens/add_exercise_screen_test.dart | 2 +- .../add_exercise_text_area_test.dart | 2 +- .../widgets/exercises_detail_widget_test.dart | 2 +- .../exercises/widgets/muscle_widget_test.dart | 2 +- .../gallery/screens/gallery_screen_test.dart | 2 +- test/features/gallery/widgets/forms_test.dart | 2 +- .../gallery/widgets/overview_test.dart | 2 +- .../measurements/charts/data_test.dart | 2 +- .../models/measurement_calculation_test.dart | 2 +- .../measurement_categories_screen_test.dart | 2 +- ...measurement_category_sort_screen_test.dart | 2 +- .../measurement_entries_screen_test.dart | 2 +- .../screens/weight_screen_test.dart | 2 +- .../widgets/calculation_mark_test.dart | 2 +- .../widgets/calculation_params_test.dart | 2 +- .../widgets/categories_card_test.dart | 2 +- .../measurements/widgets/categories_test.dart | 2 +- .../widgets/chart_range_selector_test.dart | 2 +- .../widgets/charts/chart_widgets_test.dart | 2 +- .../charts/distribution_chart_test.dart | 2 +- .../widgets/charts/heatmap_chart_test.dart | 2 +- .../widgets/charts/spark_charts_test.dart | 2 +- .../measurements/widgets/entries_test.dart | 2 +- .../widgets/forms/category_test.dart | 2 +- .../widgets/forms/entry_test.dart | 2 +- .../widgets/forms/group_entry_test.dart | 2 +- .../measurements/widgets/helpers_test.dart | 2 +- .../widgets/measurement_fab_test.dart | 2 +- .../widgets/measurement_tile_test.dart | 2 +- .../widgets/metric_picker_test.dart | 2 +- .../widgets/weight_form_test.dart | 2 +- .../screens/nutritional_plan_screen_test.dart | 2 +- .../nutritional_plans_screen_test.dart | 2 +- .../nutrition/widgets/charts_test.dart | 2 +- .../widgets/ingredient_dialogs_test.dart | 2 +- .../widgets/ingredient_typeahead_test.dart | 2 +- .../nutrition/widgets/meal_widget_test.dart | 2 +- .../nutritional_diary_detail_test.dart | 2 +- .../widgets/nutritional_meal_form_test.dart | 2 +- .../nutritional_meal_item_form_test.dart | 2 +- .../widgets/nutritional_plan_form_test.dart | 2 +- .../widgets/plan_weight_chart_test.dart | 2 +- .../routines/models/session_test.dart | 2 +- .../routines/providers/gym_state_test.dart | 2 +- .../providers/plate_weights_test.dart | 2 +- .../routines/screens/gym_mode_test.dart | 2 +- .../screens/routine_edit_screen_test.dart | 2 +- .../screens/routine_list_screen_test.dart | 2 +- .../screens/routine_logs_screen_test.dart | 2 +- .../routines/screens/routine_screen_test.dart | 2 +- .../routines/widgets/charts_test.dart | 2 +- .../routines/widgets/forms/day_form_test.dart | 2 +- .../repetition_unit_form_widget_test.dart | 2 +- .../widgets/forms/routine_form_test.dart | 2 +- .../widgets/forms/session_form_test.dart | 2 +- .../widgets/forms/slot_entry_form_test.dart | 2 +- .../routines/widgets/forms/slot_test.dart | 2 +- .../forms/weight_unit_form_widget_test.dart | 2 +- .../widgets/gym_mode/elapsed_time_test.dart | 2 +- .../widgets/gym_mode/log_page_test.dart | 2 +- .../widgets/gym_mode/navigation_test.dart | 2 +- .../widgets/gym_mode/session_page_test.dart | 2 +- .../widgets/gym_mode/start_page_test.dart | 2 +- .../widgets/gym_mode/workout_menu_test.dart | 2 +- .../widgets/plate_calculator_test.dart | 2 +- .../routines/widgets/routine_edit_test.dart | 2 +- .../widgets/trophies_overview_test.dart | 2 +- .../screenshots/screenshots_01_dashboard.dart | 2 +- .../screenshots_01_dashboard_test.dart | 2 +- test/screenshots/screenshots_02_workout.dart | 2 +- test/screenshots/screenshots_03_gym_mode.dart | 2 +- .../screenshots_04_measurements.dart | 2 +- .../screenshots_04_measurements_test.dart | 2 +- .../screenshots_05_nutritional_plan.dart | 2 +- test/theme/dynamic_color_test.dart | 2 +- test/theme/theme_test.dart | 2 +- test_data/nutritional_plans.dart | 2 +- test_data/screenshots/nutrition.dart | 2 +- 331 files changed, 443 insertions(+), 419 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 6e5847163..e86bfd061 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -5,6 +5,13 @@ analyzer: - '**/*.g.dart' - '**/*.freezed.dart' - '**/*.mocks.dart' + - build/** + - android/** + - ios/** + - web/** + - windows/** + - macos/** + - linux/** strong-mode: implicit-casts: true # to be changed implicit-dynamic: true # to be changed diff --git a/integration_test/make_screenshots_test.dart b/integration_test/make_screenshots_test.dart index 9fa092bd4..1ac9d6c34 100644 --- a/integration_test/make_screenshots_test.dart +++ b/integration_test/make_screenshots_test.dart @@ -21,7 +21,7 @@ import 'dart:io'; import 'package:drift/drift.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; diff --git a/lib/core/app_settings_notifier.dart b/lib/core/app_settings_notifier.dart index dec389eda..e4085a9b1 100644 --- a/lib/core/app_settings_notifier.dart +++ b/lib/core/app_settings_notifier.dart @@ -19,7 +19,7 @@ import 'dart:convert'; import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart' show Provider; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/lib/core/colors.dart b/lib/core/colors.dart index aa99dc60f..37e6143b5 100644 --- a/lib/core/colors.dart +++ b/lib/core/colors.dart @@ -17,7 +17,7 @@ */ import 'package:flex_color_scheme/flex_color_scheme.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; const COLOR_SURPLUS = Color.fromARGB(255, 231, 71, 71); diff --git a/lib/core/consts.dart b/lib/core/consts.dart index 920c31337..001f8bafb 100644 --- a/lib/core/consts.dart +++ b/lib/core/consts.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; /// Minimum server version required by this version of the app. diff --git a/lib/core/dashboard.dart b/lib/core/dashboard.dart index 284a9e163..4d2156734 100644 --- a/lib/core/dashboard.dart +++ b/lib/core/dashboard.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/app_settings_notifier.dart'; import 'package:wger/core/material.dart'; diff --git a/lib/core/error_dialogs.dart b/lib/core/error_dialogs.dart index 6fdd08108..4f0f8e7e8 100644 --- a/lib/core/error_dialogs.dart +++ b/lib/core/error_dialogs.dart @@ -17,7 +17,7 @@ */ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_html/flutter_html.dart'; import 'package:json_annotation/json_annotation.dart'; diff --git a/lib/core/form_screen.dart b/lib/core/form_screen.dart index faf234f92..85d4d91ba 100644 --- a/lib/core/form_screen.dart +++ b/lib/core/form_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/rendering.dart'; import 'package:wger/core/wide_screen_wrapper.dart'; diff --git a/lib/core/form_validators.dart b/lib/core/form_validators.dart index cf85007bd..7b88a2cbf 100644 --- a/lib/core/form_validators.dart +++ b/lib/core/form_validators.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/core/home_tabs_screen.dart b/lib/core/home_tabs_screen.dart index 485d11e31..d86b9418d 100644 --- a/lib/core/home_tabs_screen.dart +++ b/lib/core/home_tabs_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/dashboard.dart'; import 'package:wger/core/material.dart'; diff --git a/lib/core/json.dart b/lib/core/json.dart index b0202ca3e..d08f7d702 100644 --- a/lib/core/json.dart +++ b/lib/core/json.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; num stringToNum(String? e) { diff --git a/lib/core/keys.dart b/lib/core/keys.dart index c3a4e959e..b283fe814 100644 --- a/lib/core/keys.dart +++ b/lib/core/keys.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// App-wide navigator key. Lets code outside the widget tree (the global error /// handlers, background callbacks) reach a [BuildContext] and the navigator. diff --git a/lib/core/misc.dart b/lib/core/misc.dart index 8e9bbc383..2ab994e7d 100644 --- a/lib/core/misc.dart +++ b/lib/core/misc.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:url_launcher/url_launcher.dart'; void launchURL( diff --git a/lib/core/powersync_unreachable_screen.dart b/lib/core/powersync_unreachable_screen.dart index 198caa642..0159ea905 100644 --- a/lib/core/powersync_unreachable_screen.dart +++ b/lib/core/powersync_unreachable_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/core/misc.dart'; diff --git a/lib/core/settings_dashboard_widgets_screen.dart b/lib/core/settings_dashboard_widgets_screen.dart index 433229c3c..db8af461a 100644 --- a/lib/core/settings_dashboard_widgets_screen.dart +++ b/lib/core/settings_dashboard_widgets_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/wide_screen_wrapper.dart'; import 'package:wger/features/account/widgets/settings/dashboard_visibility.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/core/snackbar.dart b/lib/core/snackbar.dart index 3a855cbb5..ca3fa9cf8 100644 --- a/lib/core/snackbar.dart +++ b/lib/core/snackbar.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Shows a plain text snackbar via the nearest [ScaffoldMessenger]. void showSnackbar( diff --git a/lib/core/splash_screen.dart b/lib/core/splash_screen.dart index f3eeb378d..0dab0476f 100644 --- a/lib/core/splash_screen.dart +++ b/lib/core/splash_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class SplashScreen extends StatelessWidget { const SplashScreen(); diff --git a/lib/core/update_app_screen.dart b/lib/core/update_app_screen.dart index 2b01eeec7..29fc9dde8 100644 --- a/lib/core/update_app_screen.dart +++ b/lib/core/update_app_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; class UpdateAppScreen extends StatelessWidget { diff --git a/lib/core/update_server_screen.dart b/lib/core/update_server_screen.dart index 1620a9a8b..3330d970e 100644 --- a/lib/core/update_server_screen.dart +++ b/lib/core/update_server_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/core/wide_screen_wrapper.dart b/lib/core/wide_screen_wrapper.dart index f78dd26c3..3d6a7ffff 100644 --- a/lib/core/wide_screen_wrapper.dart +++ b/lib/core/wide_screen_wrapper.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/material.dart'; class WidescreenWrapper extends StatelessWidget { diff --git a/lib/core/widgets/about.dart b/lib/core/widgets/about.dart index 0339481b6..1e87aba47 100644 --- a/lib/core/widgets/about.dart +++ b/lib/core/widgets/about.dart @@ -18,7 +18,7 @@ import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:wger/core/consts.dart'; diff --git a/lib/core/widgets/app_bar.dart b/lib/core/widgets/app_bar.dart index 13c957fac..77216a3a1 100644 --- a/lib/core/widgets/app_bar.dart +++ b/lib/core/widgets/app_bar.dart @@ -18,7 +18,7 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/form_screen.dart'; import 'package:wger/core/network/auth_http_client.dart'; diff --git a/lib/core/widgets/async_value_widget.dart b/lib/core/widgets/async_value_widget.dart index f08f10867..a5401c0b5 100644 --- a/lib/core/widgets/async_value_widget.dart +++ b/lib/core/widgets/async_value_widget.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:logging/logging.dart'; import 'package:wger/core/widgets/error.dart'; diff --git a/lib/core/widgets/cards.dart b/lib/core/widgets/cards.dart index 3c56f9e3a..c81108620 100644 --- a/lib/core/widgets/cards.dart +++ b/lib/core/widgets/cards.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class InfoCard extends StatelessWidget { final String text; diff --git a/lib/core/widgets/confirm_delete_dialog.dart b/lib/core/widgets/confirm_delete_dialog.dart index c62a44e8b..710962f80 100644 --- a/lib/core/widgets/confirm_delete_dialog.dart +++ b/lib/core/widgets/confirm_delete_dialog.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/snackbar.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/core/widgets/core.dart b/lib/core/widgets/core.dart index c40585ea1..005142392 100644 --- a/lib/core/widgets/core.dart +++ b/lib/core/widgets/core.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class MutedText extends StatelessWidget { final String _text; diff --git a/lib/core/widgets/dashboard/calendar.dart b/lib/core/widgets/dashboard/calendar.dart index 68dd3ef3b..d67af3f62 100644 --- a/lib/core/widgets/dashboard/calendar.dart +++ b/lib/core/widgets/dashboard/calendar.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod; import 'package:table_calendar/table_calendar.dart'; import 'package:wger/core/consts.dart'; diff --git a/lib/core/widgets/dashboard/widgets/measurements.dart b/lib/core/widgets/dashboard/widgets/measurements.dart index 74feb4037..a64f0ff54 100644 --- a/lib/core/widgets/dashboard/widgets/measurements.dart +++ b/lib/core/widgets/dashboard/widgets/measurements.dart @@ -17,7 +17,7 @@ */ import 'package:carousel_slider/carousel_slider.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:wger/core/widgets/async_value_widget.dart'; diff --git a/lib/core/widgets/dashboard/widgets/nothing_found.dart b/lib/core/widgets/dashboard/widgets/nothing_found.dart index bc2cb0221..99d7ff9bf 100644 --- a/lib/core/widgets/dashboard/widgets/nothing_found.dart +++ b/lib/core/widgets/dashboard/widgets/nothing_found.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/form_screen.dart'; class NothingFound extends StatelessWidget { diff --git a/lib/core/widgets/dashboard/widgets/nutrition.dart b/lib/core/widgets/dashboard/widgets/nutrition.dart index b2c6e66dd..162fc5ffb 100644 --- a/lib/core/widgets/dashboard/widgets/nutrition.dart +++ b/lib/core/widgets/dashboard/widgets/nutrition.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/form_screen.dart'; import 'package:wger/core/formatting/formatting.dart'; diff --git a/lib/core/widgets/dashboard/widgets/routines.dart b/lib/core/widgets/dashboard/widgets/routines.dart index 871e5bfd1..60a1ed561 100644 --- a/lib/core/widgets/dashboard/widgets/routines.dart +++ b/lib/core/widgets/dashboard/widgets/routines.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/date.dart'; import 'package:wger/core/formatting/formatting.dart'; diff --git a/lib/core/widgets/dashboard/widgets/trophies.dart b/lib/core/widgets/dashboard/widgets/trophies.dart index db2db6dfa..222445fd7 100644 --- a/lib/core/widgets/dashboard/widgets/trophies.dart +++ b/lib/core/widgets/dashboard/widgets/trophies.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/network/network_provider.dart'; import 'package:wger/core/widgets/core.dart'; diff --git a/lib/core/widgets/dashboard/widgets/weight.dart b/lib/core/widgets/dashboard/widgets/weight.dart index 0f7c4fa9d..92a1033f3 100644 --- a/lib/core/widgets/dashboard/widgets/weight.dart +++ b/lib/core/widgets/dashboard/widgets/weight.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:logging/logging.dart'; diff --git a/lib/core/widgets/datetime_input.dart b/lib/core/widgets/datetime_input.dart index e2f3aa745..bf3df1463 100644 --- a/lib/core/widgets/datetime_input.dart +++ b/lib/core/widgets/datetime_input.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/formatting/formatting.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/core/widgets/decimal_input.dart b/lib/core/widgets/decimal_input.dart index 6a144c2b9..7b9ef7709 100644 --- a/lib/core/widgets/decimal_input.dart +++ b/lib/core/widgets/decimal_input.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/core/formatting/formatting.dart'; diff --git a/lib/core/widgets/error.dart b/lib/core/widgets/error.dart index 21695c022..318f624ba 100644 --- a/lib/core/widgets/error.dart +++ b/lib/core/widgets/error.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/error_dialogs.dart' show ServerHtmlError; import 'package:wger/core/exceptions/http_exception.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/core/widgets/form_submit_button.dart b/lib/core/widgets/form_submit_button.dart index f2ad5a7c7..d54dd61fb 100644 --- a/lib/core/widgets/form_submit_button.dart +++ b/lib/core/widgets/form_submit_button.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/error_dialogs.dart'; import 'package:wger/core/exceptions/http_exception.dart'; import 'package:wger/core/widgets/progress_indicator.dart'; diff --git a/lib/core/widgets/image.dart b/lib/core/widgets/image.dart index 22ad59ae2..3e9011691 100644 --- a/lib/core/widgets/image.dart +++ b/lib/core/widgets/image.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:logging/logging.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/core/widgets/language_dropdown.dart b/lib/core/widgets/language_dropdown.dart index 3a4bb9140..0cc2a5f96 100644 --- a/lib/core/widgets/language_dropdown.dart +++ b/lib/core/widgets/language_dropdown.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/core/search_options.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/core/widgets/legend.dart b/lib/core/widgets/legend.dart index f1a2f1a2c..4b1edf63a 100644 --- a/lib/core/widgets/legend.dart +++ b/lib/core/widgets/legend.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A legend entry: a colour swatch with its label. class Indicator extends StatelessWidget { diff --git a/lib/core/widgets/log_overview.dart b/lib/core/widgets/log_overview.dart index 249d4d0dd..6d6512885 100644 --- a/lib/core/widgets/log_overview.dart +++ b/lib/core/widgets/log_overview.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:logging/logging.dart'; import 'package:wger/core/error_dialogs.dart' show CopyToClipboardButton; import 'package:wger/core/errors.dart' show buildGithubIssueUrl, collectAppVersion; diff --git a/lib/core/widgets/object_gone_redirect.dart b/lib/core/widgets/object_gone_redirect.dart index bb0266943..8ab97b448 100644 --- a/lib/core/widgets/object_gone_redirect.dart +++ b/lib/core/widgets/object_gone_redirect.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Leaves a detail screen whose object was deleted and dropped from the live /// stream while it was open. Returns a blank placeholder and pops on the next diff --git a/lib/core/widgets/progress_indicator.dart b/lib/core/widgets/progress_indicator.dart index 6c0c79026..89b2aede0 100644 --- a/lib/core/widgets/progress_indicator.dart +++ b/lib/core/widgets/progress_indicator.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class BoxedProgressIndicator extends StatelessWidget { const BoxedProgressIndicator({super.key}); diff --git a/lib/core/widgets/server_config_warning_dialog.dart b/lib/core/widgets/server_config_warning_dialog.dart index 753617b83..6033fbf27 100644 --- a/lib/core/widgets/server_config_warning_dialog.dart +++ b/lib/core/widgets/server_config_warning_dialog.dart @@ -8,7 +8,7 @@ * (at your option) any later version. */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/misc.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/core/widgets/svg_icon.dart b/lib/core/widgets/svg_icon.dart index af92f56e2..7c0a90771 100644 --- a/lib/core/widgets/svg_icon.dart +++ b/lib/core/widgets/svg_icon.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_svg/flutter_svg.dart'; /// An SVG asset drawn like a Material icon. diff --git a/lib/core/widgets/sync_status_dialog.dart b/lib/core/widgets/sync_status_dialog.dart index fa2f2e4a1..d8e2e9132 100644 --- a/lib/core/widgets/sync_status_dialog.dart +++ b/lib/core/widgets/sync_status_dialog.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:logging/logging.dart'; import 'package:powersync/powersync.dart' show SyncStatus; diff --git a/lib/core/widgets/text_prompt.dart b/lib/core/widgets/text_prompt.dart index f42ba4cff..f042050e4 100644 --- a/lib/core/widgets/text_prompt.dart +++ b/lib/core/widgets/text_prompt.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; class TextPrompt extends StatelessWidget { diff --git a/lib/core/widgets/wger_image.dart b/lib/core/widgets/wger_image.dart index 601f9e53a..fab222a78 100644 --- a/lib/core/widgets/wger_image.dart +++ b/lib/core/widgets/wger_image.dart @@ -17,7 +17,7 @@ */ import 'package:extended_image/extended_image.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/network/wger_base.dart'; import 'package:wger/core/widgets/image.dart'; diff --git a/lib/database/converters/time_of_day_converter.dart b/lib/database/converters/time_of_day_converter.dart index 885653610..8ef9abe6c 100644 --- a/lib/database/converters/time_of_day_converter.dart +++ b/lib/database/converters/time_of_day_converter.dart @@ -17,7 +17,7 @@ */ import 'package:drift/drift.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/json.dart'; class TimeOfDayConverter extends TypeConverter { diff --git a/lib/database/powersync/database.dart b/lib/database/powersync/database.dart index 5cf338c0a..327385d7f 100644 --- a/lib/database/powersync/database.dart +++ b/lib/database/powersync/database.dart @@ -18,7 +18,7 @@ import 'package:drift/drift.dart'; import 'package:drift_sqlite_async/drift_sqlite_async.dart'; -import 'package:flutter/material.dart' show TimeOfDay; +import 'package:material_ui/material_ui.dart' show TimeOfDay; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:powersync/powersync.dart' as ps; import 'package:wger/core/language.dart'; diff --git a/lib/database/powersync/tables/nutrition.dart b/lib/database/powersync/tables/nutrition.dart index 5c44e5d41..be0878aed 100644 --- a/lib/database/powersync/tables/nutrition.dart +++ b/lib/database/powersync/tables/nutrition.dart @@ -17,7 +17,7 @@ */ import 'package:drift/drift.dart'; -import 'package:flutter/material.dart' show TimeOfDay; +import 'package:material_ui/material_ui.dart' show TimeOfDay; import 'package:powersync/powersync.dart' as ps; import 'package:wger/database/converters/date_only_text_converter.dart'; import 'package:wger/database/converters/time_of_day_converter.dart'; diff --git a/lib/features/account/widgets/forms.dart b/lib/features/account/widgets/forms.dart index f0604d1b8..84fd947b9 100644 --- a/lib/features/account/widgets/forms.dart +++ b/lib/features/account/widgets/forms.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/lib/features/account/widgets/settings.dart b/lib/features/account/widgets/settings.dart index b681b8d6d..a7b584420 100644 --- a/lib/features/account/widgets/settings.dart +++ b/lib/features/account/widgets/settings.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/wide_screen_wrapper.dart'; import 'package:wger/features/account/widgets/settings/certs_not_verified.dart'; import 'package:wger/features/account/widgets/settings/data_privacy.dart'; diff --git a/lib/features/account/widgets/settings/certs_not_verified.dart b/lib/features/account/widgets/settings/certs_not_verified.dart index 869dd999c..14efbd976 100644 --- a/lib/features/account/widgets/settings/certs_not_verified.dart +++ b/lib/features/account/widgets/settings/certs_not_verified.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/app_settings_notifier.dart'; import 'package:wger/core/consts.dart'; diff --git a/lib/features/account/widgets/settings/dashboard_visibility.dart b/lib/features/account/widgets/settings/dashboard_visibility.dart index 06c052ce5..c3e135732 100644 --- a/lib/features/account/widgets/settings/dashboard_visibility.dart +++ b/lib/features/account/widgets/settings/dashboard_visibility.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/app_settings_notifier.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/account/widgets/settings/data_privacy.dart b/lib/features/account/widgets/settings/data_privacy.dart index 872a6dfe9..20012ca3d 100644 --- a/lib/features/account/widgets/settings/data_privacy.dart +++ b/lib/features/account/widgets/settings/data_privacy.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/app_settings_notifier.dart'; import 'package:wger/core/consts.dart'; diff --git a/lib/features/account/widgets/settings/health_sync.dart b/lib/features/account/widgets/settings/health_sync.dart index ccb2d453a..e193f70a7 100644 --- a/lib/features/account/widgets/settings/health_sync.dart +++ b/lib/features/account/widgets/settings/health_sync.dart @@ -17,7 +17,7 @@ */ import 'package:flutter/foundation.dart' show TargetPlatform, defaultTargetPlatform; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:intl/intl.dart'; import 'package:logging/logging.dart'; diff --git a/lib/features/account/widgets/settings/image_cache.dart b/lib/features/account/widgets/settings/image_cache.dart index 1b59a0ab3..eea5c1f70 100644 --- a/lib/features/account/widgets/settings/image_cache.dart +++ b/lib/features/account/widgets/settings/image_cache.dart @@ -19,7 +19,7 @@ import 'dart:io'; import 'package:extended_image/extended_image.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:path/path.dart' as p; import 'package:path_provider/path_provider.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/account/widgets/settings/language.dart b/lib/features/account/widgets/settings/language.dart index e1cbadc48..5872d6ab2 100644 --- a/lib/features/account/widgets/settings/language.dart +++ b/lib/features/account/widgets/settings/language.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/app_settings_notifier.dart'; import 'package:wger/core/locale.dart'; diff --git a/lib/features/account/widgets/settings/theme.dart b/lib/features/account/widgets/settings/theme.dart index a500fdcac..aeedd5940 100644 --- a/lib/features/account/widgets/settings/theme.dart +++ b/lib/features/account/widgets/settings/theme.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/app_settings_notifier.dart'; import 'package:wger/core/consts.dart'; diff --git a/lib/features/account/widgets/settings/verbose_logging.dart b/lib/features/account/widgets/settings/verbose_logging.dart index de74952fd..0e367fa10 100644 --- a/lib/features/account/widgets/settings/verbose_logging.dart +++ b/lib/features/account/widgets/settings/verbose_logging.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/app_settings_notifier.dart'; import 'package:wger/core/consts.dart'; diff --git a/lib/features/auth/screens/auth_screen.dart b/lib/features/auth/screens/auth_screen.dart index 461f80ca2..c9afe58ea 100644 --- a/lib/features/auth/screens/auth_screen.dart +++ b/lib/features/auth/screens/auth_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/auth/widgets/auth_card.dart'; class AuthScreen extends StatelessWidget { diff --git a/lib/features/auth/screens/auto_login_error_screen.dart b/lib/features/auth/screens/auto_login_error_screen.dart index 13dc26312..7c62d9d40 100644 --- a/lib/features/auth/screens/auto_login_error_screen.dart +++ b/lib/features/auth/screens/auto_login_error_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/network/auth_notifier.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/auth/screens/mfa_challenge_screen.dart b/lib/features/auth/screens/mfa_challenge_screen.dart index b8abe3340..7d64df1e5 100644 --- a/lib/features/auth/screens/mfa_challenge_screen.dart +++ b/lib/features/auth/screens/mfa_challenge_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/error_dialogs.dart'; diff --git a/lib/features/auth/widgets/advanced_footer.dart b/lib/features/auth/widgets/advanced_footer.dart index c91804388..55a521983 100644 --- a/lib/features/auth/widgets/advanced_footer.dart +++ b/lib/features/auth/widgets/advanced_footer.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; /// "ADVANCED" footer line opening the advanced sheet. Shows an indicator dot diff --git a/lib/features/auth/widgets/advanced_sheet.dart b/lib/features/auth/widgets/advanced_sheet.dart index 01251621e..d3ed62254 100644 --- a/lib/features/auth/widgets/advanced_sheet.dart +++ b/lib/features/auth/widgets/advanced_sheet.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/features/auth/widgets/server_field.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/auth/widgets/auth_card.dart b/lib/features/auth/widgets/auth_card.dart index ac29b6753..c62b13306 100644 --- a/lib/features/auth/widgets/auth_card.dart +++ b/lib/features/auth/widgets/auth_card.dart @@ -17,7 +17,7 @@ */ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:wger/core/app_link_router.dart'; diff --git a/lib/features/auth/widgets/auth_mode_switch_link.dart b/lib/features/auth/widgets/auth_mode_switch_link.dart index 9aec589c7..382f71a97 100644 --- a/lib/features/auth/widgets/auth_mode_switch_link.dart +++ b/lib/features/auth/widgets/auth_mode_switch_link.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; /// Footer line that switches between login and register modes diff --git a/lib/features/auth/widgets/confirm_password_field.dart b/lib/features/auth/widgets/confirm_password_field.dart index e9b1dbc5c..17c3b40db 100644 --- a/lib/features/auth/widgets/confirm_password_field.dart +++ b/lib/features/auth/widgets/confirm_password_field.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; class ConfirmPasswordField extends StatefulWidget { diff --git a/lib/features/auth/widgets/email_field.dart b/lib/features/auth/widgets/email_field.dart index 007476126..04d1f3699 100644 --- a/lib/features/auth/widgets/email_field.dart +++ b/lib/features/auth/widgets/email_field.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/auth/widgets/password_field.dart b/lib/features/auth/widgets/password_field.dart index 84a6fa5cf..aeb2cc3b1 100644 --- a/lib/features/auth/widgets/password_field.dart +++ b/lib/features/auth/widgets/password_field.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; class PasswordField extends StatefulWidget { diff --git a/lib/features/auth/widgets/refresh_token_field.dart b/lib/features/auth/widgets/refresh_token_field.dart index 7b7274705..a806b4e6c 100644 --- a/lib/features/auth/widgets/refresh_token_field.dart +++ b/lib/features/auth/widgets/refresh_token_field.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/auth/widgets/server_field.dart b/lib/features/auth/widgets/server_field.dart index deebcd763..eb0729790 100644 --- a/lib/features/auth/widgets/server_field.dart +++ b/lib/features/auth/widgets/server_field.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/validators.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/auth/widgets/username_field.dart b/lib/features/auth/widgets/username_field.dart index 2f5f4bd5c..ea5a0d932 100644 --- a/lib/features/auth/widgets/username_field.dart +++ b/lib/features/auth/widgets/username_field.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/auth/widgets/web_handoff_link.dart b/lib/features/auth/widgets/web_handoff_link.dart index 7bab64503..bde5984b8 100644 --- a/lib/features/auth/widgets/web_handoff_link.dart +++ b/lib/features/auth/widgets/web_handoff_link.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; /// Two-line link that hands the login off to the browser. The browser path diff --git a/lib/features/exercises/models/exercise_submission_images.dart b/lib/features/exercises/models/exercise_submission_images.dart index 935e85f3c..b64c98144 100644 --- a/lib/features/exercises/models/exercise_submission_images.dart +++ b/lib/features/exercises/models/exercise_submission_images.dart @@ -18,7 +18,7 @@ import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; enum ImageType { photo(id: 1, label: 'Photo', icon: Icons.photo_camera), diff --git a/lib/features/exercises/screens/add_exercise_screen.dart b/lib/features/exercises/screens/add_exercise_screen.dart index 3c8b0fcd4..b33db6357 100644 --- a/lib/features/exercises/screens/add_exercise_screen.dart +++ b/lib/features/exercises/screens/add_exercise_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/core/error_dialogs.dart'; diff --git a/lib/features/exercises/screens/exercise_screen.dart b/lib/features/exercises/screens/exercise_screen.dart index f88771bb0..dc6d67c8e 100644 --- a/lib/features/exercises/screens/exercise_screen.dart +++ b/lib/features/exercises/screens/exercise_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/wide_screen_wrapper.dart'; import 'package:wger/features/exercises/models/exercise.dart'; import 'package:wger/features/exercises/widgets/exercises.dart'; diff --git a/lib/features/exercises/screens/exercises_screen.dart b/lib/features/exercises/screens/exercises_screen.dart index 7ecebcbeb..ff714543e 100644 --- a/lib/features/exercises/screens/exercises_screen.dart +++ b/lib/features/exercises/screens/exercises_screen.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/wide_screen_wrapper.dart'; import 'package:wger/core/widgets/app_bar.dart'; diff --git a/lib/features/exercises/validators.dart b/lib/features/exercises/validators.dart index 2af07d8b3..46bb5f31a 100644 --- a/lib/features/exercises/validators.dart +++ b/lib/features/exercises/validators.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; /// The amount of characters an exercise description needs to have diff --git a/lib/features/exercises/widgets/add_exercise/add_exercise_dropdown_button.dart b/lib/features/exercises/widgets/add_exercise/add_exercise_dropdown_button.dart index 2b82ff0c1..439bc1834 100644 --- a/lib/features/exercises/widgets/add_exercise/add_exercise_dropdown_button.dart +++ b/lib/features/exercises/widgets/add_exercise/add_exercise_dropdown_button.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class AddExerciseDropdownButton extends StatefulWidget { const AddExerciseDropdownButton({ diff --git a/lib/features/exercises/widgets/add_exercise/add_exercise_multiselect_button.dart b/lib/features/exercises/widgets/add_exercise/add_exercise_multiselect_button.dart index 91fbabe48..b8cfac32a 100644 --- a/lib/features/exercises/widgets/add_exercise/add_exercise_multiselect_button.dart +++ b/lib/features/exercises/widgets/add_exercise/add_exercise_multiselect_button.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:multi_select_flutter/multi_select_flutter.dart'; class AddExerciseMultiselectButton extends StatefulWidget { diff --git a/lib/features/exercises/widgets/add_exercise/add_exercise_text_area.dart b/lib/features/exercises/widgets/add_exercise/add_exercise_text_area.dart index 24e36d0c1..5232defd7 100644 --- a/lib/features/exercises/widgets/add_exercise/add_exercise_text_area.dart +++ b/lib/features/exercises/widgets/add_exercise/add_exercise_text_area.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_html/flutter_html.dart'; import 'package:markdown/markdown.dart' as md; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/exercises/widgets/add_exercise/image_details_form.dart b/lib/features/exercises/widgets/add_exercise/image_details_form.dart index 594537071..91e3ccf54 100644 --- a/lib/features/exercises/widgets/add_exercise/image_details_form.dart +++ b/lib/features/exercises/widgets/add_exercise/image_details_form.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/validators.dart'; import 'package:wger/features/exercises/models/exercise_submission_images.dart'; import 'package:wger/features/exercises/validators.dart'; diff --git a/lib/features/exercises/widgets/add_exercise/license_info_widget.dart b/lib/features/exercises/widgets/add_exercise/license_info_widget.dart index 9324df7af..81d1cff2e 100644 --- a/lib/features/exercises/widgets/add_exercise/license_info_widget.dart +++ b/lib/features/exercises/widgets/add_exercise/license_info_widget.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/exercises/widgets/add_exercise/mixins/image_picker_mixin.dart b/lib/features/exercises/widgets/add_exercise/mixins/image_picker_mixin.dart index 5c72d11e4..b026368cc 100644 --- a/lib/features/exercises/widgets/add_exercise/mixins/image_picker_mixin.dart +++ b/lib/features/exercises/widgets/add_exercise/mixins/image_picker_mixin.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:image_picker/image_picker.dart'; import 'package:wger/features/exercises/models/exercise_submission_images.dart'; diff --git a/lib/features/exercises/widgets/add_exercise/preview_images.dart b/lib/features/exercises/widgets/add_exercise/preview_images.dart index c3e178286..65b498743 100644 --- a/lib/features/exercises/widgets/add_exercise/preview_images.dart +++ b/lib/features/exercises/widgets/add_exercise/preview_images.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/features/exercises/models/exercise_submission_images.dart'; import 'package:wger/features/exercises/providers/add_exercise_notifier.dart'; diff --git a/lib/features/exercises/widgets/add_exercise/steps/step_1_basics.dart b/lib/features/exercises/widgets/add_exercise/steps/step_1_basics.dart index 9998f1dcc..4a4dd1735 100644 --- a/lib/features/exercises/widgets/add_exercise/steps/step_1_basics.dart +++ b/lib/features/exercises/widgets/add_exercise/steps/step_1_basics.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/core/i18n.dart'; diff --git a/lib/features/exercises/widgets/add_exercise/steps/step_2_variations.dart b/lib/features/exercises/widgets/add_exercise/steps/step_2_variations.dart index 695baa5a5..e8aabe07e 100644 --- a/lib/features/exercises/widgets/add_exercise/steps/step_2_variations.dart +++ b/lib/features/exercises/widgets/add_exercise/steps/step_2_variations.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/features/exercises/providers/add_exercise_notifier.dart'; import 'package:wger/features/exercises/providers/exercises_notifier.dart'; diff --git a/lib/features/exercises/widgets/add_exercise/steps/step_3_description.dart b/lib/features/exercises/widgets/add_exercise/steps/step_3_description.dart index 36c1131a9..556e9ccbe 100644 --- a/lib/features/exercises/widgets/add_exercise/steps/step_3_description.dart +++ b/lib/features/exercises/widgets/add_exercise/steps/step_3_description.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/features/exercises/providers/add_exercise_notifier.dart'; import 'package:wger/features/exercises/validators.dart'; diff --git a/lib/features/exercises/widgets/add_exercise/steps/step_4_translations.dart b/lib/features/exercises/widgets/add_exercise/steps/step_4_translations.dart index d9cc4692d..8946dc399 100644 --- a/lib/features/exercises/widgets/add_exercise/steps/step_4_translations.dart +++ b/lib/features/exercises/widgets/add_exercise/steps/step_4_translations.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/language.dart'; import 'package:wger/features/exercises/providers/add_exercise_notifier.dart'; diff --git a/lib/features/exercises/widgets/add_exercise/steps/step_5_images.dart b/lib/features/exercises/widgets/add_exercise/steps/step_5_images.dart index 8ac1f2cb0..9929fa6d6 100644 --- a/lib/features/exercises/widgets/add_exercise/steps/step_5_images.dart +++ b/lib/features/exercises/widgets/add_exercise/steps/step_5_images.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:image_picker/image_picker.dart'; import 'package:wger/core/snackbar.dart'; diff --git a/lib/features/exercises/widgets/add_exercise/steps/step_6_overview.dart b/lib/features/exercises/widgets/add_exercise/steps/step_6_overview.dart index 4fe1fcd0f..076df7ee2 100644 --- a/lib/features/exercises/widgets/add_exercise/steps/step_6_overview.dart +++ b/lib/features/exercises/widgets/add_exercise/steps/step_6_overview.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_html/flutter_html.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:markdown/markdown.dart' as md; diff --git a/lib/features/exercises/widgets/autocompleter.dart b/lib/features/exercises/widgets/autocompleter.dart index 52a7df078..63a9705e9 100644 --- a/lib/features/exercises/widgets/autocompleter.dart +++ b/lib/features/exercises/widgets/autocompleter.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_typeahead/flutter_typeahead.dart'; import 'package:wger/core/consts.dart'; diff --git a/lib/features/exercises/widgets/detail/aliases_section.dart b/lib/features/exercises/widgets/detail/aliases_section.dart index 4bbefa5b9..e8501b5c7 100644 --- a/lib/features/exercises/widgets/detail/aliases_section.dart +++ b/lib/features/exercises/widgets/detail/aliases_section.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/widgets/core.dart'; import 'package:wger/features/exercises/models/translation.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/exercises/widgets/detail/category_equipment_row.dart b/lib/features/exercises/widgets/detail/category_equipment_row.dart index d3f8664da..d2fd02b27 100644 --- a/lib/features/exercises/widgets/detail/category_equipment_row.dart +++ b/lib/features/exercises/widgets/detail/category_equipment_row.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/i18n.dart'; import 'package:wger/features/exercises/models/exercise.dart'; diff --git a/lib/features/exercises/widgets/detail/description_section.dart b/lib/features/exercises/widgets/detail/description_section.dart index 5e5f2e314..6ee31ff79 100644 --- a/lib/features/exercises/widgets/detail/description_section.dart +++ b/lib/features/exercises/widgets/detail/description_section.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_html/flutter_html.dart'; import 'package:wger/features/exercises/models/translation.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/exercises/widgets/detail/images_section.dart b/lib/features/exercises/widgets/detail/images_section.dart index 8b5f6530b..2f6221e93 100644 --- a/lib/features/exercises/widgets/detail/images_section.dart +++ b/lib/features/exercises/widgets/detail/images_section.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/exercises/models/exercise.dart'; import 'package:wger/features/exercises/widgets/exercises.dart'; diff --git a/lib/features/exercises/widgets/detail/muscles_section.dart b/lib/features/exercises/widgets/detail/muscles_section.dart index 48c1b6cfc..f0d915db6 100644 --- a/lib/features/exercises/widgets/detail/muscles_section.dart +++ b/lib/features/exercises/widgets/detail/muscles_section.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/exercises/models/exercise.dart'; import 'package:wger/features/exercises/widgets/exercises.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/exercises/widgets/detail/notes_section.dart b/lib/features/exercises/widgets/detail/notes_section.dart index 2c5a6aa33..cefb213f9 100644 --- a/lib/features/exercises/widgets/detail/notes_section.dart +++ b/lib/features/exercises/widgets/detail/notes_section.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/exercises/models/translation.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/exercises/widgets/detail/variations_section.dart b/lib/features/exercises/widgets/detail/variations_section.dart index 98f3b00f7..49c99eb7a 100644 --- a/lib/features/exercises/widgets/detail/variations_section.dart +++ b/lib/features/exercises/widgets/detail/variations_section.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/features/exercises/models/exercise.dart'; import 'package:wger/features/exercises/providers/exercises_notifier.dart'; diff --git a/lib/features/exercises/widgets/detail/videos_section.dart b/lib/features/exercises/widgets/detail/videos_section.dart index 92f380afb..72002e6b9 100644 --- a/lib/features/exercises/widgets/detail/videos_section.dart +++ b/lib/features/exercises/widgets/detail/videos_section.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/platform.dart'; import 'package:wger/features/exercises/models/exercise.dart'; import 'package:wger/features/exercises/widgets/videos.dart'; diff --git a/lib/features/exercises/widgets/exercise_filter_dialog.dart b/lib/features/exercises/widgets/exercise_filter_dialog.dart index e6f1a7b21..b252b97c9 100644 --- a/lib/features/exercises/widgets/exercise_filter_dialog.dart +++ b/lib/features/exercises/widgets/exercise_filter_dialog.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/widgets/language_dropdown.dart'; import 'package:wger/features/exercises/models/exercise_filters.dart'; diff --git a/lib/features/exercises/widgets/exercises.dart b/lib/features/exercises/widgets/exercises.dart index 5fb149bce..22d12e962 100644 --- a/lib/features/exercises/widgets/exercises.dart +++ b/lib/features/exercises/widgets/exercises.dart @@ -17,7 +17,7 @@ */ import 'package:carousel_slider/carousel_slider.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_svg/svg.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/features/exercises/models/exercise.dart'; diff --git a/lib/features/exercises/widgets/filter_modal.dart b/lib/features/exercises/widgets/filter_modal.dart index e5f9a8caa..cd469f5ab 100644 --- a/lib/features/exercises/widgets/filter_modal.dart +++ b/lib/features/exercises/widgets/filter_modal.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/i18n.dart'; import 'package:wger/features/exercises/providers/exercise_filter_state.dart'; diff --git a/lib/features/exercises/widgets/filter_row.dart b/lib/features/exercises/widgets/filter_row.dart index 1b7d10aaa..45beb0f15 100644 --- a/lib/features/exercises/widgets/filter_row.dart +++ b/lib/features/exercises/widgets/filter_row.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/network/network_provider.dart'; import 'package:wger/features/exercises/providers/exercise_filters_notifier.dart'; diff --git a/lib/features/exercises/widgets/forms.dart b/lib/features/exercises/widgets/forms.dart index 40d473e2f..065709cee 100644 --- a/lib/features/exercises/widgets/forms.dart +++ b/lib/features/exercises/widgets/forms.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Input widget for exercise category objects /// diff --git a/lib/features/exercises/widgets/images.dart b/lib/features/exercises/widgets/images.dart index 0200c01b1..25ddbd428 100644 --- a/lib/features/exercises/widgets/images.dart +++ b/lib/features/exercises/widgets/images.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/widgets/wger_image.dart'; import 'package:wger/features/exercises/models/image.dart'; diff --git a/lib/features/exercises/widgets/list_tile.dart b/lib/features/exercises/widgets/list_tile.dart index e1cd873ec..d21295576 100644 --- a/lib/features/exercises/widgets/list_tile.dart +++ b/lib/features/exercises/widgets/list_tile.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/i18n.dart'; import 'package:wger/features/exercises/models/exercise.dart'; import 'package:wger/features/exercises/screens/exercise_screen.dart'; diff --git a/lib/features/exercises/widgets/videos.dart b/lib/features/exercises/widgets/videos.dart index 62d229ff9..400989067 100644 --- a/lib/features/exercises/widgets/videos.dart +++ b/lib/features/exercises/widgets/videos.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:logging/logging.dart'; diff --git a/lib/features/gallery/screens/gallery_screen.dart b/lib/features/gallery/screens/gallery_screen.dart index c405d4b68..e6e763293 100644 --- a/lib/features/gallery/screens/gallery_screen.dart +++ b/lib/features/gallery/screens/gallery_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/form_screen.dart'; import 'package:wger/core/network/network_provider.dart'; diff --git a/lib/features/gallery/widgets/forms.dart b/lib/features/gallery/widgets/forms.dart index 7cf2609bb..b42fdee6b 100644 --- a/lib/features/gallery/widgets/forms.dart +++ b/lib/features/gallery/widgets/forms.dart @@ -18,7 +18,7 @@ import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:image_picker/image_picker.dart'; import 'package:wger/core/consts.dart'; diff --git a/lib/features/gallery/widgets/overview.dart b/lib/features/gallery/widgets/overview.dart index 69c611021..4ca49d8a7 100644 --- a/lib/features/gallery/widgets/overview.dart +++ b/lib/features/gallery/widgets/overview.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart'; import 'package:wger/core/form_screen.dart'; diff --git a/lib/features/measurements/charts/colors.dart b/lib/features/measurements/charts/colors.dart index aee5a022f..8188da54a 100644 --- a/lib/features/measurements/charts/colors.dart +++ b/lib/features/measurements/charts/colors.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/measurements/charts/series.dart'; /// Fill of a plan period band, shared with the legend so its swatch matches. diff --git a/lib/features/measurements/charts/data.dart b/lib/features/measurements/charts/data.dart index e3fb98a91..c92a11108 100644 --- a/lib/features/measurements/charts/data.dart +++ b/lib/features/measurements/charts/data.dart @@ -19,7 +19,7 @@ import 'dart:math'; import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/measurements/charts/calendar.dart'; import 'package:wger/features/measurements/charts/range.dart'; import 'package:wger/features/measurements/charts/series.dart'; diff --git a/lib/features/measurements/charts/series.dart b/lib/features/measurements/charts/series.dart index de563768a..5bb797c5a 100644 --- a/lib/features/measurements/charts/series.dart +++ b/lib/features/measurements/charts/series.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart' show DateTimeRange; +import 'package:material_ui/material_ui.dart' show DateTimeRange; /// A nutrition plan period shown for context: shaded as a vertical band in /// the chart, and named in the tooltip of the points it contains. diff --git a/lib/features/measurements/models/measurement_calculation.dart b/lib/features/measurements/models/measurement_calculation.dart index 4abd4e6c8..6c46473dc 100644 --- a/lib/features/measurements/models/measurement_calculation.dart +++ b/lib/features/measurements/models/measurement_calculation.dart @@ -25,7 +25,7 @@ /// wger/measurements/dynamic/types.py. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/measurements/models/measurement_category.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/measurements/models/measurement_category.dart b/lib/features/measurements/models/measurement_category.dart index 3d6f940a2..bfd7ef086 100644 --- a/lib/features/measurements/models/measurement_category.dart +++ b/lib/features/measurements/models/measurement_category.dart @@ -17,7 +17,7 @@ */ import 'package:drift/drift.dart' hide JsonKey; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:powersync/powersync.dart' as ps; import 'package:wger/core/formatting/formatting.dart'; diff --git a/lib/features/measurements/screens/measurement_categories_screen.dart b/lib/features/measurements/screens/measurement_categories_screen.dart index e2797c6b3..dbaf4bfb8 100644 --- a/lib/features/measurements/screens/measurement_categories_screen.dart +++ b/lib/features/measurements/screens/measurement_categories_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/wide_screen_wrapper.dart'; import 'package:wger/features/measurements/screens/measurement_category_sort_screen.dart'; import 'package:wger/features/measurements/widgets/categories.dart'; diff --git a/lib/features/measurements/screens/measurement_category_sort_screen.dart b/lib/features/measurements/screens/measurement_category_sort_screen.dart index 4ffac10bd..a8f624985 100644 --- a/lib/features/measurements/screens/measurement_category_sort_screen.dart +++ b/lib/features/measurements/screens/measurement_category_sort_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/wide_screen_wrapper.dart'; import 'package:wger/core/widgets/async_value_widget.dart'; diff --git a/lib/features/measurements/screens/measurement_entries_screen.dart b/lib/features/measurements/screens/measurement_entries_screen.dart index 0f182dd04..01bae4e21 100644 --- a/lib/features/measurements/screens/measurement_entries_screen.dart +++ b/lib/features/measurements/screens/measurement_entries_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/form_screen.dart'; import 'package:wger/core/wide_screen_wrapper.dart'; diff --git a/lib/features/measurements/screens/weight_screen.dart b/lib/features/measurements/screens/weight_screen.dart index 4f4037c4e..099985c9f 100644 --- a/lib/features/measurements/screens/weight_screen.dart +++ b/lib/features/measurements/screens/weight_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/form_screen.dart'; import 'package:wger/core/formatting/formatting.dart'; diff --git a/lib/features/measurements/widgets/calculation_mark.dart b/lib/features/measurements/widgets/calculation_mark.dart index cdbaa1979..467f370b1 100644 --- a/lib/features/measurements/widgets/calculation_mark.dart +++ b/lib/features/measurements/widgets/calculation_mark.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/features/measurements/models/measurement_calculation.dart'; import 'package:wger/features/measurements/models/measurement_category.dart'; diff --git a/lib/features/measurements/widgets/calculation_params.dart b/lib/features/measurements/widgets/calculation_params.dart index 826407445..0540a2601 100644 --- a/lib/features/measurements/widgets/calculation_params.dart +++ b/lib/features/measurements/widgets/calculation_params.dart @@ -17,7 +17,7 @@ */ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/features/exercises/providers/exercises_notifier.dart'; diff --git a/lib/features/measurements/widgets/categories.dart b/lib/features/measurements/widgets/categories.dart index fb6ddb77d..039915ad4 100644 --- a/lib/features/measurements/widgets/categories.dart +++ b/lib/features/measurements/widgets/categories.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/formatting/formatting.dart'; import 'package:wger/core/widgets/async_value_widget.dart'; diff --git a/lib/features/measurements/widgets/categories_card.dart b/lib/features/measurements/widgets/categories_card.dart index f7234e87f..85abb6ecf 100644 --- a/lib/features/measurements/widgets/categories_card.dart +++ b/lib/features/measurements/widgets/categories_card.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/form_screen.dart'; import 'package:wger/core/formatting/formatting.dart'; diff --git a/lib/features/measurements/widgets/chart_range_selector.dart b/lib/features/measurements/widgets/chart_range_selector.dart index c6169cf67..b30530dd8 100644 --- a/lib/features/measurements/widgets/chart_range_selector.dart +++ b/lib/features/measurements/widgets/chart_range_selector.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/measurements/charts/range.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/measurements/widgets/charts/bar_chart.dart b/lib/features/measurements/widgets/charts/bar_chart.dart index 8638b6b71..c7ef86807 100644 --- a/lib/features/measurements/widgets/charts/bar_chart.dart +++ b/lib/features/measurements/widgets/charts/bar_chart.dart @@ -19,7 +19,7 @@ import 'dart:math'; import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; import 'package:wger/core/formatting/formatting.dart'; import 'package:wger/features/measurements/charts/colors.dart'; diff --git a/lib/features/measurements/widgets/charts/chart_painting.dart b/lib/features/measurements/widgets/charts/chart_painting.dart index 754fb7ecd..09dad5ebc 100644 --- a/lib/features/measurements/widgets/charts/chart_painting.dart +++ b/lib/features/measurements/widgets/charts/chart_painting.dart @@ -23,7 +23,7 @@ library; import 'dart:math'; import 'dart:ui' as ui; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Colour of a heatmap cell holding [value]. /// diff --git a/lib/features/measurements/widgets/charts/distribution_chart.dart b/lib/features/measurements/widgets/charts/distribution_chart.dart index 66234aee4..2eafa24ea 100644 --- a/lib/features/measurements/widgets/charts/distribution_chart.dart +++ b/lib/features/measurements/widgets/charts/distribution_chart.dart @@ -19,7 +19,7 @@ import 'dart:math'; import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/formatting/formatting.dart'; import 'package:wger/features/measurements/charts/data.dart'; import 'package:wger/features/measurements/widgets/charts/chart_painting.dart'; diff --git a/lib/features/measurements/widgets/charts/fl_axes.dart b/lib/features/measurements/widgets/charts/fl_axes.dart index 225383871..b986f27ac 100644 --- a/lib/features/measurements/widgets/charts/fl_axes.dart +++ b/lib/features/measurements/widgets/charts/fl_axes.dart @@ -23,7 +23,7 @@ library; import 'dart:math'; import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; import 'package:wger/core/formatting/formatting.dart'; diff --git a/lib/features/measurements/widgets/charts/heatmap_chart.dart b/lib/features/measurements/widgets/charts/heatmap_chart.dart index 44d711601..c0bf52e1c 100644 --- a/lib/features/measurements/widgets/charts/heatmap_chart.dart +++ b/lib/features/measurements/widgets/charts/heatmap_chart.dart @@ -18,7 +18,7 @@ import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; import 'package:wger/core/formatting/formatting.dart'; import 'package:wger/features/measurements/charts/data.dart'; diff --git a/lib/features/measurements/widgets/charts/line_chart.dart b/lib/features/measurements/widgets/charts/line_chart.dart index 359562e8b..29512d137 100644 --- a/lib/features/measurements/widgets/charts/line_chart.dart +++ b/lib/features/measurements/widgets/charts/line_chart.dart @@ -20,7 +20,7 @@ import 'dart:math'; import 'package:collection/collection.dart'; import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; import 'package:wger/core/charts.dart'; import 'package:wger/core/consts.dart'; diff --git a/lib/features/measurements/widgets/charts/overall_change.dart b/lib/features/measurements/widgets/charts/overall_change.dart index 300a32940..f915b1fdf 100644 --- a/lib/features/measurements/widgets/charts/overall_change.dart +++ b/lib/features/measurements/widgets/charts/overall_change.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/formatting/formatting.dart'; import 'package:wger/features/measurements/charts/series.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/measurements/widgets/charts/spark_charts.dart b/lib/features/measurements/widgets/charts/spark_charts.dart index c55339b25..44ae0f8d4 100644 --- a/lib/features/measurements/widgets/charts/spark_charts.dart +++ b/lib/features/measurements/widgets/charts/spark_charts.dart @@ -25,7 +25,7 @@ library; import 'dart:math'; import 'dart:ui' show PointMode; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/measurements/charts/calendar.dart'; import 'package:wger/features/measurements/charts/colors.dart'; import 'package:wger/features/measurements/charts/data.dart'; diff --git a/lib/features/measurements/widgets/charts/stacked_bar_chart.dart b/lib/features/measurements/widgets/charts/stacked_bar_chart.dart index b3cc31e68..69a826da4 100644 --- a/lib/features/measurements/widgets/charts/stacked_bar_chart.dart +++ b/lib/features/measurements/widgets/charts/stacked_bar_chart.dart @@ -19,7 +19,7 @@ import 'dart:math'; import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; import 'package:wger/core/formatting/formatting.dart'; import 'package:wger/features/measurements/charts/colors.dart'; diff --git a/lib/features/measurements/widgets/entries.dart b/lib/features/measurements/widgets/entries.dart index bdc71cb96..fee554fef 100644 --- a/lib/features/measurements/widgets/entries.dart +++ b/lib/features/measurements/widgets/entries.dart @@ -17,7 +17,7 @@ */ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/form_screen.dart'; import 'package:wger/core/formatting/formatting.dart'; diff --git a/lib/features/measurements/widgets/forms/category.dart b/lib/features/measurements/widgets/forms/category.dart index c00ff5a67..906d7dfae 100644 --- a/lib/features/measurements/widgets/forms/category.dart +++ b/lib/features/measurements/widgets/forms/category.dart @@ -17,7 +17,7 @@ */ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/widgets/form_submit_button.dart'; import 'package:wger/features/account/providers/user_profile_notifier.dart'; diff --git a/lib/features/measurements/widgets/forms/entry.dart b/lib/features/measurements/widgets/forms/entry.dart index b54c2f5ca..98ff4bfac 100644 --- a/lib/features/measurements/widgets/forms/entry.dart +++ b/lib/features/measurements/widgets/forms/entry.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/widgets/datetime_input.dart'; import 'package:wger/core/widgets/decimal_input.dart'; diff --git a/lib/features/measurements/widgets/forms/group_entry.dart b/lib/features/measurements/widgets/forms/group_entry.dart index f0c864afd..09808b21a 100644 --- a/lib/features/measurements/widgets/forms/group_entry.dart +++ b/lib/features/measurements/widgets/forms/group_entry.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/widgets/datetime_input.dart'; import 'package:wger/core/widgets/decimal_input.dart'; diff --git a/lib/features/measurements/widgets/helpers.dart b/lib/features/measurements/widgets/helpers.dart index ae9992710..8c7260213 100644 --- a/lib/features/measurements/widgets/helpers.dart +++ b/lib/features/measurements/widgets/helpers.dart @@ -1,5 +1,5 @@ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/form_screen.dart'; import 'package:wger/core/widgets/error.dart'; diff --git a/lib/features/measurements/widgets/measurement_fab.dart b/lib/features/measurements/widgets/measurement_fab.dart index a405af379..5cef3bbfb 100644 --- a/lib/features/measurements/widgets/measurement_fab.dart +++ b/lib/features/measurements/widgets/measurement_fab.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/measurements/widgets/metric_picker.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/measurements/widgets/measurement_tile.dart b/lib/features/measurements/widgets/measurement_tile.dart index 60d903e20..4eb7988be 100644 --- a/lib/features/measurements/widgets/measurement_tile.dart +++ b/lib/features/measurements/widgets/measurement_tile.dart @@ -19,7 +19,7 @@ import 'dart:math'; import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:intl/intl.dart'; import 'package:wger/core/formatting/formatting.dart'; diff --git a/lib/features/measurements/widgets/metric_picker.dart b/lib/features/measurements/widgets/metric_picker.dart index 5d5544227..0cda08dcc 100644 --- a/lib/features/measurements/widgets/metric_picker.dart +++ b/lib/features/measurements/widgets/metric_picker.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/form_screen.dart'; import 'package:wger/features/measurements/models/measurement_category.dart'; diff --git a/lib/features/measurements/widgets/weight_form.dart b/lib/features/measurements/widgets/weight_form.dart index b1170296b..3775fd45e 100644 --- a/lib/features/measurements/widgets/weight_form.dart +++ b/lib/features/measurements/widgets/weight_form.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod; import 'package:wger/core/consts.dart'; import 'package:wger/core/widgets/datetime_input.dart'; diff --git a/lib/features/nutrition/models/meal.dart b/lib/features/nutrition/models/meal.dart index 143a5ad65..8b13abda4 100644 --- a/lib/features/nutrition/models/meal.dart +++ b/lib/features/nutrition/models/meal.dart @@ -17,7 +17,7 @@ */ import 'package:drift/drift.dart' as drift; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/core/date.dart'; import 'package:wger/database/powersync/database.dart'; diff --git a/lib/features/nutrition/screens/ingredient_detail_screen.dart b/lib/features/nutrition/screens/ingredient_detail_screen.dart index 4864b8334..2e77bec20 100644 --- a/lib/features/nutrition/screens/ingredient_detail_screen.dart +++ b/lib/features/nutrition/screens/ingredient_detail_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/widgets/async_value_widget.dart'; import 'package:wger/core/widgets/progress_indicator.dart'; diff --git a/lib/features/nutrition/screens/ingredients_screen.dart b/lib/features/nutrition/screens/ingredients_screen.dart index 972a2eb51..56dcb5feb 100644 --- a/lib/features/nutrition/screens/ingredients_screen.dart +++ b/lib/features/nutrition/screens/ingredients_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/wide_screen_wrapper.dart'; import 'package:wger/core/widgets/progress_indicator.dart'; diff --git a/lib/features/nutrition/screens/log_meal_screen.dart b/lib/features/nutrition/screens/log_meal_screen.dart index 501f79303..683a2f096 100644 --- a/lib/features/nutrition/screens/log_meal_screen.dart +++ b/lib/features/nutrition/screens/log_meal_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/snackbar.dart'; import 'package:wger/core/widgets/datetime_input.dart'; diff --git a/lib/features/nutrition/screens/log_meals_screen.dart b/lib/features/nutrition/screens/log_meals_screen.dart index 9d65dfb53..6fcbd3532 100644 --- a/lib/features/nutrition/screens/log_meals_screen.dart +++ b/lib/features/nutrition/screens/log_meals_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/nutrition/models/nutritional_plan.dart'; import 'package:wger/features/nutrition/screens/nutritional_plan_screen.dart'; import 'package:wger/features/nutrition/widgets/meal.dart'; diff --git a/lib/features/nutrition/screens/nutritional_diary_screen.dart b/lib/features/nutrition/screens/nutritional_diary_screen.dart index 40099ff83..042f0925f 100644 --- a/lib/features/nutrition/screens/nutritional_diary_screen.dart +++ b/lib/features/nutrition/screens/nutritional_diary_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/formatting/formatting.dart'; import 'package:wger/core/wide_screen_wrapper.dart'; diff --git a/lib/features/nutrition/screens/nutritional_plan_screen.dart b/lib/features/nutrition/screens/nutritional_plan_screen.dart index dbf13bdd6..ec45a7f0f 100644 --- a/lib/features/nutrition/screens/nutritional_plan_screen.dart +++ b/lib/features/nutrition/screens/nutritional_plan_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/form_screen.dart'; import 'package:wger/core/widgets/object_gone_redirect.dart'; diff --git a/lib/features/nutrition/screens/nutritional_plans_screen.dart b/lib/features/nutrition/screens/nutritional_plans_screen.dart index aa1bbd59f..d064c0ed1 100644 --- a/lib/features/nutrition/screens/nutritional_plans_screen.dart +++ b/lib/features/nutrition/screens/nutritional_plans_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/form_screen.dart'; import 'package:wger/core/wide_screen_wrapper.dart'; diff --git a/lib/features/nutrition/widgets/charts.dart b/lib/features/nutrition/widgets/charts.dart index 296dc19ab..e2c8a3b85 100644 --- a/lib/features/nutrition/widgets/charts.dart +++ b/lib/features/nutrition/widgets/charts.dart @@ -19,7 +19,7 @@ import 'dart:math'; import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/colors.dart'; import 'package:wger/core/widgets/legend.dart'; import 'package:wger/features/nutrition/models/nutritional_plan.dart'; diff --git a/lib/features/nutrition/widgets/forms.dart b/lib/features/nutrition/widgets/forms.dart index cc7db695d..f78a1611c 100644 --- a/lib/features/nutrition/widgets/forms.dart +++ b/lib/features/nutrition/widgets/forms.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/core/formatting/formatting.dart'; diff --git a/lib/features/nutrition/widgets/helpers.dart b/lib/features/nutrition/widgets/helpers.dart index eff201979..fa8256cc6 100644 --- a/lib/features/nutrition/widgets/helpers.dart +++ b/lib/features/nutrition/widgets/helpers.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/widgets/core.dart'; import 'package:wger/features/nutrition/models/ingredient.dart'; diff --git a/lib/features/nutrition/widgets/ingredient_dialogs.dart b/lib/features/nutrition/widgets/ingredient_dialogs.dart index 444dbf273..e75d3f849 100644 --- a/lib/features/nutrition/widgets/ingredient_dialogs.dart +++ b/lib/features/nutrition/widgets/ingredient_dialogs.dart @@ -18,7 +18,7 @@ import 'dart:ui'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/misc.dart'; import 'package:wger/core/widgets/error.dart'; import 'package:wger/core/widgets/progress_indicator.dart'; diff --git a/lib/features/nutrition/widgets/ingredient_filter_dialog.dart b/lib/features/nutrition/widgets/ingredient_filter_dialog.dart index 7c9693a7c..fbb19d92d 100644 --- a/lib/features/nutrition/widgets/ingredient_filter_dialog.dart +++ b/lib/features/nutrition/widgets/ingredient_filter_dialog.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/widgets/language_dropdown.dart'; import 'package:wger/features/nutrition/models/ingredient.dart'; diff --git a/lib/features/nutrition/widgets/ingredient_filter_row.dart b/lib/features/nutrition/widgets/ingredient_filter_row.dart index f114db26f..cb85fe876 100644 --- a/lib/features/nutrition/widgets/ingredient_filter_row.dart +++ b/lib/features/nutrition/widgets/ingredient_filter_row.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/features/nutrition/providers/ingredient_filters_notifier.dart'; import 'package:wger/features/nutrition/widgets/ingredient_filter_dialog.dart'; diff --git a/lib/features/nutrition/widgets/ingredient_images.dart b/lib/features/nutrition/widgets/ingredient_images.dart index 892565d8d..1d7df5c20 100644 --- a/lib/features/nutrition/widgets/ingredient_images.dart +++ b/lib/features/nutrition/widgets/ingredient_images.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/widgets/wger_image.dart'; import 'package:wger/features/nutrition/models/ingredient_image.dart'; diff --git a/lib/features/nutrition/widgets/ingredient_list_tile.dart b/lib/features/nutrition/widgets/ingredient_list_tile.dart index 931de1fde..1887598f5 100644 --- a/lib/features/nutrition/widgets/ingredient_list_tile.dart +++ b/lib/features/nutrition/widgets/ingredient_list_tile.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/nutrition/models/ingredient.dart'; import 'package:wger/features/nutrition/screens/ingredient_detail_screen.dart'; import 'package:wger/features/nutrition/widgets/ingredient_images.dart'; diff --git a/lib/features/nutrition/widgets/macro_nutrients_table.dart b/lib/features/nutrition/widgets/macro_nutrients_table.dart index aa5d5dbaa..a4c83991b 100644 --- a/lib/features/nutrition/widgets/macro_nutrients_table.dart +++ b/lib/features/nutrition/widgets/macro_nutrients_table.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/nutrition/models/nutritional_goals.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/nutrition/widgets/meal.dart b/lib/features/nutrition/widgets/meal.dart index a69f36cf1..ec625e619 100644 --- a/lib/features/nutrition/widgets/meal.dart +++ b/lib/features/nutrition/widgets/meal.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/core/form_screen.dart'; diff --git a/lib/features/nutrition/widgets/nutri_score_badge.dart b/lib/features/nutrition/widgets/nutri_score_badge.dart index 46f49aacd..9dc5c6b2d 100644 --- a/lib/features/nutrition/widgets/nutri_score_badge.dart +++ b/lib/features/nutrition/widgets/nutri_score_badge.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/nutrition/models/ingredient.dart'; const _nutriScoreColors = { diff --git a/lib/features/nutrition/widgets/nutrition_tile.dart b/lib/features/nutrition/widgets/nutrition_tile.dart index 22de42b3c..63ef9ae88 100644 --- a/lib/features/nutrition/widgets/nutrition_tile.dart +++ b/lib/features/nutrition/widgets/nutrition_tile.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// NutritionTile is similar to a non-interactive ListTile, /// but uses a fixed, easy to understand layout. diff --git a/lib/features/nutrition/widgets/nutrition_tiles.dart b/lib/features/nutrition/widgets/nutrition_tiles.dart index 38ff99582..f469399f1 100644 --- a/lib/features/nutrition/widgets/nutrition_tiles.dart +++ b/lib/features/nutrition/widgets/nutrition_tiles.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:intl/intl.dart'; import 'package:wger/core/consts.dart'; diff --git a/lib/features/nutrition/widgets/nutritional_diary_detail.dart b/lib/features/nutrition/widgets/nutritional_diary_detail.dart index cc567b32f..3eb0bd9ab 100644 --- a/lib/features/nutrition/widgets/nutritional_diary_detail.dart +++ b/lib/features/nutrition/widgets/nutritional_diary_detail.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/nutrition/models/nutritional_plan.dart'; import 'package:wger/features/nutrition/models/nutritional_values.dart'; import 'package:wger/features/nutrition/widgets/charts.dart'; diff --git a/lib/features/nutrition/widgets/nutritional_diary_table.dart b/lib/features/nutrition/widgets/nutritional_diary_table.dart index 71e7d3a5b..c0554fdf1 100644 --- a/lib/features/nutrition/widgets/nutritional_diary_table.dart +++ b/lib/features/nutrition/widgets/nutritional_diary_table.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; import 'package:wger/features/nutrition/models/nutritional_goals.dart'; import 'package:wger/features/nutrition/models/nutritional_plan.dart'; diff --git a/lib/features/nutrition/widgets/nutritional_plan_detail.dart b/lib/features/nutrition/widgets/nutritional_plan_detail.dart index b47cc48af..33db80f03 100644 --- a/lib/features/nutrition/widgets/nutritional_plan_detail.dart +++ b/lib/features/nutrition/widgets/nutritional_plan_detail.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod; import 'package:intl/intl.dart'; import 'package:wger/features/measurements/models/unit_conversion.dart'; diff --git a/lib/features/nutrition/widgets/nutritional_plans_list.dart b/lib/features/nutrition/widgets/nutritional_plans_list.dart index 43cf449a3..f5ee60e79 100644 --- a/lib/features/nutrition/widgets/nutritional_plans_list.dart +++ b/lib/features/nutrition/widgets/nutritional_plans_list.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod; import 'package:wger/core/formatting/formatting.dart'; import 'package:wger/core/widgets/async_value_widget.dart'; diff --git a/lib/features/nutrition/widgets/plan_weight_chart.dart b/lib/features/nutrition/widgets/plan_weight_chart.dart index d58d27fd9..a6e1ea14e 100644 --- a/lib/features/nutrition/widgets/plan_weight_chart.dart +++ b/lib/features/nutrition/widgets/plan_weight_chart.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/formatting/formatting.dart'; import 'package:wger/features/account/providers/user_profile_notifier.dart'; diff --git a/lib/features/nutrition/widgets/widgets.dart b/lib/features/nutrition/widgets/widgets.dart index fb1834bef..b159e7105 100644 --- a/lib/features/nutrition/widgets/widgets.dart +++ b/lib/features/nutrition/widgets/widgets.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_typeahead/flutter_typeahead.dart'; diff --git a/lib/features/routines/models/log.dart b/lib/features/routines/models/log.dart index 56609d07b..94eceaf8b 100644 --- a/lib/features/routines/models/log.dart +++ b/lib/features/routines/models/log.dart @@ -17,7 +17,7 @@ */ import 'package:drift/drift.dart' as drift; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/core/i18n.dart'; import 'package:wger/core/misc.dart'; diff --git a/lib/features/routines/models/session.dart b/lib/features/routines/models/session.dart index a8e62932f..ecabb7653 100644 --- a/lib/features/routines/models/session.dart +++ b/lib/features/routines/models/session.dart @@ -18,7 +18,7 @@ import 'package:clock/clock.dart'; import 'package:drift/drift.dart' as drift; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:wger/core/date.dart'; import 'package:wger/database/powersync/database.dart'; diff --git a/lib/features/routines/providers/gym_state.dart b/lib/features/routines/providers/gym_state.dart index ffb5f9b27..e77cc1dcd 100644 --- a/lib/features/routines/providers/gym_state.dart +++ b/lib/features/routines/providers/gym_state.dart @@ -17,7 +17,7 @@ */ import 'package:clock/clock.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/uuid.dart'; import 'package:wger/features/exercises/models/exercise.dart'; import 'package:wger/features/routines/models/day_data.dart'; diff --git a/lib/features/routines/providers/plate_weights.dart b/lib/features/routines/providers/plate_weights.dart index 04e72d574..b7e309e47 100644 --- a/lib/features/routines/providers/plate_weights.dart +++ b/lib/features/routines/providers/plate_weights.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:logging/logging.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/lib/features/routines/screens/gym_mode.dart b/lib/features/routines/screens/gym_mode.dart index 057c3fc72..334fa1845 100644 --- a/lib/features/routines/screens/gym_mode.dart +++ b/lib/features/routines/screens/gym_mode.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/wide_screen_wrapper.dart'; import 'package:wger/features/routines/widgets/gym_mode/gym_mode.dart'; diff --git a/lib/features/routines/screens/routine_edit_screen.dart b/lib/features/routines/screens/routine_edit_screen.dart index eabfed8da..e5655a196 100644 --- a/lib/features/routines/screens/routine_edit_screen.dart +++ b/lib/features/routines/screens/routine_edit_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/wide_screen_wrapper.dart'; import 'package:wger/core/widgets/app_bar.dart'; diff --git a/lib/features/routines/screens/routine_list_screen.dart b/lib/features/routines/screens/routine_list_screen.dart index da5fca20c..6538e8317 100644 --- a/lib/features/routines/screens/routine_list_screen.dart +++ b/lib/features/routines/screens/routine_list_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod; import 'package:wger/core/form_screen.dart'; import 'package:wger/core/network/network_provider.dart'; diff --git a/lib/features/routines/screens/routine_logs_screen.dart b/lib/features/routines/screens/routine_logs_screen.dart index 57f214e60..38f79146b 100644 --- a/lib/features/routines/screens/routine_logs_screen.dart +++ b/lib/features/routines/screens/routine_logs_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/wide_screen_wrapper.dart'; import 'package:wger/core/widgets/app_bar.dart'; diff --git a/lib/features/routines/screens/routine_screen.dart b/lib/features/routines/screens/routine_screen.dart index 834a3e4d7..3a879e56f 100644 --- a/lib/features/routines/screens/routine_screen.dart +++ b/lib/features/routines/screens/routine_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/wide_screen_wrapper.dart'; import 'package:wger/core/widgets/async_value_widget.dart'; diff --git a/lib/features/routines/screens/settings_plates_screen.dart b/lib/features/routines/screens/settings_plates_screen.dart index e62f4e101..911e2a84b 100644 --- a/lib/features/routines/screens/settings_plates_screen.dart +++ b/lib/features/routines/screens/settings_plates_screen.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/wide_screen_wrapper.dart'; import 'package:wger/features/routines/widgets/plate_calculator.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/routines/widgets/app_bar.dart b/lib/features/routines/widgets/app_bar.dart index 0fa17b35d..23316073f 100644 --- a/lib/features/routines/widgets/app_bar.dart +++ b/lib/features/routines/widgets/app_bar.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/network/network_provider.dart'; import 'package:wger/features/exercises/screens/add_exercise_screen.dart'; diff --git a/lib/features/routines/widgets/charts.dart b/lib/features/routines/widgets/charts.dart index 9d190e109..d05cfb80c 100644 --- a/lib/features/routines/widgets/charts.dart +++ b/lib/features/routines/widgets/charts.dart @@ -17,7 +17,7 @@ */ import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/charts.dart'; import 'package:wger/core/colors.dart'; import 'package:wger/core/formatting/formatting.dart'; diff --git a/lib/features/routines/widgets/day.dart b/lib/features/routines/widgets/day.dart index d1ac06dd2..d10b7cbd2 100644 --- a/lib/features/routines/widgets/day.dart +++ b/lib/features/routines/widgets/day.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/date.dart'; import 'package:wger/core/widgets/core.dart'; import 'package:wger/features/exercises/models/exercise.dart'; diff --git a/lib/features/routines/widgets/forms/day.dart b/lib/features/routines/widgets/forms/day.dart index 2b2e467c1..d347d6896 100644 --- a/lib/features/routines/widgets/forms/day.dart +++ b/lib/features/routines/widgets/forms/day.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/core/error_dialogs.dart'; diff --git a/lib/features/routines/widgets/forms/repetitions.dart b/lib/features/routines/widgets/forms/repetitions.dart index 606b0a8b1..bca82756e 100644 --- a/lib/features/routines/widgets/forms/repetitions.dart +++ b/lib/features/routines/widgets/forms/repetitions.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:intl/intl.dart'; import 'package:logging/logging.dart'; diff --git a/lib/features/routines/widgets/forms/rir.dart b/lib/features/routines/widgets/forms/rir.dart index 894bf3cc9..78b819ccc 100644 --- a/lib/features/routines/widgets/forms/rir.dart +++ b/lib/features/routines/widgets/forms/rir.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:logging/logging.dart'; import 'package:wger/features/routines/models/slot_entry.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/routines/widgets/forms/routine.dart b/lib/features/routines/widgets/forms/routine.dart index a817fa71d..d70021ebe 100644 --- a/lib/features/routines/widgets/forms/routine.dart +++ b/lib/features/routines/widgets/forms/routine.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/core/network/network_provider.dart'; diff --git a/lib/features/routines/widgets/forms/session.dart b/lib/features/routines/widgets/forms/session.dart index 0faf28e2e..732d7168f 100644 --- a/lib/features/routines/widgets/forms/session.dart +++ b/lib/features/routines/widgets/forms/session.dart @@ -17,7 +17,7 @@ */ import 'package:clock/clock.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:logging/logging.dart'; import 'package:wger/core/snackbar.dart'; diff --git a/lib/features/routines/widgets/forms/slot.dart b/lib/features/routines/widgets/forms/slot.dart index f2eccc533..9f2f7c0b7 100644 --- a/lib/features/routines/widgets/forms/slot.dart +++ b/lib/features/routines/widgets/forms/slot.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/error_dialogs.dart'; import 'package:wger/core/exceptions/http_exception.dart'; diff --git a/lib/features/routines/widgets/forms/slot_entry.dart b/lib/features/routines/widgets/forms/slot_entry.dart index dceebe940..a159c32aa 100644 --- a/lib/features/routines/widgets/forms/slot_entry.dart +++ b/lib/features/routines/widgets/forms/slot_entry.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/core/error_dialogs.dart'; diff --git a/lib/features/routines/widgets/forms/weight.dart b/lib/features/routines/widgets/forms/weight.dart index 60da45317..2abaa0b71 100644 --- a/lib/features/routines/widgets/forms/weight.dart +++ b/lib/features/routines/widgets/forms/weight.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:intl/intl.dart'; import 'package:logging/logging.dart'; diff --git a/lib/features/routines/widgets/gym_mode/elapsed_time.dart b/lib/features/routines/widgets/gym_mode/elapsed_time.dart index d1c9aa55e..691c288dd 100644 --- a/lib/features/routines/widgets/gym_mode/elapsed_time.dart +++ b/lib/features/routines/widgets/gym_mode/elapsed_time.dart @@ -19,7 +19,7 @@ import 'dart:async'; import 'package:clock/clock.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/features/routines/providers/gym_state_notifier.dart'; diff --git a/lib/features/routines/widgets/gym_mode/exercise_overview.dart b/lib/features/routines/widgets/gym_mode/exercise_overview.dart index 10aded957..b7a1cc396 100644 --- a/lib/features/routines/widgets/gym_mode/exercise_overview.dart +++ b/lib/features/routines/widgets/gym_mode/exercise_overview.dart @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:logging/logging.dart'; import 'package:wger/features/exercises/widgets/exercises.dart'; diff --git a/lib/features/routines/widgets/gym_mode/gym_mode.dart b/lib/features/routines/widgets/gym_mode/gym_mode.dart index 7c4a9349c..fce73f6d5 100644 --- a/lib/features/routines/widgets/gym_mode/gym_mode.dart +++ b/lib/features/routines/widgets/gym_mode/gym_mode.dart @@ -19,7 +19,7 @@ import 'dart:async'; import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:logging/logging.dart'; import 'package:wger/core/build_safety.dart'; diff --git a/lib/features/routines/widgets/gym_mode/log_page.dart b/lib/features/routines/widgets/gym_mode/log_page.dart index 58f8d5984..263d02d14 100644 --- a/lib/features/routines/widgets/gym_mode/log_page.dart +++ b/lib/features/routines/widgets/gym_mode/log_page.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:logging/logging.dart'; import 'package:wger/core/consts.dart'; diff --git a/lib/features/routines/widgets/gym_mode/navigation.dart b/lib/features/routines/widgets/gym_mode/navigation.dart index 2fc9b9b6e..ddeac2d2b 100644 --- a/lib/features/routines/widgets/gym_mode/navigation.dart +++ b/lib/features/routines/widgets/gym_mode/navigation.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/features/routines/providers/gym_state_notifier.dart'; diff --git a/lib/features/routines/widgets/gym_mode/session_page.dart b/lib/features/routines/widgets/gym_mode/session_page.dart index a8e92ca7b..8f49a3272 100644 --- a/lib/features/routines/widgets/gym_mode/session_page.dart +++ b/lib/features/routines/widgets/gym_mode/session_page.dart @@ -18,7 +18,7 @@ import 'package:clock/clock.dart'; import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/core/date.dart'; diff --git a/lib/features/routines/widgets/gym_mode/start_page.dart b/lib/features/routines/widgets/gym_mode/start_page.dart index 471a113cc..032ac94fc 100644 --- a/lib/features/routines/widgets/gym_mode/start_page.dart +++ b/lib/features/routines/widgets/gym_mode/start_page.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/features/exercises/models/exercise.dart'; import 'package:wger/features/exercises/widgets/images.dart'; diff --git a/lib/features/routines/widgets/gym_mode/summary.dart b/lib/features/routines/widgets/gym_mode/summary.dart index f688c25f6..fc0df027a 100644 --- a/lib/features/routines/widgets/gym_mode/summary.dart +++ b/lib/features/routines/widgets/gym_mode/summary.dart @@ -18,7 +18,7 @@ import 'package:clock/clock.dart'; import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:logging/logging.dart'; import 'package:wger/core/date.dart'; diff --git a/lib/features/routines/widgets/gym_mode/timer.dart b/lib/features/routines/widgets/gym_mode/timer.dart index efe21e26f..0076daa5e 100644 --- a/lib/features/routines/widgets/gym_mode/timer.dart +++ b/lib/features/routines/widgets/gym_mode/timer.dart @@ -17,7 +17,7 @@ */ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:intl/intl.dart'; diff --git a/lib/features/routines/widgets/gym_mode/workout_menu.dart b/lib/features/routines/widgets/gym_mode/workout_menu.dart index cc24e0289..c079960a0 100644 --- a/lib/features/routines/widgets/gym_mode/workout_menu.dart +++ b/lib/features/routines/widgets/gym_mode/workout_menu.dart @@ -16,7 +16,7 @@ // * along with this program. If not, see . // */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:logging/logging.dart'; import 'package:wger/core/consts.dart'; diff --git a/lib/features/routines/widgets/logs/day_logs_container.dart b/lib/features/routines/widgets/logs/day_logs_container.dart index a08aa85ee..29f2f6673 100644 --- a/lib/features/routines/widgets/logs/day_logs_container.dart +++ b/lib/features/routines/widgets/logs/day_logs_container.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/date.dart'; import 'package:wger/features/account/providers/user_profile_notifier.dart'; diff --git a/lib/features/routines/widgets/logs/exercise_log_chart.dart b/lib/features/routines/widgets/logs/exercise_log_chart.dart index dde50476f..0190352d1 100644 --- a/lib/features/routines/widgets/logs/exercise_log_chart.dart +++ b/lib/features/routines/widgets/logs/exercise_log_chart.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/colors.dart'; import 'package:wger/core/misc.dart'; import 'package:wger/core/widgets/legend.dart'; diff --git a/lib/features/routines/widgets/logs/exercises_expansion_card.dart b/lib/features/routines/widgets/logs/exercises_expansion_card.dart index 3e0e59cd0..ce1f894ef 100644 --- a/lib/features/routines/widgets/logs/exercises_expansion_card.dart +++ b/lib/features/routines/widgets/logs/exercises_expansion_card.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/i18n.dart'; import 'package:wger/features/exercises/models/exercise.dart'; import 'package:wger/features/routines/models/log.dart'; diff --git a/lib/features/routines/widgets/logs/log_delete_dialog.dart b/lib/features/routines/widgets/logs/log_delete_dialog.dart index 1bc8f5d20..73fe90ccc 100644 --- a/lib/features/routines/widgets/logs/log_delete_dialog.dart +++ b/lib/features/routines/widgets/logs/log_delete_dialog.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/widgets/confirm_delete_dialog.dart'; import 'package:wger/features/routines/models/log.dart'; diff --git a/lib/features/routines/widgets/logs/log_edit_dialog.dart b/lib/features/routines/widgets/logs/log_edit_dialog.dart index 43befddf3..56e7e2608 100644 --- a/lib/features/routines/widgets/logs/log_edit_dialog.dart +++ b/lib/features/routines/widgets/logs/log_edit_dialog.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:logging/logging.dart'; import 'package:wger/core/snackbar.dart'; diff --git a/lib/features/routines/widgets/logs/log_overview_routine.dart b/lib/features/routines/widgets/logs/log_overview_routine.dart index 099b46d68..be5e15be7 100644 --- a/lib/features/routines/widgets/logs/log_overview_routine.dart +++ b/lib/features/routines/widgets/logs/log_overview_routine.dart @@ -17,7 +17,7 @@ */ import 'package:clock/clock.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:table_calendar/table_calendar.dart'; import 'package:wger/core/consts.dart'; diff --git a/lib/features/routines/widgets/logs/muscle_groups.dart b/lib/features/routines/widgets/logs/muscle_groups.dart index 939be0c11..e8d10a7be 100644 --- a/lib/features/routines/widgets/logs/muscle_groups.dart +++ b/lib/features/routines/widgets/logs/muscle_groups.dart @@ -18,7 +18,7 @@ import 'package:collection/collection.dart'; import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/colors.dart'; import 'package:wger/features/routines/models/log.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/routines/widgets/logs/session_info.dart b/lib/features/routines/widgets/logs/session_info.dart index 39e9b967a..b90e9a9ba 100644 --- a/lib/features/routines/widgets/logs/session_info.dart +++ b/lib/features/routines/widgets/logs/session_info.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/formatting/formatting.dart'; import 'package:wger/features/routines/models/session.dart'; import 'package:wger/features/routines/widgets/forms/session.dart'; diff --git a/lib/features/routines/widgets/plate_calculator.dart b/lib/features/routines/widgets/plate_calculator.dart index d3baa1418..c6462410a 100644 --- a/lib/features/routines/widgets/plate_calculator.dart +++ b/lib/features/routines/widgets/plate_calculator.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/features/routines/providers/plate_weights.dart'; diff --git a/lib/features/routines/widgets/routine_detail.dart b/lib/features/routines/widgets/routine_detail.dart index 190a9af5b..47e385fe8 100644 --- a/lib/features/routines/widgets/routine_detail.dart +++ b/lib/features/routines/widgets/routine_detail.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/routines/models/routine.dart'; import 'package:wger/features/routines/screens/routine_edit_screen.dart'; import 'package:wger/features/routines/widgets/day.dart'; diff --git a/lib/features/routines/widgets/routine_edit.dart b/lib/features/routines/widgets/routine_edit.dart index b05453b50..8cfd0e8ff 100644 --- a/lib/features/routines/widgets/routine_edit.dart +++ b/lib/features/routines/widgets/routine_edit.dart @@ -17,7 +17,7 @@ */ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/routines/models/day.dart'; import 'package:wger/features/routines/models/routine.dart'; import 'package:wger/features/routines/widgets/forms/day.dart'; diff --git a/lib/features/routines/widgets/routines_list.dart b/lib/features/routines/widgets/routines_list.dart index 17afa9b24..96b7b9306 100644 --- a/lib/features/routines/widgets/routines_list.dart +++ b/lib/features/routines/widgets/routines_list.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/formatting/formatting.dart'; import 'package:wger/core/network/network_provider.dart'; diff --git a/lib/features/routines/widgets/slot.dart b/lib/features/routines/widgets/slot.dart index 7cfc1d572..ae18d4712 100644 --- a/lib/features/routines/widgets/slot.dart +++ b/lib/features/routines/widgets/slot.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/exercises/models/exercise.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/features/trophies/screens/trophy_screen.dart b/lib/features/trophies/screens/trophy_screen.dart index 116738a41..482a42a3d 100644 --- a/lib/features/trophies/screens/trophy_screen.dart +++ b/lib/features/trophies/screens/trophy_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/core/wide_screen_wrapper.dart'; import 'package:wger/core/widgets/app_bar.dart'; import 'package:wger/features/trophies/widgets/trophies_overview.dart'; diff --git a/lib/features/trophies/widgets/trophies_overview.dart b/lib/features/trophies/widgets/trophies_overview.dart index 97be23263..659651930 100644 --- a/lib/features/trophies/widgets/trophies_overview.dart +++ b/lib/features/trophies/widgets/trophies_overview.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/material.dart'; import 'package:wger/features/trophies/models/user_trophy_progression.dart'; diff --git a/lib/main.dart b/lib/main.dart index 114f7ec85..4a2ed2884 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -21,7 +21,7 @@ import 'dart:async'; import 'package:dynamic_color/dynamic_color.dart'; import 'package:extended_image/extended_image.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:logging/logging.dart'; import 'package:timezone/data/latest.dart' as tzdata; diff --git a/lib/theme/dynamic_color.dart b/lib/theme/dynamic_color.dart index e28065775..46c4e0dfe 100644 --- a/lib/theme/dynamic_color.dart +++ b/lib/theme/dynamic_color.dart @@ -17,7 +17,7 @@ */ import 'package:dynamic_color/dynamic_color.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; diff --git a/lib/theme/theme.dart b/lib/theme/theme.dart index e5d131393..66bb07863 100644 --- a/lib/theme/theme.dart +++ b/lib/theme/theme.dart @@ -17,7 +17,7 @@ */ import 'package:flex_color_scheme/flex_color_scheme.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:table_calendar/table_calendar.dart'; // Color scheme, please consult diff --git a/pubspec.lock b/pubspec.lock index 832c4d807..d5c540acd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: analyzer_buffer - sha256: "445b77e2054fa3e8c8a8ef1b5e9e6b23bb8028fffd34b5e60eaef315b7750674" + sha256: f890a2e708e38fbf4238ad2f9fd3d506538acdddb0cd8eb2c3e8c7bd17784b57 url: "https://pub.dev" source: hosted - version: "0.3.3" + version: "0.3.4" ansicolor: dependency: transitive description: @@ -69,10 +69,10 @@ packages: dependency: transitive description: name: archive - sha256: be169cf6ac481e052c4538715d88841d567150dfe1df38aaec76461a4e7b39f2 + sha256: ace891da0862b0e4cabbb064ee3fd87b2728b898949fdb366d83fe98342c9f19 url: "https://pub.dev" source: hosted - version: "4.1.0" + version: "4.2.0" args: dependency: transitive description: @@ -157,18 +157,18 @@ packages: dependency: transitive description: name: camera_android_camerax - sha256: "47aa7c2963ceb8db4fc3dfbba0f9195da3741f3d11e80f0e29472d46bf4c2e66" + sha256: a13f12f9c067679bf11f0f61e3f2079ac5c740388dec2e46d82e9f28ea093b4f url: "https://pub.dev" source: hosted - version: "0.7.4+6" + version: "0.7.4+7" camera_avfoundation: dependency: transitive description: name: camera_avfoundation - sha256: "866e9cd8370f8055d005c0413937a52dc1d7a472687f0ee3ce02392955aababa" + sha256: "843247230a583e04742ea1434ce3f91e536760922fab67c72ce46aa34fac3e9d" url: "https://pub.dev" source: hosted - version: "0.10.2" + version: "0.10.3" camera_platform_interface: dependency: transitive description: @@ -253,10 +253,10 @@ packages: dependency: "direct main" 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: @@ -269,10 +269,10 @@ packages: dependency: transitive description: name: code_builder - sha256: "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d" + sha256: aa5932e94c6c39c2f9ec4e5e06dfdd11a9430a61f6c41b6ba75b28ce0c481baf url: "https://pub.dev" source: hosted - version: "4.11.1" + version: "4.12.0" collection: dependency: "direct main" description: @@ -317,10 +317,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "92c9c43c383bfa1c32079d3bc492d55d6d4318044b7b47edaff8971cbb555c51" + sha256: f141ea4f277af142a0356955707f6556f37b03947d39d55585981a06ca437bd6 url: "https://pub.dev" source: hosted - version: "0.3.5+4" + version: "0.3.5+5" crypto: dependency: transitive description: @@ -345,6 +345,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.9" + cupertino_ui: + dependency: transitive + description: + name: cupertino_ui + sha256: "2137c0d41f3b62cc4d3d2495e6c354bd6b6133cd21c6bb155736cc31dbd49a11" + url: "https://pub.dev" + source: hosted + version: "1.0.1" dart_style: dependency: transitive description: @@ -469,18 +477,18 @@ packages: dependency: transitive description: name: file_selector_linux - sha256: "2567f398e06ac72dcf2e98a0c95df2a9edd03c2c2e0cacd4780f20cdf56263a0" + sha256: da76400e7872ce7637ffdce12749ec24169c25f6195c28372208e65a24bcd2ab url: "https://pub.dev" source: hosted - version: "0.9.4" + version: "0.9.4+1" file_selector_macos: dependency: transitive description: name: file_selector_macos - sha256: "5e0bbe9c312416f1787a68259ea1505b52f258c587f12920422671807c4d618a" + sha256: d57c62362766b5e7ae739448650b66c6aab7a68ba7ecc65e04018652645ae0f4 url: "https://pub.dev" source: hosted - version: "0.9.5" + version: "0.9.5+1" file_selector_platform_interface: dependency: transitive description: @@ -493,10 +501,10 @@ packages: dependency: transitive description: name: file_selector_windows - sha256: "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd" + sha256: fbefc5fb92c6d3cbe8d284a2cd971b593bb07d2cd6da8557b81a862250b4acec url: "https://pub.dev" source: hosted - version: "0.9.3+5" + version: "0.9.3+6" fixnum: dependency: transitive description: @@ -723,10 +731,10 @@ packages: dependency: transitive description: name: glob - sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de + sha256: "218aeb56050c714f62a3182775320dfa04602b55074873e24e31bbd39bda96fb" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.2.0" graphs: dependency: transitive description: @@ -756,18 +764,18 @@ packages: dependency: transitive description: name: hooks - sha256: "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba" + sha256: eaac480a35ec0814146c2c48d96aaa829e0e44a7662c88ae84c9edf4bc35651f url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.2.0" html: dependency: transitive description: name: html - sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602" + sha256: "43b67b8f43321ab066817dfac5619596c98bb1b61624e77203bb4351785f9699" url: "https://pub.dev" source: hosted - version: "0.15.6" + version: "0.15.7" http: dependency: "direct main" description: @@ -820,10 +828,10 @@ packages: dependency: transitive description: name: image_picker_android - sha256: "6f3a1995eafb000333174fae92202622033b0ee7fd917a6cd3730295264df84a" + sha256: f71f4f3a9c5dbbe39800b31839cb3b305aac403a7cfbddf8331cf179d813b72a url: "https://pub.dev" source: hosted - version: "0.8.13+19" + version: "0.8.13+21" image_picker_for_web: dependency: transitive description: @@ -836,10 +844,10 @@ packages: dependency: transitive description: name: image_picker_ios - sha256: b9c4a438a9ff4f60808c9cf0039b93a42bb6c2211ef6ebb647394b2b3fa84588 + sha256: ee3885b6fcd71958fbc79770dd194c63371439d536d69c47b279171a486482ae url: "https://pub.dev" source: hosted - version: "0.8.13+6" + version: "0.8.13+7" image_picker_linux: dependency: transitive description: @@ -881,18 +889,18 @@ packages: dependency: "direct main" description: name: intl - sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5" + sha256: "1ca20c894b1717686a2319b8548763d812bc0aabdac580420a44c5178c57a867" url: "https://pub.dev" source: hosted - version: "0.20.2" + version: "0.20.3" io: dependency: transitive description: name: io - sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b + sha256: "2635216ca6a737e60de577ffa1a48a0bec76ca8a62917cfc1bb88c14c570646f" url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.1.0" jni: dependency: transitive description: @@ -905,10 +913,10 @@ packages: dependency: transitive description: name: jni_flutter - sha256: "7b717011ea40d04fd47c2731d3d1d36eb99eba3435c2753d62489e8c3c9991d5" + sha256: b2310cdd4c18c65c081ab141a41efa94aa26c65431803703ece51996f174f351 url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.0.3" jni_util: dependency: transitive description: @@ -1009,10 +1017,10 @@ packages: dependency: transitive description: name: matcher - sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861 + sha256: "31bd099b47c10cd1aeb55146a2d46ce0277630ecef3f7dae54ad7873f36696cd" url: "https://pub.dev" source: hosted - version: "0.12.19" + version: "0.12.20" material_color_utilities: dependency: transitive description: @@ -1021,22 +1029,30 @@ packages: url: "https://pub.dev" source: hosted version: "0.13.0" + material_ui: + dependency: "direct main" + description: + name: material_ui + sha256: "7ba1ca315d50a004791dbab290417c52a61466d56db2822fe3c5c2994903110c" + url: "https://pub.dev" + source: hosted + version: "1.1.0" meta: dependency: transitive description: name: meta - sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349" + sha256: "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" mime: dependency: transitive description: name: mime - sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" + sha256: bd47de35f07e27267e69c8c8b22edf9473bfee170a60d60fcc93730c5144b7f6 url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.0" mockito: dependency: "direct dev" description: @@ -1057,10 +1073,10 @@ packages: dependency: transitive description: name: native_toolchain_c - sha256: f9c168717100ae6d9fee9ffb0be379bf1f8b26b0f6bcbd4fdddcd931993a6a72 + sha256: a1c26117c48cebe5677b0cf0e33a980a79a7c5577effc86f52e5a0d309cdcb60 url: "https://pub.dev" source: hosted - version: "0.19.2" + version: "0.19.3" network_image_mock: dependency: "direct dev" description: @@ -1209,10 +1225,10 @@ packages: dependency: transitive description: name: pool - sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d" + sha256: "4177f68c237ea2128d1bee66ac17b2ce05ba3dbaafcbdd54c5d40a39d0b6b11c" url: "https://pub.dev" source: hosted - version: "1.5.2" + version: "1.5.3" posix: dependency: transitive description: @@ -1241,26 +1257,26 @@ packages: dependency: transitive description: name: process - sha256: c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744 + sha256: "4242ba3508d37e01808bdf71ad1d5bb93a8d671bf2e7450e6b1b353fb0808891" url: "https://pub.dev" source: hosted - version: "5.0.5" + version: "5.0.6" pub_semver: dependency: transitive description: name: pub_semver - sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" + sha256: "261236774e8b1d69cfc6b9eabbc96c40f25e7a2d6b171f3385d4f65d5734fb24" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" pubspec_parse: dependency: transitive description: name: pubspec_parse - sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082" + sha256: c38b81cbf34450b67e0265d73433569d12e34782e30ed769c9cc99c9d5f2e796 url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "1.6.0" recase: dependency: transitive description: @@ -1273,10 +1289,10 @@ packages: dependency: transitive description: name: record_use - sha256: "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed" + sha256: "1cb8564af8d43b464294411db9217f5ec04891c6f22ee2c32d73ae05e88a6bd2" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "1.1.1" rfc_6901: dependency: transitive description: @@ -1329,18 +1345,18 @@ packages: dependency: transitive description: name: shared_preferences_android - sha256: "0634e64bd719f89c012f392938e173521f535d3ecaf66558fa94a056d22b5cc7" + sha256: "1e12aafe408aa50da80edfd679a2a6bf63ba7ab37c7fa98286da459a757b3399" url: "https://pub.dev" source: hosted - version: "2.4.27" + version: "2.4.28" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f" + sha256: "2ec3934efa51e46117f23031cc141b8fc878e8525b94ec1ea4f7f586cf1b47ea" url: "https://pub.dev" source: hosted - version: "2.5.6" + version: "2.5.7" shared_preferences_linux: dependency: transitive description: @@ -1478,10 +1494,10 @@ packages: dependency: transitive description: name: sqlite3_connection_pool - sha256: "8f2df36dc9f0f51ec04506b90848769b5a4538a9f937472147a274910a92e7ee" + sha256: dd1ec28bbe3b10401c34ee9482d808dd68c95a47c73d36ee908bce2168cf2eac url: "https://pub.dev" source: hosted - version: "0.2.9" + version: "0.2.10" sqlite3_flutter_libs: dependency: transitive description: @@ -1502,10 +1518,10 @@ packages: dependency: transitive description: name: sqlite_async - sha256: "83aff15d2bb3b296d35e15419a85c3207df3baca62b64b778958a59eb291502d" + sha256: "40c7d6f660322e4a2b4367ff75b9d5111389441aaa87e44f417420b56e0b0c97" url: "https://pub.dev" source: hosted - version: "0.14.4" + version: "0.14.5" sqlparser: dependency: transitive description: @@ -1518,10 +1534,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" state_notifier: dependency: "direct main" description: @@ -1542,10 +1558,10 @@ packages: dependency: "direct main" description: name: stream_transform - sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 + sha256: a00e5f18bffc764f923e7dec1038527f7fe7a1791361a7117f0358193f13d53a url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -1582,26 +1598,26 @@ packages: dependency: transitive description: name: test - sha256: "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20" + sha256: ca578dc12bb8b2f40b67b7d3bd2fac4f31c01a6ff7130a14e2597b919934507f url: "https://pub.dev" source: hosted - version: "1.31.0" + version: "1.31.1" test_api: dependency: transitive description: name: test_api - sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e" + sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11" url: "https://pub.dev" source: hosted - version: "0.7.11" + version: "0.7.12" test_core: dependency: transitive description: name: test_core - sha256: "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34" + sha256: d2e98ec12998368dc59ddd47ab709f2cd55acd6b66dc7db764455a44082f4bc5 url: "https://pub.dev" source: hosted - version: "0.6.17" + version: "0.6.18" timezone: dependency: "direct main" description: @@ -1638,34 +1654,34 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: b413d49b73867ac08dd2f9890efd3cc11f2a0e577618d50843440a1fb3776c32 + sha256: "611e87fb320b70d1dd721dc46af89c98aceccea9b31fde49e084591414e0c610" url: "https://pub.dev" source: hosted - version: "6.3.32" + version: "6.3.33" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0" + sha256: "8faa1aab294f1ab4040b43660c887b0418d5fa4f0cffef76a484e6aa1092eb4a" url: "https://pub.dev" source: hosted - version: "6.4.1" + version: "6.4.2" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a + sha256: "10f86fef4c2c43563fa6c211ff9cf757adf4d3ab762c56bd430664a947d70cd0" url: "https://pub.dev" source: hosted - version: "3.2.2" + version: "3.2.3" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18" + sha256: "5e835a3b869c2d70325349c81c5a45c28e20791265b67b2669da6b08c5cd5201" url: "https://pub.dev" source: hosted - version: "3.2.5" + version: "3.2.6" url_launcher_platform_interface: dependency: "direct dev" description: @@ -1686,10 +1702,10 @@ packages: dependency: transitive description: name: url_launcher_windows - sha256: "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f" + sha256: "6c5ad3f22cd4c38e089b81963b3cd7bb83b111b2df5dce008bb066162f42e429" url: "https://pub.dev" source: hosted - version: "3.1.5" + version: "3.1.6" uuid: dependency: transitive description: @@ -1726,10 +1742,10 @@ packages: dependency: transitive description: name: vector_math - sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b + sha256: f36f9f3be64c6198714492bb455c11056e33e2f85d9a0b676a48301e44fdcf47 url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.4.2" version: dependency: "direct main" description: @@ -1758,18 +1774,18 @@ packages: dependency: transitive description: name: video_player_android - sha256: e229676f8fade3e0124482495aaa2b548872cc4018b6268adfca4868be16aa74 + sha256: "39cf6b79ead3e5b339a8a27651359bde5ed47f753b4c3d0c0942db033591f5ba" url: "https://pub.dev" source: hosted - version: "2.12.0" + version: "2.12.1" video_player_avfoundation: dependency: transitive description: name: video_player_avfoundation - sha256: c238f5f0a26845cd0bcc2956049b63065a4d3c40ddfc22c3414cd170bef7fff9 + sha256: "436fd029bd1c1e303b2d95ebd76948893f3c28dab286e7235ba9dd7b22533bf0" url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.11.1" video_player_platform_interface: dependency: transitive description: @@ -1878,10 +1894,10 @@ packages: dependency: transitive description: name: yaml - sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce + sha256: f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "3.1.4" sdks: dart: ">=3.12.0 <4.0.0" flutter: ">=3.44.0" diff --git a/pubspec.yaml b/pubspec.yaml index 24addb0be..723ecbfbb 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -84,7 +84,8 @@ dependencies: powersync: ^2.3.3 flutter_timezone: ^5.1.0 timezone: ^0.11.1 - + material_ui: ^1.1.0 + dependency_overrides: # health -> device_info_plus ^12.1.0 pins win32 5.x, which conflicts with # package_info_plus 10.2.0 (win32 ^6). device_info_plus 13.x is a pure win32 diff --git a/test/core/app_settings_notifier_test.dart b/test/core/app_settings_notifier_test.dart index 51447844b..15f70405a 100644 --- a/test/core/app_settings_notifier_test.dart +++ b/test/core/app_settings_notifier_test.dart @@ -18,7 +18,7 @@ import 'dart:convert'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:logging/logging.dart'; diff --git a/test/core/colors_test.dart b/test/core/colors_test.dart index 9fa861dc2..ce339632d 100644 --- a/test/core/colors_test.dart +++ b/test/core/colors_test.dart @@ -17,7 +17,7 @@ */ import 'package:flex_color_scheme/flex_color_scheme.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/colors.dart'; import 'package:wger/theme/theme.dart'; diff --git a/test/core/error_dialogs_test.dart b/test/core/error_dialogs_test.dart index f1a9fff49..317a3303c 100644 --- a/test/core/error_dialogs_test.dart +++ b/test/core/error_dialogs_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/error_dialogs.dart'; diff --git a/test/core/errors_test.dart b/test/core/errors_test.dart index 185927f82..420f7260a 100644 --- a/test/core/errors_test.dart +++ b/test/core/errors_test.dart @@ -20,7 +20,7 @@ import 'dart:async'; import 'dart:io'; import 'package:flutter/foundation.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:logging/logging.dart'; diff --git a/test/core/form_validators_test.dart b/test/core/form_validators_test.dart index 1cc29489e..6de754bf9 100644 --- a/test/core/form_validators_test.dart +++ b/test/core/form_validators_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:intl/intl.dart'; import 'package:wger/core/form_validators.dart'; diff --git a/test/core/formatting_test.dart b/test/core/formatting_test.dart index bbbc72ed6..047fad999 100644 --- a/test/core/formatting_test.dart +++ b/test/core/formatting_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/formatting/formatting.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/test/core/json_test.dart b/test/core/json_test.dart index df5a13d66..20a665d15 100644 --- a/test/core/json_test.dart +++ b/test/core/json_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/json.dart'; diff --git a/test/core/locale_test.dart b/test/core/locale_test.dart index 547789a5d..e5f1a61aa 100644 --- a/test/core/locale_test.dart +++ b/test/core/locale_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/locale.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/test/core/recovery_screens_test.dart b/test/core/recovery_screens_test.dart index 462960d56..f0d61a235 100644 --- a/test/core/recovery_screens_test.dart +++ b/test/core/recovery_screens_test.dart @@ -19,7 +19,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; diff --git a/test/core/widgets/app_bar_test.dart b/test/core/widgets/app_bar_test.dart index 40ac92405..a0660a7f2 100644 --- a/test/core/widgets/app_bar_test.dart +++ b/test/core/widgets/app_bar_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/network/base_provider.dart'; diff --git a/test/core/widgets/dashboard/calendar_test.dart b/test/core/widgets/dashboard/calendar_test.dart index 602182e75..988b7d168 100644 --- a/test/core/widgets/dashboard/calendar_test.dart +++ b/test/core/widgets/dashboard/calendar_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:timezone/data/latest_all.dart' as tzdata; diff --git a/test/core/widgets/dashboard/widgets/dashboard_trophies_widget_test.dart b/test/core/widgets/dashboard/widgets/dashboard_trophies_widget_test.dart index b526ad863..5512516a8 100644 --- a/test/core/widgets/dashboard/widgets/dashboard_trophies_widget_test.dart +++ b/test/core/widgets/dashboard/widgets/dashboard_trophies_widget_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/misc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/core/widgets/dashboard/widgets/routines_test.dart b/test/core/widgets/dashboard/widgets/routines_test.dart index f1e84e138..354cc0b32 100644 --- a/test/core/widgets/dashboard/widgets/routines_test.dart +++ b/test/core/widgets/dashboard/widgets/routines_test.dart @@ -18,7 +18,7 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/misc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/core/widgets/dashboard/widgets/weight_test.dart b/test/core/widgets/dashboard/widgets/weight_test.dart index 8410e3e7f..433b76bb1 100644 --- a/test/core/widgets/dashboard/widgets/weight_test.dart +++ b/test/core/widgets/dashboard/widgets/weight_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/widgets/dashboard/widgets/nothing_found.dart'; diff --git a/test/core/widgets/datetime_input_test.dart b/test/core/widgets/datetime_input_test.dart index 4c779e8c9..e1a1adcbf 100644 --- a/test/core/widgets/datetime_input_test.dart +++ b/test/core/widgets/datetime_input_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/widgets/datetime_input.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/test/core/widgets/decimal_input_test.dart b/test/core/widgets/decimal_input_test.dart index 1a8ee2149..8fb333db8 100644 --- a/test/core/widgets/decimal_input_test.dart +++ b/test/core/widgets/decimal_input_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/widgets/decimal_input.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/test/core/widgets/error_test.dart b/test/core/widgets/error_test.dart index b063cd258..79dadeb71 100644 --- a/test/core/widgets/error_test.dart +++ b/test/core/widgets/error_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' show Response; import 'package:wger/core/exceptions/http_exception.dart'; diff --git a/test/core/widgets/form_submit_button_test.dart b/test/core/widgets/form_submit_button_test.dart index 2c4cb700c..469edd529 100644 --- a/test/core/widgets/form_submit_button_test.dart +++ b/test/core/widgets/form_submit_button_test.dart @@ -18,7 +18,7 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/error_dialogs.dart'; import 'package:wger/core/exceptions/http_exception.dart'; diff --git a/test/core/widgets/log_overview_test.dart b/test/core/widgets/log_overview_test.dart index b432011c1..d39eddd99 100644 --- a/test/core/widgets/log_overview_test.dart +++ b/test/core/widgets/log_overview_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -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:logging/logging.dart'; diff --git a/test/core/widgets/object_gone_redirect_test.dart b/test/core/widgets/object_gone_redirect_test.dart index 3861df2ca..63b71b400 100644 --- a/test/core/widgets/object_gone_redirect_test.dart +++ b/test/core/widgets/object_gone_redirect_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/widgets/object_gone_redirect.dart'; diff --git a/test/core/widgets/svg_icon_test.dart b/test/core/widgets/svg_icon_test.dart index 145abdc5b..bb05a4f92 100644 --- a/test/core/widgets/svg_icon_test.dart +++ b/test/core/widgets/svg_icon_test.dart @@ -18,7 +18,7 @@ import 'dart:ui' as ui; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/widgets/svg_icon.dart'; diff --git a/test/core/widgets/sync_status_dialog_test.dart b/test/core/widgets/sync_status_dialog_test.dart index db8c83510..0d250d267 100644 --- a/test/core/widgets/sync_status_dialog_test.dart +++ b/test/core/widgets/sync_status_dialog_test.dart @@ -19,7 +19,7 @@ import 'dart:async'; import 'dart:io' show SocketException; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:powersync/powersync.dart' diff --git a/test/database/converters/time_of_day_converter_test.dart b/test/database/converters/time_of_day_converter_test.dart index 635733eed..64ef0456d 100644 --- a/test/database/converters/time_of_day_converter_test.dart +++ b/test/database/converters/time_of_day_converter_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/database/converters/time_of_day_converter.dart'; diff --git a/test/features/account/widgets/forms_test.dart b/test/features/account/widgets/forms_test.dart index f3ba69a1a..861c08c5c 100644 --- a/test/features/account/widgets/forms_test.dart +++ b/test/features/account/widgets/forms_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/account/widgets/settings/certs_not_verified_test.dart b/test/features/account/widgets/settings/certs_not_verified_test.dart index 578094fa5..d3736a197 100644 --- a/test/features/account/widgets/settings/certs_not_verified_test.dart +++ b/test/features/account/widgets/settings/certs_not_verified_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/test/features/account/widgets/settings/dashboard_visibility_test.dart b/test/features/account/widgets/settings/dashboard_visibility_test.dart index b11ab8857..3bb9b1437 100644 --- a/test/features/account/widgets/settings/dashboard_visibility_test.dart +++ b/test/features/account/widgets/settings/dashboard_visibility_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/test/features/account/widgets/settings/health_sync_test.dart b/test/features/account/widgets/settings/health_sync_test.dart index 15453a7cb..e6a432554 100644 --- a/test/features/account/widgets/settings/health_sync_test.dart +++ b/test/features/account/widgets/settings/health_sync_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/account/widgets/settings/health_sync.dart'; diff --git a/test/features/account/widgets/settings_test.dart b/test/features/account/widgets/settings_test.dart index a860f37c0..037d006e0 100644 --- a/test/features/account/widgets/settings_test.dart +++ b/test/features/account/widgets/settings_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/auth/screens/auth_screen_test.dart b/test/features/auth/screens/auth_screen_test.dart index ec40ec784..8aae5d2f4 100644 --- a/test/features/auth/screens/auth_screen_test.dart +++ b/test/features/auth/screens/auth_screen_test.dart @@ -18,7 +18,7 @@ import 'dart:convert'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/misc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/auth/screens/mfa_challenge_screen_test.dart b/test/features/auth/screens/mfa_challenge_screen_test.dart index 7c830bd3c..fbdba7001 100644 --- a/test/features/auth/screens/mfa_challenge_screen_test.dart +++ b/test/features/auth/screens/mfa_challenge_screen_test.dart @@ -18,7 +18,7 @@ import 'dart:convert'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; diff --git a/test/features/exercises/screens/add_exercise_screen_test.dart b/test/features/exercises/screens/add_exercise_screen_test.dart index bc63d84e8..4a172ff8b 100644 --- a/test/features/exercises/screens/add_exercise_screen_test.dart +++ b/test/features/exercises/screens/add_exercise_screen_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/exercises/widgets/add_exercise/add_exercise_text_area_test.dart b/test/features/exercises/widgets/add_exercise/add_exercise_text_area_test.dart index b7108d111..9b698edae 100644 --- a/test/features/exercises/widgets/add_exercise/add_exercise_text_area_test.dart +++ b/test/features/exercises/widgets/add_exercise/add_exercise_text_area_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/exercises/widgets/add_exercise/add_exercise_text_area.dart'; diff --git a/test/features/exercises/widgets/exercises_detail_widget_test.dart b/test/features/exercises/widgets/exercises_detail_widget_test.dart index 875cdb468..981df7486 100644 --- a/test/features/exercises/widgets/exercises_detail_widget_test.dart +++ b/test/features/exercises/widgets/exercises_detail_widget_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/exercises/widgets/muscle_widget_test.dart b/test/features/exercises/widgets/muscle_widget_test.dart index 4dc5b17f4..05ad8d9a5 100644 --- a/test/features/exercises/widgets/muscle_widget_test.dart +++ b/test/features/exercises/widgets/muscle_widget_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_svg/svg.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/exercises/models/muscle.dart'; diff --git a/test/features/gallery/screens/gallery_screen_test.dart b/test/features/gallery/screens/gallery_screen_test.dart index 1b34ee77f..ac3fb4206 100644 --- a/test/features/gallery/screens/gallery_screen_test.dart +++ b/test/features/gallery/screens/gallery_screen_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/gallery/widgets/forms_test.dart b/test/features/gallery/widgets/forms_test.dart index ed3cc9488..8ac52d740 100644 --- a/test/features/gallery/widgets/forms_test.dart +++ b/test/features/gallery/widgets/forms_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/gallery/widgets/overview_test.dart b/test/features/gallery/widgets/overview_test.dart index 42e997aa4..b1079d1a3 100644 --- a/test/features/gallery/widgets/overview_test.dart +++ b/test/features/gallery/widgets/overview_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/measurements/charts/data_test.dart b/test/features/measurements/charts/data_test.dart index eeb164f05..afad9e761 100644 --- a/test/features/measurements/charts/data_test.dart +++ b/test/features/measurements/charts/data_test.dart @@ -17,7 +17,7 @@ */ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/measurements/charts/data.dart'; import 'package:wger/features/measurements/charts/range.dart'; diff --git a/test/features/measurements/models/measurement_calculation_test.dart b/test/features/measurements/models/measurement_calculation_test.dart index 3968ef0c8..9f2bf786f 100644 --- a/test/features/measurements/models/measurement_calculation_test.dart +++ b/test/features/measurements/models/measurement_calculation_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/measurements/models/measurement_calculation.dart'; import 'package:wger/features/measurements/models/measurement_category.dart'; diff --git a/test/features/measurements/screens/measurement_categories_screen_test.dart b/test/features/measurements/screens/measurement_categories_screen_test.dart index b213f6b20..27d5ae7bb 100644 --- a/test/features/measurements/screens/measurement_categories_screen_test.dart +++ b/test/features/measurements/screens/measurement_categories_screen_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/measurements/screens/measurement_category_sort_screen_test.dart b/test/features/measurements/screens/measurement_category_sort_screen_test.dart index b94309b02..0106384b1 100644 --- a/test/features/measurements/screens/measurement_category_sort_screen_test.dart +++ b/test/features/measurements/screens/measurement_category_sort_screen_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/measurements/screens/measurement_entries_screen_test.dart b/test/features/measurements/screens/measurement_entries_screen_test.dart index 3dada0959..3b0de879c 100644 --- a/test/features/measurements/screens/measurement_entries_screen_test.dart +++ b/test/features/measurements/screens/measurement_entries_screen_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/measurements/screens/weight_screen_test.dart b/test/features/measurements/screens/weight_screen_test.dart index 5cf916203..68e4fd087 100644 --- a/test/features/measurements/screens/weight_screen_test.dart +++ b/test/features/measurements/screens/weight_screen_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/measurements/widgets/calculation_mark_test.dart b/test/features/measurements/widgets/calculation_mark_test.dart index df960662a..87afad331 100644 --- a/test/features/measurements/widgets/calculation_mark_test.dart +++ b/test/features/measurements/widgets/calculation_mark_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/measurements/widgets/calculation_params_test.dart b/test/features/measurements/widgets/calculation_params_test.dart index 74ec5c615..2837203e0 100644 --- a/test/features/measurements/widgets/calculation_params_test.dart +++ b/test/features/measurements/widgets/calculation_params_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/measurements/widgets/categories_card_test.dart b/test/features/measurements/widgets/categories_card_test.dart index 742c46e36..51b5734d6 100644 --- a/test/features/measurements/widgets/categories_card_test.dart +++ b/test/features/measurements/widgets/categories_card_test.dart @@ -17,7 +17,7 @@ */ import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/measurements/charts/range.dart'; diff --git a/test/features/measurements/widgets/categories_test.dart b/test/features/measurements/widgets/categories_test.dart index 5c7e1ab86..1cc719aa8 100644 --- a/test/features/measurements/widgets/categories_test.dart +++ b/test/features/measurements/widgets/categories_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/measurements/widgets/chart_range_selector_test.dart b/test/features/measurements/widgets/chart_range_selector_test.dart index d50775827..fad2a4c5f 100644 --- a/test/features/measurements/widgets/chart_range_selector_test.dart +++ b/test/features/measurements/widgets/chart_range_selector_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/measurements/charts/range.dart'; import 'package:wger/features/measurements/widgets/chart_range_selector.dart'; diff --git a/test/features/measurements/widgets/charts/chart_widgets_test.dart b/test/features/measurements/widgets/charts/chart_widgets_test.dart index 51c3c69a7..38d7f0c04 100644 --- a/test/features/measurements/widgets/charts/chart_widgets_test.dart +++ b/test/features/measurements/widgets/charts/chart_widgets_test.dart @@ -17,7 +17,7 @@ */ 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 'package:wger/features/measurements/charts/series.dart'; import 'package:wger/features/measurements/widgets/charts/bar_chart.dart'; diff --git a/test/features/measurements/widgets/charts/distribution_chart_test.dart b/test/features/measurements/widgets/charts/distribution_chart_test.dart index 3045c43cb..a1ee4f2b4 100644 --- a/test/features/measurements/widgets/charts/distribution_chart_test.dart +++ b/test/features/measurements/widgets/charts/distribution_chart_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/measurements/charts/data.dart'; import 'package:wger/features/measurements/widgets/charts/distribution_chart.dart'; diff --git a/test/features/measurements/widgets/charts/heatmap_chart_test.dart b/test/features/measurements/widgets/charts/heatmap_chart_test.dart index 4893051c6..c112e1a2c 100644 --- a/test/features/measurements/widgets/charts/heatmap_chart_test.dart +++ b/test/features/measurements/widgets/charts/heatmap_chart_test.dart @@ -18,7 +18,7 @@ import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/measurements/charts/data.dart'; import 'package:wger/features/measurements/charts/series.dart'; diff --git a/test/features/measurements/widgets/charts/spark_charts_test.dart b/test/features/measurements/widgets/charts/spark_charts_test.dart index 23fdb7517..593d0dd1a 100644 --- a/test/features/measurements/widgets/charts/spark_charts_test.dart +++ b/test/features/measurements/widgets/charts/spark_charts_test.dart @@ -17,7 +17,7 @@ */ import 'dart:ui'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/measurements/charts/series.dart'; import 'package:wger/features/measurements/charts/spark.dart'; diff --git a/test/features/measurements/widgets/entries_test.dart b/test/features/measurements/widgets/entries_test.dart index efff1194d..3f1e4d540 100644 --- a/test/features/measurements/widgets/entries_test.dart +++ b/test/features/measurements/widgets/entries_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/measurements/widgets/forms/category_test.dart b/test/features/measurements/widgets/forms/category_test.dart index fc5fa2274..f6db8c35c 100644 --- a/test/features/measurements/widgets/forms/category_test.dart +++ b/test/features/measurements/widgets/forms/category_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/measurements/widgets/forms/entry_test.dart b/test/features/measurements/widgets/forms/entry_test.dart index 644964ce0..dffae05a0 100644 --- a/test/features/measurements/widgets/forms/entry_test.dart +++ b/test/features/measurements/widgets/forms/entry_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/measurements/widgets/forms/group_entry_test.dart b/test/features/measurements/widgets/forms/group_entry_test.dart index 6267b2a0c..4f95ee82e 100644 --- a/test/features/measurements/widgets/forms/group_entry_test.dart +++ b/test/features/measurements/widgets/forms/group_entry_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/measurements/widgets/helpers_test.dart b/test/features/measurements/widgets/helpers_test.dart index 9f14d4801..a6395c492 100644 --- a/test/features/measurements/widgets/helpers_test.dart +++ b/test/features/measurements/widgets/helpers_test.dart @@ -17,7 +17,7 @@ */ 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 'package:wger/core/widgets/legend.dart'; import 'package:wger/features/measurements/charts/data.dart'; diff --git a/test/features/measurements/widgets/measurement_fab_test.dart b/test/features/measurements/widgets/measurement_fab_test.dart index 130cf4fbe..d49414527 100644 --- a/test/features/measurements/widgets/measurement_fab_test.dart +++ b/test/features/measurements/widgets/measurement_fab_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/measurements/widgets/measurement_tile_test.dart b/test/features/measurements/widgets/measurement_tile_test.dart index 8f51b5931..efdad3205 100644 --- a/test/features/measurements/widgets/measurement_tile_test.dart +++ b/test/features/measurements/widgets/measurement_tile_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/measurements/widgets/metric_picker_test.dart b/test/features/measurements/widgets/metric_picker_test.dart index c2822fd5b..5be9f09f8 100644 --- a/test/features/measurements/widgets/metric_picker_test.dart +++ b/test/features/measurements/widgets/metric_picker_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/measurements/widgets/weight_form_test.dart b/test/features/measurements/widgets/weight_form_test.dart index 552daaa21..4f2bae734 100644 --- a/test/features/measurements/widgets/weight_form_test.dart +++ b/test/features/measurements/widgets/weight_form_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/misc.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/nutrition/screens/nutritional_plan_screen_test.dart b/test/features/nutrition/screens/nutritional_plan_screen_test.dart index 1f79192a7..15c8bd94a 100644 --- a/test/features/nutrition/screens/nutritional_plan_screen_test.dart +++ b/test/features/nutrition/screens/nutritional_plan_screen_test.dart @@ -20,7 +20,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; diff --git a/test/features/nutrition/screens/nutritional_plans_screen_test.dart b/test/features/nutrition/screens/nutritional_plans_screen_test.dart index 29ad21727..726e1a21e 100644 --- a/test/features/nutrition/screens/nutritional_plans_screen_test.dart +++ b/test/features/nutrition/screens/nutritional_plans_screen_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; diff --git a/test/features/nutrition/widgets/charts_test.dart b/test/features/nutrition/widgets/charts_test.dart index 995616d9b..42e23827f 100644 --- a/test/features/nutrition/widgets/charts_test.dart +++ b/test/features/nutrition/widgets/charts_test.dart @@ -17,7 +17,7 @@ */ 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 'package:wger/features/nutrition/models/nutritional_values.dart'; import 'package:wger/features/nutrition/widgets/charts.dart'; diff --git a/test/features/nutrition/widgets/ingredient_dialogs_test.dart b/test/features/nutrition/widgets/ingredient_dialogs_test.dart index cd83b6f1f..37d176d35 100644 --- a/test/features/nutrition/widgets/ingredient_dialogs_test.dart +++ b/test/features/nutrition/widgets/ingredient_dialogs_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/nutrition/models/ingredient.dart'; import 'package:wger/features/nutrition/models/ingredient_image.dart'; diff --git a/test/features/nutrition/widgets/ingredient_typeahead_test.dart b/test/features/nutrition/widgets/ingredient_typeahead_test.dart index 901eb93e1..ef452703e 100644 --- a/test/features/nutrition/widgets/ingredient_typeahead_test.dart +++ b/test/features/nutrition/widgets/ingredient_typeahead_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_typeahead/flutter_typeahead.dart'; diff --git a/test/features/nutrition/widgets/meal_widget_test.dart b/test/features/nutrition/widgets/meal_widget_test.dart index eb6559015..778c82952 100644 --- a/test/features/nutrition/widgets/meal_widget_test.dart +++ b/test/features/nutrition/widgets/meal_widget_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/network/network_provider.dart'; diff --git a/test/features/nutrition/widgets/nutritional_diary_detail_test.dart b/test/features/nutrition/widgets/nutritional_diary_detail_test.dart index c1f9a8b6b..bac5815e3 100644 --- a/test/features/nutrition/widgets/nutritional_diary_detail_test.dart +++ b/test/features/nutrition/widgets/nutritional_diary_detail_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/nutrition/widgets/charts.dart'; import 'package:wger/features/nutrition/widgets/nutritional_diary_detail.dart'; diff --git a/test/features/nutrition/widgets/nutritional_meal_form_test.dart b/test/features/nutrition/widgets/nutritional_meal_form_test.dart index 712b3df0d..2b4bce38d 100644 --- a/test/features/nutrition/widgets/nutritional_meal_form_test.dart +++ b/test/features/nutrition/widgets/nutritional_meal_form_test.dart @@ -17,7 +17,7 @@ */ import 'package:clock/clock.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/nutrition/widgets/nutritional_meal_item_form_test.dart b/test/features/nutrition/widgets/nutritional_meal_item_form_test.dart index 8b7224b32..70f35f832 100644 --- a/test/features/nutrition/widgets/nutritional_meal_item_form_test.dart +++ b/test/features/nutrition/widgets/nutritional_meal_item_form_test.dart @@ -18,7 +18,7 @@ import 'dart:convert'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/nutrition/widgets/nutritional_plan_form_test.dart b/test/features/nutrition/widgets/nutritional_plan_form_test.dart index 1bd2b7afb..e36cb6ddb 100644 --- a/test/features/nutrition/widgets/nutritional_plan_form_test.dart +++ b/test/features/nutrition/widgets/nutritional_plan_form_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/nutrition/widgets/plan_weight_chart_test.dart b/test/features/nutrition/widgets/plan_weight_chart_test.dart index 6d165afac..c01c6103d 100644 --- a/test/features/nutrition/widgets/plan_weight_chart_test.dart +++ b/test/features/nutrition/widgets/plan_weight_chart_test.dart @@ -17,7 +17,7 @@ */ import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/routines/models/session_test.dart b/test/features/routines/models/session_test.dart index 5ede05c9c..ead0a9590 100644 --- a/test/features/routines/models/session_test.dart +++ b/test/features/routines/models/session_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:timezone/data/latest.dart' as tzdata; import 'package:wger/core/consts.dart'; diff --git a/test/features/routines/providers/gym_state_test.dart b/test/features/routines/providers/gym_state_test.dart index cb7894b3f..8aa36cfac 100644 --- a/test/features/routines/providers/gym_state_test.dart +++ b/test/features/routines/providers/gym_state_test.dart @@ -17,7 +17,7 @@ */ import 'package:clock/clock.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; diff --git a/test/features/routines/providers/plate_weights_test.dart b/test/features/routines/providers/plate_weights_test.dart index b24851bbd..6d1bc1b6c 100644 --- a/test/features/routines/providers/plate_weights_test.dart +++ b/test/features/routines/providers/plate_weights_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; // Added for annotations diff --git a/test/features/routines/screens/gym_mode_test.dart b/test/features/routines/screens/gym_mode_test.dart index a7a99d539..1734de71c 100644 --- a/test/features/routines/screens/gym_mode_test.dart +++ b/test/features/routines/screens/gym_mode_test.dart @@ -19,7 +19,7 @@ import 'dart:io'; import 'package:clock/clock.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod; import 'package:flutter_riverpod/misc.dart' as riverpod; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/routines/screens/routine_edit_screen_test.dart b/test/features/routines/screens/routine_edit_screen_test.dart index 5de990988..567e00856 100644 --- a/test/features/routines/screens/routine_edit_screen_test.dart +++ b/test/features/routines/screens/routine_edit_screen_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/routines/models/routine.dart'; diff --git a/test/features/routines/screens/routine_list_screen_test.dart b/test/features/routines/screens/routine_list_screen_test.dart index 22a080e95..7b27351ec 100644 --- a/test/features/routines/screens/routine_list_screen_test.dart +++ b/test/features/routines/screens/routine_list_screen_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/routines/screens/routine_logs_screen_test.dart b/test/features/routines/screens/routine_logs_screen_test.dart index c425326d6..2ff87fb49 100644 --- a/test/features/routines/screens/routine_logs_screen_test.dart +++ b/test/features/routines/screens/routine_logs_screen_test.dart @@ -19,7 +19,7 @@ import 'dart:io'; import 'package:clock/clock.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/routines/screens/routine_screen_test.dart b/test/features/routines/screens/routine_screen_test.dart index 3a50efae1..8e7ae4f94 100644 --- a/test/features/routines/screens/routine_screen_test.dart +++ b/test/features/routines/screens/routine_screen_test.dart @@ -19,7 +19,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/network/network_provider.dart'; diff --git a/test/features/routines/widgets/charts_test.dart b/test/features/routines/widgets/charts_test.dart index 9f392e2b0..837e0d495 100644 --- a/test/features/routines/widgets/charts_test.dart +++ b/test/features/routines/widgets/charts_test.dart @@ -17,7 +17,7 @@ */ 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 'package:wger/features/routines/models/log.dart'; import 'package:wger/features/routines/widgets/charts.dart'; diff --git a/test/features/routines/widgets/forms/day_form_test.dart b/test/features/routines/widgets/forms/day_form_test.dart index 6a9e0afeb..7cc2811db 100644 --- a/test/features/routines/widgets/forms/day_form_test.dart +++ b/test/features/routines/widgets/forms/day_form_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/routines/widgets/forms/repetition_unit_form_widget_test.dart b/test/features/routines/widgets/forms/repetition_unit_form_widget_test.dart index ef8eb58b0..1f9bf349b 100644 --- a/test/features/routines/widgets/forms/repetition_unit_form_widget_test.dart +++ b/test/features/routines/widgets/forms/repetition_unit_form_widget_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/routines/models/repetition_unit.dart'; diff --git a/test/features/routines/widgets/forms/routine_form_test.dart b/test/features/routines/widgets/forms/routine_form_test.dart index a98f038d3..af1869d1b 100644 --- a/test/features/routines/widgets/forms/routine_form_test.dart +++ b/test/features/routines/widgets/forms/routine_form_test.dart @@ -18,7 +18,7 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/routines/widgets/forms/session_form_test.dart b/test/features/routines/widgets/forms/session_form_test.dart index a681e10bd..ff45164f5 100644 --- a/test/features/routines/widgets/forms/session_form_test.dart +++ b/test/features/routines/widgets/forms/session_form_test.dart @@ -1,5 +1,5 @@ // test/widgets/routines/forms/session_form_test.dart -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/routines/widgets/forms/slot_entry_form_test.dart b/test/features/routines/widgets/forms/slot_entry_form_test.dart index 6652ee5c6..f740c07d0 100644 --- a/test/features/routines/widgets/forms/slot_entry_form_test.dart +++ b/test/features/routines/widgets/forms/slot_entry_form_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/routines/widgets/forms/slot_test.dart b/test/features/routines/widgets/forms/slot_test.dart index 6b496b20f..129b3ebf1 100644 --- a/test/features/routines/widgets/forms/slot_test.dart +++ b/test/features/routines/widgets/forms/slot_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/routines/widgets/forms/weight_unit_form_widget_test.dart b/test/features/routines/widgets/forms/weight_unit_form_widget_test.dart index ef327d535..873ff8962 100644 --- a/test/features/routines/widgets/forms/weight_unit_form_widget_test.dart +++ b/test/features/routines/widgets/forms/weight_unit_form_widget_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/routines/models/slot_entry.dart'; diff --git a/test/features/routines/widgets/gym_mode/elapsed_time_test.dart b/test/features/routines/widgets/gym_mode/elapsed_time_test.dart index 439c52554..1036c7449 100644 --- a/test/features/routines/widgets/gym_mode/elapsed_time_test.dart +++ b/test/features/routines/widgets/gym_mode/elapsed_time_test.dart @@ -17,7 +17,7 @@ */ import 'package:clock/clock.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/routines/providers/gym_state.dart'; diff --git a/test/features/routines/widgets/gym_mode/log_page_test.dart b/test/features/routines/widgets/gym_mode/log_page_test.dart index 3cf87b695..35fe0a28d 100644 --- a/test/features/routines/widgets/gym_mode/log_page_test.dart +++ b/test/features/routines/widgets/gym_mode/log_page_test.dart @@ -18,7 +18,7 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/routines/widgets/gym_mode/navigation_test.dart b/test/features/routines/widgets/gym_mode/navigation_test.dart index 037216791..ce0dbae31 100644 --- a/test/features/routines/widgets/gym_mode/navigation_test.dart +++ b/test/features/routines/widgets/gym_mode/navigation_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/routines/providers/gym_state.dart'; diff --git a/test/features/routines/widgets/gym_mode/session_page_test.dart b/test/features/routines/widgets/gym_mode/session_page_test.dart index 0076162d5..c97c189ef 100644 --- a/test/features/routines/widgets/gym_mode/session_page_test.dart +++ b/test/features/routines/widgets/gym_mode/session_page_test.dart @@ -17,7 +17,7 @@ */ import 'package:clock/clock.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/routines/widgets/gym_mode/start_page_test.dart b/test/features/routines/widgets/gym_mode/start_page_test.dart index dcc9105fe..069914d83 100644 --- a/test/features/routines/widgets/gym_mode/start_page_test.dart +++ b/test/features/routines/widgets/gym_mode/start_page_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart'; diff --git a/test/features/routines/widgets/gym_mode/workout_menu_test.dart b/test/features/routines/widgets/gym_mode/workout_menu_test.dart index 7e439cdc3..4a58f6585 100644 --- a/test/features/routines/widgets/gym_mode/workout_menu_test.dart +++ b/test/features/routines/widgets/gym_mode/workout_menu_test.dart @@ -18,7 +18,7 @@ import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart'; diff --git a/test/features/routines/widgets/plate_calculator_test.dart b/test/features/routines/widgets/plate_calculator_test.dart index f1ff0ec4f..55d57aa8e 100644 --- a/test/features/routines/widgets/plate_calculator_test.dart +++ b/test/features/routines/widgets/plate_calculator_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart'; diff --git a/test/features/routines/widgets/routine_edit_test.dart b/test/features/routines/widgets/routine_edit_test.dart index 90074cd6e..a396e0c05 100644 --- a/test/features/routines/widgets/routine_edit_test.dart +++ b/test/features/routines/widgets/routine_edit_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/trophies/widgets/trophies_overview_test.dart b/test/features/trophies/widgets/trophies_overview_test.dart index 4d9b9c8a5..39dc9b099 100644 --- a/test/features/trophies/widgets/trophies_overview_test.dart +++ b/test/features/trophies/widgets/trophies_overview_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:network_image_mock/network_image_mock.dart'; diff --git a/test/screenshots/screenshots_01_dashboard.dart b/test/screenshots/screenshots_01_dashboard.dart index 84e07c9c8..7d2f9c6b3 100644 --- a/test/screenshots/screenshots_01_dashboard.dart +++ b/test/screenshots/screenshots_01_dashboard.dart @@ -17,7 +17,7 @@ */ import 'package:drift/native.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; diff --git a/test/screenshots/screenshots_01_dashboard_test.dart b/test/screenshots/screenshots_01_dashboard_test.dart index e135e979d..a8dcc7135 100644 --- a/test/screenshots/screenshots_01_dashboard_test.dart +++ b/test/screenshots/screenshots_01_dashboard_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart'; import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart'; diff --git a/test/screenshots/screenshots_02_workout.dart b/test/screenshots/screenshots_02_workout.dart index 30af3c43e..2b98aad93 100644 --- a/test/screenshots/screenshots_02_workout.dart +++ b/test/screenshots/screenshots_02_workout.dart @@ -17,7 +17,7 @@ */ import 'package:drift/native.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; diff --git a/test/screenshots/screenshots_03_gym_mode.dart b/test/screenshots/screenshots_03_gym_mode.dart index b8232b354..122bef106 100644 --- a/test/screenshots/screenshots_03_gym_mode.dart +++ b/test/screenshots/screenshots_03_gym_mode.dart @@ -17,7 +17,7 @@ */ import 'package:drift/native.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod; import 'package:wger/database/powersync/database.dart'; import 'package:wger/features/exercises/providers/exercise_filter_state.dart'; diff --git a/test/screenshots/screenshots_04_measurements.dart b/test/screenshots/screenshots_04_measurements.dart index c8534c030..c7e2a086f 100644 --- a/test/screenshots/screenshots_04_measurements.dart +++ b/test/screenshots/screenshots_04_measurements.dart @@ -17,7 +17,7 @@ */ import 'package:drift/native.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; diff --git a/test/screenshots/screenshots_04_measurements_test.dart b/test/screenshots/screenshots_04_measurements_test.dart index bf9ecf6c8..224ce8717 100644 --- a/test/screenshots/screenshots_04_measurements_test.dart +++ b/test/screenshots/screenshots_04_measurements_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart'; import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart'; diff --git a/test/screenshots/screenshots_05_nutritional_plan.dart b/test/screenshots/screenshots_05_nutritional_plan.dart index cebbf01f1..a2018771b 100644 --- a/test/screenshots/screenshots_05_nutritional_plan.dart +++ b/test/screenshots/screenshots_05_nutritional_plan.dart @@ -17,7 +17,7 @@ */ import 'package:drift/native.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; diff --git a/test/theme/dynamic_color_test.dart b/test/theme/dynamic_color_test.dart index 57976d416..a7ec649c5 100644 --- a/test/theme/dynamic_color_test.dart +++ b/test/theme/dynamic_color_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/theme/dynamic_color.dart'; diff --git a/test/theme/theme_test.dart b/test/theme/theme_test.dart index 3e1b30bf8..6d7dac7b4 100644 --- a/test/theme/theme_test.dart +++ b/test/theme/theme_test.dart @@ -17,7 +17,7 @@ */ import 'package:flex_color_scheme/flex_color_scheme.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/theme/theme.dart'; diff --git a/test_data/nutritional_plans.dart b/test_data/nutritional_plans.dart index e3ce6e17e..ec212af97 100644 --- a/test_data/nutritional_plans.dart +++ b/test_data/nutritional_plans.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/nutrition/models/ingredient.dart'; import 'package:wger/features/nutrition/models/log.dart'; import 'package:wger/features/nutrition/models/meal.dart'; diff --git a/test_data/screenshots/nutrition.dart b/test_data/screenshots/nutrition.dart index 3e741f52a..7a2de1ab7 100644 --- a/test_data/screenshots/nutrition.dart +++ b/test_data/screenshots/nutrition.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wger/features/nutrition/models/ingredient.dart'; import 'package:wger/features/nutrition/models/log.dart'; import 'package:wger/features/nutrition/models/meal.dart'; From f7930ce68b910802df91a7f04220eff6f56a0682 Mon Sep 17 00:00:00 2001 From: pankaj-basnet <165250380+pankaj-basnet@users.noreply.github.com> Date: Tue, 1 Sep 2026 16:09:32 +0545 Subject: [PATCH 2/3] fix: remove material_ui imports where not needed --- .gitignore | 3 +++ lib/core/app_settings_notifier.dart | 2 +- lib/core/app_settings_notifier.g.dart | 2 +- lib/core/colors.dart | 2 +- lib/core/error_dialogs.dart | 2 +- lib/core/json.dart | 2 +- lib/core/keys.dart | 2 +- lib/core/network/auth_notifier.g.dart | 2 +- lib/core/widgets/dashboard/calendar.dart | 2 +- lib/core/widgets/datetime_input.dart | 2 +- lib/database/converters/time_of_day_converter.dart | 2 +- lib/database/powersync/database.dart | 2 +- lib/database/powersync/powersync.g.dart | 2 +- lib/database/powersync/tables/nutrition.dart | 1 - lib/features/account/widgets/settings/theme.dart | 2 +- lib/features/measurements/charts/data.dart | 2 +- lib/features/measurements/charts/series.dart | 2 +- lib/features/measurements/widgets/charts/line_chart.dart | 2 +- lib/features/measurements/widgets/entries.dart | 2 +- lib/features/nutrition/models/meal.dart | 2 +- lib/features/nutrition/screens/log_meal_screen.dart | 2 +- lib/features/nutrition/widgets/charts.dart | 2 +- lib/features/nutrition/widgets/forms.dart | 2 +- lib/features/routines/models/session.dart | 2 +- lib/features/routines/widgets/charts.dart | 2 +- lib/features/routines/widgets/forms/session.dart | 2 +- .../routines/widgets/logs/exercise_log_chart.dart | 2 +- .../routines/widgets/logs/log_overview_routine.dart | 2 +- lib/features/routines/widgets/logs/muscle_groups.dart | 2 +- lib/main.dart | 3 +-- lib/theme/dynamic_color.dart | 2 +- lib/theme/theme.dart | 4 ++-- test/core/app_settings_notifier_test.dart | 3 ++- test/core/colors_test.dart | 8 +++++++- test/core/error_dialogs_test.dart | 9 ++++++++- .../add_exercise/add_exercise_text_area_test.dart | 4 ++-- test/screenshots/screenshots_01_dashboard.dart | 3 ++- test/screenshots/screenshots_02_workout.dart | 3 ++- test/screenshots/screenshots_03_gym_mode.dart | 3 ++- test/screenshots/screenshots_04_measurements.dart | 3 ++- test/screenshots/screenshots_05_nutritional_plan.dart | 3 ++- test/theme/dynamic_color_test.dart | 3 ++- 42 files changed, 65 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index 41a777d31..78d315c64 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,6 @@ ios/Runner.app.dSYM.zip #Flutter Version Management .fvm/ + +# personal +z-notes \ No newline at end of file diff --git a/lib/core/app_settings_notifier.dart b/lib/core/app_settings_notifier.dart index e4085a9b1..dec389eda 100644 --- a/lib/core/app_settings_notifier.dart +++ b/lib/core/app_settings_notifier.dart @@ -19,7 +19,7 @@ import 'dart:convert'; import 'package:collection/collection.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart' show Provider; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/lib/core/app_settings_notifier.g.dart b/lib/core/app_settings_notifier.g.dart index e8db06b64..e629e6e66 100644 --- a/lib/core/app_settings_notifier.g.dart +++ b/lib/core/app_settings_notifier.g.dart @@ -33,7 +33,7 @@ final class AppSettingsNotifierProvider AppSettingsNotifier create() => AppSettingsNotifier(); } -String _$appSettingsNotifierHash() => r'cae697753d7dd1efc72e12fd89299c5c8e741ed6'; +String _$appSettingsNotifierHash() => r'6674b0150917c08b3c9390885fe4899daf7b711c'; abstract class _$AppSettingsNotifier extends $AsyncNotifier { FutureOr build(); diff --git a/lib/core/colors.dart b/lib/core/colors.dart index 37e6143b5..aa99dc60f 100644 --- a/lib/core/colors.dart +++ b/lib/core/colors.dart @@ -17,7 +17,7 @@ */ import 'package:flex_color_scheme/flex_color_scheme.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; const COLOR_SURPLUS = Color.fromARGB(255, 231, 71, 71); diff --git a/lib/core/error_dialogs.dart b/lib/core/error_dialogs.dart index 4f0f8e7e8..6fdd08108 100644 --- a/lib/core/error_dialogs.dart +++ b/lib/core/error_dialogs.dart @@ -17,7 +17,7 @@ */ import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_html/flutter_html.dart'; import 'package:json_annotation/json_annotation.dart'; diff --git a/lib/core/json.dart b/lib/core/json.dart index d08f7d702..b0202ca3e 100644 --- a/lib/core/json.dart +++ b/lib/core/json.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; num stringToNum(String? e) { diff --git a/lib/core/keys.dart b/lib/core/keys.dart index b283fe814..c3a4e959e 100644 --- a/lib/core/keys.dart +++ b/lib/core/keys.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; /// App-wide navigator key. Lets code outside the widget tree (the global error /// handlers, background callbacks) reach a [BuildContext] and the navigator. diff --git a/lib/core/network/auth_notifier.g.dart b/lib/core/network/auth_notifier.g.dart index 1273b1f08..3977ae4c9 100644 --- a/lib/core/network/auth_notifier.g.dart +++ b/lib/core/network/auth_notifier.g.dart @@ -32,7 +32,7 @@ final class AuthNotifierProvider extends $AsyncNotifierProvider AuthNotifier(); } -String _$authNotifierHash() => r'20634c92164a774060760f66edbe3357cf219279'; +String _$authNotifierHash() => r'f4f13eb779843cd8a2cad044a08d568e6f245073'; abstract class _$AuthNotifier extends $AsyncNotifier { FutureOr build(); diff --git a/lib/core/widgets/dashboard/calendar.dart b/lib/core/widgets/dashboard/calendar.dart index d67af3f62..68dd3ef3b 100644 --- a/lib/core/widgets/dashboard/calendar.dart +++ b/lib/core/widgets/dashboard/calendar.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod; import 'package:table_calendar/table_calendar.dart'; import 'package:wger/core/consts.dart'; diff --git a/lib/core/widgets/datetime_input.dart b/lib/core/widgets/datetime_input.dart index bf3df1463..e2f3aa745 100644 --- a/lib/core/widgets/datetime_input.dart +++ b/lib/core/widgets/datetime_input.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:wger/core/formatting/formatting.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/database/converters/time_of_day_converter.dart b/lib/database/converters/time_of_day_converter.dart index 8ef9abe6c..885653610 100644 --- a/lib/database/converters/time_of_day_converter.dart +++ b/lib/database/converters/time_of_day_converter.dart @@ -17,7 +17,7 @@ */ import 'package:drift/drift.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:wger/core/json.dart'; class TimeOfDayConverter extends TypeConverter { diff --git a/lib/database/powersync/database.dart b/lib/database/powersync/database.dart index 327385d7f..5cf338c0a 100644 --- a/lib/database/powersync/database.dart +++ b/lib/database/powersync/database.dart @@ -18,7 +18,7 @@ import 'package:drift/drift.dart'; import 'package:drift_sqlite_async/drift_sqlite_async.dart'; -import 'package:material_ui/material_ui.dart' show TimeOfDay; +import 'package:flutter/material.dart' show TimeOfDay; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:powersync/powersync.dart' as ps; import 'package:wger/core/language.dart'; diff --git a/lib/database/powersync/powersync.g.dart b/lib/database/powersync/powersync.g.dart index efca46362..08789cc52 100644 --- a/lib/database/powersync/powersync.g.dart +++ b/lib/database/powersync/powersync.g.dart @@ -46,4 +46,4 @@ final class PowerSyncInstanceProvider } } -String _$powerSyncInstanceHash() => r'5d245fd575f1839d9920644027eb027f55b0e117'; +String _$powerSyncInstanceHash() => r'f8e609edc64283c406d4a8f28c8bbaf1dfb0ad43'; diff --git a/lib/database/powersync/tables/nutrition.dart b/lib/database/powersync/tables/nutrition.dart index be0878aed..584108f21 100644 --- a/lib/database/powersync/tables/nutrition.dart +++ b/lib/database/powersync/tables/nutrition.dart @@ -17,7 +17,6 @@ */ import 'package:drift/drift.dart'; -import 'package:material_ui/material_ui.dart' show TimeOfDay; import 'package:powersync/powersync.dart' as ps; import 'package:wger/database/converters/date_only_text_converter.dart'; import 'package:wger/database/converters/time_of_day_converter.dart'; diff --git a/lib/features/account/widgets/settings/theme.dart b/lib/features/account/widgets/settings/theme.dart index aeedd5940..a500fdcac 100644 --- a/lib/features/account/widgets/settings/theme.dart +++ b/lib/features/account/widgets/settings/theme.dart @@ -1,4 +1,4 @@ -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/app_settings_notifier.dart'; import 'package:wger/core/consts.dart'; diff --git a/lib/features/measurements/charts/data.dart b/lib/features/measurements/charts/data.dart index c92a11108..e3fb98a91 100644 --- a/lib/features/measurements/charts/data.dart +++ b/lib/features/measurements/charts/data.dart @@ -19,7 +19,7 @@ import 'dart:math'; import 'package:collection/collection.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:wger/features/measurements/charts/calendar.dart'; import 'package:wger/features/measurements/charts/range.dart'; import 'package:wger/features/measurements/charts/series.dart'; diff --git a/lib/features/measurements/charts/series.dart b/lib/features/measurements/charts/series.dart index 5bb797c5a..5e0f42975 100644 --- a/lib/features/measurements/charts/series.dart +++ b/lib/features/measurements/charts/series.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart' show DateTimeRange; +import 'package:flutter/material.dart'; /// A nutrition plan period shown for context: shaded as a vertical band in /// the chart, and named in the tooltip of the points it contains. diff --git a/lib/features/measurements/widgets/charts/line_chart.dart b/lib/features/measurements/widgets/charts/line_chart.dart index 29512d137..359562e8b 100644 --- a/lib/features/measurements/widgets/charts/line_chart.dart +++ b/lib/features/measurements/widgets/charts/line_chart.dart @@ -20,7 +20,7 @@ import 'dart:math'; import 'package:collection/collection.dart'; import 'package:fl_chart/fl_chart.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:wger/core/charts.dart'; import 'package:wger/core/consts.dart'; diff --git a/lib/features/measurements/widgets/entries.dart b/lib/features/measurements/widgets/entries.dart index fee554fef..bdc71cb96 100644 --- a/lib/features/measurements/widgets/entries.dart +++ b/lib/features/measurements/widgets/entries.dart @@ -17,7 +17,7 @@ */ import 'package:collection/collection.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/form_screen.dart'; import 'package:wger/core/formatting/formatting.dart'; diff --git a/lib/features/nutrition/models/meal.dart b/lib/features/nutrition/models/meal.dart index 8b13abda4..143a5ad65 100644 --- a/lib/features/nutrition/models/meal.dart +++ b/lib/features/nutrition/models/meal.dart @@ -17,7 +17,7 @@ */ import 'package:drift/drift.dart' as drift; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/core/date.dart'; import 'package:wger/database/powersync/database.dart'; diff --git a/lib/features/nutrition/screens/log_meal_screen.dart b/lib/features/nutrition/screens/log_meal_screen.dart index 683a2f096..501f79303 100644 --- a/lib/features/nutrition/screens/log_meal_screen.dart +++ b/lib/features/nutrition/screens/log_meal_screen.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/snackbar.dart'; import 'package:wger/core/widgets/datetime_input.dart'; diff --git a/lib/features/nutrition/widgets/charts.dart b/lib/features/nutrition/widgets/charts.dart index e2c8a3b85..296dc19ab 100644 --- a/lib/features/nutrition/widgets/charts.dart +++ b/lib/features/nutrition/widgets/charts.dart @@ -19,7 +19,7 @@ import 'dart:math'; import 'package:fl_chart/fl_chart.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:wger/core/colors.dart'; import 'package:wger/core/widgets/legend.dart'; import 'package:wger/features/nutrition/models/nutritional_plan.dart'; diff --git a/lib/features/nutrition/widgets/forms.dart b/lib/features/nutrition/widgets/forms.dart index f78a1611c..cc7db695d 100644 --- a/lib/features/nutrition/widgets/forms.dart +++ b/lib/features/nutrition/widgets/forms.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:wger/core/consts.dart'; import 'package:wger/core/formatting/formatting.dart'; diff --git a/lib/features/routines/models/session.dart b/lib/features/routines/models/session.dart index ecabb7653..a8e62932f 100644 --- a/lib/features/routines/models/session.dart +++ b/lib/features/routines/models/session.dart @@ -18,7 +18,7 @@ import 'package:clock/clock.dart'; import 'package:drift/drift.dart' as drift; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:wger/core/date.dart'; import 'package:wger/database/powersync/database.dart'; diff --git a/lib/features/routines/widgets/charts.dart b/lib/features/routines/widgets/charts.dart index d05cfb80c..9d190e109 100644 --- a/lib/features/routines/widgets/charts.dart +++ b/lib/features/routines/widgets/charts.dart @@ -17,7 +17,7 @@ */ import 'package:fl_chart/fl_chart.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:wger/core/charts.dart'; import 'package:wger/core/colors.dart'; import 'package:wger/core/formatting/formatting.dart'; diff --git a/lib/features/routines/widgets/forms/session.dart b/lib/features/routines/widgets/forms/session.dart index 732d7168f..0faf28e2e 100644 --- a/lib/features/routines/widgets/forms/session.dart +++ b/lib/features/routines/widgets/forms/session.dart @@ -17,7 +17,7 @@ */ import 'package:clock/clock.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:logging/logging.dart'; import 'package:wger/core/snackbar.dart'; diff --git a/lib/features/routines/widgets/logs/exercise_log_chart.dart b/lib/features/routines/widgets/logs/exercise_log_chart.dart index 0190352d1..dde50476f 100644 --- a/lib/features/routines/widgets/logs/exercise_log_chart.dart +++ b/lib/features/routines/widgets/logs/exercise_log_chart.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:wger/core/colors.dart'; import 'package:wger/core/misc.dart'; import 'package:wger/core/widgets/legend.dart'; diff --git a/lib/features/routines/widgets/logs/log_overview_routine.dart b/lib/features/routines/widgets/logs/log_overview_routine.dart index be5e15be7..099b46d68 100644 --- a/lib/features/routines/widgets/logs/log_overview_routine.dart +++ b/lib/features/routines/widgets/logs/log_overview_routine.dart @@ -17,7 +17,7 @@ */ import 'package:clock/clock.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:table_calendar/table_calendar.dart'; import 'package:wger/core/consts.dart'; diff --git a/lib/features/routines/widgets/logs/muscle_groups.dart b/lib/features/routines/widgets/logs/muscle_groups.dart index e8d10a7be..939be0c11 100644 --- a/lib/features/routines/widgets/logs/muscle_groups.dart +++ b/lib/features/routines/widgets/logs/muscle_groups.dart @@ -18,7 +18,7 @@ import 'package:collection/collection.dart'; import 'package:fl_chart/fl_chart.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:wger/core/colors.dart'; import 'package:wger/features/routines/models/log.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/lib/main.dart b/lib/main.dart index 4a2ed2884..e4e7574b8 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -17,11 +17,10 @@ */ import 'dart:async'; - import 'package:dynamic_color/dynamic_color.dart'; import 'package:extended_image/extended_image.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:logging/logging.dart'; import 'package:timezone/data/latest.dart' as tzdata; diff --git a/lib/theme/dynamic_color.dart b/lib/theme/dynamic_color.dart index 46c4e0dfe..e28065775 100644 --- a/lib/theme/dynamic_color.dart +++ b/lib/theme/dynamic_color.dart @@ -17,7 +17,7 @@ */ import 'package:dynamic_color/dynamic_color.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; diff --git a/lib/theme/theme.dart b/lib/theme/theme.dart index 66bb07863..96cda6fe3 100644 --- a/lib/theme/theme.dart +++ b/lib/theme/theme.dart @@ -17,8 +17,8 @@ */ import 'package:flex_color_scheme/flex_color_scheme.dart'; -import 'package:material_ui/material_ui.dart'; import 'package:table_calendar/table_calendar.dart'; +import 'package:flutter/material.dart'; // Color scheme, please consult // * https://pub.dev/packages/flex_color_scheme @@ -46,7 +46,7 @@ const List displayFontBoldWeight = [FontVariation('wght', 600)]; const List displayFontHeavyWeight = [FontVariation('wght', 800)]; // Make a light ColorScheme from the seeds. -final ColorScheme schemeLight = SeedColorScheme.fromSeeds( +final ColorScheme? schemeLight = SeedColorScheme.fromSeeds( primary: wgerPrimaryColor, primaryKey: wgerPrimaryColor, secondaryKey: wgerSecondaryColor, diff --git a/test/core/app_settings_notifier_test.dart b/test/core/app_settings_notifier_test.dart index 15f70405a..440c52263 100644 --- a/test/core/app_settings_notifier_test.dart +++ b/test/core/app_settings_notifier_test.dart @@ -18,7 +18,8 @@ import 'dart:convert'; -import 'package:material_ui/material_ui.dart'; +// import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:logging/logging.dart'; diff --git a/test/core/colors_test.dart b/test/core/colors_test.dart index ce339632d..99a3d7fe5 100644 --- a/test/core/colors_test.dart +++ b/test/core/colors_test.dart @@ -17,7 +17,8 @@ */ import 'package:flex_color_scheme/flex_color_scheme.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; +// import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/colors.dart'; import 'package:wger/theme/theme.dart'; @@ -65,6 +66,9 @@ void main() { test('ramps the tone across the palette', () { for (final scheme in [light, dark]) { + // Error + // The argument type 'Diagnosticable' can't be assigned to the parameter type 'ColorScheme'. dartargument_type_not_assignable + final tones = chartColorPalette(5, scheme).map(toneOf).toList(); for (var i = 1; i < tones.length; i++) { @@ -75,6 +79,8 @@ void main() { test('keeps the dark palette light enough for a dark surface', () { // The old fixed palette was tuned for light backgrounds only. + + // The argument type 'ColorScheme (where ColorScheme is defined in C:\Users\saurav\dev\tooling\flutter\packages\flutter\lib\src\material\color_scheme.dart)' can't be assigned to the parameter type 'ColorScheme (where ColorScheme is defined in C:\Users\saurav\AppData\Local\Pub\Cache\hosted\pub.dev\material_ui-1.1.0\lib\src\color_scheme.dart)'. expect(chartColorPalette(6, dark).every((c) => toneOf(c) >= 55), isTrue); }); }); diff --git a/test/core/error_dialogs_test.dart b/test/core/error_dialogs_test.dart index 317a3303c..6ccfa4bab 100644 --- a/test/core/error_dialogs_test.dart +++ b/test/core/error_dialogs_test.dart @@ -16,7 +16,8 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart'; +// import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/error_dialogs.dart'; @@ -99,6 +100,12 @@ void main() { Widget app(Widget home) => MaterialApp( localizationsDelegates: const [ AppLocalizations.delegate, + +// Error +// The values in a const list literal must be constants. +// Try removing the keyword 'const' from the list literal.dartnon_constant_list_element +// The name 'GlobalMaterialLocalizations' is defined in the libraries 'package:flutter_localizations/src/material_localizations.dart (via package:flutter_localizations/flutter_localizations.dart)' and 'package:material_ui/src/global_material_localizations.dart (via package:material_ui/material_ui.dart)'. +// Try using 'as prefix' for one of the import directives, or hiding the name from all but one of the imports. GlobalMaterialLocalizations.delegate, GlobalWidgetsLocalizations.delegate, ], diff --git a/test/features/exercises/widgets/add_exercise/add_exercise_text_area_test.dart b/test/features/exercises/widgets/add_exercise/add_exercise_text_area_test.dart index 9b698edae..3f2fde67d 100644 --- a/test/features/exercises/widgets/add_exercise/add_exercise_text_area_test.dart +++ b/test/features/exercises/widgets/add_exercise/add_exercise_text_area_test.dart @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart'; -import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:material_ui/material_ui.dart' hide GlobalMaterialLocalizations; +import 'package:flutter_localizations/flutter_localizations.dart' ; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/exercises/widgets/add_exercise/add_exercise_text_area.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/test/screenshots/screenshots_01_dashboard.dart b/test/screenshots/screenshots_01_dashboard.dart index 7d2f9c6b3..3c1d32c2f 100644 --- a/test/screenshots/screenshots_01_dashboard.dart +++ b/test/screenshots/screenshots_01_dashboard.dart @@ -17,7 +17,8 @@ */ import 'package:drift/native.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; +// import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; diff --git a/test/screenshots/screenshots_02_workout.dart b/test/screenshots/screenshots_02_workout.dart index 2b98aad93..fe7544cd3 100644 --- a/test/screenshots/screenshots_02_workout.dart +++ b/test/screenshots/screenshots_02_workout.dart @@ -17,7 +17,8 @@ */ import 'package:drift/native.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; +// import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; diff --git a/test/screenshots/screenshots_03_gym_mode.dart b/test/screenshots/screenshots_03_gym_mode.dart index 122bef106..dfa297fba 100644 --- a/test/screenshots/screenshots_03_gym_mode.dart +++ b/test/screenshots/screenshots_03_gym_mode.dart @@ -17,7 +17,8 @@ */ import 'package:drift/native.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; +// import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod; import 'package:wger/database/powersync/database.dart'; import 'package:wger/features/exercises/providers/exercise_filter_state.dart'; diff --git a/test/screenshots/screenshots_04_measurements.dart b/test/screenshots/screenshots_04_measurements.dart index c7e2a086f..8c06cc7dd 100644 --- a/test/screenshots/screenshots_04_measurements.dart +++ b/test/screenshots/screenshots_04_measurements.dart @@ -17,7 +17,8 @@ */ import 'package:drift/native.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; +// import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; diff --git a/test/screenshots/screenshots_05_nutritional_plan.dart b/test/screenshots/screenshots_05_nutritional_plan.dart index a2018771b..bb3e45ee0 100644 --- a/test/screenshots/screenshots_05_nutritional_plan.dart +++ b/test/screenshots/screenshots_05_nutritional_plan.dart @@ -17,7 +17,8 @@ */ import 'package:drift/native.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; +// import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; diff --git a/test/theme/dynamic_color_test.dart b/test/theme/dynamic_color_test.dart index a7ec649c5..6a3726bd4 100644 --- a/test/theme/dynamic_color_test.dart +++ b/test/theme/dynamic_color_test.dart @@ -16,7 +16,8 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart'; +// import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/theme/dynamic_color.dart'; From 5ab92f73cb085f6fbba69a28b16819e87a46a445 Mon Sep 17 00:00:00 2001 From: pankaj-basnet <165250380+pankaj-basnet@users.noreply.github.com> Date: Tue, 1 Sep 2026 20:15:29 +0545 Subject: [PATCH 3/3] test: align test imports for material_ui package usage --- .gitignore | 5 +---- test/core/app_settings_notifier_test.dart | 2 -- test/core/colors_test.dart | 5 ----- test/core/error_dialogs_test.dart | 7 ------- test/core/json_test.dart | 2 +- test/core/media_url_prefix_notifier_test.mocks.dart | 1 + test/core/network/auth_credentials_storage_test.mocks.dart | 1 + test/core/network/auth_http_client_test.mocks.dart | 1 + test/core/network/auth_notifier_login_test.mocks.dart | 1 + test/core/network/auth_notifier_powersync_test.mocks.dart | 1 + test/core/network/base_provider_test.mocks.dart | 1 + test/core/recovery_screens_test.mocks.dart | 1 + test/core/validators_test.mocks.dart | 1 + test/core/widgets/datetime_input_test.dart | 2 +- test/database/converters/time_of_day_converter_test.dart | 2 +- .../account/providers/account_notifier_test.mocks.dart | 1 + .../account/providers/account_repository_test.mocks.dart | 1 + .../providers/user_profile_notifier_test.mocks.dart | 1 + test/features/account/widgets/forms_test.mocks.dart | 1 + test/features/account/widgets/settings_test.mocks.dart | 1 + test/features/auth/screens/auth_screen_test.mocks.dart | 1 + .../auth/screens/mfa_challenge_screen_test.mocks.dart | 1 + .../providers/add_exercise_notifier_test.mocks.dart | 1 + .../providers/add_exercise_repository_test.mocks.dart | 1 + .../providers/exercise_filters_notifier_test.mocks.dart | 1 + .../providers/exercise_repository_test.mocks.dart | 1 + .../exercises/providers/exercises_notifier_test.mocks.dart | 1 + .../exercises/screens/add_exercise_screen_test.mocks.dart | 1 + .../widgets/add_exercise/add_exercise_text_area_test.dart | 4 ++-- .../widgets/exercises_detail_widget_test.mocks.dart | 1 + .../gallery/providers/gallery_notifier_test.mocks.dart | 1 + .../gallery/providers/gallery_repository_test.mocks.dart | 1 + .../gallery/screens/gallery_screen_test.mocks.dart | 1 + test/features/gallery/widgets/forms_test.mocks.dart | 1 + test/features/gallery/widgets/overview_test.mocks.dart | 1 + .../health/providers/health_importer_test.mocks.dart | 1 + .../health/providers/health_repository_test.mocks.dart | 1 + test/features/health/providers/health_sync_test.mocks.dart | 1 + test/features/measurements/charts/data_test.dart | 2 +- .../providers/body_weight_provider_test.mocks.dart | 1 + .../providers/measurement_notifier_test.mocks.dart | 1 + .../screens/measurement_categories_screen_test.mocks.dart | 1 + .../measurement_category_sort_screen_test.mocks.dart | 1 + .../screens/measurement_entries_screen_test.mocks.dart | 1 + .../measurements/screens/weight_screen_test.mocks.dart | 1 + .../measurements/widgets/calculation_mark_test.mocks.dart | 1 + .../widgets/calculation_params_test.mocks.dart | 1 + .../measurements/widgets/categories_test.mocks.dart | 1 + .../measurements/widgets/charts/chart_widgets_test.dart | 2 +- test/features/measurements/widgets/entries_test.mocks.dart | 1 + .../measurements/widgets/forms/category_test.mocks.dart | 1 + .../measurements/widgets/forms/entry_test.mocks.dart | 1 + .../measurements/widgets/forms/group_entry_test.mocks.dart | 1 + test/features/measurements/widgets/helpers_test.dart | 2 +- .../measurements/widgets/measurement_fab_test.mocks.dart | 1 + .../measurements/widgets/measurement_tile_test.mocks.dart | 1 + .../measurements/widgets/metric_picker_test.mocks.dart | 1 + .../measurements/widgets/weight_form_test.mocks.dart | 1 + .../providers/ingredient_notifier_test.mocks.dart | 1 + .../providers/ingredient_repository_test.mocks.dart | 1 + .../nutrition/providers/nutrition_notifier_test.mocks.dart | 1 + .../screens/nutritional_plan_screen_test.mocks.dart | 1 + .../screens/nutritional_plans_screen_test.mocks.dart | 1 + .../nutrition/widgets/ingredient_typeahead_test.mocks.dart | 1 + test/features/nutrition/widgets/meal_widget_test.dart | 2 +- .../nutrition/widgets/nutritional_meal_form_test.dart | 2 +- .../widgets/nutritional_meal_form_test.mocks.dart | 1 + .../widgets/nutritional_meal_item_form_test.mocks.dart | 1 + .../widgets/nutritional_plan_form_test.mocks.dart | 1 + .../nutrition/widgets/plan_weight_chart_test.mocks.dart | 1 + .../helpers/routine_form_test_overrides.mocks.dart | 1 + test/features/routines/models/session_test.dart | 2 +- .../routines/providers/plate_weights_test.mocks.dart | 1 + .../routines/providers/routines_notifier_test.mocks.dart | 1 + .../routines/providers/routines_repository_test.mocks.dart | 7 ++++--- .../providers/workout_logs_notifier_test.mocks.dart | 1 + test/features/routines/screens/gym_mode_test.mocks.dart | 1 + .../routines/screens/routine_list_screen_test.mocks.dart | 1 + .../routines/screens/routine_logs_screen_test.mocks.dart | 1 + .../routines/widgets/forms/day_form_test.mocks.dart | 1 + .../routines/widgets/forms/routine_form_test.mocks.dart | 1 + .../features/routines/widgets/forms/session_form_test.dart | 3 +-- .../routines/widgets/forms/session_form_test.mocks.dart | 1 + .../routines/widgets/forms/slot_entry_form_test.mocks.dart | 1 + test/features/routines/widgets/forms/slot_test.mocks.dart | 1 + .../routines/widgets/gym_mode/log_page_test.mocks.dart | 1 + .../routines/widgets/gym_mode/session_page_test.mocks.dart | 1 + .../features/routines/widgets/routine_edit_test.mocks.dart | 1 + .../trophies/providers/trophy_repository_test.mocks.dart | 1 + test/powersync/api_client_test.mocks.dart | 1 + test/powersync/connector_test.mocks.dart | 1 + test/screenshots/screenshots_01_dashboard.dart | 1 - test/screenshots/screenshots_01_dashboard.mocks.dart | 1 + test/screenshots/screenshots_02_workout.dart | 3 +-- test/screenshots/screenshots_02_workout.mocks.dart | 1 + test/screenshots/screenshots_03_gym_mode.dart | 1 - test/screenshots/screenshots_04_measurements.dart | 1 - test/screenshots/screenshots_04_measurements.mocks.dart | 1 + test/screenshots/screenshots_05_nutritional_plan.dart | 1 - .../screenshots/screenshots_05_nutritional_plan.mocks.dart | 1 + test/theme/dynamic_color_test.dart | 1 - test_data/nutritional_plans.dart | 2 +- test_data/screenshots/nutrition.dart | 2 +- 103 files changed, 99 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 78d315c64..e2377fc91 100644 --- a/.gitignore +++ b/.gitignore @@ -67,7 +67,4 @@ ios/Runner.ipa ios/Runner.app.dSYM.zip #Flutter Version Management -.fvm/ - -# personal -z-notes \ No newline at end of file +.fvm/ \ No newline at end of file diff --git a/test/core/app_settings_notifier_test.dart b/test/core/app_settings_notifier_test.dart index 440c52263..d6a586291 100644 --- a/test/core/app_settings_notifier_test.dart +++ b/test/core/app_settings_notifier_test.dart @@ -17,8 +17,6 @@ */ import 'dart:convert'; - -// import 'package:material_ui/material_ui.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/core/colors_test.dart b/test/core/colors_test.dart index 99a3d7fe5..cb6e41b12 100644 --- a/test/core/colors_test.dart +++ b/test/core/colors_test.dart @@ -18,7 +18,6 @@ import 'package:flex_color_scheme/flex_color_scheme.dart'; import 'package:flutter/material.dart'; -// import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/colors.dart'; import 'package:wger/theme/theme.dart'; @@ -66,9 +65,6 @@ void main() { test('ramps the tone across the palette', () { for (final scheme in [light, dark]) { - // Error - // The argument type 'Diagnosticable' can't be assigned to the parameter type 'ColorScheme'. dartargument_type_not_assignable - final tones = chartColorPalette(5, scheme).map(toneOf).toList(); for (var i = 1; i < tones.length; i++) { @@ -80,7 +76,6 @@ void main() { test('keeps the dark palette light enough for a dark surface', () { // The old fixed palette was tuned for light backgrounds only. - // The argument type 'ColorScheme (where ColorScheme is defined in C:\Users\saurav\dev\tooling\flutter\packages\flutter\lib\src\material\color_scheme.dart)' can't be assigned to the parameter type 'ColorScheme (where ColorScheme is defined in C:\Users\saurav\AppData\Local\Pub\Cache\hosted\pub.dev\material_ui-1.1.0\lib\src\color_scheme.dart)'. expect(chartColorPalette(6, dark).every((c) => toneOf(c) >= 55), isTrue); }); }); diff --git a/test/core/error_dialogs_test.dart b/test/core/error_dialogs_test.dart index 6ccfa4bab..f1a9fff49 100644 --- a/test/core/error_dialogs_test.dart +++ b/test/core/error_dialogs_test.dart @@ -16,7 +16,6 @@ * along with this program. If not, see . */ -// import 'package:material_ui/material_ui.dart'; import 'package:flutter/material.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -100,12 +99,6 @@ void main() { Widget app(Widget home) => MaterialApp( localizationsDelegates: const [ AppLocalizations.delegate, - -// Error -// The values in a const list literal must be constants. -// Try removing the keyword 'const' from the list literal.dartnon_constant_list_element -// The name 'GlobalMaterialLocalizations' is defined in the libraries 'package:flutter_localizations/src/material_localizations.dart (via package:flutter_localizations/flutter_localizations.dart)' and 'package:material_ui/src/global_material_localizations.dart (via package:material_ui/material_ui.dart)'. -// Try using 'as prefix' for one of the import directives, or hiding the name from all but one of the imports. GlobalMaterialLocalizations.delegate, GlobalWidgetsLocalizations.delegate, ], diff --git a/test/core/json_test.dart b/test/core/json_test.dart index 20a665d15..df5a13d66 100644 --- a/test/core/json_test.dart +++ b/test/core/json_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/json.dart'; diff --git a/test/core/media_url_prefix_notifier_test.mocks.dart b/test/core/media_url_prefix_notifier_test.mocks.dart index 38d3b6f93..a73d6a4cc 100644 --- a/test/core/media_url_prefix_notifier_test.mocks.dart +++ b/test/core/media_url_prefix_notifier_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i4; import 'package:http/http.dart' as _i2; diff --git a/test/core/network/auth_credentials_storage_test.mocks.dart b/test/core/network/auth_credentials_storage_test.mocks.dart index d44613575..4f8364853 100644 --- a/test/core/network/auth_credentials_storage_test.mocks.dart +++ b/test/core/network/auth_credentials_storage_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/core/network/auth_http_client_test.mocks.dart b/test/core/network/auth_http_client_test.mocks.dart index 410592787..1452cf202 100644 --- a/test/core/network/auth_http_client_test.mocks.dart +++ b/test/core/network/auth_http_client_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'dart:convert' as _i4; import 'dart:typed_data' as _i6; diff --git a/test/core/network/auth_notifier_login_test.mocks.dart b/test/core/network/auth_notifier_login_test.mocks.dart index 2be32f6ba..c26bf16b6 100644 --- a/test/core/network/auth_notifier_login_test.mocks.dart +++ b/test/core/network/auth_notifier_login_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i4; import 'dart:convert' as _i5; import 'dart:typed_data' as _i7; diff --git a/test/core/network/auth_notifier_powersync_test.mocks.dart b/test/core/network/auth_notifier_powersync_test.mocks.dart index 80f57894f..c73e56a09 100644 --- a/test/core/network/auth_notifier_powersync_test.mocks.dart +++ b/test/core/network/auth_notifier_powersync_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'dart:convert' as _i4; import 'dart:typed_data' as _i6; diff --git a/test/core/network/base_provider_test.mocks.dart b/test/core/network/base_provider_test.mocks.dart index 4a2eb837a..49902827b 100644 --- a/test/core/network/base_provider_test.mocks.dart +++ b/test/core/network/base_provider_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'dart:convert' as _i4; import 'dart:typed_data' as _i6; diff --git a/test/core/recovery_screens_test.mocks.dart b/test/core/recovery_screens_test.mocks.dart index 79a7c7924..38e6c9ed1 100644 --- a/test/core/recovery_screens_test.mocks.dart +++ b/test/core/recovery_screens_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'dart:convert' as _i4; import 'dart:typed_data' as _i6; diff --git a/test/core/validators_test.mocks.dart b/test/core/validators_test.mocks.dart index e5d022259..a79a78276 100644 --- a/test/core/validators_test.mocks.dart +++ b/test/core/validators_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'package:mockito/mockito.dart' as _i1; import 'package:mockito/src/dummies.dart' as _i3; import 'package:wger/l10n/generated/app_localizations.dart' as _i2; diff --git a/test/core/widgets/datetime_input_test.dart b/test/core/widgets/datetime_input_test.dart index e1a1adcbf..4c779e8c9 100644 --- a/test/core/widgets/datetime_input_test.dart +++ b/test/core/widgets/datetime_input_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/widgets/datetime_input.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/test/database/converters/time_of_day_converter_test.dart b/test/database/converters/time_of_day_converter_test.dart index 64ef0456d..635733eed 100644 --- a/test/database/converters/time_of_day_converter_test.dart +++ b/test/database/converters/time_of_day_converter_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/database/converters/time_of_day_converter.dart'; diff --git a/test/features/account/providers/account_notifier_test.mocks.dart b/test/features/account/providers/account_notifier_test.mocks.dart index 6722ce537..7ac2fce15 100644 --- a/test/features/account/providers/account_notifier_test.mocks.dart +++ b/test/features/account/providers/account_notifier_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i4; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/account/providers/account_repository_test.mocks.dart b/test/features/account/providers/account_repository_test.mocks.dart index 1600f2555..d8c83dab0 100644 --- a/test/features/account/providers/account_repository_test.mocks.dart +++ b/test/features/account/providers/account_repository_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i5; import 'package:http/http.dart' as _i2; diff --git a/test/features/account/providers/user_profile_notifier_test.mocks.dart b/test/features/account/providers/user_profile_notifier_test.mocks.dart index fc7f21125..1119e435d 100644 --- a/test/features/account/providers/user_profile_notifier_test.mocks.dart +++ b/test/features/account/providers/user_profile_notifier_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/account/widgets/forms_test.mocks.dart b/test/features/account/widgets/forms_test.mocks.dart index 1619e3acb..8ac54ad4d 100644 --- a/test/features/account/widgets/forms_test.mocks.dart +++ b/test/features/account/widgets/forms_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i4; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/account/widgets/settings_test.mocks.dart b/test/features/account/widgets/settings_test.mocks.dart index a56795ad4..476e0fd2a 100644 --- a/test/features/account/widgets/settings_test.mocks.dart +++ b/test/features/account/widgets/settings_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/auth/screens/auth_screen_test.mocks.dart b/test/features/auth/screens/auth_screen_test.mocks.dart index e78299c19..9f7931485 100644 --- a/test/features/auth/screens/auth_screen_test.mocks.dart +++ b/test/features/auth/screens/auth_screen_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'dart:convert' as _i4; import 'dart:typed_data' as _i6; diff --git a/test/features/auth/screens/mfa_challenge_screen_test.mocks.dart b/test/features/auth/screens/mfa_challenge_screen_test.mocks.dart index 5e8842319..d0dc4d11f 100644 --- a/test/features/auth/screens/mfa_challenge_screen_test.mocks.dart +++ b/test/features/auth/screens/mfa_challenge_screen_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'dart:convert' as _i4; import 'dart:typed_data' as _i6; diff --git a/test/features/exercises/providers/add_exercise_notifier_test.mocks.dart b/test/features/exercises/providers/add_exercise_notifier_test.mocks.dart index 65afeaf3d..7d0c52766 100644 --- a/test/features/exercises/providers/add_exercise_notifier_test.mocks.dart +++ b/test/features/exercises/providers/add_exercise_notifier_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/exercises/providers/add_exercise_repository_test.mocks.dart b/test/features/exercises/providers/add_exercise_repository_test.mocks.dart index b2c723cb4..fa2c8aec9 100644 --- a/test/features/exercises/providers/add_exercise_repository_test.mocks.dart +++ b/test/features/exercises/providers/add_exercise_repository_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i5; import 'package:http/http.dart' as _i2; diff --git a/test/features/exercises/providers/exercise_filters_notifier_test.mocks.dart b/test/features/exercises/providers/exercise_filters_notifier_test.mocks.dart index f99ced776..83835cc7d 100644 --- a/test/features/exercises/providers/exercise_filters_notifier_test.mocks.dart +++ b/test/features/exercises/providers/exercise_filters_notifier_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/exercises/providers/exercise_repository_test.mocks.dart b/test/features/exercises/providers/exercise_repository_test.mocks.dart index d51c8f30d..19ef923da 100644 --- a/test/features/exercises/providers/exercise_repository_test.mocks.dart +++ b/test/features/exercises/providers/exercise_repository_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i5; import 'package:http/http.dart' as _i2; diff --git a/test/features/exercises/providers/exercises_notifier_test.mocks.dart b/test/features/exercises/providers/exercises_notifier_test.mocks.dart index 4d3f23291..7ec7f112d 100644 --- a/test/features/exercises/providers/exercises_notifier_test.mocks.dart +++ b/test/features/exercises/providers/exercises_notifier_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/exercises/screens/add_exercise_screen_test.mocks.dart b/test/features/exercises/screens/add_exercise_screen_test.mocks.dart index 1e9c705cc..5e2998274 100644 --- a/test/features/exercises/screens/add_exercise_screen_test.mocks.dart +++ b/test/features/exercises/screens/add_exercise_screen_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i4; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/exercises/widgets/add_exercise/add_exercise_text_area_test.dart b/test/features/exercises/widgets/add_exercise/add_exercise_text_area_test.dart index 3f2fde67d..b7108d111 100644 --- a/test/features/exercises/widgets/add_exercise/add_exercise_text_area_test.dart +++ b/test/features/exercises/widgets/add_exercise/add_exercise_text_area_test.dart @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart' hide GlobalMaterialLocalizations; -import 'package:flutter_localizations/flutter_localizations.dart' ; +import 'package:flutter/material.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/exercises/widgets/add_exercise/add_exercise_text_area.dart'; import 'package:wger/l10n/generated/app_localizations.dart'; diff --git a/test/features/exercises/widgets/exercises_detail_widget_test.mocks.dart b/test/features/exercises/widgets/exercises_detail_widget_test.mocks.dart index 817c037c9..94e351354 100644 --- a/test/features/exercises/widgets/exercises_detail_widget_test.mocks.dart +++ b/test/features/exercises/widgets/exercises_detail_widget_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/gallery/providers/gallery_notifier_test.mocks.dart b/test/features/gallery/providers/gallery_notifier_test.mocks.dart index c055d2335..efc80b30a 100644 --- a/test/features/gallery/providers/gallery_notifier_test.mocks.dart +++ b/test/features/gallery/providers/gallery_notifier_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i4; import 'package:image_picker/image_picker.dart' as _i5; diff --git a/test/features/gallery/providers/gallery_repository_test.mocks.dart b/test/features/gallery/providers/gallery_repository_test.mocks.dart index 821f370e4..f866f064a 100644 --- a/test/features/gallery/providers/gallery_repository_test.mocks.dart +++ b/test/features/gallery/providers/gallery_repository_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i5; import 'package:http/http.dart' as _i2; diff --git a/test/features/gallery/screens/gallery_screen_test.mocks.dart b/test/features/gallery/screens/gallery_screen_test.mocks.dart index 8300e24aa..5c963eed1 100644 --- a/test/features/gallery/screens/gallery_screen_test.mocks.dart +++ b/test/features/gallery/screens/gallery_screen_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i4; import 'package:image_picker/image_picker.dart' as _i5; diff --git a/test/features/gallery/widgets/forms_test.mocks.dart b/test/features/gallery/widgets/forms_test.mocks.dart index 6a00407f2..8f76ab1b9 100644 --- a/test/features/gallery/widgets/forms_test.mocks.dart +++ b/test/features/gallery/widgets/forms_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i4; import 'package:image_picker/image_picker.dart' as _i5; diff --git a/test/features/gallery/widgets/overview_test.mocks.dart b/test/features/gallery/widgets/overview_test.mocks.dart index a21e324e9..b3392daa2 100644 --- a/test/features/gallery/widgets/overview_test.mocks.dart +++ b/test/features/gallery/widgets/overview_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i4; import 'package:image_picker/image_picker.dart' as _i5; diff --git a/test/features/health/providers/health_importer_test.mocks.dart b/test/features/health/providers/health_importer_test.mocks.dart index 08bce393c..4e030abdd 100644 --- a/test/features/health/providers/health_importer_test.mocks.dart +++ b/test/features/health/providers/health_importer_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i4; import 'package:health_bridge/health.dart' as _i5; diff --git a/test/features/health/providers/health_repository_test.mocks.dart b/test/features/health/providers/health_repository_test.mocks.dart index dfcb215d1..02f3ca2a0 100644 --- a/test/features/health/providers/health_repository_test.mocks.dart +++ b/test/features/health/providers/health_repository_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i4; import 'package:health_bridge/health.dart' as _i2; diff --git a/test/features/health/providers/health_sync_test.mocks.dart b/test/features/health/providers/health_sync_test.mocks.dart index 01cd72ecd..8f6a68f2e 100644 --- a/test/features/health/providers/health_sync_test.mocks.dart +++ b/test/features/health/providers/health_sync_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i4; import 'package:health_bridge/health.dart' as _i5; diff --git a/test/features/measurements/charts/data_test.dart b/test/features/measurements/charts/data_test.dart index afad9e761..eeb164f05 100644 --- a/test/features/measurements/charts/data_test.dart +++ b/test/features/measurements/charts/data_test.dart @@ -17,7 +17,7 @@ */ import 'package:collection/collection.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/measurements/charts/data.dart'; import 'package:wger/features/measurements/charts/range.dart'; diff --git a/test/features/measurements/providers/body_weight_provider_test.mocks.dart b/test/features/measurements/providers/body_weight_provider_test.mocks.dart index 903488b65..371c805d1 100644 --- a/test/features/measurements/providers/body_weight_provider_test.mocks.dart +++ b/test/features/measurements/providers/body_weight_provider_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/measurements/providers/measurement_notifier_test.mocks.dart b/test/features/measurements/providers/measurement_notifier_test.mocks.dart index bd827dc95..829389d34 100644 --- a/test/features/measurements/providers/measurement_notifier_test.mocks.dart +++ b/test/features/measurements/providers/measurement_notifier_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/measurements/screens/measurement_categories_screen_test.mocks.dart b/test/features/measurements/screens/measurement_categories_screen_test.mocks.dart index c23d61fa2..d3a088429 100644 --- a/test/features/measurements/screens/measurement_categories_screen_test.mocks.dart +++ b/test/features/measurements/screens/measurement_categories_screen_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/measurements/screens/measurement_category_sort_screen_test.mocks.dart b/test/features/measurements/screens/measurement_category_sort_screen_test.mocks.dart index 6e338281c..ccf20ae99 100644 --- a/test/features/measurements/screens/measurement_category_sort_screen_test.mocks.dart +++ b/test/features/measurements/screens/measurement_category_sort_screen_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/measurements/screens/measurement_entries_screen_test.mocks.dart b/test/features/measurements/screens/measurement_entries_screen_test.mocks.dart index 4050a77fd..48b912bfd 100644 --- a/test/features/measurements/screens/measurement_entries_screen_test.mocks.dart +++ b/test/features/measurements/screens/measurement_entries_screen_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/measurements/screens/weight_screen_test.mocks.dart b/test/features/measurements/screens/weight_screen_test.mocks.dart index 587a5b0db..fd391012e 100644 --- a/test/features/measurements/screens/weight_screen_test.mocks.dart +++ b/test/features/measurements/screens/weight_screen_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/measurements/widgets/calculation_mark_test.mocks.dart b/test/features/measurements/widgets/calculation_mark_test.mocks.dart index fa1085047..c8b47066a 100644 --- a/test/features/measurements/widgets/calculation_mark_test.mocks.dart +++ b/test/features/measurements/widgets/calculation_mark_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/measurements/widgets/calculation_params_test.mocks.dart b/test/features/measurements/widgets/calculation_params_test.mocks.dart index a7f26a6a3..5387a82c1 100644 --- a/test/features/measurements/widgets/calculation_params_test.mocks.dart +++ b/test/features/measurements/widgets/calculation_params_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/measurements/widgets/categories_test.mocks.dart b/test/features/measurements/widgets/categories_test.mocks.dart index 5ea452d64..d92829b46 100644 --- a/test/features/measurements/widgets/categories_test.mocks.dart +++ b/test/features/measurements/widgets/categories_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/measurements/widgets/charts/chart_widgets_test.dart b/test/features/measurements/widgets/charts/chart_widgets_test.dart index 38d7f0c04..51c3c69a7 100644 --- a/test/features/measurements/widgets/charts/chart_widgets_test.dart +++ b/test/features/measurements/widgets/charts/chart_widgets_test.dart @@ -17,7 +17,7 @@ */ import 'package:fl_chart/fl_chart.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/features/measurements/charts/series.dart'; import 'package:wger/features/measurements/widgets/charts/bar_chart.dart'; diff --git a/test/features/measurements/widgets/entries_test.mocks.dart b/test/features/measurements/widgets/entries_test.mocks.dart index 88400880a..272eeda58 100644 --- a/test/features/measurements/widgets/entries_test.mocks.dart +++ b/test/features/measurements/widgets/entries_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/measurements/widgets/forms/category_test.mocks.dart b/test/features/measurements/widgets/forms/category_test.mocks.dart index b9ebb339a..ec276165a 100644 --- a/test/features/measurements/widgets/forms/category_test.mocks.dart +++ b/test/features/measurements/widgets/forms/category_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/measurements/widgets/forms/entry_test.mocks.dart b/test/features/measurements/widgets/forms/entry_test.mocks.dart index f785b71a6..b43d2e5bd 100644 --- a/test/features/measurements/widgets/forms/entry_test.mocks.dart +++ b/test/features/measurements/widgets/forms/entry_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/measurements/widgets/forms/group_entry_test.mocks.dart b/test/features/measurements/widgets/forms/group_entry_test.mocks.dart index eb8c471cc..6807b93c3 100644 --- a/test/features/measurements/widgets/forms/group_entry_test.mocks.dart +++ b/test/features/measurements/widgets/forms/group_entry_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/measurements/widgets/helpers_test.dart b/test/features/measurements/widgets/helpers_test.dart index a6395c492..9f14d4801 100644 --- a/test/features/measurements/widgets/helpers_test.dart +++ b/test/features/measurements/widgets/helpers_test.dart @@ -17,7 +17,7 @@ */ import 'package:fl_chart/fl_chart.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/widgets/legend.dart'; import 'package:wger/features/measurements/charts/data.dart'; diff --git a/test/features/measurements/widgets/measurement_fab_test.mocks.dart b/test/features/measurements/widgets/measurement_fab_test.mocks.dart index 6e91c093c..632ba6828 100644 --- a/test/features/measurements/widgets/measurement_fab_test.mocks.dart +++ b/test/features/measurements/widgets/measurement_fab_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/measurements/widgets/measurement_tile_test.mocks.dart b/test/features/measurements/widgets/measurement_tile_test.mocks.dart index b417f3393..418918c74 100644 --- a/test/features/measurements/widgets/measurement_tile_test.mocks.dart +++ b/test/features/measurements/widgets/measurement_tile_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/measurements/widgets/metric_picker_test.mocks.dart b/test/features/measurements/widgets/metric_picker_test.mocks.dart index d6a3e298b..abd2bc0f5 100644 --- a/test/features/measurements/widgets/metric_picker_test.mocks.dart +++ b/test/features/measurements/widgets/metric_picker_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/measurements/widgets/weight_form_test.mocks.dart b/test/features/measurements/widgets/weight_form_test.mocks.dart index db81a8a44..1183daa51 100644 --- a/test/features/measurements/widgets/weight_form_test.mocks.dart +++ b/test/features/measurements/widgets/weight_form_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/nutrition/providers/ingredient_notifier_test.mocks.dart b/test/features/nutrition/providers/ingredient_notifier_test.mocks.dart index 7982e3237..5cf99d205 100644 --- a/test/features/nutrition/providers/ingredient_notifier_test.mocks.dart +++ b/test/features/nutrition/providers/ingredient_notifier_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/nutrition/providers/ingredient_repository_test.mocks.dart b/test/features/nutrition/providers/ingredient_repository_test.mocks.dart index afea46cee..9413a60f5 100644 --- a/test/features/nutrition/providers/ingredient_repository_test.mocks.dart +++ b/test/features/nutrition/providers/ingredient_repository_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i5; import 'package:http/http.dart' as _i2; diff --git a/test/features/nutrition/providers/nutrition_notifier_test.mocks.dart b/test/features/nutrition/providers/nutrition_notifier_test.mocks.dart index b678bc200..cb4af3c75 100644 --- a/test/features/nutrition/providers/nutrition_notifier_test.mocks.dart +++ b/test/features/nutrition/providers/nutrition_notifier_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/nutrition/screens/nutritional_plan_screen_test.mocks.dart b/test/features/nutrition/screens/nutritional_plan_screen_test.mocks.dart index bc56942ef..94a160df6 100644 --- a/test/features/nutrition/screens/nutritional_plan_screen_test.mocks.dart +++ b/test/features/nutrition/screens/nutritional_plan_screen_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i4; import 'dart:convert' as _i13; import 'dart:typed_data' as _i15; diff --git a/test/features/nutrition/screens/nutritional_plans_screen_test.mocks.dart b/test/features/nutrition/screens/nutritional_plans_screen_test.mocks.dart index 3b7462255..4ac8b9022 100644 --- a/test/features/nutrition/screens/nutritional_plans_screen_test.mocks.dart +++ b/test/features/nutrition/screens/nutritional_plans_screen_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i4; import 'dart:convert' as _i13; import 'dart:typed_data' as _i15; diff --git a/test/features/nutrition/widgets/ingredient_typeahead_test.mocks.dart b/test/features/nutrition/widgets/ingredient_typeahead_test.mocks.dart index 0a6c23174..6d72befae 100644 --- a/test/features/nutrition/widgets/ingredient_typeahead_test.mocks.dart +++ b/test/features/nutrition/widgets/ingredient_typeahead_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/nutrition/widgets/meal_widget_test.dart b/test/features/nutrition/widgets/meal_widget_test.dart index 778c82952..eb6559015 100644 --- a/test/features/nutrition/widgets/meal_widget_test.dart +++ b/test/features/nutrition/widgets/meal_widget_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/core/network/network_provider.dart'; diff --git a/test/features/nutrition/widgets/nutritional_meal_form_test.dart b/test/features/nutrition/widgets/nutritional_meal_form_test.dart index 2b4bce38d..712b3df0d 100644 --- a/test/features/nutrition/widgets/nutritional_meal_form_test.dart +++ b/test/features/nutrition/widgets/nutritional_meal_form_test.dart @@ -17,7 +17,7 @@ */ import 'package:clock/clock.dart'; -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/nutrition/widgets/nutritional_meal_form_test.mocks.dart b/test/features/nutrition/widgets/nutritional_meal_form_test.mocks.dart index 212a9df95..4d9933365 100644 --- a/test/features/nutrition/widgets/nutritional_meal_form_test.mocks.dart +++ b/test/features/nutrition/widgets/nutritional_meal_form_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/nutrition/widgets/nutritional_meal_item_form_test.mocks.dart b/test/features/nutrition/widgets/nutritional_meal_item_form_test.mocks.dart index 45657548b..5db59f591 100644 --- a/test/features/nutrition/widgets/nutritional_meal_item_form_test.mocks.dart +++ b/test/features/nutrition/widgets/nutritional_meal_item_form_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'dart:convert' as _i4; import 'dart:typed_data' as _i6; diff --git a/test/features/nutrition/widgets/nutritional_plan_form_test.mocks.dart b/test/features/nutrition/widgets/nutritional_plan_form_test.mocks.dart index 1a5ef1853..f836bdcbc 100644 --- a/test/features/nutrition/widgets/nutritional_plan_form_test.mocks.dart +++ b/test/features/nutrition/widgets/nutritional_plan_form_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/nutrition/widgets/plan_weight_chart_test.mocks.dart b/test/features/nutrition/widgets/plan_weight_chart_test.mocks.dart index cd1574dbe..482894e41 100644 --- a/test/features/nutrition/widgets/plan_weight_chart_test.mocks.dart +++ b/test/features/nutrition/widgets/plan_weight_chart_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/routines/helpers/routine_form_test_overrides.mocks.dart b/test/features/routines/helpers/routine_form_test_overrides.mocks.dart index 4715131c5..cc01947e8 100644 --- a/test/features/routines/helpers/routine_form_test_overrides.mocks.dart +++ b/test/features/routines/helpers/routine_form_test_overrides.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i4; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/routines/models/session_test.dart b/test/features/routines/models/session_test.dart index ead0a9590..5ede05c9c 100644 --- a/test/features/routines/models/session_test.dart +++ b/test/features/routines/models/session_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:timezone/data/latest.dart' as tzdata; import 'package:wger/core/consts.dart'; diff --git a/test/features/routines/providers/plate_weights_test.mocks.dart b/test/features/routines/providers/plate_weights_test.mocks.dart index d31f3d118..e8e059142 100644 --- a/test/features/routines/providers/plate_weights_test.mocks.dart +++ b/test/features/routines/providers/plate_weights_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/routines/providers/routines_notifier_test.mocks.dart b/test/features/routines/providers/routines_notifier_test.mocks.dart index f4e84bafe..f3fc849e7 100644 --- a/test/features/routines/providers/routines_notifier_test.mocks.dart +++ b/test/features/routines/providers/routines_notifier_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i8; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/routines/providers/routines_repository_test.mocks.dart b/test/features/routines/providers/routines_repository_test.mocks.dart index d69c0d1e8..43a85d229 100644 --- a/test/features/routines/providers/routines_repository_test.mocks.dart +++ b/test/features/routines/providers/routines_repository_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i6; import 'package:drift/drift.dart' as _i3; @@ -848,12 +849,12 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD as _i4.$GalleryImageTableTable); @override - Iterable<_i3.TableInfo<_i3.Table, Object?>> get allTables => + Iterable<_i3.TableInfo> get allTables => (super.noSuchMethod( Invocation.getter(#allTables), - returnValue: <_i3.TableInfo<_i3.Table, Object?>>[], + returnValue: <_i3.TableInfo>[], ) - as Iterable<_i3.TableInfo<_i3.Table, Object?>>); + as Iterable<_i3.TableInfo>); @override List<_i3.DatabaseSchemaEntity> get allSchemaEntities => diff --git a/test/features/routines/providers/workout_logs_notifier_test.mocks.dart b/test/features/routines/providers/workout_logs_notifier_test.mocks.dart index d01f71674..b3b60d7a2 100644 --- a/test/features/routines/providers/workout_logs_notifier_test.mocks.dart +++ b/test/features/routines/providers/workout_logs_notifier_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/routines/screens/gym_mode_test.mocks.dart b/test/features/routines/screens/gym_mode_test.mocks.dart index acd9adffc..f510f2352 100644 --- a/test/features/routines/screens/gym_mode_test.mocks.dart +++ b/test/features/routines/screens/gym_mode_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i10; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/routines/screens/routine_list_screen_test.mocks.dart b/test/features/routines/screens/routine_list_screen_test.mocks.dart index 6eda265ce..52eaba675 100644 --- a/test/features/routines/screens/routine_list_screen_test.mocks.dart +++ b/test/features/routines/screens/routine_list_screen_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i8; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/routines/screens/routine_logs_screen_test.mocks.dart b/test/features/routines/screens/routine_logs_screen_test.mocks.dart index 70b9852f4..a79bc9078 100644 --- a/test/features/routines/screens/routine_logs_screen_test.mocks.dart +++ b/test/features/routines/screens/routine_logs_screen_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i5; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/routines/widgets/forms/day_form_test.mocks.dart b/test/features/routines/widgets/forms/day_form_test.mocks.dart index d5a73d483..4601ecb71 100644 --- a/test/features/routines/widgets/forms/day_form_test.mocks.dart +++ b/test/features/routines/widgets/forms/day_form_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i8; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/routines/widgets/forms/routine_form_test.mocks.dart b/test/features/routines/widgets/forms/routine_form_test.mocks.dart index 2a2ae4525..3dc7ea7a2 100644 --- a/test/features/routines/widgets/forms/routine_form_test.mocks.dart +++ b/test/features/routines/widgets/forms/routine_form_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i9; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/routines/widgets/forms/session_form_test.dart b/test/features/routines/widgets/forms/session_form_test.dart index ff45164f5..e04a00cc5 100644 --- a/test/features/routines/widgets/forms/session_form_test.dart +++ b/test/features/routines/widgets/forms/session_form_test.dart @@ -1,5 +1,4 @@ -// test/widgets/routines/forms/session_form_test.dart -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/test/features/routines/widgets/forms/session_form_test.mocks.dart b/test/features/routines/widgets/forms/session_form_test.mocks.dart index 9696415ff..0db03f51e 100644 --- a/test/features/routines/widgets/forms/session_form_test.mocks.dart +++ b/test/features/routines/widgets/forms/session_form_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i4; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/routines/widgets/forms/slot_entry_form_test.mocks.dart b/test/features/routines/widgets/forms/slot_entry_form_test.mocks.dart index 8de6255d5..2054f1cce 100644 --- a/test/features/routines/widgets/forms/slot_entry_form_test.mocks.dart +++ b/test/features/routines/widgets/forms/slot_entry_form_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i8; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/routines/widgets/forms/slot_test.mocks.dart b/test/features/routines/widgets/forms/slot_test.mocks.dart index db105852b..4885e65de 100644 --- a/test/features/routines/widgets/forms/slot_test.mocks.dart +++ b/test/features/routines/widgets/forms/slot_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i8; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/routines/widgets/gym_mode/log_page_test.mocks.dart b/test/features/routines/widgets/gym_mode/log_page_test.mocks.dart index ac6599b78..95028d5f6 100644 --- a/test/features/routines/widgets/gym_mode/log_page_test.mocks.dart +++ b/test/features/routines/widgets/gym_mode/log_page_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/routines/widgets/gym_mode/session_page_test.mocks.dart b/test/features/routines/widgets/gym_mode/session_page_test.mocks.dart index 78a3a3e01..52f0f1727 100644 --- a/test/features/routines/widgets/gym_mode/session_page_test.mocks.dart +++ b/test/features/routines/widgets/gym_mode/session_page_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i4; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/routines/widgets/routine_edit_test.mocks.dart b/test/features/routines/widgets/routine_edit_test.mocks.dart index 101efe037..d421764b6 100644 --- a/test/features/routines/widgets/routine_edit_test.mocks.dart +++ b/test/features/routines/widgets/routine_edit_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i8; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/features/trophies/providers/trophy_repository_test.mocks.dart b/test/features/trophies/providers/trophy_repository_test.mocks.dart index 0b5c39f05..3ac70de42 100644 --- a/test/features/trophies/providers/trophy_repository_test.mocks.dart +++ b/test/features/trophies/providers/trophy_repository_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i5; import 'package:http/http.dart' as _i2; diff --git a/test/powersync/api_client_test.mocks.dart b/test/powersync/api_client_test.mocks.dart index 7f4391931..fd21ad33f 100644 --- a/test/powersync/api_client_test.mocks.dart +++ b/test/powersync/api_client_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'dart:convert' as _i4; import 'dart:typed_data' as _i6; diff --git a/test/powersync/connector_test.mocks.dart b/test/powersync/connector_test.mocks.dart index a6a96776d..8d1859d10 100644 --- a/test/powersync/connector_test.mocks.dart +++ b/test/powersync/connector_test.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i5; import 'package:http/http.dart' as _i2; diff --git a/test/screenshots/screenshots_01_dashboard.dart b/test/screenshots/screenshots_01_dashboard.dart index 3c1d32c2f..84e07c9c8 100644 --- a/test/screenshots/screenshots_01_dashboard.dart +++ b/test/screenshots/screenshots_01_dashboard.dart @@ -18,7 +18,6 @@ import 'package:drift/native.dart'; import 'package:flutter/material.dart'; -// import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; diff --git a/test/screenshots/screenshots_01_dashboard.mocks.dart b/test/screenshots/screenshots_01_dashboard.mocks.dart index 624ee51c6..23fb39bf7 100644 --- a/test/screenshots/screenshots_01_dashboard.mocks.dart +++ b/test/screenshots/screenshots_01_dashboard.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i11; import 'package:health_bridge/health.dart' as _i44; diff --git a/test/screenshots/screenshots_02_workout.dart b/test/screenshots/screenshots_02_workout.dart index fe7544cd3..08dca3ae6 100644 --- a/test/screenshots/screenshots_02_workout.dart +++ b/test/screenshots/screenshots_02_workout.dart @@ -14,11 +14,10 @@ * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . - */ +*/ import 'package:drift/native.dart'; import 'package:flutter/material.dart'; -// import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; diff --git a/test/screenshots/screenshots_02_workout.mocks.dart b/test/screenshots/screenshots_02_workout.mocks.dart index 38461ef3b..01c7a5c00 100644 --- a/test/screenshots/screenshots_02_workout.mocks.dart +++ b/test/screenshots/screenshots_02_workout.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i8; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/screenshots/screenshots_03_gym_mode.dart b/test/screenshots/screenshots_03_gym_mode.dart index dfa297fba..b8232b354 100644 --- a/test/screenshots/screenshots_03_gym_mode.dart +++ b/test/screenshots/screenshots_03_gym_mode.dart @@ -18,7 +18,6 @@ import 'package:drift/native.dart'; import 'package:flutter/material.dart'; -// import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod; import 'package:wger/database/powersync/database.dart'; import 'package:wger/features/exercises/providers/exercise_filter_state.dart'; diff --git a/test/screenshots/screenshots_04_measurements.dart b/test/screenshots/screenshots_04_measurements.dart index 8c06cc7dd..c8534c030 100644 --- a/test/screenshots/screenshots_04_measurements.dart +++ b/test/screenshots/screenshots_04_measurements.dart @@ -18,7 +18,6 @@ import 'package:drift/native.dart'; import 'package:flutter/material.dart'; -// import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; diff --git a/test/screenshots/screenshots_04_measurements.mocks.dart b/test/screenshots/screenshots_04_measurements.mocks.dart index ef81457af..1f3e80919 100644 --- a/test/screenshots/screenshots_04_measurements.mocks.dart +++ b/test/screenshots/screenshots_04_measurements.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/screenshots/screenshots_05_nutritional_plan.dart b/test/screenshots/screenshots_05_nutritional_plan.dart index bb3e45ee0..cebbf01f1 100644 --- a/test/screenshots/screenshots_05_nutritional_plan.dart +++ b/test/screenshots/screenshots_05_nutritional_plan.dart @@ -18,7 +18,6 @@ import 'package:drift/native.dart'; import 'package:flutter/material.dart'; -// import 'package:material_ui/material_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; diff --git a/test/screenshots/screenshots_05_nutritional_plan.mocks.dart b/test/screenshots/screenshots_05_nutritional_plan.mocks.dart index ecf475d6b..7e8fbc846 100644 --- a/test/screenshots/screenshots_05_nutritional_plan.mocks.dart +++ b/test/screenshots/screenshots_05_nutritional_plan.mocks.dart @@ -3,6 +3,7 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes + import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/theme/dynamic_color_test.dart b/test/theme/dynamic_color_test.dart index 6a3726bd4..57976d416 100644 --- a/test/theme/dynamic_color_test.dart +++ b/test/theme/dynamic_color_test.dart @@ -16,7 +16,6 @@ * along with this program. If not, see . */ -// import 'package:material_ui/material_ui.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:wger/theme/dynamic_color.dart'; diff --git a/test_data/nutritional_plans.dart b/test_data/nutritional_plans.dart index ec212af97..e3ce6e17e 100644 --- a/test_data/nutritional_plans.dart +++ b/test_data/nutritional_plans.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:wger/features/nutrition/models/ingredient.dart'; import 'package:wger/features/nutrition/models/log.dart'; import 'package:wger/features/nutrition/models/meal.dart'; diff --git a/test_data/screenshots/nutrition.dart b/test_data/screenshots/nutrition.dart index 7a2de1ab7..3e741f52a 100644 --- a/test_data/screenshots/nutrition.dart +++ b/test_data/screenshots/nutrition.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:material_ui/material_ui.dart'; +import 'package:flutter/material.dart'; import 'package:wger/features/nutrition/models/ingredient.dart'; import 'package:wger/features/nutrition/models/log.dart'; import 'package:wger/features/nutrition/models/meal.dart';