From 5cebbb7c7fa2b01353fd3dd429c4f27379321ded Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Sat, 19 Feb 2022 22:16:32 +0100 Subject: [PATCH] Fix merge conflicts --- lib/models/exercises/base.dart | 4 + lib/providers/exercises.dart | 22 +- lib/widgets/exercises/exercises.dart | 17 +- pubspec.lock | 9 +- test/gallery/gallery_screen_test.mocks.dart | 3 +- ...surement_categories_screen_test.mocks.dart | 3 +- .../measurement_provider_test.mocks.dart | 3 +- .../nutritional_plan_form_test.mocks.dart | 8 +- test/other/base_provider_test.mocks.dart | 3 +- test/workout/workout_form_test.mocks.dart | 3 +- test/workout/workout_set_form_test.mocks.dart | 192 ++++++++++-------- 11 files changed, 143 insertions(+), 124 deletions(-) diff --git a/lib/models/exercises/base.dart b/lib/models/exercises/base.dart index 92f04374..914e590e 100644 --- a/lib/models/exercises/base.dart +++ b/lib/models/exercises/base.dart @@ -23,6 +23,7 @@ import 'package:wger/models/exercises/equipment.dart'; import 'package:wger/models/exercises/exercise.dart'; import 'package:wger/models/exercises/image.dart'; import 'package:wger/models/exercises/muscle.dart'; +import 'package:wger/models/exercises/video.dart'; part 'base.g.dart'; @@ -73,6 +74,9 @@ class ExerciseBase extends Equatable { @JsonKey(ignore: true) List exercises = []; + @JsonKey(ignore: true) + List