diff --git a/lib/models/exercises/alias.g.dart b/lib/models/exercises/alias.g.dart
index 491f30f0..5c2c91b0 100644
--- a/lib/models/exercises/alias.g.dart
+++ b/lib/models/exercises/alias.g.dart
@@ -7,7 +7,10 @@ part of 'alias.dart';
 // **************************************************************************
 
 Alias _$AliasFromJson(Map<String, dynamic> json) {
-  $checkKeys(json, requiredKeys: const ['id', 'exercise', 'alias']);
+  $checkKeys(
+    json,
+    requiredKeys: const ['id', 'exercise', 'alias'],
+  );
   return Alias(
     id: json['id'] as int,
     exerciseId: json['exercise'] as int,
diff --git a/lib/models/exercises/base.g.dart b/lib/models/exercises/base.g.dart
index 9ae5c128..4cb720e3 100644
--- a/lib/models/exercises/base.g.dart
+++ b/lib/models/exercises/base.g.dart
@@ -7,17 +7,20 @@ part of 'base.dart';
 // **************************************************************************
 
 ExerciseBase _$ExerciseBaseFromJson(Map<String, dynamic> json) {
-  $checkKeys(json, requiredKeys: const [
-    'id',
-    'uuid',
-    'variations',
-    'creation_date',
-    'update_date',
-    'category',
-    'muscles',
-    'muscles_secondary',
-    'equipment'
-  ]);
+  $checkKeys(
+    json,
+    requiredKeys: const [
+      'id',
+      'uuid',
+      'variations',
+      'creation_date',
+      'update_date',
+      'category',
+      'muscles',
+      'muscles_secondary',
+      'equipment'
+    ],
+  );
   return ExerciseBase(
     id: json['id'] as int,
     uuid: json['uuid'] as String,
diff --git a/lib/models/exercises/comment.g.dart b/lib/models/exercises/comment.g.dart
index de5e68ac..6fb7dfd9 100644
--- a/lib/models/exercises/comment.g.dart
+++ b/lib/models/exercises/comment.g.dart
@@ -7,7 +7,10 @@ part of 'comment.dart';
 // **************************************************************************
 
 Comment _$CommentFromJson(Map<String, dynamic> json) {
-  $checkKeys(json, requiredKeys: const ['id', 'exercise', 'comment']);
+  $checkKeys(
+    json,
+    requiredKeys: const ['id', 'exercise', 'comment'],
+  );
   return Comment(
     id: json['id'] as int,
     exerciseId: json['exercise'] as int,
diff --git a/lib/models/exercises/exercise.g.dart b/lib/models/exercises/exercise.g.dart
index e81b7ffb..627e07fd 100644
--- a/lib/models/exercises/exercise.g.dart
+++ b/lib/models/exercises/exercise.g.dart
@@ -7,15 +7,18 @@ part of 'exercise.dart';
 // **************************************************************************
 
 Exercise _$ExerciseFromJson(Map<String, dynamic> json) {
-  $checkKeys(json, requiredKeys: const [
-    'id',
-    'exercise_base',
-    'uuid',
-    'language',
-    'creation_date',
-    'name',
-    'description'
-  ]);
+  $checkKeys(
+    json,
+    requiredKeys: const [
+      'id',
+      'exercise_base',
+      'uuid',
+      'language',
+      'creation_date',
+      'name',
+      'description'
+    ],
+  );
   return Exercise(
     id: json['id'] as int,
     baseId: json['exercise_base'] as int,
diff --git a/lib/models/exercises/image.g.dart b/lib/models/exercises/image.g.dart
index d3fc1a55..1240dc38 100644
--- a/lib/models/exercises/image.g.dart
+++ b/lib/models/exercises/image.g.dart
@@ -7,8 +7,10 @@ part of 'image.dart';
 // **************************************************************************
 
 ExerciseImage _$ExerciseImageFromJson(Map<String, dynamic> json) {
-  $checkKeys(json,
-      requiredKeys: const ['id', 'uuid', 'exercise_base', 'image']);
+  $checkKeys(
+    json,
+    requiredKeys: const ['id', 'uuid', 'exercise_base', 'image'],
+  );
   return ExerciseImage(
     id: json['id'] as int,
     uuid: json['uuid'] as String,
diff --git a/lib/models/exercises/language.g.dart b/lib/models/exercises/language.g.dart
index 15a9d0ff..1c538d97 100644
--- a/lib/models/exercises/language.g.dart
+++ b/lib/models/exercises/language.g.dart
@@ -7,7 +7,10 @@ part of 'language.dart';
 // **************************************************************************
 
 Language _$LanguageFromJson(Map<String, dynamic> json) {
-  $checkKeys(json, requiredKeys: const ['id', 'short_name', 'full_name']);
+  $checkKeys(
+    json,
+    requiredKeys: const ['id', 'short_name', 'full_name'],
+  );
   return Language(
     id: json['id'] as int,
     shortName: json['short_name'] as String,
diff --git a/lib/models/exercises/variation.g.dart b/lib/models/exercises/variation.g.dart
index 26fa881f..859c407b 100644
--- a/lib/models/exercises/variation.g.dart
+++ b/lib/models/exercises/variation.g.dart
@@ -7,7 +7,10 @@ part of 'variation.dart';
 // **************************************************************************
 
 Variation _$VariationFromJson(Map<String, dynamic> json) {
-  $checkKeys(json, requiredKeys: const ['id']);
+  $checkKeys(
+    json,
+    requiredKeys: const ['id'],
+  );
   return Variation(
     id: json['id'] as int,
   );
diff --git a/lib/models/measurements/measurement_entry.g.dart b/lib/models/measurements/measurement_entry.g.dart
index 935487c7..4b096960 100644
--- a/lib/models/measurements/measurement_entry.g.dart
+++ b/lib/models/measurements/measurement_entry.g.dart
@@ -7,8 +7,10 @@ part of 'measurement_entry.dart';
 // **************************************************************************
 
 MeasurementEntry _$MeasurementEntryFromJson(Map<String, dynamic> json) {
-  $checkKeys(json,
-      requiredKeys: const ['id', 'category', 'date', 'value', 'notes']);
+  $checkKeys(
+    json,
+    requiredKeys: const ['id', 'category', 'date', 'value', 'notes'],
+  );
   return MeasurementEntry(
     id: json['id'] as int?,
     category: json['category'] as int,
diff --git a/lib/models/nutrition/ingredient_weight_unit.g.dart b/lib/models/nutrition/ingredient_weight_unit.g.dart
index 8dc1e54d..74b1f101 100644
--- a/lib/models/nutrition/ingredient_weight_unit.g.dart
+++ b/lib/models/nutrition/ingredient_weight_unit.g.dart
@@ -7,13 +7,10 @@ part of 'ingredient_weight_unit.dart';
 // **************************************************************************
 
 IngredientWeightUnit _$IngredientWeightUnitFromJson(Map<String, dynamic> json) {
-  $checkKeys(json, requiredKeys: const [
-    'id',
-    'weight_unit',
-    'ingredient',
-    'grams',
-    'amount'
-  ]);
+  $checkKeys(
+    json,
+    requiredKeys: const ['id', 'weight_unit', 'ingredient', 'grams', 'amount'],
+  );
   return IngredientWeightUnit(
     id: json['id'] as int,
     weightUnit:
diff --git a/lib/models/nutrition/log.g.dart b/lib/models/nutrition/log.g.dart
index f9c16113..39068768 100644
--- a/lib/models/nutrition/log.g.dart
+++ b/lib/models/nutrition/log.g.dart
@@ -7,14 +7,17 @@ part of 'log.dart';
 // **************************************************************************
 
 Log _$LogFromJson(Map<String, dynamic> json) {
-  $checkKeys(json, requiredKeys: const [
-    'id',
-    'plan',
-    'datetime',
-    'ingredient',
-    'weight_unit',
-    'amount'
-  ]);
+  $checkKeys(
+    json,
+    requiredKeys: const [
+      'id',
+      'plan',
+      'datetime',
+      'ingredient',
+      'weight_unit',
+      'amount'
+    ],
+  );
   return Log(
     id: json['id'] as int?,
     mealId: json['meal'] as int?,
diff --git a/lib/models/workouts/day.g.dart b/lib/models/workouts/day.g.dart
index 9d261015..0f1b6736 100644
--- a/lib/models/workouts/day.g.dart
+++ b/lib/models/workouts/day.g.dart
@@ -7,8 +7,10 @@ part of 'day.dart';
 // **************************************************************************
 
 Day _$DayFromJson(Map<String, dynamic> json) {
-  $checkKeys(json,
-      requiredKeys: const ['id', 'training', 'description', 'day']);
+  $checkKeys(
+    json,
+    requiredKeys: const ['id', 'training', 'description', 'day'],
+  );
   return Day()
     ..id = json['id'] as int?
     ..workoutId = json['training'] as int
diff --git a/lib/models/workouts/session.g.dart b/lib/models/workouts/session.g.dart
index eae1b04d..e16affad 100644
--- a/lib/models/workouts/session.g.dart
+++ b/lib/models/workouts/session.g.dart
@@ -7,14 +7,17 @@ part of 'session.dart';
 // **************************************************************************
 
 WorkoutSession _$WorkoutSessionFromJson(Map<String, dynamic> json) {
-  $checkKeys(json, requiredKeys: const [
-    'id',
-    'workout',
-    'date',
-    'impression',
-    'time_start',
-    'time_end'
-  ]);
+  $checkKeys(
+    json,
+    requiredKeys: const [
+      'id',
+      'workout',
+      'date',
+      'impression',
+      'time_start',
+      'time_end'
+    ],
+  );
   return WorkoutSession()
     ..id = json['id'] as int?
     ..workoutId = json['workout'] as int
diff --git a/lib/models/workouts/workout_plan.g.dart b/lib/models/workouts/workout_plan.g.dart
index 412986f2..ef156e3e 100644
--- a/lib/models/workouts/workout_plan.g.dart
+++ b/lib/models/workouts/workout_plan.g.dart
@@ -7,8 +7,10 @@ part of 'workout_plan.dart';
 // **************************************************************************
 
 WorkoutPlan _$WorkoutPlanFromJson(Map<String, dynamic> json) {
-  $checkKeys(json,
-      requiredKeys: const ['id', 'creation_date', 'name', 'description']);
+  $checkKeys(
+    json,
+    requiredKeys: const ['id', 'creation_date', 'name', 'description'],
+  );
   return WorkoutPlan(
     id: json['id'] as int?,
     creationDate: DateTime.parse(json['creation_date'] as String),
diff --git a/test/gallery/gallery_screen_test.mocks.dart b/test/gallery/gallery_screen_test.mocks.dart
index 8f5d6f1d..775851ff 100644
--- a/test/gallery/gallery_screen_test.mocks.dart
+++ b/test/gallery/gallery_screen_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.0.16 from annotations
+// Mocks generated by Mockito 5.0.15 from annotations
 // in wger/test/gallery/gallery_screen_test.dart.
 // Do not manually edit this file.
 
@@ -19,7 +19,6 @@ import 'package:wger/providers/gallery.dart' as _i4;
 // ignore_for_file: invalid_use_of_visible_for_testing_member
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
 
 class _FakeAuthProvider_0 extends _i1.Fake implements _i2.AuthProvider {}
 
@@ -38,31 +37,33 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
   }
 
   @override
-  List<_i5.Image> get images =>
-      (super.noSuchMethod(Invocation.getter(#images), returnValue: <_i5.Image>[])
-          as List<_i5.Image>);
+  List<_i5.Image> get images => (super.noSuchMethod(Invocation.getter(#images),
+      returnValue: <_i5.Image>[]) as List<_i5.Image>);
   @override
   set images(List<_i5.Image>? _images) =>
-      super.noSuchMethod(Invocation.setter(#images, _images), returnValueForMissingStub: null);
+      super.noSuchMethod(Invocation.setter(#images, _images),
+          returnValueForMissingStub: null);
   @override
-  _i2.AuthProvider get auth =>
-      (super.noSuchMethod(Invocation.getter(#auth), returnValue: _FakeAuthProvider_0())
-          as _i2.AuthProvider);
+  _i2.AuthProvider get auth => (super.noSuchMethod(Invocation.getter(#auth),
+      returnValue: _FakeAuthProvider_0()) as _i2.AuthProvider);
   @override
   set auth(_i2.AuthProvider? _auth) =>
-      super.noSuchMethod(Invocation.setter(#auth, _auth), returnValueForMissingStub: null);
+      super.noSuchMethod(Invocation.setter(#auth, _auth),
+          returnValueForMissingStub: null);
   @override
-  _i3.Client get client =>
-      (super.noSuchMethod(Invocation.getter(#client), returnValue: _FakeClient_1()) as _i3.Client);
+  _i3.Client get client => (super.noSuchMethod(Invocation.getter(#client),
+      returnValue: _FakeClient_1()) as _i3.Client);
   @override
   set client(_i3.Client? _client) =>
-      super.noSuchMethod(Invocation.setter(#client, _client), returnValueForMissingStub: null);
+      super.noSuchMethod(Invocation.setter(#client, _client),
+          returnValueForMissingStub: null);
   @override
   bool get hasListeners =>
-      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false)
+          as bool);
   @override
-  void clear() =>
-      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+  void clear() => super.noSuchMethod(Invocation.method(#clear, []),
+      returnValueForMissingStub: null);
   @override
   _i6.Future<void> fetchAndSetGallery() =>
       (super.noSuchMethod(Invocation.method(#fetchAndSetGallery, []),
@@ -84,43 +85,50 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
           returnValue: Future<void>.value(),
           returnValueForMissingStub: Future<void>.value()) as _i6.Future<void>);
   @override
-  Uri makeUrl(String? path, {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
+  Uri makeUrl(String? path,
+          {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
       (super.noSuchMethod(
-          Invocation.method(
-              #makeUrl, [path], {#id: id, #objectMethod: objectMethod, #query: query}),
+          Invocation.method(#makeUrl, [path],
+              {#id: id, #objectMethod: objectMethod, #query: query}),
           returnValue: _FakeUri_2()) as Uri);
   @override
-  _i6.Future<Map<String, dynamic>> fetch(Uri? uri) =>
-      (super.noSuchMethod(Invocation.method(#fetch, [uri]),
-              returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
-          as _i6.Future<Map<String, dynamic>>);
+  _i6.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
+          Invocation.method(#fetch, [uri]),
+          returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
+      as _i6.Future<Map<String, dynamic>>);
   @override
   _i6.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
       (super.noSuchMethod(Invocation.method(#post, [data, uri]),
-              returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
+              returnValue:
+                  Future<Map<String, dynamic>>.value(<String, dynamic>{}))
           as _i6.Future<Map<String, dynamic>>);
   @override
-  _i6.Future<Map<String, dynamic>> patch(Map<String, dynamic>? data, Uri? uri) =>
+  _i6.Future<Map<String, dynamic>> patch(
+          Map<String, dynamic>? data, Uri? uri) =>
       (super.noSuchMethod(Invocation.method(#patch, [data, uri]),
-              returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
+              returnValue:
+                  Future<Map<String, dynamic>>.value(<String, dynamic>{}))
           as _i6.Future<Map<String, dynamic>>);
   @override
   _i6.Future<_i3.Response> deleteRequest(String? url, int? id) =>
       (super.noSuchMethod(Invocation.method(#deleteRequest, [url, id]),
-          returnValue: Future<_i3.Response>.value(_FakeResponse_3())) as _i6.Future<_i3.Response>);
+              returnValue: Future<_i3.Response>.value(_FakeResponse_3()))
+          as _i6.Future<_i3.Response>);
   @override
   String toString() => super.toString();
   @override
-  void addListener(_i8.VoidCallback? listener) => super
-      .noSuchMethod(Invocation.method(#addListener, [listener]), returnValueForMissingStub: null);
+  void addListener(_i8.VoidCallback? listener) =>
+      super.noSuchMethod(Invocation.method(#addListener, [listener]),
+          returnValueForMissingStub: null);
   @override
   void removeListener(_i8.VoidCallback? listener) =>
       super.noSuchMethod(Invocation.method(#removeListener, [listener]),
           returnValueForMissingStub: null);
   @override
-  void dispose() =>
-      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
+  void dispose() => super.noSuchMethod(Invocation.method(#dispose, []),
+      returnValueForMissingStub: null);
   @override
   void notifyListeners() =>
-      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
+      super.noSuchMethod(Invocation.method(#notifyListeners, []),
+          returnValueForMissingStub: null);
 }
diff --git a/test/measurements/measurement_categories_screen_test.mocks.dart b/test/measurements/measurement_categories_screen_test.mocks.dart
index 89093d71..f3b33bb4 100644
--- a/test/measurements/measurement_categories_screen_test.mocks.dart
+++ b/test/measurements/measurement_categories_screen_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.0.16 from annotations
+// Mocks generated by Mockito 5.0.15 from annotations
 // in wger/test/measurements/measurement_categories_screen_test.dart.
 // Do not manually edit this file.
 
@@ -18,38 +18,42 @@ import 'package:wger/providers/measurement.dart' as _i4;
 // ignore_for_file: invalid_use_of_visible_for_testing_member
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
 
-class _FakeWgerBaseProvider_0 extends _i1.Fake implements _i2.WgerBaseProvider {}
+class _FakeWgerBaseProvider_0 extends _i1.Fake implements _i2.WgerBaseProvider {
+}
 
-class _FakeMeasurementCategory_1 extends _i1.Fake implements _i3.MeasurementCategory {}
+class _FakeMeasurementCategory_1 extends _i1.Fake
+    implements _i3.MeasurementCategory {}
 
 /// A class which mocks [MeasurementProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockMeasurementProvider extends _i1.Mock implements _i4.MeasurementProvider {
+class MockMeasurementProvider extends _i1.Mock
+    implements _i4.MeasurementProvider {
   MockMeasurementProvider() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
   _i2.WgerBaseProvider get baseProvider =>
-      (super.noSuchMethod(Invocation.getter(#baseProvider), returnValue: _FakeWgerBaseProvider_0())
-          as _i2.WgerBaseProvider);
+      (super.noSuchMethod(Invocation.getter(#baseProvider),
+          returnValue: _FakeWgerBaseProvider_0()) as _i2.WgerBaseProvider);
   @override
   List<_i3.MeasurementCategory> get categories =>
-      (super.noSuchMethod(Invocation.getter(#categories), returnValue: <_i3.MeasurementCategory>[])
+      (super.noSuchMethod(Invocation.getter(#categories),
+              returnValue: <_i3.MeasurementCategory>[])
           as List<_i3.MeasurementCategory>);
   @override
   bool get hasListeners =>
-      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false)
+          as bool);
   @override
-  void clear() =>
-      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+  void clear() => super.noSuchMethod(Invocation.method(#clear, []),
+      returnValueForMissingStub: null);
   @override
-  _i3.MeasurementCategory findCategoryById(int? id) =>
-      (super.noSuchMethod(Invocation.method(#findCategoryById, [id]),
-          returnValue: _FakeMeasurementCategory_1()) as _i3.MeasurementCategory);
+  _i3.MeasurementCategory findCategoryById(int? id) => (super.noSuchMethod(
+      Invocation.method(#findCategoryById, [id]),
+      returnValue: _FakeMeasurementCategory_1()) as _i3.MeasurementCategory);
   @override
   _i5.Future<void> fetchAndSetCategories() =>
       (super.noSuchMethod(Invocation.method(#fetchAndSetCategories, []),
@@ -61,10 +65,10 @@ class MockMeasurementProvider extends _i1.Mock implements _i4.MeasurementProvide
           returnValue: Future<void>.value(),
           returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
   @override
-  _i5.Future<void> fetchAndSetAllCategoriesAndEntries() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetAllCategoriesAndEntries, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
+  _i5.Future<void> fetchAndSetAllCategoriesAndEntries() => (super.noSuchMethod(
+      Invocation.method(#fetchAndSetAllCategoriesAndEntries, []),
+      returnValue: Future<void>.value(),
+      returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
   @override
   _i5.Future<void> addCategory(_i3.MeasurementCategory? category) =>
       (super.noSuchMethod(Invocation.method(#addCategory, [category]),
@@ -77,7 +81,8 @@ class MockMeasurementProvider extends _i1.Mock implements _i4.MeasurementProvide
           returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
   @override
   _i5.Future<void> editCategory(int? id, String? newName, String? newUnit) =>
-      (super.noSuchMethod(Invocation.method(#editCategory, [id, newName, newUnit]),
+      (super.noSuchMethod(
+          Invocation.method(#editCategory, [id, newName, newUnit]),
           returnValue: Future<void>.value(),
           returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
   @override
@@ -91,25 +96,28 @@ class MockMeasurementProvider extends _i1.Mock implements _i4.MeasurementProvide
           returnValue: Future<void>.value(),
           returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
   @override
-  _i5.Future<void> editEntry(
-          int? id, int? categoryId, num? newValue, String? newNotes, DateTime? newDate) =>
+  _i5.Future<void> editEntry(int? id, int? categoryId, num? newValue,
+          String? newNotes, DateTime? newDate) =>
       (super.noSuchMethod(
-          Invocation.method(#editEntry, [id, categoryId, newValue, newNotes, newDate]),
+          Invocation.method(
+              #editEntry, [id, categoryId, newValue, newNotes, newDate]),
           returnValue: Future<void>.value(),
           returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
   @override
   String toString() => super.toString();
   @override
-  void addListener(_i7.VoidCallback? listener) => super
-      .noSuchMethod(Invocation.method(#addListener, [listener]), returnValueForMissingStub: null);
+  void addListener(_i7.VoidCallback? listener) =>
+      super.noSuchMethod(Invocation.method(#addListener, [listener]),
+          returnValueForMissingStub: null);
   @override
   void removeListener(_i7.VoidCallback? listener) =>
       super.noSuchMethod(Invocation.method(#removeListener, [listener]),
           returnValueForMissingStub: null);
   @override
-  void dispose() =>
-      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
+  void dispose() => super.noSuchMethod(Invocation.method(#dispose, []),
+      returnValueForMissingStub: null);
   @override
   void notifyListeners() =>
-      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
+      super.noSuchMethod(Invocation.method(#notifyListeners, []),
+          returnValueForMissingStub: null);
 }
diff --git a/test/measurements/measurement_provider_test.mocks.dart b/test/measurements/measurement_provider_test.mocks.dart
index 45ea064b..279715bb 100644
--- a/test/measurements/measurement_provider_test.mocks.dart
+++ b/test/measurements/measurement_provider_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.0.16 from annotations
+// Mocks generated by Mockito 5.0.15 from annotations
 // in wger/test/measurements/measurement_provider_test.dart.
 // Do not manually edit this file.
 
@@ -16,7 +16,6 @@ import 'package:wger/providers/base_provider.dart' as _i4;
 // ignore_for_file: invalid_use_of_visible_for_testing_member
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
 
 class _FakeAuthProvider_0 extends _i1.Fake implements _i2.AuthProvider {}
 
@@ -35,43 +34,49 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
   }
 
   @override
-  _i2.AuthProvider get auth =>
-      (super.noSuchMethod(Invocation.getter(#auth), returnValue: _FakeAuthProvider_0())
-          as _i2.AuthProvider);
+  _i2.AuthProvider get auth => (super.noSuchMethod(Invocation.getter(#auth),
+      returnValue: _FakeAuthProvider_0()) as _i2.AuthProvider);
   @override
   set auth(_i2.AuthProvider? _auth) =>
-      super.noSuchMethod(Invocation.setter(#auth, _auth), returnValueForMissingStub: null);
+      super.noSuchMethod(Invocation.setter(#auth, _auth),
+          returnValueForMissingStub: null);
   @override
-  _i3.Client get client =>
-      (super.noSuchMethod(Invocation.getter(#client), returnValue: _FakeClient_1()) as _i3.Client);
+  _i3.Client get client => (super.noSuchMethod(Invocation.getter(#client),
+      returnValue: _FakeClient_1()) as _i3.Client);
   @override
   set client(_i3.Client? _client) =>
-      super.noSuchMethod(Invocation.setter(#client, _client), returnValueForMissingStub: null);
+      super.noSuchMethod(Invocation.setter(#client, _client),
+          returnValueForMissingStub: null);
   @override
-  Uri makeUrl(String? path, {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
+  Uri makeUrl(String? path,
+          {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
       (super.noSuchMethod(
-          Invocation.method(
-              #makeUrl, [path], {#id: id, #objectMethod: objectMethod, #query: query}),
+          Invocation.method(#makeUrl, [path],
+              {#id: id, #objectMethod: objectMethod, #query: query}),
           returnValue: _FakeUri_2()) as Uri);
   @override
-  _i5.Future<Map<String, dynamic>> fetch(Uri? uri) =>
-      (super.noSuchMethod(Invocation.method(#fetch, [uri]),
-              returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
-          as _i5.Future<Map<String, dynamic>>);
+  _i5.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
+          Invocation.method(#fetch, [uri]),
+          returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
+      as _i5.Future<Map<String, dynamic>>);
   @override
   _i5.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
       (super.noSuchMethod(Invocation.method(#post, [data, uri]),
-              returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
+              returnValue:
+                  Future<Map<String, dynamic>>.value(<String, dynamic>{}))
           as _i5.Future<Map<String, dynamic>>);
   @override
-  _i5.Future<Map<String, dynamic>> patch(Map<String, dynamic>? data, Uri? uri) =>
+  _i5.Future<Map<String, dynamic>> patch(
+          Map<String, dynamic>? data, Uri? uri) =>
       (super.noSuchMethod(Invocation.method(#patch, [data, uri]),
-              returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
+              returnValue:
+                  Future<Map<String, dynamic>>.value(<String, dynamic>{}))
           as _i5.Future<Map<String, dynamic>>);
   @override
   _i5.Future<_i3.Response> deleteRequest(String? url, int? id) =>
       (super.noSuchMethod(Invocation.method(#deleteRequest, [url, id]),
-          returnValue: Future<_i3.Response>.value(_FakeResponse_3())) as _i5.Future<_i3.Response>);
+              returnValue: Future<_i3.Response>.value(_FakeResponse_3()))
+          as _i5.Future<_i3.Response>);
   @override
   String toString() => super.toString();
 }
diff --git a/test/nutrition/nutritional_plan_form_test.mocks.dart b/test/nutrition/nutritional_plan_form_test.mocks.dart
index ab76647c..0a6341a5 100644
--- a/test/nutrition/nutritional_plan_form_test.mocks.dart
+++ b/test/nutrition/nutritional_plan_form_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.0.16 from annotations
+// Mocks generated by Mockito 5.0.15 from annotations
 // in wger/test/nutrition/nutritional_plan_form_test.dart.
 // Do not manually edit this file.
 
@@ -21,7 +21,6 @@ import 'package:wger/providers/nutrition.dart' as _i8;
 // ignore_for_file: invalid_use_of_visible_for_testing_member
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
 
 class _FakeAuthProvider_0 extends _i1.Fake implements _i2.AuthProvider {}
 
@@ -42,38 +41,41 @@ class _FakeResponse_7 extends _i1.Fake implements _i3.Response {}
 /// A class which mocks [NutritionPlansProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansProvider {
+class MockNutritionPlansProvider extends _i1.Mock
+    implements _i8.NutritionPlansProvider {
   MockNutritionPlansProvider() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
   List<_i4.NutritionalPlan> get items =>
-      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i4.NutritionalPlan>[])
-          as List<_i4.NutritionalPlan>);
+      (super.noSuchMethod(Invocation.getter(#items),
+          returnValue: <_i4.NutritionalPlan>[]) as List<_i4.NutritionalPlan>);
   @override
-  _i2.AuthProvider get auth =>
-      (super.noSuchMethod(Invocation.getter(#auth), returnValue: _FakeAuthProvider_0())
-          as _i2.AuthProvider);
+  _i2.AuthProvider get auth => (super.noSuchMethod(Invocation.getter(#auth),
+      returnValue: _FakeAuthProvider_0()) as _i2.AuthProvider);
   @override
   set auth(_i2.AuthProvider? _auth) =>
-      super.noSuchMethod(Invocation.setter(#auth, _auth), returnValueForMissingStub: null);
+      super.noSuchMethod(Invocation.setter(#auth, _auth),
+          returnValueForMissingStub: null);
   @override
-  _i3.Client get client =>
-      (super.noSuchMethod(Invocation.getter(#client), returnValue: _FakeClient_1()) as _i3.Client);
+  _i3.Client get client => (super.noSuchMethod(Invocation.getter(#client),
+      returnValue: _FakeClient_1()) as _i3.Client);
   @override
   set client(_i3.Client? _client) =>
-      super.noSuchMethod(Invocation.setter(#client, _client), returnValueForMissingStub: null);
+      super.noSuchMethod(Invocation.setter(#client, _client),
+          returnValueForMissingStub: null);
   @override
   bool get hasListeners =>
-      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false)
+          as bool);
   @override
-  void clear() =>
-      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+  void clear() => super.noSuchMethod(Invocation.method(#clear, []),
+      returnValueForMissingStub: null);
   @override
   _i4.NutritionalPlan findById(int? id) =>
-      (super.noSuchMethod(Invocation.method(#findById, [id]), returnValue: _FakeNutritionalPlan_2())
-          as _i4.NutritionalPlan);
+      (super.noSuchMethod(Invocation.method(#findById, [id]),
+          returnValue: _FakeNutritionalPlan_2()) as _i4.NutritionalPlan);
   @override
   _i5.Meal? findMealById(int? id) =>
       (super.noSuchMethod(Invocation.method(#findMealById, [id])) as _i5.Meal?);
@@ -90,17 +92,20 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
   @override
   _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanSparse(int? planId) =>
       (super.noSuchMethod(Invocation.method(#fetchAndSetPlanSparse, [planId]),
-              returnValue: Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2()))
+              returnValue:
+                  Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2()))
           as _i9.Future<_i4.NutritionalPlan>);
   @override
   _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanFull(int? planId) =>
       (super.noSuchMethod(Invocation.method(#fetchAndSetPlanFull, [planId]),
-              returnValue: Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2()))
+              returnValue:
+                  Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2()))
           as _i9.Future<_i4.NutritionalPlan>);
   @override
   _i9.Future<_i4.NutritionalPlan> addPlan(_i4.NutritionalPlan? planData) =>
       (super.noSuchMethod(Invocation.method(#addPlan, [planData]),
-              returnValue: Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2()))
+              returnValue:
+                  Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2()))
           as _i9.Future<_i4.NutritionalPlan>);
   @override
   _i9.Future<void> editPlan(_i4.NutritionalPlan? plan) =>
@@ -108,26 +113,31 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
           returnValue: Future<void>.value(),
           returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
   @override
-  _i9.Future<void> deletePlan(int? id) => (super.noSuchMethod(Invocation.method(#deletePlan, [id]),
-      returnValue: Future<void>.value(),
-      returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+  _i9.Future<void> deletePlan(int? id) =>
+      (super.noSuchMethod(Invocation.method(#deletePlan, [id]),
+          returnValue: Future<void>.value(),
+          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
   @override
   _i9.Future<_i5.Meal> addMeal(_i5.Meal? meal, int? planId) =>
       (super.noSuchMethod(Invocation.method(#addMeal, [meal, planId]),
-          returnValue: Future<_i5.Meal>.value(_FakeMeal_3())) as _i9.Future<_i5.Meal>);
+              returnValue: Future<_i5.Meal>.value(_FakeMeal_3()))
+          as _i9.Future<_i5.Meal>);
   @override
   _i9.Future<_i5.Meal> editMeal(_i5.Meal? meal) =>
       (super.noSuchMethod(Invocation.method(#editMeal, [meal]),
-          returnValue: Future<_i5.Meal>.value(_FakeMeal_3())) as _i9.Future<_i5.Meal>);
+              returnValue: Future<_i5.Meal>.value(_FakeMeal_3()))
+          as _i9.Future<_i5.Meal>);
   @override
   _i9.Future<void> deleteMeal(_i5.Meal? meal) =>
       (super.noSuchMethod(Invocation.method(#deleteMeal, [meal]),
           returnValue: Future<void>.value(),
           returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
   @override
-  _i9.Future<_i6.MealItem> addMealItem(_i6.MealItem? mealItem, _i5.Meal? meal) =>
+  _i9.Future<_i6.MealItem> addMealItem(
+          _i6.MealItem? mealItem, _i5.Meal? meal) =>
       (super.noSuchMethod(Invocation.method(#addMealItem, [mealItem, meal]),
-          returnValue: Future<_i6.MealItem>.value(_FakeMealItem_4())) as _i9.Future<_i6.MealItem>);
+              returnValue: Future<_i6.MealItem>.value(_FakeMealItem_4()))
+          as _i9.Future<_i6.MealItem>);
   @override
   _i9.Future<void> deleteMealItem(_i6.MealItem? mealItem) =>
       (super.noSuchMethod(Invocation.method(#deleteMealItem, [mealItem]),
@@ -144,17 +154,22 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
           returnValue: Future<void>.value(),
           returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
   @override
-  _i9.Future<List<dynamic>> searchIngredient(String? name, [String? languageCode = r'en']) =>
-      (super.noSuchMethod(Invocation.method(#searchIngredient, [name, languageCode]),
-          returnValue: Future<List<dynamic>>.value(<dynamic>[])) as _i9.Future<List<dynamic>>);
+  _i9.Future<List<dynamic>> searchIngredient(String? name,
+          [String? languageCode = r'en']) =>
+      (super.noSuchMethod(
+              Invocation.method(#searchIngredient, [name, languageCode]),
+              returnValue: Future<List<dynamic>>.value(<dynamic>[]))
+          as _i9.Future<List<dynamic>>);
   @override
   _i9.Future<void> logMealToDiary(_i5.Meal? meal) =>
       (super.noSuchMethod(Invocation.method(#logMealToDiary, [meal]),
           returnValue: Future<void>.value(),
           returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
   @override
-  _i9.Future<void> logIngredentToDiary(_i6.MealItem? mealItem, int? planId, [DateTime? dateTime]) =>
-      (super.noSuchMethod(Invocation.method(#logIngredentToDiary, [mealItem, planId, dateTime]),
+  _i9.Future<void> logIngredentToDiary(_i6.MealItem? mealItem, int? planId,
+          [DateTime? dateTime]) =>
+      (super.noSuchMethod(
+          Invocation.method(#logIngredentToDiary, [mealItem, planId, dateTime]),
           returnValue: Future<void>.value(),
           returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
   @override
@@ -168,43 +183,50 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
           returnValue: Future<void>.value(),
           returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
   @override
-  Uri makeUrl(String? path, {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
+  Uri makeUrl(String? path,
+          {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
       (super.noSuchMethod(
-          Invocation.method(
-              #makeUrl, [path], {#id: id, #objectMethod: objectMethod, #query: query}),
+          Invocation.method(#makeUrl, [path],
+              {#id: id, #objectMethod: objectMethod, #query: query}),
           returnValue: _FakeUri_6()) as Uri);
   @override
-  _i9.Future<Map<String, dynamic>> fetch(Uri? uri) =>
-      (super.noSuchMethod(Invocation.method(#fetch, [uri]),
-              returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
-          as _i9.Future<Map<String, dynamic>>);
+  _i9.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
+          Invocation.method(#fetch, [uri]),
+          returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
+      as _i9.Future<Map<String, dynamic>>);
   @override
   _i9.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
       (super.noSuchMethod(Invocation.method(#post, [data, uri]),
-              returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
+              returnValue:
+                  Future<Map<String, dynamic>>.value(<String, dynamic>{}))
           as _i9.Future<Map<String, dynamic>>);
   @override
-  _i9.Future<Map<String, dynamic>> patch(Map<String, dynamic>? data, Uri? uri) =>
+  _i9.Future<Map<String, dynamic>> patch(
+          Map<String, dynamic>? data, Uri? uri) =>
       (super.noSuchMethod(Invocation.method(#patch, [data, uri]),
-              returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
+              returnValue:
+                  Future<Map<String, dynamic>>.value(<String, dynamic>{}))
           as _i9.Future<Map<String, dynamic>>);
   @override
   _i9.Future<_i3.Response> deleteRequest(String? url, int? id) =>
       (super.noSuchMethod(Invocation.method(#deleteRequest, [url, id]),
-          returnValue: Future<_i3.Response>.value(_FakeResponse_7())) as _i9.Future<_i3.Response>);
+              returnValue: Future<_i3.Response>.value(_FakeResponse_7()))
+          as _i9.Future<_i3.Response>);
   @override
   String toString() => super.toString();
   @override
-  void addListener(_i10.VoidCallback? listener) => super
-      .noSuchMethod(Invocation.method(#addListener, [listener]), returnValueForMissingStub: null);
+  void addListener(_i10.VoidCallback? listener) =>
+      super.noSuchMethod(Invocation.method(#addListener, [listener]),
+          returnValueForMissingStub: null);
   @override
   void removeListener(_i10.VoidCallback? listener) =>
       super.noSuchMethod(Invocation.method(#removeListener, [listener]),
           returnValueForMissingStub: null);
   @override
-  void dispose() =>
-      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
+  void dispose() => super.noSuchMethod(Invocation.method(#dispose, []),
+      returnValueForMissingStub: null);
   @override
   void notifyListeners() =>
-      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
+      super.noSuchMethod(Invocation.method(#notifyListeners, []),
+          returnValueForMissingStub: null);
 }
diff --git a/test/other/base_provider_test.mocks.dart b/test/other/base_provider_test.mocks.dart
index c052da81..0486c3d5 100644
--- a/test/other/base_provider_test.mocks.dart
+++ b/test/other/base_provider_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.0.16 from annotations
+// Mocks generated by Mockito 5.0.15 from annotations
 // in wger/test/other/base_provider_test.dart.
 // Do not manually edit this file.
 
@@ -19,11 +19,11 @@ import 'package:mockito/mockito.dart' as _i1;
 // ignore_for_file: invalid_use_of_visible_for_testing_member
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
 
 class _FakeResponse_0 extends _i1.Fake implements _i2.Response {}
 
-class _FakeStreamedResponse_1 extends _i1.Fake implements _i3.StreamedResponse {}
+class _FakeStreamedResponse_1 extends _i1.Fake implements _i3.StreamedResponse {
+}
 
 /// A class which mocks [Client].
 ///
@@ -36,51 +36,73 @@ class MockClient extends _i1.Mock implements _i4.Client {
   @override
   _i5.Future<_i2.Response> head(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(Invocation.method(#head, [url], {#headers: headers}),
-          returnValue: Future<_i2.Response>.value(_FakeResponse_0())) as _i5.Future<_i2.Response>);
+              returnValue: Future<_i2.Response>.value(_FakeResponse_0()))
+          as _i5.Future<_i2.Response>);
   @override
   _i5.Future<_i2.Response> get(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(Invocation.method(#get, [url], {#headers: headers}),
-          returnValue: Future<_i2.Response>.value(_FakeResponse_0())) as _i5.Future<_i2.Response>);
+              returnValue: Future<_i2.Response>.value(_FakeResponse_0()))
+          as _i5.Future<_i2.Response>);
   @override
   _i5.Future<_i2.Response> post(Uri? url,
-          {Map<String, String>? headers, Object? body, _i6.Encoding? encoding}) =>
+          {Map<String, String>? headers,
+          Object? body,
+          _i6.Encoding? encoding}) =>
       (super.noSuchMethod(
-          Invocation.method(#post, [url], {#headers: headers, #body: body, #encoding: encoding}),
-          returnValue: Future<_i2.Response>.value(_FakeResponse_0())) as _i5.Future<_i2.Response>);
+              Invocation.method(#post, [url],
+                  {#headers: headers, #body: body, #encoding: encoding}),
+              returnValue: Future<_i2.Response>.value(_FakeResponse_0()))
+          as _i5.Future<_i2.Response>);
   @override
   _i5.Future<_i2.Response> put(Uri? url,
-          {Map<String, String>? headers, Object? body, _i6.Encoding? encoding}) =>
+          {Map<String, String>? headers,
+          Object? body,
+          _i6.Encoding? encoding}) =>
       (super.noSuchMethod(
-          Invocation.method(#put, [url], {#headers: headers, #body: body, #encoding: encoding}),
-          returnValue: Future<_i2.Response>.value(_FakeResponse_0())) as _i5.Future<_i2.Response>);
+              Invocation.method(#put, [url],
+                  {#headers: headers, #body: body, #encoding: encoding}),
+              returnValue: Future<_i2.Response>.value(_FakeResponse_0()))
+          as _i5.Future<_i2.Response>);
   @override
   _i5.Future<_i2.Response> patch(Uri? url,
-          {Map<String, String>? headers, Object? body, _i6.Encoding? encoding}) =>
+          {Map<String, String>? headers,
+          Object? body,
+          _i6.Encoding? encoding}) =>
       (super.noSuchMethod(
-          Invocation.method(#patch, [url], {#headers: headers, #body: body, #encoding: encoding}),
-          returnValue: Future<_i2.Response>.value(_FakeResponse_0())) as _i5.Future<_i2.Response>);
+              Invocation.method(#patch, [url],
+                  {#headers: headers, #body: body, #encoding: encoding}),
+              returnValue: Future<_i2.Response>.value(_FakeResponse_0()))
+          as _i5.Future<_i2.Response>);
   @override
   _i5.Future<_i2.Response> delete(Uri? url,
-          {Map<String, String>? headers, Object? body, _i6.Encoding? encoding}) =>
+          {Map<String, String>? headers,
+          Object? body,
+          _i6.Encoding? encoding}) =>
       (super.noSuchMethod(
-          Invocation.method(#delete, [url], {#headers: headers, #body: body, #encoding: encoding}),
-          returnValue: Future<_i2.Response>.value(_FakeResponse_0())) as _i5.Future<_i2.Response>);
+              Invocation.method(#delete, [url],
+                  {#headers: headers, #body: body, #encoding: encoding}),
+              returnValue: Future<_i2.Response>.value(_FakeResponse_0()))
+          as _i5.Future<_i2.Response>);
   @override
   _i5.Future<String> read(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(Invocation.method(#read, [url], {#headers: headers}),
           returnValue: Future<String>.value('')) as _i5.Future<String>);
   @override
-  _i5.Future<_i7.Uint8List> readBytes(Uri? url, {Map<String, String>? headers}) =>
-      (super.noSuchMethod(Invocation.method(#readBytes, [url], {#headers: headers}),
-          returnValue: Future<_i7.Uint8List>.value(_i7.Uint8List(0))) as _i5.Future<_i7.Uint8List>);
+  _i5.Future<_i7.Uint8List> readBytes(Uri? url,
+          {Map<String, String>? headers}) =>
+      (super.noSuchMethod(
+              Invocation.method(#readBytes, [url], {#headers: headers}),
+              returnValue: Future<_i7.Uint8List>.value(_i7.Uint8List(0)))
+          as _i5.Future<_i7.Uint8List>);
   @override
   _i5.Future<_i3.StreamedResponse> send(_i8.BaseRequest? request) =>
       (super.noSuchMethod(Invocation.method(#send, [request]),
-              returnValue: Future<_i3.StreamedResponse>.value(_FakeStreamedResponse_1()))
+              returnValue:
+                  Future<_i3.StreamedResponse>.value(_FakeStreamedResponse_1()))
           as _i5.Future<_i3.StreamedResponse>);
   @override
-  void close() =>
-      super.noSuchMethod(Invocation.method(#close, []), returnValueForMissingStub: null);
+  void close() => super.noSuchMethod(Invocation.method(#close, []),
+      returnValueForMissingStub: null);
   @override
   String toString() => super.toString();
 }
diff --git a/test/workout/gym_mode_screen_test.dart b/test/workout/gym_mode_screen_test.dart
index 2f462865..b7a4b824 100644
--- a/test/workout/gym_mode_screen_test.dart
+++ b/test/workout/gym_mode_screen_test.dart
@@ -30,11 +30,11 @@ import 'package:wger/screens/workout_plan_screen.dart';
 import 'package:wger/widgets/workouts/forms.dart';
 import 'package:wger/widgets/workouts/gym_mode.dart';
 
-import '../test_data/exercises.dart';
 import '../../test_data/workouts.dart';
 import '../other/base_provider_test.mocks.dart';
-import 'gym_mode_screen_test.mocks.dart';
+import '../test_data/exercises.dart';
 import '../utils.dart';
+import 'gym_mode_screen_test.mocks.dart';
 
 @GenerateMocks([ExercisesProvider])
 void main() {
diff --git a/test/workout/workout_form_test.mocks.dart b/test/workout/workout_form_test.mocks.dart
index 00b22094..a4234391 100644
--- a/test/workout/workout_form_test.mocks.dart
+++ b/test/workout/workout_form_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.0.16 from annotations
+// Mocks generated by Mockito 5.0.15 from annotations
 // in wger/test/workout/workout_form_test.dart.
 // Do not manually edit this file.
 
@@ -26,7 +26,6 @@ import 'package:wger/providers/workout_plans.dart' as _i12;
 // ignore_for_file: invalid_use_of_visible_for_testing_member
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
 
 class _FakeWeightUnit_0 extends _i1.Fake implements _i2.WeightUnit {}
 
@@ -55,73 +54,79 @@ class _FakeResponse_11 extends _i1.Fake implements _i5.Response {}
 /// A class which mocks [WorkoutPlansProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProvider {
+class MockWorkoutPlansProvider extends _i1.Mock
+    implements _i12.WorkoutPlansProvider {
   MockWorkoutPlansProvider() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
   List<_i6.WorkoutPlan> get items =>
-      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i6.WorkoutPlan>[])
-          as List<_i6.WorkoutPlan>);
+      (super.noSuchMethod(Invocation.getter(#items),
+          returnValue: <_i6.WorkoutPlan>[]) as List<_i6.WorkoutPlan>);
   @override
   List<_i2.WeightUnit> get weightUnits =>
-      (super.noSuchMethod(Invocation.getter(#weightUnits), returnValue: <_i2.WeightUnit>[])
-          as List<_i2.WeightUnit>);
+      (super.noSuchMethod(Invocation.getter(#weightUnits),
+          returnValue: <_i2.WeightUnit>[]) as List<_i2.WeightUnit>);
   @override
   _i2.WeightUnit get defaultWeightUnit =>
-      (super.noSuchMethod(Invocation.getter(#defaultWeightUnit), returnValue: _FakeWeightUnit_0())
-          as _i2.WeightUnit);
+      (super.noSuchMethod(Invocation.getter(#defaultWeightUnit),
+          returnValue: _FakeWeightUnit_0()) as _i2.WeightUnit);
   @override
   List<_i3.RepetitionUnit> get repetitionUnits =>
-      (super.noSuchMethod(Invocation.getter(#repetitionUnits), returnValue: <_i3.RepetitionUnit>[])
-          as List<_i3.RepetitionUnit>);
+      (super.noSuchMethod(Invocation.getter(#repetitionUnits),
+          returnValue: <_i3.RepetitionUnit>[]) as List<_i3.RepetitionUnit>);
   @override
   _i3.RepetitionUnit get defaultRepetitionUnit =>
       (super.noSuchMethod(Invocation.getter(#defaultRepetitionUnit),
           returnValue: _FakeRepetitionUnit_1()) as _i3.RepetitionUnit);
   @override
-  _i4.AuthProvider get auth =>
-      (super.noSuchMethod(Invocation.getter(#auth), returnValue: _FakeAuthProvider_2())
-          as _i4.AuthProvider);
+  _i4.AuthProvider get auth => (super.noSuchMethod(Invocation.getter(#auth),
+      returnValue: _FakeAuthProvider_2()) as _i4.AuthProvider);
   @override
   set auth(_i4.AuthProvider? _auth) =>
-      super.noSuchMethod(Invocation.setter(#auth, _auth), returnValueForMissingStub: null);
+      super.noSuchMethod(Invocation.setter(#auth, _auth),
+          returnValueForMissingStub: null);
   @override
-  _i5.Client get client =>
-      (super.noSuchMethod(Invocation.getter(#client), returnValue: _FakeClient_3()) as _i5.Client);
+  _i5.Client get client => (super.noSuchMethod(Invocation.getter(#client),
+      returnValue: _FakeClient_3()) as _i5.Client);
   @override
   set client(_i5.Client? _client) =>
-      super.noSuchMethod(Invocation.setter(#client, _client), returnValueForMissingStub: null);
+      super.noSuchMethod(Invocation.setter(#client, _client),
+          returnValueForMissingStub: null);
   @override
   bool get hasListeners =>
-      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false)
+          as bool);
   @override
-  void clear() =>
-      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+  void clear() => super.noSuchMethod(Invocation.method(#clear, []),
+      returnValueForMissingStub: null);
   @override
   _i6.WorkoutPlan findById(int? id) =>
-      (super.noSuchMethod(Invocation.method(#findById, [id]), returnValue: _FakeWorkoutPlan_4())
-          as _i6.WorkoutPlan);
+      (super.noSuchMethod(Invocation.method(#findById, [id]),
+          returnValue: _FakeWorkoutPlan_4()) as _i6.WorkoutPlan);
   @override
-  int findIndexById(int? id) =>
-      (super.noSuchMethod(Invocation.method(#findIndexById, [id]), returnValue: 0) as int);
+  int findIndexById(int? id) => (super
+          .noSuchMethod(Invocation.method(#findIndexById, [id]), returnValue: 0)
+      as int);
   @override
   void setCurrentPlan(int? id) =>
-      super.noSuchMethod(Invocation.method(#setCurrentPlan, [id]), returnValueForMissingStub: null);
+      super.noSuchMethod(Invocation.method(#setCurrentPlan, [id]),
+          returnValueForMissingStub: null);
   @override
   void resetCurrentPlan() =>
-      super.noSuchMethod(Invocation.method(#resetCurrentPlan, []), returnValueForMissingStub: null);
+      super.noSuchMethod(Invocation.method(#resetCurrentPlan, []),
+          returnValueForMissingStub: null);
   @override
-  _i13.Future<void> fetchAndSetAllPlansFull() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetAllPlansFull, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllPlansFull() => (super.noSuchMethod(
+      Invocation.method(#fetchAndSetAllPlansFull, []),
+      returnValue: Future<void>.value(),
+      returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
   @override
-  _i13.Future<void> fetchAndSetAllPlansSparse() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetAllPlansSparse, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllPlansSparse() => (super.noSuchMethod(
+      Invocation.method(#fetchAndSetAllPlansSparse, []),
+      returnValue: Future<void>.value(),
+      returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
   @override
   _i13.Future<_i6.WorkoutPlan> fetchAndSetPlanSparse(int? planId) =>
       (super.noSuchMethod(Invocation.method(#fetchAndSetPlanSparse, [planId]),
@@ -129,7 +134,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
           as _i13.Future<_i6.WorkoutPlan>);
   @override
   _i13.Future<_i6.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetWorkoutPlanFull, [workoutId]),
+      (super.noSuchMethod(
+              Invocation.method(#fetchAndSetWorkoutPlanFull, [workoutId]),
               returnValue: Future<_i6.WorkoutPlan>.value(_FakeWorkoutPlan_4()))
           as _i13.Future<_i6.WorkoutPlan>);
   @override
@@ -140,78 +146,89 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
   @override
   _i13.Future<void> editWorkout(_i6.WorkoutPlan? workout) =>
       (super.noSuchMethod(Invocation.method(#editWorkout, [workout]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
+              returnValue: Future<void>.value(),
+              returnValueForMissingStub: Future<void>.value())
+          as _i13.Future<void>);
   @override
-  _i13.Future<void> deleteWorkout(int? id) =>
-      (super.noSuchMethod(Invocation.method(#deleteWorkout, [id]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
+  _i13.Future<void> deleteWorkout(int? id) => (super.noSuchMethod(
+      Invocation.method(#deleteWorkout, [id]),
+      returnValue: Future<void>.value(),
+      returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
   @override
   _i13.Future<Map<String, dynamic>> fetchLogData(
           _i6.WorkoutPlan? workout, _i14.Exercise? exercise) =>
       (super.noSuchMethod(Invocation.method(#fetchLogData, [workout, exercise]),
-              returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
+              returnValue:
+                  Future<Map<String, dynamic>>.value(<String, dynamic>{}))
           as _i13.Future<Map<String, dynamic>>);
   @override
-  _i13.Future<void> fetchAndSetRepetitionUnits() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetRepetitionUnits, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
-  @override
-  _i13.Future<void> fetchAndSetWeightUnits() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetWeightUnits, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
-  @override
-  _i13.Future<void> fetchAndSetUnits() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetUnits, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
-  @override
-  _i13.Future<_i7.Day> addDay(_i7.Day? day, _i6.WorkoutPlan? workout) =>
-      (super.noSuchMethod(Invocation.method(#addDay, [day, workout]),
-          returnValue: Future<_i7.Day>.value(_FakeDay_5())) as _i13.Future<_i7.Day>);
-  @override
-  _i13.Future<void> editDay(_i7.Day? day) => (super.noSuchMethod(Invocation.method(#editDay, [day]),
+  _i13.Future<void> fetchAndSetRepetitionUnits() => (super.noSuchMethod(
+      Invocation.method(#fetchAndSetRepetitionUnits, []),
       returnValue: Future<void>.value(),
       returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
   @override
-  _i13.Future<void> deleteDay(_i7.Day? day) =>
-      (super.noSuchMethod(Invocation.method(#deleteDay, [day]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetWeightUnits() => (super.noSuchMethod(
+      Invocation.method(#fetchAndSetWeightUnits, []),
+      returnValue: Future<void>.value(),
+      returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
+  @override
+  _i13.Future<void> fetchAndSetUnits() => (super.noSuchMethod(
+      Invocation.method(#fetchAndSetUnits, []),
+      returnValue: Future<void>.value(),
+      returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
+  @override
+  _i13.Future<_i7.Day> addDay(_i7.Day? day, _i6.WorkoutPlan? workout) =>
+      (super.noSuchMethod(Invocation.method(#addDay, [day, workout]),
+              returnValue: Future<_i7.Day>.value(_FakeDay_5()))
+          as _i13.Future<_i7.Day>);
+  @override
+  _i13.Future<void> editDay(_i7.Day? day) => (super.noSuchMethod(
+      Invocation.method(#editDay, [day]),
+      returnValue: Future<void>.value(),
+      returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
+  @override
+  _i13.Future<void> deleteDay(_i7.Day? day) => (super.noSuchMethod(
+      Invocation.method(#deleteDay, [day]),
+      returnValue: Future<void>.value(),
+      returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
   @override
   _i13.Future<_i8.Set> addSet(_i8.Set? workoutSet) =>
       (super.noSuchMethod(Invocation.method(#addSet, [workoutSet]),
-          returnValue: Future<_i8.Set>.value(_FakeSet_6())) as _i13.Future<_i8.Set>);
+              returnValue: Future<_i8.Set>.value(_FakeSet_6()))
+          as _i13.Future<_i8.Set>);
   @override
-  _i13.Future<void> editSet(_i8.Set? workoutSet) =>
-      (super.noSuchMethod(Invocation.method(#editSet, [workoutSet]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
+  _i13.Future<void> editSet(_i8.Set? workoutSet) => (super.noSuchMethod(
+      Invocation.method(#editSet, [workoutSet]),
+      returnValue: Future<void>.value(),
+      returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
   @override
-  _i13.Future<List<_i8.Set>> reorderSets(List<_i8.Set>? sets, int? startIndex) =>
+  _i13.Future<List<_i8.Set>> reorderSets(
+          List<_i8.Set>? sets, int? startIndex) =>
       (super.noSuchMethod(Invocation.method(#reorderSets, [sets, startIndex]),
-          returnValue: Future<List<_i8.Set>>.value(<_i8.Set>[])) as _i13.Future<List<_i8.Set>>);
+              returnValue: Future<List<_i8.Set>>.value(<_i8.Set>[]))
+          as _i13.Future<List<_i8.Set>>);
   @override
-  _i13.Future<void> fetchComputedSettings(_i8.Set? workoutSet) =>
-      (super.noSuchMethod(Invocation.method(#fetchComputedSettings, [workoutSet]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
+  _i13.Future<void> fetchComputedSettings(_i8.Set? workoutSet) => (super
+          .noSuchMethod(Invocation.method(#fetchComputedSettings, [workoutSet]),
+              returnValue: Future<void>.value(),
+              returnValueForMissingStub: Future<void>.value())
+      as _i13.Future<void>);
   @override
-  _i13.Future<String> fetchSmartText(_i8.Set? workoutSet, _i14.Exercise? exercise) =>
-      (super.noSuchMethod(Invocation.method(#fetchSmartText, [workoutSet, exercise]),
+  _i13.Future<String> fetchSmartText(
+          _i8.Set? workoutSet, _i14.Exercise? exercise) =>
+      (super.noSuchMethod(
+          Invocation.method(#fetchSmartText, [workoutSet, exercise]),
           returnValue: Future<String>.value('')) as _i13.Future<String>);
   @override
-  _i13.Future<void> deleteSet(_i8.Set? workoutSet) =>
-      (super.noSuchMethod(Invocation.method(#deleteSet, [workoutSet]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
+  _i13.Future<void> deleteSet(_i8.Set? workoutSet) => (super.noSuchMethod(
+      Invocation.method(#deleteSet, [workoutSet]),
+      returnValue: Future<void>.value(),
+      returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
   @override
   _i13.Future<_i9.Setting> addSetting(_i9.Setting? workoutSetting) =>
       (super.noSuchMethod(Invocation.method(#addSetting, [workoutSetting]),
-          returnValue: Future<_i9.Setting>.value(_FakeSetting_7())) as _i13.Future<_i9.Setting>);
+              returnValue: Future<_i9.Setting>.value(_FakeSetting_7()))
+          as _i13.Future<_i9.Setting>);
   @override
   _i13.Future<dynamic> fetchSessionData() =>
       (super.noSuchMethod(Invocation.method(#fetchSessionData, []),
@@ -219,55 +236,65 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
   @override
   _i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session) =>
       (super.noSuchMethod(Invocation.method(#addSession, [session]),
-              returnValue: Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8()))
+              returnValue:
+                  Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8()))
           as _i13.Future<_i10.WorkoutSession>);
   @override
   _i13.Future<_i11.Log> addLog(_i11.Log? log) =>
       (super.noSuchMethod(Invocation.method(#addLog, [log]),
-          returnValue: Future<_i11.Log>.value(_FakeLog_9())) as _i13.Future<_i11.Log>);
+              returnValue: Future<_i11.Log>.value(_FakeLog_9()))
+          as _i13.Future<_i11.Log>);
   @override
-  _i13.Future<void> deleteLog(_i11.Log? log) =>
-      (super.noSuchMethod(Invocation.method(#deleteLog, [log]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
+  _i13.Future<void> deleteLog(_i11.Log? log) => (super.noSuchMethod(
+      Invocation.method(#deleteLog, [log]),
+      returnValue: Future<void>.value(),
+      returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
   @override
-  Uri makeUrl(String? path, {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
+  Uri makeUrl(String? path,
+          {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
       (super.noSuchMethod(
-          Invocation.method(
-              #makeUrl, [path], {#id: id, #objectMethod: objectMethod, #query: query}),
+          Invocation.method(#makeUrl, [path],
+              {#id: id, #objectMethod: objectMethod, #query: query}),
           returnValue: _FakeUri_10()) as Uri);
   @override
-  _i13.Future<Map<String, dynamic>> fetch(Uri? uri) =>
-      (super.noSuchMethod(Invocation.method(#fetch, [uri]),
-              returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
-          as _i13.Future<Map<String, dynamic>>);
+  _i13.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
+          Invocation.method(#fetch, [uri]),
+          returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
+      as _i13.Future<Map<String, dynamic>>);
   @override
-  _i13.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
+  _i13.Future<Map<String, dynamic>> post(
+          Map<String, dynamic>? data, Uri? uri) =>
       (super.noSuchMethod(Invocation.method(#post, [data, uri]),
-              returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
+              returnValue:
+                  Future<Map<String, dynamic>>.value(<String, dynamic>{}))
           as _i13.Future<Map<String, dynamic>>);
   @override
-  _i13.Future<Map<String, dynamic>> patch(Map<String, dynamic>? data, Uri? uri) =>
+  _i13.Future<Map<String, dynamic>> patch(
+          Map<String, dynamic>? data, Uri? uri) =>
       (super.noSuchMethod(Invocation.method(#patch, [data, uri]),
-              returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
+              returnValue:
+                  Future<Map<String, dynamic>>.value(<String, dynamic>{}))
           as _i13.Future<Map<String, dynamic>>);
   @override
-  _i13.Future<_i5.Response> deleteRequest(String? url, int? id) => (super.noSuchMethod(
-      Invocation.method(#deleteRequest, [url, id]),
-      returnValue: Future<_i5.Response>.value(_FakeResponse_11())) as _i13.Future<_i5.Response>);
+  _i13.Future<_i5.Response> deleteRequest(String? url, int? id) =>
+      (super.noSuchMethod(Invocation.method(#deleteRequest, [url, id]),
+              returnValue: Future<_i5.Response>.value(_FakeResponse_11()))
+          as _i13.Future<_i5.Response>);
   @override
   String toString() => super.toString();
   @override
-  void addListener(_i15.VoidCallback? listener) => super
-      .noSuchMethod(Invocation.method(#addListener, [listener]), returnValueForMissingStub: null);
+  void addListener(_i15.VoidCallback? listener) =>
+      super.noSuchMethod(Invocation.method(#addListener, [listener]),
+          returnValueForMissingStub: null);
   @override
   void removeListener(_i15.VoidCallback? listener) =>
       super.noSuchMethod(Invocation.method(#removeListener, [listener]),
           returnValueForMissingStub: null);
   @override
-  void dispose() =>
-      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
+  void dispose() => super.noSuchMethod(Invocation.method(#dispose, []),
+      returnValueForMissingStub: null);
   @override
   void notifyListeners() =>
-      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
+      super.noSuchMethod(Invocation.method(#notifyListeners, []),
+          returnValueForMissingStub: null);
 }
diff --git a/test/workout/workout_set_form_test.mocks.dart b/test/workout/workout_set_form_test.mocks.dart
index 87955720..6e946b12 100644
--- a/test/workout/workout_set_form_test.mocks.dart
+++ b/test/workout/workout_set_form_test.mocks.dart
@@ -1,15 +1,19 @@
-// Mocks generated by Mockito 5.0.16 from annotations
+// Mocks generated by Mockito 5.0.15 from annotations
 // in wger/test/workout/workout_set_form_test.dart.
 // Do not manually edit this file.
 
-import 'dart:async' as _i6;
-import 'dart:ui' as _i7;
+import 'dart:async' as _i9;
+import 'dart:ui' as _i11;
 
-import 'package:http/http.dart' as _i3;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:wger/models/exercises/exercise.dart' as _i4;
-import 'package:wger/providers/auth.dart' as _i2;
-import 'package:wger/providers/exercises.dart' as _i5;
+import 'package:wger/models/exercises/base.dart' as _i10;
+import 'package:wger/models/exercises/category.dart' as _i4;
+import 'package:wger/models/exercises/equipment.dart' as _i5;
+import 'package:wger/models/exercises/exercise.dart' as _i3;
+import 'package:wger/models/exercises/language.dart' as _i7;
+import 'package:wger/models/exercises/muscle.dart' as _i6;
+import 'package:wger/providers/base_provider.dart' as _i2;
+import 'package:wger/providers/exercises.dart' as _i8;
 
 // ignore_for_file: avoid_redundant_argument_values
 // ignore_for_file: avoid_setters_without_getters
@@ -18,116 +22,178 @@ import 'package:wger/providers/exercises.dart' as _i5;
 // ignore_for_file: invalid_use_of_visible_for_testing_member
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
 
-class _FakeAuthProvider_0 extends _i1.Fake implements _i2.AuthProvider {}
+class _FakeWgerBaseProvider_0 extends _i1.Fake implements _i2.WgerBaseProvider {
+}
 
-class _FakeClient_1 extends _i1.Fake implements _i3.Client {}
+class _FakeExercise_1 extends _i1.Fake implements _i3.Exercise {}
 
-class _FakeExercise_2 extends _i1.Fake implements _i4.Exercise {}
+class _FakeExerciseCategory_2 extends _i1.Fake implements _i4.ExerciseCategory {
+}
 
-class _FakeUri_3 extends _i1.Fake implements Uri {}
+class _FakeEquipment_3 extends _i1.Fake implements _i5.Equipment {}
 
-class _FakeResponse_4 extends _i1.Fake implements _i3.Response {}
+class _FakeMuscle_4 extends _i1.Fake implements _i6.Muscle {}
+
+class _FakeLanguage_5 extends _i1.Fake implements _i7.Language {}
 
 /// A class which mocks [ExercisesProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockExercisesProvider extends _i1.Mock implements _i5.ExercisesProvider {
+class MockExercisesProvider extends _i1.Mock implements _i8.ExercisesProvider {
   MockExercisesProvider() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  List<_i4.Exercise> get items =>
-      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i4.Exercise>[])
-          as List<_i4.Exercise>);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(Invocation.getter(#baseProvider),
+          returnValue: _FakeWgerBaseProvider_0()) as _i2.WgerBaseProvider);
   @override
-  _i2.AuthProvider get auth =>
-      (super.noSuchMethod(Invocation.getter(#auth), returnValue: _FakeAuthProvider_0())
-          as _i2.AuthProvider);
+  set exercises(List<_i3.Exercise>? exercises) =>
+      super.noSuchMethod(Invocation.setter(#exercises, exercises),
+          returnValueForMissingStub: null);
   @override
-  set auth(_i2.AuthProvider? _auth) =>
-      super.noSuchMethod(Invocation.setter(#auth, _auth), returnValueForMissingStub: null);
+  set filteredExercises(List<_i3.Exercise>? newfilteredExercises) => super
+      .noSuchMethod(Invocation.setter(#filteredExercises, newfilteredExercises),
+          returnValueForMissingStub: null);
   @override
-  _i3.Client get client =>
-      (super.noSuchMethod(Invocation.getter(#client), returnValue: _FakeClient_1()) as _i3.Client);
+  List<_i3.Exercise> get items => (super.noSuchMethod(Invocation.getter(#items),
+      returnValue: <_i3.Exercise>[]) as List<_i3.Exercise>);
   @override
-  set client(_i3.Client? _client) =>
-      super.noSuchMethod(Invocation.setter(#client, _client), returnValueForMissingStub: null);
+  List<_i4.ExerciseCategory> get categories =>
+      (super.noSuchMethod(Invocation.getter(#categories),
+          returnValue: <_i4.ExerciseCategory>[]) as List<_i4.ExerciseCategory>);
   @override
   bool get hasListeners =>
-      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false)
+          as bool);
   @override
-  _i4.Exercise findById(int? exerciseId) => (super
-          .noSuchMethod(Invocation.method(#findById, [exerciseId]), returnValue: _FakeExercise_2())
-      as _i4.Exercise);
+  _i9.Future<void> setFilters(_i8.Filters? newFilters) =>
+      (super.noSuchMethod(Invocation.method(#setFilters, [newFilters]),
+          returnValue: Future<void>.value(),
+          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
   @override
-  _i6.Future<void> fetchAndSetCategories() =>
+  _i9.Future<void> findByFilters() =>
+      (super.noSuchMethod(Invocation.method(#findByFilters, []),
+          returnValue: Future<void>.value(),
+          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+  @override
+  void clear() => super.noSuchMethod(Invocation.method(#clear, []),
+      returnValueForMissingStub: null);
+  @override
+  List<_i3.Exercise> findByCategory(_i4.ExerciseCategory? category) =>
+      (super.noSuchMethod(Invocation.method(#findByCategory, [category]),
+          returnValue: <_i3.Exercise>[]) as List<_i3.Exercise>);
+  @override
+  _i3.Exercise findExerciseById(int? id) =>
+      (super.noSuchMethod(Invocation.method(#findExerciseById, [id]),
+          returnValue: _FakeExercise_1()) as _i3.Exercise);
+  @override
+  _i4.ExerciseCategory findCategoryById(int? id) =>
+      (super.noSuchMethod(Invocation.method(#findCategoryById, [id]),
+          returnValue: _FakeExerciseCategory_2()) as _i4.ExerciseCategory);
+  @override
+  _i5.Equipment findEquipmentById(int? id) =>
+      (super.noSuchMethod(Invocation.method(#findEquipmentById, [id]),
+          returnValue: _FakeEquipment_3()) as _i5.Equipment);
+  @override
+  _i6.Muscle findMuscleById(int? id) =>
+      (super.noSuchMethod(Invocation.method(#findMuscleById, [id]),
+          returnValue: _FakeMuscle_4()) as _i6.Muscle);
+  @override
+  _i7.Language findLanguageById(int? id) =>
+      (super.noSuchMethod(Invocation.method(#findLanguageById, [id]),
+          returnValue: _FakeLanguage_5()) as _i7.Language);
+  @override
+  _i9.Future<void> fetchAndSetCategories() =>
       (super.noSuchMethod(Invocation.method(#fetchAndSetCategories, []),
           returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i6.Future<void>);
+          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
   @override
-  _i6.Future<void> fetchAndSetMuscles() =>
+  _i9.Future<void> fetchAndSetVariations() =>
+      (super.noSuchMethod(Invocation.method(#fetchAndSetVariations, []),
+          returnValue: Future<void>.value(),
+          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+  @override
+  _i9.Future<void> fetchAndSetMuscles() =>
       (super.noSuchMethod(Invocation.method(#fetchAndSetMuscles, []),
           returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i6.Future<void>);
+          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
   @override
-  _i6.Future<void> fetchAndSetEquipment() =>
+  _i9.Future<void> fetchAndSetEquipment() =>
       (super.noSuchMethod(Invocation.method(#fetchAndSetEquipment, []),
           returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i6.Future<void>);
+          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
   @override
-  _i6.Future<_i4.Exercise> fetchAndSetExercise(int? exerciseId) =>
+  _i9.Future<void> fetchAndSetLanguages() =>
+      (super.noSuchMethod(Invocation.method(#fetchAndSetLanguages, []),
+          returnValue: Future<void>.value(),
+          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+  @override
+  _i9.Future<_i3.Exercise> fetchAndSetExercise(int? exerciseId) =>
       (super.noSuchMethod(Invocation.method(#fetchAndSetExercise, [exerciseId]),
-          returnValue: Future<_i4.Exercise>.value(_FakeExercise_2())) as _i6.Future<_i4.Exercise>);
+              returnValue: Future<_i3.Exercise>.value(_FakeExercise_1()))
+          as _i9.Future<_i3.Exercise>);
   @override
-  _i6.Future<void> fetchAndSetExercises() =>
+  List<_i10.ExerciseBase> mapImages(
+          dynamic data, List<_i10.ExerciseBase>? bases) =>
+      (super.noSuchMethod(Invocation.method(#mapImages, [data, bases]),
+          returnValue: <_i10.ExerciseBase>[]) as List<_i10.ExerciseBase>);
+  @override
+  List<_i10.ExerciseBase> setBaseData(
+          dynamic data, List<_i3.Exercise>? exercises) =>
+      (super.noSuchMethod(Invocation.method(#setBaseData, [data, exercises]),
+          returnValue: <_i10.ExerciseBase>[]) as List<_i10.ExerciseBase>);
+  @override
+  List<dynamic> mapBases(
+          List<_i10.ExerciseBase>? bases, List<_i3.Exercise>? exercises) =>
+      (super.noSuchMethod(Invocation.method(#mapBases, [bases, exercises]),
+          returnValue: <dynamic>[]) as List<dynamic>);
+  @override
+  List<_i3.Exercise> mapLanguages(List<_i3.Exercise>? exercises) =>
+      (super.noSuchMethod(Invocation.method(#mapLanguages, [exercises]),
+          returnValue: <_i3.Exercise>[]) as List<_i3.Exercise>);
+  @override
+  List<_i3.Exercise> mapAliases(dynamic data, List<_i3.Exercise>? exercises) =>
+      (super.noSuchMethod(Invocation.method(#mapAliases, [data, exercises]),
+          returnValue: <_i3.Exercise>[]) as List<_i3.Exercise>);
+  @override
+  List<_i3.Exercise> mapComments(dynamic data, List<_i3.Exercise>? exercises) =>
+      (super.noSuchMethod(Invocation.method(#mapComments, [data, exercises]),
+          returnValue: <_i3.Exercise>[]) as List<_i3.Exercise>);
+  @override
+  _i9.Future<void> checkExerciseCacheVersion() =>
+      (super.noSuchMethod(Invocation.method(#checkExerciseCacheVersion, []),
+          returnValue: Future<void>.value(),
+          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+  @override
+  _i9.Future<void> fetchAndSetExercises() =>
       (super.noSuchMethod(Invocation.method(#fetchAndSetExercises, []),
           returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i6.Future<void>);
+          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
   @override
-  _i6.Future<List<dynamic>> searchExercise(String? name, [String? languageCode = r'en']) =>
-      (super.noSuchMethod(Invocation.method(#searchExercise, [name, languageCode]),
-          returnValue: Future<List<dynamic>>.value(<dynamic>[])) as _i6.Future<List<dynamic>>);
-  @override
-  Uri makeUrl(String? path, {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
+  _i9.Future<List<_i3.Exercise>> searchExercise(String? name,
+          [String? languageCode = r'en']) =>
       (super.noSuchMethod(
-          Invocation.method(
-              #makeUrl, [path], {#id: id, #objectMethod: objectMethod, #query: query}),
-          returnValue: _FakeUri_3()) as Uri);
-  @override
-  _i6.Future<Map<String, dynamic>> fetch(Uri? uri) =>
-      (super.noSuchMethod(Invocation.method(#fetch, [uri]),
-              returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
-          as _i6.Future<Map<String, dynamic>>);
-  @override
-  _i6.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
-      (super.noSuchMethod(Invocation.method(#post, [data, uri]),
-              returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
-          as _i6.Future<Map<String, dynamic>>);
-  @override
-  _i6.Future<Map<String, dynamic>> patch(Map<String, dynamic>? data, Uri? uri) =>
-      (super.noSuchMethod(Invocation.method(#patch, [data, uri]),
-              returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
-          as _i6.Future<Map<String, dynamic>>);
-  @override
-  _i6.Future<_i3.Response> deleteRequest(String? url, int? id) =>
-      (super.noSuchMethod(Invocation.method(#deleteRequest, [url, id]),
-          returnValue: Future<_i3.Response>.value(_FakeResponse_4())) as _i6.Future<_i3.Response>);
+              Invocation.method(#searchExercise, [name, languageCode]),
+              returnValue: Future<List<_i3.Exercise>>.value(<_i3.Exercise>[]))
+          as _i9.Future<List<_i3.Exercise>>);
   @override
   String toString() => super.toString();
   @override
-  void addListener(_i7.VoidCallback? listener) => super
-      .noSuchMethod(Invocation.method(#addListener, [listener]), returnValueForMissingStub: null);
+  void addListener(_i11.VoidCallback? listener) =>
+      super.noSuchMethod(Invocation.method(#addListener, [listener]),
+          returnValueForMissingStub: null);
   @override
-  void removeListener(_i7.VoidCallback? listener) =>
+  void removeListener(_i11.VoidCallback? listener) =>
       super.noSuchMethod(Invocation.method(#removeListener, [listener]),
           returnValueForMissingStub: null);
   @override
-  void dispose() =>
-      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
+  void dispose() => super.noSuchMethod(Invocation.method(#dispose, []),
+      returnValueForMissingStub: null);
   @override
   void notifyListeners() =>
-      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
+      super.noSuchMethod(Invocation.method(#notifyListeners, []),
+          returnValueForMissingStub: null);
 }