Merge pull request #640 from wger-project/dcm-fix

Dcm fixes

Author: Dieterbe

analysis_options.yaml

@@ -163,6 +163,9 @@ dart_code_metrics:
     - prefer-prefixed-global-constants: false # we don't really care for the 'k' prefix
     - prefer-single-widget-per-file: false
     - avoid-passing-self-as-argument: false # fairly harmless. and e.g. drift calls are like this
+    - avoid-passing-async-when-sync-expected: false # we really like to do this in onTap() etc, and it seems harmless
+    - prefer-match-file-name: false # dieter wants to enable this. but requires a lot of renames. what does roland think?
+
   formatter:
     indent: 0
     line-length: 100

integration_test/1_dashboard.dart

@@ -34,9 +34,9 @@ Widget createDashboardScreen({locale = 'en'}) {
         'date': '2022-12-01',
         'impression': '3',
         'time_start': '17:00',
-        'time_end': '19:00'
-      }
-    ]
+        'time_end': '19:00',
+      },
+    ],
   };
   when(mockWorkoutProvider.fetchSessionData()).thenAnswer((a) => Future.value(logs));
 

integration_test/6_weight.dart

@@ -36,9 +36,7 @@ Widget createWeightScreen({locale = 'en'}) {
       supportedLocales: AppLocalizations.supportedLocales,
       theme: wgerLightTheme,
       home: const WeightScreen(),
-      routes: {
-        FormScreen.routeName: (ctx) => const FormScreen(),
-      },
+      routes: {FormScreen.routeName: (ctx) => const FormScreen()},
     ),
   );
 }

integration_test/make_screenshots_test.dart

@@ -57,7 +57,7 @@ const languages = [
   'ru-RU',
   'tr-TR',
   'uk',
-  'zh-CN'
+  'zh-CN',
 ];
 
 void main() {

lib/models/nutrition/ingredient.dart

@@ -17,7 +17,7 @@
  */
 import 'package:json_annotation/json_annotation.dart';
 import 'package:wger/helpers/json.dart';
-import 'package:wger/models/nutrition/image.dart';
+import 'package:wger/models/nutrition/ingredient_image.dart';
 import 'package:wger/models/nutrition/nutritional_values.dart';
 
 part 'ingredient.g.dart';

lib/models/nutrition/image.dart renamed to lib/models/nutrition/ingredient_image.dart

@@ -17,7 +17,7 @@
  */
 import 'package:json_annotation/json_annotation.dart';
 
-part 'image.g.dart';
+part 'ingredient_image.g.dart';
 
 @JsonSerializable()
 class IngredientImage {

lib/models/nutrition/image.g.dart renamed to lib/models/nutrition/ingredient_image.g.dart

@@ -134,6 +134,7 @@ class NutritionalGoals {
 
   @override
   String toString() {
+    // ignore: avoid-nullable-interpolation
     return 'e: $energy, p: $protein, c: $carbohydrates, cS: $carbohydratesSugar, f: $fat, fS: $fatSaturated, fi: $fiber, s: $sodium';
   }
 

lib/models/nutrition/nutritional_goals.dart

@@ -25,8 +25,8 @@ import 'package:wger/exceptions/http_exception.dart';
 import 'package:wger/exceptions/no_such_entry_exception.dart';
 import 'package:wger/helpers/consts.dart';
 import 'package:wger/models/exercises/ingredient_api.dart';
-import 'package:wger/models/nutrition/image.dart';
 import 'package:wger/models/nutrition/ingredient.dart';
+import 'package:wger/models/nutrition/ingredient_image.dart';
 import 'package:wger/models/nutrition/log.dart';
 import 'package:wger/models/nutrition/meal.dart';
 import 'package:wger/models/nutrition/meal_item.dart';

lib/providers/nutrition.dart

@@ -34,7 +34,7 @@ class MeasurementCategoriesScreen extends StatelessWidget {
       appBar: AppBar(title: Text(AppLocalizations.of(context).measurements)),
       floatingActionButton: FloatingActionButton(
         child: const Icon(Icons.add, color: Colors.white),
-        onPressed: () async {
+        onPressed: () {
           Navigator.pushNamed(
             context,
             FormScreen.routeName,