Merge branch 'master' into feature/material-3

# Conflicts:
#	lib/widgets/nutrition/meal.dart
#	lib/widgets/workouts/day.dart

android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M43.5,51V40.5H37.5V42H33V43.5H28.5V51H27V57H28.5V64.5H33V66H37.5V67.5H43.5V57H64.5V67.5H70.5V66H75V64.5H79.5V57H81V51H79.5V43.5H75V42H70.5V40.5H64.5V51H43.5ZM42,42H39V66H42V42ZM43.5,52.5V55.5H64.5V52.5H43.5ZM66,66H69V42H66V66ZM33,63V45H30V63H33ZM34.5,43.5V64.5H37.5V43.5H34.5ZM75,45V63H78V45H75ZM73.5,64.5V43.5H70.5V64.5H73.5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
   <background android:drawable="@color/ic_launcher_background"/>
   <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

integration_test/5_nutritional_plan.dart

@@ -14,7 +14,7 @@ import 'package:wger/theme/theme.dart';
 import '../test/user/provider_test.mocks.dart';
 
 Widget createNutritionalPlanScreen({locale = 'en'}) {
-  var mockBaseProvider = MockWgerBaseProvider();
+  final mockBaseProvider = MockWgerBaseProvider();
 
   final key = GlobalKey<NavigatorState>();
 

lib/helpers/colors.dart

@@ -40,4 +40,4 @@ Iterable<Color> generateChartColors(int nrOfItems) sync* {
   for (final color in colors) {
     yield color;
   }
-}
+}

lib/helpers/consts.dart

@@ -88,6 +88,7 @@ const LANGUAGE_SHORT_ENGLISH = 'en';
 ///
 /// Values taken from exercises/models/image.py
 enum EXERCISE_IMAGE_ART_STYLE {
+  // ignore: unused_field
   _, // 0 is not used
   LINE_ART,
   THREE_D,

lib/models/nutrition/nutritional_values.dart

@@ -16,8 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import 'dart:ui';
-
 class NutritionalValues {
   double energy = 0;
   double protein = 0;

lib/providers/gallery.dart

@@ -103,7 +103,7 @@ class GalleryProvider extends WgerBaseProvider with ChangeNotifier {
   }
 
   Future<void> deleteImage(gallery.Image image) async {
-    var response = await deleteRequest(_galleryUrlPath, image.id!);
+    final response = await deleteRequest(_galleryUrlPath, image.id!);
     images.removeWhere((element) => element.id == image.id);
 
     notifyListeners();

lib/screens/auth_screen.dart

@@ -187,17 +187,19 @@ class _AuthCardState extends State<AuthCard> {
         _isLoading = false;
       });
     } on WgerHttpException catch (error) {
-      showHttpExceptionErrorDialog(error, context);
+      if (mounted) {
+        showHttpExceptionErrorDialog(error, context);
+      }
       setState(() {
         _isLoading = false;
       });
     } catch (error) {
       if (mounted) {
         showErrorDialog(error, context);
-        setState(() {
-          _isLoading = false;
-        });
       }
+      setState(() {
+        _isLoading = false;
+      });
     }
   }
 
@@ -249,7 +251,7 @@ class _AuthCardState extends State<AuthCard> {
                       if (value == null || value.isEmpty) {
                         return AppLocalizations.of(context).invalidUsername;
                       }
-                      if (!RegExp(r'^[\w.@+-]+$').hasMatch(value!)) {
+                      if (!RegExp(r'^[\w.@+-]+$').hasMatch(value)) {
                         return AppLocalizations.of(context).usernameValidChars;
                       }
 

lib/widgets/add_exercise/add_exercise_dropdown_button.dart

@@ -49,8 +49,8 @@ class _AddExerciseDropdownButtonState extends State<AddExerciseDropdownButton> {
         items: widget.items
             .map(
               (item) => DropdownMenuItem<String>(
-                child: Text(item),
                 value: item,
+                child: Text(item),
               ),
             )
             .toList(),

lib/widgets/add_exercise/mixins/image_picker_mixin.dart

@@ -49,7 +49,9 @@ mixin ExerciseImagePickerMixin {
         }
 
         if (!isFileValid) {
-          showDialog(context: context, builder: (context) => Text(errorMessage));
+          if (context.mounted) {
+            showDialog(context: context, builder: (context) => Text(errorMessage));
+          }
           return;
         }
       }

lib/widgets/core/app_bar.dart

@@ -32,7 +32,7 @@ import 'package:wger/widgets/user/forms.dart';
 class MainAppBar extends StatelessWidget implements PreferredSizeWidget {
   final String _title;
 
-  MainAppBar(this._title);
+  const MainAppBar(this._title);
 
   @override
   Widget build(BuildContext context) {
@@ -116,7 +116,7 @@ class MainAppBar extends StatelessWidget implements PreferredSizeWidget {
 class EmptyAppBar extends StatelessWidget implements PreferredSizeWidget {
   final String _title;
 
-  EmptyAppBar(this._title);
+  const EmptyAppBar(this._title);
 
   @override
   Widget build(BuildContext context) {

lib/widgets/core/text_prompt.dart

@@ -13,7 +13,7 @@ class TextPrompt extends StatelessWidget {
             style: Theme.of(context).textTheme.headlineMedium,
           ),
           Padding(
-            padding: EdgeInsets.only(top: 12),
+            padding: const EdgeInsets.only(top: 12),
             child: Text(AppLocalizations.of(context).textPromptSubheading),
           ),
         ],