Merge branch 'master' into indonesia-language-translate

.gitignore

@@ -18,7 +18,7 @@
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
 # is commented out by default.
-#.vscode/
+.vscode/
 
 # Flutter/Dart/Pub related
 **/doc/api/
@@ -31,6 +31,7 @@
 .pub/
 /build/
 
+
 # Web related
 lib/generated_plugin_registrant.dart
 

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "dart.lineLength": 100
+    "dart.lineLength": 100,
+    "diffEditor.ignoreTrimWhitespace": true,
 }

AUTHORS.md

@@ -14,6 +14,7 @@
 - Karthik Reddy (Axel) - <https://github.com/AxelBlaz3>
 - Ogundoyin Toluwani - <https://github.com/Tolu007>
 - Nenza Nurfirmansyah - <https://github.com/nenzan>
+- Florian Schmitz - <https://github.com/floodoo>
 
 ## Translators
 

android/app/build.gradle

@@ -51,7 +51,7 @@ if (localMapsPropertiesFile.exists()) {
 def wgerApiKey = wgerProperties.getProperty('WGER_API_KEY')
 if(wgerApiKey == null){
     wgerApiKey = ""
-    project.logger.error('Wger Api Key not configured. Set it in `app/wger.properties` or in the environment variable `WGER_API_KEY`')
+    project.logger.error('Wger Api Key not configured. Set it in `/fastlane/metadata/android/envfiles/wger.properties` or in the environment variable `WGER_API_KEY`')
 }
 
 android {

android/fastlane/envfiles/wger.properties

@@ -1,3 +0,0 @@
-```properties
-WGER_API_KEY=77a270641bb5654c517e91f277bf06623c141318
-```

ios/Runner/Info.plist

@@ -41,5 +41,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 </dict>
 </plist>

lib/helpers/misc.dart

@@ -93,8 +93,8 @@ extension TimeOfDayExtension on TimeOfDay {
 }
 
 void launchURL(String url, BuildContext context) async {
-  await canLaunch(url)
-      ? await launch(url)
+  await canLaunchUrl(Uri.parse(url))
+      ? await launchUrl(Uri.parse(url))
       : ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(content: Text('Could not open $url.')),
         );

lib/models/nutrition/ingredient.dart

@@ -27,7 +27,7 @@ class Ingredient {
 
   /// Barcode of the product
   @JsonKey(required: true)
-  final String code;
+  final String? code;
 
   /// Name of the product
   @JsonKey(required: true)

lib/models/nutrition/ingredient.g.dart

@@ -26,7 +26,7 @@ Ingredient _$IngredientFromJson(Map<String, dynamic> json) {
   );
   return Ingredient(
     id: json['id'] as int,
-    code: json['code'] as String,
+    code: json['code'] as String?,
     name: json['name'] as String,
     creationDate: DateTime.parse(json['creation_date'] as String),
     energy: json['energy'] as int,

lib/models/nutrition/nutritional_values.dart

@@ -91,7 +91,7 @@ class NutritionalValues {
 
   @override
   //ignore: avoid_equals_and_hash_code_on_mutable_classes
-  int get hashCode => hashValues(
+  int get hashCode => Object.hash(
       energy, protein, carbohydrates, carbohydratesSugar, fat, fatSaturated, fibres, sodium);
 }
 

lib/models/workouts/log.dart

@@ -133,7 +133,7 @@ class Log {
 
   @override
   //ignore: avoid_equals_and_hash_code_on_mutable_classes
-  int get hashCode => hashValues(exerciseId, weight, weightUnitId, reps, repetitionUnitId, rir);
+  int get hashCode => Object.hash(exerciseId, weight, weightUnitId, reps, repetitionUnitId, rir);
 
   //@override
   //int get hashCode => super.hashCode;

lib/screens/auth_screen.dart

@@ -119,7 +119,7 @@ class _AuthCardState extends State<AuthCard> {
     // If not, the user will not be able to register via the app
     try {
       final metadata = Provider.of<AuthProvider>(context, listen: false).metadata;
-      if (metadata.containsKey(MANIFEST_KEY_API) || metadata[MANIFEST_KEY_API] == '') {
+      if (metadata.containsKey(MANIFEST_KEY_API) && metadata[MANIFEST_KEY_API] == '') {
         _canRegister = false;
       }
     } on PlatformException {
@@ -221,6 +221,7 @@ class _AuthCardState extends State<AuthCard> {
                       }
                       return null;
                     },
+                    inputFormatters: [FilteringTextInputFormatter.deny(new RegExp(r"\s\b|\b\s"))],
                     onSaved: (value) {
                       _authData['username'] = value!;
                     },

lib/screens/home_tabs_screen.dart

@@ -165,7 +165,7 @@ class _HomeTabsScreenState extends State<HomeTabsScreen> with SingleTickerProvid
                 ),
                 BottomNavigationBarItem(
                   icon: const FaIcon(
-                    FontAwesomeIcons.weight,
+                    FontAwesomeIcons.weightScale,
                     size: 20,
                   ),
                   label: AppLocalizations.of(context).weight,

lib/theme/theme.dart

@@ -100,14 +100,14 @@ final ThemeData wgerTheme = ThemeData(
     ),
     outlinedButtonTheme: OutlinedButtonThemeData(
       style: OutlinedButton.styleFrom(
-        primary: wgerPrimaryButtonColor,
+        foregroundColor: wgerPrimaryButtonColor,
         visualDensity: VisualDensity.compact,
         side: const BorderSide(color: wgerPrimaryButtonColor),
       ),
     ),
     elevatedButtonTheme: ElevatedButtonThemeData(
       style: ElevatedButton.styleFrom(
-        primary: wgerPrimaryButtonColor,
+        backgroundColor: wgerPrimaryButtonColor,
       ),
     ),
 

lib/widgets/dashboard/widgets.dart

@@ -253,7 +253,7 @@ class _DashboardWeightWidgetState extends State<DashboardWeightWidget> {
                 style: Theme.of(context).textTheme.headline4,
               ),
               leading: const FaIcon(
-                FontAwesomeIcons.weight,
+                FontAwesomeIcons.weightScale,
                 color: Colors.black,
               ),
               trailing: IconButton(

lib/widgets/measurements/forms.dart

@@ -156,6 +156,11 @@ class MeasurementEntryForm extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final measurementProvider = Provider.of<MeasurementProvider>(context, listen: false);
+    final measurementCategory = measurementProvider.categories.firstWhere(
+      (category) => category.id == _categoryId,
+    );
+
     return Form(
       key: _form,
       child: Column(
@@ -199,7 +204,11 @@ class MeasurementEntryForm extends StatelessWidget {
           ),
           // Value
           TextFormField(
-            decoration: InputDecoration(labelText: AppLocalizations.of(context).value),
+            decoration: InputDecoration(
+              labelText: AppLocalizations.of(context).value,
+              suffixIcon: Text(measurementCategory.unit),
+              suffixIconConstraints: const BoxConstraints(minWidth: 0, minHeight: 0),
+            ),
             controller: _valueController,
             keyboardType: TextInputType.number,
             validator: (value) {

pubspec.lock

@@ -489,7 +489,7 @@ packages:
       name: image_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.5"
+    version: "0.8.6"
   image_picker_android:
     dependency: transitive
     description:
@@ -510,14 +510,14 @@ packages:
       name: image_picker_ios
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.5"
+    version: "0.8.6+1"
   image_picker_platform_interface:
     dependency: transitive
     description:
       name: image_picker_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.4"
+    version: "2.6.2"
   intl:
     dependency: "direct main"
     description:
@@ -552,7 +552,7 @@ packages:
       name: json_serializable
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.4.0"
+    version: "6.5.0"
   klizma:
     dependency: transitive
     description:
@@ -956,7 +956,7 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.5"
+    version: "6.1.6"
   url_launcher_android:
     dependency: transitive
     description:

pubspec.yaml

@@ -42,7 +42,7 @@ dependencies:
   flutter_typeahead: ^4.1.1
   font_awesome_flutter: ^10.2.1
   http: ^0.13.5
-  image_picker: ^0.8.4+9
+  image_picker: ^0.8.6
   intl: ^0.17.0
   json_annotation: ^4.7.0
   version: ^3.0.2
@@ -51,7 +51,7 @@ dependencies:
   rive: ^0.9.1
   shared_preferences: ^2.0.15
   table_calendar: ^3.0.7
-  url_launcher: ^6.1.5
+  url_launcher: ^6.1.6
   flutter_barcode_scanner: ^2.0.0
   video_player: ^2.4.7
 
@@ -62,7 +62,7 @@ dev_dependencies:
   #  sdk: flutter
   build_runner: ^2.2.1
   flutter_launcher_icons: ^0.10.0
-  json_serializable: ^6.3.2
+  json_serializable: ^6.5.0
   mockito: ^5.3.2
   network_image_mock: ^2.1.1
   flutter_lints: ^2.0.1

test/gallery/gallery_screen_test.mocks.dart

@@ -1,7 +1,8 @@
-// Mocks generated by Mockito 5.0.17 from annotations
+// Mocks generated by Mockito 5.3.2 from annotations
 // in wger/test/gallery/gallery_screen_test.dart.
 // Do not manually edit this file.
 
+// ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i6;
 import 'dart:ui' as _i8;
 
@@ -12,6 +13,7 @@ import 'package:wger/models/gallery/image.dart' as _i5;
 import 'package:wger/providers/auth.dart' as _i2;
 import 'package:wger/providers/gallery.dart' as _i4;
 
+// ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
 // ignore_for_file: avoid_setters_without_getters
 // ignore_for_file: comment_references
@@ -20,14 +22,47 @@ import 'package:wger/providers/gallery.dart' as _i4;
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
 
-class _FakeAuthProvider_0 extends _i1.Fake implements _i2.AuthProvider {}
+class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
+  _FakeAuthProvider_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeClient_1 extends _i1.Fake implements _i3.Client {}
+class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
+  _FakeClient_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeUri_2 extends _i1.Fake implements Uri {}
+class _FakeUri_2 extends _i1.SmartFake implements Uri {
+  _FakeUri_2(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeResponse_3 extends _i1.Fake implements _i3.Response {}
+class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
+  _FakeResponse_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
 /// A class which mocks [GalleryProvider].
 ///
@@ -38,87 +73,235 @@ 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);
+  set images(List<_i5.Image>? _images) => 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(
+          this,
+          Invocation.getter(#auth),
+        ),
+      ) as _i2.AuthProvider);
   @override
-  set auth(_i2.AuthProvider? _auth) =>
-      super.noSuchMethod(Invocation.setter(#auth, _auth), returnValueForMissingStub: null);
+  set auth(_i2.AuthProvider? _auth) => 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(
+          this,
+          Invocation.getter(#client),
+        ),
+      ) as _i3.Client);
   @override
-  set client(_i3.Client? _client) =>
-      super.noSuchMethod(Invocation.setter(#client, _client), returnValueForMissingStub: null);
+  set client(_i3.Client? _client) => super.noSuchMethod(
+        Invocation.setter(
+          #client,
+          _client,
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  bool get hasListeners =>
-      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+  bool get hasListeners => (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, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i6.Future<void>);
+  _i6.Future<void> fetchAndSetGallery() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetGallery,
+          [],
+        ),
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  _i6.Future<void> addImage(_i5.Image? image, _i7.XFile? imageFile) =>
-      (super.noSuchMethod(Invocation.method(#addImage, [image, imageFile]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i6.Future<void>);
-  @override
-  _i6.Future<void> editImage(_i5.Image? image, _i7.XFile? imageFile) =>
-      (super.noSuchMethod(Invocation.method(#editImage, [image, imageFile]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i6.Future<void>);
-  @override
-  _i6.Future<void> deleteImage(_i5.Image? image) =>
-      (super.noSuchMethod(Invocation.method(#deleteImage, [image]),
-          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}) =>
+  _i6.Future<void> addImage(
+    _i5.Image? image,
+    _i7.XFile? imageFile,
+  ) =>
       (super.noSuchMethod(
+        Invocation.method(
+          #addImage,
+          [
+            image,
+            imageFile,
+          ],
+        ),
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
+  @override
+  _i6.Future<void> editImage(
+    _i5.Image? image,
+    _i7.XFile? imageFile,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #editImage,
+          [
+            image,
+            imageFile,
+          ],
+        ),
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
+  @override
+  _i6.Future<void> deleteImage(_i5.Image? image) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteImage,
+          [image],
+        ),
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
+  @override
+  Uri makeUrl(
+    String? path, {
+    int? id,
+    String? objectMethod,
+    Map<String, dynamic>? query,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #makeUrl,
+          [path],
+          {
+            #id: id,
+            #objectMethod: objectMethod,
+            #query: query,
+          },
+        ),
+        returnValue: _FakeUri_2(
+          this,
           Invocation.method(
-              #makeUrl, [path], {#id: id, #objectMethod: objectMethod, #query: query}),
-          returnValue: _FakeUri_2()) as Uri);
+            #makeUrl,
+            [path],
+            {
+              #id: id,
+              #objectMethod: objectMethod,
+              #query: query,
+            },
+          ),
+        ),
+      ) 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: _i6.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>>);
+  _i6.Future<Map<String, dynamic>> post(
+    Map<String, dynamic>? data,
+    Uri? uri,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #post,
+          [
+            data,
+            uri,
+          ],
+        ),
+        returnValue: _i6.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>>);
+  _i6.Future<Map<String, dynamic>> patch(
+    Map<String, dynamic>? data,
+    Uri? uri,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #patch,
+          [
+            data,
+            uri,
+          ],
+        ),
+        returnValue: _i6.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>);
+  _i6.Future<_i3.Response> deleteRequest(
+    String? url,
+    int? id,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #deleteRequest,
+          [
+            url,
+            id,
+          ],
+        ),
+        returnValue: _i6.Future<_i3.Response>.value(_FakeResponse_3(
+          this,
+          Invocation.method(
+            #deleteRequest,
+            [
+              url,
+              id,
+            ],
+          ),
+        )),
+      ) as _i6.Future<_i3.Response>);
   @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);
+  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);
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
 }

test/measurements/measurement_categories_screen_test.mocks.dart

@@ -1,7 +1,8 @@
-// Mocks generated by Mockito 5.0.17 from annotations
+// Mocks generated by Mockito 5.3.2 from annotations
 // in wger/test/measurements/measurement_categories_screen_test.dart.
 // Do not manually edit this file.
 
+// ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i5;
 import 'dart:ui' as _i7;
 
@@ -11,6 +12,7 @@ import 'package:wger/models/measurements/measurement_entry.dart' as _i6;
 import 'package:wger/providers/base_provider.dart' as _i2;
 import 'package:wger/providers/measurement.dart' as _i4;
 
+// ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
 // ignore_for_file: avoid_setters_without_getters
 // ignore_for_file: comment_references
@@ -19,10 +21,27 @@ import 'package:wger/providers/measurement.dart' as _i4;
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
 
-class _FakeWgerBaseProvider_0 extends _i1.Fake implements _i2.WgerBaseProvider {}
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeMeasurementCategory_1 extends _i1.Fake implements _i3.MeasurementCategory {}
+class _FakeMeasurementCategory_1 extends _i1.SmartFake implements _i3.MeasurementCategory {
+  _FakeMeasurementCategory_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
 /// A class which mocks [MeasurementProvider].
 ///
@@ -33,81 +52,185 @@ class MockMeasurementProvider extends _i1.Mock implements _i4.MeasurementProvide
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider =>
-      (super.noSuchMethod(Invocation.getter(#baseProvider), returnValue: _FakeWgerBaseProvider_0())
-          as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
+        Invocation.getter(#baseProvider),
+        returnValue: _FakeWgerBaseProvider_0(
+          this,
+          Invocation.getter(#baseProvider),
+        ),
+      ) as _i2.WgerBaseProvider);
   @override
-  List<_i3.MeasurementCategory> get categories =>
-      (super.noSuchMethod(Invocation.getter(#categories), returnValue: <_i3.MeasurementCategory>[])
-          as List<_i3.MeasurementCategory>);
+  List<_i3.MeasurementCategory> get categories => (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);
+  bool get hasListeners => (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(
+          this,
+          Invocation.method(
+            #findCategoryById,
+            [id],
+          ),
+        ),
+      ) as _i3.MeasurementCategory);
   @override
-  _i5.Future<void> fetchAndSetCategories() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetCategories, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
+  _i5.Future<void> fetchAndSetCategories() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetCategories,
+          [],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
   @override
-  _i5.Future<void> fetchAndSetCategoryEntries(int? id) =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetCategoryEntries, [id]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
+  _i5.Future<void> fetchAndSetCategoryEntries(int? id) => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetCategoryEntries,
+          [id],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.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: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
   @override
-  _i5.Future<void> addCategory(_i3.MeasurementCategory? category) =>
-      (super.noSuchMethod(Invocation.method(#addCategory, [category]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
+  _i5.Future<void> addCategory(_i3.MeasurementCategory? category) => (super.noSuchMethod(
+        Invocation.method(
+          #addCategory,
+          [category],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
   @override
-  _i5.Future<void> deleteCategory(int? id) =>
-      (super.noSuchMethod(Invocation.method(#deleteCategory, [id]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
+  _i5.Future<void> deleteCategory(int? id) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteCategory,
+          [id],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.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]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
+  _i5.Future<void> editCategory(
+    int? id,
+    String? newName,
+    String? newUnit,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #editCategory,
+          [
+            id,
+            newName,
+            newUnit,
+          ],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
   @override
-  _i5.Future<void> addEntry(_i6.MeasurementEntry? entry) =>
-      (super.noSuchMethod(Invocation.method(#addEntry, [entry]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
+  _i5.Future<void> addEntry(_i6.MeasurementEntry? entry) => (super.noSuchMethod(
+        Invocation.method(
+          #addEntry,
+          [entry],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
   @override
-  _i5.Future<void> deleteEntry(int? id, int? categoryId) =>
-      (super.noSuchMethod(Invocation.method(#deleteEntry, [id, categoryId]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
+  _i5.Future<void> deleteEntry(
+    int? id,
+    int? categoryId,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #deleteEntry,
+          [
+            id,
+            categoryId,
+          ],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
   @override
   _i5.Future<void> editEntry(
-          int? id, int? categoryId, num? newValue, String? newNotes, DateTime? newDate) =>
+    int? id,
+    int? categoryId,
+    num? newValue,
+    String? newNotes,
+    DateTime? newDate,
+  ) =>
       (super.noSuchMethod(
-          Invocation.method(#editEntry, [id, categoryId, newValue, newNotes, newDate]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
+        Invocation.method(
+          #editEntry,
+          [
+            id,
+            categoryId,
+            newValue,
+            newNotes,
+            newDate,
+          ],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
   @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);
+  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);
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
 }

test/measurements/measurement_provider_test.mocks.dart

@@ -1,7 +1,8 @@
-// Mocks generated by Mockito 5.0.17 from annotations
+// Mocks generated by Mockito 5.3.2 from annotations
 // in wger/test/measurements/measurement_provider_test.dart.
 // Do not manually edit this file.
 
+// ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i5;
 
 import 'package:http/http.dart' as _i3;
@@ -9,6 +10,7 @@ import 'package:mockito/mockito.dart' as _i1;
 import 'package:wger/providers/auth.dart' as _i2;
 import 'package:wger/providers/base_provider.dart' as _i4;
 
+// ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
 // ignore_for_file: avoid_setters_without_getters
 // ignore_for_file: comment_references
@@ -17,14 +19,47 @@ import 'package:wger/providers/base_provider.dart' as _i4;
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
 
-class _FakeAuthProvider_0 extends _i1.Fake implements _i2.AuthProvider {}
+class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
+  _FakeAuthProvider_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeClient_1 extends _i1.Fake implements _i3.Client {}
+class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
+  _FakeClient_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeUri_2 extends _i1.Fake implements Uri {}
+class _FakeUri_2 extends _i1.SmartFake implements Uri {
+  _FakeUri_2(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeResponse_3 extends _i1.Fake implements _i3.Response {}
+class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
+  _FakeResponse_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
 /// A class which mocks [WgerBaseProvider].
 ///
@@ -35,41 +70,127 @@ 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(
+          this,
+          Invocation.getter(#auth),
+        ),
+      ) as _i2.AuthProvider);
   @override
-  set auth(_i2.AuthProvider? _auth) =>
-      super.noSuchMethod(Invocation.setter(#auth, _auth), returnValueForMissingStub: null);
+  set auth(_i2.AuthProvider? _auth) => 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(
+          this,
+          Invocation.getter(#client),
+        ),
+      ) as _i3.Client);
   @override
-  set client(_i3.Client? _client) =>
-      super.noSuchMethod(Invocation.setter(#client, _client), returnValueForMissingStub: null);
+  set client(_i3.Client? _client) => 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,
+          },
+        ),
+        returnValue: _FakeUri_2(
+          this,
           Invocation.method(
-              #makeUrl, [path], {#id: id, #objectMethod: objectMethod, #query: query}),
-          returnValue: _FakeUri_2()) as Uri);
+            #makeUrl,
+            [path],
+            {
+              #id: id,
+              #objectMethod: objectMethod,
+              #query: query,
+            },
+          ),
+        ),
+      ) 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: _i5.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>{}))
-          as _i5.Future<Map<String, dynamic>>);
+  _i5.Future<Map<String, dynamic>> post(
+    Map<String, dynamic>? data,
+    Uri? uri,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #post,
+          [
+            data,
+            uri,
+          ],
+        ),
+        returnValue: _i5.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) =>
-      (super.noSuchMethod(Invocation.method(#patch, [data, uri]),
-              returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
-          as _i5.Future<Map<String, dynamic>>);
+  _i5.Future<Map<String, dynamic>> patch(
+    Map<String, dynamic>? data,
+    Uri? uri,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #patch,
+          [
+            data,
+            uri,
+          ],
+        ),
+        returnValue: _i5.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>);
+  _i5.Future<_i3.Response> deleteRequest(
+    String? url,
+    int? id,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #deleteRequest,
+          [
+            url,
+            id,
+          ],
+        ),
+        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
+          this,
+          Invocation.method(
+            #deleteRequest,
+            [
+              url,
+              id,
+            ],
+          ),
+        )),
+      ) as _i5.Future<_i3.Response>);
 }

test/nutrition/nutritional_plan_form_test.mocks.dart

@@ -1,7 +1,8 @@
-// Mocks generated by Mockito 5.0.17 from annotations
+// Mocks generated by Mockito 5.3.2 from annotations
 // in wger/test/nutrition/nutritional_plan_form_test.dart.
 // Do not manually edit this file.
 
+// ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i9;
 import 'dart:ui' as _i10;
 
@@ -14,6 +15,7 @@ import 'package:wger/models/nutrition/nutritional_plan.dart' as _i4;
 import 'package:wger/providers/auth.dart' as _i2;
 import 'package:wger/providers/nutrition.dart' as _i8;
 
+// ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
 // ignore_for_file: avoid_setters_without_getters
 // ignore_for_file: comment_references
@@ -22,22 +24,87 @@ import 'package:wger/providers/nutrition.dart' as _i8;
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
 
-class _FakeAuthProvider_0 extends _i1.Fake implements _i2.AuthProvider {}
+class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
+  _FakeAuthProvider_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeClient_1 extends _i1.Fake implements _i3.Client {}
+class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
+  _FakeClient_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeNutritionalPlan_2 extends _i1.Fake implements _i4.NutritionalPlan {}
+class _FakeNutritionalPlan_2 extends _i1.SmartFake implements _i4.NutritionalPlan {
+  _FakeNutritionalPlan_2(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeMeal_3 extends _i1.Fake implements _i5.Meal {}
+class _FakeMeal_3 extends _i1.SmartFake implements _i5.Meal {
+  _FakeMeal_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeMealItem_4 extends _i1.Fake implements _i6.MealItem {}
+class _FakeMealItem_4 extends _i1.SmartFake implements _i6.MealItem {
+  _FakeMealItem_4(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeIngredient_5 extends _i1.Fake implements _i7.Ingredient {}
+class _FakeIngredient_5 extends _i1.SmartFake implements _i7.Ingredient {
+  _FakeIngredient_5(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeUri_6 extends _i1.Fake implements Uri {}
+class _FakeUri_6 extends _i1.SmartFake implements Uri {
+  _FakeUri_6(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeResponse_7 extends _i1.Fake implements _i3.Response {}
+class _FakeResponse_7 extends _i1.SmartFake implements _i3.Response {
+  _FakeResponse_7(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
 /// A class which mocks [NutritionPlansProvider].
 ///
@@ -48,165 +115,452 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
   }
 
   @override
-  List<_i4.NutritionalPlan> get items =>
-      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i4.NutritionalPlan>[])
-          as List<_i4.NutritionalPlan>);
+  List<_i4.NutritionalPlan> get items => (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(
+          this,
+          Invocation.getter(#auth),
+        ),
+      ) as _i2.AuthProvider);
   @override
-  set auth(_i2.AuthProvider? _auth) =>
-      super.noSuchMethod(Invocation.setter(#auth, _auth), returnValueForMissingStub: null);
+  set auth(_i2.AuthProvider? _auth) => 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(
+          this,
+          Invocation.getter(#client),
+        ),
+      ) as _i3.Client);
   @override
-  set client(_i3.Client? _client) =>
-      super.noSuchMethod(Invocation.setter(#client, _client), returnValueForMissingStub: null);
+  set client(_i3.Client? _client) => super.noSuchMethod(
+        Invocation.setter(
+          #client,
+          _client,
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  bool get hasListeners =>
-      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+  bool get hasListeners => (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);
-  @override
-  _i5.Meal? findMealById(int? id) =>
-      (super.noSuchMethod(Invocation.method(#findMealById, [id])) as _i5.Meal?);
-  @override
-  _i9.Future<void> fetchAndSetAllPlansSparse() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetAllPlansSparse, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  _i9.Future<void> fetchAndSetAllPlansFull() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetAllPlansFull, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanSparse(int? planId) =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetPlanSparse, [planId]),
-              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()))
-          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()))
-          as _i9.Future<_i4.NutritionalPlan>);
-  @override
-  _i9.Future<void> editPlan(_i4.NutritionalPlan? plan) =>
-      (super.noSuchMethod(Invocation.method(#editPlan, [plan]),
-          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>);
-  @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>);
-  @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>);
-  @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) =>
-      (super.noSuchMethod(Invocation.method(#addMealItem, [mealItem, meal]),
-          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]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  _i9.Future<_i7.Ingredient> fetchIngredient(int? ingredientId) =>
-      (super.noSuchMethod(Invocation.method(#fetchIngredient, [ingredientId]),
-              returnValue: Future<_i7.Ingredient>.value(_FakeIngredient_5()))
-          as _i9.Future<_i7.Ingredient>);
-  @override
-  _i9.Future<void> fetchIngredientsFromCache() =>
-      (super.noSuchMethod(Invocation.method(#fetchIngredientsFromCache, []),
-          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>>);
-  @override
-  _i9.Future<_i7.Ingredient?> searchIngredientWithCode(String? code) =>
-      (super.noSuchMethod(Invocation.method(#searchIngredientWithCode, [code]),
-          returnValue: Future<_i7.Ingredient?>.value()) as _i9.Future<_i7.Ingredient?>);
-  @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]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  _i9.Future<void> deleteLog(int? logId, int? planId) =>
-      (super.noSuchMethod(Invocation.method(#deleteLog, [logId, planId]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  _i9.Future<void> fetchAndSetLogs(_i4.NutritionalPlan? plan) =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetLogs, [plan]),
-          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}) =>
-      (super.noSuchMethod(
+  _i4.NutritionalPlan findById(int? id) => (super.noSuchMethod(
+        Invocation.method(
+          #findById,
+          [id],
+        ),
+        returnValue: _FakeNutritionalPlan_2(
+          this,
           Invocation.method(
-              #makeUrl, [path], {#id: id, #objectMethod: objectMethod, #query: query}),
-          returnValue: _FakeUri_6()) as Uri);
+            #findById,
+            [id],
+          ),
+        ),
+      ) as _i4.NutritionalPlan);
   @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>>);
+  _i5.Meal? findMealById(int? id) => (super.noSuchMethod(Invocation.method(
+        #findMealById,
+        [id],
+      )) as _i5.Meal?);
   @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>{}))
-          as _i9.Future<Map<String, dynamic>>);
+  _i9.Future<void> fetchAndSetAllPlansSparse() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetAllPlansSparse,
+          [],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
   @override
-  _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>{}))
-          as _i9.Future<Map<String, dynamic>>);
+  _i9.Future<void> fetchAndSetAllPlansFull() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetAllPlansFull,
+          [],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
   @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>);
+  _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetPlanSparse,
+          [planId],
+        ),
+        returnValue: _i9.Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2(
+          this,
+          Invocation.method(
+            #fetchAndSetPlanSparse,
+            [planId],
+          ),
+        )),
+      ) as _i9.Future<_i4.NutritionalPlan>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super
-      .noSuchMethod(Invocation.method(#addListener, [listener]), returnValueForMissingStub: null);
+  _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanFull(int? planId) => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetPlanFull,
+          [planId],
+        ),
+        returnValue: _i9.Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2(
+          this,
+          Invocation.method(
+            #fetchAndSetPlanFull,
+            [planId],
+          ),
+        )),
+      ) as _i9.Future<_i4.NutritionalPlan>);
   @override
-  void removeListener(_i10.VoidCallback? listener) =>
-      super.noSuchMethod(Invocation.method(#removeListener, [listener]),
-          returnValueForMissingStub: null);
+  _i9.Future<_i4.NutritionalPlan> addPlan(_i4.NutritionalPlan? planData) => (super.noSuchMethod(
+        Invocation.method(
+          #addPlan,
+          [planData],
+        ),
+        returnValue: _i9.Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2(
+          this,
+          Invocation.method(
+            #addPlan,
+            [planData],
+          ),
+        )),
+      ) as _i9.Future<_i4.NutritionalPlan>);
   @override
-  void dispose() =>
-      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
+  _i9.Future<void> editPlan(_i4.NutritionalPlan? plan) => (super.noSuchMethod(
+        Invocation.method(
+          #editPlan,
+          [plan],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
   @override
-  void notifyListeners() =>
-      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
+  _i9.Future<void> deletePlan(int? id) => (super.noSuchMethod(
+        Invocation.method(
+          #deletePlan,
+          [id],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.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: _i9.Future<_i5.Meal>.value(_FakeMeal_3(
+          this,
+          Invocation.method(
+            #addMeal,
+            [
+              meal,
+              planId,
+            ],
+          ),
+        )),
+      ) as _i9.Future<_i5.Meal>);
+  @override
+  _i9.Future<_i5.Meal> editMeal(_i5.Meal? meal) => (super.noSuchMethod(
+        Invocation.method(
+          #editMeal,
+          [meal],
+        ),
+        returnValue: _i9.Future<_i5.Meal>.value(_FakeMeal_3(
+          this,
+          Invocation.method(
+            #editMeal,
+            [meal],
+          ),
+        )),
+      ) as _i9.Future<_i5.Meal>);
+  @override
+  _i9.Future<void> deleteMeal(_i5.Meal? meal) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteMeal,
+          [meal],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  _i9.Future<_i6.MealItem> addMealItem(
+    _i6.MealItem? mealItem,
+    _i5.Meal? meal,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #addMealItem,
+          [
+            mealItem,
+            meal,
+          ],
+        ),
+        returnValue: _i9.Future<_i6.MealItem>.value(_FakeMealItem_4(
+          this,
+          Invocation.method(
+            #addMealItem,
+            [
+              mealItem,
+              meal,
+            ],
+          ),
+        )),
+      ) as _i9.Future<_i6.MealItem>);
+  @override
+  _i9.Future<void> deleteMealItem(_i6.MealItem? mealItem) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteMealItem,
+          [mealItem],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  _i9.Future<_i7.Ingredient> fetchIngredient(int? ingredientId) => (super.noSuchMethod(
+        Invocation.method(
+          #fetchIngredient,
+          [ingredientId],
+        ),
+        returnValue: _i9.Future<_i7.Ingredient>.value(_FakeIngredient_5(
+          this,
+          Invocation.method(
+            #fetchIngredient,
+            [ingredientId],
+          ),
+        )),
+      ) as _i9.Future<_i7.Ingredient>);
+  @override
+  _i9.Future<void> fetchIngredientsFromCache() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchIngredientsFromCache,
+          [],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.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: _i9.Future<List<dynamic>>.value(<dynamic>[]),
+      ) as _i9.Future<List<dynamic>>);
+  @override
+  _i9.Future<_i7.Ingredient?> searchIngredientWithCode(String? code) => (super.noSuchMethod(
+        Invocation.method(
+          #searchIngredientWithCode,
+          [code],
+        ),
+        returnValue: _i9.Future<_i7.Ingredient?>.value(),
+      ) as _i9.Future<_i7.Ingredient?>);
+  @override
+  _i9.Future<void> logMealToDiary(_i5.Meal? meal) => (super.noSuchMethod(
+        Invocation.method(
+          #logMealToDiary,
+          [meal],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.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,
+          ],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  _i9.Future<void> deleteLog(
+    int? logId,
+    int? planId,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #deleteLog,
+          [
+            logId,
+            planId,
+          ],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  _i9.Future<void> fetchAndSetLogs(_i4.NutritionalPlan? plan) => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetLogs,
+          [plan],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  Uri makeUrl(
+    String? path, {
+    int? id,
+    String? objectMethod,
+    Map<String, dynamic>? query,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #makeUrl,
+          [path],
+          {
+            #id: id,
+            #objectMethod: objectMethod,
+            #query: query,
+          },
+        ),
+        returnValue: _FakeUri_6(
+          this,
+          Invocation.method(
+            #makeUrl,
+            [path],
+            {
+              #id: id,
+              #objectMethod: objectMethod,
+              #query: query,
+            },
+          ),
+        ),
+      ) as Uri);
+  @override
+  _i9.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
+        Invocation.method(
+          #fetch,
+          [uri],
+        ),
+        returnValue: _i9.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: _i9.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,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #patch,
+          [
+            data,
+            uri,
+          ],
+        ),
+        returnValue: _i9.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: _i9.Future<_i3.Response>.value(_FakeResponse_7(
+          this,
+          Invocation.method(
+            #deleteRequest,
+            [
+              url,
+              id,
+            ],
+          ),
+        )),
+      ) as _i9.Future<_i3.Response>);
+  @override
+  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,
+      );
+  @override
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
 }

test/other/base_provider_test.mocks.dart

@@ -1,17 +1,16 @@
-// Mocks generated by Mockito 5.0.17 from annotations
+// Mocks generated by Mockito 5.3.2 from annotations
 // in wger/test/other/base_provider_test.dart.
 // Do not manually edit this file.
 
-import 'dart:async' as _i5;
-import 'dart:convert' as _i6;
-import 'dart:typed_data' as _i7;
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i3;
+import 'dart:convert' as _i4;
+import 'dart:typed_data' as _i5;
 
-import 'package:http/src/base_request.dart' as _i8;
-import 'package:http/src/client.dart' as _i4;
-import 'package:http/src/response.dart' as _i2;
-import 'package:http/src/streamed_response.dart' as _i3;
+import 'package:http/http.dart' as _i2;
 import 'package:mockito/mockito.dart' as _i1;
 
+// ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
 // ignore_for_file: avoid_setters_without_getters
 // ignore_for_file: comment_references
@@ -20,65 +19,242 @@ import 'package:mockito/mockito.dart' as _i1;
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
 
-class _FakeResponse_0 extends _i1.Fake implements _i2.Response {}
+class _FakeResponse_0 extends _i1.SmartFake implements _i2.Response {
+  _FakeResponse_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeStreamedResponse_1 extends _i1.Fake implements _i3.StreamedResponse {}
+class _FakeStreamedResponse_1 extends _i1.SmartFake implements _i2.StreamedResponse {
+  _FakeStreamedResponse_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
 /// A class which mocks [Client].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockClient extends _i1.Mock implements _i4.Client {
+class MockClient extends _i1.Mock implements _i2.Client {
   MockClient() {
     _i1.throwOnMissingStub(this);
   }
 
   @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>);
-  @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>);
-  @override
-  _i5.Future<_i2.Response> post(Uri? url,
-          {Map<String, String>? headers, Object? body, _i6.Encoding? encoding}) =>
+  _i3.Future<_i2.Response> head(
+    Uri? url, {
+    Map<String, String>? headers,
+  }) =>
       (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(
+          #head,
+          [url],
+          {#headers: headers},
+        ),
+        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_0(
+          this,
+          Invocation.method(
+            #head,
+            [url],
+            {#headers: headers},
+          ),
+        )),
+      ) as _i3.Future<_i2.Response>);
   @override
-  _i5.Future<_i2.Response> put(Uri? url,
-          {Map<String, String>? headers, Object? body, _i6.Encoding? encoding}) =>
+  _i3.Future<_i2.Response> get(
+    Uri? url, {
+    Map<String, String>? headers,
+  }) =>
       (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(
+          #get,
+          [url],
+          {#headers: headers},
+        ),
+        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_0(
+          this,
+          Invocation.method(
+            #get,
+            [url],
+            {#headers: headers},
+          ),
+        )),
+      ) as _i3.Future<_i2.Response>);
   @override
-  _i5.Future<_i2.Response> patch(Uri? url,
-          {Map<String, String>? headers, Object? body, _i6.Encoding? encoding}) =>
+  _i3.Future<_i2.Response> post(
+    Uri? url, {
+    Map<String, String>? headers,
+    Object? body,
+    _i4.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(
+          #post,
+          [url],
+          {
+            #headers: headers,
+            #body: body,
+            #encoding: encoding,
+          },
+        ),
+        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_0(
+          this,
+          Invocation.method(
+            #post,
+            [url],
+            {
+              #headers: headers,
+              #body: body,
+              #encoding: encoding,
+            },
+          ),
+        )),
+      ) as _i3.Future<_i2.Response>);
   @override
-  _i5.Future<_i2.Response> delete(Uri? url,
-          {Map<String, String>? headers, Object? body, _i6.Encoding? encoding}) =>
+  _i3.Future<_i2.Response> put(
+    Uri? url, {
+    Map<String, String>? headers,
+    Object? body,
+    _i4.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(
+          #put,
+          [url],
+          {
+            #headers: headers,
+            #body: body,
+            #encoding: encoding,
+          },
+        ),
+        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_0(
+          this,
+          Invocation.method(
+            #put,
+            [url],
+            {
+              #headers: headers,
+              #body: body,
+              #encoding: encoding,
+            },
+          ),
+        )),
+      ) as _i3.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>);
+  _i3.Future<_i2.Response> patch(
+    Uri? url, {
+    Map<String, String>? headers,
+    Object? body,
+    _i4.Encoding? encoding,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #patch,
+          [url],
+          {
+            #headers: headers,
+            #body: body,
+            #encoding: encoding,
+          },
+        ),
+        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_0(
+          this,
+          Invocation.method(
+            #patch,
+            [url],
+            {
+              #headers: headers,
+              #body: body,
+              #encoding: encoding,
+            },
+          ),
+        )),
+      ) as _i3.Future<_i2.Response>);
   @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>);
+  _i3.Future<_i2.Response> delete(
+    Uri? url, {
+    Map<String, String>? headers,
+    Object? body,
+    _i4.Encoding? encoding,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #delete,
+          [url],
+          {
+            #headers: headers,
+            #body: body,
+            #encoding: encoding,
+          },
+        ),
+        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_0(
+          this,
+          Invocation.method(
+            #delete,
+            [url],
+            {
+              #headers: headers,
+              #body: body,
+              #encoding: encoding,
+            },
+          ),
+        )),
+      ) as _i3.Future<_i2.Response>);
   @override
-  _i5.Future<_i3.StreamedResponse> send(_i8.BaseRequest? request) =>
-      (super.noSuchMethod(Invocation.method(#send, [request]),
-              returnValue: Future<_i3.StreamedResponse>.value(_FakeStreamedResponse_1()))
-          as _i5.Future<_i3.StreamedResponse>);
+  _i3.Future<String> read(
+    Uri? url, {
+    Map<String, String>? headers,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #read,
+          [url],
+          {#headers: headers},
+        ),
+        returnValue: _i3.Future<String>.value(''),
+      ) as _i3.Future<String>);
   @override
-  void close() =>
-      super.noSuchMethod(Invocation.method(#close, []), returnValueForMissingStub: null);
+  _i3.Future<_i5.Uint8List> readBytes(
+    Uri? url, {
+    Map<String, String>? headers,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #readBytes,
+          [url],
+          {#headers: headers},
+        ),
+        returnValue: _i3.Future<_i5.Uint8List>.value(_i5.Uint8List(0)),
+      ) as _i3.Future<_i5.Uint8List>);
+  @override
+  _i3.Future<_i2.StreamedResponse> send(_i2.BaseRequest? request) => (super.noSuchMethod(
+        Invocation.method(
+          #send,
+          [request],
+        ),
+        returnValue: _i3.Future<_i2.StreamedResponse>.value(_FakeStreamedResponse_1(
+          this,
+          Invocation.method(
+            #send,
+            [request],
+          ),
+        )),
+      ) as _i3.Future<_i2.StreamedResponse>);
+  @override
+  void close() => super.noSuchMethod(
+        Invocation.method(
+          #close,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
 }

test/workout/workout_form_test.mocks.dart

@@ -1,7 +1,8 @@
-// Mocks generated by Mockito 5.0.17 from annotations
+// Mocks generated by Mockito 5.3.2 from annotations
 // in wger/test/workout/workout_form_test.dart.
 // Do not manually edit this file.
 
+// ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i13;
 import 'dart:ui' as _i15;
 
@@ -19,6 +20,7 @@ import 'package:wger/models/workouts/workout_plan.dart' as _i6;
 import 'package:wger/providers/auth.dart' as _i4;
 import 'package:wger/providers/workout_plans.dart' as _i12;
 
+// ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
 // ignore_for_file: avoid_setters_without_getters
 // ignore_for_file: comment_references
@@ -27,30 +29,127 @@ import 'package:wger/providers/workout_plans.dart' as _i12;
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
 
-class _FakeWeightUnit_0 extends _i1.Fake implements _i2.WeightUnit {}
+class _FakeWeightUnit_0 extends _i1.SmartFake implements _i2.WeightUnit {
+  _FakeWeightUnit_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeRepetitionUnit_1 extends _i1.Fake implements _i3.RepetitionUnit {}
+class _FakeRepetitionUnit_1 extends _i1.SmartFake implements _i3.RepetitionUnit {
+  _FakeRepetitionUnit_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeAuthProvider_2 extends _i1.Fake implements _i4.AuthProvider {}
+class _FakeAuthProvider_2 extends _i1.SmartFake implements _i4.AuthProvider {
+  _FakeAuthProvider_2(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeClient_3 extends _i1.Fake implements _i5.Client {}
+class _FakeClient_3 extends _i1.SmartFake implements _i5.Client {
+  _FakeClient_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeWorkoutPlan_4 extends _i1.Fake implements _i6.WorkoutPlan {}
+class _FakeWorkoutPlan_4 extends _i1.SmartFake implements _i6.WorkoutPlan {
+  _FakeWorkoutPlan_4(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeDay_5 extends _i1.Fake implements _i7.Day {}
+class _FakeDay_5 extends _i1.SmartFake implements _i7.Day {
+  _FakeDay_5(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeSet_6 extends _i1.Fake implements _i8.Set {}
+class _FakeSet_6 extends _i1.SmartFake implements _i8.Set {
+  _FakeSet_6(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeSetting_7 extends _i1.Fake implements _i9.Setting {}
+class _FakeSetting_7 extends _i1.SmartFake implements _i9.Setting {
+  _FakeSetting_7(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeWorkoutSession_8 extends _i1.Fake implements _i10.WorkoutSession {}
+class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
+  _FakeWorkoutSession_8(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeLog_9 extends _i1.Fake implements _i11.Log {}
+class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
+  _FakeLog_9(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeUri_10 extends _i1.Fake implements Uri {}
+class _FakeUri_10 extends _i1.SmartFake implements Uri {
+  _FakeUri_10(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeResponse_11 extends _i1.Fake implements _i5.Response {}
+class _FakeResponse_11 extends _i1.SmartFake implements _i5.Response {
+  _FakeResponse_11(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
 /// A class which mocks [WorkoutPlansProvider].
 ///
@@ -61,211 +160,533 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
   }
 
   @override
-  List<_i6.WorkoutPlan> get items =>
-      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i6.WorkoutPlan>[])
-          as List<_i6.WorkoutPlan>);
+  List<_i6.WorkoutPlan> get items => (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>);
+  List<_i2.WeightUnit> get weightUnits => (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);
+  _i2.WeightUnit get defaultWeightUnit => (super.noSuchMethod(
+        Invocation.getter(#defaultWeightUnit),
+        returnValue: _FakeWeightUnit_0(
+          this,
+          Invocation.getter(#defaultWeightUnit),
+        ),
+      ) as _i2.WeightUnit);
   @override
-  List<_i3.RepetitionUnit> get repetitionUnits =>
-      (super.noSuchMethod(Invocation.getter(#repetitionUnits), returnValue: <_i3.RepetitionUnit>[])
-          as List<_i3.RepetitionUnit>);
+  List<_i3.RepetitionUnit> get repetitionUnits => (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);
+  _i3.RepetitionUnit get defaultRepetitionUnit => (super.noSuchMethod(
+        Invocation.getter(#defaultRepetitionUnit),
+        returnValue: _FakeRepetitionUnit_1(
+          this,
+          Invocation.getter(#defaultRepetitionUnit),
+        ),
+      ) 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(
+          this,
+          Invocation.getter(#auth),
+        ),
+      ) as _i4.AuthProvider);
   @override
-  set auth(_i4.AuthProvider? _auth) =>
-      super.noSuchMethod(Invocation.setter(#auth, _auth), returnValueForMissingStub: null);
+  set auth(_i4.AuthProvider? _auth) => 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(
+          this,
+          Invocation.getter(#client),
+        ),
+      ) as _i5.Client);
   @override
-  set client(_i5.Client? _client) =>
-      super.noSuchMethod(Invocation.setter(#client, _client), returnValueForMissingStub: null);
+  set client(_i5.Client? _client) => super.noSuchMethod(
+        Invocation.setter(
+          #client,
+          _client,
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  bool get hasListeners =>
-      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+  bool get hasListeners => (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);
+  _i6.WorkoutPlan findById(int? id) => (super.noSuchMethod(
+        Invocation.method(
+          #findById,
+          [id],
+        ),
+        returnValue: _FakeWorkoutPlan_4(
+          this,
+          Invocation.method(
+            #findById,
+            [id],
+          ),
+        ),
+      ) 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);
+  void setCurrentPlan(int? id) => super.noSuchMethod(
+        Invocation.method(
+          #setCurrentPlan,
+          [id],
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  void resetCurrentPlan() =>
-      super.noSuchMethod(Invocation.method(#resetCurrentPlan, []), returnValueForMissingStub: null);
+  void resetCurrentPlan() => 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: _i13.Future<void>.value(),
+        returnValueForMissingStub: _i13.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: _i13.Future<void>.value(),
+        returnValueForMissingStub: _i13.Future<void>.value(),
+      ) as _i13.Future<void>);
   @override
-  _i13.Future<_i6.WorkoutPlan> fetchAndSetPlanSparse(int? planId) =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetPlanSparse, [planId]),
-              returnValue: Future<_i6.WorkoutPlan>.value(_FakeWorkoutPlan_4()))
-          as _i13.Future<_i6.WorkoutPlan>);
+  _i13.Future<_i6.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetPlanSparse,
+          [planId],
+        ),
+        returnValue: _i13.Future<_i6.WorkoutPlan>.value(_FakeWorkoutPlan_4(
+          this,
+          Invocation.method(
+            #fetchAndSetPlanSparse,
+            [planId],
+          ),
+        )),
+      ) as _i13.Future<_i6.WorkoutPlan>);
   @override
-  _i13.Future<_i6.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetWorkoutPlanFull, [workoutId]),
-              returnValue: Future<_i6.WorkoutPlan>.value(_FakeWorkoutPlan_4()))
-          as _i13.Future<_i6.WorkoutPlan>);
+  _i13.Future<_i6.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetWorkoutPlanFull,
+          [workoutId],
+        ),
+        returnValue: _i13.Future<_i6.WorkoutPlan>.value(_FakeWorkoutPlan_4(
+          this,
+          Invocation.method(
+            #fetchAndSetWorkoutPlanFull,
+            [workoutId],
+          ),
+        )),
+      ) as _i13.Future<_i6.WorkoutPlan>);
   @override
-  _i13.Future<_i6.WorkoutPlan> addWorkout(_i6.WorkoutPlan? workout) =>
-      (super.noSuchMethod(Invocation.method(#addWorkout, [workout]),
-              returnValue: Future<_i6.WorkoutPlan>.value(_FakeWorkoutPlan_4()))
-          as _i13.Future<_i6.WorkoutPlan>);
+  _i13.Future<_i6.WorkoutPlan> addWorkout(_i6.WorkoutPlan? workout) => (super.noSuchMethod(
+        Invocation.method(
+          #addWorkout,
+          [workout],
+        ),
+        returnValue: _i13.Future<_i6.WorkoutPlan>.value(_FakeWorkoutPlan_4(
+          this,
+          Invocation.method(
+            #addWorkout,
+            [workout],
+          ),
+        )),
+      ) as _i13.Future<_i6.WorkoutPlan>);
   @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>);
+  _i13.Future<void> editWorkout(_i6.WorkoutPlan? workout) => (super.noSuchMethod(
+        Invocation.method(
+          #editWorkout,
+          [workout],
+        ),
+        returnValue: _i13.Future<void>.value(),
+        returnValueForMissingStub: _i13.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: _i13.Future<void>.value(),
+        returnValueForMissingStub: _i13.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>{}))
-          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]),
-      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>);
-  @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>);
-  @override
-  _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>>);
-  @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>);
-  @override
-  _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>);
-  @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>);
-  @override
-  _i13.Future<dynamic> fetchSessionData() =>
-      (super.noSuchMethod(Invocation.method(#fetchSessionData, []),
-          returnValue: Future<dynamic>.value()) as _i13.Future<dynamic>);
-  @override
-  _i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session) =>
-      (super.noSuchMethod(Invocation.method(#addSession, [session]),
-              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>);
-  @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>);
-  @override
-  Uri makeUrl(String? path, {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
+    _i6.WorkoutPlan? workout,
+    _i14.Exercise? exercise,
+  ) =>
       (super.noSuchMethod(
+        Invocation.method(
+          #fetchLogData,
+          [
+            workout,
+            exercise,
+          ],
+        ),
+        returnValue: _i13.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i13.Future<Map<String, dynamic>>);
+  @override
+  _i13.Future<void> fetchAndSetRepetitionUnits() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetRepetitionUnits,
+          [],
+        ),
+        returnValue: _i13.Future<void>.value(),
+        returnValueForMissingStub: _i13.Future<void>.value(),
+      ) as _i13.Future<void>);
+  @override
+  _i13.Future<void> fetchAndSetWeightUnits() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetWeightUnits,
+          [],
+        ),
+        returnValue: _i13.Future<void>.value(),
+        returnValueForMissingStub: _i13.Future<void>.value(),
+      ) as _i13.Future<void>);
+  @override
+  _i13.Future<void> fetchAndSetUnits() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetUnits,
+          [],
+        ),
+        returnValue: _i13.Future<void>.value(),
+        returnValueForMissingStub: _i13.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: _i13.Future<_i7.Day>.value(_FakeDay_5(
+          this,
           Invocation.method(
-              #makeUrl, [path], {#id: id, #objectMethod: objectMethod, #query: query}),
-          returnValue: _FakeUri_10()) as Uri);
+            #addDay,
+            [
+              day,
+              workout,
+            ],
+          ),
+        )),
+      ) as _i13.Future<_i7.Day>);
   @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<void> editDay(_i7.Day? day) => (super.noSuchMethod(
+        Invocation.method(
+          #editDay,
+          [day],
+        ),
+        returnValue: _i13.Future<void>.value(),
+        returnValueForMissingStub: _i13.Future<void>.value(),
+      ) as _i13.Future<void>);
   @override
-  _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>{}))
-          as _i13.Future<Map<String, dynamic>>);
+  _i13.Future<void> deleteDay(_i7.Day? day) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteDay,
+          [day],
+        ),
+        returnValue: _i13.Future<void>.value(),
+        returnValueForMissingStub: _i13.Future<void>.value(),
+      ) as _i13.Future<void>);
   @override
-  _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>{}))
-          as _i13.Future<Map<String, dynamic>>);
+  _i13.Future<_i8.Set> addSet(_i8.Set? workoutSet) => (super.noSuchMethod(
+        Invocation.method(
+          #addSet,
+          [workoutSet],
+        ),
+        returnValue: _i13.Future<_i8.Set>.value(_FakeSet_6(
+          this,
+          Invocation.method(
+            #addSet,
+            [workoutSet],
+          ),
+        )),
+      ) as _i13.Future<_i8.Set>);
   @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<void> editSet(_i8.Set? workoutSet) => (super.noSuchMethod(
+        Invocation.method(
+          #editSet,
+          [workoutSet],
+        ),
+        returnValue: _i13.Future<void>.value(),
+        returnValueForMissingStub: _i13.Future<void>.value(),
+      ) as _i13.Future<void>);
   @override
-  void addListener(_i15.VoidCallback? listener) => super
-      .noSuchMethod(Invocation.method(#addListener, [listener]), returnValueForMissingStub: null);
+  _i13.Future<List<_i8.Set>> reorderSets(
+    List<_i8.Set>? sets,
+    int? startIndex,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #reorderSets,
+          [
+            sets,
+            startIndex,
+          ],
+        ),
+        returnValue: _i13.Future<List<_i8.Set>>.value(<_i8.Set>[]),
+      ) as _i13.Future<List<_i8.Set>>);
   @override
-  void removeListener(_i15.VoidCallback? listener) =>
-      super.noSuchMethod(Invocation.method(#removeListener, [listener]),
-          returnValueForMissingStub: null);
+  _i13.Future<void> fetchComputedSettings(_i8.Set? workoutSet) => (super.noSuchMethod(
+        Invocation.method(
+          #fetchComputedSettings,
+          [workoutSet],
+        ),
+        returnValue: _i13.Future<void>.value(),
+        returnValueForMissingStub: _i13.Future<void>.value(),
+      ) as _i13.Future<void>);
   @override
-  void dispose() =>
-      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
+  _i13.Future<String> fetchSmartText(
+    _i8.Set? workoutSet,
+    _i14.Exercise? exercise,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchSmartText,
+          [
+            workoutSet,
+            exercise,
+          ],
+        ),
+        returnValue: _i13.Future<String>.value(''),
+      ) as _i13.Future<String>);
   @override
-  void notifyListeners() =>
-      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
+  _i13.Future<void> deleteSet(_i8.Set? workoutSet) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteSet,
+          [workoutSet],
+        ),
+        returnValue: _i13.Future<void>.value(),
+        returnValueForMissingStub: _i13.Future<void>.value(),
+      ) as _i13.Future<void>);
+  @override
+  _i13.Future<_i9.Setting> addSetting(_i9.Setting? workoutSetting) => (super.noSuchMethod(
+        Invocation.method(
+          #addSetting,
+          [workoutSetting],
+        ),
+        returnValue: _i13.Future<_i9.Setting>.value(_FakeSetting_7(
+          this,
+          Invocation.method(
+            #addSetting,
+            [workoutSetting],
+          ),
+        )),
+      ) as _i13.Future<_i9.Setting>);
+  @override
+  _i13.Future<dynamic> fetchSessionData() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchSessionData,
+          [],
+        ),
+        returnValue: _i13.Future<dynamic>.value(),
+      ) as _i13.Future<dynamic>);
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
+        Invocation.method(
+          #addSession,
+          [session],
+        ),
+        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
+          this,
+          Invocation.method(
+            #addSession,
+            [session],
+          ),
+        )),
+      ) as _i13.Future<_i10.WorkoutSession>);
+  @override
+  _i13.Future<_i11.Log> addLog(_i11.Log? log) => (super.noSuchMethod(
+        Invocation.method(
+          #addLog,
+          [log],
+        ),
+        returnValue: _i13.Future<_i11.Log>.value(_FakeLog_9(
+          this,
+          Invocation.method(
+            #addLog,
+            [log],
+          ),
+        )),
+      ) as _i13.Future<_i11.Log>);
+  @override
+  _i13.Future<void> deleteLog(_i11.Log? log) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteLog,
+          [log],
+        ),
+        returnValue: _i13.Future<void>.value(),
+        returnValueForMissingStub: _i13.Future<void>.value(),
+      ) as _i13.Future<void>);
+  @override
+  Uri makeUrl(
+    String? path, {
+    int? id,
+    String? objectMethod,
+    Map<String, dynamic>? query,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #makeUrl,
+          [path],
+          {
+            #id: id,
+            #objectMethod: objectMethod,
+            #query: query,
+          },
+        ),
+        returnValue: _FakeUri_10(
+          this,
+          Invocation.method(
+            #makeUrl,
+            [path],
+            {
+              #id: id,
+              #objectMethod: objectMethod,
+              #query: query,
+            },
+          ),
+        ),
+      ) as Uri);
+  @override
+  _i13.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
+        Invocation.method(
+          #fetch,
+          [uri],
+        ),
+        returnValue: _i13.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,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #post,
+          [
+            data,
+            uri,
+          ],
+        ),
+        returnValue: _i13.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,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #patch,
+          [
+            data,
+            uri,
+          ],
+        ),
+        returnValue: _i13.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: _i13.Future<_i5.Response>.value(_FakeResponse_11(
+          this,
+          Invocation.method(
+            #deleteRequest,
+            [
+              url,
+              id,
+            ],
+          ),
+        )),
+      ) as _i13.Future<_i5.Response>);
+  @override
+  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,
+      );
+  @override
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
 }

test/workout/workout_set_form_test.mocks.dart

@@ -1,7 +1,8 @@
-// Mocks generated by Mockito 5.0.17 from annotations
+// Mocks generated by Mockito 5.3.2 from annotations
 // in wger/test/workout/workout_set_form_test.dart.
 // Do not manually edit this file.
 
+// ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i6;
 import 'dart:ui' as _i7;
 
@@ -11,6 +12,7 @@ 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;
 
+// ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
 // ignore_for_file: avoid_setters_without_getters
 // ignore_for_file: comment_references
@@ -19,16 +21,57 @@ import 'package:wger/providers/exercises.dart' as _i5;
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
 
-class _FakeAuthProvider_0 extends _i1.Fake implements _i2.AuthProvider {}
+class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
+  _FakeAuthProvider_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeClient_1 extends _i1.Fake implements _i3.Client {}
+class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
+  _FakeClient_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeExercise_2 extends _i1.Fake implements _i4.Exercise {}
+class _FakeExercise_2 extends _i1.SmartFake implements _i4.Exercise {
+  _FakeExercise_2(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeUri_3 extends _i1.Fake implements Uri {}
+class _FakeUri_3 extends _i1.SmartFake implements Uri {
+  _FakeUri_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeResponse_4 extends _i1.Fake implements _i3.Response {}
+class _FakeResponse_4 extends _i1.SmartFake implements _i3.Response {
+  _FakeResponse_4(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
 /// A class which mocks [ExercisesProvider].
 ///
@@ -39,93 +82,257 @@ class MockExercisesProvider extends _i1.Mock implements _i5.ExercisesProvider {
   }
 
   @override
-  List<_i4.Exercise> get items =>
-      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i4.Exercise>[])
-          as List<_i4.Exercise>);
+  List<_i4.Exercise> get items => (super.noSuchMethod(
+        Invocation.getter(#items),
+        returnValue: <_i4.Exercise>[],
+      ) as List<_i4.Exercise>);
   @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(
+          this,
+          Invocation.getter(#auth),
+        ),
+      ) as _i2.AuthProvider);
   @override
-  set auth(_i2.AuthProvider? _auth) =>
-      super.noSuchMethod(Invocation.setter(#auth, _auth), returnValueForMissingStub: null);
+  set auth(_i2.AuthProvider? _auth) => 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(
+          this,
+          Invocation.getter(#client),
+        ),
+      ) as _i3.Client);
   @override
-  set client(_i3.Client? _client) =>
-      super.noSuchMethod(Invocation.setter(#client, _client), returnValueForMissingStub: null);
+  set client(_i3.Client? _client) => super.noSuchMethod(
+        Invocation.setter(
+          #client,
+          _client,
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  bool get hasListeners =>
-      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+  bool get hasListeners => (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);
-  @override
-  _i6.Future<void> fetchAndSetCategories() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetCategories, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i6.Future<void>);
-  @override
-  _i6.Future<void> fetchAndSetMuscles() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetMuscles, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i6.Future<void>);
-  @override
-  _i6.Future<void> fetchAndSetEquipment() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetEquipment, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i6.Future<void>);
-  @override
-  _i6.Future<_i4.Exercise> fetchAndSetExercise(int? exerciseId) =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetExercise, [exerciseId]),
-          returnValue: Future<_i4.Exercise>.value(_FakeExercise_2())) as _i6.Future<_i4.Exercise>);
-  @override
-  _i6.Future<void> fetchAndSetExercises() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetExercises, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i6.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}) =>
-      (super.noSuchMethod(
+  _i4.Exercise findById(int? exerciseId) => (super.noSuchMethod(
+        Invocation.method(
+          #findById,
+          [exerciseId],
+        ),
+        returnValue: _FakeExercise_2(
+          this,
           Invocation.method(
-              #makeUrl, [path], {#id: id, #objectMethod: objectMethod, #query: query}),
-          returnValue: _FakeUri_3()) as Uri);
+            #findById,
+            [exerciseId],
+          ),
+        ),
+      ) as _i4.Exercise);
   @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<void> fetchAndSetCategories() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetCategories,
+          [],
+        ),
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @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>>);
+  _i6.Future<void> fetchAndSetMuscles() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetMuscles,
+          [],
+        ),
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @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>>);
+  _i6.Future<void> fetchAndSetEquipment() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetEquipment,
+          [],
+        ),
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @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>);
+  _i6.Future<_i4.Exercise> fetchAndSetExercise(int? exerciseId) => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetExercise,
+          [exerciseId],
+        ),
+        returnValue: _i6.Future<_i4.Exercise>.value(_FakeExercise_2(
+          this,
+          Invocation.method(
+            #fetchAndSetExercise,
+            [exerciseId],
+          ),
+        )),
+      ) as _i6.Future<_i4.Exercise>);
   @override
-  void addListener(_i7.VoidCallback? listener) => super
-      .noSuchMethod(Invocation.method(#addListener, [listener]), returnValueForMissingStub: null);
+  _i6.Future<void> checkExerciseCacheVersion() => (super.noSuchMethod(
+        Invocation.method(
+          #checkExerciseCacheVersion,
+          [],
+        ),
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  void removeListener(_i7.VoidCallback? listener) =>
-      super.noSuchMethod(Invocation.method(#removeListener, [listener]),
-          returnValueForMissingStub: null);
+  _i6.Future<void> fetchAndSetExercises() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetExercises,
+          [],
+        ),
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  void dispose() =>
-      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
+  _i6.Future<List<dynamic>> searchExercise(
+    String? name, [
+    String? languageCode = r'en',
+  ]) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #searchExercise,
+          [
+            name,
+            languageCode,
+          ],
+        ),
+        returnValue: _i6.Future<List<dynamic>>.value(<dynamic>[]),
+      ) as _i6.Future<List<dynamic>>);
   @override
-  void notifyListeners() =>
-      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
+  Uri makeUrl(
+    String? path, {
+    int? id,
+    String? objectMethod,
+    Map<String, dynamic>? query,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #makeUrl,
+          [path],
+          {
+            #id: id,
+            #objectMethod: objectMethod,
+            #query: query,
+          },
+        ),
+        returnValue: _FakeUri_3(
+          this,
+          Invocation.method(
+            #makeUrl,
+            [path],
+            {
+              #id: id,
+              #objectMethod: objectMethod,
+              #query: query,
+            },
+          ),
+        ),
+      ) as Uri);
+  @override
+  _i6.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
+        Invocation.method(
+          #fetch,
+          [uri],
+        ),
+        returnValue: _i6.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: _i6.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: _i6.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: _i6.Future<_i3.Response>.value(_FakeResponse_4(
+          this,
+          Invocation.method(
+            #deleteRequest,
+            [
+              url,
+              id,
+            ],
+          ),
+        )),
+      ) as _i6.Future<_i3.Response>);
+  @override
+  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,
+      );
+  @override
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
 }