Merge branch 'master' into feature/flexible-routines

# Conflicts:
#	test/weight/weight_screen_test.mocks.dart

integration_test/5_nutritional_plan.dart

@@ -1,6 +1,8 @@
+import 'package:drift/native.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:provider/provider.dart';
+import 'package:wger/database/ingredients/ingredients_database.dart';
 import 'package:wger/providers/body_weight.dart';
 import 'package:wger/providers/nutrition.dart';
 import 'package:wger/screens/nutritional_plan_screen.dart';
@@ -17,7 +19,11 @@ Widget createNutritionalPlanScreen({locale = 'en'}) {
   return MultiProvider(
     providers: [
       ChangeNotifierProvider<NutritionPlansProvider>(
-        create: (context) => NutritionPlansProvider(mockBaseProvider, []),
+        create: (context) => NutritionPlansProvider(
+          mockBaseProvider,
+          [],
+          database: IngredientDatabase.inMemory(NativeDatabase.memory()),
+        ),
       ),
       ChangeNotifierProvider<BodyWeightProvider>(
         create: (context) => BodyWeightProvider(mockBaseProvider),

integration_test/6_weight.dart

@@ -3,6 +3,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/providers/body_weight.dart';
+import 'package:wger/providers/nutrition.dart';
 import 'package:wger/providers/user.dart';
 import 'package:wger/screens/form_screen.dart';
 import 'package:wger/screens/weight_screen.dart';
@@ -20,6 +21,9 @@ Widget createWeightScreen({locale = 'en'}) {
   final mockUserProvider = MockUserProvider();
   when(mockUserProvider.profile).thenReturn(tProfile1);
 
+  final mockNutritionPlansProvider = MockNutritionPlansProvider();
+  when(mockNutritionPlansProvider.currentPlan).thenReturn(null);
+
   return MultiProvider(
     providers: [
       ChangeNotifierProvider<UserProvider>(
@@ -28,6 +32,9 @@ Widget createWeightScreen({locale = 'en'}) {
       ChangeNotifierProvider<BodyWeightProvider>(
         create: (context) => mockWeightProvider,
       ),
+      ChangeNotifierProvider<NutritionPlansProvider>(
+        create: (context) => mockNutritionPlansProvider,
+      ),
     ],
     child: MaterialApp(
       locale: Locale(locale),

integration_test/make_screenshots_test.dart

@@ -20,7 +20,7 @@ enum DeviceType {
   wearScreenshots
 }
 
-final destination = DeviceType.phoneScreenshots.name;
+final destination = DeviceType.tenInchScreenshots.name;
 
 Future<void> takeScreenshot(tester, binding, String language, String name) async {
   if (Platform.isAndroid) {
@@ -38,12 +38,12 @@ const languages = [
   // Note: it seems if too many languages are processed at once, some processes
   // disappear and no images are written. Doing this in smaller steps works fine
 
-  // 'ca',
-  // 'cs-CZ',
-  // 'de-DE',
-  // 'el-GR',
-  // 'en-US',
-  // 'es-ES',
+  'ca',
+  'cs-CZ',
+  'de-DE',
+  'el-GR',
+  'en-US',
+  'es-ES',
 
   'fr-FR',
   'hi-IN',