Merge branch 'master' into feature/exercise-crowdsourcing

# Conflicts:
#	lib/models/workouts/log.dart
#	test/gallery/gallery_screen_test.mocks.dart
#	test/measurements/measurement_categories_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
#	test/other/base_provider_test.mocks.dart
#	test/workout/workout_form_test.mocks.dart
#	test/workout/workout_set_form_test.mocks.dart

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ on:
       - 'pubspec.yaml'
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:  
     - uses: actions/checkout@v1
 

.github/workflows/dependabot.yml

@@ -1,15 +0,0 @@
-name: Dependabot Pub
-
-on: workflow_dispatch
-
-jobs:
-  pub:
-    name: Dependabot Pub
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: dart-lang/setup-dart@v1
-      - name: Update
-        uses: IchordeDionysos/dependabot-pub-runner@main
-        with:
-          path: /

.gitignore

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

.vscode/settings.json

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

AUTHORS.md

@@ -13,6 +13,8 @@
 - Marko Milosevic - <https://github.com/TaarnStar>
 - Karthik Reddy (Axel) - <https://github.com/AxelBlaz3>
 - Ogundoyin Toluwani - <https://github.com/Tolu007>
+- Nenza Nurfirmansyah - <https://github.com/nenzan>
+- Florian Schmitz - <https://github.com/floodoo>
 
 ## Translators
 
@@ -51,3 +53,7 @@
 - Japanese
 
   - Kosei TANAKA <wms784.app@gmail.com> (97)
+
+- Bahasa Indonesia
+
+  - Nenza Nurfirmansyah <nnurfirmansyah@gmail.com> (73)

android/app/build.gradle

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

android/fastlane/envfiles/wger.properties

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

ios/Runner/Info.plist

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

lib/helpers/misc.dart

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

lib/l10n/app_id.arb

@@ -0,0 +1,549 @@
+{
+  "@@last_modified": "2020-11-11T15:04:05.523531",
+  "login": "Masuk",
+  "@login": {
+    "description": "Text for login button"
+  },
+  "logout": "Keluar",
+  "@logout": {
+    "description": "Text for logout button"
+  },
+  "register": "Daftar",
+  "@register": {
+    "description": "Text for registration button"
+  },
+  "useDefaultServer": "Gunakan server bawaan ",
+  "@useDefaultServer": {
+    "description": "Toggle button allowing users to switch between the default and a custom wger server"
+  },
+  "useCustomServer": "Gunakan server lain",
+  "@useCustomServer": {
+    "description": "Toggle button allowing users to switch between the default and a custom wger server"
+  },
+  "invalidUrl": "Mohon masukkan URL yang valid",
+  "@invalidUrl": {
+    "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+  },
+  "usernameValidChars": "Username hanya dapat diisi dengan hiruf, angka, dan karakter @, +, ., -, dan _",
+  "@usernameValidChars": {
+    "description": "Error message when the user tries to register a username with forbidden characters"
+  },
+  "passwordsDontMatch": "Password tidak sesuai",
+  "@passwordsDontMatch": {
+    "description": "Error message when the user enters two different passwords during registration"
+  },
+  "passwordTooShort": "Password terlalu pendek",
+  "@passwordTooShort": {
+    "description": "Error message when the user a password that is too short"
+  },
+  "password": "Password",
+  "@password": {},
+  "confirmPassword": "Konfirmasi Password",
+  "@confirmPassword": {},
+  "invalidEmail": "Mohon masukkan E-mail yang valid",
+  "@invalidEmail": {
+    "description": "Error message when the user enters an invalid email"
+  },
+  "email": "Alamat E-mail",
+  "@email": {},
+  "username": "Username",
+  "@username": {},
+  "invalidUsername": "Mohon masukkan username yang valid",
+  "@invalidUsername": {
+    "description": "Error message when the user enters an invalid username"
+  },
+  "customServerUrl": "URL dari wger",
+  "@customServerUrl": {
+    "description": "Label in the form where the users can enter their own wger instance"
+  },
+  "customServerHint": "Masukkan alamat servermu sendiri, jika tidak akan menggunakan server bawaan",
+  "@customServerHint": {
+    "description": "Hint text for the form where the users can enter their own wger instance"
+  },
+  "reset": "Reset",
+  "@reset": {
+    "description": "Button text allowing the user to reset the entered values to the default"
+  },
+  "registerInstead": "Mohon daftar terlebih dahulu",
+  "@registerInstead": {},
+  "loginInstead": "Mohon masuk terlebih dahulu",
+  "@loginInstead": {},
+  "labelWorkoutPlans": "Daftar rencana workout",
+  "@labelWorkoutPlans": {
+    "description": "Title for screen workout plans"
+  },
+  "labelBottomNavWorkout": "Workout",
+  "@labelBottomNavWorkout": {
+    "description": "Label used in bottom navigation, use a short word"
+  },
+  "labelBottomNavNutrition": "Nutrisi",
+  "@labelBottomNavNutrition": {
+    "description": "Label used in bottom navigation, use a short word"
+  },
+  "labelWorkoutLogs": "Log latihan",
+  "@labelWorkoutLogs": {
+    "description": "(Workout) logs"
+  },
+  "labelWorkoutPlan": "Rencana workout",
+  "@labelWorkoutPlan": {
+    "description": "Title for screen workout plan"
+  },
+  "labelDashboard": "Dashboard",
+  "@labelDashboard": {
+    "description": "Title for screen dashboard"
+  },
+  "successfullyDeleted": "Terhapus",
+  "@successfullyDeleted": {
+    "description": "Message when an item was successfully deleted"
+  },
+  "successfullySaved": "Tersimpan",
+  "@successfullySaved": {
+    "description": "Message when an item was successfully saved"
+  },
+  "exercise": "Latihan",
+  "@exercise": {
+    "description": "An exercise for a workout"
+  },
+  "searchExercise": "Cari latihan untuk ditambahkan",
+  "@searchExercise": {
+    "description": "Label on set form. Selected exercises are added to the set"
+  },
+  "supersetWith": "tambahkan dengan",
+  "@supersetWith": {
+    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
+  },
+  "equipment": "Perlengkapan",
+  "@equipment": {
+    "description": "Equipment needed to perform an exercise"
+  },
+  "muscles": "Otot",
+  "@muscles": {
+    "description": "(main) muscles trained by an exercise"
+  },
+  "musclesSecondary": "Otot sekunder",
+  "@musclesSecondary": {
+    "description": "secondary muscles trained by an exercise"
+  },
+  "category": "Kategori",
+  "@category": {
+    "description": "Category for an exercise, ingredient, etc."
+  },
+  "newWorkout": "Rencana workout baru",
+  "@newWorkout": {
+    "description": "Header when adding a new workout"
+  },
+  "noWorkoutPlans": "Kamu belum mempunyain rencana workout",
+  "@noWorkoutPlans": {
+    "description": "Message shown when the user has no workout plans"
+  },
+  "repetitions": "Pengulangan",
+  "@repetitions": {
+    "description": "Repetitions for an exercise set"
+  },
+  "reps": "Reps",
+  "@reps": {
+    "description": "Shorthand for repetitions, used when space constraints are tighter"
+  },
+  "rir": "RiR",
+  "@rir": {
+    "description": "Shorthand for Repetitions In Reserve"
+  },
+  "rirNotUsed": "RiR tidak digunakan",
+  "@rirNotUsed": {
+    "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
+  },
+  "weightUnit": "Satuan bobot",
+  "@weightUnit": {},
+  "repetitionUnit": "Satuan pengulangan",
+  "@repetitionUnit": {},
+  "set": "Set",
+  "@set": {
+    "description": "A set in a workout plan"
+  },
+  "dayDescriptionHelp": "Deskripsi untuk yang sudah diselesaikan hari ini (contoh: 'pull day') atau bagian tubuh mana yang sudah dilatih (contoh: 'dada dan pundak')",
+  "@dayDescriptionHelp": {},
+  "setNr": "Set {nr}",
+  "@setNr": {
+    "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
+    "type": "text",
+    "placeholders": {
+      "nr": {}
+    }
+  },
+  "sameRepetitions": "Jika Anda melakukan pengulangan dan bobot yang sama untuk semua set, Anda cukup mengisi satu baris. Misalnya untuk 4 set cukup masukkan 10 untuk pengulangan, ini secara otomatis menjadi \"4 x 10\".",
+  "@sameRepetitions": {},
+  "comment": "Komentar",
+  "@comment": {
+    "description": "Comment, additional information"
+  },
+  "impression": "Kesan",
+  "@impression": {
+    "description": "General impression (e.g. for a workout session) such as good, bad, etc."
+  },
+  "notes": "Catatan",
+  "@notes": {
+    "description": "Personal notes, e.g. for a workout session"
+  },
+  "workoutSession": "Sesi workout",
+  "@workoutSession": {
+    "description": "A (logged) workout session"
+  },
+  "newDay": "Hari baru",
+  "@newDay": {},
+  "newSet": "Set baru",
+  "@newSet": {
+    "description": "Header when adding a new set to a workout day"
+  },
+  "selectExercises": "Jika Anda ingin melakukan superset, Anda dapat mencari beberapa latihan, mereka akan dikelompokkan bersama",
+  "@selectExercises": {},
+  "gymMode": "Mode gym",
+  "@gymMode": {
+    "description": "Label when starting the gym mode"
+  },
+  "plateCalculator": "Plates",
+  "@plateCalculator": {
+    "description": "Label used for the plate calculator in the gym mode"
+  },
+  "plateCalculatorNotDivisible": "Tidak memungkinkan untuk mencapai bobot dengan plate yang tersedia",
+  "@plateCalculatorNotDivisible": {
+    "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
+  },
+  "pause": "Jeda",
+  "@pause": {
+    "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
+  },
+  "jumpTo": "Lompat ke",
+  "@jumpTo": {
+    "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
+  },
+  "todaysWorkout": "Latihanmu hari ini",
+  "@todaysWorkout": {},
+  "logHelpEntries": "If on a single day there is more than one entry with the same number of repetitions, but different weights, only the entry with the higher weight is shown in the diagram.",
+  "@logHelpEntries": {},
+  "logHelpEntriesUnits": "Note that only entries with a weight unit (kg or lb) and repetitions are charted, other combinations such as time or until failure are ignored here.",
+  "@logHelpEntriesUnits": {},
+  "description": "Description",
+  "@description": {},
+  "name": "Nama",
+  "@name": {
+    "description": "Name for a workout or nutritional plan"
+  },
+  "save": "Simpan",
+  "@save": {},
+  "addSet": "Tambah set",
+  "@addSet": {
+    "description": "Label for the button that adds a set (to a workout day)"
+  },
+  "addMeal": "Tambah makanan",
+  "@addMeal": {},
+  "mealLogged": "Meal logged to diary",
+  "@mealLogged": {},
+  "logMeal": "Catat makanan ini",
+  "@logMeal": {},
+  "addIngredient": "Tambah komposisi",
+  "@addIngredient": {},
+  "logIngredient": "Simpan di diari nutrisi",
+  "@logIngredient": {},
+  "searchIngredient": "Cari komposisi",
+  "@searchIngredient": {
+    "description": "Label on ingredient search form"
+  },
+  "nutritionalPlan": "Nutritional plan",
+  "@nutritionalPlan": {},
+  "nutritionalDiary": "Nutritional diary",
+  "@nutritionalDiary": {},
+  "nutritionalPlans": "Nutritional plans",
+  "@nutritionalPlans": {},
+  "noNutritionalPlans": "You have no nutritional plans",
+  "@noNutritionalPlans": {
+    "description": "Message shown when the user has no nutritional plans"
+  },
+  "anErrorOccurred": "An Error Occurred!",
+  "@anErrorOccurred": {},
+  "weight": "Weight",
+  "@weight": {
+    "description": "The weight of a workout log or body weight entry"
+  },
+  "measurement": "Ukuran",
+  "measurements": "Measurements",
+  "@measurements": {
+    "description": "Categories for the measurements such as biceps size, body fat, etc."
+  },
+  "measurementCategoriesHelpText": "Measurement category, such as 'biceps' or 'body fat'",
+  "measurementEntriesHelpText": "The unit used to measure the category such as 'cm' or '%'",
+  "date": "Date",
+  "@date": {
+    "description": "The date of a workout log or body weight entry"
+  },
+  "value": "Value",
+  "@value": {
+    "description": "The value of a measurement entry"
+  },
+  "start": "Start",
+  "@start": {
+    "description": "Label on button to start the gym mode (i.e., an imperative)"
+  },
+  "time": "Time",
+  "@time": {
+    "description": "The time of a meal or workout"
+  },
+  "timeStart": "Start time",
+  "@timeStart": {
+    "description": "The starting time of a workout"
+  },
+  "timeEnd": "End time",
+  "@timeEnd": {
+    "description": "The end time of a workout"
+  },
+  "timeStartAhead": "Start time cannot be ahead of end time",
+  "ingredient": "Ingredient",
+  "@ingredient": {},
+  "energy": "Energy",
+  "@energy": {
+    "description": "Energy in a meal, ingredient etc. e.g. in kJ"
+  },
+  "energyShort": "E",
+  "@energyShort": {
+    "description": "The first letter or short name of the word 'Energy', used in overviews"
+  },
+  "kcal": "kcal",
+  "@kcal": {
+    "description": "Energy in a meal in kilocalories, kcal"
+  },
+  "macronutrients": "Macronutrients",
+  "planned": "Planned",
+  "@planned": {
+    "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
+  },
+  "logged": "Logged",
+  "@logged": {
+    "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
+  },
+  "weekAverage": "7 day average",
+  "@weekAverage": {
+    "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
+  },
+  "difference": "Difference",
+  "percentEnergy": "Percent of energy",
+  "gPerBodyKg": "g per body kg",
+  "@gPerBodyKg": {
+    "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
+  },
+  "total": "Total",
+  "@total": {
+    "description": "Label used for total sums of e.g. calories or similar"
+  },
+  "kJ": "kJ",
+  "@kJ": {
+    "description": "Energy in a meal in kilo joules, kJ"
+  },
+  "g": "g",
+  "@g": {
+    "description": "Abbreviation for gram"
+  },
+  "protein": "Protein",
+  "@protein": {},
+  "proteinShort": "P",
+  "@proteinShort": {
+    "description" : "The first letter or short name of the word 'Protein', used in overviews"
+  },
+  "carbohydrates": "Carbohydrates",
+  "@carbohydrates": {},
+  "carbohydratesShort": "C",
+  "@carbohydratesShort": {
+    "description" : "The first letter or short name of the word 'Carbohydrates', used in overviews"
+  },
+  "sugars": "Sugars",
+  "@sugars": {},
+  "fat": "Fat",
+  "@fat": {},
+  "fatShort": "F",
+  "@fatShort": {
+    "description" : "The first letter or short name of the word 'Fat', used in overviews"
+  },
+  "saturatedFat": "Saturated fat",
+  "@saturatedFat": {},
+  "fibres": "Fibre",
+  "@fibres": {},
+  "sodium": "Sodium",
+  "@sodium": {},
+  "amount": "Amount",
+  "@amount": {
+    "description": "The amount (e.g. in grams) of an ingredient in a meal"
+  },
+  "unit": "Unit",
+  "@unit": {
+    "description": "The unit used for a repetition (kg, time, etc.)"
+  },
+  "newEntry": "New entry",
+  "@newEntry": {
+    "description": "Title when adding a new entry such as a weight or log entry"
+  },
+  "noWeightEntries": "You have no weight entries",
+  "@noWeightEntries": {
+    "description": "Message shown when the user has no logged weight entries"
+  },
+  "edit": "Edit",
+  "@edit": {},
+  "loadingText": "Loading...",
+  "@loadingText": {
+    "description": "Text to show when entries are being loaded in the background: Loading..."
+  },
+  "delete": "Delete",
+  "@delete": {},
+  "confirmDelete": "Are you sure you want to delete '{toDelete}'?",
+  "@confirmDelete": {
+    "description": "Confirmation text before the user deletes an object",
+    "type": "text",
+    "placeholders": {
+      "toDelete": {}
+    }
+  },
+  "newNutritionalPlan": "New nutritional plan",
+  "@newNutritionalPlan": {},
+  "toggleDetails": "Toggle details",
+  "@toggleDetails": {
+    "description": "Switch to toggle detail / overview"
+  },
+  "goToDetailPage": "Go to detail page",
+  "aboutDescription": "Thank you for using wger! wger is a collaborative open source project, made by fitness enthusiasts from around the world.",
+  "@aboutDescription": {
+    "description": "Text in the about dialog"
+  },
+  "aboutSourceTitle": "Source code",
+  "@aboutSourceTitle": {
+    "description": "Title for source code section in the about dialog"
+  },
+  "aboutSourceText": "Get the source code of this application and its server on github",
+  "@aboutSourceText": {
+    "description": "Text for source code section in the about dialog"
+  },
+  "aboutBugsTitle": "Have a problem or idea?",
+  "@aboutBugsTitle": {
+    "description": "Title for bugs section in the about dialog"
+  },
+  "aboutBugsText": "Get in touch if something didn't behave as expected or if there is a feature that you feel is missing.",
+  "@aboutBugsText": {
+    "description": "Text for bugs section in the about dialog"
+  },
+  "aboutContactUsTitle": "Say hi!",
+  "@aboutContactUsTitle": {
+    "description": "Title for contact us section in the about dialog"
+  },
+  "aboutContactUsText": "If you want to chat with us, hop on the Discord server and get in touch",
+  "@aboutContactUsText": {
+    "description": "Text for contact us section in the about dialog"
+  },
+  "aboutTranslationTitle": "Translation",
+  "@aboutTranslationTitle": {
+    "description": "Title for translation section in the about dialog"
+  },
+  "aboutTranslationText": "This application is translated on weblate. If you also want to help, click the link and start translating",
+  "@aboutTranslationText": {
+    "description": "Text for translation section in the about dialog"
+  },
+  "calendar": "Calendar",
+  "@calendar": {},
+  "goToToday": "Go to today",
+  "@goToToday": {
+    "description": "Label on button to jump back to 'today' in the calendar widget"
+  },
+  "enterRepetitionsOrWeight": "Please fill in either the repetitions or the weight for at least one of the sets",
+  "@enterRepetitionsOrWeight": {
+    "description": "Error message when the user hasn't filled in the forms for exercise sets"
+  },
+  "enterValue": "Please enter a value",
+  "@enterValue": {
+    "description": "Error message when the user hasn't entered a value on a required field"
+  },
+  "selectExercise": "Please select an exercise",
+  "@selectExercise": {
+    "description": "Error message when the user hasn't selected an exercise in the form"
+  },
+  "enterCharacters": "Please enter between {min} and {max} characters",
+  "@enterCharacters": {
+    "description": "Error message when the user hasn't entered the correct number of characters in a form",
+    "type": "text",
+    "placeholders": {
+      "min": {},
+      "max": {}
+    }
+  },
+  "nrOfSets": "Sets per exercise: {nrOfSets}",
+  "@nrOfSets": {
+    "description": "Label shown on the slider where the user selects the nr of sets",
+    "type": "text",
+    "placeholders": {
+      "nrOfSets": {}
+    }
+  },
+  "setUnitsAndRir": "Set units and RiR",
+  "@setUnitsAndRir": {
+    "description": "Label shown on the slider where the user can toggle showing units and RiR",
+    "type": "text"
+  },
+  "enterValidNumber": "Please enter a valid number",
+  "@enterValidNumber": {
+    "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
+  },
+  "selectIngredient": "Please select an ingredient",
+  "@selectIngredient": {
+    "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
+  },
+  "recentlyUsedIngredients": "Recently added ingredients",
+  "@recentlyUsedIngredients": {
+    "description": "A message when a user adds a new ingredient to a meal."
+  },
+  "selectImage": "Please select an image",
+  "@selectImage": {
+    "description": "Label and error message when the user hasn't selected an image to save"
+  },
+  "optionsLabel": "Options",
+  "@optionsLabel": {
+    "description": "Label for the popup with general app options"
+  },
+  "takePicture": "Take a picture",
+  "chooseFromLibrary": "Choose from photo library",
+  "gallery": "Gallery",
+  "addImage": "Add image",
+  "dataCopied": "Data copied to new entry",
+  "@dataCopied": {
+    "description": "Snackbar message to show on copying data to a new log entry"
+  },
+  "appUpdateTitle" : "Update needed",
+  "appUpdateContent" : "This version of the app is not compatible with the server, please update your application.",
+
+  "productFound": "Product found",
+  "@productFound": {
+    "description": "Header label for dialog when product is found with barcode"
+  },
+
+  "productFoundDescription": "The barcode corresponds to this product: {productName}. Do you want to continue?",
+  "@productFoundDescription": {
+    "description": "Dialog info when product is found with barcode",
+    "type": "text",
+    "placeholders": {
+      "productName": {}
+    }
+  },
+  "productNotFound": "Product not found",
+  "@productNotFound": {
+    "description": "Header label for dialog when product is not found with barcode"
+  },
+  "productNotFoundDescription": "The product with the scanned barcode {barcode} was not found in the wger database",
+  "@productNotFoundDescription": {
+    "description": "Dialog info when product is not found with barcode",
+    "type": "text",
+    "placeholders": {
+      "barcode": {}
+    }
+  },
+  "scanBarcode": "Scan barcode",
+  "@scanBarcode": {
+    "description": "Label for scan barcode button"
+  },
+  "close": "Close",
+  "@close": {
+    "description": "Translation for close"
+  }
+}

lib/models/nutrition/ingredient.dart

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

lib/models/nutrition/ingredient.g.dart

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

lib/models/nutrition/nutritional_values.dart

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

lib/models/workouts/log.dart

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

lib/screens/auth_screen.dart

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

lib/theme/theme.dart

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

lib/widgets/dashboard/widgets.dart

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

lib/widgets/measurements/forms.dart

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

pubspec.lock

@@ -489,7 +489,7 @@ packages:
       name: image_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.5"
+    version: "0.8.6"
   image_picker_android:
     dependency: transitive
     description:
@@ -510,14 +510,14 @@ packages:
       name: image_picker_ios
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.5"
+    version: "0.8.6+1"
   image_picker_platform_interface:
     dependency: transitive
     description:
       name: image_picker_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.4"
+    version: "2.6.2"
   intl:
     dependency: "direct main"
     description:
@@ -545,14 +545,14 @@ packages:
       name: json_annotation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.6.0"
+    version: "4.7.0"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.3.2"
+    version: "6.5.0"
   klizma:
     dependency: transitive
     description:
@@ -622,7 +622,7 @@ packages:
       name: mockito
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.3.1"
+    version: "5.3.2"
   nested:
     dependency: transitive
     description:
@@ -956,7 +956,7 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.5"
+    version: "6.1.6"
   url_launcher_android:
     dependency: transitive
     description:

pubspec.yaml

@@ -42,16 +42,16 @@ dependencies:
   flutter_typeahead: ^4.1.1
   font_awesome_flutter: ^10.2.1
   http: ^0.13.5
-  image_picker: ^0.8.4+9
+  image_picker: ^0.8.6
   intl: ^0.17.0
-  json_annotation: ^4.5.0
+  json_annotation: ^4.7.0
   version: ^3.0.2
   package_info: ^2.0.2
   provider: ^6.0.3
   rive: ^0.9.1
   shared_preferences: ^2.0.15
   table_calendar: ^3.0.7
-  url_launcher: ^6.1.5
+  url_launcher: ^6.1.6
   flutter_barcode_scanner: ^2.0.0
   video_player: ^2.4.7
   multi_select_flutter: ^4.1.2
@@ -64,8 +64,8 @@ dev_dependencies:
     sdk: flutter
   build_runner: ^2.2.1
   flutter_launcher_icons: ^0.10.0
-  json_serializable: ^6.3.2
+  json_serializable: ^6.5.0
-  mockito: ^5.3.1
+  mockito: ^5.3.2
   network_image_mock: ^2.1.1
   flutter_lints: ^2.0.1
   cider: ^0.1.1

test/gallery/gallery_screen_test.mocks.dart

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

test/measurements/measurement_categories_screen_test.mocks.dart

@@ -1,7 +1,8 @@
-// Mocks generated by Mockito 5.2.0 from annotations
+// Mocks generated by Mockito 5.3.2 from annotations
 // in wger/test/measurements/measurement_categories_screen_test.dart.
 // Do not manually edit this file.
 
+// ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i5;
 import 'dart:ui' as _i7;
 
@@ -20,104 +21,216 @@ import 'package:wger/providers/measurement.dart' as _i4;
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
 
-class _FakeWgerBaseProvider_0 extends _i1.Fake implements _i2.WgerBaseProvider {
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
 }
 
-class _FakeMeasurementCategory_1 extends _i1.Fake
+class _FakeMeasurementCategory_1 extends _i1.SmartFake implements _i3.MeasurementCategory {
-    implements _i3.MeasurementCategory {}
+  _FakeMeasurementCategory_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
 /// A class which mocks [MeasurementProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockMeasurementProvider extends _i1.Mock
+class MockMeasurementProvider extends _i1.Mock implements _i4.MeasurementProvider {
-    implements _i4.MeasurementProvider {
   MockMeasurementProvider() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider =>
+  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.getter(#baseProvider),
+        Invocation.getter(#baseProvider),
-          returnValue: _FakeWgerBaseProvider_0()) as _i2.WgerBaseProvider);
+        returnValue: _FakeWgerBaseProvider_0(
+          this,
+          Invocation.getter(#baseProvider),
+        ),
+      ) as _i2.WgerBaseProvider);
   @override
-  List<_i3.MeasurementCategory> get categories =>
+  List<_i3.MeasurementCategory> get categories => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.getter(#categories),
+        Invocation.getter(#categories),
-              returnValue: <_i3.MeasurementCategory>[])
+        returnValue: <_i3.MeasurementCategory>[],
-          as List<_i3.MeasurementCategory>);
+      ) as List<_i3.MeasurementCategory>);
   @override
-  bool get hasListeners =>
+  bool get hasListeners => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false)
+        Invocation.getter(#hasListeners),
-          as bool);
+        returnValue: false,
+      ) as bool);
   @override
-  void clear() => super.noSuchMethod(Invocation.method(#clear, []),
+  void clear() => super.noSuchMethod(
-      returnValueForMissingStub: null);
+        Invocation.method(
+          #clear,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
   _i3.MeasurementCategory findCategoryById(int? id) => (super.noSuchMethod(
-      Invocation.method(#findCategoryById, [id]),
+        Invocation.method(
-      returnValue: _FakeMeasurementCategory_1()) as _i3.MeasurementCategory);
+          #findCategoryById,
+          [id],
+        ),
+        returnValue: _FakeMeasurementCategory_1(
+          this,
+          Invocation.method(
+            #findCategoryById,
+            [id],
+          ),
+        ),
+      ) as _i3.MeasurementCategory);
   @override
-  _i5.Future<void> fetchAndSetCategories() =>
+  _i5.Future<void> fetchAndSetCategories() => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.method(#fetchAndSetCategories, []),
+        Invocation.method(
-          returnValue: Future<void>.value(),
+          #fetchAndSetCategories,
-          returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
+          [],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
   @override
-  _i5.Future<void> fetchAndSetCategoryEntries(int? id) =>
+  _i5.Future<void> fetchAndSetCategoryEntries(int? id) => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.method(#fetchAndSetCategoryEntries, [id]),
+        Invocation.method(
-          returnValue: Future<void>.value(),
+          #fetchAndSetCategoryEntries,
-          returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
+          [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, []),
+        Invocation.method(
-      returnValue: Future<void>.value(),
+          #fetchAndSetAllCategoriesAndEntries,
-      returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
+          [],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
   @override
-  _i5.Future<void> addCategory(_i3.MeasurementCategory? category) =>
+  _i5.Future<void> addCategory(_i3.MeasurementCategory? category) => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.method(#addCategory, [category]),
+        Invocation.method(
-          returnValue: Future<void>.value(),
+          #addCategory,
-          returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
+          [category],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
   @override
-  _i5.Future<void> deleteCategory(int? id) =>
+  _i5.Future<void> deleteCategory(int? id) => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.method(#deleteCategory, [id]),
+        Invocation.method(
-          returnValue: Future<void>.value(),
+          #deleteCategory,
-          returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
+          [id],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
   @override
-  _i5.Future<void> editCategory(int? id, String? newName, String? newUnit) =>
+  _i5.Future<void> editCategory(
+    int? id,
+    String? newName,
+    String? newUnit,
+  ) =>
       (super.noSuchMethod(
-          Invocation.method(#editCategory, [id, newName, newUnit]),
+        Invocation.method(
-          returnValue: Future<void>.value(),
+          #editCategory,
-          returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
+          [
+            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) =>
+  _i5.Future<void> addEntry(_i6.MeasurementEntry? entry) => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.method(#addEntry, [entry]),
+        Invocation.method(
-          returnValue: Future<void>.value(),
+          #addEntry,
-          returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
+          [entry],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
   @override
-  _i5.Future<void> deleteEntry(int? id, int? categoryId) =>
+  _i5.Future<void> deleteEntry(
-      (super.noSuchMethod(Invocation.method(#deleteEntry, [id, categoryId]),
+    int? id,
-          returnValue: Future<void>.value(),
+    int? categoryId,
-          returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
+  ) =>
-  @override
-  _i5.Future<void> editEntry(int? id, int? categoryId, num? newValue,
-          String? newNotes, DateTime? newDate) =>
       (super.noSuchMethod(
-          Invocation.method(
+        Invocation.method(
-              #editEntry, [id, categoryId, newValue, newNotes, newDate]),
+          #deleteEntry,
-          returnValue: Future<void>.value(),
+          [
-          returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
+            id,
+            categoryId,
+          ],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
   @override
-  void addListener(_i7.VoidCallback? listener) =>
+  _i5.Future<void> editEntry(
-      super.noSuchMethod(Invocation.method(#addListener, [listener]),
+    int? id,
-          returnValueForMissingStub: null);
+    int? categoryId,
+    num? newValue,
+    String? newNotes,
+    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>);
   @override
-  void removeListener(_i7.VoidCallback? listener) =>
+  void addListener(_i7.VoidCallback? listener) => super.noSuchMethod(
-      super.noSuchMethod(Invocation.method(#removeListener, [listener]),
+        Invocation.method(
-          returnValueForMissingStub: null);
+          #addListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  void dispose() => super.noSuchMethod(Invocation.method(#dispose, []),
+  void removeListener(_i7.VoidCallback? listener) => super.noSuchMethod(
-      returnValueForMissingStub: null);
+        Invocation.method(
+          #removeListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  void notifyListeners() =>
+  void dispose() => super.noSuchMethod(
-      super.noSuchMethod(Invocation.method(#notifyListeners, []),
+        Invocation.method(
-          returnValueForMissingStub: null);
+          #dispose,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
 }

test/measurements/measurement_provider_test.mocks.dart

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

test/nutrition/nutritional_plan_form_test.mocks.dart

@@ -1,7 +1,8 @@
-// Mocks generated by Mockito 5.2.0 from annotations
+// Mocks generated by Mockito 5.3.2 from annotations
 // in wger/test/nutrition/nutritional_plan_form_test.dart.
 // Do not manually edit this file.
 
+// ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i9;
 import 'dart:ui' as _i10;
 
@@ -23,221 +24,543 @@ import 'package:wger/providers/nutrition.dart' as _i8;
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
 
-class _FakeAuthProvider_0 extends _i1.Fake implements _i2.AuthProvider {}
+class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
+  _FakeAuthProvider_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeClient_1 extends _i1.Fake implements _i3.Client {}
+class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
+  _FakeClient_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeNutritionalPlan_2 extends _i1.Fake implements _i4.NutritionalPlan {}
+class _FakeNutritionalPlan_2 extends _i1.SmartFake implements _i4.NutritionalPlan {
+  _FakeNutritionalPlan_2(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeMeal_3 extends _i1.Fake implements _i5.Meal {}
+class _FakeMeal_3 extends _i1.SmartFake implements _i5.Meal {
+  _FakeMeal_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeMealItem_4 extends _i1.Fake implements _i6.MealItem {}
+class _FakeMealItem_4 extends _i1.SmartFake implements _i6.MealItem {
+  _FakeMealItem_4(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeIngredient_5 extends _i1.Fake implements _i7.Ingredient {}
+class _FakeIngredient_5 extends _i1.SmartFake implements _i7.Ingredient {
+  _FakeIngredient_5(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeUri_6 extends _i1.Fake implements Uri {}
+class _FakeUri_6 extends _i1.SmartFake implements Uri {
+  _FakeUri_6(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeResponse_7 extends _i1.Fake implements _i3.Response {}
+class _FakeResponse_7 extends _i1.SmartFake implements _i3.Response {
+  _FakeResponse_7(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
 /// A class which mocks [NutritionPlansProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNutritionPlansProvider extends _i1.Mock
+class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansProvider {
-    implements _i8.NutritionPlansProvider {
   MockNutritionPlansProvider() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  List<_i4.NutritionalPlan> get items =>
+  List<_i4.NutritionalPlan> get items => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.getter(#items),
+        Invocation.getter(#items),
-          returnValue: <_i4.NutritionalPlan>[]) as List<_i4.NutritionalPlan>);
+        returnValue: <_i4.NutritionalPlan>[],
+      ) as List<_i4.NutritionalPlan>);
   @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(Invocation.getter(#auth),
+  _i2.AuthProvider get auth => (super.noSuchMethod(
-      returnValue: _FakeAuthProvider_0()) as _i2.AuthProvider);
+        Invocation.getter(#auth),
+        returnValue: _FakeAuthProvider_0(
+          this,
+          Invocation.getter(#auth),
+        ),
+      ) as _i2.AuthProvider);
   @override
-  set auth(_i2.AuthProvider? _auth) =>
+  set auth(_i2.AuthProvider? _auth) => super.noSuchMethod(
-      super.noSuchMethod(Invocation.setter(#auth, _auth),
+        Invocation.setter(
-          returnValueForMissingStub: null);
+          #auth,
+          _auth,
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  _i3.Client get client => (super.noSuchMethod(Invocation.getter(#client),
+  _i3.Client get client => (super.noSuchMethod(
-      returnValue: _FakeClient_1()) as _i3.Client);
+        Invocation.getter(#client),
+        returnValue: _FakeClient_1(
+          this,
+          Invocation.getter(#client),
+        ),
+      ) as _i3.Client);
   @override
-  set client(_i3.Client? _client) =>
+  set client(_i3.Client? _client) => super.noSuchMethod(
-      super.noSuchMethod(Invocation.setter(#client, _client),
+        Invocation.setter(
-          returnValueForMissingStub: null);
+          #client,
+          _client,
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  bool get hasListeners =>
+  bool get hasListeners => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false)
+        Invocation.getter(#hasListeners),
-          as bool);
+        returnValue: false,
+      ) as bool);
   @override
-  void clear() => super.noSuchMethod(Invocation.method(#clear, []),
+  void clear() => super.noSuchMethod(
-      returnValueForMissingStub: null);
+        Invocation.method(
+          #clear,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  _i4.NutritionalPlan findById(int? id) =>
+  _i4.NutritionalPlan findById(int? id) => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.method(#findById, [id]),
+        Invocation.method(
-          returnValue: _FakeNutritionalPlan_2()) as _i4.NutritionalPlan);
+          #findById,
+          [id],
+        ),
+        returnValue: _FakeNutritionalPlan_2(
+          this,
+          Invocation.method(
+            #findById,
+            [id],
+          ),
+        ),
+      ) as _i4.NutritionalPlan);
   @override
-  _i5.Meal? findMealById(int? id) =>
+  _i5.Meal? findMealById(int? id) => (super.noSuchMethod(Invocation.method(
-      (super.noSuchMethod(Invocation.method(#findMealById, [id])) as _i5.Meal?);
+        #findMealById,
+        [id],
+      )) as _i5.Meal?);
   @override
-  _i9.Future<void> fetchAndSetAllPlansSparse() =>
+  _i9.Future<void> fetchAndSetAllPlansSparse() => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.method(#fetchAndSetAllPlansSparse, []),
+        Invocation.method(
-          returnValue: Future<void>.value(),
+          #fetchAndSetAllPlansSparse,
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+          [],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
   @override
-  _i9.Future<void> fetchAndSetAllPlansFull() =>
+  _i9.Future<void> fetchAndSetAllPlansFull() => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.method(#fetchAndSetAllPlansFull, []),
+        Invocation.method(
-          returnValue: Future<void>.value(),
+          #fetchAndSetAllPlansFull,
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+          [],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
   @override
-  _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanSparse(int? planId) =>
+  _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.method(#fetchAndSetPlanSparse, [planId]),
+        Invocation.method(
-              returnValue:
+          #fetchAndSetPlanSparse,
-                  Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2()))
+          [planId],
-          as _i9.Future<_i4.NutritionalPlan>);
+        ),
+        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) =>
+  _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanFull(int? planId) => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.method(#fetchAndSetPlanFull, [planId]),
+        Invocation.method(
-              returnValue:
+          #fetchAndSetPlanFull,
-                  Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2()))
+          [planId],
-          as _i9.Future<_i4.NutritionalPlan>);
+        ),
+        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) =>
+  _i9.Future<_i4.NutritionalPlan> addPlan(_i4.NutritionalPlan? planData) => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.method(#addPlan, [planData]),
+        Invocation.method(
-              returnValue:
+          #addPlan,
-                  Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2()))
+          [planData],
-          as _i9.Future<_i4.NutritionalPlan>);
+        ),
+        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) =>
+  _i9.Future<void> editPlan(_i4.NutritionalPlan? plan) => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.method(#editPlan, [plan]),
+        Invocation.method(
-          returnValue: Future<void>.value(),
+          #editPlan,
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+          [plan],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
   @override
-  _i9.Future<void> deletePlan(int? id) =>
+  _i9.Future<void> deletePlan(int? id) => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.method(#deletePlan, [id]),
+        Invocation.method(
-          returnValue: Future<void>.value(),
+          #deletePlan,
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+          [id],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
   @override
-  _i9.Future<_i5.Meal> addMeal(_i5.Meal? meal, int? planId) =>
+  _i9.Future<_i5.Meal> addMeal(
-      (super.noSuchMethod(Invocation.method(#addMeal, [meal, planId]),
+    _i5.Meal? meal,
-              returnValue: Future<_i5.Meal>.value(_FakeMeal_3()))
+    int? planId,
-          as _i9.Future<_i5.Meal>);
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #addMeal,
+          [
+            meal,
+            planId,
+          ],
+        ),
+        returnValue: _i9.Future<_i5.Meal>.value(_FakeMeal_3(
+          this,
+          Invocation.method(
+            #addMeal,
+            [
+              meal,
+              planId,
+            ],
+          ),
+        )),
+      ) as _i9.Future<_i5.Meal>);
   @override
-  _i9.Future<_i5.Meal> editMeal(_i5.Meal? meal) =>
+  _i9.Future<_i5.Meal> editMeal(_i5.Meal? meal) => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.method(#editMeal, [meal]),
+        Invocation.method(
-              returnValue: Future<_i5.Meal>.value(_FakeMeal_3()))
+          #editMeal,
-          as _i9.Future<_i5.Meal>);
+          [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) =>
+  _i9.Future<void> deleteMeal(_i5.Meal? meal) => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.method(#deleteMeal, [meal]),
+        Invocation.method(
-          returnValue: Future<void>.value(),
+          #deleteMeal,
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+          [meal],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
   @override
   _i9.Future<_i6.MealItem> addMealItem(
-          _i6.MealItem? mealItem, _i5.Meal? meal) =>
+    _i6.MealItem? mealItem,
-      (super.noSuchMethod(Invocation.method(#addMealItem, [mealItem, meal]),
+    _i5.Meal? meal,
-              returnValue: Future<_i6.MealItem>.value(_FakeMealItem_4()))
+  ) =>
-          as _i9.Future<_i6.MealItem>);
-  @override
-  _i9.Future<void> deleteMealItem(_i6.MealItem? mealItem) =>
-      (super.noSuchMethod(Invocation.method(#deleteMealItem, [mealItem]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  _i9.Future<_i7.Ingredient> fetchIngredient(int? ingredientId) =>
-      (super.noSuchMethod(Invocation.method(#fetchIngredient, [ingredientId]),
-              returnValue: Future<_i7.Ingredient>.value(_FakeIngredient_5()))
-          as _i9.Future<_i7.Ingredient>);
-  @override
-  _i9.Future<void> fetchIngredientsFromCache() =>
-      (super.noSuchMethod(Invocation.method(#fetchIngredientsFromCache, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  _i9.Future<List<dynamic>> searchIngredient(String? name,
-          [String? languageCode = r'en']) =>
-      (super.noSuchMethod(
-              Invocation.method(#searchIngredient, [name, languageCode]),
-              returnValue: Future<List<dynamic>>.value(<dynamic>[]))
-          as _i9.Future<List<dynamic>>);
-  @override
-  _i9.Future<_i7.Ingredient?> searchIngredientWithCode(String? code) =>
-      (super.noSuchMethod(Invocation.method(#searchIngredientWithCode, [code]),
-              returnValue: Future<_i7.Ingredient?>.value())
-          as _i9.Future<_i7.Ingredient?>);
-  @override
-  _i9.Future<void> logMealToDiary(_i5.Meal? meal) =>
-      (super.noSuchMethod(Invocation.method(#logMealToDiary, [meal]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  _i9.Future<void> logIngredentToDiary(_i6.MealItem? mealItem, int? planId,
-          [DateTime? dateTime]) =>
-      (super.noSuchMethod(
-          Invocation.method(#logIngredentToDiary, [mealItem, planId, dateTime]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  _i9.Future<void> deleteLog(int? logId, int? planId) =>
-      (super.noSuchMethod(Invocation.method(#deleteLog, [logId, planId]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  _i9.Future<void> fetchAndSetLogs(_i4.NutritionalPlan? plan) =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetLogs, [plan]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  Map<String, String> getDefaultHeaders({dynamic includeAuth = false}) =>
       (super.noSuchMethod(
+        Invocation.method(
+          #addMealItem,
+          [
+            mealItem,
+            meal,
+          ],
+        ),
+        returnValue: _i9.Future<_i6.MealItem>.value(_FakeMealItem_4(
+          this,
           Invocation.method(
-              #getDefaultHeaders, [], {#includeAuth: includeAuth}),
+            #addMealItem,
-          returnValue: <String, String>{}) as Map<String, String>);
+            [
+              mealItem,
+              meal,
+            ],
+          ),
+        )),
+      ) as _i9.Future<_i6.MealItem>);
   @override
-  Uri makeUrl(String? path,
+  _i9.Future<void> deleteMealItem(_i6.MealItem? mealItem) => (super.noSuchMethod(
-          {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
+        Invocation.method(
+          #deleteMealItem,
+          [mealItem],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  _i9.Future<_i7.Ingredient> fetchIngredient(int? ingredientId) => (super.noSuchMethod(
+        Invocation.method(
+          #fetchIngredient,
+          [ingredientId],
+        ),
+        returnValue: _i9.Future<_i7.Ingredient>.value(_FakeIngredient_5(
+          this,
+          Invocation.method(
+            #fetchIngredient,
+            [ingredientId],
+          ),
+        )),
+      ) as _i9.Future<_i7.Ingredient>);
+  @override
+  _i9.Future<void> fetchIngredientsFromCache() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchIngredientsFromCache,
+          [],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  _i9.Future<List<dynamic>> searchIngredient(
+    String? name, [
+    String? languageCode = r'en',
+  ]) =>
       (super.noSuchMethod(
-          Invocation.method(#makeUrl, [path],
+        Invocation.method(
-              {#id: id, #objectMethod: objectMethod, #query: query}),
+          #searchIngredient,
-          returnValue: _FakeUri_6()) as Uri);
+          [
+            name,
+            languageCode,
+          ],
+        ),
+        returnValue: _i9.Future<List<dynamic>>.value(<dynamic>[]),
+      ) as _i9.Future<List<dynamic>>);
+  @override
+  _i9.Future<_i7.Ingredient?> searchIngredientWithCode(String? code) => (super.noSuchMethod(
+        Invocation.method(
+          #searchIngredientWithCode,
+          [code],
+        ),
+        returnValue: _i9.Future<_i7.Ingredient?>.value(),
+      ) as _i9.Future<_i7.Ingredient?>);
+  @override
+  _i9.Future<void> logMealToDiary(_i5.Meal? meal) => (super.noSuchMethod(
+        Invocation.method(
+          #logMealToDiary,
+          [meal],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  _i9.Future<void> logIngredentToDiary(
+    _i6.MealItem? mealItem,
+    int? planId, [
+    DateTime? dateTime,
+  ]) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #logIngredentToDiary,
+          [
+            mealItem,
+            planId,
+            dateTime,
+          ],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  _i9.Future<void> deleteLog(
+    int? logId,
+    int? planId,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #deleteLog,
+          [
+            logId,
+            planId,
+          ],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  _i9.Future<void> fetchAndSetLogs(_i4.NutritionalPlan? plan) => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetLogs,
+          [plan],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  Uri makeUrl(
+    String? path, {
+    int? id,
+    String? objectMethod,
+    Map<String, dynamic>? query,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #makeUrl,
+          [path],
+          {
+            #id: id,
+            #objectMethod: objectMethod,
+            #query: query,
+          },
+        ),
+        returnValue: _FakeUri_6(
+          this,
+          Invocation.method(
+            #makeUrl,
+            [path],
+            {
+              #id: id,
+              #objectMethod: objectMethod,
+              #query: query,
+            },
+          ),
+        ),
+      ) as Uri);
   @override
   _i9.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
-          Invocation.method(#fetch, [uri]),
+        Invocation.method(
-          returnValue: Future<Map<String, dynamic>>.value(<String, dynamic>{}))
+          #fetch,
-      as _i9.Future<Map<String, dynamic>>);
+          [uri],
+        ),
+        returnValue: _i9.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i9.Future<Map<String, dynamic>>);
   @override
-  _i9.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
+  _i9.Future<Map<String, dynamic>> post(
-      (super.noSuchMethod(Invocation.method(#post, [data, uri]),
+    Map<String, dynamic>? data,
-              returnValue:
+    Uri? uri,
-                  Future<Map<String, dynamic>>.value(<String, dynamic>{}))
+  ) =>
-          as _i9.Future<Map<String, dynamic>>);
+      (super.noSuchMethod(
+        Invocation.method(
+          #post,
+          [
+            data,
+            uri,
+          ],
+        ),
+        returnValue: _i9.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i9.Future<Map<String, dynamic>>);
   @override
   _i9.Future<Map<String, dynamic>> patch(
-          Map<String, dynamic>? data, Uri? uri) =>
+    Map<String, dynamic>? data,
-      (super.noSuchMethod(Invocation.method(#patch, [data, uri]),
+    Uri? uri,
-              returnValue:
+  ) =>
-                  Future<Map<String, dynamic>>.value(<String, dynamic>{}))
+      (super.noSuchMethod(
-          as _i9.Future<Map<String, dynamic>>);
+        Invocation.method(
+          #patch,
+          [
+            data,
+            uri,
+          ],
+        ),
+        returnValue: _i9.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i9.Future<Map<String, dynamic>>);
   @override
-  _i9.Future<_i3.Response> deleteRequest(String? url, int? id) =>
+  _i9.Future<_i3.Response> deleteRequest(
-      (super.noSuchMethod(Invocation.method(#deleteRequest, [url, id]),
+    String? url,
-              returnValue: Future<_i3.Response>.value(_FakeResponse_7()))
+    int? id,
-          as _i9.Future<_i3.Response>);
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #deleteRequest,
+          [
+            url,
+            id,
+          ],
+        ),
+        returnValue: _i9.Future<_i3.Response>.value(_FakeResponse_7(
+          this,
+          Invocation.method(
+            #deleteRequest,
+            [
+              url,
+              id,
+            ],
+          ),
+        )),
+      ) as _i9.Future<_i3.Response>);
   @override
-  void addListener(_i10.VoidCallback? listener) =>
+  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
-      super.noSuchMethod(Invocation.method(#addListener, [listener]),
+        Invocation.method(
-          returnValueForMissingStub: null);
+          #addListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  void removeListener(_i10.VoidCallback? listener) =>
+  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
-      super.noSuchMethod(Invocation.method(#removeListener, [listener]),
+        Invocation.method(
-          returnValueForMissingStub: null);
+          #removeListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  void dispose() => super.noSuchMethod(Invocation.method(#dispose, []),
+  void dispose() => super.noSuchMethod(
-      returnValueForMissingStub: null);
+        Invocation.method(
+          #dispose,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  void notifyListeners() =>
+  void notifyListeners() => super.noSuchMethod(
-      super.noSuchMethod(Invocation.method(#notifyListeners, []),
+        Invocation.method(
-          returnValueForMissingStub: null);
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
 }

test/other/base_provider_test.mocks.dart

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

test/workout/workout_form_test.mocks.dart

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

test/workout/workout_set_form_test.mocks.dart

@@ -1,18 +1,16 @@
-// Mocks generated by Mockito 5.2.0 from annotations
+// Mocks generated by Mockito 5.3.2 from annotations
 // in wger/test/workout/workout_set_form_test.dart.
 // Do not manually edit this file.
 
-import 'dart:async' as _i9;
+// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:ui' as _i10;
+import 'dart:async' as _i6;
+import 'dart:ui' as _i7;
 
+import 'package:http/http.dart' as _i3;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:wger/models/exercises/base.dart' as _i3;
+import 'package:wger/models/exercises/exercise.dart' as _i4;
-import 'package:wger/models/exercises/category.dart' as _i4;
+import 'package:wger/providers/auth.dart' as _i2;
-import 'package:wger/models/exercises/equipment.dart' as _i5;
+import 'package:wger/providers/exercises.dart' as _i5;
-import 'package:wger/models/exercises/language.dart' as _i7;
-import 'package:wger/models/exercises/muscle.dart' as _i6;
-import 'package:wger/providers/base_provider.dart' as _i2;
-import 'package:wger/providers/exercises.dart' as _i8;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -23,187 +21,318 @@ import 'package:wger/providers/exercises.dart' as _i8;
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
 
-class _FakeWgerBaseProvider_0 extends _i1.Fake implements _i2.WgerBaseProvider {
+class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
+  _FakeAuthProvider_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
 }
 
-class _FakeExerciseBase_1 extends _i1.Fake implements _i3.ExerciseBase {}
+class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
-
+  _FakeClient_1(
-class _FakeExerciseCategory_2 extends _i1.Fake implements _i4.ExerciseCategory {
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
 }
 
-class _FakeEquipment_3 extends _i1.Fake implements _i5.Equipment {}
+class _FakeExercise_2 extends _i1.SmartFake implements _i4.Exercise {
+  _FakeExercise_2(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeMuscle_4 extends _i1.Fake implements _i6.Muscle {}
+class _FakeUri_3 extends _i1.SmartFake implements Uri {
+  _FakeUri_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeLanguage_5 extends _i1.Fake implements _i7.Language {}
+class _FakeResponse_4 extends _i1.SmartFake implements _i3.Response {
+  _FakeResponse_4(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
 /// A class which mocks [ExercisesProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockExercisesProvider extends _i1.Mock implements _i8.ExercisesProvider {
+class MockExercisesProvider extends _i1.Mock implements _i5.ExercisesProvider {
   MockExercisesProvider() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider =>
+  List<_i4.Exercise> get items => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.getter(#baseProvider),
+        Invocation.getter(#items),
-          returnValue: _FakeWgerBaseProvider_0()) as _i2.WgerBaseProvider);
+        returnValue: <_i4.Exercise>[],
+      ) as List<_i4.Exercise>);
   @override
-  set exerciseBases(List<_i3.ExerciseBase>? exercisesBases) =>
+  _i2.AuthProvider get auth => (super.noSuchMethod(
-      super.noSuchMethod(Invocation.setter(#exerciseBases, exercisesBases),
+        Invocation.getter(#auth),
-          returnValueForMissingStub: null);
+        returnValue: _FakeAuthProvider_0(
+          this,
+          Invocation.getter(#auth),
+        ),
+      ) as _i2.AuthProvider);
   @override
-  List<_i3.ExerciseBase> get filteredExerciseBases =>
+  set auth(_i2.AuthProvider? _auth) => super.noSuchMethod(
-      (super.noSuchMethod(Invocation.getter(#filteredExerciseBases),
+        Invocation.setter(
-          returnValue: <_i3.ExerciseBase>[]) as List<_i3.ExerciseBase>);
+          #auth,
+          _auth,
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  set filteredExerciseBases(List<_i3.ExerciseBase>? newFilteredExercises) =>
+  _i3.Client get client => (super.noSuchMethod(
-      super.noSuchMethod(
+        Invocation.getter(#client),
-          Invocation.setter(#filteredExerciseBases, newFilteredExercises),
+        returnValue: _FakeClient_1(
-          returnValueForMissingStub: null);
+          this,
+          Invocation.getter(#client),
+        ),
+      ) as _i3.Client);
   @override
-  Map<int, List<_i3.ExerciseBase>> get exerciseBasesByVariation =>
+  set client(_i3.Client? _client) => super.noSuchMethod(
-      (super.noSuchMethod(Invocation.getter(#exerciseBasesByVariation),
+        Invocation.setter(
-              returnValue: <int, List<_i3.ExerciseBase>>{})
+          #client,
-          as Map<int, List<_i3.ExerciseBase>>);
+          _client,
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  List<_i3.ExerciseBase> get bases =>
+  bool get hasListeners => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.getter(#bases),
+        Invocation.getter(#hasListeners),
-          returnValue: <_i3.ExerciseBase>[]) as List<_i3.ExerciseBase>);
+        returnValue: false,
+      ) as bool);
   @override
-  List<_i4.ExerciseCategory> get categories =>
+  _i4.Exercise findById(int? exerciseId) => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.getter(#categories),
+        Invocation.method(
-          returnValue: <_i4.ExerciseCategory>[]) as List<_i4.ExerciseCategory>);
+          #findById,
+          [exerciseId],
+        ),
+        returnValue: _FakeExercise_2(
+          this,
+          Invocation.method(
+            #findById,
+            [exerciseId],
+          ),
+        ),
+      ) as _i4.Exercise);
   @override
-  List<_i6.Muscle> get muscles =>
+  _i6.Future<void> fetchAndSetCategories() => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.getter(#muscles),
+        Invocation.method(
-          returnValue: <_i6.Muscle>[]) as List<_i6.Muscle>);
+          #fetchAndSetCategories,
+          [],
+        ),
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  List<_i5.Equipment> get equipment =>
+  _i6.Future<void> fetchAndSetMuscles() => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.getter(#equipment),
+        Invocation.method(
-          returnValue: <_i5.Equipment>[]) as List<_i5.Equipment>);
+          #fetchAndSetMuscles,
+          [],
+        ),
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  List<_i7.Language> get languages =>
+  _i6.Future<void> fetchAndSetEquipment() => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.getter(#languages),
+        Invocation.method(
-          returnValue: <_i7.Language>[]) as List<_i7.Language>);
+          #fetchAndSetEquipment,
+          [],
+        ),
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  set languages(List<_i7.Language>? languages) =>
+  _i6.Future<_i4.Exercise> fetchAndSetExercise(int? exerciseId) => (super.noSuchMethod(
-      super.noSuchMethod(Invocation.setter(#languages, languages),
+        Invocation.method(
-          returnValueForMissingStub: null);
+          #fetchAndSetExercise,
+          [exerciseId],
+        ),
+        returnValue: _i6.Future<_i4.Exercise>.value(_FakeExercise_2(
+          this,
+          Invocation.method(
+            #fetchAndSetExercise,
+            [exerciseId],
+          ),
+        )),
+      ) as _i6.Future<_i4.Exercise>);
   @override
-  bool get hasListeners =>
+  _i6.Future<void> checkExerciseCacheVersion() => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false)
+        Invocation.method(
-          as bool);
+          #checkExerciseCacheVersion,
+          [],
+        ),
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  _i9.Future<void> setFilters(_i8.Filters? newFilters) =>
+  _i6.Future<void> fetchAndSetExercises() => (super.noSuchMethod(
-      (super.noSuchMethod(Invocation.method(#setFilters, [newFilters]),
+        Invocation.method(
-          returnValue: Future<void>.value(),
+          #fetchAndSetExercises,
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+          [],
+        ),
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  _i9.Future<void> findByFilters() =>
+  _i6.Future<List<dynamic>> searchExercise(
-      (super.noSuchMethod(Invocation.method(#findByFilters, []),
+    String? name, [
-          returnValue: Future<void>.value(),
+    String? languageCode = r'en',
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+  ]) =>
-  @override
-  void clear() => super.noSuchMethod(Invocation.method(#clear, []),
-      returnValueForMissingStub: null);
-  @override
-  _i3.ExerciseBase findExerciseBaseById(int? id) =>
-      (super.noSuchMethod(Invocation.method(#findExerciseBaseById, [id]),
-          returnValue: _FakeExerciseBase_1()) as _i3.ExerciseBase);
-  @override
-  List<_i3.ExerciseBase> findExerciseBasesByVariationId(int? id,
-          {int? exerciseBaseIdToExclude}) =>
       (super.noSuchMethod(
-          Invocation.method(#findExerciseBasesByVariationId, [id],
+        Invocation.method(
-              {#exerciseBaseIdToExclude: exerciseBaseIdToExclude}),
+          #searchExercise,
-          returnValue: <_i3.ExerciseBase>[]) as List<_i3.ExerciseBase>);
+          [
+            name,
+            languageCode,
+          ],
+        ),
+        returnValue: _i6.Future<List<dynamic>>.value(<dynamic>[]),
+      ) as _i6.Future<List<dynamic>>);
   @override
-  _i4.ExerciseCategory findCategoryById(int? id) =>
+  Uri makeUrl(
-      (super.noSuchMethod(Invocation.method(#findCategoryById, [id]),
+    String? path, {
-          returnValue: _FakeExerciseCategory_2()) as _i4.ExerciseCategory);
+    int? id,
-  @override
+    String? objectMethod,
-  _i5.Equipment findEquipmentById(int? id) =>
+    Map<String, dynamic>? query,
-      (super.noSuchMethod(Invocation.method(#findEquipmentById, [id]),
+  }) =>
-          returnValue: _FakeEquipment_3()) as _i5.Equipment);
-  @override
-  _i6.Muscle findMuscleById(int? id) =>
-      (super.noSuchMethod(Invocation.method(#findMuscleById, [id]),
-          returnValue: _FakeMuscle_4()) as _i6.Muscle);
-  @override
-  _i7.Language findLanguageById(int? id) =>
-      (super.noSuchMethod(Invocation.method(#findLanguageById, [id]),
-          returnValue: _FakeLanguage_5()) as _i7.Language);
-  @override
-  _i9.Future<void> fetchAndSetCategories() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetCategories, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  _i9.Future<void> fetchAndSetVariations() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetVariations, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  _i9.Future<void> fetchAndSetMuscles() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetMuscles, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  _i9.Future<void> fetchAndSetEquipment() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetEquipment, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  _i9.Future<void> fetchAndSetLanguages() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetLanguages, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  _i9.Future<_i3.ExerciseBase> fetchAndSetExerciseBase(int? exerciseBaseId) =>
       (super.noSuchMethod(
-              Invocation.method(#fetchAndSetExerciseBase, [exerciseBaseId]),
+        Invocation.method(
-              returnValue:
+          #makeUrl,
-                  Future<_i3.ExerciseBase>.value(_FakeExerciseBase_1()))
+          [path],
-          as _i9.Future<_i3.ExerciseBase>);
+          {
+            #id: id,
+            #objectMethod: objectMethod,
+            #query: query,
+          },
+        ),
+        returnValue: _FakeUri_3(
+          this,
+          Invocation.method(
+            #makeUrl,
+            [path],
+            {
+              #id: id,
+              #objectMethod: objectMethod,
+              #query: query,
+            },
+          ),
+        ),
+      ) as Uri);
   @override
-  _i3.ExerciseBase readExerciseBaseFromBaseInfo(dynamic baseData) =>
+  _i6.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
+        Invocation.method(
+          #fetch,
+          [uri],
+        ),
+        returnValue: _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i6.Future<Map<String, dynamic>>);
+  @override
+  _i6.Future<Map<String, dynamic>> post(
+    Map<String, dynamic>? data,
+    Uri? uri,
+  ) =>
       (super.noSuchMethod(
-          Invocation.method(#readExerciseBaseFromBaseInfo, [baseData]),
+        Invocation.method(
-          returnValue: _FakeExerciseBase_1()) as _i3.ExerciseBase);
+          #post,
+          [
+            data,
+            uri,
+          ],
+        ),
+        returnValue: _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i6.Future<Map<String, dynamic>>);
   @override
-  _i9.Future<void> checkExerciseCacheVersion() =>
+  _i6.Future<Map<String, dynamic>> patch(
-      (super.noSuchMethod(Invocation.method(#checkExerciseCacheVersion, []),
+    Map<String, dynamic>? data,
-          returnValue: Future<void>.value(),
+    Uri? uri,
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+  ) =>
-  @override
-  _i9.Future<void> fetchAndSetExercises() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetExercises, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  _i9.Future<List<_i3.ExerciseBase>> searchExercise(String? name,
-          [String? languageCode = r'en']) =>
       (super.noSuchMethod(
-              Invocation.method(#searchExercise, [name, languageCode]),
+        Invocation.method(
-              returnValue:
+          #patch,
-                  Future<List<_i3.ExerciseBase>>.value(<_i3.ExerciseBase>[]))
+          [
-          as _i9.Future<List<_i3.ExerciseBase>>);
+            data,
+            uri,
+          ],
+        ),
+        returnValue: _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i6.Future<Map<String, dynamic>>);
   @override
-  void addListener(_i10.VoidCallback? listener) =>
+  _i6.Future<_i3.Response> deleteRequest(
-      super.noSuchMethod(Invocation.method(#addListener, [listener]),
+    String? url,
-          returnValueForMissingStub: null);
+    int? id,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #deleteRequest,
+          [
+            url,
+            id,
+          ],
+        ),
+        returnValue: _i6.Future<_i3.Response>.value(_FakeResponse_4(
+          this,
+          Invocation.method(
+            #deleteRequest,
+            [
+              url,
+              id,
+            ],
+          ),
+        )),
+      ) as _i6.Future<_i3.Response>);
   @override
-  void removeListener(_i10.VoidCallback? listener) =>
+  void addListener(_i7.VoidCallback? listener) => super.noSuchMethod(
-      super.noSuchMethod(Invocation.method(#removeListener, [listener]),
+        Invocation.method(
-          returnValueForMissingStub: null);
+          #addListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  void dispose() => super.noSuchMethod(Invocation.method(#dispose, []),
+  void removeListener(_i7.VoidCallback? listener) => super.noSuchMethod(
-      returnValueForMissingStub: null);
+        Invocation.method(
+          #removeListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  void notifyListeners() =>
+  void dispose() => super.noSuchMethod(
-      super.noSuchMethod(Invocation.method(#notifyListeners, []),
+        Invocation.method(
-          returnValueForMissingStub: null);
+          #dispose,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
 }