From 5c947375eeb20896a5c7d1b1f7e5e4b3d3603e1c Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Sun, 10 Nov 2024 14:48:03 +0100 Subject: [PATCH] Rename provider --- integration_test/1_dashboard.dart | 2 +- integration_test/2_workout.dart | 2 +- integration_test/3_gym_mode.dart | 2 +- lib/helpers/ui.dart | 2 +- lib/main.dart | 2 +- lib/providers/{workout_plans.dart => routines.dart} | 0 lib/screens/gym_mode.dart | 2 +- lib/screens/home_tabs_screen.dart | 2 +- lib/screens/workout_plan_screen.dart | 2 +- lib/screens/workout_plans_screen.dart | 2 +- lib/widgets/core/app_bar.dart | 2 +- lib/widgets/dashboard/calendar.dart | 2 +- lib/widgets/dashboard/widgets.dart | 2 +- lib/widgets/workouts/day.dart | 2 +- lib/widgets/workouts/forms.dart | 2 +- lib/widgets/workouts/gym_mode.dart | 2 +- lib/widgets/workouts/log.dart | 2 +- lib/widgets/workouts/workout_plans_list.dart | 2 +- test/workout/gym_mode_screen_test.dart | 2 +- test/workout/repetition_unit_form_widget_test.dart | 2 +- test/workout/repetition_unit_form_widget_test.mocks.dart | 2 +- test/workout/weight_unit_form_widget_test.dart | 2 +- test/workout/workout_day_form_test.dart | 2 +- test/workout/workout_day_form_test.mocks.dart | 2 +- test/workout/workout_form_test.dart | 2 +- test/workout/workout_form_test.mocks.dart | 2 +- test/workout/workout_plan_screen_test.dart | 2 +- test/workout/workout_plans_screen_test.dart | 2 +- test/workout/workout_provider_test.dart | 2 +- test/workout/workout_set_form_test.dart | 2 +- test/workout/workout_set_form_test.mocks.dart | 2 +- 31 files changed, 30 insertions(+), 30 deletions(-) rename lib/providers/{workout_plans.dart => routines.dart} (100%) diff --git a/integration_test/1_dashboard.dart b/integration_test/1_dashboard.dart index 89bdcd0a..4dffc218 100644 --- a/integration_test/1_dashboard.dart +++ b/integration_test/1_dashboard.dart @@ -5,8 +5,8 @@ import 'package:provider/provider.dart'; import 'package:wger/providers/body_weight.dart'; import 'package:wger/providers/measurement.dart'; import 'package:wger/providers/nutrition.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/providers/user.dart'; -import 'package:wger/providers/workout_plans.dart'; import 'package:wger/screens/dashboard.dart'; import 'package:wger/theme/theme.dart'; diff --git a/integration_test/2_workout.dart b/integration_test/2_workout.dart index 45509b02..7c3c6cba 100644 --- a/integration_test/2_workout.dart +++ b/integration_test/2_workout.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:mockito/mockito.dart'; import 'package:provider/provider.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/screens/workout_plan_screen.dart'; import 'package:wger/theme/theme.dart'; diff --git a/integration_test/3_gym_mode.dart b/integration_test/3_gym_mode.dart index cf016822..8f39f946 100644 --- a/integration_test/3_gym_mode.dart +++ b/integration_test/3_gym_mode.dart @@ -3,7 +3,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:mockito/mockito.dart'; import 'package:provider/provider.dart'; import 'package:wger/providers/exercises.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/screens/gym_mode.dart'; import 'package:wger/screens/workout_plan_screen.dart'; import 'package:wger/theme/theme.dart'; diff --git a/lib/helpers/ui.dart b/lib/helpers/ui.dart index 65438843..18398cf7 100644 --- a/lib/helpers/ui.dart +++ b/lib/helpers/ui.dart @@ -25,7 +25,7 @@ import 'package:wger/exceptions/http_exception.dart'; import 'package:wger/models/exercises/exercise.dart'; import 'package:wger/models/exercises/translation.dart'; import 'package:wger/models/workouts/log.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; void showErrorDialog(dynamic exception, BuildContext context) { // log('showErrorDialog: '); diff --git a/lib/main.dart b/lib/main.dart index 3707a58a..e8f671f2 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -27,8 +27,8 @@ import 'package:wger/providers/exercises.dart'; import 'package:wger/providers/gallery.dart'; import 'package:wger/providers/measurement.dart'; import 'package:wger/providers/nutrition.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/providers/user.dart'; -import 'package:wger/providers/workout_plans.dart'; import 'package:wger/screens/add_exercise_screen.dart'; import 'package:wger/screens/auth_screen.dart'; import 'package:wger/screens/dashboard.dart'; diff --git a/lib/providers/workout_plans.dart b/lib/providers/routines.dart similarity index 100% rename from lib/providers/workout_plans.dart rename to lib/providers/routines.dart diff --git a/lib/screens/gym_mode.dart b/lib/screens/gym_mode.dart index 999558d2..4a30b555 100644 --- a/lib/screens/gym_mode.dart +++ b/lib/screens/gym_mode.dart @@ -19,7 +19,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:wger/models/workouts/day_data.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/widgets/workouts/gym_mode.dart'; class GymModeScreen extends StatelessWidget { diff --git a/lib/screens/home_tabs_screen.dart b/lib/screens/home_tabs_screen.dart index af6a2929..70837a6e 100644 --- a/lib/screens/home_tabs_screen.dart +++ b/lib/screens/home_tabs_screen.dart @@ -29,8 +29,8 @@ import 'package:wger/providers/exercises.dart'; import 'package:wger/providers/gallery.dart'; import 'package:wger/providers/measurement.dart'; import 'package:wger/providers/nutrition.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/providers/user.dart'; -import 'package:wger/providers/workout_plans.dart'; import 'package:wger/screens/dashboard.dart'; import 'package:wger/screens/gallery_screen.dart'; import 'package:wger/screens/nutritional_plans_screen.dart'; diff --git a/lib/screens/workout_plan_screen.dart b/lib/screens/workout_plan_screen.dart index 1c398138..6b5767cb 100644 --- a/lib/screens/workout_plan_screen.dart +++ b/lib/screens/workout_plan_screen.dart @@ -20,7 +20,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:provider/provider.dart'; import 'package:wger/models/workouts/routine.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/screens/form_screen.dart'; import 'package:wger/theme/theme.dart'; import 'package:wger/widgets/workouts/forms.dart'; diff --git a/lib/screens/workout_plans_screen.dart b/lib/screens/workout_plans_screen.dart index 3f61d640..25bf0e48 100644 --- a/lib/screens/workout_plans_screen.dart +++ b/lib/screens/workout_plans_screen.dart @@ -20,7 +20,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:provider/provider.dart'; import 'package:wger/models/workouts/routine.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/screens/form_screen.dart'; import 'package:wger/widgets/workouts/app_bar.dart'; import 'package:wger/widgets/workouts/forms.dart'; diff --git a/lib/widgets/core/app_bar.dart b/lib/widgets/core/app_bar.dart index 5c62b2a4..9faab5e9 100644 --- a/lib/widgets/core/app_bar.dart +++ b/lib/widgets/core/app_bar.dart @@ -23,8 +23,8 @@ import 'package:wger/providers/auth.dart'; import 'package:wger/providers/body_weight.dart'; import 'package:wger/providers/gallery.dart'; import 'package:wger/providers/nutrition.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/providers/user.dart'; -import 'package:wger/providers/workout_plans.dart'; import 'package:wger/screens/form_screen.dart'; import 'package:wger/widgets/core/about.dart'; import 'package:wger/widgets/core/settings.dart'; diff --git a/lib/widgets/dashboard/calendar.dart b/lib/widgets/dashboard/calendar.dart index d5a534f3..27b9ab57 100644 --- a/lib/widgets/dashboard/calendar.dart +++ b/lib/widgets/dashboard/calendar.dart @@ -27,7 +27,7 @@ import 'package:wger/models/workouts/session.dart'; import 'package:wger/providers/body_weight.dart'; import 'package:wger/providers/measurement.dart'; import 'package:wger/providers/nutrition.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/theme/theme.dart'; /// Types of events diff --git a/lib/widgets/dashboard/widgets.dart b/lib/widgets/dashboard/widgets.dart index 9a069c31..8ec90f2e 100644 --- a/lib/widgets/dashboard/widgets.dart +++ b/lib/widgets/dashboard/widgets.dart @@ -28,8 +28,8 @@ import 'package:wger/models/workouts/routine.dart'; import 'package:wger/providers/body_weight.dart'; import 'package:wger/providers/measurement.dart'; import 'package:wger/providers/nutrition.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/providers/user.dart'; -import 'package:wger/providers/workout_plans.dart'; import 'package:wger/screens/form_screen.dart'; import 'package:wger/screens/gym_mode.dart'; import 'package:wger/screens/log_meals_screen.dart'; diff --git a/lib/widgets/workouts/day.dart b/lib/widgets/workouts/day.dart index a24be3f5..1de8b866 100644 --- a/lib/widgets/workouts/day.dart +++ b/lib/widgets/workouts/day.dart @@ -23,7 +23,7 @@ import 'package:wger/helpers/consts.dart'; import 'package:wger/models/workouts/day_data.dart'; import 'package:wger/models/workouts/set_config_data.dart'; import 'package:wger/models/workouts/slot_data.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/screens/form_screen.dart'; import 'package:wger/screens/gym_mode.dart'; import 'package:wger/widgets/core/core.dart'; diff --git a/lib/widgets/workouts/forms.dart b/lib/widgets/workouts/forms.dart index 483fe992..4ad12991 100644 --- a/lib/widgets/workouts/forms.dart +++ b/lib/widgets/workouts/forms.dart @@ -29,7 +29,7 @@ import 'package:wger/models/workouts/slot.dart'; import 'package:wger/models/workouts/slot_entry.dart'; import 'package:wger/models/workouts/weight_unit.dart'; import 'package:wger/providers/exercises.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/screens/add_exercise_screen.dart'; import 'package:wger/screens/workout_plan_screen.dart'; import 'package:wger/widgets/exercises/images.dart'; diff --git a/lib/widgets/workouts/gym_mode.dart b/lib/widgets/workouts/gym_mode.dart index 926edac6..ba5e19f9 100644 --- a/lib/widgets/workouts/gym_mode.dart +++ b/lib/widgets/workouts/gym_mode.dart @@ -38,7 +38,7 @@ import 'package:wger/models/workouts/session.dart'; import 'package:wger/models/workouts/slot.dart'; import 'package:wger/models/workouts/slot_entry.dart'; import 'package:wger/providers/exercises.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/theme/theme.dart'; import 'package:wger/widgets/core/core.dart'; import 'package:wger/widgets/exercises/images.dart'; diff --git a/lib/widgets/workouts/log.dart b/lib/widgets/workouts/log.dart index d4dbccf1..0bcdffb0 100644 --- a/lib/widgets/workouts/log.dart +++ b/lib/widgets/workouts/log.dart @@ -24,7 +24,7 @@ import 'package:wger/helpers/ui.dart'; import 'package:wger/models/exercises/exercise.dart'; import 'package:wger/models/workouts/log.dart'; import 'package:wger/models/workouts/session.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/widgets/measurements/charts.dart'; import 'package:wger/widgets/workouts/charts.dart'; diff --git a/lib/widgets/workouts/workout_plans_list.dart b/lib/widgets/workouts/workout_plans_list.dart index 326a0bd5..40589d98 100644 --- a/lib/widgets/workouts/workout_plans_list.dart +++ b/lib/widgets/workouts/workout_plans_list.dart @@ -20,7 +20,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/screens/workout_plan_screen.dart'; import 'package:wger/widgets/core/text_prompt.dart'; diff --git a/test/workout/gym_mode_screen_test.dart b/test/workout/gym_mode_screen_test.dart index fa645f20..5ae56673 100644 --- a/test/workout/gym_mode_screen_test.dart +++ b/test/workout/gym_mode_screen_test.dart @@ -24,7 +24,7 @@ import 'package:mockito/mockito.dart'; import 'package:provider/provider.dart'; import 'package:wger/providers/base_provider.dart'; import 'package:wger/providers/exercises.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/screens/gym_mode.dart'; import 'package:wger/screens/workout_plan_screen.dart'; import 'package:wger/widgets/workouts/forms.dart'; diff --git a/test/workout/repetition_unit_form_widget_test.dart b/test/workout/repetition_unit_form_widget_test.dart index 5b1db5b0..f35170a0 100644 --- a/test/workout/repetition_unit_form_widget_test.dart +++ b/test/workout/repetition_unit_form_widget_test.dart @@ -24,7 +24,7 @@ import 'package:mockito/mockito.dart'; import 'package:provider/provider.dart'; import 'package:wger/models/workouts/repetition_unit.dart'; import 'package:wger/models/workouts/slot_entry.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/screens/workout_plan_screen.dart'; import 'package:wger/widgets/workouts/forms.dart'; diff --git a/test/workout/repetition_unit_form_widget_test.mocks.dart b/test/workout/repetition_unit_form_widget_test.mocks.dart index d9e7b7f1..10431da4 100644 --- a/test/workout/repetition_unit_form_widget_test.mocks.dart +++ b/test/workout/repetition_unit_form_widget_test.mocks.dart @@ -20,7 +20,7 @@ import 'package:wger/models/workouts/slot.dart' as _i7; import 'package:wger/models/workouts/slot_entry.dart' as _i8; import 'package:wger/models/workouts/weight_unit.dart' as _i3; import 'package:wger/providers/base_provider.dart' as _i2; -import 'package:wger/providers/workout_plans.dart' as _i11; +import 'package:wger/providers/routines.dart' as _i11; // ignore_for_file: type=lint // ignore_for_file: avoid_redundant_argument_values diff --git a/test/workout/weight_unit_form_widget_test.dart b/test/workout/weight_unit_form_widget_test.dart index e1423526..77759a0b 100644 --- a/test/workout/weight_unit_form_widget_test.dart +++ b/test/workout/weight_unit_form_widget_test.dart @@ -25,7 +25,7 @@ import 'package:provider/provider.dart'; import 'package:wger/models/workouts/slot_entry.dart'; import 'package:wger/models/workouts/weight_unit.dart'; import 'package:wger/providers/body_weight.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/screens/workout_plan_screen.dart'; import 'package:wger/widgets/workouts/forms.dart'; diff --git a/test/workout/workout_day_form_test.dart b/test/workout/workout_day_form_test.dart index 4fd05294..a5afb52b 100644 --- a/test/workout/workout_day_form_test.dart +++ b/test/workout/workout_day_form_test.dart @@ -25,7 +25,7 @@ import 'package:provider/provider.dart'; import 'package:wger/helpers/consts.dart'; import 'package:wger/models/workouts/day.dart'; import 'package:wger/models/workouts/routine.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/widgets/workouts/forms.dart'; import '../../test_data/routines.dart'; diff --git a/test/workout/workout_day_form_test.mocks.dart b/test/workout/workout_day_form_test.mocks.dart index 10f1cad7..8e63d13f 100644 --- a/test/workout/workout_day_form_test.mocks.dart +++ b/test/workout/workout_day_form_test.mocks.dart @@ -20,7 +20,7 @@ import 'package:wger/models/workouts/slot.dart' as _i7; import 'package:wger/models/workouts/slot_entry.dart' as _i8; import 'package:wger/models/workouts/weight_unit.dart' as _i3; import 'package:wger/providers/base_provider.dart' as _i2; -import 'package:wger/providers/workout_plans.dart' as _i11; +import 'package:wger/providers/routines.dart' as _i11; // ignore_for_file: type=lint // ignore_for_file: avoid_redundant_argument_values diff --git a/test/workout/workout_form_test.dart b/test/workout/workout_form_test.dart index 0315383d..24a5c61d 100644 --- a/test/workout/workout_form_test.dart +++ b/test/workout/workout_form_test.dart @@ -24,7 +24,7 @@ import 'package:mockito/mockito.dart'; import 'package:provider/provider.dart'; import 'package:wger/helpers/consts.dart'; import 'package:wger/models/workouts/routine.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/screens/workout_plan_screen.dart'; import 'package:wger/widgets/workouts/forms.dart'; diff --git a/test/workout/workout_form_test.mocks.dart b/test/workout/workout_form_test.mocks.dart index 8572a7b8..201b8a7b 100644 --- a/test/workout/workout_form_test.mocks.dart +++ b/test/workout/workout_form_test.mocks.dart @@ -20,7 +20,7 @@ import 'package:wger/models/workouts/slot.dart' as _i7; import 'package:wger/models/workouts/slot_entry.dart' as _i8; import 'package:wger/models/workouts/weight_unit.dart' as _i3; import 'package:wger/providers/base_provider.dart' as _i2; -import 'package:wger/providers/workout_plans.dart' as _i11; +import 'package:wger/providers/routines.dart' as _i11; // ignore_for_file: type=lint // ignore_for_file: avoid_redundant_argument_values diff --git a/test/workout/workout_plan_screen_test.dart b/test/workout/workout_plan_screen_test.dart index ab7e4900..94a71d39 100644 --- a/test/workout/workout_plan_screen_test.dart +++ b/test/workout/workout_plan_screen_test.dart @@ -25,7 +25,7 @@ import 'package:provider/provider.dart'; import 'package:wger/database/exercises/exercise_database.dart'; import 'package:wger/providers/base_provider.dart'; import 'package:wger/providers/exercises.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/screens/workout_plan_screen.dart'; import '../../test_data/routines.dart'; diff --git a/test/workout/workout_plans_screen_test.dart b/test/workout/workout_plans_screen_test.dart index 85ae64fd..4d9f5523 100644 --- a/test/workout/workout_plans_screen_test.dart +++ b/test/workout/workout_plans_screen_test.dart @@ -28,7 +28,7 @@ import 'package:wger/database/exercises/exercise_database.dart'; import 'package:wger/models/workouts/routine.dart'; import 'package:wger/providers/base_provider.dart'; import 'package:wger/providers/exercises.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/screens/form_screen.dart'; import 'package:wger/screens/workout_plans_screen.dart'; import 'package:wger/widgets/nutrition/forms.dart'; diff --git a/test/workout/workout_provider_test.dart b/test/workout/workout_provider_test.dart index b33d0840..5bf35c1d 100644 --- a/test/workout/workout_provider_test.dart +++ b/test/workout/workout_provider_test.dart @@ -31,7 +31,7 @@ import 'package:wger/models/workouts/routine.dart'; import 'package:wger/models/workouts/weight_unit.dart'; import 'package:wger/providers/base_provider.dart'; import 'package:wger/providers/exercises.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import '../fixtures/fixture_reader.dart'; import 'workout_provider_test.mocks.dart'; diff --git a/test/workout/workout_set_form_test.dart b/test/workout/workout_set_form_test.dart index 145fb27c..9cc21914 100644 --- a/test/workout/workout_set_form_test.dart +++ b/test/workout/workout_set_form_test.dart @@ -28,7 +28,7 @@ import 'package:wger/models/workouts/slot.dart'; import 'package:wger/models/workouts/slot_entry.dart'; import 'package:wger/providers/base_provider.dart'; import 'package:wger/providers/exercises.dart'; -import 'package:wger/providers/workout_plans.dart'; +import 'package:wger/providers/routines.dart'; import 'package:wger/widgets/workouts/forms.dart'; import '../../test_data/exercises.dart'; diff --git a/test/workout/workout_set_form_test.mocks.dart b/test/workout/workout_set_form_test.mocks.dart index e18882e5..d56e84d4 100644 --- a/test/workout/workout_set_form_test.mocks.dart +++ b/test/workout/workout_set_form_test.mocks.dart @@ -28,7 +28,7 @@ import 'package:wger/models/workouts/weight_unit.dart' as _i11; import 'package:wger/providers/auth.dart' as _i9; import 'package:wger/providers/base_provider.dart' as _i2; import 'package:wger/providers/exercises.dart' as _i19; -import 'package:wger/providers/workout_plans.dart' as _i22; +import 'package:wger/providers/routines.dart' as _i22; // ignore_for_file: type=lint // ignore_for_file: avoid_redundant_argument_values