diff --git a/lib/main.dart b/lib/main.dart
index 56109959..7a125ae1 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -69,8 +69,7 @@ class MyApp extends StatelessWidget {
           create: (ctx) => AuthProvider(),
         ),
         ChangeNotifierProxyProvider<AuthProvider, ExercisesProvider>(
-          create: (context) => ExercisesProvider(
-              WgerBaseProvider(context.read<AuthProvider>())),
+          create: (context) => ExercisesProvider(WgerBaseProvider(context.read<AuthProvider>())),
           update: (context, base, previous) =>
               previous ?? ExercisesProvider(WgerBaseProvider(base)),
         ),
@@ -106,7 +105,8 @@ class MyApp extends StatelessWidget {
         ),
         ChangeNotifierProxyProvider<AuthProvider, BodyWeightProvider>(
           create: (context) => BodyWeightProvider(WgerBaseProvider(context.read<AuthProvider>())),
-          update: (context, base, previous) => previous ?? BodyWeightProvider(WgerBaseProvider(base)),
+          update: (context, base, previous) =>
+              previous ?? BodyWeightProvider(WgerBaseProvider(base)),
         ),
         ChangeNotifierProxyProvider<AuthProvider, GalleryProvider>(
           create: (context) => GalleryProvider(context.read<AuthProvider>(), []),
diff --git a/lib/models/body_weight/weight_entry.g.dart b/lib/models/body_weight/weight_entry.g.dart
index 60ee02c9..d1152d20 100644
--- a/lib/models/body_weight/weight_entry.g.dart
+++ b/lib/models/body_weight/weight_entry.g.dart
@@ -18,8 +18,7 @@ WeightEntry _$WeightEntryFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$WeightEntryToJson(WeightEntry instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$WeightEntryToJson(WeightEntry instance) => <String, dynamic>{
       'id': instance.id,
       'weight': numToString(instance.weight),
       'date': toDate(instance.date),
diff --git a/lib/models/exercises/category.g.dart b/lib/models/exercises/category.g.dart
index 19383107..915120d1 100644
--- a/lib/models/exercises/category.g.dart
+++ b/lib/models/exercises/category.g.dart
@@ -17,8 +17,7 @@ ExerciseCategory _$ExerciseCategoryFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$ExerciseCategoryToJson(ExerciseCategory instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$ExerciseCategoryToJson(ExerciseCategory instance) => <String, dynamic>{
       'id': instance.id,
       'name': instance.name,
     };
diff --git a/lib/models/exercises/image.g.dart b/lib/models/exercises/image.g.dart
index 1240dc38..6ef7c62e 100644
--- a/lib/models/exercises/image.g.dart
+++ b/lib/models/exercises/image.g.dart
@@ -20,8 +20,7 @@ ExerciseImage _$ExerciseImageFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$ExerciseImageToJson(ExerciseImage instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$ExerciseImageToJson(ExerciseImage instance) => <String, dynamic>{
       'id': instance.id,
       'uuid': instance.uuid,
       'exercise_base': instance.exerciseBaseId,
diff --git a/lib/models/measurements/measurement_category.g.dart b/lib/models/measurements/measurement_category.g.dart
index ef4ebcd3..eb887b2e 100644
--- a/lib/models/measurements/measurement_category.g.dart
+++ b/lib/models/measurements/measurement_category.g.dart
@@ -22,9 +22,7 @@ MeasurementCategory _$MeasurementCategoryFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$MeasurementCategoryToJson(
-        MeasurementCategory instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$MeasurementCategoryToJson(MeasurementCategory instance) => <String, dynamic>{
       'id': instance.id,
       'name': instance.name,
       'unit': instance.unit,
diff --git a/lib/models/measurements/measurement_entry.g.dart b/lib/models/measurements/measurement_entry.g.dart
index 4b096960..7f6e346a 100644
--- a/lib/models/measurements/measurement_entry.g.dart
+++ b/lib/models/measurements/measurement_entry.g.dart
@@ -20,8 +20,7 @@ MeasurementEntry _$MeasurementEntryFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$MeasurementEntryToJson(MeasurementEntry instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$MeasurementEntryToJson(MeasurementEntry instance) => <String, dynamic>{
       'id': instance.id,
       'category': instance.category,
       'date': toDate(instance.date),
diff --git a/lib/models/nutrition/image.g.dart b/lib/models/nutrition/image.g.dart
index 5dd96e6f..f7bfba41 100644
--- a/lib/models/nutrition/image.g.dart
+++ b/lib/models/nutrition/image.g.dart
@@ -20,8 +20,7 @@ IngredientImage _$IngredientImageFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$IngredientImageToJson(IngredientImage instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$IngredientImageToJson(IngredientImage instance) => <String, dynamic>{
       'id': instance.id,
       'uuid': instance.uuid,
       'ingredient_id': instance.ingredientId,
diff --git a/lib/models/nutrition/ingredient.g.dart b/lib/models/nutrition/ingredient.g.dart
index cb5168ec..bb7edb7c 100644
--- a/lib/models/nutrition/ingredient.g.dart
+++ b/lib/models/nutrition/ingredient.g.dart
@@ -43,8 +43,7 @@ Ingredient _$IngredientFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$IngredientToJson(Ingredient instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$IngredientToJson(Ingredient instance) => <String, dynamic>{
       'id': instance.id,
       'code': instance.code,
       'name': instance.name,
diff --git a/lib/models/nutrition/ingredient_weight_unit.g.dart b/lib/models/nutrition/ingredient_weight_unit.g.dart
index 74b1f101..f147a2ee 100644
--- a/lib/models/nutrition/ingredient_weight_unit.g.dart
+++ b/lib/models/nutrition/ingredient_weight_unit.g.dart
@@ -13,16 +13,14 @@ IngredientWeightUnit _$IngredientWeightUnitFromJson(Map<String, dynamic> json) {
   );
   return IngredientWeightUnit(
     id: json['id'] as int,
-    weightUnit:
-        WeightUnit.fromJson(json['weight_unit'] as Map<String, dynamic>),
+    weightUnit: WeightUnit.fromJson(json['weight_unit'] as Map<String, dynamic>),
     ingredient: Ingredient.fromJson(json['ingredient'] as Map<String, dynamic>),
     grams: json['grams'] as int,
     amount: (json['amount'] as num).toDouble(),
   );
 }
 
-Map<String, dynamic> _$IngredientWeightUnitToJson(
-        IngredientWeightUnit instance) =>
+Map<String, dynamic> _$IngredientWeightUnitToJson(IngredientWeightUnit instance) =>
     <String, dynamic>{
       'id': instance.id,
       'weight_unit': instance.weightUnit,
diff --git a/lib/models/nutrition/log.g.dart b/lib/models/nutrition/log.g.dart
index 39068768..61690155 100644
--- a/lib/models/nutrition/log.g.dart
+++ b/lib/models/nutrition/log.g.dart
@@ -9,14 +9,7 @@ part of 'log.dart';
 Log _$LogFromJson(Map<String, dynamic> json) {
   $checkKeys(
     json,
-    requiredKeys: const [
-      'id',
-      'plan',
-      'datetime',
-      'ingredient',
-      'weight_unit',
-      'amount'
-    ],
+    requiredKeys: const ['id', 'plan', 'datetime', 'ingredient', 'weight_unit', 'amount'],
   );
   return Log(
     id: json['id'] as int?,
diff --git a/lib/models/nutrition/nutritional_plan.g.dart b/lib/models/nutrition/nutritional_plan.g.dart
index 9b10d8a5..661a9f47 100644
--- a/lib/models/nutrition/nutritional_plan.g.dart
+++ b/lib/models/nutrition/nutritional_plan.g.dart
@@ -18,8 +18,7 @@ NutritionalPlan _$NutritionalPlanFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$NutritionalPlanToJson(NutritionalPlan instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$NutritionalPlanToJson(NutritionalPlan instance) => <String, dynamic>{
       'id': instance.id,
       'description': instance.description,
       'creation_date': toDate(instance.creationDate),
diff --git a/lib/models/nutrition/weight_unit.g.dart b/lib/models/nutrition/weight_unit.g.dart
index 74e1f0cf..6f2b9607 100644
--- a/lib/models/nutrition/weight_unit.g.dart
+++ b/lib/models/nutrition/weight_unit.g.dart
@@ -17,8 +17,7 @@ WeightUnit _$WeightUnitFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$WeightUnitToJson(WeightUnit instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$WeightUnitToJson(WeightUnit instance) => <String, dynamic>{
       'id': instance.id,
       'name': instance.name,
     };
diff --git a/lib/models/workouts/repetition_unit.g.dart b/lib/models/workouts/repetition_unit.g.dart
index 115dc338..33e6a815 100644
--- a/lib/models/workouts/repetition_unit.g.dart
+++ b/lib/models/workouts/repetition_unit.g.dart
@@ -17,8 +17,7 @@ RepetitionUnit _$RepetitionUnitFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$RepetitionUnitToJson(RepetitionUnit instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$RepetitionUnitToJson(RepetitionUnit instance) => <String, dynamic>{
       'id': instance.id,
       'name': instance.name,
     };
diff --git a/lib/models/workouts/session.g.dart b/lib/models/workouts/session.g.dart
index e16affad..79f4fee4 100644
--- a/lib/models/workouts/session.g.dart
+++ b/lib/models/workouts/session.g.dart
@@ -9,14 +9,7 @@ part of 'session.dart';
 WorkoutSession _$WorkoutSessionFromJson(Map<String, dynamic> json) {
   $checkKeys(
     json,
-    requiredKeys: const [
-      'id',
-      'workout',
-      'date',
-      'impression',
-      'time_start',
-      'time_end'
-    ],
+    requiredKeys: const ['id', 'workout', 'date', 'impression', 'time_start', 'time_end'],
   );
   return WorkoutSession()
     ..id = json['id'] as int?
@@ -28,8 +21,7 @@ WorkoutSession _$WorkoutSessionFromJson(Map<String, dynamic> json) {
     ..timeEnd = stringToTime(json['time_end'] as String?);
 }
 
-Map<String, dynamic> _$WorkoutSessionToJson(WorkoutSession instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$WorkoutSessionToJson(WorkoutSession instance) => <String, dynamic>{
       'id': instance.id,
       'workout': instance.workoutId,
       'date': toDate(instance.date),
diff --git a/lib/models/workouts/weight_unit.g.dart b/lib/models/workouts/weight_unit.g.dart
index 74e1f0cf..6f2b9607 100644
--- a/lib/models/workouts/weight_unit.g.dart
+++ b/lib/models/workouts/weight_unit.g.dart
@@ -17,8 +17,7 @@ WeightUnit _$WeightUnitFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$WeightUnitToJson(WeightUnit instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$WeightUnitToJson(WeightUnit instance) => <String, dynamic>{
       'id': instance.id,
       'name': instance.name,
     };
diff --git a/lib/models/workouts/workout_plan.g.dart b/lib/models/workouts/workout_plan.g.dart
index ef156e3e..ac1d6fa9 100644
--- a/lib/models/workouts/workout_plan.g.dart
+++ b/lib/models/workouts/workout_plan.g.dart
@@ -19,8 +19,7 @@ WorkoutPlan _$WorkoutPlanFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$WorkoutPlanToJson(WorkoutPlan instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$WorkoutPlanToJson(WorkoutPlan instance) => <String, dynamic>{
       'id': instance.id,
       'creation_date': instance.creationDate.toIso8601String(),
       'name': instance.name,
diff --git a/lib/widgets/core/core.dart b/lib/widgets/core/core.dart
index d99fc9d1..d61e5939 100644
--- a/lib/widgets/core/core.dart
+++ b/lib/widgets/core/core.dart
@@ -59,7 +59,6 @@ class Pill extends StatelessWidget {
   }
 }
 
-
 class CircleIconAvatar extends StatelessWidget {
   final double radius;
   final Icon _icon;
diff --git a/test/nutrition/nutritional_plan_form_test.mocks.dart b/test/nutrition/nutritional_plan_form_test.mocks.dart
index 9d060edd..fde0989a 100644
--- a/test/nutrition/nutritional_plan_form_test.mocks.dart
+++ b/test/nutrition/nutritional_plan_form_test.mocks.dart
@@ -3,17 +3,16 @@
 // 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;
+import 'dart:async' as _i8;
+import 'dart:ui' as _i9;
 
-import 'package:http/http.dart' as _i3;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:wger/models/nutrition/ingredient.dart' as _i7;
-import 'package:wger/models/nutrition/meal.dart' as _i5;
-import 'package:wger/models/nutrition/meal_item.dart' as _i6;
-import 'package:wger/models/nutrition/nutritional_plan.dart' as _i4;
-import 'package:wger/providers/auth.dart' as _i2;
-import 'package:wger/providers/nutrition.dart' as _i8;
+import 'package:wger/models/nutrition/ingredient.dart' as _i6;
+import 'package:wger/models/nutrition/meal.dart' as _i4;
+import 'package:wger/models/nutrition/meal_item.dart' as _i5;
+import 'package:wger/models/nutrition/nutritional_plan.dart' as _i3;
+import 'package:wger/providers/base_provider.dart' as _i2;
+import 'package:wger/providers/nutrition.dart' as _i7;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -26,8 +25,8 @@ import 'package:wger/providers/nutrition.dart' as _i8;
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
 
-class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
-  _FakeAuthProvider_0(
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -36,8 +35,8 @@ class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
         );
 }
 
-class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
-  _FakeClient_1(
+class _FakeNutritionalPlan_1 extends _i1.SmartFake implements _i3.NutritionalPlan {
+  _FakeNutritionalPlan_1(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -46,8 +45,8 @@ class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
         );
 }
 
-class _FakeNutritionalPlan_2 extends _i1.SmartFake implements _i4.NutritionalPlan {
-  _FakeNutritionalPlan_2(
+class _FakeMeal_2 extends _i1.SmartFake implements _i4.Meal {
+  _FakeMeal_2(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -56,8 +55,8 @@ class _FakeNutritionalPlan_2 extends _i1.SmartFake implements _i4.NutritionalPla
         );
 }
 
-class _FakeMeal_3 extends _i1.SmartFake implements _i5.Meal {
-  _FakeMeal_3(
+class _FakeMealItem_3 extends _i1.SmartFake implements _i5.MealItem {
+  _FakeMealItem_3(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -66,38 +65,8 @@ class _FakeMeal_3 extends _i1.SmartFake implements _i5.Meal {
         );
 }
 
-class _FakeMealItem_4 extends _i1.SmartFake implements _i6.MealItem {
-  _FakeMealItem_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeIngredient_5 extends _i1.SmartFake implements _i7.Ingredient {
-  _FakeIngredient_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeUri_6 extends _i1.SmartFake implements Uri {
-  _FakeUri_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeResponse_7 extends _i1.SmartFake implements _i3.Response {
-  _FakeResponse_7(
+class _FakeIngredient_4 extends _i1.SmartFake implements _i6.Ingredient {
+  _FakeIngredient_4(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -109,45 +78,29 @@ class _FakeResponse_7 extends _i1.SmartFake implements _i3.Response {
 /// A class which mocks [NutritionPlansProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansProvider {
+class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansProvider {
   MockNutritionPlansProvider() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  List<_i4.NutritionalPlan> get items => (super.noSuchMethod(
+  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
+        Invocation.getter(#baseProvider),
+        returnValue: _FakeWgerBaseProvider_0(
+          this,
+          Invocation.getter(#baseProvider),
+        ),
+      ) as _i2.WgerBaseProvider);
+  @override
+  List<_i3.NutritionalPlan> get items => (super.noSuchMethod(
         Invocation.getter(#items),
-        returnValue: <_i4.NutritionalPlan>[],
-      ) as List<_i4.NutritionalPlan>);
+        returnValue: <_i3.NutritionalPlan>[],
+      ) as List<_i3.NutritionalPlan>);
   @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
-  @override
-  set auth(_i2.AuthProvider? _auth) => super.noSuchMethod(
+  set ingredients(dynamic items) => super.noSuchMethod(
         Invocation.setter(
-          #auth,
-          _auth,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
-  @override
-  set client(_i3.Client? _client) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          _client,
+          #ingredients,
+          items,
         ),
         returnValueForMissingStub: null,
       );
@@ -165,105 +118,105 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
         returnValueForMissingStub: null,
       );
   @override
-  _i4.NutritionalPlan findById(int? id) => (super.noSuchMethod(
+  _i3.NutritionalPlan findById(int? id) => (super.noSuchMethod(
         Invocation.method(
           #findById,
           [id],
         ),
-        returnValue: _FakeNutritionalPlan_2(
+        returnValue: _FakeNutritionalPlan_1(
           this,
           Invocation.method(
             #findById,
             [id],
           ),
         ),
-      ) as _i4.NutritionalPlan);
+      ) as _i3.NutritionalPlan);
   @override
-  _i5.Meal? findMealById(int? id) => (super.noSuchMethod(Invocation.method(
+  _i4.Meal? findMealById(int? id) => (super.noSuchMethod(Invocation.method(
         #findMealById,
         [id],
-      )) as _i5.Meal?);
+      )) as _i4.Meal?);
   @override
-  _i9.Future<void> fetchAndSetAllPlansSparse() => (super.noSuchMethod(
+  _i8.Future<void> fetchAndSetAllPlansSparse() => (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetAllPlansSparse,
           [],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> fetchAndSetAllPlansFull() => (super.noSuchMethod(
+  _i8.Future<void> fetchAndSetAllPlansFull() => (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetAllPlansFull,
           [],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod(
+  _i8.Future<_i3.NutritionalPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetPlanSparse,
           [planId],
         ),
-        returnValue: _i9.Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2(
+        returnValue: _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1(
           this,
           Invocation.method(
             #fetchAndSetPlanSparse,
             [planId],
           ),
         )),
-      ) as _i9.Future<_i4.NutritionalPlan>);
+      ) as _i8.Future<_i3.NutritionalPlan>);
   @override
-  _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanFull(int? planId) => (super.noSuchMethod(
+  _i8.Future<_i3.NutritionalPlan> fetchAndSetPlanFull(int? planId) => (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetPlanFull,
           [planId],
         ),
-        returnValue: _i9.Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2(
+        returnValue: _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1(
           this,
           Invocation.method(
             #fetchAndSetPlanFull,
             [planId],
           ),
         )),
-      ) as _i9.Future<_i4.NutritionalPlan>);
+      ) as _i8.Future<_i3.NutritionalPlan>);
   @override
-  _i9.Future<_i4.NutritionalPlan> addPlan(_i4.NutritionalPlan? planData) => (super.noSuchMethod(
+  _i8.Future<_i3.NutritionalPlan> addPlan(_i3.NutritionalPlan? planData) => (super.noSuchMethod(
         Invocation.method(
           #addPlan,
           [planData],
         ),
-        returnValue: _i9.Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2(
+        returnValue: _i8.Future<_i3.NutritionalPlan>.value(_FakeNutritionalPlan_1(
           this,
           Invocation.method(
             #addPlan,
             [planData],
           ),
         )),
-      ) as _i9.Future<_i4.NutritionalPlan>);
+      ) as _i8.Future<_i3.NutritionalPlan>);
   @override
-  _i9.Future<void> editPlan(_i4.NutritionalPlan? plan) => (super.noSuchMethod(
+  _i8.Future<void> editPlan(_i3.NutritionalPlan? plan) => (super.noSuchMethod(
         Invocation.method(
           #editPlan,
           [plan],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> deletePlan(int? id) => (super.noSuchMethod(
+  _i8.Future<void> deletePlan(int? id) => (super.noSuchMethod(
         Invocation.method(
           #deletePlan,
           [id],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<_i5.Meal> addMeal(
-    _i5.Meal? meal,
+  _i8.Future<_i4.Meal> addMeal(
+    _i4.Meal? meal,
     int? planId,
   ) =>
       (super.noSuchMethod(
@@ -274,7 +227,7 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
             planId,
           ],
         ),
-        returnValue: _i9.Future<_i5.Meal>.value(_FakeMeal_3(
+        returnValue: _i8.Future<_i4.Meal>.value(_FakeMeal_2(
           this,
           Invocation.method(
             #addMeal,
@@ -284,34 +237,34 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
             ],
           ),
         )),
-      ) as _i9.Future<_i5.Meal>);
+      ) as _i8.Future<_i4.Meal>);
   @override
-  _i9.Future<_i5.Meal> editMeal(_i5.Meal? meal) => (super.noSuchMethod(
+  _i8.Future<_i4.Meal> editMeal(_i4.Meal? meal) => (super.noSuchMethod(
         Invocation.method(
           #editMeal,
           [meal],
         ),
-        returnValue: _i9.Future<_i5.Meal>.value(_FakeMeal_3(
+        returnValue: _i8.Future<_i4.Meal>.value(_FakeMeal_2(
           this,
           Invocation.method(
             #editMeal,
             [meal],
           ),
         )),
-      ) as _i9.Future<_i5.Meal>);
+      ) as _i8.Future<_i4.Meal>);
   @override
-  _i9.Future<void> deleteMeal(_i5.Meal? meal) => (super.noSuchMethod(
+  _i8.Future<void> deleteMeal(_i4.Meal? meal) => (super.noSuchMethod(
         Invocation.method(
           #deleteMeal,
           [meal],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<_i6.MealItem> addMealItem(
-    _i6.MealItem? mealItem,
-    _i5.Meal? meal,
+  _i8.Future<_i5.MealItem> addMealItem(
+    _i5.MealItem? mealItem,
+    _i4.Meal? meal,
   ) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -321,7 +274,7 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
             meal,
           ],
         ),
-        returnValue: _i9.Future<_i6.MealItem>.value(_FakeMealItem_4(
+        returnValue: _i8.Future<_i5.MealItem>.value(_FakeMealItem_3(
           this,
           Invocation.method(
             #addMealItem,
@@ -331,41 +284,41 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
             ],
           ),
         )),
-      ) as _i9.Future<_i6.MealItem>);
+      ) as _i8.Future<_i5.MealItem>);
   @override
-  _i9.Future<void> deleteMealItem(_i6.MealItem? mealItem) => (super.noSuchMethod(
+  _i8.Future<void> deleteMealItem(_i5.MealItem? mealItem) => (super.noSuchMethod(
         Invocation.method(
           #deleteMealItem,
           [mealItem],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<_i7.Ingredient> fetchIngredient(int? ingredientId) => (super.noSuchMethod(
+  _i8.Future<_i6.Ingredient> fetchIngredient(int? ingredientId) => (super.noSuchMethod(
         Invocation.method(
           #fetchIngredient,
           [ingredientId],
         ),
-        returnValue: _i9.Future<_i7.Ingredient>.value(_FakeIngredient_5(
+        returnValue: _i8.Future<_i6.Ingredient>.value(_FakeIngredient_4(
           this,
           Invocation.method(
             #fetchIngredient,
             [ingredientId],
           ),
         )),
-      ) as _i9.Future<_i7.Ingredient>);
+      ) as _i8.Future<_i6.Ingredient>);
   @override
-  _i9.Future<void> fetchIngredientsFromCache() => (super.noSuchMethod(
+  _i8.Future<void> fetchIngredientsFromCache() => (super.noSuchMethod(
         Invocation.method(
           #fetchIngredientsFromCache,
           [],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<List<dynamic>> searchIngredient(
+  _i8.Future<List<dynamic>> searchIngredient(
     String? name, [
     String? languageCode = r'en',
   ]) =>
@@ -377,28 +330,28 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
             languageCode,
           ],
         ),
-        returnValue: _i9.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i9.Future<List<dynamic>>);
+        returnValue: _i8.Future<List<dynamic>>.value(<dynamic>[]),
+      ) as _i8.Future<List<dynamic>>);
   @override
-  _i9.Future<_i7.Ingredient?> searchIngredientWithCode(String? code) => (super.noSuchMethod(
+  _i8.Future<_i6.Ingredient?> searchIngredientWithCode(String? code) => (super.noSuchMethod(
         Invocation.method(
           #searchIngredientWithCode,
           [code],
         ),
-        returnValue: _i9.Future<_i7.Ingredient?>.value(),
-      ) as _i9.Future<_i7.Ingredient?>);
+        returnValue: _i8.Future<_i6.Ingredient?>.value(),
+      ) as _i8.Future<_i6.Ingredient?>);
   @override
-  _i9.Future<void> logMealToDiary(_i5.Meal? meal) => (super.noSuchMethod(
+  _i8.Future<void> logMealToDiary(_i4.Meal? meal) => (super.noSuchMethod(
         Invocation.method(
           #logMealToDiary,
           [meal],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> logIngredentToDiary(
-    _i6.MealItem? mealItem,
+  _i8.Future<void> logIngredentToDiary(
+    _i5.MealItem? mealItem,
     int? planId, [
     DateTime? dateTime,
   ]) =>
@@ -411,11 +364,11 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
             dateTime,
           ],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> deleteLog(
+  _i8.Future<void> deleteLog(
     int? logId,
     int? planId,
   ) =>
@@ -427,129 +380,20 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
             planId,
           ],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> fetchAndSetLogs(_i4.NutritionalPlan? plan) => (super.noSuchMethod(
+  _i8.Future<void> fetchAndSetLogs(_i3.NutritionalPlan? plan) => (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetLogs,
           [plan],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  Map<String, String> getDefaultHeaders({dynamic includeAuth = false}) => (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
-  @override
-  Uri makeUrl(
-    String? path, {
-    int? id,
-    String? objectMethod,
-    Map<String, dynamic>? query,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #makeUrl,
-          [path],
-          {
-            #id: id,
-            #objectMethod: objectMethod,
-            #query: query,
-          },
-        ),
-        returnValue: _FakeUri_6(
-          this,
-          Invocation.method(
-            #makeUrl,
-            [path],
-            {
-              #id: id,
-              #objectMethod: objectMethod,
-              #query: query,
-            },
-          ),
-        ),
-      ) as Uri);
-  @override
-  _i9.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue: _i9.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i9.Future<Map<String, dynamic>>);
-  @override
-  _i9.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i9.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i9.Future<List<dynamic>>);
-  @override
-  _i9.Future<Map<String, dynamic>> post(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i9.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i9.Future<Map<String, dynamic>>);
-  @override
-  _i9.Future<Map<String, dynamic>> patch(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i9.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i9.Future<Map<String, dynamic>>);
-  @override
-  _i9.Future<_i3.Response> deleteRequest(
-    String? url,
-    int? id,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #deleteRequest,
-          [
-            url,
-            id,
-          ],
-        ),
-        returnValue: _i9.Future<_i3.Response>.value(_FakeResponse_7(
-          this,
-          Invocation.method(
-            #deleteRequest,
-            [
-              url,
-              id,
-            ],
-          ),
-        )),
-      ) as _i9.Future<_i3.Response>);
-  @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -557,7 +401,7 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],