From ed8e9ec744d5002370916e2be9e05da8667a4a76 Mon Sep 17 00:00:00 2001
From: Branislav Nohaj <branislav.nohaj@student.tuke.sk>
Date: Sat, 4 Oct 2025 10:22:01 +0200
Subject: [PATCH 01/29] Added option in mobile app to add more info about image

---
 lib/providers/add_exercise.dart               | 206 ++++++++-
 .../add_exercise/image_details_form.dart      | 412 ++++++++++++++++++
 .../add_exercise/steps/step5images.dart       | 208 ++++++++-
 .../add_exercise/steps/step6Overview.dart     |   2 +-
 .../add_exercise_image_withDetail_test.dart   | 218 +++++++++
 5 files changed, 1004 insertions(+), 42 deletions(-)
 create mode 100644 lib/widgets/add_exercise/image_details_form.dart
 create mode 100644 test/exercises/add_exercise_image_withDetail_test.dart

diff --git a/lib/providers/add_exercise.dart b/lib/providers/add_exercise.dart
index cdda6710..99c0db8f 100644
--- a/lib/providers/add_exercise.dart
+++ b/lib/providers/add_exercise.dart
@@ -1,9 +1,9 @@
+import 'dart:convert';
 import 'dart:developer';
 import 'dart:io';
 
 import 'package:flutter/foundation.dart';
 import 'package:http/http.dart' as http;
-import 'package:wger/helpers/consts.dart';
 import 'package:wger/models/exercises/category.dart';
 import 'package:wger/models/exercises/equipment.dart';
 import 'package:wger/models/exercises/exercise.dart';
@@ -21,6 +21,10 @@ class AddExerciseProvider with ChangeNotifier {
 
   List<File> get exerciseImages => [..._exerciseImages];
   List<File> _exerciseImages = [];
+
+  // Map storing image metadata (license info, style), keyed by file path
+  final Map<String, Map<String, String>> _imageDetails = {};
+
   String? exerciseNameEn;
   String? exerciseNameTrans;
   String? descriptionEn;
@@ -43,6 +47,7 @@ class AddExerciseProvider with ChangeNotifier {
 
   void clear() {
     _exerciseImages = [];
+    _imageDetails.clear(); // Also clear image metadata
     languageTranslation = null;
     category = null;
     exerciseNameEn = null;
@@ -135,18 +140,63 @@ class AddExerciseProvider with ChangeNotifier {
     );
   }
 
-  void addExerciseImages(List<File> exercises) {
-    _exerciseImages.addAll(exercises);
+  /// Add images with optional license metadata
+  ///
+  /// [images] - List of image files to add
+  /// [title] - License title
+  /// [author] - Author name
+  /// [authorUrl] - Author's URL
+  /// [sourceUrl] - Source/object URL
+  /// [derivativeSourceUrl] - Derivative source URL
+  /// [style] - Image style: 1=PHOTO, 2=3D, 3=LINE, 4=LOW-POLY, 5=OTHER
+  void addExerciseImages(
+      List<File> images, {
+        String? title,
+        String? author,
+        String? authorUrl,
+        String? sourceUrl,
+        String? derivativeSourceUrl,
+        String style = '1',
+      }) {
+    _exerciseImages.addAll(images);
+
+    // Store metadata for each image
+    for (final image in images) {
+      final details = <String, String>{
+        'style': style,
+      };
+
+      // Only add non-empty fields
+      if (title != null && title.isNotEmpty) {
+        details['license_title'] = title;
+      }
+      if (author != null && author.isNotEmpty) {
+        details['license_author'] = author;
+      }
+      if (authorUrl != null && authorUrl.isNotEmpty) {
+        details['license_author_url'] = authorUrl;
+      }
+      if (sourceUrl != null && sourceUrl.isNotEmpty) {
+        details['license_object_url'] = sourceUrl;
+      }
+      if (derivativeSourceUrl != null && derivativeSourceUrl.isNotEmpty) {
+        details['license_derivative_source_url'] = derivativeSourceUrl;
+      }
+
+      _imageDetails[image.path] = details;
+    }
+
     notifyListeners();
   }
 
   void removeExercise(String path) {
     final file = _exerciseImages.where((element) => element.path == path).first;
     _exerciseImages.remove(file);
+    _imageDetails.remove(path); // Also remove associated metadata
     notifyListeners();
   }
 
-  //Just to Debug Provider
+  // Debug method to print all collected exercise data
   void printValues() {
     log('Collected exercise data');
     log('------------------------');
@@ -164,24 +214,41 @@ class AddExerciseProvider with ChangeNotifier {
     log('Name: en/$exerciseNameEn translation/$exerciseNameTrans');
     log('Description: en/$descriptionEn translation/$descriptionTrans');
     log('Alternate names: en/$alternateNamesEn translation/$alternateNamesTrans');
+
+    log('');
+    log('Images: ${_exerciseImages.length} images with details');
   }
 
+  /// Main method to submit exercise with images
+  ///
+  /// Returns the ID of the created exercise
+  /// Throws exception if submission fails
   Future<int> addExercise() async {
     printValues();
 
-    // Create the variations if needed
-    // if (newVariation) {
-    //   await addVariation();
-    // }
+    try {
+      // 1. Create the exercise
+      final exerciseId = await addExerciseSubmission();
+      print('Exercise created with ID: $exerciseId');
 
-    // Create the exercise
-    final exerciseId = await addExerciseSubmission();
+      // 2. Upload images if any exist
+      if (_exerciseImages.isNotEmpty) {
+        print('Uploading ${_exerciseImages.length} images...');
+        await addImages(exerciseId);
+        print('Images uploaded successfully');
+      } else {
+        print('ℹ No images to upload');
+      }
 
-    // Clear everything
-    clear();
+      // 3. Clear all data after successful upload
+      clear();
 
-    // Return exercise ID
-    return exerciseId;
+      return exerciseId;
+    } catch (e) {
+      print('Error adding exercise: $e');
+      // Don't clear on error so user can retry
+      rethrow;
+    }
   }
 
   Future<int> addExerciseSubmission() async {
@@ -194,16 +261,119 @@ class AddExerciseProvider with ChangeNotifier {
     return result['id'];
   }
 
+  /// Upload exercise images with license metadata
+  ///
+  /// For each image:
+  /// - Sends multipart request with image file
+  /// - Includes license fields from _imageDetails map
+  /// - Validates server response contains all submitted fields
   Future<void> addImages(int exerciseId) async {
+    print('Starting image upload for exercise ID: $exerciseId');
+    print('Number of images to upload: ${_exerciseImages.length}');
+
     for (final image in _exerciseImages) {
+      print('Processing image: ${image.path}');
+
       final request = http.MultipartRequest('POST', baseProvider.makeUrl(_imagesUrlPath));
       request.headers.addAll(baseProvider.getDefaultHeaders(includeAuth: true));
 
       request.files.add(await http.MultipartFile.fromPath('image', image.path));
       request.fields['exercise'] = exerciseId.toString();
-      request.fields['style'] = EXERCISE_IMAGE_ART_STYLE.PHOTO.index.toString();
+      request.fields['license'] = '1';
+      request.fields['is_main'] = 'false';
 
-      await request.send();
+      final details = _imageDetails[image.path];
+      print('Image details to send: $details');
+
+      if (details != null && details.isNotEmpty) {
+        request.fields.addAll(details);
+        print('Request fields: ${request.fields}');
+      } else {
+        request.fields['style'] = '1';
+      }
+
+      try {
+        print('Sending request...');
+        final streamedResponse = await request.send();
+        print('Response status: ${streamedResponse.statusCode}');
+
+        // Read response body to verify upload success
+        final response = await http.Response.fromStream(streamedResponse);
+
+        if (response.statusCode == 201 || response.statusCode == 200) {
+          final responseData = jsonDecode(response.body);
+
+          log('Image uploaded successfully!');
+          log('Response body: ${response.body}');
+
+          // Debug: Print all fields from server response
+          print('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+          print('SERVER RESPONSE:');
+          print('ID: ${responseData['id']}');
+          print('UUID: ${responseData['uuid']}');
+          print('Image URL: ${responseData['image']}');
+          print('Exercise: ${responseData['exercise']}');
+          print('Style: ${responseData['style']}');
+          print('License: ${responseData['license']}');
+          print('License Title: ${responseData['license_title']}');
+          print('License Author: ${responseData['license_author']}');
+          print('License Author URL: ${responseData['license_author_url']}');
+          print('License Object URL: ${responseData['license_object_url']}');
+          print('License Derivative: ${responseData['license_derivative_source_url']}');
+          print('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+
+          // Validate that license fields were saved correctly
+          if (details != null) {
+            bool allFieldsMatch = true;
+
+            if (details.containsKey('license_title') &&
+                responseData['license_title'] != details['license_title']) {
+              print('WARNING: license_title mismatch!');
+              print('Sent: ${details['license_title']}');
+              print('Received: ${responseData['license_title']}');
+              allFieldsMatch = false;
+            }
+
+            if (details.containsKey('license_author') &&
+                responseData['license_author'] != details['license_author']) {
+              print('WARNING: license_author mismatch!');
+              allFieldsMatch = false;
+            }
+
+            if (details.containsKey('license_author_url') &&
+                responseData['license_author_url'] != details['license_author_url']) {
+              print('WARNING: license_author_url mismatch!');
+              allFieldsMatch = false;
+            }
+
+            if (details.containsKey('license_object_url') &&
+                responseData['license_object_url'] != details['license_object_url']) {
+              print('WARNING: license_object_url mismatch!');
+              allFieldsMatch = false;
+            }
+
+            if (details.containsKey('license_derivative_source_url') &&
+                responseData['license_derivative_source_url'] != details['license_derivative_source_url']) {
+              print('WARNING: license_derivative_source_url mismatch!');
+              allFieldsMatch = false;
+            }
+
+            if (allFieldsMatch) {
+              print('ALL LICENSE FIELDS SAVED CORRECTLY!');
+            } else {
+              print('SOME LICENSE FIELDS NOT SAVED CORRECTLY!');
+            }
+          }
+
+        } else {
+          log('Failed to upload image: ${response.statusCode}');
+          log('Response body: ${response.body}');
+          throw Exception('Upload failed: ${response.statusCode}');
+        }
+      } catch (e) {
+        log('Error uploading image: $e');
+        rethrow;
+      }
     }
 
     notifyListeners();
@@ -220,7 +390,7 @@ class AddExerciseProvider with ChangeNotifier {
     return false;
   }
 
-  /*
+/*
     Note: all this logic is not needed now since we are using the /exercise-submission
     endpoint, however, if we ever want to implement editing of exercises, we will
     need basically all of it again, so this is kept here for reference.
@@ -275,4 +445,4 @@ class AddExerciseProvider with ChangeNotifier {
   }
 
    */
-}
+}
\ No newline at end of file
diff --git a/lib/widgets/add_exercise/image_details_form.dart b/lib/widgets/add_exercise/image_details_form.dart
new file mode 100644
index 00000000..315d270e
--- /dev/null
+++ b/lib/widgets/add_exercise/image_details_form.dart
@@ -0,0 +1,412 @@
+import 'dart:io';
+import 'package:flutter/material.dart';
+
+/// Form for collecting image metadata including license information
+///
+/// Displayed after image selection in Step 5 of exercise creation
+/// Collects: title, source URL, author info, derivative work info, and image style
+class ImageDetailsForm extends StatefulWidget {
+  final File imageFile;
+  final Function(File image, Map<String, String> details) onAdd;
+  final VoidCallback onCancel;
+
+  const ImageDetailsForm({
+    Key? key,
+    required this.imageFile,
+    required this.onAdd,
+    required this.onCancel,
+  }) : super(key: key);
+
+  @override
+  State<ImageDetailsForm> createState() => _ImageDetailsFormState();
+}
+
+class _ImageDetailsFormState extends State<ImageDetailsForm> {
+  final _formKey = GlobalKey<FormState>();
+
+  final _titleController = TextEditingController();
+  final _sourceLinkController = TextEditingController();
+  final _authorController = TextEditingController();
+  final _authorLinkController = TextEditingController();
+  final _originalSourceController = TextEditingController();
+
+  String _selectedImageType = 'PHOTO';
+
+  final List<Map<String, dynamic>> _imageTypes = [
+    {'type': 'PHOTO', 'icon': Icons.photo_camera, 'label': 'PHOTO'},
+    {'type': '3D', 'icon': Icons.view_in_ar, 'label': '3D'},
+    {'type': 'LINE', 'icon': Icons.show_chart, 'label': 'LINE'},
+    {'type': 'LOW-POLY', 'icon': Icons.filter_vintage, 'label': 'LOW-POLY'},
+    {'type': 'OTHER', 'icon': Icons.more_horiz, 'label': 'OTHER'},
+  ];
+
+  @override
+  void dispose() {
+    _titleController.dispose();
+    _sourceLinkController.dispose();
+    _authorController.dispose();
+    _authorLinkController.dispose();
+    _originalSourceController.dispose();
+    super.dispose();
+  }
+
+  /// Maps UI image type selection to API style value
+  /// PHOTO=1, 3D=2, LINE=3, LOW-POLY=4, OTHER=5
+  String _getStyleValue() {
+    switch (_selectedImageType) {
+      case 'PHOTO':
+        return '1';
+      case '3D':
+        return '2';
+      case 'LINE':
+        return '3';
+      case 'LOW-POLY':
+        return '4';
+      case 'OTHER':
+        return '5';
+      default:
+        return '1';
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SingleChildScrollView(
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Form(
+          key: _formKey,
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                'Image details',
+                style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+              const SizedBox(height: 16),
+
+              _buildImagePreview(),
+              const SizedBox(height: 24),
+
+              _buildTextField(
+                controller: _titleController,
+                label: 'Title',
+                hint: 'Enter image title',
+              ),
+              const SizedBox(height: 16),
+
+              _buildTextField(
+                controller: _sourceLinkController,
+                label: 'Link to the source website, if available',
+                hint: 'https://example.com',
+                keyboardType: TextInputType.url,
+              ),
+              const SizedBox(height: 16),
+
+              _buildTextField(
+                controller: _authorController,
+                label: 'Author(s)',
+                hint: 'Enter author name',
+              ),
+              const SizedBox(height: 16),
+
+              _buildTextField(
+                controller: _authorLinkController,
+                label: 'Link to author website or profile, if available',
+                hint: 'https://example.com/author',
+                keyboardType: TextInputType.url,
+              ),
+              const SizedBox(height: 16),
+
+              _buildTextField(
+                controller: _originalSourceController,
+                label: 'Link to the original source, if this is a derivative work',
+                hint: 'https://example.com/original',
+                keyboardType: TextInputType.url,
+              ),
+              const SizedBox(height: 8),
+
+              _buildDerivativeWorkNote(),
+              const SizedBox(height: 24),
+
+              _buildImageTypeSelector(),
+              const SizedBox(height: 24),
+
+              _buildLicenseInfo(),
+              const SizedBox(height: 24),
+
+              _buildButtons(),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildImagePreview() {
+    return Center(
+      child: Container(
+        constraints: const BoxConstraints(
+          maxWidth: 300,
+          maxHeight: 200,
+        ),
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(8),
+          border: Border.all(color: Colors.grey.shade300),
+        ),
+        child: ClipRRect(
+          borderRadius: BorderRadius.circular(8),
+          child: Image.file(
+            widget.imageFile,
+            fit: BoxFit.contain,
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTextField({
+    required TextEditingController controller,
+    required String label,
+    String? hint,
+    TextInputType? keyboardType,
+  }) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          label,
+          style: const TextStyle(
+            fontSize: 14,
+            fontWeight: FontWeight.w500,
+          ),
+        ),
+        const SizedBox(height: 8),
+        TextFormField(
+          controller: controller,
+          keyboardType: keyboardType,
+          decoration: InputDecoration(
+            hintText: hint,
+            border: OutlineInputBorder(
+              borderRadius: BorderRadius.circular(4),
+            ),
+            contentPadding: const EdgeInsets.symmetric(
+              horizontal: 12,
+              vertical: 12,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  /// Info box explaining what constitutes a derivative work
+  Widget _buildDerivativeWorkNote() {
+    return Container(
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: Colors.blue.shade50,
+        borderRadius: BorderRadius.circular(4),
+        border: Border.all(color: Colors.blue.shade200),
+      ),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Icon(
+            Icons.info_outline,
+            size: 20,
+            color: Colors.blue.shade700,
+          ),
+          const SizedBox(width: 8),
+          Expanded(
+            child: Text(
+              'Note that a derivative work is one which is not only based on a previous work, but which also contains sufficient new, creative content to entitle it to its own copyright.',
+              style: TextStyle(
+                fontSize: 12,
+                color: Colors.blue.shade900,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  /// Selector for image style (PHOTO, 3D, LINE, LOW-POLY, OTHER)
+  Widget _buildImageTypeSelector() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        const Text(
+          'Image Type',
+          style: TextStyle(
+            fontSize: 14,
+            fontWeight: FontWeight.w500,
+          ),
+        ),
+        const SizedBox(height: 12),
+        Wrap(
+          spacing: 8,
+          runSpacing: 8,
+          children: _imageTypes.map((type) {
+            final isSelected = _selectedImageType == type['type'];
+            return InkWell(
+              onTap: () {
+                setState(() {
+                  _selectedImageType = type['type'];
+                });
+              },
+              borderRadius: BorderRadius.circular(4),
+              child: Container(
+                width: 90,
+                height: 90,
+                decoration: BoxDecoration(
+                  color: isSelected ? Colors.blue.shade50 : Colors.white,
+                  border: Border.all(
+                    color: isSelected ? Colors.blue : Colors.grey.shade300,
+                    width: isSelected ? 2 : 1,
+                  ),
+                  borderRadius: BorderRadius.circular(4),
+                ),
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Icon(
+                      type['icon'],
+                      size: 32,
+                      color: isSelected ? Colors.blue : Colors.grey.shade600,
+                    ),
+                    const SizedBox(height: 8),
+                    Text(
+                      type['label'],
+                      style: TextStyle(
+                        fontSize: 11,
+                        color: isSelected ? Colors.blue : Colors.grey.shade700,
+                        fontWeight: isSelected ? FontWeight.bold : FontWeight.normal,
+                      ),
+                      textAlign: TextAlign.center,
+                    ),
+                  ],
+                ),
+              ),
+            );
+          }).toList(),
+        ),
+      ],
+    );
+  }
+
+  /// Warning box about CC BY-SA 4.0 license requirements
+  Widget _buildLicenseInfo() {
+    return Container(
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: Colors.amber.shade50,
+        borderRadius: BorderRadius.circular(4),
+        border: Border.all(color: Colors.amber.shade200),
+      ),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Icon(
+            Icons.info_outline,
+            size: 20,
+            color: Colors.amber.shade900,
+          ),
+          const SizedBox(width: 8),
+          Expanded(
+            child: RichText(
+              text: TextSpan(
+                style: TextStyle(
+                  fontSize: 12,
+                  color: Colors.amber.shade900,
+                ),
+                children: const [
+                  TextSpan(
+                    text: 'By submitting this image, you agree to release it under the ',
+                  ),
+                  TextSpan(
+                    text: 'CC BY-SA 4.0',
+                    style: TextStyle(
+                      fontWeight: FontWeight.bold,
+                      decoration: TextDecoration.underline,
+                    ),
+                  ),
+                  TextSpan(
+                    text: ' license. The image must be either your own work or the author must have released it under a license compatible with CC BY-SA 4.0.',
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildButtons() {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.end,
+      children: [
+        TextButton(
+          onPressed: widget.onCancel,
+          child: const Text('CANCEL'),
+        ),
+        const SizedBox(width: 8),
+        ElevatedButton(
+          onPressed: () {
+            if (_formKey.currentState!.validate()) {
+              // Build details map with API field names
+              final details = <String, String>{
+                'style': _getStyleValue(),
+              };
+
+              // Add only non-empty fields
+              final title = _titleController.text.trim();
+              if (title.isNotEmpty) {
+                details['license_title'] = title;
+              }
+
+              final author = _authorController.text.trim();
+              if (author.isNotEmpty) {
+                details['license_author'] = author;
+              }
+
+              final sourceUrl = _sourceLinkController.text.trim();
+              if (sourceUrl.isNotEmpty) {
+                details['license_object_url'] = sourceUrl;
+              }
+
+              final authorUrl = _authorLinkController.text.trim();
+              if (authorUrl.isNotEmpty) {
+                details['license_author_url'] = authorUrl;
+              }
+
+              final derivativeUrl = _originalSourceController.text.trim();
+              if (derivativeUrl.isNotEmpty) {
+                details['license_derivative_source_url'] = derivativeUrl;
+              }
+
+              widget.onAdd(widget.imageFile, details);
+            }
+          },
+          style: ElevatedButton.styleFrom(
+            backgroundColor: Theme.of(context).primaryColor,
+            padding: const EdgeInsets.symmetric(
+              horizontal: 32,
+              vertical: 12,
+            ),
+          ),
+          child: const Text(
+            'ADD',
+            style: TextStyle(
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/widgets/add_exercise/steps/step5images.dart b/lib/widgets/add_exercise/steps/step5images.dart
index 54f89f9b..413be166 100644
--- a/lib/widgets/add_exercise/steps/step5images.dart
+++ b/lib/widgets/add_exercise/steps/step5images.dart
@@ -1,13 +1,15 @@
+import 'dart:io';
 import 'package:flutter/material.dart';
+import 'package:image_picker/image_picker.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/providers/add_exercise.dart';
 import 'package:wger/widgets/add_exercise/mixins/image_picker_mixin.dart';
 import 'package:wger/widgets/add_exercise/preview_images.dart';
+import 'package:wger/widgets/add_exercise/image_details_form.dart';
 
 class Step5Images extends StatefulWidget {
   final GlobalKey<FormState> formkey;
-
   const Step5Images({required this.formkey});
 
   @override
@@ -15,39 +17,199 @@ class Step5Images extends StatefulWidget {
 }
 
 class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin {
+  File? _currentImageToAdd;
+
+  /// Pick image and show details form for license metadata
+  void _pickAndShowImageDetails(BuildContext context, {bool pickFromCamera = false}) async {
+    final imagePicker = ImagePicker();
+
+    XFile? selectedImage;
+    if (pickFromCamera) {
+      selectedImage = await imagePicker.pickImage(source: ImageSource.camera);
+    } else {
+      selectedImage = await imagePicker.pickImage(source: ImageSource.gallery);
+    }
+
+    if (selectedImage != null) {
+      final imageFile = File(selectedImage.path);
+
+      // Validate file type and size
+      bool isFileValid = true;
+      String errorMessage = '';
+
+      final extension = imageFile.path.split('.').last;
+      const validFileExtensions = ['jpg', 'jpeg', 'png', 'webp'];
+      if (!validFileExtensions.any((ext) => extension.toLowerCase() == ext)) {
+        isFileValid = false;
+        errorMessage = "Select only 'jpg', 'jpeg', 'png', 'webp' files";
+      }
+
+      final fileSizeInMB = imageFile.lengthSync() / 1024 / 1024;
+      if (fileSizeInMB > 20) {
+        isFileValid = false;
+        errorMessage = 'File Size should not be greater than 20 MB';
+      }
+
+      if (!isFileValid) {
+        if (context.mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text(errorMessage)),
+          );
+        }
+        return;
+      }
+
+      // Show details form for valid image
+      setState(() {
+        _currentImageToAdd = imageFile;
+      });
+    }
+  }
+
+  /// Add image with license metadata to provider
+  void _addImageWithDetails(File image, Map<String, String> details) {
+    final provider = context.read<AddExerciseProvider>();
+
+    provider.addExerciseImages(
+      [image],
+      title: details['license_title'],
+      author: details['license_author'],
+      authorUrl: details['license_author_url'],
+      sourceUrl: details['license_object_url'],
+      derivativeSourceUrl: details['license_derivative_source_url'],
+      style: details['style'] ?? '1',
+    );
+
+    setState(() {
+      _currentImageToAdd = null;
+    });
+
+    ScaffoldMessenger.of(context).showSnackBar(
+      const SnackBar(
+        content: Text('Image added with details'),
+        backgroundColor: Colors.green,
+        duration: Duration(seconds: 2),
+      ),
+    );
+  }
+
+  void _cancelImageAdd() {
+    setState(() {
+      _currentImageToAdd = null;
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return Form(
       key: widget.formkey,
       child: Column(
         children: [
-          Text(
-            AppLocalizations.of(context).add_exercise_image_license,
-            style: Theme.of(context).textTheme.bodySmall,
-          ),
-          Consumer<AddExerciseProvider>(
-            builder: (ctx, provider, __) => provider.exerciseImages.isNotEmpty
-                ? PreviewExerciseImages(selectedImages: provider.exerciseImages)
-                : Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
+          // Show license notice when not adding image
+          if (_currentImageToAdd == null)
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+              child: Text(
+                AppLocalizations.of(context).add_exercise_image_license,
+                style: Theme.of(context).textTheme.bodySmall,
+                textAlign: TextAlign.center,
+              ),
+            ),
+
+          // Show image details form when image is selected
+          if (_currentImageToAdd != null)
+            ImageDetailsForm(
+              imageFile: _currentImageToAdd!,
+              onAdd: _addImageWithDetails,
+              onCancel: _cancelImageAdd,
+            ),
+
+          // Show image picker or preview when no image is being added
+          if (_currentImageToAdd == null)
+            Consumer<AddExerciseProvider>(
+              builder: (ctx, provider, __) {
+                if (provider.exerciseImages.isNotEmpty) {
+                  // Show preview of existing images
+                  return Column(
                     children: [
-                      IconButton(
-                        onPressed: () => pickImages(context, pickFromCamera: true),
-                        icon: const Icon(Icons.camera_alt),
+                      PreviewExerciseImages(
+                        selectedImages: provider.exerciseImages,
                       ),
-                      IconButton(
-                        onPressed: () => pickImages(context),
-                        icon: const Icon(Icons.collections),
+                      const SizedBox(height: 16),
+                      ElevatedButton.icon(
+                        onPressed: () => _pickAndShowImageDetails(context),
+                        icon: const Icon(Icons.add_photo_alternate),
+                        label: const Text('Add Another Image'),
                       ),
                     ],
-                  ),
-          ),
-          Text(
-            'Only JPEG, PNG and WEBP files below 20 MB are supported',
-            style: Theme.of(context).textTheme.bodySmall,
-          ),
+                  );
+                }
+
+                // Show empty state with camera/gallery buttons
+                return Column(
+                  children: [
+                    const SizedBox(height: 20),
+                    Icon(
+                      Icons.add_photo_alternate,
+                      size: 80,
+                      color: Colors.grey.shade400,
+                    ),
+                    const SizedBox(height: 16),
+                    Text(
+                      'No images selected',
+                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                        color: Colors.grey.shade600,
+                      ),
+                    ),
+                    const SizedBox(height: 24),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        ElevatedButton.icon(
+                          onPressed: () => _pickAndShowImageDetails(
+                            context,
+                            pickFromCamera: true,
+                          ),
+                          icon: const Icon(Icons.camera_alt),
+                          label: const Text('Camera'),
+                          style: ElevatedButton.styleFrom(
+                            padding: const EdgeInsets.symmetric(
+                              horizontal: 20,
+                              vertical: 12,
+                            ),
+                          ),
+                        ),
+                        const SizedBox(width: 16),
+                        ElevatedButton.icon(
+                          onPressed: () => _pickAndShowImageDetails(context),
+                          icon: const Icon(Icons.collections),
+                          label: const Text('Gallery'),
+                          style: ElevatedButton.styleFrom(
+                            padding: const EdgeInsets.symmetric(
+                              horizontal: 20,
+                              vertical: 12,
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 16),
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                      child: Text(
+                        'Only JPEG, PNG and WEBP files below 20 MB are supported',
+                        style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                          color: Colors.grey.shade600,
+                        ),
+                        textAlign: TextAlign.center,
+                      ),
+                    ),
+                  ],
+                );
+              },
+            ),
         ],
       ),
     );
   }
-}
+}
\ No newline at end of file
diff --git a/lib/widgets/add_exercise/steps/step6Overview.dart b/lib/widgets/add_exercise/steps/step6Overview.dart
index fbe65664..43f707d8 100644
--- a/lib/widgets/add_exercise/steps/step6Overview.dart
+++ b/lib/widgets/add_exercise/steps/step6Overview.dart
@@ -108,4 +108,4 @@ class Step6Overview extends StatelessWidget {
       ),
     );
   }
-}
+}
\ No newline at end of file
diff --git a/test/exercises/add_exercise_image_withDetail_test.dart b/test/exercises/add_exercise_image_withDetail_test.dart
new file mode 100644
index 00000000..5e4435d3
--- /dev/null
+++ b/test/exercises/add_exercise_image_withDetail_test.dart
@@ -0,0 +1,218 @@
+import 'dart:io';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/providers/add_exercise.dart';
+
+import '../core/settings_test.mocks.dart';
+
+void main() {
+  late MockWgerBaseProvider mockBaseProvider;
+  late AddExerciseProvider provider;
+
+  setUp(() {
+    mockBaseProvider = MockWgerBaseProvider();
+    provider = AddExerciseProvider(mockBaseProvider);
+  });
+
+  group('Image metadata handling', () {
+    test('should store image with all license fields', () {
+      final mockFile = File('test.jpg');
+
+      provider.addExerciseImages(
+        [mockFile],
+        title: 'Test Title',
+        author: 'Test Author',
+        authorUrl: 'https://test.com/author',
+        sourceUrl: 'https://source.com',
+        derivativeSourceUrl: 'https://derivative.com',
+        style: '4',
+      );
+
+      expect(provider.exerciseImages.length, 1);
+      expect(provider.exerciseImages.first.path, mockFile.path);
+    });
+
+    test('should handle empty fields gracefully', () {
+      final mockFile = File('test2.jpg');
+
+      provider.addExerciseImages(
+        [mockFile],
+        title: 'Only Title',
+        author: null,
+        authorUrl: '',
+        style: '2',
+      );
+
+      expect(provider.exerciseImages.length, 1);
+    });
+
+    test('should handle multiple images with different metadata', () {
+      final file1 = File('image1.jpg');
+      final file2 = File('image2.jpg');
+
+      provider.addExerciseImages([file1], title: 'Image 1', author: 'Author 1', style: '1');
+      provider.addExerciseImages([file2], title: 'Image 2', author: 'Author 2', style: '2');
+
+      expect(provider.exerciseImages.length, 2);
+      expect(provider.exerciseImages[0].path, file1.path);
+      expect(provider.exerciseImages[1].path, file2.path);
+    });
+
+    test('should handle all image style types', () {
+      final styles = ['1', '2', '3', '4', '5'];
+
+      for (var i = 0; i < styles.length; i++) {
+        provider.addExerciseImages(
+          [File('image_$i.jpg')],
+          style: styles[i],
+        );
+      }
+
+      expect(provider.exerciseImages.length, 5);
+    });
+
+    test('should use default style when not specified', () {
+      final mockFile = File('default.jpg');
+
+      provider.addExerciseImages([mockFile]);
+
+      expect(provider.exerciseImages.length, 1);
+    });
+
+    test('should handle empty image list', () {
+      provider.addExerciseImages([]);
+
+      expect(provider.exerciseImages.length, 0);
+    });
+
+    test('should handle adding same file multiple times', () {
+      final mockFile = File('same.jpg');
+
+      provider.addExerciseImages([mockFile], title: 'First');
+      provider.addExerciseImages([mockFile], title: 'Second');
+
+      expect(provider.exerciseImages.length, 2);
+    });
+
+    test('should remove image and its metadata', () {
+      final mockFile = File('to_remove.jpg');
+      provider.addExerciseImages([mockFile], title: 'Will be removed', style: '1');
+
+      expect(provider.exerciseImages.length, 1);
+
+      provider.removeExercise(mockFile.path);
+
+      expect(provider.exerciseImages.length, 0);
+    });
+
+    test('should handle removing non-existent image gracefully', () {
+      expect(
+            () => provider.removeExercise('nonexistent.jpg'),
+        throwsStateError,
+      );
+    });
+
+    test('should clear all images and metadata', () {
+      provider.addExerciseImages([File('image1.jpg')], title: 'Image 1');
+      provider.addExerciseImages([File('image2.jpg')], title: 'Image 2');
+
+      expect(provider.exerciseImages.length, 2);
+
+      provider.clear();
+
+      expect(provider.exerciseImages.length, 0);
+    });
+
+    test('should handle clearing empty list', () {
+      expect(provider.exerciseImages.length, 0);
+
+      provider.clear();
+
+      expect(provider.exerciseImages.length, 0);
+    });
+
+    test('should preserve image order', () {
+      final file1 = File('first.jpg');
+      final file2 = File('second.jpg');
+      final file3 = File('third.jpg');
+
+      provider.addExerciseImages([file1]);
+      provider.addExerciseImages([file2]);
+      provider.addExerciseImages([file3]);
+
+      expect(provider.exerciseImages[0].path, 'first.jpg');
+      expect(provider.exerciseImages[1].path, 'second.jpg');
+      expect(provider.exerciseImages[2].path, 'third.jpg');
+    });
+
+    test('should handle batch adding multiple images at once', () {
+      final files = [
+        File('batch1.jpg'),
+        File('batch2.jpg'),
+        File('batch3.jpg'),
+      ];
+
+      provider.addExerciseImages(files, title: 'Batch Upload', style: '3');
+
+      expect(provider.exerciseImages.length, 3);
+    });
+
+    test('should allow removing specific image from multiple images', () {
+      final file1 = File('keep1.jpg');
+      final file2 = File('remove.jpg');
+      final file3 = File('keep2.jpg');
+
+      provider.addExerciseImages([file1]);
+      provider.addExerciseImages([file2]);
+      provider.addExerciseImages([file3]);
+
+      expect(provider.exerciseImages.length, 3);
+
+      provider.removeExercise(file2.path);
+
+      expect(provider.exerciseImages.length, 2);
+      expect(provider.exerciseImages[0].path, file1.path);
+      expect(provider.exerciseImages[1].path, file3.path);
+    });
+
+    test('should handle very long metadata strings', () {
+      final mockFile = File('long.jpg');
+      final longString = 'a' * 1000;
+
+      provider.addExerciseImages(
+        [mockFile],
+        title: longString,
+        author: longString,
+        authorUrl: 'https://example.com/$longString',
+      );
+
+      expect(provider.exerciseImages.length, 1);
+    });
+
+    test('should handle special characters in metadata', () {
+      final mockFile = File('special.jpg');
+
+      provider.addExerciseImages(
+        [mockFile],
+        title: 'Title with émojis 🎉 and spëcial çhars',
+        author: 'Autör with ümlauts',
+        authorUrl: 'https://example.com/path?query=value&another=value',
+      );
+
+      expect(provider.exerciseImages.length, 1);
+    });
+  });
+
+  group('State management', () {
+    test('should reset all state after clear', () {
+      provider.exerciseNameEn = 'Test Exercise';
+      provider.descriptionEn = 'Description';
+      provider.addExerciseImages([File('test.jpg')]);
+
+      provider.clear();
+
+      expect(provider.exerciseImages.length, 0);
+      expect(provider.exerciseNameEn, isNull);
+      expect(provider.descriptionEn, isNull);
+    });
+  });
+}
\ No newline at end of file

From e9ab11c8bb0f5dba45002030ca64494d9ec54750 Mon Sep 17 00:00:00 2001
From: Branislav Nohaj <branislav.nohaj@student.tuke.sk>
Date: Sat, 4 Oct 2025 10:58:36 +0200
Subject: [PATCH 02/29] added better comments

---
 .../add_exercise/image_details_form.dart      | 67 +++++++++++++++----
 .../add_exercise/steps/step5images.dart       | 48 ++++++++++---
 .../add_exercise_image_withDetail_test.dart   | 47 +++++++++++--
 3 files changed, 135 insertions(+), 27 deletions(-)

diff --git a/lib/widgets/add_exercise/image_details_form.dart b/lib/widgets/add_exercise/image_details_form.dart
index 315d270e..805fb586 100644
--- a/lib/widgets/add_exercise/image_details_form.dart
+++ b/lib/widgets/add_exercise/image_details_form.dart
@@ -1,10 +1,24 @@
 import 'dart:io';
 import 'package:flutter/material.dart';
 
-/// Form for collecting image metadata including license information
+/// Form for collecting CC BY-SA 4.0 license metadata for exercise images
 ///
-/// Displayed after image selection in Step 5 of exercise creation
-/// Collects: title, source URL, author info, derivative work info, and image style
+/// This form is displayed after image selection in Step 5 of exercise creation.
+/// It collects all required and optional license attribution fields:
+///
+/// Required by CC BY-SA 4.0:
+/// - Author name
+/// - License type (implicitly CC BY-SA 4.0)
+///
+/// Optional but recommended:
+/// - Title (helps identify the image)
+/// - Source URL (where image was found)
+/// - Author URL (author's website/profile)
+/// - Derivative source URL (if modified from another work)
+/// - Image style (PHOTO, 3D, LINE, LOW-POLY, OTHER)
+///
+/// All metadata is sent to the API's /exerciseimage endpoint along with
+/// the image file when the exercise is submitted.
 class ImageDetailsForm extends StatefulWidget {
   final File imageFile;
   final Function(File image, Map<String, String> details) onAdd;
@@ -24,12 +38,15 @@ class ImageDetailsForm extends StatefulWidget {
 class _ImageDetailsFormState extends State<ImageDetailsForm> {
   final _formKey = GlobalKey<FormState>();
 
+  // Text controllers for license metadata fields
   final _titleController = TextEditingController();
-  final _sourceLinkController = TextEditingController();
-  final _authorController = TextEditingController();
-  final _authorLinkController = TextEditingController();
-  final _originalSourceController = TextEditingController();
+  final _sourceLinkController = TextEditingController(); // license_object_url in API
+  final _authorController = TextEditingController(); // license_author in API
+  final _authorLinkController = TextEditingController(); // license_author_url in API
+  final _originalSourceController = TextEditingController(); // license_derivative_source_url in API
 
+  /// Currently selected image type
+  /// Maps to API 'style' field: PHOTO=1, 3D=2, LINE=3, LOW-POLY=4, OTHER=5
   String _selectedImageType = 'PHOTO';
 
   final List<Map<String, dynamic>> _imageTypes = [
@@ -50,8 +67,14 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
     super.dispose();
   }
 
-  /// Maps UI image type selection to API style value
-  /// PHOTO=1, 3D=2, LINE=3, LOW-POLY=4, OTHER=5
+  /// Maps UI image type selection to API 'style' field value
+  ///
+  /// API expects numeric string:
+  /// - PHOTO = '1'
+  /// - 3D = '2'
+  /// - LINE = '3'
+  /// - LOW-POLY = '4'
+  /// - OTHER = '5'
   String _getStyleValue() {
     switch (_selectedImageType) {
       case 'PHOTO':
@@ -65,7 +88,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
       case 'OTHER':
         return '5';
       default:
-        return '1';
+        return '1'; // Default to PHOTO if unknown
     }
   }
 
@@ -90,6 +113,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
               _buildImagePreview(),
               const SizedBox(height: 24),
 
+              // License title field - helps identify the image
               _buildTextField(
                 controller: _titleController,
                 label: 'Title',
@@ -97,6 +121,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
               ),
               const SizedBox(height: 16),
 
+              // Source URL - where the image was found (license_object_url in API)
               _buildTextField(
                 controller: _sourceLinkController,
                 label: 'Link to the source website, if available',
@@ -105,6 +130,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
               ),
               const SizedBox(height: 16),
 
+              // Author name - required for proper CC BY-SA attribution
               _buildTextField(
                 controller: _authorController,
                 label: 'Author(s)',
@@ -112,6 +138,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
               ),
               const SizedBox(height: 16),
 
+              // Author's website/profile URL
               _buildTextField(
                 controller: _authorLinkController,
                 label: 'Link to author website or profile, if available',
@@ -120,6 +147,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
               ),
               const SizedBox(height: 16),
 
+              // Original source if this is a derivative work (modified from another image)
               _buildTextField(
                 controller: _originalSourceController,
                 label: 'Link to the original source, if this is a derivative work',
@@ -202,7 +230,10 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
     );
   }
 
-  /// Info box explaining what constitutes a derivative work
+  /// Informational box explaining what constitutes a derivative work
+  ///
+  /// Important for CC BY-SA compliance - users need to understand when
+  /// they must cite the original work they modified
   Widget _buildDerivativeWorkNote() {
     return Container(
       padding: const EdgeInsets.all(12),
@@ -234,7 +265,10 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
     );
   }
 
-  /// Selector for image style (PHOTO, 3D, LINE, LOW-POLY, OTHER)
+  /// Visual selector for image style/type
+  ///
+  /// Allows user to categorize the image as PHOTO, 3D render, LINE drawing,
+  /// LOW-POLY art, or OTHER. This helps users find appropriate exercise images.
   Widget _buildImageTypeSelector() {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -298,7 +332,10 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
     );
   }
 
-  /// Warning box about CC BY-SA 4.0 license requirements
+  /// Legal notice about CC BY-SA 4.0 license
+  ///
+  /// Critical for compliance - informs user that by uploading, they're
+  /// releasing the image under CC BY-SA 4.0 and must have rights to do so
   Widget _buildLicenseInfo() {
     return Container(
       padding: const EdgeInsets.all(12),
@@ -359,11 +396,12 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
           onPressed: () {
             if (_formKey.currentState!.validate()) {
               // Build details map with API field names
+              // Style is always included, other fields only if non-empty
               final details = <String, String>{
                 'style': _getStyleValue(),
               };
 
-              // Add only non-empty fields
+              // Add optional fields only if user provided values
               final title = _titleController.text.trim();
               if (title.isNotEmpty) {
                 details['license_title'] = title;
@@ -389,6 +427,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
                 details['license_derivative_source_url'] = derivativeUrl;
               }
 
+              // Pass image and metadata back to parent
               widget.onAdd(widget.imageFile, details);
             }
           },
diff --git a/lib/widgets/add_exercise/steps/step5images.dart b/lib/widgets/add_exercise/steps/step5images.dart
index 413be166..8ccaf83a 100644
--- a/lib/widgets/add_exercise/steps/step5images.dart
+++ b/lib/widgets/add_exercise/steps/step5images.dart
@@ -8,6 +8,17 @@ import 'package:wger/widgets/add_exercise/mixins/image_picker_mixin.dart';
 import 'package:wger/widgets/add_exercise/preview_images.dart';
 import 'package:wger/widgets/add_exercise/image_details_form.dart';
 
+/// Step 5 of exercise creation wizard - Image upload with license metadata
+///
+/// This step allows users to add exercise images with proper CC BY-SA 4.0 license
+/// attribution. Unlike the previous implementation that uploaded images directly,
+/// this version collects license metadata (title, author, URLs) before adding images.
+///
+/// Flow:
+/// 1. User picks image from camera/gallery
+/// 2. ImageDetailsForm is shown to collect license metadata
+/// 3. Image + metadata is stored in AddExerciseProvider
+/// 4. Final upload happens in Step 6 when user clicks "Submit"
 class Step5Images extends StatefulWidget {
   final GlobalKey<FormState> formkey;
   const Step5Images({required this.formkey});
@@ -17,9 +28,16 @@ class Step5Images extends StatefulWidget {
 }
 
 class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin {
+  /// Currently selected image waiting for metadata input
+  /// When non-null, ImageDetailsForm is displayed instead of image picker
   File? _currentImageToAdd;
 
-  /// Pick image and show details form for license metadata
+  /// Pick image from camera or gallery and show metadata collection form
+  ///
+  /// Validates file format (jpg, jpeg, png, webp) and size (<20MB) before
+  /// showing the form. Invalid files are rejected with a snackbar message.
+  ///
+  /// [pickFromCamera] - If true, opens camera; otherwise opens gallery
   void _pickAndShowImageDetails(BuildContext context, {bool pickFromCamera = false}) async {
     final imagePicker = ImagePicker();
 
@@ -33,7 +51,7 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
     if (selectedImage != null) {
       final imageFile = File(selectedImage.path);
 
-      // Validate file type and size
+      // Validate file type - only common image formats accepted
       bool isFileValid = true;
       String errorMessage = '';
 
@@ -44,6 +62,7 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
         errorMessage = "Select only 'jpg', 'jpeg', 'png', 'webp' files";
       }
 
+      // Validate file size - 20MB limit matches server-side restriction
       final fileSizeInMB = imageFile.lengthSync() / 1024 / 1024;
       if (fileSizeInMB > 20) {
         isFileValid = false;
@@ -59,17 +78,25 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
         return;
       }
 
-      // Show details form for valid image
+      // Show metadata collection form for valid image
       setState(() {
         _currentImageToAdd = imageFile;
       });
     }
   }
 
-  /// Add image with license metadata to provider
+  /// Add image with its license metadata to the provider
+  ///
+  /// Called when user clicks "ADD" in ImageDetailsForm. The image and metadata
+  /// are stored locally in AddExerciseProvider and will be uploaded together
+  /// when the exercise is submitted in Step 6.
+  ///
+  /// [image] - The image file to add
+  /// [details] - Map containing license fields (license_title, license_author, etc.)
   void _addImageWithDetails(File image, Map<String, String> details) {
     final provider = context.read<AddExerciseProvider>();
 
+    // Store image with metadata - actual upload happens in addExercise()
     provider.addExerciseImages(
       [image],
       title: details['license_title'],
@@ -80,6 +107,7 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
       style: details['style'] ?? '1',
     );
 
+    // Reset form state
     setState(() {
       _currentImageToAdd = null;
     });
@@ -93,6 +121,7 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
     );
   }
 
+  /// Cancel metadata input and return to image picker
   void _cancelImageAdd() {
     setState(() {
       _currentImageToAdd = null;
@@ -105,7 +134,7 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
       key: widget.formkey,
       child: Column(
         children: [
-          // Show license notice when not adding image
+          // License notice - shown when not entering metadata
           if (_currentImageToAdd == null)
             Padding(
               padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
@@ -116,7 +145,7 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
               ),
             ),
 
-          // Show image details form when image is selected
+          // Metadata collection form - shown when image is selected
           if (_currentImageToAdd != null)
             ImageDetailsForm(
               imageFile: _currentImageToAdd!,
@@ -124,12 +153,12 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
               onCancel: _cancelImageAdd,
             ),
 
-          // Show image picker or preview when no image is being added
+          // Image picker or preview - shown when not entering metadata
           if (_currentImageToAdd == null)
             Consumer<AddExerciseProvider>(
               builder: (ctx, provider, __) {
                 if (provider.exerciseImages.isNotEmpty) {
-                  // Show preview of existing images
+                  // Show preview of images that have been added with metadata
                   return Column(
                     children: [
                       PreviewExerciseImages(
@@ -145,7 +174,7 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
                   );
                 }
 
-                // Show empty state with camera/gallery buttons
+                // Empty state - no images added yet
                 return Column(
                   children: [
                     const SizedBox(height: 20),
@@ -162,6 +191,7 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
                       ),
                     ),
                     const SizedBox(height: 24),
+                    // Camera and Gallery buttons
                     Row(
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: [
diff --git a/test/exercises/add_exercise_image_withDetail_test.dart b/test/exercises/add_exercise_image_withDetail_test.dart
index 5e4435d3..b7428085 100644
--- a/test/exercises/add_exercise_image_withDetail_test.dart
+++ b/test/exercises/add_exercise_image_withDetail_test.dart
@@ -4,6 +4,16 @@ import 'package:wger/providers/add_exercise.dart';
 
 import '../core/settings_test.mocks.dart';
 
+/// Unit tests for AddExerciseProvider image metadata handling
+///
+/// Tests the functionality added for issue #931 - storing and managing
+/// CC BY-SA 4.0 license metadata alongside exercise images.
+///
+/// Key areas tested:
+/// - Adding images with complete/partial/no metadata
+/// - Edge cases (empty lists, duplicates, special characters)
+/// - State management (clear, remove)
+/// - Image ordering and batch operations
 void main() {
   late MockWgerBaseProvider mockBaseProvider;
   late AddExerciseProvider provider;
@@ -14,6 +24,8 @@ void main() {
   });
 
   group('Image metadata handling', () {
+    /// Verify that all CC BY-SA license fields are stored correctly
+    /// Tests: title, author, authorUrl, sourceUrl, derivativeSourceUrl, style
     test('should store image with all license fields', () {
       final mockFile = File('test.jpg');
 
@@ -24,27 +36,31 @@ void main() {
         authorUrl: 'https://test.com/author',
         sourceUrl: 'https://source.com',
         derivativeSourceUrl: 'https://derivative.com',
-        style: '4',
+        style: '4', // LOW-POLY
       );
 
       expect(provider.exerciseImages.length, 1);
       expect(provider.exerciseImages.first.path, mockFile.path);
     });
 
+    /// License fields are optional - provider should handle null/empty values
+    /// Only non-empty fields should be included in the metadata map
     test('should handle empty fields gracefully', () {
       final mockFile = File('test2.jpg');
 
       provider.addExerciseImages(
         [mockFile],
         title: 'Only Title',
-        author: null,
-        authorUrl: '',
-        style: '2',
+        author: null, // null value
+        authorUrl: '', // empty string
+        style: '2', // 3D
       );
 
       expect(provider.exerciseImages.length, 1);
     });
 
+    /// Each image can have different metadata - test storing multiple
+    /// images with unique license information
     test('should handle multiple images with different metadata', () {
       final file1 = File('image1.jpg');
       final file2 = File('image2.jpg');
@@ -57,6 +73,8 @@ void main() {
       expect(provider.exerciseImages[1].path, file2.path);
     });
 
+    /// Test all 5 image style types defined by the API
+    /// 1=PHOTO, 2=3D, 3=LINE, 4=LOW-POLY, 5=OTHER
     test('should handle all image style types', () {
       final styles = ['1', '2', '3', '4', '5'];
 
@@ -70,6 +88,7 @@ void main() {
       expect(provider.exerciseImages.length, 5);
     });
 
+    /// If no style is specified, should default to '1' (PHOTO)
     test('should use default style when not specified', () {
       final mockFile = File('default.jpg');
 
@@ -78,12 +97,15 @@ void main() {
       expect(provider.exerciseImages.length, 1);
     });
 
+    /// Edge case: calling addExerciseImages with empty list should not crash
     test('should handle empty image list', () {
       provider.addExerciseImages([]);
 
       expect(provider.exerciseImages.length, 0);
     });
 
+    /// Allows adding the same file multiple times with different metadata
+    /// (e.g., different crops or edits of the same original image)
     test('should handle adding same file multiple times', () {
       final mockFile = File('same.jpg');
 
@@ -93,6 +115,8 @@ void main() {
       expect(provider.exerciseImages.length, 2);
     });
 
+    /// Removing an image should also remove its associated metadata
+    /// to prevent memory leaks
     test('should remove image and its metadata', () {
       final mockFile = File('to_remove.jpg');
       provider.addExerciseImages([mockFile], title: 'Will be removed', style: '1');
@@ -104,6 +128,8 @@ void main() {
       expect(provider.exerciseImages.length, 0);
     });
 
+    /// Attempting to remove a non-existent image should throw StateError
+    /// (from firstWhere with no orElse)
     test('should handle removing non-existent image gracefully', () {
       expect(
             () => provider.removeExercise('nonexistent.jpg'),
@@ -111,6 +137,7 @@ void main() {
       );
     });
 
+    /// clear() should reset all state including images and metadata
     test('should clear all images and metadata', () {
       provider.addExerciseImages([File('image1.jpg')], title: 'Image 1');
       provider.addExerciseImages([File('image2.jpg')], title: 'Image 2');
@@ -122,6 +149,7 @@ void main() {
       expect(provider.exerciseImages.length, 0);
     });
 
+    /// Clearing an already empty list should not cause errors
     test('should handle clearing empty list', () {
       expect(provider.exerciseImages.length, 0);
 
@@ -130,6 +158,8 @@ void main() {
       expect(provider.exerciseImages.length, 0);
     });
 
+    /// Images should be stored in the order they were added
+    /// Important for display consistency
     test('should preserve image order', () {
       final file1 = File('first.jpg');
       final file2 = File('second.jpg');
@@ -144,6 +174,8 @@ void main() {
       expect(provider.exerciseImages[2].path, 'third.jpg');
     });
 
+    /// Multiple images can be added in a single call with shared metadata
+    /// Useful for bulk uploads from the same source
     test('should handle batch adding multiple images at once', () {
       final files = [
         File('batch1.jpg'),
@@ -156,6 +188,7 @@ void main() {
       expect(provider.exerciseImages.length, 3);
     });
 
+    /// Removing one image from a set should not affect others
     test('should allow removing specific image from multiple images', () {
       final file1 = File('keep1.jpg');
       final file2 = File('remove.jpg');
@@ -174,6 +207,8 @@ void main() {
       expect(provider.exerciseImages[1].path, file3.path);
     });
 
+    /// Test with extremely long strings (1000 chars) to ensure no
+    /// buffer overflow or validation issues
     test('should handle very long metadata strings', () {
       final mockFile = File('long.jpg');
       final longString = 'a' * 1000;
@@ -188,6 +223,8 @@ void main() {
       expect(provider.exerciseImages.length, 1);
     });
 
+    /// Unicode characters, emojis, and URL-encoded strings should all work
+    /// Tests international character support
     test('should handle special characters in metadata', () {
       final mockFile = File('special.jpg');
 
@@ -203,6 +240,8 @@ void main() {
   });
 
   group('State management', () {
+    /// clear() should reset ALL provider state, not just images
+    /// Ensures no data leaks between exercises
     test('should reset all state after clear', () {
       provider.exerciseNameEn = 'Test Exercise';
       provider.descriptionEn = 'Description';

From cb138f41f7ccb9c6f16212cbe934e3efdba3534f Mon Sep 17 00:00:00 2001
From: Branislav Nohaj <branislav.nohaj@student.tuke.sk>
Date: Sat, 4 Oct 2025 11:07:41 +0200
Subject: [PATCH 03/29] missing button fix

---
 .../add_exercise/image_details_form.dart      | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/lib/widgets/add_exercise/image_details_form.dart b/lib/widgets/add_exercise/image_details_form.dart
index 805fb586..a8985069 100644
--- a/lib/widgets/add_exercise/image_details_form.dart
+++ b/lib/widgets/add_exercise/image_details_form.dart
@@ -1,5 +1,6 @@
 import 'dart:io';
 import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 /// Form for collecting CC BY-SA 4.0 license metadata for exercise images
 ///
@@ -360,18 +361,30 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
                   fontSize: 12,
                   color: Colors.amber.shade900,
                 ),
-                children: const [
-                  TextSpan(
+                children: [
+                  const TextSpan(
                     text: 'By submitting this image, you agree to release it under the ',
                   ),
-                  TextSpan(
-                    text: 'CC BY-SA 4.0',
-                    style: TextStyle(
-                      fontWeight: FontWeight.bold,
-                      decoration: TextDecoration.underline,
+                  WidgetSpan(
+                    child: GestureDetector(
+                      onTap: () async {
+                        final url = Uri.parse('https://creativecommons.org/licenses/by-sa/4.0/');
+                        if (await canLaunchUrl(url)) {
+                          await launchUrl(url, mode: LaunchMode.externalApplication);
+                        }
+                      },
+                      child: Text(
+                        'CC BY-SA 4.0',
+                        style: TextStyle(
+                          fontSize: 12,
+                          color: Colors.amber.shade900,
+                          fontWeight: FontWeight.bold,
+                          decoration: TextDecoration.underline,
+                        ),
+                      ),
                     ),
                   ),
-                  TextSpan(
+                  const TextSpan(
                     text: ' license. The image must be either your own work or the author must have released it under a license compatible with CC BY-SA 4.0.',
                   ),
                 ],
@@ -433,6 +446,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
           },
           style: ElevatedButton.styleFrom(
             backgroundColor: Theme.of(context).primaryColor,
+            foregroundColor: Colors.white,
             padding: const EdgeInsets.symmetric(
               horizontal: 32,
               vertical: 12,
@@ -442,6 +456,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
             'ADD',
             style: TextStyle(
               fontWeight: FontWeight.bold,
+              color: Colors.white,
             ),
           ),
         ),

From 7bc84634068848635701767cfd8958da322cb37f Mon Sep 17 00:00:00 2001
From: Branislav Nohaj <branislav.nohaj@student.tuke.sk>
Date: Sat, 4 Oct 2025 11:13:10 +0200
Subject: [PATCH 04/29] dar format was performed

---
 lib/providers/add_exercise.dart               | 28 +++---
 .../add_exercise/image_details_form.dart      | 87 +++++--------------
 .../add_exercise/steps/step5images.dart       | 43 +++------
 .../add_exercise/steps/step6Overview.dart     |  2 +-
 .../add_exercise_image_withDetail_test.dart   | 18 +---
 5 files changed, 51 insertions(+), 127 deletions(-)

diff --git a/lib/providers/add_exercise.dart b/lib/providers/add_exercise.dart
index 99c0db8f..5b8ef729 100644
--- a/lib/providers/add_exercise.dart
+++ b/lib/providers/add_exercise.dart
@@ -150,21 +150,19 @@ class AddExerciseProvider with ChangeNotifier {
   /// [derivativeSourceUrl] - Derivative source URL
   /// [style] - Image style: 1=PHOTO, 2=3D, 3=LINE, 4=LOW-POLY, 5=OTHER
   void addExerciseImages(
-      List<File> images, {
-        String? title,
-        String? author,
-        String? authorUrl,
-        String? sourceUrl,
-        String? derivativeSourceUrl,
-        String style = '1',
-      }) {
+    List<File> images, {
+    String? title,
+    String? author,
+    String? authorUrl,
+    String? sourceUrl,
+    String? derivativeSourceUrl,
+    String style = '1',
+  }) {
     _exerciseImages.addAll(images);
 
     // Store metadata for each image
     for (final image in images) {
-      final details = <String, String>{
-        'style': style,
-      };
+      final details = <String, String>{'style': style};
 
       // Only add non-empty fields
       if (title != null && title.isNotEmpty) {
@@ -353,7 +351,8 @@ class AddExerciseProvider with ChangeNotifier {
             }
 
             if (details.containsKey('license_derivative_source_url') &&
-                responseData['license_derivative_source_url'] != details['license_derivative_source_url']) {
+                responseData['license_derivative_source_url'] !=
+                    details['license_derivative_source_url']) {
               print('WARNING: license_derivative_source_url mismatch!');
               allFieldsMatch = false;
             }
@@ -364,7 +363,6 @@ class AddExerciseProvider with ChangeNotifier {
               print('SOME LICENSE FIELDS NOT SAVED CORRECTLY!');
             }
           }
-
         } else {
           log('Failed to upload image: ${response.statusCode}');
           log('Response body: ${response.body}');
@@ -390,7 +388,7 @@ class AddExerciseProvider with ChangeNotifier {
     return false;
   }
 
-/*
+  /*
     Note: all this logic is not needed now since we are using the /exercise-submission
     endpoint, however, if we ever want to implement editing of exercises, we will
     need basically all of it again, so this is kept here for reference.
@@ -445,4 +443,4 @@ class AddExerciseProvider with ChangeNotifier {
   }
 
    */
-}
\ No newline at end of file
+}
diff --git a/lib/widgets/add_exercise/image_details_form.dart b/lib/widgets/add_exercise/image_details_form.dart
index a8985069..6479782b 100644
--- a/lib/widgets/add_exercise/image_details_form.dart
+++ b/lib/widgets/add_exercise/image_details_form.dart
@@ -105,9 +105,9 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
             children: [
               Text(
                 'Image details',
-                style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                  fontWeight: FontWeight.bold,
-                ),
+                style: Theme.of(
+                  context,
+                ).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
               ),
               const SizedBox(height: 16),
 
@@ -177,20 +177,14 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
   Widget _buildImagePreview() {
     return Center(
       child: Container(
-        constraints: const BoxConstraints(
-          maxWidth: 300,
-          maxHeight: 200,
-        ),
+        constraints: const BoxConstraints(maxWidth: 300, maxHeight: 200),
         decoration: BoxDecoration(
           borderRadius: BorderRadius.circular(8),
           border: Border.all(color: Colors.grey.shade300),
         ),
         child: ClipRRect(
           borderRadius: BorderRadius.circular(8),
-          child: Image.file(
-            widget.imageFile,
-            fit: BoxFit.contain,
-          ),
+          child: Image.file(widget.imageFile, fit: BoxFit.contain),
         ),
       ),
     );
@@ -205,26 +199,15 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text(
-          label,
-          style: const TextStyle(
-            fontSize: 14,
-            fontWeight: FontWeight.w500,
-          ),
-        ),
+        Text(label, style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500)),
         const SizedBox(height: 8),
         TextFormField(
           controller: controller,
           keyboardType: keyboardType,
           decoration: InputDecoration(
             hintText: hint,
-            border: OutlineInputBorder(
-              borderRadius: BorderRadius.circular(4),
-            ),
-            contentPadding: const EdgeInsets.symmetric(
-              horizontal: 12,
-              vertical: 12,
-            ),
+            border: OutlineInputBorder(borderRadius: BorderRadius.circular(4)),
+            contentPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 12),
           ),
         ),
       ],
@@ -246,19 +229,12 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Icon(
-            Icons.info_outline,
-            size: 20,
-            color: Colors.blue.shade700,
-          ),
+          Icon(Icons.info_outline, size: 20, color: Colors.blue.shade700),
           const SizedBox(width: 8),
           Expanded(
             child: Text(
               'Note that a derivative work is one which is not only based on a previous work, but which also contains sufficient new, creative content to entitle it to its own copyright.',
-              style: TextStyle(
-                fontSize: 12,
-                color: Colors.blue.shade900,
-              ),
+              style: TextStyle(fontSize: 12, color: Colors.blue.shade900),
             ),
           ),
         ],
@@ -274,13 +250,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        const Text(
-          'Image Type',
-          style: TextStyle(
-            fontSize: 14,
-            fontWeight: FontWeight.w500,
-          ),
-        ),
+        const Text('Image Type', style: TextStyle(fontSize: 14, fontWeight: FontWeight.w500)),
         const SizedBox(height: 12),
         Wrap(
           spacing: 8,
@@ -348,19 +318,12 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Icon(
-            Icons.info_outline,
-            size: 20,
-            color: Colors.amber.shade900,
-          ),
+          Icon(Icons.info_outline, size: 20, color: Colors.amber.shade900),
           const SizedBox(width: 8),
           Expanded(
             child: RichText(
               text: TextSpan(
-                style: TextStyle(
-                  fontSize: 12,
-                  color: Colors.amber.shade900,
-                ),
+                style: TextStyle(fontSize: 12, color: Colors.amber.shade900),
                 children: [
                   const TextSpan(
                     text: 'By submitting this image, you agree to release it under the ',
@@ -385,7 +348,8 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
                     ),
                   ),
                   const TextSpan(
-                    text: ' license. The image must be either your own work or the author must have released it under a license compatible with CC BY-SA 4.0.',
+                    text:
+                        ' license. The image must be either your own work or the author must have released it under a license compatible with CC BY-SA 4.0.',
                   ),
                 ],
               ),
@@ -400,19 +364,14 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
     return Row(
       mainAxisAlignment: MainAxisAlignment.end,
       children: [
-        TextButton(
-          onPressed: widget.onCancel,
-          child: const Text('CANCEL'),
-        ),
+        TextButton(onPressed: widget.onCancel, child: const Text('CANCEL')),
         const SizedBox(width: 8),
         ElevatedButton(
           onPressed: () {
             if (_formKey.currentState!.validate()) {
               // Build details map with API field names
               // Style is always included, other fields only if non-empty
-              final details = <String, String>{
-                'style': _getStyleValue(),
-              };
+              final details = <String, String>{'style': _getStyleValue()};
 
               // Add optional fields only if user provided values
               final title = _titleController.text.trim();
@@ -447,20 +406,14 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
           style: ElevatedButton.styleFrom(
             backgroundColor: Theme.of(context).primaryColor,
             foregroundColor: Colors.white,
-            padding: const EdgeInsets.symmetric(
-              horizontal: 32,
-              vertical: 12,
-            ),
+            padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 12),
           ),
           child: const Text(
             'ADD',
-            style: TextStyle(
-              fontWeight: FontWeight.bold,
-              color: Colors.white,
-            ),
+            style: TextStyle(fontWeight: FontWeight.bold, color: Colors.white),
           ),
         ),
       ],
     );
   }
-}
\ No newline at end of file
+}
diff --git a/lib/widgets/add_exercise/steps/step5images.dart b/lib/widgets/add_exercise/steps/step5images.dart
index 8ccaf83a..179e0514 100644
--- a/lib/widgets/add_exercise/steps/step5images.dart
+++ b/lib/widgets/add_exercise/steps/step5images.dart
@@ -71,9 +71,7 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
 
       if (!isFileValid) {
         if (context.mounted) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text(errorMessage)),
-          );
+          ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(errorMessage)));
         }
         return;
       }
@@ -161,9 +159,7 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
                   // Show preview of images that have been added with metadata
                   return Column(
                     children: [
-                      PreviewExerciseImages(
-                        selectedImages: provider.exerciseImages,
-                      ),
+                      PreviewExerciseImages(selectedImages: provider.exerciseImages),
                       const SizedBox(height: 16),
                       ElevatedButton.icon(
                         onPressed: () => _pickAndShowImageDetails(context),
@@ -178,17 +174,13 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
                 return Column(
                   children: [
                     const SizedBox(height: 20),
-                    Icon(
-                      Icons.add_photo_alternate,
-                      size: 80,
-                      color: Colors.grey.shade400,
-                    ),
+                    Icon(Icons.add_photo_alternate, size: 80, color: Colors.grey.shade400),
                     const SizedBox(height: 16),
                     Text(
                       'No images selected',
-                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                        color: Colors.grey.shade600,
-                      ),
+                      style: Theme.of(
+                        context,
+                      ).textTheme.titleMedium?.copyWith(color: Colors.grey.shade600),
                     ),
                     const SizedBox(height: 24),
                     // Camera and Gallery buttons
@@ -196,17 +188,11 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: [
                         ElevatedButton.icon(
-                          onPressed: () => _pickAndShowImageDetails(
-                            context,
-                            pickFromCamera: true,
-                          ),
+                          onPressed: () => _pickAndShowImageDetails(context, pickFromCamera: true),
                           icon: const Icon(Icons.camera_alt),
                           label: const Text('Camera'),
                           style: ElevatedButton.styleFrom(
-                            padding: const EdgeInsets.symmetric(
-                              horizontal: 20,
-                              vertical: 12,
-                            ),
+                            padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
                           ),
                         ),
                         const SizedBox(width: 16),
@@ -215,10 +201,7 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
                           icon: const Icon(Icons.collections),
                           label: const Text('Gallery'),
                           style: ElevatedButton.styleFrom(
-                            padding: const EdgeInsets.symmetric(
-                              horizontal: 20,
-                              vertical: 12,
-                            ),
+                            padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
                           ),
                         ),
                       ],
@@ -228,9 +211,9 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
                       padding: const EdgeInsets.symmetric(horizontal: 16.0),
                       child: Text(
                         'Only JPEG, PNG and WEBP files below 20 MB are supported',
-                        style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                          color: Colors.grey.shade600,
-                        ),
+                        style: Theme.of(
+                          context,
+                        ).textTheme.bodySmall?.copyWith(color: Colors.grey.shade600),
                         textAlign: TextAlign.center,
                       ),
                     ),
@@ -242,4 +225,4 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
       ),
     );
   }
-}
\ No newline at end of file
+}
diff --git a/lib/widgets/add_exercise/steps/step6Overview.dart b/lib/widgets/add_exercise/steps/step6Overview.dart
index 43f707d8..fbe65664 100644
--- a/lib/widgets/add_exercise/steps/step6Overview.dart
+++ b/lib/widgets/add_exercise/steps/step6Overview.dart
@@ -108,4 +108,4 @@ class Step6Overview extends StatelessWidget {
       ),
     );
   }
-}
\ No newline at end of file
+}
diff --git a/test/exercises/add_exercise_image_withDetail_test.dart b/test/exercises/add_exercise_image_withDetail_test.dart
index b7428085..e56a36fb 100644
--- a/test/exercises/add_exercise_image_withDetail_test.dart
+++ b/test/exercises/add_exercise_image_withDetail_test.dart
@@ -79,10 +79,7 @@ void main() {
       final styles = ['1', '2', '3', '4', '5'];
 
       for (var i = 0; i < styles.length; i++) {
-        provider.addExerciseImages(
-          [File('image_$i.jpg')],
-          style: styles[i],
-        );
+        provider.addExerciseImages([File('image_$i.jpg')], style: styles[i]);
       }
 
       expect(provider.exerciseImages.length, 5);
@@ -131,10 +128,7 @@ void main() {
     /// Attempting to remove a non-existent image should throw StateError
     /// (from firstWhere with no orElse)
     test('should handle removing non-existent image gracefully', () {
-      expect(
-            () => provider.removeExercise('nonexistent.jpg'),
-        throwsStateError,
-      );
+      expect(() => provider.removeExercise('nonexistent.jpg'), throwsStateError);
     });
 
     /// clear() should reset all state including images and metadata
@@ -177,11 +171,7 @@ void main() {
     /// Multiple images can be added in a single call with shared metadata
     /// Useful for bulk uploads from the same source
     test('should handle batch adding multiple images at once', () {
-      final files = [
-        File('batch1.jpg'),
-        File('batch2.jpg'),
-        File('batch3.jpg'),
-      ];
+      final files = [File('batch1.jpg'), File('batch2.jpg'), File('batch3.jpg')];
 
       provider.addExerciseImages(files, title: 'Batch Upload', style: '3');
 
@@ -254,4 +244,4 @@ void main() {
       expect(provider.descriptionEn, isNull);
     });
   });
-}
\ No newline at end of file
+}

From b1ef5df97aa7041243d4f4c90c054e1409926efe Mon Sep 17 00:00:00 2001
From: Branislav Nohaj <branislav.nohaj@student.tuke.sk>
Date: Sat, 4 Oct 2025 15:39:35 +0200
Subject: [PATCH 05/29] data for localization

---
 lib/l10n/app_en.arb | 98 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 83 insertions(+), 15 deletions(-)

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 163674e2..9133f4ab 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -719,21 +719,89 @@
       }
     }
   },
-  "scanBarcode": "Scan barcode",
-  "@scanBarcode": {
-    "description": "Label for scan barcode button"
-  },
-  "close": "Close",
-  "@close": {
-    "description": "Translation for close"
-  },
-  "identicalExercisePleaseDiscard": "If you notice an exercise that is identical to the one you're adding, please discard your draft and edit that exercise instead.",
-  "checkInformationBeforeSubmitting": "Please check that the information you entered is correct before submitting the exercise",
-  "add_exercise_image_license": "Images must be compatible with the CC BY SA license. If in doubt, upload only photos you've taken yourself.",
-  "variations": "Variations",
-  "@variations": {
-    "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
-  },
+"scanBarcode": "Scan barcode",
+"@scanBarcode": {
+  "description": "Label for scan barcode button"
+},
+"close": "Close",
+"@close": {
+  "description": "Translation for close"
+},
+"identicalExercisePleaseDiscard": "If you notice an exercise that is identical to the one you're adding, please discard your draft and edit that exercise instead.",
+"checkInformationBeforeSubmitting": "Please check that the information you entered is correct before submitting the exercise",
+"add_exercise_image_license": "Images must be compatible with the CC BY SA license. If in doubt, upload only photos you've taken yourself.",
+"imageDetailsTitle": "Image details",
+"@imageDetailsTitle": {
+  "description": "Title for image details form"
+},
+"imageDetailsLicenseTitle": "Title",
+"@imageDetailsLicenseTitle": {
+  "description": "Label for image title field"
+},
+"imageDetailsLicenseTitleHint": "Enter image title",
+"@imageDetailsLicenseTitleHint": {
+  "description": "Hint text for image title field"
+},
+"imageDetailsSourceLink": "Link to the source website, if available",
+"@imageDetailsSourceLink": {
+  "description": "Label for source link field"
+},
+"imageDetailsSourceLinkHint": "https://example.com",
+"@imageDetailsSourceLinkHint": {
+  "description": "Hint text for source link field"
+},
+"imageDetailsAuthor": "Author(s)",
+"@imageDetailsAuthor": {
+  "description": "Label for author field"
+},
+"imageDetailsAuthorHint": "Enter author name",
+"@imageDetailsAuthorHint": {
+  "description": "Hint text for author field"
+},
+"imageDetailsAuthorLink": "Link to author website or profile, if available",
+"@imageDetailsAuthorLink": {
+  "description": "Label for author link field"
+},
+"imageDetailsAuthorLinkHint": "https://example.com/author",
+"@imageDetailsAuthorLinkHint": {
+  "description": "Hint text for author link field"
+},
+"imageDetailsDerivativeSource": "Link to the original source, if this is a derivative work",
+"@imageDetailsDerivativeSource": {
+  "description": "Label for derivative source field"
+},
+"imageDetailsDerivativeSourceHint": "https://example.com/original",
+"@imageDetailsDerivativeSourceHint": {
+  "description": "Hint text for derivative source field"
+},
+"imageDetailsDerivativeHelp": "A derivative work is based on a previous work but contains sufficient new, creative content to entitle it to its own copyright.",
+"@imageDetailsDerivativeHelp": {
+  "description": "Helper text explaining derivative works"
+},
+"imageDetailsImageType": "Image Type",
+"@imageDetailsImageType": {
+  "description": "Label for image type selector"
+},
+"imageDetailsLicenseNoticePrefix": "By submitting this image, you agree to release it under the ",
+"@imageDetailsLicenseNoticePrefix": {
+  "description": "First part of license notice text"
+},
+"imageDetailsLicenseNoticeSuffix": " The image must be either your own work or the author must have released it under a license compatible with CC BY-SA 4.0.",
+"@imageDetailsLicenseNoticeSuffix": {
+  "description": "Second part of license notice text"
+},
+"imageDetailsCancel": "CANCEL",
+"@imageDetailsCancel": {
+  "description": "Cancel button text"
+},
+"imageDetailsAdd": "ADD",
+"@imageDetailsAdd": {
+  "description": "Add button text"
+},
+"variations": "Variations",
+"@variations": {
+  "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
+},
   "alsoKnownAs": "Also known as: {aliases}",
   "@alsoKnownAs": {
     "placeholders": {

From 65fd2f09069284f986bfc9fff7f1868709c8f18f Mon Sep 17 00:00:00 2001
From: Branislav Nohaj <branislav.nohaj@student.tuke.sk>
Date: Sat, 4 Oct 2025 16:12:18 +0200
Subject: [PATCH 06/29] Add separate license info widget for CC BY-SA notice

---
 .../add_exercise/license_info_widget.dart     | 77 +++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 lib/widgets/add_exercise/license_info_widget.dart

diff --git a/lib/widgets/add_exercise/license_info_widget.dart b/lib/widgets/add_exercise/license_info_widget.dart
new file mode 100644
index 00000000..146a2e4c
--- /dev/null
+++ b/lib/widgets/add_exercise/license_info_widget.dart
@@ -0,0 +1,77 @@
+import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+/// Static widget displaying CC BY-SA 4.0 license notice for image uploads
+///
+/// This widget informs users that by uploading images, they agree to release
+/// them under the CC BY-SA 4.0 license. The license name is clickable and
+/// opens the Creative Commons license page.
+///
+/// Being a separate widget allows Flutter to optimize rendering since
+/// this content never changes.
+class LicenseInfoWidget extends StatelessWidget {
+  const LicenseInfoWidget({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Container(
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: colorScheme.surfaceVariant,
+        borderRadius: BorderRadius.circular(4),
+        border: Border.all(color: colorScheme.outline),
+      ),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Icon(
+            Icons.info_outline,
+            size: 20,
+            color: colorScheme.onSurfaceVariant,
+          ),
+          const SizedBox(width: 8),
+          Expanded(
+            child: RichText(
+              text: TextSpan(
+                style: TextStyle(
+                  fontSize: 12,
+                  color: colorScheme.onSurfaceVariant,
+                ),
+                children: [
+                  TextSpan(
+                    text: AppLocalizations.of(context).imageDetailsLicenseNoticePrefix,
+                  ),
+                  WidgetSpan(
+                    child: GestureDetector(
+                      onTap: () async {
+                        final url = Uri.parse('https://creativecommons.org/licenses/by-sa/4.0/');
+                        if (await canLaunchUrl(url)) {
+                          await launchUrl(url, mode: LaunchMode.externalApplication);
+                        }
+                      },
+                      child: Text(
+                        'CC BY-SA 4.0',
+                        style: TextStyle(
+                          fontSize: 12,
+                          color: colorScheme.primary,
+                          fontWeight: FontWeight.bold,
+                          decoration: TextDecoration.underline,
+                        ),
+                      ),
+                    ),
+                  ),
+                  TextSpan(
+                    text: AppLocalizations.of(context).imageDetailsLicenseNoticeSuffix,
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
\ No newline at end of file

From 1903fb4d5ed9d73cccac696acd163cad3e0df34b Mon Sep 17 00:00:00 2001
From: Branislav Nohaj <branislav.nohaj@student.tuke.sk>
Date: Sat, 4 Oct 2025 16:12:41 +0200
Subject: [PATCH 07/29] Add image details form with license metadata collection

Implement form for collecting CC BY-SA 4.0 license metadata
including title, author, URLs, and image style. Includes URL
validation and uses localized strings.
---
 .../add_exercise/image_details_form.dart      | 175 +++++++-----------
 1 file changed, 65 insertions(+), 110 deletions(-)

diff --git a/lib/widgets/add_exercise/image_details_form.dart b/lib/widgets/add_exercise/image_details_form.dart
index 6479782b..2e33a3d4 100644
--- a/lib/widgets/add_exercise/image_details_form.dart
+++ b/lib/widgets/add_exercise/image_details_form.dart
@@ -1,6 +1,7 @@
 import 'dart:io';
 import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/widgets/add_exercise/license_info_widget.dart';
 
 /// Form for collecting CC BY-SA 4.0 license metadata for exercise images
 ///
@@ -68,6 +69,34 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
     super.dispose();
   }
 
+  /// Validates URL format
+  ///
+  /// Returns error message if URL is invalid, null if valid or empty
+  String? _validateUrl(String? value) {
+    if (value == null || value.trim().isEmpty) {
+      return null; // Empty is OK (optional field)
+    }
+
+    final trimmedValue = value.trim();
+
+    // Check if starts with http:// or https://
+    if (!trimmedValue.startsWith('http://') && !trimmedValue.startsWith('https://')) {
+      return AppLocalizations.of(context).invalidUrl;
+    }
+
+    // Try to parse as URI
+    try {
+      final uri = Uri.parse(trimmedValue);
+      if (!uri.hasScheme || !uri.hasAuthority) {
+        return AppLocalizations.of(context).invalidUrl;
+      }
+    } catch (e) {
+      return AppLocalizations.of(context).invalidUrl;
+    }
+
+    return null;
+  }
+
   /// Maps UI image type selection to API 'style' field value
   ///
   /// API expects numeric string:
@@ -104,10 +133,8 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Text(
-                'Image details',
-                style: Theme.of(
-                  context,
-                ).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
+                AppLocalizations.of(context).imageDetailsTitle,
+                style: Theme.of(context).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
               ),
               const SizedBox(height: 16),
 
@@ -117,53 +144,55 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
               // License title field - helps identify the image
               _buildTextField(
                 controller: _titleController,
-                label: 'Title',
-                hint: 'Enter image title',
+                label: AppLocalizations.of(context).imageDetailsLicenseTitle,
+                hint: AppLocalizations.of(context).imageDetailsLicenseTitleHint,
               ),
               const SizedBox(height: 16),
 
               // Source URL - where the image was found (license_object_url in API)
               _buildTextField(
                 controller: _sourceLinkController,
-                label: 'Link to the source website, if available',
-                hint: 'https://example.com',
+                label: AppLocalizations.of(context).imageDetailsSourceLink,
+                hint: AppLocalizations.of(context).imageDetailsSourceLinkHint,
                 keyboardType: TextInputType.url,
+                validator: _validateUrl,
               ),
               const SizedBox(height: 16),
 
               // Author name - required for proper CC BY-SA attribution
               _buildTextField(
                 controller: _authorController,
-                label: 'Author(s)',
-                hint: 'Enter author name',
+                label: AppLocalizations.of(context).imageDetailsAuthor,
+                hint: AppLocalizations.of(context).imageDetailsAuthorHint,
               ),
               const SizedBox(height: 16),
 
               // Author's website/profile URL
               _buildTextField(
                 controller: _authorLinkController,
-                label: 'Link to author website or profile, if available',
-                hint: 'https://example.com/author',
+                label: AppLocalizations.of(context).imageDetailsAuthorLink,
+                hint: AppLocalizations.of(context).imageDetailsAuthorLinkHint,
                 keyboardType: TextInputType.url,
+                validator: _validateUrl,
               ),
               const SizedBox(height: 16),
 
               // Original source if this is a derivative work (modified from another image)
               _buildTextField(
                 controller: _originalSourceController,
-                label: 'Link to the original source, if this is a derivative work',
-                hint: 'https://example.com/original',
+                label: AppLocalizations.of(context).imageDetailsDerivativeSource,
+                hint: AppLocalizations.of(context).imageDetailsDerivativeSourceHint,
                 keyboardType: TextInputType.url,
+                helperText: AppLocalizations.of(context).imageDetailsDerivativeHelp,
+                validator: _validateUrl,
               ),
-              const SizedBox(height: 8),
-
-              _buildDerivativeWorkNote(),
               const SizedBox(height: 24),
 
               _buildImageTypeSelector(),
               const SizedBox(height: 24),
 
-              _buildLicenseInfo(),
+              // License info as separate widget for better optimization
+              const LicenseInfoWidget(),
               const SizedBox(height: 24),
 
               _buildButtons(),
@@ -195,6 +224,8 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
     required String label,
     String? hint,
     TextInputType? keyboardType,
+    String? helperText,
+    String? Function(String?)? validator,
   }) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -204,8 +235,11 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
         TextFormField(
           controller: controller,
           keyboardType: keyboardType,
+          validator: validator,
           decoration: InputDecoration(
             hintText: hint,
+            helperText: helperText,
+            helperMaxLines: 3,
             border: OutlineInputBorder(borderRadius: BorderRadius.circular(4)),
             contentPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 12),
           ),
@@ -214,34 +248,6 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
     );
   }
 
-  /// Informational box explaining what constitutes a derivative work
-  ///
-  /// Important for CC BY-SA compliance - users need to understand when
-  /// they must cite the original work they modified
-  Widget _buildDerivativeWorkNote() {
-    return Container(
-      padding: const EdgeInsets.all(12),
-      decoration: BoxDecoration(
-        color: Colors.blue.shade50,
-        borderRadius: BorderRadius.circular(4),
-        border: Border.all(color: Colors.blue.shade200),
-      ),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Icon(Icons.info_outline, size: 20, color: Colors.blue.shade700),
-          const SizedBox(width: 8),
-          Expanded(
-            child: Text(
-              'Note that a derivative work is one which is not only based on a previous work, but which also contains sufficient new, creative content to entitle it to its own copyright.',
-              style: TextStyle(fontSize: 12, color: Colors.blue.shade900),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
   /// Visual selector for image style/type
   ///
   /// Allows user to categorize the image as PHOTO, 3D render, LINE drawing,
@@ -250,7 +256,10 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        const Text('Image Type', style: TextStyle(fontSize: 14, fontWeight: FontWeight.w500)),
+        Text(
+          AppLocalizations.of(context).imageDetailsImageType,
+          style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500),
+        ),
         const SizedBox(height: 12),
         Wrap(
           spacing: 8,
@@ -303,68 +312,14 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
     );
   }
 
-  /// Legal notice about CC BY-SA 4.0 license
-  ///
-  /// Critical for compliance - informs user that by uploading, they're
-  /// releasing the image under CC BY-SA 4.0 and must have rights to do so
-  Widget _buildLicenseInfo() {
-    return Container(
-      padding: const EdgeInsets.all(12),
-      decoration: BoxDecoration(
-        color: Colors.amber.shade50,
-        borderRadius: BorderRadius.circular(4),
-        border: Border.all(color: Colors.amber.shade200),
-      ),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Icon(Icons.info_outline, size: 20, color: Colors.amber.shade900),
-          const SizedBox(width: 8),
-          Expanded(
-            child: RichText(
-              text: TextSpan(
-                style: TextStyle(fontSize: 12, color: Colors.amber.shade900),
-                children: [
-                  const TextSpan(
-                    text: 'By submitting this image, you agree to release it under the ',
-                  ),
-                  WidgetSpan(
-                    child: GestureDetector(
-                      onTap: () async {
-                        final url = Uri.parse('https://creativecommons.org/licenses/by-sa/4.0/');
-                        if (await canLaunchUrl(url)) {
-                          await launchUrl(url, mode: LaunchMode.externalApplication);
-                        }
-                      },
-                      child: Text(
-                        'CC BY-SA 4.0',
-                        style: TextStyle(
-                          fontSize: 12,
-                          color: Colors.amber.shade900,
-                          fontWeight: FontWeight.bold,
-                          decoration: TextDecoration.underline,
-                        ),
-                      ),
-                    ),
-                  ),
-                  const TextSpan(
-                    text:
-                        ' license. The image must be either your own work or the author must have released it under a license compatible with CC BY-SA 4.0.',
-                  ),
-                ],
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
   Widget _buildButtons() {
     return Row(
       mainAxisAlignment: MainAxisAlignment.end,
       children: [
-        TextButton(onPressed: widget.onCancel, child: const Text('CANCEL')),
+        TextButton(
+          onPressed: widget.onCancel,
+          child: Text(AppLocalizations.of(context).imageDetailsCancel),
+        ),
         const SizedBox(width: 8),
         ElevatedButton(
           onPressed: () {
@@ -408,12 +363,12 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
             foregroundColor: Colors.white,
             padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 12),
           ),
-          child: const Text(
-            'ADD',
-            style: TextStyle(fontWeight: FontWeight.bold, color: Colors.white),
+          child: Text(
+            AppLocalizations.of(context).imageDetailsAdd,
+            style: const TextStyle(fontWeight: FontWeight.bold, color: Colors.white),
           ),
         ),
       ],
     );
   }
-}
+}
\ No newline at end of file

From c00246dedbf8f1d2d05142cfa088c6a23a3ae3ab Mon Sep 17 00:00:00 2001
From: Branislav Nohaj <branislav.nohaj@student.tuke.sk>
Date: Sat, 4 Oct 2025 16:13:02 +0200
Subject: [PATCH 08/29] Add image source selection and preview improvements

Add dialog for camera/gallery selection and improve preview widget
with edit mode toggle. Preview now supports add-more callback and
can be displayed in read-only mode.
---
 lib/widgets/add_exercise/preview_images.dart  | 156 +++++++++++-------
 .../add_exercise/steps/step5images.dart       |  58 +++++--
 2 files changed, 140 insertions(+), 74 deletions(-)

diff --git a/lib/widgets/add_exercise/preview_images.dart b/lib/widgets/add_exercise/preview_images.dart
index 23f7660c..5a6249a2 100644
--- a/lib/widgets/add_exercise/preview_images.dart
+++ b/lib/widgets/add_exercise/preview_images.dart
@@ -1,73 +1,111 @@
 import 'dart:io';
-
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/providers/add_exercise.dart';
 
-import 'mixins/image_picker_mixin.dart';
-
-class PreviewExerciseImages extends StatelessWidget with ExerciseImagePickerMixin {
+/// Widget to preview selected exercise images
+///
+/// Displays images in a horizontal scrollable list with thumbnails.
+/// Each image shows a preview thumbnail and optionally a delete button.
+/// Can optionally include an "add more" button at the end of the list.
+class PreviewExerciseImages extends StatelessWidget {
   final List<File> selectedImages;
+  final VoidCallback? onAddMore;
   final bool allowEdit;
 
-  const PreviewExerciseImages({super.key, required this.selectedImages, this.allowEdit = true});
+  const PreviewExerciseImages({
+    Key? key,
+    required this.selectedImages,
+    this.onAddMore,
+    this.allowEdit = true,
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
+    // Calculate item count: images + optional "add more" button
+    final itemCount = selectedImages.length + (allowEdit && onAddMore != null ? 1 : 0);
+
     return SizedBox(
-      height: 300,
-      child: ListView(scrollDirection: Axis.horizontal, children: [
-        ...selectedImages.map(
-          (file) => SizedBox(
-            height: 200,
-            child: Padding(
-              padding: const EdgeInsets.all(8.0),
-              child: Stack(
-                children: [
-                  Image.file(file),
-                  if (allowEdit)
-                    Positioned(
-                      bottom: 0,
-                      right: 0,
-                      child: Padding(
-                        padding: const EdgeInsets.all(3.0),
-                        child: Container(
-                          decoration: BoxDecoration(
-                            color: Colors.grey.withValues(alpha: 0.5),
-                            borderRadius: const BorderRadius.all(Radius.circular(20)),
-                          ),
-                          child: IconButton(
-                            iconSize: 20,
-                            onPressed: () =>
-                                context.read<AddExerciseProvider>().removeExercise(file.path),
-                            color: Colors.white,
-                            icon: const Icon(Icons.delete),
-                          ),
-                        ),
-                      ),
-                    ),
-                ],
-              ),
-            ),
-          ),
-        ),
-        const SizedBox(width: 10),
-        if (allowEdit)
-          Padding(
-            padding: const EdgeInsets.all(8.0),
-            child: Container(
-              color: Colors.grey,
-              height: 200,
-              width: 100,
-              child: Center(
-                child: IconButton(
-                  icon: const Icon(Icons.add),
-                  onPressed: () => pickImages(context),
-                ),
-              ),
-            ),
-          ),
-      ]),
+      height: 120,
+      child: ListView.builder(
+        scrollDirection: Axis.horizontal,
+        itemCount: itemCount,
+        itemBuilder: (context, index) {
+          // Show "add more" button at the end (only if editing is allowed)
+          if (index == selectedImages.length) {
+            return _buildAddMoreButton(context);
+          }
+
+          // Show image thumbnail
+          final image = selectedImages[index];
+          return _buildImageCard(context, image);
+        },
+      ),
     );
   }
-}
+
+  Widget _buildImageCard(BuildContext context, File image) {
+    return Container(
+      width: 120,
+      margin: const EdgeInsets.only(right: 8),
+      child: Stack(
+        children: [
+          // Image thumbnail
+          ClipRRect(
+            borderRadius: BorderRadius.circular(8),
+            child: Image.file(
+              image,
+              width: 120,
+              height: 120,
+              fit: BoxFit.cover,
+            ),
+          ),
+
+          // Delete button overlay (only shown if editing is allowed)
+          if (allowEdit)
+            Positioned(
+              top: 4,
+              right: 4,
+              child: IconButton(
+                icon: const Icon(Icons.close),
+                color: Colors.white,
+                iconSize: 20,
+                style: IconButton.styleFrom(
+                  backgroundColor: Colors.black.withOpacity(0.6),
+                  padding: const EdgeInsets.all(4),
+                ),
+                onPressed: () {
+                  context.read<AddExerciseProvider>().removeExercise(image.path);
+                },
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildAddMoreButton(BuildContext context) {
+    return GestureDetector(
+      onTap: onAddMore,
+      child: Container(
+        width: 120,
+        height: 120,
+        margin: const EdgeInsets.only(right: 8),
+        decoration: BoxDecoration(
+          color: Theme.of(context).colorScheme.surfaceVariant,
+          borderRadius: BorderRadius.circular(8),
+          border: Border.all(
+            color: Theme.of(context).colorScheme.outline,
+            width: 2,
+            style: BorderStyle.solid,
+          ),
+        ),
+        child: Icon(
+          Icons.add,
+          size: 48,
+          color: Theme.of(context).colorScheme.onSurfaceVariant,
+        ),
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/widgets/add_exercise/steps/step5images.dart b/lib/widgets/add_exercise/steps/step5images.dart
index 179e0514..e0a23ae2 100644
--- a/lib/widgets/add_exercise/steps/step5images.dart
+++ b/lib/widgets/add_exercise/steps/step5images.dart
@@ -32,6 +32,39 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
   /// When non-null, ImageDetailsForm is displayed instead of image picker
   File? _currentImageToAdd;
 
+  /// Show dialog to choose between Camera and Gallery
+  Future<void> _showImageSourceDialog(BuildContext context) async {
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: Text(AppLocalizations.of(context).selectImage),
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              ListTile(
+                leading: const Icon(Icons.camera_alt),
+                title: Text(AppLocalizations.of(context).takePicture),
+                onTap: () {
+                  Navigator.of(context).pop();
+                  _pickAndShowImageDetails(context, pickFromCamera: true);
+                },
+              ),
+              ListTile(
+                leading: const Icon(Icons.collections),
+                title: Text(AppLocalizations.of(context).gallery),
+                onTap: () {
+                  Navigator.of(context).pop();
+                  _pickAndShowImageDetails(context, pickFromCamera: false);
+                },
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
   /// Pick image from camera or gallery and show metadata collection form
   ///
   /// Validates file format (jpg, jpeg, png, webp) and size (<20MB) before
@@ -105,18 +138,10 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
       style: details['style'] ?? '1',
     );
 
-    // Reset form state
+    // Reset form state - image is now visible in preview list
     setState(() {
       _currentImageToAdd = null;
     });
-
-    ScaffoldMessenger.of(context).showSnackBar(
-      const SnackBar(
-        content: Text('Image added with details'),
-        backgroundColor: Colors.green,
-        duration: Duration(seconds: 2),
-      ),
-    );
   }
 
   /// Cancel metadata input and return to image picker
@@ -159,12 +184,15 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
                   // Show preview of images that have been added with metadata
                   return Column(
                     children: [
-                      PreviewExerciseImages(selectedImages: provider.exerciseImages),
+                      PreviewExerciseImages(
+                        selectedImages: provider.exerciseImages,
+                        onAddMore: () => _showImageSourceDialog(context),
+                      ),
                       const SizedBox(height: 16),
                       ElevatedButton.icon(
-                        onPressed: () => _pickAndShowImageDetails(context),
+                        onPressed: () => _showImageSourceDialog(context),
                         icon: const Icon(Icons.add_photo_alternate),
-                        label: const Text('Add Another Image'),
+                        label: Text(AppLocalizations.of(context).addImage),
                       ),
                     ],
                   );
@@ -190,7 +218,7 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
                         ElevatedButton.icon(
                           onPressed: () => _pickAndShowImageDetails(context, pickFromCamera: true),
                           icon: const Icon(Icons.camera_alt),
-                          label: const Text('Camera'),
+                          label: Text(AppLocalizations.of(context).takePicture),
                           style: ElevatedButton.styleFrom(
                             padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
                           ),
@@ -199,7 +227,7 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
                         ElevatedButton.icon(
                           onPressed: () => _pickAndShowImageDetails(context),
                           icon: const Icon(Icons.collections),
-                          label: const Text('Gallery'),
+                          label: Text(AppLocalizations.of(context).gallery),
                           style: ElevatedButton.styleFrom(
                             padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
                           ),
@@ -225,4 +253,4 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
       ),
     );
   }
-}
+}
\ No newline at end of file

From 6f5777fbcb2a28e72cb0b2264c48023c5fa5e879 Mon Sep 17 00:00:00 2001
From: Branislav Nohaj <branislav.nohaj@student.tuke.sk>
Date: Sat, 4 Oct 2025 16:13:22 +0200
Subject: [PATCH 09/29] Simplify image upload and improve logging

Remove unnecessary response validation, replace print statements
with proper Logger module, and clean up debug output.
---
 lib/providers/add_exercise.dart | 203 ++++----------------------------
 1 file changed, 20 insertions(+), 183 deletions(-)

diff --git a/lib/providers/add_exercise.dart b/lib/providers/add_exercise.dart
index 5b8ef729..7fd69c32 100644
--- a/lib/providers/add_exercise.dart
+++ b/lib/providers/add_exercise.dart
@@ -1,9 +1,9 @@
 import 'dart:convert';
-import 'dart:developer';
 import 'dart:io';
 
 import 'package:flutter/foundation.dart';
 import 'package:http/http.dart' as http;
+import 'package:logging/logging.dart';
 import 'package:wger/models/exercises/category.dart';
 import 'package:wger/models/exercises/equipment.dart';
 import 'package:wger/models/exercises/exercise.dart';
@@ -16,6 +16,7 @@ import 'base_provider.dart';
 
 class AddExerciseProvider with ChangeNotifier {
   final WgerBaseProvider baseProvider;
+  static final _logger = Logger('AddExerciseProvider');
 
   AddExerciseProvider(this.baseProvider);
 
@@ -47,7 +48,7 @@ class AddExerciseProvider with ChangeNotifier {
 
   void clear() {
     _exerciseImages = [];
-    _imageDetails.clear(); // Also clear image metadata
+    _imageDetails.clear();
     languageTranslation = null;
     category = null;
     exerciseNameEn = null;
@@ -150,14 +151,14 @@ class AddExerciseProvider with ChangeNotifier {
   /// [derivativeSourceUrl] - Derivative source URL
   /// [style] - Image style: 1=PHOTO, 2=3D, 3=LINE, 4=LOW-POLY, 5=OTHER
   void addExerciseImages(
-    List<File> images, {
-    String? title,
-    String? author,
-    String? authorUrl,
-    String? sourceUrl,
-    String? derivativeSourceUrl,
-    String style = '1',
-  }) {
+      List<File> images, {
+        String? title,
+        String? author,
+        String? authorUrl,
+        String? sourceUrl,
+        String? derivativeSourceUrl,
+        String style = '1',
+      }) {
     _exerciseImages.addAll(images);
 
     // Store metadata for each image
@@ -190,52 +191,24 @@ class AddExerciseProvider with ChangeNotifier {
   void removeExercise(String path) {
     final file = _exerciseImages.where((element) => element.path == path).first;
     _exerciseImages.remove(file);
-    _imageDetails.remove(path); // Also remove associated metadata
+    _imageDetails.remove(path);
     notifyListeners();
   }
 
-  // Debug method to print all collected exercise data
-  void printValues() {
-    log('Collected exercise data');
-    log('------------------------');
-
-    log('Base data...');
-    log('Target area : $category');
-    log('Primary muscles: $_primaryMuscles');
-    log('Secondary muscles: $_secondaryMuscles');
-    log('Equipment: $_equipment');
-    log('Variations: $_variations');
-
-    log('');
-    log('Language specific...');
-    log('Language: ${languageTranslation?.shortName}');
-    log('Name: en/$exerciseNameEn translation/$exerciseNameTrans');
-    log('Description: en/$descriptionEn translation/$descriptionTrans');
-    log('Alternate names: en/$alternateNamesEn translation/$alternateNamesTrans');
-
-    log('');
-    log('Images: ${_exerciseImages.length} images with details');
-  }
-
   /// Main method to submit exercise with images
   ///
   /// Returns the ID of the created exercise
   /// Throws exception if submission fails
   Future<int> addExercise() async {
-    printValues();
-
     try {
       // 1. Create the exercise
       final exerciseId = await addExerciseSubmission();
-      print('Exercise created with ID: $exerciseId');
+
 
       // 2. Upload images if any exist
       if (_exerciseImages.isNotEmpty) {
-        print('Uploading ${_exerciseImages.length} images...');
         await addImages(exerciseId);
-        print('Images uploaded successfully');
-      } else {
-        print('ℹ No images to upload');
+
       }
 
       // 3. Clear all data after successful upload
@@ -243,7 +216,7 @@ class AddExerciseProvider with ChangeNotifier {
 
       return exerciseId;
     } catch (e) {
-      print('Error adding exercise: $e');
+
       // Don't clear on error so user can retry
       rethrow;
     }
@@ -264,14 +237,8 @@ class AddExerciseProvider with ChangeNotifier {
   /// For each image:
   /// - Sends multipart request with image file
   /// - Includes license fields from _imageDetails map
-  /// - Validates server response contains all submitted fields
   Future<void> addImages(int exerciseId) async {
-    print('Starting image upload for exercise ID: $exerciseId');
-    print('Number of images to upload: ${_exerciseImages.length}');
-
     for (final image in _exerciseImages) {
-      print('Processing image: ${image.path}');
-
       final request = http.MultipartRequest('POST', baseProvider.makeUrl(_imagesUrlPath));
       request.headers.addAll(baseProvider.getDefaultHeaders(includeAuth: true));
 
@@ -281,95 +248,22 @@ class AddExerciseProvider with ChangeNotifier {
       request.fields['is_main'] = 'false';
 
       final details = _imageDetails[image.path];
-      print('Image details to send: $details');
-
       if (details != null && details.isNotEmpty) {
         request.fields.addAll(details);
-        print('Request fields: ${request.fields}');
       } else {
         request.fields['style'] = '1';
       }
 
       try {
-        print('Sending request...');
         final streamedResponse = await request.send();
-        print('Response status: ${streamedResponse.statusCode}');
 
-        // Read response body to verify upload success
-        final response = await http.Response.fromStream(streamedResponse);
-
-        if (response.statusCode == 201 || response.statusCode == 200) {
-          final responseData = jsonDecode(response.body);
-
-          log('Image uploaded successfully!');
-          log('Response body: ${response.body}');
-
-          // Debug: Print all fields from server response
-          print('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
-          print('SERVER RESPONSE:');
-          print('ID: ${responseData['id']}');
-          print('UUID: ${responseData['uuid']}');
-          print('Image URL: ${responseData['image']}');
-          print('Exercise: ${responseData['exercise']}');
-          print('Style: ${responseData['style']}');
-          print('License: ${responseData['license']}');
-          print('License Title: ${responseData['license_title']}');
-          print('License Author: ${responseData['license_author']}');
-          print('License Author URL: ${responseData['license_author_url']}');
-          print('License Object URL: ${responseData['license_object_url']}');
-          print('License Derivative: ${responseData['license_derivative_source_url']}');
-          print('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
-
-          // Validate that license fields were saved correctly
-          if (details != null) {
-            bool allFieldsMatch = true;
-
-            if (details.containsKey('license_title') &&
-                responseData['license_title'] != details['license_title']) {
-              print('WARNING: license_title mismatch!');
-              print('Sent: ${details['license_title']}');
-              print('Received: ${responseData['license_title']}');
-              allFieldsMatch = false;
-            }
-
-            if (details.containsKey('license_author') &&
-                responseData['license_author'] != details['license_author']) {
-              print('WARNING: license_author mismatch!');
-              allFieldsMatch = false;
-            }
-
-            if (details.containsKey('license_author_url') &&
-                responseData['license_author_url'] != details['license_author_url']) {
-              print('WARNING: license_author_url mismatch!');
-              allFieldsMatch = false;
-            }
-
-            if (details.containsKey('license_object_url') &&
-                responseData['license_object_url'] != details['license_object_url']) {
-              print('WARNING: license_object_url mismatch!');
-              allFieldsMatch = false;
-            }
-
-            if (details.containsKey('license_derivative_source_url') &&
-                responseData['license_derivative_source_url'] !=
-                    details['license_derivative_source_url']) {
-              print('WARNING: license_derivative_source_url mismatch!');
-              allFieldsMatch = false;
-            }
-
-            if (allFieldsMatch) {
-              print('ALL LICENSE FIELDS SAVED CORRECTLY!');
-            } else {
-              print('SOME LICENSE FIELDS NOT SAVED CORRECTLY!');
-            }
-          }
+        if (streamedResponse.statusCode == 201 || streamedResponse.statusCode == 200) {
+          _logger.fine('Image uploaded successfully');
         } else {
-          log('Failed to upload image: ${response.statusCode}');
-          log('Response body: ${response.body}');
-          throw Exception('Upload failed: ${response.statusCode}');
+          final response = await http.Response.fromStream(streamedResponse);
+          throw Exception('Upload failed: ${streamedResponse.statusCode}');
         }
       } catch (e) {
-        log('Error uploading image: $e');
         rethrow;
       }
     }
@@ -383,64 +277,7 @@ class AddExerciseProvider with ChangeNotifier {
       'language_code': languageCode,
     }, baseProvider.makeUrl(_checkLanguageUrlPath));
     notifyListeners();
-    print(result);
 
     return false;
   }
-
-  /*
-    Note: all this logic is not needed now since we are using the /exercise-submission
-    endpoint, however, if we ever want to implement editing of exercises, we will
-    need basically all of it again, so this is kept here for reference.
-
-
-
-
-  Future<Variation> addVariation() async {
-    final Uri postUri = baseProvider.makeUrl(_exerciseVariationPath);
-
-    // We send an empty dictionary since at the moment the variations only have an ID
-    final Map<String, dynamic> variationMap = await baseProvider.post({}, postUri);
-    final Variation newVariation = Variation.fromJson(variationMap);
-    _variationId = newVariation.id;
-    notifyListeners();
-    return newVariation;
-  }
-
-  Future<void> addImages(Exercise exercise) async {
-    for (final image in _exerciseImages) {
-      final request = http.MultipartRequest('POST', baseProvider.makeUrl(_imagesUrlPath));
-      request.headers.addAll(baseProvider.getDefaultHeaders(includeAuth: true));
-
-      request.files.add(await http.MultipartFile.fromPath('image', image.path));
-      request.fields['exercise'] = exercise.id!.toString();
-      request.fields['style'] = EXERCISE_IMAGE_ART_STYLE.PHOTO.index.toString();
-
-      await request.send();
-    }
-
-    notifyListeners();
-  }
-
-  Future<Translation> addExerciseTranslation(Translation exercise) async {
-    final Uri postUri = baseProvider.makeUrl(_exerciseTranslationUrlPath);
-
-    final Map<String, dynamic> newTranslation = await baseProvider.post(exercise.toJson(), postUri);
-    final Translation newExercise = Translation.fromJson(newTranslation);
-    notifyListeners();
-
-    return newExercise;
-  }
-
-  Future<Alias> addExerciseAlias(String name, int exerciseId) async {
-    final alias = Alias(translationId: exerciseId, alias: name);
-    final Uri postUri = baseProvider.makeUrl(_exerciseAliasPath);
-
-    final Alias newAlias = Alias.fromJson(await baseProvider.post(alias.toJson(), postUri));
-    notifyListeners();
-
-    return newAlias;
-  }
-
-   */
-}
+}
\ No newline at end of file

From 796b142c7ad8e89533cf864f2cb0853bc9845045 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 00:05:15 +0000
Subject: [PATCH 10/29] Bump sqlite3_flutter_libs from 0.5.39 to 0.5.40

Bumps [sqlite3_flutter_libs](https://github.com/simolus3/sqlite3.dart) from 0.5.39 to 0.5.40.
- [Release notes](https://github.com/simolus3/sqlite3.dart/releases)
- [Commits](https://github.com/simolus3/sqlite3.dart/compare/sqlite3_flutter_libs-0.5.39...sqlite3_flutter_libs-0.5.40)

---
updated-dependencies:
- dependency-name: sqlite3_flutter_libs
  dependency-version: 0.5.40
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pubspec.lock | 4 ++--
 pubspec.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index a1d24d6d..724e9c1c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1205,10 +1205,10 @@ packages:
     dependency: "direct main"
     description:
       name: sqlite3_flutter_libs
-      sha256: "2b03273e71867a8a4d030861fc21706200debe5c5858a4b9e58f4a1c129586a4"
+      sha256: "69c80d812ef2500202ebd22002cbfc1b6565e9ff56b2f971e757fac5d42294df"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.39"
+    version: "0.5.40"
   sqlparser:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 3eaff457..73a4a903 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -61,7 +61,7 @@ dependencies:
   provider: ^6.1.5
   rive: ^0.13.20
   shared_preferences: ^2.5.3
-  sqlite3_flutter_libs: ^0.5.39
+  sqlite3_flutter_libs: ^0.5.40
   table_calendar: ^3.0.8
   url_launcher: ^6.3.2
   version: ^3.0.2

From fa7f670e9f88bba81ae0a1b76641e6b66527d181 Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Mon, 6 Oct 2025 12:31:12 +0200
Subject: [PATCH 11/29] Some light cleanup

---
 lib/l10n/app_en.arb                           |  154 +-
 lib/models/exercises/exercise.g.dart          |   65 +-
 .../exercises/exercise_api.freezed.dart       | 1370 +++++-------
 lib/models/exercises/exercise_api.g.dart      |  109 +-
 .../exercise_submission.freezed.dart          |    8 +
 lib/models/exercises/image.g.dart             |   17 +-
 lib/providers/exercises.dart                  |   92 +-
 .../add_exercise/image_details_form.dart      |   31 +-
 lib/widgets/core/settings.dart                |   22 +-
 lib/widgets/core/settings/exercise_cache.dart |  117 +-
 .../contribute_exercise_test.mocks.dart       | 1239 ++++-------
 .../exercises_detail_widget_test.mocks.dart   |  669 +++---
 .../plate_calculator_test.mocks.dart          |  266 +--
 test/routine/day_form_test.mocks.dart         |  992 +++------
 .../forms/session_form_test.mocks.dart        |  992 +++------
 test/routine/gym_mode_screen_test.mocks.dart  | 1907 ++++++-----------
 .../gym_mode_session_screen_test.mocks.dart   |  992 +++------
 ...epetition_unit_form_widget_test.mocks.dart |  992 +++------
 .../routine_edit_screen_test.mocks.dart       |  992 +++------
 test/routine/routine_edit_test.mocks.dart     |  992 +++------
 test/routine/routine_form_test.mocks.dart     |  992 +++------
 .../routine_logs_screen_test.mocks.dart       |  992 +++------
 test/routine/routine_screen_test.mocks.dart   |  255 +--
 .../routine/routines_provider_test.mocks.dart |  924 +++-----
 test/routine/routines_screen_test.mocks.dart  |  255 +--
 test/routine/slot_entry_form_test.mocks.dart  |  992 +++------
 .../weight_unit_form_widget_test.mocks.dart   |  992 +++------
 27 files changed, 6260 insertions(+), 11160 deletions(-)

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 9133f4ab..df9a85bd 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -719,89 +719,77 @@
       }
     }
   },
-"scanBarcode": "Scan barcode",
-"@scanBarcode": {
-  "description": "Label for scan barcode button"
-},
-"close": "Close",
-"@close": {
-  "description": "Translation for close"
-},
-"identicalExercisePleaseDiscard": "If you notice an exercise that is identical to the one you're adding, please discard your draft and edit that exercise instead.",
-"checkInformationBeforeSubmitting": "Please check that the information you entered is correct before submitting the exercise",
-"add_exercise_image_license": "Images must be compatible with the CC BY SA license. If in doubt, upload only photos you've taken yourself.",
-"imageDetailsTitle": "Image details",
-"@imageDetailsTitle": {
-  "description": "Title for image details form"
-},
-"imageDetailsLicenseTitle": "Title",
-"@imageDetailsLicenseTitle": {
-  "description": "Label for image title field"
-},
-"imageDetailsLicenseTitleHint": "Enter image title",
-"@imageDetailsLicenseTitleHint": {
-  "description": "Hint text for image title field"
-},
-"imageDetailsSourceLink": "Link to the source website, if available",
-"@imageDetailsSourceLink": {
-  "description": "Label for source link field"
-},
-"imageDetailsSourceLinkHint": "https://example.com",
-"@imageDetailsSourceLinkHint": {
-  "description": "Hint text for source link field"
-},
-"imageDetailsAuthor": "Author(s)",
-"@imageDetailsAuthor": {
-  "description": "Label for author field"
-},
-"imageDetailsAuthorHint": "Enter author name",
-"@imageDetailsAuthorHint": {
-  "description": "Hint text for author field"
-},
-"imageDetailsAuthorLink": "Link to author website or profile, if available",
-"@imageDetailsAuthorLink": {
-  "description": "Label for author link field"
-},
-"imageDetailsAuthorLinkHint": "https://example.com/author",
-"@imageDetailsAuthorLinkHint": {
-  "description": "Hint text for author link field"
-},
-"imageDetailsDerivativeSource": "Link to the original source, if this is a derivative work",
-"@imageDetailsDerivativeSource": {
-  "description": "Label for derivative source field"
-},
-"imageDetailsDerivativeSourceHint": "https://example.com/original",
-"@imageDetailsDerivativeSourceHint": {
-  "description": "Hint text for derivative source field"
-},
-"imageDetailsDerivativeHelp": "A derivative work is based on a previous work but contains sufficient new, creative content to entitle it to its own copyright.",
-"@imageDetailsDerivativeHelp": {
-  "description": "Helper text explaining derivative works"
-},
-"imageDetailsImageType": "Image Type",
-"@imageDetailsImageType": {
-  "description": "Label for image type selector"
-},
-"imageDetailsLicenseNoticePrefix": "By submitting this image, you agree to release it under the ",
-"@imageDetailsLicenseNoticePrefix": {
-  "description": "First part of license notice text"
-},
-"imageDetailsLicenseNoticeSuffix": " The image must be either your own work or the author must have released it under a license compatible with CC BY-SA 4.0.",
-"@imageDetailsLicenseNoticeSuffix": {
-  "description": "Second part of license notice text"
-},
-"imageDetailsCancel": "CANCEL",
-"@imageDetailsCancel": {
-  "description": "Cancel button text"
-},
-"imageDetailsAdd": "ADD",
-"@imageDetailsAdd": {
-  "description": "Add button text"
-},
-"variations": "Variations",
-"@variations": {
-  "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
-},
+  "scanBarcode": "Scan barcode",
+  "@scanBarcode": {
+    "description": "Label for scan barcode button"
+  },
+  "close": "Close",
+  "@close": {
+    "description": "Translation for close"
+  },
+  "identicalExercisePleaseDiscard": "If you notice an exercise that is identical to the one you're adding, please discard your draft and edit that exercise instead.",
+  "checkInformationBeforeSubmitting": "Please check that the information you entered is correct before submitting the exercise",
+  "add_exercise_image_license": "Images must be compatible with the CC BY SA license. If in doubt, upload only photos you've taken yourself.",
+  "imageDetailsTitle": "Image details",
+  "@imageDetailsTitle": {
+    "description": "Title for image details form"
+  },
+  "imageDetailsLicenseTitle": "Title",
+  "@imageDetailsLicenseTitle": {
+    "description": "Label for image title field"
+  },
+  "imageDetailsLicenseTitleHint": "Enter image title",
+  "@imageDetailsLicenseTitleHint": {
+    "description": "Hint text for image title field"
+  },
+  "imageDetailsSourceLink": "Link to the source website, if available",
+  "@imageDetailsSourceLink": {
+    "description": "Label for source link field"
+  },
+  "imageDetailsAuthor": "Author(s)",
+  "@imageDetailsAuthor": {
+    "description": "Label for author field"
+  },
+  "imageDetailsAuthorHint": "Enter author name",
+  "@imageDetailsAuthorHint": {
+    "description": "Hint text for author field"
+  },
+  "imageDetailsAuthorLink": "Link to author website or profile, if available",
+  "@imageDetailsAuthorLink": {
+    "description": "Label for author link field"
+  },
+  "imageDetailsDerivativeSource": "Link to the original source, if this is a derivative work",
+  "@imageDetailsDerivativeSource": {
+    "description": "Label for derivative source field"
+  },
+  "imageDetailsDerivativeHelp": "A derivative work is based on a previous work but contains sufficient new, creative content to entitle it to its own copyright.",
+  "@imageDetailsDerivativeHelp": {
+    "description": "Helper text explaining derivative works"
+  },
+  "imageDetailsImageType": "Image Type",
+  "@imageDetailsImageType": {
+    "description": "Label for image type selector"
+  },
+  "imageDetailsLicenseNoticePrefix": "By submitting this image, you agree to release it under the ",
+  "@imageDetailsLicenseNoticePrefix": {
+    "description": "First part of license notice text"
+  },
+  "imageDetailsLicenseNoticeSuffix": " The image must be either your own work or the author must have released it under a license compatible with CC BY-SA 4.0.",
+  "@imageDetailsLicenseNoticeSuffix": {
+    "description": "Second part of license notice text"
+  },
+  "imageDetailsCancel": "CANCEL",
+  "@imageDetailsCancel": {
+    "description": "Cancel button text"
+  },
+  "imageDetailsAdd": "ADD",
+  "@imageDetailsAdd": {
+    "description": "Add button text"
+  },
+  "variations": "Variations",
+  "@variations": {
+    "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
+  },
   "alsoKnownAs": "Also known as: {aliases}",
   "@alsoKnownAs": {
     "placeholders": {
diff --git a/lib/models/exercises/exercise.g.dart b/lib/models/exercises/exercise.g.dart
index 5c9fcd4a..8d68fe3d 100644
--- a/lib/models/exercises/exercise.g.dart
+++ b/lib/models/exercises/exercise.g.dart
@@ -19,43 +19,46 @@ Exercise _$ExerciseFromJson(Map<String, dynamic> json) {
       'category',
       'muscles',
       'muscles_secondary',
-      'equipment'
+      'equipment',
     ],
   );
   return Exercise(
-    id: (json['id'] as num?)?.toInt(),
-    uuid: json['uuid'] as String?,
-    created: json['created'] == null ? null : DateTime.parse(json['created'] as String),
-    lastUpdate: json['last_update'] == null ? null : DateTime.parse(json['last_update'] as String),
-    lastUpdateGlobal: json['last_update_global'] == null
-        ? null
-        : DateTime.parse(json['last_update_global'] as String),
-    variationId: (json['variations'] as num?)?.toInt(),
-    translations: (json['translations'] as List<dynamic>?)
-        ?.map((e) => Translation.fromJson(e as Map<String, dynamic>))
-        .toList(),
-    category: json['categories'] == null
-        ? null
-        : ExerciseCategory.fromJson(json['categories'] as Map<String, dynamic>),
-  )
+      id: (json['id'] as num?)?.toInt(),
+      uuid: json['uuid'] as String?,
+      created: json['created'] == null ? null : DateTime.parse(json['created'] as String),
+      lastUpdate: json['last_update'] == null
+          ? null
+          : DateTime.parse(json['last_update'] as String),
+      lastUpdateGlobal: json['last_update_global'] == null
+          ? null
+          : DateTime.parse(json['last_update_global'] as String),
+      variationId: (json['variations'] as num?)?.toInt(),
+      translations: (json['translations'] as List<dynamic>?)
+          ?.map((e) => Translation.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      category: json['categories'] == null
+          ? null
+          : ExerciseCategory.fromJson(json['categories'] as Map<String, dynamic>),
+    )
     ..categoryId = (json['category'] as num).toInt()
     ..musclesIds = (json['muscles'] as List<dynamic>).map((e) => (e as num).toInt()).toList()
-    ..musclesSecondaryIds =
-        (json['muscles_secondary'] as List<dynamic>).map((e) => (e as num).toInt()).toList()
+    ..musclesSecondaryIds = (json['muscles_secondary'] as List<dynamic>)
+        .map((e) => (e as num).toInt())
+        .toList()
     ..equipmentIds = (json['equipment'] as List<dynamic>).map((e) => (e as num).toInt()).toList();
 }
 
 Map<String, dynamic> _$ExerciseToJson(Exercise instance) => <String, dynamic>{
-      'id': instance.id,
-      'uuid': instance.uuid,
-      'variations': instance.variationId,
-      'created': instance.created?.toIso8601String(),
-      'last_update': instance.lastUpdate?.toIso8601String(),
-      'last_update_global': instance.lastUpdateGlobal?.toIso8601String(),
-      'category': instance.categoryId,
-      'categories': instance.category?.toJson(),
-      'muscles': instance.musclesIds,
-      'muscles_secondary': instance.musclesSecondaryIds,
-      'musclesSecondary': instance.musclesSecondary.map((e) => e.toJson()).toList(),
-      'equipment': instance.equipmentIds,
-    };
+  'id': instance.id,
+  'uuid': instance.uuid,
+  'variations': instance.variationId,
+  'created': instance.created?.toIso8601String(),
+  'last_update': instance.lastUpdate?.toIso8601String(),
+  'last_update_global': instance.lastUpdateGlobal?.toIso8601String(),
+  'category': instance.categoryId,
+  'categories': instance.category?.toJson(),
+  'muscles': instance.musclesIds,
+  'muscles_secondary': instance.musclesSecondaryIds,
+  'musclesSecondary': instance.musclesSecondary.map((e) => e.toJson()).toList(),
+  'equipment': instance.equipmentIds,
+};
diff --git a/lib/models/exercises/exercise_api.freezed.dart b/lib/models/exercises/exercise_api.freezed.dart
index 85554ce8..740ec6c0 100644
--- a/lib/models/exercises/exercise_api.freezed.dart
+++ b/lib/models/exercises/exercise_api.freezed.dart
@@ -11,35 +11,37 @@ part of 'exercise_api.dart';
 
 // dart format off
 T _$identity<T>(T value) => value;
+
 ExerciseApiData _$ExerciseApiDataFromJson(Map<String, dynamic> json) {
-  return _ExerciseBaseData.fromJson(json);
+  return _ExerciseBaseData.fromJson(
+      json
+  );
 }
 
 /// @nodoc
 mixin _$ExerciseApiData {
+
   int get id;
+
   String get uuid; // ignore: invalid_annotation_target
-  @JsonKey(name: 'variations')
-  int? get variationId; // ignore: invalid_annotation_target
-  @JsonKey(name: 'created')
-  DateTime get created; // ignore: invalid_annotation_target
-  @JsonKey(name: 'last_update')
-  DateTime get lastUpdate; // ignore: invalid_annotation_target
-  @JsonKey(name: 'last_update_global')
-  DateTime get lastUpdateGlobal;
+  @JsonKey(name: 'variations') int? get variationId; // ignore: invalid_annotation_target
+  @JsonKey(name: 'created') DateTime get created; // ignore: invalid_annotation_target
+  @JsonKey(name: 'last_update') DateTime get lastUpdate; // ignore: invalid_annotation_target
+  @JsonKey(name: 'last_update_global') DateTime get lastUpdateGlobal;
+
   ExerciseCategory get category;
+
   List<Muscle> get muscles; // ignore: invalid_annotation_target
-  @JsonKey(name: 'muscles_secondary')
-  List<Muscle> get musclesSecondary; // ignore: invalid_annotation_target
+  @JsonKey(name: 'muscles_secondary') List<
+      Muscle> get musclesSecondary; // ignore: invalid_annotation_target
   List<Equipment> get equipment; // ignore: invalid_annotation_target
-  @JsonKey(name: 'translations', defaultValue: [])
-  List<Translation> get translations;
+  @JsonKey(name: 'translations', defaultValue: []) List<Translation> get translations;
+
   List<ExerciseImage> get images;
+
   List<Video> get videos; // ignore: invalid_annotation_target
-  @JsonKey(name: 'author_history')
-  List<String> get authors; // ignore: invalid_annotation_target
-  @JsonKey(name: 'total_authors_history')
-  List<String> get authorsGlobal;
+  @JsonKey(name: 'author_history') List<String> get authors; // ignore: invalid_annotation_target
+  @JsonKey(name: 'total_authors_history') List<String> get authorsGlobal;
 
   /// Create a copy of ExerciseApiData
   /// with the given fields replaced by the non-null parameter values.
@@ -51,11 +53,11 @@ mixin _$ExerciseApiData {
   /// Serializes this ExerciseApiData to a JSON map.
   Map<String, dynamic> toJson();
 
+
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is ExerciseApiData &&
+        (other.runtimeType == runtimeType && other is ExerciseApiData &&
             (identical(other.id, id) || other.id == id) &&
             (identical(other.uuid, uuid) || other.uuid == uuid) &&
             (identical(other.variationId, variationId) || other.variationId == variationId) &&
@@ -76,55 +78,56 @@ mixin _$ExerciseApiData {
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      id,
-      uuid,
-      variationId,
-      created,
-      lastUpdate,
-      lastUpdateGlobal,
-      category,
-      const DeepCollectionEquality().hash(muscles),
-      const DeepCollectionEquality().hash(musclesSecondary),
-      const DeepCollectionEquality().hash(equipment),
-      const DeepCollectionEquality().hash(translations),
-      const DeepCollectionEquality().hash(images),
-      const DeepCollectionEquality().hash(videos),
-      const DeepCollectionEquality().hash(authors),
-      const DeepCollectionEquality().hash(authorsGlobal));
+  int get hashCode =>
+      Object.hash(
+          runtimeType,
+          id,
+          uuid,
+          variationId,
+          created,
+          lastUpdate,
+          lastUpdateGlobal,
+          category,
+          const DeepCollectionEquality().hash(muscles),
+          const DeepCollectionEquality().hash(musclesSecondary),
+          const DeepCollectionEquality().hash(equipment),
+          const DeepCollectionEquality().hash(translations),
+          const DeepCollectionEquality().hash(images),
+          const DeepCollectionEquality().hash(videos),
+          const DeepCollectionEquality().hash(authors),
+          const DeepCollectionEquality().hash(authorsGlobal));
 
   @override
   String toString() {
     return 'ExerciseApiData(id: $id, uuid: $uuid, variationId: $variationId, created: $created, lastUpdate: $lastUpdate, lastUpdateGlobal: $lastUpdateGlobal, category: $category, muscles: $muscles, musclesSecondary: $musclesSecondary, equipment: $equipment, translations: $translations, images: $images, videos: $videos, authors: $authors, authorsGlobal: $authorsGlobal)';
   }
+
+
 }
 
 /// @nodoc
 abstract mixin class $ExerciseApiDataCopyWith<$Res> {
-  factory $ExerciseApiDataCopyWith(ExerciseApiData value, $Res Function(ExerciseApiData) _then) =
-      _$ExerciseApiDataCopyWithImpl;
-  @useResult
-  $Res call(
-      {int id,
-      String uuid,
-      @JsonKey(name: 'variations') int? variationId,
-      @JsonKey(name: 'created') DateTime created,
-      @JsonKey(name: 'last_update') DateTime lastUpdate,
-      @JsonKey(name: 'last_update_global') DateTime lastUpdateGlobal,
-      ExerciseCategory category,
-      List<Muscle> muscles,
-      @JsonKey(name: 'muscles_secondary') List<Muscle> musclesSecondary,
-      List<Equipment> equipment,
-      @JsonKey(name: 'translations', defaultValue: []) List<Translation> translations,
-      List<ExerciseImage> images,
-      List<Video> videos,
-      @JsonKey(name: 'author_history') List<String> authors,
-      @JsonKey(name: 'total_authors_history') List<String> authorsGlobal});
-}
+  factory $ExerciseApiDataCopyWith(ExerciseApiData value,
+      $Res Function(ExerciseApiData) _then) = _$ExerciseApiDataCopyWithImpl;
 
+  @useResult
+  $Res call({
+    int id, String uuid, @JsonKey(name: 'variations') int? variationId, @JsonKey(
+        name: 'created') DateTime created, @JsonKey(
+        name: 'last_update') DateTime lastUpdate, @JsonKey(
+        name: 'last_update_global') DateTime lastUpdateGlobal, ExerciseCategory category, List<
+        Muscle> muscles, @JsonKey(name: 'muscles_secondary') List<Muscle> musclesSecondary, List<
+        Equipment> equipment, @JsonKey(name: 'translations', defaultValue: []) List<
+        Translation> translations, List<ExerciseImage> images, List<Video> videos, @JsonKey(
+        name: 'author_history') List<String> authors, @JsonKey(name: 'total_authors_history') List<
+        String> authorsGlobal
+  });
+
+
+}
 /// @nodoc
-class _$ExerciseApiDataCopyWithImpl<$Res> implements $ExerciseApiDataCopyWith<$Res> {
+class _$ExerciseApiDataCopyWithImpl<$Res>
+    implements $ExerciseApiDataCopyWith<$Res> {
   _$ExerciseApiDataCopyWithImpl(this._self, this._then);
 
   final ExerciseApiData _self;
@@ -134,88 +137,61 @@ class _$ExerciseApiDataCopyWithImpl<$Res> implements $ExerciseApiDataCopyWith<$R
   /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
-  $Res call({
-    Object? id = null,
-    Object? uuid = null,
-    Object? variationId = freezed,
-    Object? created = null,
-    Object? lastUpdate = null,
-    Object? lastUpdateGlobal = null,
-    Object? category = null,
-    Object? muscles = null,
-    Object? musclesSecondary = null,
-    Object? equipment = null,
-    Object? translations = null,
-    Object? images = null,
-    Object? videos = null,
-    Object? authors = null,
-    Object? authorsGlobal = null,
-  }) {
+  $Res call(
+      {Object? id = null, Object? uuid = null, Object? variationId = freezed, Object? created = null, Object? lastUpdate = null, Object? lastUpdateGlobal = null, Object? category = null, Object? muscles = null, Object? musclesSecondary = null, Object? equipment = null, Object? translations = null, Object? images = null, Object? videos = null, Object? authors = null, Object? authorsGlobal = null,}) {
     return _then(_self.copyWith(
-      id: null == id
-          ? _self.id
-          : id // ignore: cast_nullable_to_non_nullable
-              as int,
-      uuid: null == uuid
-          ? _self.uuid
-          : uuid // ignore: cast_nullable_to_non_nullable
-              as String,
+      id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+      as int,
+      uuid: null == uuid ? _self.uuid : uuid // ignore: cast_nullable_to_non_nullable
+      as String,
       variationId: freezed == variationId
           ? _self.variationId
           : variationId // ignore: cast_nullable_to_non_nullable
-              as int?,
-      created: null == created
-          ? _self.created
-          : created // ignore: cast_nullable_to_non_nullable
-              as DateTime,
+      as int?,
+      created: null == created ? _self.created : created // ignore: cast_nullable_to_non_nullable
+      as DateTime,
       lastUpdate: null == lastUpdate
           ? _self.lastUpdate
           : lastUpdate // ignore: cast_nullable_to_non_nullable
-              as DateTime,
+      as DateTime,
       lastUpdateGlobal: null == lastUpdateGlobal
           ? _self.lastUpdateGlobal
           : lastUpdateGlobal // ignore: cast_nullable_to_non_nullable
-              as DateTime,
+      as DateTime,
       category: null == category
           ? _self.category
           : category // ignore: cast_nullable_to_non_nullable
-              as ExerciseCategory,
-      muscles: null == muscles
-          ? _self.muscles
-          : muscles // ignore: cast_nullable_to_non_nullable
-              as List<Muscle>,
+      as ExerciseCategory,
+      muscles: null == muscles ? _self.muscles : muscles // ignore: cast_nullable_to_non_nullable
+      as List<Muscle>,
       musclesSecondary: null == musclesSecondary
           ? _self.musclesSecondary
           : musclesSecondary // ignore: cast_nullable_to_non_nullable
-              as List<Muscle>,
+      as List<Muscle>,
       equipment: null == equipment
           ? _self.equipment
           : equipment // ignore: cast_nullable_to_non_nullable
-              as List<Equipment>,
+      as List<Equipment>,
       translations: null == translations
           ? _self.translations
           : translations // ignore: cast_nullable_to_non_nullable
-              as List<Translation>,
-      images: null == images
-          ? _self.images
-          : images // ignore: cast_nullable_to_non_nullable
-              as List<ExerciseImage>,
-      videos: null == videos
-          ? _self.videos
-          : videos // ignore: cast_nullable_to_non_nullable
-              as List<Video>,
-      authors: null == authors
-          ? _self.authors
-          : authors // ignore: cast_nullable_to_non_nullable
-              as List<String>,
+      as List<Translation>,
+      images: null == images ? _self.images : images // ignore: cast_nullable_to_non_nullable
+      as List<ExerciseImage>,
+      videos: null == videos ? _self.videos : videos // ignore: cast_nullable_to_non_nullable
+      as List<Video>,
+      authors: null == authors ? _self.authors : authors // ignore: cast_nullable_to_non_nullable
+      as List<String>,
       authorsGlobal: null == authorsGlobal
           ? _self.authorsGlobal
           : authorsGlobal // ignore: cast_nullable_to_non_nullable
-              as List<String>,
+      as List<String>,
     ));
   }
+
 }
 
+
 /// Adds pattern-matching-related methods to [ExerciseApiData].
 extension ExerciseApiDataPatterns on ExerciseApiData {
   /// A variant of `map` that fallback to returning `orElse`.
@@ -230,20 +206,29 @@ extension ExerciseApiDataPatterns on ExerciseApiData {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult maybeMap<TResult extends Object?>(
-    TResult Function(_ExerciseBaseData value)? $default, {
-    required TResult orElse(),
-  }) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseBaseData() when $default != null:
-        return $default(_that);
-      case _:
-        return orElse();
-    }
-  }
+  @optionalTypeArgs TResult maybeMap
 
+  <
+
+  TResult
+
+  extends
+
+  Object?
+
+  >
+
+  (
+
+  TResult Function( _ExerciseBaseData value)? $default,{required TResult orElse(),}){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseBaseData() when $default != null:
+  return $default(_that);case _:
+  return orElse();
+
+  }
+  }
   /// A `switch`-like method, using callbacks.
   ///
   /// Callbacks receives the raw object, upcasted.
@@ -257,17 +242,12 @@ extension ExerciseApiDataPatterns on ExerciseApiData {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult map<TResult extends Object?>(
-    TResult Function(_ExerciseBaseData value) $default,
-  ) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseBaseData():
-        return $default(_that);
-    }
+  @optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _ExerciseBaseData value) $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseBaseData():
+  return $default(_that);}
   }
-
   /// A variant of `map` that fallback to returning `null`.
   ///
   /// It is equivalent to doing:
@@ -280,19 +260,15 @@ extension ExerciseApiDataPatterns on ExerciseApiData {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult? mapOrNull<TResult extends Object?>(
-    TResult? Function(_ExerciseBaseData value)? $default,
-  ) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseBaseData() when $default != null:
-        return $default(_that);
-      case _:
-        return null;
-    }
-  }
+  @optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _ExerciseBaseData value)? $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseBaseData() when $default != null:
+  return $default(_that);case _:
+  return null;
 
+  }
+  }
   /// A variant of `when` that fallback to an `orElse` callback.
   ///
   /// It is equivalent to doing:
@@ -305,51 +281,14 @@ extension ExerciseApiDataPatterns on ExerciseApiData {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult maybeWhen<TResult extends Object?>(
-    TResult Function(
-            int id,
-            String uuid,
-            @JsonKey(name: 'variations') int? variationId,
-            @JsonKey(name: 'created') DateTime created,
-            @JsonKey(name: 'last_update') DateTime lastUpdate,
-            @JsonKey(name: 'last_update_global') DateTime lastUpdateGlobal,
-            ExerciseCategory category,
-            List<Muscle> muscles,
-            @JsonKey(name: 'muscles_secondary') List<Muscle> musclesSecondary,
-            List<Equipment> equipment,
-            @JsonKey(name: 'translations', defaultValue: []) List<Translation> translations,
-            List<ExerciseImage> images,
-            List<Video> videos,
-            @JsonKey(name: 'author_history') List<String> authors,
-            @JsonKey(name: 'total_authors_history') List<String> authorsGlobal)?
-        $default, {
-    required TResult orElse(),
-  }) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseBaseData() when $default != null:
-        return $default(
-            _that.id,
-            _that.uuid,
-            _that.variationId,
-            _that.created,
-            _that.lastUpdate,
-            _that.lastUpdateGlobal,
-            _that.category,
-            _that.muscles,
-            _that.musclesSecondary,
-            _that.equipment,
-            _that.translations,
-            _that.images,
-            _that.videos,
-            _that.authors,
-            _that.authorsGlobal);
-      case _:
-        return orElse();
-    }
-  }
+  @optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( int id, String uuid, @JsonKey(name: 'variations') int? variationId, @JsonKey(name: 'created') DateTime created, @JsonKey(name: 'last_update') DateTime lastUpdate, @JsonKey(name: 'last_update_global') DateTime lastUpdateGlobal, ExerciseCategory category, List<Muscle> muscles, @JsonKey(name: 'muscles_secondary') List<Muscle> musclesSecondary, List<Equipment> equipment, @JsonKey(name: 'translations', defaultValue: []) List<Translation> translations, List<ExerciseImage> images, List<Video> videos, @JsonKey(name: 'author_history') List<String> authors, @JsonKey(name: 'total_authors_history') List<String> authorsGlobal)? $default,{required TResult orElse(),}) {final _that = this;
+  switch (_that) {
+  case _ExerciseBaseData() when $default != null:
+  return $default(_that.id,_that.uuid,_that.variationId,_that.created,_that.lastUpdate,_that.lastUpdateGlobal,_that.category,_that.muscles,_that.musclesSecondary,_that.equipment,_that.translations,_that.images,_that.videos,_that.authors,_that.authorsGlobal);case _:
+  return orElse();
 
+  }
+  }
   /// A `switch`-like method, using callbacks.
   ///
   /// As opposed to `map`, this offers destructuring.
@@ -363,48 +302,11 @@ extension ExerciseApiDataPatterns on ExerciseApiData {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult when<TResult extends Object?>(
-    TResult Function(
-            int id,
-            String uuid,
-            @JsonKey(name: 'variations') int? variationId,
-            @JsonKey(name: 'created') DateTime created,
-            @JsonKey(name: 'last_update') DateTime lastUpdate,
-            @JsonKey(name: 'last_update_global') DateTime lastUpdateGlobal,
-            ExerciseCategory category,
-            List<Muscle> muscles,
-            @JsonKey(name: 'muscles_secondary') List<Muscle> musclesSecondary,
-            List<Equipment> equipment,
-            @JsonKey(name: 'translations', defaultValue: []) List<Translation> translations,
-            List<ExerciseImage> images,
-            List<Video> videos,
-            @JsonKey(name: 'author_history') List<String> authors,
-            @JsonKey(name: 'total_authors_history') List<String> authorsGlobal)
-        $default,
-  ) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseBaseData():
-        return $default(
-            _that.id,
-            _that.uuid,
-            _that.variationId,
-            _that.created,
-            _that.lastUpdate,
-            _that.lastUpdateGlobal,
-            _that.category,
-            _that.muscles,
-            _that.musclesSecondary,
-            _that.equipment,
-            _that.translations,
-            _that.images,
-            _that.videos,
-            _that.authors,
-            _that.authorsGlobal);
-    }
+  @optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( int id, String uuid, @JsonKey(name: 'variations') int? variationId, @JsonKey(name: 'created') DateTime created, @JsonKey(name: 'last_update') DateTime lastUpdate, @JsonKey(name: 'last_update_global') DateTime lastUpdateGlobal, ExerciseCategory category, List<Muscle> muscles, @JsonKey(name: 'muscles_secondary') List<Muscle> musclesSecondary, List<Equipment> equipment, @JsonKey(name: 'translations', defaultValue: []) List<Translation> translations, List<ExerciseImage> images, List<Video> videos, @JsonKey(name: 'author_history') List<String> authors, @JsonKey(name: 'total_authors_history') List<String> authorsGlobal) $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseBaseData():
+  return $default(_that.id,_that.uuid,_that.variationId,_that.created,_that.lastUpdate,_that.lastUpdateGlobal,_that.category,_that.muscles,_that.musclesSecondary,_that.equipment,_that.translations,_that.images,_that.videos,_that.authors,_that.authorsGlobal);}
   }
-
   /// A variant of `when` that fallback to returning `null`
   ///
   /// It is equivalent to doing:
@@ -417,71 +319,32 @@ extension ExerciseApiDataPatterns on ExerciseApiData {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult? whenOrNull<TResult extends Object?>(
-    TResult? Function(
-            int id,
-            String uuid,
-            @JsonKey(name: 'variations') int? variationId,
-            @JsonKey(name: 'created') DateTime created,
-            @JsonKey(name: 'last_update') DateTime lastUpdate,
-            @JsonKey(name: 'last_update_global') DateTime lastUpdateGlobal,
-            ExerciseCategory category,
-            List<Muscle> muscles,
-            @JsonKey(name: 'muscles_secondary') List<Muscle> musclesSecondary,
-            List<Equipment> equipment,
-            @JsonKey(name: 'translations', defaultValue: []) List<Translation> translations,
-            List<ExerciseImage> images,
-            List<Video> videos,
-            @JsonKey(name: 'author_history') List<String> authors,
-            @JsonKey(name: 'total_authors_history') List<String> authorsGlobal)?
-        $default,
-  ) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseBaseData() when $default != null:
-        return $default(
-            _that.id,
-            _that.uuid,
-            _that.variationId,
-            _that.created,
-            _that.lastUpdate,
-            _that.lastUpdateGlobal,
-            _that.category,
-            _that.muscles,
-            _that.musclesSecondary,
-            _that.equipment,
-            _that.translations,
-            _that.images,
-            _that.videos,
-            _that.authors,
-            _that.authorsGlobal);
-      case _:
-        return null;
-    }
+  @optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( int id, String uuid, @JsonKey(name: 'variations') int? variationId, @JsonKey(name: 'created') DateTime created, @JsonKey(name: 'last_update') DateTime lastUpdate, @JsonKey(name: 'last_update_global') DateTime lastUpdateGlobal, ExerciseCategory category, List<Muscle> muscles, @JsonKey(name: 'muscles_secondary') List<Muscle> musclesSecondary, List<Equipment> equipment, @JsonKey(name: 'translations', defaultValue: []) List<Translation> translations, List<ExerciseImage> images, List<Video> videos, @JsonKey(name: 'author_history') List<String> authors, @JsonKey(name: 'total_authors_history') List<String> authorsGlobal)? $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseBaseData() when $default != null:
+  return $default(_that.id,_that.uuid,_that.variationId,_that.created,_that.lastUpdate,_that.lastUpdateGlobal,_that.category,_that.muscles,_that.musclesSecondary,_that.equipment,_that.translations,_that.images,_that.videos,_that.authors,_that.authorsGlobal);case _:
+  return null;
+
   }
+  }
+
 }
 
 /// @nodoc
 @JsonSerializable()
+
 class _ExerciseBaseData implements ExerciseApiData {
-  _ExerciseBaseData(
-      {required this.id,
-      required this.uuid,
-      @JsonKey(name: 'variations') this.variationId = null,
-      @JsonKey(name: 'created') required this.created,
-      @JsonKey(name: 'last_update') required this.lastUpdate,
-      @JsonKey(name: 'last_update_global') required this.lastUpdateGlobal,
-      required this.category,
-      required final List<Muscle> muscles,
-      @JsonKey(name: 'muscles_secondary') required final List<Muscle> musclesSecondary,
-      required final List<Equipment> equipment,
-      @JsonKey(name: 'translations', defaultValue: [])
-      required final List<Translation> translations,
-      required final List<ExerciseImage> images,
-      required final List<Video> videos,
-      @JsonKey(name: 'author_history') required final List<String> authors,
-      @JsonKey(name: 'total_authors_history') required final List<String> authorsGlobal})
+  _ExerciseBaseData({required this.id, required this.uuid, @JsonKey(
+      name: 'variations') this.variationId = null, @JsonKey(
+      name: 'created') required this.created, @JsonKey(
+      name: 'last_update') required this.lastUpdate, @JsonKey(
+      name: 'last_update_global') required this.lastUpdateGlobal, required this.category, required final List<
+      Muscle> muscles, @JsonKey(name: 'muscles_secondary') required final List<
+      Muscle> musclesSecondary, required final List<Equipment> equipment, @JsonKey(
+      name: 'translations', defaultValue: []) required final List<
+      Translation> translations, required final List<ExerciseImage> images, required final List<
+      Video> videos, @JsonKey(name: 'author_history') required final List<String> authors, @JsonKey(
+      name: 'total_authors_history') required final List<String> authorsGlobal})
       : _muscles = muscles,
         _musclesSecondary = musclesSecondary,
         _equipment = equipment,
@@ -492,10 +355,8 @@ class _ExerciseBaseData implements ExerciseApiData {
         _authorsGlobal = authorsGlobal;
   factory _ExerciseBaseData.fromJson(Map<String, dynamic> json) => _$ExerciseBaseDataFromJson(json);
 
-  @override
-  final int id;
-  @override
-  final String uuid;
+  @override final int id;
+  @override final String uuid;
 // ignore: invalid_annotation_target
   @override
   @JsonKey(name: 'variations')
@@ -512,11 +373,10 @@ class _ExerciseBaseData implements ExerciseApiData {
   @override
   @JsonKey(name: 'last_update_global')
   final DateTime lastUpdateGlobal;
-  @override
-  final ExerciseCategory category;
+  @override final ExerciseCategory category;
   final List<Muscle> _muscles;
-  @override
-  List<Muscle> get muscles {
+
+  @override List<Muscle> get muscles {
     if (_muscles is EqualUnmodifiableListView) return _muscles;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(_muscles);
@@ -536,8 +396,7 @@ class _ExerciseBaseData implements ExerciseApiData {
 // ignore: invalid_annotation_target
   final List<Equipment> _equipment;
 // ignore: invalid_annotation_target
-  @override
-  List<Equipment> get equipment {
+  @override List<Equipment> get equipment {
     if (_equipment is EqualUnmodifiableListView) return _equipment;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(_equipment);
@@ -555,16 +414,16 @@ class _ExerciseBaseData implements ExerciseApiData {
   }
 
   final List<ExerciseImage> _images;
-  @override
-  List<ExerciseImage> get images {
+
+  @override List<ExerciseImage> get images {
     if (_images is EqualUnmodifiableListView) return _images;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(_images);
   }
 
   final List<Video> _videos;
-  @override
-  List<Video> get videos {
+
+  @override List<Video> get videos {
     if (_videos is EqualUnmodifiableListView) return _videos;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(_videos);
@@ -592,6 +451,7 @@ class _ExerciseBaseData implements ExerciseApiData {
     return EqualUnmodifiableListView(_authorsGlobal);
   }
 
+
   /// Create a copy of ExerciseApiData
   /// with the given fields replaced by the non-null parameter values.
   @override
@@ -602,16 +462,13 @@ class _ExerciseBaseData implements ExerciseApiData {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$ExerciseBaseDataToJson(
-      this,
-    );
+    return _$ExerciseBaseDataToJson(this,);
   }
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _ExerciseBaseData &&
+        (other.runtimeType == runtimeType && other is _ExerciseBaseData &&
             (identical(other.id, id) || other.id == id) &&
             (identical(other.uuid, uuid) || other.uuid == uuid) &&
             (identical(other.variationId, variationId) || other.variationId == variationId) &&
@@ -632,57 +489,57 @@ class _ExerciseBaseData implements ExerciseApiData {
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      id,
-      uuid,
-      variationId,
-      created,
-      lastUpdate,
-      lastUpdateGlobal,
-      category,
-      const DeepCollectionEquality().hash(_muscles),
-      const DeepCollectionEquality().hash(_musclesSecondary),
-      const DeepCollectionEquality().hash(_equipment),
-      const DeepCollectionEquality().hash(_translations),
-      const DeepCollectionEquality().hash(_images),
-      const DeepCollectionEquality().hash(_videos),
-      const DeepCollectionEquality().hash(_authors),
-      const DeepCollectionEquality().hash(_authorsGlobal));
+  int get hashCode =>
+      Object.hash(
+          runtimeType,
+          id,
+          uuid,
+          variationId,
+          created,
+          lastUpdate,
+          lastUpdateGlobal,
+          category,
+          const DeepCollectionEquality().hash(_muscles),
+          const DeepCollectionEquality().hash(_musclesSecondary),
+          const DeepCollectionEquality().hash(_equipment),
+          const DeepCollectionEquality().hash(_translations),
+          const DeepCollectionEquality().hash(_images),
+          const DeepCollectionEquality().hash(_videos),
+          const DeepCollectionEquality().hash(_authors),
+          const DeepCollectionEquality().hash(_authorsGlobal));
 
   @override
   String toString() {
     return 'ExerciseApiData(id: $id, uuid: $uuid, variationId: $variationId, created: $created, lastUpdate: $lastUpdate, lastUpdateGlobal: $lastUpdateGlobal, category: $category, muscles: $muscles, musclesSecondary: $musclesSecondary, equipment: $equipment, translations: $translations, images: $images, videos: $videos, authors: $authors, authorsGlobal: $authorsGlobal)';
   }
+
+
 }
 
 /// @nodoc
 abstract mixin class _$ExerciseBaseDataCopyWith<$Res> implements $ExerciseApiDataCopyWith<$Res> {
-  factory _$ExerciseBaseDataCopyWith(
-          _ExerciseBaseData value, $Res Function(_ExerciseBaseData) _then) =
-      __$ExerciseBaseDataCopyWithImpl;
+  factory _$ExerciseBaseDataCopyWith(_ExerciseBaseData value,
+      $Res Function(_ExerciseBaseData) _then) = __$ExerciseBaseDataCopyWithImpl;
+
   @override
   @useResult
-  $Res call(
-      {int id,
-      String uuid,
-      @JsonKey(name: 'variations') int? variationId,
-      @JsonKey(name: 'created') DateTime created,
-      @JsonKey(name: 'last_update') DateTime lastUpdate,
-      @JsonKey(name: 'last_update_global') DateTime lastUpdateGlobal,
-      ExerciseCategory category,
-      List<Muscle> muscles,
-      @JsonKey(name: 'muscles_secondary') List<Muscle> musclesSecondary,
-      List<Equipment> equipment,
-      @JsonKey(name: 'translations', defaultValue: []) List<Translation> translations,
-      List<ExerciseImage> images,
-      List<Video> videos,
-      @JsonKey(name: 'author_history') List<String> authors,
-      @JsonKey(name: 'total_authors_history') List<String> authorsGlobal});
-}
+  $Res call({
+    int id, String uuid, @JsonKey(name: 'variations') int? variationId, @JsonKey(
+        name: 'created') DateTime created, @JsonKey(
+        name: 'last_update') DateTime lastUpdate, @JsonKey(
+        name: 'last_update_global') DateTime lastUpdateGlobal, ExerciseCategory category, List<
+        Muscle> muscles, @JsonKey(name: 'muscles_secondary') List<Muscle> musclesSecondary, List<
+        Equipment> equipment, @JsonKey(name: 'translations', defaultValue: []) List<
+        Translation> translations, List<ExerciseImage> images, List<Video> videos, @JsonKey(
+        name: 'author_history') List<String> authors, @JsonKey(name: 'total_authors_history') List<
+        String> authorsGlobal
+  });
 
+
+}
 /// @nodoc
-class __$ExerciseBaseDataCopyWithImpl<$Res> implements _$ExerciseBaseDataCopyWith<$Res> {
+class __$ExerciseBaseDataCopyWithImpl<$Res>
+    implements _$ExerciseBaseDataCopyWith<$Res> {
   __$ExerciseBaseDataCopyWithImpl(this._self, this._then);
 
   final _ExerciseBaseData _self;
@@ -692,100 +549,75 @@ class __$ExerciseBaseDataCopyWithImpl<$Res> implements _$ExerciseBaseDataCopyWit
   /// with the given fields replaced by the non-null parameter values.
   @override
   @pragma('vm:prefer-inline')
-  $Res call({
-    Object? id = null,
-    Object? uuid = null,
-    Object? variationId = freezed,
-    Object? created = null,
-    Object? lastUpdate = null,
-    Object? lastUpdateGlobal = null,
-    Object? category = null,
-    Object? muscles = null,
-    Object? musclesSecondary = null,
-    Object? equipment = null,
-    Object? translations = null,
-    Object? images = null,
-    Object? videos = null,
-    Object? authors = null,
-    Object? authorsGlobal = null,
-  }) {
+  $Res call(
+      {Object? id = null, Object? uuid = null, Object? variationId = freezed, Object? created = null, Object? lastUpdate = null, Object? lastUpdateGlobal = null, Object? category = null, Object? muscles = null, Object? musclesSecondary = null, Object? equipment = null, Object? translations = null, Object? images = null, Object? videos = null, Object? authors = null, Object? authorsGlobal = null,}) {
     return _then(_ExerciseBaseData(
-      id: null == id
-          ? _self.id
-          : id // ignore: cast_nullable_to_non_nullable
-              as int,
-      uuid: null == uuid
-          ? _self.uuid
-          : uuid // ignore: cast_nullable_to_non_nullable
-              as String,
+      id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+      as int,
+      uuid: null == uuid ? _self.uuid : uuid // ignore: cast_nullable_to_non_nullable
+      as String,
       variationId: freezed == variationId
           ? _self.variationId
           : variationId // ignore: cast_nullable_to_non_nullable
-              as int?,
-      created: null == created
-          ? _self.created
-          : created // ignore: cast_nullable_to_non_nullable
-              as DateTime,
+      as int?,
+      created: null == created ? _self.created : created // ignore: cast_nullable_to_non_nullable
+      as DateTime,
       lastUpdate: null == lastUpdate
           ? _self.lastUpdate
           : lastUpdate // ignore: cast_nullable_to_non_nullable
-              as DateTime,
+      as DateTime,
       lastUpdateGlobal: null == lastUpdateGlobal
           ? _self.lastUpdateGlobal
           : lastUpdateGlobal // ignore: cast_nullable_to_non_nullable
-              as DateTime,
+      as DateTime,
       category: null == category
           ? _self.category
           : category // ignore: cast_nullable_to_non_nullable
-              as ExerciseCategory,
-      muscles: null == muscles
-          ? _self._muscles
-          : muscles // ignore: cast_nullable_to_non_nullable
-              as List<Muscle>,
+      as ExerciseCategory,
+      muscles: null == muscles ? _self._muscles : muscles // ignore: cast_nullable_to_non_nullable
+      as List<Muscle>,
       musclesSecondary: null == musclesSecondary
           ? _self._musclesSecondary
           : musclesSecondary // ignore: cast_nullable_to_non_nullable
-              as List<Muscle>,
+      as List<Muscle>,
       equipment: null == equipment
           ? _self._equipment
           : equipment // ignore: cast_nullable_to_non_nullable
-              as List<Equipment>,
+      as List<Equipment>,
       translations: null == translations
           ? _self._translations
           : translations // ignore: cast_nullable_to_non_nullable
-              as List<Translation>,
-      images: null == images
-          ? _self._images
-          : images // ignore: cast_nullable_to_non_nullable
-              as List<ExerciseImage>,
-      videos: null == videos
-          ? _self._videos
-          : videos // ignore: cast_nullable_to_non_nullable
-              as List<Video>,
-      authors: null == authors
-          ? _self._authors
-          : authors // ignore: cast_nullable_to_non_nullable
-              as List<String>,
+      as List<Translation>,
+      images: null == images ? _self._images : images // ignore: cast_nullable_to_non_nullable
+      as List<ExerciseImage>,
+      videos: null == videos ? _self._videos : videos // ignore: cast_nullable_to_non_nullable
+      as List<Video>,
+      authors: null == authors ? _self._authors : authors // ignore: cast_nullable_to_non_nullable
+      as List<String>,
       authorsGlobal: null == authorsGlobal
           ? _self._authorsGlobal
           : authorsGlobal // ignore: cast_nullable_to_non_nullable
-              as List<String>,
+      as List<String>,
     ));
   }
+
+
 }
 
+
 /// @nodoc
 mixin _$ExerciseSearchDetails {
+
 // ignore: invalid_annotation_target
-  @JsonKey(name: 'id')
-  int get translationId; // ignore: invalid_annotation_target
-  @JsonKey(name: 'base_id')
-  int get exerciseId;
+  @JsonKey(name: 'id') int get translationId; // ignore: invalid_annotation_target
+  @JsonKey(name: 'base_id') int get exerciseId;
+
   String get name;
+
   String get category;
+
   String? get image; // ignore: invalid_annotation_target
-  @JsonKey(name: 'image_thumbnail')
-  String? get imageThumbnail;
+  @JsonKey(name: 'image_thumbnail') String? get imageThumbnail;
 
   /// Create a copy of ExerciseSearchDetails
   /// with the given fields replaced by the non-null parameter values.
@@ -798,11 +630,11 @@ mixin _$ExerciseSearchDetails {
   /// Serializes this ExerciseSearchDetails to a JSON map.
   Map<String, dynamic> toJson();
 
+
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is ExerciseSearchDetails &&
+        (other.runtimeType == runtimeType && other is ExerciseSearchDetails &&
             (identical(other.translationId, translationId) ||
                 other.translationId == translationId) &&
             (identical(other.exerciseId, exerciseId) || other.exerciseId == exerciseId) &&
@@ -816,31 +648,40 @@ mixin _$ExerciseSearchDetails {
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
   int get hashCode =>
-      Object.hash(runtimeType, translationId, exerciseId, name, category, image, imageThumbnail);
+      Object.hash(
+          runtimeType,
+          translationId,
+          exerciseId,
+          name,
+          category,
+          image,
+          imageThumbnail);
 
   @override
   String toString() {
     return 'ExerciseSearchDetails(translationId: $translationId, exerciseId: $exerciseId, name: $name, category: $category, image: $image, imageThumbnail: $imageThumbnail)';
   }
+
+
 }
 
 /// @nodoc
 abstract mixin class $ExerciseSearchDetailsCopyWith<$Res> {
-  factory $ExerciseSearchDetailsCopyWith(
-          ExerciseSearchDetails value, $Res Function(ExerciseSearchDetails) _then) =
-      _$ExerciseSearchDetailsCopyWithImpl;
-  @useResult
-  $Res call(
-      {@JsonKey(name: 'id') int translationId,
-      @JsonKey(name: 'base_id') int exerciseId,
-      String name,
-      String category,
-      String? image,
-      @JsonKey(name: 'image_thumbnail') String? imageThumbnail});
-}
+  factory $ExerciseSearchDetailsCopyWith(ExerciseSearchDetails value,
+      $Res Function(ExerciseSearchDetails) _then) = _$ExerciseSearchDetailsCopyWithImpl;
 
+  @useResult
+  $Res call({
+    @JsonKey(name: 'id') int translationId, @JsonKey(
+        name: 'base_id') int exerciseId, String name, String category, String? image, @JsonKey(
+        name: 'image_thumbnail') String? imageThumbnail
+  });
+
+
+}
 /// @nodoc
-class _$ExerciseSearchDetailsCopyWithImpl<$Res> implements $ExerciseSearchDetailsCopyWith<$Res> {
+class _$ExerciseSearchDetailsCopyWithImpl<$Res>
+    implements $ExerciseSearchDetailsCopyWith<$Res> {
   _$ExerciseSearchDetailsCopyWithImpl(this._self, this._then);
 
   final ExerciseSearchDetails _self;
@@ -850,43 +691,35 @@ class _$ExerciseSearchDetailsCopyWithImpl<$Res> implements $ExerciseSearchDetail
   /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
-  $Res call({
-    Object? translationId = null,
-    Object? exerciseId = null,
-    Object? name = null,
-    Object? category = null,
-    Object? image = freezed,
-    Object? imageThumbnail = freezed,
-  }) {
+  $Res call(
+      {Object? translationId = null, Object? exerciseId = null, Object? name = null, Object? category = null, Object? image = freezed, Object? imageThumbnail = freezed,}) {
     return _then(_self.copyWith(
       translationId: null == translationId
           ? _self.translationId
           : translationId // ignore: cast_nullable_to_non_nullable
-              as int,
+      as int,
       exerciseId: null == exerciseId
           ? _self.exerciseId
           : exerciseId // ignore: cast_nullable_to_non_nullable
-              as int,
-      name: null == name
-          ? _self.name
-          : name // ignore: cast_nullable_to_non_nullable
-              as String,
+      as int,
+      name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+      as String,
       category: null == category
           ? _self.category
           : category // ignore: cast_nullable_to_non_nullable
-              as String,
-      image: freezed == image
-          ? _self.image
-          : image // ignore: cast_nullable_to_non_nullable
-              as String?,
+      as String,
+      image: freezed == image ? _self.image : image // ignore: cast_nullable_to_non_nullable
+      as String?,
       imageThumbnail: freezed == imageThumbnail
           ? _self.imageThumbnail
           : imageThumbnail // ignore: cast_nullable_to_non_nullable
-              as String?,
+      as String?,
     ));
   }
+
 }
 
+
 /// Adds pattern-matching-related methods to [ExerciseSearchDetails].
 extension ExerciseSearchDetailsPatterns on ExerciseSearchDetails {
   /// A variant of `map` that fallback to returning `orElse`.
@@ -901,20 +734,29 @@ extension ExerciseSearchDetailsPatterns on ExerciseSearchDetails {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult maybeMap<TResult extends Object?>(
-    TResult Function(_ExerciseSearchDetails value)? $default, {
-    required TResult orElse(),
-  }) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseSearchDetails() when $default != null:
-        return $default(_that);
-      case _:
-        return orElse();
-    }
-  }
+  @optionalTypeArgs TResult maybeMap
 
+  <
+
+  TResult
+
+  extends
+
+  Object?
+
+  >
+
+  (
+
+  TResult Function( _ExerciseSearchDetails value)? $default,{required TResult orElse(),}){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseSearchDetails() when $default != null:
+  return $default(_that);case _:
+  return orElse();
+
+  }
+  }
   /// A `switch`-like method, using callbacks.
   ///
   /// Callbacks receives the raw object, upcasted.
@@ -928,17 +770,12 @@ extension ExerciseSearchDetailsPatterns on ExerciseSearchDetails {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult map<TResult extends Object?>(
-    TResult Function(_ExerciseSearchDetails value) $default,
-  ) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseSearchDetails():
-        return $default(_that);
-    }
+  @optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _ExerciseSearchDetails value) $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseSearchDetails():
+  return $default(_that);}
   }
-
   /// A variant of `map` that fallback to returning `null`.
   ///
   /// It is equivalent to doing:
@@ -951,19 +788,15 @@ extension ExerciseSearchDetailsPatterns on ExerciseSearchDetails {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult? mapOrNull<TResult extends Object?>(
-    TResult? Function(_ExerciseSearchDetails value)? $default,
-  ) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseSearchDetails() when $default != null:
-        return $default(_that);
-      case _:
-        return null;
-    }
-  }
+  @optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _ExerciseSearchDetails value)? $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseSearchDetails() when $default != null:
+  return $default(_that);case _:
+  return null;
 
+  }
+  }
   /// A variant of `when` that fallback to an `orElse` callback.
   ///
   /// It is equivalent to doing:
@@ -976,28 +809,14 @@ extension ExerciseSearchDetailsPatterns on ExerciseSearchDetails {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult maybeWhen<TResult extends Object?>(
-    TResult Function(
-            @JsonKey(name: 'id') int translationId,
-            @JsonKey(name: 'base_id') int exerciseId,
-            String name,
-            String category,
-            String? image,
-            @JsonKey(name: 'image_thumbnail') String? imageThumbnail)?
-        $default, {
-    required TResult orElse(),
-  }) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseSearchDetails() when $default != null:
-        return $default(_that.translationId, _that.exerciseId, _that.name, _that.category,
-            _that.image, _that.imageThumbnail);
-      case _:
-        return orElse();
-    }
-  }
+  @optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function(@JsonKey(name: 'id') int translationId, @JsonKey(name: 'base_id') int exerciseId, String name, String category, String? image, @JsonKey(name: 'image_thumbnail') String? imageThumbnail)? $default,{required TResult orElse(),}) {final _that = this;
+  switch (_that) {
+  case _ExerciseSearchDetails() when $default != null:
+  return $default(_that.translationId,_that.exerciseId,_that.name,_that.category,_that.image,_that.imageThumbnail);case _:
+  return orElse();
 
+  }
+  }
   /// A `switch`-like method, using callbacks.
   ///
   /// As opposed to `map`, this offers destructuring.
@@ -1011,25 +830,11 @@ extension ExerciseSearchDetailsPatterns on ExerciseSearchDetails {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult when<TResult extends Object?>(
-    TResult Function(
-            @JsonKey(name: 'id') int translationId,
-            @JsonKey(name: 'base_id') int exerciseId,
-            String name,
-            String category,
-            String? image,
-            @JsonKey(name: 'image_thumbnail') String? imageThumbnail)
-        $default,
-  ) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseSearchDetails():
-        return $default(_that.translationId, _that.exerciseId, _that.name, _that.category,
-            _that.image, _that.imageThumbnail);
-    }
+  @optionalTypeArgs TResult when<TResult extends Object?>(TResult Function(@JsonKey(name: 'id') int translationId, @JsonKey(name: 'base_id') int exerciseId, String name, String category, String? image, @JsonKey(name: 'image_thumbnail') String? imageThumbnail) $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseSearchDetails():
+  return $default(_that.translationId,_that.exerciseId,_that.name,_that.category,_that.image,_that.imageThumbnail);}
   }
-
   /// A variant of `when` that fallback to returning `null`
   ///
   /// It is equivalent to doing:
@@ -1042,38 +847,25 @@ extension ExerciseSearchDetailsPatterns on ExerciseSearchDetails {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult? whenOrNull<TResult extends Object?>(
-    TResult? Function(
-            @JsonKey(name: 'id') int translationId,
-            @JsonKey(name: 'base_id') int exerciseId,
-            String name,
-            String category,
-            String? image,
-            @JsonKey(name: 'image_thumbnail') String? imageThumbnail)?
-        $default,
-  ) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseSearchDetails() when $default != null:
-        return $default(_that.translationId, _that.exerciseId, _that.name, _that.category,
-            _that.image, _that.imageThumbnail);
-      case _:
-        return null;
-    }
+  @optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function(@JsonKey(name: 'id') int translationId, @JsonKey(name: 'base_id') int exerciseId, String name, String category, String? image, @JsonKey(name: 'image_thumbnail') String? imageThumbnail)? $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseSearchDetails() when $default != null:
+  return $default(_that.translationId,_that.exerciseId,_that.name,_that.category,_that.image,_that.imageThumbnail);case _:
+  return null;
+
   }
+  }
+
 }
 
 /// @nodoc
 @JsonSerializable()
+
 class _ExerciseSearchDetails implements ExerciseSearchDetails {
-  _ExerciseSearchDetails(
-      {@JsonKey(name: 'id') required this.translationId,
-      @JsonKey(name: 'base_id') required this.exerciseId,
-      required this.name,
-      required this.category,
-      required this.image,
-      @JsonKey(name: 'image_thumbnail') required this.imageThumbnail});
+  _ExerciseSearchDetails({@JsonKey(name: 'id') required this.translationId, @JsonKey(
+      name: 'base_id') required this.exerciseId, required this.name, required this.category, required this.image, @JsonKey(
+      name: 'image_thumbnail') required this.imageThumbnail});
+
   factory _ExerciseSearchDetails.fromJson(Map<String, dynamic> json) =>
       _$ExerciseSearchDetailsFromJson(json);
 
@@ -1085,12 +877,9 @@ class _ExerciseSearchDetails implements ExerciseSearchDetails {
   @override
   @JsonKey(name: 'base_id')
   final int exerciseId;
-  @override
-  final String name;
-  @override
-  final String category;
-  @override
-  final String? image;
+  @override final String name;
+  @override final String category;
+  @override final String? image;
 // ignore: invalid_annotation_target
   @override
   @JsonKey(name: 'image_thumbnail')
@@ -1106,16 +895,13 @@ class _ExerciseSearchDetails implements ExerciseSearchDetails {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$ExerciseSearchDetailsToJson(
-      this,
-    );
+    return _$ExerciseSearchDetailsToJson(this,);
   }
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _ExerciseSearchDetails &&
+        (other.runtimeType == runtimeType && other is _ExerciseSearchDetails &&
             (identical(other.translationId, translationId) ||
                 other.translationId == translationId) &&
             (identical(other.exerciseId, exerciseId) || other.exerciseId == exerciseId) &&
@@ -1129,33 +915,42 @@ class _ExerciseSearchDetails implements ExerciseSearchDetails {
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
   int get hashCode =>
-      Object.hash(runtimeType, translationId, exerciseId, name, category, image, imageThumbnail);
+      Object.hash(
+          runtimeType,
+          translationId,
+          exerciseId,
+          name,
+          category,
+          image,
+          imageThumbnail);
 
   @override
   String toString() {
     return 'ExerciseSearchDetails(translationId: $translationId, exerciseId: $exerciseId, name: $name, category: $category, image: $image, imageThumbnail: $imageThumbnail)';
   }
+
+
 }
 
 /// @nodoc
 abstract mixin class _$ExerciseSearchDetailsCopyWith<$Res>
     implements $ExerciseSearchDetailsCopyWith<$Res> {
-  factory _$ExerciseSearchDetailsCopyWith(
-          _ExerciseSearchDetails value, $Res Function(_ExerciseSearchDetails) _then) =
-      __$ExerciseSearchDetailsCopyWithImpl;
+  factory _$ExerciseSearchDetailsCopyWith(_ExerciseSearchDetails value,
+      $Res Function(_ExerciseSearchDetails) _then) = __$ExerciseSearchDetailsCopyWithImpl;
+
   @override
   @useResult
-  $Res call(
-      {@JsonKey(name: 'id') int translationId,
-      @JsonKey(name: 'base_id') int exerciseId,
-      String name,
-      String category,
-      String? image,
-      @JsonKey(name: 'image_thumbnail') String? imageThumbnail});
-}
+  $Res call({
+    @JsonKey(name: 'id') int translationId, @JsonKey(
+        name: 'base_id') int exerciseId, String name, String category, String? image, @JsonKey(
+        name: 'image_thumbnail') String? imageThumbnail
+  });
 
+
+}
 /// @nodoc
-class __$ExerciseSearchDetailsCopyWithImpl<$Res> implements _$ExerciseSearchDetailsCopyWith<$Res> {
+class __$ExerciseSearchDetailsCopyWithImpl<$Res>
+    implements _$ExerciseSearchDetailsCopyWith<$Res> {
   __$ExerciseSearchDetailsCopyWithImpl(this._self, this._then);
 
   final _ExerciseSearchDetails _self;
@@ -1165,46 +960,41 @@ class __$ExerciseSearchDetailsCopyWithImpl<$Res> implements _$ExerciseSearchDeta
   /// with the given fields replaced by the non-null parameter values.
   @override
   @pragma('vm:prefer-inline')
-  $Res call({
-    Object? translationId = null,
-    Object? exerciseId = null,
-    Object? name = null,
-    Object? category = null,
-    Object? image = freezed,
-    Object? imageThumbnail = freezed,
-  }) {
+  $Res call(
+      {Object? translationId = null, Object? exerciseId = null, Object? name = null, Object? category = null, Object? image = freezed, Object? imageThumbnail = freezed,}) {
     return _then(_ExerciseSearchDetails(
       translationId: null == translationId
           ? _self.translationId
           : translationId // ignore: cast_nullable_to_non_nullable
-              as int,
+      as int,
       exerciseId: null == exerciseId
           ? _self.exerciseId
           : exerciseId // ignore: cast_nullable_to_non_nullable
-              as int,
-      name: null == name
-          ? _self.name
-          : name // ignore: cast_nullable_to_non_nullable
-              as String,
+      as int,
+      name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+      as String,
       category: null == category
           ? _self.category
           : category // ignore: cast_nullable_to_non_nullable
-              as String,
-      image: freezed == image
-          ? _self.image
-          : image // ignore: cast_nullable_to_non_nullable
-              as String?,
+      as String,
+      image: freezed == image ? _self.image : image // ignore: cast_nullable_to_non_nullable
+      as String?,
       imageThumbnail: freezed == imageThumbnail
           ? _self.imageThumbnail
           : imageThumbnail // ignore: cast_nullable_to_non_nullable
-              as String?,
+      as String?,
     ));
   }
+
+
 }
 
+
 /// @nodoc
 mixin _$ExerciseSearchEntry {
+
   String get value;
+
   ExerciseSearchDetails get data;
 
   /// Create a copy of ExerciseSearchEntry
@@ -1218,11 +1008,11 @@ mixin _$ExerciseSearchEntry {
   /// Serializes this ExerciseSearchEntry to a JSON map.
   Map<String, dynamic> toJson();
 
+
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is ExerciseSearchEntry &&
+        (other.runtimeType == runtimeType && other is ExerciseSearchEntry &&
             (identical(other.value, value) || other.value == value) &&
             (identical(other.data, data) || other.data == data));
   }
@@ -1235,21 +1025,27 @@ mixin _$ExerciseSearchEntry {
   String toString() {
     return 'ExerciseSearchEntry(value: $value, data: $data)';
   }
+
+
 }
 
 /// @nodoc
 abstract mixin class $ExerciseSearchEntryCopyWith<$Res> {
-  factory $ExerciseSearchEntryCopyWith(
-          ExerciseSearchEntry value, $Res Function(ExerciseSearchEntry) _then) =
-      _$ExerciseSearchEntryCopyWithImpl;
+  factory $ExerciseSearchEntryCopyWith(ExerciseSearchEntry value,
+      $Res Function(ExerciseSearchEntry) _then) = _$ExerciseSearchEntryCopyWithImpl;
+
   @useResult
-  $Res call({String value, ExerciseSearchDetails data});
+  $Res call({
+    String value, ExerciseSearchDetails data
+  });
+
 
   $ExerciseSearchDetailsCopyWith<$Res> get data;
-}
 
+}
 /// @nodoc
-class _$ExerciseSearchEntryCopyWithImpl<$Res> implements $ExerciseSearchEntryCopyWith<$Res> {
+class _$ExerciseSearchEntryCopyWithImpl<$Res>
+    implements $ExerciseSearchEntryCopyWith<$Res> {
   _$ExerciseSearchEntryCopyWithImpl(this._self, this._then);
 
   final ExerciseSearchEntry _self;
@@ -1259,19 +1055,11 @@ class _$ExerciseSearchEntryCopyWithImpl<$Res> implements $ExerciseSearchEntryCop
   /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
-  $Res call({
-    Object? value = null,
-    Object? data = null,
-  }) {
+  $Res call({Object? value = null, Object? data = null,}) {
     return _then(_self.copyWith(
-      value: null == value
-          ? _self.value
-          : value // ignore: cast_nullable_to_non_nullable
-              as String,
-      data: null == data
-          ? _self.data
-          : data // ignore: cast_nullable_to_non_nullable
-              as ExerciseSearchDetails,
+      value: null == value ? _self.value : value // ignore: cast_nullable_to_non_nullable
+      as String, data: null == data ? _self.data : data // ignore: cast_nullable_to_non_nullable
+    as ExerciseSearchDetails,
     ));
   }
 
@@ -1286,6 +1074,7 @@ class _$ExerciseSearchEntryCopyWithImpl<$Res> implements $ExerciseSearchEntryCop
   }
 }
 
+
 /// Adds pattern-matching-related methods to [ExerciseSearchEntry].
 extension ExerciseSearchEntryPatterns on ExerciseSearchEntry {
   /// A variant of `map` that fallback to returning `orElse`.
@@ -1300,20 +1089,29 @@ extension ExerciseSearchEntryPatterns on ExerciseSearchEntry {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult maybeMap<TResult extends Object?>(
-    TResult Function(_ExerciseSearchEntry value)? $default, {
-    required TResult orElse(),
-  }) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseSearchEntry() when $default != null:
-        return $default(_that);
-      case _:
-        return orElse();
-    }
-  }
+  @optionalTypeArgs TResult maybeMap
 
+  <
+
+  TResult
+
+  extends
+
+  Object?
+
+  >
+
+  (
+
+  TResult Function( _ExerciseSearchEntry value)? $default,{required TResult orElse(),}){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseSearchEntry() when $default != null:
+  return $default(_that);case _:
+  return orElse();
+
+  }
+  }
   /// A `switch`-like method, using callbacks.
   ///
   /// Callbacks receives the raw object, upcasted.
@@ -1327,17 +1125,12 @@ extension ExerciseSearchEntryPatterns on ExerciseSearchEntry {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult map<TResult extends Object?>(
-    TResult Function(_ExerciseSearchEntry value) $default,
-  ) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseSearchEntry():
-        return $default(_that);
-    }
+  @optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _ExerciseSearchEntry value) $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseSearchEntry():
+  return $default(_that);}
   }
-
   /// A variant of `map` that fallback to returning `null`.
   ///
   /// It is equivalent to doing:
@@ -1350,19 +1143,15 @@ extension ExerciseSearchEntryPatterns on ExerciseSearchEntry {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult? mapOrNull<TResult extends Object?>(
-    TResult? Function(_ExerciseSearchEntry value)? $default,
-  ) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseSearchEntry() when $default != null:
-        return $default(_that);
-      case _:
-        return null;
-    }
-  }
+  @optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _ExerciseSearchEntry value)? $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseSearchEntry() when $default != null:
+  return $default(_that);case _:
+  return null;
 
+  }
+  }
   /// A variant of `when` that fallback to an `orElse` callback.
   ///
   /// It is equivalent to doing:
@@ -1375,20 +1164,14 @@ extension ExerciseSearchEntryPatterns on ExerciseSearchEntry {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult maybeWhen<TResult extends Object?>(
-    TResult Function(String value, ExerciseSearchDetails data)? $default, {
-    required TResult orElse(),
-  }) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseSearchEntry() when $default != null:
-        return $default(_that.value, _that.data);
-      case _:
-        return orElse();
-    }
-  }
+  @optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String value, ExerciseSearchDetails data)? $default,{required TResult orElse(),}) {final _that = this;
+  switch (_that) {
+  case _ExerciseSearchEntry() when $default != null:
+  return $default(_that.value,_that.data);case _:
+  return orElse();
 
+  }
+  }
   /// A `switch`-like method, using callbacks.
   ///
   /// As opposed to `map`, this offers destructuring.
@@ -1402,17 +1185,11 @@ extension ExerciseSearchEntryPatterns on ExerciseSearchEntry {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult when<TResult extends Object?>(
-    TResult Function(String value, ExerciseSearchDetails data) $default,
-  ) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseSearchEntry():
-        return $default(_that.value, _that.data);
-    }
+  @optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String value, ExerciseSearchDetails data) $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseSearchEntry():
+  return $default(_that.value,_that.data);}
   }
-
   /// A variant of `when` that fallback to returning `null`
   ///
   /// It is equivalent to doing:
@@ -1425,31 +1202,28 @@ extension ExerciseSearchEntryPatterns on ExerciseSearchEntry {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult? whenOrNull<TResult extends Object?>(
-    TResult? Function(String value, ExerciseSearchDetails data)? $default,
-  ) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseSearchEntry() when $default != null:
-        return $default(_that.value, _that.data);
-      case _:
-        return null;
-    }
+  @optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String value, ExerciseSearchDetails data)? $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseSearchEntry() when $default != null:
+  return $default(_that.value,_that.data);case _:
+  return null;
+
   }
+  }
+
 }
 
 /// @nodoc
 @JsonSerializable()
+
 class _ExerciseSearchEntry implements ExerciseSearchEntry {
   _ExerciseSearchEntry({required this.value, required this.data});
+
   factory _ExerciseSearchEntry.fromJson(Map<String, dynamic> json) =>
       _$ExerciseSearchEntryFromJson(json);
 
-  @override
-  final String value;
-  @override
-  final ExerciseSearchDetails data;
+  @override final String value;
+  @override final ExerciseSearchDetails data;
 
   /// Create a copy of ExerciseSearchEntry
   /// with the given fields replaced by the non-null parameter values.
@@ -1461,16 +1235,13 @@ class _ExerciseSearchEntry implements ExerciseSearchEntry {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$ExerciseSearchEntryToJson(
-      this,
-    );
+    return _$ExerciseSearchEntryToJson(this,);
   }
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _ExerciseSearchEntry &&
+        (other.runtimeType == runtimeType && other is _ExerciseSearchEntry &&
             (identical(other.value, value) || other.value == value) &&
             (identical(other.data, data) || other.data == data));
   }
@@ -1483,24 +1254,29 @@ class _ExerciseSearchEntry implements ExerciseSearchEntry {
   String toString() {
     return 'ExerciseSearchEntry(value: $value, data: $data)';
   }
+
+
 }
 
 /// @nodoc
 abstract mixin class _$ExerciseSearchEntryCopyWith<$Res>
     implements $ExerciseSearchEntryCopyWith<$Res> {
-  factory _$ExerciseSearchEntryCopyWith(
-          _ExerciseSearchEntry value, $Res Function(_ExerciseSearchEntry) _then) =
-      __$ExerciseSearchEntryCopyWithImpl;
+  factory _$ExerciseSearchEntryCopyWith(_ExerciseSearchEntry value,
+      $Res Function(_ExerciseSearchEntry) _then) = __$ExerciseSearchEntryCopyWithImpl;
+
   @override
   @useResult
-  $Res call({String value, ExerciseSearchDetails data});
+  $Res call({
+    String value, ExerciseSearchDetails data
+  });
+
+
+  @override $ExerciseSearchDetailsCopyWith<$Res> get data;
 
-  @override
-  $ExerciseSearchDetailsCopyWith<$Res> get data;
 }
-
 /// @nodoc
-class __$ExerciseSearchEntryCopyWithImpl<$Res> implements _$ExerciseSearchEntryCopyWith<$Res> {
+class __$ExerciseSearchEntryCopyWithImpl<$Res>
+    implements _$ExerciseSearchEntryCopyWith<$Res> {
   __$ExerciseSearchEntryCopyWithImpl(this._self, this._then);
 
   final _ExerciseSearchEntry _self;
@@ -1510,19 +1286,11 @@ class __$ExerciseSearchEntryCopyWithImpl<$Res> implements _$ExerciseSearchEntryC
   /// with the given fields replaced by the non-null parameter values.
   @override
   @pragma('vm:prefer-inline')
-  $Res call({
-    Object? value = null,
-    Object? data = null,
-  }) {
+  $Res call({Object? value = null, Object? data = null,}) {
     return _then(_ExerciseSearchEntry(
-      value: null == value
-          ? _self.value
-          : value // ignore: cast_nullable_to_non_nullable
-              as String,
-      data: null == data
-          ? _self.data
-          : data // ignore: cast_nullable_to_non_nullable
-              as ExerciseSearchDetails,
+      value: null == value ? _self.value : value // ignore: cast_nullable_to_non_nullable
+      as String, data: null == data ? _self.data : data // ignore: cast_nullable_to_non_nullable
+    as ExerciseSearchDetails,
     ));
   }
 
@@ -1537,8 +1305,10 @@ class __$ExerciseSearchEntryCopyWithImpl<$Res> implements _$ExerciseSearchEntryC
   }
 }
 
+
 /// @nodoc
 mixin _$ExerciseApiSearch {
+
   List<ExerciseSearchEntry> get suggestions;
 
   /// Create a copy of ExerciseApiSearch
@@ -1551,11 +1321,11 @@ mixin _$ExerciseApiSearch {
   /// Serializes this ExerciseApiSearch to a JSON map.
   Map<String, dynamic> toJson();
 
+
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is ExerciseApiSearch &&
+        (other.runtimeType == runtimeType && other is ExerciseApiSearch &&
             const DeepCollectionEquality().equals(other.suggestions, suggestions));
   }
 
@@ -1567,19 +1337,25 @@ mixin _$ExerciseApiSearch {
   String toString() {
     return 'ExerciseApiSearch(suggestions: $suggestions)';
   }
+
+
 }
 
 /// @nodoc
 abstract mixin class $ExerciseApiSearchCopyWith<$Res> {
-  factory $ExerciseApiSearchCopyWith(
-          ExerciseApiSearch value, $Res Function(ExerciseApiSearch) _then) =
-      _$ExerciseApiSearchCopyWithImpl;
-  @useResult
-  $Res call({List<ExerciseSearchEntry> suggestions});
-}
+  factory $ExerciseApiSearchCopyWith(ExerciseApiSearch value,
+      $Res Function(ExerciseApiSearch) _then) = _$ExerciseApiSearchCopyWithImpl;
 
+  @useResult
+  $Res call({
+    List<ExerciseSearchEntry> suggestions
+  });
+
+
+}
 /// @nodoc
-class _$ExerciseApiSearchCopyWithImpl<$Res> implements $ExerciseApiSearchCopyWith<$Res> {
+class _$ExerciseApiSearchCopyWithImpl<$Res>
+    implements $ExerciseApiSearchCopyWith<$Res> {
   _$ExerciseApiSearchCopyWithImpl(this._self, this._then);
 
   final ExerciseApiSearch _self;
@@ -1589,18 +1365,18 @@ class _$ExerciseApiSearchCopyWithImpl<$Res> implements $ExerciseApiSearchCopyWit
   /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
-  $Res call({
-    Object? suggestions = null,
-  }) {
+  $Res call({Object? suggestions = null,}) {
     return _then(_self.copyWith(
       suggestions: null == suggestions
           ? _self.suggestions
           : suggestions // ignore: cast_nullable_to_non_nullable
-              as List<ExerciseSearchEntry>,
+      as List<ExerciseSearchEntry>,
     ));
   }
+
 }
 
+
 /// Adds pattern-matching-related methods to [ExerciseApiSearch].
 extension ExerciseApiSearchPatterns on ExerciseApiSearch {
   /// A variant of `map` that fallback to returning `orElse`.
@@ -1615,20 +1391,29 @@ extension ExerciseApiSearchPatterns on ExerciseApiSearch {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult maybeMap<TResult extends Object?>(
-    TResult Function(_ExerciseApiSearch value)? $default, {
-    required TResult orElse(),
-  }) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseApiSearch() when $default != null:
-        return $default(_that);
-      case _:
-        return orElse();
-    }
-  }
+  @optionalTypeArgs TResult maybeMap
 
+  <
+
+  TResult
+
+  extends
+
+  Object?
+
+  >
+
+  (
+
+  TResult Function( _ExerciseApiSearch value)? $default,{required TResult orElse(),}){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseApiSearch() when $default != null:
+  return $default(_that);case _:
+  return orElse();
+
+  }
+  }
   /// A `switch`-like method, using callbacks.
   ///
   /// Callbacks receives the raw object, upcasted.
@@ -1642,17 +1427,12 @@ extension ExerciseApiSearchPatterns on ExerciseApiSearch {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult map<TResult extends Object?>(
-    TResult Function(_ExerciseApiSearch value) $default,
-  ) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseApiSearch():
-        return $default(_that);
-    }
+  @optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _ExerciseApiSearch value) $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseApiSearch():
+  return $default(_that);}
   }
-
   /// A variant of `map` that fallback to returning `null`.
   ///
   /// It is equivalent to doing:
@@ -1665,19 +1445,15 @@ extension ExerciseApiSearchPatterns on ExerciseApiSearch {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult? mapOrNull<TResult extends Object?>(
-    TResult? Function(_ExerciseApiSearch value)? $default,
-  ) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseApiSearch() when $default != null:
-        return $default(_that);
-      case _:
-        return null;
-    }
-  }
+  @optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _ExerciseApiSearch value)? $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseApiSearch() when $default != null:
+  return $default(_that);case _:
+  return null;
 
+  }
+  }
   /// A variant of `when` that fallback to an `orElse` callback.
   ///
   /// It is equivalent to doing:
@@ -1690,20 +1466,14 @@ extension ExerciseApiSearchPatterns on ExerciseApiSearch {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult maybeWhen<TResult extends Object?>(
-    TResult Function(List<ExerciseSearchEntry> suggestions)? $default, {
-    required TResult orElse(),
-  }) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseApiSearch() when $default != null:
-        return $default(_that.suggestions);
-      case _:
-        return orElse();
-    }
-  }
+  @optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( List<ExerciseSearchEntry> suggestions)? $default,{required TResult orElse(),}) {final _that = this;
+  switch (_that) {
+  case _ExerciseApiSearch() when $default != null:
+  return $default(_that.suggestions);case _:
+  return orElse();
 
+  }
+  }
   /// A `switch`-like method, using callbacks.
   ///
   /// As opposed to `map`, this offers destructuring.
@@ -1717,17 +1487,11 @@ extension ExerciseApiSearchPatterns on ExerciseApiSearch {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult when<TResult extends Object?>(
-    TResult Function(List<ExerciseSearchEntry> suggestions) $default,
-  ) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseApiSearch():
-        return $default(_that.suggestions);
-    }
+  @optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( List<ExerciseSearchEntry> suggestions) $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseApiSearch():
+  return $default(_that.suggestions);}
   }
-
   /// A variant of `when` that fallback to returning `null`
   ///
   /// It is equivalent to doing:
@@ -1740,18 +1504,15 @@ extension ExerciseApiSearchPatterns on ExerciseApiSearch {
   /// }
   /// ```
 
-  @optionalTypeArgs
-  TResult? whenOrNull<TResult extends Object?>(
-    TResult? Function(List<ExerciseSearchEntry> suggestions)? $default,
-  ) {
-    final _that = this;
-    switch (_that) {
-      case _ExerciseApiSearch() when $default != null:
-        return $default(_that.suggestions);
-      case _:
-        return null;
-    }
+  @optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( List<ExerciseSearchEntry> suggestions)? $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseApiSearch() when $default != null:
+  return $default(_that.suggestions);case _:
+  return null;
+
   }
+  }
+
 }
 
 /// @nodoc
@@ -1759,17 +1520,19 @@ extension ExerciseApiSearchPatterns on ExerciseApiSearch {
 class _ExerciseApiSearch implements ExerciseApiSearch {
   _ExerciseApiSearch({required final List<ExerciseSearchEntry> suggestions})
       : _suggestions = suggestions;
+
   factory _ExerciseApiSearch.fromJson(Map<String, dynamic> json) =>
       _$ExerciseApiSearchFromJson(json);
 
   final List<ExerciseSearchEntry> _suggestions;
-  @override
-  List<ExerciseSearchEntry> get suggestions {
+
+  @override List<ExerciseSearchEntry> get suggestions {
     if (_suggestions is EqualUnmodifiableListView) return _suggestions;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(_suggestions);
   }
 
+
   /// Create a copy of ExerciseApiSearch
   /// with the given fields replaced by the non-null parameter values.
   @override
@@ -1780,16 +1543,13 @@ class _ExerciseApiSearch implements ExerciseApiSearch {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$ExerciseApiSearchToJson(
-      this,
-    );
+    return _$ExerciseApiSearchToJson(this,);
   }
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _ExerciseApiSearch &&
+        (other.runtimeType == runtimeType && other is _ExerciseApiSearch &&
             const DeepCollectionEquality().equals(other._suggestions, _suggestions));
   }
 
@@ -1801,20 +1561,26 @@ class _ExerciseApiSearch implements ExerciseApiSearch {
   String toString() {
     return 'ExerciseApiSearch(suggestions: $suggestions)';
   }
+
+
 }
 
 /// @nodoc
 abstract mixin class _$ExerciseApiSearchCopyWith<$Res> implements $ExerciseApiSearchCopyWith<$Res> {
-  factory _$ExerciseApiSearchCopyWith(
-          _ExerciseApiSearch value, $Res Function(_ExerciseApiSearch) _then) =
-      __$ExerciseApiSearchCopyWithImpl;
+  factory _$ExerciseApiSearchCopyWith(_ExerciseApiSearch value,
+      $Res Function(_ExerciseApiSearch) _then) = __$ExerciseApiSearchCopyWithImpl;
+
   @override
   @useResult
-  $Res call({List<ExerciseSearchEntry> suggestions});
-}
+  $Res call({
+    List<ExerciseSearchEntry> suggestions
+  });
 
+
+}
 /// @nodoc
-class __$ExerciseApiSearchCopyWithImpl<$Res> implements _$ExerciseApiSearchCopyWith<$Res> {
+class __$ExerciseApiSearchCopyWithImpl<$Res>
+    implements _$ExerciseApiSearchCopyWith<$Res> {
   __$ExerciseApiSearchCopyWithImpl(this._self, this._then);
 
   final _ExerciseApiSearch _self;
@@ -1824,16 +1590,16 @@ class __$ExerciseApiSearchCopyWithImpl<$Res> implements _$ExerciseApiSearchCopyW
   /// with the given fields replaced by the non-null parameter values.
   @override
   @pragma('vm:prefer-inline')
-  $Res call({
-    Object? suggestions = null,
-  }) {
+  $Res call({Object? suggestions = null,}) {
     return _then(_ExerciseApiSearch(
       suggestions: null == suggestions
           ? _self._suggestions
           : suggestions // ignore: cast_nullable_to_non_nullable
-              as List<ExerciseSearchEntry>,
+      as List<ExerciseSearchEntry>,
     ));
   }
+
+
 }
 
 // dart format on
diff --git a/lib/models/exercises/exercise_api.g.dart b/lib/models/exercises/exercise_api.g.dart
index 99a9a585..76d995a6 100644
--- a/lib/models/exercises/exercise_api.g.dart
+++ b/lib/models/exercises/exercise_api.g.dart
@@ -7,54 +7,54 @@ part of 'exercise_api.dart';
 // **************************************************************************
 
 _ExerciseBaseData _$ExerciseBaseDataFromJson(Map<String, dynamic> json) => _ExerciseBaseData(
-      id: (json['id'] as num).toInt(),
-      uuid: json['uuid'] as String,
-      variationId: (json['variations'] as num?)?.toInt() ?? null,
-      created: DateTime.parse(json['created'] as String),
-      lastUpdate: DateTime.parse(json['last_update'] as String),
-      lastUpdateGlobal: DateTime.parse(json['last_update_global'] as String),
-      category: ExerciseCategory.fromJson(json['category'] as Map<String, dynamic>),
-      muscles: (json['muscles'] as List<dynamic>)
-          .map((e) => Muscle.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      musclesSecondary: (json['muscles_secondary'] as List<dynamic>)
-          .map((e) => Muscle.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      equipment: (json['equipment'] as List<dynamic>)
-          .map((e) => Equipment.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      translations: (json['translations'] as List<dynamic>?)
-              ?.map((e) => Translation.fromJson(e as Map<String, dynamic>))
-              .toList() ??
-          [],
-      images: (json['images'] as List<dynamic>)
-          .map((e) => ExerciseImage.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      videos: (json['videos'] as List<dynamic>)
-          .map((e) => Video.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      authors: (json['author_history'] as List<dynamic>).map((e) => e as String).toList(),
-      authorsGlobal:
-          (json['total_authors_history'] as List<dynamic>).map((e) => e as String).toList(),
-    );
+  id: (json['id'] as num).toInt(),
+  uuid: json['uuid'] as String,
+  variationId: (json['variations'] as num?)?.toInt() ?? null,
+  created: DateTime.parse(json['created'] as String),
+  lastUpdate: DateTime.parse(json['last_update'] as String),
+  lastUpdateGlobal: DateTime.parse(json['last_update_global'] as String),
+  category: ExerciseCategory.fromJson(json['category'] as Map<String, dynamic>),
+  muscles: (json['muscles'] as List<dynamic>)
+      .map((e) => Muscle.fromJson(e as Map<String, dynamic>))
+      .toList(),
+  musclesSecondary: (json['muscles_secondary'] as List<dynamic>)
+      .map((e) => Muscle.fromJson(e as Map<String, dynamic>))
+      .toList(),
+  equipment: (json['equipment'] as List<dynamic>)
+      .map((e) => Equipment.fromJson(e as Map<String, dynamic>))
+      .toList(),
+  translations:
+      (json['translations'] as List<dynamic>?)
+          ?.map((e) => Translation.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
+  images: (json['images'] as List<dynamic>)
+      .map((e) => ExerciseImage.fromJson(e as Map<String, dynamic>))
+      .toList(),
+  videos: (json['videos'] as List<dynamic>)
+      .map((e) => Video.fromJson(e as Map<String, dynamic>))
+      .toList(),
+  authors: (json['author_history'] as List<dynamic>).map((e) => e as String).toList(),
+  authorsGlobal: (json['total_authors_history'] as List<dynamic>).map((e) => e as String).toList(),
+);
 
 Map<String, dynamic> _$ExerciseBaseDataToJson(_ExerciseBaseData instance) => <String, dynamic>{
-      'id': instance.id,
-      'uuid': instance.uuid,
-      'variations': instance.variationId,
-      'created': instance.created.toIso8601String(),
-      'last_update': instance.lastUpdate.toIso8601String(),
-      'last_update_global': instance.lastUpdateGlobal.toIso8601String(),
-      'category': instance.category,
-      'muscles': instance.muscles,
-      'muscles_secondary': instance.musclesSecondary,
-      'equipment': instance.equipment,
-      'translations': instance.translations,
-      'images': instance.images,
-      'videos': instance.videos,
-      'author_history': instance.authors,
-      'total_authors_history': instance.authorsGlobal,
-    };
+  'id': instance.id,
+  'uuid': instance.uuid,
+  'variations': instance.variationId,
+  'created': instance.created.toIso8601String(),
+  'last_update': instance.lastUpdate.toIso8601String(),
+  'last_update_global': instance.lastUpdateGlobal.toIso8601String(),
+  'category': instance.category,
+  'muscles': instance.muscles,
+  'muscles_secondary': instance.musclesSecondary,
+  'equipment': instance.equipment,
+  'translations': instance.translations,
+  'images': instance.images,
+  'videos': instance.videos,
+  'author_history': instance.authors,
+  'total_authors_history': instance.authorsGlobal,
+};
 
 _ExerciseSearchDetails _$ExerciseSearchDetailsFromJson(Map<String, dynamic> json) =>
     _ExerciseSearchDetails(
@@ -83,17 +83,14 @@ _ExerciseSearchEntry _$ExerciseSearchEntryFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$ExerciseSearchEntryToJson(_ExerciseSearchEntry instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-      'data': instance.data,
-    };
+    <String, dynamic>{'value': instance.value, 'data': instance.data};
 
 _ExerciseApiSearch _$ExerciseApiSearchFromJson(Map<String, dynamic> json) => _ExerciseApiSearch(
-      suggestions: (json['suggestions'] as List<dynamic>)
-          .map((e) => ExerciseSearchEntry.fromJson(e as Map<String, dynamic>))
-          .toList(),
-    );
+  suggestions: (json['suggestions'] as List<dynamic>)
+      .map((e) => ExerciseSearchEntry.fromJson(e as Map<String, dynamic>))
+      .toList(),
+);
 
 Map<String, dynamic> _$ExerciseApiSearchToJson(_ExerciseApiSearch instance) => <String, dynamic>{
-      'suggestions': instance.suggestions,
-    };
+  'suggestions': instance.suggestions,
+};
diff --git a/lib/models/exercises/exercise_submission.freezed.dart b/lib/models/exercises/exercise_submission.freezed.dart
index d9e03d64..4babf039 100644
--- a/lib/models/exercises/exercise_submission.freezed.dart
+++ b/lib/models/exercises/exercise_submission.freezed.dart
@@ -660,6 +660,8 @@ abstract mixin class $ExerciseTranslationSubmissionApiCopyWith<$Res> {
   });
 
 
+
+
 }
 /// @nodoc
 class _$ExerciseTranslationSubmissionApiCopyWithImpl<$Res>
@@ -941,6 +943,8 @@ abstract mixin class _$ExerciseTranslationSubmissionApiCopyWith<$Res>
   });
 
 
+
+
 }
 /// @nodoc
 class __$ExerciseTranslationSubmissionApiCopyWithImpl<$Res>
@@ -1066,6 +1070,8 @@ abstract mixin class $ExerciseSubmissionApiCopyWith<$Res> {
   });
 
 
+
+
 }
 /// @nodoc
 class _$ExerciseSubmissionApiCopyWithImpl<$Res>
@@ -1385,6 +1391,8 @@ abstract mixin class _$ExerciseSubmissionApiCopyWith<$Res>
   });
 
 
+
+
 }
 /// @nodoc
 class __$ExerciseSubmissionApiCopyWithImpl<$Res>
diff --git a/lib/models/exercises/image.g.dart b/lib/models/exercises/image.g.dart
index 2cc1621f..c5baa02b 100644
--- a/lib/models/exercises/image.g.dart
+++ b/lib/models/exercises/image.g.dart
@@ -7,10 +7,7 @@ part of 'image.dart';
 // **************************************************************************
 
 ExerciseImage _$ExerciseImageFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'uuid', 'exercise', 'image'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'uuid', 'exercise', 'image']);
   return ExerciseImage(
     id: (json['id'] as num).toInt(),
     uuid: json['uuid'] as String,
@@ -21,9 +18,9 @@ ExerciseImage _$ExerciseImageFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$ExerciseImageToJson(ExerciseImage instance) => <String, dynamic>{
-      'id': instance.id,
-      'uuid': instance.uuid,
-      'exercise': instance.exerciseId,
-      'image': instance.url,
-      'is_main': instance.isMain,
-    };
+  'id': instance.id,
+  'uuid': instance.uuid,
+  'exercise': instance.exerciseId,
+  'image': instance.url,
+  'is_main': instance.isMain,
+};
diff --git a/lib/providers/exercises.dart b/lib/providers/exercises.dart
index 1040df25..5ab3d70f 100644
--- a/lib/providers/exercises.dart
+++ b/lib/providers/exercises.dart
@@ -42,7 +42,7 @@ class ExercisesProvider with ChangeNotifier {
   ExerciseDatabase database;
 
   ExercisesProvider(this.baseProvider, {ExerciseDatabase? database})
-      : database = database ?? locator<ExerciseDatabase>();
+    : database = database ?? locator<ExerciseDatabase>();
 
   static const EXERCISE_CACHE_DAYS = 7;
   static const CACHE_VERSION = 4;
@@ -118,17 +118,13 @@ class ExercisesProvider with ChangeNotifier {
         exerciseCategories: FilterCategory(
           title: 'Category',
           items: Map.fromEntries(
-            _categories.map(
-              (category) => MapEntry<ExerciseCategory, bool>(category, false),
-            ),
+            _categories.map((category) => MapEntry<ExerciseCategory, bool>(category, false)),
           ),
         ),
         equipment: FilterCategory(
           title: 'Equipment',
           items: Map.fromEntries(
-            _equipment.map(
-              (singleEquipment) => MapEntry<Equipment, bool>(singleEquipment, false),
-            ),
+            _equipment.map((singleEquipment) => MapEntry<Equipment, bool>(singleEquipment, false)),
           ),
         ),
       ),
@@ -191,10 +187,7 @@ class ExercisesProvider with ChangeNotifier {
   /// returned exercises. Since this is typically called by one exercise, we are
   /// not interested in seeing that same exercise returned in the list of variations.
   /// If this parameter is not passed, all exercises are returned.
-  List<Exercise> findExercisesByVariationId(
-    int? variationId, {
-    int? exerciseIdToExclude,
-  }) {
+  List<Exercise> findExercisesByVariationId(int? variationId, {int? exerciseIdToExclude}) {
     if (variationId == null) {
       return [];
     }
@@ -317,18 +310,16 @@ class ExercisesProvider with ChangeNotifier {
   /// -> yes: Do we need to re-fetch?
   ///    -> no: just return what we have in the DB
   ///    -> yes: fetch data and update if necessary
-  Future<Exercise> handleUpdateExerciseFromApi(
-    ExerciseDatabase database,
-    int exerciseId,
-  ) async {
+  Future<Exercise> handleUpdateExerciseFromApi(ExerciseDatabase database, int exerciseId) async {
     Exercise exercise;
 
     // NOTE: this should not be necessary anymore. We had a bug that would
     //       create duplicate entries in the database and should be fixed now.
     //       However, we keep it here for now to be on the safe side.
     //       In the future this can be replaced by a .getSingleOrNull()
-    final exerciseResult =
-        await (database.select(database.exercises)..where((e) => e.id.equals(exerciseId))).get();
+    final exerciseResult = await (database.select(
+      database.exercises,
+    )..where((e) => e.id.equals(exerciseId))).get();
 
     ExerciseTable? exerciseDb;
     if (exerciseResult.isNotEmpty) {
@@ -383,7 +374,9 @@ class ExercisesProvider with ChangeNotifier {
       exercise = Exercise.fromApiDataJson(exerciseData, _languages);
 
       if (exerciseDb == null) {
-        await database.into(database.exercises).insert(
+        await database
+            .into(database.exercises)
+            .insert(
               ExercisesCompanion.insert(
                 id: exercise.id!,
                 data: jsonEncode(exerciseData),
@@ -426,6 +419,7 @@ class ExercisesProvider with ChangeNotifier {
   }
 
   Future<void> clearAllCachesAndPrefs() async {
+    clear();
     await database.deleteEverything();
     await initCacheTimesLocalPrefs(forceInit: true);
   }
@@ -480,13 +474,15 @@ class ExercisesProvider with ChangeNotifier {
 
     // Insert new entries and update ones that have been edited
     Future.forEach(data, (exerciseData) async {
-      final exercise = await (database.select(database.exercises)
-            ..where((e) => e.id.equals(exerciseData['id'])))
-          .getSingleOrNull();
+      final exercise = await (database.select(
+        database.exercises,
+      )..where((e) => e.id.equals(exerciseData['id']))).getSingleOrNull();
 
       // New exercise, insert
       if (exercise == null) {
-        database.into(database.exercises).insert(
+        database
+            .into(database.exercises)
+            .insert(
               ExercisesCompanion.insert(
                 id: exerciseData['id'],
                 data: jsonEncode(exerciseData),
@@ -537,15 +533,10 @@ class ExercisesProvider with ChangeNotifier {
     await fetchAndSetMusclesFromApi();
     await database.delete(database.muscles).go();
     await Future.forEach(_muscles, (e) async {
-      await database.into(database.muscles).insert(
-            MusclesCompanion.insert(id: e.id, data: e),
-          );
+      await database.into(database.muscles).insert(MusclesCompanion.insert(id: e.id, data: e));
     });
     validTill = DateTime.now().add(const Duration(days: EXERCISE_CACHE_DAYS));
-    await prefs.setString(
-      PREFS_LAST_UPDATED_MUSCLES,
-      validTill.toIso8601String(),
-    );
+    await prefs.setString(PREFS_LAST_UPDATED_MUSCLES, validTill.toIso8601String());
     _logger.fine('Saved ${_muscles.length} muscles to cache (valid till $validTill)');
   }
 
@@ -571,15 +562,12 @@ class ExercisesProvider with ChangeNotifier {
     await fetchAndSetCategoriesFromApi();
     await database.delete(database.categories).go();
     await Future.forEach(_categories, (e) async {
-      await database.into(database.categories).insert(
-            CategoriesCompanion.insert(id: e.id, data: e),
-          );
+      await database
+          .into(database.categories)
+          .insert(CategoriesCompanion.insert(id: e.id, data: e));
     });
     validTill = DateTime.now().add(const Duration(days: EXERCISE_CACHE_DAYS));
-    await prefs.setString(
-      PREFS_LAST_UPDATED_CATEGORIES,
-      validTill.toIso8601String(),
-    );
+    await prefs.setString(PREFS_LAST_UPDATED_CATEGORIES, validTill.toIso8601String());
     _logger.fine('Saved ${_categories.length} categories to cache (valid till $validTill)');
   }
 
@@ -605,16 +593,11 @@ class ExercisesProvider with ChangeNotifier {
     await fetchAndSetLanguagesFromApi();
     await database.delete(database.languages).go();
     await Future.forEach(_languages, (e) async {
-      await database.into(database.languages).insert(
-            LanguagesCompanion.insert(id: e.id, data: e),
-          );
+      await database.into(database.languages).insert(LanguagesCompanion.insert(id: e.id, data: e));
     });
 
     validTill = DateTime.now().add(const Duration(days: EXERCISE_CACHE_DAYS));
-    await prefs.setString(
-      PREFS_LAST_UPDATED_LANGUAGES,
-      validTill.toIso8601String(),
-    );
+    await prefs.setString(PREFS_LAST_UPDATED_LANGUAGES, validTill.toIso8601String());
     _logger.info('Saved ${languages.length} languages to cache (valid till $validTill)');
   }
 
@@ -640,15 +623,12 @@ class ExercisesProvider with ChangeNotifier {
     await fetchAndSetEquipmentsFromApi();
     await database.delete(database.equipments).go();
     await Future.forEach(_equipment, (e) async {
-      await database.into(database.equipments).insert(
-            EquipmentsCompanion.insert(id: e.id, data: e),
-          );
+      await database
+          .into(database.equipments)
+          .insert(EquipmentsCompanion.insert(id: e.id, data: e));
     });
     validTill = DateTime.now().add(const Duration(days: EXERCISE_CACHE_DAYS));
-    await prefs.setString(
-      PREFS_LAST_UPDATED_EQUIPMENT,
-      validTill.toIso8601String(),
-    );
+    await prefs.setString(PREFS_LAST_UPDATED_EQUIPMENT, validTill.toIso8601String());
     _logger.fine('Saved ${_equipment.length} equipment entries to cache (valid till $validTill)');
   }
 
@@ -703,17 +683,9 @@ class FilterCategory<T> {
 
   List<T> get selected => [...items.keys].where((key) => items[key]!).toList();
 
-  FilterCategory({
-    required this.title,
-    required this.items,
-    this.isExpanded = false,
-  });
+  FilterCategory({required this.title, required this.items, this.isExpanded = false});
 
-  FilterCategory<T> copyWith({
-    bool? isExpanded,
-    Map<T, bool>? items,
-    String? title,
-  }) {
+  FilterCategory<T> copyWith({bool? isExpanded, Map<T, bool>? items, String? title}) {
     return FilterCategory(
       isExpanded: isExpanded ?? this.isExpanded,
       items: items ?? this.items,
diff --git a/lib/widgets/add_exercise/image_details_form.dart b/lib/widgets/add_exercise/image_details_form.dart
index 2e33a3d4..8b3414b6 100644
--- a/lib/widgets/add_exercise/image_details_form.dart
+++ b/lib/widgets/add_exercise/image_details_form.dart
@@ -1,4 +1,5 @@
 import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/widgets/add_exercise/license_info_widget.dart';
@@ -27,11 +28,11 @@ class ImageDetailsForm extends StatefulWidget {
   final VoidCallback onCancel;
 
   const ImageDetailsForm({
-    Key? key,
+    super.key,
     required this.imageFile,
     required this.onAdd,
     required this.onCancel,
-  }) : super(key: key);
+  });
 
   @override
   State<ImageDetailsForm> createState() => _ImageDetailsFormState();
@@ -134,7 +135,9 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
             children: [
               Text(
                 AppLocalizations.of(context).imageDetailsTitle,
-                style: Theme.of(context).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
+                style: Theme.of(
+                  context,
+                ).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
               ),
               const SizedBox(height: 16),
 
@@ -153,7 +156,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
               _buildTextField(
                 controller: _sourceLinkController,
                 label: AppLocalizations.of(context).imageDetailsSourceLink,
-                hint: AppLocalizations.of(context).imageDetailsSourceLinkHint,
+                hint: 'https://example.com',
                 keyboardType: TextInputType.url,
                 validator: _validateUrl,
               ),
@@ -171,7 +174,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
               _buildTextField(
                 controller: _authorLinkController,
                 label: AppLocalizations.of(context).imageDetailsAuthorLink,
-                hint: AppLocalizations.of(context).imageDetailsAuthorLinkHint,
+                hint: 'https://example.com/author',
                 keyboardType: TextInputType.url,
                 validator: _validateUrl,
               ),
@@ -181,7 +184,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
               _buildTextField(
                 controller: _originalSourceController,
                 label: AppLocalizations.of(context).imageDetailsDerivativeSource,
-                hint: AppLocalizations.of(context).imageDetailsDerivativeSourceHint,
+                hint: 'https://example.com/original',
                 keyboardType: TextInputType.url,
                 helperText: AppLocalizations.of(context).imageDetailsDerivativeHelp,
                 validator: _validateUrl,
@@ -253,6 +256,8 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
   /// Allows user to categorize the image as PHOTO, 3D render, LINE drawing,
   /// LOW-POLY art, or OTHER. This helps users find appropriate exercise images.
   Widget _buildImageTypeSelector() {
+    final theme = Theme.of(context);
+
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -277,11 +282,9 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
                 width: 90,
                 height: 90,
                 decoration: BoxDecoration(
-                  color: isSelected ? Colors.blue.shade50 : Colors.white,
-                  border: Border.all(
-                    color: isSelected ? Colors.blue : Colors.grey.shade300,
-                    width: isSelected ? 2 : 1,
-                  ),
+                  color: isSelected
+                      ? theme.buttonTheme.colorScheme!.primary
+                      : theme.buttonTheme.colorScheme!.primaryContainer,
                   borderRadius: BorderRadius.circular(4),
                 ),
                 child: Column(
@@ -290,7 +293,9 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
                     Icon(
                       type['icon'],
                       size: 32,
-                      color: isSelected ? Colors.blue : Colors.grey.shade600,
+                      color: isSelected
+                          ? theme.buttonTheme.colorScheme!.onPrimary
+                          : theme.buttonTheme.colorScheme!.primary,
                     ),
                     const SizedBox(height: 8),
                     Text(
@@ -371,4 +376,4 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
       ],
     );
   }
-}
\ No newline at end of file
+}
diff --git a/lib/widgets/core/settings.dart b/lib/widgets/core/settings.dart
index 66e7fce8..e5226a85 100644
--- a/lib/widgets/core/settings.dart
+++ b/lib/widgets/core/settings.dart
@@ -41,14 +41,12 @@ class SettingsPage extends StatelessWidget {
       body: ListView(
         children: [
           ListTile(
-            title: Text(
-              i18n.settingsCacheTitle,
-              style: Theme.of(context).textTheme.headlineSmall,
-            ),
+            title: Text(i18n.settingsCacheTitle, style: Theme.of(context).textTheme.headlineSmall),
           ),
           const SettingsExerciseCache(),
           ListTile(
             title: Text(i18n.settingsIngredientCacheDescription),
+            subtitle: Text('${nutritionProvider.ingredients.length} cached ingredients'),
             trailing: IconButton(
               key: const ValueKey('cacheIconIngredients'),
               icon: const Icon(Icons.delete),
@@ -56,21 +54,14 @@ class SettingsPage extends StatelessWidget {
                 await nutritionProvider.clearIngredientCache();
 
                 if (context.mounted) {
-                  final snackBar = SnackBar(
-                    content: Text(i18n.settingsCacheDeletedSnackbar),
-                  );
+                  final snackBar = SnackBar(content: Text(i18n.settingsCacheDeletedSnackbar));
 
                   ScaffoldMessenger.of(context).showSnackBar(snackBar);
                 }
               },
             ),
           ),
-          ListTile(
-            title: Text(
-              i18n.others,
-              style: Theme.of(context).textTheme.headlineSmall,
-            ),
-          ),
+          ListTile(title: Text(i18n.others, style: Theme.of(context).textTheme.headlineSmall)),
           ListTile(
             title: Text(i18n.themeMode),
             trailing: DropdownButton<ThemeMode>(
@@ -93,10 +84,7 @@ class SettingsPage extends StatelessWidget {
                   }
                 })();
 
-                return DropdownMenuItem<ThemeMode>(
-                  value: value,
-                  child: Text(label),
-                );
+                return DropdownMenuItem<ThemeMode>(value: value, child: Text(label));
               }).toList(),
             ),
           ),
diff --git a/lib/widgets/core/settings/exercise_cache.dart b/lib/widgets/core/settings/exercise_cache.dart
index 1eef754f..cb48efe1 100644
--- a/lib/widgets/core/settings/exercise_cache.dart
+++ b/lib/widgets/core/settings/exercise_cache.dart
@@ -22,68 +22,71 @@ class _SettingsExerciseCacheState extends State<SettingsExerciseCache> {
     return ListTile(
       enabled: !_isRefreshLoading,
       title: Text(i18n.settingsExerciseCacheDescription),
-      subtitle: _subtitle.isNotEmpty ? Text(_subtitle) : null,
-      trailing: Row(mainAxisSize: MainAxisSize.min, children: [
-        IconButton(
-          key: const ValueKey('cacheIconExercisesRefresh'),
-          icon: _isRefreshLoading
-              ? const SizedBox(
-                  width: 24,
-                  height: 24,
-                  child: CircularProgressIndicator(strokeWidth: 2),
-                )
-              : const Icon(Icons.refresh),
-          onPressed: _isRefreshLoading
-              ? null
-              : () async {
-                  setState(() => _isRefreshLoading = true);
+      subtitle: _subtitle.isNotEmpty
+          ? Text(_subtitle)
+          : Text('${exerciseProvider.exercises.length} cached exercises'),
+      trailing: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          IconButton(
+            key: const ValueKey('cacheIconExercisesRefresh'),
+            icon: _isRefreshLoading
+                ? const SizedBox(
+                    width: 24,
+                    height: 24,
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  )
+                : const Icon(Icons.refresh),
+            onPressed: _isRefreshLoading
+                ? null
+                : () async {
+                    setState(() => _isRefreshLoading = true);
 
-                  // Note: status messages are currently left in English on purpose
-                  try {
-                    setState(() => _subtitle = 'Clearing cache...');
-                    await exerciseProvider.clearAllCachesAndPrefs();
+                    // Note: status messages are currently left in English on purpose
+                    try {
+                      setState(() => _subtitle = 'Clearing cache...');
+                      await exerciseProvider.clearAllCachesAndPrefs();
 
-                    if (mounted) {
-                      setState(() => _subtitle = 'Loading languages and units...');
+                      if (mounted) {
+                        setState(() => _subtitle = 'Loading languages and units...');
+                      }
+                      await exerciseProvider.fetchAndSetInitialData();
+
+                      if (mounted) {
+                        setState(() => _subtitle = 'Loading all exercises from server...');
+                      }
+                      await exerciseProvider.fetchAndSetAllExercises();
+
+                      if (mounted) {
+                        setState(() => _subtitle = '');
+                      }
+                    } finally {
+                      if (mounted) {
+                        setState(() => _isRefreshLoading = false);
+                      }
+                      if (context.mounted) {
+                        ScaffoldMessenger.of(
+                          context,
+                        ).showSnackBar(SnackBar(content: Text(i18n.success)));
+                      }
                     }
-                    await exerciseProvider.fetchAndSetInitialData();
+                  },
+          ),
+          IconButton(
+            key: const ValueKey('cacheIconExercisesDelete'),
+            icon: const Icon(Icons.delete),
+            onPressed: () async {
+              await exerciseProvider.clearAllCachesAndPrefs();
 
-                    if (mounted) {
-                      setState(() => _subtitle = 'Loading all exercises from server...');
-                    }
-                    await exerciseProvider.fetchAndSetAllExercises();
+              if (context.mounted) {
+                final snackBar = SnackBar(content: Text(i18n.settingsCacheDeletedSnackbar));
 
-                    if (mounted) {
-                      setState(() => _subtitle = '');
-                    }
-                  } finally {
-                    if (mounted) {
-                      setState(() => _isRefreshLoading = false);
-                    }
-                    if (context.mounted) {
-                      ScaffoldMessenger.of(context).showSnackBar(
-                        SnackBar(content: Text(i18n.success)),
-                      );
-                    }
-                  }
-                },
-        ),
-        IconButton(
-          key: const ValueKey('cacheIconExercisesDelete'),
-          icon: const Icon(Icons.delete),
-          onPressed: () async {
-            await exerciseProvider.clearAllCachesAndPrefs();
-
-            if (context.mounted) {
-              final snackBar = SnackBar(
-                content: Text(i18n.settingsCacheDeletedSnackbar),
-              );
-
-              ScaffoldMessenger.of(context).showSnackBar(snackBar);
-            }
-          },
-        )
-      ]),
+                ScaffoldMessenger.of(context).showSnackBar(snackBar);
+              }
+            },
+          ),
+        ],
+      ),
     );
   }
 }
diff --git a/test/exercises/contribute_exercise_test.mocks.dart b/test/exercises/contribute_exercise_test.mocks.dart
index 25cee87e..cdf1c482 100644
--- a/test/exercises/contribute_exercise_test.mocks.dart
+++ b/test/exercises/contribute_exercise_test.mocks.dart
@@ -41,93 +41,43 @@ import 'package:wger/providers/user.dart' as _i17;
 // ignore_for_file: invalid_use_of_internal_member
 
 class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeVariation_1 extends _i1.SmartFake implements _i3.Variation {
-  _FakeVariation_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeVariation_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSharedPreferencesAsync_2 extends _i1.SmartFake implements _i4.SharedPreferencesAsync {
-  _FakeSharedPreferencesAsync_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSharedPreferencesAsync_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeExerciseDatabase_3 extends _i1.SmartFake implements _i5.ExerciseDatabase {
-  _FakeExerciseDatabase_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeExerciseDatabase_3(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeExercise_4 extends _i1.SmartFake implements _i6.Exercise {
-  _FakeExercise_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeExercise_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeExerciseCategory_5 extends _i1.SmartFake implements _i7.ExerciseCategory {
-  _FakeExerciseCategory_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeExerciseCategory_5(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeEquipment_6 extends _i1.SmartFake implements _i8.Equipment {
-  _FakeEquipment_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeEquipment_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeMuscle_7 extends _i1.SmartFake implements _i9.Muscle {
-  _FakeMuscle_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeMuscle_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeLanguage_8 extends _i1.SmartFake implements _i10.Language {
-  _FakeLanguage_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeLanguage_8(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [AddExerciseProvider].
@@ -139,321 +89,233 @@ class MockAddExerciseProvider extends _i1.Mock implements _i11.AddExerciseProvid
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  List<_i12.File> get exerciseImages => (super.noSuchMethod(
-        Invocation.getter(#exerciseImages),
-        returnValue: <_i12.File>[],
-      ) as List<_i12.File>);
+  List<_i12.File> get exerciseImages =>
+      (super.noSuchMethod(Invocation.getter(#exerciseImages), returnValue: <_i12.File>[])
+          as List<_i12.File>);
 
   @override
-  List<String> get alternateNamesEn => (super.noSuchMethod(
-        Invocation.getter(#alternateNamesEn),
-        returnValue: <String>[],
-      ) as List<String>);
+  List<String> get alternateNamesEn =>
+      (super.noSuchMethod(Invocation.getter(#alternateNamesEn), returnValue: <String>[])
+          as List<String>);
 
   @override
-  List<String> get alternateNamesTrans => (super.noSuchMethod(
-        Invocation.getter(#alternateNamesTrans),
-        returnValue: <String>[],
-      ) as List<String>);
+  List<String> get alternateNamesTrans =>
+      (super.noSuchMethod(Invocation.getter(#alternateNamesTrans), returnValue: <String>[])
+          as List<String>);
 
   @override
-  List<_i8.Equipment> get equipment => (super.noSuchMethod(
-        Invocation.getter(#equipment),
-        returnValue: <_i8.Equipment>[],
-      ) as List<_i8.Equipment>);
+  List<_i8.Equipment> get equipment =>
+      (super.noSuchMethod(Invocation.getter(#equipment), returnValue: <_i8.Equipment>[])
+          as List<_i8.Equipment>);
 
   @override
-  bool get newVariation => (super.noSuchMethod(
-        Invocation.getter(#newVariation),
-        returnValue: false,
-      ) as bool);
+  bool get newVariation =>
+      (super.noSuchMethod(Invocation.getter(#newVariation), returnValue: false) as bool);
 
   @override
-  _i3.Variation get variation => (super.noSuchMethod(
-        Invocation.getter(#variation),
-        returnValue: _FakeVariation_1(
-          this,
-          Invocation.getter(#variation),
-        ),
-      ) as _i3.Variation);
+  _i3.Variation get variation =>
+      (super.noSuchMethod(
+            Invocation.getter(#variation),
+            returnValue: _FakeVariation_1(this, Invocation.getter(#variation)),
+          )
+          as _i3.Variation);
 
   @override
-  List<_i9.Muscle> get primaryMuscles => (super.noSuchMethod(
-        Invocation.getter(#primaryMuscles),
-        returnValue: <_i9.Muscle>[],
-      ) as List<_i9.Muscle>);
+  List<_i9.Muscle> get primaryMuscles =>
+      (super.noSuchMethod(Invocation.getter(#primaryMuscles), returnValue: <_i9.Muscle>[])
+          as List<_i9.Muscle>);
 
   @override
-  List<_i9.Muscle> get secondaryMuscles => (super.noSuchMethod(
-        Invocation.getter(#secondaryMuscles),
-        returnValue: <_i9.Muscle>[],
-      ) as List<_i9.Muscle>);
+  List<_i9.Muscle> get secondaryMuscles =>
+      (super.noSuchMethod(Invocation.getter(#secondaryMuscles), returnValue: <_i9.Muscle>[])
+          as List<_i9.Muscle>);
 
   @override
-  _i13.ExerciseSubmissionApi get exerciseApiObject => (super.noSuchMethod(
-        Invocation.getter(#exerciseApiObject),
-        returnValue: _i14.dummyValue<_i13.ExerciseSubmissionApi>(
-          this,
-          Invocation.getter(#exerciseApiObject),
-        ),
-      ) as _i13.ExerciseSubmissionApi);
+  _i13.ExerciseSubmissionApi get exerciseApiObject =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseApiObject),
+            returnValue: _i14.dummyValue<_i13.ExerciseSubmissionApi>(
+              this,
+              Invocation.getter(#exerciseApiObject),
+            ),
+          )
+          as _i13.ExerciseSubmissionApi);
 
   @override
   set exerciseNameEn(String? value) => super.noSuchMethod(
-        Invocation.setter(
-          #exerciseNameEn,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#exerciseNameEn, value),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set exerciseNameTrans(String? value) => super.noSuchMethod(
-        Invocation.setter(
-          #exerciseNameTrans,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#exerciseNameTrans, value),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  set descriptionEn(String? value) => super.noSuchMethod(
-        Invocation.setter(
-          #descriptionEn,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set descriptionEn(String? value) =>
+      super.noSuchMethod(Invocation.setter(#descriptionEn, value), returnValueForMissingStub: null);
 
   @override
   set descriptionTrans(String? value) => super.noSuchMethod(
-        Invocation.setter(
-          #descriptionTrans,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#descriptionTrans, value),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  set languageEn(_i10.Language? value) => super.noSuchMethod(
-        Invocation.setter(
-          #languageEn,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set languageEn(_i10.Language? value) =>
+      super.noSuchMethod(Invocation.setter(#languageEn, value), returnValueForMissingStub: null);
 
   @override
   set languageTranslation(_i10.Language? value) => super.noSuchMethod(
-        Invocation.setter(
-          #languageTranslation,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#languageTranslation, value),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set alternateNamesEn(List<String>? value) => super.noSuchMethod(
-        Invocation.setter(
-          #alternateNamesEn,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#alternateNamesEn, value),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set alternateNamesTrans(List<String>? value) => super.noSuchMethod(
-        Invocation.setter(
-          #alternateNamesTrans,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#alternateNamesTrans, value),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  set category(_i7.ExerciseCategory? value) => super.noSuchMethod(
-        Invocation.setter(
-          #category,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set category(_i7.ExerciseCategory? value) =>
+      super.noSuchMethod(Invocation.setter(#category, value), returnValueForMissingStub: null);
 
   @override
-  set equipment(List<_i8.Equipment>? equipment) => super.noSuchMethod(
-        Invocation.setter(
-          #equipment,
-          equipment,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set equipment(List<_i8.Equipment>? equipment) =>
+      super.noSuchMethod(Invocation.setter(#equipment, equipment), returnValueForMissingStub: null);
 
   @override
-  set newVariationForExercise(int? value) => super.noSuchMethod(
-        Invocation.setter(
-          #newVariationForExercise,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set variationConnectToExercise(int? value) => super.noSuchMethod(
+    Invocation.setter(#variationConnectToExercise, value),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set variationId(int? variation) => super.noSuchMethod(
-        Invocation.setter(
-          #variationId,
-          variation,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#variationId, variation),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set primaryMuscles(List<_i9.Muscle>? muscles) => super.noSuchMethod(
-        Invocation.setter(
-          #primaryMuscles,
-          muscles,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#primaryMuscles, muscles),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set secondaryMuscles(List<_i9.Muscle>? muscles) => super.noSuchMethod(
-        Invocation.setter(
-          #secondaryMuscles,
-          muscles,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#secondaryMuscles, muscles),
+    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
-  void addExerciseImages(List<_i12.File>? exercises) => super.noSuchMethod(
-        Invocation.method(
-          #addExerciseImages,
-          [exercises],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void addExerciseImages(
+    List<_i12.File>? images, {
+    String? title,
+    String? author,
+    String? authorUrl,
+    String? sourceUrl,
+    String? derivativeSourceUrl,
+    String? style = '1',
+  }) => super.noSuchMethod(
+    Invocation.method(
+      #addExerciseImages,
+      [images],
+      {
+        #title: title,
+        #author: author,
+        #authorUrl: authorUrl,
+        #sourceUrl: sourceUrl,
+        #derivativeSourceUrl: derivativeSourceUrl,
+        #style: style,
+      },
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeExercise(String? path) => super.noSuchMethod(
-        Invocation.method(
-          #removeExercise,
-          [path],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#removeExercise, [path]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void printValues() => super.noSuchMethod(
-        Invocation.method(
-          #printValues,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i15.Future<int> addExercise() => (super.noSuchMethod(
-        Invocation.method(
-          #addExercise,
-          [],
-        ),
-        returnValue: _i15.Future<int>.value(0),
-      ) as _i15.Future<int>);
-
-  @override
-  _i15.Future<int> addExerciseSubmission() => (super.noSuchMethod(
-        Invocation.method(
-          #addExerciseSubmission,
-          [],
-        ),
-        returnValue: _i15.Future<int>.value(0),
-      ) as _i15.Future<int>);
-
-  @override
-  _i15.Future<void> addImages(int? exerciseId) => (super.noSuchMethod(
-        Invocation.method(
-          #addImages,
-          [exerciseId],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
-
-  @override
-  _i15.Future<bool> validateLanguage(
-    String? input,
-    String? languageCode,
-  ) =>
+  _i15.Future<int> addExercise() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #validateLanguage,
-          [
-            input,
-            languageCode,
-          ],
-        ),
-        returnValue: _i15.Future<bool>.value(false),
-      ) as _i15.Future<bool>);
+            Invocation.method(#addExercise, []),
+            returnValue: _i15.Future<int>.value(0),
+          )
+          as _i15.Future<int>);
+
+  @override
+  _i15.Future<int> addExerciseSubmission() =>
+      (super.noSuchMethod(
+            Invocation.method(#addExerciseSubmission, []),
+            returnValue: _i15.Future<int>.value(0),
+          )
+          as _i15.Future<int>);
+
+  @override
+  _i15.Future<void> addImages(int? exerciseId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addImages, [exerciseId]),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<bool> validateLanguage(String? input, String? languageCode) =>
+      (super.noSuchMethod(
+            Invocation.method(#validateLanguage, [input, languageCode]),
+            returnValue: _i15.Future<bool>.value(false),
+          )
+          as _i15.Future<bool>);
 
   @override
   void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    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);
 }
 
 /// A class which mocks [UserProvider].
@@ -465,145 +327,96 @@ class MockUserProvider extends _i1.Mock implements _i17.UserProvider {
   }
 
   @override
-  _i18.ThemeMode get themeMode => (super.noSuchMethod(
-        Invocation.getter(#themeMode),
-        returnValue: _i18.ThemeMode.system,
-      ) as _i18.ThemeMode);
+  _i18.ThemeMode get themeMode =>
+      (super.noSuchMethod(Invocation.getter(#themeMode), returnValue: _i18.ThemeMode.system)
+          as _i18.ThemeMode);
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  _i4.SharedPreferencesAsync get prefs => (super.noSuchMethod(
-        Invocation.getter(#prefs),
-        returnValue: _FakeSharedPreferencesAsync_2(
-          this,
-          Invocation.getter(#prefs),
-        ),
-      ) as _i4.SharedPreferencesAsync);
+  _i4.SharedPreferencesAsync get prefs =>
+      (super.noSuchMethod(
+            Invocation.getter(#prefs),
+            returnValue: _FakeSharedPreferencesAsync_2(this, Invocation.getter(#prefs)),
+          )
+          as _i4.SharedPreferencesAsync);
 
   @override
-  set themeMode(_i18.ThemeMode? value) => super.noSuchMethod(
-        Invocation.setter(
-          #themeMode,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set themeMode(_i18.ThemeMode? value) =>
+      super.noSuchMethod(Invocation.setter(#themeMode, value), returnValueForMissingStub: null);
 
   @override
-  set prefs(_i4.SharedPreferencesAsync? value) => super.noSuchMethod(
-        Invocation.setter(
-          #prefs,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set prefs(_i4.SharedPreferencesAsync? value) =>
+      super.noSuchMethod(Invocation.setter(#prefs, value), returnValueForMissingStub: null);
 
   @override
-  set profile(_i19.Profile? value) => super.noSuchMethod(
-        Invocation.setter(
-          #profile,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set profile(_i19.Profile? value) =>
+      super.noSuchMethod(Invocation.setter(#profile, value), 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
-  void setThemeMode(_i18.ThemeMode? mode) => super.noSuchMethod(
-        Invocation.method(
-          #setThemeMode,
-          [mode],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void setThemeMode(_i18.ThemeMode? mode) =>
+      super.noSuchMethod(Invocation.method(#setThemeMode, [mode]), returnValueForMissingStub: null);
 
   @override
-  _i15.Future<void> fetchAndSetProfile() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetProfile,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i15.Future<void> fetchAndSetProfile() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetProfile, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
 
   @override
-  _i15.Future<void> saveProfile() => (super.noSuchMethod(
-        Invocation.method(
-          #saveProfile,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i15.Future<void> saveProfile() =>
+      (super.noSuchMethod(
+            Invocation.method(#saveProfile, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
 
   @override
-  _i15.Future<void> verifyEmail() => (super.noSuchMethod(
-        Invocation.method(
-          #verifyEmail,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i15.Future<void> verifyEmail() =>
+      (super.noSuchMethod(
+            Invocation.method(#verifyEmail, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
 
   @override
   void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    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);
 }
 
 /// A class which mocks [ExercisesProvider].
@@ -615,292 +428,211 @@ class MockExercisesProvider extends _i1.Mock implements _i20.ExercisesProvider {
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  _i5.ExerciseDatabase get database => (super.noSuchMethod(
-        Invocation.getter(#database),
-        returnValue: _FakeExerciseDatabase_3(
-          this,
-          Invocation.getter(#database),
-        ),
-      ) as _i5.ExerciseDatabase);
+  _i5.ExerciseDatabase get database =>
+      (super.noSuchMethod(
+            Invocation.getter(#database),
+            returnValue: _FakeExerciseDatabase_3(this, Invocation.getter(#database)),
+          )
+          as _i5.ExerciseDatabase);
 
   @override
-  List<_i6.Exercise> get exercises => (super.noSuchMethod(
-        Invocation.getter(#exercises),
-        returnValue: <_i6.Exercise>[],
-      ) as List<_i6.Exercise>);
+  List<_i6.Exercise> get exercises =>
+      (super.noSuchMethod(Invocation.getter(#exercises), returnValue: <_i6.Exercise>[])
+          as List<_i6.Exercise>);
 
   @override
-  List<_i6.Exercise> get filteredExercises => (super.noSuchMethod(
-        Invocation.getter(#filteredExercises),
-        returnValue: <_i6.Exercise>[],
-      ) as List<_i6.Exercise>);
+  List<_i6.Exercise> get filteredExercises =>
+      (super.noSuchMethod(Invocation.getter(#filteredExercises), returnValue: <_i6.Exercise>[])
+          as List<_i6.Exercise>);
 
   @override
-  Map<int, List<_i6.Exercise>> get exerciseByVariation => (super.noSuchMethod(
-        Invocation.getter(#exerciseByVariation),
-        returnValue: <int, List<_i6.Exercise>>{},
-      ) as Map<int, List<_i6.Exercise>>);
+  Map<int, List<_i6.Exercise>> get exerciseByVariation =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseByVariation),
+            returnValue: <int, List<_i6.Exercise>>{},
+          )
+          as Map<int, List<_i6.Exercise>>);
 
   @override
-  List<_i7.ExerciseCategory> get categories => (super.noSuchMethod(
-        Invocation.getter(#categories),
-        returnValue: <_i7.ExerciseCategory>[],
-      ) as List<_i7.ExerciseCategory>);
+  List<_i7.ExerciseCategory> get categories =>
+      (super.noSuchMethod(Invocation.getter(#categories), returnValue: <_i7.ExerciseCategory>[])
+          as List<_i7.ExerciseCategory>);
 
   @override
-  List<_i9.Muscle> get muscles => (super.noSuchMethod(
-        Invocation.getter(#muscles),
-        returnValue: <_i9.Muscle>[],
-      ) as List<_i9.Muscle>);
+  List<_i9.Muscle> get muscles =>
+      (super.noSuchMethod(Invocation.getter(#muscles), returnValue: <_i9.Muscle>[])
+          as List<_i9.Muscle>);
 
   @override
-  List<_i8.Equipment> get equipment => (super.noSuchMethod(
-        Invocation.getter(#equipment),
-        returnValue: <_i8.Equipment>[],
-      ) as List<_i8.Equipment>);
+  List<_i8.Equipment> get equipment =>
+      (super.noSuchMethod(Invocation.getter(#equipment), returnValue: <_i8.Equipment>[])
+          as List<_i8.Equipment>);
 
   @override
-  List<_i10.Language> get languages => (super.noSuchMethod(
-        Invocation.getter(#languages),
-        returnValue: <_i10.Language>[],
-      ) as List<_i10.Language>);
+  List<_i10.Language> get languages =>
+      (super.noSuchMethod(Invocation.getter(#languages), returnValue: <_i10.Language>[])
+          as List<_i10.Language>);
 
   @override
-  set database(_i5.ExerciseDatabase? value) => super.noSuchMethod(
-        Invocation.setter(
-          #database,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set database(_i5.ExerciseDatabase? value) =>
+      super.noSuchMethod(Invocation.setter(#database, value), returnValueForMissingStub: null);
 
   @override
-  set exercises(List<_i6.Exercise>? value) => super.noSuchMethod(
-        Invocation.setter(
-          #exercises,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set exercises(List<_i6.Exercise>? value) =>
+      super.noSuchMethod(Invocation.setter(#exercises, value), returnValueForMissingStub: null);
 
   @override
   set filteredExercises(List<_i6.Exercise>? newFilteredExercises) => super.noSuchMethod(
-        Invocation.setter(
-          #filteredExercises,
-          newFilteredExercises,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#filteredExercises, newFilteredExercises),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  set languages(List<_i10.Language>? languages) => super.noSuchMethod(
-        Invocation.setter(
-          #languages,
-          languages,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set languages(List<_i10.Language>? languages) =>
+      super.noSuchMethod(Invocation.setter(#languages, languages), 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
-  _i15.Future<void> setFilters(_i20.Filters? newFilters) => (super.noSuchMethod(
-        Invocation.method(
-          #setFilters,
-          [newFilters],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
-
-  @override
-  void initFilters() => super.noSuchMethod(
-        Invocation.method(
-          #initFilters,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i15.Future<void> findByFilters() => (super.noSuchMethod(
-        Invocation.method(
-          #findByFilters,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
-
-  @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i6.Exercise findExerciseById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findExerciseById,
-          [id],
-        ),
-        returnValue: _FakeExercise_4(
-          this,
-          Invocation.method(
-            #findExerciseById,
-            [id],
-          ),
-        ),
-      ) as _i6.Exercise);
-
-  @override
-  List<_i6.Exercise> findExercisesByVariationId(
-    int? variationId, {
-    int? exerciseIdToExclude,
-  }) =>
+  _i15.Future<void> setFilters(_i20.Filters? newFilters) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #findExercisesByVariationId,
-          [variationId],
-          {#exerciseIdToExclude: exerciseIdToExclude},
-        ),
-        returnValue: <_i6.Exercise>[],
-      ) as List<_i6.Exercise>);
+            Invocation.method(#setFilters, [newFilters]),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
 
   @override
-  _i7.ExerciseCategory findCategoryById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findCategoryById,
-          [id],
-        ),
-        returnValue: _FakeExerciseCategory_5(
-          this,
-          Invocation.method(
-            #findCategoryById,
-            [id],
-          ),
-        ),
-      ) as _i7.ExerciseCategory);
+  void initFilters() =>
+      super.noSuchMethod(Invocation.method(#initFilters, []), returnValueForMissingStub: null);
 
   @override
-  _i8.Equipment findEquipmentById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findEquipmentById,
-          [id],
-        ),
-        returnValue: _FakeEquipment_6(
-          this,
-          Invocation.method(
-            #findEquipmentById,
-            [id],
-          ),
-        ),
-      ) as _i8.Equipment);
+  _i15.Future<void> findByFilters() =>
+      (super.noSuchMethod(
+            Invocation.method(#findByFilters, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
 
   @override
-  _i9.Muscle findMuscleById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findMuscleById,
-          [id],
-        ),
-        returnValue: _FakeMuscle_7(
-          this,
-          Invocation.method(
-            #findMuscleById,
-            [id],
-          ),
-        ),
-      ) as _i9.Muscle);
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
 
   @override
-  _i10.Language findLanguageById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findLanguageById,
-          [id],
-        ),
-        returnValue: _FakeLanguage_8(
-          this,
-          Invocation.method(
-            #findLanguageById,
-            [id],
-          ),
-        ),
-      ) as _i10.Language);
+  _i6.Exercise findExerciseById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findExerciseById, [id]),
+            returnValue: _FakeExercise_4(this, Invocation.method(#findExerciseById, [id])),
+          )
+          as _i6.Exercise);
 
   @override
-  _i15.Future<void> fetchAndSetCategoriesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetCategoriesFromApi,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  List<_i6.Exercise> findExercisesByVariationId(int? variationId, {int? exerciseIdToExclude}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findExercisesByVariationId,
+              [variationId],
+              {#exerciseIdToExclude: exerciseIdToExclude},
+            ),
+            returnValue: <_i6.Exercise>[],
+          )
+          as List<_i6.Exercise>);
 
   @override
-  _i15.Future<void> fetchAndSetMusclesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetMusclesFromApi,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i7.ExerciseCategory findCategoryById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findCategoryById, [id]),
+            returnValue: _FakeExerciseCategory_5(this, Invocation.method(#findCategoryById, [id])),
+          )
+          as _i7.ExerciseCategory);
 
   @override
-  _i15.Future<void> fetchAndSetEquipmentsFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEquipmentsFromApi,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i8.Equipment findEquipmentById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findEquipmentById, [id]),
+            returnValue: _FakeEquipment_6(this, Invocation.method(#findEquipmentById, [id])),
+          )
+          as _i8.Equipment);
 
   @override
-  _i15.Future<void> fetchAndSetLanguagesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLanguagesFromApi,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i9.Muscle findMuscleById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findMuscleById, [id]),
+            returnValue: _FakeMuscle_7(this, Invocation.method(#findMuscleById, [id])),
+          )
+          as _i9.Muscle);
 
   @override
-  _i15.Future<void> fetchAndSetAllExercises() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllExercises,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i10.Language findLanguageById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findLanguageById, [id]),
+            returnValue: _FakeLanguage_8(this, Invocation.method(#findLanguageById, [id])),
+          )
+          as _i10.Language);
 
   @override
-  _i15.Future<_i6.Exercise?> fetchAndSetExercise(int? exerciseId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetExercise,
-          [exerciseId],
-        ),
-        returnValue: _i15.Future<_i6.Exercise?>.value(),
-      ) as _i15.Future<_i6.Exercise?>);
+  _i15.Future<void> fetchAndSetCategoriesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategoriesFromApi, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<void> fetchAndSetMusclesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetMusclesFromApi, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<void> fetchAndSetEquipmentsFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetEquipmentsFromApi, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<void> fetchAndSetLanguagesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetLanguagesFromApi, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<void> fetchAndSetAllExercises() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllExercises, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<_i6.Exercise?> fetchAndSetExercise(int? exerciseId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetExercise, [exerciseId]),
+            returnValue: _i15.Future<_i6.Exercise?>.value(),
+          )
+          as _i15.Future<_i6.Exercise?>);
 
   @override
   _i15.Future<_i6.Exercise> handleUpdateExerciseFromApi(
@@ -908,55 +640,42 @@ class MockExercisesProvider extends _i1.Mock implements _i20.ExercisesProvider {
     int? exerciseId,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #handleUpdateExerciseFromApi,
-          [
-            database,
-            exerciseId,
-          ],
-        ),
-        returnValue: _i15.Future<_i6.Exercise>.value(_FakeExercise_4(
-          this,
-          Invocation.method(
-            #handleUpdateExerciseFromApi,
-            [
-              database,
-              exerciseId,
-            ],
-          ),
-        )),
-      ) as _i15.Future<_i6.Exercise>);
+            Invocation.method(#handleUpdateExerciseFromApi, [database, exerciseId]),
+            returnValue: _i15.Future<_i6.Exercise>.value(
+              _FakeExercise_4(
+                this,
+                Invocation.method(#handleUpdateExerciseFromApi, [database, exerciseId]),
+              ),
+            ),
+          )
+          as _i15.Future<_i6.Exercise>);
 
   @override
-  _i15.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) => (super.noSuchMethod(
-        Invocation.method(
-          #initCacheTimesLocalPrefs,
-          [],
-          {#forceInit: forceInit},
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i15.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(#initCacheTimesLocalPrefs, [], {#forceInit: forceInit}),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
 
   @override
-  _i15.Future<void> clearAllCachesAndPrefs() => (super.noSuchMethod(
-        Invocation.method(
-          #clearAllCachesAndPrefs,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i15.Future<void> clearAllCachesAndPrefs() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearAllCachesAndPrefs, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
 
   @override
-  _i15.Future<void> fetchAndSetInitialData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetInitialData,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i15.Future<void> fetchAndSetInitialData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetInitialData, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
 
   @override
   _i15.Future<void> setExercisesFromDatabase(
@@ -964,64 +683,60 @@ class MockExercisesProvider extends _i1.Mock implements _i20.ExercisesProvider {
     bool? forceDeleteCache = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesFromDatabase,
-          [database],
-          {#forceDeleteCache: forceDeleteCache},
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+            Invocation.method(
+              #setExercisesFromDatabase,
+              [database],
+              {#forceDeleteCache: forceDeleteCache},
+            ),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
 
   @override
-  _i15.Future<void> updateExerciseCache(_i5.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #updateExerciseCache,
-          [database],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i15.Future<void> updateExerciseCache(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateExerciseCache, [database]),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
 
   @override
-  _i15.Future<void> fetchAndSetMuscles(_i5.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetMuscles,
-          [database],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i15.Future<void> fetchAndSetMuscles(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetMuscles, [database]),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
 
   @override
-  _i15.Future<void> fetchAndSetCategories(_i5.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetCategories,
-          [database],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i15.Future<void> fetchAndSetCategories(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategories, [database]),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
 
   @override
-  _i15.Future<void> fetchAndSetLanguages(_i5.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLanguages,
-          [database],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i15.Future<void> fetchAndSetLanguages(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetLanguages, [database]),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
 
   @override
-  _i15.Future<void> fetchAndSetEquipments(_i5.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEquipments,
-          [database],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i15.Future<void> fetchAndSetEquipments(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetEquipments, [database]),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
 
   @override
   _i15.Future<List<_i6.Exercise>> searchExercise(
@@ -1030,50 +745,32 @@ class MockExercisesProvider extends _i1.Mock implements _i20.ExercisesProvider {
     bool? searchEnglish = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #searchExercise,
-          [name],
-          {
-            #languageCode: languageCode,
-            #searchEnglish: searchEnglish,
-          },
-        ),
-        returnValue: _i15.Future<List<_i6.Exercise>>.value(<_i6.Exercise>[]),
-      ) as _i15.Future<List<_i6.Exercise>>);
+            Invocation.method(
+              #searchExercise,
+              [name],
+              {#languageCode: languageCode, #searchEnglish: searchEnglish},
+            ),
+            returnValue: _i15.Future<List<_i6.Exercise>>.value(<_i6.Exercise>[]),
+          )
+          as _i15.Future<List<_i6.Exercise>>);
 
   @override
   void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    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);
 }
diff --git a/test/exercises/exercises_detail_widget_test.mocks.dart b/test/exercises/exercises_detail_widget_test.mocks.dart
index 425264a3..5c39de2b 100644
--- a/test/exercises/exercises_detail_widget_test.mocks.dart
+++ b/test/exercises/exercises_detail_widget_test.mocks.dart
@@ -32,73 +32,34 @@ import 'package:wger/providers/exercises.dart' as _i9;
 // ignore_for_file: invalid_use_of_internal_member
 
 class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeExerciseDatabase_1 extends _i1.SmartFake implements _i3.ExerciseDatabase {
-  _FakeExerciseDatabase_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeExerciseDatabase_1(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeExercise_2 extends _i1.SmartFake implements _i4.Exercise {
-  _FakeExercise_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeExercise_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeExerciseCategory_3 extends _i1.SmartFake implements _i5.ExerciseCategory {
-  _FakeExerciseCategory_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeExerciseCategory_3(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeEquipment_4 extends _i1.SmartFake implements _i6.Equipment {
-  _FakeEquipment_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeEquipment_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeMuscle_5 extends _i1.SmartFake implements _i7.Muscle {
-  _FakeMuscle_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeMuscle_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeLanguage_6 extends _i1.SmartFake implements _i8.Language {
-  _FakeLanguage_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeLanguage_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [ExercisesProvider].
@@ -110,292 +71,211 @@ class MockExercisesProvider extends _i1.Mock implements _i9.ExercisesProvider {
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  _i3.ExerciseDatabase get database => (super.noSuchMethod(
-        Invocation.getter(#database),
-        returnValue: _FakeExerciseDatabase_1(
-          this,
-          Invocation.getter(#database),
-        ),
-      ) as _i3.ExerciseDatabase);
+  _i3.ExerciseDatabase get database =>
+      (super.noSuchMethod(
+            Invocation.getter(#database),
+            returnValue: _FakeExerciseDatabase_1(this, Invocation.getter(#database)),
+          )
+          as _i3.ExerciseDatabase);
 
   @override
-  List<_i4.Exercise> get exercises => (super.noSuchMethod(
-        Invocation.getter(#exercises),
-        returnValue: <_i4.Exercise>[],
-      ) as List<_i4.Exercise>);
+  List<_i4.Exercise> get exercises =>
+      (super.noSuchMethod(Invocation.getter(#exercises), returnValue: <_i4.Exercise>[])
+          as List<_i4.Exercise>);
 
   @override
-  List<_i4.Exercise> get filteredExercises => (super.noSuchMethod(
-        Invocation.getter(#filteredExercises),
-        returnValue: <_i4.Exercise>[],
-      ) as List<_i4.Exercise>);
+  List<_i4.Exercise> get filteredExercises =>
+      (super.noSuchMethod(Invocation.getter(#filteredExercises), returnValue: <_i4.Exercise>[])
+          as List<_i4.Exercise>);
 
   @override
-  Map<int, List<_i4.Exercise>> get exerciseByVariation => (super.noSuchMethod(
-        Invocation.getter(#exerciseByVariation),
-        returnValue: <int, List<_i4.Exercise>>{},
-      ) as Map<int, List<_i4.Exercise>>);
+  Map<int, List<_i4.Exercise>> get exerciseByVariation =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseByVariation),
+            returnValue: <int, List<_i4.Exercise>>{},
+          )
+          as Map<int, List<_i4.Exercise>>);
 
   @override
-  List<_i5.ExerciseCategory> get categories => (super.noSuchMethod(
-        Invocation.getter(#categories),
-        returnValue: <_i5.ExerciseCategory>[],
-      ) as List<_i5.ExerciseCategory>);
+  List<_i5.ExerciseCategory> get categories =>
+      (super.noSuchMethod(Invocation.getter(#categories), returnValue: <_i5.ExerciseCategory>[])
+          as List<_i5.ExerciseCategory>);
 
   @override
-  List<_i7.Muscle> get muscles => (super.noSuchMethod(
-        Invocation.getter(#muscles),
-        returnValue: <_i7.Muscle>[],
-      ) as List<_i7.Muscle>);
+  List<_i7.Muscle> get muscles =>
+      (super.noSuchMethod(Invocation.getter(#muscles), returnValue: <_i7.Muscle>[])
+          as List<_i7.Muscle>);
 
   @override
-  List<_i6.Equipment> get equipment => (super.noSuchMethod(
-        Invocation.getter(#equipment),
-        returnValue: <_i6.Equipment>[],
-      ) as List<_i6.Equipment>);
+  List<_i6.Equipment> get equipment =>
+      (super.noSuchMethod(Invocation.getter(#equipment), returnValue: <_i6.Equipment>[])
+          as List<_i6.Equipment>);
 
   @override
-  List<_i8.Language> get languages => (super.noSuchMethod(
-        Invocation.getter(#languages),
-        returnValue: <_i8.Language>[],
-      ) as List<_i8.Language>);
+  List<_i8.Language> get languages =>
+      (super.noSuchMethod(Invocation.getter(#languages), returnValue: <_i8.Language>[])
+          as List<_i8.Language>);
 
   @override
-  set database(_i3.ExerciseDatabase? value) => super.noSuchMethod(
-        Invocation.setter(
-          #database,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set database(_i3.ExerciseDatabase? value) =>
+      super.noSuchMethod(Invocation.setter(#database, value), returnValueForMissingStub: null);
 
   @override
-  set exercises(List<_i4.Exercise>? value) => super.noSuchMethod(
-        Invocation.setter(
-          #exercises,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set exercises(List<_i4.Exercise>? value) =>
+      super.noSuchMethod(Invocation.setter(#exercises, value), returnValueForMissingStub: null);
 
   @override
   set filteredExercises(List<_i4.Exercise>? newFilteredExercises) => super.noSuchMethod(
-        Invocation.setter(
-          #filteredExercises,
-          newFilteredExercises,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#filteredExercises, newFilteredExercises),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  set languages(List<_i8.Language>? languages) => super.noSuchMethod(
-        Invocation.setter(
-          #languages,
-          languages,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set languages(List<_i8.Language>? languages) =>
+      super.noSuchMethod(Invocation.setter(#languages, languages), 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
-  _i10.Future<void> setFilters(_i9.Filters? newFilters) => (super.noSuchMethod(
-        Invocation.method(
-          #setFilters,
-          [newFilters],
-        ),
-        returnValue: _i10.Future<void>.value(),
-        returnValueForMissingStub: _i10.Future<void>.value(),
-      ) as _i10.Future<void>);
-
-  @override
-  void initFilters() => super.noSuchMethod(
-        Invocation.method(
-          #initFilters,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i10.Future<void> findByFilters() => (super.noSuchMethod(
-        Invocation.method(
-          #findByFilters,
-          [],
-        ),
-        returnValue: _i10.Future<void>.value(),
-        returnValueForMissingStub: _i10.Future<void>.value(),
-      ) as _i10.Future<void>);
-
-  @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i4.Exercise findExerciseById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findExerciseById,
-          [id],
-        ),
-        returnValue: _FakeExercise_2(
-          this,
-          Invocation.method(
-            #findExerciseById,
-            [id],
-          ),
-        ),
-      ) as _i4.Exercise);
-
-  @override
-  List<_i4.Exercise> findExercisesByVariationId(
-    int? variationId, {
-    int? exerciseIdToExclude,
-  }) =>
+  _i10.Future<void> setFilters(_i9.Filters? newFilters) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #findExercisesByVariationId,
-          [variationId],
-          {#exerciseIdToExclude: exerciseIdToExclude},
-        ),
-        returnValue: <_i4.Exercise>[],
-      ) as List<_i4.Exercise>);
+            Invocation.method(#setFilters, [newFilters]),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
 
   @override
-  _i5.ExerciseCategory findCategoryById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findCategoryById,
-          [id],
-        ),
-        returnValue: _FakeExerciseCategory_3(
-          this,
-          Invocation.method(
-            #findCategoryById,
-            [id],
-          ),
-        ),
-      ) as _i5.ExerciseCategory);
+  void initFilters() =>
+      super.noSuchMethod(Invocation.method(#initFilters, []), returnValueForMissingStub: null);
 
   @override
-  _i6.Equipment findEquipmentById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findEquipmentById,
-          [id],
-        ),
-        returnValue: _FakeEquipment_4(
-          this,
-          Invocation.method(
-            #findEquipmentById,
-            [id],
-          ),
-        ),
-      ) as _i6.Equipment);
+  _i10.Future<void> findByFilters() =>
+      (super.noSuchMethod(
+            Invocation.method(#findByFilters, []),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
 
   @override
-  _i7.Muscle findMuscleById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findMuscleById,
-          [id],
-        ),
-        returnValue: _FakeMuscle_5(
-          this,
-          Invocation.method(
-            #findMuscleById,
-            [id],
-          ),
-        ),
-      ) as _i7.Muscle);
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
 
   @override
-  _i8.Language findLanguageById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findLanguageById,
-          [id],
-        ),
-        returnValue: _FakeLanguage_6(
-          this,
-          Invocation.method(
-            #findLanguageById,
-            [id],
-          ),
-        ),
-      ) as _i8.Language);
+  _i4.Exercise findExerciseById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findExerciseById, [id]),
+            returnValue: _FakeExercise_2(this, Invocation.method(#findExerciseById, [id])),
+          )
+          as _i4.Exercise);
 
   @override
-  _i10.Future<void> fetchAndSetCategoriesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetCategoriesFromApi,
-          [],
-        ),
-        returnValue: _i10.Future<void>.value(),
-        returnValueForMissingStub: _i10.Future<void>.value(),
-      ) as _i10.Future<void>);
+  List<_i4.Exercise> findExercisesByVariationId(int? variationId, {int? exerciseIdToExclude}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findExercisesByVariationId,
+              [variationId],
+              {#exerciseIdToExclude: exerciseIdToExclude},
+            ),
+            returnValue: <_i4.Exercise>[],
+          )
+          as List<_i4.Exercise>);
 
   @override
-  _i10.Future<void> fetchAndSetMusclesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetMusclesFromApi,
-          [],
-        ),
-        returnValue: _i10.Future<void>.value(),
-        returnValueForMissingStub: _i10.Future<void>.value(),
-      ) as _i10.Future<void>);
+  _i5.ExerciseCategory findCategoryById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findCategoryById, [id]),
+            returnValue: _FakeExerciseCategory_3(this, Invocation.method(#findCategoryById, [id])),
+          )
+          as _i5.ExerciseCategory);
 
   @override
-  _i10.Future<void> fetchAndSetEquipmentsFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEquipmentsFromApi,
-          [],
-        ),
-        returnValue: _i10.Future<void>.value(),
-        returnValueForMissingStub: _i10.Future<void>.value(),
-      ) as _i10.Future<void>);
+  _i6.Equipment findEquipmentById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findEquipmentById, [id]),
+            returnValue: _FakeEquipment_4(this, Invocation.method(#findEquipmentById, [id])),
+          )
+          as _i6.Equipment);
 
   @override
-  _i10.Future<void> fetchAndSetLanguagesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLanguagesFromApi,
-          [],
-        ),
-        returnValue: _i10.Future<void>.value(),
-        returnValueForMissingStub: _i10.Future<void>.value(),
-      ) as _i10.Future<void>);
+  _i7.Muscle findMuscleById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findMuscleById, [id]),
+            returnValue: _FakeMuscle_5(this, Invocation.method(#findMuscleById, [id])),
+          )
+          as _i7.Muscle);
 
   @override
-  _i10.Future<void> fetchAndSetAllExercises() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllExercises,
-          [],
-        ),
-        returnValue: _i10.Future<void>.value(),
-        returnValueForMissingStub: _i10.Future<void>.value(),
-      ) as _i10.Future<void>);
+  _i8.Language findLanguageById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findLanguageById, [id]),
+            returnValue: _FakeLanguage_6(this, Invocation.method(#findLanguageById, [id])),
+          )
+          as _i8.Language);
 
   @override
-  _i10.Future<_i4.Exercise?> fetchAndSetExercise(int? exerciseId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetExercise,
-          [exerciseId],
-        ),
-        returnValue: _i10.Future<_i4.Exercise?>.value(),
-      ) as _i10.Future<_i4.Exercise?>);
+  _i10.Future<void> fetchAndSetCategoriesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategoriesFromApi, []),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<void> fetchAndSetMusclesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetMusclesFromApi, []),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<void> fetchAndSetEquipmentsFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetEquipmentsFromApi, []),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<void> fetchAndSetLanguagesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetLanguagesFromApi, []),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<void> fetchAndSetAllExercises() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllExercises, []),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<_i4.Exercise?> fetchAndSetExercise(int? exerciseId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetExercise, [exerciseId]),
+            returnValue: _i10.Future<_i4.Exercise?>.value(),
+          )
+          as _i10.Future<_i4.Exercise?>);
 
   @override
   _i10.Future<_i4.Exercise> handleUpdateExerciseFromApi(
@@ -403,55 +283,42 @@ class MockExercisesProvider extends _i1.Mock implements _i9.ExercisesProvider {
     int? exerciseId,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #handleUpdateExerciseFromApi,
-          [
-            database,
-            exerciseId,
-          ],
-        ),
-        returnValue: _i10.Future<_i4.Exercise>.value(_FakeExercise_2(
-          this,
-          Invocation.method(
-            #handleUpdateExerciseFromApi,
-            [
-              database,
-              exerciseId,
-            ],
-          ),
-        )),
-      ) as _i10.Future<_i4.Exercise>);
+            Invocation.method(#handleUpdateExerciseFromApi, [database, exerciseId]),
+            returnValue: _i10.Future<_i4.Exercise>.value(
+              _FakeExercise_2(
+                this,
+                Invocation.method(#handleUpdateExerciseFromApi, [database, exerciseId]),
+              ),
+            ),
+          )
+          as _i10.Future<_i4.Exercise>);
 
   @override
-  _i10.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) => (super.noSuchMethod(
-        Invocation.method(
-          #initCacheTimesLocalPrefs,
-          [],
-          {#forceInit: forceInit},
-        ),
-        returnValue: _i10.Future<void>.value(),
-        returnValueForMissingStub: _i10.Future<void>.value(),
-      ) as _i10.Future<void>);
+  _i10.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(#initCacheTimesLocalPrefs, [], {#forceInit: forceInit}),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
 
   @override
-  _i10.Future<void> clearAllCachesAndPrefs() => (super.noSuchMethod(
-        Invocation.method(
-          #clearAllCachesAndPrefs,
-          [],
-        ),
-        returnValue: _i10.Future<void>.value(),
-        returnValueForMissingStub: _i10.Future<void>.value(),
-      ) as _i10.Future<void>);
+  _i10.Future<void> clearAllCachesAndPrefs() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearAllCachesAndPrefs, []),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
 
   @override
-  _i10.Future<void> fetchAndSetInitialData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetInitialData,
-          [],
-        ),
-        returnValue: _i10.Future<void>.value(),
-        returnValueForMissingStub: _i10.Future<void>.value(),
-      ) as _i10.Future<void>);
+  _i10.Future<void> fetchAndSetInitialData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetInitialData, []),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
 
   @override
   _i10.Future<void> setExercisesFromDatabase(
@@ -459,64 +326,60 @@ class MockExercisesProvider extends _i1.Mock implements _i9.ExercisesProvider {
     bool? forceDeleteCache = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesFromDatabase,
-          [database],
-          {#forceDeleteCache: forceDeleteCache},
-        ),
-        returnValue: _i10.Future<void>.value(),
-        returnValueForMissingStub: _i10.Future<void>.value(),
-      ) as _i10.Future<void>);
+            Invocation.method(
+              #setExercisesFromDatabase,
+              [database],
+              {#forceDeleteCache: forceDeleteCache},
+            ),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
 
   @override
-  _i10.Future<void> updateExerciseCache(_i3.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #updateExerciseCache,
-          [database],
-        ),
-        returnValue: _i10.Future<void>.value(),
-        returnValueForMissingStub: _i10.Future<void>.value(),
-      ) as _i10.Future<void>);
+  _i10.Future<void> updateExerciseCache(_i3.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateExerciseCache, [database]),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
 
   @override
-  _i10.Future<void> fetchAndSetMuscles(_i3.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetMuscles,
-          [database],
-        ),
-        returnValue: _i10.Future<void>.value(),
-        returnValueForMissingStub: _i10.Future<void>.value(),
-      ) as _i10.Future<void>);
+  _i10.Future<void> fetchAndSetMuscles(_i3.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetMuscles, [database]),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
 
   @override
-  _i10.Future<void> fetchAndSetCategories(_i3.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetCategories,
-          [database],
-        ),
-        returnValue: _i10.Future<void>.value(),
-        returnValueForMissingStub: _i10.Future<void>.value(),
-      ) as _i10.Future<void>);
+  _i10.Future<void> fetchAndSetCategories(_i3.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategories, [database]),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
 
   @override
-  _i10.Future<void> fetchAndSetLanguages(_i3.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLanguages,
-          [database],
-        ),
-        returnValue: _i10.Future<void>.value(),
-        returnValueForMissingStub: _i10.Future<void>.value(),
-      ) as _i10.Future<void>);
+  _i10.Future<void> fetchAndSetLanguages(_i3.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetLanguages, [database]),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
 
   @override
-  _i10.Future<void> fetchAndSetEquipments(_i3.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEquipments,
-          [database],
-        ),
-        returnValue: _i10.Future<void>.value(),
-        returnValueForMissingStub: _i10.Future<void>.value(),
-      ) as _i10.Future<void>);
+  _i10.Future<void> fetchAndSetEquipments(_i3.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetEquipments, [database]),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
 
   @override
   _i10.Future<List<_i4.Exercise>> searchExercise(
@@ -525,50 +388,32 @@ class MockExercisesProvider extends _i1.Mock implements _i9.ExercisesProvider {
     bool? searchEnglish = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #searchExercise,
-          [name],
-          {
-            #languageCode: languageCode,
-            #searchEnglish: searchEnglish,
-          },
-        ),
-        returnValue: _i10.Future<List<_i4.Exercise>>.value(<_i4.Exercise>[]),
-      ) as _i10.Future<List<_i4.Exercise>>);
+            Invocation.method(
+              #searchExercise,
+              [name],
+              {#languageCode: languageCode, #searchEnglish: searchEnglish},
+            ),
+            returnValue: _i10.Future<List<_i4.Exercise>>.value(<_i4.Exercise>[]),
+          )
+          as _i10.Future<List<_i4.Exercise>>);
 
   @override
   void addListener(_i11.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i11.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    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);
 }
diff --git a/test/providers/plate_calculator_test.mocks.dart b/test/providers/plate_calculator_test.mocks.dart
index b9aecbe0..57fd2a99 100644
--- a/test/providers/plate_calculator_test.mocks.dart
+++ b/test/providers/plate_calculator_test.mocks.dart
@@ -33,182 +33,126 @@ class MockSharedPreferencesAsync extends _i1.Mock implements _i2.SharedPreferenc
   }
 
   @override
-  _i3.Future<Set<String>> getKeys({Set<String>? allowList}) => (super.noSuchMethod(
-        Invocation.method(
-          #getKeys,
-          [],
-          {#allowList: allowList},
-        ),
-        returnValue: _i3.Future<Set<String>>.value(<String>{}),
-      ) as _i3.Future<Set<String>>);
-
-  @override
-  _i3.Future<Map<String, Object?>> getAll({Set<String>? allowList}) => (super.noSuchMethod(
-        Invocation.method(
-          #getAll,
-          [],
-          {#allowList: allowList},
-        ),
-        returnValue: _i3.Future<Map<String, Object?>>.value(<String, Object?>{}),
-      ) as _i3.Future<Map<String, Object?>>);
-
-  @override
-  _i3.Future<bool?> getBool(String? key) => (super.noSuchMethod(
-        Invocation.method(
-          #getBool,
-          [key],
-        ),
-        returnValue: _i3.Future<bool?>.value(),
-      ) as _i3.Future<bool?>);
-
-  @override
-  _i3.Future<int?> getInt(String? key) => (super.noSuchMethod(
-        Invocation.method(
-          #getInt,
-          [key],
-        ),
-        returnValue: _i3.Future<int?>.value(),
-      ) as _i3.Future<int?>);
-
-  @override
-  _i3.Future<double?> getDouble(String? key) => (super.noSuchMethod(
-        Invocation.method(
-          #getDouble,
-          [key],
-        ),
-        returnValue: _i3.Future<double?>.value(),
-      ) as _i3.Future<double?>);
-
-  @override
-  _i3.Future<String?> getString(String? key) => (super.noSuchMethod(
-        Invocation.method(
-          #getString,
-          [key],
-        ),
-        returnValue: _i3.Future<String?>.value(),
-      ) as _i3.Future<String?>);
-
-  @override
-  _i3.Future<List<String>?> getStringList(String? key) => (super.noSuchMethod(
-        Invocation.method(
-          #getStringList,
-          [key],
-        ),
-        returnValue: _i3.Future<List<String>?>.value(),
-      ) as _i3.Future<List<String>?>);
-
-  @override
-  _i3.Future<bool> containsKey(String? key) => (super.noSuchMethod(
-        Invocation.method(
-          #containsKey,
-          [key],
-        ),
-        returnValue: _i3.Future<bool>.value(false),
-      ) as _i3.Future<bool>);
-
-  @override
-  _i3.Future<void> setBool(
-    String? key,
-    bool? value,
-  ) =>
+  _i3.Future<Set<String>> getKeys({Set<String>? allowList}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setBool,
-          [
-            key,
-            value,
-          ],
-        ),
-        returnValue: _i3.Future<void>.value(),
-        returnValueForMissingStub: _i3.Future<void>.value(),
-      ) as _i3.Future<void>);
+            Invocation.method(#getKeys, [], {#allowList: allowList}),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
 
   @override
-  _i3.Future<void> setInt(
-    String? key,
-    int? value,
-  ) =>
+  _i3.Future<Map<String, Object?>> getAll({Set<String>? allowList}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setInt,
-          [
-            key,
-            value,
-          ],
-        ),
-        returnValue: _i3.Future<void>.value(),
-        returnValueForMissingStub: _i3.Future<void>.value(),
-      ) as _i3.Future<void>);
+            Invocation.method(#getAll, [], {#allowList: allowList}),
+            returnValue: _i3.Future<Map<String, Object?>>.value(<String, Object?>{}),
+          )
+          as _i3.Future<Map<String, Object?>>);
 
   @override
-  _i3.Future<void> setDouble(
-    String? key,
-    double? value,
-  ) =>
+  _i3.Future<bool?> getBool(String? key) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setDouble,
-          [
-            key,
-            value,
-          ],
-        ),
-        returnValue: _i3.Future<void>.value(),
-        returnValueForMissingStub: _i3.Future<void>.value(),
-      ) as _i3.Future<void>);
+            Invocation.method(#getBool, [key]),
+            returnValue: _i3.Future<bool?>.value(),
+          )
+          as _i3.Future<bool?>);
 
   @override
-  _i3.Future<void> setString(
-    String? key,
-    String? value,
-  ) =>
+  _i3.Future<int?> getInt(String? key) =>
+      (super.noSuchMethod(Invocation.method(#getInt, [key]), returnValue: _i3.Future<int?>.value())
+          as _i3.Future<int?>);
+
+  @override
+  _i3.Future<double?> getDouble(String? key) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setString,
-          [
-            key,
-            value,
-          ],
-        ),
-        returnValue: _i3.Future<void>.value(),
-        returnValueForMissingStub: _i3.Future<void>.value(),
-      ) as _i3.Future<void>);
+            Invocation.method(#getDouble, [key]),
+            returnValue: _i3.Future<double?>.value(),
+          )
+          as _i3.Future<double?>);
 
   @override
-  _i3.Future<void> setStringList(
-    String? key,
-    List<String>? value,
-  ) =>
+  _i3.Future<String?> getString(String? key) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setStringList,
-          [
-            key,
-            value,
-          ],
-        ),
-        returnValue: _i3.Future<void>.value(),
-        returnValueForMissingStub: _i3.Future<void>.value(),
-      ) as _i3.Future<void>);
+            Invocation.method(#getString, [key]),
+            returnValue: _i3.Future<String?>.value(),
+          )
+          as _i3.Future<String?>);
 
   @override
-  _i3.Future<void> remove(String? key) => (super.noSuchMethod(
-        Invocation.method(
-          #remove,
-          [key],
-        ),
-        returnValue: _i3.Future<void>.value(),
-        returnValueForMissingStub: _i3.Future<void>.value(),
-      ) as _i3.Future<void>);
+  _i3.Future<List<String>?> getStringList(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(#getStringList, [key]),
+            returnValue: _i3.Future<List<String>?>.value(),
+          )
+          as _i3.Future<List<String>?>);
 
   @override
-  _i3.Future<void> clear({Set<String>? allowList}) => (super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-          {#allowList: allowList},
-        ),
-        returnValue: _i3.Future<void>.value(),
-        returnValueForMissingStub: _i3.Future<void>.value(),
-      ) as _i3.Future<void>);
+  _i3.Future<bool> containsKey(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(#containsKey, [key]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
+  @override
+  _i3.Future<void> setBool(String? key, bool? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#setBool, [key, value]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> setInt(String? key, int? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#setInt, [key, value]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> setDouble(String? key, double? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#setDouble, [key, value]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> setString(String? key, String? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#setString, [key, value]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> setStringList(String? key, List<String>? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#setStringList, [key, value]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> remove(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(#remove, [key]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> clear({Set<String>? allowList}) =>
+      (super.noSuchMethod(
+            Invocation.method(#clear, [], {#allowList: allowList}),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
 }
diff --git a/test/routine/day_form_test.mocks.dart b/test/routine/day_form_test.mocks.dart
index 4df7295b..211c521f 100644
--- a/test/routine/day_form_test.mocks.dart
+++ b/test/routine/day_form_test.mocks.dart
@@ -38,103 +38,46 @@ import 'package:wger/providers/routines.dart' as _i12;
 // ignore_for_file: invalid_use_of_internal_member
 
 class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
-  _FakeRoutine_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
-  _FakeSlot_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
-  _FakeSlotEntry_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
-  _FakeBaseConfig_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
-  _FakeWorkoutSession_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
-  _FakeLog_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [RoutinesProvider].
@@ -146,174 +89,121 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  List<_i5.Routine> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  List<_i3.WeightUnit> get weightUnits => (super.noSuchMethod(
-        Invocation.getter(#weightUnits),
-        returnValue: <_i3.WeightUnit>[],
-      ) as List<_i3.WeightUnit>);
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(Invocation.getter(#weightUnits), returnValue: <_i3.WeightUnit>[])
+          as List<_i3.WeightUnit>);
 
   @override
-  _i3.WeightUnit get defaultWeightUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultWeightUnit),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.getter(#defaultWeightUnit),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(this, Invocation.getter(#defaultWeightUnit)),
+          )
+          as _i3.WeightUnit);
 
   @override
-  List<_i4.RepetitionUnit> get repetitionUnits => (super.noSuchMethod(
-        Invocation.getter(#repetitionUnits),
-        returnValue: <_i4.RepetitionUnit>[],
-      ) as List<_i4.RepetitionUnit>);
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(Invocation.getter(#repetitionUnits), returnValue: <_i4.RepetitionUnit>[])
+          as List<_i4.RepetitionUnit>);
 
   @override
-  _i4.RepetitionUnit get defaultRepetitionUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultRepetitionUnit),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.getter(#defaultRepetitionUnit),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(this, Invocation.getter(#defaultRepetitionUnit)),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
-        Invocation.setter(
-          #activeRoutine,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set activeRoutine(_i5.Routine? value) =>
+      super.noSuchMethod(Invocation.setter(#activeRoutine, value), returnValueForMissingStub: null);
 
   @override
   set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #weightUnits,
-          weightUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #repetitionUnits,
-          repetitionUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    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
-  _i3.WeightUnit findWeightUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findWeightUnitById,
-          [id],
-        ),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.method(
-            #findWeightUnitById,
-            [id],
-          ),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(this, Invocation.method(#findWeightUnitById, [id])),
+          )
+          as _i3.WeightUnit);
 
   @override
-  _i4.RepetitionUnit findRepetitionUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findRepetitionUnitById,
-          [id],
-        ),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.method(
-            #findRepetitionUnitById,
-            [id],
-          ),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  List<_i5.Routine> getPlans() => (super.noSuchMethod(
-        Invocation.method(
-          #getPlans,
-          [],
-        ),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(Invocation.method(#getPlans, []), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  _i5.Routine findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeRoutine_3(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i5.Routine);
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(this, Invocation.method(#findById, [id])),
+          )
+          as _i5.Routine);
 
   @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
-  _i13.Future<void> fetchAndSetAllRoutinesFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesFull,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> fetchAndSetAllRoutinesSparse() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesSparse,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   _i13.Future<void> setExercisesAndUnits(
@@ -321,505 +211,299 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
     Map<int, _i15.Exercise>? exercises,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesAndUnits,
-          [entries],
-          {#exercises: exercises},
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#setExercisesAndUnits, [entries], {#exercises: exercises}),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineSparse,
-          [planId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineSparse,
-            [planId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineFull,
-          [routineId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineFull,
-            [routineId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #addRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #addRoutine,
-            [routine],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<void> editRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #editRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteRoutine(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteRoutine,
-          [id],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @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<_i6.Day> addDay(_i6.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #addDay,
-          [day],
-        ),
-        returnValue: _i13.Future<_i6.Day>.value(_FakeDay_4(
-          this,
-          Invocation.method(
-            #addDay,
-            [day],
-          ),
-        )),
-      ) as _i13.Future<_i6.Day>);
-
-  @override
-  _i13.Future<void> editDay(_i6.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<void> editDays(List<_i6.Day>? days) => (super.noSuchMethod(
-        Invocation.method(
-          #editDays,
-          [days],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteDay(int? dayId) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteDay,
-          [dayId],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<_i7.Slot> addSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i7.Slot>.value(_FakeSlot_5(
-          this,
-          Invocation.method(
-            #addSlot,
-            [
-              slot,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i7.Slot>);
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineSparse, [planId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> deleteSlot(
-    int? slotId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlot,
-          [
-            slotId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineFull, [routineId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlots(
-    List<_i7.Slot>? slots,
-    int? routineId,
-  ) =>
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlots,
-          [
-            slots,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i8.SlotEntry> addSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteRoutine(int? id) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i8.SlotEntry>.value(_FakeSlotEntry_6(
-          this,
-          Invocation.method(
-            #addSlotEntry,
-            [
-              entry,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i8.SlotEntry>);
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> deleteSlotEntry(
-    int? id,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlotEntry,
-          [
-            id,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> editSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetWeightUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  String getConfigUrl(_i8.ConfigType? type) => (super.noSuchMethod(
-        Invocation.method(
-          #getConfigUrl,
-          [type],
-        ),
-        returnValue: _i16.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getConfigUrl,
-            [type],
-          ),
-        ),
-      ) as String);
-
-  @override
-  _i13.Future<_i9.BaseConfig> editConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> fetchAndSetUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #editConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i9.BaseConfig> addConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #addConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
 
   @override
-  _i13.Future<void> deleteConfig(
-    int? id,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteConfig,
-          [
-            id,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> handleConfig(
-    _i8.SlotEntry? entry,
-    num? value,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #handleConfig,
-          [
-            entry,
-            value,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchSessionData,
-          [],
-        ),
-        returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
-      ) as _i13.Future<List<_i10.WorkoutSession>>);
-
-  @override
-  _i13.Future<_i10.WorkoutSession> addSession(
-    _i10.WorkoutSession? session,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteDay(int? dayId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSession,
-          [
-            session,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #addSession,
-            [
-              session,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i10.WorkoutSession>);
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
-        Invocation.method(
-          #editSession,
-          [session],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #editSession,
-            [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(
-    int? logId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [
-            logId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(this, Invocation.method(#addSlotEntry, [entry, routineId])),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(this, Invocation.method(#getConfigUrl, [type])),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#editConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#addConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(_i8.SlotEntry? entry, num? value, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#addSession, [session, routineId])),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#editSession, [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(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    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);
 }
diff --git a/test/routine/forms/session_form_test.mocks.dart b/test/routine/forms/session_form_test.mocks.dart
index f6c5b483..c167ffaa 100644
--- a/test/routine/forms/session_form_test.mocks.dart
+++ b/test/routine/forms/session_form_test.mocks.dart
@@ -38,103 +38,46 @@ import 'package:wger/providers/routines.dart' as _i12;
 // ignore_for_file: invalid_use_of_internal_member
 
 class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
-  _FakeRoutine_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
-  _FakeSlot_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
-  _FakeSlotEntry_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
-  _FakeBaseConfig_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
-  _FakeWorkoutSession_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
-  _FakeLog_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [RoutinesProvider].
@@ -146,174 +89,121 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  List<_i5.Routine> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  List<_i3.WeightUnit> get weightUnits => (super.noSuchMethod(
-        Invocation.getter(#weightUnits),
-        returnValue: <_i3.WeightUnit>[],
-      ) as List<_i3.WeightUnit>);
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(Invocation.getter(#weightUnits), returnValue: <_i3.WeightUnit>[])
+          as List<_i3.WeightUnit>);
 
   @override
-  _i3.WeightUnit get defaultWeightUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultWeightUnit),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.getter(#defaultWeightUnit),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(this, Invocation.getter(#defaultWeightUnit)),
+          )
+          as _i3.WeightUnit);
 
   @override
-  List<_i4.RepetitionUnit> get repetitionUnits => (super.noSuchMethod(
-        Invocation.getter(#repetitionUnits),
-        returnValue: <_i4.RepetitionUnit>[],
-      ) as List<_i4.RepetitionUnit>);
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(Invocation.getter(#repetitionUnits), returnValue: <_i4.RepetitionUnit>[])
+          as List<_i4.RepetitionUnit>);
 
   @override
-  _i4.RepetitionUnit get defaultRepetitionUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultRepetitionUnit),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.getter(#defaultRepetitionUnit),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(this, Invocation.getter(#defaultRepetitionUnit)),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
-        Invocation.setter(
-          #activeRoutine,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set activeRoutine(_i5.Routine? value) =>
+      super.noSuchMethod(Invocation.setter(#activeRoutine, value), returnValueForMissingStub: null);
 
   @override
   set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #weightUnits,
-          weightUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #repetitionUnits,
-          repetitionUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    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
-  _i3.WeightUnit findWeightUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findWeightUnitById,
-          [id],
-        ),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.method(
-            #findWeightUnitById,
-            [id],
-          ),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(this, Invocation.method(#findWeightUnitById, [id])),
+          )
+          as _i3.WeightUnit);
 
   @override
-  _i4.RepetitionUnit findRepetitionUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findRepetitionUnitById,
-          [id],
-        ),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.method(
-            #findRepetitionUnitById,
-            [id],
-          ),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  List<_i5.Routine> getPlans() => (super.noSuchMethod(
-        Invocation.method(
-          #getPlans,
-          [],
-        ),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(Invocation.method(#getPlans, []), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  _i5.Routine findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeRoutine_3(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i5.Routine);
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(this, Invocation.method(#findById, [id])),
+          )
+          as _i5.Routine);
 
   @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
-  _i13.Future<void> fetchAndSetAllRoutinesFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesFull,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> fetchAndSetAllRoutinesSparse() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesSparse,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   _i13.Future<void> setExercisesAndUnits(
@@ -321,505 +211,299 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
     Map<int, _i15.Exercise>? exercises,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesAndUnits,
-          [entries],
-          {#exercises: exercises},
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#setExercisesAndUnits, [entries], {#exercises: exercises}),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineSparse,
-          [planId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineSparse,
-            [planId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineFull,
-          [routineId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineFull,
-            [routineId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #addRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #addRoutine,
-            [routine],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<void> editRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #editRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteRoutine(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteRoutine,
-          [id],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @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<_i6.Day> addDay(_i6.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #addDay,
-          [day],
-        ),
-        returnValue: _i13.Future<_i6.Day>.value(_FakeDay_4(
-          this,
-          Invocation.method(
-            #addDay,
-            [day],
-          ),
-        )),
-      ) as _i13.Future<_i6.Day>);
-
-  @override
-  _i13.Future<void> editDay(_i6.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<void> editDays(List<_i6.Day>? days) => (super.noSuchMethod(
-        Invocation.method(
-          #editDays,
-          [days],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteDay(int? dayId) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteDay,
-          [dayId],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<_i7.Slot> addSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i7.Slot>.value(_FakeSlot_5(
-          this,
-          Invocation.method(
-            #addSlot,
-            [
-              slot,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i7.Slot>);
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineSparse, [planId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> deleteSlot(
-    int? slotId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlot,
-          [
-            slotId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineFull, [routineId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlots(
-    List<_i7.Slot>? slots,
-    int? routineId,
-  ) =>
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlots,
-          [
-            slots,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i8.SlotEntry> addSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteRoutine(int? id) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i8.SlotEntry>.value(_FakeSlotEntry_6(
-          this,
-          Invocation.method(
-            #addSlotEntry,
-            [
-              entry,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i8.SlotEntry>);
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> deleteSlotEntry(
-    int? id,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlotEntry,
-          [
-            id,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> editSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetWeightUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  String getConfigUrl(_i8.ConfigType? type) => (super.noSuchMethod(
-        Invocation.method(
-          #getConfigUrl,
-          [type],
-        ),
-        returnValue: _i16.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getConfigUrl,
-            [type],
-          ),
-        ),
-      ) as String);
-
-  @override
-  _i13.Future<_i9.BaseConfig> editConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> fetchAndSetUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #editConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i9.BaseConfig> addConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #addConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
 
   @override
-  _i13.Future<void> deleteConfig(
-    int? id,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteConfig,
-          [
-            id,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> handleConfig(
-    _i8.SlotEntry? entry,
-    num? value,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #handleConfig,
-          [
-            entry,
-            value,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchSessionData,
-          [],
-        ),
-        returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
-      ) as _i13.Future<List<_i10.WorkoutSession>>);
-
-  @override
-  _i13.Future<_i10.WorkoutSession> addSession(
-    _i10.WorkoutSession? session,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteDay(int? dayId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSession,
-          [
-            session,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #addSession,
-            [
-              session,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i10.WorkoutSession>);
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
-        Invocation.method(
-          #editSession,
-          [session],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #editSession,
-            [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(
-    int? logId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [
-            logId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(this, Invocation.method(#addSlotEntry, [entry, routineId])),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(this, Invocation.method(#getConfigUrl, [type])),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#editConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#addConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(_i8.SlotEntry? entry, num? value, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#addSession, [session, routineId])),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#editSession, [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(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    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);
 }
diff --git a/test/routine/gym_mode_screen_test.mocks.dart b/test/routine/gym_mode_screen_test.mocks.dart
index 0e3e3ea4..468c5600 100644
--- a/test/routine/gym_mode_screen_test.mocks.dart
+++ b/test/routine/gym_mode_screen_test.mocks.dart
@@ -46,203 +46,88 @@ import 'package:wger/providers/routines.dart' as _i23;
 // ignore_for_file: invalid_use_of_internal_member
 
 class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
-  _FakeAuthProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeAuthProvider_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
-  _FakeClient_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeClient_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeUri_2 extends _i1.SmartFake implements Uri {
-  _FakeUri_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeUri_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
-  _FakeResponse_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeResponse_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeWgerBaseProvider_4 extends _i1.SmartFake implements _i4.WgerBaseProvider {
-  _FakeWgerBaseProvider_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWgerBaseProvider_4(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeExerciseDatabase_5 extends _i1.SmartFake implements _i5.ExerciseDatabase {
-  _FakeExerciseDatabase_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeExerciseDatabase_5(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeExercise_6 extends _i1.SmartFake implements _i6.Exercise {
-  _FakeExercise_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeExercise_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeExerciseCategory_7 extends _i1.SmartFake implements _i7.ExerciseCategory {
-  _FakeExerciseCategory_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeExerciseCategory_7(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeEquipment_8 extends _i1.SmartFake implements _i8.Equipment {
-  _FakeEquipment_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeEquipment_8(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeMuscle_9 extends _i1.SmartFake implements _i9.Muscle {
-  _FakeMuscle_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeMuscle_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeLanguage_10 extends _i1.SmartFake implements _i10.Language {
-  _FakeLanguage_10(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeLanguage_10(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeWeightUnit_11 extends _i1.SmartFake implements _i11.WeightUnit {
-  _FakeWeightUnit_11(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWeightUnit_11(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeRepetitionUnit_12 extends _i1.SmartFake implements _i12.RepetitionUnit {
-  _FakeRepetitionUnit_12(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRepetitionUnit_12(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeRoutine_13 extends _i1.SmartFake implements _i13.Routine {
-  _FakeRoutine_13(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRoutine_13(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeDay_14 extends _i1.SmartFake implements _i14.Day {
-  _FakeDay_14(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeDay_14(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlot_15 extends _i1.SmartFake implements _i15.Slot {
-  _FakeSlot_15(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlot_15(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlotEntry_16 extends _i1.SmartFake implements _i16.SlotEntry {
-  _FakeSlotEntry_16(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlotEntry_16(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeBaseConfig_17 extends _i1.SmartFake implements _i17.BaseConfig {
-  _FakeBaseConfig_17(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeBaseConfig_17(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeWorkoutSession_18 extends _i1.SmartFake implements _i18.WorkoutSession {
-  _FakeWorkoutSession_18(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWorkoutSession_18(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeLog_19 extends _i1.SmartFake implements _i19.Log {
-  _FakeLog_19(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeLog_19(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [WgerBaseProvider].
@@ -254,156 +139,97 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
   }
 
   @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
-
-  @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
-
-  @override
-  set auth(_i2.AuthProvider? value) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  set client(_i3.Client? value) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) => (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
-
-  @override
-  Uri makeUrl(
-    String? path, {
-    int? id,
-    String? objectMethod,
-    Map<String, dynamic>? query,
-  }) =>
+  _i2.AuthProvider get auth =>
       (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,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(this, Invocation.getter(#auth)),
+          )
+          as _i2.AuthProvider);
 
   @override
-  _i20.Future<dynamic> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue: _i20.Future<dynamic>.value(),
-      ) as _i20.Future<dynamic>);
-
-  @override
-  _i20.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i20.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i20.Future<List<dynamic>>);
-
-  @override
-  _i20.Future<Map<String, dynamic>> post(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
+  _i3.Client get client =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i20.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i20.Future<Map<String, dynamic>>);
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(this, Invocation.getter(#client)),
+          )
+          as _i3.Client);
 
   @override
-  _i20.Future<Map<String, dynamic>> patch(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i20.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i20.Future<Map<String, dynamic>>);
+  set auth(_i2.AuthProvider? value) =>
+      super.noSuchMethod(Invocation.setter(#auth, value), returnValueForMissingStub: null);
 
   @override
-  _i20.Future<_i3.Response> deleteRequest(
-    String? url,
-    int? id,
-  ) =>
+  set client(_i3.Client? value) =>
+      super.noSuchMethod(Invocation.setter(#client, value), returnValueForMissingStub: null);
+
+  @override
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteRequest,
-          [
-            url,
-            id,
-          ],
-        ),
-        returnValue: _i20.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #deleteRequest,
-            [
-              url,
-              id,
-            ],
-          ),
-        )),
-      ) as _i20.Future<_i3.Response>);
+            Invocation.method(#getDefaultHeaders, [], {#includeAuth: includeAuth}),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
+
+  @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},
+              ),
+            ),
+          )
+          as Uri);
+
+  @override
+  _i20.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetch, [uri]),
+            returnValue: _i20.Future<dynamic>.value(),
+          )
+          as _i20.Future<dynamic>);
+
+  @override
+  _i20.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchPaginated, [uri]),
+            returnValue: _i20.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i20.Future<List<dynamic>>);
+
+  @override
+  _i20.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#post, [data, uri]),
+            returnValue: _i20.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i20.Future<Map<String, dynamic>>);
+
+  @override
+  _i20.Future<Map<String, dynamic>> patch(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#patch, [data, uri]),
+            returnValue: _i20.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i20.Future<Map<String, dynamic>>);
+
+  @override
+  _i20.Future<_i3.Response> deleteRequest(String? url, int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRequest, [url, id]),
+            returnValue: _i20.Future<_i3.Response>.value(
+              _FakeResponse_3(this, Invocation.method(#deleteRequest, [url, id])),
+            ),
+          )
+          as _i20.Future<_i3.Response>);
 }
 
 /// A class which mocks [ExercisesProvider].
@@ -415,292 +241,211 @@ class MockExercisesProvider extends _i1.Mock implements _i21.ExercisesProvider {
   }
 
   @override
-  _i4.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_4(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i4.WgerBaseProvider);
+  _i4.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_4(this, Invocation.getter(#baseProvider)),
+          )
+          as _i4.WgerBaseProvider);
 
   @override
-  _i5.ExerciseDatabase get database => (super.noSuchMethod(
-        Invocation.getter(#database),
-        returnValue: _FakeExerciseDatabase_5(
-          this,
-          Invocation.getter(#database),
-        ),
-      ) as _i5.ExerciseDatabase);
+  _i5.ExerciseDatabase get database =>
+      (super.noSuchMethod(
+            Invocation.getter(#database),
+            returnValue: _FakeExerciseDatabase_5(this, Invocation.getter(#database)),
+          )
+          as _i5.ExerciseDatabase);
 
   @override
-  List<_i6.Exercise> get exercises => (super.noSuchMethod(
-        Invocation.getter(#exercises),
-        returnValue: <_i6.Exercise>[],
-      ) as List<_i6.Exercise>);
+  List<_i6.Exercise> get exercises =>
+      (super.noSuchMethod(Invocation.getter(#exercises), returnValue: <_i6.Exercise>[])
+          as List<_i6.Exercise>);
 
   @override
-  List<_i6.Exercise> get filteredExercises => (super.noSuchMethod(
-        Invocation.getter(#filteredExercises),
-        returnValue: <_i6.Exercise>[],
-      ) as List<_i6.Exercise>);
+  List<_i6.Exercise> get filteredExercises =>
+      (super.noSuchMethod(Invocation.getter(#filteredExercises), returnValue: <_i6.Exercise>[])
+          as List<_i6.Exercise>);
 
   @override
-  Map<int, List<_i6.Exercise>> get exerciseByVariation => (super.noSuchMethod(
-        Invocation.getter(#exerciseByVariation),
-        returnValue: <int, List<_i6.Exercise>>{},
-      ) as Map<int, List<_i6.Exercise>>);
+  Map<int, List<_i6.Exercise>> get exerciseByVariation =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseByVariation),
+            returnValue: <int, List<_i6.Exercise>>{},
+          )
+          as Map<int, List<_i6.Exercise>>);
 
   @override
-  List<_i7.ExerciseCategory> get categories => (super.noSuchMethod(
-        Invocation.getter(#categories),
-        returnValue: <_i7.ExerciseCategory>[],
-      ) as List<_i7.ExerciseCategory>);
+  List<_i7.ExerciseCategory> get categories =>
+      (super.noSuchMethod(Invocation.getter(#categories), returnValue: <_i7.ExerciseCategory>[])
+          as List<_i7.ExerciseCategory>);
 
   @override
-  List<_i9.Muscle> get muscles => (super.noSuchMethod(
-        Invocation.getter(#muscles),
-        returnValue: <_i9.Muscle>[],
-      ) as List<_i9.Muscle>);
+  List<_i9.Muscle> get muscles =>
+      (super.noSuchMethod(Invocation.getter(#muscles), returnValue: <_i9.Muscle>[])
+          as List<_i9.Muscle>);
 
   @override
-  List<_i8.Equipment> get equipment => (super.noSuchMethod(
-        Invocation.getter(#equipment),
-        returnValue: <_i8.Equipment>[],
-      ) as List<_i8.Equipment>);
+  List<_i8.Equipment> get equipment =>
+      (super.noSuchMethod(Invocation.getter(#equipment), returnValue: <_i8.Equipment>[])
+          as List<_i8.Equipment>);
 
   @override
-  List<_i10.Language> get languages => (super.noSuchMethod(
-        Invocation.getter(#languages),
-        returnValue: <_i10.Language>[],
-      ) as List<_i10.Language>);
+  List<_i10.Language> get languages =>
+      (super.noSuchMethod(Invocation.getter(#languages), returnValue: <_i10.Language>[])
+          as List<_i10.Language>);
 
   @override
-  set database(_i5.ExerciseDatabase? value) => super.noSuchMethod(
-        Invocation.setter(
-          #database,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set database(_i5.ExerciseDatabase? value) =>
+      super.noSuchMethod(Invocation.setter(#database, value), returnValueForMissingStub: null);
 
   @override
-  set exercises(List<_i6.Exercise>? value) => super.noSuchMethod(
-        Invocation.setter(
-          #exercises,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set exercises(List<_i6.Exercise>? value) =>
+      super.noSuchMethod(Invocation.setter(#exercises, value), returnValueForMissingStub: null);
 
   @override
   set filteredExercises(List<_i6.Exercise>? newFilteredExercises) => super.noSuchMethod(
-        Invocation.setter(
-          #filteredExercises,
-          newFilteredExercises,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#filteredExercises, newFilteredExercises),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  set languages(List<_i10.Language>? languages) => super.noSuchMethod(
-        Invocation.setter(
-          #languages,
-          languages,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set languages(List<_i10.Language>? languages) =>
+      super.noSuchMethod(Invocation.setter(#languages, languages), 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
-  _i20.Future<void> setFilters(_i21.Filters? newFilters) => (super.noSuchMethod(
-        Invocation.method(
-          #setFilters,
-          [newFilters],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  void initFilters() => super.noSuchMethod(
-        Invocation.method(
-          #initFilters,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i20.Future<void> findByFilters() => (super.noSuchMethod(
-        Invocation.method(
-          #findByFilters,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i6.Exercise findExerciseById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findExerciseById,
-          [id],
-        ),
-        returnValue: _FakeExercise_6(
-          this,
-          Invocation.method(
-            #findExerciseById,
-            [id],
-          ),
-        ),
-      ) as _i6.Exercise);
-
-  @override
-  List<_i6.Exercise> findExercisesByVariationId(
-    int? variationId, {
-    int? exerciseIdToExclude,
-  }) =>
+  _i20.Future<void> setFilters(_i21.Filters? newFilters) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #findExercisesByVariationId,
-          [variationId],
-          {#exerciseIdToExclude: exerciseIdToExclude},
-        ),
-        returnValue: <_i6.Exercise>[],
-      ) as List<_i6.Exercise>);
+            Invocation.method(#setFilters, [newFilters]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  _i7.ExerciseCategory findCategoryById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findCategoryById,
-          [id],
-        ),
-        returnValue: _FakeExerciseCategory_7(
-          this,
-          Invocation.method(
-            #findCategoryById,
-            [id],
-          ),
-        ),
-      ) as _i7.ExerciseCategory);
+  void initFilters() =>
+      super.noSuchMethod(Invocation.method(#initFilters, []), returnValueForMissingStub: null);
 
   @override
-  _i8.Equipment findEquipmentById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findEquipmentById,
-          [id],
-        ),
-        returnValue: _FakeEquipment_8(
-          this,
-          Invocation.method(
-            #findEquipmentById,
-            [id],
-          ),
-        ),
-      ) as _i8.Equipment);
+  _i20.Future<void> findByFilters() =>
+      (super.noSuchMethod(
+            Invocation.method(#findByFilters, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  _i9.Muscle findMuscleById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findMuscleById,
-          [id],
-        ),
-        returnValue: _FakeMuscle_9(
-          this,
-          Invocation.method(
-            #findMuscleById,
-            [id],
-          ),
-        ),
-      ) as _i9.Muscle);
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
 
   @override
-  _i10.Language findLanguageById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findLanguageById,
-          [id],
-        ),
-        returnValue: _FakeLanguage_10(
-          this,
-          Invocation.method(
-            #findLanguageById,
-            [id],
-          ),
-        ),
-      ) as _i10.Language);
+  _i6.Exercise findExerciseById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findExerciseById, [id]),
+            returnValue: _FakeExercise_6(this, Invocation.method(#findExerciseById, [id])),
+          )
+          as _i6.Exercise);
 
   @override
-  _i20.Future<void> fetchAndSetCategoriesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetCategoriesFromApi,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+  List<_i6.Exercise> findExercisesByVariationId(int? variationId, {int? exerciseIdToExclude}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findExercisesByVariationId,
+              [variationId],
+              {#exerciseIdToExclude: exerciseIdToExclude},
+            ),
+            returnValue: <_i6.Exercise>[],
+          )
+          as List<_i6.Exercise>);
 
   @override
-  _i20.Future<void> fetchAndSetMusclesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetMusclesFromApi,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+  _i7.ExerciseCategory findCategoryById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findCategoryById, [id]),
+            returnValue: _FakeExerciseCategory_7(this, Invocation.method(#findCategoryById, [id])),
+          )
+          as _i7.ExerciseCategory);
 
   @override
-  _i20.Future<void> fetchAndSetEquipmentsFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEquipmentsFromApi,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+  _i8.Equipment findEquipmentById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findEquipmentById, [id]),
+            returnValue: _FakeEquipment_8(this, Invocation.method(#findEquipmentById, [id])),
+          )
+          as _i8.Equipment);
 
   @override
-  _i20.Future<void> fetchAndSetLanguagesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLanguagesFromApi,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+  _i9.Muscle findMuscleById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findMuscleById, [id]),
+            returnValue: _FakeMuscle_9(this, Invocation.method(#findMuscleById, [id])),
+          )
+          as _i9.Muscle);
 
   @override
-  _i20.Future<void> fetchAndSetAllExercises() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllExercises,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+  _i10.Language findLanguageById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findLanguageById, [id]),
+            returnValue: _FakeLanguage_10(this, Invocation.method(#findLanguageById, [id])),
+          )
+          as _i10.Language);
 
   @override
-  _i20.Future<_i6.Exercise?> fetchAndSetExercise(int? exerciseId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetExercise,
-          [exerciseId],
-        ),
-        returnValue: _i20.Future<_i6.Exercise?>.value(),
-      ) as _i20.Future<_i6.Exercise?>);
+  _i20.Future<void> fetchAndSetCategoriesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategoriesFromApi, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> fetchAndSetMusclesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetMusclesFromApi, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> fetchAndSetEquipmentsFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetEquipmentsFromApi, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> fetchAndSetLanguagesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetLanguagesFromApi, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> fetchAndSetAllExercises() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllExercises, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<_i6.Exercise?> fetchAndSetExercise(int? exerciseId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetExercise, [exerciseId]),
+            returnValue: _i20.Future<_i6.Exercise?>.value(),
+          )
+          as _i20.Future<_i6.Exercise?>);
 
   @override
   _i20.Future<_i6.Exercise> handleUpdateExerciseFromApi(
@@ -708,55 +453,42 @@ class MockExercisesProvider extends _i1.Mock implements _i21.ExercisesProvider {
     int? exerciseId,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #handleUpdateExerciseFromApi,
-          [
-            database,
-            exerciseId,
-          ],
-        ),
-        returnValue: _i20.Future<_i6.Exercise>.value(_FakeExercise_6(
-          this,
-          Invocation.method(
-            #handleUpdateExerciseFromApi,
-            [
-              database,
-              exerciseId,
-            ],
-          ),
-        )),
-      ) as _i20.Future<_i6.Exercise>);
+            Invocation.method(#handleUpdateExerciseFromApi, [database, exerciseId]),
+            returnValue: _i20.Future<_i6.Exercise>.value(
+              _FakeExercise_6(
+                this,
+                Invocation.method(#handleUpdateExerciseFromApi, [database, exerciseId]),
+              ),
+            ),
+          )
+          as _i20.Future<_i6.Exercise>);
 
   @override
-  _i20.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) => (super.noSuchMethod(
-        Invocation.method(
-          #initCacheTimesLocalPrefs,
-          [],
-          {#forceInit: forceInit},
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+  _i20.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(#initCacheTimesLocalPrefs, [], {#forceInit: forceInit}),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  _i20.Future<void> clearAllCachesAndPrefs() => (super.noSuchMethod(
-        Invocation.method(
-          #clearAllCachesAndPrefs,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+  _i20.Future<void> clearAllCachesAndPrefs() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearAllCachesAndPrefs, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  _i20.Future<void> fetchAndSetInitialData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetInitialData,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+  _i20.Future<void> fetchAndSetInitialData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetInitialData, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
   _i20.Future<void> setExercisesFromDatabase(
@@ -764,64 +496,60 @@ class MockExercisesProvider extends _i1.Mock implements _i21.ExercisesProvider {
     bool? forceDeleteCache = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesFromDatabase,
-          [database],
-          {#forceDeleteCache: forceDeleteCache},
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+            Invocation.method(
+              #setExercisesFromDatabase,
+              [database],
+              {#forceDeleteCache: forceDeleteCache},
+            ),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  _i20.Future<void> updateExerciseCache(_i5.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #updateExerciseCache,
-          [database],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+  _i20.Future<void> updateExerciseCache(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateExerciseCache, [database]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  _i20.Future<void> fetchAndSetMuscles(_i5.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetMuscles,
-          [database],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+  _i20.Future<void> fetchAndSetMuscles(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetMuscles, [database]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  _i20.Future<void> fetchAndSetCategories(_i5.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetCategories,
-          [database],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+  _i20.Future<void> fetchAndSetCategories(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategories, [database]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  _i20.Future<void> fetchAndSetLanguages(_i5.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLanguages,
-          [database],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+  _i20.Future<void> fetchAndSetLanguages(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetLanguages, [database]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  _i20.Future<void> fetchAndSetEquipments(_i5.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEquipments,
-          [database],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+  _i20.Future<void> fetchAndSetEquipments(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetEquipments, [database]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
   _i20.Future<List<_i6.Exercise>> searchExercise(
@@ -830,52 +558,34 @@ class MockExercisesProvider extends _i1.Mock implements _i21.ExercisesProvider {
     bool? searchEnglish = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #searchExercise,
-          [name],
-          {
-            #languageCode: languageCode,
-            #searchEnglish: searchEnglish,
-          },
-        ),
-        returnValue: _i20.Future<List<_i6.Exercise>>.value(<_i6.Exercise>[]),
-      ) as _i20.Future<List<_i6.Exercise>>);
+            Invocation.method(
+              #searchExercise,
+              [name],
+              {#languageCode: languageCode, #searchEnglish: searchEnglish},
+            ),
+            returnValue: _i20.Future<List<_i6.Exercise>>.value(<_i6.Exercise>[]),
+          )
+          as _i20.Future<List<_i6.Exercise>>);
 
   @override
   void addListener(_i22.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i22.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    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);
 }
 
 /// A class which mocks [RoutinesProvider].
@@ -887,174 +597,121 @@ class MockRoutinesProvider extends _i1.Mock implements _i23.RoutinesProvider {
   }
 
   @override
-  _i4.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_4(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i4.WgerBaseProvider);
+  _i4.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_4(this, Invocation.getter(#baseProvider)),
+          )
+          as _i4.WgerBaseProvider);
 
   @override
-  List<_i13.Routine> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i13.Routine>[],
-      ) as List<_i13.Routine>);
+  List<_i13.Routine> get items =>
+      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i13.Routine>[])
+          as List<_i13.Routine>);
 
   @override
-  List<_i11.WeightUnit> get weightUnits => (super.noSuchMethod(
-        Invocation.getter(#weightUnits),
-        returnValue: <_i11.WeightUnit>[],
-      ) as List<_i11.WeightUnit>);
+  List<_i11.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(Invocation.getter(#weightUnits), returnValue: <_i11.WeightUnit>[])
+          as List<_i11.WeightUnit>);
 
   @override
-  _i11.WeightUnit get defaultWeightUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultWeightUnit),
-        returnValue: _FakeWeightUnit_11(
-          this,
-          Invocation.getter(#defaultWeightUnit),
-        ),
-      ) as _i11.WeightUnit);
+  _i11.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_11(this, Invocation.getter(#defaultWeightUnit)),
+          )
+          as _i11.WeightUnit);
 
   @override
-  List<_i12.RepetitionUnit> get repetitionUnits => (super.noSuchMethod(
-        Invocation.getter(#repetitionUnits),
-        returnValue: <_i12.RepetitionUnit>[],
-      ) as List<_i12.RepetitionUnit>);
+  List<_i12.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(Invocation.getter(#repetitionUnits), returnValue: <_i12.RepetitionUnit>[])
+          as List<_i12.RepetitionUnit>);
 
   @override
-  _i12.RepetitionUnit get defaultRepetitionUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultRepetitionUnit),
-        returnValue: _FakeRepetitionUnit_12(
-          this,
-          Invocation.getter(#defaultRepetitionUnit),
-        ),
-      ) as _i12.RepetitionUnit);
+  _i12.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_12(this, Invocation.getter(#defaultRepetitionUnit)),
+          )
+          as _i12.RepetitionUnit);
 
   @override
-  set activeRoutine(_i13.Routine? value) => super.noSuchMethod(
-        Invocation.setter(
-          #activeRoutine,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set activeRoutine(_i13.Routine? value) =>
+      super.noSuchMethod(Invocation.setter(#activeRoutine, value), returnValueForMissingStub: null);
 
   @override
   set weightUnits(List<_i11.WeightUnit>? weightUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #weightUnits,
-          weightUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set repetitionUnits(List<_i12.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #repetitionUnits,
-          repetitionUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    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
-  _i11.WeightUnit findWeightUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findWeightUnitById,
-          [id],
-        ),
-        returnValue: _FakeWeightUnit_11(
-          this,
-          Invocation.method(
-            #findWeightUnitById,
-            [id],
-          ),
-        ),
-      ) as _i11.WeightUnit);
+  _i11.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_11(this, Invocation.method(#findWeightUnitById, [id])),
+          )
+          as _i11.WeightUnit);
 
   @override
-  _i12.RepetitionUnit findRepetitionUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findRepetitionUnitById,
-          [id],
-        ),
-        returnValue: _FakeRepetitionUnit_12(
-          this,
-          Invocation.method(
-            #findRepetitionUnitById,
-            [id],
-          ),
-        ),
-      ) as _i12.RepetitionUnit);
+  _i12.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_12(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i12.RepetitionUnit);
 
   @override
-  List<_i13.Routine> getPlans() => (super.noSuchMethod(
-        Invocation.method(
-          #getPlans,
-          [],
-        ),
-        returnValue: <_i13.Routine>[],
-      ) as List<_i13.Routine>);
+  List<_i13.Routine> getPlans() =>
+      (super.noSuchMethod(Invocation.method(#getPlans, []), returnValue: <_i13.Routine>[])
+          as List<_i13.Routine>);
 
   @override
-  _i13.Routine findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeRoutine_13(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i13.Routine);
+  _i13.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_13(this, Invocation.method(#findById, [id])),
+          )
+          as _i13.Routine);
 
   @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
-  _i20.Future<void> fetchAndSetAllRoutinesFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesFull,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+  _i20.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  _i20.Future<void> fetchAndSetAllRoutinesSparse() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesSparse,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+  _i20.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
   _i20.Future<void> setExercisesAndUnits(
@@ -1062,505 +719,299 @@ class MockRoutinesProvider extends _i1.Mock implements _i23.RoutinesProvider {
     Map<int, _i6.Exercise>? exercises,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesAndUnits,
-          [entries],
-          {#exercises: exercises},
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+            Invocation.method(#setExercisesAndUnits, [entries], {#exercises: exercises}),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  _i20.Future<_i13.Routine> fetchAndSetRoutineSparse(int? planId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineSparse,
-          [planId],
-        ),
-        returnValue: _i20.Future<_i13.Routine>.value(_FakeRoutine_13(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineSparse,
-            [planId],
-          ),
-        )),
-      ) as _i20.Future<_i13.Routine>);
-
-  @override
-  _i20.Future<_i13.Routine> fetchAndSetRoutineFull(int? routineId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineFull,
-          [routineId],
-        ),
-        returnValue: _i20.Future<_i13.Routine>.value(_FakeRoutine_13(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineFull,
-            [routineId],
-          ),
-        )),
-      ) as _i20.Future<_i13.Routine>);
-
-  @override
-  _i20.Future<_i13.Routine> addRoutine(_i13.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #addRoutine,
-          [routine],
-        ),
-        returnValue: _i20.Future<_i13.Routine>.value(_FakeRoutine_13(
-          this,
-          Invocation.method(
-            #addRoutine,
-            [routine],
-          ),
-        )),
-      ) as _i20.Future<_i13.Routine>);
-
-  @override
-  _i20.Future<void> editRoutine(_i13.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #editRoutine,
-          [routine],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> deleteRoutine(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteRoutine,
-          [id],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> fetchAndSetRepetitionUnits() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRepetitionUnits,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> fetchAndSetWeightUnits() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetWeightUnits,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> fetchAndSetUnits() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetUnits,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<_i14.Day> addDay(_i14.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #addDay,
-          [day],
-        ),
-        returnValue: _i20.Future<_i14.Day>.value(_FakeDay_14(
-          this,
-          Invocation.method(
-            #addDay,
-            [day],
-          ),
-        )),
-      ) as _i20.Future<_i14.Day>);
-
-  @override
-  _i20.Future<void> editDay(_i14.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #editDay,
-          [day],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> editDays(List<_i14.Day>? days) => (super.noSuchMethod(
-        Invocation.method(
-          #editDays,
-          [days],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> deleteDay(int? dayId) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteDay,
-          [dayId],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<_i15.Slot> addSlot(
-    _i15.Slot? slot,
-    int? routineId,
-  ) =>
+  _i20.Future<_i13.Routine> fetchAndSetRoutineSparse(int? planId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i20.Future<_i15.Slot>.value(_FakeSlot_15(
-          this,
-          Invocation.method(
-            #addSlot,
-            [
-              slot,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i20.Future<_i15.Slot>);
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i20.Future<_i13.Routine>.value(
+              _FakeRoutine_13(this, Invocation.method(#fetchAndSetRoutineSparse, [planId])),
+            ),
+          )
+          as _i20.Future<_i13.Routine>);
 
   @override
-  _i20.Future<void> deleteSlot(
-    int? slotId,
-    int? routineId,
-  ) =>
+  _i20.Future<_i13.Routine> fetchAndSetRoutineFull(int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlot,
-          [
-            slotId,
-            routineId,
-          ],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i20.Future<_i13.Routine>.value(
+              _FakeRoutine_13(this, Invocation.method(#fetchAndSetRoutineFull, [routineId])),
+            ),
+          )
+          as _i20.Future<_i13.Routine>);
 
   @override
-  _i20.Future<void> editSlot(
-    _i15.Slot? slot,
-    int? routineId,
-  ) =>
+  _i20.Future<_i13.Routine> addRoutine(_i13.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i20.Future<_i13.Routine>.value(
+              _FakeRoutine_13(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i20.Future<_i13.Routine>);
 
   @override
-  _i20.Future<void> editSlots(
-    List<_i15.Slot>? slots,
-    int? routineId,
-  ) =>
+  _i20.Future<void> editRoutine(_i13.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlots,
-          [
-            slots,
-            routineId,
-          ],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  _i20.Future<_i16.SlotEntry> addSlotEntry(
-    _i16.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i20.Future<void> deleteRoutine(int? id) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i20.Future<_i16.SlotEntry>.value(_FakeSlotEntry_16(
-          this,
-          Invocation.method(
-            #addSlotEntry,
-            [
-              entry,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i20.Future<_i16.SlotEntry>);
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  _i20.Future<void> deleteSlotEntry(
-    int? id,
-    int? routineId,
-  ) =>
+  _i20.Future<void> fetchAndSetRepetitionUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlotEntry,
-          [
-            id,
-            routineId,
-          ],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  _i20.Future<void> editSlotEntry(
-    _i16.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i20.Future<void> fetchAndSetWeightUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  String getConfigUrl(_i16.ConfigType? type) => (super.noSuchMethod(
-        Invocation.method(
-          #getConfigUrl,
-          [type],
-        ),
-        returnValue: _i25.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getConfigUrl,
-            [type],
-          ),
-        ),
-      ) as String);
-
-  @override
-  _i20.Future<_i17.BaseConfig> editConfig(
-    _i17.BaseConfig? config,
-    _i16.ConfigType? type,
-  ) =>
+  _i20.Future<void> fetchAndSetUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i20.Future<_i17.BaseConfig>.value(_FakeBaseConfig_17(
-          this,
-          Invocation.method(
-            #editConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i20.Future<_i17.BaseConfig>);
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  _i20.Future<_i17.BaseConfig> addConfig(
-    _i17.BaseConfig? config,
-    _i16.ConfigType? type,
-  ) =>
+  _i20.Future<_i14.Day> addDay(_i14.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i20.Future<_i17.BaseConfig>.value(_FakeBaseConfig_17(
-          this,
-          Invocation.method(
-            #addConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i20.Future<_i17.BaseConfig>);
+            Invocation.method(#addDay, [day]),
+            returnValue: _i20.Future<_i14.Day>.value(
+              _FakeDay_14(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i20.Future<_i14.Day>);
 
   @override
-  _i20.Future<void> deleteConfig(
-    int? id,
-    _i16.ConfigType? type,
-  ) =>
+  _i20.Future<void> editDay(_i14.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteConfig,
-          [
-            id,
-            type,
-          ],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+            Invocation.method(#editDay, [day]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  _i20.Future<void> handleConfig(
-    _i16.SlotEntry? entry,
-    num? value,
-    _i16.ConfigType? type,
-  ) =>
+  _i20.Future<void> editDays(List<_i14.Day>? days) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #handleConfig,
-          [
-            entry,
-            value,
-            type,
-          ],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+            Invocation.method(#editDays, [days]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  _i20.Future<List<_i18.WorkoutSession>> fetchSessionData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchSessionData,
-          [],
-        ),
-        returnValue: _i20.Future<List<_i18.WorkoutSession>>.value(<_i18.WorkoutSession>[]),
-      ) as _i20.Future<List<_i18.WorkoutSession>>);
-
-  @override
-  _i20.Future<_i18.WorkoutSession> addSession(
-    _i18.WorkoutSession? session,
-    int? routineId,
-  ) =>
+  _i20.Future<void> deleteDay(int? dayId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSession,
-          [
-            session,
-            routineId,
-          ],
-        ),
-        returnValue: _i20.Future<_i18.WorkoutSession>.value(_FakeWorkoutSession_18(
-          this,
-          Invocation.method(
-            #addSession,
-            [
-              session,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i20.Future<_i18.WorkoutSession>);
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
-  _i20.Future<_i18.WorkoutSession> editSession(_i18.WorkoutSession? session) => (super.noSuchMethod(
-        Invocation.method(
-          #editSession,
-          [session],
-        ),
-        returnValue: _i20.Future<_i18.WorkoutSession>.value(_FakeWorkoutSession_18(
-          this,
-          Invocation.method(
-            #editSession,
-            [session],
-          ),
-        )),
-      ) as _i20.Future<_i18.WorkoutSession>);
-
-  @override
-  _i20.Future<_i19.Log> addLog(_i19.Log? log) => (super.noSuchMethod(
-        Invocation.method(
-          #addLog,
-          [log],
-        ),
-        returnValue: _i20.Future<_i19.Log>.value(_FakeLog_19(
-          this,
-          Invocation.method(
-            #addLog,
-            [log],
-          ),
-        )),
-      ) as _i20.Future<_i19.Log>);
-
-  @override
-  _i20.Future<void> deleteLog(
-    int? logId,
-    int? routineId,
-  ) =>
+  _i20.Future<_i15.Slot> addSlot(_i15.Slot? slot, int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [
-            logId,
-            routineId,
-          ],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i20.Future<_i15.Slot>.value(
+              _FakeSlot_15(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i20.Future<_i15.Slot>);
+
+  @override
+  _i20.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> editSlot(_i15.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> editSlots(List<_i15.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<_i16.SlotEntry> addSlotEntry(_i16.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i20.Future<_i16.SlotEntry>.value(
+              _FakeSlotEntry_16(this, Invocation.method(#addSlotEntry, [entry, routineId])),
+            ),
+          )
+          as _i20.Future<_i16.SlotEntry>);
+
+  @override
+  _i20.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> editSlotEntry(_i16.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  String getConfigUrl(_i16.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i25.dummyValue<String>(this, Invocation.method(#getConfigUrl, [type])),
+          )
+          as String);
+
+  @override
+  _i20.Future<_i17.BaseConfig> editConfig(_i17.BaseConfig? config, _i16.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i20.Future<_i17.BaseConfig>.value(
+              _FakeBaseConfig_17(this, Invocation.method(#editConfig, [config, type])),
+            ),
+          )
+          as _i20.Future<_i17.BaseConfig>);
+
+  @override
+  _i20.Future<_i17.BaseConfig> addConfig(_i17.BaseConfig? config, _i16.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i20.Future<_i17.BaseConfig>.value(
+              _FakeBaseConfig_17(this, Invocation.method(#addConfig, [config, type])),
+            ),
+          )
+          as _i20.Future<_i17.BaseConfig>);
+
+  @override
+  _i20.Future<void> deleteConfig(int? id, _i16.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> handleConfig(_i16.SlotEntry? entry, num? value, _i16.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<List<_i18.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i20.Future<List<_i18.WorkoutSession>>.value(<_i18.WorkoutSession>[]),
+          )
+          as _i20.Future<List<_i18.WorkoutSession>>);
+
+  @override
+  _i20.Future<_i18.WorkoutSession> addSession(_i18.WorkoutSession? session, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i20.Future<_i18.WorkoutSession>.value(
+              _FakeWorkoutSession_18(this, Invocation.method(#addSession, [session, routineId])),
+            ),
+          )
+          as _i20.Future<_i18.WorkoutSession>);
+
+  @override
+  _i20.Future<_i18.WorkoutSession> editSession(_i18.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i20.Future<_i18.WorkoutSession>.value(
+              _FakeWorkoutSession_18(this, Invocation.method(#editSession, [session])),
+            ),
+          )
+          as _i20.Future<_i18.WorkoutSession>);
+
+  @override
+  _i20.Future<_i19.Log> addLog(_i19.Log? log) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLog, [log]),
+            returnValue: _i20.Future<_i19.Log>.value(
+              _FakeLog_19(this, Invocation.method(#addLog, [log])),
+            ),
+          )
+          as _i20.Future<_i19.Log>);
+
+  @override
+  _i20.Future<void> deleteLog(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
 
   @override
   void addListener(_i22.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i22.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    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);
 }
diff --git a/test/routine/gym_mode_session_screen_test.mocks.dart b/test/routine/gym_mode_session_screen_test.mocks.dart
index 78725bf3..05bb0ba5 100644
--- a/test/routine/gym_mode_session_screen_test.mocks.dart
+++ b/test/routine/gym_mode_session_screen_test.mocks.dart
@@ -38,103 +38,46 @@ import 'package:wger/providers/routines.dart' as _i12;
 // ignore_for_file: invalid_use_of_internal_member
 
 class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
-  _FakeRoutine_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
-  _FakeSlot_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
-  _FakeSlotEntry_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
-  _FakeBaseConfig_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
-  _FakeWorkoutSession_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
-  _FakeLog_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [RoutinesProvider].
@@ -146,174 +89,121 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  List<_i5.Routine> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  List<_i3.WeightUnit> get weightUnits => (super.noSuchMethod(
-        Invocation.getter(#weightUnits),
-        returnValue: <_i3.WeightUnit>[],
-      ) as List<_i3.WeightUnit>);
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(Invocation.getter(#weightUnits), returnValue: <_i3.WeightUnit>[])
+          as List<_i3.WeightUnit>);
 
   @override
-  _i3.WeightUnit get defaultWeightUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultWeightUnit),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.getter(#defaultWeightUnit),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(this, Invocation.getter(#defaultWeightUnit)),
+          )
+          as _i3.WeightUnit);
 
   @override
-  List<_i4.RepetitionUnit> get repetitionUnits => (super.noSuchMethod(
-        Invocation.getter(#repetitionUnits),
-        returnValue: <_i4.RepetitionUnit>[],
-      ) as List<_i4.RepetitionUnit>);
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(Invocation.getter(#repetitionUnits), returnValue: <_i4.RepetitionUnit>[])
+          as List<_i4.RepetitionUnit>);
 
   @override
-  _i4.RepetitionUnit get defaultRepetitionUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultRepetitionUnit),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.getter(#defaultRepetitionUnit),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(this, Invocation.getter(#defaultRepetitionUnit)),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
-        Invocation.setter(
-          #activeRoutine,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set activeRoutine(_i5.Routine? value) =>
+      super.noSuchMethod(Invocation.setter(#activeRoutine, value), returnValueForMissingStub: null);
 
   @override
   set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #weightUnits,
-          weightUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #repetitionUnits,
-          repetitionUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    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
-  _i3.WeightUnit findWeightUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findWeightUnitById,
-          [id],
-        ),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.method(
-            #findWeightUnitById,
-            [id],
-          ),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(this, Invocation.method(#findWeightUnitById, [id])),
+          )
+          as _i3.WeightUnit);
 
   @override
-  _i4.RepetitionUnit findRepetitionUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findRepetitionUnitById,
-          [id],
-        ),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.method(
-            #findRepetitionUnitById,
-            [id],
-          ),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  List<_i5.Routine> getPlans() => (super.noSuchMethod(
-        Invocation.method(
-          #getPlans,
-          [],
-        ),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(Invocation.method(#getPlans, []), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  _i5.Routine findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeRoutine_3(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i5.Routine);
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(this, Invocation.method(#findById, [id])),
+          )
+          as _i5.Routine);
 
   @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
-  _i13.Future<void> fetchAndSetAllRoutinesFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesFull,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> fetchAndSetAllRoutinesSparse() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesSparse,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   _i13.Future<void> setExercisesAndUnits(
@@ -321,505 +211,299 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
     Map<int, _i15.Exercise>? exercises,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesAndUnits,
-          [entries],
-          {#exercises: exercises},
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#setExercisesAndUnits, [entries], {#exercises: exercises}),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineSparse,
-          [planId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineSparse,
-            [planId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineFull,
-          [routineId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineFull,
-            [routineId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #addRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #addRoutine,
-            [routine],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<void> editRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #editRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteRoutine(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteRoutine,
-          [id],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @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<_i6.Day> addDay(_i6.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #addDay,
-          [day],
-        ),
-        returnValue: _i13.Future<_i6.Day>.value(_FakeDay_4(
-          this,
-          Invocation.method(
-            #addDay,
-            [day],
-          ),
-        )),
-      ) as _i13.Future<_i6.Day>);
-
-  @override
-  _i13.Future<void> editDay(_i6.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<void> editDays(List<_i6.Day>? days) => (super.noSuchMethod(
-        Invocation.method(
-          #editDays,
-          [days],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteDay(int? dayId) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteDay,
-          [dayId],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<_i7.Slot> addSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i7.Slot>.value(_FakeSlot_5(
-          this,
-          Invocation.method(
-            #addSlot,
-            [
-              slot,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i7.Slot>);
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineSparse, [planId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> deleteSlot(
-    int? slotId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlot,
-          [
-            slotId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineFull, [routineId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlots(
-    List<_i7.Slot>? slots,
-    int? routineId,
-  ) =>
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlots,
-          [
-            slots,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i8.SlotEntry> addSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteRoutine(int? id) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i8.SlotEntry>.value(_FakeSlotEntry_6(
-          this,
-          Invocation.method(
-            #addSlotEntry,
-            [
-              entry,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i8.SlotEntry>);
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> deleteSlotEntry(
-    int? id,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlotEntry,
-          [
-            id,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> editSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetWeightUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  String getConfigUrl(_i8.ConfigType? type) => (super.noSuchMethod(
-        Invocation.method(
-          #getConfigUrl,
-          [type],
-        ),
-        returnValue: _i16.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getConfigUrl,
-            [type],
-          ),
-        ),
-      ) as String);
-
-  @override
-  _i13.Future<_i9.BaseConfig> editConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> fetchAndSetUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #editConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i9.BaseConfig> addConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #addConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
 
   @override
-  _i13.Future<void> deleteConfig(
-    int? id,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteConfig,
-          [
-            id,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> handleConfig(
-    _i8.SlotEntry? entry,
-    num? value,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #handleConfig,
-          [
-            entry,
-            value,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchSessionData,
-          [],
-        ),
-        returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
-      ) as _i13.Future<List<_i10.WorkoutSession>>);
-
-  @override
-  _i13.Future<_i10.WorkoutSession> addSession(
-    _i10.WorkoutSession? session,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteDay(int? dayId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSession,
-          [
-            session,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #addSession,
-            [
-              session,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i10.WorkoutSession>);
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
-        Invocation.method(
-          #editSession,
-          [session],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #editSession,
-            [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(
-    int? logId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [
-            logId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(this, Invocation.method(#addSlotEntry, [entry, routineId])),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(this, Invocation.method(#getConfigUrl, [type])),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#editConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#addConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(_i8.SlotEntry? entry, num? value, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#addSession, [session, routineId])),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#editSession, [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(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    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);
 }
diff --git a/test/routine/repetition_unit_form_widget_test.mocks.dart b/test/routine/repetition_unit_form_widget_test.mocks.dart
index 6c6fde11..7294923b 100644
--- a/test/routine/repetition_unit_form_widget_test.mocks.dart
+++ b/test/routine/repetition_unit_form_widget_test.mocks.dart
@@ -38,103 +38,46 @@ import 'package:wger/providers/routines.dart' as _i12;
 // ignore_for_file: invalid_use_of_internal_member
 
 class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
-  _FakeRoutine_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
-  _FakeSlot_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
-  _FakeSlotEntry_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
-  _FakeBaseConfig_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
-  _FakeWorkoutSession_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
-  _FakeLog_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [RoutinesProvider].
@@ -146,174 +89,121 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  List<_i5.Routine> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  List<_i3.WeightUnit> get weightUnits => (super.noSuchMethod(
-        Invocation.getter(#weightUnits),
-        returnValue: <_i3.WeightUnit>[],
-      ) as List<_i3.WeightUnit>);
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(Invocation.getter(#weightUnits), returnValue: <_i3.WeightUnit>[])
+          as List<_i3.WeightUnit>);
 
   @override
-  _i3.WeightUnit get defaultWeightUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultWeightUnit),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.getter(#defaultWeightUnit),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(this, Invocation.getter(#defaultWeightUnit)),
+          )
+          as _i3.WeightUnit);
 
   @override
-  List<_i4.RepetitionUnit> get repetitionUnits => (super.noSuchMethod(
-        Invocation.getter(#repetitionUnits),
-        returnValue: <_i4.RepetitionUnit>[],
-      ) as List<_i4.RepetitionUnit>);
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(Invocation.getter(#repetitionUnits), returnValue: <_i4.RepetitionUnit>[])
+          as List<_i4.RepetitionUnit>);
 
   @override
-  _i4.RepetitionUnit get defaultRepetitionUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultRepetitionUnit),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.getter(#defaultRepetitionUnit),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(this, Invocation.getter(#defaultRepetitionUnit)),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
-        Invocation.setter(
-          #activeRoutine,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set activeRoutine(_i5.Routine? value) =>
+      super.noSuchMethod(Invocation.setter(#activeRoutine, value), returnValueForMissingStub: null);
 
   @override
   set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #weightUnits,
-          weightUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #repetitionUnits,
-          repetitionUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    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
-  _i3.WeightUnit findWeightUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findWeightUnitById,
-          [id],
-        ),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.method(
-            #findWeightUnitById,
-            [id],
-          ),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(this, Invocation.method(#findWeightUnitById, [id])),
+          )
+          as _i3.WeightUnit);
 
   @override
-  _i4.RepetitionUnit findRepetitionUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findRepetitionUnitById,
-          [id],
-        ),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.method(
-            #findRepetitionUnitById,
-            [id],
-          ),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  List<_i5.Routine> getPlans() => (super.noSuchMethod(
-        Invocation.method(
-          #getPlans,
-          [],
-        ),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(Invocation.method(#getPlans, []), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  _i5.Routine findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeRoutine_3(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i5.Routine);
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(this, Invocation.method(#findById, [id])),
+          )
+          as _i5.Routine);
 
   @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
-  _i13.Future<void> fetchAndSetAllRoutinesFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesFull,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> fetchAndSetAllRoutinesSparse() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesSparse,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   _i13.Future<void> setExercisesAndUnits(
@@ -321,505 +211,299 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
     Map<int, _i15.Exercise>? exercises,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesAndUnits,
-          [entries],
-          {#exercises: exercises},
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#setExercisesAndUnits, [entries], {#exercises: exercises}),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineSparse,
-          [planId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineSparse,
-            [planId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineFull,
-          [routineId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineFull,
-            [routineId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #addRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #addRoutine,
-            [routine],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<void> editRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #editRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteRoutine(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteRoutine,
-          [id],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @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<_i6.Day> addDay(_i6.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #addDay,
-          [day],
-        ),
-        returnValue: _i13.Future<_i6.Day>.value(_FakeDay_4(
-          this,
-          Invocation.method(
-            #addDay,
-            [day],
-          ),
-        )),
-      ) as _i13.Future<_i6.Day>);
-
-  @override
-  _i13.Future<void> editDay(_i6.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<void> editDays(List<_i6.Day>? days) => (super.noSuchMethod(
-        Invocation.method(
-          #editDays,
-          [days],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteDay(int? dayId) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteDay,
-          [dayId],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<_i7.Slot> addSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i7.Slot>.value(_FakeSlot_5(
-          this,
-          Invocation.method(
-            #addSlot,
-            [
-              slot,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i7.Slot>);
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineSparse, [planId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> deleteSlot(
-    int? slotId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlot,
-          [
-            slotId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineFull, [routineId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlots(
-    List<_i7.Slot>? slots,
-    int? routineId,
-  ) =>
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlots,
-          [
-            slots,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i8.SlotEntry> addSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteRoutine(int? id) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i8.SlotEntry>.value(_FakeSlotEntry_6(
-          this,
-          Invocation.method(
-            #addSlotEntry,
-            [
-              entry,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i8.SlotEntry>);
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> deleteSlotEntry(
-    int? id,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlotEntry,
-          [
-            id,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> editSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetWeightUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  String getConfigUrl(_i8.ConfigType? type) => (super.noSuchMethod(
-        Invocation.method(
-          #getConfigUrl,
-          [type],
-        ),
-        returnValue: _i16.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getConfigUrl,
-            [type],
-          ),
-        ),
-      ) as String);
-
-  @override
-  _i13.Future<_i9.BaseConfig> editConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> fetchAndSetUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #editConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i9.BaseConfig> addConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #addConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
 
   @override
-  _i13.Future<void> deleteConfig(
-    int? id,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteConfig,
-          [
-            id,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> handleConfig(
-    _i8.SlotEntry? entry,
-    num? value,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #handleConfig,
-          [
-            entry,
-            value,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchSessionData,
-          [],
-        ),
-        returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
-      ) as _i13.Future<List<_i10.WorkoutSession>>);
-
-  @override
-  _i13.Future<_i10.WorkoutSession> addSession(
-    _i10.WorkoutSession? session,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteDay(int? dayId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSession,
-          [
-            session,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #addSession,
-            [
-              session,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i10.WorkoutSession>);
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
-        Invocation.method(
-          #editSession,
-          [session],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #editSession,
-            [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(
-    int? logId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [
-            logId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(this, Invocation.method(#addSlotEntry, [entry, routineId])),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(this, Invocation.method(#getConfigUrl, [type])),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#editConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#addConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(_i8.SlotEntry? entry, num? value, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#addSession, [session, routineId])),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#editSession, [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(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    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);
 }
diff --git a/test/routine/routine_edit_screen_test.mocks.dart b/test/routine/routine_edit_screen_test.mocks.dart
index 5a48f35d..26ed8b10 100644
--- a/test/routine/routine_edit_screen_test.mocks.dart
+++ b/test/routine/routine_edit_screen_test.mocks.dart
@@ -38,103 +38,46 @@ import 'package:wger/providers/routines.dart' as _i12;
 // ignore_for_file: invalid_use_of_internal_member
 
 class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
-  _FakeRoutine_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
-  _FakeSlot_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
-  _FakeSlotEntry_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
-  _FakeBaseConfig_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
-  _FakeWorkoutSession_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
-  _FakeLog_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [RoutinesProvider].
@@ -146,174 +89,121 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  List<_i5.Routine> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  List<_i3.WeightUnit> get weightUnits => (super.noSuchMethod(
-        Invocation.getter(#weightUnits),
-        returnValue: <_i3.WeightUnit>[],
-      ) as List<_i3.WeightUnit>);
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(Invocation.getter(#weightUnits), returnValue: <_i3.WeightUnit>[])
+          as List<_i3.WeightUnit>);
 
   @override
-  _i3.WeightUnit get defaultWeightUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultWeightUnit),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.getter(#defaultWeightUnit),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(this, Invocation.getter(#defaultWeightUnit)),
+          )
+          as _i3.WeightUnit);
 
   @override
-  List<_i4.RepetitionUnit> get repetitionUnits => (super.noSuchMethod(
-        Invocation.getter(#repetitionUnits),
-        returnValue: <_i4.RepetitionUnit>[],
-      ) as List<_i4.RepetitionUnit>);
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(Invocation.getter(#repetitionUnits), returnValue: <_i4.RepetitionUnit>[])
+          as List<_i4.RepetitionUnit>);
 
   @override
-  _i4.RepetitionUnit get defaultRepetitionUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultRepetitionUnit),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.getter(#defaultRepetitionUnit),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(this, Invocation.getter(#defaultRepetitionUnit)),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
-        Invocation.setter(
-          #activeRoutine,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set activeRoutine(_i5.Routine? value) =>
+      super.noSuchMethod(Invocation.setter(#activeRoutine, value), returnValueForMissingStub: null);
 
   @override
   set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #weightUnits,
-          weightUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #repetitionUnits,
-          repetitionUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    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
-  _i3.WeightUnit findWeightUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findWeightUnitById,
-          [id],
-        ),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.method(
-            #findWeightUnitById,
-            [id],
-          ),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(this, Invocation.method(#findWeightUnitById, [id])),
+          )
+          as _i3.WeightUnit);
 
   @override
-  _i4.RepetitionUnit findRepetitionUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findRepetitionUnitById,
-          [id],
-        ),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.method(
-            #findRepetitionUnitById,
-            [id],
-          ),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  List<_i5.Routine> getPlans() => (super.noSuchMethod(
-        Invocation.method(
-          #getPlans,
-          [],
-        ),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(Invocation.method(#getPlans, []), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  _i5.Routine findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeRoutine_3(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i5.Routine);
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(this, Invocation.method(#findById, [id])),
+          )
+          as _i5.Routine);
 
   @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
-  _i13.Future<void> fetchAndSetAllRoutinesFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesFull,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> fetchAndSetAllRoutinesSparse() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesSparse,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   _i13.Future<void> setExercisesAndUnits(
@@ -321,505 +211,299 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
     Map<int, _i15.Exercise>? exercises,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesAndUnits,
-          [entries],
-          {#exercises: exercises},
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#setExercisesAndUnits, [entries], {#exercises: exercises}),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineSparse,
-          [planId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineSparse,
-            [planId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineFull,
-          [routineId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineFull,
-            [routineId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #addRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #addRoutine,
-            [routine],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<void> editRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #editRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteRoutine(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteRoutine,
-          [id],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @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<_i6.Day> addDay(_i6.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #addDay,
-          [day],
-        ),
-        returnValue: _i13.Future<_i6.Day>.value(_FakeDay_4(
-          this,
-          Invocation.method(
-            #addDay,
-            [day],
-          ),
-        )),
-      ) as _i13.Future<_i6.Day>);
-
-  @override
-  _i13.Future<void> editDay(_i6.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<void> editDays(List<_i6.Day>? days) => (super.noSuchMethod(
-        Invocation.method(
-          #editDays,
-          [days],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteDay(int? dayId) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteDay,
-          [dayId],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<_i7.Slot> addSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i7.Slot>.value(_FakeSlot_5(
-          this,
-          Invocation.method(
-            #addSlot,
-            [
-              slot,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i7.Slot>);
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineSparse, [planId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> deleteSlot(
-    int? slotId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlot,
-          [
-            slotId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineFull, [routineId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlots(
-    List<_i7.Slot>? slots,
-    int? routineId,
-  ) =>
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlots,
-          [
-            slots,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i8.SlotEntry> addSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteRoutine(int? id) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i8.SlotEntry>.value(_FakeSlotEntry_6(
-          this,
-          Invocation.method(
-            #addSlotEntry,
-            [
-              entry,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i8.SlotEntry>);
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> deleteSlotEntry(
-    int? id,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlotEntry,
-          [
-            id,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> editSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetWeightUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  String getConfigUrl(_i8.ConfigType? type) => (super.noSuchMethod(
-        Invocation.method(
-          #getConfigUrl,
-          [type],
-        ),
-        returnValue: _i16.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getConfigUrl,
-            [type],
-          ),
-        ),
-      ) as String);
-
-  @override
-  _i13.Future<_i9.BaseConfig> editConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> fetchAndSetUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #editConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i9.BaseConfig> addConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #addConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
 
   @override
-  _i13.Future<void> deleteConfig(
-    int? id,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteConfig,
-          [
-            id,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> handleConfig(
-    _i8.SlotEntry? entry,
-    num? value,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #handleConfig,
-          [
-            entry,
-            value,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchSessionData,
-          [],
-        ),
-        returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
-      ) as _i13.Future<List<_i10.WorkoutSession>>);
-
-  @override
-  _i13.Future<_i10.WorkoutSession> addSession(
-    _i10.WorkoutSession? session,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteDay(int? dayId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSession,
-          [
-            session,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #addSession,
-            [
-              session,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i10.WorkoutSession>);
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
-        Invocation.method(
-          #editSession,
-          [session],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #editSession,
-            [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(
-    int? logId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [
-            logId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(this, Invocation.method(#addSlotEntry, [entry, routineId])),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(this, Invocation.method(#getConfigUrl, [type])),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#editConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#addConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(_i8.SlotEntry? entry, num? value, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#addSession, [session, routineId])),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#editSession, [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(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    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);
 }
diff --git a/test/routine/routine_edit_test.mocks.dart b/test/routine/routine_edit_test.mocks.dart
index b182db36..11e15eb9 100644
--- a/test/routine/routine_edit_test.mocks.dart
+++ b/test/routine/routine_edit_test.mocks.dart
@@ -38,103 +38,46 @@ import 'package:wger/providers/routines.dart' as _i12;
 // ignore_for_file: invalid_use_of_internal_member
 
 class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
-  _FakeRoutine_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
-  _FakeSlot_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
-  _FakeSlotEntry_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
-  _FakeBaseConfig_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
-  _FakeWorkoutSession_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
-  _FakeLog_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [RoutinesProvider].
@@ -146,174 +89,121 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  List<_i5.Routine> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  List<_i3.WeightUnit> get weightUnits => (super.noSuchMethod(
-        Invocation.getter(#weightUnits),
-        returnValue: <_i3.WeightUnit>[],
-      ) as List<_i3.WeightUnit>);
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(Invocation.getter(#weightUnits), returnValue: <_i3.WeightUnit>[])
+          as List<_i3.WeightUnit>);
 
   @override
-  _i3.WeightUnit get defaultWeightUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultWeightUnit),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.getter(#defaultWeightUnit),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(this, Invocation.getter(#defaultWeightUnit)),
+          )
+          as _i3.WeightUnit);
 
   @override
-  List<_i4.RepetitionUnit> get repetitionUnits => (super.noSuchMethod(
-        Invocation.getter(#repetitionUnits),
-        returnValue: <_i4.RepetitionUnit>[],
-      ) as List<_i4.RepetitionUnit>);
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(Invocation.getter(#repetitionUnits), returnValue: <_i4.RepetitionUnit>[])
+          as List<_i4.RepetitionUnit>);
 
   @override
-  _i4.RepetitionUnit get defaultRepetitionUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultRepetitionUnit),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.getter(#defaultRepetitionUnit),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(this, Invocation.getter(#defaultRepetitionUnit)),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
-        Invocation.setter(
-          #activeRoutine,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set activeRoutine(_i5.Routine? value) =>
+      super.noSuchMethod(Invocation.setter(#activeRoutine, value), returnValueForMissingStub: null);
 
   @override
   set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #weightUnits,
-          weightUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #repetitionUnits,
-          repetitionUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    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
-  _i3.WeightUnit findWeightUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findWeightUnitById,
-          [id],
-        ),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.method(
-            #findWeightUnitById,
-            [id],
-          ),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(this, Invocation.method(#findWeightUnitById, [id])),
+          )
+          as _i3.WeightUnit);
 
   @override
-  _i4.RepetitionUnit findRepetitionUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findRepetitionUnitById,
-          [id],
-        ),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.method(
-            #findRepetitionUnitById,
-            [id],
-          ),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  List<_i5.Routine> getPlans() => (super.noSuchMethod(
-        Invocation.method(
-          #getPlans,
-          [],
-        ),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(Invocation.method(#getPlans, []), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  _i5.Routine findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeRoutine_3(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i5.Routine);
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(this, Invocation.method(#findById, [id])),
+          )
+          as _i5.Routine);
 
   @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
-  _i13.Future<void> fetchAndSetAllRoutinesFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesFull,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> fetchAndSetAllRoutinesSparse() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesSparse,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   _i13.Future<void> setExercisesAndUnits(
@@ -321,505 +211,299 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
     Map<int, _i15.Exercise>? exercises,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesAndUnits,
-          [entries],
-          {#exercises: exercises},
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#setExercisesAndUnits, [entries], {#exercises: exercises}),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineSparse,
-          [planId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineSparse,
-            [planId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineFull,
-          [routineId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineFull,
-            [routineId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #addRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #addRoutine,
-            [routine],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<void> editRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #editRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteRoutine(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteRoutine,
-          [id],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @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<_i6.Day> addDay(_i6.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #addDay,
-          [day],
-        ),
-        returnValue: _i13.Future<_i6.Day>.value(_FakeDay_4(
-          this,
-          Invocation.method(
-            #addDay,
-            [day],
-          ),
-        )),
-      ) as _i13.Future<_i6.Day>);
-
-  @override
-  _i13.Future<void> editDay(_i6.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<void> editDays(List<_i6.Day>? days) => (super.noSuchMethod(
-        Invocation.method(
-          #editDays,
-          [days],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteDay(int? dayId) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteDay,
-          [dayId],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<_i7.Slot> addSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i7.Slot>.value(_FakeSlot_5(
-          this,
-          Invocation.method(
-            #addSlot,
-            [
-              slot,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i7.Slot>);
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineSparse, [planId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> deleteSlot(
-    int? slotId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlot,
-          [
-            slotId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineFull, [routineId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlots(
-    List<_i7.Slot>? slots,
-    int? routineId,
-  ) =>
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlots,
-          [
-            slots,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i8.SlotEntry> addSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteRoutine(int? id) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i8.SlotEntry>.value(_FakeSlotEntry_6(
-          this,
-          Invocation.method(
-            #addSlotEntry,
-            [
-              entry,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i8.SlotEntry>);
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> deleteSlotEntry(
-    int? id,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlotEntry,
-          [
-            id,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> editSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetWeightUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  String getConfigUrl(_i8.ConfigType? type) => (super.noSuchMethod(
-        Invocation.method(
-          #getConfigUrl,
-          [type],
-        ),
-        returnValue: _i16.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getConfigUrl,
-            [type],
-          ),
-        ),
-      ) as String);
-
-  @override
-  _i13.Future<_i9.BaseConfig> editConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> fetchAndSetUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #editConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i9.BaseConfig> addConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #addConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
 
   @override
-  _i13.Future<void> deleteConfig(
-    int? id,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteConfig,
-          [
-            id,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> handleConfig(
-    _i8.SlotEntry? entry,
-    num? value,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #handleConfig,
-          [
-            entry,
-            value,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchSessionData,
-          [],
-        ),
-        returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
-      ) as _i13.Future<List<_i10.WorkoutSession>>);
-
-  @override
-  _i13.Future<_i10.WorkoutSession> addSession(
-    _i10.WorkoutSession? session,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteDay(int? dayId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSession,
-          [
-            session,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #addSession,
-            [
-              session,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i10.WorkoutSession>);
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
-        Invocation.method(
-          #editSession,
-          [session],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #editSession,
-            [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(
-    int? logId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [
-            logId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(this, Invocation.method(#addSlotEntry, [entry, routineId])),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(this, Invocation.method(#getConfigUrl, [type])),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#editConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#addConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(_i8.SlotEntry? entry, num? value, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#addSession, [session, routineId])),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#editSession, [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(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    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);
 }
diff --git a/test/routine/routine_form_test.mocks.dart b/test/routine/routine_form_test.mocks.dart
index bce93593..84648c71 100644
--- a/test/routine/routine_form_test.mocks.dart
+++ b/test/routine/routine_form_test.mocks.dart
@@ -38,103 +38,46 @@ import 'package:wger/providers/routines.dart' as _i12;
 // ignore_for_file: invalid_use_of_internal_member
 
 class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
-  _FakeRoutine_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
-  _FakeSlot_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
-  _FakeSlotEntry_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
-  _FakeBaseConfig_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
-  _FakeWorkoutSession_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
-  _FakeLog_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [RoutinesProvider].
@@ -146,174 +89,121 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  List<_i5.Routine> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  List<_i3.WeightUnit> get weightUnits => (super.noSuchMethod(
-        Invocation.getter(#weightUnits),
-        returnValue: <_i3.WeightUnit>[],
-      ) as List<_i3.WeightUnit>);
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(Invocation.getter(#weightUnits), returnValue: <_i3.WeightUnit>[])
+          as List<_i3.WeightUnit>);
 
   @override
-  _i3.WeightUnit get defaultWeightUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultWeightUnit),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.getter(#defaultWeightUnit),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(this, Invocation.getter(#defaultWeightUnit)),
+          )
+          as _i3.WeightUnit);
 
   @override
-  List<_i4.RepetitionUnit> get repetitionUnits => (super.noSuchMethod(
-        Invocation.getter(#repetitionUnits),
-        returnValue: <_i4.RepetitionUnit>[],
-      ) as List<_i4.RepetitionUnit>);
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(Invocation.getter(#repetitionUnits), returnValue: <_i4.RepetitionUnit>[])
+          as List<_i4.RepetitionUnit>);
 
   @override
-  _i4.RepetitionUnit get defaultRepetitionUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultRepetitionUnit),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.getter(#defaultRepetitionUnit),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(this, Invocation.getter(#defaultRepetitionUnit)),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
-        Invocation.setter(
-          #activeRoutine,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set activeRoutine(_i5.Routine? value) =>
+      super.noSuchMethod(Invocation.setter(#activeRoutine, value), returnValueForMissingStub: null);
 
   @override
   set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #weightUnits,
-          weightUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #repetitionUnits,
-          repetitionUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    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
-  _i3.WeightUnit findWeightUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findWeightUnitById,
-          [id],
-        ),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.method(
-            #findWeightUnitById,
-            [id],
-          ),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(this, Invocation.method(#findWeightUnitById, [id])),
+          )
+          as _i3.WeightUnit);
 
   @override
-  _i4.RepetitionUnit findRepetitionUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findRepetitionUnitById,
-          [id],
-        ),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.method(
-            #findRepetitionUnitById,
-            [id],
-          ),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  List<_i5.Routine> getPlans() => (super.noSuchMethod(
-        Invocation.method(
-          #getPlans,
-          [],
-        ),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(Invocation.method(#getPlans, []), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  _i5.Routine findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeRoutine_3(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i5.Routine);
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(this, Invocation.method(#findById, [id])),
+          )
+          as _i5.Routine);
 
   @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
-  _i13.Future<void> fetchAndSetAllRoutinesFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesFull,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> fetchAndSetAllRoutinesSparse() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesSparse,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   _i13.Future<void> setExercisesAndUnits(
@@ -321,505 +211,299 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
     Map<int, _i15.Exercise>? exercises,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesAndUnits,
-          [entries],
-          {#exercises: exercises},
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#setExercisesAndUnits, [entries], {#exercises: exercises}),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineSparse,
-          [planId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineSparse,
-            [planId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineFull,
-          [routineId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineFull,
-            [routineId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #addRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #addRoutine,
-            [routine],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<void> editRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #editRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteRoutine(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteRoutine,
-          [id],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @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<_i6.Day> addDay(_i6.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #addDay,
-          [day],
-        ),
-        returnValue: _i13.Future<_i6.Day>.value(_FakeDay_4(
-          this,
-          Invocation.method(
-            #addDay,
-            [day],
-          ),
-        )),
-      ) as _i13.Future<_i6.Day>);
-
-  @override
-  _i13.Future<void> editDay(_i6.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<void> editDays(List<_i6.Day>? days) => (super.noSuchMethod(
-        Invocation.method(
-          #editDays,
-          [days],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteDay(int? dayId) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteDay,
-          [dayId],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<_i7.Slot> addSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i7.Slot>.value(_FakeSlot_5(
-          this,
-          Invocation.method(
-            #addSlot,
-            [
-              slot,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i7.Slot>);
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineSparse, [planId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> deleteSlot(
-    int? slotId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlot,
-          [
-            slotId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineFull, [routineId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlots(
-    List<_i7.Slot>? slots,
-    int? routineId,
-  ) =>
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlots,
-          [
-            slots,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i8.SlotEntry> addSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteRoutine(int? id) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i8.SlotEntry>.value(_FakeSlotEntry_6(
-          this,
-          Invocation.method(
-            #addSlotEntry,
-            [
-              entry,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i8.SlotEntry>);
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> deleteSlotEntry(
-    int? id,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlotEntry,
-          [
-            id,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> editSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetWeightUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  String getConfigUrl(_i8.ConfigType? type) => (super.noSuchMethod(
-        Invocation.method(
-          #getConfigUrl,
-          [type],
-        ),
-        returnValue: _i16.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getConfigUrl,
-            [type],
-          ),
-        ),
-      ) as String);
-
-  @override
-  _i13.Future<_i9.BaseConfig> editConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> fetchAndSetUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #editConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i9.BaseConfig> addConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #addConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
 
   @override
-  _i13.Future<void> deleteConfig(
-    int? id,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteConfig,
-          [
-            id,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> handleConfig(
-    _i8.SlotEntry? entry,
-    num? value,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #handleConfig,
-          [
-            entry,
-            value,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchSessionData,
-          [],
-        ),
-        returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
-      ) as _i13.Future<List<_i10.WorkoutSession>>);
-
-  @override
-  _i13.Future<_i10.WorkoutSession> addSession(
-    _i10.WorkoutSession? session,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteDay(int? dayId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSession,
-          [
-            session,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #addSession,
-            [
-              session,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i10.WorkoutSession>);
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
-        Invocation.method(
-          #editSession,
-          [session],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #editSession,
-            [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(
-    int? logId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [
-            logId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(this, Invocation.method(#addSlotEntry, [entry, routineId])),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(this, Invocation.method(#getConfigUrl, [type])),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#editConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#addConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(_i8.SlotEntry? entry, num? value, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#addSession, [session, routineId])),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#editSession, [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(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    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);
 }
diff --git a/test/routine/routine_logs_screen_test.mocks.dart b/test/routine/routine_logs_screen_test.mocks.dart
index 365fec88..24560f3c 100644
--- a/test/routine/routine_logs_screen_test.mocks.dart
+++ b/test/routine/routine_logs_screen_test.mocks.dart
@@ -38,103 +38,46 @@ import 'package:wger/providers/routines.dart' as _i12;
 // ignore_for_file: invalid_use_of_internal_member
 
 class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
-  _FakeRoutine_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
-  _FakeSlot_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
-  _FakeSlotEntry_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
-  _FakeBaseConfig_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
-  _FakeWorkoutSession_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
-  _FakeLog_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [RoutinesProvider].
@@ -146,174 +89,121 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  List<_i5.Routine> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  List<_i3.WeightUnit> get weightUnits => (super.noSuchMethod(
-        Invocation.getter(#weightUnits),
-        returnValue: <_i3.WeightUnit>[],
-      ) as List<_i3.WeightUnit>);
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(Invocation.getter(#weightUnits), returnValue: <_i3.WeightUnit>[])
+          as List<_i3.WeightUnit>);
 
   @override
-  _i3.WeightUnit get defaultWeightUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultWeightUnit),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.getter(#defaultWeightUnit),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(this, Invocation.getter(#defaultWeightUnit)),
+          )
+          as _i3.WeightUnit);
 
   @override
-  List<_i4.RepetitionUnit> get repetitionUnits => (super.noSuchMethod(
-        Invocation.getter(#repetitionUnits),
-        returnValue: <_i4.RepetitionUnit>[],
-      ) as List<_i4.RepetitionUnit>);
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(Invocation.getter(#repetitionUnits), returnValue: <_i4.RepetitionUnit>[])
+          as List<_i4.RepetitionUnit>);
 
   @override
-  _i4.RepetitionUnit get defaultRepetitionUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultRepetitionUnit),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.getter(#defaultRepetitionUnit),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(this, Invocation.getter(#defaultRepetitionUnit)),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
-        Invocation.setter(
-          #activeRoutine,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set activeRoutine(_i5.Routine? value) =>
+      super.noSuchMethod(Invocation.setter(#activeRoutine, value), returnValueForMissingStub: null);
 
   @override
   set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #weightUnits,
-          weightUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #repetitionUnits,
-          repetitionUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    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
-  _i3.WeightUnit findWeightUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findWeightUnitById,
-          [id],
-        ),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.method(
-            #findWeightUnitById,
-            [id],
-          ),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(this, Invocation.method(#findWeightUnitById, [id])),
+          )
+          as _i3.WeightUnit);
 
   @override
-  _i4.RepetitionUnit findRepetitionUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findRepetitionUnitById,
-          [id],
-        ),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.method(
-            #findRepetitionUnitById,
-            [id],
-          ),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  List<_i5.Routine> getPlans() => (super.noSuchMethod(
-        Invocation.method(
-          #getPlans,
-          [],
-        ),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(Invocation.method(#getPlans, []), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  _i5.Routine findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeRoutine_3(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i5.Routine);
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(this, Invocation.method(#findById, [id])),
+          )
+          as _i5.Routine);
 
   @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
-  _i13.Future<void> fetchAndSetAllRoutinesFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesFull,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> fetchAndSetAllRoutinesSparse() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesSparse,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   _i13.Future<void> setExercisesAndUnits(
@@ -321,505 +211,299 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
     Map<int, _i15.Exercise>? exercises,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesAndUnits,
-          [entries],
-          {#exercises: exercises},
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#setExercisesAndUnits, [entries], {#exercises: exercises}),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineSparse,
-          [planId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineSparse,
-            [planId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineFull,
-          [routineId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineFull,
-            [routineId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #addRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #addRoutine,
-            [routine],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<void> editRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #editRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteRoutine(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteRoutine,
-          [id],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @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<_i6.Day> addDay(_i6.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #addDay,
-          [day],
-        ),
-        returnValue: _i13.Future<_i6.Day>.value(_FakeDay_4(
-          this,
-          Invocation.method(
-            #addDay,
-            [day],
-          ),
-        )),
-      ) as _i13.Future<_i6.Day>);
-
-  @override
-  _i13.Future<void> editDay(_i6.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<void> editDays(List<_i6.Day>? days) => (super.noSuchMethod(
-        Invocation.method(
-          #editDays,
-          [days],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteDay(int? dayId) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteDay,
-          [dayId],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<_i7.Slot> addSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i7.Slot>.value(_FakeSlot_5(
-          this,
-          Invocation.method(
-            #addSlot,
-            [
-              slot,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i7.Slot>);
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineSparse, [planId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> deleteSlot(
-    int? slotId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlot,
-          [
-            slotId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineFull, [routineId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlots(
-    List<_i7.Slot>? slots,
-    int? routineId,
-  ) =>
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlots,
-          [
-            slots,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i8.SlotEntry> addSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteRoutine(int? id) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i8.SlotEntry>.value(_FakeSlotEntry_6(
-          this,
-          Invocation.method(
-            #addSlotEntry,
-            [
-              entry,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i8.SlotEntry>);
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> deleteSlotEntry(
-    int? id,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlotEntry,
-          [
-            id,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> editSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetWeightUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  String getConfigUrl(_i8.ConfigType? type) => (super.noSuchMethod(
-        Invocation.method(
-          #getConfigUrl,
-          [type],
-        ),
-        returnValue: _i16.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getConfigUrl,
-            [type],
-          ),
-        ),
-      ) as String);
-
-  @override
-  _i13.Future<_i9.BaseConfig> editConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> fetchAndSetUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #editConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i9.BaseConfig> addConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #addConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
 
   @override
-  _i13.Future<void> deleteConfig(
-    int? id,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteConfig,
-          [
-            id,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> handleConfig(
-    _i8.SlotEntry? entry,
-    num? value,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #handleConfig,
-          [
-            entry,
-            value,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchSessionData,
-          [],
-        ),
-        returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
-      ) as _i13.Future<List<_i10.WorkoutSession>>);
-
-  @override
-  _i13.Future<_i10.WorkoutSession> addSession(
-    _i10.WorkoutSession? session,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteDay(int? dayId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSession,
-          [
-            session,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #addSession,
-            [
-              session,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i10.WorkoutSession>);
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
-        Invocation.method(
-          #editSession,
-          [session],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #editSession,
-            [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(
-    int? logId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [
-            logId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(this, Invocation.method(#addSlotEntry, [entry, routineId])),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(this, Invocation.method(#getConfigUrl, [type])),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#editConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#addConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(_i8.SlotEntry? entry, num? value, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#addSession, [session, routineId])),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#editSession, [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(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    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);
 }
diff --git a/test/routine/routine_screen_test.mocks.dart b/test/routine/routine_screen_test.mocks.dart
index eaa9d719..73f33eef 100644
--- a/test/routine/routine_screen_test.mocks.dart
+++ b/test/routine/routine_screen_test.mocks.dart
@@ -26,43 +26,19 @@ import 'package:wger/providers/base_provider.dart' as _i4;
 // ignore_for_file: invalid_use_of_internal_member
 
 class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
-  _FakeAuthProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeAuthProvider_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
-  _FakeClient_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeClient_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeUri_2 extends _i1.SmartFake implements Uri {
-  _FakeUri_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeUri_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
-  _FakeResponse_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeResponse_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [WgerBaseProvider].
@@ -74,154 +50,95 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
   }
 
   @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
-
-  @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
-
-  @override
-  set auth(_i2.AuthProvider? value) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  set client(_i3.Client? value) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) => (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
-
-  @override
-  Uri makeUrl(
-    String? path, {
-    int? id,
-    String? objectMethod,
-    Map<String, dynamic>? query,
-  }) =>
+  _i2.AuthProvider get auth =>
       (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,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(this, Invocation.getter(#auth)),
+          )
+          as _i2.AuthProvider);
 
   @override
-  _i5.Future<dynamic> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue: _i5.Future<dynamic>.value(),
-      ) as _i5.Future<dynamic>);
-
-  @override
-  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i5.Future<List<dynamic>>);
-
-  @override
-  _i5.Future<Map<String, dynamic>> post(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
+  _i3.Client get client =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(this, Invocation.getter(#client)),
+          )
+          as _i3.Client);
 
   @override
-  _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>>);
+  set auth(_i2.AuthProvider? value) =>
+      super.noSuchMethod(Invocation.setter(#auth, value), returnValueForMissingStub: null);
 
   @override
-  _i5.Future<_i3.Response> deleteRequest(
-    String? url,
-    int? id,
-  ) =>
+  set client(_i3.Client? value) =>
+      super.noSuchMethod(Invocation.setter(#client, value), returnValueForMissingStub: null);
+
+  @override
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
       (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>);
+            Invocation.method(#getDefaultHeaders, [], {#includeAuth: includeAuth}),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
+
+  @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},
+              ),
+            ),
+          )
+          as Uri);
+
+  @override
+  _i5.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetch, [uri]),
+            returnValue: _i5.Future<dynamic>.value(),
+          )
+          as _i5.Future<dynamic>);
+
+  @override
+  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchPaginated, [uri]),
+            returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i5.Future<List<dynamic>>);
+
+  @override
+  _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: _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: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(this, Invocation.method(#deleteRequest, [url, id])),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 }
diff --git a/test/routine/routines_provider_test.mocks.dart b/test/routine/routines_provider_test.mocks.dart
index 0d3699ad..c949f79b 100644
--- a/test/routine/routines_provider_test.mocks.dart
+++ b/test/routine/routines_provider_test.mocks.dart
@@ -34,113 +34,50 @@ import 'package:wger/providers/exercises.dart' as _i12;
 // ignore_for_file: invalid_use_of_internal_member
 
 class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
-  _FakeAuthProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeAuthProvider_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
-  _FakeClient_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeClient_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeUri_2 extends _i1.SmartFake implements Uri {
-  _FakeUri_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeUri_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
-  _FakeResponse_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeResponse_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeWgerBaseProvider_4 extends _i1.SmartFake implements _i4.WgerBaseProvider {
-  _FakeWgerBaseProvider_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWgerBaseProvider_4(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeExerciseDatabase_5 extends _i1.SmartFake implements _i5.ExerciseDatabase {
-  _FakeExerciseDatabase_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeExerciseDatabase_5(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeExercise_6 extends _i1.SmartFake implements _i6.Exercise {
-  _FakeExercise_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeExercise_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeExerciseCategory_7 extends _i1.SmartFake implements _i7.ExerciseCategory {
-  _FakeExerciseCategory_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeExerciseCategory_7(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeEquipment_8 extends _i1.SmartFake implements _i8.Equipment {
-  _FakeEquipment_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeEquipment_8(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeMuscle_9 extends _i1.SmartFake implements _i9.Muscle {
-  _FakeMuscle_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeMuscle_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeLanguage_10 extends _i1.SmartFake implements _i10.Language {
-  _FakeLanguage_10(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeLanguage_10(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [WgerBaseProvider].
@@ -152,156 +89,97 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
   }
 
   @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
-
-  @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
-
-  @override
-  set auth(_i2.AuthProvider? value) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  set client(_i3.Client? value) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) => (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
-
-  @override
-  Uri makeUrl(
-    String? path, {
-    int? id,
-    String? objectMethod,
-    Map<String, dynamic>? query,
-  }) =>
+  _i2.AuthProvider get auth =>
       (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,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(this, Invocation.getter(#auth)),
+          )
+          as _i2.AuthProvider);
 
   @override
-  _i11.Future<dynamic> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue: _i11.Future<dynamic>.value(),
-      ) as _i11.Future<dynamic>);
-
-  @override
-  _i11.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i11.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i11.Future<List<dynamic>>);
-
-  @override
-  _i11.Future<Map<String, dynamic>> post(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
+  _i3.Client get client =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i11.Future<Map<String, dynamic>>);
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(this, Invocation.getter(#client)),
+          )
+          as _i3.Client);
 
   @override
-  _i11.Future<Map<String, dynamic>> patch(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i11.Future<Map<String, dynamic>>);
+  set auth(_i2.AuthProvider? value) =>
+      super.noSuchMethod(Invocation.setter(#auth, value), returnValueForMissingStub: null);
 
   @override
-  _i11.Future<_i3.Response> deleteRequest(
-    String? url,
-    int? id,
-  ) =>
+  set client(_i3.Client? value) =>
+      super.noSuchMethod(Invocation.setter(#client, value), returnValueForMissingStub: null);
+
+  @override
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteRequest,
-          [
-            url,
-            id,
-          ],
-        ),
-        returnValue: _i11.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #deleteRequest,
-            [
-              url,
-              id,
-            ],
-          ),
-        )),
-      ) as _i11.Future<_i3.Response>);
+            Invocation.method(#getDefaultHeaders, [], {#includeAuth: includeAuth}),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
+
+  @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},
+              ),
+            ),
+          )
+          as Uri);
+
+  @override
+  _i11.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetch, [uri]),
+            returnValue: _i11.Future<dynamic>.value(),
+          )
+          as _i11.Future<dynamic>);
+
+  @override
+  _i11.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchPaginated, [uri]),
+            returnValue: _i11.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i11.Future<List<dynamic>>);
+
+  @override
+  _i11.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#post, [data, uri]),
+            returnValue: _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i11.Future<Map<String, dynamic>>);
+
+  @override
+  _i11.Future<Map<String, dynamic>> patch(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#patch, [data, uri]),
+            returnValue: _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i11.Future<Map<String, dynamic>>);
+
+  @override
+  _i11.Future<_i3.Response> deleteRequest(String? url, int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRequest, [url, id]),
+            returnValue: _i11.Future<_i3.Response>.value(
+              _FakeResponse_3(this, Invocation.method(#deleteRequest, [url, id])),
+            ),
+          )
+          as _i11.Future<_i3.Response>);
 }
 
 /// A class which mocks [ExercisesProvider].
@@ -313,292 +191,211 @@ class MockExercisesProvider extends _i1.Mock implements _i12.ExercisesProvider {
   }
 
   @override
-  _i4.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_4(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i4.WgerBaseProvider);
+  _i4.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_4(this, Invocation.getter(#baseProvider)),
+          )
+          as _i4.WgerBaseProvider);
 
   @override
-  _i5.ExerciseDatabase get database => (super.noSuchMethod(
-        Invocation.getter(#database),
-        returnValue: _FakeExerciseDatabase_5(
-          this,
-          Invocation.getter(#database),
-        ),
-      ) as _i5.ExerciseDatabase);
+  _i5.ExerciseDatabase get database =>
+      (super.noSuchMethod(
+            Invocation.getter(#database),
+            returnValue: _FakeExerciseDatabase_5(this, Invocation.getter(#database)),
+          )
+          as _i5.ExerciseDatabase);
 
   @override
-  List<_i6.Exercise> get exercises => (super.noSuchMethod(
-        Invocation.getter(#exercises),
-        returnValue: <_i6.Exercise>[],
-      ) as List<_i6.Exercise>);
+  List<_i6.Exercise> get exercises =>
+      (super.noSuchMethod(Invocation.getter(#exercises), returnValue: <_i6.Exercise>[])
+          as List<_i6.Exercise>);
 
   @override
-  List<_i6.Exercise> get filteredExercises => (super.noSuchMethod(
-        Invocation.getter(#filteredExercises),
-        returnValue: <_i6.Exercise>[],
-      ) as List<_i6.Exercise>);
+  List<_i6.Exercise> get filteredExercises =>
+      (super.noSuchMethod(Invocation.getter(#filteredExercises), returnValue: <_i6.Exercise>[])
+          as List<_i6.Exercise>);
 
   @override
-  Map<int, List<_i6.Exercise>> get exerciseByVariation => (super.noSuchMethod(
-        Invocation.getter(#exerciseByVariation),
-        returnValue: <int, List<_i6.Exercise>>{},
-      ) as Map<int, List<_i6.Exercise>>);
+  Map<int, List<_i6.Exercise>> get exerciseByVariation =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseByVariation),
+            returnValue: <int, List<_i6.Exercise>>{},
+          )
+          as Map<int, List<_i6.Exercise>>);
 
   @override
-  List<_i7.ExerciseCategory> get categories => (super.noSuchMethod(
-        Invocation.getter(#categories),
-        returnValue: <_i7.ExerciseCategory>[],
-      ) as List<_i7.ExerciseCategory>);
+  List<_i7.ExerciseCategory> get categories =>
+      (super.noSuchMethod(Invocation.getter(#categories), returnValue: <_i7.ExerciseCategory>[])
+          as List<_i7.ExerciseCategory>);
 
   @override
-  List<_i9.Muscle> get muscles => (super.noSuchMethod(
-        Invocation.getter(#muscles),
-        returnValue: <_i9.Muscle>[],
-      ) as List<_i9.Muscle>);
+  List<_i9.Muscle> get muscles =>
+      (super.noSuchMethod(Invocation.getter(#muscles), returnValue: <_i9.Muscle>[])
+          as List<_i9.Muscle>);
 
   @override
-  List<_i8.Equipment> get equipment => (super.noSuchMethod(
-        Invocation.getter(#equipment),
-        returnValue: <_i8.Equipment>[],
-      ) as List<_i8.Equipment>);
+  List<_i8.Equipment> get equipment =>
+      (super.noSuchMethod(Invocation.getter(#equipment), returnValue: <_i8.Equipment>[])
+          as List<_i8.Equipment>);
 
   @override
-  List<_i10.Language> get languages => (super.noSuchMethod(
-        Invocation.getter(#languages),
-        returnValue: <_i10.Language>[],
-      ) as List<_i10.Language>);
+  List<_i10.Language> get languages =>
+      (super.noSuchMethod(Invocation.getter(#languages), returnValue: <_i10.Language>[])
+          as List<_i10.Language>);
 
   @override
-  set database(_i5.ExerciseDatabase? value) => super.noSuchMethod(
-        Invocation.setter(
-          #database,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set database(_i5.ExerciseDatabase? value) =>
+      super.noSuchMethod(Invocation.setter(#database, value), returnValueForMissingStub: null);
 
   @override
-  set exercises(List<_i6.Exercise>? value) => super.noSuchMethod(
-        Invocation.setter(
-          #exercises,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set exercises(List<_i6.Exercise>? value) =>
+      super.noSuchMethod(Invocation.setter(#exercises, value), returnValueForMissingStub: null);
 
   @override
   set filteredExercises(List<_i6.Exercise>? newFilteredExercises) => super.noSuchMethod(
-        Invocation.setter(
-          #filteredExercises,
-          newFilteredExercises,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#filteredExercises, newFilteredExercises),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  set languages(List<_i10.Language>? languages) => super.noSuchMethod(
-        Invocation.setter(
-          #languages,
-          languages,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set languages(List<_i10.Language>? languages) =>
+      super.noSuchMethod(Invocation.setter(#languages, languages), 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
-  _i11.Future<void> setFilters(_i12.Filters? newFilters) => (super.noSuchMethod(
-        Invocation.method(
-          #setFilters,
-          [newFilters],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-
-  @override
-  void initFilters() => super.noSuchMethod(
-        Invocation.method(
-          #initFilters,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i11.Future<void> findByFilters() => (super.noSuchMethod(
-        Invocation.method(
-          #findByFilters,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-
-  @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i6.Exercise findExerciseById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findExerciseById,
-          [id],
-        ),
-        returnValue: _FakeExercise_6(
-          this,
-          Invocation.method(
-            #findExerciseById,
-            [id],
-          ),
-        ),
-      ) as _i6.Exercise);
-
-  @override
-  List<_i6.Exercise> findExercisesByVariationId(
-    int? variationId, {
-    int? exerciseIdToExclude,
-  }) =>
+  _i11.Future<void> setFilters(_i12.Filters? newFilters) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #findExercisesByVariationId,
-          [variationId],
-          {#exerciseIdToExclude: exerciseIdToExclude},
-        ),
-        returnValue: <_i6.Exercise>[],
-      ) as List<_i6.Exercise>);
+            Invocation.method(#setFilters, [newFilters]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  _i7.ExerciseCategory findCategoryById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findCategoryById,
-          [id],
-        ),
-        returnValue: _FakeExerciseCategory_7(
-          this,
-          Invocation.method(
-            #findCategoryById,
-            [id],
-          ),
-        ),
-      ) as _i7.ExerciseCategory);
+  void initFilters() =>
+      super.noSuchMethod(Invocation.method(#initFilters, []), returnValueForMissingStub: null);
 
   @override
-  _i8.Equipment findEquipmentById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findEquipmentById,
-          [id],
-        ),
-        returnValue: _FakeEquipment_8(
-          this,
-          Invocation.method(
-            #findEquipmentById,
-            [id],
-          ),
-        ),
-      ) as _i8.Equipment);
+  _i11.Future<void> findByFilters() =>
+      (super.noSuchMethod(
+            Invocation.method(#findByFilters, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  _i9.Muscle findMuscleById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findMuscleById,
-          [id],
-        ),
-        returnValue: _FakeMuscle_9(
-          this,
-          Invocation.method(
-            #findMuscleById,
-            [id],
-          ),
-        ),
-      ) as _i9.Muscle);
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
 
   @override
-  _i10.Language findLanguageById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findLanguageById,
-          [id],
-        ),
-        returnValue: _FakeLanguage_10(
-          this,
-          Invocation.method(
-            #findLanguageById,
-            [id],
-          ),
-        ),
-      ) as _i10.Language);
+  _i6.Exercise findExerciseById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findExerciseById, [id]),
+            returnValue: _FakeExercise_6(this, Invocation.method(#findExerciseById, [id])),
+          )
+          as _i6.Exercise);
 
   @override
-  _i11.Future<void> fetchAndSetCategoriesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetCategoriesFromApi,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  List<_i6.Exercise> findExercisesByVariationId(int? variationId, {int? exerciseIdToExclude}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findExercisesByVariationId,
+              [variationId],
+              {#exerciseIdToExclude: exerciseIdToExclude},
+            ),
+            returnValue: <_i6.Exercise>[],
+          )
+          as List<_i6.Exercise>);
 
   @override
-  _i11.Future<void> fetchAndSetMusclesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetMusclesFromApi,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i7.ExerciseCategory findCategoryById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findCategoryById, [id]),
+            returnValue: _FakeExerciseCategory_7(this, Invocation.method(#findCategoryById, [id])),
+          )
+          as _i7.ExerciseCategory);
 
   @override
-  _i11.Future<void> fetchAndSetEquipmentsFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEquipmentsFromApi,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i8.Equipment findEquipmentById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findEquipmentById, [id]),
+            returnValue: _FakeEquipment_8(this, Invocation.method(#findEquipmentById, [id])),
+          )
+          as _i8.Equipment);
 
   @override
-  _i11.Future<void> fetchAndSetLanguagesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLanguagesFromApi,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i9.Muscle findMuscleById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findMuscleById, [id]),
+            returnValue: _FakeMuscle_9(this, Invocation.method(#findMuscleById, [id])),
+          )
+          as _i9.Muscle);
 
   @override
-  _i11.Future<void> fetchAndSetAllExercises() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllExercises,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i10.Language findLanguageById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findLanguageById, [id]),
+            returnValue: _FakeLanguage_10(this, Invocation.method(#findLanguageById, [id])),
+          )
+          as _i10.Language);
 
   @override
-  _i11.Future<_i6.Exercise?> fetchAndSetExercise(int? exerciseId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetExercise,
-          [exerciseId],
-        ),
-        returnValue: _i11.Future<_i6.Exercise?>.value(),
-      ) as _i11.Future<_i6.Exercise?>);
+  _i11.Future<void> fetchAndSetCategoriesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategoriesFromApi, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> fetchAndSetMusclesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetMusclesFromApi, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> fetchAndSetEquipmentsFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetEquipmentsFromApi, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> fetchAndSetLanguagesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetLanguagesFromApi, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> fetchAndSetAllExercises() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllExercises, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<_i6.Exercise?> fetchAndSetExercise(int? exerciseId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetExercise, [exerciseId]),
+            returnValue: _i11.Future<_i6.Exercise?>.value(),
+          )
+          as _i11.Future<_i6.Exercise?>);
 
   @override
   _i11.Future<_i6.Exercise> handleUpdateExerciseFromApi(
@@ -606,55 +403,42 @@ class MockExercisesProvider extends _i1.Mock implements _i12.ExercisesProvider {
     int? exerciseId,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #handleUpdateExerciseFromApi,
-          [
-            database,
-            exerciseId,
-          ],
-        ),
-        returnValue: _i11.Future<_i6.Exercise>.value(_FakeExercise_6(
-          this,
-          Invocation.method(
-            #handleUpdateExerciseFromApi,
-            [
-              database,
-              exerciseId,
-            ],
-          ),
-        )),
-      ) as _i11.Future<_i6.Exercise>);
+            Invocation.method(#handleUpdateExerciseFromApi, [database, exerciseId]),
+            returnValue: _i11.Future<_i6.Exercise>.value(
+              _FakeExercise_6(
+                this,
+                Invocation.method(#handleUpdateExerciseFromApi, [database, exerciseId]),
+              ),
+            ),
+          )
+          as _i11.Future<_i6.Exercise>);
 
   @override
-  _i11.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) => (super.noSuchMethod(
-        Invocation.method(
-          #initCacheTimesLocalPrefs,
-          [],
-          {#forceInit: forceInit},
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(#initCacheTimesLocalPrefs, [], {#forceInit: forceInit}),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  _i11.Future<void> clearAllCachesAndPrefs() => (super.noSuchMethod(
-        Invocation.method(
-          #clearAllCachesAndPrefs,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> clearAllCachesAndPrefs() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearAllCachesAndPrefs, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  _i11.Future<void> fetchAndSetInitialData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetInitialData,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> fetchAndSetInitialData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetInitialData, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
   _i11.Future<void> setExercisesFromDatabase(
@@ -662,64 +446,60 @@ class MockExercisesProvider extends _i1.Mock implements _i12.ExercisesProvider {
     bool? forceDeleteCache = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesFromDatabase,
-          [database],
-          {#forceDeleteCache: forceDeleteCache},
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+            Invocation.method(
+              #setExercisesFromDatabase,
+              [database],
+              {#forceDeleteCache: forceDeleteCache},
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  _i11.Future<void> updateExerciseCache(_i5.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #updateExerciseCache,
-          [database],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> updateExerciseCache(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateExerciseCache, [database]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  _i11.Future<void> fetchAndSetMuscles(_i5.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetMuscles,
-          [database],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> fetchAndSetMuscles(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetMuscles, [database]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  _i11.Future<void> fetchAndSetCategories(_i5.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetCategories,
-          [database],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> fetchAndSetCategories(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategories, [database]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  _i11.Future<void> fetchAndSetLanguages(_i5.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLanguages,
-          [database],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> fetchAndSetLanguages(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetLanguages, [database]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  _i11.Future<void> fetchAndSetEquipments(_i5.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEquipments,
-          [database],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> fetchAndSetEquipments(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetEquipments, [database]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
   _i11.Future<List<_i6.Exercise>> searchExercise(
@@ -728,50 +508,32 @@ class MockExercisesProvider extends _i1.Mock implements _i12.ExercisesProvider {
     bool? searchEnglish = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #searchExercise,
-          [name],
-          {
-            #languageCode: languageCode,
-            #searchEnglish: searchEnglish,
-          },
-        ),
-        returnValue: _i11.Future<List<_i6.Exercise>>.value(<_i6.Exercise>[]),
-      ) as _i11.Future<List<_i6.Exercise>>);
+            Invocation.method(
+              #searchExercise,
+              [name],
+              {#languageCode: languageCode, #searchEnglish: searchEnglish},
+            ),
+            returnValue: _i11.Future<List<_i6.Exercise>>.value(<_i6.Exercise>[]),
+          )
+          as _i11.Future<List<_i6.Exercise>>);
 
   @override
   void addListener(_i13.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i13.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    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);
 }
diff --git a/test/routine/routines_screen_test.mocks.dart b/test/routine/routines_screen_test.mocks.dart
index 29154394..48952b88 100644
--- a/test/routine/routines_screen_test.mocks.dart
+++ b/test/routine/routines_screen_test.mocks.dart
@@ -26,43 +26,19 @@ import 'package:wger/providers/base_provider.dart' as _i4;
 // ignore_for_file: invalid_use_of_internal_member
 
 class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
-  _FakeAuthProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeAuthProvider_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
-  _FakeClient_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeClient_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeUri_2 extends _i1.SmartFake implements Uri {
-  _FakeUri_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeUri_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
-  _FakeResponse_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeResponse_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [WgerBaseProvider].
@@ -74,154 +50,95 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
   }
 
   @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
-
-  @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
-
-  @override
-  set auth(_i2.AuthProvider? value) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  set client(_i3.Client? value) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) => (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
-
-  @override
-  Uri makeUrl(
-    String? path, {
-    int? id,
-    String? objectMethod,
-    Map<String, dynamic>? query,
-  }) =>
+  _i2.AuthProvider get auth =>
       (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,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(this, Invocation.getter(#auth)),
+          )
+          as _i2.AuthProvider);
 
   @override
-  _i5.Future<dynamic> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue: _i5.Future<dynamic>.value(),
-      ) as _i5.Future<dynamic>);
-
-  @override
-  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i5.Future<List<dynamic>>);
-
-  @override
-  _i5.Future<Map<String, dynamic>> post(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
+  _i3.Client get client =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(this, Invocation.getter(#client)),
+          )
+          as _i3.Client);
 
   @override
-  _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>>);
+  set auth(_i2.AuthProvider? value) =>
+      super.noSuchMethod(Invocation.setter(#auth, value), returnValueForMissingStub: null);
 
   @override
-  _i5.Future<_i3.Response> deleteRequest(
-    String? url,
-    int? id,
-  ) =>
+  set client(_i3.Client? value) =>
+      super.noSuchMethod(Invocation.setter(#client, value), returnValueForMissingStub: null);
+
+  @override
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
       (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>);
+            Invocation.method(#getDefaultHeaders, [], {#includeAuth: includeAuth}),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
+
+  @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},
+              ),
+            ),
+          )
+          as Uri);
+
+  @override
+  _i5.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetch, [uri]),
+            returnValue: _i5.Future<dynamic>.value(),
+          )
+          as _i5.Future<dynamic>);
+
+  @override
+  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchPaginated, [uri]),
+            returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i5.Future<List<dynamic>>);
+
+  @override
+  _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: _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: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(this, Invocation.method(#deleteRequest, [url, id])),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 }
diff --git a/test/routine/slot_entry_form_test.mocks.dart b/test/routine/slot_entry_form_test.mocks.dart
index d0a17c54..c9606827 100644
--- a/test/routine/slot_entry_form_test.mocks.dart
+++ b/test/routine/slot_entry_form_test.mocks.dart
@@ -38,103 +38,46 @@ import 'package:wger/providers/routines.dart' as _i12;
 // ignore_for_file: invalid_use_of_internal_member
 
 class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
-  _FakeRoutine_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
-  _FakeSlot_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
-  _FakeSlotEntry_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
-  _FakeBaseConfig_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
-  _FakeWorkoutSession_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
-  _FakeLog_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [RoutinesProvider].
@@ -146,174 +89,121 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  List<_i5.Routine> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  List<_i3.WeightUnit> get weightUnits => (super.noSuchMethod(
-        Invocation.getter(#weightUnits),
-        returnValue: <_i3.WeightUnit>[],
-      ) as List<_i3.WeightUnit>);
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(Invocation.getter(#weightUnits), returnValue: <_i3.WeightUnit>[])
+          as List<_i3.WeightUnit>);
 
   @override
-  _i3.WeightUnit get defaultWeightUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultWeightUnit),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.getter(#defaultWeightUnit),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(this, Invocation.getter(#defaultWeightUnit)),
+          )
+          as _i3.WeightUnit);
 
   @override
-  List<_i4.RepetitionUnit> get repetitionUnits => (super.noSuchMethod(
-        Invocation.getter(#repetitionUnits),
-        returnValue: <_i4.RepetitionUnit>[],
-      ) as List<_i4.RepetitionUnit>);
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(Invocation.getter(#repetitionUnits), returnValue: <_i4.RepetitionUnit>[])
+          as List<_i4.RepetitionUnit>);
 
   @override
-  _i4.RepetitionUnit get defaultRepetitionUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultRepetitionUnit),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.getter(#defaultRepetitionUnit),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(this, Invocation.getter(#defaultRepetitionUnit)),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
-        Invocation.setter(
-          #activeRoutine,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set activeRoutine(_i5.Routine? value) =>
+      super.noSuchMethod(Invocation.setter(#activeRoutine, value), returnValueForMissingStub: null);
 
   @override
   set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #weightUnits,
-          weightUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #repetitionUnits,
-          repetitionUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    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
-  _i3.WeightUnit findWeightUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findWeightUnitById,
-          [id],
-        ),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.method(
-            #findWeightUnitById,
-            [id],
-          ),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(this, Invocation.method(#findWeightUnitById, [id])),
+          )
+          as _i3.WeightUnit);
 
   @override
-  _i4.RepetitionUnit findRepetitionUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findRepetitionUnitById,
-          [id],
-        ),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.method(
-            #findRepetitionUnitById,
-            [id],
-          ),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  List<_i5.Routine> getPlans() => (super.noSuchMethod(
-        Invocation.method(
-          #getPlans,
-          [],
-        ),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(Invocation.method(#getPlans, []), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  _i5.Routine findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeRoutine_3(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i5.Routine);
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(this, Invocation.method(#findById, [id])),
+          )
+          as _i5.Routine);
 
   @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
-  _i13.Future<void> fetchAndSetAllRoutinesFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesFull,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> fetchAndSetAllRoutinesSparse() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesSparse,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   _i13.Future<void> setExercisesAndUnits(
@@ -321,505 +211,299 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
     Map<int, _i15.Exercise>? exercises,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesAndUnits,
-          [entries],
-          {#exercises: exercises},
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#setExercisesAndUnits, [entries], {#exercises: exercises}),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineSparse,
-          [planId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineSparse,
-            [planId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineFull,
-          [routineId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineFull,
-            [routineId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #addRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #addRoutine,
-            [routine],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<void> editRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #editRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteRoutine(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteRoutine,
-          [id],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @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<_i6.Day> addDay(_i6.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #addDay,
-          [day],
-        ),
-        returnValue: _i13.Future<_i6.Day>.value(_FakeDay_4(
-          this,
-          Invocation.method(
-            #addDay,
-            [day],
-          ),
-        )),
-      ) as _i13.Future<_i6.Day>);
-
-  @override
-  _i13.Future<void> editDay(_i6.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<void> editDays(List<_i6.Day>? days) => (super.noSuchMethod(
-        Invocation.method(
-          #editDays,
-          [days],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteDay(int? dayId) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteDay,
-          [dayId],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<_i7.Slot> addSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i7.Slot>.value(_FakeSlot_5(
-          this,
-          Invocation.method(
-            #addSlot,
-            [
-              slot,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i7.Slot>);
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineSparse, [planId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> deleteSlot(
-    int? slotId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlot,
-          [
-            slotId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineFull, [routineId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlots(
-    List<_i7.Slot>? slots,
-    int? routineId,
-  ) =>
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlots,
-          [
-            slots,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i8.SlotEntry> addSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteRoutine(int? id) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i8.SlotEntry>.value(_FakeSlotEntry_6(
-          this,
-          Invocation.method(
-            #addSlotEntry,
-            [
-              entry,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i8.SlotEntry>);
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> deleteSlotEntry(
-    int? id,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlotEntry,
-          [
-            id,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> editSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetWeightUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  String getConfigUrl(_i8.ConfigType? type) => (super.noSuchMethod(
-        Invocation.method(
-          #getConfigUrl,
-          [type],
-        ),
-        returnValue: _i16.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getConfigUrl,
-            [type],
-          ),
-        ),
-      ) as String);
-
-  @override
-  _i13.Future<_i9.BaseConfig> editConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> fetchAndSetUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #editConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i9.BaseConfig> addConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #addConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
 
   @override
-  _i13.Future<void> deleteConfig(
-    int? id,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteConfig,
-          [
-            id,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> handleConfig(
-    _i8.SlotEntry? entry,
-    num? value,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #handleConfig,
-          [
-            entry,
-            value,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchSessionData,
-          [],
-        ),
-        returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
-      ) as _i13.Future<List<_i10.WorkoutSession>>);
-
-  @override
-  _i13.Future<_i10.WorkoutSession> addSession(
-    _i10.WorkoutSession? session,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteDay(int? dayId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSession,
-          [
-            session,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #addSession,
-            [
-              session,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i10.WorkoutSession>);
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
-        Invocation.method(
-          #editSession,
-          [session],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #editSession,
-            [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(
-    int? logId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [
-            logId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(this, Invocation.method(#addSlotEntry, [entry, routineId])),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(this, Invocation.method(#getConfigUrl, [type])),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#editConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#addConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(_i8.SlotEntry? entry, num? value, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#addSession, [session, routineId])),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#editSession, [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(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    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);
 }
diff --git a/test/routine/weight_unit_form_widget_test.mocks.dart b/test/routine/weight_unit_form_widget_test.mocks.dart
index 6b8d818f..c862b9ac 100644
--- a/test/routine/weight_unit_form_widget_test.mocks.dart
+++ b/test/routine/weight_unit_form_widget_test.mocks.dart
@@ -38,103 +38,46 @@ import 'package:wger/providers/routines.dart' as _i12;
 // ignore_for_file: invalid_use_of_internal_member
 
 class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
-  _FakeRoutine_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
-  _FakeSlot_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
-  _FakeSlotEntry_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
-  _FakeBaseConfig_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
-  _FakeWorkoutSession_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
-  _FakeLog_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [RoutinesProvider].
@@ -146,174 +89,121 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  List<_i5.Routine> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  List<_i3.WeightUnit> get weightUnits => (super.noSuchMethod(
-        Invocation.getter(#weightUnits),
-        returnValue: <_i3.WeightUnit>[],
-      ) as List<_i3.WeightUnit>);
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(Invocation.getter(#weightUnits), returnValue: <_i3.WeightUnit>[])
+          as List<_i3.WeightUnit>);
 
   @override
-  _i3.WeightUnit get defaultWeightUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultWeightUnit),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.getter(#defaultWeightUnit),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(this, Invocation.getter(#defaultWeightUnit)),
+          )
+          as _i3.WeightUnit);
 
   @override
-  List<_i4.RepetitionUnit> get repetitionUnits => (super.noSuchMethod(
-        Invocation.getter(#repetitionUnits),
-        returnValue: <_i4.RepetitionUnit>[],
-      ) as List<_i4.RepetitionUnit>);
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(Invocation.getter(#repetitionUnits), returnValue: <_i4.RepetitionUnit>[])
+          as List<_i4.RepetitionUnit>);
 
   @override
-  _i4.RepetitionUnit get defaultRepetitionUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultRepetitionUnit),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.getter(#defaultRepetitionUnit),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(this, Invocation.getter(#defaultRepetitionUnit)),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
-        Invocation.setter(
-          #activeRoutine,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set activeRoutine(_i5.Routine? value) =>
+      super.noSuchMethod(Invocation.setter(#activeRoutine, value), returnValueForMissingStub: null);
 
   @override
   set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #weightUnits,
-          weightUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
-        Invocation.setter(
-          #repetitionUnits,
-          repetitionUnits,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    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
-  _i3.WeightUnit findWeightUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findWeightUnitById,
-          [id],
-        ),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.method(
-            #findWeightUnitById,
-            [id],
-          ),
-        ),
-      ) as _i3.WeightUnit);
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(this, Invocation.method(#findWeightUnitById, [id])),
+          )
+          as _i3.WeightUnit);
 
   @override
-  _i4.RepetitionUnit findRepetitionUnitById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findRepetitionUnitById,
-          [id],
-        ),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.method(
-            #findRepetitionUnitById,
-            [id],
-          ),
-        ),
-      ) as _i4.RepetitionUnit);
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
 
   @override
-  List<_i5.Routine> getPlans() => (super.noSuchMethod(
-        Invocation.method(
-          #getPlans,
-          [],
-        ),
-        returnValue: <_i5.Routine>[],
-      ) as List<_i5.Routine>);
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(Invocation.method(#getPlans, []), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
 
   @override
-  _i5.Routine findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeRoutine_3(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i5.Routine);
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(this, Invocation.method(#findById, [id])),
+          )
+          as _i5.Routine);
 
   @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
-  _i13.Future<void> fetchAndSetAllRoutinesFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesFull,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> fetchAndSetAllRoutinesSparse() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllRoutinesSparse,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   _i13.Future<void> setExercisesAndUnits(
@@ -321,505 +211,299 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
     Map<int, _i15.Exercise>? exercises,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesAndUnits,
-          [entries],
-          {#exercises: exercises},
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#setExercisesAndUnits, [entries], {#exercises: exercises}),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineSparse,
-          [planId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineSparse,
-            [planId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRoutineFull,
-          [routineId],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #fetchAndSetRoutineFull,
-            [routineId],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #addRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<_i5.Routine>.value(_FakeRoutine_3(
-          this,
-          Invocation.method(
-            #addRoutine,
-            [routine],
-          ),
-        )),
-      ) as _i13.Future<_i5.Routine>);
-
-  @override
-  _i13.Future<void> editRoutine(_i5.Routine? routine) => (super.noSuchMethod(
-        Invocation.method(
-          #editRoutine,
-          [routine],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteRoutine(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteRoutine,
-          [id],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @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<_i6.Day> addDay(_i6.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #addDay,
-          [day],
-        ),
-        returnValue: _i13.Future<_i6.Day>.value(_FakeDay_4(
-          this,
-          Invocation.method(
-            #addDay,
-            [day],
-          ),
-        )),
-      ) as _i13.Future<_i6.Day>);
-
-  @override
-  _i13.Future<void> editDay(_i6.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<void> editDays(List<_i6.Day>? days) => (super.noSuchMethod(
-        Invocation.method(
-          #editDays,
-          [days],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<void> deleteDay(int? dayId) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteDay,
-          [dayId],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<_i7.Slot> addSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i7.Slot>.value(_FakeSlot_5(
-          this,
-          Invocation.method(
-            #addSlot,
-            [
-              slot,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i7.Slot>);
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineSparse, [planId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> deleteSlot(
-    int? slotId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlot,
-          [
-            slotId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineFull, [routineId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlot(
-    _i7.Slot? slot,
-    int? routineId,
-  ) =>
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlot,
-          [
-            slot,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
 
   @override
-  _i13.Future<void> editSlots(
-    List<_i7.Slot>? slots,
-    int? routineId,
-  ) =>
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlots,
-          [
-            slots,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i8.SlotEntry> addSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteRoutine(int? id) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i8.SlotEntry>.value(_FakeSlotEntry_6(
-          this,
-          Invocation.method(
-            #addSlotEntry,
-            [
-              entry,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i8.SlotEntry>);
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> deleteSlotEntry(
-    int? id,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteSlotEntry,
-          [
-            id,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> editSlotEntry(
-    _i8.SlotEntry? entry,
-    int? routineId,
-  ) =>
+  _i13.Future<void> fetchAndSetWeightUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editSlotEntry,
-          [
-            entry,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  String getConfigUrl(_i8.ConfigType? type) => (super.noSuchMethod(
-        Invocation.method(
-          #getConfigUrl,
-          [type],
-        ),
-        returnValue: _i16.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getConfigUrl,
-            [type],
-          ),
-        ),
-      ) as String);
-
-  @override
-  _i13.Future<_i9.BaseConfig> editConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> fetchAndSetUnits() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #editConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i9.BaseConfig> addConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addConfig,
-          [
-            config,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<_i9.BaseConfig>.value(_FakeBaseConfig_7(
-          this,
-          Invocation.method(
-            #addConfig,
-            [
-              config,
-              type,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i9.BaseConfig>);
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
 
   @override
-  _i13.Future<void> deleteConfig(
-    int? id,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDay(_i6.Day? day) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteConfig,
-          [
-            id,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<void> handleConfig(
-    _i8.SlotEntry? entry,
-    num? value,
-    _i8.ConfigType? type,
-  ) =>
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #handleConfig,
-          [
-            entry,
-            value,
-            type,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchSessionData,
-          [],
-        ),
-        returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
-      ) as _i13.Future<List<_i10.WorkoutSession>>);
-
-  @override
-  _i13.Future<_i10.WorkoutSession> addSession(
-    _i10.WorkoutSession? session,
-    int? routineId,
-  ) =>
+  _i13.Future<void> deleteDay(int? dayId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addSession,
-          [
-            session,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #addSession,
-            [
-              session,
-              routineId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i10.WorkoutSession>);
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
-  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
-        Invocation.method(
-          #editSession,
-          [session],
-        ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
-          this,
-          Invocation.method(
-            #editSession,
-            [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(
-    int? logId,
-    int? routineId,
-  ) =>
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [
-            logId,
-            routineId,
-          ],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(this, Invocation.method(#addSlotEntry, [entry, routineId])),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(this, Invocation.method(#getConfigUrl, [type])),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#editConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#addConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(_i8.SlotEntry? entry, num? value, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#addSession, [session, routineId])),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#editSession, [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(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
 
   @override
   void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    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);
 }

From 136d0e0825871f4df04464688e4386a8172b6288 Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Mon, 6 Oct 2025 12:43:05 +0200
Subject: [PATCH 12/29] Extract some logic to their own widgets

---
 lib/providers/nutrition.dart                  | 69 ++++++++-----------
 lib/widgets/core/settings.dart                | 52 ++------------
 .../core/settings/ingredient_cache.dart       | 32 +++++++++
 lib/widgets/core/settings/theme.dart          | 41 +++++++++++
 test/core/settings_test.dart                  |  4 ++
 5 files changed, 109 insertions(+), 89 deletions(-)
 create mode 100644 lib/widgets/core/settings/ingredient_cache.dart
 create mode 100644 lib/widgets/core/settings/theme.dart

diff --git a/lib/providers/nutrition.dart b/lib/providers/nutrition.dart
index b3f84063..3fea337c 100644
--- a/lib/providers/nutrition.dart
+++ b/lib/providers/nutrition.dart
@@ -49,9 +49,11 @@ class NutritionPlansProvider with ChangeNotifier {
   List<NutritionalPlan> _plans = [];
   List<Ingredient> ingredients = [];
 
-  NutritionPlansProvider(this.baseProvider, List<NutritionalPlan> entries,
-      {IngredientDatabase? database})
-      : _plans = entries {
+  NutritionPlansProvider(
+    this.baseProvider,
+    List<NutritionalPlan> entries, {
+    IngredientDatabase? database,
+  }) : _plans = entries {
     this.database = database ?? locator<IngredientDatabase>();
   }
 
@@ -73,8 +75,10 @@ class NutritionPlansProvider with ChangeNotifier {
   NutritionalPlan? get currentPlan {
     final now = DateTime.now();
     return _plans
-        .where((plan) =>
-            plan.startDate.isBefore(now) && (plan.endDate == null || plan.endDate!.isAfter(now)))
+        .where(
+          (plan) =>
+              plan.startDate.isBefore(now) && (plan.endDate == null || plan.endDate!.isAfter(now)),
+        )
         .toList()
         .sorted((a, b) => b.creationDate.compareTo(a.creationDate))
         .firstOrNull;
@@ -114,10 +118,9 @@ class NutritionPlansProvider with ChangeNotifier {
 
   /// Fetches and sets all plans fully, i.e. with all corresponding child objects
   Future<void> fetchAndSetAllPlansFull() async {
-    final data = await baseProvider.fetchPaginated(baseProvider.makeUrl(
-      _nutritionalPlansPath,
-      query: {'limit': API_MAX_PAGE_SIZE},
-    ));
+    final data = await baseProvider.fetchPaginated(
+      baseProvider.makeUrl(_nutritionalPlansPath, query: {'limit': API_MAX_PAGE_SIZE}),
+    );
     await Future.wait(data.map((e) => fetchAndSetPlanFull(e['id'])).toList());
   }
 
@@ -225,10 +228,7 @@ class NutritionPlansProvider with ChangeNotifier {
   /// Adds a meal to a plan
   Future<Meal> addMeal(Meal meal, int planId) async {
     final plan = findById(planId);
-    final data = await baseProvider.post(
-      meal.toJson(),
-      baseProvider.makeUrl(_mealPath),
-    );
+    final data = await baseProvider.post(meal.toJson(), baseProvider.makeUrl(_mealPath));
 
     meal = Meal.fromJson(data);
     plan.meals.add(meal);
@@ -269,10 +269,7 @@ class NutritionPlansProvider with ChangeNotifier {
 
   /// Adds a meal item to a meal
   Future<MealItem> addMealItem(MealItem mealItem, Meal meal) async {
-    final data = await baseProvider.post(
-      mealItem.toJson(),
-      baseProvider.makeUrl(_mealItemPath),
-    );
+    final data = await baseProvider.post(mealItem.toJson(), baseProvider.makeUrl(_mealItemPath));
 
     mealItem = MealItem.fromJson(data);
     mealItem.ingredient = await fetchIngredient(mealItem.ingredientId);
@@ -301,6 +298,7 @@ class NutritionPlansProvider with ChangeNotifier {
   }
 
   Future<void> clearIngredientCache() async {
+    ingredients = [];
     await database.deleteEverything();
   }
 
@@ -314,9 +312,9 @@ class NutritionPlansProvider with ChangeNotifier {
     try {
       ingredient = ingredients.firstWhere((e) => e.id == ingredientId);
     } on StateError {
-      final ingredientDb = await (database.select(database.ingredients)
-            ..where((e) => e.id.equals(ingredientId)))
-          .getSingleOrNull();
+      final ingredientDb = await (database.select(
+        database.ingredients,
+      )..where((e) => e.id.equals(ingredientId))).getSingleOrNull();
 
       // Try to fetch from local db
       if (ingredientDb != null) {
@@ -325,8 +323,9 @@ class NutritionPlansProvider with ChangeNotifier {
         _logger.info("Loaded ingredient '${ingredient.name}' from db cache");
 
         // Prune old entries
-        if (DateTime.now()
-            .isAfter(ingredientDb.lastFetched.add(const Duration(days: DAYS_TO_CACHE)))) {
+        if (DateTime.now().isAfter(
+          ingredientDb.lastFetched.add(const Duration(days: DAYS_TO_CACHE)),
+        )) {
           (database.delete(database.ingredients)..where((i) => i.id.equals(ingredientId))).go();
         }
       } else {
@@ -336,7 +335,9 @@ class NutritionPlansProvider with ChangeNotifier {
         ingredient = Ingredient.fromJson(data);
         ingredients.add(ingredient);
 
-        database.into(database.ingredients).insert(
+        database
+            .into(database.ingredients)
+            .insert(
               IngredientsCompanion.insert(
                 id: ingredientId,
                 data: jsonEncode(data),
@@ -415,10 +416,7 @@ class NutritionPlansProvider with ChangeNotifier {
       final plan = findById(meal.planId);
       final Log log = Log.fromMealItem(item, plan.id!, meal.id, mealDateTime);
 
-      final data = await baseProvider.post(
-        log.toJson(),
-        baseProvider.makeUrl(_nutritionDiaryPath),
-      );
+      final data = await baseProvider.post(log.toJson(), baseProvider.makeUrl(_nutritionDiaryPath));
       log.id = data['id'];
       plan.diaryEntries.add(log);
     }
@@ -426,19 +424,12 @@ class NutritionPlansProvider with ChangeNotifier {
   }
 
   /// Log custom ingredient to nutrition diary
-  Future<void> logIngredientToDiary(
-    MealItem mealItem,
-    int planId, [
-    DateTime? dateTime,
-  ]) async {
+  Future<void> logIngredientToDiary(MealItem mealItem, int planId, [DateTime? dateTime]) async {
     final plan = findById(planId);
     mealItem.ingredient = await fetchIngredient(mealItem.ingredientId);
     final log = Log.fromMealItem(mealItem, plan.id!, null, dateTime);
 
-    final data = await baseProvider.post(
-      log.toJson(),
-      baseProvider.makeUrl(_nutritionDiaryPath),
-    );
+    final data = await baseProvider.post(log.toJson(), baseProvider.makeUrl(_nutritionDiaryPath));
     log.id = data['id'];
     plan.diaryEntries.add(log);
     notifyListeners();
@@ -458,11 +449,7 @@ class NutritionPlansProvider with ChangeNotifier {
     final data = await baseProvider.fetchPaginated(
       baseProvider.makeUrl(
         _nutritionDiaryPath,
-        query: {
-          'plan': plan.id?.toString(),
-          'limit': API_MAX_PAGE_SIZE,
-          'ordering': 'datetime',
-        },
+        query: {'plan': plan.id?.toString(), 'limit': API_MAX_PAGE_SIZE, 'ordering': 'datetime'},
       ),
     );
 
diff --git a/lib/widgets/core/settings.dart b/lib/widgets/core/settings.dart
index e5226a85..e310ab03 100644
--- a/lib/widgets/core/settings.dart
+++ b/lib/widgets/core/settings.dart
@@ -18,12 +18,11 @@
 
 //import 'package:drift/drift.dart';
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/providers/nutrition.dart';
-import 'package:wger/providers/user.dart';
 import 'package:wger/screens/configure_plates_screen.dart';
 import 'package:wger/widgets/core/settings/exercise_cache.dart';
+import 'package:wger/widgets/core/settings/ingredient_cache.dart';
+import 'package:wger/widgets/core/settings/theme.dart';
 
 class SettingsPage extends StatelessWidget {
   static String routeName = '/SettingsPage';
@@ -33,8 +32,6 @@ class SettingsPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final i18n = AppLocalizations.of(context);
-    final nutritionProvider = Provider.of<NutritionPlansProvider>(context, listen: false);
-    final userProvider = Provider.of<UserProvider>(context);
 
     return Scaffold(
       appBar: AppBar(title: Text(i18n.settingsTitle)),
@@ -44,50 +41,9 @@ class SettingsPage extends StatelessWidget {
             title: Text(i18n.settingsCacheTitle, style: Theme.of(context).textTheme.headlineSmall),
           ),
           const SettingsExerciseCache(),
-          ListTile(
-            title: Text(i18n.settingsIngredientCacheDescription),
-            subtitle: Text('${nutritionProvider.ingredients.length} cached ingredients'),
-            trailing: IconButton(
-              key: const ValueKey('cacheIconIngredients'),
-              icon: const Icon(Icons.delete),
-              onPressed: () async {
-                await nutritionProvider.clearIngredientCache();
-
-                if (context.mounted) {
-                  final snackBar = SnackBar(content: Text(i18n.settingsCacheDeletedSnackbar));
-
-                  ScaffoldMessenger.of(context).showSnackBar(snackBar);
-                }
-              },
-            ),
-          ),
+          const SettingsIngredientCache(),
           ListTile(title: Text(i18n.others, style: Theme.of(context).textTheme.headlineSmall)),
-          ListTile(
-            title: Text(i18n.themeMode),
-            trailing: DropdownButton<ThemeMode>(
-              key: const ValueKey('themeModeDropdown'),
-              value: userProvider.themeMode,
-              onChanged: (ThemeMode? newValue) {
-                if (newValue != null) {
-                  userProvider.setThemeMode(newValue);
-                }
-              },
-              items: ThemeMode.values.map<DropdownMenuItem<ThemeMode>>((ThemeMode value) {
-                final label = (() {
-                  switch (value) {
-                    case ThemeMode.system:
-                      return i18n.systemMode;
-                    case ThemeMode.light:
-                      return i18n.lightMode;
-                    case ThemeMode.dark:
-                      return i18n.darkMode;
-                  }
-                })();
-
-                return DropdownMenuItem<ThemeMode>(value: value, child: Text(label));
-              }).toList(),
-            ),
-          ),
+          const SettingsTheme(),
           ListTile(
             title: Text(i18n.selectAvailablePlates),
             onTap: () {
diff --git a/lib/widgets/core/settings/ingredient_cache.dart b/lib/widgets/core/settings/ingredient_cache.dart
new file mode 100644
index 00000000..c183fd97
--- /dev/null
+++ b/lib/widgets/core/settings/ingredient_cache.dart
@@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/providers/nutrition.dart';
+
+class SettingsIngredientCache extends StatelessWidget {
+  const SettingsIngredientCache({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+    final nutritionProvider = Provider.of<NutritionPlansProvider>(context, listen: false);
+
+    return ListTile(
+      title: Text(i18n.settingsIngredientCacheDescription),
+      subtitle: Text('${nutritionProvider.ingredients.length} cached ingredients'),
+      trailing: IconButton(
+        key: const ValueKey('cacheIconIngredients'),
+        icon: const Icon(Icons.delete),
+        onPressed: () async {
+          await nutritionProvider.clearIngredientCache();
+
+          if (context.mounted) {
+            final snackBar = SnackBar(content: Text(i18n.settingsCacheDeletedSnackbar));
+
+            ScaffoldMessenger.of(context).showSnackBar(snackBar);
+          }
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/core/settings/theme.dart b/lib/widgets/core/settings/theme.dart
new file mode 100644
index 00000000..901c2ff4
--- /dev/null
+++ b/lib/widgets/core/settings/theme.dart
@@ -0,0 +1,41 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/providers/user.dart';
+
+class SettingsTheme extends StatelessWidget {
+  const SettingsTheme({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+    final userProvider = Provider.of<UserProvider>(context);
+
+    return ListTile(
+      title: Text(i18n.themeMode),
+      trailing: DropdownButton<ThemeMode>(
+        key: const ValueKey('themeModeDropdown'),
+        value: userProvider.themeMode,
+        onChanged: (ThemeMode? newValue) {
+          if (newValue != null) {
+            userProvider.setThemeMode(newValue);
+          }
+        },
+        items: ThemeMode.values.map<DropdownMenuItem<ThemeMode>>((ThemeMode value) {
+          final label = (() {
+            switch (value) {
+              case ThemeMode.system:
+                return i18n.systemMode;
+              case ThemeMode.light:
+                return i18n.lightMode;
+              case ThemeMode.dark:
+                return i18n.darkMode;
+            }
+          })();
+
+          return DropdownMenuItem<ThemeMode>(value: value, child: Text(label));
+        }).toList(),
+      ),
+    );
+  }
+}
diff --git a/test/core/settings_test.dart b/test/core/settings_test.dart
index 7fe2d7ed..474603c9 100644
--- a/test/core/settings_test.dart
+++ b/test/core/settings_test.dart
@@ -30,6 +30,8 @@ import 'package:wger/providers/nutrition.dart';
 import 'package:wger/providers/user.dart';
 import 'package:wger/widgets/core/settings.dart';
 
+import '../../test_data/exercises.dart';
+import '../../test_data/nutritional_plans.dart';
 import 'settings_test.mocks.dart';
 
 @GenerateMocks([
@@ -47,6 +49,8 @@ void main() {
 
   setUp(() {
     when(mockUserProvider.themeMode).thenReturn(ThemeMode.system);
+    when(mockExerciseProvider.exercises).thenReturn(getTestExercises());
+    when(mockNutritionProvider.ingredients).thenReturn([ingredient1, ingredient2]);
   });
 
   Widget createSettingsScreen({locale = 'en'}) {

From bad5e68fb6cedd38a2e44e2751abf5a2996b0a0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 00:05:10 +0000
Subject: [PATCH 13/29] Bump build_runner from 2.8.0 to 2.9.0

Bumps [build_runner](https://github.com/dart-lang/build) from 2.8.0 to 2.9.0.
- [Release notes](https://github.com/dart-lang/build/releases)
- [Commits](https://github.com/dart-lang/build/compare/build_runner-v2.8.0...build_runner-v2.9.0)

---
updated-dependencies:
- dependency-name: build_runner
  dependency-version: 2.9.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pubspec.lock | 12 ++----------
 pubspec.yaml |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index 724e9c1c..e6d7ec3a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -77,10 +77,10 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "804c47c936df75e1911c19a4fb8c46fa8ff2b3099b9f2b2aa4726af3774f734b"
+      sha256: "4e54dbeefdc70691ba80b3bce3976af63b5425c8c07dface348dfee664a0edc1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.0"
+    version: "2.9.0"
   built_collection:
     dependency: transitive
     description:
@@ -546,14 +546,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.0"
-  frontend_server_client:
-    dependency: transitive
-    description:
-      name: frontend_server_client
-      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.0"
   fuchsia_remote_debug_protocol:
     dependency: transitive
     description: flutter
diff --git a/pubspec.yaml b/pubspec.yaml
index 73a4a903..54d6877c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -74,7 +74,7 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     sdk: flutter
-  build_runner: ^2.8.0
+  build_runner: ^2.9.0
   cider: ^0.2.7
   drift_dev: ^2.28.3
   flutter_lints: ^6.0.0

From 2494effe64aba351996c6d9196584e7e1522572e Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Mon, 6 Oct 2025 14:13:19 +0200
Subject: [PATCH 14/29] Use existing material localizations for "cancel" and
 use lower case for "add"

---
 lib/l10n/app_en.arb                              | 9 ++-------
 lib/widgets/add_exercise/image_details_form.dart | 4 ++--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index df9a85bd..f5a96603 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -155,7 +155,6 @@
   "@category": {
     "description": "Category for an exercise, ingredient, etc."
   },
-  "endDate": "End date",
   "startDate": "Start date",
   "routines": "Routines",
   "newRoutine": "New routine",
@@ -778,12 +777,8 @@
   "@imageDetailsLicenseNoticeSuffix": {
     "description": "Second part of license notice text"
   },
-  "imageDetailsCancel": "CANCEL",
-  "@imageDetailsCancel": {
-    "description": "Cancel button text"
-  },
-  "imageDetailsAdd": "ADD",
-  "@imageDetailsAdd": {
+  "add": "add",
+  "@add": {
     "description": "Add button text"
   },
   "variations": "Variations",
diff --git a/lib/widgets/add_exercise/image_details_form.dart b/lib/widgets/add_exercise/image_details_form.dart
index 8b3414b6..f3cef3f3 100644
--- a/lib/widgets/add_exercise/image_details_form.dart
+++ b/lib/widgets/add_exercise/image_details_form.dart
@@ -323,7 +323,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
       children: [
         TextButton(
           onPressed: widget.onCancel,
-          child: Text(AppLocalizations.of(context).imageDetailsCancel),
+          child: Text(MaterialLocalizations.of(context).cancelButtonLabel),
         ),
         const SizedBox(width: 8),
         ElevatedButton(
@@ -369,7 +369,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
             padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 12),
           ),
           child: Text(
-            AppLocalizations.of(context).imageDetailsAdd,
+            AppLocalizations.of(context).add,
             style: const TextStyle(fontWeight: FontWeight.bold, color: Colors.white),
           ),
         ),

From 50b63a47493a4a15f1e2db396c7b775ba3ebfcc5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Oct 2025 00:11:22 +0000
Subject: [PATCH 15/29] Bump astral-sh/setup-uv from 6 to 7

Bumps [astral-sh/setup-uv](https://github.com/astral-sh/setup-uv) from 6 to 7.
- [Release notes](https://github.com/astral-sh/setup-uv/releases)
- [Commits](https://github.com/astral-sh/setup-uv/compare/v6...v7)

---
updated-dependencies:
- dependency-name: astral-sh/setup-uv
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/bump-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
index 951ab4db..55efba77 100644
--- a/.github/workflows/bump-version.yml
+++ b/.github/workflows/bump-version.yml
@@ -22,7 +22,7 @@ jobs:
         uses: ./.github/actions/flutter-common
 
       - name: Setup uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
 
       - name: Validate version
         run: |

From 1a78011a7d099b7de81db5d27e1657e14a52f1c6 Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Mon, 6 Oct 2025 16:01:14 +0200
Subject: [PATCH 16/29] Refactor image handling in the exercise submission
 process

Now the images are kept in a single list, instead of having two for
the files themselves and the metadata.
---
 lib/helpers/consts.dart                       |   3 +
 .../exercises/exercise_submission_images.dart |  67 +++
 lib/providers/add_exercise.dart               |  88 +---
 lib/screens/add_exercise_screen.dart          |   4 +-
 .../add_exercise/image_details_form.dart      | 108 +++--
 .../mixins/image_picker_mixin.dart            |  11 +-
 lib/widgets/add_exercise/preview_images.dart  |  27 +-
 .../add_exercise/steps/step5images.dart       |  35 +-
 ...rt => contribute_exercise_image_test.dart} | 164 +++-----
 .../contribute_exercise_image_test.mocks.dart | 383 ++++++++++++++++++
 .../contribute_exercise_test.mocks.dart       |  44 +-
 11 files changed, 623 insertions(+), 311 deletions(-)
 create mode 100644 lib/models/exercises/exercise_submission_images.dart
 rename test/exercises/{add_exercise_image_withDetail_test.dart => contribute_exercise_image_test.dart} (51%)
 create mode 100644 test/exercises/contribute_exercise_image_test.mocks.dart

diff --git a/lib/helpers/consts.dart b/lib/helpers/consts.dart
index 52ca907d..f545e9b8 100644
--- a/lib/helpers/consts.dart
+++ b/lib/helpers/consts.dart
@@ -143,3 +143,6 @@ const String API_RESULTS_PAGE_SIZE = '100';
 /// Marker used for identifying interpolated values in a list, e.g. for measurements
 /// the milliseconds in the entry date are set to this value
 const INTERPOLATION_MARKER = 123;
+
+/// Creative Commons license IDs
+const CC_BY_SA_4_ID = 4;
diff --git a/lib/models/exercises/exercise_submission_images.dart b/lib/models/exercises/exercise_submission_images.dart
new file mode 100644
index 00000000..fe97466b
--- /dev/null
+++ b/lib/models/exercises/exercise_submission_images.dart
@@ -0,0 +1,67 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+
+enum ImageType {
+  photo(id: 1, label: 'Photo', icon: Icons.photo_camera),
+  threeD(id: 2, label: '3D', icon: Icons.view_in_ar),
+  line(id: 3, label: 'Line', icon: Icons.show_chart),
+  lowPoly(id: 4, label: 'Low-Poly', icon: Icons.filter_vintage),
+  other(id: 5, label: 'Other', icon: Icons.more_horiz);
+
+  const ImageType({required this.id, required this.label, required this.icon});
+
+  final int id;
+  final String label;
+  final IconData icon;
+}
+
+class ExerciseSubmissionImage {
+  final File imageFile;
+
+  String? title;
+  String? author;
+  String? authorUrl;
+  String? sourceUrl;
+  String? derivativeSourceUrl;
+  ImageType type = ImageType.photo;
+
+  ExerciseSubmissionImage({
+    this.title,
+    this.author,
+    this.authorUrl,
+    this.sourceUrl,
+    this.derivativeSourceUrl,
+    this.type = ImageType.photo,
+    required this.imageFile,
+  });
+
+  Map<String, String> toJson() {
+    return {
+      'title': title ?? '',
+      'author': author ?? '',
+      'author_url': authorUrl ?? '',
+      'source_url': sourceUrl ?? '',
+      'derivative_source_url': derivativeSourceUrl ?? '',
+      'type': type.id.toString(),
+    };
+  }
+}
diff --git a/lib/providers/add_exercise.dart b/lib/providers/add_exercise.dart
index 7fd69c32..c61410e2 100644
--- a/lib/providers/add_exercise.dart
+++ b/lib/providers/add_exercise.dart
@@ -1,13 +1,11 @@
-import 'dart:convert';
-import 'dart:io';
-
 import 'package:flutter/foundation.dart';
 import 'package:http/http.dart' as http;
 import 'package:logging/logging.dart';
+import 'package:wger/helpers/consts.dart';
 import 'package:wger/models/exercises/category.dart';
 import 'package:wger/models/exercises/equipment.dart';
-import 'package:wger/models/exercises/exercise.dart';
 import 'package:wger/models/exercises/exercise_submission.dart';
+import 'package:wger/models/exercises/exercise_submission_images.dart';
 import 'package:wger/models/exercises/language.dart';
 import 'package:wger/models/exercises/muscle.dart';
 import 'package:wger/models/exercises/variation.dart';
@@ -20,11 +18,10 @@ class AddExerciseProvider with ChangeNotifier {
 
   AddExerciseProvider(this.baseProvider);
 
-  List<File> get exerciseImages => [..._exerciseImages];
-  List<File> _exerciseImages = [];
+  // Images and their metadata (license info, style)
+  final List<ExerciseSubmissionImage> _exerciseImages = [];
 
-  // Map storing image metadata (license info, style), keyed by file path
-  final Map<String, Map<String, String>> _imageDetails = {};
+  List<ExerciseSubmissionImage> get exerciseImages => [..._exerciseImages];
 
   String? exerciseNameEn;
   String? exerciseNameTrans;
@@ -37,7 +34,6 @@ class AddExerciseProvider with ChangeNotifier {
   List<String> alternateNamesEn = [];
   List<String> alternateNamesTrans = [];
   ExerciseCategory? category;
-  List<Exercise> _variations = [];
   List<Equipment> _equipment = [];
   List<Muscle> _primaryMuscles = [];
   List<Muscle> _secondaryMuscles = [];
@@ -47,8 +43,7 @@ class AddExerciseProvider with ChangeNotifier {
   static const _checkLanguageUrlPath = 'check-language';
 
   void clear() {
-    _exerciseImages = [];
-    _imageDetails.clear();
+    _exerciseImages.clear();
     languageTranslation = null;
     category = null;
     exerciseNameEn = null;
@@ -57,7 +52,6 @@ class AddExerciseProvider with ChangeNotifier {
     descriptionTrans = null;
     alternateNamesEn = [];
     alternateNamesTrans = [];
-    _variations = [];
     _equipment = [];
     _primaryMuscles = [];
     _secondaryMuscles = [];
@@ -142,56 +136,14 @@ class AddExerciseProvider with ChangeNotifier {
   }
 
   /// Add images with optional license metadata
-  ///
-  /// [images] - List of image files to add
-  /// [title] - License title
-  /// [author] - Author name
-  /// [authorUrl] - Author's URL
-  /// [sourceUrl] - Source/object URL
-  /// [derivativeSourceUrl] - Derivative source URL
-  /// [style] - Image style: 1=PHOTO, 2=3D, 3=LINE, 4=LOW-POLY, 5=OTHER
-  void addExerciseImages(
-      List<File> images, {
-        String? title,
-        String? author,
-        String? authorUrl,
-        String? sourceUrl,
-        String? derivativeSourceUrl,
-        String style = '1',
-      }) {
+  void addExerciseImages(List<ExerciseSubmissionImage> images) {
     _exerciseImages.addAll(images);
-
-    // Store metadata for each image
-    for (final image in images) {
-      final details = <String, String>{'style': style};
-
-      // Only add non-empty fields
-      if (title != null && title.isNotEmpty) {
-        details['license_title'] = title;
-      }
-      if (author != null && author.isNotEmpty) {
-        details['license_author'] = author;
-      }
-      if (authorUrl != null && authorUrl.isNotEmpty) {
-        details['license_author_url'] = authorUrl;
-      }
-      if (sourceUrl != null && sourceUrl.isNotEmpty) {
-        details['license_object_url'] = sourceUrl;
-      }
-      if (derivativeSourceUrl != null && derivativeSourceUrl.isNotEmpty) {
-        details['license_derivative_source_url'] = derivativeSourceUrl;
-      }
-
-      _imageDetails[image.path] = details;
-    }
-
     notifyListeners();
   }
 
-  void removeExercise(String path) {
-    final file = _exerciseImages.where((element) => element.path == path).first;
+  void removeImage(String path) {
+    final file = _exerciseImages.where((element) => element.imageFile.path == path).first;
     _exerciseImages.remove(file);
-    _imageDetails.remove(path);
     notifyListeners();
   }
 
@@ -199,16 +151,14 @@ class AddExerciseProvider with ChangeNotifier {
   ///
   /// Returns the ID of the created exercise
   /// Throws exception if submission fails
-  Future<int> addExercise() async {
+  Future<int> postExerciseToServer() async {
     try {
       // 1. Create the exercise
       final exerciseId = await addExerciseSubmission();
 
-
       // 2. Upload images if any exist
       if (_exerciseImages.isNotEmpty) {
         await addImages(exerciseId);
-
       }
 
       // 3. Clear all data after successful upload
@@ -216,7 +166,6 @@ class AddExerciseProvider with ChangeNotifier {
 
       return exerciseId;
     } catch (e) {
-
       // Don't clear on error so user can retry
       rethrow;
     }
@@ -233,25 +182,20 @@ class AddExerciseProvider with ChangeNotifier {
   }
 
   /// Upload exercise images with license metadata
-  ///
-  /// For each image:
-  /// - Sends multipart request with image file
-  /// - Includes license fields from _imageDetails map
   Future<void> addImages(int exerciseId) async {
     for (final image in _exerciseImages) {
       final request = http.MultipartRequest('POST', baseProvider.makeUrl(_imagesUrlPath));
       request.headers.addAll(baseProvider.getDefaultHeaders(includeAuth: true));
 
-      request.files.add(await http.MultipartFile.fromPath('image', image.path));
+      request.files.add(await http.MultipartFile.fromPath('image', image.imageFile.path));
       request.fields['exercise'] = exerciseId.toString();
-      request.fields['license'] = '1';
+      request.fields['license'] = CC_BY_SA_4_ID.toString();
       request.fields['is_main'] = 'false';
+      request.fields['style'] = ImageType.photo.id.toString();
 
-      final details = _imageDetails[image.path];
-      if (details != null && details.isNotEmpty) {
+      final details = image.toJson();
+      if (details.isNotEmpty) {
         request.fields.addAll(details);
-      } else {
-        request.fields['style'] = '1';
       }
 
       try {
@@ -280,4 +224,4 @@ class AddExerciseProvider with ChangeNotifier {
 
     return false;
   }
-}
\ No newline at end of file
+}
diff --git a/lib/screens/add_exercise_screen.dart b/lib/screens/add_exercise_screen.dart
index c8b2fef7..4eec7d3d 100644
--- a/lib/screens/add_exercise_screen.dart
+++ b/lib/screens/add_exercise_screen.dart
@@ -85,10 +85,8 @@ class _AddExerciseStepperState extends State<AddExerciseStepper> {
 
                         Exercise? exercise;
                         try {
-                          final exerciseId = await addExerciseProvider.addExercise();
-                          await addExerciseProvider.addImages(exerciseId);
+                          final exerciseId = await addExerciseProvider.postExerciseToServer();
                           exercise = await exerciseProvider.fetchAndSetExercise(exerciseId);
-                          addExerciseProvider.clear();
                         } on WgerHttpException catch (error) {
                           if (context.mounted) {
                             setState(() {
diff --git a/lib/widgets/add_exercise/image_details_form.dart b/lib/widgets/add_exercise/image_details_form.dart
index f3cef3f3..1e8beed6 100644
--- a/lib/widgets/add_exercise/image_details_form.dart
+++ b/lib/widgets/add_exercise/image_details_form.dart
@@ -1,7 +1,6 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/exercises/exercise_submission_images.dart';
 import 'package:wger/widgets/add_exercise/license_info_widget.dart';
 
 /// Form for collecting CC BY-SA 4.0 license metadata for exercise images
@@ -23,13 +22,13 @@ import 'package:wger/widgets/add_exercise/license_info_widget.dart';
 /// All metadata is sent to the API's /exerciseimage endpoint along with
 /// the image file when the exercise is submitted.
 class ImageDetailsForm extends StatefulWidget {
-  final File imageFile;
-  final Function(File image, Map<String, String> details) onAdd;
+  final Function(ExerciseSubmissionImage image) onAdd;
   final VoidCallback onCancel;
+  final ExerciseSubmissionImage submissionImage;
 
   const ImageDetailsForm({
     super.key,
-    required this.imageFile,
+    required this.submissionImage,
     required this.onAdd,
     required this.onCancel,
   });
@@ -43,22 +42,13 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
 
   // Text controllers for license metadata fields
   final _titleController = TextEditingController();
-  final _sourceLinkController = TextEditingController(); // license_object_url in API
-  final _authorController = TextEditingController(); // license_author in API
-  final _authorLinkController = TextEditingController(); // license_author_url in API
-  final _originalSourceController = TextEditingController(); // license_derivative_source_url in API
+  final _sourceLinkController = TextEditingController();
+  final _authorController = TextEditingController();
+  final _authorLinkController = TextEditingController();
+  final _originalSourceController = TextEditingController();
 
   /// Currently selected image type
-  /// Maps to API 'style' field: PHOTO=1, 3D=2, LINE=3, LOW-POLY=4, OTHER=5
-  String _selectedImageType = 'PHOTO';
-
-  final List<Map<String, dynamic>> _imageTypes = [
-    {'type': 'PHOTO', 'icon': Icons.photo_camera, 'label': 'PHOTO'},
-    {'type': '3D', 'icon': Icons.view_in_ar, 'label': '3D'},
-    {'type': 'LINE', 'icon': Icons.show_chart, 'label': 'LINE'},
-    {'type': 'LOW-POLY', 'icon': Icons.filter_vintage, 'label': 'LOW-POLY'},
-    {'type': 'OTHER', 'icon': Icons.more_horiz, 'label': 'OTHER'},
-  ];
+  ImageType _selectedImageType = ImageType.photo;
 
   @override
   void dispose() {
@@ -216,7 +206,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
         ),
         child: ClipRRect(
           borderRadius: BorderRadius.circular(8),
-          child: Image.file(widget.imageFile, fit: BoxFit.contain),
+          child: Image.file(widget.submissionImage.imageFile, fit: BoxFit.contain),
         ),
       ),
     );
@@ -269,12 +259,12 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
         Wrap(
           spacing: 8,
           runSpacing: 8,
-          children: _imageTypes.map((type) {
-            final isSelected = _selectedImageType == type['type'];
+          children: ImageType.values.map((type) {
+            final isSelected = _selectedImageType == type;
             return InkWell(
               onTap: () {
                 setState(() {
-                  _selectedImageType = type['type'];
+                  _selectedImageType = type;
                 });
               },
               borderRadius: BorderRadius.circular(4),
@@ -291,7 +281,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
                     Icon(
-                      type['icon'],
+                      type.icon,
                       size: 32,
                       color: isSelected
                           ? theme.buttonTheme.colorScheme!.onPrimary
@@ -299,7 +289,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
                     ),
                     const SizedBox(height: 8),
                     Text(
-                      type['label'],
+                      type.label,
                       style: TextStyle(
                         fontSize: 11,
                         color: isSelected ? Colors.blue : Colors.grey.shade700,
@@ -328,40 +318,42 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
         const SizedBox(width: 8),
         ElevatedButton(
           onPressed: () {
-            if (_formKey.currentState!.validate()) {
-              // Build details map with API field names
-              // Style is always included, other fields only if non-empty
-              final details = <String, String>{'style': _getStyleValue()};
-
-              // Add optional fields only if user provided values
-              final title = _titleController.text.trim();
-              if (title.isNotEmpty) {
-                details['license_title'] = title;
-              }
-
-              final author = _authorController.text.trim();
-              if (author.isNotEmpty) {
-                details['license_author'] = author;
-              }
-
-              final sourceUrl = _sourceLinkController.text.trim();
-              if (sourceUrl.isNotEmpty) {
-                details['license_object_url'] = sourceUrl;
-              }
-
-              final authorUrl = _authorLinkController.text.trim();
-              if (authorUrl.isNotEmpty) {
-                details['license_author_url'] = authorUrl;
-              }
-
-              final derivativeUrl = _originalSourceController.text.trim();
-              if (derivativeUrl.isNotEmpty) {
-                details['license_derivative_source_url'] = derivativeUrl;
-              }
-
-              // Pass image and metadata back to parent
-              widget.onAdd(widget.imageFile, details);
+            if (!_formKey.currentState!.validate()) {
+              return;
             }
+
+            // Build details map with API field names
+            // Style is always included, other fields only if non-empty
+            final details = <String, String>{'style': _getStyleValue()};
+
+            // Add optional fields only if user provided values
+            final title = _titleController.text.trim();
+            if (title.isNotEmpty) {
+              widget.submissionImage.title = title;
+            }
+
+            final author = _authorController.text.trim();
+            if (author.isNotEmpty) {
+              widget.submissionImage.author = author;
+            }
+
+            final sourceUrl = _sourceLinkController.text.trim();
+            if (sourceUrl.isNotEmpty) {
+              widget.submissionImage.sourceUrl = sourceUrl;
+            }
+
+            final authorUrl = _authorLinkController.text.trim();
+            if (authorUrl.isNotEmpty) {
+              widget.submissionImage.authorUrl = authorUrl;
+            }
+
+            final derivativeUrl = _originalSourceController.text.trim();
+            if (derivativeUrl.isNotEmpty) {
+              widget.submissionImage.derivativeSourceUrl = derivativeUrl;
+            }
+
+            // Pass image and metadata back to parent
+            widget.onAdd(widget.submissionImage);
           },
           style: ElevatedButton.styleFrom(
             backgroundColor: Theme.of(context).primaryColor,
diff --git a/lib/widgets/add_exercise/mixins/image_picker_mixin.dart b/lib/widgets/add_exercise/mixins/image_picker_mixin.dart
index d98a235e..1f58548a 100644
--- a/lib/widgets/add_exercise/mixins/image_picker_mixin.dart
+++ b/lib/widgets/add_exercise/mixins/image_picker_mixin.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:provider/provider.dart';
+import 'package:wger/models/exercises/exercise_submission_images.dart';
 import 'package:wger/providers/add_exercise.dart';
 
 const validFileExtensions = ['jpg', 'jpeg', 'png', 'webp'];
@@ -31,19 +32,21 @@ mixin ExerciseImagePickerMixin {
       images = await imagePicker.pickMultiImage();
     }
 
-    final selectedImages = <File>[];
+    final selectedImages = <ExerciseSubmissionImage>[];
     if (images != null) {
-      selectedImages.addAll(images.map((e) => File(e.path)).toList());
+      selectedImages.addAll(
+        images.map((e) => ExerciseSubmissionImage(imageFile: File(e.path))).toList(),
+      );
 
       for (final image in selectedImages) {
         bool isFileValid = true;
         String errorMessage = '';
 
-        if (!_validateFileType(image)) {
+        if (!_validateFileType(image.imageFile)) {
           isFileValid = false;
           errorMessage = "Select only 'jpg', 'jpeg', 'png', 'webp' files";
         }
-        if (_validateFileSize(image.lengthSync())) {
+        if (_validateFileSize(image.imageFile.lengthSync())) {
           isFileValid = true;
           errorMessage = 'File Size should not be greater than 20 mb';
         }
diff --git a/lib/widgets/add_exercise/preview_images.dart b/lib/widgets/add_exercise/preview_images.dart
index 5a6249a2..3da95b58 100644
--- a/lib/widgets/add_exercise/preview_images.dart
+++ b/lib/widgets/add_exercise/preview_images.dart
@@ -1,6 +1,8 @@
 import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:wger/models/exercises/exercise_submission_images.dart';
 import 'package:wger/providers/add_exercise.dart';
 
 /// Widget to preview selected exercise images
@@ -9,16 +11,16 @@ import 'package:wger/providers/add_exercise.dart';
 /// Each image shows a preview thumbnail and optionally a delete button.
 /// Can optionally include an "add more" button at the end of the list.
 class PreviewExerciseImages extends StatelessWidget {
-  final List<File> selectedImages;
+  final List<ExerciseSubmissionImage> selectedImages;
   final VoidCallback? onAddMore;
   final bool allowEdit;
 
   const PreviewExerciseImages({
-    Key? key,
+    super.key,
     required this.selectedImages,
     this.onAddMore,
     this.allowEdit = true,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -38,7 +40,7 @@ class PreviewExerciseImages extends StatelessWidget {
 
           // Show image thumbnail
           final image = selectedImages[index];
-          return _buildImageCard(context, image);
+          return _buildImageCard(context, image.imageFile);
         },
       ),
     );
@@ -53,12 +55,7 @@ class PreviewExerciseImages extends StatelessWidget {
           // Image thumbnail
           ClipRRect(
             borderRadius: BorderRadius.circular(8),
-            child: Image.file(
-              image,
-              width: 120,
-              height: 120,
-              fit: BoxFit.cover,
-            ),
+            child: Image.file(image, width: 120, height: 120, fit: BoxFit.cover),
           ),
 
           // Delete button overlay (only shown if editing is allowed)
@@ -75,7 +72,7 @@ class PreviewExerciseImages extends StatelessWidget {
                   padding: const EdgeInsets.all(4),
                 ),
                 onPressed: () {
-                  context.read<AddExerciseProvider>().removeExercise(image.path);
+                  context.read<AddExerciseProvider>().removeImage(image.path);
                 },
               ),
             ),
@@ -100,12 +97,8 @@ class PreviewExerciseImages extends StatelessWidget {
             style: BorderStyle.solid,
           ),
         ),
-        child: Icon(
-          Icons.add,
-          size: 48,
-          color: Theme.of(context).colorScheme.onSurfaceVariant,
-        ),
+        child: Icon(Icons.add, size: 48, color: Theme.of(context).colorScheme.onSurfaceVariant),
       ),
     );
   }
-}
\ No newline at end of file
+}
diff --git a/lib/widgets/add_exercise/steps/step5images.dart b/lib/widgets/add_exercise/steps/step5images.dart
index e0a23ae2..3371981a 100644
--- a/lib/widgets/add_exercise/steps/step5images.dart
+++ b/lib/widgets/add_exercise/steps/step5images.dart
@@ -1,12 +1,14 @@
 import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/exercises/exercise_submission_images.dart';
 import 'package:wger/providers/add_exercise.dart';
+import 'package:wger/widgets/add_exercise/image_details_form.dart';
 import 'package:wger/widgets/add_exercise/mixins/image_picker_mixin.dart';
 import 'package:wger/widgets/add_exercise/preview_images.dart';
-import 'package:wger/widgets/add_exercise/image_details_form.dart';
 
 /// Step 5 of exercise creation wizard - Image upload with license metadata
 ///
@@ -21,6 +23,7 @@ import 'package:wger/widgets/add_exercise/image_details_form.dart';
 /// 4. Final upload happens in Step 6 when user clicks "Submit"
 class Step5Images extends StatefulWidget {
   final GlobalKey<FormState> formkey;
+
   const Step5Images({required this.formkey});
 
   @override
@@ -30,7 +33,7 @@ class Step5Images extends StatefulWidget {
 class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin {
   /// Currently selected image waiting for metadata input
   /// When non-null, ImageDetailsForm is displayed instead of image picker
-  File? _currentImageToAdd;
+  ExerciseSubmissionImage? _currentImageToAddNew;
 
   /// Show dialog to choose between Camera and Gallery
   Future<void> _showImageSourceDialog(BuildContext context) async {
@@ -111,7 +114,7 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
 
       // Show metadata collection form for valid image
       setState(() {
-        _currentImageToAdd = imageFile;
+        _currentImageToAddNew = ExerciseSubmissionImage(imageFile: imageFile);
       });
     }
   }
@@ -124,30 +127,22 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
   ///
   /// [image] - The image file to add
   /// [details] - Map containing license fields (license_title, license_author, etc.)
-  void _addImageWithDetails(File image, Map<String, String> details) {
+  void _addImageWithDetails(ExerciseSubmissionImage image) {
     final provider = context.read<AddExerciseProvider>();
 
     // Store image with metadata - actual upload happens in addExercise()
-    provider.addExerciseImages(
-      [image],
-      title: details['license_title'],
-      author: details['license_author'],
-      authorUrl: details['license_author_url'],
-      sourceUrl: details['license_object_url'],
-      derivativeSourceUrl: details['license_derivative_source_url'],
-      style: details['style'] ?? '1',
-    );
+    provider.addExerciseImages([image]);
 
     // Reset form state - image is now visible in preview list
     setState(() {
-      _currentImageToAdd = null;
+      _currentImageToAddNew = null;
     });
   }
 
   /// Cancel metadata input and return to image picker
   void _cancelImageAdd() {
     setState(() {
-      _currentImageToAdd = null;
+      _currentImageToAddNew = null;
     });
   }
 
@@ -158,7 +153,7 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
       child: Column(
         children: [
           // License notice - shown when not entering metadata
-          if (_currentImageToAdd == null)
+          if (_currentImageToAddNew == null)
             Padding(
               padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
               child: Text(
@@ -169,15 +164,15 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
             ),
 
           // Metadata collection form - shown when image is selected
-          if (_currentImageToAdd != null)
+          if (_currentImageToAddNew != null)
             ImageDetailsForm(
-              imageFile: _currentImageToAdd!,
+              submissionImage: _currentImageToAddNew!,
               onAdd: _addImageWithDetails,
               onCancel: _cancelImageAdd,
             ),
 
           // Image picker or preview - shown when not entering metadata
-          if (_currentImageToAdd == null)
+          if (_currentImageToAddNew == null)
             Consumer<AddExerciseProvider>(
               builder: (ctx, provider, __) {
                 if (provider.exerciseImages.isNotEmpty) {
@@ -253,4 +248,4 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
       ),
     );
   }
-}
\ No newline at end of file
+}
diff --git a/test/exercises/add_exercise_image_withDetail_test.dart b/test/exercises/contribute_exercise_image_test.dart
similarity index 51%
rename from test/exercises/add_exercise_image_withDetail_test.dart
rename to test/exercises/contribute_exercise_image_test.dart
index e56a36fb..f8fe127a 100644
--- a/test/exercises/add_exercise_image_withDetail_test.dart
+++ b/test/exercises/contribute_exercise_image_test.dart
@@ -1,8 +1,12 @@
 import 'dart:io';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:wger/providers/add_exercise.dart';
 
-import '../core/settings_test.mocks.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:wger/models/exercises/exercise_submission_images.dart';
+import 'package:wger/providers/add_exercise.dart';
+import 'package:wger/providers/base_provider.dart';
+
+import 'contribute_exercise_image_test.mocks.dart';
 
 /// Unit tests for AddExerciseProvider image metadata handling
 ///
@@ -14,6 +18,8 @@ import '../core/settings_test.mocks.dart';
 /// - Edge cases (empty lists, duplicates, special characters)
 /// - State management (clear, remove)
 /// - Image ordering and batch operations
+
+@GenerateMocks([AddExerciseProvider, WgerBaseProvider])
 void main() {
   late MockWgerBaseProvider mockBaseProvider;
   late AddExerciseProvider provider;
@@ -29,18 +35,20 @@ void main() {
     test('should store image with all license fields', () {
       final mockFile = File('test.jpg');
 
-      provider.addExerciseImages(
-        [mockFile],
-        title: 'Test Title',
-        author: 'Test Author',
-        authorUrl: 'https://test.com/author',
-        sourceUrl: 'https://source.com',
-        derivativeSourceUrl: 'https://derivative.com',
-        style: '4', // LOW-POLY
-      );
+      provider.addExerciseImages([
+        ExerciseSubmissionImage(
+          imageFile: mockFile,
+          title: 'Test Title',
+          author: 'Test Author',
+          authorUrl: 'https://test.com/author',
+          sourceUrl: 'https://source.com',
+          derivativeSourceUrl: 'https://derivative.com',
+          type: ImageType.lowPoly,
+        ),
+      ]);
 
       expect(provider.exerciseImages.length, 1);
-      expect(provider.exerciseImages.first.path, mockFile.path);
+      expect(provider.exerciseImages.first.imageFile.path, mockFile.path);
     });
 
     /// License fields are optional - provider should handle null/empty values
@@ -48,13 +56,9 @@ void main() {
     test('should handle empty fields gracefully', () {
       final mockFile = File('test2.jpg');
 
-      provider.addExerciseImages(
-        [mockFile],
-        title: 'Only Title',
-        author: null, // null value
-        authorUrl: '', // empty string
-        style: '2', // 3D
-      );
+      provider.addExerciseImages([
+        ExerciseSubmissionImage(imageFile: mockFile, title: 'Only Title', type: ImageType.threeD),
+      ]);
 
       expect(provider.exerciseImages.length, 1);
     });
@@ -65,33 +69,12 @@ void main() {
       final file1 = File('image1.jpg');
       final file2 = File('image2.jpg');
 
-      provider.addExerciseImages([file1], title: 'Image 1', author: 'Author 1', style: '1');
-      provider.addExerciseImages([file2], title: 'Image 2', author: 'Author 2', style: '2');
+      provider.addExerciseImages([ExerciseSubmissionImage(imageFile: file1, author: 'Author 1')]);
+      provider.addExerciseImages([ExerciseSubmissionImage(imageFile: file2, author: 'Author 1')]);
 
       expect(provider.exerciseImages.length, 2);
-      expect(provider.exerciseImages[0].path, file1.path);
-      expect(provider.exerciseImages[1].path, file2.path);
-    });
-
-    /// Test all 5 image style types defined by the API
-    /// 1=PHOTO, 2=3D, 3=LINE, 4=LOW-POLY, 5=OTHER
-    test('should handle all image style types', () {
-      final styles = ['1', '2', '3', '4', '5'];
-
-      for (var i = 0; i < styles.length; i++) {
-        provider.addExerciseImages([File('image_$i.jpg')], style: styles[i]);
-      }
-
-      expect(provider.exerciseImages.length, 5);
-    });
-
-    /// If no style is specified, should default to '1' (PHOTO)
-    test('should use default style when not specified', () {
-      final mockFile = File('default.jpg');
-
-      provider.addExerciseImages([mockFile]);
-
-      expect(provider.exerciseImages.length, 1);
+      expect(provider.exerciseImages[0].imageFile.path, file1.path);
+      expect(provider.exerciseImages[1].imageFile.path, file2.path);
     });
 
     /// Edge case: calling addExerciseImages with empty list should not crash
@@ -101,26 +84,15 @@ void main() {
       expect(provider.exerciseImages.length, 0);
     });
 
-    /// Allows adding the same file multiple times with different metadata
-    /// (e.g., different crops or edits of the same original image)
-    test('should handle adding same file multiple times', () {
-      final mockFile = File('same.jpg');
-
-      provider.addExerciseImages([mockFile], title: 'First');
-      provider.addExerciseImages([mockFile], title: 'Second');
-
-      expect(provider.exerciseImages.length, 2);
-    });
-
     /// Removing an image should also remove its associated metadata
     /// to prevent memory leaks
     test('should remove image and its metadata', () {
       final mockFile = File('to_remove.jpg');
-      provider.addExerciseImages([mockFile], title: 'Will be removed', style: '1');
+      provider.addExerciseImages([ExerciseSubmissionImage(imageFile: mockFile)]);
 
       expect(provider.exerciseImages.length, 1);
 
-      provider.removeExercise(mockFile.path);
+      provider.removeImage(mockFile.path);
 
       expect(provider.exerciseImages.length, 0);
     });
@@ -128,13 +100,15 @@ void main() {
     /// Attempting to remove a non-existent image should throw StateError
     /// (from firstWhere with no orElse)
     test('should handle removing non-existent image gracefully', () {
-      expect(() => provider.removeExercise('nonexistent.jpg'), throwsStateError);
+      expect(() => provider.removeImage('nonexistent.jpg'), throwsStateError);
     });
 
     /// clear() should reset all state including images and metadata
     test('should clear all images and metadata', () {
-      provider.addExerciseImages([File('image1.jpg')], title: 'Image 1');
-      provider.addExerciseImages([File('image2.jpg')], title: 'Image 2');
+      provider.addExerciseImages([
+        ExerciseSubmissionImage(imageFile: File('image1.jpg'), title: 'Image 1'),
+        ExerciseSubmissionImage(imageFile: File('image2.jpg'), title: 'Image 2'),
+      ]);
 
       expect(provider.exerciseImages.length, 2);
 
@@ -152,49 +126,23 @@ void main() {
       expect(provider.exerciseImages.length, 0);
     });
 
-    /// Images should be stored in the order they were added
-    /// Important for display consistency
-    test('should preserve image order', () {
-      final file1 = File('first.jpg');
-      final file2 = File('second.jpg');
-      final file3 = File('third.jpg');
-
-      provider.addExerciseImages([file1]);
-      provider.addExerciseImages([file2]);
-      provider.addExerciseImages([file3]);
-
-      expect(provider.exerciseImages[0].path, 'first.jpg');
-      expect(provider.exerciseImages[1].path, 'second.jpg');
-      expect(provider.exerciseImages[2].path, 'third.jpg');
-    });
-
-    /// Multiple images can be added in a single call with shared metadata
-    /// Useful for bulk uploads from the same source
-    test('should handle batch adding multiple images at once', () {
-      final files = [File('batch1.jpg'), File('batch2.jpg'), File('batch3.jpg')];
-
-      provider.addExerciseImages(files, title: 'Batch Upload', style: '3');
-
-      expect(provider.exerciseImages.length, 3);
-    });
-
     /// Removing one image from a set should not affect others
     test('should allow removing specific image from multiple images', () {
       final file1 = File('keep1.jpg');
       final file2 = File('remove.jpg');
       final file3 = File('keep2.jpg');
 
-      provider.addExerciseImages([file1]);
-      provider.addExerciseImages([file2]);
-      provider.addExerciseImages([file3]);
+      provider.addExerciseImages([ExerciseSubmissionImage(imageFile: file1)]);
+      provider.addExerciseImages([ExerciseSubmissionImage(imageFile: file2)]);
+      provider.addExerciseImages([ExerciseSubmissionImage(imageFile: file3)]);
 
       expect(provider.exerciseImages.length, 3);
 
-      provider.removeExercise(file2.path);
+      provider.removeImage(file2.path);
 
       expect(provider.exerciseImages.length, 2);
-      expect(provider.exerciseImages[0].path, file1.path);
-      expect(provider.exerciseImages[1].path, file3.path);
+      expect(provider.exerciseImages[0].imageFile.path, file1.path);
+      expect(provider.exerciseImages[1].imageFile.path, file3.path);
     });
 
     /// Test with extremely long strings (1000 chars) to ensure no
@@ -203,12 +151,14 @@ void main() {
       final mockFile = File('long.jpg');
       final longString = 'a' * 1000;
 
-      provider.addExerciseImages(
-        [mockFile],
-        title: longString,
-        author: longString,
-        authorUrl: 'https://example.com/$longString',
-      );
+      provider.addExerciseImages([
+        ExerciseSubmissionImage(
+          imageFile: mockFile,
+          title: longString,
+          author: longString,
+          authorUrl: 'https://example.com/$longString',
+        ),
+      ]);
 
       expect(provider.exerciseImages.length, 1);
     });
@@ -218,12 +168,14 @@ void main() {
     test('should handle special characters in metadata', () {
       final mockFile = File('special.jpg');
 
-      provider.addExerciseImages(
-        [mockFile],
-        title: 'Title with émojis 🎉 and spëcial çhars',
-        author: 'Autör with ümlauts',
-        authorUrl: 'https://example.com/path?query=value&another=value',
-      );
+      provider.addExerciseImages([
+        ExerciseSubmissionImage(
+          imageFile: mockFile,
+          title: 'Title with émojis 🎉 and spëcial çhars',
+          author: 'Autör with ümlauts',
+          authorUrl: 'https://example.com/path?query=value&another=value',
+        ),
+      ]);
 
       expect(provider.exerciseImages.length, 1);
     });
@@ -235,7 +187,7 @@ void main() {
     test('should reset all state after clear', () {
       provider.exerciseNameEn = 'Test Exercise';
       provider.descriptionEn = 'Description';
-      provider.addExerciseImages([File('test.jpg')]);
+      provider.addExerciseImages([ExerciseSubmissionImage(imageFile: File('test.jpg'))]);
 
       provider.clear();
 
diff --git a/test/exercises/contribute_exercise_image_test.mocks.dart b/test/exercises/contribute_exercise_image_test.mocks.dart
new file mode 100644
index 00000000..cf7d9693
--- /dev/null
+++ b/test/exercises/contribute_exercise_image_test.mocks.dart
@@ -0,0 +1,383 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/exercises/contribute_exercise_image_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i14;
+import 'dart:ui' as _i15;
+
+import 'package:http/http.dart' as _i5;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i11;
+import 'package:wger/models/exercises/category.dart' as _i13;
+import 'package:wger/models/exercises/equipment.dart' as _i8;
+import 'package:wger/models/exercises/exercise_submission.dart' as _i10;
+import 'package:wger/models/exercises/exercise_submission_images.dart' as _i7;
+import 'package:wger/models/exercises/language.dart' as _i12;
+import 'package:wger/models/exercises/muscle.dart' as _i9;
+import 'package:wger/models/exercises/variation.dart' as _i3;
+import 'package:wger/providers/add_exercise.dart' as _i6;
+import 'package:wger/providers/auth.dart' as _i4;
+import 'package:wger/providers/base_provider.dart' as _i2;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeVariation_1 extends _i1.SmartFake implements _i3.Variation {
+  _FakeVariation_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeAuthProvider_2 extends _i1.SmartFake implements _i4.AuthProvider {
+  _FakeAuthProvider_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeClient_3 extends _i1.SmartFake implements _i5.Client {
+  _FakeClient_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeUri_4 extends _i1.SmartFake implements Uri {
+  _FakeUri_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeResponse_5 extends _i1.SmartFake implements _i5.Response {
+  _FakeResponse_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [AddExerciseProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockAddExerciseProvider extends _i1.Mock implements _i6.AddExerciseProvider {
+  MockAddExerciseProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
+
+  @override
+  List<_i7.ExerciseSubmissionImage> get exerciseImages =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseImages),
+            returnValue: <_i7.ExerciseSubmissionImage>[],
+          )
+          as List<_i7.ExerciseSubmissionImage>);
+
+  @override
+  List<String> get alternateNamesEn =>
+      (super.noSuchMethod(Invocation.getter(#alternateNamesEn), returnValue: <String>[])
+          as List<String>);
+
+  @override
+  List<String> get alternateNamesTrans =>
+      (super.noSuchMethod(Invocation.getter(#alternateNamesTrans), returnValue: <String>[])
+          as List<String>);
+
+  @override
+  List<_i8.Equipment> get equipment =>
+      (super.noSuchMethod(Invocation.getter(#equipment), returnValue: <_i8.Equipment>[])
+          as List<_i8.Equipment>);
+
+  @override
+  bool get newVariation =>
+      (super.noSuchMethod(Invocation.getter(#newVariation), returnValue: false) as bool);
+
+  @override
+  _i3.Variation get variation =>
+      (super.noSuchMethod(
+            Invocation.getter(#variation),
+            returnValue: _FakeVariation_1(this, Invocation.getter(#variation)),
+          )
+          as _i3.Variation);
+
+  @override
+  List<_i9.Muscle> get primaryMuscles =>
+      (super.noSuchMethod(Invocation.getter(#primaryMuscles), returnValue: <_i9.Muscle>[])
+          as List<_i9.Muscle>);
+
+  @override
+  List<_i9.Muscle> get secondaryMuscles =>
+      (super.noSuchMethod(Invocation.getter(#secondaryMuscles), returnValue: <_i9.Muscle>[])
+          as List<_i9.Muscle>);
+
+  @override
+  _i10.ExerciseSubmissionApi get exerciseApiObject =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseApiObject),
+            returnValue: _i11.dummyValue<_i10.ExerciseSubmissionApi>(
+              this,
+              Invocation.getter(#exerciseApiObject),
+            ),
+          )
+          as _i10.ExerciseSubmissionApi);
+
+  @override
+  set exerciseNameEn(String? value) => super.noSuchMethod(
+    Invocation.setter(#exerciseNameEn, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set exerciseNameTrans(String? value) => super.noSuchMethod(
+    Invocation.setter(#exerciseNameTrans, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set descriptionEn(String? value) =>
+      super.noSuchMethod(Invocation.setter(#descriptionEn, value), returnValueForMissingStub: null);
+
+  @override
+  set descriptionTrans(String? value) => super.noSuchMethod(
+    Invocation.setter(#descriptionTrans, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set languageEn(_i12.Language? value) =>
+      super.noSuchMethod(Invocation.setter(#languageEn, value), returnValueForMissingStub: null);
+
+  @override
+  set languageTranslation(_i12.Language? value) => super.noSuchMethod(
+    Invocation.setter(#languageTranslation, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set alternateNamesEn(List<String>? value) => super.noSuchMethod(
+    Invocation.setter(#alternateNamesEn, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set alternateNamesTrans(List<String>? value) => super.noSuchMethod(
+    Invocation.setter(#alternateNamesTrans, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set category(_i13.ExerciseCategory? value) =>
+      super.noSuchMethod(Invocation.setter(#category, value), returnValueForMissingStub: null);
+
+  @override
+  set equipment(List<_i8.Equipment>? equipment) =>
+      super.noSuchMethod(Invocation.setter(#equipment, equipment), returnValueForMissingStub: null);
+
+  @override
+  set variationConnectToExercise(int? value) => super.noSuchMethod(
+    Invocation.setter(#variationConnectToExercise, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set variationId(int? variation) => super.noSuchMethod(
+    Invocation.setter(#variationId, variation),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set primaryMuscles(List<_i9.Muscle>? muscles) => super.noSuchMethod(
+    Invocation.setter(#primaryMuscles, muscles),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set secondaryMuscles(List<_i9.Muscle>? muscles) => super.noSuchMethod(
+    Invocation.setter(#secondaryMuscles, muscles),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+
+  @override
+  void addExerciseImages(List<_i7.ExerciseSubmissionImage>? images) => super.noSuchMethod(
+    Invocation.method(#addExerciseImages, [images]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeImage(String? path) =>
+      super.noSuchMethod(Invocation.method(#removeImage, [path]), returnValueForMissingStub: null);
+
+  @override
+  _i14.Future<int> postExerciseToServer() =>
+      (super.noSuchMethod(
+            Invocation.method(#postExerciseToServer, []),
+            returnValue: _i14.Future<int>.value(0),
+          )
+          as _i14.Future<int>);
+
+  @override
+  _i14.Future<int> addExerciseSubmission() =>
+      (super.noSuchMethod(
+            Invocation.method(#addExerciseSubmission, []),
+            returnValue: _i14.Future<int>.value(0),
+          )
+          as _i14.Future<int>);
+
+  @override
+  _i14.Future<void> addImages(int? exerciseId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addImages, [exerciseId]),
+            returnValue: _i14.Future<void>.value(),
+            returnValueForMissingStub: _i14.Future<void>.value(),
+          )
+          as _i14.Future<void>);
+
+  @override
+  _i14.Future<bool> validateLanguage(String? input, String? languageCode) =>
+      (super.noSuchMethod(
+            Invocation.method(#validateLanguage, [input, languageCode]),
+            returnValue: _i14.Future<bool>.value(false),
+          )
+          as _i14.Future<bool>);
+
+  @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);
+}
+
+/// A class which mocks [WgerBaseProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider {
+  MockWgerBaseProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i4.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_2(this, Invocation.getter(#auth)),
+          )
+          as _i4.AuthProvider);
+
+  @override
+  _i5.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_3(this, Invocation.getter(#client)),
+          )
+          as _i5.Client);
+
+  @override
+  set auth(_i4.AuthProvider? value) =>
+      super.noSuchMethod(Invocation.setter(#auth, value), returnValueForMissingStub: null);
+
+  @override
+  set client(_i5.Client? value) =>
+      super.noSuchMethod(Invocation.setter(#client, value), returnValueForMissingStub: null);
+
+  @override
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(#getDefaultHeaders, [], {#includeAuth: includeAuth}),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
+
+  @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_4(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {#id: id, #objectMethod: objectMethod, #query: query},
+              ),
+            ),
+          )
+          as Uri);
+
+  @override
+  _i14.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetch, [uri]),
+            returnValue: _i14.Future<dynamic>.value(),
+          )
+          as _i14.Future<dynamic>);
+
+  @override
+  _i14.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchPaginated, [uri]),
+            returnValue: _i14.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i14.Future<List<dynamic>>);
+
+  @override
+  _i14.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#post, [data, uri]),
+            returnValue: _i14.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i14.Future<Map<String, dynamic>>);
+
+  @override
+  _i14.Future<Map<String, dynamic>> patch(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#patch, [data, uri]),
+            returnValue: _i14.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i14.Future<Map<String, dynamic>>);
+
+  @override
+  _i14.Future<_i5.Response> deleteRequest(String? url, int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRequest, [url, id]),
+            returnValue: _i14.Future<_i5.Response>.value(
+              _FakeResponse_5(this, Invocation.method(#deleteRequest, [url, id])),
+            ),
+          )
+          as _i14.Future<_i5.Response>);
+}
diff --git a/test/exercises/contribute_exercise_test.mocks.dart b/test/exercises/contribute_exercise_test.mocks.dart
index cdf1c482..97cbe8e3 100644
--- a/test/exercises/contribute_exercise_test.mocks.dart
+++ b/test/exercises/contribute_exercise_test.mocks.dart
@@ -4,7 +4,6 @@
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i15;
-import 'dart:io' as _i12;
 import 'dart:ui' as _i16;
 
 import 'package:flutter/material.dart' as _i18;
@@ -16,6 +15,7 @@ import 'package:wger/models/exercises/category.dart' as _i7;
 import 'package:wger/models/exercises/equipment.dart' as _i8;
 import 'package:wger/models/exercises/exercise.dart' as _i6;
 import 'package:wger/models/exercises/exercise_submission.dart' as _i13;
+import 'package:wger/models/exercises/exercise_submission_images.dart' as _i12;
 import 'package:wger/models/exercises/language.dart' as _i10;
 import 'package:wger/models/exercises/muscle.dart' as _i9;
 import 'package:wger/models/exercises/variation.dart' as _i3;
@@ -97,9 +97,12 @@ class MockAddExerciseProvider extends _i1.Mock implements _i11.AddExerciseProvid
           as _i2.WgerBaseProvider);
 
   @override
-  List<_i12.File> get exerciseImages =>
-      (super.noSuchMethod(Invocation.getter(#exerciseImages), returnValue: <_i12.File>[])
-          as List<_i12.File>);
+  List<_i12.ExerciseSubmissionImage> get exerciseImages =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseImages),
+            returnValue: <_i12.ExerciseSubmissionImage>[],
+          )
+          as List<_i12.ExerciseSubmissionImage>);
 
   @override
   List<String> get alternateNamesEn =>
@@ -234,40 +237,19 @@ class MockAddExerciseProvider extends _i1.Mock implements _i11.AddExerciseProvid
       super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
 
   @override
-  void addExerciseImages(
-    List<_i12.File>? images, {
-    String? title,
-    String? author,
-    String? authorUrl,
-    String? sourceUrl,
-    String? derivativeSourceUrl,
-    String? style = '1',
-  }) => super.noSuchMethod(
-    Invocation.method(
-      #addExerciseImages,
-      [images],
-      {
-        #title: title,
-        #author: author,
-        #authorUrl: authorUrl,
-        #sourceUrl: sourceUrl,
-        #derivativeSourceUrl: derivativeSourceUrl,
-        #style: style,
-      },
-    ),
+  void addExerciseImages(List<_i12.ExerciseSubmissionImage>? images) => super.noSuchMethod(
+    Invocation.method(#addExerciseImages, [images]),
     returnValueForMissingStub: null,
   );
 
   @override
-  void removeExercise(String? path) => super.noSuchMethod(
-    Invocation.method(#removeExercise, [path]),
-    returnValueForMissingStub: null,
-  );
+  void removeImage(String? path) =>
+      super.noSuchMethod(Invocation.method(#removeImage, [path]), returnValueForMissingStub: null);
 
   @override
-  _i15.Future<int> addExercise() =>
+  _i15.Future<int> postExerciseToServer() =>
       (super.noSuchMethod(
-            Invocation.method(#addExercise, []),
+            Invocation.method(#postExerciseToServer, []),
             returnValue: _i15.Future<int>.value(0),
           )
           as _i15.Future<int>);

From 949ad02ab6e642431236607d17020044ad53565e Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Mon, 6 Oct 2025 16:02:17 +0200
Subject: [PATCH 17/29] Add generated files

It seems a recent update changes the way dart code is formatted
---
 .../exercises/exercise_database.g.dart        | 956 ++++++++++--------
 .../ingredients/ingredients_database.g.dart   | 227 +++--
 lib/models/body_weight/weight_entry.g.dart    |  13 +-
 lib/models/exercises/alias.g.dart             |  13 +-
 lib/models/exercises/category.g.dart          |  18 +-
 lib/models/exercises/comment.g.dart           |  13 +-
 lib/models/exercises/equipment.g.dart         |  11 +-
 .../exercises/exercise_api.freezed.dart       |   9 +
 lib/models/exercises/language.g.dart          |  13 +-
 lib/models/exercises/muscle.g.dart            |  15 +-
 lib/models/exercises/translation.g.dart       |  30 +-
 lib/models/exercises/variation.g.dart         |  13 +-
 lib/models/exercises/video.g.dart             |  28 +-
 lib/models/gallery/image.g.dart               |  15 +-
 .../measurements/measurement_category.g.dart  |  18 +-
 .../measurements/measurement_entry.g.dart     |   3 +-
 lib/models/nutrition/ingredient.g.dart        |  40 +-
 lib/models/nutrition/ingredient_image.g.dart  |  26 +-
 .../ingredient_image_thumbnails.g.dart        |   2 +-
 .../nutrition/ingredient_weight_unit.g.dart   |   5 +-
 lib/models/nutrition/log.g.dart               |  27 +-
 lib/models/nutrition/meal.g.dart              |  18 +-
 lib/models/nutrition/meal_item.g.dart         |  17 +-
 lib/models/nutrition/nutritional_plan.g.dart  |  31 +-
 lib/models/nutrition/weight_unit.g.dart       |  11 +-
 lib/models/user/profile.g.dart                |  20 +-
 lib/models/workouts/base_config.g.dart        |   5 +-
 lib/models/workouts/day.g.dart                |  23 +-
 lib/models/workouts/day_data.g.dart           |  20 +-
 lib/models/workouts/log.g.dart                |  34 +-
 lib/models/workouts/repetition_unit.g.dart    |  11 +-
 lib/models/workouts/routine.g.dart            |  20 +-
 lib/models/workouts/session.g.dart            |  21 +-
 lib/models/workouts/session_api.g.dart        |  12 +-
 lib/models/workouts/set_config_data.g.dart    |  44 +-
 lib/models/workouts/slot.g.dart               |  35 +-
 lib/models/workouts/slot_data.g.dart          |  18 +-
 lib/models/workouts/slot_entry.g.dart         |  54 +-
 lib/models/workouts/weight_unit.g.dart        |  11 +-
 39 files changed, 1038 insertions(+), 862 deletions(-)

diff --git a/lib/database/exercises/exercise_database.g.dart b/lib/database/exercises/exercise_database.g.dart
index 05f81233..6da378e2 100644
--- a/lib/database/exercises/exercise_database.g.dart
+++ b/lib/database/exercises/exercise_database.g.dart
@@ -7,35 +7,61 @@ class $ExercisesTable extends Exercises with TableInfo<$ExercisesTable, Exercise
   @override
   final GeneratedDatabase attachedDatabase;
   final String? _alias;
+
   $ExercisesTable(this.attachedDatabase, [this._alias]);
+
   static const VerificationMeta _idMeta = const VerificationMeta('id');
   @override
-  late final GeneratedColumn<int> id = GeneratedColumn<int>('id', aliasedName, false,
-      type: DriftSqlType.int, requiredDuringInsert: true);
+  late final GeneratedColumn<int> id = GeneratedColumn<int>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
   static const VerificationMeta _dataMeta = const VerificationMeta('data');
   @override
-  late final GeneratedColumn<String> data = GeneratedColumn<String>('data', aliasedName, false,
-      type: DriftSqlType.string, requiredDuringInsert: true);
+  late final GeneratedColumn<String> data = GeneratedColumn<String>(
+    'data',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
   static const VerificationMeta _lastUpdateMeta = const VerificationMeta('lastUpdate');
   @override
   late final GeneratedColumn<DateTime> lastUpdate = GeneratedColumn<DateTime>(
-      'last_update', aliasedName, false,
-      type: DriftSqlType.dateTime, requiredDuringInsert: true);
+    'last_update',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: true,
+  );
   static const VerificationMeta _lastFetchedMeta = const VerificationMeta('lastFetched');
   @override
   late final GeneratedColumn<DateTime> lastFetched = GeneratedColumn<DateTime>(
-      'last_fetched', aliasedName, false,
-      type: DriftSqlType.dateTime, requiredDuringInsert: true);
+    'last_fetched',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: true,
+  );
+
   @override
   List<GeneratedColumn> get $columns => [id, data, lastUpdate, lastFetched];
+
   @override
   String get aliasedName => _alias ?? actualTableName;
+
   @override
   String get actualTableName => $name;
   static const String $name = 'exercises';
+
   @override
-  VerificationContext validateIntegrity(Insertable<ExerciseTable> instance,
-      {bool isInserting = false}) {
+  VerificationContext validateIntegrity(
+    Insertable<ExerciseTable> instance, {
+    bool isInserting = false,
+  }) {
     final context = VerificationContext();
     final data = instance.toColumns(true);
     if (data.containsKey('id')) {
@@ -50,13 +76,17 @@ class $ExercisesTable extends Exercises with TableInfo<$ExercisesTable, Exercise
     }
     if (data.containsKey('last_update')) {
       context.handle(
-          _lastUpdateMeta, lastUpdate.isAcceptableOrUnknown(data['last_update']!, _lastUpdateMeta));
+        _lastUpdateMeta,
+        lastUpdate.isAcceptableOrUnknown(data['last_update']!, _lastUpdateMeta),
+      );
     } else if (isInserting) {
       context.missing(_lastUpdateMeta);
     }
     if (data.containsKey('last_fetched')) {
-      context.handle(_lastFetchedMeta,
-          lastFetched.isAcceptableOrUnknown(data['last_fetched']!, _lastFetchedMeta));
+      context.handle(
+        _lastFetchedMeta,
+        lastFetched.isAcceptableOrUnknown(data['last_fetched']!, _lastFetchedMeta),
+      );
     } else if (isInserting) {
       context.missing(_lastFetchedMeta);
     }
@@ -65,16 +95,21 @@ class $ExercisesTable extends Exercises with TableInfo<$ExercisesTable, Exercise
 
   @override
   Set<GeneratedColumn> get $primaryKey => const {};
+
   @override
   ExerciseTable map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
     return ExerciseTable(
       id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!,
       data: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!,
-      lastUpdate: attachedDatabase.typeMapping
-          .read(DriftSqlType.dateTime, data['${effectivePrefix}last_update'])!,
-      lastFetched: attachedDatabase.typeMapping
-          .read(DriftSqlType.dateTime, data['${effectivePrefix}last_fetched'])!,
+      lastUpdate: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}last_update'],
+      )!,
+      lastFetched: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}last_fetched'],
+      )!,
     );
   }
 
@@ -93,8 +128,14 @@ class ExerciseTable extends DataClass implements Insertable<ExerciseTable> {
   /// when the exercise itself was last updated in `lastUpdate`, we can save
   /// ourselves a lot of requests if we don't check too often
   final DateTime lastFetched;
-  const ExerciseTable(
-      {required this.id, required this.data, required this.lastUpdate, required this.lastFetched});
+
+  const ExerciseTable({
+    required this.id,
+    required this.data,
+    required this.lastUpdate,
+    required this.lastFetched,
+  });
+
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -123,6 +164,7 @@ class ExerciseTable extends DataClass implements Insertable<ExerciseTable> {
       lastFetched: serializer.fromJson<DateTime>(json['lastFetched']),
     );
   }
+
   @override
   Map<String, dynamic> toJson({ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
@@ -141,6 +183,7 @@ class ExerciseTable extends DataClass implements Insertable<ExerciseTable> {
         lastUpdate: lastUpdate ?? this.lastUpdate,
         lastFetched: lastFetched ?? this.lastFetched,
       );
+
   ExerciseTable copyWithCompanion(ExercisesCompanion data) {
     return ExerciseTable(
       id: data.id.present ? data.id.value : this.id,
@@ -163,6 +206,7 @@ class ExerciseTable extends DataClass implements Insertable<ExerciseTable> {
 
   @override
   int get hashCode => Object.hash(id, data, lastUpdate, lastFetched);
+
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -179,6 +223,7 @@ class ExercisesCompanion extends UpdateCompanion<ExerciseTable> {
   final Value<DateTime> lastUpdate;
   final Value<DateTime> lastFetched;
   final Value<int> rowid;
+
   const ExercisesCompanion({
     this.id = const Value.absent(),
     this.data = const Value.absent(),
@@ -186,16 +231,18 @@ class ExercisesCompanion extends UpdateCompanion<ExerciseTable> {
     this.lastFetched = const Value.absent(),
     this.rowid = const Value.absent(),
   });
+
   ExercisesCompanion.insert({
     required int id,
     required String data,
     required DateTime lastUpdate,
     required DateTime lastFetched,
     this.rowid = const Value.absent(),
-  })  : id = Value(id),
-        data = Value(data),
-        lastUpdate = Value(lastUpdate),
-        lastFetched = Value(lastFetched);
+  }) : id = Value(id),
+       data = Value(data),
+       lastUpdate = Value(lastUpdate),
+       lastFetched = Value(lastFetched);
+
   static Insertable<ExerciseTable> custom({
     Expression<int>? id,
     Expression<String>? data,
@@ -212,12 +259,13 @@ class ExercisesCompanion extends UpdateCompanion<ExerciseTable> {
     });
   }
 
-  ExercisesCompanion copyWith(
-      {Value<int>? id,
-      Value<String>? data,
-      Value<DateTime>? lastUpdate,
-      Value<DateTime>? lastFetched,
-      Value<int>? rowid}) {
+  ExercisesCompanion copyWith({
+    Value<int>? id,
+    Value<String>? data,
+    Value<DateTime>? lastUpdate,
+    Value<DateTime>? lastFetched,
+    Value<int>? rowid,
+  }) {
     return ExercisesCompanion(
       id: id ?? this.id,
       data: data ?? this.data,
@@ -265,26 +313,42 @@ class $MusclesTable extends Muscles with TableInfo<$MusclesTable, MuscleTable> {
   @override
   final GeneratedDatabase attachedDatabase;
   final String? _alias;
+
   $MusclesTable(this.attachedDatabase, [this._alias]);
+
   static const VerificationMeta _idMeta = const VerificationMeta('id');
   @override
-  late final GeneratedColumn<int> id = GeneratedColumn<int>('id', aliasedName, false,
-      type: DriftSqlType.int, requiredDuringInsert: true);
+  late final GeneratedColumn<int> id = GeneratedColumn<int>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
   @override
   late final GeneratedColumnWithTypeConverter<Muscle, String> data = GeneratedColumn<String>(
-          'data', aliasedName, false,
-          type: DriftSqlType.string, requiredDuringInsert: true)
-      .withConverter<Muscle>($MusclesTable.$converterdata);
+    'data',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  ).withConverter<Muscle>($MusclesTable.$converterdata);
+
   @override
   List<GeneratedColumn> get $columns => [id, data];
+
   @override
   String get aliasedName => _alias ?? actualTableName;
+
   @override
   String get actualTableName => $name;
   static const String $name = 'muscles';
+
   @override
-  VerificationContext validateIntegrity(Insertable<MuscleTable> instance,
-      {bool isInserting = false}) {
+  VerificationContext validateIntegrity(
+    Insertable<MuscleTable> instance, {
+    bool isInserting = false,
+  }) {
     final context = VerificationContext();
     final data = instance.toColumns(true);
     if (data.containsKey('id')) {
@@ -297,13 +361,15 @@ class $MusclesTable extends Muscles with TableInfo<$MusclesTable, MuscleTable> {
 
   @override
   Set<GeneratedColumn> get $primaryKey => const {};
+
   @override
   MuscleTable map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
     return MuscleTable(
       id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!,
       data: $MusclesTable.$converterdata.fromSql(
-          attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!),
+        attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!,
+      ),
     );
   }
 
@@ -318,7 +384,9 @@ class $MusclesTable extends Muscles with TableInfo<$MusclesTable, MuscleTable> {
 class MuscleTable extends DataClass implements Insertable<MuscleTable> {
   final int id;
   final Muscle data;
+
   const MuscleTable({required this.id, required this.data});
+
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -330,10 +398,7 @@ class MuscleTable extends DataClass implements Insertable<MuscleTable> {
   }
 
   MusclesCompanion toCompanion(bool nullToAbsent) {
-    return MusclesCompanion(
-      id: Value(id),
-      data: Value(data),
-    );
+    return MusclesCompanion(id: Value(id), data: Value(data));
   }
 
   factory MuscleTable.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
@@ -343,6 +408,7 @@ class MuscleTable extends DataClass implements Insertable<MuscleTable> {
       data: serializer.fromJson<Muscle>(json['data']),
     );
   }
+
   @override
   Map<String, dynamic> toJson({ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
@@ -352,10 +418,9 @@ class MuscleTable extends DataClass implements Insertable<MuscleTable> {
     };
   }
 
-  MuscleTable copyWith({int? id, Muscle? data}) => MuscleTable(
-        id: id ?? this.id,
-        data: data ?? this.data,
-      );
+  MuscleTable copyWith({int? id, Muscle? data}) =>
+      MuscleTable(id: id ?? this.id, data: data ?? this.data);
+
   MuscleTable copyWithCompanion(MusclesCompanion data) {
     return MuscleTable(
       id: data.id.present ? data.id.value : this.id,
@@ -374,6 +439,7 @@ class MuscleTable extends DataClass implements Insertable<MuscleTable> {
 
   @override
   int get hashCode => Object.hash(id, data);
+
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -384,17 +450,20 @@ class MusclesCompanion extends UpdateCompanion<MuscleTable> {
   final Value<int> id;
   final Value<Muscle> data;
   final Value<int> rowid;
+
   const MusclesCompanion({
     this.id = const Value.absent(),
     this.data = const Value.absent(),
     this.rowid = const Value.absent(),
   });
+
   MusclesCompanion.insert({
     required int id,
     required Muscle data,
     this.rowid = const Value.absent(),
-  })  : id = Value(id),
-        data = Value(data);
+  }) : id = Value(id),
+       data = Value(data);
+
   static Insertable<MuscleTable> custom({
     Expression<int>? id,
     Expression<String>? data,
@@ -408,11 +477,7 @@ class MusclesCompanion extends UpdateCompanion<MuscleTable> {
   }
 
   MusclesCompanion copyWith({Value<int>? id, Value<Muscle>? data, Value<int>? rowid}) {
-    return MusclesCompanion(
-      id: id ?? this.id,
-      data: data ?? this.data,
-      rowid: rowid ?? this.rowid,
-    );
+    return MusclesCompanion(id: id ?? this.id, data: data ?? this.data, rowid: rowid ?? this.rowid);
   }
 
   @override
@@ -445,26 +510,42 @@ class $EquipmentsTable extends Equipments with TableInfo<$EquipmentsTable, Equip
   @override
   final GeneratedDatabase attachedDatabase;
   final String? _alias;
+
   $EquipmentsTable(this.attachedDatabase, [this._alias]);
+
   static const VerificationMeta _idMeta = const VerificationMeta('id');
   @override
-  late final GeneratedColumn<int> id = GeneratedColumn<int>('id', aliasedName, false,
-      type: DriftSqlType.int, requiredDuringInsert: true);
+  late final GeneratedColumn<int> id = GeneratedColumn<int>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
   @override
   late final GeneratedColumnWithTypeConverter<Equipment, String> data = GeneratedColumn<String>(
-          'data', aliasedName, false,
-          type: DriftSqlType.string, requiredDuringInsert: true)
-      .withConverter<Equipment>($EquipmentsTable.$converterdata);
+    'data',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  ).withConverter<Equipment>($EquipmentsTable.$converterdata);
+
   @override
   List<GeneratedColumn> get $columns => [id, data];
+
   @override
   String get aliasedName => _alias ?? actualTableName;
+
   @override
   String get actualTableName => $name;
   static const String $name = 'equipments';
+
   @override
-  VerificationContext validateIntegrity(Insertable<EquipmentTable> instance,
-      {bool isInserting = false}) {
+  VerificationContext validateIntegrity(
+    Insertable<EquipmentTable> instance, {
+    bool isInserting = false,
+  }) {
     final context = VerificationContext();
     final data = instance.toColumns(true);
     if (data.containsKey('id')) {
@@ -477,13 +558,15 @@ class $EquipmentsTable extends Equipments with TableInfo<$EquipmentsTable, Equip
 
   @override
   Set<GeneratedColumn> get $primaryKey => const {};
+
   @override
   EquipmentTable map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
     return EquipmentTable(
       id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!,
       data: $EquipmentsTable.$converterdata.fromSql(
-          attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!),
+        attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!,
+      ),
     );
   }
 
@@ -498,7 +581,9 @@ class $EquipmentsTable extends Equipments with TableInfo<$EquipmentsTable, Equip
 class EquipmentTable extends DataClass implements Insertable<EquipmentTable> {
   final int id;
   final Equipment data;
+
   const EquipmentTable({required this.id, required this.data});
+
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -510,10 +595,7 @@ class EquipmentTable extends DataClass implements Insertable<EquipmentTable> {
   }
 
   EquipmentsCompanion toCompanion(bool nullToAbsent) {
-    return EquipmentsCompanion(
-      id: Value(id),
-      data: Value(data),
-    );
+    return EquipmentsCompanion(id: Value(id), data: Value(data));
   }
 
   factory EquipmentTable.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
@@ -523,6 +605,7 @@ class EquipmentTable extends DataClass implements Insertable<EquipmentTable> {
       data: serializer.fromJson<Equipment>(json['data']),
     );
   }
+
   @override
   Map<String, dynamic> toJson({ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
@@ -532,10 +615,9 @@ class EquipmentTable extends DataClass implements Insertable<EquipmentTable> {
     };
   }
 
-  EquipmentTable copyWith({int? id, Equipment? data}) => EquipmentTable(
-        id: id ?? this.id,
-        data: data ?? this.data,
-      );
+  EquipmentTable copyWith({int? id, Equipment? data}) =>
+      EquipmentTable(id: id ?? this.id, data: data ?? this.data);
+
   EquipmentTable copyWithCompanion(EquipmentsCompanion data) {
     return EquipmentTable(
       id: data.id.present ? data.id.value : this.id,
@@ -554,6 +636,7 @@ class EquipmentTable extends DataClass implements Insertable<EquipmentTable> {
 
   @override
   int get hashCode => Object.hash(id, data);
+
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -564,17 +647,20 @@ class EquipmentsCompanion extends UpdateCompanion<EquipmentTable> {
   final Value<int> id;
   final Value<Equipment> data;
   final Value<int> rowid;
+
   const EquipmentsCompanion({
     this.id = const Value.absent(),
     this.data = const Value.absent(),
     this.rowid = const Value.absent(),
   });
+
   EquipmentsCompanion.insert({
     required int id,
     required Equipment data,
     this.rowid = const Value.absent(),
-  })  : id = Value(id),
-        data = Value(data);
+  }) : id = Value(id),
+       data = Value(data);
+
   static Insertable<EquipmentTable> custom({
     Expression<int>? id,
     Expression<String>? data,
@@ -625,26 +711,43 @@ class $CategoriesTable extends Categories with TableInfo<$CategoriesTable, Categ
   @override
   final GeneratedDatabase attachedDatabase;
   final String? _alias;
+
   $CategoriesTable(this.attachedDatabase, [this._alias]);
+
   static const VerificationMeta _idMeta = const VerificationMeta('id');
   @override
-  late final GeneratedColumn<int> id = GeneratedColumn<int>('id', aliasedName, false,
-      type: DriftSqlType.int, requiredDuringInsert: true);
+  late final GeneratedColumn<int> id = GeneratedColumn<int>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
   @override
   late final GeneratedColumnWithTypeConverter<ExerciseCategory, String> data =
-      GeneratedColumn<String>('data', aliasedName, false,
-              type: DriftSqlType.string, requiredDuringInsert: true)
-          .withConverter<ExerciseCategory>($CategoriesTable.$converterdata);
+      GeneratedColumn<String>(
+        'data',
+        aliasedName,
+        false,
+        type: DriftSqlType.string,
+        requiredDuringInsert: true,
+      ).withConverter<ExerciseCategory>($CategoriesTable.$converterdata);
+
   @override
   List<GeneratedColumn> get $columns => [id, data];
+
   @override
   String get aliasedName => _alias ?? actualTableName;
+
   @override
   String get actualTableName => $name;
   static const String $name = 'categories';
+
   @override
-  VerificationContext validateIntegrity(Insertable<CategoryTable> instance,
-      {bool isInserting = false}) {
+  VerificationContext validateIntegrity(
+    Insertable<CategoryTable> instance, {
+    bool isInserting = false,
+  }) {
     final context = VerificationContext();
     final data = instance.toColumns(true);
     if (data.containsKey('id')) {
@@ -657,13 +760,15 @@ class $CategoriesTable extends Categories with TableInfo<$CategoriesTable, Categ
 
   @override
   Set<GeneratedColumn> get $primaryKey => const {};
+
   @override
   CategoryTable map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
     return CategoryTable(
       id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!,
       data: $CategoriesTable.$converterdata.fromSql(
-          attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!),
+        attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!,
+      ),
     );
   }
 
@@ -678,7 +783,9 @@ class $CategoriesTable extends Categories with TableInfo<$CategoriesTable, Categ
 class CategoryTable extends DataClass implements Insertable<CategoryTable> {
   final int id;
   final ExerciseCategory data;
+
   const CategoryTable({required this.id, required this.data});
+
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -690,10 +797,7 @@ class CategoryTable extends DataClass implements Insertable<CategoryTable> {
   }
 
   CategoriesCompanion toCompanion(bool nullToAbsent) {
-    return CategoriesCompanion(
-      id: Value(id),
-      data: Value(data),
-    );
+    return CategoriesCompanion(id: Value(id), data: Value(data));
   }
 
   factory CategoryTable.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
@@ -703,6 +807,7 @@ class CategoryTable extends DataClass implements Insertable<CategoryTable> {
       data: serializer.fromJson<ExerciseCategory>(json['data']),
     );
   }
+
   @override
   Map<String, dynamic> toJson({ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
@@ -712,10 +817,9 @@ class CategoryTable extends DataClass implements Insertable<CategoryTable> {
     };
   }
 
-  CategoryTable copyWith({int? id, ExerciseCategory? data}) => CategoryTable(
-        id: id ?? this.id,
-        data: data ?? this.data,
-      );
+  CategoryTable copyWith({int? id, ExerciseCategory? data}) =>
+      CategoryTable(id: id ?? this.id, data: data ?? this.data);
+
   CategoryTable copyWithCompanion(CategoriesCompanion data) {
     return CategoryTable(
       id: data.id.present ? data.id.value : this.id,
@@ -734,6 +838,7 @@ class CategoryTable extends DataClass implements Insertable<CategoryTable> {
 
   @override
   int get hashCode => Object.hash(id, data);
+
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -744,17 +849,20 @@ class CategoriesCompanion extends UpdateCompanion<CategoryTable> {
   final Value<int> id;
   final Value<ExerciseCategory> data;
   final Value<int> rowid;
+
   const CategoriesCompanion({
     this.id = const Value.absent(),
     this.data = const Value.absent(),
     this.rowid = const Value.absent(),
   });
+
   CategoriesCompanion.insert({
     required int id,
     required ExerciseCategory data,
     this.rowid = const Value.absent(),
-  })  : id = Value(id),
-        data = Value(data);
+  }) : id = Value(id),
+       data = Value(data);
+
   static Insertable<CategoryTable> custom({
     Expression<int>? id,
     Expression<String>? data,
@@ -805,26 +913,42 @@ class $LanguagesTable extends Languages with TableInfo<$LanguagesTable, Language
   @override
   final GeneratedDatabase attachedDatabase;
   final String? _alias;
+
   $LanguagesTable(this.attachedDatabase, [this._alias]);
+
   static const VerificationMeta _idMeta = const VerificationMeta('id');
   @override
-  late final GeneratedColumn<int> id = GeneratedColumn<int>('id', aliasedName, false,
-      type: DriftSqlType.int, requiredDuringInsert: true);
+  late final GeneratedColumn<int> id = GeneratedColumn<int>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
   @override
   late final GeneratedColumnWithTypeConverter<Language, String> data = GeneratedColumn<String>(
-          'data', aliasedName, false,
-          type: DriftSqlType.string, requiredDuringInsert: true)
-      .withConverter<Language>($LanguagesTable.$converterdata);
+    'data',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  ).withConverter<Language>($LanguagesTable.$converterdata);
+
   @override
   List<GeneratedColumn> get $columns => [id, data];
+
   @override
   String get aliasedName => _alias ?? actualTableName;
+
   @override
   String get actualTableName => $name;
   static const String $name = 'languages';
+
   @override
-  VerificationContext validateIntegrity(Insertable<LanguagesTable> instance,
-      {bool isInserting = false}) {
+  VerificationContext validateIntegrity(
+    Insertable<LanguagesTable> instance, {
+    bool isInserting = false,
+  }) {
     final context = VerificationContext();
     final data = instance.toColumns(true);
     if (data.containsKey('id')) {
@@ -837,13 +961,15 @@ class $LanguagesTable extends Languages with TableInfo<$LanguagesTable, Language
 
   @override
   Set<GeneratedColumn> get $primaryKey => const {};
+
   @override
   LanguagesTable map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
     return LanguagesTable(
       id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!,
       data: $LanguagesTable.$converterdata.fromSql(
-          attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!),
+        attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!,
+      ),
     );
   }
 
@@ -858,7 +984,9 @@ class $LanguagesTable extends Languages with TableInfo<$LanguagesTable, Language
 class LanguagesTable extends DataClass implements Insertable<LanguagesTable> {
   final int id;
   final Language data;
+
   const LanguagesTable({required this.id, required this.data});
+
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -870,10 +998,7 @@ class LanguagesTable extends DataClass implements Insertable<LanguagesTable> {
   }
 
   LanguagesCompanion toCompanion(bool nullToAbsent) {
-    return LanguagesCompanion(
-      id: Value(id),
-      data: Value(data),
-    );
+    return LanguagesCompanion(id: Value(id), data: Value(data));
   }
 
   factory LanguagesTable.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
@@ -883,6 +1008,7 @@ class LanguagesTable extends DataClass implements Insertable<LanguagesTable> {
       data: serializer.fromJson<Language>(json['data']),
     );
   }
+
   @override
   Map<String, dynamic> toJson({ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
@@ -892,10 +1018,9 @@ class LanguagesTable extends DataClass implements Insertable<LanguagesTable> {
     };
   }
 
-  LanguagesTable copyWith({int? id, Language? data}) => LanguagesTable(
-        id: id ?? this.id,
-        data: data ?? this.data,
-      );
+  LanguagesTable copyWith({int? id, Language? data}) =>
+      LanguagesTable(id: id ?? this.id, data: data ?? this.data);
+
   LanguagesTable copyWithCompanion(LanguagesCompanion data) {
     return LanguagesTable(
       id: data.id.present ? data.id.value : this.id,
@@ -914,6 +1039,7 @@ class LanguagesTable extends DataClass implements Insertable<LanguagesTable> {
 
   @override
   int get hashCode => Object.hash(id, data);
+
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -924,17 +1050,20 @@ class LanguagesCompanion extends UpdateCompanion<LanguagesTable> {
   final Value<int> id;
   final Value<Language> data;
   final Value<int> rowid;
+
   const LanguagesCompanion({
     this.id = const Value.absent(),
     this.data = const Value.absent(),
     this.rowid = const Value.absent(),
   });
+
   LanguagesCompanion.insert({
     required int id,
     required Language data,
     this.rowid = const Value.absent(),
-  })  : id = Value(id),
-        data = Value(data);
+  }) : id = Value(id),
+       data = Value(data);
+
   static Insertable<LanguagesTable> custom({
     Expression<int>? id,
     Expression<String>? data,
@@ -983,34 +1112,44 @@ class LanguagesCompanion extends UpdateCompanion<LanguagesTable> {
 
 abstract class _$ExerciseDatabase extends GeneratedDatabase {
   _$ExerciseDatabase(QueryExecutor e) : super(e);
+
   $ExerciseDatabaseManager get managers => $ExerciseDatabaseManager(this);
   late final $ExercisesTable exercises = $ExercisesTable(this);
   late final $MusclesTable muscles = $MusclesTable(this);
   late final $EquipmentsTable equipments = $EquipmentsTable(this);
   late final $CategoriesTable categories = $CategoriesTable(this);
   late final $LanguagesTable languages = $LanguagesTable(this);
+
   @override
   Iterable<TableInfo<Table, Object?>> get allTables =>
       allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+
   @override
-  List<DatabaseSchemaEntity> get allSchemaEntities =>
-      [exercises, muscles, equipments, categories, languages];
+  List<DatabaseSchemaEntity> get allSchemaEntities => [
+    exercises,
+    muscles,
+    equipments,
+    categories,
+    languages,
+  ];
 }
 
-typedef $$ExercisesTableCreateCompanionBuilder = ExercisesCompanion Function({
-  required int id,
-  required String data,
-  required DateTime lastUpdate,
-  required DateTime lastFetched,
-  Value<int> rowid,
-});
-typedef $$ExercisesTableUpdateCompanionBuilder = ExercisesCompanion Function({
-  Value<int> id,
-  Value<String> data,
-  Value<DateTime> lastUpdate,
-  Value<DateTime> lastFetched,
-  Value<int> rowid,
-});
+typedef $$ExercisesTableCreateCompanionBuilder =
+    ExercisesCompanion Function({
+      required int id,
+      required String data,
+      required DateTime lastUpdate,
+      required DateTime lastFetched,
+      Value<int> rowid,
+    });
+typedef $$ExercisesTableUpdateCompanionBuilder =
+    ExercisesCompanion Function({
+      Value<int> id,
+      Value<String> data,
+      Value<DateTime> lastUpdate,
+      Value<DateTime> lastFetched,
+      Value<int> rowid,
+    });
 
 class $$ExercisesTableFilterComposer extends Composer<_$ExerciseDatabase, $ExercisesTable> {
   $$ExercisesTableFilterComposer({
@@ -1020,6 +1159,7 @@ class $$ExercisesTableFilterComposer extends Composer<_$ExerciseDatabase, $Exerc
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
+
   ColumnFilters<int> get id =>
       $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column));
 
@@ -1041,6 +1181,7 @@ class $$ExercisesTableOrderingComposer extends Composer<_$ExerciseDatabase, $Exe
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
+
   ColumnOrderings<int> get id =>
       $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column));
 
@@ -1062,6 +1203,7 @@ class $$ExercisesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $E
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
+
   GeneratedColumn<int> get id => $composableBuilder(column: $table.id, builder: (column) => column);
 
   GeneratedColumn<String> get data =>
@@ -1074,82 +1216,83 @@ class $$ExercisesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $E
       $composableBuilder(column: $table.lastFetched, builder: (column) => column);
 }
 
-class $$ExercisesTableTableManager extends RootTableManager<
-    _$ExerciseDatabase,
-    $ExercisesTable,
-    ExerciseTable,
-    $$ExercisesTableFilterComposer,
-    $$ExercisesTableOrderingComposer,
-    $$ExercisesTableAnnotationComposer,
-    $$ExercisesTableCreateCompanionBuilder,
-    $$ExercisesTableUpdateCompanionBuilder,
-    (ExerciseTable, BaseReferences<_$ExerciseDatabase, $ExercisesTable, ExerciseTable>),
-    ExerciseTable,
-    PrefetchHooks Function()> {
+class $$ExercisesTableTableManager
+    extends
+        RootTableManager<
+          _$ExerciseDatabase,
+          $ExercisesTable,
+          ExerciseTable,
+          $$ExercisesTableFilterComposer,
+          $$ExercisesTableOrderingComposer,
+          $$ExercisesTableAnnotationComposer,
+          $$ExercisesTableCreateCompanionBuilder,
+          $$ExercisesTableUpdateCompanionBuilder,
+          (ExerciseTable, BaseReferences<_$ExerciseDatabase, $ExercisesTable, ExerciseTable>),
+          ExerciseTable,
+          PrefetchHooks Function()
+        > {
   $$ExercisesTableTableManager(_$ExerciseDatabase db, $ExercisesTable table)
-      : super(TableManagerState(
+    : super(
+        TableManagerState(
           db: db,
           table: table,
           createFilteringComposer: () => $$ExercisesTableFilterComposer($db: db, $table: table),
           createOrderingComposer: () => $$ExercisesTableOrderingComposer($db: db, $table: table),
           createComputedFieldComposer: () =>
               $$ExercisesTableAnnotationComposer($db: db, $table: table),
-          updateCompanionCallback: ({
-            Value<int> id = const Value.absent(),
-            Value<String> data = const Value.absent(),
-            Value<DateTime> lastUpdate = const Value.absent(),
-            Value<DateTime> lastFetched = const Value.absent(),
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              ExercisesCompanion(
-            id: id,
-            data: data,
-            lastUpdate: lastUpdate,
-            lastFetched: lastFetched,
-            rowid: rowid,
-          ),
-          createCompanionCallback: ({
-            required int id,
-            required String data,
-            required DateTime lastUpdate,
-            required DateTime lastFetched,
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              ExercisesCompanion.insert(
-            id: id,
-            data: data,
-            lastUpdate: lastUpdate,
-            lastFetched: lastFetched,
-            rowid: rowid,
-          ),
+          updateCompanionCallback:
+              ({
+                Value<int> id = const Value.absent(),
+                Value<String> data = const Value.absent(),
+                Value<DateTime> lastUpdate = const Value.absent(),
+                Value<DateTime> lastFetched = const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => ExercisesCompanion(
+                id: id,
+                data: data,
+                lastUpdate: lastUpdate,
+                lastFetched: lastFetched,
+                rowid: rowid,
+              ),
+          createCompanionCallback:
+              ({
+                required int id,
+                required String data,
+                required DateTime lastUpdate,
+                required DateTime lastFetched,
+                Value<int> rowid = const Value.absent(),
+              }) => ExercisesCompanion.insert(
+                id: id,
+                data: data,
+                lastUpdate: lastUpdate,
+                lastFetched: lastFetched,
+                rowid: rowid,
+              ),
           withReferenceMapper: (p0) =>
               p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(),
           prefetchHooksCallback: null,
-        ));
+        ),
+      );
 }
 
-typedef $$ExercisesTableProcessedTableManager = ProcessedTableManager<
-    _$ExerciseDatabase,
-    $ExercisesTable,
-    ExerciseTable,
-    $$ExercisesTableFilterComposer,
-    $$ExercisesTableOrderingComposer,
-    $$ExercisesTableAnnotationComposer,
-    $$ExercisesTableCreateCompanionBuilder,
-    $$ExercisesTableUpdateCompanionBuilder,
-    (ExerciseTable, BaseReferences<_$ExerciseDatabase, $ExercisesTable, ExerciseTable>),
-    ExerciseTable,
-    PrefetchHooks Function()>;
-typedef $$MusclesTableCreateCompanionBuilder = MusclesCompanion Function({
-  required int id,
-  required Muscle data,
-  Value<int> rowid,
-});
-typedef $$MusclesTableUpdateCompanionBuilder = MusclesCompanion Function({
-  Value<int> id,
-  Value<Muscle> data,
-  Value<int> rowid,
-});
+typedef $$ExercisesTableProcessedTableManager =
+    ProcessedTableManager<
+      _$ExerciseDatabase,
+      $ExercisesTable,
+      ExerciseTable,
+      $$ExercisesTableFilterComposer,
+      $$ExercisesTableOrderingComposer,
+      $$ExercisesTableAnnotationComposer,
+      $$ExercisesTableCreateCompanionBuilder,
+      $$ExercisesTableUpdateCompanionBuilder,
+      (ExerciseTable, BaseReferences<_$ExerciseDatabase, $ExercisesTable, ExerciseTable>),
+      ExerciseTable,
+      PrefetchHooks Function()
+    >;
+typedef $$MusclesTableCreateCompanionBuilder =
+    MusclesCompanion Function({required int id, required Muscle data, Value<int> rowid});
+typedef $$MusclesTableUpdateCompanionBuilder =
+    MusclesCompanion Function({Value<int> id, Value<Muscle> data, Value<int> rowid});
 
 class $$MusclesTableFilterComposer extends Composer<_$ExerciseDatabase, $MusclesTable> {
   $$MusclesTableFilterComposer({
@@ -1159,11 +1302,14 @@ class $$MusclesTableFilterComposer extends Composer<_$ExerciseDatabase, $Muscles
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
+
   ColumnFilters<int> get id =>
       $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column));
 
   ColumnWithTypeConverterFilters<Muscle, Muscle, String> get data => $composableBuilder(
-      column: $table.data, builder: (column) => ColumnWithTypeConverterFilters(column));
+    column: $table.data,
+    builder: (column) => ColumnWithTypeConverterFilters(column),
+  );
 }
 
 class $$MusclesTableOrderingComposer extends Composer<_$ExerciseDatabase, $MusclesTable> {
@@ -1174,6 +1320,7 @@ class $$MusclesTableOrderingComposer extends Composer<_$ExerciseDatabase, $Muscl
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
+
   ColumnOrderings<int> get id =>
       $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column));
 
@@ -1189,80 +1336,71 @@ class $$MusclesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $Mus
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
+
   GeneratedColumn<int> get id => $composableBuilder(column: $table.id, builder: (column) => column);
 
   GeneratedColumnWithTypeConverter<Muscle, String> get data =>
       $composableBuilder(column: $table.data, builder: (column) => column);
 }
 
-class $$MusclesTableTableManager extends RootTableManager<
-    _$ExerciseDatabase,
-    $MusclesTable,
-    MuscleTable,
-    $$MusclesTableFilterComposer,
-    $$MusclesTableOrderingComposer,
-    $$MusclesTableAnnotationComposer,
-    $$MusclesTableCreateCompanionBuilder,
-    $$MusclesTableUpdateCompanionBuilder,
-    (MuscleTable, BaseReferences<_$ExerciseDatabase, $MusclesTable, MuscleTable>),
-    MuscleTable,
-    PrefetchHooks Function()> {
+class $$MusclesTableTableManager
+    extends
+        RootTableManager<
+          _$ExerciseDatabase,
+          $MusclesTable,
+          MuscleTable,
+          $$MusclesTableFilterComposer,
+          $$MusclesTableOrderingComposer,
+          $$MusclesTableAnnotationComposer,
+          $$MusclesTableCreateCompanionBuilder,
+          $$MusclesTableUpdateCompanionBuilder,
+          (MuscleTable, BaseReferences<_$ExerciseDatabase, $MusclesTable, MuscleTable>),
+          MuscleTable,
+          PrefetchHooks Function()
+        > {
   $$MusclesTableTableManager(_$ExerciseDatabase db, $MusclesTable table)
-      : super(TableManagerState(
+    : super(
+        TableManagerState(
           db: db,
           table: table,
           createFilteringComposer: () => $$MusclesTableFilterComposer($db: db, $table: table),
           createOrderingComposer: () => $$MusclesTableOrderingComposer($db: db, $table: table),
           createComputedFieldComposer: () =>
               $$MusclesTableAnnotationComposer($db: db, $table: table),
-          updateCompanionCallback: ({
-            Value<int> id = const Value.absent(),
-            Value<Muscle> data = const Value.absent(),
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              MusclesCompanion(
-            id: id,
-            data: data,
-            rowid: rowid,
-          ),
-          createCompanionCallback: ({
-            required int id,
-            required Muscle data,
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              MusclesCompanion.insert(
-            id: id,
-            data: data,
-            rowid: rowid,
-          ),
+          updateCompanionCallback:
+              ({
+                Value<int> id = const Value.absent(),
+                Value<Muscle> data = const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => MusclesCompanion(id: id, data: data, rowid: rowid),
+          createCompanionCallback:
+              ({required int id, required Muscle data, Value<int> rowid = const Value.absent()}) =>
+                  MusclesCompanion.insert(id: id, data: data, rowid: rowid),
           withReferenceMapper: (p0) =>
               p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(),
           prefetchHooksCallback: null,
-        ));
+        ),
+      );
 }
 
-typedef $$MusclesTableProcessedTableManager = ProcessedTableManager<
-    _$ExerciseDatabase,
-    $MusclesTable,
-    MuscleTable,
-    $$MusclesTableFilterComposer,
-    $$MusclesTableOrderingComposer,
-    $$MusclesTableAnnotationComposer,
-    $$MusclesTableCreateCompanionBuilder,
-    $$MusclesTableUpdateCompanionBuilder,
-    (MuscleTable, BaseReferences<_$ExerciseDatabase, $MusclesTable, MuscleTable>),
-    MuscleTable,
-    PrefetchHooks Function()>;
-typedef $$EquipmentsTableCreateCompanionBuilder = EquipmentsCompanion Function({
-  required int id,
-  required Equipment data,
-  Value<int> rowid,
-});
-typedef $$EquipmentsTableUpdateCompanionBuilder = EquipmentsCompanion Function({
-  Value<int> id,
-  Value<Equipment> data,
-  Value<int> rowid,
-});
+typedef $$MusclesTableProcessedTableManager =
+    ProcessedTableManager<
+      _$ExerciseDatabase,
+      $MusclesTable,
+      MuscleTable,
+      $$MusclesTableFilterComposer,
+      $$MusclesTableOrderingComposer,
+      $$MusclesTableAnnotationComposer,
+      $$MusclesTableCreateCompanionBuilder,
+      $$MusclesTableUpdateCompanionBuilder,
+      (MuscleTable, BaseReferences<_$ExerciseDatabase, $MusclesTable, MuscleTable>),
+      MuscleTable,
+      PrefetchHooks Function()
+    >;
+typedef $$EquipmentsTableCreateCompanionBuilder =
+    EquipmentsCompanion Function({required int id, required Equipment data, Value<int> rowid});
+typedef $$EquipmentsTableUpdateCompanionBuilder =
+    EquipmentsCompanion Function({Value<int> id, Value<Equipment> data, Value<int> rowid});
 
 class $$EquipmentsTableFilterComposer extends Composer<_$ExerciseDatabase, $EquipmentsTable> {
   $$EquipmentsTableFilterComposer({
@@ -1272,11 +1410,14 @@ class $$EquipmentsTableFilterComposer extends Composer<_$ExerciseDatabase, $Equi
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
+
   ColumnFilters<int> get id =>
       $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column));
 
   ColumnWithTypeConverterFilters<Equipment, Equipment, String> get data => $composableBuilder(
-      column: $table.data, builder: (column) => ColumnWithTypeConverterFilters(column));
+    column: $table.data,
+    builder: (column) => ColumnWithTypeConverterFilters(column),
+  );
 }
 
 class $$EquipmentsTableOrderingComposer extends Composer<_$ExerciseDatabase, $EquipmentsTable> {
@@ -1287,6 +1428,7 @@ class $$EquipmentsTableOrderingComposer extends Composer<_$ExerciseDatabase, $Eq
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
+
   ColumnOrderings<int> get id =>
       $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column));
 
@@ -1302,80 +1444,78 @@ class $$EquipmentsTableAnnotationComposer extends Composer<_$ExerciseDatabase, $
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
+
   GeneratedColumn<int> get id => $composableBuilder(column: $table.id, builder: (column) => column);
 
   GeneratedColumnWithTypeConverter<Equipment, String> get data =>
       $composableBuilder(column: $table.data, builder: (column) => column);
 }
 
-class $$EquipmentsTableTableManager extends RootTableManager<
-    _$ExerciseDatabase,
-    $EquipmentsTable,
-    EquipmentTable,
-    $$EquipmentsTableFilterComposer,
-    $$EquipmentsTableOrderingComposer,
-    $$EquipmentsTableAnnotationComposer,
-    $$EquipmentsTableCreateCompanionBuilder,
-    $$EquipmentsTableUpdateCompanionBuilder,
-    (EquipmentTable, BaseReferences<_$ExerciseDatabase, $EquipmentsTable, EquipmentTable>),
-    EquipmentTable,
-    PrefetchHooks Function()> {
+class $$EquipmentsTableTableManager
+    extends
+        RootTableManager<
+          _$ExerciseDatabase,
+          $EquipmentsTable,
+          EquipmentTable,
+          $$EquipmentsTableFilterComposer,
+          $$EquipmentsTableOrderingComposer,
+          $$EquipmentsTableAnnotationComposer,
+          $$EquipmentsTableCreateCompanionBuilder,
+          $$EquipmentsTableUpdateCompanionBuilder,
+          (EquipmentTable, BaseReferences<_$ExerciseDatabase, $EquipmentsTable, EquipmentTable>),
+          EquipmentTable,
+          PrefetchHooks Function()
+        > {
   $$EquipmentsTableTableManager(_$ExerciseDatabase db, $EquipmentsTable table)
-      : super(TableManagerState(
+    : super(
+        TableManagerState(
           db: db,
           table: table,
           createFilteringComposer: () => $$EquipmentsTableFilterComposer($db: db, $table: table),
           createOrderingComposer: () => $$EquipmentsTableOrderingComposer($db: db, $table: table),
           createComputedFieldComposer: () =>
               $$EquipmentsTableAnnotationComposer($db: db, $table: table),
-          updateCompanionCallback: ({
-            Value<int> id = const Value.absent(),
-            Value<Equipment> data = const Value.absent(),
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              EquipmentsCompanion(
-            id: id,
-            data: data,
-            rowid: rowid,
-          ),
-          createCompanionCallback: ({
-            required int id,
-            required Equipment data,
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              EquipmentsCompanion.insert(
-            id: id,
-            data: data,
-            rowid: rowid,
-          ),
+          updateCompanionCallback:
+              ({
+                Value<int> id = const Value.absent(),
+                Value<Equipment> data = const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => EquipmentsCompanion(id: id, data: data, rowid: rowid),
+          createCompanionCallback:
+              ({
+                required int id,
+                required Equipment data,
+                Value<int> rowid = const Value.absent(),
+              }) => EquipmentsCompanion.insert(id: id, data: data, rowid: rowid),
           withReferenceMapper: (p0) =>
               p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(),
           prefetchHooksCallback: null,
-        ));
+        ),
+      );
 }
 
-typedef $$EquipmentsTableProcessedTableManager = ProcessedTableManager<
-    _$ExerciseDatabase,
-    $EquipmentsTable,
-    EquipmentTable,
-    $$EquipmentsTableFilterComposer,
-    $$EquipmentsTableOrderingComposer,
-    $$EquipmentsTableAnnotationComposer,
-    $$EquipmentsTableCreateCompanionBuilder,
-    $$EquipmentsTableUpdateCompanionBuilder,
-    (EquipmentTable, BaseReferences<_$ExerciseDatabase, $EquipmentsTable, EquipmentTable>),
-    EquipmentTable,
-    PrefetchHooks Function()>;
-typedef $$CategoriesTableCreateCompanionBuilder = CategoriesCompanion Function({
-  required int id,
-  required ExerciseCategory data,
-  Value<int> rowid,
-});
-typedef $$CategoriesTableUpdateCompanionBuilder = CategoriesCompanion Function({
-  Value<int> id,
-  Value<ExerciseCategory> data,
-  Value<int> rowid,
-});
+typedef $$EquipmentsTableProcessedTableManager =
+    ProcessedTableManager<
+      _$ExerciseDatabase,
+      $EquipmentsTable,
+      EquipmentTable,
+      $$EquipmentsTableFilterComposer,
+      $$EquipmentsTableOrderingComposer,
+      $$EquipmentsTableAnnotationComposer,
+      $$EquipmentsTableCreateCompanionBuilder,
+      $$EquipmentsTableUpdateCompanionBuilder,
+      (EquipmentTable, BaseReferences<_$ExerciseDatabase, $EquipmentsTable, EquipmentTable>),
+      EquipmentTable,
+      PrefetchHooks Function()
+    >;
+typedef $$CategoriesTableCreateCompanionBuilder =
+    CategoriesCompanion Function({
+      required int id,
+      required ExerciseCategory data,
+      Value<int> rowid,
+    });
+typedef $$CategoriesTableUpdateCompanionBuilder =
+    CategoriesCompanion Function({Value<int> id, Value<ExerciseCategory> data, Value<int> rowid});
 
 class $$CategoriesTableFilterComposer extends Composer<_$ExerciseDatabase, $CategoriesTable> {
   $$CategoriesTableFilterComposer({
@@ -1385,12 +1525,15 @@ class $$CategoriesTableFilterComposer extends Composer<_$ExerciseDatabase, $Cate
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
+
   ColumnFilters<int> get id =>
       $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column));
 
   ColumnWithTypeConverterFilters<ExerciseCategory, ExerciseCategory, String> get data =>
       $composableBuilder(
-          column: $table.data, builder: (column) => ColumnWithTypeConverterFilters(column));
+        column: $table.data,
+        builder: (column) => ColumnWithTypeConverterFilters(column),
+      );
 }
 
 class $$CategoriesTableOrderingComposer extends Composer<_$ExerciseDatabase, $CategoriesTable> {
@@ -1401,6 +1544,7 @@ class $$CategoriesTableOrderingComposer extends Composer<_$ExerciseDatabase, $Ca
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
+
   ColumnOrderings<int> get id =>
       $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column));
 
@@ -1416,80 +1560,74 @@ class $$CategoriesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
+
   GeneratedColumn<int> get id => $composableBuilder(column: $table.id, builder: (column) => column);
 
   GeneratedColumnWithTypeConverter<ExerciseCategory, String> get data =>
       $composableBuilder(column: $table.data, builder: (column) => column);
 }
 
-class $$CategoriesTableTableManager extends RootTableManager<
-    _$ExerciseDatabase,
-    $CategoriesTable,
-    CategoryTable,
-    $$CategoriesTableFilterComposer,
-    $$CategoriesTableOrderingComposer,
-    $$CategoriesTableAnnotationComposer,
-    $$CategoriesTableCreateCompanionBuilder,
-    $$CategoriesTableUpdateCompanionBuilder,
-    (CategoryTable, BaseReferences<_$ExerciseDatabase, $CategoriesTable, CategoryTable>),
-    CategoryTable,
-    PrefetchHooks Function()> {
+class $$CategoriesTableTableManager
+    extends
+        RootTableManager<
+          _$ExerciseDatabase,
+          $CategoriesTable,
+          CategoryTable,
+          $$CategoriesTableFilterComposer,
+          $$CategoriesTableOrderingComposer,
+          $$CategoriesTableAnnotationComposer,
+          $$CategoriesTableCreateCompanionBuilder,
+          $$CategoriesTableUpdateCompanionBuilder,
+          (CategoryTable, BaseReferences<_$ExerciseDatabase, $CategoriesTable, CategoryTable>),
+          CategoryTable,
+          PrefetchHooks Function()
+        > {
   $$CategoriesTableTableManager(_$ExerciseDatabase db, $CategoriesTable table)
-      : super(TableManagerState(
+    : super(
+        TableManagerState(
           db: db,
           table: table,
           createFilteringComposer: () => $$CategoriesTableFilterComposer($db: db, $table: table),
           createOrderingComposer: () => $$CategoriesTableOrderingComposer($db: db, $table: table),
           createComputedFieldComposer: () =>
               $$CategoriesTableAnnotationComposer($db: db, $table: table),
-          updateCompanionCallback: ({
-            Value<int> id = const Value.absent(),
-            Value<ExerciseCategory> data = const Value.absent(),
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              CategoriesCompanion(
-            id: id,
-            data: data,
-            rowid: rowid,
-          ),
-          createCompanionCallback: ({
-            required int id,
-            required ExerciseCategory data,
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              CategoriesCompanion.insert(
-            id: id,
-            data: data,
-            rowid: rowid,
-          ),
+          updateCompanionCallback:
+              ({
+                Value<int> id = const Value.absent(),
+                Value<ExerciseCategory> data = const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => CategoriesCompanion(id: id, data: data, rowid: rowid),
+          createCompanionCallback:
+              ({
+                required int id,
+                required ExerciseCategory data,
+                Value<int> rowid = const Value.absent(),
+              }) => CategoriesCompanion.insert(id: id, data: data, rowid: rowid),
           withReferenceMapper: (p0) =>
               p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(),
           prefetchHooksCallback: null,
-        ));
+        ),
+      );
 }
 
-typedef $$CategoriesTableProcessedTableManager = ProcessedTableManager<
-    _$ExerciseDatabase,
-    $CategoriesTable,
-    CategoryTable,
-    $$CategoriesTableFilterComposer,
-    $$CategoriesTableOrderingComposer,
-    $$CategoriesTableAnnotationComposer,
-    $$CategoriesTableCreateCompanionBuilder,
-    $$CategoriesTableUpdateCompanionBuilder,
-    (CategoryTable, BaseReferences<_$ExerciseDatabase, $CategoriesTable, CategoryTable>),
-    CategoryTable,
-    PrefetchHooks Function()>;
-typedef $$LanguagesTableCreateCompanionBuilder = LanguagesCompanion Function({
-  required int id,
-  required Language data,
-  Value<int> rowid,
-});
-typedef $$LanguagesTableUpdateCompanionBuilder = LanguagesCompanion Function({
-  Value<int> id,
-  Value<Language> data,
-  Value<int> rowid,
-});
+typedef $$CategoriesTableProcessedTableManager =
+    ProcessedTableManager<
+      _$ExerciseDatabase,
+      $CategoriesTable,
+      CategoryTable,
+      $$CategoriesTableFilterComposer,
+      $$CategoriesTableOrderingComposer,
+      $$CategoriesTableAnnotationComposer,
+      $$CategoriesTableCreateCompanionBuilder,
+      $$CategoriesTableUpdateCompanionBuilder,
+      (CategoryTable, BaseReferences<_$ExerciseDatabase, $CategoriesTable, CategoryTable>),
+      CategoryTable,
+      PrefetchHooks Function()
+    >;
+typedef $$LanguagesTableCreateCompanionBuilder =
+    LanguagesCompanion Function({required int id, required Language data, Value<int> rowid});
+typedef $$LanguagesTableUpdateCompanionBuilder =
+    LanguagesCompanion Function({Value<int> id, Value<Language> data, Value<int> rowid});
 
 class $$LanguagesTableFilterComposer extends Composer<_$ExerciseDatabase, $LanguagesTable> {
   $$LanguagesTableFilterComposer({
@@ -1499,11 +1637,14 @@ class $$LanguagesTableFilterComposer extends Composer<_$ExerciseDatabase, $Langu
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
+
   ColumnFilters<int> get id =>
       $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column));
 
   ColumnWithTypeConverterFilters<Language, Language, String> get data => $composableBuilder(
-      column: $table.data, builder: (column) => ColumnWithTypeConverterFilters(column));
+    column: $table.data,
+    builder: (column) => ColumnWithTypeConverterFilters(column),
+  );
 }
 
 class $$LanguagesTableOrderingComposer extends Composer<_$ExerciseDatabase, $LanguagesTable> {
@@ -1514,6 +1655,7 @@ class $$LanguagesTableOrderingComposer extends Composer<_$ExerciseDatabase, $Lan
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
+
   ColumnOrderings<int> get id =>
       $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column));
 
@@ -1529,79 +1671,85 @@ class $$LanguagesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $L
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
+
   GeneratedColumn<int> get id => $composableBuilder(column: $table.id, builder: (column) => column);
 
   GeneratedColumnWithTypeConverter<Language, String> get data =>
       $composableBuilder(column: $table.data, builder: (column) => column);
 }
 
-class $$LanguagesTableTableManager extends RootTableManager<
-    _$ExerciseDatabase,
-    $LanguagesTable,
-    LanguagesTable,
-    $$LanguagesTableFilterComposer,
-    $$LanguagesTableOrderingComposer,
-    $$LanguagesTableAnnotationComposer,
-    $$LanguagesTableCreateCompanionBuilder,
-    $$LanguagesTableUpdateCompanionBuilder,
-    (LanguagesTable, BaseReferences<_$ExerciseDatabase, $LanguagesTable, LanguagesTable>),
-    LanguagesTable,
-    PrefetchHooks Function()> {
+class $$LanguagesTableTableManager
+    extends
+        RootTableManager<
+          _$ExerciseDatabase,
+          $LanguagesTable,
+          LanguagesTable,
+          $$LanguagesTableFilterComposer,
+          $$LanguagesTableOrderingComposer,
+          $$LanguagesTableAnnotationComposer,
+          $$LanguagesTableCreateCompanionBuilder,
+          $$LanguagesTableUpdateCompanionBuilder,
+          (LanguagesTable, BaseReferences<_$ExerciseDatabase, $LanguagesTable, LanguagesTable>),
+          LanguagesTable,
+          PrefetchHooks Function()
+        > {
   $$LanguagesTableTableManager(_$ExerciseDatabase db, $LanguagesTable table)
-      : super(TableManagerState(
+    : super(
+        TableManagerState(
           db: db,
           table: table,
           createFilteringComposer: () => $$LanguagesTableFilterComposer($db: db, $table: table),
           createOrderingComposer: () => $$LanguagesTableOrderingComposer($db: db, $table: table),
           createComputedFieldComposer: () =>
               $$LanguagesTableAnnotationComposer($db: db, $table: table),
-          updateCompanionCallback: ({
-            Value<int> id = const Value.absent(),
-            Value<Language> data = const Value.absent(),
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              LanguagesCompanion(
-            id: id,
-            data: data,
-            rowid: rowid,
-          ),
-          createCompanionCallback: ({
-            required int id,
-            required Language data,
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              LanguagesCompanion.insert(
-            id: id,
-            data: data,
-            rowid: rowid,
-          ),
+          updateCompanionCallback:
+              ({
+                Value<int> id = const Value.absent(),
+                Value<Language> data = const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => LanguagesCompanion(id: id, data: data, rowid: rowid),
+          createCompanionCallback:
+              ({
+                required int id,
+                required Language data,
+                Value<int> rowid = const Value.absent(),
+              }) => LanguagesCompanion.insert(id: id, data: data, rowid: rowid),
           withReferenceMapper: (p0) =>
               p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(),
           prefetchHooksCallback: null,
-        ));
+        ),
+      );
 }
 
-typedef $$LanguagesTableProcessedTableManager = ProcessedTableManager<
-    _$ExerciseDatabase,
-    $LanguagesTable,
-    LanguagesTable,
-    $$LanguagesTableFilterComposer,
-    $$LanguagesTableOrderingComposer,
-    $$LanguagesTableAnnotationComposer,
-    $$LanguagesTableCreateCompanionBuilder,
-    $$LanguagesTableUpdateCompanionBuilder,
-    (LanguagesTable, BaseReferences<_$ExerciseDatabase, $LanguagesTable, LanguagesTable>),
-    LanguagesTable,
-    PrefetchHooks Function()>;
+typedef $$LanguagesTableProcessedTableManager =
+    ProcessedTableManager<
+      _$ExerciseDatabase,
+      $LanguagesTable,
+      LanguagesTable,
+      $$LanguagesTableFilterComposer,
+      $$LanguagesTableOrderingComposer,
+      $$LanguagesTableAnnotationComposer,
+      $$LanguagesTableCreateCompanionBuilder,
+      $$LanguagesTableUpdateCompanionBuilder,
+      (LanguagesTable, BaseReferences<_$ExerciseDatabase, $LanguagesTable, LanguagesTable>),
+      LanguagesTable,
+      PrefetchHooks Function()
+    >;
 
 class $ExerciseDatabaseManager {
   final _$ExerciseDatabase _db;
+
   $ExerciseDatabaseManager(this._db);
+
   $$ExercisesTableTableManager get exercises => $$ExercisesTableTableManager(_db, _db.exercises);
+
   $$MusclesTableTableManager get muscles => $$MusclesTableTableManager(_db, _db.muscles);
+
   $$EquipmentsTableTableManager get equipments =>
       $$EquipmentsTableTableManager(_db, _db.equipments);
+
   $$CategoriesTableTableManager get categories =>
       $$CategoriesTableTableManager(_db, _db.categories);
+
   $$LanguagesTableTableManager get languages => $$LanguagesTableTableManager(_db, _db.languages);
 }
diff --git a/lib/database/ingredients/ingredients_database.g.dart b/lib/database/ingredients/ingredients_database.g.dart
index 63633c83..a8bc8006 100644
--- a/lib/database/ingredients/ingredients_database.g.dart
+++ b/lib/database/ingredients/ingredients_database.g.dart
@@ -7,30 +7,52 @@ class $IngredientsTable extends Ingredients with TableInfo<$IngredientsTable, In
   @override
   final GeneratedDatabase attachedDatabase;
   final String? _alias;
+
   $IngredientsTable(this.attachedDatabase, [this._alias]);
+
   static const VerificationMeta _idMeta = const VerificationMeta('id');
   @override
-  late final GeneratedColumn<int> id = GeneratedColumn<int>('id', aliasedName, false,
-      type: DriftSqlType.int, requiredDuringInsert: true);
+  late final GeneratedColumn<int> id = GeneratedColumn<int>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
   static const VerificationMeta _dataMeta = const VerificationMeta('data');
   @override
-  late final GeneratedColumn<String> data = GeneratedColumn<String>('data', aliasedName, false,
-      type: DriftSqlType.string, requiredDuringInsert: true);
+  late final GeneratedColumn<String> data = GeneratedColumn<String>(
+    'data',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
   static const VerificationMeta _lastFetchedMeta = const VerificationMeta('lastFetched');
   @override
   late final GeneratedColumn<DateTime> lastFetched = GeneratedColumn<DateTime>(
-      'last_fetched', aliasedName, false,
-      type: DriftSqlType.dateTime, requiredDuringInsert: true);
+    'last_fetched',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: true,
+  );
+
   @override
   List<GeneratedColumn> get $columns => [id, data, lastFetched];
+
   @override
   String get aliasedName => _alias ?? actualTableName;
+
   @override
   String get actualTableName => $name;
   static const String $name = 'ingredients';
+
   @override
-  VerificationContext validateIntegrity(Insertable<IngredientTable> instance,
-      {bool isInserting = false}) {
+  VerificationContext validateIntegrity(
+    Insertable<IngredientTable> instance, {
+    bool isInserting = false,
+  }) {
     final context = VerificationContext();
     final data = instance.toColumns(true);
     if (data.containsKey('id')) {
@@ -44,8 +66,10 @@ class $IngredientsTable extends Ingredients with TableInfo<$IngredientsTable, In
       context.missing(_dataMeta);
     }
     if (data.containsKey('last_fetched')) {
-      context.handle(_lastFetchedMeta,
-          lastFetched.isAcceptableOrUnknown(data['last_fetched']!, _lastFetchedMeta));
+      context.handle(
+        _lastFetchedMeta,
+        lastFetched.isAcceptableOrUnknown(data['last_fetched']!, _lastFetchedMeta),
+      );
     } else if (isInserting) {
       context.missing(_lastFetchedMeta);
     }
@@ -54,14 +78,17 @@ class $IngredientsTable extends Ingredients with TableInfo<$IngredientsTable, In
 
   @override
   Set<GeneratedColumn> get $primaryKey => const {};
+
   @override
   IngredientTable map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
     return IngredientTable(
       id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!,
       data: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!,
-      lastFetched: attachedDatabase.typeMapping
-          .read(DriftSqlType.dateTime, data['${effectivePrefix}last_fetched'])!,
+      lastFetched: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}last_fetched'],
+      )!,
     );
   }
 
@@ -77,7 +104,9 @@ class IngredientTable extends DataClass implements Insertable<IngredientTable> {
 
   /// The date when the ingredient was last fetched from the server
   final DateTime lastFetched;
+
   const IngredientTable({required this.id, required this.data, required this.lastFetched});
+
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -88,11 +117,7 @@ class IngredientTable extends DataClass implements Insertable<IngredientTable> {
   }
 
   IngredientsCompanion toCompanion(bool nullToAbsent) {
-    return IngredientsCompanion(
-      id: Value(id),
-      data: Value(data),
-      lastFetched: Value(lastFetched),
-    );
+    return IngredientsCompanion(id: Value(id), data: Value(data), lastFetched: Value(lastFetched));
   }
 
   factory IngredientTable.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
@@ -103,6 +128,7 @@ class IngredientTable extends DataClass implements Insertable<IngredientTable> {
       lastFetched: serializer.fromJson<DateTime>(json['lastFetched']),
     );
   }
+
   @override
   Map<String, dynamic> toJson({ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
@@ -114,10 +140,11 @@ class IngredientTable extends DataClass implements Insertable<IngredientTable> {
   }
 
   IngredientTable copyWith({int? id, String? data, DateTime? lastFetched}) => IngredientTable(
-        id: id ?? this.id,
-        data: data ?? this.data,
-        lastFetched: lastFetched ?? this.lastFetched,
-      );
+    id: id ?? this.id,
+    data: data ?? this.data,
+    lastFetched: lastFetched ?? this.lastFetched,
+  );
+
   IngredientTable copyWithCompanion(IngredientsCompanion data) {
     return IngredientTable(
       id: data.id.present ? data.id.value : this.id,
@@ -138,6 +165,7 @@ class IngredientTable extends DataClass implements Insertable<IngredientTable> {
 
   @override
   int get hashCode => Object.hash(id, data, lastFetched);
+
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -152,20 +180,23 @@ class IngredientsCompanion extends UpdateCompanion<IngredientTable> {
   final Value<String> data;
   final Value<DateTime> lastFetched;
   final Value<int> rowid;
+
   const IngredientsCompanion({
     this.id = const Value.absent(),
     this.data = const Value.absent(),
     this.lastFetched = const Value.absent(),
     this.rowid = const Value.absent(),
   });
+
   IngredientsCompanion.insert({
     required int id,
     required String data,
     required DateTime lastFetched,
     this.rowid = const Value.absent(),
-  })  : id = Value(id),
-        data = Value(data),
-        lastFetched = Value(lastFetched);
+  }) : id = Value(id),
+       data = Value(data),
+       lastFetched = Value(lastFetched);
+
   static Insertable<IngredientTable> custom({
     Expression<int>? id,
     Expression<String>? data,
@@ -180,8 +211,12 @@ class IngredientsCompanion extends UpdateCompanion<IngredientTable> {
     });
   }
 
-  IngredientsCompanion copyWith(
-      {Value<int>? id, Value<String>? data, Value<DateTime>? lastFetched, Value<int>? rowid}) {
+  IngredientsCompanion copyWith({
+    Value<int>? id,
+    Value<String>? data,
+    Value<DateTime>? lastFetched,
+    Value<int>? rowid,
+  }) {
     return IngredientsCompanion(
       id: id ?? this.id,
       data: data ?? this.data,
@@ -222,27 +257,32 @@ class IngredientsCompanion extends UpdateCompanion<IngredientTable> {
 
 abstract class _$IngredientDatabase extends GeneratedDatabase {
   _$IngredientDatabase(QueryExecutor e) : super(e);
+
   $IngredientDatabaseManager get managers => $IngredientDatabaseManager(this);
   late final $IngredientsTable ingredients = $IngredientsTable(this);
+
   @override
   Iterable<TableInfo<Table, Object?>> get allTables =>
       allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+
   @override
   List<DatabaseSchemaEntity> get allSchemaEntities => [ingredients];
 }
 
-typedef $$IngredientsTableCreateCompanionBuilder = IngredientsCompanion Function({
-  required int id,
-  required String data,
-  required DateTime lastFetched,
-  Value<int> rowid,
-});
-typedef $$IngredientsTableUpdateCompanionBuilder = IngredientsCompanion Function({
-  Value<int> id,
-  Value<String> data,
-  Value<DateTime> lastFetched,
-  Value<int> rowid,
-});
+typedef $$IngredientsTableCreateCompanionBuilder =
+    IngredientsCompanion Function({
+      required int id,
+      required String data,
+      required DateTime lastFetched,
+      Value<int> rowid,
+    });
+typedef $$IngredientsTableUpdateCompanionBuilder =
+    IngredientsCompanion Function({
+      Value<int> id,
+      Value<String> data,
+      Value<DateTime> lastFetched,
+      Value<int> rowid,
+    });
 
 class $$IngredientsTableFilterComposer extends Composer<_$IngredientDatabase, $IngredientsTable> {
   $$IngredientsTableFilterComposer({
@@ -252,6 +292,7 @@ class $$IngredientsTableFilterComposer extends Composer<_$IngredientDatabase, $I
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
+
   ColumnFilters<int> get id =>
       $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column));
 
@@ -270,6 +311,7 @@ class $$IngredientsTableOrderingComposer extends Composer<_$IngredientDatabase,
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
+
   ColumnOrderings<int> get id =>
       $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column));
 
@@ -289,6 +331,7 @@ class $$IngredientsTableAnnotationComposer
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
+
   GeneratedColumn<int> get id => $composableBuilder(column: $table.id, builder: (column) => column);
 
   GeneratedColumn<String> get data =>
@@ -298,72 +341,80 @@ class $$IngredientsTableAnnotationComposer
       $composableBuilder(column: $table.lastFetched, builder: (column) => column);
 }
 
-class $$IngredientsTableTableManager extends RootTableManager<
-    _$IngredientDatabase,
-    $IngredientsTable,
-    IngredientTable,
-    $$IngredientsTableFilterComposer,
-    $$IngredientsTableOrderingComposer,
-    $$IngredientsTableAnnotationComposer,
-    $$IngredientsTableCreateCompanionBuilder,
-    $$IngredientsTableUpdateCompanionBuilder,
-    (IngredientTable, BaseReferences<_$IngredientDatabase, $IngredientsTable, IngredientTable>),
-    IngredientTable,
-    PrefetchHooks Function()> {
+class $$IngredientsTableTableManager
+    extends
+        RootTableManager<
+          _$IngredientDatabase,
+          $IngredientsTable,
+          IngredientTable,
+          $$IngredientsTableFilterComposer,
+          $$IngredientsTableOrderingComposer,
+          $$IngredientsTableAnnotationComposer,
+          $$IngredientsTableCreateCompanionBuilder,
+          $$IngredientsTableUpdateCompanionBuilder,
+          (
+            IngredientTable,
+            BaseReferences<_$IngredientDatabase, $IngredientsTable, IngredientTable>,
+          ),
+          IngredientTable,
+          PrefetchHooks Function()
+        > {
   $$IngredientsTableTableManager(_$IngredientDatabase db, $IngredientsTable table)
-      : super(TableManagerState(
+    : super(
+        TableManagerState(
           db: db,
           table: table,
           createFilteringComposer: () => $$IngredientsTableFilterComposer($db: db, $table: table),
           createOrderingComposer: () => $$IngredientsTableOrderingComposer($db: db, $table: table),
           createComputedFieldComposer: () =>
               $$IngredientsTableAnnotationComposer($db: db, $table: table),
-          updateCompanionCallback: ({
-            Value<int> id = const Value.absent(),
-            Value<String> data = const Value.absent(),
-            Value<DateTime> lastFetched = const Value.absent(),
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              IngredientsCompanion(
-            id: id,
-            data: data,
-            lastFetched: lastFetched,
-            rowid: rowid,
-          ),
-          createCompanionCallback: ({
-            required int id,
-            required String data,
-            required DateTime lastFetched,
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              IngredientsCompanion.insert(
-            id: id,
-            data: data,
-            lastFetched: lastFetched,
-            rowid: rowid,
-          ),
+          updateCompanionCallback:
+              ({
+                Value<int> id = const Value.absent(),
+                Value<String> data = const Value.absent(),
+                Value<DateTime> lastFetched = const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) =>
+                  IngredientsCompanion(id: id, data: data, lastFetched: lastFetched, rowid: rowid),
+          createCompanionCallback:
+              ({
+                required int id,
+                required String data,
+                required DateTime lastFetched,
+                Value<int> rowid = const Value.absent(),
+              }) => IngredientsCompanion.insert(
+                id: id,
+                data: data,
+                lastFetched: lastFetched,
+                rowid: rowid,
+              ),
           withReferenceMapper: (p0) =>
               p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(),
           prefetchHooksCallback: null,
-        ));
+        ),
+      );
 }
 
-typedef $$IngredientsTableProcessedTableManager = ProcessedTableManager<
-    _$IngredientDatabase,
-    $IngredientsTable,
-    IngredientTable,
-    $$IngredientsTableFilterComposer,
-    $$IngredientsTableOrderingComposer,
-    $$IngredientsTableAnnotationComposer,
-    $$IngredientsTableCreateCompanionBuilder,
-    $$IngredientsTableUpdateCompanionBuilder,
-    (IngredientTable, BaseReferences<_$IngredientDatabase, $IngredientsTable, IngredientTable>),
-    IngredientTable,
-    PrefetchHooks Function()>;
+typedef $$IngredientsTableProcessedTableManager =
+    ProcessedTableManager<
+      _$IngredientDatabase,
+      $IngredientsTable,
+      IngredientTable,
+      $$IngredientsTableFilterComposer,
+      $$IngredientsTableOrderingComposer,
+      $$IngredientsTableAnnotationComposer,
+      $$IngredientsTableCreateCompanionBuilder,
+      $$IngredientsTableUpdateCompanionBuilder,
+      (IngredientTable, BaseReferences<_$IngredientDatabase, $IngredientsTable, IngredientTable>),
+      IngredientTable,
+      PrefetchHooks Function()
+    >;
 
 class $IngredientDatabaseManager {
   final _$IngredientDatabase _db;
+
   $IngredientDatabaseManager(this._db);
+
   $$IngredientsTableTableManager get ingredients =>
       $$IngredientsTableTableManager(_db, _db.ingredients);
 }
diff --git a/lib/models/body_weight/weight_entry.g.dart b/lib/models/body_weight/weight_entry.g.dart
index 8295b62b..42281afa 100644
--- a/lib/models/body_weight/weight_entry.g.dart
+++ b/lib/models/body_weight/weight_entry.g.dart
@@ -7,10 +7,7 @@ part of 'weight_entry.dart';
 // **************************************************************************
 
 WeightEntry _$WeightEntryFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'weight', 'date'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'weight', 'date']);
   return WeightEntry(
     id: (json['id'] as num?)?.toInt(),
     weight: stringToNum(json['weight'] as String?),
@@ -19,7 +16,7 @@ WeightEntry _$WeightEntryFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$WeightEntryToJson(WeightEntry instance) => <String, dynamic>{
-      'id': instance.id,
-      'weight': numToString(instance.weight),
-      'date': instance.date.toIso8601String(),
-    };
+  'id': instance.id,
+  'weight': numToString(instance.weight),
+  'date': instance.date.toIso8601String(),
+};
diff --git a/lib/models/exercises/alias.g.dart b/lib/models/exercises/alias.g.dart
index 708ee7ab..e631ec6e 100644
--- a/lib/models/exercises/alias.g.dart
+++ b/lib/models/exercises/alias.g.dart
@@ -7,10 +7,7 @@ part of 'alias.dart';
 // **************************************************************************
 
 Alias _$AliasFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'alias'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'alias']);
   return Alias(
     id: (json['id'] as num?)?.toInt(),
     translationId: (json['translation'] as num?)?.toInt(),
@@ -19,7 +16,7 @@ Alias _$AliasFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$AliasToJson(Alias instance) => <String, dynamic>{
-      'id': instance.id,
-      'translation': instance.translationId,
-      'alias': instance.alias,
-    };
+  'id': instance.id,
+  'translation': instance.translationId,
+  'alias': instance.alias,
+};
diff --git a/lib/models/exercises/category.g.dart b/lib/models/exercises/category.g.dart
index 098a0489..04c8db5f 100644
--- a/lib/models/exercises/category.g.dart
+++ b/lib/models/exercises/category.g.dart
@@ -7,17 +7,11 @@ part of 'category.dart';
 // **************************************************************************
 
 ExerciseCategory _$ExerciseCategoryFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'name'],
-  );
-  return ExerciseCategory(
-    id: (json['id'] as num).toInt(),
-    name: json['name'] as String,
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'name']);
+  return ExerciseCategory(id: (json['id'] as num).toInt(), name: json['name'] as String);
 }
 
-Map<String, dynamic> _$ExerciseCategoryToJson(ExerciseCategory instance) => <String, dynamic>{
-      'id': instance.id,
-      'name': instance.name,
-    };
+ap<String, dynamic> _$ExerciseCategoryToJson(ExerciseCategory instance) => <String, dynamic>{
+  'id': instance.id,
+  'name': instance.name,
+};
diff --git a/lib/models/exercises/comment.g.dart b/lib/models/exercises/comment.g.dart
index f5e502c2..7cf62d92 100644
--- a/lib/models/exercises/comment.g.dart
+++ b/lib/models/exercises/comment.g.dart
@@ -7,10 +7,7 @@ part of 'comment.dart';
 // **************************************************************************
 
 Comment _$CommentFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'comment'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'comment']);
   return Comment(
     id: (json['id'] as num).toInt(),
     translationId: (json['translation'] as num).toInt(),
@@ -19,7 +16,7 @@ Comment _$CommentFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$CommentToJson(Comment instance) => <String, dynamic>{
-      'id': instance.id,
-      'translation': instance.translationId,
-      'comment': instance.comment,
-    };
+  'id': instance.id,
+  'translation': instance.translationId,
+  'comment': instance.comment,
+};
diff --git a/lib/models/exercises/equipment.g.dart b/lib/models/exercises/equipment.g.dart
index 2c8caa17..b452d40a 100644
--- a/lib/models/exercises/equipment.g.dart
+++ b/lib/models/exercises/equipment.g.dart
@@ -7,10 +7,7 @@ part of 'equipment.dart';
 // **************************************************************************
 
 Equipment _$EquipmentFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'name'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'name']);
   return Equipment(
     id: (json['id'] as num).toInt(),
     name: json['name'] as String,
@@ -18,6 +15,6 @@ Equipment _$EquipmentFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$EquipmentToJson(Equipment instance) => <String, dynamic>{
-      'id': instance.id,
-      'name': instance.name,
-    };
+  'id': instance.id,
+  'name': instance.name,
+};
diff --git a/lib/models/exercises/exercise_api.freezed.dart b/lib/models/exercises/exercise_api.freezed.dart
index 740ec6c0..e3959c06 100644
--- a/lib/models/exercises/exercise_api.freezed.dart
+++ b/lib/models/exercises/exercise_api.freezed.dart
@@ -124,6 +124,8 @@ abstract mixin class $ExerciseApiDataCopyWith<$Res> {
   });
 
 
+
+
 }
 /// @nodoc
 class _$ExerciseApiDataCopyWithImpl<$Res>
@@ -536,6 +538,8 @@ abstract mixin class _$ExerciseBaseDataCopyWith<$Res> implements $ExerciseApiDat
   });
 
 
+
+
 }
 /// @nodoc
 class __$ExerciseBaseDataCopyWithImpl<$Res>
@@ -678,6 +682,8 @@ abstract mixin class $ExerciseSearchDetailsCopyWith<$Res> {
   });
 
 
+
+
 }
 /// @nodoc
 class _$ExerciseSearchDetailsCopyWithImpl<$Res>
@@ -947,6 +953,8 @@ abstract mixin class _$ExerciseSearchDetailsCopyWith<$Res>
   });
 
 
+
+
 }
 /// @nodoc
 class __$ExerciseSearchDetailsCopyWithImpl<$Res>
@@ -1517,6 +1525,7 @@ extension ExerciseApiSearchPatterns on ExerciseApiSearch {
 
 /// @nodoc
 @JsonSerializable()
+
 class _ExerciseApiSearch implements ExerciseApiSearch {
   _ExerciseApiSearch({required final List<ExerciseSearchEntry> suggestions})
       : _suggestions = suggestions;
diff --git a/lib/models/exercises/language.g.dart b/lib/models/exercises/language.g.dart
index 28a31848..e1129373 100644
--- a/lib/models/exercises/language.g.dart
+++ b/lib/models/exercises/language.g.dart
@@ -7,10 +7,7 @@ part of 'language.dart';
 // **************************************************************************
 
 Language _$LanguageFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'short_name', 'full_name'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'short_name', 'full_name']);
   return Language(
     id: (json['id'] as num).toInt(),
     shortName: json['short_name'] as String,
@@ -19,7 +16,7 @@ Language _$LanguageFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$LanguageToJson(Language instance) => <String, dynamic>{
-      'id': instance.id,
-      'short_name': instance.shortName,
-      'full_name': instance.fullName,
-    };
+  'id': instance.id,
+  'short_name': instance.shortName,
+  'full_name': instance.fullName,
+};
diff --git a/lib/models/exercises/muscle.g.dart b/lib/models/exercises/muscle.g.dart
index 04319680..37a9b073 100644
--- a/lib/models/exercises/muscle.g.dart
+++ b/lib/models/exercises/muscle.g.dart
@@ -7,10 +7,7 @@ part of 'muscle.dart';
 // **************************************************************************
 
 Muscle _$MuscleFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'name', 'name_en', 'is_front'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'name', 'name_en', 'is_front']);
   return Muscle(
     id: (json['id'] as num).toInt(),
     name: json['name'] as String,
@@ -20,8 +17,8 @@ Muscle _$MuscleFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$MuscleToJson(Muscle instance) => <String, dynamic>{
-      'id': instance.id,
-      'name': instance.name,
-      'name_en': instance.nameEn,
-      'is_front': instance.isFront,
-    };
+  'id': instance.id,
+  'name': instance.name,
+  'name_en': instance.nameEn,
+  'is_front': instance.isFront,
+};
diff --git a/lib/models/exercises/translation.g.dart b/lib/models/exercises/translation.g.dart
index cbcd94c5..2042296d 100644
--- a/lib/models/exercises/translation.g.dart
+++ b/lib/models/exercises/translation.g.dart
@@ -12,13 +12,13 @@ Translation _$TranslationFromJson(Map<String, dynamic> json) {
     requiredKeys: const ['id', 'uuid', 'language', 'created', 'exercise', 'name', 'description'],
   );
   return Translation(
-    id: (json['id'] as num?)?.toInt(),
-    uuid: json['uuid'] as String?,
-    created: json['created'] == null ? null : DateTime.parse(json['created'] as String),
-    name: json['name'] as String,
-    description: json['description'] as String,
-    exerciseId: (json['exercise'] as num?)?.toInt(),
-  )
+      id: (json['id'] as num?)?.toInt(),
+      uuid: json['uuid'] as String?,
+      created: json['created'] == null ? null : DateTime.parse(json['created'] as String),
+      name: json['name'] as String,
+      description: json['description'] as String,
+      exerciseId: (json['exercise'] as num?)?.toInt(),
+    )
     ..languageId = (json['language'] as num).toInt()
     ..notes = (json['notes'] as List<dynamic>)
         .map((e) => Comment.fromJson(e as Map<String, dynamic>))
@@ -29,11 +29,11 @@ Translation _$TranslationFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$TranslationToJson(Translation instance) => <String, dynamic>{
-      'id': instance.id,
-      'uuid': instance.uuid,
-      'language': instance.languageId,
-      'created': instance.created?.toIso8601String(),
-      'exercise': instance.exerciseId,
-      'name': instance.name,
-      'description': instance.description,
-    };
+  'id': instance.id,
+  'uuid': instance.uuid,
+  'language': instance.languageId,
+  'created': instance.created?.toIso8601String(),
+  'exercise': instance.exerciseId,
+  'name': instance.name,
+  'description': instance.description,
+};
diff --git a/lib/models/exercises/variation.g.dart b/lib/models/exercises/variation.g.dart
index 9b9901e2..b9d3b187 100644
--- a/lib/models/exercises/variation.g.dart
+++ b/lib/models/exercises/variation.g.dart
@@ -7,15 +7,10 @@ part of 'variation.dart';
 // **************************************************************************
 
 Variation _$VariationFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id'],
-  );
-  return Variation(
-    id: (json['id'] as num).toInt(),
-  );
+  $checkKeys(json, requiredKeys: const ['id']);
+  return Variation(id: (json['id'] as num).toInt());
 }
 
 Map<String, dynamic> _$VariationToJson(Variation instance) => <String, dynamic>{
-      'id': instance.id,
-    };
+  'id': instance.id,
+};
diff --git a/lib/models/exercises/video.g.dart b/lib/models/exercises/video.g.dart
index 3481438e..f574eb65 100644
--- a/lib/models/exercises/video.g.dart
+++ b/lib/models/exercises/video.g.dart
@@ -21,7 +21,7 @@ Video _$VideoFromJson(Map<String, dynamic> json) {
       'codec',
       'codec_long',
       'license',
-      'license_author'
+      'license_author',
     ],
   );
   return Video(
@@ -41,16 +41,16 @@ Video _$VideoFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$VideoToJson(Video instance) => <String, dynamic>{
-      'id': instance.id,
-      'uuid': instance.uuid,
-      'video': instance.url,
-      'exercise': instance.exerciseId,
-      'size': instance.size,
-      'duration': numToString(instance.duration),
-      'width': instance.width,
-      'height': instance.height,
-      'codec': instance.codec,
-      'codec_long': instance.codecLong,
-      'license': instance.license,
-      'license_author': instance.licenseAuthor,
-    };
+  'id': instance.id,
+  'uuid': instance.uuid,
+  'video': instance.url,
+  'exercise': instance.exerciseId,
+  'size': instance.size,
+  'duration': numToString(instance.duration),
+  'width': instance.width,
+  'height': instance.height,
+  'codec': instance.codec,
+  'codec_long': instance.codecLong,
+  'license': instance.license,
+  'license_author': instance.licenseAuthor,
+};
diff --git a/lib/models/gallery/image.g.dart b/lib/models/gallery/image.g.dart
index 7f672827..0a6f9694 100644
--- a/lib/models/gallery/image.g.dart
+++ b/lib/models/gallery/image.g.dart
@@ -7,10 +7,7 @@ part of 'image.dart';
 // **************************************************************************
 
 Image _$ImageFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'date', 'image'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'date', 'image']);
   return Image(
     id: (json['id'] as num?)?.toInt(),
     date: DateTime.parse(json['date'] as String),
@@ -20,8 +17,8 @@ Image _$ImageFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$ImageToJson(Image instance) => <String, dynamic>{
-      'id': instance.id,
-      'date': dateToYYYYMMDD(instance.date),
-      'image': instance.url,
-      'description': instance.description,
-    };
+  'id': instance.id,
+  'date': dateToYYYYMMDD(instance.date),
+  'image': instance.url,
+  'description': instance.description,
+};
diff --git a/lib/models/measurements/measurement_category.g.dart b/lib/models/measurements/measurement_category.g.dart
index 05ddd4c7..89600fb7 100644
--- a/lib/models/measurements/measurement_category.g.dart
+++ b/lib/models/measurements/measurement_category.g.dart
@@ -7,15 +7,13 @@ part of 'measurement_category.dart';
 // **************************************************************************
 
 MeasurementCategory _$MeasurementCategoryFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'name', 'unit'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'name', 'unit']);
   return MeasurementCategory(
     id: (json['id'] as num?)?.toInt(),
     name: json['name'] as String,
     unit: json['unit'] as String,
-    entries: (json['entries'] as List<dynamic>?)
+    entries:
+        (json['entries'] as List<dynamic>?)
             ?.map((e) => MeasurementEntry.fromJson(e as Map<String, dynamic>))
             .toList() ??
         [],
@@ -23,8 +21,8 @@ MeasurementCategory _$MeasurementCategoryFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$MeasurementCategoryToJson(MeasurementCategory instance) => <String, dynamic>{
-      'id': instance.id,
-      'name': instance.name,
-      'unit': instance.unit,
-      'entries': MeasurementCategory._nullValue(instance.entries),
-    };
+  'id': instance.id,
+  'name': instance.name,
+  'unit': instance.unit,
+  'entries': MeasurementCategory._nullValue(instance.entries),
+};
diff --git a/lib/models/measurements/measurement_entry.g.dart b/lib/models/measurements/measurement_entry.g.dart
index 7d53e35e..a0c73b73 100644
--- a/lib/models/measurements/measurement_entry.g.dart
+++ b/lib/models/measurements/measurement_entry.g.dart
@@ -20,7 +20,8 @@ MeasurementEntry _$MeasurementEntryFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$MeasurementEntryToJson(MeasurementEntry instance) => <String, dynamic>{
+Map<String, dynamic> _$MeasurementEntryToJson(MeasurementEntry instance) =>
+    <String, dynamic>{
       'id': instance.id,
       'category': instance.category,
       'date': dateToYYYYMMDD(instance.date),
diff --git a/lib/models/nutrition/ingredient.g.dart b/lib/models/nutrition/ingredient.g.dart
index 93678ed4..c862786c 100644
--- a/lib/models/nutrition/ingredient.g.dart
+++ b/lib/models/nutrition/ingredient.g.dart
@@ -25,7 +25,7 @@ Ingredient _$IngredientFromJson(Map<String, dynamic> json) {
       'fat',
       'fat_saturated',
       'fiber',
-      'sodium'
+      'sodium',
     ],
   );
   return Ingredient(
@@ -55,22 +55,22 @@ Ingredient _$IngredientFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$IngredientToJson(Ingredient instance) => <String, dynamic>{
-      'id': instance.id,
-      'remote_id': instance.remoteId,
-      'source_name': instance.sourceName,
-      'source_url': instance.sourceUrl,
-      'license_object_url': instance.licenseObjectURl,
-      'code': instance.code,
-      'name': instance.name,
-      'created': instance.created.toIso8601String(),
-      'energy': instance.energy,
-      'carbohydrates': numToString(instance.carbohydrates),
-      'carbohydrates_sugar': numToString(instance.carbohydratesSugar),
-      'protein': numToString(instance.protein),
-      'fat': numToString(instance.fat),
-      'fat_saturated': numToString(instance.fatSaturated),
-      'fiber': numToString(instance.fiber),
-      'sodium': numToString(instance.sodium),
-      'image': instance.image,
-      'thumbnails': instance.thumbnails,
-    };
+  'id': instance.id,
+  'remote_id': instance.remoteId,
+  'source_name': instance.sourceName,
+  'source_url': instance.sourceUrl,
+  'license_object_url': instance.licenseObjectURl,
+  'code': instance.code,
+  'name': instance.name,
+  'created': instance.created.toIso8601String(),
+  'energy': instance.energy,
+  'carbohydrates': numToString(instance.carbohydrates),
+  'carbohydrates_sugar': numToString(instance.carbohydratesSugar),
+  'protein': numToString(instance.protein),
+  'fat': numToString(instance.fat),
+  'fat_saturated': numToString(instance.fatSaturated),
+  'fiber': numToString(instance.fiber),
+  'sodium': numToString(instance.sodium),
+  'image': instance.image,
+  'thumbnails': instance.thumbnails,
+};
diff --git a/lib/models/nutrition/ingredient_image.g.dart b/lib/models/nutrition/ingredient_image.g.dart
index c28cc382..e772150b 100644
--- a/lib/models/nutrition/ingredient_image.g.dart
+++ b/lib/models/nutrition/ingredient_image.g.dart
@@ -20,7 +20,7 @@ IngredientImage _$IngredientImageFromJson(Map<String, dynamic> json) {
       'license_author_url',
       'license_title',
       'license_object_url',
-      'license_derivative_source_url'
+      'license_derivative_source_url',
     ],
   );
   return IngredientImage(
@@ -39,15 +39,15 @@ IngredientImage _$IngredientImageFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$IngredientImageToJson(IngredientImage instance) => <String, dynamic>{
-      'id': instance.id,
-      'uuid': instance.uuid,
-      'ingredient_id': instance.ingredientId,
-      'image': instance.url,
-      'size': instance.size,
-      'license': instance.licenseId,
-      'license_author': instance.author,
-      'license_author_url': instance.authorUrl,
-      'license_title': instance.title,
-      'license_object_url': instance.objectUrl,
-      'license_derivative_source_url': instance.derivativeSourceUrl,
-    };
+  'id': instance.id,
+  'uuid': instance.uuid,
+  'ingredient_id': instance.ingredientId,
+  'image': instance.url,
+  'size': instance.size,
+  'license': instance.licenseId,
+  'license_author': instance.author,
+  'license_author_url': instance.authorUrl,
+  'license_title': instance.title,
+  'license_object_url': instance.objectUrl,
+  'license_derivative_source_url': instance.derivativeSourceUrl,
+};
diff --git a/lib/models/nutrition/ingredient_image_thumbnails.g.dart b/lib/models/nutrition/ingredient_image_thumbnails.g.dart
index e58b8988..ba75fd01 100644
--- a/lib/models/nutrition/ingredient_image_thumbnails.g.dart
+++ b/lib/models/nutrition/ingredient_image_thumbnails.g.dart
@@ -15,7 +15,7 @@ IngredientImageThumbnails _$IngredientImageThumbnailsFromJson(Map<String, dynami
       'medium',
       'medium_cropped',
       'large',
-      'large_cropped'
+      'large_cropped',
     ],
   );
   return IngredientImageThumbnails(
diff --git a/lib/models/nutrition/ingredient_weight_unit.g.dart b/lib/models/nutrition/ingredient_weight_unit.g.dart
index d8829e2a..6356e8d3 100644
--- a/lib/models/nutrition/ingredient_weight_unit.g.dart
+++ b/lib/models/nutrition/ingredient_weight_unit.g.dart
@@ -7,10 +7,7 @@ part of 'ingredient_weight_unit.dart';
 // **************************************************************************
 
 IngredientWeightUnit _$IngredientWeightUnitFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'weight_unit', 'ingredient', 'grams', 'amount'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'weight_unit', 'ingredient', 'grams', 'amount']);
   return IngredientWeightUnit(
     id: (json['id'] as num).toInt(),
     weightUnit: WeightUnit.fromJson(json['weight_unit'] as Map<String, dynamic>),
diff --git a/lib/models/nutrition/log.g.dart b/lib/models/nutrition/log.g.dart
index 8d8587d2..1325e3a1 100644
--- a/lib/models/nutrition/log.g.dart
+++ b/lib/models/nutrition/log.g.dart
@@ -9,7 +9,14 @@ part of 'log.dart';
 Log _$LogFromJson(Map<String, dynamic> json) {
   $checkKeys(
     json,
-    requiredKeys: const ['id', 'plan', 'datetime', 'ingredient', 'weight_unit', 'amount'],
+    requiredKeys: const [
+      'id',
+      'plan',
+      'datetime',
+      'ingredient',
+      'weight_unit',
+      'amount',
+    ],
   );
   return Log(
     id: (json['id'] as num?)?.toInt(),
@@ -24,12 +31,12 @@ Log _$LogFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$LogToJson(Log instance) => <String, dynamic>{
-      'id': instance.id,
-      'meal': instance.mealId,
-      'plan': instance.planId,
-      'datetime': dateToUtcIso8601(instance.datetime),
-      'comment': instance.comment,
-      'ingredient': instance.ingredientId,
-      'weight_unit': instance.weightUnitId,
-      'amount': instance.amount,
-    };
+  'id': instance.id,
+  'meal': instance.mealId,
+  'plan': instance.planId,
+  'datetime': dateToUtcIso8601(instance.datetime),
+  'comment': instance.comment,
+  'ingredient': instance.ingredientId,
+  'weight_unit': instance.weightUnitId,
+  'amount': instance.amount,
+};
diff --git a/lib/models/nutrition/meal.g.dart b/lib/models/nutrition/meal.g.dart
index ee2b1a63..0edad8cd 100644
--- a/lib/models/nutrition/meal.g.dart
+++ b/lib/models/nutrition/meal.g.dart
@@ -7,14 +7,14 @@ part of 'meal.dart';
 // **************************************************************************
 
 Meal _$MealFromJson(Map<String, dynamic> json) => Meal(
-      id: (json['id'] as num?)?.toInt(),
-      time: stringToTimeNull(json['time'] as String?),
-      name: json['name'] as String?,
-    )..planId = (json['plan'] as num).toInt();
+  id: (json['id'] as num?)?.toInt(),
+  time: stringToTimeNull(json['time'] as String?),
+  name: json['name'] as String?,
+)..planId = (json['plan'] as num).toInt();
 
 Map<String, dynamic> _$MealToJson(Meal instance) => <String, dynamic>{
-      'id': instance.id,
-      'plan': instance.planId,
-      'time': timeToString(instance.time),
-      'name': instance.name,
-    };
+  'id': instance.id,
+  'plan': instance.planId,
+  'time': timeToString(instance.time),
+  'name': instance.name,
+};
diff --git a/lib/models/nutrition/meal_item.g.dart b/lib/models/nutrition/meal_item.g.dart
index 256f9cce..91b201ed 100644
--- a/lib/models/nutrition/meal_item.g.dart
+++ b/lib/models/nutrition/meal_item.g.dart
@@ -7,10 +7,7 @@ part of 'meal_item.dart';
 // **************************************************************************
 
 MealItem _$MealItemFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'amount'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'amount']);
   return MealItem(
     id: (json['id'] as num?)?.toInt(),
     mealId: (json['meal'] as num?)?.toInt(),
@@ -21,9 +18,9 @@ MealItem _$MealItemFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$MealItemToJson(MealItem instance) => <String, dynamic>{
-      'id': instance.id,
-      'meal': instance.mealId,
-      'ingredient': instance.ingredientId,
-      'weight_unit': instance.weightUnitId,
-      'amount': numToString(instance.amount),
-    };
+  'id': instance.id,
+  'meal': instance.mealId,
+  'ingredient': instance.ingredientId,
+  'weight_unit': instance.weightUnitId,
+  'amount': numToString(instance.amount),
+};
diff --git a/lib/models/nutrition/nutritional_plan.g.dart b/lib/models/nutrition/nutritional_plan.g.dart
index 742d3435..61cedaba 100644
--- a/lib/models/nutrition/nutritional_plan.g.dart
+++ b/lib/models/nutrition/nutritional_plan.g.dart
@@ -20,14 +20,15 @@ NutritionalPlan _$NutritionalPlanFromJson(Map<String, dynamic> json) {
       'goal_protein',
       'goal_carbohydrates',
       'goal_fat',
-      'goal_fiber'
+      'goal_fiber',
     ],
   );
   return NutritionalPlan(
     id: (json['id'] as num?)?.toInt(),
     description: json['description'] as String,
-    creationDate:
-        json['creation_date'] == null ? null : DateTime.parse(json['creation_date'] as String),
+    creationDate: json['creation_date'] == null
+        ? null
+        : DateTime.parse(json['creation_date'] as String),
     startDate: DateTime.parse(json['start'] as String),
     endDate: json['end'] == null ? null : DateTime.parse(json['end'] as String),
     onlyLogging: json['only_logging'] as bool? ?? false,
@@ -40,15 +41,15 @@ NutritionalPlan _$NutritionalPlanFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$NutritionalPlanToJson(NutritionalPlan instance) => <String, dynamic>{
-      'id': instance.id,
-      'description': instance.description,
-      'creation_date': dateToUtcIso8601(instance.creationDate),
-      'start': dateToYYYYMMDD(instance.startDate),
-      'end': dateToYYYYMMDD(instance.endDate),
-      'only_logging': instance.onlyLogging,
-      'goal_energy': instance.goalEnergy,
-      'goal_protein': instance.goalProtein,
-      'goal_carbohydrates': instance.goalCarbohydrates,
-      'goal_fat': instance.goalFat,
-      'goal_fiber': instance.goalFiber,
-    };
+  'id': instance.id,
+  'description': instance.description,
+  'creation_date': dateToUtcIso8601(instance.creationDate),
+  'start': dateToYYYYMMDD(instance.startDate),
+  'end': dateToYYYYMMDD(instance.endDate),
+  'only_logging': instance.onlyLogging,
+  'goal_energy': instance.goalEnergy,
+  'goal_protein': instance.goalProtein,
+  'goal_carbohydrates': instance.goalCarbohydrates,
+  'goal_fat': instance.goalFat,
+  'goal_fiber': instance.goalFiber,
+};
diff --git a/lib/models/nutrition/weight_unit.g.dart b/lib/models/nutrition/weight_unit.g.dart
index ba89171d..af7c8bed 100644
--- a/lib/models/nutrition/weight_unit.g.dart
+++ b/lib/models/nutrition/weight_unit.g.dart
@@ -7,17 +7,12 @@ part of 'weight_unit.dart';
 // **************************************************************************
 
 WeightUnit _$WeightUnitFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'name'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'name']);
   return WeightUnit(
     id: (json['id'] as num).toInt(),
     name: json['name'] as String,
   );
 }
 
-Map<String, dynamic> _$WeightUnitToJson(WeightUnit instance) => <String, dynamic>{
-      'id': instance.id,
-      'name': instance.name,
-    };
+Map<String, dynamic> _$WeightUnitToJson(WeightUnit instance) =>
+    <String, dynamic>{'id': instance.id, 'name': instance.name};
diff --git a/lib/models/user/profile.g.dart b/lib/models/user/profile.g.dart
index 1bc975c2..e3106444 100644
--- a/lib/models/user/profile.g.dart
+++ b/lib/models/user/profile.g.dart
@@ -9,7 +9,13 @@ part of 'profile.dart';
 Profile _$ProfileFromJson(Map<String, dynamic> json) {
   $checkKeys(
     json,
-    requiredKeys: const ['username', 'email_verified', 'is_trustworthy', 'weight_unit', 'email'],
+    requiredKeys: const [
+      'username',
+      'email_verified',
+      'is_trustworthy',
+      'weight_unit',
+      'email',
+    ],
   );
   return Profile(
     username: json['username'] as String,
@@ -21,9 +27,9 @@ Profile _$ProfileFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$ProfileToJson(Profile instance) => <String, dynamic>{
-      'username': instance.username,
-      'email_verified': instance.emailVerified,
-      'is_trustworthy': instance.isTrustworthy,
-      'weight_unit': instance.weightUnitStr,
-      'email': instance.email,
-    };
+  'username': instance.username,
+  'email_verified': instance.emailVerified,
+  'is_trustworthy': instance.isTrustworthy,
+  'weight_unit': instance.weightUnitStr,
+  'email': instance.email,
+};
diff --git a/lib/models/workouts/base_config.g.dart b/lib/models/workouts/base_config.g.dart
index 3a8889bf..c97f3899 100644
--- a/lib/models/workouts/base_config.g.dart
+++ b/lib/models/workouts/base_config.g.dart
@@ -17,7 +17,7 @@ BaseConfig _$BaseConfigFromJson(Map<String, dynamic> json) {
       'operation',
       'step',
       'repeat',
-      'requirements'
+      'requirements',
     ],
   );
   return BaseConfig(
@@ -32,7 +32,8 @@ BaseConfig _$BaseConfigFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$BaseConfigToJson(BaseConfig instance) => <String, dynamic>{
+Map<String, dynamic> _$BaseConfigToJson(BaseConfig instance) =>
+    <String, dynamic>{
       'slot_entry': instance.slotEntryId,
       'iteration': instance.iteration,
       'value': instance.value,
diff --git a/lib/models/workouts/day.g.dart b/lib/models/workouts/day.g.dart
index 000f7331..192ca0ec 100644
--- a/lib/models/workouts/day.g.dart
+++ b/lib/models/workouts/day.g.dart
@@ -18,7 +18,7 @@ Day _$DayFromJson(Map<String, dynamic> json) {
       'need_logs_to_advance',
       'type',
       'order',
-      'config'
+      'config',
     ],
   );
   return Day(
@@ -31,7 +31,8 @@ Day _$DayFromJson(Map<String, dynamic> json) {
     type: json['type'] as String? ?? 'custom',
     order: json['order'] as num? ?? 0,
     config: json['config'] ?? null,
-    slots: (json['slots'] as List<dynamic>?)
+    slots:
+        (json['slots'] as List<dynamic>?)
             ?.map((e) => Slot.fromJson(e as Map<String, dynamic>))
             .toList() ??
         [],
@@ -39,12 +40,12 @@ Day _$DayFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$DayToJson(Day instance) => <String, dynamic>{
-      'routine': instance.routineId,
-      'name': instance.name,
-      'description': instance.description,
-      'is_rest': instance.isRest,
-      'need_logs_to_advance': instance.needLogsToAdvance,
-      'type': instance.type,
-      'order': instance.order,
-      'config': instance.config,
-    };
+  'routine': instance.routineId,
+  'name': instance.name,
+  'description': instance.description,
+  'is_rest': instance.isRest,
+  'need_logs_to_advance': instance.needLogsToAdvance,
+  'type': instance.type,
+  'order': instance.order,
+  'config': instance.config,
+};
diff --git a/lib/models/workouts/day_data.g.dart b/lib/models/workouts/day_data.g.dart
index 08e08e19..4744c90b 100644
--- a/lib/models/workouts/day_data.g.dart
+++ b/lib/models/workouts/day_data.g.dart
@@ -7,16 +7,14 @@ part of 'day_data.dart';
 // **************************************************************************
 
 DayData _$DayDataFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['iteration', 'date', 'label'],
-  );
+  $checkKeys(json, requiredKeys: const ['iteration', 'date', 'label']);
   return DayData(
     iteration: (json['iteration'] as num).toInt(),
     date: DateTime.parse(json['date'] as String),
     label: json['label'] as String? ?? '',
     day: json['day'] == null ? null : Day.fromJson(json['day'] as Map<String, dynamic>),
-    slots: (json['slots'] as List<dynamic>?)
+    slots:
+        (json['slots'] as List<dynamic>?)
             ?.map((e) => SlotData.fromJson(e as Map<String, dynamic>))
             .toList() ??
         const [],
@@ -24,9 +22,9 @@ DayData _$DayDataFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$DayDataToJson(DayData instance) => <String, dynamic>{
-      'iteration': instance.iteration,
-      'date': instance.date.toIso8601String(),
-      'label': instance.label,
-      'day': instance.day,
-      'slots': instance.slots,
-    };
+  'iteration': instance.iteration,
+  'date': instance.date.toIso8601String(),
+  'label': instance.label,
+  'day': instance.day,
+  'slots': instance.slots,
+};
diff --git a/lib/models/workouts/log.g.dart b/lib/models/workouts/log.g.dart
index ec4b667c..803f1778 100644
--- a/lib/models/workouts/log.g.dart
+++ b/lib/models/workouts/log.g.dart
@@ -22,7 +22,7 @@ Log _$LogFromJson(Map<String, dynamic> json) {
       'weight',
       'weight_target',
       'weight_unit',
-      'date'
+      'date',
     ],
   );
   return Log(
@@ -44,19 +44,19 @@ Log _$LogFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$LogToJson(Log instance) => <String, dynamic>{
-      'id': instance.id,
-      'exercise': instance.exerciseId,
-      'routine': instance.routineId,
-      'session': instance.sessionId,
-      'iteration': instance.iteration,
-      'slot_entry': instance.slotEntryId,
-      'rir': instance.rir,
-      'rir_target': instance.rirTarget,
-      'repetitions': instance.repetitions,
-      'repetitions_target': instance.repetitionsTarget,
-      'repetitions_unit': instance.repetitionsUnitId,
-      'weight': numToString(instance.weight),
-      'weight_target': numToString(instance.weightTarget),
-      'weight_unit': instance.weightUnitId,
-      'date': dateToUtcIso8601(instance.date),
-    };
+  'id': instance.id,
+  'exercise': instance.exerciseId,
+  'routine': instance.routineId,
+  'session': instance.sessionId,
+  'iteration': instance.iteration,
+  'slot_entry': instance.slotEntryId,
+  'rir': instance.rir,
+  'rir_target': instance.rirTarget,
+  'repetitions': instance.repetitions,
+  'repetitions_target': instance.repetitionsTarget,
+  'repetitions_unit': instance.repetitionsUnitId,
+  'weight': numToString(instance.weight),
+  'weight_target': numToString(instance.weightTarget),
+  'weight_unit': instance.weightUnitId,
+  'date': dateToUtcIso8601(instance.date),
+};
diff --git a/lib/models/workouts/repetition_unit.g.dart b/lib/models/workouts/repetition_unit.g.dart
index bd9ab9f2..d234bc55 100644
--- a/lib/models/workouts/repetition_unit.g.dart
+++ b/lib/models/workouts/repetition_unit.g.dart
@@ -7,17 +7,12 @@ part of 'repetition_unit.dart';
 // **************************************************************************
 
 RepetitionUnit _$RepetitionUnitFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'name'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'name']);
   return RepetitionUnit(
     id: (json['id'] as num).toInt(),
     name: json['name'] as String,
   );
 }
 
-Map<String, dynamic> _$RepetitionUnitToJson(RepetitionUnit instance) => <String, dynamic>{
-      'id': instance.id,
-      'name': instance.name,
-    };
+Map<String, dynamic> _$RepetitionUnitToJson(RepetitionUnit instance) =>
+    <String, dynamic>{'id': instance.id, 'name': instance.name};
diff --git a/lib/models/workouts/routine.g.dart b/lib/models/workouts/routine.g.dart
index 44649f04..d6385c8b 100644
--- a/lib/models/workouts/routine.g.dart
+++ b/lib/models/workouts/routine.g.dart
@@ -19,11 +19,13 @@ Routine _$RoutineFromJson(Map<String, dynamic> json) {
     end: json['end'] == null ? null : DateTime.parse(json['end'] as String),
     fitInWeek: json['fit_in_week'] as bool? ?? false,
     description: json['description'] as String?,
-    days: (json['days'] as List<dynamic>?)
+    days:
+        (json['days'] as List<dynamic>?)
             ?.map((e) => Day.fromJson(e as Map<String, dynamic>))
             .toList() ??
         const [],
-    sessions: (json['sessions'] as List<dynamic>?)
+    sessions:
+        (json['sessions'] as List<dynamic>?)
             ?.map((e) => WorkoutSessionApi.fromJson(e as Map<String, dynamic>))
             .toList() ??
         [],
@@ -31,10 +33,10 @@ Routine _$RoutineFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$RoutineToJson(Routine instance) => <String, dynamic>{
-      'created': dateToUtcIso8601(instance.created),
-      'name': instance.name,
-      'description': instance.description,
-      'fit_in_week': instance.fitInWeek,
-      'start': dateToYYYYMMDD(instance.start),
-      'end': dateToYYYYMMDD(instance.end),
-    };
+  'created': dateToUtcIso8601(instance.created),
+  'name': instance.name,
+  'description': instance.description,
+  'fit_in_week': instance.fitInWeek,
+  'start': dateToYYYYMMDD(instance.start),
+  'end': dateToYYYYMMDD(instance.end),
+};
diff --git a/lib/models/workouts/session.g.dart b/lib/models/workouts/session.g.dart
index 3991664a..7cfc9d89 100644
--- a/lib/models/workouts/session.g.dart
+++ b/lib/models/workouts/session.g.dart
@@ -19,7 +19,8 @@ WorkoutSession _$WorkoutSessionFromJson(Map<String, dynamic> json) {
     notes: json['notes'] as String? ?? '',
     timeStart: stringToTimeNull(json['time_start'] as String?),
     timeEnd: stringToTimeNull(json['time_end'] as String?),
-    logs: (json['logs'] as List<dynamic>?)
+    logs:
+        (json['logs'] as List<dynamic>?)
             ?.map((e) => Log.fromJson(e as Map<String, dynamic>))
             .toList() ??
         [],
@@ -28,12 +29,12 @@ WorkoutSession _$WorkoutSessionFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$WorkoutSessionToJson(WorkoutSession instance) => <String, dynamic>{
-      'id': instance.id,
-      'routine': instance.routineId,
-      'day': instance.dayId,
-      'date': dateToYYYYMMDD(instance.date),
-      'impression': numToString(instance.impression),
-      'notes': instance.notes,
-      'time_start': timeToString(instance.timeStart),
-      'time_end': timeToString(instance.timeEnd),
-    };
+  'id': instance.id,
+  'routine': instance.routineId,
+  'day': instance.dayId,
+  'date': dateToYYYYMMDD(instance.date),
+  'impression': numToString(instance.impression),
+  'notes': instance.notes,
+  'time_start': timeToString(instance.timeStart),
+  'time_end': timeToString(instance.timeEnd),
+};
diff --git a/lib/models/workouts/session_api.g.dart b/lib/models/workouts/session_api.g.dart
index 57ec196e..1e75cdcd 100644
--- a/lib/models/workouts/session_api.g.dart
+++ b/lib/models/workouts/session_api.g.dart
@@ -7,13 +7,11 @@ part of 'session_api.dart';
 // **************************************************************************
 
 WorkoutSessionApi _$WorkoutSessionApiFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['session'],
-  );
+  $checkKeys(json, requiredKeys: const ['session']);
   return WorkoutSessionApi(
     session: WorkoutSession.fromJson(json['session'] as Map<String, dynamic>),
-    logs: (json['logs'] as List<dynamic>?)
+    logs:
+        (json['logs'] as List<dynamic>?)
             ?.map((e) => Log.fromJson(e as Map<String, dynamic>))
             .toList() ??
         [],
@@ -21,5 +19,5 @@ WorkoutSessionApi _$WorkoutSessionApiFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$WorkoutSessionApiToJson(WorkoutSessionApi instance) => <String, dynamic>{
-      'session': instance.session,
-    };
+  'session': instance.session,
+};
diff --git a/lib/models/workouts/set_config_data.g.dart b/lib/models/workouts/set_config_data.g.dart
index d2a65835..ee2241d9 100644
--- a/lib/models/workouts/set_config_data.g.dart
+++ b/lib/models/workouts/set_config_data.g.dart
@@ -29,7 +29,7 @@ SetConfigData _$SetConfigDataFromJson(Map<String, dynamic> json) {
       'rpe',
       'rest',
       'max_rest',
-      'comment'
+      'comment',
     ],
   );
   return SetConfigData(
@@ -61,24 +61,24 @@ SetConfigData _$SetConfigDataFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$SetConfigDataToJson(SetConfigData instance) => <String, dynamic>{
-      'exercise': instance.exerciseId,
-      'slot_entry_id': instance.slotEntryId,
-      'type': instance.type,
-      'text_repr': instance.textRepr,
-      'sets': instance.nrOfSets,
-      'max_sets': instance.maxNrOfSets,
-      'weight': instance.weight,
-      'max_weight': instance.maxWeight,
-      'weight_unit': instance.weightUnitId,
-      'weight_rounding': instance.weightRounding,
-      'repetitions': instance.repetitions,
-      'max_repetitions': instance.maxRepetitions,
-      'repetitions_unit': instance.repetitionsUnitId,
-      'repetitions_rounding': instance.repetitionsRounding,
-      'rir': instance.rir,
-      'max_rir': instance.maxRir,
-      'rpe': instance.rpe,
-      'rest': instance.restTime,
-      'max_rest': instance.maxRestTime,
-      'comment': instance.comment,
-    };
+  'exercise': instance.exerciseId,
+  'slot_entry_id': instance.slotEntryId,
+  'type': instance.type,
+  'text_repr': instance.textRepr,
+  'sets': instance.nrOfSets,
+  'max_sets': instance.maxNrOfSets,
+  'weight': instance.weight,
+  'max_weight': instance.maxWeight,
+  'weight_unit': instance.weightUnitId,
+  'weight_rounding': instance.weightRounding,
+  'repetitions': instance.repetitions,
+  'max_repetitions': instance.maxRepetitions,
+  'repetitions_unit': instance.repetitionsUnitId,
+  'repetitions_rounding': instance.repetitionsRounding,
+  'rir': instance.rir,
+  'max_rir': instance.maxRir,
+  'rpe': instance.rpe,
+  'rest': instance.restTime,
+  'max_rest': instance.maxRestTime,
+  'comment': instance.comment,
+};
diff --git a/lib/models/workouts/slot.g.dart b/lib/models/workouts/slot.g.dart
index 0d1085af..c059c53a 100644
--- a/lib/models/workouts/slot.g.dart
+++ b/lib/models/workouts/slot.g.dart
@@ -7,25 +7,24 @@ part of 'slot.dart';
 // **************************************************************************
 
 Slot _$SlotFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'order', 'comment', 'config'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'order', 'comment', 'config']);
   return Slot(
-    id: (json['id'] as num?)?.toInt(),
-    day: (json['day'] as num).toInt(),
-    comment: json['comment'] as String? ?? '',
-    order: (json['order'] as num).toInt(),
-    config: json['config'],
-  )..entries = (json['entries'] as List<dynamic>?)
-          ?.map((e) => SlotEntry.fromJson(e as Map<String, dynamic>))
-          .toList() ??
-      [];
+      id: (json['id'] as num?)?.toInt(),
+      day: (json['day'] as num).toInt(),
+      comment: json['comment'] as String? ?? '',
+      order: (json['order'] as num).toInt(),
+      config: json['config'],
+    )
+    ..entries =
+        (json['entries'] as List<dynamic>?)
+            ?.map((e) => SlotEntry.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        [];
 }
 
 Map<String, dynamic> _$SlotToJson(Slot instance) => <String, dynamic>{
-      'day': instance.day,
-      'order': instance.order,
-      'comment': instance.comment,
-      'config': instance.config,
-    };
+  'day': instance.day,
+  'order': instance.order,
+  'comment': instance.comment,
+  'config': instance.config,
+};
diff --git a/lib/models/workouts/slot_data.g.dart b/lib/models/workouts/slot_data.g.dart
index cafada4a..29b7ebaa 100644
--- a/lib/models/workouts/slot_data.g.dart
+++ b/lib/models/workouts/slot_data.g.dart
@@ -7,16 +7,14 @@ part of 'slot_data.dart';
 // **************************************************************************
 
 SlotData _$SlotDataFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['comment', 'is_superset', 'exercises', 'sets'],
-  );
+  $checkKeys(json, requiredKeys: const ['comment', 'is_superset', 'exercises', 'sets']);
   return SlotData(
     comment: json['comment'] as String,
     isSuperset: json['is_superset'] as bool,
     exerciseIds:
         (json['exercises'] as List<dynamic>?)?.map((e) => (e as num).toInt()).toList() ?? const [],
-    setConfigs: (json['sets'] as List<dynamic>?)
+    setConfigs:
+        (json['sets'] as List<dynamic>?)
             ?.map((e) => SetConfigData.fromJson(e as Map<String, dynamic>))
             .toList() ??
         const [],
@@ -24,8 +22,8 @@ SlotData _$SlotDataFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$SlotDataToJson(SlotData instance) => <String, dynamic>{
-      'comment': instance.comment,
-      'is_superset': instance.isSuperset,
-      'exercises': instance.exerciseIds,
-      'sets': instance.setConfigs,
-    };
+  'comment': instance.comment,
+  'is_superset': instance.isSuperset,
+  'exercises': instance.exerciseIds,
+  'sets': instance.setConfigs,
+};
diff --git a/lib/models/workouts/slot_entry.g.dart b/lib/models/workouts/slot_entry.g.dart
index 71be96ab..5de52481 100644
--- a/lib/models/workouts/slot_entry.g.dart
+++ b/lib/models/workouts/slot_entry.g.dart
@@ -20,7 +20,7 @@ SlotEntry _$SlotEntryFromJson(Map<String, dynamic> json) {
       'repetition_rounding',
       'weight_unit',
       'weight_rounding',
-      'config'
+      'config',
     ],
   );
   return SlotEntry(
@@ -34,43 +34,53 @@ SlotEntry _$SlotEntryFromJson(Map<String, dynamic> json) {
     weightUnitId: (json['weight_unit'] as num?)?.toInt(),
     weightRounding: stringToNumNull(json['weight_rounding'] as String?),
     comment: json['comment'] as String,
-    weightConfigs: (json['weight_configs'] as List<dynamic>?)
+    weightConfigs:
+        (json['weight_configs'] as List<dynamic>?)
             ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
             .toList() ??
         [],
-    maxWeightConfigs: (json['max_weight_configs'] as List<dynamic>?)
+    maxWeightConfigs:
+        (json['max_weight_configs'] as List<dynamic>?)
             ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
             .toList() ??
         [],
-    nrOfSetsConfigs: (json['set_nr_configs'] as List<dynamic>?)
+    nrOfSetsConfigs:
+        (json['set_nr_configs'] as List<dynamic>?)
             ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
             .toList() ??
         [],
-    maxNrOfSetsConfigs: (json['max_set_nr_configs'] as List<dynamic>?)
+    maxNrOfSetsConfigs:
+        (json['max_set_nr_configs'] as List<dynamic>?)
             ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
             .toList() ??
         [],
-    rirConfigs: (json['rir_configs'] as List<dynamic>?)
+    rirConfigs:
+        (json['rir_configs'] as List<dynamic>?)
             ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
             .toList() ??
         [],
-    maxRirConfigs: (json['max_rir_configs'] as List<dynamic>?)
+    maxRirConfigs:
+        (json['max_rir_configs'] as List<dynamic>?)
             ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
             .toList() ??
         [],
-    restTimeConfigs: (json['rest_configs'] as List<dynamic>?)
+    restTimeConfigs:
+        (json['rest_configs'] as List<dynamic>?)
             ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
             .toList() ??
         [],
-    maxRestTimeConfigs: (json['max_rest_configs'] as List<dynamic>?)
+    maxRestTimeConfigs:
+        (json['max_rest_configs'] as List<dynamic>?)
             ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
             .toList() ??
         [],
-    repetitionsConfigs: (json['repetitions_configs'] as List<dynamic>?)
+    repetitionsConfigs:
+        (json['repetitions_configs'] as List<dynamic>?)
             ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
             .toList() ??
         [],
-    maxRepetitionsConfigs: (json['max_repetitions_configs'] as List<dynamic>?)
+    maxRepetitionsConfigs:
+        (json['max_repetitions_configs'] as List<dynamic>?)
             ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
             .toList() ??
         [],
@@ -78,14 +88,14 @@ SlotEntry _$SlotEntryFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$SlotEntryToJson(SlotEntry instance) => <String, dynamic>{
-      'slot': instance.slotId,
-      'order': instance.order,
-      'comment': instance.comment,
-      'type': instance.type,
-      'exercise': instance.exerciseId,
-      'repetition_unit': instance.repetitionUnitId,
-      'repetition_rounding': instance.repetitionRounding,
-      'weight_unit': instance.weightUnitId,
-      'weight_rounding': instance.weightRounding,
-      'config': instance.config,
-    };
+  'slot': instance.slotId,
+  'order': instance.order,
+  'comment': instance.comment,
+  'type': instance.type,
+  'exercise': instance.exerciseId,
+  'repetition_unit': instance.repetitionUnitId,
+  'repetition_rounding': instance.repetitionRounding,
+  'weight_unit': instance.weightUnitId,
+  'weight_rounding': instance.weightRounding,
+  'config': instance.config,
+};
diff --git a/lib/models/workouts/weight_unit.g.dart b/lib/models/workouts/weight_unit.g.dart
index ba89171d..af7c8bed 100644
--- a/lib/models/workouts/weight_unit.g.dart
+++ b/lib/models/workouts/weight_unit.g.dart
@@ -7,17 +7,12 @@ part of 'weight_unit.dart';
 // **************************************************************************
 
 WeightUnit _$WeightUnitFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'name'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'name']);
   return WeightUnit(
     id: (json['id'] as num).toInt(),
     name: json['name'] as String,
   );
 }
 
-Map<String, dynamic> _$WeightUnitToJson(WeightUnit instance) => <String, dynamic>{
-      'id': instance.id,
-      'name': instance.name,
-    };
+Map<String, dynamic> _$WeightUnitToJson(WeightUnit instance) =>
+    <String, dynamic>{'id': instance.id, 'name': instance.name};

From a76ca9ae36a97dce6e4992233162e56622218cad Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Mon, 6 Oct 2025 21:00:48 +0200
Subject: [PATCH 18/29] Update license notice localization

This keeps the main info text in one block, otherwise translating these
can get tricky
---
 lib/l10n/app_en.arb                           | 10 ++-----
 .../add_exercise/license_info_widget.dart     | 26 ++++++-------------
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index f5a96603..ab3ebb6f 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -769,14 +769,8 @@
   "@imageDetailsImageType": {
     "description": "Label for image type selector"
   },
-  "imageDetailsLicenseNoticePrefix": "By submitting this image, you agree to release it under the ",
-  "@imageDetailsLicenseNoticePrefix": {
-    "description": "First part of license notice text"
-  },
-  "imageDetailsLicenseNoticeSuffix": " The image must be either your own work or the author must have released it under a license compatible with CC BY-SA 4.0.",
-  "@imageDetailsLicenseNoticeSuffix": {
-    "description": "Second part of license notice text"
-  },
+  "imageDetailsLicenseNotice": "By submitting this image, you agree to release it under the CC-BY-SA-4. The image must be either your own work or the author must have released it under a license compatible with it.",
+  "imageDetailsLicenseNoticeLinkToLicense": "See license text.",
   "add": "add",
   "@add": {
     "description": "Add button text"
diff --git a/lib/widgets/add_exercise/license_info_widget.dart b/lib/widgets/add_exercise/license_info_widget.dart
index 146a2e4c..59e9609b 100644
--- a/lib/widgets/add_exercise/license_info_widget.dart
+++ b/lib/widgets/add_exercise/license_info_widget.dart
@@ -15,35 +15,28 @@ class LicenseInfoWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
     final colorScheme = Theme.of(context).colorScheme;
 
     return Container(
       padding: const EdgeInsets.all(12),
       decoration: BoxDecoration(
-        color: colorScheme.surfaceVariant,
+        color: colorScheme.surfaceContainerHighest,
         borderRadius: BorderRadius.circular(4),
         border: Border.all(color: colorScheme.outline),
       ),
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Icon(
-            Icons.info_outline,
-            size: 20,
-            color: colorScheme.onSurfaceVariant,
-          ),
+          Icon(Icons.info_outline, size: 20, color: colorScheme.onSurfaceVariant),
           const SizedBox(width: 8),
+
           Expanded(
             child: RichText(
               text: TextSpan(
-                style: TextStyle(
-                  fontSize: 12,
-                  color: colorScheme.onSurfaceVariant,
-                ),
+                style: TextStyle(fontSize: 12, color: colorScheme.onSurfaceVariant),
                 children: [
-                  TextSpan(
-                    text: AppLocalizations.of(context).imageDetailsLicenseNoticePrefix,
-                  ),
+                  TextSpan(text: i18n.imageDetailsLicenseNotice),
                   WidgetSpan(
                     child: GestureDetector(
                       onTap: () async {
@@ -53,7 +46,7 @@ class LicenseInfoWidget extends StatelessWidget {
                         }
                       },
                       child: Text(
-                        'CC BY-SA 4.0',
+                        i18n.imageDetailsLicenseNoticeLinkToLicense,
                         style: TextStyle(
                           fontSize: 12,
                           color: colorScheme.primary,
@@ -63,9 +56,6 @@ class LicenseInfoWidget extends StatelessWidget {
                       ),
                     ),
                   ),
-                  TextSpan(
-                    text: AppLocalizations.of(context).imageDetailsLicenseNoticeSuffix,
-                  ),
                 ],
               ),
             ),
@@ -74,4 +64,4 @@ class LicenseInfoWidget extends StatelessWidget {
       ),
     );
   }
-}
\ No newline at end of file
+}

From 6b6afbb5288c33fc54d9f1577509317d5e9e8306 Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Wed, 8 Oct 2025 12:46:34 +0200
Subject: [PATCH 19/29] Update Podfile.lock

---
 macos/Podfile.lock | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/macos/Podfile.lock b/macos/Podfile.lock
index b2f16cb7..38ef6c65 100644
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@@ -1,6 +1,4 @@
 PODS:
-  - device_info_plus (0.0.1):
-    - FlutterMacOS
   - file_selector_macos (0.0.1):
     - FlutterMacOS
   - flutter_zxing (0.0.1):
@@ -48,7 +46,6 @@ PODS:
     - FlutterMacOS
 
 DEPENDENCIES:
-  - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
   - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`)
   - flutter_zxing (from `Flutter/ephemeral/.symlinks/plugins/flutter_zxing/macos`)
   - FlutterMacOS (from `Flutter/ephemeral`)
@@ -65,8 +62,6 @@ SPEC REPOS:
     - sqlite3
 
 EXTERNAL SOURCES:
-  device_info_plus:
-    :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos
   file_selector_macos:
     :path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos
   flutter_zxing:
@@ -89,7 +84,6 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin
 
 SPEC CHECKSUMS:
-  device_info_plus: 4fb280989f669696856f8b129e4a5e3cd6c48f76
   file_selector_macos: 6280b52b459ae6c590af5d78fc35c7267a3c4b31
   flutter_zxing: 91e9d17c79c60860450e8879cced0ec54f6a2601
   FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1

From 0add2a6bd1a6123d6f7769946705b4da9bae1274 Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Wed, 8 Oct 2025 14:03:25 +0200
Subject: [PATCH 20/29] Extract url validator to its own file

---
 lib/core/validators.dart             |   29 +
 lib/helpers/exercises/forms.dart     |   36 -
 lib/widgets/auth/server_field.dart   |   24 +-
 test/core/validators_test.dart       |   49 +
 test/core/validators_test.mocks.dart | 2799 ++++++++++++++++++++++++++
 5 files changed, 2884 insertions(+), 53 deletions(-)
 create mode 100644 lib/core/validators.dart
 delete mode 100644 lib/helpers/exercises/forms.dart
 create mode 100644 test/core/validators_test.dart
 create mode 100644 test/core/validators_test.mocks.dart

diff --git a/lib/core/validators.dart b/lib/core/validators.dart
new file mode 100644
index 00000000..c9e3e835
--- /dev/null
+++ b/lib/core/validators.dart
@@ -0,0 +1,29 @@
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+String? validateUrl(String? value, AppLocalizations i18n, {bool required = true}) {
+  // Required?
+  if (required && (value == null || value.trim().isEmpty)) {
+    return i18n.enterValue;
+  }
+
+  if (!required && (value == null || value.trim().isEmpty)) {
+    return null;
+  }
+  value = value!.trim();
+
+  if (!value.startsWith('http://') && !value.startsWith('https://')) {
+    return i18n.invalidUrl;
+  }
+
+  // Try to parse as URI
+  try {
+    final uri = Uri.parse(value);
+    if (!uri.hasScheme || !uri.hasAuthority) {
+      return i18n.invalidUrl;
+    }
+  } catch (e) {
+    return i18n.invalidUrl;
+  }
+
+  return null;
+}
diff --git a/lib/helpers/exercises/forms.dart b/lib/helpers/exercises/forms.dart
deleted file mode 100644
index 33c7ad0d..00000000
--- a/lib/helpers/exercises/forms.dart
+++ /dev/null
@@ -1,36 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-
-/// The amount of characters an exercise description needs to have
-const MIN_CHARS_DESCRIPTION = 40;
-
-/// The amount of characters an exercise name needs to have
-const MIN_CHARS_NAME = 5;
-const MAX_CHARS_NAME = 40;
-
-String? validateName(String? name, BuildContext context) {
-  if (name!.isEmpty) {
-    return AppLocalizations.of(context).enterValue;
-  }
-
-  if (name.length < MIN_CHARS_NAME || name.length > MAX_CHARS_NAME) {
-    return AppLocalizations.of(context).enterCharacters(
-      MIN_CHARS_NAME.toString(),
-      MAX_CHARS_NAME.toString(),
-    );
-  }
-
-  return null;
-}
-
-String? validateExerciseDescription(String? name, BuildContext context) {
-  if (name!.isEmpty) {
-    return AppLocalizations.of(context).enterValue;
-  }
-
-  if (name.length < MIN_CHARS_DESCRIPTION) {
-    return AppLocalizations.of(context).enterMinCharacters(MIN_CHARS_DESCRIPTION.toString());
-  }
-
-  return null;
-}
diff --git a/lib/widgets/auth/server_field.dart b/lib/widgets/auth/server_field.dart
index 3ebe89d1..6a7fb39f 100644
--- a/lib/widgets/auth/server_field.dart
+++ b/lib/widgets/auth/server_field.dart
@@ -1,36 +1,26 @@
 import 'package:flutter/material.dart';
+import 'package:wger/core/validators.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
 class ServerField extends StatelessWidget {
   final TextEditingController controller;
   final Function(String?) onSaved;
 
-  const ServerField({
-    required this.controller,
-    required this.onSaved,
-    super.key,
-  });
+  const ServerField({required this.controller, required this.onSaved, super.key});
 
   @override
   Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
     return TextFormField(
       key: const Key('inputServer'),
       decoration: InputDecoration(
-        labelText: AppLocalizations.of(context).customServerUrl,
-        helperText: AppLocalizations.of(context).customServerHint,
+        labelText: i18n.customServerUrl,
+        helperText: i18n.customServerHint,
         helperMaxLines: 4,
       ),
       controller: controller,
-      validator: (value) {
-        if (Uri.tryParse(value!) == null) {
-          return AppLocalizations.of(context).invalidUrl;
-        }
-
-        if (value.isEmpty || !value.contains('http')) {
-          return AppLocalizations.of(context).invalidUrl;
-        }
-        return null;
-      },
+      validator: (value) => validateUrl(value, i18n, required: true),
       onSaved: onSaved,
     );
   }
diff --git a/test/core/validators_test.dart b/test/core/validators_test.dart
new file mode 100644
index 00000000..ffa4cdf1
--- /dev/null
+++ b/test/core/validators_test.dart
@@ -0,0 +1,49 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:wger/core/validators.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import 'validators_test.mocks.dart';
+
+@GenerateMocks([AppLocalizations])
+void main() {
+  MockAppLocalizations mockI18n = MockAppLocalizations();
+
+  setUp(() {
+    mockI18n = MockAppLocalizations();
+
+    when(mockI18n.enterValue).thenReturn('Please enter a value');
+    when(mockI18n.invalidUrl).thenReturn('Invalid URL');
+  });
+
+  test('Required field empty returns error', () {
+    final result = validateUrl('', mockI18n, required: true);
+    expect(result, isNotNull);
+  });
+
+  test('Optional field empty returns no error', () {
+    final result = validateUrl('', mockI18n, required: false);
+    expect(result, isNull);
+  });
+
+  test('Invalid URL without http/https returns error', () {
+    final result = validateUrl('www.example.com', mockI18n);
+    expect(result, isNotNull);
+  });
+
+  test('Invalid URL with wrong protocol returns error', () {
+    final result = validateUrl('gopher://', mockI18n);
+    expect(result, isNotNull);
+  });
+
+  test('Valid http URL returns no error', () {
+    final result = validateUrl('http://example.com', mockI18n);
+    expect(result, isNull);
+  });
+
+  test('Valid https URL returns no error', () {
+    final result = validateUrl('https://example.com', mockI18n);
+    expect(result, isNull);
+  });
+}
diff --git a/test/core/validators_test.mocks.dart b/test/core/validators_test.mocks.dart
new file mode 100644
index 00000000..5c46a756
--- /dev/null
+++ b/test/core/validators_test.mocks.dart
@@ -0,0 +1,2799 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/core/validators_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i3;
+import 'package:wger/l10n/generated/app_localizations.dart' as _i2;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+/// A class which mocks [AppLocalizations].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockAppLocalizations extends _i1.Mock implements _i2.AppLocalizations {
+  MockAppLocalizations() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get localeName =>
+      (super.noSuchMethod(
+            Invocation.getter(#localeName),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#localeName)),
+          )
+          as String);
+
+  @override
+  String get userProfile =>
+      (super.noSuchMethod(
+            Invocation.getter(#userProfile),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#userProfile)),
+          )
+          as String);
+
+  @override
+  String get login =>
+      (super.noSuchMethod(
+            Invocation.getter(#login),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#login)),
+          )
+          as String);
+
+  @override
+  String get logout =>
+      (super.noSuchMethod(
+            Invocation.getter(#logout),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#logout)),
+          )
+          as String);
+
+  @override
+  String get register =>
+      (super.noSuchMethod(
+            Invocation.getter(#register),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#register)),
+          )
+          as String);
+
+  @override
+  String get useDefaultServer =>
+      (super.noSuchMethod(
+            Invocation.getter(#useDefaultServer),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#useDefaultServer)),
+          )
+          as String);
+
+  @override
+  String get useCustomServer =>
+      (super.noSuchMethod(
+            Invocation.getter(#useCustomServer),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#useCustomServer)),
+          )
+          as String);
+
+  @override
+  String get invalidUrl =>
+      (super.noSuchMethod(
+            Invocation.getter(#invalidUrl),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#invalidUrl)),
+          )
+          as String);
+
+  @override
+  String get usernameValidChars =>
+      (super.noSuchMethod(
+            Invocation.getter(#usernameValidChars),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#usernameValidChars)),
+          )
+          as String);
+
+  @override
+  String get passwordsDontMatch =>
+      (super.noSuchMethod(
+            Invocation.getter(#passwordsDontMatch),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#passwordsDontMatch)),
+          )
+          as String);
+
+  @override
+  String get passwordTooShort =>
+      (super.noSuchMethod(
+            Invocation.getter(#passwordTooShort),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#passwordTooShort)),
+          )
+          as String);
+
+  @override
+  String get selectAvailablePlates =>
+      (super.noSuchMethod(
+            Invocation.getter(#selectAvailablePlates),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#selectAvailablePlates)),
+          )
+          as String);
+
+  @override
+  String get barWeight =>
+      (super.noSuchMethod(
+            Invocation.getter(#barWeight),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#barWeight)),
+          )
+          as String);
+
+  @override
+  String get useColors =>
+      (super.noSuchMethod(
+            Invocation.getter(#useColors),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#useColors)),
+          )
+          as String);
+
+  @override
+  String get password =>
+      (super.noSuchMethod(
+            Invocation.getter(#password),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#password)),
+          )
+          as String);
+
+  @override
+  String get confirmPassword =>
+      (super.noSuchMethod(
+            Invocation.getter(#confirmPassword),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#confirmPassword)),
+          )
+          as String);
+
+  @override
+  String get invalidEmail =>
+      (super.noSuchMethod(
+            Invocation.getter(#invalidEmail),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#invalidEmail)),
+          )
+          as String);
+
+  @override
+  String get email =>
+      (super.noSuchMethod(
+            Invocation.getter(#email),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#email)),
+          )
+          as String);
+
+  @override
+  String get username =>
+      (super.noSuchMethod(
+            Invocation.getter(#username),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#username)),
+          )
+          as String);
+
+  @override
+  String get invalidUsername =>
+      (super.noSuchMethod(
+            Invocation.getter(#invalidUsername),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#invalidUsername)),
+          )
+          as String);
+
+  @override
+  String get useApiToken =>
+      (super.noSuchMethod(
+            Invocation.getter(#useApiToken),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#useApiToken)),
+          )
+          as String);
+
+  @override
+  String get useUsernameAndPassword =>
+      (super.noSuchMethod(
+            Invocation.getter(#useUsernameAndPassword),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#useUsernameAndPassword)),
+          )
+          as String);
+
+  @override
+  String get apiToken =>
+      (super.noSuchMethod(
+            Invocation.getter(#apiToken),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#apiToken)),
+          )
+          as String);
+
+  @override
+  String get invalidApiToken =>
+      (super.noSuchMethod(
+            Invocation.getter(#invalidApiToken),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#invalidApiToken)),
+          )
+          as String);
+
+  @override
+  String get apiTokenValidChars =>
+      (super.noSuchMethod(
+            Invocation.getter(#apiTokenValidChars),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#apiTokenValidChars)),
+          )
+          as String);
+
+  @override
+  String get customServerUrl =>
+      (super.noSuchMethod(
+            Invocation.getter(#customServerUrl),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#customServerUrl)),
+          )
+          as String);
+
+  @override
+  String get customServerHint =>
+      (super.noSuchMethod(
+            Invocation.getter(#customServerHint),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#customServerHint)),
+          )
+          as String);
+
+  @override
+  String get reset =>
+      (super.noSuchMethod(
+            Invocation.getter(#reset),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#reset)),
+          )
+          as String);
+
+  @override
+  String get registerInstead =>
+      (super.noSuchMethod(
+            Invocation.getter(#registerInstead),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#registerInstead)),
+          )
+          as String);
+
+  @override
+  String get loginInstead =>
+      (super.noSuchMethod(
+            Invocation.getter(#loginInstead),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#loginInstead)),
+          )
+          as String);
+
+  @override
+  String get labelBottomNavWorkout =>
+      (super.noSuchMethod(
+            Invocation.getter(#labelBottomNavWorkout),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#labelBottomNavWorkout)),
+          )
+          as String);
+
+  @override
+  String get labelBottomNavNutrition =>
+      (super.noSuchMethod(
+            Invocation.getter(#labelBottomNavNutrition),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#labelBottomNavNutrition)),
+          )
+          as String);
+
+  @override
+  String get labelWorkoutLogs =>
+      (super.noSuchMethod(
+            Invocation.getter(#labelWorkoutLogs),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#labelWorkoutLogs)),
+          )
+          as String);
+
+  @override
+  String get labelWorkoutPlan =>
+      (super.noSuchMethod(
+            Invocation.getter(#labelWorkoutPlan),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#labelWorkoutPlan)),
+          )
+          as String);
+
+  @override
+  String get labelDashboard =>
+      (super.noSuchMethod(
+            Invocation.getter(#labelDashboard),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#labelDashboard)),
+          )
+          as String);
+
+  @override
+  String get success =>
+      (super.noSuchMethod(
+            Invocation.getter(#success),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#success)),
+          )
+          as String);
+
+  @override
+  String get successfullyDeleted =>
+      (super.noSuchMethod(
+            Invocation.getter(#successfullyDeleted),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#successfullyDeleted)),
+          )
+          as String);
+
+  @override
+  String get successfullySaved =>
+      (super.noSuchMethod(
+            Invocation.getter(#successfullySaved),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#successfullySaved)),
+          )
+          as String);
+
+  @override
+  String get exerciseList =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseList),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#exerciseList)),
+          )
+          as String);
+
+  @override
+  String get exercise =>
+      (super.noSuchMethod(
+            Invocation.getter(#exercise),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#exercise)),
+          )
+          as String);
+
+  @override
+  String get exercises =>
+      (super.noSuchMethod(
+            Invocation.getter(#exercises),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#exercises)),
+          )
+          as String);
+
+  @override
+  String get exerciseName =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseName),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#exerciseName)),
+          )
+          as String);
+
+  @override
+  String get searchExercise =>
+      (super.noSuchMethod(
+            Invocation.getter(#searchExercise),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#searchExercise)),
+          )
+          as String);
+
+  @override
+  String get noIngredientsDefined =>
+      (super.noSuchMethod(
+            Invocation.getter(#noIngredientsDefined),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#noIngredientsDefined)),
+          )
+          as String);
+
+  @override
+  String get noMatchingExerciseFound =>
+      (super.noSuchMethod(
+            Invocation.getter(#noMatchingExerciseFound),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#noMatchingExerciseFound)),
+          )
+          as String);
+
+  @override
+  String get searchNamesInEnglish =>
+      (super.noSuchMethod(
+            Invocation.getter(#searchNamesInEnglish),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#searchNamesInEnglish)),
+          )
+          as String);
+
+  @override
+  String get equipment =>
+      (super.noSuchMethod(
+            Invocation.getter(#equipment),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#equipment)),
+          )
+          as String);
+
+  @override
+  String get muscles =>
+      (super.noSuchMethod(
+            Invocation.getter(#muscles),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#muscles)),
+          )
+          as String);
+
+  @override
+  String get musclesSecondary =>
+      (super.noSuchMethod(
+            Invocation.getter(#musclesSecondary),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#musclesSecondary)),
+          )
+          as String);
+
+  @override
+  String get category =>
+      (super.noSuchMethod(
+            Invocation.getter(#category),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#category)),
+          )
+          as String);
+
+  @override
+  String get startDate =>
+      (super.noSuchMethod(
+            Invocation.getter(#startDate),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#startDate)),
+          )
+          as String);
+
+  @override
+  String get routines =>
+      (super.noSuchMethod(
+            Invocation.getter(#routines),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#routines)),
+          )
+          as String);
+
+  @override
+  String get newRoutine =>
+      (super.noSuchMethod(
+            Invocation.getter(#newRoutine),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#newRoutine)),
+          )
+          as String);
+
+  @override
+  String get noRoutines =>
+      (super.noSuchMethod(
+            Invocation.getter(#noRoutines),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#noRoutines)),
+          )
+          as String);
+
+  @override
+  String get reps =>
+      (super.noSuchMethod(
+            Invocation.getter(#reps),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#reps)),
+          )
+          as String);
+
+  @override
+  String get restTime =>
+      (super.noSuchMethod(
+            Invocation.getter(#restTime),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#restTime)),
+          )
+          as String);
+
+  @override
+  String get sets =>
+      (super.noSuchMethod(
+            Invocation.getter(#sets),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#sets)),
+          )
+          as String);
+
+  @override
+  String get rir =>
+      (super.noSuchMethod(
+            Invocation.getter(#rir),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#rir)),
+          )
+          as String);
+
+  @override
+  String get rirNotUsed =>
+      (super.noSuchMethod(
+            Invocation.getter(#rirNotUsed),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#rirNotUsed)),
+          )
+          as String);
+
+  @override
+  String get useMetric =>
+      (super.noSuchMethod(
+            Invocation.getter(#useMetric),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#useMetric)),
+          )
+          as String);
+
+  @override
+  String get weightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#weightUnit),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#weightUnit)),
+          )
+          as String);
+
+  @override
+  String get repetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#repetitionUnit),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#repetitionUnit)),
+          )
+          as String);
+
+  @override
+  String get set =>
+      (super.noSuchMethod(
+            Invocation.getter(#set),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#set)),
+          )
+          as String);
+
+  @override
+  String get dayDescriptionHelp =>
+      (super.noSuchMethod(
+            Invocation.getter(#dayDescriptionHelp),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#dayDescriptionHelp)),
+          )
+          as String);
+
+  @override
+  String get sameRepetitions =>
+      (super.noSuchMethod(
+            Invocation.getter(#sameRepetitions),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#sameRepetitions)),
+          )
+          as String);
+
+  @override
+  String get comment =>
+      (super.noSuchMethod(
+            Invocation.getter(#comment),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#comment)),
+          )
+          as String);
+
+  @override
+  String get impression =>
+      (super.noSuchMethod(
+            Invocation.getter(#impression),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#impression)),
+          )
+          as String);
+
+  @override
+  String get notes =>
+      (super.noSuchMethod(
+            Invocation.getter(#notes),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#notes)),
+          )
+          as String);
+
+  @override
+  String get workoutSession =>
+      (super.noSuchMethod(
+            Invocation.getter(#workoutSession),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#workoutSession)),
+          )
+          as String);
+
+  @override
+  String get restDay =>
+      (super.noSuchMethod(
+            Invocation.getter(#restDay),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#restDay)),
+          )
+          as String);
+
+  @override
+  String get isRestDay =>
+      (super.noSuchMethod(
+            Invocation.getter(#isRestDay),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#isRestDay)),
+          )
+          as String);
+
+  @override
+  String get isRestDayHelp =>
+      (super.noSuchMethod(
+            Invocation.getter(#isRestDayHelp),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#isRestDayHelp)),
+          )
+          as String);
+
+  @override
+  String get needsLogsToAdvance =>
+      (super.noSuchMethod(
+            Invocation.getter(#needsLogsToAdvance),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#needsLogsToAdvance)),
+          )
+          as String);
+
+  @override
+  String get needsLogsToAdvanceHelp =>
+      (super.noSuchMethod(
+            Invocation.getter(#needsLogsToAdvanceHelp),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#needsLogsToAdvanceHelp)),
+          )
+          as String);
+
+  @override
+  String get routineDays =>
+      (super.noSuchMethod(
+            Invocation.getter(#routineDays),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#routineDays)),
+          )
+          as String);
+
+  @override
+  String get resultingRoutine =>
+      (super.noSuchMethod(
+            Invocation.getter(#resultingRoutine),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#resultingRoutine)),
+          )
+          as String);
+
+  @override
+  String get newDay =>
+      (super.noSuchMethod(
+            Invocation.getter(#newDay),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#newDay)),
+          )
+          as String);
+
+  @override
+  String get newSet =>
+      (super.noSuchMethod(
+            Invocation.getter(#newSet),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#newSet)),
+          )
+          as String);
+
+  @override
+  String get selectExercises =>
+      (super.noSuchMethod(
+            Invocation.getter(#selectExercises),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#selectExercises)),
+          )
+          as String);
+
+  @override
+  String get gymMode =>
+      (super.noSuchMethod(
+            Invocation.getter(#gymMode),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#gymMode)),
+          )
+          as String);
+
+  @override
+  String get plateCalculator =>
+      (super.noSuchMethod(
+            Invocation.getter(#plateCalculator),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#plateCalculator)),
+          )
+          as String);
+
+  @override
+  String get plateCalculatorNotDivisible =>
+      (super.noSuchMethod(
+            Invocation.getter(#plateCalculatorNotDivisible),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#plateCalculatorNotDivisible),
+            ),
+          )
+          as String);
+
+  @override
+  String get pause =>
+      (super.noSuchMethod(
+            Invocation.getter(#pause),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#pause)),
+          )
+          as String);
+
+  @override
+  String get jumpTo =>
+      (super.noSuchMethod(
+            Invocation.getter(#jumpTo),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#jumpTo)),
+          )
+          as String);
+
+  @override
+  String get todaysWorkout =>
+      (super.noSuchMethod(
+            Invocation.getter(#todaysWorkout),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#todaysWorkout)),
+          )
+          as String);
+
+  @override
+  String get logHelpEntries =>
+      (super.noSuchMethod(
+            Invocation.getter(#logHelpEntries),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#logHelpEntries)),
+          )
+          as String);
+
+  @override
+  String get logHelpEntriesUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#logHelpEntriesUnits),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#logHelpEntriesUnits)),
+          )
+          as String);
+
+  @override
+  String get description =>
+      (super.noSuchMethod(
+            Invocation.getter(#description),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#description)),
+          )
+          as String);
+
+  @override
+  String get name =>
+      (super.noSuchMethod(
+            Invocation.getter(#name),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#name)),
+          )
+          as String);
+
+  @override
+  String get save =>
+      (super.noSuchMethod(
+            Invocation.getter(#save),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#save)),
+          )
+          as String);
+
+  @override
+  String get verify =>
+      (super.noSuchMethod(
+            Invocation.getter(#verify),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#verify)),
+          )
+          as String);
+
+  @override
+  String get addSet =>
+      (super.noSuchMethod(
+            Invocation.getter(#addSet),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#addSet)),
+          )
+          as String);
+
+  @override
+  String get addMeal =>
+      (super.noSuchMethod(
+            Invocation.getter(#addMeal),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#addMeal)),
+          )
+          as String);
+
+  @override
+  String get mealLogged =>
+      (super.noSuchMethod(
+            Invocation.getter(#mealLogged),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#mealLogged)),
+          )
+          as String);
+
+  @override
+  String get ingredientLogged =>
+      (super.noSuchMethod(
+            Invocation.getter(#ingredientLogged),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#ingredientLogged)),
+          )
+          as String);
+
+  @override
+  String get logMeal =>
+      (super.noSuchMethod(
+            Invocation.getter(#logMeal),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#logMeal)),
+          )
+          as String);
+
+  @override
+  String get addIngredient =>
+      (super.noSuchMethod(
+            Invocation.getter(#addIngredient),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#addIngredient)),
+          )
+          as String);
+
+  @override
+  String get logIngredient =>
+      (super.noSuchMethod(
+            Invocation.getter(#logIngredient),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#logIngredient)),
+          )
+          as String);
+
+  @override
+  String get searchIngredient =>
+      (super.noSuchMethod(
+            Invocation.getter(#searchIngredient),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#searchIngredient)),
+          )
+          as String);
+
+  @override
+  String get nutritionalPlan =>
+      (super.noSuchMethod(
+            Invocation.getter(#nutritionalPlan),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#nutritionalPlan)),
+          )
+          as String);
+
+  @override
+  String get nutritionalDiary =>
+      (super.noSuchMethod(
+            Invocation.getter(#nutritionalDiary),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#nutritionalDiary)),
+          )
+          as String);
+
+  @override
+  String get nutritionalPlans =>
+      (super.noSuchMethod(
+            Invocation.getter(#nutritionalPlans),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#nutritionalPlans)),
+          )
+          as String);
+
+  @override
+  String get noNutritionalPlans =>
+      (super.noSuchMethod(
+            Invocation.getter(#noNutritionalPlans),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#noNutritionalPlans)),
+          )
+          as String);
+
+  @override
+  String get onlyLogging =>
+      (super.noSuchMethod(
+            Invocation.getter(#onlyLogging),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#onlyLogging)),
+          )
+          as String);
+
+  @override
+  String get onlyLoggingHelpText =>
+      (super.noSuchMethod(
+            Invocation.getter(#onlyLoggingHelpText),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#onlyLoggingHelpText)),
+          )
+          as String);
+
+  @override
+  String get goalMacro =>
+      (super.noSuchMethod(
+            Invocation.getter(#goalMacro),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goalMacro)),
+          )
+          as String);
+
+  @override
+  String get selectMealToLog =>
+      (super.noSuchMethod(
+            Invocation.getter(#selectMealToLog),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#selectMealToLog)),
+          )
+          as String);
+
+  @override
+  String get yourCurrentNutritionPlanHasNoMealsDefinedYet =>
+      (super.noSuchMethod(
+            Invocation.getter(#yourCurrentNutritionPlanHasNoMealsDefinedYet),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#yourCurrentNutritionPlanHasNoMealsDefinedYet),
+            ),
+          )
+          as String);
+
+  @override
+  String get toAddMealsToThePlanGoToNutritionalPlanDetails =>
+      (super.noSuchMethod(
+            Invocation.getter(#toAddMealsToThePlanGoToNutritionalPlanDetails),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#toAddMealsToThePlanGoToNutritionalPlanDetails),
+            ),
+          )
+          as String);
+
+  @override
+  String get goalEnergy =>
+      (super.noSuchMethod(
+            Invocation.getter(#goalEnergy),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goalEnergy)),
+          )
+          as String);
+
+  @override
+  String get goalProtein =>
+      (super.noSuchMethod(
+            Invocation.getter(#goalProtein),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goalProtein)),
+          )
+          as String);
+
+  @override
+  String get goalCarbohydrates =>
+      (super.noSuchMethod(
+            Invocation.getter(#goalCarbohydrates),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goalCarbohydrates)),
+          )
+          as String);
+
+  @override
+  String get goalFat =>
+      (super.noSuchMethod(
+            Invocation.getter(#goalFat),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goalFat)),
+          )
+          as String);
+
+  @override
+  String get goalFiber =>
+      (super.noSuchMethod(
+            Invocation.getter(#goalFiber),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goalFiber)),
+          )
+          as String);
+
+  @override
+  String get anErrorOccurred =>
+      (super.noSuchMethod(
+            Invocation.getter(#anErrorOccurred),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#anErrorOccurred)),
+          )
+          as String);
+
+  @override
+  String get errorInfoDescription =>
+      (super.noSuchMethod(
+            Invocation.getter(#errorInfoDescription),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#errorInfoDescription)),
+          )
+          as String);
+
+  @override
+  String get errorInfoDescription2 =>
+      (super.noSuchMethod(
+            Invocation.getter(#errorInfoDescription2),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#errorInfoDescription2)),
+          )
+          as String);
+
+  @override
+  String get errorViewDetails =>
+      (super.noSuchMethod(
+            Invocation.getter(#errorViewDetails),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#errorViewDetails)),
+          )
+          as String);
+
+  @override
+  String get applicationLogs =>
+      (super.noSuchMethod(
+            Invocation.getter(#applicationLogs),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#applicationLogs)),
+          )
+          as String);
+
+  @override
+  String get errorCouldNotConnectToServer =>
+      (super.noSuchMethod(
+            Invocation.getter(#errorCouldNotConnectToServer),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#errorCouldNotConnectToServer),
+            ),
+          )
+          as String);
+
+  @override
+  String get errorCouldNotConnectToServerDetails =>
+      (super.noSuchMethod(
+            Invocation.getter(#errorCouldNotConnectToServerDetails),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#errorCouldNotConnectToServerDetails),
+            ),
+          )
+          as String);
+
+  @override
+  String get copyToClipboard =>
+      (super.noSuchMethod(
+            Invocation.getter(#copyToClipboard),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#copyToClipboard)),
+          )
+          as String);
+
+  @override
+  String get weight =>
+      (super.noSuchMethod(
+            Invocation.getter(#weight),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#weight)),
+          )
+          as String);
+
+  @override
+  String get min =>
+      (super.noSuchMethod(
+            Invocation.getter(#min),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#min)),
+          )
+          as String);
+
+  @override
+  String get max =>
+      (super.noSuchMethod(
+            Invocation.getter(#max),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#max)),
+          )
+          as String);
+
+  @override
+  String get measurement =>
+      (super.noSuchMethod(
+            Invocation.getter(#measurement),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#measurement)),
+          )
+          as String);
+
+  @override
+  String get measurements =>
+      (super.noSuchMethod(
+            Invocation.getter(#measurements),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#measurements)),
+          )
+          as String);
+
+  @override
+  String get measurementCategoriesHelpText =>
+      (super.noSuchMethod(
+            Invocation.getter(#measurementCategoriesHelpText),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#measurementCategoriesHelpText),
+            ),
+          )
+          as String);
+
+  @override
+  String get measurementEntriesHelpText =>
+      (super.noSuchMethod(
+            Invocation.getter(#measurementEntriesHelpText),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#measurementEntriesHelpText),
+            ),
+          )
+          as String);
+
+  @override
+  String get date =>
+      (super.noSuchMethod(
+            Invocation.getter(#date),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#date)),
+          )
+          as String);
+
+  @override
+  String get creationDate =>
+      (super.noSuchMethod(
+            Invocation.getter(#creationDate),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#creationDate)),
+          )
+          as String);
+
+  @override
+  String get endDate =>
+      (super.noSuchMethod(
+            Invocation.getter(#endDate),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#endDate)),
+          )
+          as String);
+
+  @override
+  String get openEnded =>
+      (super.noSuchMethod(
+            Invocation.getter(#openEnded),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#openEnded)),
+          )
+          as String);
+
+  @override
+  String get value =>
+      (super.noSuchMethod(
+            Invocation.getter(#value),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#value)),
+          )
+          as String);
+
+  @override
+  String get start =>
+      (super.noSuchMethod(
+            Invocation.getter(#start),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#start)),
+          )
+          as String);
+
+  @override
+  String get time =>
+      (super.noSuchMethod(
+            Invocation.getter(#time),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#time)),
+          )
+          as String);
+
+  @override
+  String get timeStart =>
+      (super.noSuchMethod(
+            Invocation.getter(#timeStart),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#timeStart)),
+          )
+          as String);
+
+  @override
+  String get timeEnd =>
+      (super.noSuchMethod(
+            Invocation.getter(#timeEnd),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#timeEnd)),
+          )
+          as String);
+
+  @override
+  String get timeStartAhead =>
+      (super.noSuchMethod(
+            Invocation.getter(#timeStartAhead),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#timeStartAhead)),
+          )
+          as String);
+
+  @override
+  String get ingredient =>
+      (super.noSuchMethod(
+            Invocation.getter(#ingredient),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#ingredient)),
+          )
+          as String);
+
+  @override
+  String get energy =>
+      (super.noSuchMethod(
+            Invocation.getter(#energy),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#energy)),
+          )
+          as String);
+
+  @override
+  String get energyShort =>
+      (super.noSuchMethod(
+            Invocation.getter(#energyShort),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#energyShort)),
+          )
+          as String);
+
+  @override
+  String get macronutrients =>
+      (super.noSuchMethod(
+            Invocation.getter(#macronutrients),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#macronutrients)),
+          )
+          as String);
+
+  @override
+  String get planned =>
+      (super.noSuchMethod(
+            Invocation.getter(#planned),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#planned)),
+          )
+          as String);
+
+  @override
+  String get logged =>
+      (super.noSuchMethod(
+            Invocation.getter(#logged),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#logged)),
+          )
+          as String);
+
+  @override
+  String get today =>
+      (super.noSuchMethod(
+            Invocation.getter(#today),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#today)),
+          )
+          as String);
+
+  @override
+  String get loggedToday =>
+      (super.noSuchMethod(
+            Invocation.getter(#loggedToday),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#loggedToday)),
+          )
+          as String);
+
+  @override
+  String get weekAverage =>
+      (super.noSuchMethod(
+            Invocation.getter(#weekAverage),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#weekAverage)),
+          )
+          as String);
+
+  @override
+  String get surplus =>
+      (super.noSuchMethod(
+            Invocation.getter(#surplus),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#surplus)),
+          )
+          as String);
+
+  @override
+  String get deficit =>
+      (super.noSuchMethod(
+            Invocation.getter(#deficit),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#deficit)),
+          )
+          as String);
+
+  @override
+  String get difference =>
+      (super.noSuchMethod(
+            Invocation.getter(#difference),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#difference)),
+          )
+          as String);
+
+  @override
+  String get percentEnergy =>
+      (super.noSuchMethod(
+            Invocation.getter(#percentEnergy),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#percentEnergy)),
+          )
+          as String);
+
+  @override
+  String get gPerBodyKg =>
+      (super.noSuchMethod(
+            Invocation.getter(#gPerBodyKg),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#gPerBodyKg)),
+          )
+          as String);
+
+  @override
+  String get total =>
+      (super.noSuchMethod(
+            Invocation.getter(#total),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#total)),
+          )
+          as String);
+
+  @override
+  String get kcal =>
+      (super.noSuchMethod(
+            Invocation.getter(#kcal),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#kcal)),
+          )
+          as String);
+
+  @override
+  String get kJ =>
+      (super.noSuchMethod(
+            Invocation.getter(#kJ),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#kJ)),
+          )
+          as String);
+
+  @override
+  String get g =>
+      (super.noSuchMethod(
+            Invocation.getter(#g),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#g)),
+          )
+          as String);
+
+  @override
+  String get protein =>
+      (super.noSuchMethod(
+            Invocation.getter(#protein),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#protein)),
+          )
+          as String);
+
+  @override
+  String get proteinShort =>
+      (super.noSuchMethod(
+            Invocation.getter(#proteinShort),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#proteinShort)),
+          )
+          as String);
+
+  @override
+  String get carbohydrates =>
+      (super.noSuchMethod(
+            Invocation.getter(#carbohydrates),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#carbohydrates)),
+          )
+          as String);
+
+  @override
+  String get carbohydratesShort =>
+      (super.noSuchMethod(
+            Invocation.getter(#carbohydratesShort),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#carbohydratesShort)),
+          )
+          as String);
+
+  @override
+  String get sugars =>
+      (super.noSuchMethod(
+            Invocation.getter(#sugars),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#sugars)),
+          )
+          as String);
+
+  @override
+  String get fat =>
+      (super.noSuchMethod(
+            Invocation.getter(#fat),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#fat)),
+          )
+          as String);
+
+  @override
+  String get fatShort =>
+      (super.noSuchMethod(
+            Invocation.getter(#fatShort),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#fatShort)),
+          )
+          as String);
+
+  @override
+  String get saturatedFat =>
+      (super.noSuchMethod(
+            Invocation.getter(#saturatedFat),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#saturatedFat)),
+          )
+          as String);
+
+  @override
+  String get fiber =>
+      (super.noSuchMethod(
+            Invocation.getter(#fiber),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#fiber)),
+          )
+          as String);
+
+  @override
+  String get sodium =>
+      (super.noSuchMethod(
+            Invocation.getter(#sodium),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#sodium)),
+          )
+          as String);
+
+  @override
+  String get amount =>
+      (super.noSuchMethod(
+            Invocation.getter(#amount),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#amount)),
+          )
+          as String);
+
+  @override
+  String get unit =>
+      (super.noSuchMethod(
+            Invocation.getter(#unit),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#unit)),
+          )
+          as String);
+
+  @override
+  String get newEntry =>
+      (super.noSuchMethod(
+            Invocation.getter(#newEntry),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#newEntry)),
+          )
+          as String);
+
+  @override
+  String get noWeightEntries =>
+      (super.noSuchMethod(
+            Invocation.getter(#noWeightEntries),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#noWeightEntries)),
+          )
+          as String);
+
+  @override
+  String get noMeasurementEntries =>
+      (super.noSuchMethod(
+            Invocation.getter(#noMeasurementEntries),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#noMeasurementEntries)),
+          )
+          as String);
+
+  @override
+  String get moreMeasurementEntries =>
+      (super.noSuchMethod(
+            Invocation.getter(#moreMeasurementEntries),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#moreMeasurementEntries)),
+          )
+          as String);
+
+  @override
+  String get edit =>
+      (super.noSuchMethod(
+            Invocation.getter(#edit),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#edit)),
+          )
+          as String);
+
+  @override
+  String get loadingText =>
+      (super.noSuchMethod(
+            Invocation.getter(#loadingText),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#loadingText)),
+          )
+          as String);
+
+  @override
+  String get delete =>
+      (super.noSuchMethod(
+            Invocation.getter(#delete),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#delete)),
+          )
+          as String);
+
+  @override
+  String get newNutritionalPlan =>
+      (super.noSuchMethod(
+            Invocation.getter(#newNutritionalPlan),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#newNutritionalPlan)),
+          )
+          as String);
+
+  @override
+  String get overview =>
+      (super.noSuchMethod(
+            Invocation.getter(#overview),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#overview)),
+          )
+          as String);
+
+  @override
+  String get toggleDetails =>
+      (super.noSuchMethod(
+            Invocation.getter(#toggleDetails),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#toggleDetails)),
+          )
+          as String);
+
+  @override
+  String get goToDetailPage =>
+      (super.noSuchMethod(
+            Invocation.getter(#goToDetailPage),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goToDetailPage)),
+          )
+          as String);
+
+  @override
+  String get aboutWhySupportTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutWhySupportTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutWhySupportTitle)),
+          )
+          as String);
+
+  @override
+  String get aboutDescription =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutDescription),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutDescription)),
+          )
+          as String);
+
+  @override
+  String get aboutDonateTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutDonateTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutDonateTitle)),
+          )
+          as String);
+
+  @override
+  String get aboutDonateText =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutDonateText),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutDonateText)),
+          )
+          as String);
+
+  @override
+  String get aboutContributeTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutContributeTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutContributeTitle)),
+          )
+          as String);
+
+  @override
+  String get aboutContributeText =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutContributeText),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutContributeText)),
+          )
+          as String);
+
+  @override
+  String get aboutBugsListTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutBugsListTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutBugsListTitle)),
+          )
+          as String);
+
+  @override
+  String get aboutTranslationListTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutTranslationListTitle),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#aboutTranslationListTitle),
+            ),
+          )
+          as String);
+
+  @override
+  String get aboutSourceListTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutSourceListTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutSourceListTitle)),
+          )
+          as String);
+
+  @override
+  String get aboutJoinCommunityTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutJoinCommunityTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutJoinCommunityTitle)),
+          )
+          as String);
+
+  @override
+  String get aboutMastodonTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutMastodonTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutMastodonTitle)),
+          )
+          as String);
+
+  @override
+  String get aboutDiscordTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutDiscordTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutDiscordTitle)),
+          )
+          as String);
+
+  @override
+  String get others =>
+      (super.noSuchMethod(
+            Invocation.getter(#others),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#others)),
+          )
+          as String);
+
+  @override
+  String get calendar =>
+      (super.noSuchMethod(
+            Invocation.getter(#calendar),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#calendar)),
+          )
+          as String);
+
+  @override
+  String get goToToday =>
+      (super.noSuchMethod(
+            Invocation.getter(#goToToday),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goToToday)),
+          )
+          as String);
+
+  @override
+  String get enterValue =>
+      (super.noSuchMethod(
+            Invocation.getter(#enterValue),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#enterValue)),
+          )
+          as String);
+
+  @override
+  String get selectEntry =>
+      (super.noSuchMethod(
+            Invocation.getter(#selectEntry),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#selectEntry)),
+          )
+          as String);
+
+  @override
+  String get selectExercise =>
+      (super.noSuchMethod(
+            Invocation.getter(#selectExercise),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#selectExercise)),
+          )
+          as String);
+
+  @override
+  String get baseNameEnglish =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseNameEnglish),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#baseNameEnglish)),
+          )
+          as String);
+
+  @override
+  String get setUnitsAndRir =>
+      (super.noSuchMethod(
+            Invocation.getter(#setUnitsAndRir),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#setUnitsAndRir)),
+          )
+          as String);
+
+  @override
+  String get enterValidNumber =>
+      (super.noSuchMethod(
+            Invocation.getter(#enterValidNumber),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#enterValidNumber)),
+          )
+          as String);
+
+  @override
+  String get selectIngredient =>
+      (super.noSuchMethod(
+            Invocation.getter(#selectIngredient),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#selectIngredient)),
+          )
+          as String);
+
+  @override
+  String get recentlyUsedIngredients =>
+      (super.noSuchMethod(
+            Invocation.getter(#recentlyUsedIngredients),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#recentlyUsedIngredients)),
+          )
+          as String);
+
+  @override
+  String get selectImage =>
+      (super.noSuchMethod(
+            Invocation.getter(#selectImage),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#selectImage)),
+          )
+          as String);
+
+  @override
+  String get optionsLabel =>
+      (super.noSuchMethod(
+            Invocation.getter(#optionsLabel),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#optionsLabel)),
+          )
+          as String);
+
+  @override
+  String get takePicture =>
+      (super.noSuchMethod(
+            Invocation.getter(#takePicture),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#takePicture)),
+          )
+          as String);
+
+  @override
+  String get chooseFromLibrary =>
+      (super.noSuchMethod(
+            Invocation.getter(#chooseFromLibrary),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#chooseFromLibrary)),
+          )
+          as String);
+
+  @override
+  String get gallery =>
+      (super.noSuchMethod(
+            Invocation.getter(#gallery),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#gallery)),
+          )
+          as String);
+
+  @override
+  String get addImage =>
+      (super.noSuchMethod(
+            Invocation.getter(#addImage),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#addImage)),
+          )
+          as String);
+
+  @override
+  String get dataCopied =>
+      (super.noSuchMethod(
+            Invocation.getter(#dataCopied),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#dataCopied)),
+          )
+          as String);
+
+  @override
+  String get appUpdateTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#appUpdateTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#appUpdateTitle)),
+          )
+          as String);
+
+  @override
+  String get appUpdateContent =>
+      (super.noSuchMethod(
+            Invocation.getter(#appUpdateContent),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#appUpdateContent)),
+          )
+          as String);
+
+  @override
+  String get productFound =>
+      (super.noSuchMethod(
+            Invocation.getter(#productFound),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#productFound)),
+          )
+          as String);
+
+  @override
+  String get productNotFound =>
+      (super.noSuchMethod(
+            Invocation.getter(#productNotFound),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#productNotFound)),
+          )
+          as String);
+
+  @override
+  String get scanBarcode =>
+      (super.noSuchMethod(
+            Invocation.getter(#scanBarcode),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#scanBarcode)),
+          )
+          as String);
+
+  @override
+  String get close =>
+      (super.noSuchMethod(
+            Invocation.getter(#close),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#close)),
+          )
+          as String);
+
+  @override
+  String get identicalExercisePleaseDiscard =>
+      (super.noSuchMethod(
+            Invocation.getter(#identicalExercisePleaseDiscard),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#identicalExercisePleaseDiscard),
+            ),
+          )
+          as String);
+
+  @override
+  String get checkInformationBeforeSubmitting =>
+      (super.noSuchMethod(
+            Invocation.getter(#checkInformationBeforeSubmitting),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#checkInformationBeforeSubmitting),
+            ),
+          )
+          as String);
+
+  @override
+  String get add_exercise_image_license =>
+      (super.noSuchMethod(
+            Invocation.getter(#add_exercise_image_license),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#add_exercise_image_license),
+            ),
+          )
+          as String);
+
+  @override
+  String get imageDetailsTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#imageDetailsTitle)),
+          )
+          as String);
+
+  @override
+  String get imageDetailsLicenseTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsLicenseTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#imageDetailsLicenseTitle)),
+          )
+          as String);
+
+  @override
+  String get imageDetailsLicenseTitleHint =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsLicenseTitleHint),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#imageDetailsLicenseTitleHint),
+            ),
+          )
+          as String);
+
+  @override
+  String get imageDetailsSourceLink =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsSourceLink),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#imageDetailsSourceLink)),
+          )
+          as String);
+
+  @override
+  String get author =>
+      (super.noSuchMethod(
+            Invocation.getter(#author),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#author)),
+          )
+          as String);
+
+  @override
+  String get authorHint =>
+      (super.noSuchMethod(
+            Invocation.getter(#authorHint),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#authorHint)),
+          )
+          as String);
+
+  @override
+  String get imageDetailsAuthorLink =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsAuthorLink),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#imageDetailsAuthorLink)),
+          )
+          as String);
+
+  @override
+  String get imageDetailsDerivativeSource =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsDerivativeSource),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#imageDetailsDerivativeSource),
+            ),
+          )
+          as String);
+
+  @override
+  String get imageDetailsDerivativeHelp =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsDerivativeHelp),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#imageDetailsDerivativeHelp),
+            ),
+          )
+          as String);
+
+  @override
+  String get imageDetailsImageType =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsImageType),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#imageDetailsImageType)),
+          )
+          as String);
+
+  @override
+  String get imageDetailsLicenseNotice =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsLicenseNotice),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#imageDetailsLicenseNotice),
+            ),
+          )
+          as String);
+
+  @override
+  String get imageDetailsLicenseNoticeLinkToLicense =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsLicenseNoticeLinkToLicense),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#imageDetailsLicenseNoticeLinkToLicense),
+            ),
+          )
+          as String);
+
+  @override
+  String get add =>
+      (super.noSuchMethod(
+            Invocation.getter(#add),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#add)),
+          )
+          as String);
+
+  @override
+  String get variations =>
+      (super.noSuchMethod(
+            Invocation.getter(#variations),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#variations)),
+          )
+          as String);
+
+  @override
+  String get verifiedEmail =>
+      (super.noSuchMethod(
+            Invocation.getter(#verifiedEmail),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#verifiedEmail)),
+          )
+          as String);
+
+  @override
+  String get unVerifiedEmail =>
+      (super.noSuchMethod(
+            Invocation.getter(#unVerifiedEmail),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#unVerifiedEmail)),
+          )
+          as String);
+
+  @override
+  String get verifiedEmailReason =>
+      (super.noSuchMethod(
+            Invocation.getter(#verifiedEmailReason),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#verifiedEmailReason)),
+          )
+          as String);
+
+  @override
+  String get alternativeNames =>
+      (super.noSuchMethod(
+            Invocation.getter(#alternativeNames),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#alternativeNames)),
+          )
+          as String);
+
+  @override
+  String get oneNamePerLine =>
+      (super.noSuchMethod(
+            Invocation.getter(#oneNamePerLine),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#oneNamePerLine)),
+          )
+          as String);
+
+  @override
+  String get whatVariationsExist =>
+      (super.noSuchMethod(
+            Invocation.getter(#whatVariationsExist),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#whatVariationsExist)),
+          )
+          as String);
+
+  @override
+  String get previous =>
+      (super.noSuchMethod(
+            Invocation.getter(#previous),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#previous)),
+          )
+          as String);
+
+  @override
+  String get next =>
+      (super.noSuchMethod(
+            Invocation.getter(#next),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#next)),
+          )
+          as String);
+
+  @override
+  String get images =>
+      (super.noSuchMethod(
+            Invocation.getter(#images),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#images)),
+          )
+          as String);
+
+  @override
+  String get language =>
+      (super.noSuchMethod(
+            Invocation.getter(#language),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#language)),
+          )
+          as String);
+
+  @override
+  String get addExercise =>
+      (super.noSuchMethod(
+            Invocation.getter(#addExercise),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#addExercise)),
+          )
+          as String);
+
+  @override
+  String get fitInWeek =>
+      (super.noSuchMethod(
+            Invocation.getter(#fitInWeek),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#fitInWeek)),
+          )
+          as String);
+
+  @override
+  String get fitInWeekHelp =>
+      (super.noSuchMethod(
+            Invocation.getter(#fitInWeekHelp),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#fitInWeekHelp)),
+          )
+          as String);
+
+  @override
+  String get addSuperset =>
+      (super.noSuchMethod(
+            Invocation.getter(#addSuperset),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#addSuperset)),
+          )
+          as String);
+
+  @override
+  String get setHasProgression =>
+      (super.noSuchMethod(
+            Invocation.getter(#setHasProgression),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#setHasProgression)),
+          )
+          as String);
+
+  @override
+  String get setHasProgressionWarning =>
+      (super.noSuchMethod(
+            Invocation.getter(#setHasProgressionWarning),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#setHasProgressionWarning)),
+          )
+          as String);
+
+  @override
+  String get setHasNoExercises =>
+      (super.noSuchMethod(
+            Invocation.getter(#setHasNoExercises),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#setHasNoExercises)),
+          )
+          as String);
+
+  @override
+  String get contributeExercise =>
+      (super.noSuchMethod(
+            Invocation.getter(#contributeExercise),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#contributeExercise)),
+          )
+          as String);
+
+  @override
+  String get translation =>
+      (super.noSuchMethod(
+            Invocation.getter(#translation),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#translation)),
+          )
+          as String);
+
+  @override
+  String get translateExercise =>
+      (super.noSuchMethod(
+            Invocation.getter(#translateExercise),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#translateExercise)),
+          )
+          as String);
+
+  @override
+  String get baseData =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseData),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#baseData)),
+          )
+          as String);
+
+  @override
+  String get enterTextInLanguage =>
+      (super.noSuchMethod(
+            Invocation.getter(#enterTextInLanguage),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#enterTextInLanguage)),
+          )
+          as String);
+
+  @override
+  String get settingsTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#settingsTitle)),
+          )
+          as String);
+
+  @override
+  String get settingsCacheTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsCacheTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#settingsCacheTitle)),
+          )
+          as String);
+
+  @override
+  String get settingsExerciseCacheDescription =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsExerciseCacheDescription),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#settingsExerciseCacheDescription),
+            ),
+          )
+          as String);
+
+  @override
+  String get settingsIngredientCacheDescription =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsIngredientCacheDescription),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#settingsIngredientCacheDescription),
+            ),
+          )
+          as String);
+
+  @override
+  String get settingsCacheDeletedSnackbar =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsCacheDeletedSnackbar),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#settingsCacheDeletedSnackbar),
+            ),
+          )
+          as String);
+
+  @override
+  String get aboutPageTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutPageTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutPageTitle)),
+          )
+          as String);
+
+  @override
+  String get simpleMode =>
+      (super.noSuchMethod(
+            Invocation.getter(#simpleMode),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#simpleMode)),
+          )
+          as String);
+
+  @override
+  String get simpleModeHelp =>
+      (super.noSuchMethod(
+            Invocation.getter(#simpleModeHelp),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#simpleModeHelp)),
+          )
+          as String);
+
+  @override
+  String get progressionRules =>
+      (super.noSuchMethod(
+            Invocation.getter(#progressionRules),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#progressionRules)),
+          )
+          as String);
+
+  @override
+  String get cacheWarning =>
+      (super.noSuchMethod(
+            Invocation.getter(#cacheWarning),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#cacheWarning)),
+          )
+          as String);
+
+  @override
+  String get textPromptTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#textPromptTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#textPromptTitle)),
+          )
+          as String);
+
+  @override
+  String get textPromptSubheading =>
+      (super.noSuchMethod(
+            Invocation.getter(#textPromptSubheading),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#textPromptSubheading)),
+          )
+          as String);
+
+  @override
+  String get abs =>
+      (super.noSuchMethod(
+            Invocation.getter(#abs),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#abs)),
+          )
+          as String);
+
+  @override
+  String get arms =>
+      (super.noSuchMethod(
+            Invocation.getter(#arms),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#arms)),
+          )
+          as String);
+
+  @override
+  String get back =>
+      (super.noSuchMethod(
+            Invocation.getter(#back),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#back)),
+          )
+          as String);
+
+  @override
+  String get barbell =>
+      (super.noSuchMethod(
+            Invocation.getter(#barbell),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#barbell)),
+          )
+          as String);
+
+  @override
+  String get bench =>
+      (super.noSuchMethod(
+            Invocation.getter(#bench),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#bench)),
+          )
+          as String);
+
+  @override
+  String get biceps =>
+      (super.noSuchMethod(
+            Invocation.getter(#biceps),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#biceps)),
+          )
+          as String);
+
+  @override
+  String get body_weight =>
+      (super.noSuchMethod(
+            Invocation.getter(#body_weight),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#body_weight)),
+          )
+          as String);
+
+  @override
+  String get calves =>
+      (super.noSuchMethod(
+            Invocation.getter(#calves),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#calves)),
+          )
+          as String);
+
+  @override
+  String get cardio =>
+      (super.noSuchMethod(
+            Invocation.getter(#cardio),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#cardio)),
+          )
+          as String);
+
+  @override
+  String get chest =>
+      (super.noSuchMethod(
+            Invocation.getter(#chest),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#chest)),
+          )
+          as String);
+
+  @override
+  String get dumbbell =>
+      (super.noSuchMethod(
+            Invocation.getter(#dumbbell),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#dumbbell)),
+          )
+          as String);
+
+  @override
+  String get glutes =>
+      (super.noSuchMethod(
+            Invocation.getter(#glutes),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#glutes)),
+          )
+          as String);
+
+  @override
+  String get gym_mat =>
+      (super.noSuchMethod(
+            Invocation.getter(#gym_mat),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#gym_mat)),
+          )
+          as String);
+
+  @override
+  String get hamstrings =>
+      (super.noSuchMethod(
+            Invocation.getter(#hamstrings),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#hamstrings)),
+          )
+          as String);
+
+  @override
+  String get incline_bench =>
+      (super.noSuchMethod(
+            Invocation.getter(#incline_bench),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#incline_bench)),
+          )
+          as String);
+
+  @override
+  String get kettlebell =>
+      (super.noSuchMethod(
+            Invocation.getter(#kettlebell),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#kettlebell)),
+          )
+          as String);
+
+  @override
+  String get kilometers =>
+      (super.noSuchMethod(
+            Invocation.getter(#kilometers),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#kilometers)),
+          )
+          as String);
+
+  @override
+  String get kilometers_per_hour =>
+      (super.noSuchMethod(
+            Invocation.getter(#kilometers_per_hour),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#kilometers_per_hour)),
+          )
+          as String);
+
+  @override
+  String get lats =>
+      (super.noSuchMethod(
+            Invocation.getter(#lats),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#lats)),
+          )
+          as String);
+
+  @override
+  String get legs =>
+      (super.noSuchMethod(
+            Invocation.getter(#legs),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#legs)),
+          )
+          as String);
+
+  @override
+  String get lower_back =>
+      (super.noSuchMethod(
+            Invocation.getter(#lower_back),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#lower_back)),
+          )
+          as String);
+
+  @override
+  String get max_reps =>
+      (super.noSuchMethod(
+            Invocation.getter(#max_reps),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#max_reps)),
+          )
+          as String);
+
+  @override
+  String get miles =>
+      (super.noSuchMethod(
+            Invocation.getter(#miles),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#miles)),
+          )
+          as String);
+
+  @override
+  String get miles_per_hour =>
+      (super.noSuchMethod(
+            Invocation.getter(#miles_per_hour),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#miles_per_hour)),
+          )
+          as String);
+
+  @override
+  String get minutes =>
+      (super.noSuchMethod(
+            Invocation.getter(#minutes),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#minutes)),
+          )
+          as String);
+
+  @override
+  String get plates =>
+      (super.noSuchMethod(
+            Invocation.getter(#plates),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#plates)),
+          )
+          as String);
+
+  @override
+  String get pull_up_bar =>
+      (super.noSuchMethod(
+            Invocation.getter(#pull_up_bar),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#pull_up_bar)),
+          )
+          as String);
+
+  @override
+  String get quads =>
+      (super.noSuchMethod(
+            Invocation.getter(#quads),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#quads)),
+          )
+          as String);
+
+  @override
+  String get repetitions =>
+      (super.noSuchMethod(
+            Invocation.getter(#repetitions),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#repetitions)),
+          )
+          as String);
+
+  @override
+  String get resistance_band =>
+      (super.noSuchMethod(
+            Invocation.getter(#resistance_band),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#resistance_band)),
+          )
+          as String);
+
+  @override
+  String get sz_bar =>
+      (super.noSuchMethod(
+            Invocation.getter(#sz_bar),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#sz_bar)),
+          )
+          as String);
+
+  @override
+  String get seconds =>
+      (super.noSuchMethod(
+            Invocation.getter(#seconds),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#seconds)),
+          )
+          as String);
+
+  @override
+  String get shoulders =>
+      (super.noSuchMethod(
+            Invocation.getter(#shoulders),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#shoulders)),
+          )
+          as String);
+
+  @override
+  String get swiss_ball =>
+      (super.noSuchMethod(
+            Invocation.getter(#swiss_ball),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#swiss_ball)),
+          )
+          as String);
+
+  @override
+  String get triceps =>
+      (super.noSuchMethod(
+            Invocation.getter(#triceps),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#triceps)),
+          )
+          as String);
+
+  @override
+  String get until_failure =>
+      (super.noSuchMethod(
+            Invocation.getter(#until_failure),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#until_failure)),
+          )
+          as String);
+
+  @override
+  String get kg =>
+      (super.noSuchMethod(
+            Invocation.getter(#kg),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#kg)),
+          )
+          as String);
+
+  @override
+  String get lb =>
+      (super.noSuchMethod(
+            Invocation.getter(#lb),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#lb)),
+          )
+          as String);
+
+  @override
+  String get none__bodyweight_exercise_ =>
+      (super.noSuchMethod(
+            Invocation.getter(#none__bodyweight_exercise_),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#none__bodyweight_exercise_),
+            ),
+          )
+          as String);
+
+  @override
+  String get log =>
+      (super.noSuchMethod(
+            Invocation.getter(#log),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#log)),
+          )
+          as String);
+
+  @override
+  String get done =>
+      (super.noSuchMethod(
+            Invocation.getter(#done),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#done)),
+          )
+          as String);
+
+  @override
+  String get overallChangeWeight =>
+      (super.noSuchMethod(
+            Invocation.getter(#overallChangeWeight),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#overallChangeWeight)),
+          )
+          as String);
+
+  @override
+  String get goalTypeMeals =>
+      (super.noSuchMethod(
+            Invocation.getter(#goalTypeMeals),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goalTypeMeals)),
+          )
+          as String);
+
+  @override
+  String get goalTypeBasic =>
+      (super.noSuchMethod(
+            Invocation.getter(#goalTypeBasic),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goalTypeBasic)),
+          )
+          as String);
+
+  @override
+  String get goalTypeAdvanced =>
+      (super.noSuchMethod(
+            Invocation.getter(#goalTypeAdvanced),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goalTypeAdvanced)),
+          )
+          as String);
+
+  @override
+  String get indicatorRaw =>
+      (super.noSuchMethod(
+            Invocation.getter(#indicatorRaw),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#indicatorRaw)),
+          )
+          as String);
+
+  @override
+  String get indicatorAvg =>
+      (super.noSuchMethod(
+            Invocation.getter(#indicatorAvg),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#indicatorAvg)),
+          )
+          as String);
+
+  @override
+  String get themeMode =>
+      (super.noSuchMethod(
+            Invocation.getter(#themeMode),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#themeMode)),
+          )
+          as String);
+
+  @override
+  String get darkMode =>
+      (super.noSuchMethod(
+            Invocation.getter(#darkMode),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#darkMode)),
+          )
+          as String);
+
+  @override
+  String get lightMode =>
+      (super.noSuchMethod(
+            Invocation.getter(#lightMode),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#lightMode)),
+          )
+          as String);
+
+  @override
+  String get systemMode =>
+      (super.noSuchMethod(
+            Invocation.getter(#systemMode),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#systemMode)),
+          )
+          as String);
+
+  @override
+  String exerciseNr(String? nr) =>
+      (super.noSuchMethod(
+            Invocation.method(#exerciseNr, [nr]),
+            returnValue: _i3.dummyValue<String>(this, Invocation.method(#exerciseNr, [nr])),
+          )
+          as String);
+
+  @override
+  String supersetNr(String? nr) =>
+      (super.noSuchMethod(
+            Invocation.method(#supersetNr, [nr]),
+            returnValue: _i3.dummyValue<String>(this, Invocation.method(#supersetNr, [nr])),
+          )
+          as String);
+
+  @override
+  String chartAllTimeTitle(String? name) =>
+      (super.noSuchMethod(
+            Invocation.method(#chartAllTimeTitle, [name]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#chartAllTimeTitle, [name]),
+            ),
+          )
+          as String);
+
+  @override
+  String chart30DaysTitle(String? name) =>
+      (super.noSuchMethod(
+            Invocation.method(#chart30DaysTitle, [name]),
+            returnValue: _i3.dummyValue<String>(this, Invocation.method(#chart30DaysTitle, [name])),
+          )
+          as String);
+
+  @override
+  String chartDuringPlanTitle(String? chartName, String? planName) =>
+      (super.noSuchMethod(
+            Invocation.method(#chartDuringPlanTitle, [chartName, planName]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#chartDuringPlanTitle, [chartName, planName]),
+            ),
+          )
+          as String);
+
+  @override
+  String kcalValue(String? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#kcalValue, [value]),
+            returnValue: _i3.dummyValue<String>(this, Invocation.method(#kcalValue, [value])),
+          )
+          as String);
+
+  @override
+  String gValue(String? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#gValue, [value]),
+            returnValue: _i3.dummyValue<String>(this, Invocation.method(#gValue, [value])),
+          )
+          as String);
+
+  @override
+  String percentValue(String? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#percentValue, [value]),
+            returnValue: _i3.dummyValue<String>(this, Invocation.method(#percentValue, [value])),
+          )
+          as String);
+
+  @override
+  String confirmDelete(String? toDelete) =>
+      (super.noSuchMethod(
+            Invocation.method(#confirmDelete, [toDelete]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#confirmDelete, [toDelete]),
+            ),
+          )
+          as String);
+
+  @override
+  String enterCharacters(String? min, String? max) =>
+      (super.noSuchMethod(
+            Invocation.method(#enterCharacters, [min, max]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#enterCharacters, [min, max]),
+            ),
+          )
+          as String);
+
+  @override
+  String enterMinCharacters(String? min) =>
+      (super.noSuchMethod(
+            Invocation.method(#enterMinCharacters, [min]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#enterMinCharacters, [min]),
+            ),
+          )
+          as String);
+
+  @override
+  String nrOfSets(String? nrOfSets) =>
+      (super.noSuchMethod(
+            Invocation.method(#nrOfSets, [nrOfSets]),
+            returnValue: _i3.dummyValue<String>(this, Invocation.method(#nrOfSets, [nrOfSets])),
+          )
+          as String);
+
+  @override
+  String productFoundDescription(String? productName) =>
+      (super.noSuchMethod(
+            Invocation.method(#productFoundDescription, [productName]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#productFoundDescription, [productName]),
+            ),
+          )
+          as String);
+
+  @override
+  String productNotFoundDescription(String? barcode) =>
+      (super.noSuchMethod(
+            Invocation.method(#productNotFoundDescription, [barcode]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#productNotFoundDescription, [barcode]),
+            ),
+          )
+          as String);
+
+  @override
+  String alsoKnownAs(String? aliases) =>
+      (super.noSuchMethod(
+            Invocation.method(#alsoKnownAs, [aliases]),
+            returnValue: _i3.dummyValue<String>(this, Invocation.method(#alsoKnownAs, [aliases])),
+          )
+          as String);
+
+  @override
+  String verifiedEmailInfo(String? email) =>
+      (super.noSuchMethod(
+            Invocation.method(#verifiedEmailInfo, [email]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#verifiedEmailInfo, [email]),
+            ),
+          )
+          as String);
+
+  @override
+  String contributeExerciseWarning(String? days) =>
+      (super.noSuchMethod(
+            Invocation.method(#contributeExerciseWarning, [days]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#contributeExerciseWarning, [days]),
+            ),
+          )
+          as String);
+}

From c63057fe35dc557262bd65d12c014f41ccecbccf Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Wed, 8 Oct 2025 14:05:50 +0200
Subject: [PATCH 21/29] Reuse AddExerciseTextArea in the image form

---
 lib/helpers/consts.dart                       |   2 +-
 lib/helpers/exercises/validators.dart         |  43 ++++
 lib/l10n/app_en.arb                           |  12 +-
 lib/models/exercises/category.g.dart          |   2 +-
 lib/providers/add_exercise.dart               |   1 +
 .../add_exercise/add_exercise_text_area.dart  |  16 +-
 .../add_exercise/image_details_form.dart      | 194 +++++++-----------
 .../add_exercise/steps/step1basics.dart       |  16 +-
 .../add_exercise/steps/step3description.dart  |   5 +-
 .../add_exercise/steps/step4translations.dart |   6 +-
 .../add_exercise/steps/step5images.dart       |  21 +-
 .../add_exercise/steps/step6Overview.dart     |   3 +-
 .../contribute_exercise_image_test.mocks.dart |  50 +++--
 .../contribute_exercise_test.mocks.dart       |  22 +-
 14 files changed, 207 insertions(+), 186 deletions(-)
 create mode 100644 lib/helpers/exercises/validators.dart

diff --git a/lib/helpers/consts.dart b/lib/helpers/consts.dart
index f545e9b8..2b976165 100644
--- a/lib/helpers/consts.dart
+++ b/lib/helpers/consts.dart
@@ -145,4 +145,4 @@ const String API_RESULTS_PAGE_SIZE = '100';
 const INTERPOLATION_MARKER = 123;
 
 /// Creative Commons license IDs
-const CC_BY_SA_4_ID = 4;
+const CC_BY_SA_4_ID = 2;
diff --git a/lib/helpers/exercises/validators.dart b/lib/helpers/exercises/validators.dart
new file mode 100644
index 00000000..2af07d8b
--- /dev/null
+++ b/lib/helpers/exercises/validators.dart
@@ -0,0 +1,43 @@
+import 'package:flutter/material.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+/// The amount of characters an exercise description needs to have
+const MIN_CHARS_DESCRIPTION = 40;
+
+/// The amount of characters an exercise name needs to have
+const MIN_CHARS_NAME = 5;
+const MAX_CHARS_NAME = 40;
+
+String? validateName(String? name, BuildContext context) {
+  if (name!.isEmpty) {
+    return AppLocalizations.of(context).enterValue;
+  }
+
+  if (name.length < MIN_CHARS_NAME || name.length > MAX_CHARS_NAME) {
+    return AppLocalizations.of(
+      context,
+    ).enterCharacters(MIN_CHARS_NAME.toString(), MAX_CHARS_NAME.toString());
+  }
+
+  return null;
+}
+
+String? validateAuthorName(String? name, BuildContext context) {
+  if (name!.isEmpty) {
+    return AppLocalizations.of(context).enterValue;
+  }
+
+  return null;
+}
+
+String? validateExerciseDescription(String? name, BuildContext context) {
+  if (name!.isEmpty) {
+    return AppLocalizations.of(context).enterValue;
+  }
+
+  if (name.length < MIN_CHARS_DESCRIPTION) {
+    return AppLocalizations.of(context).enterMinCharacters(MIN_CHARS_DESCRIPTION.toString());
+  }
+
+  return null;
+}
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index ab3ebb6f..b74e6dd9 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -741,19 +741,19 @@
   "@imageDetailsLicenseTitleHint": {
     "description": "Hint text for image title field"
   },
-  "imageDetailsSourceLink": "Link to the source website, if available",
+  "imageDetailsSourceLink": "Link to the source website",
   "@imageDetailsSourceLink": {
     "description": "Label for source link field"
   },
-  "imageDetailsAuthor": "Author(s)",
-  "@imageDetailsAuthor": {
+  "author": "Author(s)",
+  "@Author": {
     "description": "Label for author field"
   },
-  "imageDetailsAuthorHint": "Enter author name",
-  "@imageDetailsAuthorHint": {
+  "authorHint": "Enter author name",
+  "@authorHint": {
     "description": "Hint text for author field"
   },
-  "imageDetailsAuthorLink": "Link to author website or profile, if available",
+  "imageDetailsAuthorLink": "Link to author website or profile",
   "@imageDetailsAuthorLink": {
     "description": "Label for author link field"
   },
diff --git a/lib/models/exercises/category.g.dart b/lib/models/exercises/category.g.dart
index 04c8db5f..c7966369 100644
--- a/lib/models/exercises/category.g.dart
+++ b/lib/models/exercises/category.g.dart
@@ -11,7 +11,7 @@ ExerciseCategory _$ExerciseCategoryFromJson(Map<String, dynamic> json) {
   return ExerciseCategory(id: (json['id'] as num).toInt(), name: json['name'] as String);
 }
 
-ap<String, dynamic> _$ExerciseCategoryToJson(ExerciseCategory instance) => <String, dynamic>{
+Map<String, dynamic> _$ExerciseCategoryToJson(ExerciseCategory instance) => <String, dynamic>{
   'id': instance.id,
   'name': instance.name,
 };
diff --git a/lib/providers/add_exercise.dart b/lib/providers/add_exercise.dart
index c61410e2..da3fdbfd 100644
--- a/lib/providers/add_exercise.dart
+++ b/lib/providers/add_exercise.dart
@@ -23,6 +23,7 @@ class AddExerciseProvider with ChangeNotifier {
 
   List<ExerciseSubmissionImage> get exerciseImages => [..._exerciseImages];
 
+  String author = '';
   String? exerciseNameEn;
   String? exerciseNameTrans;
   String? descriptionEn;
diff --git a/lib/widgets/add_exercise/add_exercise_text_area.dart b/lib/widgets/add_exercise/add_exercise_text_area.dart
index 7bad7be6..03579a1b 100644
--- a/lib/widgets/add_exercise/add_exercise_text_area.dart
+++ b/lib/widgets/add_exercise/add_exercise_text_area.dart
@@ -1,22 +1,22 @@
 import 'package:flutter/material.dart';
 
 class AddExerciseTextArea extends StatelessWidget {
-  const AddExerciseTextArea({
+  AddExerciseTextArea({
     super.key,
-    required this.onChange,
     required this.title,
+    ValueChanged<String>? onChange,
     this.helperText = '',
-    this.isRequired = true,
     this.isMultiline = false,
+    this.initialValue = '',
     this.validator,
     this.onSaved,
-  });
+  }) : onChange = onChange ?? ((String value) {});
 
   final ValueChanged<String> onChange;
-  final bool isRequired;
   final bool isMultiline;
   final String title;
   final String helperText;
+  final String? initialValue;
   final FormFieldValidator<String?>? validator;
   final FormFieldSetter<String?>? onSaved;
 
@@ -28,6 +28,7 @@ class AddExerciseTextArea extends StatelessWidget {
     return Padding(
       padding: const EdgeInsets.all(8.0),
       child: TextFormField(
+        initialValue: initialValue,
         keyboardType: isMultiline ? TextInputType.multiline : TextInputType.text,
         maxLines: isMultiline ? null : DEFAULT_LINES,
         minLines: isMultiline ? MULTILINE_MIN_LINES : DEFAULT_LINES,
@@ -35,12 +36,11 @@ class AddExerciseTextArea extends StatelessWidget {
         onSaved: onSaved,
         decoration: InputDecoration(
           contentPadding: const EdgeInsets.symmetric(horizontal: 10, vertical: 10),
-          border: const OutlineInputBorder(
-            borderRadius: BorderRadius.all(Radius.circular(10)),
-          ),
+          border: const OutlineInputBorder(borderRadius: BorderRadius.all(Radius.circular(10))),
           labelText: title,
           alignLabelWithHint: true,
           helperText: helperText,
+          helperMaxLines: 3,
         ),
         onChanged: onChange,
       ),
diff --git a/lib/widgets/add_exercise/image_details_form.dart b/lib/widgets/add_exercise/image_details_form.dart
index 1e8beed6..4bfa10d5 100644
--- a/lib/widgets/add_exercise/image_details_form.dart
+++ b/lib/widgets/add_exercise/image_details_form.dart
@@ -1,8 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:wger/core/validators.dart';
+import 'package:wger/helpers/exercises/validators.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/exercises/exercise_submission_images.dart';
 import 'package:wger/widgets/add_exercise/license_info_widget.dart';
 
+import 'add_exercise_text_area.dart';
+
 /// Form for collecting CC BY-SA 4.0 license metadata for exercise images
 ///
 /// This form is displayed after image selection in Step 5 of exercise creation.
@@ -50,6 +54,11 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
   /// Currently selected image type
   ImageType _selectedImageType = ImageType.photo;
 
+  @override
+  void initState() {
+    super.initState();
+  }
+
   @override
   void dispose() {
     _titleController.dispose();
@@ -60,137 +69,76 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
     super.dispose();
   }
 
-  /// Validates URL format
-  ///
-  /// Returns error message if URL is invalid, null if valid or empty
-  String? _validateUrl(String? value) {
-    if (value == null || value.trim().isEmpty) {
-      return null; // Empty is OK (optional field)
-    }
-
-    final trimmedValue = value.trim();
-
-    // Check if starts with http:// or https://
-    if (!trimmedValue.startsWith('http://') && !trimmedValue.startsWith('https://')) {
-      return AppLocalizations.of(context).invalidUrl;
-    }
-
-    // Try to parse as URI
-    try {
-      final uri = Uri.parse(trimmedValue);
-      if (!uri.hasScheme || !uri.hasAuthority) {
-        return AppLocalizations.of(context).invalidUrl;
-      }
-    } catch (e) {
-      return AppLocalizations.of(context).invalidUrl;
-    }
-
-    return null;
-  }
-
-  /// Maps UI image type selection to API 'style' field value
-  ///
-  /// API expects numeric string:
-  /// - PHOTO = '1'
-  /// - 3D = '2'
-  /// - LINE = '3'
-  /// - LOW-POLY = '4'
-  /// - OTHER = '5'
-  String _getStyleValue() {
-    switch (_selectedImageType) {
-      case 'PHOTO':
-        return '1';
-      case '3D':
-        return '2';
-      case 'LINE':
-        return '3';
-      case 'LOW-POLY':
-        return '4';
-      case 'OTHER':
-        return '5';
-      default:
-        return '1'; // Default to PHOTO if unknown
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
     return SingleChildScrollView(
-      child: Padding(
-        padding: const EdgeInsets.all(16.0),
-        child: Form(
-          key: _formKey,
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Text(
-                AppLocalizations.of(context).imageDetailsTitle,
-                style: Theme.of(
-                  context,
-                ).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
-              ),
-              const SizedBox(height: 16),
+      child: Form(
+        key: _formKey,
+        child: Column(
+          spacing: 8,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              AppLocalizations.of(context).imageDetailsTitle,
+              style: Theme.of(context).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
+            ),
+            const SizedBox(height: 8),
 
-              _buildImagePreview(),
-              const SizedBox(height: 24),
+            _buildImagePreview(),
+            const SizedBox(height: 8),
 
-              // License title field - helps identify the image
-              _buildTextField(
-                controller: _titleController,
-                label: AppLocalizations.of(context).imageDetailsLicenseTitle,
-                hint: AppLocalizations.of(context).imageDetailsLicenseTitleHint,
-              ),
-              const SizedBox(height: 16),
+            // Author name - required for proper CC BY-SA attribution
+            AddExerciseTextArea(
+              title: '${AppLocalizations.of(context).author}*',
+              initialValue: widget.submissionImage.author,
+              onSaved: (value) => widget.submissionImage.author = value!,
+              validator: (name) => validateAuthorName(name, context),
+            ),
 
-              // Source URL - where the image was found (license_object_url in API)
-              _buildTextField(
-                controller: _sourceLinkController,
-                label: AppLocalizations.of(context).imageDetailsSourceLink,
-                hint: 'https://example.com',
-                keyboardType: TextInputType.url,
-                validator: _validateUrl,
-              ),
-              const SizedBox(height: 16),
+            // License title field - helps identify the image
+            AddExerciseTextArea(
+              title: AppLocalizations.of(context).imageDetailsLicenseTitle,
+              helperText: AppLocalizations.of(context).imageDetailsLicenseTitleHint,
+              initialValue: widget.submissionImage.title,
+              onSaved: (value) => widget.submissionImage.title = value,
+            ),
 
-              // Author name - required for proper CC BY-SA attribution
-              _buildTextField(
-                controller: _authorController,
-                label: AppLocalizations.of(context).imageDetailsAuthor,
-                hint: AppLocalizations.of(context).imageDetailsAuthorHint,
-              ),
-              const SizedBox(height: 16),
+            // Source URL - where the image was found (license_object_url in API)
+            AddExerciseTextArea(
+              title: AppLocalizations.of(context).imageDetailsSourceLink,
+              initialValue: widget.submissionImage.sourceUrl,
+              onSaved: (value) => widget.submissionImage.sourceUrl = value,
+              validator: (value) => validateUrl(value, i18n, required: false),
+            ),
 
-              // Author's website/profile URL
-              _buildTextField(
-                controller: _authorLinkController,
-                label: AppLocalizations.of(context).imageDetailsAuthorLink,
-                hint: 'https://example.com/author',
-                keyboardType: TextInputType.url,
-                validator: _validateUrl,
-              ),
-              const SizedBox(height: 16),
+            // Author's website/profile URL
+            AddExerciseTextArea(
+              title: AppLocalizations.of(context).imageDetailsAuthorLink,
+              initialValue: widget.submissionImage.authorUrl,
+              onSaved: (value) => widget.submissionImage.authorUrl = value,
+              validator: (value) => validateUrl(value, i18n, required: false),
+            ),
 
-              // Original source if this is a derivative work (modified from another image)
-              _buildTextField(
-                controller: _originalSourceController,
-                label: AppLocalizations.of(context).imageDetailsDerivativeSource,
-                hint: 'https://example.com/original',
-                keyboardType: TextInputType.url,
-                helperText: AppLocalizations.of(context).imageDetailsDerivativeHelp,
-                validator: _validateUrl,
-              ),
-              const SizedBox(height: 24),
+            // Original source if this is a derivative work (modified from another image)
+            AddExerciseTextArea(
+              title: AppLocalizations.of(context).imageDetailsDerivativeSource,
+              helperText: AppLocalizations.of(context).imageDetailsDerivativeHelp,
+              initialValue: widget.submissionImage.derivativeSourceUrl,
+              onSaved: (value) => widget.submissionImage.derivativeSourceUrl = value,
+              validator: (value) => validateUrl(value, i18n, required: false),
+            ),
 
-              _buildImageTypeSelector(),
-              const SizedBox(height: 24),
+            _buildImageTypeSelector(),
+            const SizedBox(height: 16),
 
-              // License info as separate widget for better optimization
-              const LicenseInfoWidget(),
-              const SizedBox(height: 24),
+            // License info as separate widget for better optimization
+            const LicenseInfoWidget(),
+            const SizedBox(height: 8),
 
-              _buildButtons(),
-            ],
-          ),
+            _buildButtons(),
+          ],
         ),
       ),
     );
@@ -292,7 +240,9 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
                       type.label,
                       style: TextStyle(
                         fontSize: 11,
-                        color: isSelected ? Colors.blue : Colors.grey.shade700,
+                        color: isSelected
+                            ? theme.buttonTheme.colorScheme!.onPrimary
+                            : theme.buttonTheme.colorScheme!.primary,
                         fontWeight: isSelected ? FontWeight.bold : FontWeight.normal,
                       ),
                       textAlign: TextAlign.center,
@@ -322,10 +272,6 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
               return;
             }
 
-            // Build details map with API field names
-            // Style is always included, other fields only if non-empty
-            final details = <String, String>{'style': _getStyleValue()};
-
             // Add optional fields only if user provided values
             final title = _titleController.text.trim();
             if (title.isNotEmpty) {
diff --git a/lib/widgets/add_exercise/steps/step1basics.dart b/lib/widgets/add_exercise/steps/step1basics.dart
index 761a2411..12eb38dd 100644
--- a/lib/widgets/add_exercise/steps/step1basics.dart
+++ b/lib/widgets/add_exercise/steps/step1basics.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/helpers/consts.dart';
-import 'package:wger/helpers/exercises/forms.dart';
+import 'package:wger/helpers/exercises/validators.dart';
 import 'package:wger/helpers/i18n.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/exercises/category.dart';
@@ -9,6 +9,7 @@ import 'package:wger/models/exercises/equipment.dart';
 import 'package:wger/models/exercises/muscle.dart';
 import 'package:wger/providers/add_exercise.dart';
 import 'package:wger/providers/exercises.dart';
+import 'package:wger/providers/user.dart';
 import 'package:wger/widgets/add_exercise/add_exercise_multiselect_button.dart';
 import 'package:wger/widgets/add_exercise/add_exercise_text_area.dart';
 import 'package:wger/widgets/exercises/exercises.dart';
@@ -21,6 +22,7 @@ class Step1Basics extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final userProvider = context.read<UserProvider>();
     final addExerciseProvider = context.read<AddExerciseProvider>();
     final exerciseProvider = context.read<ExercisesProvider>();
     final categories = exerciseProvider.categories;
@@ -38,21 +40,25 @@ class Step1Basics extends StatelessWidget {
         builder: (context, provider, child) => Column(
           children: [
             AddExerciseTextArea(
-              onChange: (value) => {},
               title: '${AppLocalizations.of(context).name}*',
               helperText: AppLocalizations.of(context).baseNameEnglish,
-              isRequired: true,
               validator: (name) => validateName(name, context),
-              onSaved: (String? name) => addExerciseProvider.exerciseNameEn = name!,
+              onSaved: (String? name) => addExerciseProvider.exerciseNameEn = name,
             ),
             AddExerciseTextArea(
-              onChange: (value) => {},
               title: AppLocalizations.of(context).alternativeNames,
               isMultiline: true,
               helperText: AppLocalizations.of(context).oneNamePerLine,
               onSaved: (String? alternateName) =>
                   addExerciseProvider.alternateNamesEn = alternateName!.split('\n'),
             ),
+            AddExerciseTextArea(
+              title: '${AppLocalizations.of(context).author}*',
+              isMultiline: false,
+              validator: (name) => validateAuthorName(name, context),
+              initialValue: userProvider.profile!.username,
+              onSaved: (String? author) => addExerciseProvider.author = author!,
+            ),
             ExerciseCategoryInputWidget<ExerciseCategory>(
               key: const Key('category-dropdown'),
               entries: categories,
diff --git a/lib/widgets/add_exercise/steps/step3description.dart b/lib/widgets/add_exercise/steps/step3description.dart
index 0de027e3..2905df17 100644
--- a/lib/widgets/add_exercise/steps/step3description.dart
+++ b/lib/widgets/add_exercise/steps/step3description.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:wger/helpers/exercises/forms.dart';
+import 'package:wger/helpers/exercises/validators.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/providers/add_exercise.dart';
 import 'package:wger/widgets/add_exercise/add_exercise_text_area.dart';
@@ -23,10 +23,9 @@ class Step3Description extends StatelessWidget {
             onChange: (value) => {},
             title: '${i18n.description}*',
             helperText: i18n.enterTextInLanguage,
-            isRequired: true,
             isMultiline: true,
             validator: (name) => validateExerciseDescription(name, context),
-            onSaved: (String? description) => addExerciseProvider.descriptionEn = description!,
+            onSaved: (String? description) => addExerciseProvider.descriptionEn = description,
           ),
         ],
       ),
diff --git a/lib/widgets/add_exercise/steps/step4translations.dart b/lib/widgets/add_exercise/steps/step4translations.dart
index eadd61a7..d8f4a778 100644
--- a/lib/widgets/add_exercise/steps/step4translations.dart
+++ b/lib/widgets/add_exercise/steps/step4translations.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:wger/helpers/exercises/forms.dart';
+import 'package:wger/helpers/exercises/validators.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/exercises/language.dart';
 import 'package:wger/providers/add_exercise.dart';
@@ -59,14 +59,11 @@ class _Step4TranslationState extends State<Step4Translation> {
                   },
                 ),
                 AddExerciseTextArea(
-                  onChange: (value) => {},
                   title: '${i18n.name}*',
-                  isRequired: true,
                   validator: (name) => validateName(name, context),
                   onSaved: (String? name) => addExerciseProvider.exerciseNameTrans = name!,
                 ),
                 AddExerciseTextArea(
-                  onChange: (value) => {},
                   title: i18n.alternativeNames,
                   isMultiline: true,
                   helperText: i18n.oneNamePerLine,
@@ -93,7 +90,6 @@ class _Step4TranslationState extends State<Step4Translation> {
                     onChange: (value) => {},
                     title: '${i18n.description}*',
                     helperText: i18n.enterTextInLanguage,
-                    isRequired: true,
                     isMultiline: true,
                     validator: (name) => validateExerciseDescription(name, context),
                     onSaved: (String? description) =>
diff --git a/lib/widgets/add_exercise/steps/step5images.dart b/lib/widgets/add_exercise/steps/step5images.dart
index 3371981a..6d436122 100644
--- a/lib/widgets/add_exercise/steps/step5images.dart
+++ b/lib/widgets/add_exercise/steps/step5images.dart
@@ -6,6 +6,7 @@ import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/exercises/exercise_submission_images.dart';
 import 'package:wger/providers/add_exercise.dart';
+import 'package:wger/providers/user.dart';
 import 'package:wger/widgets/add_exercise/image_details_form.dart';
 import 'package:wger/widgets/add_exercise/mixins/image_picker_mixin.dart';
 import 'package:wger/widgets/add_exercise/preview_images.dart';
@@ -33,7 +34,7 @@ class Step5Images extends StatefulWidget {
 class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin {
   /// Currently selected image waiting for metadata input
   /// When non-null, ImageDetailsForm is displayed instead of image picker
-  ExerciseSubmissionImage? _currentImageToAddNew;
+  ExerciseSubmissionImage? _currentImageToAdd;
 
   /// Show dialog to choose between Camera and Gallery
   Future<void> _showImageSourceDialog(BuildContext context) async {
@@ -75,6 +76,7 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
   ///
   /// [pickFromCamera] - If true, opens camera; otherwise opens gallery
   void _pickAndShowImageDetails(BuildContext context, {bool pickFromCamera = false}) async {
+    final userProvider = context.read<UserProvider>();
     final imagePicker = ImagePicker();
 
     XFile? selectedImage;
@@ -114,7 +116,10 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
 
       // Show metadata collection form for valid image
       setState(() {
-        _currentImageToAddNew = ExerciseSubmissionImage(imageFile: imageFile);
+        _currentImageToAdd = ExerciseSubmissionImage(
+          imageFile: imageFile,
+          author: userProvider.profile?.username ?? '',
+        );
       });
     }
   }
@@ -135,14 +140,14 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
 
     // Reset form state - image is now visible in preview list
     setState(() {
-      _currentImageToAddNew = null;
+      _currentImageToAdd = null;
     });
   }
 
   /// Cancel metadata input and return to image picker
   void _cancelImageAdd() {
     setState(() {
-      _currentImageToAddNew = null;
+      _currentImageToAdd = null;
     });
   }
 
@@ -153,7 +158,7 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
       child: Column(
         children: [
           // License notice - shown when not entering metadata
-          if (_currentImageToAddNew == null)
+          if (_currentImageToAdd == null)
             Padding(
               padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
               child: Text(
@@ -164,15 +169,15 @@ class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin
             ),
 
           // Metadata collection form - shown when image is selected
-          if (_currentImageToAddNew != null)
+          if (_currentImageToAdd != null)
             ImageDetailsForm(
-              submissionImage: _currentImageToAddNew!,
+              submissionImage: _currentImageToAdd!,
               onAdd: _addImageWithDetails,
               onCancel: _cancelImageAdd,
             ),
 
           // Image picker or preview - shown when not entering metadata
-          if (_currentImageToAddNew == null)
+          if (_currentImageToAdd == null)
             Consumer<AddExerciseProvider>(
               builder: (ctx, provider, __) {
                 if (provider.exerciseImages.isNotEmpty) {
diff --git a/lib/widgets/add_exercise/steps/step6Overview.dart b/lib/widgets/add_exercise/steps/step6Overview.dart
index fbe65664..dda2f6c8 100644
--- a/lib/widgets/add_exercise/steps/step6Overview.dart
+++ b/lib/widgets/add_exercise/steps/step6Overview.dart
@@ -11,13 +11,14 @@ class Step6Overview extends StatelessWidget {
     final i18n = AppLocalizations.of(context);
 
     return Consumer<AddExerciseProvider>(
-      builder: (ctx, provider, __) => Column(
+      builder: (ctx, provider, _) => Column(
         spacing: 8,
         children: [
           Text(i18n.baseData, style: Theme.of(context).textTheme.headlineSmall),
           Table(
             columnWidths: const {0: FlexColumnWidth(2), 1: FlexColumnWidth(3)},
             children: [
+              TableRow(children: [Text(i18n.author), Text(provider.author)]),
               TableRow(children: [Text(i18n.name), Text(provider.exerciseNameEn ?? '...')]),
               TableRow(
                 children: [
diff --git a/test/exercises/contribute_exercise_image_test.mocks.dart b/test/exercises/contribute_exercise_image_test.mocks.dart
index cf7d9693..22ab5237 100644
--- a/test/exercises/contribute_exercise_image_test.mocks.dart
+++ b/test/exercises/contribute_exercise_image_test.mocks.dart
@@ -8,13 +8,13 @@ import 'dart:ui' as _i15;
 
 import 'package:http/http.dart' as _i5;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:mockito/src/dummies.dart' as _i11;
+import 'package:mockito/src/dummies.dart' as _i8;
 import 'package:wger/models/exercises/category.dart' as _i13;
-import 'package:wger/models/exercises/equipment.dart' as _i8;
-import 'package:wger/models/exercises/exercise_submission.dart' as _i10;
+import 'package:wger/models/exercises/equipment.dart' as _i9;
+import 'package:wger/models/exercises/exercise_submission.dart' as _i11;
 import 'package:wger/models/exercises/exercise_submission_images.dart' as _i7;
 import 'package:wger/models/exercises/language.dart' as _i12;
-import 'package:wger/models/exercises/muscle.dart' as _i9;
+import 'package:wger/models/exercises/muscle.dart' as _i10;
 import 'package:wger/models/exercises/variation.dart' as _i3;
 import 'package:wger/providers/add_exercise.dart' as _i6;
 import 'package:wger/providers/auth.dart' as _i4;
@@ -84,6 +84,14 @@ class MockAddExerciseProvider extends _i1.Mock implements _i6.AddExerciseProvide
           )
           as List<_i7.ExerciseSubmissionImage>);
 
+  @override
+  String get author =>
+      (super.noSuchMethod(
+            Invocation.getter(#author),
+            returnValue: _i8.dummyValue<String>(this, Invocation.getter(#author)),
+          )
+          as String);
+
   @override
   List<String> get alternateNamesEn =>
       (super.noSuchMethod(Invocation.getter(#alternateNamesEn), returnValue: <String>[])
@@ -95,9 +103,9 @@ class MockAddExerciseProvider extends _i1.Mock implements _i6.AddExerciseProvide
           as List<String>);
 
   @override
-  List<_i8.Equipment> get equipment =>
-      (super.noSuchMethod(Invocation.getter(#equipment), returnValue: <_i8.Equipment>[])
-          as List<_i8.Equipment>);
+  List<_i9.Equipment> get equipment =>
+      (super.noSuchMethod(Invocation.getter(#equipment), returnValue: <_i9.Equipment>[])
+          as List<_i9.Equipment>);
 
   @override
   bool get newVariation =>
@@ -112,25 +120,29 @@ class MockAddExerciseProvider extends _i1.Mock implements _i6.AddExerciseProvide
           as _i3.Variation);
 
   @override
-  List<_i9.Muscle> get primaryMuscles =>
-      (super.noSuchMethod(Invocation.getter(#primaryMuscles), returnValue: <_i9.Muscle>[])
-          as List<_i9.Muscle>);
+  List<_i10.Muscle> get primaryMuscles =>
+      (super.noSuchMethod(Invocation.getter(#primaryMuscles), returnValue: <_i10.Muscle>[])
+          as List<_i10.Muscle>);
 
   @override
-  List<_i9.Muscle> get secondaryMuscles =>
-      (super.noSuchMethod(Invocation.getter(#secondaryMuscles), returnValue: <_i9.Muscle>[])
-          as List<_i9.Muscle>);
+  List<_i10.Muscle> get secondaryMuscles =>
+      (super.noSuchMethod(Invocation.getter(#secondaryMuscles), returnValue: <_i10.Muscle>[])
+          as List<_i10.Muscle>);
 
   @override
-  _i10.ExerciseSubmissionApi get exerciseApiObject =>
+  _i11.ExerciseSubmissionApi get exerciseApiObject =>
       (super.noSuchMethod(
             Invocation.getter(#exerciseApiObject),
-            returnValue: _i11.dummyValue<_i10.ExerciseSubmissionApi>(
+            returnValue: _i8.dummyValue<_i11.ExerciseSubmissionApi>(
               this,
               Invocation.getter(#exerciseApiObject),
             ),
           )
-          as _i10.ExerciseSubmissionApi);
+          as _i11.ExerciseSubmissionApi);
+
+  @override
+  set author(String? value) =>
+      super.noSuchMethod(Invocation.setter(#author, value), returnValueForMissingStub: null);
 
   @override
   set exerciseNameEn(String? value) => super.noSuchMethod(
@@ -181,7 +193,7 @@ class MockAddExerciseProvider extends _i1.Mock implements _i6.AddExerciseProvide
       super.noSuchMethod(Invocation.setter(#category, value), returnValueForMissingStub: null);
 
   @override
-  set equipment(List<_i8.Equipment>? equipment) =>
+  set equipment(List<_i9.Equipment>? equipment) =>
       super.noSuchMethod(Invocation.setter(#equipment, equipment), returnValueForMissingStub: null);
 
   @override
@@ -197,13 +209,13 @@ class MockAddExerciseProvider extends _i1.Mock implements _i6.AddExerciseProvide
   );
 
   @override
-  set primaryMuscles(List<_i9.Muscle>? muscles) => super.noSuchMethod(
+  set primaryMuscles(List<_i10.Muscle>? muscles) => super.noSuchMethod(
     Invocation.setter(#primaryMuscles, muscles),
     returnValueForMissingStub: null,
   );
 
   @override
-  set secondaryMuscles(List<_i9.Muscle>? muscles) => super.noSuchMethod(
+  set secondaryMuscles(List<_i10.Muscle>? muscles) => super.noSuchMethod(
     Invocation.setter(#secondaryMuscles, muscles),
     returnValueForMissingStub: null,
   );
diff --git a/test/exercises/contribute_exercise_test.mocks.dart b/test/exercises/contribute_exercise_test.mocks.dart
index 97cbe8e3..27e36f70 100644
--- a/test/exercises/contribute_exercise_test.mocks.dart
+++ b/test/exercises/contribute_exercise_test.mocks.dart
@@ -8,13 +8,13 @@ import 'dart:ui' as _i16;
 
 import 'package:flutter/material.dart' as _i18;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:mockito/src/dummies.dart' as _i14;
+import 'package:mockito/src/dummies.dart' as _i13;
 import 'package:shared_preferences/shared_preferences.dart' as _i4;
 import 'package:wger/database/exercises/exercise_database.dart' as _i5;
 import 'package:wger/models/exercises/category.dart' as _i7;
 import 'package:wger/models/exercises/equipment.dart' as _i8;
 import 'package:wger/models/exercises/exercise.dart' as _i6;
-import 'package:wger/models/exercises/exercise_submission.dart' as _i13;
+import 'package:wger/models/exercises/exercise_submission.dart' as _i14;
 import 'package:wger/models/exercises/exercise_submission_images.dart' as _i12;
 import 'package:wger/models/exercises/language.dart' as _i10;
 import 'package:wger/models/exercises/muscle.dart' as _i9;
@@ -104,6 +104,14 @@ class MockAddExerciseProvider extends _i1.Mock implements _i11.AddExerciseProvid
           )
           as List<_i12.ExerciseSubmissionImage>);
 
+  @override
+  String get author =>
+      (super.noSuchMethod(
+            Invocation.getter(#author),
+            returnValue: _i13.dummyValue<String>(this, Invocation.getter(#author)),
+          )
+          as String);
+
   @override
   List<String> get alternateNamesEn =>
       (super.noSuchMethod(Invocation.getter(#alternateNamesEn), returnValue: <String>[])
@@ -142,15 +150,19 @@ class MockAddExerciseProvider extends _i1.Mock implements _i11.AddExerciseProvid
           as List<_i9.Muscle>);
 
   @override
-  _i13.ExerciseSubmissionApi get exerciseApiObject =>
+  _i14.ExerciseSubmissionApi get exerciseApiObject =>
       (super.noSuchMethod(
             Invocation.getter(#exerciseApiObject),
-            returnValue: _i14.dummyValue<_i13.ExerciseSubmissionApi>(
+            returnValue: _i13.dummyValue<_i14.ExerciseSubmissionApi>(
               this,
               Invocation.getter(#exerciseApiObject),
             ),
           )
-          as _i13.ExerciseSubmissionApi);
+          as _i14.ExerciseSubmissionApi);
+
+  @override
+  set author(String? value) =>
+      super.noSuchMethod(Invocation.setter(#author, value), returnValueForMissingStub: null);
 
   @override
   set exerciseNameEn(String? value) => super.noSuchMethod(

From bb2fbc2c7394ec9203eaa6e6abeeb6cf76280d07 Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Wed, 8 Oct 2025 14:07:51 +0200
Subject: [PATCH 22/29] Rename files to follow naming schema of all others

---
 lib/screens/add_exercise_screen.dart                 | 12 ++++++------
 .../steps/{step1basics.dart => step_1_basics.dart}   |  0
 .../{step2variations.dart => step_2_variations.dart} |  0
 ...step3description.dart => step_3_description.dart} |  0
 ...ep4translations.dart => step_4_translations.dart} |  0
 .../steps/{step5images.dart => step_5_images.dart}   |  0
 .../{step6Overview.dart => step_6_overview.dart}     |  0
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename lib/widgets/add_exercise/steps/{step1basics.dart => step_1_basics.dart} (100%)
 rename lib/widgets/add_exercise/steps/{step2variations.dart => step_2_variations.dart} (100%)
 rename lib/widgets/add_exercise/steps/{step3description.dart => step_3_description.dart} (100%)
 rename lib/widgets/add_exercise/steps/{step4translations.dart => step_4_translations.dart} (100%)
 rename lib/widgets/add_exercise/steps/{step5images.dart => step_5_images.dart} (100%)
 rename lib/widgets/add_exercise/steps/{step6Overview.dart => step_6_overview.dart} (100%)

diff --git a/lib/screens/add_exercise_screen.dart b/lib/screens/add_exercise_screen.dart
index 4eec7d3d..83dd447e 100644
--- a/lib/screens/add_exercise_screen.dart
+++ b/lib/screens/add_exercise_screen.dart
@@ -9,12 +9,12 @@ import 'package:wger/providers/add_exercise.dart';
 import 'package:wger/providers/exercises.dart';
 import 'package:wger/providers/user.dart';
 import 'package:wger/screens/exercise_screen.dart';
-import 'package:wger/widgets/add_exercise/steps/step1basics.dart';
-import 'package:wger/widgets/add_exercise/steps/step2variations.dart';
-import 'package:wger/widgets/add_exercise/steps/step3description.dart';
-import 'package:wger/widgets/add_exercise/steps/step4translations.dart';
-import 'package:wger/widgets/add_exercise/steps/step5images.dart';
-import 'package:wger/widgets/add_exercise/steps/step6Overview.dart';
+import 'package:wger/widgets/add_exercise/steps/step_1_basics.dart';
+import 'package:wger/widgets/add_exercise/steps/step_2_variations.dart';
+import 'package:wger/widgets/add_exercise/steps/step_3_description.dart';
+import 'package:wger/widgets/add_exercise/steps/step_4_translations.dart';
+import 'package:wger/widgets/add_exercise/steps/step_5_images.dart';
+import 'package:wger/widgets/add_exercise/steps/step_6_overview.dart';
 import 'package:wger/widgets/core/app_bar.dart';
 import 'package:wger/widgets/user/forms.dart';
 
diff --git a/lib/widgets/add_exercise/steps/step1basics.dart b/lib/widgets/add_exercise/steps/step_1_basics.dart
similarity index 100%
rename from lib/widgets/add_exercise/steps/step1basics.dart
rename to lib/widgets/add_exercise/steps/step_1_basics.dart
diff --git a/lib/widgets/add_exercise/steps/step2variations.dart b/lib/widgets/add_exercise/steps/step_2_variations.dart
similarity index 100%
rename from lib/widgets/add_exercise/steps/step2variations.dart
rename to lib/widgets/add_exercise/steps/step_2_variations.dart
diff --git a/lib/widgets/add_exercise/steps/step3description.dart b/lib/widgets/add_exercise/steps/step_3_description.dart
similarity index 100%
rename from lib/widgets/add_exercise/steps/step3description.dart
rename to lib/widgets/add_exercise/steps/step_3_description.dart
diff --git a/lib/widgets/add_exercise/steps/step4translations.dart b/lib/widgets/add_exercise/steps/step_4_translations.dart
similarity index 100%
rename from lib/widgets/add_exercise/steps/step4translations.dart
rename to lib/widgets/add_exercise/steps/step_4_translations.dart
diff --git a/lib/widgets/add_exercise/steps/step5images.dart b/lib/widgets/add_exercise/steps/step_5_images.dart
similarity index 100%
rename from lib/widgets/add_exercise/steps/step5images.dart
rename to lib/widgets/add_exercise/steps/step_5_images.dart
diff --git a/lib/widgets/add_exercise/steps/step6Overview.dart b/lib/widgets/add_exercise/steps/step_6_overview.dart
similarity index 100%
rename from lib/widgets/add_exercise/steps/step6Overview.dart
rename to lib/widgets/add_exercise/steps/step_6_overview.dart

From cb9d2a0e979f072a4179512db970b1574b94fcc9 Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Wed, 8 Oct 2025 14:10:21 +0200
Subject: [PATCH 23/29] Add other build folders to .gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index edc2c5c0..b3dc0686 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,8 @@
 .pub-cache/
 .pub/
 /build/
+/**/build/
+/android/app/.cxx
 **/failures/*.png
 
 
@@ -62,3 +64,4 @@ ios/fastlane/Preview.html
 ios/fastlane/output
 ios/Runner.ipa
 ios/Runner.app.dSYM.zip
+

From 4b9afa5c9808f09b9df4e050ae00dbb12b4ad39f Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Wed, 8 Oct 2025 14:34:23 +0200
Subject: [PATCH 24/29] Actually send the correct image fields to the server

---
 .../exercises/exercise_submission_images.dart | 12 ++--
 lib/providers/add_exercise.dart               |  1 -
 .../add_exercise/image_details_form.dart      | 61 +------------------
 3 files changed, 9 insertions(+), 65 deletions(-)

diff --git a/lib/models/exercises/exercise_submission_images.dart b/lib/models/exercises/exercise_submission_images.dart
index fe97466b..935e85f3 100644
--- a/lib/models/exercises/exercise_submission_images.dart
+++ b/lib/models/exercises/exercise_submission_images.dart
@@ -56,12 +56,12 @@ class ExerciseSubmissionImage {
 
   Map<String, String> toJson() {
     return {
-      'title': title ?? '',
-      'author': author ?? '',
-      'author_url': authorUrl ?? '',
-      'source_url': sourceUrl ?? '',
-      'derivative_source_url': derivativeSourceUrl ?? '',
-      'type': type.id.toString(),
+      'license_title': title ?? '',
+      'license_author': author ?? '',
+      'license_author_url': authorUrl ?? '',
+      'license_object_url': sourceUrl ?? '',
+      'license_derivative_source_url': derivativeSourceUrl ?? '',
+      'style': type.id.toString(),
     };
   }
 }
diff --git a/lib/providers/add_exercise.dart b/lib/providers/add_exercise.dart
index da3fdbfd..a813744f 100644
--- a/lib/providers/add_exercise.dart
+++ b/lib/providers/add_exercise.dart
@@ -192,7 +192,6 @@ class AddExerciseProvider with ChangeNotifier {
       request.fields['exercise'] = exerciseId.toString();
       request.fields['license'] = CC_BY_SA_4_ID.toString();
       request.fields['is_main'] = 'false';
-      request.fields['style'] = ImageType.photo.id.toString();
 
       final details = image.toJson();
       if (details.isNotEmpty) {
diff --git a/lib/widgets/add_exercise/image_details_form.dart b/lib/widgets/add_exercise/image_details_form.dart
index 4bfa10d5..4e242e69 100644
--- a/lib/widgets/add_exercise/image_details_form.dart
+++ b/lib/widgets/add_exercise/image_details_form.dart
@@ -77,15 +77,14 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
       child: Form(
         key: _formKey,
         child: Column(
-          spacing: 8,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Text(
               AppLocalizations.of(context).imageDetailsTitle,
               style: Theme.of(context).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
             ),
-            const SizedBox(height: 8),
 
+            const SizedBox(height: 8),
             _buildImagePreview(),
             const SizedBox(height: 8),
 
@@ -93,7 +92,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
             AddExerciseTextArea(
               title: '${AppLocalizations.of(context).author}*',
               initialValue: widget.submissionImage.author,
-              onSaved: (value) => widget.submissionImage.author = value!,
+              onSaved: (value) => widget.submissionImage.author = value,
               validator: (name) => validateAuthorName(name, context),
             ),
 
@@ -160,35 +159,6 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
     );
   }
 
-  Widget _buildTextField({
-    required TextEditingController controller,
-    required String label,
-    String? hint,
-    TextInputType? keyboardType,
-    String? helperText,
-    String? Function(String?)? validator,
-  }) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(label, style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500)),
-        const SizedBox(height: 8),
-        TextFormField(
-          controller: controller,
-          keyboardType: keyboardType,
-          validator: validator,
-          decoration: InputDecoration(
-            hintText: hint,
-            helperText: helperText,
-            helperMaxLines: 3,
-            border: OutlineInputBorder(borderRadius: BorderRadius.circular(4)),
-            contentPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 12),
-          ),
-        ),
-      ],
-    );
-  }
-
   /// Visual selector for image style/type
   ///
   /// Allows user to categorize the image as PHOTO, 3D render, LINE drawing,
@@ -271,32 +241,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
             if (!_formKey.currentState!.validate()) {
               return;
             }
-
-            // Add optional fields only if user provided values
-            final title = _titleController.text.trim();
-            if (title.isNotEmpty) {
-              widget.submissionImage.title = title;
-            }
-
-            final author = _authorController.text.trim();
-            if (author.isNotEmpty) {
-              widget.submissionImage.author = author;
-            }
-
-            final sourceUrl = _sourceLinkController.text.trim();
-            if (sourceUrl.isNotEmpty) {
-              widget.submissionImage.sourceUrl = sourceUrl;
-            }
-
-            final authorUrl = _authorLinkController.text.trim();
-            if (authorUrl.isNotEmpty) {
-              widget.submissionImage.authorUrl = authorUrl;
-            }
-
-            final derivativeUrl = _originalSourceController.text.trim();
-            if (derivativeUrl.isNotEmpty) {
-              widget.submissionImage.derivativeSourceUrl = derivativeUrl;
-            }
+            _formKey.currentState?.save();
 
             // Pass image and metadata back to parent
             widget.onAdd(widget.submissionImage);

From 8199205b021b579bd5b7721785ab1b5df0df0f65 Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Wed, 8 Oct 2025 14:42:58 +0200
Subject: [PATCH 25/29] Don't dump all the debug info to the error reporting

---
 lib/helpers/errors.dart     | 102 +++++++++++++++++-------------------
 lib/helpers/logs.dart       |  14 +++--
 test/helpers/logs_test.dart |   6 ++-
 3 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/lib/helpers/errors.dart b/lib/helpers/errors.dart
index e6807c02..77d03a0a 100644
--- a/lib/helpers/errors.dart
+++ b/lib/helpers/errors.dart
@@ -101,7 +101,8 @@ void showGeneralErrorDialog(dynamic error, StackTrace? stackTrace, {BuildContext
 
   if (error is TimeoutException) {
     issueTitle = 'Network Timeout';
-    issueErrorMessage = 'The connection to the server timed out. Please check your '
+    issueErrorMessage =
+        'The connection to the server timed out. Please check your '
         'internet connection and try again.';
   } else if (error is FlutterErrorDetails) {
     issueTitle = 'Application Error';
@@ -116,7 +117,7 @@ void showGeneralErrorDialog(dynamic error, StackTrace? stackTrace, {BuildContext
   }
 
   final String fullStackTrace = stackTrace?.toString() ?? 'No stack trace available.';
-  final applicationLogs = InMemoryLogStore().formattedLogs;
+  final applicationLogs = InMemoryLogStore().getFormattedLogs();
 
   showDialog(
     context: dialogContext,
@@ -127,15 +128,9 @@ void showGeneralErrorDialog(dynamic error, StackTrace? stackTrace, {BuildContext
           spacing: 8,
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
-            Icon(
-              icon,
-              color: Theme.of(context).colorScheme.error,
-            ),
+            Icon(icon, color: Theme.of(context).colorScheme.error),
             Expanded(
-              child: Text(
-                errorTitle,
-                style: TextStyle(color: Theme.of(context).colorScheme.error),
-              ),
+              child: Text(errorTitle, style: TextStyle(color: Theme.of(context).colorScheme.error)),
             ),
           ],
         ),
@@ -150,10 +145,7 @@ void showGeneralErrorDialog(dynamic error, StackTrace? stackTrace, {BuildContext
                 tilePadding: EdgeInsets.zero,
                 title: Text(i18n.errorViewDetails),
                 children: [
-                  Text(
-                    issueErrorMessage,
-                    style: const TextStyle(fontWeight: FontWeight.bold),
-                  ),
+                  Text(issueErrorMessage, style: const TextStyle(fontWeight: FontWeight.bold)),
                   Container(
                     alignment: Alignment.topLeft,
                     padding: const EdgeInsets.symmetric(vertical: 8.0),
@@ -166,15 +158,13 @@ void showGeneralErrorDialog(dynamic error, StackTrace? stackTrace, {BuildContext
                     ),
                   ),
                   CopyToClipboardButton(
-                    text: 'Error Title: $issueTitle\n'
+                    text:
+                        'Error Title: $issueTitle\n'
                         'Error Message: $issueErrorMessage\n\n'
                         'Stack Trace:\n$fullStackTrace',
                   ),
                   const SizedBox(height: 8),
-                  Text(
-                    i18n.applicationLogs,
-                    style: const TextStyle(fontWeight: FontWeight.bold),
-                  ),
+                  Text(i18n.applicationLogs, style: const TextStyle(fontWeight: FontWeight.bold)),
                   Container(
                     alignment: Alignment.topLeft,
                     padding: const EdgeInsets.symmetric(vertical: 8.0),
@@ -182,10 +172,12 @@ void showGeneralErrorDialog(dynamic error, StackTrace? stackTrace, {BuildContext
                     child: SingleChildScrollView(
                       child: Column(
                         children: [
-                          ...applicationLogs.map((entry) => Text(
-                                entry,
-                                style: TextStyle(fontSize: 12.0, color: Colors.grey[700]),
-                              ))
+                          ...applicationLogs.map(
+                            (entry) => Text(
+                              entry,
+                              style: TextStyle(fontSize: 12.0, color: Colors.grey[700]),
+                            ),
+                          ),
                         ],
                       ),
                     ),
@@ -215,7 +207,8 @@ void showGeneralErrorDialog(dynamic error, StackTrace? stackTrace, {BuildContext
                   'App logs (last ${applicationLogs.length} entries):\n'
                   '```\n$logText\n```',
                 );
-                final githubIssueUrl = '$GITHUB_ISSUES_BUG_URL'
+                final githubIssueUrl =
+                    '$GITHUB_ISSUES_BUG_URL'
                     '&title=$issueTitle'
                     '&description=$description';
                 final Uri reportUri = Uri.parse(githubIssueUrl);
@@ -226,9 +219,9 @@ void showGeneralErrorDialog(dynamic error, StackTrace? stackTrace, {BuildContext
                   if (kDebugMode) {
                     logger.warning('Error launching URL: $e');
                   }
-                  ScaffoldMessenger.of(context).showSnackBar(
-                    SnackBar(content: Text('Error opening issue tracker: $e')),
-                  );
+                  ScaffoldMessenger.of(
+                    context,
+                  ).showSnackBar(SnackBar(content: Text('Error opening issue tracker: $e')));
                 }
               },
             ),
@@ -248,10 +241,7 @@ class CopyToClipboardButton extends StatelessWidget {
   final logger = Logger('CopyToClipboardButton');
   final String text;
 
-  CopyToClipboardButton({
-    required this.text,
-    super.key,
-  });
+  CopyToClipboardButton({required this.text, super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -265,21 +255,23 @@ class CopyToClipboardButton extends StatelessWidget {
         tapTargetSize: MaterialTapTargetSize.shrinkWrap,
       ),
       onPressed: () {
-        Clipboard.setData(ClipboardData(text: text)).then((_) {
-          if (context.mounted) {
-            ScaffoldMessenger.of(context).showSnackBar(
-              const SnackBar(content: Text('Details copied to clipboard!')),
-            );
-          }
-        }).catchError((copyError) {
-          logger.warning('Error copying to clipboard: $copyError');
+        Clipboard.setData(ClipboardData(text: text))
+            .then((_) {
+              if (context.mounted) {
+                ScaffoldMessenger.of(
+                  context,
+                ).showSnackBar(const SnackBar(content: Text('Details copied to clipboard!')));
+              }
+            })
+            .catchError((copyError) {
+              logger.warning('Error copying to clipboard: $copyError');
 
-          if (context.mounted) {
-            ScaffoldMessenger.of(context).showSnackBar(
-              const SnackBar(content: Text('Could not copy details.')),
-            );
-          }
-        });
+              if (context.mounted) {
+                ScaffoldMessenger.of(
+                  context,
+                ).showSnackBar(const SnackBar(content: Text('Could not copy details.')));
+              }
+            });
       },
     );
   }
@@ -290,9 +282,7 @@ void showDeleteDialog(BuildContext context, String confirmDeleteName, Log log) a
     context: context,
     builder: (BuildContext contextDialog) {
       return AlertDialog(
-        content: Text(
-          AppLocalizations.of(context).confirmDelete(confirmDeleteName),
-        ),
+        content: Text(AppLocalizations.of(context).confirmDelete(confirmDeleteName)),
         actions: [
           TextButton(
             key: const ValueKey('cancel-button'),
@@ -387,7 +377,10 @@ List<Widget> formatApiErrors(List<ApiError> errors, {Color? color}) {
 
   for (final error in errors) {
     errorList.add(
-      Text(error.key, style: TextStyle(fontWeight: FontWeight.bold, color: textColor)),
+      Text(
+        error.key,
+        style: TextStyle(fontWeight: FontWeight.bold, color: textColor),
+      ),
     );
 
     print(error.errorMessages);
@@ -408,7 +401,10 @@ List<Widget> formatTextErrors(List<String> errors, {String? title, Color? color}
 
   if (title != null) {
     errorList.add(
-      Text(title, style: TextStyle(fontWeight: FontWeight.bold, color: textColor)),
+      Text(
+        title,
+        style: TextStyle(fontWeight: FontWeight.bold, color: textColor),
+      ),
     );
   }
 
@@ -458,11 +454,7 @@ class GeneralErrorsWidget extends StatelessWidget {
         child: Column(
           children: [
             Icon(Icons.error_outline, color: Theme.of(context).colorScheme.error),
-            ...formatTextErrors(
-              widgets,
-              title: title,
-              color: Theme.of(context).colorScheme.error,
-            ),
+            ...formatTextErrors(widgets, title: title, color: Theme.of(context).colorScheme.error),
           ],
         ),
       ),
diff --git a/lib/helpers/logs.dart b/lib/helpers/logs.dart
index 38aea584..e0dea032 100644
--- a/lib/helpers/logs.dart
+++ b/lib/helpers/logs.dart
@@ -41,10 +41,16 @@ class InMemoryLogStore {
 
   List<LogRecord> get logs => List.unmodifiable(_logs);
 
-  List<String> get formattedLogs => _logs
-      .map((log) =>
-          '${log.time.toIso8601String()} ${log.level.name} [${log.loggerName}] ${log.message}')
-      .toList();
+  List<String> getFormattedLogs({Level? minLevel}) {
+    final level = minLevel ?? Logger.root.level;
+    return _logs
+        .where((log) => log.level >= level)
+        .map(
+          (log) =>
+              '${log.time.toIso8601String()} ${log.level.name} [${log.loggerName}] ${log.message}',
+        )
+        .toList();
+  }
 
   void clear() => _logs.clear();
 }
diff --git a/test/helpers/logs_test.dart b/test/helpers/logs_test.dart
index 92867e0c..2db46cc4 100644
--- a/test/helpers/logs_test.dart
+++ b/test/helpers/logs_test.dart
@@ -36,10 +36,12 @@ void main() {
     });
 
     test('correctly adds LogRecords', () {
+      logStore.add(LogRecord(Level.FINE, 'this is fine!!!', 'testLogger'));
       logStore.add(LogRecord(Level.INFO, 'this is a test', 'testLogger'));
 
-      expect(logStore.logs.length, 1);
-      expect(logStore.formattedLogs.length, 1);
+      expect(logStore.logs.length, 2);
+      expect(logStore.getFormattedLogs(minLevel: Level.INFO).length, 1);
+      expect(logStore.getFormattedLogs(minLevel: Level.FINE).length, 2);
     });
 
     test('total number of logs is limited', () {

From 655a3d11d57192b61affd666669bde221c3ce781 Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Wed, 8 Oct 2025 14:46:32 +0200
Subject: [PATCH 26/29] Move helper methods to own widgets

---
 .../add_exercise/image_details_form.dart      | 116 ++++++++++--------
 1 file changed, 66 insertions(+), 50 deletions(-)

diff --git a/lib/widgets/add_exercise/image_details_form.dart b/lib/widgets/add_exercise/image_details_form.dart
index 4e242e69..7d9b3dfc 100644
--- a/lib/widgets/add_exercise/image_details_form.dart
+++ b/lib/widgets/add_exercise/image_details_form.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:wger/core/validators.dart';
 import 'package:wger/helpers/exercises/validators.dart';
@@ -85,7 +87,7 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
             ),
 
             const SizedBox(height: 8),
-            _buildImagePreview(),
+            ImagePreview(imageFile: widget.submissionImage.imageFile),
             const SizedBox(height: 8),
 
             // Author name - required for proper CC BY-SA attribution
@@ -129,7 +131,14 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
               validator: (value) => validateUrl(value, i18n, required: false),
             ),
 
-            _buildImageTypeSelector(),
+            ImageTypeSelector(
+              selectedType: _selectedImageType,
+              onTypeSelected: (type) {
+                setState(() {
+                  _selectedImageType = type;
+                });
+              },
+            ),
             const SizedBox(height: 16),
 
             // License info as separate widget for better optimization
@@ -143,7 +152,47 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
     );
   }
 
-  Widget _buildImagePreview() {
+  Widget _buildButtons() {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.end,
+      children: [
+        TextButton(
+          onPressed: widget.onCancel,
+          child: Text(MaterialLocalizations.of(context).cancelButtonLabel),
+        ),
+        const SizedBox(width: 8),
+        ElevatedButton(
+          onPressed: () {
+            if (!_formKey.currentState!.validate()) {
+              return;
+            }
+            _formKey.currentState?.save();
+
+            // Pass image and metadata back to parent
+            widget.onAdd(widget.submissionImage);
+          },
+          style: ElevatedButton.styleFrom(
+            backgroundColor: Theme.of(context).primaryColor,
+            foregroundColor: Colors.white,
+            padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 12),
+          ),
+          child: Text(
+            AppLocalizations.of(context).add,
+            style: const TextStyle(fontWeight: FontWeight.bold, color: Colors.white),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class ImagePreview extends StatelessWidget {
+  final File imageFile;
+
+  const ImagePreview({super.key, required this.imageFile});
+
+  @override
+  Widget build(BuildContext context) {
     return Center(
       child: Container(
         constraints: const BoxConstraints(maxWidth: 300, maxHeight: 200),
@@ -153,24 +202,28 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
         ),
         child: ClipRRect(
           borderRadius: BorderRadius.circular(8),
-          child: Image.file(widget.submissionImage.imageFile, fit: BoxFit.contain),
+          child: Image.file(imageFile, fit: BoxFit.contain),
         ),
       ),
     );
   }
+}
 
-  /// Visual selector for image style/type
-  ///
-  /// Allows user to categorize the image as PHOTO, 3D render, LINE drawing,
-  /// LOW-POLY art, or OTHER. This helps users find appropriate exercise images.
-  Widget _buildImageTypeSelector() {
+class ImageTypeSelector extends StatelessWidget {
+  final ImageType selectedType;
+  final ValueChanged<ImageType> onTypeSelected;
+
+  const ImageTypeSelector({super.key, required this.selectedType, required this.onTypeSelected});
+
+  @override
+  Widget build(BuildContext context) {
     final theme = Theme.of(context);
-
+    final i18n = AppLocalizations.of(context);
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Text(
-          AppLocalizations.of(context).imageDetailsImageType,
+          i18n.imageDetailsImageType,
           style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500),
         ),
         const SizedBox(height: 12),
@@ -178,13 +231,9 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
           spacing: 8,
           runSpacing: 8,
           children: ImageType.values.map((type) {
-            final isSelected = _selectedImageType == type;
+            final isSelected = selectedType == type;
             return InkWell(
-              onTap: () {
-                setState(() {
-                  _selectedImageType = type;
-                });
-              },
+              onTap: () => onTypeSelected(type),
               borderRadius: BorderRadius.circular(4),
               child: Container(
                 width: 90,
@@ -226,37 +275,4 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
       ],
     );
   }
-
-  Widget _buildButtons() {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.end,
-      children: [
-        TextButton(
-          onPressed: widget.onCancel,
-          child: Text(MaterialLocalizations.of(context).cancelButtonLabel),
-        ),
-        const SizedBox(width: 8),
-        ElevatedButton(
-          onPressed: () {
-            if (!_formKey.currentState!.validate()) {
-              return;
-            }
-            _formKey.currentState?.save();
-
-            // Pass image and metadata back to parent
-            widget.onAdd(widget.submissionImage);
-          },
-          style: ElevatedButton.styleFrom(
-            backgroundColor: Theme.of(context).primaryColor,
-            foregroundColor: Colors.white,
-            padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 12),
-          ),
-          child: Text(
-            AppLocalizations.of(context).add,
-            style: const TextStyle(fontWeight: FontWeight.bold, color: Colors.white),
-          ),
-        ),
-      ],
-    );
-  }
 }

From bd37415b8e4fd75612b4f78c7e716b7f99e379aa Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Wed, 8 Oct 2025 14:49:35 +0200
Subject: [PATCH 27/29] Remove controllers, these are not needed anymore

---
 .../add_exercise/image_details_form.dart        | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/lib/widgets/add_exercise/image_details_form.dart b/lib/widgets/add_exercise/image_details_form.dart
index 7d9b3dfc..e9462845 100644
--- a/lib/widgets/add_exercise/image_details_form.dart
+++ b/lib/widgets/add_exercise/image_details_form.dart
@@ -46,13 +46,6 @@ class ImageDetailsForm extends StatefulWidget {
 class _ImageDetailsFormState extends State<ImageDetailsForm> {
   final _formKey = GlobalKey<FormState>();
 
-  // Text controllers for license metadata fields
-  final _titleController = TextEditingController();
-  final _sourceLinkController = TextEditingController();
-  final _authorController = TextEditingController();
-  final _authorLinkController = TextEditingController();
-  final _originalSourceController = TextEditingController();
-
   /// Currently selected image type
   ImageType _selectedImageType = ImageType.photo;
 
@@ -61,16 +54,6 @@ class _ImageDetailsFormState extends State<ImageDetailsForm> {
     super.initState();
   }
 
-  @override
-  void dispose() {
-    _titleController.dispose();
-    _sourceLinkController.dispose();
-    _authorController.dispose();
-    _authorLinkController.dispose();
-    _originalSourceController.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     final i18n = AppLocalizations.of(context);

From 9a801bd2b2a53b2c3431e0e1894a0b8b37a0ccd2 Mon Sep 17 00:00:00 2001
From: "rishad.n" <rishad.n@codinghands.in>
Date: Thu, 9 Oct 2025 17:19:57 +0530
Subject: [PATCH 28/29] Refactor event type enum and improve loadEvents
 documentation

---
 lib/widgets/dashboard/calendar.dart | 72 ++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 26 deletions(-)

diff --git a/lib/widgets/dashboard/calendar.dart b/lib/widgets/dashboard/calendar.dart
index d3c1bf93..af81ca08 100644
--- a/lib/widgets/dashboard/calendar.dart
+++ b/lib/widgets/dashboard/calendar.dart
@@ -31,12 +31,7 @@ import 'package:wger/providers/routines.dart';
 import 'package:wger/theme/theme.dart';
 
 /// Types of events
-enum EventType {
-  weight,
-  measurement,
-  session,
-  caloriesDiary,
-}
+enum EventType { weight, measurement, session, caloriesDiary }
 
 /// An event in the dashboard calendar
 class Event {
@@ -85,6 +80,22 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
     });
   }
 
+  /// Loads and organizes all events from various providers into the calendar.
+  ///
+  /// This method asynchronously fetches and processes data from multiple sources:
+  /// - **Weight entries**: Retrieves weight measurements from [BodyWeightProvider]
+  /// - **Measurements**: Retrieves body measurements from [MeasurementProvider]
+  /// - **Workout sessions**: Fetches workout session data from [RoutinesProvider]
+  /// - **Nutritional plans**: Retrieves calorie diary entries from [NutritionPlansProvider]
+  ///
+  /// Each event is formatted according to the current locale and stored in the
+  /// [_events] map, keyed by date. The date format is determined by [DateFormatLists.format].
+  ///
+  /// After loading all events, the [_selectedEvents] value is updated with events
+  /// for the currently selected day, if any.
+  ///
+  /// **Note**: This method checks if the widget is still mounted before updating
+  /// the state after the async workout session fetch operation.
   void loadEvents() async {
     final numberFormat = NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
     final i18n = AppLocalizations.of(context);
@@ -112,10 +123,12 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
           _events[date] = [];
         }
 
-        _events[date]?.add(Event(
-          EventType.measurement,
-          '${category.name}: ${numberFormat.format(entry.value)} ${category.unit}',
-        ));
+        _events[date]?.add(
+          Event(
+            EventType.measurement,
+            '${category.name}: ${numberFormat.format(entry.value)} ${category.unit}',
+          ),
+        );
       }
     }
 
@@ -131,16 +144,20 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
         time = '(${timeToString(session.timeStart)} - ${timeToString(session.timeEnd)})';
 
         // Add events to lists
-        _events[date]?.add(Event(
-          EventType.session,
-          '${i18n.impression}: ${session.impressionAsString} $time',
-        ));
+        _events[date]?.add(
+          Event(EventType.session, '${i18n.impression}: ${session.impressionAsString} $time'),
+        );
       }
     });
+    if (!mounted) {
+      return;
+    }
 
     // Process nutritional plans
-    final NutritionPlansProvider nutritionProvider =
-        Provider.of<NutritionPlansProvider>(context, listen: false);
+    final NutritionPlansProvider nutritionProvider = Provider.of<NutritionPlansProvider>(
+      context,
+      listen: false,
+    );
     for (final plan in nutritionProvider.items) {
       for (final entry in plan.logEntriesValues.entries) {
         final date = DateFormatLists.format(entry.key);
@@ -149,10 +166,9 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
         }
 
         // Add events to lists
-        _events[date]?.add(Event(
-          EventType.caloriesDiary,
-          i18n.kcalValue(entry.value.energy.toStringAsFixed(0)),
-        ));
+        _events[date]?.add(
+          Event(EventType.caloriesDiary, i18n.kcalValue(entry.value.energy.toStringAsFixed(0))),
+        );
       }
     }
 
@@ -250,8 +266,10 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
             valueListenable: _selectedEvents,
             builder: (context, value, _) => Column(
               children: [
-                ...value.map((event) => ListTile(
-                      title: Text((() {
+                ...value.map(
+                  (event) => ListTile(
+                    title: Text(
+                      (() {
                         switch (event.type) {
                           case EventType.caloriesDiary:
                             return AppLocalizations.of(context).nutritionalDiary;
@@ -265,10 +283,12 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
                           case EventType.measurement:
                             return AppLocalizations.of(context).measurement;
                         }
-                      })()),
-                      subtitle: Text(event.description),
-                      //onTap: () => print('$event tapped!'),
-                    )),
+                      })(),
+                    ),
+                    subtitle: Text(event.description),
+                    //onTap: () => print('$event tapped!'),
+                  ),
+                ),
               ],
             ),
           ),

From 93a11a16e4f813e427253f759b0f74e4b2ffbc15 Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Thu, 9 Oct 2025 17:39:02 +0200
Subject: [PATCH 29/29] Recreate generated files and reformat the repo

Seems the default dart formatting rules changed recently, and this was causing
huge diffs in branches
---
 analysis_options.yaml                         |    1 +
 integration_test/1_dashboard.dart             |   30 +-
 integration_test/make_screenshots_test.dart   |    3 +-
 lib/database/exercises/exercise_database.dart |   28 +-
 .../ingredients/ingredients_database.dart     |   28 +-
 lib/helpers/measurements.dart                 |   15 +-
 lib/main.dart                                 |    4 +-
 lib/models/body_weight/weight_entry.dart      |    8 +-
 lib/models/exercises/exercise.dart            |   22 +-
 lib/models/exercises/translation.dart         |   16 +-
 .../measurements/measurement_entry.g.dart     |   15 +-
 lib/models/nutrition/log.dart                 |    5 +-
 lib/models/nutrition/nutritional_goals.dart   |   21 +-
 lib/models/nutrition/nutritional_values.dart  |   18 +-
 lib/models/nutrition/weight_unit.g.dart       |    6 +-
 lib/models/workouts/base_config.g.dart        |   19 +-
 lib/models/workouts/log.dart                  |    9 +-
 lib/models/workouts/repetition_unit.g.dart    |    6 +-
 lib/models/workouts/weight_unit.g.dart        |    6 +-
 lib/providers/auth.dart                       |    5 +-
 lib/providers/body_weight.dart                |   10 +-
 lib/providers/gym_state.dart                  |   19 +-
 lib/providers/measurement.dart                |   11 +-
 lib/providers/plate_weights.dart              |   23 +-
 lib/providers/routines.dart                   |   15 +-
 lib/providers/user.dart                       |   10 +-
 lib/screens/auth_screen.dart                  |   20 +-
 lib/screens/gym_mode.dart                     |    5 +-
 lib/screens/nutritional_plan_screen.dart      |   36 +-
 .../add_exercise_multiselect_button.dart      |    5 +-
 lib/widgets/core/about.dart                   |    3 +-
 .../dashboard/widgets/measurements.dart       |   13 +-
 lib/widgets/dashboard/widgets/nutrition.dart  |    5 +-
 lib/widgets/dashboard/widgets/routines.dart   |   17 +-
 lib/widgets/dashboard/widgets/weight.dart     |    9 +-
 lib/widgets/exercises/autocompleter.dart      |   48 +-
 lib/widgets/exercises/exercises.dart          |  142 +-
 lib/widgets/exercises/videos.dart             |   26 +-
 lib/widgets/gallery/forms.dart                |   12 +-
 lib/widgets/measurements/charts.dart          |   36 +-
 lib/widgets/measurements/entries.dart         |  138 +-
 lib/widgets/measurements/forms.dart           |   16 +-
 lib/widgets/measurements/helpers.dart         |    4 +-
 lib/widgets/nutrition/charts.dart             |  259 +-
 lib/widgets/nutrition/forms.dart              |   72 +-
 lib/widgets/nutrition/helpers.dart            |   42 +-
 lib/widgets/nutrition/ingredient_dialogs.dart |    7 +-
 .../nutrition/macro_nutrients_table.dart      |   14 +-
 lib/widgets/nutrition/meal.dart               |   31 +-
 lib/widgets/nutrition/nutrition_tiles.dart    |    6 +-
 .../nutrition/nutritional_diary_detail.dart   |   28 +-
 .../nutrition/nutritional_diary_table.dart    |   73 +-
 .../nutrition/nutritional_plan_detail.dart    |   29 +-
 .../nutrition/nutritional_plans_list.dart     |  110 +-
 lib/widgets/nutrition/widgets.dart            |   37 +-
 lib/widgets/routines/day.dart                 |    6 +-
 lib/widgets/routines/forms/day.dart           |   11 +-
 lib/widgets/routines/forms/reps_unit.dart     |   16 +-
 lib/widgets/routines/forms/session.dart       |   31 +-
 lib/widgets/routines/forms/slot.dart          |    8 +-
 lib/widgets/routines/forms/slot_entry.dart    |   18 +-
 lib/widgets/routines/forms/weight_unit.dart   |   16 +-
 lib/widgets/routines/gym_mode/gym_mode.dart   |   56 +-
 lib/widgets/routines/gym_mode/log_page.dart   |   46 +-
 .../routines/gym_mode/session_page.dart       |   24 +-
 lib/widgets/routines/gym_mode/start_page.dart |    8 +-
 lib/widgets/routines/log.dart                 |   24 +-
 lib/widgets/routines/routines_list.dart       |    5 +-
 lib/widgets/weight/forms.dart                 |    2 +-
 lib/widgets/weight/weight_overview.dart       |    3 +-
 test/auth/auth_screen_test.dart               |  170 +-
 test/auth/auth_screen_test.mocks.dart         |  350 +--
 test/core/settings_test.mocks.dart            | 2250 +++++++++--------
 test/exercises/exercise_provider_db_test.dart |   46 +-
 .../exercise_provider_load_test.dart          |   10 +-
 test/exercises/exercise_provider_test.dart    |   30 +-
 test/gallery/gallery_form_test.mocks.dart     |  422 ++--
 test/gallery/gallery_provider_test.dart       |   54 +-
 test/gallery/gallery_screen_test.mocks.dart   |  422 ++--
 .../measurement_categories_screen_test.dart   |   26 +-
 ...surement_categories_screen_test.mocks.dart |  315 +--
 .../measurement_entries_screen_test.dart      |   19 +-
 .../measurement_provider_test.dart            |  307 ++-
 .../measurement_provider_test.mocks.dart      |  252 +-
 test/nutrition/nutrition_provider_test.dart   |   31 +-
 .../nutritional_meal_form_test.mocks.dart     |  715 +++---
 .../nutritional_meal_item_form_test.dart      |   25 +-
 .../nutrition/nutritional_plan_form_test.dart |    7 +-
 .../nutritional_plan_form_test.mocks.dart     |  715 +++---
 .../nutritional_plan_screen_test.mocks.dart   | 1022 ++++----
 .../nutritional_plans_screen_test.dart        |   31 +-
 .../nutritional_plans_screen_test.mocks.dart  | 1022 ++++----
 test/other/base_provider_test.dart            |   15 +-
 test/other/base_provider_test.mocks.dart      |  350 +--
 test/routine/forms/session_form_test.dart     |    8 +-
 test/routine/gym_mode_screen_test.dart        |   15 +-
 test/routine/routine_form_test.dart           |   21 +-
 test/routine/routines_provider_test.dart      |   78 +-
 test/user/provider_test.dart                  |   15 +-
 test/user/provider_test.mocks.dart            |  252 +-
 test/utils/errors_test.dart                   |    6 +-
 test/weight/weight_model_test.dart            |    7 +-
 test/weight/weight_provider_test.dart         |   10 +-
 test/weight/weight_provider_test.mocks.dart   |  252 +-
 test/weight/weight_screen_test.mocks.dart     | 1171 +++++----
 105 files changed, 6716 insertions(+), 5595 deletions(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index 68c186a1..b7abc707 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -21,6 +21,7 @@ analyzer:
 
 formatter:
   page_width: 100
+  trailing_commas: preserve
 
 linter:
   rules:
diff --git a/integration_test/1_dashboard.dart b/integration_test/1_dashboard.dart
index 5714320c..7580b828 100644
--- a/integration_test/1_dashboard.dart
+++ b/integration_test/1_dashboard.dart
@@ -25,23 +25,27 @@ import '../test_data/routines.dart';
 Widget createDashboardScreen({String locale = 'en'}) {
   final mockWorkoutProvider = MockRoutinesProvider();
   when(mockWorkoutProvider.items).thenReturn([getTestRoutine(exercises: getScreenshotExercises())]);
-  when(mockWorkoutProvider.currentRoutine)
-      .thenReturn(getTestRoutine(exercises: getScreenshotExercises()));
+  when(
+    mockWorkoutProvider.currentRoutine,
+  ).thenReturn(getTestRoutine(exercises: getScreenshotExercises()));
 
-  when(mockWorkoutProvider.fetchSessionData()).thenAnswer((a) => Future.value([
-        WorkoutSession(
-          routineId: 1,
-          date: DateTime.now().add(const Duration(days: -1)),
-          timeStart: const TimeOfDay(hour: 17, minute: 34),
-          timeEnd: const TimeOfDay(hour: 19, minute: 3),
-          impression: 3,
-        ),
-      ]));
+  when(mockWorkoutProvider.fetchSessionData()).thenAnswer(
+    (a) => Future.value([
+      WorkoutSession(
+        routineId: 1,
+        date: DateTime.now().add(const Duration(days: -1)),
+        timeStart: const TimeOfDay(hour: 17, minute: 34),
+        timeEnd: const TimeOfDay(hour: 19, minute: 3),
+        impression: 3,
+      ),
+    ]),
+  );
 
   final mockNutritionProvider = weight.MockNutritionPlansProvider();
 
-  when(mockNutritionProvider.currentPlan)
-      .thenAnswer((realInvocation) => getNutritionalPlanScreenshot());
+  when(
+    mockNutritionProvider.currentPlan,
+  ).thenAnswer((realInvocation) => getNutritionalPlanScreenshot());
   when(mockNutritionProvider.items).thenReturn([getNutritionalPlanScreenshot()]);
 
   final mockWeightProvider = weight.MockBodyWeightProvider();
diff --git a/integration_test/make_screenshots_test.dart b/integration_test/make_screenshots_test.dart
index c4a94e68..3d475363 100644
--- a/integration_test/make_screenshots_test.dart
+++ b/integration_test/make_screenshots_test.dart
@@ -17,7 +17,7 @@ enum DeviceType {
   sevenInchScreenshots,
   tenInchScreenshots,
   tvScreenshots,
-  wearScreenshots
+  wearScreenshots,
 }
 
 final destination = DeviceType.phoneScreenshots.name;
@@ -42,7 +42,6 @@ Future<void> takeScreenshot(
 const languages = [
   // Note: it seems if too many languages are processed at once, some processes
   // disappear and no images are written. Doing this in smaller steps works fine
-
   'ar',
   'ca',
   'cs-CZ',
diff --git a/lib/database/exercises/exercise_database.dart b/lib/database/exercises/exercise_database.dart
index 35a3eaf2..e7c36a6e 100644
--- a/lib/database/exercises/exercise_database.dart
+++ b/lib/database/exercises/exercise_database.dart
@@ -85,20 +85,20 @@ class ExerciseDatabase extends _$ExerciseDatabase {
   /// will fetch everything as needed from the server
   @override
   MigrationStrategy get migration => MigrationStrategy(
-        onUpgrade: (m, from, to) async {
-          // no-op, but needs to be defined
-          return;
-        },
-        beforeOpen: (openingDetails) async {
-          if (openingDetails.hadUpgrade) {
-            final m = createMigrator();
-            for (final table in allTables) {
-              await m.deleteTable(table.actualTableName);
-              await m.createTable(table);
-            }
-          }
-        },
-      );
+    onUpgrade: (m, from, to) async {
+      // no-op, but needs to be defined
+      return;
+    },
+    beforeOpen: (openingDetails) async {
+      if (openingDetails.hadUpgrade) {
+        final m = createMigrator();
+        for (final table in allTables) {
+          await m.deleteTable(table.actualTableName);
+          await m.createTable(table);
+        }
+      }
+    },
+  );
 
   Future<void> deleteEverything() {
     return transaction(() async {
diff --git a/lib/database/ingredients/ingredients_database.dart b/lib/database/ingredients/ingredients_database.dart
index cd14ea9e..28f839ed 100644
--- a/lib/database/ingredients/ingredients_database.dart
+++ b/lib/database/ingredients/ingredients_database.dart
@@ -38,20 +38,20 @@ class IngredientDatabase extends _$IngredientDatabase {
   /// will fetch everything as needed from the server
   @override
   MigrationStrategy get migration => MigrationStrategy(
-        onUpgrade: (m, from, to) async {
-          // no-op, but needs to be defined
-          return;
-        },
-        beforeOpen: (openingDetails) async {
-          if (openingDetails.hadUpgrade) {
-            final m = createMigrator();
-            for (final table in allTables) {
-              await m.deleteTable(table.actualTableName);
-              await m.createTable(table);
-            }
-          }
-        },
-      );
+    onUpgrade: (m, from, to) async {
+      // no-op, but needs to be defined
+      return;
+    },
+    beforeOpen: (openingDetails) async {
+      if (openingDetails.hadUpgrade) {
+        final m = createMigrator();
+        for (final table in allTables) {
+          await m.deleteTable(table.actualTableName);
+          await m.createTable(table);
+        }
+      }
+    },
+  );
 
   Future<void> deleteEverything() {
     return transaction(() async {
diff --git a/lib/helpers/measurements.dart b/lib/helpers/measurements.dart
index f3cd5462..bcde38fb 100644
--- a/lib/helpers/measurements.dart
+++ b/lib/helpers/measurements.dart
@@ -25,11 +25,11 @@ extension MeasurementChartEntryListExtensions on List<MeasurementChartEntry> {
     return where((e) => e.date.isAfter(start) && (end == null || e.date.isBefore(end))).toList();
   }
 
-// assures values on the start (and optionally end) dates exist, by interpolating if needed
-// this is used for when you are looking at a specific time frame (e.g. for a nutrition plan)
-// while gaps in the middle of a chart can be "visually interpolated", it's good to have a clearer
-// explicit interpolation for the start and end dates (if needed)
-// this also helps with computing delta's across the entire window
+  // assures values on the start (and optionally end) dates exist, by interpolating if needed
+  // this is used for when you are looking at a specific time frame (e.g. for a nutrition plan)
+  // while gaps in the middle of a chart can be "visually interpolated", it's good to have a clearer
+  // explicit interpolation for the start and end dates (if needed)
+  // this also helps with computing delta's across the entire window
   List<MeasurementChartEntry> whereDateWithInterpolation(DateTime start, DateTime? end) {
     // Make sure our list is sorted by date
     sort((a, b) => a.date.compareTo(b.date));
@@ -90,7 +90,10 @@ extension MeasurementChartEntryListExtensions on List<MeasurementChartEntry> {
 
 // caller needs to make sure that before.date < date < after.date
 MeasurementChartEntry interpolateBetween(
-    MeasurementChartEntry before, MeasurementChartEntry after, DateTime date) {
+  MeasurementChartEntry before,
+  MeasurementChartEntry after,
+  DateTime date,
+) {
   final totalDuration = after.date.difference(before.date).inMilliseconds;
   final startDuration = date.difference(before.date).inMilliseconds;
 
diff --git a/lib/main.dart b/lib/main.dart
index 216e881f..db8836c1 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -146,8 +146,8 @@ class MainApp extends StatelessWidget {
           future: auth.tryAutoLogin(),
           builder: (ctx, authResultSnapshot) =>
               authResultSnapshot.connectionState == ConnectionState.waiting
-                  ? const SplashScreen()
-                  : const AuthScreen(),
+              ? const SplashScreen()
+              : const AuthScreen(),
         );
     }
   }
diff --git a/lib/models/body_weight/weight_entry.dart b/lib/models/body_weight/weight_entry.dart
index 827ccf7d..d5343cd6 100644
--- a/lib/models/body_weight/weight_entry.dart
+++ b/lib/models/body_weight/weight_entry.dart
@@ -41,10 +41,10 @@ class WeightEntry {
   }
 
   WeightEntry copyWith({int? id, int? weight, DateTime? date}) => WeightEntry(
-        id: id,
-        weight: weight ?? this.weight,
-        date: date ?? this.date,
-      );
+    id: id,
+    weight: weight ?? this.weight,
+    date: date ?? this.date,
+  );
 
   // Boilerplate
   factory WeightEntry.fromJson(Map<String, dynamic> json) => _$WeightEntryFromJson(json);
diff --git a/lib/models/exercises/exercise.dart b/lib/models/exercises/exercise.dart
index aae54832..31af9753 100644
--- a/lib/models/exercises/exercise.dart
+++ b/lib/models/exercises/exercise.dart
@@ -145,10 +145,10 @@ class Exercise extends Equatable {
   }
 
   Exercise.fromApiDataString(String baseData, List<Language> languages)
-      : this.fromApiData(ExerciseApiData.fromString(baseData), languages);
+    : this.fromApiData(ExerciseApiData.fromString(baseData), languages);
 
   Exercise.fromApiDataJson(Map<String, dynamic> baseData, List<Language> languages)
-      : this.fromApiData(ExerciseApiData.fromJson(baseData), languages);
+    : this.fromApiData(ExerciseApiData.fromJson(baseData), languages);
 
   Exercise.fromApiData(ExerciseApiData exerciseData, List<Language> languages) {
     id = exerciseData.id;
@@ -228,13 +228,13 @@ class Exercise extends Equatable {
 
   @override
   List<Object?> get props => [
-        id,
-        uuid,
-        created,
-        lastUpdate,
-        category,
-        equipment,
-        muscles,
-        musclesSecondary,
-      ];
+    id,
+    uuid,
+    created,
+    lastUpdate,
+    category,
+    equipment,
+    muscles,
+    musclesSecondary,
+  ];
 }
diff --git a/lib/models/exercises/translation.dart b/lib/models/exercises/translation.dart
index 1767501a..0fc40534 100644
--- a/lib/models/exercises/translation.dart
+++ b/lib/models/exercises/translation.dart
@@ -92,12 +92,12 @@ class Translation extends Equatable {
 
   @override
   List<Object?> get props => [
-        id,
-        exerciseId,
-        uuid,
-        languageId,
-        created,
-        name,
-        description,
-      ];
+    id,
+    exerciseId,
+    uuid,
+    languageId,
+    created,
+    name,
+    description,
+  ];
 }
diff --git a/lib/models/measurements/measurement_entry.g.dart b/lib/models/measurements/measurement_entry.g.dart
index a0c73b73..f8eebb7d 100644
--- a/lib/models/measurements/measurement_entry.g.dart
+++ b/lib/models/measurements/measurement_entry.g.dart
@@ -20,11 +20,10 @@ MeasurementEntry _$MeasurementEntryFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$MeasurementEntryToJson(MeasurementEntry instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'category': instance.category,
-      'date': dateToYYYYMMDD(instance.date),
-      'value': instance.value,
-      'notes': instance.notes,
-    };
+Map<String, dynamic> _$MeasurementEntryToJson(MeasurementEntry instance) => <String, dynamic>{
+  'id': instance.id,
+  'category': instance.category,
+  'date': dateToYYYYMMDD(instance.date),
+  'value': instance.value,
+  'notes': instance.notes,
+};
diff --git a/lib/models/nutrition/log.dart b/lib/models/nutrition/log.dart
index d36e5a53..259c43a0 100644
--- a/lib/models/nutrition/log.dart
+++ b/lib/models/nutrition/log.dart
@@ -84,8 +84,9 @@ class Log {
   NutritionalValues get nutritionalValues {
     // This is already done on the server. It might be better to read it from there.
 
-    final weight =
-        weightUnitObj == null ? amount : amount * weightUnitObj!.amount * weightUnitObj!.grams;
+    final weight = weightUnitObj == null
+        ? amount
+        : amount * weightUnitObj!.amount * weightUnitObj!.grams;
 
     return ingredient.nutritionalValues / (100 / weight);
   }
diff --git a/lib/models/nutrition/nutritional_goals.dart b/lib/models/nutrition/nutritional_goals.dart
index 7a668a46..cca69674 100644
--- a/lib/models/nutrition/nutritional_goals.dart
+++ b/lib/models/nutrition/nutritional_goals.dart
@@ -57,7 +57,8 @@ class NutritionalGoals {
           (energy! - protein! * ENERGY_PROTEIN - fat! * ENERGY_FAT) / ENERGY_CARBOHYDRATES;
       assert(carbohydrates! > 0);
     } else if (fat == null && protein != null && carbohydrates != null) {
-      fat = (energy! - protein! * ENERGY_PROTEIN - carbohydrates! * ENERGY_CARBOHYDRATES) /
+      fat =
+          (energy! - protein! * ENERGY_PROTEIN - carbohydrates! * ENERGY_CARBOHYDRATES) /
           ENERGY_FAT;
       assert(fat! > 0);
     }
@@ -141,15 +142,15 @@ class NutritionalGoals {
   @override
   //ignore: avoid_equals_and_hash_code_on_mutable_classes
   int get hashCode => Object.hash(
-        energy,
-        protein,
-        carbohydrates,
-        carbohydratesSugar,
-        fat,
-        fatSaturated,
-        fiber,
-        sodium,
-      );
+    energy,
+    protein,
+    carbohydrates,
+    carbohydratesSugar,
+    fat,
+    fatSaturated,
+    fiber,
+    sodium,
+  );
 
   @override
   // ignore: avoid_equals_and_hash_code_on_mutable_classes
diff --git a/lib/models/nutrition/nutritional_values.dart b/lib/models/nutrition/nutritional_values.dart
index fee6c370..1cb5c7fe 100644
--- a/lib/models/nutrition/nutritional_values.dart
+++ b/lib/models/nutrition/nutritional_values.dart
@@ -132,13 +132,13 @@ class NutritionalValues {
   @override
   //ignore: avoid_equals_and_hash_code_on_mutable_classes
   int get hashCode => Object.hash(
-        energy,
-        protein,
-        carbohydrates,
-        carbohydratesSugar,
-        fat,
-        fatSaturated,
-        fiber,
-        sodium,
-      );
+    energy,
+    protein,
+    carbohydrates,
+    carbohydratesSugar,
+    fat,
+    fatSaturated,
+    fiber,
+    sodium,
+  );
 }
diff --git a/lib/models/nutrition/weight_unit.g.dart b/lib/models/nutrition/weight_unit.g.dart
index af7c8bed..a8f86e6d 100644
--- a/lib/models/nutrition/weight_unit.g.dart
+++ b/lib/models/nutrition/weight_unit.g.dart
@@ -14,5 +14,7 @@ WeightUnit _$WeightUnitFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$WeightUnitToJson(WeightUnit instance) =>
-    <String, dynamic>{'id': instance.id, 'name': instance.name};
+Map<String, dynamic> _$WeightUnitToJson(WeightUnit instance) => <String, dynamic>{
+  'id': instance.id,
+  'name': instance.name,
+};
diff --git a/lib/models/workouts/base_config.g.dart b/lib/models/workouts/base_config.g.dart
index c97f3899..a3513312 100644
--- a/lib/models/workouts/base_config.g.dart
+++ b/lib/models/workouts/base_config.g.dart
@@ -32,13 +32,12 @@ BaseConfig _$BaseConfigFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$BaseConfigToJson(BaseConfig instance) =>
-    <String, dynamic>{
-      'slot_entry': instance.slotEntryId,
-      'iteration': instance.iteration,
-      'value': instance.value,
-      'operation': instance.operation,
-      'step': instance.step,
-      'repeat': instance.repeat,
-      'requirements': instance.requirements,
-    };
+Map<String, dynamic> _$BaseConfigToJson(BaseConfig instance) => <String, dynamic>{
+  'slot_entry': instance.slotEntryId,
+  'iteration': instance.iteration,
+  'value': instance.value,
+  'operation': instance.operation,
+  'step': instance.step,
+  'repeat': instance.repeat,
+  'requirements': instance.requirements,
+};
diff --git a/lib/models/workouts/log.dart b/lib/models/workouts/log.dart
index 3931d321..f3ccfb81 100644
--- a/lib/models/workouts/log.dart
+++ b/lib/models/workouts/log.dart
@@ -142,8 +142,13 @@ class Log {
 
   /// Returns the text representation for a single setting, used in the gym mode
   String get singleLogRepTextNoNl {
-    return repText(repetitions, repetitionsUnitObj, weight, weightUnitObj, rir)
-        .replaceAll('\n', '');
+    return repText(
+      repetitions,
+      repetitionsUnitObj,
+      weight,
+      weightUnitObj,
+      rir,
+    ).replaceAll('\n', '');
   }
 
   /// Override the equals operator
diff --git a/lib/models/workouts/repetition_unit.g.dart b/lib/models/workouts/repetition_unit.g.dart
index d234bc55..679c55ef 100644
--- a/lib/models/workouts/repetition_unit.g.dart
+++ b/lib/models/workouts/repetition_unit.g.dart
@@ -14,5 +14,7 @@ RepetitionUnit _$RepetitionUnitFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$RepetitionUnitToJson(RepetitionUnit instance) =>
-    <String, dynamic>{'id': instance.id, 'name': instance.name};
+Map<String, dynamic> _$RepetitionUnitToJson(RepetitionUnit instance) => <String, dynamic>{
+  'id': instance.id,
+  'name': instance.name,
+};
diff --git a/lib/models/workouts/weight_unit.g.dart b/lib/models/workouts/weight_unit.g.dart
index af7c8bed..a8f86e6d 100644
--- a/lib/models/workouts/weight_unit.g.dart
+++ b/lib/models/workouts/weight_unit.g.dart
@@ -14,5 +14,7 @@ WeightUnit _$WeightUnitFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$WeightUnitToJson(WeightUnit instance) =>
-    <String, dynamic>{'id': instance.id, 'name': instance.name};
+Map<String, dynamic> _$WeightUnitToJson(WeightUnit instance) => <String, dynamic>{
+  'id': instance.id,
+  'name': instance.name,
+};
diff --git a/lib/providers/auth.dart b/lib/providers/auth.dart
index dd569ade..a00a292a 100644
--- a/lib/providers/auth.dart
+++ b/lib/providers/auth.dart
@@ -251,7 +251,7 @@ class AuthProvider with ChangeNotifier {
       headers: {
         HttpHeaders.contentTypeHeader: 'application/json; charset=UTF-8',
         HttpHeaders.userAgentHeader: getAppNameHeader(),
-        HttpHeaders.authorizationHeader: 'Token $token'
+        HttpHeaders.authorizationHeader: 'Token $token',
       },
     );
     if (response.statusCode != 200) {
@@ -294,7 +294,8 @@ class AuthProvider with ChangeNotifier {
   String getAppNameHeader() {
     String out = '';
     if (applicationVersion != null) {
-      out = '/${applicationVersion!.version} '
+      out =
+          '/${applicationVersion!.version} '
           '(${applicationVersion!.packageName}; '
           'build: ${applicationVersion!.buildNumber})'
           ' - https://github.com/wger-project';
diff --git a/lib/providers/body_weight.dart b/lib/providers/body_weight.dart
index 9aa52c27..dddb8cec 100644
--- a/lib/providers/body_weight.dart
+++ b/lib/providers/body_weight.dart
@@ -68,10 +68,12 @@ class BodyWeightProvider with ChangeNotifier {
     _logger.info('Fetching all body weight entries');
 
     // Process the response
-    final data = await baseProvider.fetchPaginated(baseProvider.makeUrl(
-      BODY_WEIGHT_URL,
-      query: {'ordering': '-date', 'limit': API_MAX_PAGE_SIZE},
-    ));
+    final data = await baseProvider.fetchPaginated(
+      baseProvider.makeUrl(
+        BODY_WEIGHT_URL,
+        query: {'ordering': '-date', 'limit': API_MAX_PAGE_SIZE},
+      ),
+    );
     _entries = [];
     for (final entry in data) {
       _entries.add(WeightEntry.fromJson(entry));
diff --git a/lib/providers/gym_state.dart b/lib/providers/gym_state.dart
index b208f806..659cc525 100644
--- a/lib/providers/gym_state.dart
+++ b/lib/providers/gym_state.dart
@@ -8,8 +8,8 @@ const DEFAULT_DURATION = Duration(hours: 5);
 
 final StateNotifierProvider<GymStateNotifier, GymState> gymStateProvider =
     StateNotifierProvider<GymStateNotifier, GymState>((ref) {
-  return GymStateNotifier();
-});
+      return GymStateNotifier();
+    });
 
 class GymState {
   final Map<Exercise, int> exercisePages;
@@ -19,13 +19,14 @@ class GymState {
   late TimeOfDay startTime;
   late DateTime validUntil;
 
-  GymState(
-      {this.exercisePages = const {},
-      this.showExercisePages = true,
-      this.currentPage = 0,
-      this.dayId,
-      DateTime? validUntil,
-      TimeOfDay? startTime}) {
+  GymState({
+    this.exercisePages = const {},
+    this.showExercisePages = true,
+    this.currentPage = 0,
+    this.dayId,
+    DateTime? validUntil,
+    TimeOfDay? startTime,
+  }) {
     this.validUntil = validUntil ?? DateTime.now().add(DEFAULT_DURATION);
     this.startTime = startTime ?? TimeOfDay.fromDateTime(clock.now());
   }
diff --git a/lib/providers/measurement.dart b/lib/providers/measurement.dart
index faa07699..c961e938 100644
--- a/lib/providers/measurement.dart
+++ b/lib/providers/measurement.dart
@@ -133,8 +133,9 @@ class MeasurementProvider with ChangeNotifier {
       tempNewCategory.toJson(),
       baseProvider.makeUrl(_categoryUrl, id: id),
     );
-    final MeasurementCategory newCategory =
-        MeasurementCategory.fromJson(response).copyWith(entries: oldCategory.entries);
+    final MeasurementCategory newCategory = MeasurementCategory.fromJson(
+      response,
+    ).copyWith(entries: oldCategory.entries);
     _categories.removeAt(categoryIndex);
     _categories.insert(categoryIndex, newCategory);
     notifyListeners();
@@ -192,8 +193,10 @@ class MeasurementProvider with ChangeNotifier {
       date: newDate,
     );
 
-    final Map<String, dynamic> response =
-        await baseProvider.patch(tempNewEntry.toJson(), baseProvider.makeUrl(_entryUrl, id: id));
+    final Map<String, dynamic> response = await baseProvider.patch(
+      tempNewEntry.toJson(),
+      baseProvider.makeUrl(_entryUrl, id: id),
+    );
 
     final MeasurementEntry newEntry = MeasurementEntry.fromJson(response);
     category.entries.removeAt(entryIndex);
diff --git a/lib/providers/plate_weights.dart b/lib/providers/plate_weights.dart
index 51747d72..55a6e20b 100644
--- a/lib/providers/plate_weights.dart
+++ b/lib/providers/plate_weights.dart
@@ -18,8 +18,8 @@ const PREFS_KEY_PLATES = 'selectedPlates';
 
 final plateCalculatorProvider =
     StateNotifierProvider<PlateCalculatorNotifier, PlateCalculatorState>((ref) {
-  return PlateCalculatorNotifier();
-});
+      return PlateCalculatorNotifier();
+    });
 
 class PlateCalculatorState {
   final _logger = Logger('PlateWeightsState');
@@ -65,17 +65,18 @@ class PlateCalculatorState {
     this.isMetric = true,
     this.totalWeight = 0,
     List<num>? selectedPlates,
-  })  : barWeight = barWeight ?? (isMetric ? DEFAULT_BAR_WEIGHT_KG : DEFAULT_BAR_WEIGHT_LB),
-        selectedPlates =
-            selectedPlates ?? (isMetric ? [...DEFAULT_KG_PLATES] : [...DEFAULT_LB_PLATES]);
+  }) : barWeight = barWeight ?? (isMetric ? DEFAULT_BAR_WEIGHT_KG : DEFAULT_BAR_WEIGHT_LB),
+       selectedPlates =
+           selectedPlates ?? (isMetric ? [...DEFAULT_KG_PLATES] : [...DEFAULT_LB_PLATES]);
 
   PlateCalculatorState.fromJson(Map<String, dynamic> plateData)
-      : useColors = plateData['useColors'] ?? true,
-        isMetric = plateData['isMetric'] ?? true,
-        selectedPlates = plateData['selectedPlates']?.cast<num>() ?? [...DEFAULT_KG_PLATES],
-        barWeight = plateData['barWeight'] ??
-            ((plateData['isMetric'] ?? true) ? DEFAULT_BAR_WEIGHT_KG : DEFAULT_BAR_WEIGHT_LB),
-        totalWeight = 0;
+    : useColors = plateData['useColors'] ?? true,
+      isMetric = plateData['isMetric'] ?? true,
+      selectedPlates = plateData['selectedPlates']?.cast<num>() ?? [...DEFAULT_KG_PLATES],
+      barWeight =
+          plateData['barWeight'] ??
+          ((plateData['isMetric'] ?? true) ? DEFAULT_BAR_WEIGHT_KG : DEFAULT_BAR_WEIGHT_LB),
+      totalWeight = 0;
 
   PlateCalculatorState copyWith({
     bool? useColors,
diff --git a/lib/providers/routines.dart b/lib/providers/routines.dart
index 7c124274..ec8e53b9 100644
--- a/lib/providers/routines.dart
+++ b/lib/providers/routines.dart
@@ -279,8 +279,9 @@ class RoutinesProvider with ChangeNotifier {
     final dayDataEntriesGym = dayDataGym.map((entry) => DayData.fromJson(entry)).toList();
     await setExercisesAndUnits(dayDataEntriesGym, exercises: exercises);
 
-    final sessionDataEntries =
-        sessionData.map((entry) => WorkoutSessionApi.fromJson(entry)).toList();
+    final sessionDataEntries = sessionData
+        .map((entry) => WorkoutSessionApi.fromJson(entry))
+        .toList();
 
     for (final day in routine.days) {
       for (final slot in day.slots) {
@@ -322,8 +323,9 @@ class RoutinesProvider with ChangeNotifier {
         }
 
         if (!exercises.containsKey(log.exerciseId)) {
-          exercises[log.exerciseId] =
-              (await _exerciseProvider.fetchAndSetExercise(log.exerciseId))!;
+          exercises[log.exerciseId] = (await _exerciseProvider.fetchAndSetExercise(
+            log.exerciseId,
+          ))!;
         }
 
         log.exerciseBase = exercises[log.exerciseId]!;
@@ -378,8 +380,9 @@ class RoutinesProvider with ChangeNotifier {
 
   /// Fetch and set weight units for workout (kg, lb, plate, etc.)
   Future<void> fetchAndSetRepetitionUnits() async {
-    final response =
-        await baseProvider.fetchPaginated(baseProvider.makeUrl(_repetitionUnitUrlPath));
+    final response = await baseProvider.fetchPaginated(
+      baseProvider.makeUrl(_repetitionUnitUrlPath),
+    );
     for (final unit in response) {
       _repetitionUnits.add(RepetitionUnit.fromJson(unit));
     }
diff --git a/lib/providers/user.dart b/lib/providers/user.dart
index fc8959d1..3765bfe2 100644
--- a/lib/providers/user.dart
+++ b/lib/providers/user.dart
@@ -101,10 +101,12 @@ class UserProvider with ChangeNotifier {
 
   /// Verify the user's email
   Future<void> verifyEmail() async {
-    await baseProvider.fetch(baseProvider.makeUrl(
-      PROFILE_URL,
-      objectMethod: VERIFY_EMAIL,
-    ));
+    await baseProvider.fetch(
+      baseProvider.makeUrl(
+        PROFILE_URL,
+        objectMethod: VERIFY_EMAIL,
+      ),
+    );
     //log(verificationData.toString());
   }
 }
diff --git a/lib/screens/auth_screen.dart b/lib/screens/auth_screen.dart
index 1de4967b..ce036a4f 100644
--- a/lib/screens/auth_screen.dart
+++ b/lib/screens/auth_screen.dart
@@ -182,11 +182,11 @@ class _AuthCardState extends State<AuthCard> {
       late LoginActions res;
       if (_authMode == AuthMode.Login) {
         res = await context.read<AuthProvider>().login(
-              _authData['username']!,
-              _authData['password']!,
-              _authData['serverUrl']!,
-              _authData['apiToken'],
-            );
+          _authData['username']!,
+          _authData['password']!,
+          _authData['serverUrl']!,
+          _authData['apiToken'],
+        );
 
         // Register new user
       } else {
@@ -287,8 +287,9 @@ class _AuthCardState extends State<AuthCard> {
                             labelText: i18n.confirmPassword,
                             prefixIcon: const Icon(Icons.password),
                             suffixIcon: IconButton(
-                              icon:
-                                  Icon(confirmIsObscure ? Icons.visibility_off : Icons.visibility),
+                              icon: Icon(
+                                confirmIsObscure ? Icons.visibility_off : Icons.visibility,
+                              ),
                               onPressed: () {
                                 updateState(() {
                                   confirmIsObscure = !confirmIsObscure;
@@ -374,8 +375,9 @@ class _AuthCardState extends State<AuthCard> {
                   Builder(
                     key: const Key('toggleActionButton'),
                     builder: (context) {
-                      final String text =
-                          _authMode != AuthMode.Register ? i18n.registerInstead : i18n.loginInstead;
+                      final String text = _authMode != AuthMode.Register
+                          ? i18n.registerInstead
+                          : i18n.loginInstead;
 
                       return GestureDetector(
                         onTap: () => _switchAuthMode(),
diff --git a/lib/screens/gym_mode.dart b/lib/screens/gym_mode.dart
index 6137fa9a..8e28b527 100644
--- a/lib/screens/gym_mode.dart
+++ b/lib/screens/gym_mode.dart
@@ -40,8 +40,9 @@ class GymModeScreen extends StatelessWidget {
 
     final routinesProvider = context.read<RoutinesProvider>();
     final routine = routinesProvider.findById(args.routineId);
-    final dayDataDisplay =
-        routine.dayData.firstWhere((e) => e.iteration == args.iteration && e.day?.id == args.dayId);
+    final dayDataDisplay = routine.dayData.firstWhere(
+      (e) => e.iteration == args.iteration && e.day?.id == args.dayId,
+    );
     final dayDataGym = routine.dayDataGym
         .where((e) => e.iteration == args.iteration && e.day?.id == args.dayId)
         .first;
diff --git a/lib/screens/nutritional_plan_screen.dart b/lib/screens/nutritional_plan_screen.dart
index 1f8e2062..b2208223 100644
--- a/lib/screens/nutritional_plan_screen.dart
+++ b/lib/screens/nutritional_plan_screen.dart
@@ -126,8 +126,10 @@ class NutritionalPlanScreen extends StatelessWidget {
                       );
                       break;
                     case NutritionalPlanOptions.delete:
-                      Provider.of<NutritionPlansProvider>(context, listen: false)
-                          .deletePlan(nutritionalPlan.id!);
+                      Provider.of<NutritionPlansProvider>(
+                        context,
+                        listen: false,
+                      ).deletePlan(nutritionalPlan.id!);
                       Navigator.of(context).pop();
                       break;
                   }
@@ -165,22 +167,22 @@ class NutritionalPlanScreen extends StatelessWidget {
             future: _loadFullPlan(context, nutritionalPlan.id!),
             builder: (context, AsyncSnapshot<NutritionalPlan> snapshot) =>
                 snapshot.connectionState == ConnectionState.waiting
-                    ? SliverList(
-                        delegate: SliverChildListDelegate(
-                          [
-                            const SizedBox(
-                              height: 200,
-                              child: Center(
-                                child: CircularProgressIndicator(),
-                              ),
-                            ),
-                          ],
+                ? SliverList(
+                    delegate: SliverChildListDelegate(
+                      [
+                        const SizedBox(
+                          height: 200,
+                          child: Center(
+                            child: CircularProgressIndicator(),
+                          ),
                         ),
-                      )
-                    : Consumer<NutritionPlansProvider>(
-                        builder: (context, value, child) =>
-                            NutritionalPlanDetailWidget(nutritionalPlan),
-                      ),
+                      ],
+                    ),
+                  )
+                : Consumer<NutritionPlansProvider>(
+                    builder: (context, value, child) =>
+                        NutritionalPlanDetailWidget(nutritionalPlan),
+                  ),
           ),
         ],
       ),
diff --git a/lib/widgets/add_exercise/add_exercise_multiselect_button.dart b/lib/widgets/add_exercise/add_exercise_multiselect_button.dart
index 6af8a684..ae854471 100644
--- a/lib/widgets/add_exercise/add_exercise_multiselect_button.dart
+++ b/lib/widgets/add_exercise/add_exercise_multiselect_button.dart
@@ -33,8 +33,9 @@ class _AddExerciseMultiselectButtonState<T> extends State<AddExerciseMultiselect
       child: MultiSelectDialogField(
         initialValue: widget.initialItems,
         onSaved: widget.onSaved,
-        items:
-            widget.items.map((item) => MultiSelectItem<T>(item, widget.displayName(item))).toList(),
+        items: widget.items
+            .map((item) => MultiSelectItem<T>(item, widget.displayName(item)))
+            .toList(),
         onConfirm: (value) {
           setState(() {
             _selectedItems = value.cast<T>();
diff --git a/lib/widgets/core/about.dart b/lib/widgets/core/about.dart
index 9e430bcd..86348269 100644
--- a/lib/widgets/core/about.dart
+++ b/lib/widgets/core/about.dart
@@ -195,7 +195,8 @@ class AboutPage extends StatelessWidget {
                 showLicensePage(
                   context: context,
                   applicationName: 'wger',
-                  applicationVersion: 'App: ${authProvider.applicationVersion?.version ?? 'N/A'} '
+                  applicationVersion:
+                      'App: ${authProvider.applicationVersion?.version ?? 'N/A'} '
                       'Server: ${authProvider.serverVersion ?? 'N/A'}',
                   applicationLegalese: '\u{a9} ${today.year} wger contributors',
                   applicationIcon: Padding(
diff --git a/lib/widgets/dashboard/widgets/measurements.dart b/lib/widgets/dashboard/widgets/measurements.dart
index 76ef69c4..ed7fbd8f 100644
--- a/lib/widgets/dashboard/widgets/measurements.dart
+++ b/lib/widgets/dashboard/widgets/measurements.dart
@@ -42,8 +42,9 @@ class _DashboardMeasurementWidgetState extends State<DashboardMeasurementWidget>
   Widget build(BuildContext context) {
     final provider = Provider.of<MeasurementProvider>(context, listen: false);
 
-    final items =
-        provider.categories.map<Widget>((item) => CategoriesCard(item, elevation: 0)).toList();
+    final items = provider.categories
+        .map<Widget>((item) => CategoriesCard(item, elevation: 0))
+        .toList();
     if (items.isNotEmpty) {
       items.add(
         NothingFound(
@@ -115,10 +116,10 @@ class _DashboardMeasurementWidgetState extends State<DashboardMeasurementWidget>
                                 ),
                                 decoration: BoxDecoration(
                                   shape: BoxShape.circle,
-                                  color:
-                                      Theme.of(context).textTheme.headlineSmall!.color!.withOpacity(
-                                            _current == entry.key ? 0.9 : 0.4,
-                                          ),
+                                  color: Theme.of(context).textTheme.headlineSmall!.color!
+                                      .withOpacity(
+                                        _current == entry.key ? 0.9 : 0.4,
+                                      ),
                                 ),
                               ),
                             );
diff --git a/lib/widgets/dashboard/widgets/nutrition.dart b/lib/widgets/dashboard/widgets/nutrition.dart
index 4f7c0281..ee611ba4 100644
--- a/lib/widgets/dashboard/widgets/nutrition.dart
+++ b/lib/widgets/dashboard/widgets/nutrition.dart
@@ -60,8 +60,9 @@ class _DashboardNutritionWidgetState extends State<DashboardNutritionWidget> {
             ),
             subtitle: Text(
               _hasContent
-                  ? DateFormat.yMd(Localizations.localeOf(context).languageCode)
-                      .format(_plan!.creationDate)
+                  ? DateFormat.yMd(
+                      Localizations.localeOf(context).languageCode,
+                    ).format(_plan!.creationDate)
                   : '',
             ),
             leading: Icon(
diff --git a/lib/widgets/dashboard/widgets/routines.dart b/lib/widgets/dashboard/widgets/routines.dart
index 66392c68..d5d7837e 100644
--- a/lib/widgets/dashboard/widgets/routines.dart
+++ b/lib/widgets/dashboard/widgets/routines.dart
@@ -175,14 +175,19 @@ class DetailContentWidget extends StatelessWidget {
                                   Row(
                                     crossAxisAlignment: CrossAxisAlignment.start,
                                     children: [
-                                      Text(s.exercise
-                                          .getTranslation(
-                                              Localizations.localeOf(context).languageCode)
-                                          .name),
+                                      Text(
+                                        s.exercise
+                                            .getTranslation(
+                                              Localizations.localeOf(context).languageCode,
+                                            )
+                                            .name,
+                                      ),
                                       const SizedBox(width: 10),
                                       Expanded(
-                                        child:
-                                            MutedText(s.textRepr, overflow: TextOverflow.ellipsis),
+                                        child: MutedText(
+                                          s.textRepr,
+                                          overflow: TextOverflow.ellipsis,
+                                        ),
                                       ),
                                     ],
                                   ),
diff --git a/lib/widgets/dashboard/widgets/weight.dart b/lib/widgets/dashboard/widgets/weight.dart
index c5652cbf..dd568dc0 100644
--- a/lib/widgets/dashboard/widgets/weight.dart
+++ b/lib/widgets/dashboard/widgets/weight.dart
@@ -94,9 +94,12 @@ class DashboardWeightWidget extends StatelessWidget {
                                 FormScreen.routeName,
                                 arguments: FormScreenArguments(
                                   AppLocalizations.of(context).newEntry,
-                                  WeightForm(weightProvider
-                                      .getNewestEntry()
-                                      ?.copyWith(id: null, date: DateTime.now())),
+                                  WeightForm(
+                                    weightProvider.getNewestEntry()?.copyWith(
+                                      id: null,
+                                      date: DateTime.now(),
+                                    ),
+                                  ),
                                 ),
                               );
                             },
diff --git a/lib/widgets/exercises/autocompleter.dart b/lib/widgets/exercises/autocompleter.dart
index 133deb03..e333045a 100644
--- a/lib/widgets/exercises/autocompleter.dart
+++ b/lib/widgets/exercises/autocompleter.dart
@@ -85,30 +85,32 @@ class _ExerciseAutocompleterState extends State<ExerciseAutocompleter> {
               return null;
             }
             return context.read<ExercisesProvider>().searchExercise(
-                  pattern,
-                  languageCode: Localizations.localeOf(context).languageCode,
-                  searchEnglish: _searchEnglish,
-                );
+              pattern,
+              languageCode: Localizations.localeOf(context).languageCode,
+              searchEnglish: _searchEnglish,
+            );
           },
-          itemBuilder: (
-            BuildContext context,
-            Exercise exerciseSuggestion,
-          ) =>
-              ListTile(
-            key: Key('exercise-${exerciseSuggestion.id}'),
-            leading: SizedBox(
-              width: 45,
-              child: ExerciseImageWidget(
-                image: exerciseSuggestion.getMainImage,
+          itemBuilder:
+              (
+                BuildContext context,
+                Exercise exerciseSuggestion,
+              ) => ListTile(
+                key: Key('exercise-${exerciseSuggestion.id}'),
+                leading: SizedBox(
+                  width: 45,
+                  child: ExerciseImageWidget(
+                    image: exerciseSuggestion.getMainImage,
+                  ),
+                ),
+                title: Text(
+                  exerciseSuggestion
+                      .getTranslation(Localizations.localeOf(context).languageCode)
+                      .name,
+                ),
+                subtitle: Text(
+                  '${exerciseSuggestion.category!.name} / ${exerciseSuggestion.equipment.map((e) => e.name).join(', ')}',
+                ),
               ),
-            ),
-            title: Text(
-              exerciseSuggestion.getTranslation(Localizations.localeOf(context).languageCode).name,
-            ),
-            subtitle: Text(
-              '${exerciseSuggestion.category!.name} / ${exerciseSuggestion.equipment.map((e) => e.name).join(', ')}',
-            ),
-          ),
           emptyBuilder: (context) {
             return Column(
               mainAxisSize: MainAxisSize.min,
@@ -149,7 +151,7 @@ class _ExerciseAutocompleterState extends State<ExerciseAutocompleter> {
               });
             },
             dense: true,
-          )
+          ),
       ],
     );
   }
diff --git a/lib/widgets/exercises/exercises.dart b/lib/widgets/exercises/exercises.dart
index d5bb76a0..373515f0 100644
--- a/lib/widgets/exercises/exercises.dart
+++ b/lib/widgets/exercises/exercises.dart
@@ -81,21 +81,23 @@ class ExerciseDetail extends StatelessWidget {
   }
 
   List<Widget> getVariations(BuildContext context) {
-    final variations =
-        Provider.of<ExercisesProvider>(context, listen: false).findExercisesByVariationId(
-      _exercise.variationId,
-      exerciseIdToExclude: _exercise.id,
-    );
+    final variations = Provider.of<ExercisesProvider>(context, listen: false)
+        .findExercisesByVariationId(
+          _exercise.variationId,
+          exerciseIdToExclude: _exercise.id,
+        );
 
     final List<Widget> out = [];
     if (_exercise.variationId == null) {
       return out;
     }
 
-    out.add(Text(
-      AppLocalizations.of(context).variations,
-      style: Theme.of(context).textTheme.headlineSmall,
-    ));
+    out.add(
+      Text(
+        AppLocalizations.of(context).variations,
+        style: Theme.of(context).textTheme.headlineSmall,
+      ),
+    );
     for (final element in variations) {
       out.add(ExerciseListTile(exercise: element));
     }
@@ -110,10 +112,12 @@ class ExerciseDetail extends StatelessWidget {
   List<Widget> getNotes(BuildContext context) {
     final List<Widget> out = [];
     if (_translation.notes.isNotEmpty) {
-      out.add(Text(
-        AppLocalizations.of(context).notes,
-        style: Theme.of(context).textTheme.headlineSmall,
-      ));
+      out.add(
+        Text(
+          AppLocalizations.of(context).notes,
+          style: Theme.of(context).textTheme.headlineSmall,
+        ),
+      );
       for (final e in _translation.notes) {
         out.add(Text(e.comment));
       }
@@ -125,36 +129,40 @@ class ExerciseDetail extends StatelessWidget {
 
   List<Widget> getMuscles(BuildContext context) {
     final List<Widget> out = [];
-    out.add(Text(
-      AppLocalizations.of(context).muscles,
-      style: Theme.of(context).textTheme.headlineSmall,
-    ));
-    out.add(Row(
-      mainAxisAlignment: MainAxisAlignment.spaceAround,
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Expanded(
-          child: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: PADDING),
-            child: MuscleWidget(
-              muscles: _exercise.muscles,
-              musclesSecondary: _exercise.musclesSecondary,
-              isFront: true,
+    out.add(
+      Text(
+        AppLocalizations.of(context).muscles,
+        style: Theme.of(context).textTheme.headlineSmall,
+      ),
+    );
+    out.add(
+      Row(
+        mainAxisAlignment: MainAxisAlignment.spaceAround,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Expanded(
+            child: Padding(
+              padding: const EdgeInsets.symmetric(horizontal: PADDING),
+              child: MuscleWidget(
+                muscles: _exercise.muscles,
+                musclesSecondary: _exercise.musclesSecondary,
+                isFront: true,
+              ),
             ),
           ),
-        ),
-        Expanded(
-          child: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: PADDING),
-            child: MuscleWidget(
-              muscles: _exercise.muscles,
-              musclesSecondary: _exercise.musclesSecondary,
-              isFront: false,
+          Expanded(
+            child: Padding(
+              padding: const EdgeInsets.symmetric(horizontal: PADDING),
+              child: MuscleWidget(
+                muscles: _exercise.muscles,
+                musclesSecondary: _exercise.musclesSecondary,
+                isFront: false,
+              ),
             ),
           ),
-        ),
-      ],
-    ));
+        ],
+      ),
+    );
 
     out.add(
       Column(
@@ -183,10 +191,12 @@ class ExerciseDetail extends StatelessWidget {
 
   List<Widget> getDescription(BuildContext context) {
     final List<Widget> out = [];
-    out.add(Text(
-      AppLocalizations.of(context).description,
-      style: Theme.of(context).textTheme.headlineSmall,
-    ));
+    out.add(
+      Text(
+        AppLocalizations.of(context).description,
+        style: Theme.of(context).textTheme.headlineSmall,
+      ),
+    );
     out.add(Html(data: _translation.description));
 
     return out;
@@ -195,9 +205,11 @@ class ExerciseDetail extends StatelessWidget {
   List<Widget> getImages() {
     final List<Widget> out = [];
     if (_exercise.images.isNotEmpty) {
-      out.add(CarouselImages(
-        images: _exercise.images,
-      ));
+      out.add(
+        CarouselImages(
+          images: _exercise.images,
+        ),
+      );
 
       // out.add(ExerciseImageWidget(
       //   image: _exercise.getMainImage,
@@ -225,14 +237,16 @@ class ExerciseDetail extends StatelessWidget {
     );
     if (_exercise.equipment.isNotEmpty) {
       _exercise.equipment
-          .map((e) => Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 4),
-                child: Chip(
-                  label: Text(getTranslation(e.name, context)),
-                  padding: EdgeInsets.zero,
-                  backgroundColor: theme.splashColor,
-                ),
-              ))
+          .map(
+            (e) => Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 4),
+              child: Chip(
+                label: Text(getTranslation(e.name, context)),
+                padding: EdgeInsets.zero,
+                backgroundColor: theme.splashColor,
+              ),
+            ),
+          )
           .forEach((element) => out.add(element));
     }
     out.add(const SizedBox(height: PADDING));
@@ -255,11 +269,13 @@ class ExerciseDetail extends StatelessWidget {
   List<Widget> getAliases(BuildContext context) {
     final List<Widget> out = [];
     if (_translation.aliases.isNotEmpty) {
-      out.add(MutedText(
-        AppLocalizations.of(context).alsoKnownAs(
-          _translation.aliases.map((e) => e.alias).toList().join(', '),
+      out.add(
+        MutedText(
+          AppLocalizations.of(context).alsoKnownAs(
+            _translation.aliases.map((e) => e.alias).toList().join(', '),
+          ),
         ),
-      ));
+      );
       out.add(const SizedBox(height: PADDING));
     }
 
@@ -355,9 +371,13 @@ class MuscleWidget extends StatelessWidget {
       children: [
         SvgPicture.asset('assets/images/muscles/$background.svg'),
         ...muscles.map((m) => SvgPicture.asset('assets/images/muscles/main/muscle-${m.id}.svg')),
-        ...musclesSecondary.where((m) => !muscles.contains(m)).map((m) => SvgPicture.asset(
-              'assets/images/muscles/secondary/muscle-${m.id}.svg',
-            )),
+        ...musclesSecondary
+            .where((m) => !muscles.contains(m))
+            .map(
+              (m) => SvgPicture.asset(
+                'assets/images/muscles/secondary/muscle-${m.id}.svg',
+              ),
+            ),
       ],
     );
   }
diff --git a/lib/widgets/exercises/videos.dart b/lib/widgets/exercises/videos.dart
index 0a5496bf..8f38da56 100644
--- a/lib/widgets/exercises/videos.dart
+++ b/lib/widgets/exercises/videos.dart
@@ -68,22 +68,22 @@ class _ExerciseVideoWidgetState extends State<ExerciseVideoWidget> {
     return hasError
         ? const GeneralErrorsWidget(
             [
-              'An error happened while loading the video. If you can, please check the application logs.'
+              'An error happened while loading the video. If you can, please check the application logs.',
             ],
           )
         : _controller.value.isInitialized
-            ? AspectRatio(
-                aspectRatio: _controller.value.aspectRatio,
-                child: Stack(
-                  alignment: Alignment.bottomCenter,
-                  children: [
-                    VideoPlayer(_controller),
-                    _ControlsOverlay(controller: _controller),
-                    VideoProgressIndicator(_controller, allowScrubbing: true),
-                  ],
-                ),
-              )
-            : Container();
+        ? AspectRatio(
+            aspectRatio: _controller.value.aspectRatio,
+            child: Stack(
+              alignment: Alignment.bottomCenter,
+              children: [
+                VideoPlayer(_controller),
+                _ControlsOverlay(controller: _controller),
+                VideoProgressIndicator(_controller, allowScrubbing: true),
+              ],
+            ),
+          )
+        : Container();
   }
 }
 
diff --git a/lib/widgets/gallery/forms.dart b/lib/widgets/gallery/forms.dart
index 2c75ec30..2899ff99 100644
--- a/lib/widgets/gallery/forms.dart
+++ b/lib/widgets/gallery/forms.dart
@@ -197,12 +197,16 @@ class _ImageFormState extends State<ImageForm> {
               _form.currentState!.save();
 
               if (widget._image.id == null) {
-                Provider.of<GalleryProvider>(context, listen: false)
-                    .addImage(widget._image, _file!);
+                Provider.of<GalleryProvider>(
+                  context,
+                  listen: false,
+                ).addImage(widget._image, _file!);
                 Navigator.of(context).pop();
               } else {
-                Provider.of<GalleryProvider>(context, listen: false)
-                    .editImage(widget._image, _file);
+                Provider.of<GalleryProvider>(
+                  context,
+                  listen: false,
+                ).editImage(widget._image, _file);
                 Navigator.of(context).pop();
               }
             },
diff --git a/lib/widgets/measurements/charts.dart b/lib/widgets/measurements/charts.dart
index 076fa493..407b1a9f 100644
--- a/lib/widgets/measurements/charts.dart
+++ b/lib/widgets/measurements/charts.dart
@@ -41,8 +41,10 @@ class MeasurementOverallChangeWidget extends StatelessWidget {
     }
 
     // ignore: prefer_interpolation_to_compose_strings
-    return Text(AppLocalizations.of(context).overallChangeWeight +
-        ' $prefix${delta.abs().toStringAsFixed(1)} $_unit');
+    return Text(
+      AppLocalizations.of(context).overallChangeWeight +
+          ' $prefix${delta.abs().toStringAsFixed(1)} $_unit',
+    );
   }
 }
 
@@ -78,14 +80,16 @@ class _MeasurementChartWidgetFlState extends State<MeasurementChartWidgetFl> {
       touchTooltipData: LineTouchTooltipData(
         getTooltipColor: (touchedSpot) => Theme.of(context).colorScheme.primaryContainer,
         getTooltipItems: (touchedSpots) {
-          final numberFormat =
-              NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
+          final numberFormat = NumberFormat.decimalPattern(
+            Localizations.localeOf(context).toString(),
+          );
 
           return touchedSpots.map((touchedSpot) {
             final msSinceEpoch = touchedSpot.x.toInt();
             final DateTime date = DateTime.fromMillisecondsSinceEpoch(touchedSpot.x.toInt());
-            final dateStr =
-                DateFormat.Md(Localizations.localeOf(context).languageCode).format(date);
+            final dateStr = DateFormat.Md(
+              Localizations.localeOf(context).languageCode,
+            ).format(date);
 
             // Check if this is an interpolated point (milliseconds ending with 123)
             final bool isInterpolated = msSinceEpoch % 1000 == INTERPOLATION_MARKER;
@@ -180,10 +184,12 @@ class _MeasurementChartWidgetFlState extends State<MeasurementChartWidgetFl> {
       lineBarsData: [
         LineChartBarData(
           spots: widget._entries
-              .map((e) => FlSpot(
-                    e.date.millisecondsSinceEpoch.toDouble(),
-                    e.value.toDouble(),
-                  ))
+              .map(
+                (e) => FlSpot(
+                  e.date.millisecondsSinceEpoch.toDouble(),
+                  e.value.toDouble(),
+                ),
+              )
               .toList(),
           isCurved: false,
           color: Theme.of(context).colorScheme.primary,
@@ -194,10 +200,12 @@ class _MeasurementChartWidgetFlState extends State<MeasurementChartWidgetFl> {
         if (widget.avgs != null)
           LineChartBarData(
             spots: widget.avgs!
-                .map((e) => FlSpot(
-                      e.date.millisecondsSinceEpoch.toDouble(),
-                      e.value.toDouble(),
-                    ))
+                .map(
+                  (e) => FlSpot(
+                    e.date.millisecondsSinceEpoch.toDouble(),
+                    e.value.toDouble(),
+                  ),
+                )
                 .toList(),
             isCurved: false,
             color: Theme.of(context).colorScheme.tertiary,
diff --git a/lib/widgets/measurements/entries.dart b/lib/widgets/measurements/entries.dart
index 78460004..6573375f 100644
--- a/lib/widgets/measurements/entries.dart
+++ b/lib/widgets/measurements/entries.dart
@@ -40,81 +40,85 @@ class EntriesList extends StatelessWidget {
     final numberFormat = NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
     final provider = Provider.of<MeasurementProvider>(context, listen: false);
 
-    final entriesAll =
-        _category.entries.map((e) => MeasurementChartEntry(e.value, e.date)).toList();
+    final entriesAll = _category.entries
+        .map((e) => MeasurementChartEntry(e.value, e.date))
+        .toList();
     final entries7dAvg = moving7dAverage(entriesAll);
 
-    return Column(children: [
-      ...getOverviewWidgetsSeries(
-        _category.name,
-        entriesAll,
-        entries7dAvg,
-        plans,
-        _category.unit,
-        context,
-      ),
-      SizedBox(
-        height: 300,
-        child: ListView.builder(
-          padding: const EdgeInsets.all(10.0),
-          itemCount: _category.entries.length,
-          itemBuilder: (context, index) {
-            final currentEntry = _category.entries[index];
+    return Column(
+      children: [
+        ...getOverviewWidgetsSeries(
+          _category.name,
+          entriesAll,
+          entries7dAvg,
+          plans,
+          _category.unit,
+          context,
+        ),
+        SizedBox(
+          height: 300,
+          child: ListView.builder(
+            padding: const EdgeInsets.all(10.0),
+            itemCount: _category.entries.length,
+            itemBuilder: (context, index) {
+              final currentEntry = _category.entries[index];
 
-            return Card(
-              child: ListTile(
-                title: Text('${numberFormat.format(currentEntry.value)} ${_category.unit}'),
-                subtitle: Text(
-                  DateFormat.yMd(Localizations.localeOf(context).languageCode)
-                      .format(currentEntry.date),
-                ),
-                trailing: PopupMenuButton(
-                  itemBuilder: (BuildContext context) {
-                    return [
-                      PopupMenuItem(
-                        child: Text(AppLocalizations.of(context).edit),
-                        onTap: () => Navigator.pushNamed(
-                          context,
-                          FormScreen.routeName,
-                          arguments: FormScreenArguments(
-                            AppLocalizations.of(context).edit,
-                            MeasurementEntryForm(
-                              currentEntry.category,
-                              currentEntry,
+              return Card(
+                child: ListTile(
+                  title: Text('${numberFormat.format(currentEntry.value)} ${_category.unit}'),
+                  subtitle: Text(
+                    DateFormat.yMd(
+                      Localizations.localeOf(context).languageCode,
+                    ).format(currentEntry.date),
+                  ),
+                  trailing: PopupMenuButton(
+                    itemBuilder: (BuildContext context) {
+                      return [
+                        PopupMenuItem(
+                          child: Text(AppLocalizations.of(context).edit),
+                          onTap: () => Navigator.pushNamed(
+                            context,
+                            FormScreen.routeName,
+                            arguments: FormScreenArguments(
+                              AppLocalizations.of(context).edit,
+                              MeasurementEntryForm(
+                                currentEntry.category,
+                                currentEntry,
+                              ),
                             ),
                           ),
                         ),
-                      ),
-                      PopupMenuItem(
-                        child: Text(AppLocalizations.of(context).delete),
-                        onTap: () async {
-                          // Delete entry from DB
-                          await provider.deleteEntry(
-                            currentEntry.id!,
-                            currentEntry.category,
-                          );
-
-                          // and inform the user
-                          if (context.mounted) {
-                            ScaffoldMessenger.of(context).showSnackBar(
-                              SnackBar(
-                                content: Text(
-                                  AppLocalizations.of(context).successfullyDeleted,
-                                  textAlign: TextAlign.center,
-                                ),
-                              ),
+                        PopupMenuItem(
+                          child: Text(AppLocalizations.of(context).delete),
+                          onTap: () async {
+                            // Delete entry from DB
+                            await provider.deleteEntry(
+                              currentEntry.id!,
+                              currentEntry.category,
                             );
-                          }
-                        },
-                      ),
-                    ];
-                  },
+
+                            // and inform the user
+                            if (context.mounted) {
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                SnackBar(
+                                  content: Text(
+                                    AppLocalizations.of(context).successfullyDeleted,
+                                    textAlign: TextAlign.center,
+                                  ),
+                                ),
+                              );
+                            }
+                          },
+                        ),
+                      ];
+                    },
+                  ),
                 ),
-              ),
-            );
-          },
+              );
+            },
+          ),
         ),
-      ),
-    ]);
+      ],
+    );
   }
 }
diff --git a/lib/widgets/measurements/forms.dart b/lib/widgets/measurements/forms.dart
index e547dc2d..41a2ea09 100644
--- a/lib/widgets/measurements/forms.dart
+++ b/lib/widgets/measurements/forms.dart
@@ -284,13 +284,15 @@ class MeasurementEntryForm extends StatelessWidget {
                   ? await Provider.of<MeasurementProvider>(
                       context,
                       listen: false,
-                    ).addEntry(MeasurementEntry(
-                      id: _entryData['id'],
-                      category: _entryData['category'],
-                      date: _entryData['date'],
-                      value: _entryData['value'],
-                      notes: _entryData['notes'],
-                    ))
+                    ).addEntry(
+                      MeasurementEntry(
+                        id: _entryData['id'],
+                        category: _entryData['category'],
+                        date: _entryData['date'],
+                        value: _entryData['value'],
+                        notes: _entryData['notes'],
+                      ),
+                    )
                   : await Provider.of<MeasurementProvider>(
                       context,
                       listen: false,
diff --git a/lib/widgets/measurements/helpers.dart b/lib/widgets/measurements/helpers.dart
index 4a6f05af..00369b06 100644
--- a/lib/widgets/measurements/helpers.dart
+++ b/lib/widgets/measurements/helpers.dart
@@ -25,8 +25,8 @@ List<Widget> getOverviewWidgets(
               child: Text(
                 'No data available',
                 style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                      color: Theme.of(context).colorScheme.secondary.withValues(alpha: 0.7),
-                    ),
+                  color: Theme.of(context).colorScheme.secondary.withValues(alpha: 0.7),
+                ),
               ),
             )
           : MeasurementChartWidgetFl(raw, unit, avgs: avg),
diff --git a/lib/widgets/nutrition/charts.dart b/lib/widgets/nutrition/charts.dart
index c8a4b3f2..13e9ca18 100644
--- a/lib/widgets/nutrition/charts.dart
+++ b/lib/widgets/nutrition/charts.dart
@@ -71,17 +71,21 @@ class FlNutritionalPlanGoalWidget extends StatelessWidget {
 
     // paint a surplus
     if (val > plan) {
-      return Stack(children: [
-        segment(normWidth * val / plan, COLOR_SURPLUS),
-        segment(normWidth, LIST_OF_COLORS8[0]),
-      ]);
+      return Stack(
+        children: [
+          segment(normWidth * val / plan, COLOR_SURPLUS),
+          segment(normWidth, LIST_OF_COLORS8[0]),
+        ],
+      );
     }
 
     // paint a deficit
-    return Stack(children: [
-      segment(normWidth, Theme.of(context).colorScheme.surface),
-      segment(normWidth * val / plan, LIST_OF_COLORS8[0]),
-    ]);
+    return Stack(
+      children: [
+        segment(normWidth, Theme.of(context).colorScheme.surface),
+        segment(normWidth * val / plan, LIST_OF_COLORS8[0]),
+      ],
+    );
   }
 
   @override
@@ -90,87 +94,102 @@ class FlNutritionalPlanGoalWidget extends StatelessWidget {
     final goals = plan.nutritionalGoals;
     final today = plan.loggedNutritionalValuesToday;
 
-    return LayoutBuilder(builder: (context, constraints) {
-      // if any of the bars goes over 100%, find the one that goes over the most
-      // that one needs the most horizontal space to show how much it goes over,
-      // and therefore reduces the width of "100%" the most, and this width we want
-      // to be consistent for all other bars.
-      // if none goes over, 100% means fill all available space
-      final maxVal = [
-        1.0,
-        if (goals.energy != null && goals.energy! > 0) today.energy / goals.energy!,
-        if (goals.protein != null && goals.protein! > 0) today.protein / goals.protein!,
-        if (goals.carbohydrates != null && goals.carbohydrates! > 0)
-          today.carbohydrates / goals.carbohydrates!,
-        if (goals.fat != null && goals.fat! > 0) today.fat / goals.fat!,
-        if (goals.fiber != null && goals.fiber! > 0) today.fiber / goals.fiber!,
-      ].reduce(max);
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        // if any of the bars goes over 100%, find the one that goes over the most
+        // that one needs the most horizontal space to show how much it goes over,
+        // and therefore reduces the width of "100%" the most, and this width we want
+        // to be consistent for all other bars.
+        // if none goes over, 100% means fill all available space
+        final maxVal = [
+          1.0,
+          if (goals.energy != null && goals.energy! > 0) today.energy / goals.energy!,
+          if (goals.protein != null && goals.protein! > 0) today.protein / goals.protein!,
+          if (goals.carbohydrates != null && goals.carbohydrates! > 0)
+            today.carbohydrates / goals.carbohydrates!,
+          if (goals.fat != null && goals.fat! > 0) today.fat / goals.fat!,
+          if (goals.fiber != null && goals.fiber! > 0) today.fiber / goals.fiber!,
+        ].reduce(max);
 
-      final normWidth = constraints.maxWidth / maxVal;
+        final normWidth = constraints.maxWidth / maxVal;
 
-      String fmtMacro(String name, double today, double? goal, String unit) {
-        return '$name: ${today.toStringAsFixed(0)}${goal == null ? '' : ' / ${goal.toStringAsFixed(0)}'} $unit';
-      }
+        String fmtMacro(String name, double today, double? goal, String unit) {
+          return '$name: ${today.toStringAsFixed(0)}${goal == null ? '' : ' / ${goal.toStringAsFixed(0)}'} $unit';
+        }
 
-      return Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text(fmtMacro(
-            AppLocalizations.of(context).energy,
-            today.energy,
-            goals.energy,
-            AppLocalizations.of(context).kcal,
-          )),
-          const SizedBox(height: 2),
-          _diyGauge(context, normWidth, goals.energy, today.energy),
-          const SizedBox(height: 8),
-          Text(fmtMacro(
-            AppLocalizations.of(context).protein,
-            today.protein,
-            goals.protein,
-            AppLocalizations.of(context).g,
-          )),
-          const SizedBox(height: 2),
-          _diyGauge(context, normWidth, goals.protein, today.protein),
-          const SizedBox(height: 8),
-          Text(fmtMacro(
-            AppLocalizations.of(context).carbohydrates,
-            today.carbohydrates,
-            goals.carbohydrates,
-            AppLocalizations.of(context).g,
-          )),
-          const SizedBox(height: 2),
-          _diyGauge(
-            context,
-            normWidth,
-            goals.carbohydrates,
-            today.carbohydrates,
-          ),
-          const SizedBox(height: 8),
-          Text(fmtMacro(
-            AppLocalizations.of(context).fat,
-            today.fat,
-            goals.fat,
-            AppLocalizations.of(context).g,
-          )),
-          const SizedBox(height: 2),
-          _diyGauge(context, normWidth, goals.fat, today.fat),
-          // optionally display the advanced macro goals:
-          if (goals.fiber != null)
-            Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-              const SizedBox(height: 8),
-              Text(fmtMacro(
-                AppLocalizations.of(context).fiber,
-                today.fiber,
-                goals.fiber,
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              fmtMacro(
+                AppLocalizations.of(context).energy,
+                today.energy,
+                goals.energy,
+                AppLocalizations.of(context).kcal,
+              ),
+            ),
+            const SizedBox(height: 2),
+            _diyGauge(context, normWidth, goals.energy, today.energy),
+            const SizedBox(height: 8),
+            Text(
+              fmtMacro(
+                AppLocalizations.of(context).protein,
+                today.protein,
+                goals.protein,
                 AppLocalizations.of(context).g,
-              )),
-              const SizedBox(height: 2),
-              _diyGauge(context, normWidth, goals.fiber, today.fiber),
-            ]),
-        ],
-      );
-    });
+              ),
+            ),
+            const SizedBox(height: 2),
+            _diyGauge(context, normWidth, goals.protein, today.protein),
+            const SizedBox(height: 8),
+            Text(
+              fmtMacro(
+                AppLocalizations.of(context).carbohydrates,
+                today.carbohydrates,
+                goals.carbohydrates,
+                AppLocalizations.of(context).g,
+              ),
+            ),
+            const SizedBox(height: 2),
+            _diyGauge(
+              context,
+              normWidth,
+              goals.carbohydrates,
+              today.carbohydrates,
+            ),
+            const SizedBox(height: 8),
+            Text(
+              fmtMacro(
+                AppLocalizations.of(context).fat,
+                today.fat,
+                goals.fat,
+                AppLocalizations.of(context).g,
+              ),
+            ),
+            const SizedBox(height: 2),
+            _diyGauge(context, normWidth, goals.fat, today.fat),
+            // optionally display the advanced macro goals:
+            if (goals.fiber != null)
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  const SizedBox(height: 8),
+                  Text(
+                    fmtMacro(
+                      AppLocalizations.of(context).fiber,
+                      today.fiber,
+                      goals.fiber,
+                      AppLocalizations.of(context).g,
+                    ),
+                  ),
+                  const SizedBox(height: 2),
+                  _diyGauge(context, normWidth, goals.fiber, today.fiber),
+                ],
+              ),
+          ],
+        );
+      },
+    );
   }
 }
 
@@ -227,16 +246,19 @@ class FlNutritionalPlanPieChartState extends State<FlNutritionalPlanPieChartWidg
         Column(
           mainAxisAlignment: MainAxisAlignment.center,
           crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            (AppLocalizations.of(context).protein, LIST_OF_COLORS3[1]),
-            (AppLocalizations.of(context).carbohydrates, LIST_OF_COLORS3[0]),
-            (AppLocalizations.of(context).fat, LIST_OF_COLORS3[2]),
-          ]
-              .map((e) => Padding(
-                    padding: const EdgeInsets.symmetric(vertical: 2),
-                    child: Indicator(color: e.$2, text: e.$1, isSquare: true),
-                  ))
-              .toList(),
+          children:
+              [
+                    (AppLocalizations.of(context).protein, LIST_OF_COLORS3[1]),
+                    (AppLocalizations.of(context).carbohydrates, LIST_OF_COLORS3[0]),
+                    (AppLocalizations.of(context).fat, LIST_OF_COLORS3[2]),
+                  ]
+                  .map(
+                    (e) => Padding(
+                      padding: const EdgeInsets.symmetric(vertical: 2),
+                      child: Indicator(color: e.$2, text: e.$1, isSquare: true),
+                    ),
+                  )
+                  .toList(),
         ),
         const SizedBox(width: 28),
       ],
@@ -433,21 +455,22 @@ class NutritionalDiaryChartWidgetFlState extends State<NutritionalDiaryChartWidg
                 spacing: 10.0,
                 runSpacing: 10.0,
                 alignment: WrapAlignment.center,
-                children: [
-                  (AppLocalizations.of(context).deficit, colorPlanned),
-                  (AppLocalizations.of(context).surplus, COLOR_SURPLUS),
-                  (AppLocalizations.of(context).today, colorLoggedToday),
-                  (AppLocalizations.of(context).weekAverage, colorLogged7Day),
-                ]
-                    .map(
-                      (e) => Indicator(
-                        text: e.$1,
-                        color: e.$2,
-                        isSquare: true,
-                        marginRight: 0,
-                      ),
-                    )
-                    .toList(),
+                children:
+                    [
+                          (AppLocalizations.of(context).deficit, colorPlanned),
+                          (AppLocalizations.of(context).surplus, COLOR_SURPLUS),
+                          (AppLocalizations.of(context).today, colorLoggedToday),
+                          (AppLocalizations.of(context).weekAverage, colorLogged7Day),
+                        ]
+                        .map(
+                          (e) => Indicator(
+                            text: e.$1,
+                            color: e.$2,
+                            isSquare: true,
+                            marginRight: 0,
+                          ),
+                        )
+                        .toList(),
               ),
             ),
           ],
@@ -463,8 +486,8 @@ class MealDiaryBarChartWidget extends StatefulWidget {
     super.key,
     required NutritionalValues logged,
     required NutritionalValues planned,
-  })  : _logged = logged,
-        _planned = planned;
+  }) : _logged = logged,
+       _planned = planned;
 
   final NutritionalValues _logged;
   final NutritionalValues _planned;
@@ -489,12 +512,12 @@ class MealDiaryBarChartWidgetState extends State<MealDiaryBarChartWidget> {
   }
 
   Widget leftTitles(double value, TitleMeta meta) => SideTitleWidget(
-        meta: meta,
-        child: Text(
-          AppLocalizations.of(context).percentValue(value.toStringAsFixed(0)),
-          style: const TextStyle(fontSize: 10),
-        ),
-      );
+    meta: meta,
+    child: Text(
+      AppLocalizations.of(context).percentValue(value.toStringAsFixed(0)),
+      style: const TextStyle(fontSize: 10),
+    ),
+  );
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/nutrition/forms.dart b/lib/widgets/nutrition/forms.dart
index ad31917e..3d7daaa3 100644
--- a/lib/widgets/nutrition/forms.dart
+++ b/lib/widgets/nutrition/forms.dart
@@ -138,8 +138,10 @@ Widget getIngredientLogForm(NutritionalPlan plan) {
   return IngredientForm(
     recent: plan.dedupDiaryEntries,
     onSave: (BuildContext context, MealItem mealItem, DateTime? dt) {
-      Provider.of<NutritionPlansProvider>(context, listen: false)
-          .logIngredientToDiary(mealItem, plan.id!, dt);
+      Provider.of<NutritionPlansProvider>(
+        context,
+        listen: false,
+      ).logIngredientToDiary(mealItem, plan.id!, dt);
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
           content: Text(
@@ -236,8 +238,9 @@ class IngredientFormState extends State<IngredientForm> {
   Widget build(BuildContext context) {
     final String unit = AppLocalizations.of(context).g;
     final queryLower = _searchQuery.toLowerCase();
-    final suggestions =
-        widget.recent.where((e) => e.ingredient.name.toLowerCase().contains(queryLower)).toList();
+    final suggestions = widget.recent
+        .where((e) => e.ingredient.name.toLowerCase().contains(queryLower))
+        .toList();
     final numberFormat = NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
 
     return Container(
@@ -359,31 +362,32 @@ class IngredientFormState extends State<IngredientForm> {
                         context,
                         listen: false,
                       ).fetchIngredient(_mealItem.ingredientId),
-                      builder: (
-                        BuildContext context,
-                        AsyncSnapshot<Ingredient> snapshot,
-                      ) {
-                        if (snapshot.hasData) {
-                          _mealItem.ingredient = snapshot.data!;
-                          return MealItemValuesTile(
-                            ingredient: _mealItem.ingredient,
-                            nutritionalValues: _mealItem.nutritionalValues,
-                          );
-                        } else if (snapshot.hasError) {
-                          return Padding(
-                            padding: const EdgeInsets.only(top: 16),
-                            child: Text(
-                              'Ingredient lookup error: ${snapshot.error}',
-                              style: const TextStyle(color: Colors.red),
-                            ),
-                          );
-                        }
-                        return const SizedBox(
-                          width: 20,
-                          height: 20,
-                          child: CircularProgressIndicator(),
-                        );
-                      },
+                      builder:
+                          (
+                            BuildContext context,
+                            AsyncSnapshot<Ingredient> snapshot,
+                          ) {
+                            if (snapshot.hasData) {
+                              _mealItem.ingredient = snapshot.data!;
+                              return MealItemValuesTile(
+                                ingredient: _mealItem.ingredient,
+                                nutritionalValues: _mealItem.nutritionalValues,
+                              );
+                            } else if (snapshot.hasError) {
+                              return Padding(
+                                padding: const EdgeInsets.only(top: 16),
+                                child: Text(
+                                  'Ingredient lookup error: ${snapshot.error}',
+                                  style: const TextStyle(color: Colors.red),
+                                ),
+                              );
+                            }
+                            return const SizedBox(
+                              width: 20,
+                              height: 20,
+                              child: CircularProgressIndicator(),
+                            );
+                          },
                     ),
                   ],
                 ),
@@ -432,10 +436,12 @@ class IngredientFormState extends State<IngredientForm> {
                       title: Text(
                         '${suggestions[index].ingredient.name} (${suggestions[index].amount.toStringAsFixed(0)}$unit)',
                       ),
-                      subtitle: Text(getShortNutritionValues(
-                        suggestions[index].ingredient.nutritionalValues,
-                        context,
-                      )),
+                      subtitle: Text(
+                        getShortNutritionValues(
+                          suggestions[index].ingredient.nutritionalValues,
+                          context,
+                        ),
+                      ),
                       trailing: Row(
                         mainAxisSize: MainAxisSize.min,
                         children: [
diff --git a/lib/widgets/nutrition/helpers.dart b/lib/widgets/nutrition/helpers.dart
index 1dc2ea67..95cd543a 100644
--- a/lib/widgets/nutrition/helpers.dart
+++ b/lib/widgets/nutrition/helpers.dart
@@ -27,18 +27,18 @@ import 'package:wger/widgets/core/core.dart';
 import 'package:wger/widgets/nutrition/ingredient_dialogs.dart';
 
 List<String> getNutritionColumnNames(BuildContext context) => [
-      AppLocalizations.of(context).energy,
-      AppLocalizations.of(context).protein,
-      AppLocalizations.of(context).carbohydrates,
-      AppLocalizations.of(context).fat,
-    ];
+  AppLocalizations.of(context).energy,
+  AppLocalizations.of(context).protein,
+  AppLocalizations.of(context).carbohydrates,
+  AppLocalizations.of(context).fat,
+];
 
 List<String> getNutritionalValues(NutritionalValues values, BuildContext context) => [
-      AppLocalizations.of(context).kcalValue(values.energy.toStringAsFixed(0)),
-      AppLocalizations.of(context).gValue(values.protein.toStringAsFixed(0)),
-      AppLocalizations.of(context).gValue(values.carbohydrates.toStringAsFixed(0)),
-      AppLocalizations.of(context).gValue(values.fat.toStringAsFixed(0)),
-    ];
+  AppLocalizations.of(context).kcalValue(values.energy.toStringAsFixed(0)),
+  AppLocalizations.of(context).gValue(values.protein.toStringAsFixed(0)),
+  AppLocalizations.of(context).gValue(values.carbohydrates.toStringAsFixed(0)),
+  AppLocalizations.of(context).gValue(values.fat.toStringAsFixed(0)),
+];
 
 List<int> getNutritionColumnFlexes(BuildContext context) {
   return getNutritionColumnNames(context).map((e) {
@@ -51,11 +51,13 @@ List<int> getNutritionColumnFlexes(BuildContext context) {
 }
 
 List<Widget> muted(List<String> children) => children
-    .map((e) => MutedText(
-          e,
-          textAlign: TextAlign.right,
-          overflow: TextOverflow.ellipsis,
-        ))
+    .map(
+      (e) => MutedText(
+        e,
+        textAlign: TextAlign.right,
+        overflow: TextOverflow.ellipsis,
+      ),
+    )
     .toList();
 
 // return a row of elements in the standard macros spacing
@@ -85,15 +87,17 @@ String getShortNutritionValues(NutritionalValues values, BuildContext context) {
 }
 
 String getKcalConsumed(Meal meal, BuildContext context) {
-  final consumed =
-      meal.diaryEntriesToday.map((e) => e.nutritionalValues.energy).fold(0.0, (a, b) => a + b);
+  final consumed = meal.diaryEntriesToday
+      .map((e) => e.nutritionalValues.energy)
+      .fold(0.0, (a, b) => a + b);
   return AppLocalizations.of(context).kcalValue(consumed.toStringAsFixed(0));
 }
 
 String getKcalConsumedVsPlanned(Meal meal, BuildContext context) {
   final planned = meal.plannedNutritionalValues.energy;
-  final consumed =
-      meal.diaryEntriesToday.map((e) => e.nutritionalValues.energy).fold(0.0, (a, b) => a + b);
+  final consumed = meal.diaryEntriesToday
+      .map((e) => e.nutritionalValues.energy)
+      .fold(0.0, (a, b) => a + b);
   final loc = AppLocalizations.of(context);
 
   return '${consumed.toStringAsFixed(0)} / ${planned.toStringAsFixed(0)} ${loc.kcal}';
diff --git a/lib/widgets/nutrition/ingredient_dialogs.dart b/lib/widgets/nutrition/ingredient_dialogs.dart
index 449c08e3..b918b360 100644
--- a/lib/widgets/nutrition/ingredient_dialogs.dart
+++ b/lib/widgets/nutrition/ingredient_dialogs.dart
@@ -61,7 +61,7 @@ Widget ingredientImage(String url, BuildContext context) {
                   ),
                 ),
               ),
-            )
+            ),
           ],
         ),
       ),
@@ -201,8 +201,9 @@ class IngredientScanResultDialog extends StatelessWidget {
               if (ingredient != null)
                 Padding(
                   padding: const EdgeInsets.only(bottom: 8.0),
-                  child:
-                      Text(AppLocalizations.of(context).productFoundDescription(ingredient.name)),
+                  child: Text(
+                    AppLocalizations.of(context).productFoundDescription(ingredient.name),
+                  ),
                 ),
               if (ingredient?.image?.url != null) ingredientImage(ingredient!.image!.url, context),
               if (snapshot.connectionState != ConnectionState.done && !snapshot.hasError)
diff --git a/lib/widgets/nutrition/macro_nutrients_table.dart b/lib/widgets/nutrition/macro_nutrients_table.dart
index 088edaee..7a1bfc62 100644
--- a/lib/widgets/nutrition/macro_nutrients_table.dart
+++ b/lib/widgets/nutrition/macro_nutrients_table.dart
@@ -22,13 +22,13 @@ class MacronutrientsTable extends StatelessWidget {
     final loc = AppLocalizations.of(context);
 
     Widget columnHeader(bool left, String title) => Padding(
-          padding: const EdgeInsets.symmetric(vertical: tablePadding),
-          child: Text(
-            title,
-            style: const TextStyle(fontWeight: FontWeight.bold),
-            textAlign: left ? TextAlign.left : TextAlign.right,
-          ),
-        );
+      padding: const EdgeInsets.symmetric(vertical: tablePadding),
+      child: Text(
+        title,
+        style: const TextStyle(fontWeight: FontWeight.bold),
+        textAlign: left ? TextAlign.left : TextAlign.right,
+      ),
+    );
 
     TableRow macroRow(int indent, bool g, String title, double? Function(NutritionalGoals ng) get) {
       final goal = get(nutritionalGoals);
diff --git a/lib/widgets/nutrition/meal.dart b/lib/widgets/nutrition/meal.dart
index 3aebb160..4ba99cf6 100644
--- a/lib/widgets/nutrition/meal.dart
+++ b/lib/widgets/nutrition/meal.dart
@@ -36,7 +36,7 @@ import 'package:wger/widgets/nutrition/widgets.dart';
 enum viewMode {
   base, // just highlevel meal info (name, time)
   withIngredients, // + ingredients
-  withAllDetails // + nutritional breakdown of ingredients, + logged today
+  withAllDetails, // + nutritional breakdown of ingredients, + logged today
 }
 
 class MealWidget extends StatefulWidget {
@@ -173,8 +173,9 @@ class _MealWidgetState extends State<MealWidget> {
                   ),
                 )
               else
-                ...widget._meal.mealItems
-                    .map((item) => MealItemEditableFullTile(item, _viewMode, _editing)),
+                ...widget._meal.mealItems.map(
+                  (item) => MealItemEditableFullTile(item, _viewMode, _editing),
+                ),
             if (_viewMode == viewMode.withIngredients || _viewMode == viewMode.withAllDetails)
               const Divider(),
             if (_viewMode == viewMode.withIngredients || _viewMode == viewMode.withAllDetails)
@@ -201,12 +202,14 @@ class _MealWidgetState extends State<MealWidget> {
                       planned: widget._meal.plannedNutritionalValues,
                       logged: widget._meal.loggedNutritionalValuesToday,
                     ),
-                  ...widget._meal.diaryEntriesToday.map((item) => Padding(
-                        padding: const EdgeInsets.all(8.0),
-                        child: Column(
-                          children: [DiaryEntryTile(diaryEntry: item)],
-                        ),
-                      )),
+                  ...widget._meal.diaryEntriesToday.map(
+                    (item) => Padding(
+                      padding: const EdgeInsets.all(8.0),
+                      child: Column(
+                        children: [DiaryEntryTile(diaryEntry: item)],
+                      ),
+                    ),
+                  ),
                 ],
               ),
           ],
@@ -288,11 +291,11 @@ class MealHeader extends StatelessWidget {
     required viewMode viewMode,
     required Function() toggleEditing,
     required Function() toggleViewMode,
-  })  : _meal = meal,
-        _editing = editing,
-        _viewMode = viewMode,
-        _toggleViewMode = toggleViewMode,
-        _toggleEditing = toggleEditing;
+  }) : _meal = meal,
+       _editing = editing,
+       _viewMode = viewMode,
+       _toggleViewMode = toggleViewMode,
+       _toggleEditing = toggleEditing;
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/nutrition/nutrition_tiles.dart b/lib/widgets/nutrition/nutrition_tiles.dart
index ae089399..36f20155 100644
--- a/lib/widgets/nutrition/nutrition_tiles.dart
+++ b/lib/widgets/nutrition/nutrition_tiles.dart
@@ -82,8 +82,10 @@ class DiaryEntryTile extends StatelessWidget {
           : IconButton(
               tooltip: AppLocalizations.of(context).delete,
               onPressed: () {
-                Provider.of<NutritionPlansProvider>(context, listen: false)
-                    .deleteLog(diaryEntry.id!, nutritionalPlan!.id!);
+                Provider.of<NutritionPlansProvider>(
+                  context,
+                  listen: false,
+                ).deleteLog(diaryEntry.id!, nutritionalPlan!.id!);
               },
               icon: const Icon(Icons.delete_outline),
               iconSize: ICON_SIZE_SMALL,
diff --git a/lib/widgets/nutrition/nutritional_diary_detail.dart b/lib/widgets/nutrition/nutritional_diary_detail.dart
index d6c90038..3da5beaf 100644
--- a/lib/widgets/nutrition/nutritional_diary_detail.dart
+++ b/lib/widgets/nutrition/nutritional_diary_detail.dart
@@ -85,13 +85,13 @@ class NutritionDiaryTable extends StatelessWidget {
     final loc = AppLocalizations.of(context);
 
     Widget columnHeader(bool left, String title) => Padding(
-          padding: const EdgeInsets.symmetric(vertical: tablePadding),
-          child: Text(
-            title,
-            style: const TextStyle(fontWeight: FontWeight.bold),
-            textAlign: left ? TextAlign.left : TextAlign.right,
-          ),
-        );
+      padding: const EdgeInsets.symmetric(vertical: tablePadding),
+      child: Text(
+        title,
+        style: const TextStyle(fontWeight: FontWeight.bold),
+        textAlign: left ? TextAlign.left : TextAlign.right,
+      ),
+    );
 
     TableRow macroRow(int indent, bool g, String title, double Function(NutritionalValues nv) get) {
       final valFn = g ? loc.gValue : loc.kcalValue;
@@ -115,12 +115,14 @@ class NutritionDiaryTable extends StatelessWidget {
       ),
       columnWidths: const {0: FractionColumnWidth(0.4)},
       children: [
-        TableRow(children: [
-          columnHeader(true, loc.macronutrients),
-          columnHeader(false, loc.planned),
-          columnHeader(false, loc.logged),
-          columnHeader(false, loc.difference),
-        ]),
+        TableRow(
+          children: [
+            columnHeader(true, loc.macronutrients),
+            columnHeader(false, loc.planned),
+            columnHeader(false, loc.logged),
+            columnHeader(false, loc.difference),
+          ],
+        ),
         macroRow(0, false, loc.energy, (NutritionalValues nv) => nv.energy),
         macroRow(0, true, loc.protein, (NutritionalValues nv) => nv.protein),
         macroRow(0, true, loc.carbohydrates, (NutritionalValues nv) => nv.carbohydrates),
diff --git a/lib/widgets/nutrition/nutritional_diary_table.dart b/lib/widgets/nutrition/nutritional_diary_table.dart
index bbe296a8..d00a6f2f 100644
--- a/lib/widgets/nutrition/nutritional_diary_table.dart
+++ b/lib/widgets/nutrition/nutritional_diary_table.dart
@@ -82,41 +82,44 @@ class NutritionalDiaryTable extends StatelessWidget {
       decoration: BoxDecoration(
         border: Border(top: BorderSide(color: Colors.grey[300]!)),
       ),
-      children: [
-        Text(
-          style: Theme.of(context).textTheme.titleMedium?.copyWith(color: LIST_OF_COLORS3.first),
-          DateFormat.Md(Localizations.localeOf(context).languageCode).format(date),
-        ),
-        Text(
-          textAlign: TextAlign.end,
-          values.energy.toStringAsFixed(0),
-        ),
-        if (goals.energy != null)
-          Text(
-            textAlign: TextAlign.end,
-            (values.energy - goals.energy!).toStringAsFixed(0),
-          ),
-        Text(
-          textAlign: TextAlign.end,
-          values.protein.toStringAsFixed(0),
-        ),
-        Text(
-          textAlign: TextAlign.end,
-          values.carbohydrates.toStringAsFixed(0),
-        ),
-        Text(
-          textAlign: TextAlign.end,
-          values.fat.toStringAsFixed(0),
-        ),
-      ].map((element) {
-        return GestureDetector(
-          onTap: () => Navigator.of(context).pushNamed(
-            NutritionalDiaryScreen.routeName,
-            arguments: NutritionalDiaryArguments(plan, date),
-          ),
-          child: element,
-        );
-      }).toList(),
+      children:
+          [
+            Text(
+              style: Theme.of(
+                context,
+              ).textTheme.titleMedium?.copyWith(color: LIST_OF_COLORS3.first),
+              DateFormat.Md(Localizations.localeOf(context).languageCode).format(date),
+            ),
+            Text(
+              textAlign: TextAlign.end,
+              values.energy.toStringAsFixed(0),
+            ),
+            if (goals.energy != null)
+              Text(
+                textAlign: TextAlign.end,
+                (values.energy - goals.energy!).toStringAsFixed(0),
+              ),
+            Text(
+              textAlign: TextAlign.end,
+              values.protein.toStringAsFixed(0),
+            ),
+            Text(
+              textAlign: TextAlign.end,
+              values.carbohydrates.toStringAsFixed(0),
+            ),
+            Text(
+              textAlign: TextAlign.end,
+              values.fat.toStringAsFixed(0),
+            ),
+          ].map((element) {
+            return GestureDetector(
+              onTap: () => Navigator.of(context).pushNamed(
+                NutritionalDiaryScreen.routeName,
+                arguments: NutritionalDiaryArguments(plan, date),
+              ),
+              child: element,
+            );
+          }).toList(),
     );
   }
 }
diff --git a/lib/widgets/nutrition/nutritional_plan_detail.dart b/lib/widgets/nutrition/nutritional_plan_detail.dart
index b202a30b..5159909b 100644
--- a/lib/widgets/nutrition/nutritional_plan_detail.dart
+++ b/lib/widgets/nutrition/nutritional_plan_detail.dart
@@ -35,10 +35,13 @@ class NutritionalPlanDetailWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final nutritionalGoals = _nutritionalPlan.nutritionalGoals;
-    final lastWeightEntry =
-        Provider.of<BodyWeightProvider>(context, listen: false).getNewestEntry();
-    final nutritionalGoalsGperKg =
-        lastWeightEntry != null ? nutritionalGoals / lastWeightEntry.weight.toDouble() : null;
+    final lastWeightEntry = Provider.of<BodyWeightProvider>(
+      context,
+      listen: false,
+    ).getNewestEntry();
+    final nutritionalGoalsGperKg = lastWeightEntry != null
+        ? nutritionalGoals / lastWeightEntry.weight.toDouble()
+        : null;
 
     return SliverList(
       delegate: SliverChildListDelegate(
@@ -57,8 +60,8 @@ class NutritionalPlanDetailWidget extends StatelessWidget {
                       Localizations.localeOf(context).languageCode,
                     ).format(_nutritionalPlan.startDate)} (${AppLocalizations.of(context).openEnded})',
               style: Theme.of(context).textTheme.titleSmall?.copyWith(
-                    fontStyle: FontStyle.italic,
-                  ),
+                fontStyle: FontStyle.italic,
+              ),
               textAlign: TextAlign.center,
             ),
           ),
@@ -73,12 +76,14 @@ class NutritionalPlanDetailWidget extends StatelessWidget {
             ),
           ),
           const SizedBox(height: 10),
-          ..._nutritionalPlan.meals.map((meal) => MealWidget(
-                meal,
-                _nutritionalPlan.dedupMealItems,
-                false,
-                false,
-              )),
+          ..._nutritionalPlan.meals.map(
+            (meal) => MealWidget(
+              meal,
+              _nutritionalPlan.dedupMealItems,
+              false,
+              false,
+            ),
+          ),
           MealWidget(
             _nutritionalPlan.pseudoMealOthers('Other logs'),
             _nutritionalPlan.dedupMealItems,
diff --git a/lib/widgets/nutrition/nutritional_plans_list.dart b/lib/widgets/nutrition/nutritional_plans_list.dart
index 9f45149d..3c9d0e95 100644
--- a/lib/widgets/nutrition/nutritional_plans_list.dart
+++ b/lib/widgets/nutrition/nutritional_plans_list.dart
@@ -77,9 +77,9 @@ class NutritionalPlansList extends StatelessWidget {
           Text(
             weightChangeText,
             style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                  fontWeight: FontWeight.bold,
-                  color: weightChangeColor,
-                ),
+              fontWeight: FontWeight.bold,
+              color: weightChangeColor,
+            ),
           ),
         ],
       ),
@@ -123,60 +123,64 @@ class NutritionalPlansList extends StatelessWidget {
                         _buildWeightChangeInfo(context, currentPlan.startDate, currentPlan.endDate),
                       ],
                     ),
-                    trailing: Row(mainAxisSize: MainAxisSize.min, children: [
-                      const VerticalDivider(),
-                      IconButton(
-                        icon: const Icon(Icons.delete),
-                        tooltip: AppLocalizations.of(context).delete,
-                        onPressed: () async {
-                          // Delete the plan from DB
-                          await showDialog(
-                            context: context,
-                            builder: (BuildContext contextDialog) {
-                              return AlertDialog(
-                                content: Text(
-                                  AppLocalizations.of(context)
-                                      .confirmDelete(currentPlan.description),
-                                ),
-                                actions: [
-                                  TextButton(
-                                    child: Text(
-                                      MaterialLocalizations.of(context).cancelButtonLabel,
-                                    ),
-                                    onPressed: () => Navigator.of(contextDialog).pop(),
+                    trailing: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        const VerticalDivider(),
+                        IconButton(
+                          icon: const Icon(Icons.delete),
+                          tooltip: AppLocalizations.of(context).delete,
+                          onPressed: () async {
+                            // Delete the plan from DB
+                            await showDialog(
+                              context: context,
+                              builder: (BuildContext contextDialog) {
+                                return AlertDialog(
+                                  content: Text(
+                                    AppLocalizations.of(
+                                      context,
+                                    ).confirmDelete(currentPlan.description),
                                   ),
-                                  TextButton(
-                                    child: Text(
-                                      AppLocalizations.of(context).delete,
-                                      style: TextStyle(
-                                        color: Theme.of(context).colorScheme.error,
+                                  actions: [
+                                    TextButton(
+                                      child: Text(
+                                        MaterialLocalizations.of(context).cancelButtonLabel,
                                       ),
+                                      onPressed: () => Navigator.of(contextDialog).pop(),
                                     ),
-                                    onPressed: () {
-                                      // Confirmed, delete the plan
-                                      _nutritionProvider.deletePlan(currentPlan.id!);
-
-                                      // Close the popup
-                                      Navigator.of(contextDialog).pop();
-
-                                      // and inform the user
-                                      ScaffoldMessenger.of(context).showSnackBar(
-                                        SnackBar(
-                                          content: Text(
-                                            AppLocalizations.of(context).successfullyDeleted,
-                                            textAlign: TextAlign.center,
-                                          ),
+                                    TextButton(
+                                      child: Text(
+                                        AppLocalizations.of(context).delete,
+                                        style: TextStyle(
+                                          color: Theme.of(context).colorScheme.error,
                                         ),
-                                      );
-                                    },
-                                  ),
-                                ],
-                              );
-                            },
-                          );
-                        },
-                      ),
-                    ]),
+                                      ),
+                                      onPressed: () {
+                                        // Confirmed, delete the plan
+                                        _nutritionProvider.deletePlan(currentPlan.id!);
+
+                                        // Close the popup
+                                        Navigator.of(contextDialog).pop();
+
+                                        // and inform the user
+                                        ScaffoldMessenger.of(context).showSnackBar(
+                                          SnackBar(
+                                            content: Text(
+                                              AppLocalizations.of(context).successfullyDeleted,
+                                              textAlign: TextAlign.center,
+                                            ),
+                                          ),
+                                        );
+                                      },
+                                    ),
+                                  ],
+                                );
+                              },
+                            );
+                          },
+                        ),
+                      ],
+                    ),
                   ),
                 );
               },
diff --git a/lib/widgets/nutrition/widgets.dart b/lib/widgets/nutrition/widgets.dart
index 8b7a95ff..c44b2bd3 100644
--- a/lib/widgets/nutrition/widgets.dart
+++ b/lib/widgets/nutrition/widgets.dart
@@ -38,19 +38,19 @@ class ScanReader extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) => Scaffold(
-        body: ReaderWidget(
-          onScan: (result) {
-            // notes:
-            // 1. even if result.isValid, result.error is always non-null (and set to "")
-            // 2. i've never encountered scan errors to see when they occur, and
-            //    i wouldn't know what to do about them anyway, so we simply return
-            //    result.text in such case (which presumably will be null, or "")
-            // 3. when user cancels (swipe left / back button) this code is no longer
-            //    run and the caller receives null
-            Navigator.pop(context, result.text);
-          },
-        ),
-      );
+    body: ReaderWidget(
+      onScan: (result) {
+        // notes:
+        // 1. even if result.isValid, result.error is always non-null (and set to "")
+        // 2. i've never encountered scan errors to see when they occur, and
+        //    i wouldn't know what to do about them anyway, so we simply return
+        //    result.text in such case (which presumably will be null, or "")
+        // 3. when user cancels (swipe left / back button) this code is no longer
+        //    run and the caller receives null
+        Navigator.pop(context, result.text);
+      },
+    ),
+  );
 }
 
 class IngredientTypeahead extends StatefulWidget {
@@ -94,8 +94,9 @@ class _IngredientTypeaheadState extends State<IngredientTypeahead> {
 
   Future<String> openBarcodeScan(BuildContext context) async {
     try {
-      final code = await Navigator.of(context)
-          .push<String?>(MaterialPageRoute(builder: (context) => const ScanReader()));
+      final code = await Navigator.of(
+        context,
+      ).push<String?>(MaterialPageRoute(builder: (context) => const ScanReader()));
 
       if (code == null) {
         return '';
@@ -217,8 +218,10 @@ class _IngredientTypeaheadState extends State<IngredientTypeahead> {
         showDialog(
           context: context,
           builder: (context) => FutureBuilder<Ingredient?>(
-            future: Provider.of<NutritionPlansProvider>(context, listen: false)
-                .searchIngredientWithBarcode(barcode),
+            future: Provider.of<NutritionPlansProvider>(
+              context,
+              listen: false,
+            ).searchIngredientWithBarcode(barcode),
             builder: (BuildContext context, AsyncSnapshot<Ingredient?> snapshot) {
               return IngredientScanResultDialog(snapshot, barcode, widget.selectIngredient);
             },
diff --git a/lib/widgets/routines/day.dart b/lib/widgets/routines/day.dart
index 46bc5e3c..bcd3e4a8 100644
--- a/lib/widgets/routines/day.dart
+++ b/lib/widgets/routines/day.dart
@@ -128,9 +128,9 @@ class DayHeader extends StatelessWidget {
   final bool _viewMode;
 
   const DayHeader({required DayData day, required int routineId, bool viewMode = false})
-      : _dayData = day,
-        _viewMode = viewMode,
-        _routineId = routineId;
+    : _dayData = day,
+      _viewMode = viewMode,
+      _routineId = routineId;
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/routines/forms/day.dart b/lib/widgets/routines/forms/day.dart
index d5a6fc38..0cafbdaa 100644
--- a/lib/widgets/routines/forms/day.dart
+++ b/lib/widgets/routines/forms/day.dart
@@ -309,8 +309,10 @@ class _DayFormWidgetState extends State<DayFormWidget> {
                     setState(() => isSaving = true);
 
                     try {
-                      await Provider.of<RoutinesProvider>(context, listen: false)
-                          .editDay(widget.day);
+                      await Provider.of<RoutinesProvider>(
+                        context,
+                        listen: false,
+                      ).editDay(widget.day);
                       if (context.mounted) {
                         setState(() {
                           errorMessage = const SizedBox.shrink();
@@ -330,8 +332,9 @@ class _DayFormWidgetState extends State<DayFormWidget> {
                       }
                     }
                   },
-            child:
-                isSaving ? const FormProgressIndicator() : Text(AppLocalizations.of(context).save),
+            child: isSaving
+                ? const FormProgressIndicator()
+                : Text(AppLocalizations.of(context).save),
           ),
           const SizedBox(height: 5),
           ReorderableSlotList(widget.day.slots, widget.day),
diff --git a/lib/widgets/routines/forms/reps_unit.dart b/lib/widgets/routines/forms/reps_unit.dart
index cbe051c6..70e53c3b 100644
--- a/lib/widgets/routines/forms/reps_unit.dart
+++ b/lib/widgets/routines/forms/reps_unit.dart
@@ -59,15 +59,15 @@ class _RepetitionUnitInputWidgetState extends State<RepetitionUnitInputWidget> {
           widget.onChanged(newValue.id);
         });
       },
-      items: Provider.of<RoutinesProvider>(context, listen: false)
-          .repetitionUnits
+      items: Provider.of<RoutinesProvider>(context, listen: false).repetitionUnits
           .map<DropdownMenuItem<RepetitionUnit>>((RepetitionUnit value) {
-        return DropdownMenuItem<RepetitionUnit>(
-          key: Key(value.id.toString()),
-          value: value,
-          child: Text(value.name),
-        );
-      }).toList(),
+            return DropdownMenuItem<RepetitionUnit>(
+              key: Key(value.id.toString()),
+              value: value,
+              child: Text(value.name),
+            );
+          })
+          .toList(),
     );
   }
 }
diff --git a/lib/widgets/routines/forms/session.dart b/lib/widgets/routines/forms/session.dart
index 443f0c6e..191f3615 100644
--- a/lib/widgets/routines/forms/session.dart
+++ b/lib/widgets/routines/forms/session.dart
@@ -37,16 +37,17 @@ class SessionForm extends StatefulWidget {
   static const SLIDER_START = -0.5;
 
   SessionForm(this._routineId, {Function()? onSaved, WorkoutSession? session, int? dayId})
-      : _onSaved = onSaved,
-        _session = session ??
-            WorkoutSession(
-              routineId: _routineId,
-              dayId: dayId,
-              impression: DEFAULT_IMPRESSION,
-              date: clock.now(),
-              timeEnd: TimeOfDay.fromDateTime(clock.now()),
-              timeStart: null,
-            );
+    : _onSaved = onSaved,
+      _session =
+          session ??
+          WorkoutSession(
+            routineId: _routineId,
+            dayId: dayId,
+            impression: DEFAULT_IMPRESSION,
+            date: clock.now(),
+            timeEnd: TimeOfDay.fromDateTime(clock.now()),
+            timeStart: null,
+          );
 
   @override
   _SessionFormState createState() => _SessionFormState();
@@ -68,10 +69,12 @@ class _SessionFormState extends State<SessionForm> {
   void initState() {
     super.initState();
 
-    timeStartController.text =
-        widget._session.timeStart == null ? '' : timeToString(widget._session.timeStart)!;
-    timeEndController.text =
-        widget._session.timeEnd == null ? '' : timeToString(widget._session.timeEnd)!;
+    timeStartController.text = widget._session.timeStart == null
+        ? ''
+        : timeToString(widget._session.timeStart)!;
+    timeEndController.text = widget._session.timeEnd == null
+        ? ''
+        : timeToString(widget._session.timeEnd)!;
     notesController.text = widget._session.notes;
 
     selectedImpression[widget._session.impression - 1] = true;
diff --git a/lib/widgets/routines/forms/slot.dart b/lib/widgets/routines/forms/slot.dart
index 3c2b1ff2..59ab4aa9 100644
--- a/lib/widgets/routines/forms/slot.dart
+++ b/lib/widgets/routines/forms/slot.dart
@@ -53,9 +53,11 @@ class _SlotDetailWidgetState extends State<SlotDetailWidget> {
     return Column(
       children: [
         errorMessage,
-        ...widget.slot.entries.map((entry) => entry.hasProgressionRules
-            ? ProgressionRulesInfoBox(entry.exerciseObj)
-            : SlotEntryForm(entry, widget.routineId, simpleMode: widget.simpleMode)),
+        ...widget.slot.entries.map(
+          (entry) => entry.hasProgressionRules
+              ? ProgressionRulesInfoBox(entry.exerciseObj)
+              : SlotEntryForm(entry, widget.routineId, simpleMode: widget.simpleMode),
+        ),
         const SizedBox(height: 10),
         if (_showExerciseSearchBox || widget.slot.entries.isEmpty)
           ExerciseAutocompleter(
diff --git a/lib/widgets/routines/forms/slot_entry.dart b/lib/widgets/routines/forms/slot_entry.dart
index ec4d8aae..e5680800 100644
--- a/lib/widgets/routines/forms/slot_entry.dart
+++ b/lib/widgets/routines/forms/slot_entry.dart
@@ -85,8 +85,9 @@ class _SlotEntryFormState extends State<SlotEntryForm> {
       repetitionsController.text = widget.entry.repetitionsConfigs.first.value.round().toString();
     }
     if (widget.entry.maxRepetitionsConfigs.isNotEmpty) {
-      maxRepetitionsController.text =
-          widget.entry.maxRepetitionsConfigs.first.value.round().toString();
+      maxRepetitionsController.text = widget.entry.maxRepetitionsConfigs.first.value
+          .round()
+          .toString();
     }
 
     if (widget.entry.restTimeConfigs.isNotEmpty) {
@@ -384,8 +385,9 @@ class _SlotEntryFormState extends State<SlotEntryForm> {
                       }
                     }
                   },
-            child:
-                isSaving ? const FormProgressIndicator() : Text(AppLocalizations.of(context).save),
+            child: isSaving
+                ? const FormProgressIndicator()
+                : Text(AppLocalizations.of(context).save),
           ),
           const SizedBox(height: 10),
         ],
@@ -417,9 +419,11 @@ class _SlotDetailWidgetState extends State<SlotDetailWidget> {
     return Column(
       children: [
         errorMessage,
-        ...widget.slot.entries.map((entry) => entry.hasProgressionRules
-            ? ProgressionRulesInfoBox(entry.exerciseObj)
-            : SlotEntryForm(entry, widget.routineId, simpleMode: widget.simpleMode)),
+        ...widget.slot.entries.map(
+          (entry) => entry.hasProgressionRules
+              ? ProgressionRulesInfoBox(entry.exerciseObj)
+              : SlotEntryForm(entry, widget.routineId, simpleMode: widget.simpleMode),
+        ),
         const SizedBox(height: 10),
         if (_showExerciseSearchBox || widget.slot.entries.isEmpty)
           ExerciseAutocompleter(
diff --git a/lib/widgets/routines/forms/weight_unit.dart b/lib/widgets/routines/forms/weight_unit.dart
index dee9a761..d47d7d0f 100644
--- a/lib/widgets/routines/forms/weight_unit.dart
+++ b/lib/widgets/routines/forms/weight_unit.dart
@@ -56,15 +56,15 @@ class _WeightUnitInputWidgetState extends State<WeightUnitInputWidget> {
           widget.onChanged(newValue.id);
         });
       },
-      items: Provider.of<RoutinesProvider>(context, listen: false)
-          .weightUnits
+      items: Provider.of<RoutinesProvider>(context, listen: false).weightUnits
           .map<DropdownMenuItem<WeightUnit>>((WeightUnit value) {
-        return DropdownMenuItem<WeightUnit>(
-          key: Key(value.id.toString()),
-          value: value,
-          child: Text(value.name),
-        );
-      }).toList(),
+            return DropdownMenuItem<WeightUnit>(
+              key: Key(value.id.toString()),
+              value: value,
+              child: Text(value.name),
+            );
+          })
+          .toList(),
     );
   }
 }
diff --git a/lib/widgets/routines/gym_mode/gym_mode.dart b/lib/widgets/routines/gym_mode/gym_mode.dart
index ca53e163..60f11f40 100644
--- a/lib/widgets/routines/gym_mode/gym_mode.dart
+++ b/lib/widgets/routines/gym_mode/gym_mode.dart
@@ -75,9 +75,9 @@ class _GymModeState extends ConsumerState<GymMode> {
     // Re-fetch the current routine data to ensure we have the latest session
     // data since it is possible that the user created or deleted it from the
     // web interface.
-    await context
-        .read<RoutinesProvider>()
-        .fetchAndSetRoutineFull(widget._dayDataGym.day!.routineId);
+    await context.read<RoutinesProvider>().fetchAndSetRoutineFull(
+      widget._dayDataGym.day!.routineId,
+    );
     widget._logger.fine('Refreshed routine data');
 
     final validUntil = ref.read(gymStateProvider).validUntil;
@@ -137,33 +137,39 @@ class _GymModeState extends ConsumerState<GymMode> {
         currentElement++;
 
         if (firstPage && state.showExercisePages) {
-          out.add(ExerciseOverview(
-            _controller,
-            exercise,
-            ratioCompleted,
-            state.exercisePages,
-          ));
+          out.add(
+            ExerciseOverview(
+              _controller,
+              exercise,
+              ratioCompleted,
+              state.exercisePages,
+            ),
+          );
         }
 
-        out.add(LogPage(
-          _controller,
-          config,
-          slotData,
-          exercise,
-          routinesProvider.findById(widget._dayDataGym.day!.routineId),
-          ratioCompleted,
-          state.exercisePages,
-          widget._iteration,
-        ));
+        out.add(
+          LogPage(
+            _controller,
+            config,
+            slotData,
+            exercise,
+            routinesProvider.findById(widget._dayDataGym.day!.routineId),
+            ratioCompleted,
+            state.exercisePages,
+            widget._iteration,
+          ),
+        );
 
         // If there is a rest time, add a countdown timer
         if (config.restTime != null) {
-          out.add(TimerCountdownWidget(
-            _controller,
-            config.restTime!.toInt(),
-            ratioCompleted,
-            state.exercisePages,
-          ));
+          out.add(
+            TimerCountdownWidget(
+              _controller,
+              config.restTime!.toInt(),
+              ratioCompleted,
+              state.exercisePages,
+            ),
+          );
         } else {
           out.add(TimerWidget(_controller, ratioCompleted, state.exercisePages));
         }
diff --git a/lib/widgets/routines/gym_mode/log_page.dart b/lib/widgets/routines/gym_mode/log_page.dart
index b2d322bf..55334cdc 100644
--- a/lib/widgets/routines/gym_mode/log_page.dart
+++ b/lib/widgets/routines/gym_mode/log_page.dart
@@ -59,8 +59,8 @@ class LogPage extends ConsumerStatefulWidget {
     this._exercisePages,
     int? iteration,
   ) : _log = Log.fromSetConfigData(_configData)
-          ..routineId = _workoutPlan.id!
-          ..iteration = iteration;
+        ..routineId = _workoutPlan.id!
+        ..iteration = iteration;
 
   @override
   _LogPageState createState() => _LogPageState();
@@ -250,8 +250,9 @@ class _LogPageState extends ConsumerState<LogPage> {
                       rethrow;
                     }
                   },
-            child:
-                _isSaving ? const FormProgressIndicator() : Text(AppLocalizations.of(context).save),
+            child: _isSaving
+                ? const FormProgressIndicator()
+                : Text(AppLocalizations.of(context).save),
           ),
         ],
       ),
@@ -274,10 +275,9 @@ class _LogPageState extends ConsumerState<LogPage> {
           child: Center(
             child: Text(
               widget._configData.textRepr,
-              style: Theme.of(context)
-                  .textTheme
-                  .headlineMedium
-                  ?.copyWith(color: Theme.of(context).colorScheme.primary),
+              style: Theme.of(
+                context,
+              ).textTheme.headlineMedium?.copyWith(color: Theme.of(context).colorScheme.primary),
               textAlign: TextAlign.center,
             ),
           ),
@@ -499,7 +499,9 @@ class LogsWeightWidget extends ConsumerWidget {
                 setStateCallback(() {
                   log.weight = newValue;
                   controller.text = numberFormat.format(newValue);
-                  ref.read(plateCalculatorProvider.notifier).setWeight(
+                  ref
+                      .read(plateCalculatorProvider.notifier)
+                      .setWeight(
                         controller.text == '' ? 0 : newValue,
                       );
                 });
@@ -519,7 +521,9 @@ class LogsWeightWidget extends ConsumerWidget {
                 final newValue = numberFormat.parse(value);
                 setStateCallback(() {
                   log.weight = newValue;
-                  ref.read(plateCalculatorProvider.notifier).setWeight(
+                  ref
+                      .read(plateCalculatorProvider.notifier)
+                      .setWeight(
                         controller.text == '' ? 0 : numberFormat.parse(controller.text),
                       );
                 });
@@ -548,7 +552,9 @@ class LogsWeightWidget extends ConsumerWidget {
               setStateCallback(() {
                 log.weight = newValue;
                 controller.text = numberFormat.format(newValue);
-                ref.read(plateCalculatorProvider.notifier).setWeight(
+                ref
+                    .read(plateCalculatorProvider.notifier)
+                    .setWeight(
                       controller.text == '' ? 0 : newValue,
                     );
               });
@@ -601,10 +607,12 @@ class LogsPastLogsWidget extends StatelessWidget {
               onTap: () {
                 setStateCallback(() {
                   // Text field
-                  repetitionsController.text =
-                      pastLog.repetitions != null ? numberFormat.format(pastLog.repetitions) : '';
-                  weightController.text =
-                      pastLog.weight != null ? numberFormat.format(pastLog.weight) : '';
+                  repetitionsController.text = pastLog.repetitions != null
+                      ? numberFormat.format(pastLog.repetitions)
+                      : '';
+                  weightController.text = pastLog.weight != null
+                      ? numberFormat.format(pastLog.weight)
+                      : '';
 
                   // Drop downs
                   log.rir = pastLog.rir;
@@ -612,9 +620,11 @@ class LogsPastLogsWidget extends StatelessWidget {
                   log.weightUnit = pastLog.weightUnitObj;
 
                   ScaffoldMessenger.of(context).hideCurrentSnackBar();
-                  ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-                    content: Text(AppLocalizations.of(context).dataCopied),
-                  ));
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    SnackBar(
+                      content: Text(AppLocalizations.of(context).dataCopied),
+                    ),
+                  );
                 });
               },
               contentPadding: const EdgeInsets.symmetric(horizontal: 40),
diff --git a/lib/widgets/routines/gym_mode/session_page.dart b/lib/widgets/routines/gym_mode/session_page.dart
index d54240e7..45509156 100644
--- a/lib/widgets/routines/gym_mode/session_page.dart
+++ b/lib/widgets/routines/gym_mode/session_page.dart
@@ -38,17 +38,19 @@ class SessionPage extends StatelessWidget {
     TimeOfDay start,
     this._exercisePages, {
     int? dayId,
-  }) : _session = _routine.sessions.map((sessionApi) => sessionApi.session).firstWhere(
-              (session) => session.date.isSameDayAs(clock.now()),
-              orElse: () => WorkoutSession(
-                dayId: dayId,
-                routineId: _routine.id!,
-                impression: DEFAULT_IMPRESSION,
-                date: clock.now(),
-                timeStart: start,
-                timeEnd: TimeOfDay.fromDateTime(clock.now()),
-              ),
-            );
+  }) : _session = _routine.sessions
+           .map((sessionApi) => sessionApi.session)
+           .firstWhere(
+             (session) => session.date.isSameDayAs(clock.now()),
+             orElse: () => WorkoutSession(
+               dayId: dayId,
+               routineId: _routine.id!,
+               impression: DEFAULT_IMPRESSION,
+               date: clock.now(),
+               timeStart: start,
+               timeEnd: TimeOfDay.fromDateTime(clock.now()),
+             ),
+           );
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/routines/gym_mode/start_page.dart b/lib/widgets/routines/gym_mode/start_page.dart
index 6afef502..1707ddf9 100644
--- a/lib/widgets/routines/gym_mode/start_page.dart
+++ b/lib/widgets/routines/gym_mode/start_page.dart
@@ -42,9 +42,11 @@ class StartPage extends StatelessWidget {
                                   width: 45,
                                   child: ExerciseImageWidget(image: exercise.getMainImage),
                                 ),
-                                title: Text(exercise
-                                    .getTranslation(Localizations.localeOf(context).languageCode)
-                                    .name),
+                                title: Text(
+                                  exercise
+                                      .getTranslation(Localizations.localeOf(context).languageCode)
+                                      .name,
+                                ),
                                 subtitle: Column(
                                   crossAxisAlignment: CrossAxisAlignment.start,
                                   children: entry.value.map((text) => Text(text)).toList(),
diff --git a/lib/widgets/routines/log.dart b/lib/widgets/routines/log.dart
index 931c91db..9613ec1d 100644
--- a/lib/widgets/routines/log.dart
+++ b/lib/widgets/routines/log.dart
@@ -56,8 +56,9 @@ class _SessionInfoState extends State<SessionInfo> {
               style: Theme.of(context).textTheme.headlineSmall,
             ),
             subtitle: Text(
-              DateFormat.yMd(Localizations.localeOf(context).languageCode)
-                  .format(widget._session.date),
+              DateFormat.yMd(
+                Localizations.localeOf(context).languageCode,
+              ).format(widget._session.date),
             ),
             onTap: () => setState(() => editMode = !editMode),
             trailing: Icon(editMode ? Icons.edit_off : Icons.edit),
@@ -76,8 +77,9 @@ class _SessionInfoState extends State<SessionInfo> {
                   context,
                   i18n.timeStart,
                   widget._session.timeStart != null
-                      ? MaterialLocalizations.of(context)
-                          .formatTimeOfDay(widget._session.timeStart!)
+                      ? MaterialLocalizations.of(
+                          context,
+                        ).formatTimeOfDay(widget._session.timeStart!)
                       : '-/-',
                 ),
                 _buildInfoRow(
@@ -166,8 +168,9 @@ class DayLogWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final sessionApi =
-        _routine.sessions.firstWhere((sessionApi) => sessionApi.session.date.isSameDayAs(_date));
+    final sessionApi = _routine.sessions.firstWhere(
+      (sessionApi) => sessionApi.session.date.isSameDayAs(_date),
+    );
     final exercises = sessionApi.exercises;
 
     return Card(
@@ -175,15 +178,18 @@ class DayLogWidget extends StatelessWidget {
         children: [
           SessionInfo(sessionApi.session),
           ...exercises.map((exercise) {
-            final translation =
-                exercise.getTranslation(Localizations.localeOf(context).languageCode);
+            final translation = exercise.getTranslation(
+              Localizations.localeOf(context).languageCode,
+            );
             return Column(
               children: [
                 Text(
                   translation.name,
                   style: Theme.of(context).textTheme.titleMedium,
                 ),
-                ...sessionApi.logs.where((l) => l.exerciseId == exercise.id).map(
+                ...sessionApi.logs
+                    .where((l) => l.exerciseId == exercise.id)
+                    .map(
                       (log) => Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
diff --git a/lib/widgets/routines/routines_list.dart b/lib/widgets/routines/routines_list.dart
index bede513d..151c6417 100644
--- a/lib/widgets/routines/routines_list.dart
+++ b/lib/widgets/routines/routines_list.dart
@@ -96,8 +96,9 @@ class _RoutinesListState extends State<RoutinesList> {
                                 builder: (BuildContext contextDialog) {
                                   return AlertDialog(
                                     content: Text(
-                                      AppLocalizations.of(context)
-                                          .confirmDelete(currentRoutine.name),
+                                      AppLocalizations.of(
+                                        context,
+                                      ).confirmDelete(currentRoutine.name),
                                     ),
                                     actions: [
                                       TextButton(
diff --git a/lib/widgets/weight/forms.dart b/lib/widgets/weight/forms.dart
index 755cc18d..c3e18255 100644
--- a/lib/widgets/weight/forms.dart
+++ b/lib/widgets/weight/forms.dart
@@ -34,7 +34,7 @@ class WeightForm extends StatelessWidget {
   final WeightEntry _weightEntry;
 
   WeightForm([WeightEntry? weightEntry])
-      : _weightEntry = weightEntry ?? WeightEntry(date: DateTime.now());
+    : _weightEntry = weightEntry ?? WeightEntry(date: DateTime.now());
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/weight/weight_overview.dart b/lib/widgets/weight/weight_overview.dart
index 404ef853..f6f9050e 100644
--- a/lib/widgets/weight/weight_overview.dart
+++ b/lib/widgets/weight/weight_overview.dart
@@ -80,7 +80,8 @@ class WeightOverview extends StatelessWidget {
                 return Card(
                   child: ListTile(
                     title: Text(
-                        '${numberFormat.format(currentEntry.weight)} ${weightUnit(profile.isMetric, context)}'),
+                      '${numberFormat.format(currentEntry.weight)} ${weightUnit(profile.isMetric, context)}',
+                    ),
                     subtitle: Text(
                       DateFormat.yMd(
                         Localizations.localeOf(context).languageCode,
diff --git a/test/auth/auth_screen_test.dart b/test/auth/auth_screen_test.dart
index e8e48696..2267b74a 100644
--- a/test/auth/auth_screen_test.dart
+++ b/test/auth/auth_screen_test.dart
@@ -94,21 +94,26 @@ void main() {
       buildSignature: 'buildSignature',
     );
 
-    when(mockClient.post(
-      tLogin,
-      headers: anyNamed('headers'),
-      body: anyNamed('body'),
-    )).thenAnswer((_) => Future(() => Response(json.encode(responseLoginOk), 200)));
+    when(
+      mockClient.post(
+        tLogin,
+        headers: anyNamed('headers'),
+        body: anyNamed('body'),
+      ),
+    ).thenAnswer((_) => Future(() => Response(json.encode(responseLoginOk), 200)));
 
     when(mockClient.get(any)).thenAnswer((_) => Future(() => Response('"1.2.3.4"', 200)));
-    when(mockClient.get(any, headers: anyNamed('headers')))
-        .thenAnswer((_) => Future(() => Response('"1.2.3.4"', 200)));
+    when(
+      mockClient.get(any, headers: anyNamed('headers')),
+    ).thenAnswer((_) => Future(() => Response('"1.2.3.4"', 200)));
 
-    when(mockClient.post(
-      tRegistration,
-      headers: anyNamed('headers'),
-      body: anyNamed('body'),
-    )).thenAnswer((_) => Future(() => Response(json.encode(responseRegistrationOk), 201)));
+    when(
+      mockClient.post(
+        tRegistration,
+        headers: anyNamed('headers'),
+        body: anyNamed('body'),
+      ),
+    ).thenAnswer((_) => Future(() => Response(json.encode(responseRegistrationOk), 201)));
   });
 
   group('Login mode', () {
@@ -147,11 +152,13 @@ void main() {
       expect(find.byKey(const ValueKey('inputApiToken')), findsNothing);
       expect(find.textContaining('An Error Occurred'), findsNothing);
       verify(mockClient.get(any));
-      verify(mockClient.post(
-        tLogin,
-        headers: anyNamed('headers'),
-        body: json.encode({'username': 'testuser', 'password': '123456789'}),
-      ));
+      verify(
+        mockClient.post(
+          tLogin,
+          headers: anyNamed('headers'),
+          body: json.encode({'username': 'testuser', 'password': '123456789'}),
+        ),
+      );
     });
 
     testWidgets('Login - wrong username & password', (WidgetTester tester) async {
@@ -161,11 +168,13 @@ void main() {
       final response = {
         'non_field_errors': ['Username or password unknown'],
       };
-      when(mockClient.post(
-        tLogin,
-        headers: anyNamed('headers'),
-        body: anyNamed('body'),
-      )).thenAnswer((_) => Future(() => Response(json.encode(response), 400)));
+      when(
+        mockClient.post(
+          tLogin,
+          headers: anyNamed('headers'),
+          body: anyNamed('body'),
+        ),
+      ).thenAnswer((_) => Future(() => Response(json.encode(response), 400)));
 
       await tester.pumpWidget(getWidget());
 
@@ -178,11 +187,13 @@ void main() {
       // Assert
       expect(find.textContaining('Non field errors'), findsOne);
       expect(find.textContaining('Username or password unknown'), findsOne);
-      verify(mockClient.post(
-        tLogin,
-        headers: anyNamed('headers'),
-        body: json.encode({'username': 'testuser', 'password': '123456789'}),
-      ));
+      verify(
+        mockClient.post(
+          tLogin,
+          headers: anyNamed('headers'),
+          body: json.encode({'username': 'testuser', 'password': '123456789'}),
+        ),
+      );
     });
 
     testWidgets('Login - with API token - happy path', (WidgetTester tester) async {
@@ -207,20 +218,26 @@ void main() {
       expect(find.byKey(const Key('inputPassword')), findsNothing);
       expect(find.textContaining('An Error Occurred'), findsNothing);
 
-      verify(mockClient.get(
-        tProfileCheck,
-        headers: argThat(
-          predicate((headers) =>
-              headers is Map<String, String> &&
-              headers['authorization'] == 'Token 1234567890abcdef1234567890abcdef12345678'),
-          named: 'headers',
+      verify(
+        mockClient.get(
+          tProfileCheck,
+          headers: argThat(
+            predicate(
+              (headers) =>
+                  headers is Map<String, String> &&
+                  headers['authorization'] == 'Token 1234567890abcdef1234567890abcdef12345678',
+            ),
+            named: 'headers',
+          ),
         ),
-      ));
-      verifyNever(mockClient.post(
-        any,
-        headers: anyNamed('headers'),
-        body: anyNamed('body'),
-      ));
+      );
+      verifyNever(
+        mockClient.post(
+          any,
+          headers: anyNamed('headers'),
+          body: anyNamed('body'),
+        ),
+      );
     });
 
     testWidgets('Login - with API token - wrong key', (WidgetTester tester) async {
@@ -228,8 +245,9 @@ void main() {
       final response = {
         'detail': ['Invalid token'],
       };
-      when(mockClient.get(tProfileCheck, headers: anyNamed('headers')))
-          .thenAnswer((_) => Future(() => Response(json.encode(response), 400)));
+      when(
+        mockClient.get(tProfileCheck, headers: anyNamed('headers')),
+      ).thenAnswer((_) => Future(() => Response(json.encode(response), 400)));
       await tester.pumpWidget(getWidget());
 
       // Act
@@ -247,20 +265,26 @@ void main() {
       // Assert
       expect(find.textContaining('Detail'), findsOne);
       expect(find.textContaining('Invalid token'), findsOne);
-      verify(mockClient.get(
-        tProfileCheck,
-        headers: argThat(
-          predicate((headers) =>
-              headers is Map<String, String> &&
-              headers['authorization'] == 'Token 31e2ea0322c07b9df583a9b6d1e794f7139e78d4'),
-          named: 'headers',
+      verify(
+        mockClient.get(
+          tProfileCheck,
+          headers: argThat(
+            predicate(
+              (headers) =>
+                  headers is Map<String, String> &&
+                  headers['authorization'] == 'Token 31e2ea0322c07b9df583a9b6d1e794f7139e78d4',
+            ),
+            named: 'headers',
+          ),
         ),
-      ));
-      verifyNever(mockClient.post(
-        any,
-        headers: anyNamed('headers'),
-        body: anyNamed('body'),
-      ));
+      );
+      verifyNever(
+        mockClient.post(
+          any,
+          headers: anyNamed('headers'),
+          body: anyNamed('body'),
+        ),
+      );
     });
   });
 
@@ -309,11 +333,13 @@ void main() {
 
       // Assert
       expect(find.textContaining('An Error Occurred'), findsNothing);
-      verify(mockClient.post(
-        tRegistration,
-        headers: anyNamed('headers'),
-        body: json.encode({'username': 'testuser', 'password': '123456789'}),
-      ));
+      verify(
+        mockClient.post(
+          tRegistration,
+          headers: anyNamed('headers'),
+          body: json.encode({'username': 'testuser', 'password': '123456789'}),
+        ),
+      );
     });
 
     testWidgets('Registration - password problems', (WidgetTester tester) async {
@@ -328,11 +354,13 @@ void main() {
         ],
       };
 
-      when(mockClient.post(
-        tRegistration,
-        headers: anyNamed('headers'),
-        body: anyNamed('body'),
-      )).thenAnswer((_) => Future(() => Response(json.encode(response), 400)));
+      when(
+        mockClient.post(
+          tRegistration,
+          headers: anyNamed('headers'),
+          body: anyNamed('body'),
+        ),
+      ).thenAnswer((_) => Future(() => Response(json.encode(response), 400)));
       await tester.pumpWidget(getWidget());
 
       // Act
@@ -348,11 +376,13 @@ void main() {
       expect(find.textContaining('This password is entirely numeric'), findsOne);
       expect(find.textContaining('This field must be unique'), findsOne);
 
-      verify(mockClient.post(
-        tRegistration,
-        headers: anyNamed('headers'),
-        body: json.encode({'username': 'testuser', 'password': '123456789'}),
-      ));
+      verify(
+        mockClient.post(
+          tRegistration,
+          headers: anyNamed('headers'),
+          body: json.encode({'username': 'testuser', 'password': '123456789'}),
+        ),
+      );
     });
   });
 }
diff --git a/test/auth/auth_screen_test.mocks.dart b/test/auth/auth_screen_test.mocks.dart
index 3d3e2163..f0e0a5ab 100644
--- a/test/auth/auth_screen_test.mocks.dart
+++ b/test/auth/auth_screen_test.mocks.dart
@@ -31,9 +31,9 @@ class _FakeResponse_0 extends _i1.SmartFake implements _i2.Response {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeStreamedResponse_1 extends _i1.SmartFake implements _i2.StreamedResponse {
@@ -41,9 +41,9 @@ class _FakeStreamedResponse_1 extends _i1.SmartFake implements _i2.StreamedRespo
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 /// A class which mocks [Client].
@@ -60,20 +60,23 @@ class MockClient extends _i1.Mock implements _i2.Client {
     Map<String, String>? headers,
   }) =>
       (super.noSuchMethod(
-        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>);
+            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
   _i3.Future<_i2.Response> get(
@@ -81,20 +84,23 @@ class MockClient extends _i1.Mock implements _i2.Client {
     Map<String, String>? headers,
   }) =>
       (super.noSuchMethod(
-        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>);
+            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
   _i3.Future<_i2.Response> post(
@@ -104,28 +110,31 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i4.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        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>);
+            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
   _i3.Future<_i2.Response> put(
@@ -135,28 +144,31 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i4.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        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>);
+            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
   _i3.Future<_i2.Response> patch(
@@ -166,28 +178,31 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _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>);
+            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
   _i3.Future<_i2.Response> delete(
@@ -197,28 +212,31 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _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>);
+            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
   _i3.Future<String> read(
@@ -226,20 +244,23 @@ class MockClient extends _i1.Mock implements _i2.Client {
     Map<String, String>? headers,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #read,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i3.Future<String>.value(_i5.dummyValue<String>(
-          this,
-          Invocation.method(
-            #read,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i3.Future<String>);
+            Invocation.method(
+              #read,
+              [url],
+              {#headers: headers},
+            ),
+            returnValue: _i3.Future<String>.value(
+              _i5.dummyValue<String>(
+                this,
+                Invocation.method(
+                  #read,
+                  [url],
+                  {#headers: headers},
+                ),
+              ),
+            ),
+          )
+          as _i3.Future<String>);
 
   @override
   _i3.Future<_i6.Uint8List> readBytes(
@@ -247,35 +268,40 @@ class MockClient extends _i1.Mock implements _i2.Client {
     Map<String, String>? headers,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #readBytes,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i3.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
-      ) as _i3.Future<_i6.Uint8List>);
+            Invocation.method(
+              #readBytes,
+              [url],
+              {#headers: headers},
+            ),
+            returnValue: _i3.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
+          )
+          as _i3.Future<_i6.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>);
+  _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,
-      );
+    Invocation.method(
+      #close,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 }
diff --git a/test/core/settings_test.mocks.dart b/test/core/settings_test.mocks.dart
index 5f661123..529f3de0 100644
--- a/test/core/settings_test.mocks.dart
+++ b/test/core/settings_test.mocks.dart
@@ -48,9 +48,9 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvi
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeExerciseDatabase_1 extends _i1.SmartFake implements _i3.ExerciseDatabase {
@@ -58,9 +58,9 @@ class _FakeExerciseDatabase_1 extends _i1.SmartFake implements _i3.ExerciseDatab
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeExercise_2 extends _i1.SmartFake implements _i4.Exercise {
@@ -68,9 +68,9 @@ class _FakeExercise_2 extends _i1.SmartFake implements _i4.Exercise {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeExerciseCategory_3 extends _i1.SmartFake implements _i5.ExerciseCategory {
@@ -78,9 +78,9 @@ class _FakeExerciseCategory_3 extends _i1.SmartFake implements _i5.ExerciseCateg
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeEquipment_4 extends _i1.SmartFake implements _i6.Equipment {
@@ -88,9 +88,9 @@ class _FakeEquipment_4 extends _i1.SmartFake implements _i6.Equipment {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeMuscle_5 extends _i1.SmartFake implements _i7.Muscle {
@@ -98,9 +98,9 @@ class _FakeMuscle_5 extends _i1.SmartFake implements _i7.Muscle {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeLanguage_6 extends _i1.SmartFake implements _i8.Language {
@@ -108,9 +108,9 @@ class _FakeLanguage_6 extends _i1.SmartFake implements _i8.Language {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeIngredientDatabase_7 extends _i1.SmartFake implements _i9.IngredientDatabase {
@@ -118,9 +118,9 @@ class _FakeIngredientDatabase_7 extends _i1.SmartFake implements _i9.IngredientD
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeNutritionalPlan_8 extends _i1.SmartFake implements _i10.NutritionalPlan {
@@ -128,9 +128,9 @@ class _FakeNutritionalPlan_8 extends _i1.SmartFake implements _i10.NutritionalPl
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeMeal_9 extends _i1.SmartFake implements _i11.Meal {
@@ -138,9 +138,9 @@ class _FakeMeal_9 extends _i1.SmartFake implements _i11.Meal {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeMealItem_10 extends _i1.SmartFake implements _i12.MealItem {
@@ -148,9 +148,9 @@ class _FakeMealItem_10 extends _i1.SmartFake implements _i12.MealItem {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeIngredient_11 extends _i1.SmartFake implements _i13.Ingredient {
@@ -158,9 +158,9 @@ class _FakeIngredient_11 extends _i1.SmartFake implements _i13.Ingredient {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeSharedPreferencesAsync_12 extends _i1.SmartFake implements _i14.SharedPreferencesAsync {
@@ -168,9 +168,9 @@ class _FakeSharedPreferencesAsync_12 extends _i1.SmartFake implements _i14.Share
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeAuthProvider_13 extends _i1.SmartFake implements _i15.AuthProvider {
@@ -178,9 +178,9 @@ class _FakeAuthProvider_13 extends _i1.SmartFake implements _i15.AuthProvider {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeClient_14 extends _i1.SmartFake implements _i16.Client {
@@ -188,9 +188,9 @@ class _FakeClient_14 extends _i1.SmartFake implements _i16.Client {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeUri_15 extends _i1.SmartFake implements Uri {
@@ -198,9 +198,9 @@ class _FakeUri_15 extends _i1.SmartFake implements Uri {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeResponse_16 extends _i1.SmartFake implements _i16.Response {
@@ -208,9 +208,9 @@ class _FakeResponse_16 extends _i1.SmartFake implements _i16.Response {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 /// A class which mocks [ExercisesProvider].
@@ -222,159 +222,185 @@ class MockExercisesProvider extends _i1.Mock implements _i17.ExercisesProvider {
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  _i3.ExerciseDatabase get database => (super.noSuchMethod(
-        Invocation.getter(#database),
-        returnValue: _FakeExerciseDatabase_1(
-          this,
-          Invocation.getter(#database),
-        ),
-      ) as _i3.ExerciseDatabase);
+  _i3.ExerciseDatabase get database =>
+      (super.noSuchMethod(
+            Invocation.getter(#database),
+            returnValue: _FakeExerciseDatabase_1(
+              this,
+              Invocation.getter(#database),
+            ),
+          )
+          as _i3.ExerciseDatabase);
 
   @override
-  List<_i4.Exercise> get exercises => (super.noSuchMethod(
-        Invocation.getter(#exercises),
-        returnValue: <_i4.Exercise>[],
-      ) as List<_i4.Exercise>);
+  List<_i4.Exercise> get exercises =>
+      (super.noSuchMethod(
+            Invocation.getter(#exercises),
+            returnValue: <_i4.Exercise>[],
+          )
+          as List<_i4.Exercise>);
 
   @override
-  List<_i4.Exercise> get filteredExercises => (super.noSuchMethod(
-        Invocation.getter(#filteredExercises),
-        returnValue: <_i4.Exercise>[],
-      ) as List<_i4.Exercise>);
+  List<_i4.Exercise> get filteredExercises =>
+      (super.noSuchMethod(
+            Invocation.getter(#filteredExercises),
+            returnValue: <_i4.Exercise>[],
+          )
+          as List<_i4.Exercise>);
 
   @override
-  Map<int, List<_i4.Exercise>> get exerciseByVariation => (super.noSuchMethod(
-        Invocation.getter(#exerciseByVariation),
-        returnValue: <int, List<_i4.Exercise>>{},
-      ) as Map<int, List<_i4.Exercise>>);
+  Map<int, List<_i4.Exercise>> get exerciseByVariation =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseByVariation),
+            returnValue: <int, List<_i4.Exercise>>{},
+          )
+          as Map<int, List<_i4.Exercise>>);
 
   @override
-  List<_i5.ExerciseCategory> get categories => (super.noSuchMethod(
-        Invocation.getter(#categories),
-        returnValue: <_i5.ExerciseCategory>[],
-      ) as List<_i5.ExerciseCategory>);
+  List<_i5.ExerciseCategory> get categories =>
+      (super.noSuchMethod(
+            Invocation.getter(#categories),
+            returnValue: <_i5.ExerciseCategory>[],
+          )
+          as List<_i5.ExerciseCategory>);
 
   @override
-  List<_i7.Muscle> get muscles => (super.noSuchMethod(
-        Invocation.getter(#muscles),
-        returnValue: <_i7.Muscle>[],
-      ) as List<_i7.Muscle>);
+  List<_i7.Muscle> get muscles =>
+      (super.noSuchMethod(
+            Invocation.getter(#muscles),
+            returnValue: <_i7.Muscle>[],
+          )
+          as List<_i7.Muscle>);
 
   @override
-  List<_i6.Equipment> get equipment => (super.noSuchMethod(
-        Invocation.getter(#equipment),
-        returnValue: <_i6.Equipment>[],
-      ) as List<_i6.Equipment>);
+  List<_i6.Equipment> get equipment =>
+      (super.noSuchMethod(
+            Invocation.getter(#equipment),
+            returnValue: <_i6.Equipment>[],
+          )
+          as List<_i6.Equipment>);
 
   @override
-  List<_i8.Language> get languages => (super.noSuchMethod(
-        Invocation.getter(#languages),
-        returnValue: <_i8.Language>[],
-      ) as List<_i8.Language>);
+  List<_i8.Language> get languages =>
+      (super.noSuchMethod(
+            Invocation.getter(#languages),
+            returnValue: <_i8.Language>[],
+          )
+          as List<_i8.Language>);
 
   @override
   set database(_i3.ExerciseDatabase? value) => super.noSuchMethod(
-        Invocation.setter(
-          #database,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #database,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set exercises(List<_i4.Exercise>? value) => super.noSuchMethod(
-        Invocation.setter(
-          #exercises,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #exercises,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set filteredExercises(List<_i4.Exercise>? newFilteredExercises) => super.noSuchMethod(
-        Invocation.setter(
-          #filteredExercises,
-          newFilteredExercises,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #filteredExercises,
+      newFilteredExercises,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set languages(List<_i8.Language>? languages) => super.noSuchMethod(
-        Invocation.setter(
-          #languages,
-          languages,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #languages,
+      languages,
+    ),
+    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
-  _i18.Future<void> setFilters(_i17.Filters? newFilters) => (super.noSuchMethod(
-        Invocation.method(
-          #setFilters,
-          [newFilters],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> setFilters(_i17.Filters? newFilters) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setFilters,
+              [newFilters],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
   void initFilters() => super.noSuchMethod(
-        Invocation.method(
-          #initFilters,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #initFilters,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i18.Future<void> findByFilters() => (super.noSuchMethod(
-        Invocation.method(
-          #findByFilters,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> findByFilters() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findByFilters,
+              [],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
   void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #clear,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i4.Exercise findExerciseById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findExerciseById,
-          [id],
-        ),
-        returnValue: _FakeExercise_2(
-          this,
-          Invocation.method(
-            #findExerciseById,
-            [id],
-          ),
-        ),
-      ) as _i4.Exercise);
+  _i4.Exercise findExerciseById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findExerciseById,
+              [id],
+            ),
+            returnValue: _FakeExercise_2(
+              this,
+              Invocation.method(
+                #findExerciseById,
+                [id],
+              ),
+            ),
+          )
+          as _i4.Exercise);
 
   @override
   List<_i4.Exercise> findExercisesByVariationId(
@@ -382,132 +408,153 @@ class MockExercisesProvider extends _i1.Mock implements _i17.ExercisesProvider {
     int? exerciseIdToExclude,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #findExercisesByVariationId,
-          [variationId],
-          {#exerciseIdToExclude: exerciseIdToExclude},
-        ),
-        returnValue: <_i4.Exercise>[],
-      ) as List<_i4.Exercise>);
+            Invocation.method(
+              #findExercisesByVariationId,
+              [variationId],
+              {#exerciseIdToExclude: exerciseIdToExclude},
+            ),
+            returnValue: <_i4.Exercise>[],
+          )
+          as List<_i4.Exercise>);
 
   @override
-  _i5.ExerciseCategory findCategoryById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findCategoryById,
-          [id],
-        ),
-        returnValue: _FakeExerciseCategory_3(
-          this,
-          Invocation.method(
-            #findCategoryById,
-            [id],
-          ),
-        ),
-      ) as _i5.ExerciseCategory);
+  _i5.ExerciseCategory findCategoryById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findCategoryById,
+              [id],
+            ),
+            returnValue: _FakeExerciseCategory_3(
+              this,
+              Invocation.method(
+                #findCategoryById,
+                [id],
+              ),
+            ),
+          )
+          as _i5.ExerciseCategory);
 
   @override
-  _i6.Equipment findEquipmentById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findEquipmentById,
-          [id],
-        ),
-        returnValue: _FakeEquipment_4(
-          this,
-          Invocation.method(
-            #findEquipmentById,
-            [id],
-          ),
-        ),
-      ) as _i6.Equipment);
+  _i6.Equipment findEquipmentById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findEquipmentById,
+              [id],
+            ),
+            returnValue: _FakeEquipment_4(
+              this,
+              Invocation.method(
+                #findEquipmentById,
+                [id],
+              ),
+            ),
+          )
+          as _i6.Equipment);
 
   @override
-  _i7.Muscle findMuscleById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findMuscleById,
-          [id],
-        ),
-        returnValue: _FakeMuscle_5(
-          this,
-          Invocation.method(
-            #findMuscleById,
-            [id],
-          ),
-        ),
-      ) as _i7.Muscle);
+  _i7.Muscle findMuscleById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findMuscleById,
+              [id],
+            ),
+            returnValue: _FakeMuscle_5(
+              this,
+              Invocation.method(
+                #findMuscleById,
+                [id],
+              ),
+            ),
+          )
+          as _i7.Muscle);
 
   @override
-  _i8.Language findLanguageById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findLanguageById,
-          [id],
-        ),
-        returnValue: _FakeLanguage_6(
-          this,
-          Invocation.method(
-            #findLanguageById,
-            [id],
-          ),
-        ),
-      ) as _i8.Language);
+  _i8.Language findLanguageById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findLanguageById,
+              [id],
+            ),
+            returnValue: _FakeLanguage_6(
+              this,
+              Invocation.method(
+                #findLanguageById,
+                [id],
+              ),
+            ),
+          )
+          as _i8.Language);
 
   @override
-  _i18.Future<void> fetchAndSetCategoriesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetCategoriesFromApi,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> fetchAndSetCategoriesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetCategoriesFromApi,
+              [],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> fetchAndSetMusclesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetMusclesFromApi,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> fetchAndSetMusclesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetMusclesFromApi,
+              [],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> fetchAndSetEquipmentsFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEquipmentsFromApi,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> fetchAndSetEquipmentsFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetEquipmentsFromApi,
+              [],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> fetchAndSetLanguagesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLanguagesFromApi,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> fetchAndSetLanguagesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetLanguagesFromApi,
+              [],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> fetchAndSetAllExercises() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllExercises,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> fetchAndSetAllExercises() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetAllExercises,
+              [],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<_i4.Exercise?> fetchAndSetExercise(int? exerciseId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetExercise,
-          [exerciseId],
-        ),
-        returnValue: _i18.Future<_i4.Exercise?>.value(),
-      ) as _i18.Future<_i4.Exercise?>);
+  _i18.Future<_i4.Exercise?> fetchAndSetExercise(int? exerciseId) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetExercise,
+              [exerciseId],
+            ),
+            returnValue: _i18.Future<_i4.Exercise?>.value(),
+          )
+          as _i18.Future<_i4.Exercise?>);
 
   @override
   _i18.Future<_i4.Exercise> handleUpdateExerciseFromApi(
@@ -515,55 +562,64 @@ class MockExercisesProvider extends _i1.Mock implements _i17.ExercisesProvider {
     int? exerciseId,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #handleUpdateExerciseFromApi,
-          [
-            database,
-            exerciseId,
-          ],
-        ),
-        returnValue: _i18.Future<_i4.Exercise>.value(_FakeExercise_2(
-          this,
-          Invocation.method(
-            #handleUpdateExerciseFromApi,
-            [
-              database,
-              exerciseId,
-            ],
-          ),
-        )),
-      ) as _i18.Future<_i4.Exercise>);
+            Invocation.method(
+              #handleUpdateExerciseFromApi,
+              [
+                database,
+                exerciseId,
+              ],
+            ),
+            returnValue: _i18.Future<_i4.Exercise>.value(
+              _FakeExercise_2(
+                this,
+                Invocation.method(
+                  #handleUpdateExerciseFromApi,
+                  [
+                    database,
+                    exerciseId,
+                  ],
+                ),
+              ),
+            ),
+          )
+          as _i18.Future<_i4.Exercise>);
 
   @override
-  _i18.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) => (super.noSuchMethod(
-        Invocation.method(
-          #initCacheTimesLocalPrefs,
-          [],
-          {#forceInit: forceInit},
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #initCacheTimesLocalPrefs,
+              [],
+              {#forceInit: forceInit},
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> clearAllCachesAndPrefs() => (super.noSuchMethod(
-        Invocation.method(
-          #clearAllCachesAndPrefs,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> clearAllCachesAndPrefs() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #clearAllCachesAndPrefs,
+              [],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> fetchAndSetInitialData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetInitialData,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> fetchAndSetInitialData() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetInitialData,
+              [],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
   _i18.Future<void> setExercisesFromDatabase(
@@ -571,64 +627,75 @@ class MockExercisesProvider extends _i1.Mock implements _i17.ExercisesProvider {
     bool? forceDeleteCache = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesFromDatabase,
-          [database],
-          {#forceDeleteCache: forceDeleteCache},
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+            Invocation.method(
+              #setExercisesFromDatabase,
+              [database],
+              {#forceDeleteCache: forceDeleteCache},
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> updateExerciseCache(_i3.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #updateExerciseCache,
-          [database],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> updateExerciseCache(_i3.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #updateExerciseCache,
+              [database],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> fetchAndSetMuscles(_i3.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetMuscles,
-          [database],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> fetchAndSetMuscles(_i3.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetMuscles,
+              [database],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> fetchAndSetCategories(_i3.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetCategories,
-          [database],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> fetchAndSetCategories(_i3.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetCategories,
+              [database],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> fetchAndSetLanguages(_i3.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLanguages,
-          [database],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> fetchAndSetLanguages(_i3.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetLanguages,
+              [database],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> fetchAndSetEquipments(_i3.ExerciseDatabase? database) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEquipments,
-          [database],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> fetchAndSetEquipments(_i3.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetEquipments,
+              [database],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
   _i18.Future<List<_i4.Exercise>> searchExercise(
@@ -637,52 +704,53 @@ class MockExercisesProvider extends _i1.Mock implements _i17.ExercisesProvider {
     bool? searchEnglish = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #searchExercise,
-          [name],
-          {
-            #languageCode: languageCode,
-            #searchEnglish: searchEnglish,
-          },
-        ),
-        returnValue: _i18.Future<List<_i4.Exercise>>.value(<_i4.Exercise>[]),
-      ) as _i18.Future<List<_i4.Exercise>>);
+            Invocation.method(
+              #searchExercise,
+              [name],
+              {
+                #languageCode: languageCode,
+                #searchEnglish: searchEnglish,
+              },
+            ),
+            returnValue: _i18.Future<List<_i4.Exercise>>.value(<_i4.Exercise>[]),
+          )
+          as _i18.Future<List<_i4.Exercise>>);
 
   @override
   void addListener(_i19.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #addListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i19.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #removeListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #dispose,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #notifyListeners,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 }
 
 /// A class which mocks [NutritionPlansProvider].
@@ -694,173 +762,209 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i20.NutritionPlans
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  _i9.IngredientDatabase get database => (super.noSuchMethod(
-        Invocation.getter(#database),
-        returnValue: _FakeIngredientDatabase_7(
-          this,
-          Invocation.getter(#database),
-        ),
-      ) as _i9.IngredientDatabase);
+  _i9.IngredientDatabase get database =>
+      (super.noSuchMethod(
+            Invocation.getter(#database),
+            returnValue: _FakeIngredientDatabase_7(
+              this,
+              Invocation.getter(#database),
+            ),
+          )
+          as _i9.IngredientDatabase);
 
   @override
-  List<_i13.Ingredient> get ingredients => (super.noSuchMethod(
-        Invocation.getter(#ingredients),
-        returnValue: <_i13.Ingredient>[],
-      ) as List<_i13.Ingredient>);
+  List<_i13.Ingredient> get ingredients =>
+      (super.noSuchMethod(
+            Invocation.getter(#ingredients),
+            returnValue: <_i13.Ingredient>[],
+          )
+          as List<_i13.Ingredient>);
 
   @override
-  List<_i10.NutritionalPlan> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i10.NutritionalPlan>[],
-      ) as List<_i10.NutritionalPlan>);
+  List<_i10.NutritionalPlan> get items =>
+      (super.noSuchMethod(
+            Invocation.getter(#items),
+            returnValue: <_i10.NutritionalPlan>[],
+          )
+          as List<_i10.NutritionalPlan>);
 
   @override
   set database(_i9.IngredientDatabase? value) => super.noSuchMethod(
-        Invocation.setter(
-          #database,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #database,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set ingredients(List<_i13.Ingredient>? value) => super.noSuchMethod(
-        Invocation.setter(
-          #ingredients,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #ingredients,
+      value,
+    ),
+    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,
-      );
+    Invocation.method(
+      #clear,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i10.NutritionalPlan findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeNutritionalPlan_8(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i10.NutritionalPlan);
+  _i10.NutritionalPlan findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findById,
+              [id],
+            ),
+            returnValue: _FakeNutritionalPlan_8(
+              this,
+              Invocation.method(
+                #findById,
+                [id],
+              ),
+            ),
+          )
+          as _i10.NutritionalPlan);
 
   @override
-  _i11.Meal? findMealById(int? id) => (super.noSuchMethod(Invocation.method(
-        #findMealById,
-        [id],
-      )) as _i11.Meal?);
+  _i11.Meal? findMealById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findMealById,
+              [id],
+            ),
+          )
+          as _i11.Meal?);
 
   @override
-  _i18.Future<void> fetchAndSetAllPlansSparse() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllPlansSparse,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> fetchAndSetAllPlansSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetAllPlansSparse,
+              [],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> fetchAndSetAllPlansFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllPlansFull,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> fetchAndSetAllPlansFull() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetAllPlansFull,
+              [],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<_i10.NutritionalPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetPlanSparse,
-          [planId],
-        ),
-        returnValue: _i18.Future<_i10.NutritionalPlan>.value(_FakeNutritionalPlan_8(
-          this,
-          Invocation.method(
-            #fetchAndSetPlanSparse,
-            [planId],
-          ),
-        )),
-      ) as _i18.Future<_i10.NutritionalPlan>);
+  _i18.Future<_i10.NutritionalPlan> fetchAndSetPlanSparse(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetPlanSparse,
+              [planId],
+            ),
+            returnValue: _i18.Future<_i10.NutritionalPlan>.value(
+              _FakeNutritionalPlan_8(
+                this,
+                Invocation.method(
+                  #fetchAndSetPlanSparse,
+                  [planId],
+                ),
+              ),
+            ),
+          )
+          as _i18.Future<_i10.NutritionalPlan>);
 
   @override
-  _i18.Future<_i10.NutritionalPlan> fetchAndSetPlanFull(int? planId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetPlanFull,
-          [planId],
-        ),
-        returnValue: _i18.Future<_i10.NutritionalPlan>.value(_FakeNutritionalPlan_8(
-          this,
-          Invocation.method(
-            #fetchAndSetPlanFull,
-            [planId],
-          ),
-        )),
-      ) as _i18.Future<_i10.NutritionalPlan>);
+  _i18.Future<_i10.NutritionalPlan> fetchAndSetPlanFull(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetPlanFull,
+              [planId],
+            ),
+            returnValue: _i18.Future<_i10.NutritionalPlan>.value(
+              _FakeNutritionalPlan_8(
+                this,
+                Invocation.method(
+                  #fetchAndSetPlanFull,
+                  [planId],
+                ),
+              ),
+            ),
+          )
+          as _i18.Future<_i10.NutritionalPlan>);
 
   @override
-  _i18.Future<_i10.NutritionalPlan> addPlan(_i10.NutritionalPlan? planData) => (super.noSuchMethod(
-        Invocation.method(
-          #addPlan,
-          [planData],
-        ),
-        returnValue: _i18.Future<_i10.NutritionalPlan>.value(_FakeNutritionalPlan_8(
-          this,
-          Invocation.method(
-            #addPlan,
-            [planData],
-          ),
-        )),
-      ) as _i18.Future<_i10.NutritionalPlan>);
+  _i18.Future<_i10.NutritionalPlan> addPlan(_i10.NutritionalPlan? planData) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #addPlan,
+              [planData],
+            ),
+            returnValue: _i18.Future<_i10.NutritionalPlan>.value(
+              _FakeNutritionalPlan_8(
+                this,
+                Invocation.method(
+                  #addPlan,
+                  [planData],
+                ),
+              ),
+            ),
+          )
+          as _i18.Future<_i10.NutritionalPlan>);
 
   @override
-  _i18.Future<void> editPlan(_i10.NutritionalPlan? plan) => (super.noSuchMethod(
-        Invocation.method(
-          #editPlan,
-          [plan],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> editPlan(_i10.NutritionalPlan? plan) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #editPlan,
+              [plan],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> deletePlan(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deletePlan,
-          [id],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> deletePlan(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #deletePlan,
+              [id],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
   _i18.Future<_i11.Meal> addMeal(
@@ -868,49 +972,58 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i20.NutritionPlans
     int? planId,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addMeal,
-          [
-            meal,
-            planId,
-          ],
-        ),
-        returnValue: _i18.Future<_i11.Meal>.value(_FakeMeal_9(
-          this,
-          Invocation.method(
-            #addMeal,
-            [
-              meal,
-              planId,
-            ],
-          ),
-        )),
-      ) as _i18.Future<_i11.Meal>);
+            Invocation.method(
+              #addMeal,
+              [
+                meal,
+                planId,
+              ],
+            ),
+            returnValue: _i18.Future<_i11.Meal>.value(
+              _FakeMeal_9(
+                this,
+                Invocation.method(
+                  #addMeal,
+                  [
+                    meal,
+                    planId,
+                  ],
+                ),
+              ),
+            ),
+          )
+          as _i18.Future<_i11.Meal>);
 
   @override
-  _i18.Future<_i11.Meal> editMeal(_i11.Meal? meal) => (super.noSuchMethod(
-        Invocation.method(
-          #editMeal,
-          [meal],
-        ),
-        returnValue: _i18.Future<_i11.Meal>.value(_FakeMeal_9(
-          this,
-          Invocation.method(
-            #editMeal,
-            [meal],
-          ),
-        )),
-      ) as _i18.Future<_i11.Meal>);
+  _i18.Future<_i11.Meal> editMeal(_i11.Meal? meal) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #editMeal,
+              [meal],
+            ),
+            returnValue: _i18.Future<_i11.Meal>.value(
+              _FakeMeal_9(
+                this,
+                Invocation.method(
+                  #editMeal,
+                  [meal],
+                ),
+              ),
+            ),
+          )
+          as _i18.Future<_i11.Meal>);
 
   @override
-  _i18.Future<void> deleteMeal(_i11.Meal? meal) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteMeal,
-          [meal],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> deleteMeal(_i11.Meal? meal) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #deleteMeal,
+              [meal],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
   _i18.Future<_i12.MealItem> addMealItem(
@@ -918,44 +1031,51 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i20.NutritionPlans
     _i11.Meal? meal,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addMealItem,
-          [
-            mealItem,
-            meal,
-          ],
-        ),
-        returnValue: _i18.Future<_i12.MealItem>.value(_FakeMealItem_10(
-          this,
-          Invocation.method(
-            #addMealItem,
-            [
-              mealItem,
-              meal,
-            ],
-          ),
-        )),
-      ) as _i18.Future<_i12.MealItem>);
+            Invocation.method(
+              #addMealItem,
+              [
+                mealItem,
+                meal,
+              ],
+            ),
+            returnValue: _i18.Future<_i12.MealItem>.value(
+              _FakeMealItem_10(
+                this,
+                Invocation.method(
+                  #addMealItem,
+                  [
+                    mealItem,
+                    meal,
+                  ],
+                ),
+              ),
+            ),
+          )
+          as _i18.Future<_i12.MealItem>);
 
   @override
-  _i18.Future<void> deleteMealItem(_i12.MealItem? mealItem) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteMealItem,
-          [mealItem],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> deleteMealItem(_i12.MealItem? mealItem) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #deleteMealItem,
+              [mealItem],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> clearIngredientCache() => (super.noSuchMethod(
-        Invocation.method(
-          #clearIngredientCache,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> clearIngredientCache() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #clearIngredientCache,
+              [],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
   _i18.Future<_i13.Ingredient> fetchIngredient(
@@ -963,30 +1083,35 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i20.NutritionPlans
     _i9.IngredientDatabase? database,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #fetchIngredient,
-          [ingredientId],
-          {#database: database},
-        ),
-        returnValue: _i18.Future<_i13.Ingredient>.value(_FakeIngredient_11(
-          this,
-          Invocation.method(
-            #fetchIngredient,
-            [ingredientId],
-            {#database: database},
-          ),
-        )),
-      ) as _i18.Future<_i13.Ingredient>);
+            Invocation.method(
+              #fetchIngredient,
+              [ingredientId],
+              {#database: database},
+            ),
+            returnValue: _i18.Future<_i13.Ingredient>.value(
+              _FakeIngredient_11(
+                this,
+                Invocation.method(
+                  #fetchIngredient,
+                  [ingredientId],
+                  {#database: database},
+                ),
+              ),
+            ),
+          )
+          as _i18.Future<_i13.Ingredient>);
 
   @override
-  _i18.Future<void> fetchIngredientsFromCache() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchIngredientsFromCache,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> fetchIngredientsFromCache() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchIngredientsFromCache,
+              [],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
   _i18.Future<List<_i13.Ingredient>> searchIngredient(
@@ -995,25 +1120,28 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i20.NutritionPlans
     bool? searchEnglish = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #searchIngredient,
-          [name],
-          {
-            #languageCode: languageCode,
-            #searchEnglish: searchEnglish,
-          },
-        ),
-        returnValue: _i18.Future<List<_i13.Ingredient>>.value(<_i13.Ingredient>[]),
-      ) as _i18.Future<List<_i13.Ingredient>>);
+            Invocation.method(
+              #searchIngredient,
+              [name],
+              {
+                #languageCode: languageCode,
+                #searchEnglish: searchEnglish,
+              },
+            ),
+            returnValue: _i18.Future<List<_i13.Ingredient>>.value(<_i13.Ingredient>[]),
+          )
+          as _i18.Future<List<_i13.Ingredient>>);
 
   @override
-  _i18.Future<_i13.Ingredient?> searchIngredientWithBarcode(String? barcode) => (super.noSuchMethod(
-        Invocation.method(
-          #searchIngredientWithBarcode,
-          [barcode],
-        ),
-        returnValue: _i18.Future<_i13.Ingredient?>.value(),
-      ) as _i18.Future<_i13.Ingredient?>);
+  _i18.Future<_i13.Ingredient?> searchIngredientWithBarcode(String? barcode) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #searchIngredientWithBarcode,
+              [barcode],
+            ),
+            returnValue: _i18.Future<_i13.Ingredient?>.value(),
+          )
+          as _i18.Future<_i13.Ingredient?>);
 
   @override
   _i18.Future<void> logMealToDiary(
@@ -1021,16 +1149,17 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i20.NutritionPlans
     DateTime? mealDateTime,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #logMealToDiary,
-          [
-            meal,
-            mealDateTime,
-          ],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+            Invocation.method(
+              #logMealToDiary,
+              [
+                meal,
+                mealDateTime,
+              ],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
   _i18.Future<void> logIngredientToDiary(
@@ -1039,17 +1168,18 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i20.NutritionPlans
     DateTime? dateTime,
   ]) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #logIngredientToDiary,
-          [
-            mealItem,
-            planId,
-            dateTime,
-          ],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+            Invocation.method(
+              #logIngredientToDiary,
+              [
+                mealItem,
+                planId,
+                dateTime,
+              ],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
   _i18.Future<void> deleteLog(
@@ -1057,62 +1187,65 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i20.NutritionPlans
     int? planId,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [
-            logId,
-            planId,
-          ],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+            Invocation.method(
+              #deleteLog,
+              [
+                logId,
+                planId,
+              ],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> fetchAndSetLogs(_i10.NutritionalPlan? plan) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLogs,
-          [plan],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> fetchAndSetLogs(_i10.NutritionalPlan? plan) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetLogs,
+              [plan],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
   void addListener(_i19.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #addListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i19.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #removeListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #dispose,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #notifyListeners,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 }
 
 /// A class which mocks [UserProvider].
@@ -1124,145 +1257,159 @@ class MockUserProvider extends _i1.Mock implements _i21.UserProvider {
   }
 
   @override
-  _i22.ThemeMode get themeMode => (super.noSuchMethod(
-        Invocation.getter(#themeMode),
-        returnValue: _i22.ThemeMode.system,
-      ) as _i22.ThemeMode);
+  _i22.ThemeMode get themeMode =>
+      (super.noSuchMethod(
+            Invocation.getter(#themeMode),
+            returnValue: _i22.ThemeMode.system,
+          )
+          as _i22.ThemeMode);
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  _i14.SharedPreferencesAsync get prefs => (super.noSuchMethod(
-        Invocation.getter(#prefs),
-        returnValue: _FakeSharedPreferencesAsync_12(
-          this,
-          Invocation.getter(#prefs),
-        ),
-      ) as _i14.SharedPreferencesAsync);
+  _i14.SharedPreferencesAsync get prefs =>
+      (super.noSuchMethod(
+            Invocation.getter(#prefs),
+            returnValue: _FakeSharedPreferencesAsync_12(
+              this,
+              Invocation.getter(#prefs),
+            ),
+          )
+          as _i14.SharedPreferencesAsync);
 
   @override
   set themeMode(_i22.ThemeMode? value) => super.noSuchMethod(
-        Invocation.setter(
-          #themeMode,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #themeMode,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set prefs(_i14.SharedPreferencesAsync? value) => super.noSuchMethod(
-        Invocation.setter(
-          #prefs,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #prefs,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set profile(_i23.Profile? value) => super.noSuchMethod(
-        Invocation.setter(
-          #profile,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #profile,
+      value,
+    ),
+    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,
-      );
+    Invocation.method(
+      #clear,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void setThemeMode(_i22.ThemeMode? mode) => super.noSuchMethod(
-        Invocation.method(
-          #setThemeMode,
-          [mode],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #setThemeMode,
+      [mode],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i18.Future<void> fetchAndSetProfile() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetProfile,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> fetchAndSetProfile() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetProfile,
+              [],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> saveProfile() => (super.noSuchMethod(
-        Invocation.method(
-          #saveProfile,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> saveProfile() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #saveProfile,
+              [],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> verifyEmail() => (super.noSuchMethod(
-        Invocation.method(
-          #verifyEmail,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> verifyEmail() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #verifyEmail,
+              [],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
   void addListener(_i19.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #addListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i19.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #removeListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #dispose,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #notifyListeners,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 }
 
 /// A class which mocks [WgerBaseProvider].
@@ -1274,50 +1421,56 @@ class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider {
   }
 
   @override
-  _i15.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_13(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i15.AuthProvider);
+  _i15.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_13(
+              this,
+              Invocation.getter(#auth),
+            ),
+          )
+          as _i15.AuthProvider);
 
   @override
-  _i16.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_14(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i16.Client);
+  _i16.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_14(
+              this,
+              Invocation.getter(#client),
+            ),
+          )
+          as _i16.Client);
 
   @override
   set auth(_i15.AuthProvider? value) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #auth,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set client(_i16.Client? value) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #client,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) => (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getDefaultHeaders,
+              [],
+              {#includeAuth: includeAuth},
+            ),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
 
   @override
   Uri makeUrl(
@@ -1327,46 +1480,51 @@ class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider {
     Map<String, dynamic>? query,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #makeUrl,
-          [path],
-          {
-            #id: id,
-            #objectMethod: objectMethod,
-            #query: query,
-          },
-        ),
-        returnValue: _FakeUri_15(
-          this,
-          Invocation.method(
-            #makeUrl,
-            [path],
-            {
-              #id: id,
-              #objectMethod: objectMethod,
-              #query: query,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {
+                #id: id,
+                #objectMethod: objectMethod,
+                #query: query,
+              },
+            ),
+            returnValue: _FakeUri_15(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {
+                  #id: id,
+                  #objectMethod: objectMethod,
+                  #query: query,
+                },
+              ),
+            ),
+          )
+          as Uri);
 
   @override
-  _i18.Future<dynamic> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue: _i18.Future<dynamic>.value(),
-      ) as _i18.Future<dynamic>);
+  _i18.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetch,
+              [uri],
+            ),
+            returnValue: _i18.Future<dynamic>.value(),
+          )
+          as _i18.Future<dynamic>);
 
   @override
-  _i18.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i18.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i18.Future<List<dynamic>>);
+  _i18.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchPaginated,
+              [uri],
+            ),
+            returnValue: _i18.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i18.Future<List<dynamic>>);
 
   @override
   _i18.Future<Map<String, dynamic>> post(
@@ -1374,15 +1532,16 @@ class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider {
     Uri? uri,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i18.Future<Map<String, dynamic>>);
+            Invocation.method(
+              #post,
+              [
+                data,
+                uri,
+              ],
+            ),
+            returnValue: _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i18.Future<Map<String, dynamic>>);
 
   @override
   _i18.Future<Map<String, dynamic>> patch(
@@ -1390,15 +1549,16 @@ class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider {
     Uri? uri,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i18.Future<Map<String, dynamic>>);
+            Invocation.method(
+              #patch,
+              [
+                data,
+                uri,
+              ],
+            ),
+            returnValue: _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i18.Future<Map<String, dynamic>>);
 
   @override
   _i18.Future<_i16.Response> deleteRequest(
@@ -1406,24 +1566,27 @@ class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider {
     int? id,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteRequest,
-          [
-            url,
-            id,
-          ],
-        ),
-        returnValue: _i18.Future<_i16.Response>.value(_FakeResponse_16(
-          this,
-          Invocation.method(
-            #deleteRequest,
-            [
-              url,
-              id,
-            ],
-          ),
-        )),
-      ) as _i18.Future<_i16.Response>);
+            Invocation.method(
+              #deleteRequest,
+              [
+                url,
+                id,
+              ],
+            ),
+            returnValue: _i18.Future<_i16.Response>.value(
+              _FakeResponse_16(
+                this,
+                Invocation.method(
+                  #deleteRequest,
+                  [
+                    url,
+                    id,
+                  ],
+                ),
+              ),
+            ),
+          )
+          as _i18.Future<_i16.Response>);
 }
 
 /// A class which mocks [SharedPreferencesAsync].
@@ -1436,78 +1599,94 @@ class MockSharedPreferencesAsync extends _i1.Mock implements _i14.SharedPreferen
   }
 
   @override
-  _i18.Future<Set<String>> getKeys({Set<String>? allowList}) => (super.noSuchMethod(
-        Invocation.method(
-          #getKeys,
-          [],
-          {#allowList: allowList},
-        ),
-        returnValue: _i18.Future<Set<String>>.value(<String>{}),
-      ) as _i18.Future<Set<String>>);
+  _i18.Future<Set<String>> getKeys({Set<String>? allowList}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getKeys,
+              [],
+              {#allowList: allowList},
+            ),
+            returnValue: _i18.Future<Set<String>>.value(<String>{}),
+          )
+          as _i18.Future<Set<String>>);
 
   @override
-  _i18.Future<Map<String, Object?>> getAll({Set<String>? allowList}) => (super.noSuchMethod(
-        Invocation.method(
-          #getAll,
-          [],
-          {#allowList: allowList},
-        ),
-        returnValue: _i18.Future<Map<String, Object?>>.value(<String, Object?>{}),
-      ) as _i18.Future<Map<String, Object?>>);
+  _i18.Future<Map<String, Object?>> getAll({Set<String>? allowList}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getAll,
+              [],
+              {#allowList: allowList},
+            ),
+            returnValue: _i18.Future<Map<String, Object?>>.value(<String, Object?>{}),
+          )
+          as _i18.Future<Map<String, Object?>>);
 
   @override
-  _i18.Future<bool?> getBool(String? key) => (super.noSuchMethod(
-        Invocation.method(
-          #getBool,
-          [key],
-        ),
-        returnValue: _i18.Future<bool?>.value(),
-      ) as _i18.Future<bool?>);
+  _i18.Future<bool?> getBool(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getBool,
+              [key],
+            ),
+            returnValue: _i18.Future<bool?>.value(),
+          )
+          as _i18.Future<bool?>);
 
   @override
-  _i18.Future<int?> getInt(String? key) => (super.noSuchMethod(
-        Invocation.method(
-          #getInt,
-          [key],
-        ),
-        returnValue: _i18.Future<int?>.value(),
-      ) as _i18.Future<int?>);
+  _i18.Future<int?> getInt(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getInt,
+              [key],
+            ),
+            returnValue: _i18.Future<int?>.value(),
+          )
+          as _i18.Future<int?>);
 
   @override
-  _i18.Future<double?> getDouble(String? key) => (super.noSuchMethod(
-        Invocation.method(
-          #getDouble,
-          [key],
-        ),
-        returnValue: _i18.Future<double?>.value(),
-      ) as _i18.Future<double?>);
+  _i18.Future<double?> getDouble(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getDouble,
+              [key],
+            ),
+            returnValue: _i18.Future<double?>.value(),
+          )
+          as _i18.Future<double?>);
 
   @override
-  _i18.Future<String?> getString(String? key) => (super.noSuchMethod(
-        Invocation.method(
-          #getString,
-          [key],
-        ),
-        returnValue: _i18.Future<String?>.value(),
-      ) as _i18.Future<String?>);
+  _i18.Future<String?> getString(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getString,
+              [key],
+            ),
+            returnValue: _i18.Future<String?>.value(),
+          )
+          as _i18.Future<String?>);
 
   @override
-  _i18.Future<List<String>?> getStringList(String? key) => (super.noSuchMethod(
-        Invocation.method(
-          #getStringList,
-          [key],
-        ),
-        returnValue: _i18.Future<List<String>?>.value(),
-      ) as _i18.Future<List<String>?>);
+  _i18.Future<List<String>?> getStringList(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getStringList,
+              [key],
+            ),
+            returnValue: _i18.Future<List<String>?>.value(),
+          )
+          as _i18.Future<List<String>?>);
 
   @override
-  _i18.Future<bool> containsKey(String? key) => (super.noSuchMethod(
-        Invocation.method(
-          #containsKey,
-          [key],
-        ),
-        returnValue: _i18.Future<bool>.value(false),
-      ) as _i18.Future<bool>);
+  _i18.Future<bool> containsKey(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #containsKey,
+              [key],
+            ),
+            returnValue: _i18.Future<bool>.value(false),
+          )
+          as _i18.Future<bool>);
 
   @override
   _i18.Future<void> setBool(
@@ -1515,16 +1694,17 @@ class MockSharedPreferencesAsync extends _i1.Mock implements _i14.SharedPreferen
     bool? value,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setBool,
-          [
-            key,
-            value,
-          ],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+            Invocation.method(
+              #setBool,
+              [
+                key,
+                value,
+              ],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
   _i18.Future<void> setInt(
@@ -1532,16 +1712,17 @@ class MockSharedPreferencesAsync extends _i1.Mock implements _i14.SharedPreferen
     int? value,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setInt,
-          [
-            key,
-            value,
-          ],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+            Invocation.method(
+              #setInt,
+              [
+                key,
+                value,
+              ],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
   _i18.Future<void> setDouble(
@@ -1549,16 +1730,17 @@ class MockSharedPreferencesAsync extends _i1.Mock implements _i14.SharedPreferen
     double? value,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setDouble,
-          [
-            key,
-            value,
-          ],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+            Invocation.method(
+              #setDouble,
+              [
+                key,
+                value,
+              ],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
   _i18.Future<void> setString(
@@ -1566,16 +1748,17 @@ class MockSharedPreferencesAsync extends _i1.Mock implements _i14.SharedPreferen
     String? value,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setString,
-          [
-            key,
-            value,
-          ],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+            Invocation.method(
+              #setString,
+              [
+                key,
+                value,
+              ],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
   _i18.Future<void> setStringList(
@@ -1583,35 +1766,40 @@ class MockSharedPreferencesAsync extends _i1.Mock implements _i14.SharedPreferen
     List<String>? value,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setStringList,
-          [
-            key,
-            value,
-          ],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+            Invocation.method(
+              #setStringList,
+              [
+                key,
+                value,
+              ],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> remove(String? key) => (super.noSuchMethod(
-        Invocation.method(
-          #remove,
-          [key],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> remove(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #remove,
+              [key],
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i18.Future<void> clear({Set<String>? allowList}) => (super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-          {#allowList: allowList},
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
+  _i18.Future<void> clear({Set<String>? allowList}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #clear,
+              [],
+              {#allowList: allowList},
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 }
diff --git a/test/exercises/exercise_provider_db_test.dart b/test/exercises/exercise_provider_db_test.dart
index 1b092bf8..3862baa6 100644
--- a/test/exercises/exercise_provider_db_test.dart
+++ b/test/exercises/exercise_provider_db_test.dart
@@ -101,22 +101,26 @@ void main() {
 
     // Mock categories
     when(mockBaseProvider.makeUrl(categoryUrl)).thenReturn(tCategoryEntriesUri);
-    when(mockBaseProvider.fetchPaginated(tCategoryEntriesUri))
-        .thenAnswer((_) => Future.value(tCategoryMap['results']));
+    when(
+      mockBaseProvider.fetchPaginated(tCategoryEntriesUri),
+    ).thenAnswer((_) => Future.value(tCategoryMap['results']));
 
     // Mock muscles
     when(mockBaseProvider.makeUrl(muscleUrl)).thenReturn(tMuscleEntriesUri);
-    when(mockBaseProvider.fetchPaginated(tMuscleEntriesUri))
-        .thenAnswer((_) => Future.value(tMuscleMap['results']));
+    when(
+      mockBaseProvider.fetchPaginated(tMuscleEntriesUri),
+    ).thenAnswer((_) => Future.value(tMuscleMap['results']));
 
     // Mock equipment
     when(mockBaseProvider.makeUrl(equipmentUrl)).thenReturn(tEquipmentEntriesUri);
-    when(mockBaseProvider.fetchPaginated(tEquipmentEntriesUri))
-        .thenAnswer((_) => Future.value(tEquipmentMap['results']));
+    when(
+      mockBaseProvider.fetchPaginated(tEquipmentEntriesUri),
+    ).thenAnswer((_) => Future.value(tEquipmentMap['results']));
 
     // Mock languages
-    when(mockBaseProvider.makeUrl(languageUrl, query: anyNamed('query')))
-        .thenReturn(tLanguageEntriesUri);
+    when(
+      mockBaseProvider.makeUrl(languageUrl, query: anyNamed('query')),
+    ).thenReturn(tLanguageEntriesUri);
     when(mockBaseProvider.fetchPaginated(tLanguageEntriesUri)).thenAnswer(
       (_) => Future.value(tLanguageMap['results']),
     );
@@ -394,7 +398,9 @@ void main() {
       final valid = DateTime.now().add(const Duration(days: 1));
       prefs.setString(PREFS_LAST_UPDATED_LANGUAGES, valid.toIso8601String());
 
-      await database.into(database.exercises).insert(
+      await database
+          .into(database.exercises)
+          .insert(
             ExercisesCompanion.insert(
               id: tExerciseInfoMap['id'],
               data: json.encode(tExerciseInfoMap),
@@ -426,7 +432,9 @@ void main() {
     test('fetching a known exercise - no API refresh', () async {
       // Arrange
       provider.languages = testLanguages;
-      await database.into(database.exercises).insert(
+      await database
+          .into(database.exercises)
+          .insert(
             ExercisesCompanion.insert(
               id: tExerciseInfoMap['id'],
               data: json.encode(tExerciseInfoMap),
@@ -451,7 +459,9 @@ void main() {
     test('fetching a known exercise - needed API refresh - no new data', () async {
       // Arrange
       provider.languages = testLanguages;
-      await database.into(database.exercises).insert(
+      await database
+          .into(database.exercises)
+          .insert(
             ExercisesCompanion.insert(
               id: tExerciseInfoMap['id'],
               data: json.encode(tExerciseInfoMap),
@@ -465,8 +475,9 @@ void main() {
 
       // Act
       await provider.handleUpdateExerciseFromApi(database, 9);
-      final exerciseDb = await (database.select(database.exercises)..where((e) => e.id.equals(9)))
-          .getSingleOrNull();
+      final exerciseDb = await (database.select(
+        database.exercises,
+      )..where((e) => e.id.equals(9))).getSingleOrNull();
 
       // Assert
       verify(mockBaseProvider.fetch(any));
@@ -482,7 +493,9 @@ void main() {
       final newData = Map.from(tExerciseInfoMap);
       newData['uuid'] = 'bf6d5557-1c49-48fd-922e-75d11f81d4eb';
 
-      await database.into(database.exercises).insert(
+      await database
+          .into(database.exercises)
+          .insert(
             ExercisesCompanion.insert(
               id: newData['id'],
               data: json.encode(newData),
@@ -496,8 +509,9 @@ void main() {
 
       // Act
       await provider.handleUpdateExerciseFromApi(database, 9);
-      final exerciseDb = await (database.select(database.exercises)..where((e) => e.id.equals(9)))
-          .getSingleOrNull();
+      final exerciseDb = await (database.select(
+        database.exercises,
+      )..where((e) => e.id.equals(9))).getSingleOrNull();
       final exerciseData = ExerciseApiData.fromString(exerciseDb!.data);
 
       // Assert
diff --git a/test/exercises/exercise_provider_load_test.dart b/test/exercises/exercise_provider_load_test.dart
index d72ceaf6..0e4152e6 100644
--- a/test/exercises/exercise_provider_load_test.dart
+++ b/test/exercises/exercise_provider_load_test.dart
@@ -57,10 +57,12 @@ void main() {
     when(mockBaseProvider.makeUrl(exerciseInfoUrl, id: 9)).thenReturn(tExerciseInfoUri);
     when(mockBaseProvider.makeUrl(exerciseInfoUrl, id: 1)).thenReturn(tExerciseInfoUri2);
 
-    when(mockBaseProvider.fetch(tExerciseInfoUri))
-        .thenAnswer((_) => Future.value(tExerciseInfoMap));
-    when(mockBaseProvider.fetch(tExerciseInfoUri2))
-        .thenAnswer((_) => Future.value(tExerciseInfoMap));
+    when(
+      mockBaseProvider.fetch(tExerciseInfoUri),
+    ).thenAnswer((_) => Future.value(tExerciseInfoMap));
+    when(
+      mockBaseProvider.fetch(tExerciseInfoUri2),
+    ).thenAnswer((_) => Future.value(tExerciseInfoMap));
   });
 
   group('Correctly loads and parses data from the server', () {
diff --git a/test/exercises/exercise_provider_test.dart b/test/exercises/exercise_provider_test.dart
index f7534b4f..82a9d861 100644
--- a/test/exercises/exercise_provider_test.dart
+++ b/test/exercises/exercise_provider_test.dart
@@ -106,30 +106,36 @@ void main() {
 
     // Mock categories
     when(mockBaseProvider.makeUrl(categoryUrl)).thenReturn(tCategoryEntriesUri);
-    when(mockBaseProvider.fetchPaginated(tCategoryEntriesUri))
-        .thenAnswer((_) => Future.value(tCategoryMap['results']));
+    when(
+      mockBaseProvider.fetchPaginated(tCategoryEntriesUri),
+    ).thenAnswer((_) => Future.value(tCategoryMap['results']));
 
     // Mock muscles
     when(mockBaseProvider.makeUrl(muscleUrl)).thenReturn(tMuscleEntriesUri);
-    when(mockBaseProvider.fetchPaginated(tMuscleEntriesUri))
-        .thenAnswer((_) => Future.value(tMuscleMap['results']));
+    when(
+      mockBaseProvider.fetchPaginated(tMuscleEntriesUri),
+    ).thenAnswer((_) => Future.value(tMuscleMap['results']));
 
     // Mock equipment
     when(mockBaseProvider.makeUrl(equipmentUrl)).thenReturn(tEquipmentEntriesUri);
-    when(mockBaseProvider.fetchPaginated(tEquipmentEntriesUri))
-        .thenAnswer((_) => Future.value(tEquipmentMap['results']));
+    when(
+      mockBaseProvider.fetchPaginated(tEquipmentEntriesUri),
+    ).thenAnswer((_) => Future.value(tEquipmentMap['results']));
 
     // Mock languages
-    when(mockBaseProvider.makeUrl(languageUrl, query: anyNamed('query')))
-        .thenReturn(tLanguageEntriesUri);
-    when(mockBaseProvider.fetchPaginated(tLanguageEntriesUri))
-        .thenAnswer((_) => Future.value(tLanguageMap['results']));
+    when(
+      mockBaseProvider.makeUrl(languageUrl, query: anyNamed('query')),
+    ).thenReturn(tLanguageEntriesUri);
+    when(
+      mockBaseProvider.fetchPaginated(tLanguageEntriesUri),
+    ).thenAnswer((_) => Future.value(tLanguageMap['results']));
 
     // Mock base info response
     when(mockBaseProvider.makeUrl(exerciseInfoUrl, id: 1)).thenReturn(tExerciseInfoUri);
     when(mockBaseProvider.makeUrl(exerciseInfoUrl, id: 2)).thenReturn(tExerciseInfoUri);
-    when(mockBaseProvider.fetch(tExerciseInfoUri))
-        .thenAnswer((_) => Future.value(tExerciseInfoMap));
+    when(
+      mockBaseProvider.fetch(tExerciseInfoUri),
+    ).thenAnswer((_) => Future.value(tExerciseInfoMap));
   });
 
   group('findCategoryById()', () {
diff --git a/test/gallery/gallery_form_test.mocks.dart b/test/gallery/gallery_form_test.mocks.dart
index 4d0a23b7..1d59d6be 100644
--- a/test/gallery/gallery_form_test.mocks.dart
+++ b/test/gallery/gallery_form_test.mocks.dart
@@ -33,9 +33,9 @@ class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
@@ -43,9 +43,9 @@ class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeUri_2 extends _i1.SmartFake implements Uri {
@@ -53,9 +53,9 @@ class _FakeUri_2 extends _i1.SmartFake implements Uri {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
@@ -63,9 +63,9 @@ class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 /// A class which mocks [GalleryProvider].
@@ -77,80 +77,90 @@ 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>? value) => super.noSuchMethod(
-        Invocation.setter(
-          #images,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #images,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
+  _i2.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(
+              this,
+              Invocation.getter(#auth),
+            ),
+          )
+          as _i2.AuthProvider);
 
   @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
+  _i3.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(
+              this,
+              Invocation.getter(#client),
+            ),
+          )
+          as _i3.Client);
 
   @override
   set auth(_i2.AuthProvider? value) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #auth,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set client(_i3.Client? value) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #client,
+      value,
+    ),
+    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,
-      );
+    Invocation.method(
+      #clear,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i6.Future<void> fetchAndSetGallery() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetGallery,
-          [],
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.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(
@@ -158,16 +168,17 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
     _i7.XFile? imageFile,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addImage,
-          [
-            image,
-            imageFile,
-          ],
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
+            Invocation.method(
+              #addImage,
+              [
+                image,
+                imageFile,
+              ],
+            ),
+            returnValue: _i6.Future<void>.value(),
+            returnValueForMissingStub: _i6.Future<void>.value(),
+          )
+          as _i6.Future<void>);
 
   @override
   _i6.Future<void> editImage(
@@ -175,36 +186,41 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
     _i7.XFile? imageFile,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editImage,
-          [
-            image,
-            imageFile,
-          ],
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
+            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>);
+  _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
-  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) => (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getDefaultHeaders,
+              [],
+              {#includeAuth: includeAuth},
+            ),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
 
   @override
   Uri makeUrl(
@@ -214,46 +230,51 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
     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,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {
+                #id: id,
+                #objectMethod: objectMethod,
+                #query: query,
+              },
+            ),
+            returnValue: _FakeUri_2(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {
+                  #id: id,
+                  #objectMethod: objectMethod,
+                  #query: query,
+                },
+              ),
+            ),
+          )
+          as Uri);
 
   @override
-  _i6.Future<dynamic> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue: _i6.Future<dynamic>.value(),
-      ) as _i6.Future<dynamic>);
+  _i6.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetch,
+              [uri],
+            ),
+            returnValue: _i6.Future<dynamic>.value(),
+          )
+          as _i6.Future<dynamic>);
 
   @override
-  _i6.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i6.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i6.Future<List<dynamic>>);
+  _i6.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchPaginated,
+              [uri],
+            ),
+            returnValue: _i6.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i6.Future<List<dynamic>>);
 
   @override
   _i6.Future<Map<String, dynamic>> post(
@@ -261,15 +282,16 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
     Uri? uri,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i6.Future<Map<String, dynamic>>);
+            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(
@@ -277,15 +299,16 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
     Uri? uri,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i6.Future<Map<String, dynamic>>);
+            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(
@@ -293,58 +316,61 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
     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>);
+            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,
-      );
+    Invocation.method(
+      #addListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i8.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #removeListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #dispose,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #notifyListeners,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 }
diff --git a/test/gallery/gallery_provider_test.dart b/test/gallery/gallery_provider_test.dart
index b0e067b6..3fbb0f04 100644
--- a/test/gallery/gallery_provider_test.dart
+++ b/test/gallery/gallery_provider_test.dart
@@ -30,18 +30,22 @@ void main() {
     test('Test that fetch and set gallery', () async {
       final client = MockClient();
 
-      when(client.get(
-        Uri.https('localhost', 'api/v2/gallery/'),
-        headers: anyNamed('headers'),
-      )).thenAnswer((_) async => http.Response(
-            '{"count":1,"next":null,"previous":null,"results":['
-            '{"id":58,'
-            '"date":"2022-01-09",'
-            '"image":"https://wger.de/media/gallery/170335/d2b9c9e0-d541-41ae-8786-a2ab459e3538.jpg",'
-            '"description":"eggsaddjujuit\'ddayhadIforcanview",'
-            '"height":1280,"width":960}]}',
-            200,
-          ));
+      when(
+        client.get(
+          Uri.https('localhost', 'api/v2/gallery/'),
+          headers: anyNamed('headers'),
+        ),
+      ).thenAnswer(
+        (_) async => http.Response(
+          '{"count":1,"next":null,"previous":null,"results":['
+          '{"id":58,'
+          '"date":"2022-01-09",'
+          '"image":"https://wger.de/media/gallery/170335/d2b9c9e0-d541-41ae-8786-a2ab459e3538.jpg",'
+          '"description":"eggsaddjujuit\'ddayhadIforcanview",'
+          '"height":1280,"width":960}]}',
+          200,
+        ),
+      );
 
       final galleryProvider = GalleryProvider(testAuthProvider, [], client);
 
@@ -54,17 +58,21 @@ void main() {
     test('Test that delete gallery photo', () async {
       final client = MockClient();
 
-      when(client.delete(
-        Uri.https('localhost', 'api/v2/gallery/58/'),
-        headers: anyNamed('headers'),
-      )).thenAnswer((_) async => http.Response(
-            '{"id":58,'
-            '"date":"2022-01-09",'
-            '"image":"https://wger.de/media/gallery/170335/d2b9c9e0-d541-41ae-8786-a2ab459e3538.jpg",'
-            '"description":"eggsaddjujuit\'ddayhadIforcanview",'
-            '"height":1280,"width":960}',
-            200,
-          ));
+      when(
+        client.delete(
+          Uri.https('localhost', 'api/v2/gallery/58/'),
+          headers: anyNamed('headers'),
+        ),
+      ).thenAnswer(
+        (_) async => http.Response(
+          '{"id":58,'
+          '"date":"2022-01-09",'
+          '"image":"https://wger.de/media/gallery/170335/d2b9c9e0-d541-41ae-8786-a2ab459e3538.jpg",'
+          '"description":"eggsaddjujuit\'ddayhadIforcanview",'
+          '"height":1280,"width":960}',
+          200,
+        ),
+      );
 
       final galleryProvider = GalleryProvider(testAuthProvider, [], client);
 
diff --git a/test/gallery/gallery_screen_test.mocks.dart b/test/gallery/gallery_screen_test.mocks.dart
index fe133b28..8629cc7d 100644
--- a/test/gallery/gallery_screen_test.mocks.dart
+++ b/test/gallery/gallery_screen_test.mocks.dart
@@ -33,9 +33,9 @@ class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
@@ -43,9 +43,9 @@ class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeUri_2 extends _i1.SmartFake implements Uri {
@@ -53,9 +53,9 @@ class _FakeUri_2 extends _i1.SmartFake implements Uri {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
@@ -63,9 +63,9 @@ class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 /// A class which mocks [GalleryProvider].
@@ -77,80 +77,90 @@ 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>? value) => super.noSuchMethod(
-        Invocation.setter(
-          #images,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #images,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
+  _i2.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(
+              this,
+              Invocation.getter(#auth),
+            ),
+          )
+          as _i2.AuthProvider);
 
   @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
+  _i3.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(
+              this,
+              Invocation.getter(#client),
+            ),
+          )
+          as _i3.Client);
 
   @override
   set auth(_i2.AuthProvider? value) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #auth,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set client(_i3.Client? value) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #client,
+      value,
+    ),
+    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,
-      );
+    Invocation.method(
+      #clear,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i6.Future<void> fetchAndSetGallery() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetGallery,
-          [],
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.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(
@@ -158,16 +168,17 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
     _i7.XFile? imageFile,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addImage,
-          [
-            image,
-            imageFile,
-          ],
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
+            Invocation.method(
+              #addImage,
+              [
+                image,
+                imageFile,
+              ],
+            ),
+            returnValue: _i6.Future<void>.value(),
+            returnValueForMissingStub: _i6.Future<void>.value(),
+          )
+          as _i6.Future<void>);
 
   @override
   _i6.Future<void> editImage(
@@ -175,36 +186,41 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
     _i7.XFile? imageFile,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editImage,
-          [
-            image,
-            imageFile,
-          ],
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
+            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>);
+  _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
-  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) => (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getDefaultHeaders,
+              [],
+              {#includeAuth: includeAuth},
+            ),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
 
   @override
   Uri makeUrl(
@@ -214,46 +230,51 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
     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,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {
+                #id: id,
+                #objectMethod: objectMethod,
+                #query: query,
+              },
+            ),
+            returnValue: _FakeUri_2(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {
+                  #id: id,
+                  #objectMethod: objectMethod,
+                  #query: query,
+                },
+              ),
+            ),
+          )
+          as Uri);
 
   @override
-  _i6.Future<dynamic> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue: _i6.Future<dynamic>.value(),
-      ) as _i6.Future<dynamic>);
+  _i6.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetch,
+              [uri],
+            ),
+            returnValue: _i6.Future<dynamic>.value(),
+          )
+          as _i6.Future<dynamic>);
 
   @override
-  _i6.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i6.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i6.Future<List<dynamic>>);
+  _i6.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchPaginated,
+              [uri],
+            ),
+            returnValue: _i6.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i6.Future<List<dynamic>>);
 
   @override
   _i6.Future<Map<String, dynamic>> post(
@@ -261,15 +282,16 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
     Uri? uri,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i6.Future<Map<String, dynamic>>);
+            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(
@@ -277,15 +299,16 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
     Uri? uri,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i6.Future<Map<String, dynamic>>);
+            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(
@@ -293,58 +316,61 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
     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>);
+            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,
-      );
+    Invocation.method(
+      #addListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i8.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #removeListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #dispose,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #notifyListeners,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 }
diff --git a/test/measurements/measurement_categories_screen_test.dart b/test/measurements/measurement_categories_screen_test.dart
index ff4d94c3..a222f5df 100644
--- a/test/measurements/measurement_categories_screen_test.dart
+++ b/test/measurements/measurement_categories_screen_test.dart
@@ -37,14 +37,24 @@ void main() {
   setUp(() {
     mockMeasurementProvider = MockMeasurementProvider();
     when(mockMeasurementProvider.categories).thenReturn([
-      MeasurementCategory(id: 1, name: 'body fat', unit: '%', entries: [
-        MeasurementEntry(id: 1, category: 1, date: DateTime(2021, 9, 1), value: 10, notes: ''),
-        MeasurementEntry(id: 2, category: 1, date: DateTime(2021, 9, 5), value: 11, notes: ''),
-      ]),
-      MeasurementCategory(id: 2, name: 'biceps', unit: 'cm', entries: [
-        MeasurementEntry(id: 3, category: 2, date: DateTime(2021, 9, 1), value: 30, notes: ''),
-        MeasurementEntry(id: 4, category: 2, date: DateTime(2021, 9, 5), value: 40, notes: ''),
-      ]),
+      MeasurementCategory(
+        id: 1,
+        name: 'body fat',
+        unit: '%',
+        entries: [
+          MeasurementEntry(id: 1, category: 1, date: DateTime(2021, 9, 1), value: 10, notes: ''),
+          MeasurementEntry(id: 2, category: 1, date: DateTime(2021, 9, 5), value: 11, notes: ''),
+        ],
+      ),
+      MeasurementCategory(
+        id: 2,
+        name: 'biceps',
+        unit: 'cm',
+        entries: [
+          MeasurementEntry(id: 3, category: 2, date: DateTime(2021, 9, 1), value: 30, notes: ''),
+          MeasurementEntry(id: 4, category: 2, date: DateTime(2021, 9, 5), value: 40, notes: ''),
+        ],
+      ),
     ]);
   });
 
diff --git a/test/measurements/measurement_categories_screen_test.mocks.dart b/test/measurements/measurement_categories_screen_test.mocks.dart
index 3f6d6cdf..33f55194 100644
--- a/test/measurements/measurement_categories_screen_test.mocks.dart
+++ b/test/measurements/measurement_categories_screen_test.mocks.dart
@@ -32,9 +32,9 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvi
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeMeasurementCategory_1 extends _i1.SmartFake implements _i3.MeasurementCategory {
@@ -42,9 +42,9 @@ class _FakeMeasurementCategory_1 extends _i1.SmartFake implements _i3.Measuremen
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 /// A class which mocks [MeasurementProvider].
@@ -56,99 +56,117 @@ class MockMeasurementProvider extends _i1.Mock implements _i4.MeasurementProvide
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) 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,
-      );
+    Invocation.method(
+      #clear,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i3.MeasurementCategory findCategoryById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findCategoryById,
-          [id],
-        ),
-        returnValue: _FakeMeasurementCategory_1(
-          this,
-          Invocation.method(
-            #findCategoryById,
-            [id],
-          ),
-        ),
-      ) 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: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.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: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.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: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.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: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.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: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.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(
@@ -157,27 +175,30 @@ class MockMeasurementProvider extends _i1.Mock implements _i4.MeasurementProvide
     String? newUnit,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editCategory,
-          [
-            id,
-            newName,
-            newUnit,
-          ],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+            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: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.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(
@@ -185,16 +206,17 @@ class MockMeasurementProvider extends _i1.Mock implements _i4.MeasurementProvide
     int? categoryId,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteEntry,
-          [
-            id,
-            categoryId,
-          ],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+            Invocation.method(
+              #deleteEntry,
+              [
+                id,
+                categoryId,
+              ],
+            ),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
   _i5.Future<void> editEntry(
@@ -205,53 +227,54 @@ class MockMeasurementProvider extends _i1.Mock implements _i4.MeasurementProvide
     DateTime? newDate,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editEntry,
-          [
-            id,
-            categoryId,
-            newValue,
-            newNotes,
-            newDate,
-          ],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.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,
-      );
+    Invocation.method(
+      #addListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i7.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #removeListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #dispose,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #notifyListeners,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 }
diff --git a/test/measurements/measurement_entries_screen_test.dart b/test/measurements/measurement_entries_screen_test.dart
index c40785b7..4a721c51 100644
--- a/test/measurements/measurement_entries_screen_test.dart
+++ b/test/measurements/measurement_entries_screen_test.dart
@@ -37,10 +37,21 @@ void main() {
   setUp(() {
     mockMeasurementProvider = MockMeasurementProvider();
     when(mockMeasurementProvider.findCategoryById(any)).thenReturn(
-      MeasurementCategory(id: 1, name: 'body fat', unit: '%', entries: [
-        MeasurementEntry(id: 1, category: 1, date: DateTime(2021, 8, 1), value: 10.2, notes: ''),
-        MeasurementEntry(id: 1, category: 1, date: DateTime(2021, 8, 10), value: 18.1, notes: 'a'),
-      ]),
+      MeasurementCategory(
+        id: 1,
+        name: 'body fat',
+        unit: '%',
+        entries: [
+          MeasurementEntry(id: 1, category: 1, date: DateTime(2021, 8, 1), value: 10.2, notes: ''),
+          MeasurementEntry(
+            id: 1,
+            category: 1,
+            date: DateTime(2021, 8, 10),
+            value: 18.1,
+            notes: 'a',
+          ),
+        ],
+      ),
     );
 
     mockNutritionPlansProvider = MockNutritionPlansProvider();
diff --git a/test/measurements/measurement_provider_test.dart b/test/measurements/measurement_provider_test.dart
index 0b50dd1c..799ac261 100644
--- a/test/measurements/measurement_provider_test.dart
+++ b/test/measurements/measurement_provider_test.dart
@@ -23,8 +23,9 @@ void main() {
   const String categoryUrl = 'measurement-category';
   const String entryUrl = 'measurement';
   final Uri tCategoryUri = Uri();
-  final Map<String, dynamic> tMeasurementCategoryMap =
-      jsonDecode(fixture('measurement/measurement_category_entries.json'));
+  final Map<String, dynamic> tMeasurementCategoryMap = jsonDecode(
+    fixture('measurement/measurement_category_entries.json'),
+  );
   final Uri tCategoryEntriesUri = Uri(
     scheme: 'http',
     host: 'tedmosbyisajerk.com',
@@ -33,31 +34,40 @@ void main() {
   );
 
   const int tCategoryId = 1;
-  const MeasurementCategory tMeasurementCategory =
-      MeasurementCategory(id: 1, name: 'Strength', unit: 'kN');
+  const MeasurementCategory tMeasurementCategory = MeasurementCategory(
+    id: 1,
+    name: 'Strength',
+    unit: 'kN',
+  );
   final List<MeasurementCategory> tMeasurementCategories = [
     const MeasurementCategory(id: 1, name: 'Strength', unit: 'kN'),
     const MeasurementCategory(id: 2, name: 'Biceps', unit: 'cm'),
   ];
-  final Map<String, dynamic> tMeasurementCategoriesMap =
-      jsonDecode(fixture('measurement/measurement_categories.json'));
+  final Map<String, dynamic> tMeasurementCategoriesMap = jsonDecode(
+    fixture('measurement/measurement_categories.json'),
+  );
 
   setUp(() {
     mockWgerBaseProvider = MockWgerBaseProvider();
     measurementProvider = MeasurementProvider(mockWgerBaseProvider);
 
     when(mockWgerBaseProvider.makeUrl(any)).thenReturn(tCategoryUri);
-    when(mockWgerBaseProvider.makeUrl(any, id: anyNamed('id'), query: anyNamed('query')))
-        .thenReturn(tCategoryUri);
-    when(mockWgerBaseProvider.fetchPaginated(any))
-        .thenAnswer((realInvocation) => Future.value(tMeasurementCategoriesMap['results']));
+    when(
+      mockWgerBaseProvider.makeUrl(any, id: anyNamed('id'), query: anyNamed('query')),
+    ).thenReturn(tCategoryUri);
+    when(
+      mockWgerBaseProvider.fetchPaginated(any),
+    ).thenAnswer((realInvocation) => Future.value(tMeasurementCategoriesMap['results']));
 
-    when(mockWgerBaseProvider.makeUrl(entryUrl, query: anyNamed('query')))
-        .thenReturn(tCategoryEntriesUri);
-    when(mockWgerBaseProvider.makeUrl(entryUrl, id: anyNamed('id'), query: anyNamed('query')))
-        .thenReturn(tCategoryEntriesUri);
-    when(mockWgerBaseProvider.fetchPaginated(tCategoryEntriesUri))
-        .thenAnswer((realInvocation) => Future.value(tMeasurementCategoryMap['results']));
+    when(
+      mockWgerBaseProvider.makeUrl(entryUrl, query: anyNamed('query')),
+    ).thenReturn(tCategoryEntriesUri);
+    when(
+      mockWgerBaseProvider.makeUrl(entryUrl, id: anyNamed('id'), query: anyNamed('query')),
+    ).thenReturn(tCategoryEntriesUri);
+    when(
+      mockWgerBaseProvider.fetchPaginated(tCategoryEntriesUri),
+    ).thenAnswer((realInvocation) => Future.value(tMeasurementCategoryMap['results']));
   });
 
   group('clear()', () {
@@ -130,10 +140,12 @@ void main() {
       await measurementProvider.fetchAndSetCategoryEntries(tCategoryId);
 
       // assert
-      verify(mockWgerBaseProvider.makeUrl(
-        entryUrl,
-        query: {'category': tCategoryId.toString(), 'limit': API_MAX_PAGE_SIZE},
-      ));
+      verify(
+        mockWgerBaseProvider.makeUrl(
+          entryUrl,
+          query: {'category': tCategoryId.toString(), 'limit': API_MAX_PAGE_SIZE},
+        ),
+      );
     });
 
     test('should fetch categories entries for id', () async {
@@ -147,22 +159,27 @@ void main() {
     test('should add entries to category in list', () async {
       // arrange
       final List<MeasurementCategory> tMeasurementCategories = [
-        MeasurementCategory(id: 1, name: 'Strength', unit: 'kN', entries: [
-          MeasurementEntry(
-            id: 1,
-            category: 1,
-            date: DateTime(2021, 7, 21),
-            value: 10,
-            notes: 'Some important notes',
-          ),
-          MeasurementEntry(
-            id: 2,
-            category: 1,
-            date: DateTime(2021, 7, 10),
-            value: 15.00,
-            notes: '',
-          ),
-        ]),
+        MeasurementCategory(
+          id: 1,
+          name: 'Strength',
+          unit: 'kN',
+          entries: [
+            MeasurementEntry(
+              id: 1,
+              category: 1,
+              date: DateTime(2021, 7, 21),
+              value: 10,
+              notes: 'Some important notes',
+            ),
+            MeasurementEntry(
+              id: 2,
+              category: 1,
+              date: DateTime(2021, 7, 10),
+              value: 15.00,
+              notes: '',
+            ),
+          ],
+        ),
         const MeasurementCategory(id: 2, name: 'Biceps', unit: 'cm'),
       ];
 
@@ -175,20 +192,26 @@ void main() {
   });
 
   group('addCategory()', () {
-    const MeasurementCategory tMeasurementCategoryWithoutId =
-        MeasurementCategory(id: null, name: 'Strength', unit: 'kN');
-    final Map<String, dynamic> tMeasurementCategoryMap =
-        jsonDecode(fixture('measurement/measurement_category.json'));
-    final Map<String, dynamic> tMeasurementCategoryMapWithoutId =
-        jsonDecode(fixture('measurement/measurement_category_without_id_to_json.json'));
+    const MeasurementCategory tMeasurementCategoryWithoutId = MeasurementCategory(
+      id: null,
+      name: 'Strength',
+      unit: 'kN',
+    );
+    final Map<String, dynamic> tMeasurementCategoryMap = jsonDecode(
+      fixture('measurement/measurement_category.json'),
+    );
+    final Map<String, dynamic> tMeasurementCategoryMapWithoutId = jsonDecode(
+      fixture('measurement/measurement_category_without_id_to_json.json'),
+    );
     final List<MeasurementCategory> tMeasurementCategoriesAdded = [
       const MeasurementCategory(id: 2, name: 'Biceps', unit: 'cm'),
       const MeasurementCategory(id: 1, name: 'Strength', unit: 'kN'),
       const MeasurementCategory(id: 1, name: 'Strength', unit: 'kN'),
     ];
     setUp(() {
-      when(mockWgerBaseProvider.post(any, any))
-          .thenAnswer((realInvocation) => Future.value(tMeasurementCategoryMap));
+      when(
+        mockWgerBaseProvider.post(any, any),
+      ).thenAnswer((realInvocation) => Future.value(tMeasurementCategoryMap));
     });
 
     test("should post the MeasurementCategorie's Map", () async {
@@ -222,8 +245,9 @@ void main() {
       'should remove a MeasurementCategory from the categories list for an id and call the api to remove the MeasurementCategory',
       () async {
         // arrange
-        when(mockWgerBaseProvider.deleteRequest(any, any))
-            .thenAnswer((realInvocation) => Future.value(Response('', 200)));
+        when(
+          mockWgerBaseProvider.deleteRequest(any, any),
+        ).thenAnswer((realInvocation) => Future.value(Response('', 200)));
 
         final List<MeasurementCategory> tMeasurementCategoriesOneDeleted = [
           const MeasurementCategory(id: 2, name: 'Biceps', unit: 'cm'),
@@ -262,13 +286,16 @@ void main() {
   group('editCategory()', () {
     const String tCategoryEditedName = 'Triceps';
     const String tCategoryEditedUnit = 'm';
-    final Map<String, dynamic> tCategoryMapEditedToJson =
-        jsonDecode(fixture('measurement/measurement_category_edited_to_json.json'));
-    final Map<String, dynamic> tCategoryMapEdited =
-        jsonDecode(fixture('measurement/measurement_category_edited.json'));
+    final Map<String, dynamic> tCategoryMapEditedToJson = jsonDecode(
+      fixture('measurement/measurement_category_edited_to_json.json'),
+    );
+    final Map<String, dynamic> tCategoryMapEdited = jsonDecode(
+      fixture('measurement/measurement_category_edited.json'),
+    );
     setUp(() async {
-      when(mockWgerBaseProvider.patch(any, any))
-          .thenAnswer((realInvocation) => Future.value(tCategoryMapEdited));
+      when(
+        mockWgerBaseProvider.patch(any, any),
+      ).thenAnswer((realInvocation) => Future.value(tCategoryMapEdited));
       await measurementProvider.fetchAndSetCategories();
     });
     test('should add the new MeasurementCategory and remove the old one', () async {
@@ -336,33 +363,40 @@ void main() {
     );
 
     final List<MeasurementCategory> tMeasurementCategories = [
-      MeasurementCategory(id: 1, name: 'Strength', unit: 'kN', entries: [
-        MeasurementEntry(
-          id: 1,
-          category: 1,
-          date: DateTime(2021, 7, 21),
-          value: 10,
-          notes: 'Some important notes',
-        ),
-        MeasurementEntry(
-          id: 2,
-          category: 1,
-          date: DateTime(2021, 7, 10),
-          value: 15.00,
-          notes: '',
-        ),
-        tMeasurementEntry,
-      ]),
+      MeasurementCategory(
+        id: 1,
+        name: 'Strength',
+        unit: 'kN',
+        entries: [
+          MeasurementEntry(
+            id: 1,
+            category: 1,
+            date: DateTime(2021, 7, 21),
+            value: 10,
+            notes: 'Some important notes',
+          ),
+          MeasurementEntry(
+            id: 2,
+            category: 1,
+            date: DateTime(2021, 7, 10),
+            value: 15.00,
+            notes: '',
+          ),
+          tMeasurementEntry,
+        ],
+      ),
       const MeasurementCategory(id: 2, name: 'Biceps', unit: 'cm'),
     ];
 
     setUp(() async {
       await measurementProvider.fetchAndSetCategories();
 
-      final Map<String, dynamic> measurementEntryMap =
-          jsonDecode(fixture('measurement/measurement_entry.json'));
-      when(mockWgerBaseProvider.post(any, any))
-          .thenAnswer((realInvocation) => Future.value(measurementEntryMap));
+      final Map<String, dynamic> measurementEntryMap = jsonDecode(
+        fixture('measurement/measurement_entry.json'),
+      );
+      when(
+        mockWgerBaseProvider.post(any, any),
+      ).thenAnswer((realInvocation) => Future.value(measurementEntryMap));
     });
 
     test('should make the post url', () async {
@@ -375,8 +409,9 @@ void main() {
 
     test('should post the MeasurementEntryMap', () async {
       // arrange
-      final Map<String, dynamic> measurementEntryMapWithoutId =
-          jsonDecode(fixture('measurement/measurement_entry_without_id.json'));
+      final Map<String, dynamic> measurementEntryMapWithoutId = jsonDecode(
+        fixture('measurement/measurement_entry_without_id.json'),
+      );
 
       // act
       await measurementProvider.addEntry(tMeasurementEntryWithoutId);
@@ -408,10 +443,12 @@ void main() {
         value: 15.00,
         notes: '',
       );
-      final Map<String, dynamic> measurementEntryMapWrongCategory =
-          jsonDecode(fixture('measurement/measurement_entry_wrong_category.json'));
-      when(mockWgerBaseProvider.post(any, any))
-          .thenAnswer((realInvocation) => Future.value(measurementEntryMapWrongCategory));
+      final Map<String, dynamic> measurementEntryMapWrongCategory = jsonDecode(
+        fixture('measurement/measurement_entry_wrong_category.json'),
+      );
+      when(
+        mockWgerBaseProvider.post(any, any),
+      ).thenAnswer((realInvocation) => Future.value(measurementEntryMapWrongCategory));
 
       // act & assert
       expect(
@@ -424,15 +461,20 @@ void main() {
   group('deleteEntry()', () {
     const int tEntryId = 2;
     final List<MeasurementCategory> tMeasurementCategories = [
-      MeasurementCategory(id: 1, name: 'Strength', unit: 'kN', entries: [
-        MeasurementEntry(
-          id: 1,
-          category: 1,
-          date: DateTime(2021, 7, 21),
-          value: 10,
-          notes: 'Some important notes',
-        ),
-      ]),
+      MeasurementCategory(
+        id: 1,
+        name: 'Strength',
+        unit: 'kN',
+        entries: [
+          MeasurementEntry(
+            id: 1,
+            category: 1,
+            date: DateTime(2021, 7, 21),
+            value: 10,
+            notes: 'Some important notes',
+          ),
+        ],
+      ),
       const MeasurementCategory(id: 2, name: 'Biceps', unit: 'cm'),
     ];
 
@@ -440,8 +482,9 @@ void main() {
       await measurementProvider.fetchAndSetCategories();
       await measurementProvider.fetchAndSetCategoryEntries(tCategoryId);
 
-      when(mockWgerBaseProvider.deleteRequest(any, any))
-          .thenAnswer((realInvocation) => Future.value(Response('', 200)));
+      when(
+        mockWgerBaseProvider.deleteRequest(any, any),
+      ).thenAnswer((realInvocation) => Future.value(Response('', 200)));
     });
 
     test("should remove a MeasurementEntry from the category's entries List for an id", () async {
@@ -484,22 +527,27 @@ void main() {
       () {
         // arrange
         final List<MeasurementCategory> tMeasurementCategories = [
-          MeasurementCategory(id: 1, name: 'Strength', unit: 'kN', entries: [
-            MeasurementEntry(
-              id: 1,
-              category: 1,
-              date: DateTime(2021, 7, 21),
-              value: 10,
-              notes: 'Some important notes',
-            ),
-            MeasurementEntry(
-              id: 2,
-              category: 1,
-              date: DateTime(2021, 7, 10),
-              value: 15.00,
-              notes: '',
-            ),
-          ]),
+          MeasurementCategory(
+            id: 1,
+            name: 'Strength',
+            unit: 'kN',
+            entries: [
+              MeasurementEntry(
+                id: 1,
+                category: 1,
+                date: DateTime(2021, 7, 21),
+                value: 10,
+                notes: 'Some important notes',
+              ),
+              MeasurementEntry(
+                id: 2,
+                category: 1,
+                date: DateTime(2021, 7, 10),
+                value: 15.00,
+                notes: '',
+              ),
+            ],
+          ),
           const MeasurementCategory(id: 2, name: 'Biceps', unit: 'cm'),
         ];
         when(mockWgerBaseProvider.deleteRequest(any, any)).thenThrow(WgerHttpException('{}'));
@@ -525,33 +573,40 @@ void main() {
     const num tEntryEditedValue = 23;
     final DateTime tEntryEditedDate = DateTime(2021, 07, 21);
     const String tEntryEditedNote = 'I just wanted to edit this to see what happens';
-    final Map<String, dynamic> tEntryMapEdited =
-        jsonDecode(fixture('measurement/measurement_entry_edited.json'));
+    final Map<String, dynamic> tEntryMapEdited = jsonDecode(
+      fixture('measurement/measurement_entry_edited.json'),
+    );
     setUp(() async {
-      when(mockWgerBaseProvider.patch(any, any))
-          .thenAnswer((realInvocation) => Future.value(tEntryMapEdited));
+      when(
+        mockWgerBaseProvider.patch(any, any),
+      ).thenAnswer((realInvocation) => Future.value(tEntryMapEdited));
       await measurementProvider.fetchAndSetCategories();
       await measurementProvider.fetchAndSetCategoryEntries(1);
     });
     test('should add the new MeasurementEntry and remove the old one', () async {
       // arrange
       final List<MeasurementCategory> tMeasurementCategoriesEdited = [
-        MeasurementCategory(id: 1, name: 'Strength', unit: 'kN', entries: [
-          MeasurementEntry(
-            id: 1,
-            category: 1,
-            date: DateTime(2021, 7, 21),
-            value: 23,
-            notes: 'I just wanted to edit this to see what happens',
-          ),
-          MeasurementEntry(
-            id: 2,
-            category: 1,
-            date: DateTime(2021, 7, 10),
-            value: 15.00,
-            notes: '',
-          ),
-        ]),
+        MeasurementCategory(
+          id: 1,
+          name: 'Strength',
+          unit: 'kN',
+          entries: [
+            MeasurementEntry(
+              id: 1,
+              category: 1,
+              date: DateTime(2021, 7, 21),
+              value: 23,
+              notes: 'I just wanted to edit this to see what happens',
+            ),
+            MeasurementEntry(
+              id: 2,
+              category: 1,
+              date: DateTime(2021, 7, 10),
+              value: 15.00,
+              notes: '',
+            ),
+          ],
+        ),
         const MeasurementCategory(id: 2, name: 'Biceps', unit: 'cm'),
       ];
 
diff --git a/test/measurements/measurement_provider_test.mocks.dart b/test/measurements/measurement_provider_test.mocks.dart
index 99933704..f806a71b 100644
--- a/test/measurements/measurement_provider_test.mocks.dart
+++ b/test/measurements/measurement_provider_test.mocks.dart
@@ -30,9 +30,9 @@ class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
@@ -40,9 +40,9 @@ class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeUri_2 extends _i1.SmartFake implements Uri {
@@ -50,9 +50,9 @@ class _FakeUri_2 extends _i1.SmartFake implements Uri {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
@@ -60,9 +60,9 @@ class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 /// A class which mocks [WgerBaseProvider].
@@ -74,50 +74,56 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
   }
 
   @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
+  _i2.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(
+              this,
+              Invocation.getter(#auth),
+            ),
+          )
+          as _i2.AuthProvider);
 
   @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
+  _i3.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(
+              this,
+              Invocation.getter(#client),
+            ),
+          )
+          as _i3.Client);
 
   @override
   set auth(_i2.AuthProvider? value) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #auth,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set client(_i3.Client? value) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #client,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) => (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getDefaultHeaders,
+              [],
+              {#includeAuth: includeAuth},
+            ),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
 
   @override
   Uri makeUrl(
@@ -127,46 +133,51 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
     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,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {
+                #id: id,
+                #objectMethod: objectMethod,
+                #query: query,
+              },
+            ),
+            returnValue: _FakeUri_2(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {
+                  #id: id,
+                  #objectMethod: objectMethod,
+                  #query: query,
+                },
+              ),
+            ),
+          )
+          as Uri);
 
   @override
-  _i5.Future<dynamic> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue: _i5.Future<dynamic>.value(),
-      ) as _i5.Future<dynamic>);
+  _i5.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetch,
+              [uri],
+            ),
+            returnValue: _i5.Future<dynamic>.value(),
+          )
+          as _i5.Future<dynamic>);
 
   @override
-  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i5.Future<List<dynamic>>);
+  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchPaginated,
+              [uri],
+            ),
+            returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i5.Future<List<dynamic>>);
 
   @override
   _i5.Future<Map<String, dynamic>> post(
@@ -174,15 +185,16 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
     Uri? uri,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            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(
@@ -190,15 +202,16 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
     Uri? uri,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            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(
@@ -206,22 +219,25 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
     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>);
+            Invocation.method(
+              #deleteRequest,
+              [
+                url,
+                id,
+              ],
+            ),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #deleteRequest,
+                  [
+                    url,
+                    id,
+                  ],
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 }
diff --git a/test/nutrition/nutrition_provider_test.dart b/test/nutrition/nutrition_provider_test.dart
index 40cae73d..81a03bec 100644
--- a/test/nutrition/nutrition_provider_test.dart
+++ b/test/nutrition/nutrition_provider_test.dart
@@ -82,8 +82,9 @@ void main() {
     when(mockWgerBaseProvider.makeUrl(planInfoUrl, id: anyNamed('id'))).thenReturn(planInfoUri);
     when(mockWgerBaseProvider.makeUrl(planUrl, id: anyNamed('id'))).thenReturn(planUri);
     when(mockWgerBaseProvider.makeUrl(diaryUrl, query: anyNamed('query'))).thenReturn(diaryUri);
-    when(mockWgerBaseProvider.makeUrl(ingredientInfoUrl, id: anyNamed('id')))
-        .thenReturn(ingredientUri);
+    when(
+      mockWgerBaseProvider.makeUrl(ingredientInfoUrl, id: anyNamed('id')),
+    ).thenReturn(ingredientUri);
     when(mockWgerBaseProvider.fetch(planInfoUri)).thenAnswer(
       (realInvocation) => Future.value(nutritionalPlanInfoResponse),
     );
@@ -140,8 +141,10 @@ void main() {
         endDate: now.add(const Duration(days: 5)),
         creationDate: now.subtract(const Duration(days: 2)),
       );
-      nutritionProvider =
-          NutritionPlansProvider(mockWgerBaseProvider, [olderPlan, newerPlan], database: database);
+      nutritionProvider = NutritionPlansProvider(mockWgerBaseProvider, [
+        olderPlan,
+        newerPlan,
+      ], database: database);
       expect(nutritionProvider.currentPlan, equals(newerPlan));
     });
   });
@@ -192,8 +195,10 @@ void main() {
         startDate: now.subtract(const Duration(days: 10)),
         endDate: now.add(const Duration(days: 10)),
       );
-      nutritionProvider =
-          NutritionPlansProvider(mockWgerBaseProvider, [plan, inactivePlan], database: database);
+      nutritionProvider = NutritionPlansProvider(mockWgerBaseProvider, [
+        plan,
+        inactivePlan,
+      ], database: database);
       expect(nutritionProvider.currentPlan, equals(plan));
     });
 
@@ -208,8 +213,10 @@ void main() {
         startDate: now.subtract(const Duration(days: 5)),
         endDate: now.add(const Duration(days: 5)),
       );
-      nutritionProvider =
-          NutritionPlansProvider(mockWgerBaseProvider, [olderPlan, newerPlan], database: database);
+      nutritionProvider = NutritionPlansProvider(mockWgerBaseProvider, [
+        olderPlan,
+        newerPlan,
+      ], database: database);
       expect(nutritionProvider.currentPlan, equals(newerPlan));
     });
   });
@@ -218,7 +225,9 @@ void main() {
     test('that if there is already valid data in the DB, the API is not hit', () async {
       // Arrange
       nutritionProvider.ingredients = [];
-      await database.into(database.ingredients).insert(
+      await database
+          .into(database.ingredients)
+          .insert(
             IngredientsCompanion.insert(
               id: ingredient59887Response['id'],
               data: json.encode(ingredient59887Response),
@@ -239,7 +248,9 @@ void main() {
     test('fetching an ingredient not present in the DB, the API is hit', () async {
       // Arrange
       nutritionProvider.ingredients = [];
-      await database.into(database.ingredients).insert(
+      await database
+          .into(database.ingredients)
+          .insert(
             IngredientsCompanion.insert(
               id: ingredient59887Response['id'],
               data: json.encode(ingredient59887Response),
diff --git a/test/nutrition/nutritional_meal_form_test.mocks.dart b/test/nutrition/nutritional_meal_form_test.mocks.dart
index ef8ea874..36e897d8 100644
--- a/test/nutrition/nutritional_meal_form_test.mocks.dart
+++ b/test/nutrition/nutritional_meal_form_test.mocks.dart
@@ -35,9 +35,9 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvi
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeIngredientDatabase_1 extends _i1.SmartFake implements _i3.IngredientDatabase {
@@ -45,9 +45,9 @@ class _FakeIngredientDatabase_1 extends _i1.SmartFake implements _i3.IngredientD
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeNutritionalPlan_2 extends _i1.SmartFake implements _i4.NutritionalPlan {
@@ -55,9 +55,9 @@ class _FakeNutritionalPlan_2 extends _i1.SmartFake implements _i4.NutritionalPla
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeMeal_3 extends _i1.SmartFake implements _i5.Meal {
@@ -65,9 +65,9 @@ class _FakeMeal_3 extends _i1.SmartFake implements _i5.Meal {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeMealItem_4 extends _i1.SmartFake implements _i6.MealItem {
@@ -75,9 +75,9 @@ class _FakeMealItem_4 extends _i1.SmartFake implements _i6.MealItem {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeIngredient_5 extends _i1.SmartFake implements _i7.Ingredient {
@@ -85,9 +85,9 @@ class _FakeIngredient_5 extends _i1.SmartFake implements _i7.Ingredient {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 /// A class which mocks [NutritionPlansProvider].
@@ -99,173 +99,209 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  _i3.IngredientDatabase get database => (super.noSuchMethod(
-        Invocation.getter(#database),
-        returnValue: _FakeIngredientDatabase_1(
-          this,
-          Invocation.getter(#database),
-        ),
-      ) as _i3.IngredientDatabase);
+  _i3.IngredientDatabase get database =>
+      (super.noSuchMethod(
+            Invocation.getter(#database),
+            returnValue: _FakeIngredientDatabase_1(
+              this,
+              Invocation.getter(#database),
+            ),
+          )
+          as _i3.IngredientDatabase);
 
   @override
-  List<_i7.Ingredient> get ingredients => (super.noSuchMethod(
-        Invocation.getter(#ingredients),
-        returnValue: <_i7.Ingredient>[],
-      ) as List<_i7.Ingredient>);
+  List<_i7.Ingredient> get ingredients =>
+      (super.noSuchMethod(
+            Invocation.getter(#ingredients),
+            returnValue: <_i7.Ingredient>[],
+          )
+          as List<_i7.Ingredient>);
 
   @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
   set database(_i3.IngredientDatabase? value) => super.noSuchMethod(
-        Invocation.setter(
-          #database,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #database,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set ingredients(List<_i7.Ingredient>? value) => super.noSuchMethod(
-        Invocation.setter(
-          #ingredients,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #ingredients,
+      value,
+    ),
+    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,
-      );
+    Invocation.method(
+      #clear,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i4.NutritionalPlan findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeNutritionalPlan_2(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i4.NutritionalPlan);
+  _i4.NutritionalPlan findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findById,
+              [id],
+            ),
+            returnValue: _FakeNutritionalPlan_2(
+              this,
+              Invocation.method(
+                #findById,
+                [id],
+              ),
+            ),
+          )
+          as _i4.NutritionalPlan);
 
   @override
-  _i5.Meal? findMealById(int? id) => (super.noSuchMethod(Invocation.method(
-        #findMealById,
-        [id],
-      )) as _i5.Meal?);
+  _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: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+  _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<void> fetchAndSetAllPlansFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllPlansFull,
-          [],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+  _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<_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>);
+  _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
-  _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>);
+  _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
-  _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>);
+  _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
-  _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>);
+  _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
-  _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>);
+  _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(
@@ -273,49 +309,58 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
     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>);
+            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>);
+  _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>);
+  _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(
@@ -323,44 +368,51 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
     _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>);
+            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>);
+  _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<void> clearIngredientCache() => (super.noSuchMethod(
-        Invocation.method(
-          #clearIngredientCache,
-          [],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+  _i9.Future<void> clearIngredientCache() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #clearIngredientCache,
+              [],
+            ),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
   _i9.Future<_i7.Ingredient> fetchIngredient(
@@ -368,30 +420,35 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
     _i3.IngredientDatabase? database,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #fetchIngredient,
-          [ingredientId],
-          {#database: database},
-        ),
-        returnValue: _i9.Future<_i7.Ingredient>.value(_FakeIngredient_5(
-          this,
-          Invocation.method(
-            #fetchIngredient,
-            [ingredientId],
-            {#database: database},
-          ),
-        )),
-      ) as _i9.Future<_i7.Ingredient>);
+            Invocation.method(
+              #fetchIngredient,
+              [ingredientId],
+              {#database: database},
+            ),
+            returnValue: _i9.Future<_i7.Ingredient>.value(
+              _FakeIngredient_5(
+                this,
+                Invocation.method(
+                  #fetchIngredient,
+                  [ingredientId],
+                  {#database: database},
+                ),
+              ),
+            ),
+          )
+          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>);
+  _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<_i7.Ingredient>> searchIngredient(
@@ -400,25 +457,28 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
     bool? searchEnglish = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #searchIngredient,
-          [name],
-          {
-            #languageCode: languageCode,
-            #searchEnglish: searchEnglish,
-          },
-        ),
-        returnValue: _i9.Future<List<_i7.Ingredient>>.value(<_i7.Ingredient>[]),
-      ) as _i9.Future<List<_i7.Ingredient>>);
+            Invocation.method(
+              #searchIngredient,
+              [name],
+              {
+                #languageCode: languageCode,
+                #searchEnglish: searchEnglish,
+              },
+            ),
+            returnValue: _i9.Future<List<_i7.Ingredient>>.value(<_i7.Ingredient>[]),
+          )
+          as _i9.Future<List<_i7.Ingredient>>);
 
   @override
-  _i9.Future<_i7.Ingredient?> searchIngredientWithBarcode(String? barcode) => (super.noSuchMethod(
-        Invocation.method(
-          #searchIngredientWithBarcode,
-          [barcode],
-        ),
-        returnValue: _i9.Future<_i7.Ingredient?>.value(),
-      ) as _i9.Future<_i7.Ingredient?>);
+  _i9.Future<_i7.Ingredient?> searchIngredientWithBarcode(String? barcode) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #searchIngredientWithBarcode,
+              [barcode],
+            ),
+            returnValue: _i9.Future<_i7.Ingredient?>.value(),
+          )
+          as _i9.Future<_i7.Ingredient?>);
 
   @override
   _i9.Future<void> logMealToDiary(
@@ -426,16 +486,17 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
     DateTime? mealDateTime,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #logMealToDiary,
-          [
-            meal,
-            mealDateTime,
-          ],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+            Invocation.method(
+              #logMealToDiary,
+              [
+                meal,
+                mealDateTime,
+              ],
+            ),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
   _i9.Future<void> logIngredientToDiary(
@@ -444,17 +505,18 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
     DateTime? dateTime,
   ]) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #logIngredientToDiary,
-          [
-            mealItem,
-            planId,
-            dateTime,
-          ],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+            Invocation.method(
+              #logIngredientToDiary,
+              [
+                mealItem,
+                planId,
+                dateTime,
+              ],
+            ),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
   _i9.Future<void> deleteLog(
@@ -462,60 +524,63 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
     int? planId,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [
-            logId,
-            planId,
-          ],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+            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>);
+  _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
   void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #addListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #removeListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #dispose,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #notifyListeners,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 }
diff --git a/test/nutrition/nutritional_meal_item_form_test.dart b/test/nutrition/nutritional_meal_item_form_test.dart
index 224dc53e..9b4a0100 100644
--- a/test/nutrition/nutritional_meal_item_form_test.dart
+++ b/test/nutrition/nutritional_meal_item_form_test.dart
@@ -70,15 +70,18 @@ void main() {
     final MealItem mealItem = MealItem(ingredientId: ingredient.id, amount: 2);
     mockNutrition = MockNutritionPlansProvider();
 
-    when(mockNutrition.searchIngredientWithBarcode('123'))
-        .thenAnswer((_) => Future.value(ingredient));
+    when(
+      mockNutrition.searchIngredientWithBarcode('123'),
+    ).thenAnswer((_) => Future.value(ingredient));
     when(mockNutrition.searchIngredientWithBarcode('')).thenAnswer((_) => Future.value(null));
     when(mockNutrition.searchIngredientWithBarcode('222')).thenAnswer((_) => Future.value(null));
-    when(mockNutrition.searchIngredient(
-      any,
-      languageCode: anyNamed('languageCode'),
-      searchEnglish: anyNamed('searchEnglish'),
-    )).thenAnswer(
+    when(
+      mockNutrition.searchIngredient(
+        any,
+        languageCode: anyNamed('languageCode'),
+        searchEnglish: anyNamed('searchEnglish'),
+      ),
+    ).thenAnswer(
       (_) => Future.value([ingredient1, ingredient2]),
     );
 
@@ -311,9 +314,11 @@ void main() {
         await tester.enterText(find.byKey(const Key('field-weight')), '2');
 
         // once ID and weight are set, it'll fetchIngredient and show macros preview and ingredient image
-        when(mockNutrition.fetchIngredient(1)).thenAnswer((_) => Future.value(
-              Ingredient.fromJson(jsonDecode(fixture('nutrition/ingredientinfo_59887.json'))),
-            ));
+        when(mockNutrition.fetchIngredient(1)).thenAnswer(
+          (_) => Future.value(
+            Ingredient.fromJson(jsonDecode(fixture('nutrition/ingredientinfo_59887.json'))),
+          ),
+        );
         await mockNetworkImagesFor(() => tester.pumpAndSettle());
 
         expect(find.byKey(const Key('ingredient-scan-result-dialog')), findsNothing);
diff --git a/test/nutrition/nutritional_plan_form_test.dart b/test/nutrition/nutritional_plan_form_test.dart
index 5b67fdf6..73f26084 100644
--- a/test/nutrition/nutritional_plan_form_test.dart
+++ b/test/nutrition/nutritional_plan_form_test.dart
@@ -110,8 +110,11 @@ void main() {
     await tester.pumpWidget(createHomeScreen(plan2));
     await tester.pumpAndSettle();
 
-    expect(find.text(''), findsNWidgets(2),
-        reason: 'New nutritional plan needs description, and end date');
+    expect(
+      find.text(''),
+      findsNWidgets(2),
+      reason: 'New nutritional plan needs description, and end date',
+    );
     // there's also the start date, but it will have a value depending on 'now'
     await tester.enterText(find.byKey(const Key('field-description')), 'New cool plan');
     await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
diff --git a/test/nutrition/nutritional_plan_form_test.mocks.dart b/test/nutrition/nutritional_plan_form_test.mocks.dart
index 5d42b480..d0200b93 100644
--- a/test/nutrition/nutritional_plan_form_test.mocks.dart
+++ b/test/nutrition/nutritional_plan_form_test.mocks.dart
@@ -35,9 +35,9 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvi
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeIngredientDatabase_1 extends _i1.SmartFake implements _i3.IngredientDatabase {
@@ -45,9 +45,9 @@ class _FakeIngredientDatabase_1 extends _i1.SmartFake implements _i3.IngredientD
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeNutritionalPlan_2 extends _i1.SmartFake implements _i4.NutritionalPlan {
@@ -55,9 +55,9 @@ class _FakeNutritionalPlan_2 extends _i1.SmartFake implements _i4.NutritionalPla
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeMeal_3 extends _i1.SmartFake implements _i5.Meal {
@@ -65,9 +65,9 @@ class _FakeMeal_3 extends _i1.SmartFake implements _i5.Meal {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeMealItem_4 extends _i1.SmartFake implements _i6.MealItem {
@@ -75,9 +75,9 @@ class _FakeMealItem_4 extends _i1.SmartFake implements _i6.MealItem {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeIngredient_5 extends _i1.SmartFake implements _i7.Ingredient {
@@ -85,9 +85,9 @@ class _FakeIngredient_5 extends _i1.SmartFake implements _i7.Ingredient {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 /// A class which mocks [NutritionPlansProvider].
@@ -99,173 +99,209 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  _i3.IngredientDatabase get database => (super.noSuchMethod(
-        Invocation.getter(#database),
-        returnValue: _FakeIngredientDatabase_1(
-          this,
-          Invocation.getter(#database),
-        ),
-      ) as _i3.IngredientDatabase);
+  _i3.IngredientDatabase get database =>
+      (super.noSuchMethod(
+            Invocation.getter(#database),
+            returnValue: _FakeIngredientDatabase_1(
+              this,
+              Invocation.getter(#database),
+            ),
+          )
+          as _i3.IngredientDatabase);
 
   @override
-  List<_i7.Ingredient> get ingredients => (super.noSuchMethod(
-        Invocation.getter(#ingredients),
-        returnValue: <_i7.Ingredient>[],
-      ) as List<_i7.Ingredient>);
+  List<_i7.Ingredient> get ingredients =>
+      (super.noSuchMethod(
+            Invocation.getter(#ingredients),
+            returnValue: <_i7.Ingredient>[],
+          )
+          as List<_i7.Ingredient>);
 
   @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
   set database(_i3.IngredientDatabase? value) => super.noSuchMethod(
-        Invocation.setter(
-          #database,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #database,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set ingredients(List<_i7.Ingredient>? value) => super.noSuchMethod(
-        Invocation.setter(
-          #ingredients,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #ingredients,
+      value,
+    ),
+    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,
-      );
+    Invocation.method(
+      #clear,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i4.NutritionalPlan findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeNutritionalPlan_2(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i4.NutritionalPlan);
+  _i4.NutritionalPlan findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findById,
+              [id],
+            ),
+            returnValue: _FakeNutritionalPlan_2(
+              this,
+              Invocation.method(
+                #findById,
+                [id],
+              ),
+            ),
+          )
+          as _i4.NutritionalPlan);
 
   @override
-  _i5.Meal? findMealById(int? id) => (super.noSuchMethod(Invocation.method(
-        #findMealById,
-        [id],
-      )) as _i5.Meal?);
+  _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: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+  _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<void> fetchAndSetAllPlansFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllPlansFull,
-          [],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+  _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<_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>);
+  _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
-  _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>);
+  _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
-  _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>);
+  _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
-  _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>);
+  _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
-  _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>);
+  _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(
@@ -273,49 +309,58 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
     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>);
+            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>);
+  _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>);
+  _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(
@@ -323,44 +368,51 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
     _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>);
+            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>);
+  _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<void> clearIngredientCache() => (super.noSuchMethod(
-        Invocation.method(
-          #clearIngredientCache,
-          [],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+  _i9.Future<void> clearIngredientCache() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #clearIngredientCache,
+              [],
+            ),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
   _i9.Future<_i7.Ingredient> fetchIngredient(
@@ -368,30 +420,35 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
     _i3.IngredientDatabase? database,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #fetchIngredient,
-          [ingredientId],
-          {#database: database},
-        ),
-        returnValue: _i9.Future<_i7.Ingredient>.value(_FakeIngredient_5(
-          this,
-          Invocation.method(
-            #fetchIngredient,
-            [ingredientId],
-            {#database: database},
-          ),
-        )),
-      ) as _i9.Future<_i7.Ingredient>);
+            Invocation.method(
+              #fetchIngredient,
+              [ingredientId],
+              {#database: database},
+            ),
+            returnValue: _i9.Future<_i7.Ingredient>.value(
+              _FakeIngredient_5(
+                this,
+                Invocation.method(
+                  #fetchIngredient,
+                  [ingredientId],
+                  {#database: database},
+                ),
+              ),
+            ),
+          )
+          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>);
+  _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<_i7.Ingredient>> searchIngredient(
@@ -400,25 +457,28 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
     bool? searchEnglish = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #searchIngredient,
-          [name],
-          {
-            #languageCode: languageCode,
-            #searchEnglish: searchEnglish,
-          },
-        ),
-        returnValue: _i9.Future<List<_i7.Ingredient>>.value(<_i7.Ingredient>[]),
-      ) as _i9.Future<List<_i7.Ingredient>>);
+            Invocation.method(
+              #searchIngredient,
+              [name],
+              {
+                #languageCode: languageCode,
+                #searchEnglish: searchEnglish,
+              },
+            ),
+            returnValue: _i9.Future<List<_i7.Ingredient>>.value(<_i7.Ingredient>[]),
+          )
+          as _i9.Future<List<_i7.Ingredient>>);
 
   @override
-  _i9.Future<_i7.Ingredient?> searchIngredientWithBarcode(String? barcode) => (super.noSuchMethod(
-        Invocation.method(
-          #searchIngredientWithBarcode,
-          [barcode],
-        ),
-        returnValue: _i9.Future<_i7.Ingredient?>.value(),
-      ) as _i9.Future<_i7.Ingredient?>);
+  _i9.Future<_i7.Ingredient?> searchIngredientWithBarcode(String? barcode) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #searchIngredientWithBarcode,
+              [barcode],
+            ),
+            returnValue: _i9.Future<_i7.Ingredient?>.value(),
+          )
+          as _i9.Future<_i7.Ingredient?>);
 
   @override
   _i9.Future<void> logMealToDiary(
@@ -426,16 +486,17 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
     DateTime? mealDateTime,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #logMealToDiary,
-          [
-            meal,
-            mealDateTime,
-          ],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+            Invocation.method(
+              #logMealToDiary,
+              [
+                meal,
+                mealDateTime,
+              ],
+            ),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
   _i9.Future<void> logIngredientToDiary(
@@ -444,17 +505,18 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
     DateTime? dateTime,
   ]) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #logIngredientToDiary,
-          [
-            mealItem,
-            planId,
-            dateTime,
-          ],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+            Invocation.method(
+              #logIngredientToDiary,
+              [
+                mealItem,
+                planId,
+                dateTime,
+              ],
+            ),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
   _i9.Future<void> deleteLog(
@@ -462,60 +524,63 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
     int? planId,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [
-            logId,
-            planId,
-          ],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+            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>);
+  _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
   void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #addListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #removeListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #dispose,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #notifyListeners,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 }
diff --git a/test/nutrition/nutritional_plan_screen_test.mocks.dart b/test/nutrition/nutritional_plan_screen_test.mocks.dart
index b9e4f8e5..d5d303df 100644
--- a/test/nutrition/nutritional_plan_screen_test.mocks.dart
+++ b/test/nutrition/nutritional_plan_screen_test.mocks.dart
@@ -35,9 +35,9 @@ class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
@@ -45,9 +45,9 @@ class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeUri_2 extends _i1.SmartFake implements Uri {
@@ -55,9 +55,9 @@ class _FakeUri_2 extends _i1.SmartFake implements Uri {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
@@ -65,9 +65,9 @@ class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeStreamedResponse_4 extends _i1.SmartFake implements _i3.StreamedResponse {
@@ -75,9 +75,9 @@ class _FakeStreamedResponse_4 extends _i1.SmartFake implements _i3.StreamedRespo
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 /// A class which mocks [WgerBaseProvider].
@@ -89,50 +89,56 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
   }
 
   @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
+  _i2.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(
+              this,
+              Invocation.getter(#auth),
+            ),
+          )
+          as _i2.AuthProvider);
 
   @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
+  _i3.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(
+              this,
+              Invocation.getter(#client),
+            ),
+          )
+          as _i3.Client);
 
   @override
   set auth(_i2.AuthProvider? value) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #auth,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set client(_i3.Client? value) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #client,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) => (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getDefaultHeaders,
+              [],
+              {#includeAuth: includeAuth},
+            ),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
 
   @override
   Uri makeUrl(
@@ -142,46 +148,51 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
     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,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {
+                #id: id,
+                #objectMethod: objectMethod,
+                #query: query,
+              },
+            ),
+            returnValue: _FakeUri_2(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {
+                  #id: id,
+                  #objectMethod: objectMethod,
+                  #query: query,
+                },
+              ),
+            ),
+          )
+          as Uri);
 
   @override
-  _i5.Future<dynamic> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue: _i5.Future<dynamic>.value(),
-      ) as _i5.Future<dynamic>);
+  _i5.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetch,
+              [uri],
+            ),
+            returnValue: _i5.Future<dynamic>.value(),
+          )
+          as _i5.Future<dynamic>);
 
   @override
-  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i5.Future<List<dynamic>>);
+  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchPaginated,
+              [uri],
+            ),
+            returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i5.Future<List<dynamic>>);
 
   @override
   _i5.Future<Map<String, dynamic>> post(
@@ -189,15 +200,16 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
     Uri? uri,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            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(
@@ -205,15 +217,16 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
     Uri? uri,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            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(
@@ -221,24 +234,27 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
     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>);
+            Invocation.method(
+              #deleteRequest,
+              [
+                url,
+                id,
+              ],
+            ),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #deleteRequest,
+                  [
+                    url,
+                    id,
+                  ],
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 }
 
 /// A class which mocks [AuthProvider].
@@ -250,154 +266,174 @@ class MockAuthProvider extends _i1.Mock implements _i2.AuthProvider {
   }
 
   @override
-  Map<String, String> get metadata => (super.noSuchMethod(
-        Invocation.getter(#metadata),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
+  Map<String, String> get metadata =>
+      (super.noSuchMethod(
+            Invocation.getter(#metadata),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
 
   @override
-  _i2.AuthState get state => (super.noSuchMethod(
-        Invocation.getter(#state),
-        returnValue: _i2.AuthState.updateRequired,
-      ) as _i2.AuthState);
+  _i2.AuthState get state =>
+      (super.noSuchMethod(
+            Invocation.getter(#state),
+            returnValue: _i2.AuthState.updateRequired,
+          )
+          as _i2.AuthState);
 
   @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
+  _i3.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(
+              this,
+              Invocation.getter(#client),
+            ),
+          )
+          as _i3.Client);
 
   @override
-  bool get dataInit => (super.noSuchMethod(
-        Invocation.getter(#dataInit),
-        returnValue: false,
-      ) as bool);
+  bool get dataInit =>
+      (super.noSuchMethod(
+            Invocation.getter(#dataInit),
+            returnValue: false,
+          )
+          as bool);
 
   @override
-  bool get isAuth => (super.noSuchMethod(
-        Invocation.getter(#isAuth),
-        returnValue: false,
-      ) as bool);
+  bool get isAuth =>
+      (super.noSuchMethod(
+            Invocation.getter(#isAuth),
+            returnValue: false,
+          )
+          as bool);
 
   @override
   set token(String? value) => super.noSuchMethod(
-        Invocation.setter(
-          #token,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #token,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set serverUrl(String? value) => super.noSuchMethod(
-        Invocation.setter(
-          #serverUrl,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #serverUrl,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set serverVersion(String? value) => super.noSuchMethod(
-        Invocation.setter(
-          #serverVersion,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #serverVersion,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set applicationVersion(_i6.PackageInfo? value) => super.noSuchMethod(
-        Invocation.setter(
-          #applicationVersion,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #applicationVersion,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set metadata(Map<String, String>? value) => super.noSuchMethod(
-        Invocation.setter(
-          #metadata,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #metadata,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set state(_i2.AuthState? value) => super.noSuchMethod(
-        Invocation.setter(
-          #state,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #state,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set client(_i3.Client? value) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #client,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set dataInit(bool? value) => super.noSuchMethod(
-        Invocation.setter(
-          #dataInit,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #dataInit,
+      value,
+    ),
+    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
-  _i5.Future<void> setServerVersion() => (super.noSuchMethod(
-        Invocation.method(
-          #setServerVersion,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  _i5.Future<void> setServerVersion() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setServerVersion,
+              [],
+            ),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
-  _i5.Future<void> setApplicationVersion() => (super.noSuchMethod(
-        Invocation.method(
-          #setApplicationVersion,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  _i5.Future<void> setApplicationVersion() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setApplicationVersion,
+              [],
+            ),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
-  _i5.Future<void> initVersions(String? serverUrl) => (super.noSuchMethod(
-        Invocation.method(
-          #initVersions,
-          [serverUrl],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  _i5.Future<void> initVersions(String? serverUrl) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #initVersions,
+              [serverUrl],
+            ),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
-  _i5.Future<bool> applicationUpdateRequired([String? version]) => (super.noSuchMethod(
-        Invocation.method(
-          #applicationUpdateRequired,
-          [version],
-        ),
-        returnValue: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
+  _i5.Future<bool> applicationUpdateRequired([String? version]) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #applicationUpdateRequired,
+              [version],
+            ),
+            returnValue: _i5.Future<bool>.value(false),
+          )
+          as _i5.Future<bool>);
 
   @override
   _i5.Future<_i2.LoginActions> register({
@@ -408,19 +444,20 @@ class MockAuthProvider extends _i1.Mock implements _i2.AuthProvider {
     String? locale = 'en',
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #register,
-          [],
-          {
-            #username: username,
-            #password: password,
-            #email: email,
-            #serverUrl: serverUrl,
-            #locale: locale,
-          },
-        ),
-        returnValue: _i5.Future<_i2.LoginActions>.value(_i2.LoginActions.update),
-      ) as _i5.Future<_i2.LoginActions>);
+            Invocation.method(
+              #register,
+              [],
+              {
+                #username: username,
+                #password: password,
+                #email: email,
+                #serverUrl: serverUrl,
+                #locale: locale,
+              },
+            ),
+            returnValue: _i5.Future<_i2.LoginActions>.value(_i2.LoginActions.update),
+          )
+          as _i5.Future<_i2.LoginActions>);
 
   @override
   _i5.Future<_i2.LoginActions> login(
@@ -430,104 +467,115 @@ class MockAuthProvider extends _i1.Mock implements _i2.AuthProvider {
     String? apiToken,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #login,
-          [
-            username,
-            password,
-            serverUrl,
-            apiToken,
-          ],
-        ),
-        returnValue: _i5.Future<_i2.LoginActions>.value(_i2.LoginActions.update),
-      ) as _i5.Future<_i2.LoginActions>);
+            Invocation.method(
+              #login,
+              [
+                username,
+                password,
+                serverUrl,
+                apiToken,
+              ],
+            ),
+            returnValue: _i5.Future<_i2.LoginActions>.value(_i2.LoginActions.update),
+          )
+          as _i5.Future<_i2.LoginActions>);
 
   @override
-  _i5.Future<String> getServerUrlFromPrefs() => (super.noSuchMethod(
-        Invocation.method(
-          #getServerUrlFromPrefs,
-          [],
-        ),
-        returnValue: _i5.Future<String>.value(_i7.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getServerUrlFromPrefs,
-            [],
-          ),
-        )),
-      ) as _i5.Future<String>);
+  _i5.Future<String> getServerUrlFromPrefs() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getServerUrlFromPrefs,
+              [],
+            ),
+            returnValue: _i5.Future<String>.value(
+              _i7.dummyValue<String>(
+                this,
+                Invocation.method(
+                  #getServerUrlFromPrefs,
+                  [],
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<String>);
 
   @override
-  _i5.Future<void> tryAutoLogin() => (super.noSuchMethod(
-        Invocation.method(
-          #tryAutoLogin,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  _i5.Future<void> tryAutoLogin() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #tryAutoLogin,
+              [],
+            ),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
-  _i5.Future<void> logout({bool? shouldNotify = true}) => (super.noSuchMethod(
-        Invocation.method(
-          #logout,
-          [],
-          {#shouldNotify: shouldNotify},
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  _i5.Future<void> logout({bool? shouldNotify = true}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #logout,
+              [],
+              {#shouldNotify: shouldNotify},
+            ),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
-  String getAppNameHeader() => (super.noSuchMethod(
-        Invocation.method(
-          #getAppNameHeader,
-          [],
-        ),
-        returnValue: _i7.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getAppNameHeader,
-            [],
-          ),
-        ),
-      ) as String);
+  String getAppNameHeader() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getAppNameHeader,
+              [],
+            ),
+            returnValue: _i7.dummyValue<String>(
+              this,
+              Invocation.method(
+                #getAppNameHeader,
+                [],
+              ),
+            ),
+          )
+          as String);
 
   @override
   void addListener(_i8.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #addListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i8.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #removeListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #dispose,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #notifyListeners,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 }
 
 /// A class which mocks [Client].
@@ -544,20 +592,23 @@ class MockClient extends _i1.Mock implements _i3.Client {
     Map<String, String>? headers,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #head,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #head,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
+            Invocation.method(
+              #head,
+              [url],
+              {#headers: headers},
+            ),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #head,
+                  [url],
+                  {#headers: headers},
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 
   @override
   _i5.Future<_i3.Response> get(
@@ -565,20 +616,23 @@ class MockClient extends _i1.Mock implements _i3.Client {
     Map<String, String>? headers,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #get,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #get,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
+            Invocation.method(
+              #get,
+              [url],
+              {#headers: headers},
+            ),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #get,
+                  [url],
+                  {#headers: headers},
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 
   @override
   _i5.Future<_i3.Response> post(
@@ -588,28 +642,31 @@ class MockClient extends _i1.Mock implements _i3.Client {
     _i9.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #post,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
+            Invocation.method(
+              #post,
+              [url],
+              {
+                #headers: headers,
+                #body: body,
+                #encoding: encoding,
+              },
+            ),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #post,
+                  [url],
+                  {
+                    #headers: headers,
+                    #body: body,
+                    #encoding: encoding,
+                  },
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 
   @override
   _i5.Future<_i3.Response> put(
@@ -619,28 +676,31 @@ class MockClient extends _i1.Mock implements _i3.Client {
     _i9.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #put,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #put,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
+            Invocation.method(
+              #put,
+              [url],
+              {
+                #headers: headers,
+                #body: body,
+                #encoding: encoding,
+              },
+            ),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #put,
+                  [url],
+                  {
+                    #headers: headers,
+                    #body: body,
+                    #encoding: encoding,
+                  },
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 
   @override
   _i5.Future<_i3.Response> patch(
@@ -650,28 +710,31 @@ class MockClient extends _i1.Mock implements _i3.Client {
     _i9.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #patch,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
+            Invocation.method(
+              #patch,
+              [url],
+              {
+                #headers: headers,
+                #body: body,
+                #encoding: encoding,
+              },
+            ),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #patch,
+                  [url],
+                  {
+                    #headers: headers,
+                    #body: body,
+                    #encoding: encoding,
+                  },
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 
   @override
   _i5.Future<_i3.Response> delete(
@@ -681,28 +744,31 @@ class MockClient extends _i1.Mock implements _i3.Client {
     _i9.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #delete,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #delete,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
+            Invocation.method(
+              #delete,
+              [url],
+              {
+                #headers: headers,
+                #body: body,
+                #encoding: encoding,
+              },
+            ),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #delete,
+                  [url],
+                  {
+                    #headers: headers,
+                    #body: body,
+                    #encoding: encoding,
+                  },
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 
   @override
   _i5.Future<String> read(
@@ -710,20 +776,23 @@ class MockClient extends _i1.Mock implements _i3.Client {
     Map<String, String>? headers,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #read,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i5.Future<String>.value(_i7.dummyValue<String>(
-          this,
-          Invocation.method(
-            #read,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i5.Future<String>);
+            Invocation.method(
+              #read,
+              [url],
+              {#headers: headers},
+            ),
+            returnValue: _i5.Future<String>.value(
+              _i7.dummyValue<String>(
+                this,
+                Invocation.method(
+                  #read,
+                  [url],
+                  {#headers: headers},
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<String>);
 
   @override
   _i5.Future<_i10.Uint8List> readBytes(
@@ -731,35 +800,40 @@ class MockClient extends _i1.Mock implements _i3.Client {
     Map<String, String>? headers,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #readBytes,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i5.Future<_i10.Uint8List>.value(_i10.Uint8List(0)),
-      ) as _i5.Future<_i10.Uint8List>);
+            Invocation.method(
+              #readBytes,
+              [url],
+              {#headers: headers},
+            ),
+            returnValue: _i5.Future<_i10.Uint8List>.value(_i10.Uint8List(0)),
+          )
+          as _i5.Future<_i10.Uint8List>);
 
   @override
-  _i5.Future<_i3.StreamedResponse> send(_i3.BaseRequest? request) => (super.noSuchMethod(
-        Invocation.method(
-          #send,
-          [request],
-        ),
-        returnValue: _i5.Future<_i3.StreamedResponse>.value(_FakeStreamedResponse_4(
-          this,
-          Invocation.method(
-            #send,
-            [request],
-          ),
-        )),
-      ) as _i5.Future<_i3.StreamedResponse>);
+  _i5.Future<_i3.StreamedResponse> send(_i3.BaseRequest? request) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #send,
+              [request],
+            ),
+            returnValue: _i5.Future<_i3.StreamedResponse>.value(
+              _FakeStreamedResponse_4(
+                this,
+                Invocation.method(
+                  #send,
+                  [request],
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i3.StreamedResponse>);
 
   @override
   void close() => super.noSuchMethod(
-        Invocation.method(
-          #close,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #close,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 }
diff --git a/test/nutrition/nutritional_plans_screen_test.dart b/test/nutrition/nutritional_plans_screen_test.dart
index 042efd5b..3161ebd0 100644
--- a/test/nutrition/nutritional_plans_screen_test.dart
+++ b/test/nutrition/nutritional_plans_screen_test.dart
@@ -20,10 +20,8 @@ import 'package:drift/native.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart' as http;
-import 'package:intl/intl.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
-import 'package:path/path.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/database/ingredients/ingredients_database.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
@@ -56,8 +54,9 @@ void main() {
   });
 
   Widget createHomeScreen({locale = 'en'}) {
-    when(client.delete(any, headers: anyNamed('headers')))
-        .thenAnswer((_) async => http.Response('', 200));
+    when(
+      client.delete(any, headers: anyNamed('headers')),
+    ).thenAnswer((_) async => http.Response('', 200));
 
     when(mockBaseProvider.deleteRequest(any, any)).thenAnswer(
       (_) async => http.Response('', 200),
@@ -93,15 +92,17 @@ void main() {
           create: (context) => BodyWeightProvider(mockBaseProvider),
         ),
         ChangeNotifierProvider<UserProvider>(
-          create: (context) => UserProvider(
-            mockBaseProvider,
-          )..profile = Profile(
-              username: 'test',
-              emailVerified: true,
-              isTrustworthy: true,
-              email: 'test@example.com',
-              weightUnitStr: 'kg',
-            ),
+          create: (context) =>
+              UserProvider(
+                  mockBaseProvider,
+                )
+                ..profile = Profile(
+                  username: 'test',
+                  emailVerified: true,
+                  isTrustworthy: true,
+                  email: 'test@example.com',
+                  weightUnitStr: 'kg',
+                ),
         ),
       ],
       child: MaterialApp(
@@ -151,14 +152,14 @@ void main() {
   testWidgets('Tests the localization of dates - EN', (WidgetTester tester) async {
     await tester.pumpWidget(createHomeScreen());
 
-// note .. "(open ended)" at the time, depending on localisation strings
+    // note .. "(open ended)" at the time, depending on localisation strings
     expect(find.textContaining('from 1/1/2021 ('), findsOneWidget);
     expect(find.textContaining('from 1/10/2021 ('), findsOneWidget);
   });
 
   testWidgets('Tests the localization of dates - DE', (WidgetTester tester) async {
     await tester.pumpWidget(createHomeScreen(locale: 'de'));
-// note .. "(open ended)" at the time, depending on localisation strings
+    // note .. "(open ended)" at the time, depending on localisation strings
 
     expect(find.textContaining('from 1.1.2021 ('), findsOneWidget);
     expect(find.textContaining('from 10.1.2021 ('), findsOneWidget);
diff --git a/test/nutrition/nutritional_plans_screen_test.mocks.dart b/test/nutrition/nutritional_plans_screen_test.mocks.dart
index c1429fd5..cacc127d 100644
--- a/test/nutrition/nutritional_plans_screen_test.mocks.dart
+++ b/test/nutrition/nutritional_plans_screen_test.mocks.dart
@@ -35,9 +35,9 @@ class _FakeClient_0 extends _i1.SmartFake implements _i2.Client {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeAuthProvider_1 extends _i1.SmartFake implements _i3.AuthProvider {
@@ -45,9 +45,9 @@ class _FakeAuthProvider_1 extends _i1.SmartFake implements _i3.AuthProvider {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeUri_2 extends _i1.SmartFake implements Uri {
@@ -55,9 +55,9 @@ class _FakeUri_2 extends _i1.SmartFake implements Uri {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeResponse_3 extends _i1.SmartFake implements _i2.Response {
@@ -65,9 +65,9 @@ class _FakeResponse_3 extends _i1.SmartFake implements _i2.Response {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeStreamedResponse_4 extends _i1.SmartFake implements _i2.StreamedResponse {
@@ -75,9 +75,9 @@ class _FakeStreamedResponse_4 extends _i1.SmartFake implements _i2.StreamedRespo
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 /// A class which mocks [AuthProvider].
@@ -89,154 +89,174 @@ class MockAuthProvider extends _i1.Mock implements _i3.AuthProvider {
   }
 
   @override
-  Map<String, String> get metadata => (super.noSuchMethod(
-        Invocation.getter(#metadata),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
+  Map<String, String> get metadata =>
+      (super.noSuchMethod(
+            Invocation.getter(#metadata),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
 
   @override
-  _i3.AuthState get state => (super.noSuchMethod(
-        Invocation.getter(#state),
-        returnValue: _i3.AuthState.updateRequired,
-      ) as _i3.AuthState);
+  _i3.AuthState get state =>
+      (super.noSuchMethod(
+            Invocation.getter(#state),
+            returnValue: _i3.AuthState.updateRequired,
+          )
+          as _i3.AuthState);
 
   @override
-  _i2.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_0(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i2.Client);
+  _i2.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_0(
+              this,
+              Invocation.getter(#client),
+            ),
+          )
+          as _i2.Client);
 
   @override
-  bool get dataInit => (super.noSuchMethod(
-        Invocation.getter(#dataInit),
-        returnValue: false,
-      ) as bool);
+  bool get dataInit =>
+      (super.noSuchMethod(
+            Invocation.getter(#dataInit),
+            returnValue: false,
+          )
+          as bool);
 
   @override
-  bool get isAuth => (super.noSuchMethod(
-        Invocation.getter(#isAuth),
-        returnValue: false,
-      ) as bool);
+  bool get isAuth =>
+      (super.noSuchMethod(
+            Invocation.getter(#isAuth),
+            returnValue: false,
+          )
+          as bool);
 
   @override
   set token(String? value) => super.noSuchMethod(
-        Invocation.setter(
-          #token,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #token,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set serverUrl(String? value) => super.noSuchMethod(
-        Invocation.setter(
-          #serverUrl,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #serverUrl,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set serverVersion(String? value) => super.noSuchMethod(
-        Invocation.setter(
-          #serverVersion,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #serverVersion,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set applicationVersion(_i4.PackageInfo? value) => super.noSuchMethod(
-        Invocation.setter(
-          #applicationVersion,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #applicationVersion,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set metadata(Map<String, String>? value) => super.noSuchMethod(
-        Invocation.setter(
-          #metadata,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #metadata,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set state(_i3.AuthState? value) => super.noSuchMethod(
-        Invocation.setter(
-          #state,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #state,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set client(_i2.Client? value) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #client,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set dataInit(bool? value) => super.noSuchMethod(
-        Invocation.setter(
-          #dataInit,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #dataInit,
+      value,
+    ),
+    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
-  _i5.Future<void> setServerVersion() => (super.noSuchMethod(
-        Invocation.method(
-          #setServerVersion,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  _i5.Future<void> setServerVersion() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setServerVersion,
+              [],
+            ),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
-  _i5.Future<void> setApplicationVersion() => (super.noSuchMethod(
-        Invocation.method(
-          #setApplicationVersion,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  _i5.Future<void> setApplicationVersion() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setApplicationVersion,
+              [],
+            ),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
-  _i5.Future<void> initVersions(String? serverUrl) => (super.noSuchMethod(
-        Invocation.method(
-          #initVersions,
-          [serverUrl],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  _i5.Future<void> initVersions(String? serverUrl) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #initVersions,
+              [serverUrl],
+            ),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
-  _i5.Future<bool> applicationUpdateRequired([String? version]) => (super.noSuchMethod(
-        Invocation.method(
-          #applicationUpdateRequired,
-          [version],
-        ),
-        returnValue: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
+  _i5.Future<bool> applicationUpdateRequired([String? version]) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #applicationUpdateRequired,
+              [version],
+            ),
+            returnValue: _i5.Future<bool>.value(false),
+          )
+          as _i5.Future<bool>);
 
   @override
   _i5.Future<_i3.LoginActions> register({
@@ -247,19 +267,20 @@ class MockAuthProvider extends _i1.Mock implements _i3.AuthProvider {
     String? locale = 'en',
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #register,
-          [],
-          {
-            #username: username,
-            #password: password,
-            #email: email,
-            #serverUrl: serverUrl,
-            #locale: locale,
-          },
-        ),
-        returnValue: _i5.Future<_i3.LoginActions>.value(_i3.LoginActions.update),
-      ) as _i5.Future<_i3.LoginActions>);
+            Invocation.method(
+              #register,
+              [],
+              {
+                #username: username,
+                #password: password,
+                #email: email,
+                #serverUrl: serverUrl,
+                #locale: locale,
+              },
+            ),
+            returnValue: _i5.Future<_i3.LoginActions>.value(_i3.LoginActions.update),
+          )
+          as _i5.Future<_i3.LoginActions>);
 
   @override
   _i5.Future<_i3.LoginActions> login(
@@ -269,104 +290,115 @@ class MockAuthProvider extends _i1.Mock implements _i3.AuthProvider {
     String? apiToken,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #login,
-          [
-            username,
-            password,
-            serverUrl,
-            apiToken,
-          ],
-        ),
-        returnValue: _i5.Future<_i3.LoginActions>.value(_i3.LoginActions.update),
-      ) as _i5.Future<_i3.LoginActions>);
+            Invocation.method(
+              #login,
+              [
+                username,
+                password,
+                serverUrl,
+                apiToken,
+              ],
+            ),
+            returnValue: _i5.Future<_i3.LoginActions>.value(_i3.LoginActions.update),
+          )
+          as _i5.Future<_i3.LoginActions>);
 
   @override
-  _i5.Future<String> getServerUrlFromPrefs() => (super.noSuchMethod(
-        Invocation.method(
-          #getServerUrlFromPrefs,
-          [],
-        ),
-        returnValue: _i5.Future<String>.value(_i6.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getServerUrlFromPrefs,
-            [],
-          ),
-        )),
-      ) as _i5.Future<String>);
+  _i5.Future<String> getServerUrlFromPrefs() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getServerUrlFromPrefs,
+              [],
+            ),
+            returnValue: _i5.Future<String>.value(
+              _i6.dummyValue<String>(
+                this,
+                Invocation.method(
+                  #getServerUrlFromPrefs,
+                  [],
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<String>);
 
   @override
-  _i5.Future<void> tryAutoLogin() => (super.noSuchMethod(
-        Invocation.method(
-          #tryAutoLogin,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  _i5.Future<void> tryAutoLogin() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #tryAutoLogin,
+              [],
+            ),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
-  _i5.Future<void> logout({bool? shouldNotify = true}) => (super.noSuchMethod(
-        Invocation.method(
-          #logout,
-          [],
-          {#shouldNotify: shouldNotify},
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  _i5.Future<void> logout({bool? shouldNotify = true}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #logout,
+              [],
+              {#shouldNotify: shouldNotify},
+            ),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
-  String getAppNameHeader() => (super.noSuchMethod(
-        Invocation.method(
-          #getAppNameHeader,
-          [],
-        ),
-        returnValue: _i6.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getAppNameHeader,
-            [],
-          ),
-        ),
-      ) as String);
+  String getAppNameHeader() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getAppNameHeader,
+              [],
+            ),
+            returnValue: _i6.dummyValue<String>(
+              this,
+              Invocation.method(
+                #getAppNameHeader,
+                [],
+              ),
+            ),
+          )
+          as String);
 
   @override
   void addListener(_i7.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #addListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i7.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #removeListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #dispose,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #notifyListeners,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 }
 
 /// A class which mocks [WgerBaseProvider].
@@ -378,50 +410,56 @@ class MockWgerBaseProvider extends _i1.Mock implements _i8.WgerBaseProvider {
   }
 
   @override
-  _i3.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_1(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i3.AuthProvider);
+  _i3.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_1(
+              this,
+              Invocation.getter(#auth),
+            ),
+          )
+          as _i3.AuthProvider);
 
   @override
-  _i2.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_0(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i2.Client);
+  _i2.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_0(
+              this,
+              Invocation.getter(#client),
+            ),
+          )
+          as _i2.Client);
 
   @override
   set auth(_i3.AuthProvider? value) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #auth,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set client(_i2.Client? value) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #client,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) => (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getDefaultHeaders,
+              [],
+              {#includeAuth: includeAuth},
+            ),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
 
   @override
   Uri makeUrl(
@@ -431,46 +469,51 @@ class MockWgerBaseProvider extends _i1.Mock implements _i8.WgerBaseProvider {
     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,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {
+                #id: id,
+                #objectMethod: objectMethod,
+                #query: query,
+              },
+            ),
+            returnValue: _FakeUri_2(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {
+                  #id: id,
+                  #objectMethod: objectMethod,
+                  #query: query,
+                },
+              ),
+            ),
+          )
+          as Uri);
 
   @override
-  _i5.Future<dynamic> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue: _i5.Future<dynamic>.value(),
-      ) as _i5.Future<dynamic>);
+  _i5.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetch,
+              [uri],
+            ),
+            returnValue: _i5.Future<dynamic>.value(),
+          )
+          as _i5.Future<dynamic>);
 
   @override
-  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i5.Future<List<dynamic>>);
+  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchPaginated,
+              [uri],
+            ),
+            returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i5.Future<List<dynamic>>);
 
   @override
   _i5.Future<Map<String, dynamic>> post(
@@ -478,15 +521,16 @@ class MockWgerBaseProvider extends _i1.Mock implements _i8.WgerBaseProvider {
     Uri? uri,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            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(
@@ -494,15 +538,16 @@ class MockWgerBaseProvider extends _i1.Mock implements _i8.WgerBaseProvider {
     Uri? uri,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            Invocation.method(
+              #patch,
+              [
+                data,
+                uri,
+              ],
+            ),
+            returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i5.Future<Map<String, dynamic>>);
 
   @override
   _i5.Future<_i2.Response> deleteRequest(
@@ -510,24 +555,27 @@ class MockWgerBaseProvider extends _i1.Mock implements _i8.WgerBaseProvider {
     int? id,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteRequest,
-          [
-            url,
-            id,
-          ],
-        ),
-        returnValue: _i5.Future<_i2.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #deleteRequest,
-            [
-              url,
-              id,
-            ],
-          ),
-        )),
-      ) as _i5.Future<_i2.Response>);
+            Invocation.method(
+              #deleteRequest,
+              [
+                url,
+                id,
+              ],
+            ),
+            returnValue: _i5.Future<_i2.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #deleteRequest,
+                  [
+                    url,
+                    id,
+                  ],
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i2.Response>);
 }
 
 /// A class which mocks [Client].
@@ -544,20 +592,23 @@ class MockClient extends _i1.Mock implements _i2.Client {
     Map<String, String>? headers,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #head,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i5.Future<_i2.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #head,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i5.Future<_i2.Response>);
+            Invocation.method(
+              #head,
+              [url],
+              {#headers: headers},
+            ),
+            returnValue: _i5.Future<_i2.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #head,
+                  [url],
+                  {#headers: headers},
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i2.Response>);
 
   @override
   _i5.Future<_i2.Response> get(
@@ -565,20 +616,23 @@ class MockClient extends _i1.Mock implements _i2.Client {
     Map<String, String>? headers,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #get,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i5.Future<_i2.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #get,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i5.Future<_i2.Response>);
+            Invocation.method(
+              #get,
+              [url],
+              {#headers: headers},
+            ),
+            returnValue: _i5.Future<_i2.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #get,
+                  [url],
+                  {#headers: headers},
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i2.Response>);
 
   @override
   _i5.Future<_i2.Response> post(
@@ -588,28 +642,31 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i9.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i5.Future<_i2.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #post,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i5.Future<_i2.Response>);
+            Invocation.method(
+              #post,
+              [url],
+              {
+                #headers: headers,
+                #body: body,
+                #encoding: encoding,
+              },
+            ),
+            returnValue: _i5.Future<_i2.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #post,
+                  [url],
+                  {
+                    #headers: headers,
+                    #body: body,
+                    #encoding: encoding,
+                  },
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i2.Response>);
 
   @override
   _i5.Future<_i2.Response> put(
@@ -619,28 +676,31 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i9.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #put,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i5.Future<_i2.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #put,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i5.Future<_i2.Response>);
+            Invocation.method(
+              #put,
+              [url],
+              {
+                #headers: headers,
+                #body: body,
+                #encoding: encoding,
+              },
+            ),
+            returnValue: _i5.Future<_i2.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #put,
+                  [url],
+                  {
+                    #headers: headers,
+                    #body: body,
+                    #encoding: encoding,
+                  },
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i2.Response>);
 
   @override
   _i5.Future<_i2.Response> patch(
@@ -650,28 +710,31 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i9.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i5.Future<_i2.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #patch,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i5.Future<_i2.Response>);
+            Invocation.method(
+              #patch,
+              [url],
+              {
+                #headers: headers,
+                #body: body,
+                #encoding: encoding,
+              },
+            ),
+            returnValue: _i5.Future<_i2.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #patch,
+                  [url],
+                  {
+                    #headers: headers,
+                    #body: body,
+                    #encoding: encoding,
+                  },
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i2.Response>);
 
   @override
   _i5.Future<_i2.Response> delete(
@@ -681,28 +744,31 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i9.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #delete,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i5.Future<_i2.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #delete,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i5.Future<_i2.Response>);
+            Invocation.method(
+              #delete,
+              [url],
+              {
+                #headers: headers,
+                #body: body,
+                #encoding: encoding,
+              },
+            ),
+            returnValue: _i5.Future<_i2.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #delete,
+                  [url],
+                  {
+                    #headers: headers,
+                    #body: body,
+                    #encoding: encoding,
+                  },
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i2.Response>);
 
   @override
   _i5.Future<String> read(
@@ -710,20 +776,23 @@ class MockClient extends _i1.Mock implements _i2.Client {
     Map<String, String>? headers,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #read,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i5.Future<String>.value(_i6.dummyValue<String>(
-          this,
-          Invocation.method(
-            #read,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i5.Future<String>);
+            Invocation.method(
+              #read,
+              [url],
+              {#headers: headers},
+            ),
+            returnValue: _i5.Future<String>.value(
+              _i6.dummyValue<String>(
+                this,
+                Invocation.method(
+                  #read,
+                  [url],
+                  {#headers: headers},
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<String>);
 
   @override
   _i5.Future<_i10.Uint8List> readBytes(
@@ -731,35 +800,40 @@ class MockClient extends _i1.Mock implements _i2.Client {
     Map<String, String>? headers,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #readBytes,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i5.Future<_i10.Uint8List>.value(_i10.Uint8List(0)),
-      ) as _i5.Future<_i10.Uint8List>);
+            Invocation.method(
+              #readBytes,
+              [url],
+              {#headers: headers},
+            ),
+            returnValue: _i5.Future<_i10.Uint8List>.value(_i10.Uint8List(0)),
+          )
+          as _i5.Future<_i10.Uint8List>);
 
   @override
-  _i5.Future<_i2.StreamedResponse> send(_i2.BaseRequest? request) => (super.noSuchMethod(
-        Invocation.method(
-          #send,
-          [request],
-        ),
-        returnValue: _i5.Future<_i2.StreamedResponse>.value(_FakeStreamedResponse_4(
-          this,
-          Invocation.method(
-            #send,
-            [request],
-          ),
-        )),
-      ) as _i5.Future<_i2.StreamedResponse>);
+  _i5.Future<_i2.StreamedResponse> send(_i2.BaseRequest? request) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #send,
+              [request],
+            ),
+            returnValue: _i5.Future<_i2.StreamedResponse>.value(
+              _FakeStreamedResponse_4(
+                this,
+                Invocation.method(
+                  #send,
+                  [request],
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i2.StreamedResponse>);
 
   @override
   void close() => super.noSuchMethod(
-        Invocation.method(
-          #close,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #close,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 }
diff --git a/test/other/base_provider_test.dart b/test/other/base_provider_test.dart
index 3f3376d2..154a0b51 100644
--- a/test/other/base_provider_test.dart
+++ b/test/other/base_provider_test.dart
@@ -124,12 +124,15 @@ void main() {
         query: 'limit=20&offset=40',
       );
 
-      when(mockHttpClient.get(paginationUri1, headers: anyNamed('headers')))
-          .thenAnswer((_) => Future.value(response1));
-      when(mockHttpClient.get(paginationUri2, headers: anyNamed('headers')))
-          .thenAnswer((_) => Future.value(response2));
-      when(mockHttpClient.get(paginationUri3, headers: anyNamed('headers')))
-          .thenAnswer((_) => Future.value(response3));
+      when(
+        mockHttpClient.get(paginationUri1, headers: anyNamed('headers')),
+      ).thenAnswer((_) => Future.value(response1));
+      when(
+        mockHttpClient.get(paginationUri2, headers: anyNamed('headers')),
+      ).thenAnswer((_) => Future.value(response2));
+      when(
+        mockHttpClient.get(paginationUri3, headers: anyNamed('headers')),
+      ).thenAnswer((_) => Future.value(response3));
 
       // Act
       final WgerBaseProvider provider = WgerBaseProvider(testAuthProvider, mockHttpClient);
diff --git a/test/other/base_provider_test.mocks.dart b/test/other/base_provider_test.mocks.dart
index f35c57fb..3cec6689 100644
--- a/test/other/base_provider_test.mocks.dart
+++ b/test/other/base_provider_test.mocks.dart
@@ -31,9 +31,9 @@ class _FakeResponse_0 extends _i1.SmartFake implements _i2.Response {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeStreamedResponse_1 extends _i1.SmartFake implements _i2.StreamedResponse {
@@ -41,9 +41,9 @@ class _FakeStreamedResponse_1 extends _i1.SmartFake implements _i2.StreamedRespo
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 /// A class which mocks [Client].
@@ -60,20 +60,23 @@ class MockClient extends _i1.Mock implements _i2.Client {
     Map<String, String>? headers,
   }) =>
       (super.noSuchMethod(
-        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>);
+            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
   _i3.Future<_i2.Response> get(
@@ -81,20 +84,23 @@ class MockClient extends _i1.Mock implements _i2.Client {
     Map<String, String>? headers,
   }) =>
       (super.noSuchMethod(
-        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>);
+            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
   _i3.Future<_i2.Response> post(
@@ -104,28 +110,31 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i4.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        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>);
+            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
   _i3.Future<_i2.Response> put(
@@ -135,28 +144,31 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i4.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        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>);
+            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
   _i3.Future<_i2.Response> patch(
@@ -166,28 +178,31 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _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>);
+            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
   _i3.Future<_i2.Response> delete(
@@ -197,28 +212,31 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _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>);
+            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
   _i3.Future<String> read(
@@ -226,20 +244,23 @@ class MockClient extends _i1.Mock implements _i2.Client {
     Map<String, String>? headers,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #read,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i3.Future<String>.value(_i5.dummyValue<String>(
-          this,
-          Invocation.method(
-            #read,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i3.Future<String>);
+            Invocation.method(
+              #read,
+              [url],
+              {#headers: headers},
+            ),
+            returnValue: _i3.Future<String>.value(
+              _i5.dummyValue<String>(
+                this,
+                Invocation.method(
+                  #read,
+                  [url],
+                  {#headers: headers},
+                ),
+              ),
+            ),
+          )
+          as _i3.Future<String>);
 
   @override
   _i3.Future<_i6.Uint8List> readBytes(
@@ -247,35 +268,40 @@ class MockClient extends _i1.Mock implements _i2.Client {
     Map<String, String>? headers,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #readBytes,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i3.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
-      ) as _i3.Future<_i6.Uint8List>);
+            Invocation.method(
+              #readBytes,
+              [url],
+              {#headers: headers},
+            ),
+            returnValue: _i3.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
+          )
+          as _i3.Future<_i6.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>);
+  _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,
-      );
+    Invocation.method(
+      #close,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 }
diff --git a/test/routine/forms/session_form_test.dart b/test/routine/forms/session_form_test.dart
index 01a90524..53302ea9 100644
--- a/test/routine/forms/session_form_test.dart
+++ b/test/routine/forms/session_form_test.dart
@@ -131,9 +131,11 @@ void main() {
     testWidgets('shows server side error messages', (WidgetTester tester) async {
       // Arrange
       await pumpSessionForm(tester);
-      when(mockRoutinesProvider.addSession(any, any)).thenThrow(WgerHttpException.fromMap({
-        'name': ['The name is not valid'],
-      }));
+      when(mockRoutinesProvider.addSession(any, any)).thenThrow(
+        WgerHttpException.fromMap({
+          'name': ['The name is not valid'],
+        }),
+      );
 
       // Act
       await tester.tap(find.byKey(const ValueKey('save-button')));
diff --git a/test/routine/gym_mode_screen_test.dart b/test/routine/gym_mode_screen_test.dart
index 0615f4e9..8c332e1f 100644
--- a/test/routine/gym_mode_screen_test.dart
+++ b/test/routine/gym_mode_screen_test.dart
@@ -60,8 +60,9 @@ void main() {
     when(mockRoutinesProvider.findRepetitionUnitById(1)).thenReturn(testRepetitionUnit1);
     when(mockRoutinesProvider.weightUnits).thenReturn(testWeightUnits);
     when(mockRoutinesProvider.findWeightUnitById(1)).thenReturn(testWeightUnit1);
-    when(mockRoutinesProvider.fetchAndSetRoutineFull(any))
-        .thenAnswer((_) => Future.value(testRoutine));
+    when(
+      mockRoutinesProvider.fetchAndSetRoutineFull(any),
+    ).thenAnswer((_) => Future.value(testRoutine));
 
     SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
   });
@@ -96,10 +97,12 @@ void main() {
   testWidgets('Test the widgets on the gym mode screen', (WidgetTester tester) async {
     when(mockExerciseProvider.findExerciseById(1)).thenReturn(testExercises[0]);
     when(mockExerciseProvider.findExerciseById(6)).thenReturn(testExercises[5]);
-    when(mockExerciseProvider.findExercisesByVariationId(
-      null,
-      exerciseIdToExclude: anyNamed('exerciseIdToExclude'),
-    )).thenReturn([]);
+    when(
+      mockExerciseProvider.findExercisesByVariationId(
+        null,
+        exerciseIdToExclude: anyNamed('exerciseIdToExclude'),
+      ),
+    ).thenReturn([]);
 
     await withClock(Clock.fixed(DateTime(2025, 3, 29, 14, 33)), () async {
       await tester.pumpWidget(renderGymMode());
diff --git a/test/routine/routine_form_test.dart b/test/routine/routine_form_test.dart
index c52c5cd8..8f287f09 100644
--- a/test/routine/routine_form_test.dart
+++ b/test/routine/routine_form_test.dart
@@ -52,8 +52,9 @@ void main() {
     mockRoutinesProvider = MockRoutinesProvider();
     when(mockRoutinesProvider.findById(any)).thenAnswer((_) => existingRoutine);
     when(mockRoutinesProvider.editRoutine(any)).thenAnswer((_) => Future.value(existingRoutine));
-    when(mockRoutinesProvider.fetchAndSetRoutineFull(any))
-        .thenAnswer((_) => Future.value(existingRoutine));
+    when(
+      mockRoutinesProvider.fetchAndSetRoutineFull(any),
+    ).thenAnswer((_) => Future.value(existingRoutine));
   });
 
   Widget renderWidget(Routine routine, {locale = 'en'}) {
@@ -115,9 +116,11 @@ void main() {
 
   testWidgets('Test editing an existing routine - server error', (WidgetTester tester) async {
     // Arrange
-    when(mockRoutinesProvider.editRoutine(any)).thenThrow(WgerHttpException.fromMap({
-      'name': ['The name is not valid'],
-    }));
+    when(mockRoutinesProvider.editRoutine(any)).thenThrow(
+      WgerHttpException.fromMap({
+        'name': ['The name is not valid'],
+      }),
+    );
 
     // Act
     await tester.pumpWidget(renderWidget(existingRoutine));
@@ -185,9 +188,11 @@ void main() {
 
   testWidgets('Test creating a new routine - server error', (WidgetTester tester) async {
     // Arrange
-    when(mockRoutinesProvider.addRoutine(any)).thenThrow(WgerHttpException.fromMap({
-      'name': ['The name is not valid'],
-    }));
+    when(mockRoutinesProvider.addRoutine(any)).thenThrow(
+      WgerHttpException.fromMap({
+        'name': ['The name is not valid'],
+      }),
+    );
 
     // Act
     await tester.pumpWidget(renderWidget(newRoutine));
diff --git a/test/routine/routines_provider_test.dart b/test/routine/routines_provider_test.dart
index 6250415d..4679985c 100644
--- a/test/routine/routines_provider_test.dart
+++ b/test/routine/routines_provider_test.dart
@@ -58,8 +58,9 @@ void main() {
       final exercisesProvider = ExercisesProvider(mockBaseProvider);
 
       final uri = Uri.https('localhost', 'api/v2/routine/325397/');
-      when(mockBaseProvider.makeUrl('routine', id: 325397, query: {'limit': API_MAX_PAGE_SIZE}))
-          .thenReturn(uri);
+      when(
+        mockBaseProvider.makeUrl('routine', id: 325397, query: {'limit': API_MAX_PAGE_SIZE}),
+      ).thenReturn(uri);
       when(mockBaseProvider.fetch(uri)).thenAnswer(
         (_) async => Future.value({
           'id': 325397,
@@ -115,8 +116,9 @@ void main() {
       final uri = Uri.https('localhost', 'api/v2/setting-repetitionunit/');
       final tRepetitionUnits = jsonDecode(fixture('routines/repetition_units.json'));
       when(mockBaseProvider.makeUrl('setting-repetitionunit')).thenReturn(uri);
-      when(mockBaseProvider.fetchPaginated(uri))
-          .thenAnswer((_) => Future.value(tRepetitionUnits['results']));
+      when(
+        mockBaseProvider.fetchPaginated(uri),
+      ).thenAnswer((_) => Future.value(tRepetitionUnits['results']));
 
       // Load the entries
       final provider = RoutinesProvider(mockBaseProvider, exercisesProvider, []);
@@ -130,8 +132,9 @@ void main() {
       final uri = Uri.https('localhost', 'api/v2/setting-weightunit/');
       when(mockBaseProvider.makeUrl('setting-weightunit')).thenReturn(uri);
       final tWeightUnits = jsonDecode(fixture('routines/weight_units.json'));
-      when(mockBaseProvider.fetchPaginated(uri))
-          .thenAnswer((_) => Future.value(tWeightUnits['results']));
+      when(
+        mockBaseProvider.fetchPaginated(uri),
+      ).thenAnswer((_) => Future.value(tWeightUnits['results']));
 
       final ExercisesProvider testExercisesProvider = ExercisesProvider(mockBaseProvider);
 
@@ -148,14 +151,16 @@ void main() {
       final weightUri = Uri.https('localhost', 'api/v2/setting-weightunit/');
       when(mockBaseProvider.makeUrl('setting-weightunit')).thenReturn(weightUri);
       final tWeightUnits = jsonDecode(fixture('routines/weight_units.json'));
-      when(mockBaseProvider.fetchPaginated(weightUri))
-          .thenAnswer((_) => Future.value(tWeightUnits['results']));
+      when(
+        mockBaseProvider.fetchPaginated(weightUri),
+      ).thenAnswer((_) => Future.value(tWeightUnits['results']));
 
       final repUnit = Uri.https('localhost', 'api/v2/setting-repetitionunit/');
       final tRepetitionUnits = jsonDecode(fixture('routines/repetition_units.json'));
       when(mockBaseProvider.makeUrl('setting-repetitionunit')).thenReturn(repUnit);
-      when(mockBaseProvider.fetchPaginated(repUnit))
-          .thenAnswer((_) => Future.value(tRepetitionUnits['results']));
+      when(
+        mockBaseProvider.fetchPaginated(repUnit),
+      ).thenAnswer((_) => Future.value(tRepetitionUnits['results']));
 
       final exercisesProvider = ExercisesProvider(mockBaseProvider);
       WidgetsFlutterBinding.ensureInitialized();
@@ -176,32 +181,45 @@ void main() {
     test('Smoke test fetchAndSetRoutineFull', () async {
       //Arrange
       final structureUri = Uri.https('localhost', 'api/v2/routine/101/structure/');
-      when(mockBaseProvider.makeUrl('routine', objectMethod: 'structure', id: 101))
-          .thenReturn(structureUri);
-      when(mockBaseProvider.fetch(structureUri)).thenAnswer((_) async => Future.value(
-            jsonDecode(fixture('routines/routine_structure.json')),
-          ));
+      when(
+        mockBaseProvider.makeUrl('routine', objectMethod: 'structure', id: 101),
+      ).thenReturn(structureUri);
+      when(mockBaseProvider.fetch(structureUri)).thenAnswer(
+        (_) async => Future.value(
+          jsonDecode(fixture('routines/routine_structure.json')),
+        ),
+      );
 
-      final dateSequenceDisplayUri =
-          Uri.https('localhost', 'api/v2/routine/101/date-sequence-display/');
-      when(mockBaseProvider.makeUrl('routine', objectMethod: 'date-sequence-display', id: 101))
-          .thenReturn(dateSequenceDisplayUri);
-      when(mockBaseProvider.fetch(dateSequenceDisplayUri)).thenAnswer((_) async => Future.value(
-            jsonDecode(fixture('routines/routine_date_sequence_display.json')),
-          ));
+      final dateSequenceDisplayUri = Uri.https(
+        'localhost',
+        'api/v2/routine/101/date-sequence-display/',
+      );
+      when(
+        mockBaseProvider.makeUrl('routine', objectMethod: 'date-sequence-display', id: 101),
+      ).thenReturn(dateSequenceDisplayUri);
+      when(mockBaseProvider.fetch(dateSequenceDisplayUri)).thenAnswer(
+        (_) async => Future.value(
+          jsonDecode(fixture('routines/routine_date_sequence_display.json')),
+        ),
+      );
 
       final dateSequenceGymUri = Uri.https('localhost', 'api/v2/routine/101/date-sequence-gym/');
-      when(mockBaseProvider.makeUrl('routine', objectMethod: 'date-sequence-gym', id: 101))
-          .thenReturn(dateSequenceGymUri);
-      when(mockBaseProvider.fetch(dateSequenceGymUri)).thenAnswer((_) async => Future.value(
-            jsonDecode(fixture('routines/routine_date_sequence_gym.json')),
-          ));
+      when(
+        mockBaseProvider.makeUrl('routine', objectMethod: 'date-sequence-gym', id: 101),
+      ).thenReturn(dateSequenceGymUri);
+      when(mockBaseProvider.fetch(dateSequenceGymUri)).thenAnswer(
+        (_) async => Future.value(
+          jsonDecode(fixture('routines/routine_date_sequence_gym.json')),
+        ),
+      );
 
       final logsUri = Uri.https('localhost', 'api/v2/routine/101/logs/');
       when(mockBaseProvider.makeUrl('routine', objectMethod: 'logs', id: 101)).thenReturn(logsUri);
-      when(mockBaseProvider.fetch(logsUri)).thenAnswer((_) async => Future.value(
-            jsonDecode(fixture('routines/routine_logs.json')),
-          ));
+      when(mockBaseProvider.fetch(logsUri)).thenAnswer(
+        (_) async => Future.value(
+          jsonDecode(fixture('routines/routine_logs.json')),
+        ),
+      );
 
       final mockExercisesProvider = MockExercisesProvider();
       when(mockExercisesProvider.fetchAndSetExercise(76)).thenAnswer(
diff --git a/test/user/provider_test.dart b/test/user/provider_test.dart
index c9edd0f5..8297b330 100644
--- a/test/user/provider_test.dart
+++ b/test/user/provider_test.dart
@@ -36,8 +36,9 @@ void main() {
   late MockWgerBaseProvider mockWgerBaseProvider;
 
   const String profileUrl = 'userprofile';
-  final Map<String, dynamic> tUserProfileMap =
-      jsonDecode(fixture('user/userprofile_response.json'));
+  final Map<String, dynamic> tUserProfileMap = jsonDecode(
+    fixture('user/userprofile_response.json'),
+  );
   final Uri tProfileUri = Uri(
     scheme: 'http',
     host: 'localhost',
@@ -56,10 +57,12 @@ void main() {
     userProvider = UserProvider(mockWgerBaseProvider);
 
     when(mockWgerBaseProvider.makeUrl(any)).thenReturn(tProfileUri);
-    when(mockWgerBaseProvider.makeUrl(any, objectMethod: 'verify-email'))
-        .thenReturn(tEmailVerifyUri);
-    when(mockWgerBaseProvider.fetch(any))
-        .thenAnswer((realInvocation) => Future.value(tUserProfileMap));
+    when(
+      mockWgerBaseProvider.makeUrl(any, objectMethod: 'verify-email'),
+    ).thenReturn(tEmailVerifyUri);
+    when(
+      mockWgerBaseProvider.fetch(any),
+    ).thenAnswer((realInvocation) => Future.value(tUserProfileMap));
   });
 
   group('house keeping', () {
diff --git a/test/user/provider_test.mocks.dart b/test/user/provider_test.mocks.dart
index 5f3d05d8..e9d11c03 100644
--- a/test/user/provider_test.mocks.dart
+++ b/test/user/provider_test.mocks.dart
@@ -30,9 +30,9 @@ class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
@@ -40,9 +40,9 @@ class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeUri_2 extends _i1.SmartFake implements Uri {
@@ -50,9 +50,9 @@ class _FakeUri_2 extends _i1.SmartFake implements Uri {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
@@ -60,9 +60,9 @@ class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 /// A class which mocks [WgerBaseProvider].
@@ -74,50 +74,56 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
   }
 
   @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
+  _i2.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(
+              this,
+              Invocation.getter(#auth),
+            ),
+          )
+          as _i2.AuthProvider);
 
   @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
+  _i3.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(
+              this,
+              Invocation.getter(#client),
+            ),
+          )
+          as _i3.Client);
 
   @override
   set auth(_i2.AuthProvider? value) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #auth,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set client(_i3.Client? value) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #client,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) => (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getDefaultHeaders,
+              [],
+              {#includeAuth: includeAuth},
+            ),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
 
   @override
   Uri makeUrl(
@@ -127,46 +133,51 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
     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,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {
+                #id: id,
+                #objectMethod: objectMethod,
+                #query: query,
+              },
+            ),
+            returnValue: _FakeUri_2(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {
+                  #id: id,
+                  #objectMethod: objectMethod,
+                  #query: query,
+                },
+              ),
+            ),
+          )
+          as Uri);
 
   @override
-  _i5.Future<dynamic> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue: _i5.Future<dynamic>.value(),
-      ) as _i5.Future<dynamic>);
+  _i5.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetch,
+              [uri],
+            ),
+            returnValue: _i5.Future<dynamic>.value(),
+          )
+          as _i5.Future<dynamic>);
 
   @override
-  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i5.Future<List<dynamic>>);
+  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchPaginated,
+              [uri],
+            ),
+            returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i5.Future<List<dynamic>>);
 
   @override
   _i5.Future<Map<String, dynamic>> post(
@@ -174,15 +185,16 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
     Uri? uri,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            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(
@@ -190,15 +202,16 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
     Uri? uri,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            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(
@@ -206,22 +219,25 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
     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>);
+            Invocation.method(
+              #deleteRequest,
+              [
+                url,
+                id,
+              ],
+            ),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #deleteRequest,
+                  [
+                    url,
+                    id,
+                  ],
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 }
diff --git a/test/utils/errors_test.dart b/test/utils/errors_test.dart
index 8f49f0cc..6ec2afb9 100644
--- a/test/utils/errors_test.dart
+++ b/test/utils/errors_test.dart
@@ -60,7 +60,7 @@ void main() {
       // Arrange
       final errors = {
         'validation_error': {
-          'subkey': ['Error 1', 'Error 2']
+          'subkey': ['Error 1', 'Error 2'],
         },
       };
 
@@ -78,9 +78,9 @@ void main() {
       final errors = {
         'validation_error': [
           {
-            'subkey': ['Error 1', 'Error 2']
+            'subkey': ['Error 1', 'Error 2'],
           },
-          {'otherKey': 'foo'}
+          {'otherKey': 'foo'},
         ],
       };
 
diff --git a/test/weight/weight_model_test.dart b/test/weight/weight_model_test.dart
index ac97ccf6..0bebf456 100644
--- a/test/weight/weight_model_test.dart
+++ b/test/weight/weight_model_test.dart
@@ -34,8 +34,11 @@ void main() {
     });
 
     test('Test that the weight entries are correctly converted from json', () {
-      final WeightEntry weightEntryObj =
-          WeightEntry(id: 1, weight: 80, date: DateTime(2020, 12, 31));
+      final WeightEntry weightEntryObj = WeightEntry(
+        id: 1,
+        weight: 80,
+        date: DateTime(2020, 12, 31),
+      );
       final WeightEntry weightEntry = WeightEntry.fromJson({
         'id': 1,
         'weight': '80',
diff --git a/test/weight/weight_provider_test.dart b/test/weight/weight_provider_test.dart
index 65938435..72699209 100644
--- a/test/weight/weight_provider_test.dart
+++ b/test/weight/weight_provider_test.dart
@@ -70,10 +70,12 @@ void main() {
         path: 'api/v2/weightentry/',
       );
       when(mockBaseProvider.makeUrl(any, query: anyNamed('query'))).thenReturn(uri);
-      when(mockBaseProvider.post(
-        {'id': null, 'weight': '80', 'date': '2021-01-01T00:00:00.000'},
-        uri,
-      )).thenAnswer((_) => Future.value({'id': 25, 'date': '2021-01-01', 'weight': '80'}));
+      when(
+        mockBaseProvider.post(
+          {'id': null, 'weight': '80', 'date': '2021-01-01T00:00:00.000'},
+          uri,
+        ),
+      ).thenAnswer((_) => Future.value({'id': 25, 'date': '2021-01-01', 'weight': '80'}));
 
       // Act
       final BodyWeightProvider provider = BodyWeightProvider(mockBaseProvider);
diff --git a/test/weight/weight_provider_test.mocks.dart b/test/weight/weight_provider_test.mocks.dart
index 82c4496d..6734a0ad 100644
--- a/test/weight/weight_provider_test.mocks.dart
+++ b/test/weight/weight_provider_test.mocks.dart
@@ -30,9 +30,9 @@ class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
@@ -40,9 +40,9 @@ class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeUri_2 extends _i1.SmartFake implements Uri {
@@ -50,9 +50,9 @@ class _FakeUri_2 extends _i1.SmartFake implements Uri {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
@@ -60,9 +60,9 @@ class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 /// A class which mocks [WgerBaseProvider].
@@ -74,50 +74,56 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
   }
 
   @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
+  _i2.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(
+              this,
+              Invocation.getter(#auth),
+            ),
+          )
+          as _i2.AuthProvider);
 
   @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
+  _i3.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(
+              this,
+              Invocation.getter(#client),
+            ),
+          )
+          as _i3.Client);
 
   @override
   set auth(_i2.AuthProvider? value) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #auth,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set client(_i3.Client? value) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #client,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) => (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getDefaultHeaders,
+              [],
+              {#includeAuth: includeAuth},
+            ),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
 
   @override
   Uri makeUrl(
@@ -127,46 +133,51 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
     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,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {
+                #id: id,
+                #objectMethod: objectMethod,
+                #query: query,
+              },
+            ),
+            returnValue: _FakeUri_2(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {
+                  #id: id,
+                  #objectMethod: objectMethod,
+                  #query: query,
+                },
+              ),
+            ),
+          )
+          as Uri);
 
   @override
-  _i5.Future<dynamic> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue: _i5.Future<dynamic>.value(),
-      ) as _i5.Future<dynamic>);
+  _i5.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetch,
+              [uri],
+            ),
+            returnValue: _i5.Future<dynamic>.value(),
+          )
+          as _i5.Future<dynamic>);
 
   @override
-  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i5.Future<List<dynamic>>);
+  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchPaginated,
+              [uri],
+            ),
+            returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i5.Future<List<dynamic>>);
 
   @override
   _i5.Future<Map<String, dynamic>> post(
@@ -174,15 +185,16 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
     Uri? uri,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            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(
@@ -190,15 +202,16 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
     Uri? uri,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            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(
@@ -206,22 +219,25 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
     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>);
+            Invocation.method(
+              #deleteRequest,
+              [
+                url,
+                id,
+              ],
+            ),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #deleteRequest,
+                  [
+                    url,
+                    id,
+                  ],
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 }
diff --git a/test/weight/weight_screen_test.mocks.dart b/test/weight/weight_screen_test.mocks.dart
index f0fb8ed9..553ddeae 100644
--- a/test/weight/weight_screen_test.mocks.dart
+++ b/test/weight/weight_screen_test.mocks.dart
@@ -41,9 +41,9 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvi
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeWeightEntry_1 extends _i1.SmartFake implements _i3.WeightEntry {
@@ -51,9 +51,9 @@ class _FakeWeightEntry_1 extends _i1.SmartFake implements _i3.WeightEntry {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeSharedPreferencesAsync_2 extends _i1.SmartFake implements _i4.SharedPreferencesAsync {
@@ -61,9 +61,9 @@ class _FakeSharedPreferencesAsync_2 extends _i1.SmartFake implements _i4.SharedP
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeIngredientDatabase_3 extends _i1.SmartFake implements _i5.IngredientDatabase {
@@ -71,9 +71,9 @@ class _FakeIngredientDatabase_3 extends _i1.SmartFake implements _i5.IngredientD
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeNutritionalPlan_4 extends _i1.SmartFake implements _i6.NutritionalPlan {
@@ -81,9 +81,9 @@ class _FakeNutritionalPlan_4 extends _i1.SmartFake implements _i6.NutritionalPla
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeMeal_5 extends _i1.SmartFake implements _i7.Meal {
@@ -91,9 +91,9 @@ class _FakeMeal_5 extends _i1.SmartFake implements _i7.Meal {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeMealItem_6 extends _i1.SmartFake implements _i8.MealItem {
@@ -101,9 +101,9 @@ class _FakeMealItem_6 extends _i1.SmartFake implements _i8.MealItem {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 class _FakeIngredient_7 extends _i1.SmartFake implements _i9.Ingredient {
@@ -111,9 +111,9 @@ class _FakeIngredient_7 extends _i1.SmartFake implements _i9.Ingredient {
     Object parent,
     Invocation parentInvocation,
   ) : super(
-          parent,
-          parentInvocation,
-        );
+        parent,
+        parentInvocation,
+      );
 }
 
 /// A class which mocks [BodyWeightProvider].
@@ -125,144 +125,166 @@ class MockBodyWeightProvider extends _i1.Mock implements _i10.BodyWeightProvider
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) 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.WeightEntry> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i3.WeightEntry>[],
-      ) as List<_i3.WeightEntry>);
+  List<_i3.WeightEntry> get items =>
+      (super.noSuchMethod(
+            Invocation.getter(#items),
+            returnValue: <_i3.WeightEntry>[],
+          )
+          as List<_i3.WeightEntry>);
 
   @override
   set items(List<_i3.WeightEntry>? entries) => super.noSuchMethod(
-        Invocation.setter(
-          #items,
-          entries,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #items,
+      entries,
+    ),
+    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,
-      );
+    Invocation.method(
+      #clear,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i3.WeightEntry findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeWeightEntry_1(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i3.WeightEntry);
+  _i3.WeightEntry findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findById,
+              [id],
+            ),
+            returnValue: _FakeWeightEntry_1(
+              this,
+              Invocation.method(
+                #findById,
+                [id],
+              ),
+            ),
+          )
+          as _i3.WeightEntry);
 
   @override
-  _i3.WeightEntry? findByDate(DateTime? date) => (super.noSuchMethod(Invocation.method(
-        #findByDate,
-        [date],
-      )) as _i3.WeightEntry?);
+  _i3.WeightEntry? findByDate(DateTime? date) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findByDate,
+              [date],
+            ),
+          )
+          as _i3.WeightEntry?);
 
   @override
-  _i11.Future<List<_i3.WeightEntry>> fetchAndSetEntries() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEntries,
-          [],
-        ),
-        returnValue: _i11.Future<List<_i3.WeightEntry>>.value(<_i3.WeightEntry>[]),
-      ) as _i11.Future<List<_i3.WeightEntry>>);
+  _i11.Future<List<_i3.WeightEntry>> fetchAndSetEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetEntries,
+              [],
+            ),
+            returnValue: _i11.Future<List<_i3.WeightEntry>>.value(<_i3.WeightEntry>[]),
+          )
+          as _i11.Future<List<_i3.WeightEntry>>);
 
   @override
-  _i11.Future<_i3.WeightEntry> addEntry(_i3.WeightEntry? entry) => (super.noSuchMethod(
-        Invocation.method(
-          #addEntry,
-          [entry],
-        ),
-        returnValue: _i11.Future<_i3.WeightEntry>.value(_FakeWeightEntry_1(
-          this,
-          Invocation.method(
-            #addEntry,
-            [entry],
-          ),
-        )),
-      ) as _i11.Future<_i3.WeightEntry>);
+  _i11.Future<_i3.WeightEntry> addEntry(_i3.WeightEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #addEntry,
+              [entry],
+            ),
+            returnValue: _i11.Future<_i3.WeightEntry>.value(
+              _FakeWeightEntry_1(
+                this,
+                Invocation.method(
+                  #addEntry,
+                  [entry],
+                ),
+              ),
+            ),
+          )
+          as _i11.Future<_i3.WeightEntry>);
 
   @override
-  _i11.Future<void> editEntry(_i3.WeightEntry? entry) => (super.noSuchMethod(
-        Invocation.method(
-          #editEntry,
-          [entry],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> editEntry(_i3.WeightEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #editEntry,
+              [entry],
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  _i11.Future<void> deleteEntry(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteEntry,
-          [id],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> deleteEntry(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #deleteEntry,
+              [id],
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
   void addListener(_i12.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #addListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i12.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #removeListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #dispose,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #notifyListeners,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 }
 
 /// A class which mocks [UserProvider].
@@ -274,145 +296,159 @@ class MockUserProvider extends _i1.Mock implements _i13.UserProvider {
   }
 
   @override
-  _i14.ThemeMode get themeMode => (super.noSuchMethod(
-        Invocation.getter(#themeMode),
-        returnValue: _i14.ThemeMode.system,
-      ) as _i14.ThemeMode);
+  _i14.ThemeMode get themeMode =>
+      (super.noSuchMethod(
+            Invocation.getter(#themeMode),
+            returnValue: _i14.ThemeMode.system,
+          )
+          as _i14.ThemeMode);
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  _i4.SharedPreferencesAsync get prefs => (super.noSuchMethod(
-        Invocation.getter(#prefs),
-        returnValue: _FakeSharedPreferencesAsync_2(
-          this,
-          Invocation.getter(#prefs),
-        ),
-      ) as _i4.SharedPreferencesAsync);
+  _i4.SharedPreferencesAsync get prefs =>
+      (super.noSuchMethod(
+            Invocation.getter(#prefs),
+            returnValue: _FakeSharedPreferencesAsync_2(
+              this,
+              Invocation.getter(#prefs),
+            ),
+          )
+          as _i4.SharedPreferencesAsync);
 
   @override
   set themeMode(_i14.ThemeMode? value) => super.noSuchMethod(
-        Invocation.setter(
-          #themeMode,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #themeMode,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set prefs(_i4.SharedPreferencesAsync? value) => super.noSuchMethod(
-        Invocation.setter(
-          #prefs,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #prefs,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set profile(_i15.Profile? value) => super.noSuchMethod(
-        Invocation.setter(
-          #profile,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #profile,
+      value,
+    ),
+    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,
-      );
+    Invocation.method(
+      #clear,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void setThemeMode(_i14.ThemeMode? mode) => super.noSuchMethod(
-        Invocation.method(
-          #setThemeMode,
-          [mode],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #setThemeMode,
+      [mode],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i11.Future<void> fetchAndSetProfile() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetProfile,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> fetchAndSetProfile() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetProfile,
+              [],
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  _i11.Future<void> saveProfile() => (super.noSuchMethod(
-        Invocation.method(
-          #saveProfile,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> saveProfile() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #saveProfile,
+              [],
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  _i11.Future<void> verifyEmail() => (super.noSuchMethod(
-        Invocation.method(
-          #verifyEmail,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> verifyEmail() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #verifyEmail,
+              [],
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
   void addListener(_i12.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #addListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i12.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #removeListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #dispose,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #notifyListeners,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 }
 
 /// A class which mocks [NutritionPlansProvider].
@@ -424,173 +460,209 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i16.NutritionPlans
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  _i5.IngredientDatabase get database => (super.noSuchMethod(
-        Invocation.getter(#database),
-        returnValue: _FakeIngredientDatabase_3(
-          this,
-          Invocation.getter(#database),
-        ),
-      ) as _i5.IngredientDatabase);
+  _i5.IngredientDatabase get database =>
+      (super.noSuchMethod(
+            Invocation.getter(#database),
+            returnValue: _FakeIngredientDatabase_3(
+              this,
+              Invocation.getter(#database),
+            ),
+          )
+          as _i5.IngredientDatabase);
 
   @override
-  List<_i9.Ingredient> get ingredients => (super.noSuchMethod(
-        Invocation.getter(#ingredients),
-        returnValue: <_i9.Ingredient>[],
-      ) as List<_i9.Ingredient>);
+  List<_i9.Ingredient> get ingredients =>
+      (super.noSuchMethod(
+            Invocation.getter(#ingredients),
+            returnValue: <_i9.Ingredient>[],
+          )
+          as List<_i9.Ingredient>);
 
   @override
-  List<_i6.NutritionalPlan> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i6.NutritionalPlan>[],
-      ) as List<_i6.NutritionalPlan>);
+  List<_i6.NutritionalPlan> get items =>
+      (super.noSuchMethod(
+            Invocation.getter(#items),
+            returnValue: <_i6.NutritionalPlan>[],
+          )
+          as List<_i6.NutritionalPlan>);
 
   @override
   set database(_i5.IngredientDatabase? value) => super.noSuchMethod(
-        Invocation.setter(
-          #database,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #database,
+      value,
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set ingredients(List<_i9.Ingredient>? value) => super.noSuchMethod(
-        Invocation.setter(
-          #ingredients,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(
+      #ingredients,
+      value,
+    ),
+    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,
-      );
+    Invocation.method(
+      #clear,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i6.NutritionalPlan findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeNutritionalPlan_4(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i6.NutritionalPlan);
+  _i6.NutritionalPlan findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findById,
+              [id],
+            ),
+            returnValue: _FakeNutritionalPlan_4(
+              this,
+              Invocation.method(
+                #findById,
+                [id],
+              ),
+            ),
+          )
+          as _i6.NutritionalPlan);
 
   @override
-  _i7.Meal? findMealById(int? id) => (super.noSuchMethod(Invocation.method(
-        #findMealById,
-        [id],
-      )) as _i7.Meal?);
+  _i7.Meal? findMealById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findMealById,
+              [id],
+            ),
+          )
+          as _i7.Meal?);
 
   @override
-  _i11.Future<void> fetchAndSetAllPlansSparse() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllPlansSparse,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> fetchAndSetAllPlansSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetAllPlansSparse,
+              [],
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  _i11.Future<void> fetchAndSetAllPlansFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllPlansFull,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> fetchAndSetAllPlansFull() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetAllPlansFull,
+              [],
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  _i11.Future<_i6.NutritionalPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetPlanSparse,
-          [planId],
-        ),
-        returnValue: _i11.Future<_i6.NutritionalPlan>.value(_FakeNutritionalPlan_4(
-          this,
-          Invocation.method(
-            #fetchAndSetPlanSparse,
-            [planId],
-          ),
-        )),
-      ) as _i11.Future<_i6.NutritionalPlan>);
+  _i11.Future<_i6.NutritionalPlan> fetchAndSetPlanSparse(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetPlanSparse,
+              [planId],
+            ),
+            returnValue: _i11.Future<_i6.NutritionalPlan>.value(
+              _FakeNutritionalPlan_4(
+                this,
+                Invocation.method(
+                  #fetchAndSetPlanSparse,
+                  [planId],
+                ),
+              ),
+            ),
+          )
+          as _i11.Future<_i6.NutritionalPlan>);
 
   @override
-  _i11.Future<_i6.NutritionalPlan> fetchAndSetPlanFull(int? planId) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetPlanFull,
-          [planId],
-        ),
-        returnValue: _i11.Future<_i6.NutritionalPlan>.value(_FakeNutritionalPlan_4(
-          this,
-          Invocation.method(
-            #fetchAndSetPlanFull,
-            [planId],
-          ),
-        )),
-      ) as _i11.Future<_i6.NutritionalPlan>);
+  _i11.Future<_i6.NutritionalPlan> fetchAndSetPlanFull(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetPlanFull,
+              [planId],
+            ),
+            returnValue: _i11.Future<_i6.NutritionalPlan>.value(
+              _FakeNutritionalPlan_4(
+                this,
+                Invocation.method(
+                  #fetchAndSetPlanFull,
+                  [planId],
+                ),
+              ),
+            ),
+          )
+          as _i11.Future<_i6.NutritionalPlan>);
 
   @override
-  _i11.Future<_i6.NutritionalPlan> addPlan(_i6.NutritionalPlan? planData) => (super.noSuchMethod(
-        Invocation.method(
-          #addPlan,
-          [planData],
-        ),
-        returnValue: _i11.Future<_i6.NutritionalPlan>.value(_FakeNutritionalPlan_4(
-          this,
-          Invocation.method(
-            #addPlan,
-            [planData],
-          ),
-        )),
-      ) as _i11.Future<_i6.NutritionalPlan>);
+  _i11.Future<_i6.NutritionalPlan> addPlan(_i6.NutritionalPlan? planData) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #addPlan,
+              [planData],
+            ),
+            returnValue: _i11.Future<_i6.NutritionalPlan>.value(
+              _FakeNutritionalPlan_4(
+                this,
+                Invocation.method(
+                  #addPlan,
+                  [planData],
+                ),
+              ),
+            ),
+          )
+          as _i11.Future<_i6.NutritionalPlan>);
 
   @override
-  _i11.Future<void> editPlan(_i6.NutritionalPlan? plan) => (super.noSuchMethod(
-        Invocation.method(
-          #editPlan,
-          [plan],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> editPlan(_i6.NutritionalPlan? plan) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #editPlan,
+              [plan],
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  _i11.Future<void> deletePlan(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deletePlan,
-          [id],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> deletePlan(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #deletePlan,
+              [id],
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
   _i11.Future<_i7.Meal> addMeal(
@@ -598,49 +670,58 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i16.NutritionPlans
     int? planId,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addMeal,
-          [
-            meal,
-            planId,
-          ],
-        ),
-        returnValue: _i11.Future<_i7.Meal>.value(_FakeMeal_5(
-          this,
-          Invocation.method(
-            #addMeal,
-            [
-              meal,
-              planId,
-            ],
-          ),
-        )),
-      ) as _i11.Future<_i7.Meal>);
+            Invocation.method(
+              #addMeal,
+              [
+                meal,
+                planId,
+              ],
+            ),
+            returnValue: _i11.Future<_i7.Meal>.value(
+              _FakeMeal_5(
+                this,
+                Invocation.method(
+                  #addMeal,
+                  [
+                    meal,
+                    planId,
+                  ],
+                ),
+              ),
+            ),
+          )
+          as _i11.Future<_i7.Meal>);
 
   @override
-  _i11.Future<_i7.Meal> editMeal(_i7.Meal? meal) => (super.noSuchMethod(
-        Invocation.method(
-          #editMeal,
-          [meal],
-        ),
-        returnValue: _i11.Future<_i7.Meal>.value(_FakeMeal_5(
-          this,
-          Invocation.method(
-            #editMeal,
-            [meal],
-          ),
-        )),
-      ) as _i11.Future<_i7.Meal>);
+  _i11.Future<_i7.Meal> editMeal(_i7.Meal? meal) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #editMeal,
+              [meal],
+            ),
+            returnValue: _i11.Future<_i7.Meal>.value(
+              _FakeMeal_5(
+                this,
+                Invocation.method(
+                  #editMeal,
+                  [meal],
+                ),
+              ),
+            ),
+          )
+          as _i11.Future<_i7.Meal>);
 
   @override
-  _i11.Future<void> deleteMeal(_i7.Meal? meal) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteMeal,
-          [meal],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> deleteMeal(_i7.Meal? meal) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #deleteMeal,
+              [meal],
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
   _i11.Future<_i8.MealItem> addMealItem(
@@ -648,44 +729,51 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i16.NutritionPlans
     _i7.Meal? meal,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addMealItem,
-          [
-            mealItem,
-            meal,
-          ],
-        ),
-        returnValue: _i11.Future<_i8.MealItem>.value(_FakeMealItem_6(
-          this,
-          Invocation.method(
-            #addMealItem,
-            [
-              mealItem,
-              meal,
-            ],
-          ),
-        )),
-      ) as _i11.Future<_i8.MealItem>);
+            Invocation.method(
+              #addMealItem,
+              [
+                mealItem,
+                meal,
+              ],
+            ),
+            returnValue: _i11.Future<_i8.MealItem>.value(
+              _FakeMealItem_6(
+                this,
+                Invocation.method(
+                  #addMealItem,
+                  [
+                    mealItem,
+                    meal,
+                  ],
+                ),
+              ),
+            ),
+          )
+          as _i11.Future<_i8.MealItem>);
 
   @override
-  _i11.Future<void> deleteMealItem(_i8.MealItem? mealItem) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteMealItem,
-          [mealItem],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> deleteMealItem(_i8.MealItem? mealItem) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #deleteMealItem,
+              [mealItem],
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  _i11.Future<void> clearIngredientCache() => (super.noSuchMethod(
-        Invocation.method(
-          #clearIngredientCache,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> clearIngredientCache() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #clearIngredientCache,
+              [],
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
   _i11.Future<_i9.Ingredient> fetchIngredient(
@@ -693,30 +781,35 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i16.NutritionPlans
     _i5.IngredientDatabase? database,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #fetchIngredient,
-          [ingredientId],
-          {#database: database},
-        ),
-        returnValue: _i11.Future<_i9.Ingredient>.value(_FakeIngredient_7(
-          this,
-          Invocation.method(
-            #fetchIngredient,
-            [ingredientId],
-            {#database: database},
-          ),
-        )),
-      ) as _i11.Future<_i9.Ingredient>);
+            Invocation.method(
+              #fetchIngredient,
+              [ingredientId],
+              {#database: database},
+            ),
+            returnValue: _i11.Future<_i9.Ingredient>.value(
+              _FakeIngredient_7(
+                this,
+                Invocation.method(
+                  #fetchIngredient,
+                  [ingredientId],
+                  {#database: database},
+                ),
+              ),
+            ),
+          )
+          as _i11.Future<_i9.Ingredient>);
 
   @override
-  _i11.Future<void> fetchIngredientsFromCache() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchIngredientsFromCache,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> fetchIngredientsFromCache() =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchIngredientsFromCache,
+              [],
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
   _i11.Future<List<_i9.Ingredient>> searchIngredient(
@@ -725,25 +818,28 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i16.NutritionPlans
     bool? searchEnglish = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #searchIngredient,
-          [name],
-          {
-            #languageCode: languageCode,
-            #searchEnglish: searchEnglish,
-          },
-        ),
-        returnValue: _i11.Future<List<_i9.Ingredient>>.value(<_i9.Ingredient>[]),
-      ) as _i11.Future<List<_i9.Ingredient>>);
+            Invocation.method(
+              #searchIngredient,
+              [name],
+              {
+                #languageCode: languageCode,
+                #searchEnglish: searchEnglish,
+              },
+            ),
+            returnValue: _i11.Future<List<_i9.Ingredient>>.value(<_i9.Ingredient>[]),
+          )
+          as _i11.Future<List<_i9.Ingredient>>);
 
   @override
-  _i11.Future<_i9.Ingredient?> searchIngredientWithBarcode(String? barcode) => (super.noSuchMethod(
-        Invocation.method(
-          #searchIngredientWithBarcode,
-          [barcode],
-        ),
-        returnValue: _i11.Future<_i9.Ingredient?>.value(),
-      ) as _i11.Future<_i9.Ingredient?>);
+  _i11.Future<_i9.Ingredient?> searchIngredientWithBarcode(String? barcode) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #searchIngredientWithBarcode,
+              [barcode],
+            ),
+            returnValue: _i11.Future<_i9.Ingredient?>.value(),
+          )
+          as _i11.Future<_i9.Ingredient?>);
 
   @override
   _i11.Future<void> logMealToDiary(
@@ -751,16 +847,17 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i16.NutritionPlans
     DateTime? mealDateTime,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #logMealToDiary,
-          [
-            meal,
-            mealDateTime,
-          ],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+            Invocation.method(
+              #logMealToDiary,
+              [
+                meal,
+                mealDateTime,
+              ],
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
   _i11.Future<void> logIngredientToDiary(
@@ -769,17 +866,18 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i16.NutritionPlans
     DateTime? dateTime,
   ]) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #logIngredientToDiary,
-          [
-            mealItem,
-            planId,
-            dateTime,
-          ],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+            Invocation.method(
+              #logIngredientToDiary,
+              [
+                mealItem,
+                planId,
+                dateTime,
+              ],
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
   _i11.Future<void> deleteLog(
@@ -787,60 +885,63 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i16.NutritionPlans
     int? planId,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [
-            logId,
-            planId,
-          ],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+            Invocation.method(
+              #deleteLog,
+              [
+                logId,
+                planId,
+              ],
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  _i11.Future<void> fetchAndSetLogs(_i6.NutritionalPlan? plan) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLogs,
-          [plan],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
+  _i11.Future<void> fetchAndSetLogs(_i6.NutritionalPlan? plan) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #fetchAndSetLogs,
+              [plan],
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
   void addListener(_i12.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #addListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i12.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #removeListener,
+      [listener],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #dispose,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(
+      #notifyListeners,
+      [],
+    ),
+    returnValueForMissingStub: null,
+  );
 }