From 47e36eff4852cf6528095a1acd649232793b714c Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Sun, 10 Nov 2024 15:13:30 +0100 Subject: [PATCH] More refactoring of routine screens and widgets --- integration_test/2_workout.dart | 4 +- integration_test/3_gym_mode.dart | 4 +- lib/main.dart | 10 +- lib/screens/home_tabs_screen.dart | 4 +- ...s_screen.dart => routine_list_screen.dart} | 4 +- ...n_screen.dart => routine_logs_screen.dart} | 37 +---- lib/screens/routine_screen.dart | 135 ++++++++++++++++++ lib/widgets/dashboard/widgets.dart | 4 +- lib/widgets/routines/forms.dart | 4 +- ...t_plan_detail.dart => routine_detail.dart} | 36 +---- lib/widgets/routines/workout_logs.dart | 14 +- lib/widgets/routines/workout_plans_list.dart | 4 +- test/workout/gym_mode_screen_test.dart | 4 +- .../repetition_unit_form_widget_test.dart | 4 +- .../workout/weight_unit_form_widget_test.dart | 4 +- test/workout/workout_form_test.dart | 4 +- test/workout/workout_plan_screen_test.dart | 6 +- test/workout/workout_plans_screen_test.dart | 4 +- 18 files changed, 179 insertions(+), 107 deletions(-) rename lib/screens/{workout_plans_screen.dart => routine_list_screen.dart} (96%) rename lib/screens/{workout_plan_screen.dart => routine_logs_screen.dart} (83%) create mode 100644 lib/screens/routine_screen.dart rename lib/widgets/routines/{workout_plan_detail.dart => routine_detail.dart} (61%) diff --git a/integration_test/2_workout.dart b/integration_test/2_workout.dart index 7c3c6cba..fb58bb20 100644 --- a/integration_test/2_workout.dart +++ b/integration_test/2_workout.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/routines.dart'; -import 'package:wger/screens/workout_plan_screen.dart'; +import 'package:wger/screens/routine_screen.dart'; import 'package:wger/theme/theme.dart'; import '../test/workout/workout_form_test.mocks.dart'; @@ -35,7 +35,7 @@ Widget createWorkoutDetailScreen({locale = 'en'}) { onPressed: () => key.currentState!.push( MaterialPageRoute( settings: RouteSettings(arguments: workout), - builder: (_) => const WorkoutPlanScreen(), + builder: (_) => const RoutineScreen(), ), ), child: const SizedBox(), diff --git a/integration_test/3_gym_mode.dart b/integration_test/3_gym_mode.dart index 8f39f946..4f14e806 100644 --- a/integration_test/3_gym_mode.dart +++ b/integration_test/3_gym_mode.dart @@ -5,7 +5,7 @@ import 'package:provider/provider.dart'; import 'package:wger/providers/exercises.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/screens/routine_screen.dart'; import 'package:wger/theme/theme.dart'; import '../test/utils.dart'; @@ -50,7 +50,7 @@ Widget createGymModeScreen({locale = 'en'}) { child: const SizedBox(), ), routes: { - WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen(), + RoutineScreen.routeName: (ctx) => const RoutineScreen(), }, ), ), diff --git a/lib/main.dart b/lib/main.dart index e8f671f2..5e0002e3 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -45,10 +45,11 @@ import 'package:wger/screens/measurement_entries_screen.dart'; import 'package:wger/screens/nutritional_diary_screen.dart'; import 'package:wger/screens/nutritional_plan_screen.dart'; import 'package:wger/screens/nutritional_plans_screen.dart'; +import 'package:wger/screens/routine_list_screen.dart'; +import 'package:wger/screens/routine_logs_screen.dart'; +import 'package:wger/screens/routine_screen.dart'; import 'package:wger/screens/splash_screen.dart'; import 'package:wger/screens/weight_screen.dart'; -import 'package:wger/screens/workout_plan_screen.dart'; -import 'package:wger/screens/workout_plans_screen.dart'; import 'package:wger/theme/theme.dart'; import 'package:wger/widgets/core/about.dart'; import 'package:wger/widgets/core/settings.dart'; @@ -164,8 +165,9 @@ class MyApp extends StatelessWidget { LogMealsScreen.routeName: (ctx) => const LogMealsScreen(), LogMealScreen.routeName: (ctx) => const LogMealScreen(), WeightScreen.routeName: (ctx) => const WeightScreen(), - WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen(), - WorkoutPlansScreen.routeName: (ctx) => const WorkoutPlansScreen(), + RoutineScreen.routeName: (ctx) => const RoutineScreen(), + WorkoutLogsScreen.routeName: (ctx) => const WorkoutLogsScreen(), + RoutineListScreen.routeName: (ctx) => const RoutineListScreen(), ExercisesScreen.routeName: (ctx) => const ExercisesScreen(), ExerciseDetailScreen.routeName: (ctx) => const ExerciseDetailScreen(), AddExerciseScreen.routeName: (ctx) => const AddExerciseScreen(), diff --git a/lib/screens/home_tabs_screen.dart b/lib/screens/home_tabs_screen.dart index 70837a6e..5e791d80 100644 --- a/lib/screens/home_tabs_screen.dart +++ b/lib/screens/home_tabs_screen.dart @@ -34,8 +34,8 @@ import 'package:wger/providers/user.dart'; import 'package:wger/screens/dashboard.dart'; import 'package:wger/screens/gallery_screen.dart'; import 'package:wger/screens/nutritional_plans_screen.dart'; +import 'package:wger/screens/routine_list_screen.dart'; import 'package:wger/screens/weight_screen.dart'; -import 'package:wger/screens/workout_plans_screen.dart'; class HomeTabsScreen extends StatefulWidget { const HomeTabsScreen(); @@ -65,7 +65,7 @@ class _HomeTabsScreenState extends State with SingleTickerProvid final _screenList = [ const DashboardScreen(), - const WorkoutPlansScreen(), + const RoutineListScreen(), const NutritionalPlansScreen(), const WeightScreen(), const GalleryScreen(), diff --git a/lib/screens/workout_plans_screen.dart b/lib/screens/routine_list_screen.dart similarity index 96% rename from lib/screens/workout_plans_screen.dart rename to lib/screens/routine_list_screen.dart index 724ede26..ee39edda 100644 --- a/lib/screens/workout_plans_screen.dart +++ b/lib/screens/routine_list_screen.dart @@ -26,8 +26,8 @@ import 'package:wger/widgets/routines/app_bar.dart'; import 'package:wger/widgets/routines/forms.dart'; import 'package:wger/widgets/routines/workout_plans_list.dart'; -class WorkoutPlansScreen extends StatelessWidget { - const WorkoutPlansScreen(); +class RoutineListScreen extends StatelessWidget { + const RoutineListScreen(); static const routeName = '/workout-plans-list'; diff --git a/lib/screens/workout_plan_screen.dart b/lib/screens/routine_logs_screen.dart similarity index 83% rename from lib/screens/workout_plan_screen.dart rename to lib/screens/routine_logs_screen.dart index e7a6db7b..4d6aa7df 100644 --- a/lib/screens/workout_plan_screen.dart +++ b/lib/screens/routine_logs_screen.dart @@ -25,51 +25,22 @@ import 'package:wger/screens/form_screen.dart'; import 'package:wger/theme/theme.dart'; import 'package:wger/widgets/routines/forms.dart'; import 'package:wger/widgets/routines/workout_logs.dart'; -import 'package:wger/widgets/routines/workout_plan_detail.dart'; - -enum WorkoutScreenMode { - workout, - log, -} enum WorkoutOptions { edit, delete, } -class WorkoutPlanScreen extends StatefulWidget { - const WorkoutPlanScreen(); +class WorkoutLogsScreen extends StatelessWidget { + const WorkoutLogsScreen(); - static const routeName = '/workout-plan-detail'; - - @override - _WorkoutPlanScreenState createState() => _WorkoutPlanScreenState(); -} - -class _WorkoutPlanScreenState extends State { - WorkoutScreenMode _mode = WorkoutScreenMode.workout; - - void _changeMode(WorkoutScreenMode newMode) { - setState(() { - _mode = newMode; - }); - } + static const routeName = '/workout-logs'; Future _loadFullWorkout(BuildContext context, int routineId) { return Provider.of(context, listen: false) .fetchAndSetWorkoutPlanFull(routineId); } - Widget getBody(Routine routine) { - switch (_mode) { - case WorkoutScreenMode.workout: - return WorkoutPlanDetail(routine, _changeMode); - - case WorkoutScreenMode.log: - return WorkoutLogs(routine, _changeMode); - } - } - @override Widget build(BuildContext context) { const appBarForeground = Colors.white; @@ -141,7 +112,7 @@ class _WorkoutPlanScreenState extends State { ) else Consumer( - builder: (context, value, child) => getBody(routine), + builder: (context, value, child) => WorkoutLogs(routine), ), ], ), diff --git a/lib/screens/routine_screen.dart b/lib/screens/routine_screen.dart new file mode 100644 index 00000000..5f8800e3 --- /dev/null +++ b/lib/screens/routine_screen.dart @@ -0,0 +1,135 @@ +/* + * This file is part of wger Workout Manager . + * Copyright (C) 2020, 2021 wger Team + * + * wger Workout Manager is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * wger Workout Manager is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * 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:flutter_gen/gen_l10n/app_localizations.dart'; +import 'package:provider/provider.dart'; +import 'package:wger/models/workouts/routine.dart'; +import 'package:wger/providers/routines.dart'; +import 'package:wger/screens/form_screen.dart'; +import 'package:wger/screens/routine_logs_screen.dart'; +import 'package:wger/theme/theme.dart'; +import 'package:wger/widgets/routines/forms.dart'; +import 'package:wger/widgets/routines/routine_detail.dart'; + +enum WorkoutOptions { + edit, + delete, + logs, +} + +class RoutineScreen extends StatelessWidget { + const RoutineScreen(); + + static const routeName = '/routine-detail'; + + Future _loadFullWorkout(BuildContext context, int routineId) { + return Provider.of(context, listen: false) + .fetchAndSetWorkoutPlanFull(routineId); + } + + @override + Widget build(BuildContext context) { + const appBarForeground = Colors.white; + final routine = ModalRoute.of(context)!.settings.arguments as Routine; + + return Scaffold( + body: CustomScrollView( + slivers: [ + SliverAppBar( + pinned: true, + iconTheme: const IconThemeData(color: appBarForeground), + backgroundColor: wgerPrimaryColor, + flexibleSpace: FlexibleSpaceBar( + titlePadding: const EdgeInsets.fromLTRB(56, 0, 56, 16), + title: Text( + routine.name, + style: Theme.of(context).textTheme.titleLarge?.copyWith(color: appBarForeground), + ), + ), + actions: [ + PopupMenuButton( + icon: const Icon(Icons.more_vert, color: appBarForeground), + onSelected: (value) { + switch (value) { + case WorkoutOptions.edit: + Navigator.pushNamed( + context, + FormScreen.routeName, + arguments: FormScreenArguments( + AppLocalizations.of(context).edit, + WorkoutForm(routine), + ), + ); + + case WorkoutOptions.logs: + Navigator.pushNamed( + context, + WorkoutLogsScreen.routeName, + arguments: routine, + ); + + case WorkoutOptions.delete: + Provider.of(context, listen: false) + .deleteWorkout(routine.id!); + Navigator.of(context).pop(); + } + }, + itemBuilder: (BuildContext context) { + return [ + PopupMenuItem( + value: WorkoutOptions.logs, + child: Text(AppLocalizations.of(context).labelWorkoutLogs), + ), + PopupMenuItem( + value: WorkoutOptions.edit, + child: Text(AppLocalizations.of(context).edit), + ), + const PopupMenuDivider(), + PopupMenuItem( + value: WorkoutOptions.delete, + child: Text(AppLocalizations.of(context).delete), + ), + ]; + }, + ), + ], + ), + FutureBuilder( + future: _loadFullWorkout(context, routine.id!), + builder: (context, AsyncSnapshot snapshot) => SliverList( + delegate: SliverChildListDelegate( + [ + if (snapshot.connectionState == ConnectionState.waiting) + const SizedBox( + height: 200, + child: Center(child: CircularProgressIndicator()), + ) + else + Consumer( + builder: (context, value, child) => RoutineDetail(routine), + ), + ], + ), + ), + ), + ], + ), + ); + } +} diff --git a/lib/widgets/dashboard/widgets.dart b/lib/widgets/dashboard/widgets.dart index 92f002a3..240df59a 100644 --- a/lib/widgets/dashboard/widgets.dart +++ b/lib/widgets/dashboard/widgets.dart @@ -35,8 +35,8 @@ import 'package:wger/screens/gym_mode.dart'; import 'package:wger/screens/log_meals_screen.dart'; import 'package:wger/screens/measurement_categories_screen.dart'; import 'package:wger/screens/nutritional_plan_screen.dart'; +import 'package:wger/screens/routine_screen.dart'; import 'package:wger/screens/weight_screen.dart'; -import 'package:wger/screens/workout_plan_screen.dart'; import 'package:wger/theme/theme.dart'; import 'package:wger/widgets/core/core.dart'; import 'package:wger/widgets/measurements/categories_card.dart'; @@ -503,7 +503,7 @@ class _DashboardWorkoutWidgetState extends State { child: Text(AppLocalizations.of(context).goToDetailPage), onPressed: () { Navigator.of(context).pushNamed( - WorkoutPlanScreen.routeName, + RoutineScreen.routeName, arguments: _workoutPlan, ); }, diff --git a/lib/widgets/routines/forms.dart b/lib/widgets/routines/forms.dart index 4ad12991..06b3601e 100644 --- a/lib/widgets/routines/forms.dart +++ b/lib/widgets/routines/forms.dart @@ -31,7 +31,7 @@ import 'package:wger/models/workouts/weight_unit.dart'; import 'package:wger/providers/exercises.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/screens/routine_screen.dart'; import 'package:wger/widgets/exercises/images.dart'; class WorkoutForm extends StatelessWidget { @@ -114,7 +114,7 @@ class WorkoutForm extends StatelessWidget { ).addRoutine(_plan); if (context.mounted) { Navigator.of(context).pushReplacementNamed( - WorkoutPlanScreen.routeName, + RoutineScreen.routeName, arguments: newPlan, ); } diff --git a/lib/widgets/routines/workout_plan_detail.dart b/lib/widgets/routines/routine_detail.dart similarity index 61% rename from lib/widgets/routines/workout_plan_detail.dart rename to lib/widgets/routines/routine_detail.dart index eb09d7cf..d9746b6d 100644 --- a/lib/widgets/routines/workout_plan_detail.dart +++ b/lib/widgets/routines/routine_detail.dart @@ -20,48 +20,24 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:wger/models/workouts/routine.dart'; import 'package:wger/screens/form_screen.dart'; -import 'package:wger/screens/workout_plan_screen.dart'; import 'package:wger/widgets/routines/day.dart'; import 'package:wger/widgets/routines/forms.dart'; -class WorkoutPlanDetail extends StatefulWidget { +class RoutineDetail extends StatelessWidget { final Routine _routine; - final Function _changeMode; - const WorkoutPlanDetail(this._routine, this._changeMode); + const RoutineDetail(this._routine); - @override - _WorkoutPlanDetailState createState() => _WorkoutPlanDetailState(); -} - -class _WorkoutPlanDetailState extends State { @override Widget build(BuildContext context) { return Column( children: [ - if (widget._routine.dayDataCurrentIteration.isNotEmpty) - Padding( - padding: const EdgeInsets.all(10), - child: ToggleButtons( - renderBorder: false, - onPressed: (int index) { - if (index == 1) { - widget._changeMode(WorkoutScreenMode.log); - } - }, - isSelected: const [true, false], - children: const [ - Icon(Icons.table_chart), - Icon(Icons.show_chart), - ], - ), - ), - if (widget._routine.description != '') + if (_routine.description.isNotEmpty) Padding( padding: const EdgeInsets.all(15), - child: Text(widget._routine.description), + child: Text(_routine.description), ), - ...widget._routine.dayDataCurrentIteration.map((dayData) => WorkoutDayWidget(dayData)), + ..._routine.dayDataCurrentIteration.map((dayData) => WorkoutDayWidget(dayData)), Column( children: [ ElevatedButton( @@ -72,7 +48,7 @@ class _WorkoutPlanDetailState extends State { FormScreen.routeName, arguments: FormScreenArguments( AppLocalizations.of(context).newDay, - DayFormWidget(widget._routine), + DayFormWidget(_routine), hasListView: true, ), ); diff --git a/lib/widgets/routines/workout_logs.dart b/lib/widgets/routines/workout_logs.dart index fcb3e4ee..4479ecce 100644 --- a/lib/widgets/routines/workout_logs.dart +++ b/lib/widgets/routines/workout_logs.dart @@ -24,15 +24,13 @@ import 'package:wger/models/exercises/exercise.dart'; import 'package:wger/models/workouts/log.dart'; import 'package:wger/models/workouts/routine.dart'; import 'package:wger/models/workouts/session.dart'; -import 'package:wger/screens/workout_plan_screen.dart'; import 'package:wger/theme/theme.dart'; import 'package:wger/widgets/routines/log.dart'; class WorkoutLogs extends StatefulWidget { final Routine _workoutPlan; - final Function _changeMode; - const WorkoutLogs(this._workoutPlan, this._changeMode); + const WorkoutLogs(this._workoutPlan); @override _WorkoutLogsState createState() => _WorkoutLogsState(); @@ -51,16 +49,6 @@ class _WorkoutLogsState extends State { Widget build(BuildContext context) { return Column( children: [ - ToggleButtons( - renderBorder: false, - onPressed: (int index) { - if (index == 0) { - widget._changeMode(WorkoutScreenMode.workout); - } - }, - isSelected: const [false, true], - children: const [Icon(Icons.table_chart), Icon(Icons.show_chart)], - ), Padding( padding: const EdgeInsets.symmetric(vertical: 10), child: Text( diff --git a/lib/widgets/routines/workout_plans_list.dart b/lib/widgets/routines/workout_plans_list.dart index 40589d98..09d26b47 100644 --- a/lib/widgets/routines/workout_plans_list.dart +++ b/lib/widgets/routines/workout_plans_list.dart @@ -21,7 +21,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:wger/providers/routines.dart'; -import 'package:wger/screens/workout_plan_screen.dart'; +import 'package:wger/screens/routine_screen.dart'; import 'package:wger/widgets/core/text_prompt.dart'; class WorkoutPlansList extends StatelessWidget { @@ -48,7 +48,7 @@ class WorkoutPlansList extends StatelessWidget { _workoutProvider.setCurrentPlan(currentWorkout.id!); Navigator.of(context).pushNamed( - WorkoutPlanScreen.routeName, + RoutineScreen.routeName, arguments: currentWorkout, ); }, diff --git a/test/workout/gym_mode_screen_test.dart b/test/workout/gym_mode_screen_test.dart index ccb21459..3b108b0b 100644 --- a/test/workout/gym_mode_screen_test.dart +++ b/test/workout/gym_mode_screen_test.dart @@ -26,7 +26,7 @@ import 'package:wger/providers/base_provider.dart'; import 'package:wger/providers/exercises.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/screens/routine_screen.dart'; import 'package:wger/widgets/routines/forms.dart'; import 'package:wger/widgets/routines/gym_mode.dart'; @@ -67,7 +67,7 @@ void main() { child: const SizedBox(), ), routes: { - WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen(), + RoutineScreen.routeName: (ctx) => const RoutineScreen(), }, ), ), diff --git a/test/workout/repetition_unit_form_widget_test.dart b/test/workout/repetition_unit_form_widget_test.dart index bc6caa07..19248b41 100644 --- a/test/workout/repetition_unit_form_widget_test.dart +++ b/test/workout/repetition_unit_form_widget_test.dart @@ -25,7 +25,7 @@ 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/routines.dart'; -import 'package:wger/screens/workout_plan_screen.dart'; +import 'package:wger/screens/routine_screen.dart'; import 'package:wger/widgets/routines/forms.dart'; import 'repetition_unit_form_widget_test.mocks.dart'; @@ -67,7 +67,7 @@ void main() { navigatorKey: key, home: Scaffold(body: RepetitionUnitInputWidget(setting1)), routes: { - WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen(), + RoutineScreen.routeName: (ctx) => const RoutineScreen(), }, ), ); diff --git a/test/workout/weight_unit_form_widget_test.dart b/test/workout/weight_unit_form_widget_test.dart index e2436134..f523880f 100644 --- a/test/workout/weight_unit_form_widget_test.dart +++ b/test/workout/weight_unit_form_widget_test.dart @@ -26,7 +26,7 @@ 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/routines.dart'; -import 'package:wger/screens/workout_plan_screen.dart'; +import 'package:wger/screens/routine_screen.dart'; import 'package:wger/widgets/routines/forms.dart'; import './workout_form_test.mocks.dart'; @@ -68,7 +68,7 @@ void main() { navigatorKey: key, home: Scaffold(body: WeightUnitInputWidget(setting1)), routes: { - WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen(), + RoutineScreen.routeName: (ctx) => const RoutineScreen(), }, ), ); diff --git a/test/workout/workout_form_test.dart b/test/workout/workout_form_test.dart index a28933d9..f6e6de53 100644 --- a/test/workout/workout_form_test.dart +++ b/test/workout/workout_form_test.dart @@ -25,7 +25,7 @@ import 'package:provider/provider.dart'; import 'package:wger/helpers/consts.dart'; import 'package:wger/models/workouts/routine.dart'; import 'package:wger/providers/routines.dart'; -import 'package:wger/screens/workout_plan_screen.dart'; +import 'package:wger/screens/routine_screen.dart'; import 'package:wger/widgets/routines/forms.dart'; import './workout_form_test.mocks.dart'; @@ -63,7 +63,7 @@ void main() { navigatorKey: key, home: Scaffold(body: WorkoutForm(workoutPlan)), routes: { - WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen(), + RoutineScreen.routeName: (ctx) => const RoutineScreen(), }, ), ); diff --git a/test/workout/workout_plan_screen_test.dart b/test/workout/workout_plan_screen_test.dart index 94a71d39..3fb4cbad 100644 --- a/test/workout/workout_plan_screen_test.dart +++ b/test/workout/workout_plan_screen_test.dart @@ -26,7 +26,7 @@ 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/routines.dart'; -import 'package:wger/screens/workout_plan_screen.dart'; +import 'package:wger/screens/routine_screen.dart'; import '../../test_data/routines.dart'; import 'workout_plan_screen_test.mocks.dart'; @@ -52,13 +52,13 @@ void main() { onPressed: () => key.currentState!.push( MaterialPageRoute( settings: RouteSettings(arguments: getWorkout()), - builder: (_) => const WorkoutPlanScreen(), + builder: (_) => const RoutineScreen(), ), ), child: const SizedBox(), ), routes: { - WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen(), + RoutineScreen.routeName: (ctx) => const RoutineScreen(), }, ), ); diff --git a/test/workout/workout_plans_screen_test.dart b/test/workout/workout_plans_screen_test.dart index 0cf7ccfa..65bd04be 100644 --- a/test/workout/workout_plans_screen_test.dart +++ b/test/workout/workout_plans_screen_test.dart @@ -30,7 +30,7 @@ import 'package:wger/providers/base_provider.dart'; import 'package:wger/providers/exercises.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/screens/routine_list_screen.dart'; import 'package:wger/widgets/nutrition/forms.dart'; import 'package:wger/widgets/routines/forms.dart'; @@ -82,7 +82,7 @@ void main() { locale: Locale(locale), localizationsDelegates: AppLocalizations.localizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, - home: const WorkoutPlansScreen(), + home: const RoutineListScreen(), routes: {FormScreen.routeName: (ctx) => const FormScreen()}, ), );