Fix overflow bug in meal.dart

This should also fix the problem when generating the goldens. The loadAppFonts
and the check for Linux was removed as well, if the pseudo-font helps with a
constant rendering among all platforms we don't need those.

Author: rolandgeider

ios/Podfile.lock

@@ -117,6 +117,6 @@ SPEC CHECKSUMS:
   url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
   video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
 
-PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048
+PODFILE CHECKSUM: 775997f741c536251164e3eacf6e34abf2eb7a17
 
 COCOAPODS: 1.16.2

lib/widgets/nutrition/meal.dart

@@ -301,40 +301,27 @@ class MealHeader extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final subtitleTime = _meal.time != null ? '${_meal.time!.format(context)} / ' : '';
+    final subtitleCalories = _meal.isRealMeal
+        ? getKcalConsumedVsPlanned(_meal, context)
+        : getKcalConsumed(_meal, context);
+    final subtitle = '$subtitleTime $subtitleCalories';
+
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         ListTile(
           contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-          title: Row(children: [
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(
-                    _meal.name,
-                    style: Theme.of(context).textTheme.titleLarge,
-                  ),
-                  Row(
-                    children: [
-                      if (_meal.time != null)
-                        Text(
-                          _meal.time!.format(context),
-                          style: Theme.of(context).textTheme.titleSmall,
-                        ),
-                      if (_meal.time != null) const SizedBox(width: 12),
-                      Text(
-                        _meal.isRealMeal
-                            ? getKcalConsumedVsPlanned(_meal, context)
-                            : getKcalConsumed(_meal, context),
-                        style: Theme.of(context).textTheme.titleSmall,
-                      ),
-                    ],
-                  ),
-                ],
-              ),
-            ),
-          ]),
+          title: Text(
+            _meal.name,
+            style: Theme.of(context).textTheme.titleLarge,
+            overflow: TextOverflow.ellipsis,
+          ),
+          subtitle: Text(
+            subtitle,
+            style: Theme.of(context).textTheme.titleSmall,
+            overflow: TextOverflow.ellipsis,
+          ),
           trailing: Row(
             mainAxisSize: MainAxisSize.min,
             children: [

test/nutrition/goldens/nutritional_plan_1_default_view.png

@@ -16,8 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import 'dart:io';
-
 import 'package:drift/native.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -33,7 +31,6 @@ import 'package:wger/providers/nutrition.dart';
 import 'package:wger/screens/nutritional_plan_screen.dart';
 
 import '../../test_data/nutritional_plans.dart';
-import '../utils.dart';
 import 'nutritional_plan_screen_test.mocks.dart';
 
 @GenerateMocks([WgerBaseProvider, AuthProvider, http.Client])
@@ -88,40 +85,34 @@ void main() {
   testWidgets(
     'Test the widgets on the nutritional plan screen',
     (tester) async {
-      await loadAppFonts();
-
       tester.view.physicalSize = const Size(500, 1000);
       tester.view.devicePixelRatio = 1.0; // Ensure correct pixel ratio
 
       await tester.pumpWidget(createNutritionalPlan());
       await tester.tap(find.byType(TextButton));
       await tester.pumpAndSettle();
 
-      if(Platform.isLinux) {
-        await expectLater(find.byType(NutritionalPlanScreen),
-          matchesGoldenFile('goldens/nutritional_plan_1_default_view.png'));
-      }
+      await expectLater(
+        find.byType(NutritionalPlanScreen),
+        matchesGoldenFile('goldens/nutritional_plan_1_default_view.png'),
+      );
 
       // Default view shows plan description, info button, and no ingredients
       expect(find.text('Less fat, more protein'), findsOneWidget);
-      expect(find.byIcon(Icons.info_outline),
-          findsNWidgets(3)); // 2 meals, 1 "other logs"
+      expect(find.byIcon(Icons.info_outline), findsNWidgets(3)); // 2 meals, 1 "other logs"
       expect(find.byIcon(Icons.info), findsNothing);
       expect(find.text('100g Water'), findsNothing);
       expect(find.text('75g Burger soup'), findsNothing);
 
       // tap the first info button changes it and reveals ingredients for the first meal
       var infoOutlineButtons = find.byIcon(Icons.info_outline);
-      await tester.tap(infoOutlineButtons
-          .first); // 2nd button shows up also, but is off-screen
+      await tester.tap(infoOutlineButtons.first); // 2nd button shows up also, but is off-screen
       await tester.pumpAndSettle();
 
-      if(Platform.isLinux) {
-        await expectLater(
-          find.byType(NutritionalPlanScreen),
-          matchesGoldenFile(
-              'goldens/nutritional_plan_2_one_meal_with_ingredients.png'));
-      }
+      await expectLater(
+        find.byType(NutritionalPlanScreen),
+        matchesGoldenFile('goldens/nutritional_plan_2_one_meal_with_ingredients.png'),
+      );
 
       // Ingredients show up now
       expect(find.text('100g Water'), findsOneWidget);
@@ -140,12 +131,10 @@ void main() {
 
       await tester.tap(infoOutlineButtons.first);
       await tester.pumpAndSettle();
-      if(Platform.isLinux) {
-        await expectLater(
-          find.byType(MaterialApp),
-          matchesGoldenFile(
-              'goldens/nutritional_plan_3_both_meals_with_ingredients.png'));
-      }
+      await expectLater(
+        find.byType(MaterialApp),
+        matchesGoldenFile('goldens/nutritional_plan_3_both_meals_with_ingredients.png'),
+      );
 
       expect(find.byIcon(Icons.info_outline), findsOneWidget);
       expect(find.byIcon(Icons.info), findsNWidgets(2));
@@ -159,19 +148,18 @@ void main() {
       tester.view.resetPhysicalSize();
       tester.view.resetDevicePixelRatio();
     },
+    tags: ['golden'],
   );
 
-  testWidgets('Tests the localization of times - EN',
-      (WidgetTester tester) async {
+  testWidgets('Tests the localization of times - EN', (WidgetTester tester) async {
     await tester.pumpWidget(createNutritionalPlan());
     await tester.tap(find.byType(TextButton));
     await tester.pumpAndSettle();
 
     expect(find.textContaining('5:00 PM'), findsOneWidget);
   });
 
-  testWidgets('Tests the localization of times - DE',
-      (WidgetTester tester) async {
+  testWidgets('Tests the localization of times - DE', (WidgetTester tester) async {
     await tester.pumpWidget(createNutritionalPlan(locale: 'de'));
     await tester.tap(find.byType(TextButton));
     await tester.pumpAndSettle();

test/nutrition/goldens/nutritional_plan_2_one_meal_with_ingredients.png

@@ -16,10 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import 'dart:convert';
-
-import 'package:flutter/services.dart';
-import 'package:flutter_test/flutter_test.dart';
 import 'package:wger/providers/auth.dart';
 import 'package:wger/providers/exercises.dart';
 
@@ -34,57 +30,3 @@ final AuthProvider testAuthProvider = AuthProvider(MockClient())
 // Test Exercises provider
 final mockBaseProvider = MockWgerBaseProvider();
 final ExercisesProvider testExercisesProvider = ExercisesProvider(mockBaseProvider);
-
-// Load app fonts
-Future<void> loadAppFonts() async {
-  TestWidgetsFlutterBinding.ensureInitialized();
-
-  String derivedFontFamily(Map<String, dynamic> fontDefinition) {
-    const List<String> overridableFonts = <String>[
-      'Roboto',
-      '.SF UI Display',
-      '.SF UI Text',
-      '.SF Pro Text',
-      '.SF Pro Display',
-    ];
-
-    if (!fontDefinition.containsKey('family')) {
-      return '';
-    }
-
-    final String fontFamily = fontDefinition['family'];
-
-    if (overridableFonts.contains(fontFamily)) {
-      return fontFamily;
-    }
-
-    if (fontFamily.startsWith('packages/')) {
-      final fontFamilyName = fontFamily.split('/').last;
-      if (overridableFonts.any((font) => font == fontFamilyName)) {
-        return fontFamilyName;
-      }
-    } else {
-      for (final Map<String, dynamic> fontType in fontDefinition['fonts']) {
-        final String? asset = fontType['asset'];
-        if (asset != null && asset.startsWith('packages')) {
-          final packageName = asset.split('/')[1];
-          return 'packages/$packageName/$fontFamily';
-        }
-      }
-    }
-    return fontFamily;
-  }
-
-  final fontManifest = await rootBundle.loadStructuredData<Iterable<dynamic>>(
-    'FontManifest.json',
-        (string) async => json.decode(string),
-  );
-
-  for (final Map<String, dynamic> font in fontManifest) {
-    final fontLoader = FontLoader(derivedFontFamily(font));
-    for (final Map<String, dynamic> fontType in font['fonts']) {
-      fontLoader.addFont(rootBundle.load(fontType['asset']));
-    }
-    await fontLoader.load();
-  }
-}

test/nutrition/goldens/nutritional_plan_3_both_meals_with_ingredients.png

@@ -16,8 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import 'dart:io';
-
 import 'package:clock/clock.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -31,7 +29,6 @@ import 'package:wger/screens/routine_screen.dart';
 import 'package:wger/widgets/routines/workout_logs.dart';
 
 import '../../test_data/routines.dart';
-import '../utils.dart';
 import 'routine_logs_screen_test.mocks.dart';
 
 @GenerateMocks([RoutinesProvider])
@@ -70,18 +67,21 @@ void main() {
     );
   }
 
-  testWidgets('Smoke test the widgets on the routine logs screen', (WidgetTester tester) async {
-    await withClock(Clock.fixed(DateTime(2025, 3, 29)), () async {
-      await loadAppFonts();
-      await tester.pumpWidget(renderWidget());
-      await tester.tap(find.byType(TextButton));
-      await tester.pumpAndSettle();
+  testWidgets(
+    'Smoke test the widgets on the routine logs screen',
+    (WidgetTester tester) async {
+      await withClock(Clock.fixed(DateTime(2025, 3, 29)), () async {
+        await tester.pumpWidget(renderWidget());
+        await tester.tap(find.byType(TextButton));
+        await tester.pumpAndSettle();
 
-      await expectLater(find.byType(WorkoutLogsScreen),
-          matchesGoldenFile('goldens/routine_logs_screen_detail.png'));
+        await expectLater(find.byType(WorkoutLogsScreen),
+            matchesGoldenFile('goldens/routine_logs_screen_detail.png'));
 
-      expect(find.text('Training logs'), findsOneWidget);
-      expect(find.byType(WorkoutLogCalendar), findsOneWidget);
-    });
-  });
+        expect(find.text('Training logs'), findsOneWidget);
+        expect(find.byType(WorkoutLogCalendar), findsOneWidget);
+      });
+    },
+    tags: ['golden'],
+  );
 }

test/nutrition/nutritional_plan_screen_test.dart

@@ -31,7 +31,6 @@ import 'package:wger/providers/routines.dart';
 import 'package:wger/screens/routine_screen.dart';
 
 import '../../test_data/routines.dart';
-import '../utils.dart';
 import 'routine_screen_test.mocks.dart';
 
 @GenerateMocks([WgerBaseProvider])
@@ -70,27 +69,29 @@ void main() {
     );
   }
 
-  testWidgets('Test the widgets on the routine screen',
-      (WidgetTester tester) async {
-    await loadAppFonts();
-    await tester.pumpWidget(renderWidget());
-    await tester.tap(find.byType(TextButton));
-    await tester.pumpAndSettle();
+  testWidgets(
+    'Test the widgets on the routine screen',
+    (WidgetTester tester) async {
+      await tester.pumpWidget(renderWidget());
+      await tester.tap(find.byType(TextButton));
+      await tester.pumpAndSettle();
 
-    if(Platform.isLinux) {
-      await expectLater(find.byType(MaterialApp),
-        matchesGoldenFile('goldens/routine_logs_screen_detail.png'));
-    }
+      if (Platform.isLinux) {
+        await expectLater(
+            find.byType(MaterialApp), matchesGoldenFile('goldens/routine_logs_screen_detail.png'));
+      }
 
-    expect(find.text('3 day workout'), findsOneWidget);
+      expect(find.text('3 day workout'), findsOneWidget);
 
-    expect(find.text('first day'), findsOneWidget);
-    expect(find.text('chest, shoulders'), findsOneWidget);
+      expect(find.text('first day'), findsOneWidget);
+      expect(find.text('chest, shoulders'), findsOneWidget);
 
-    expect(find.text('second day'), findsOneWidget);
-    expect(find.text('legs'), findsOneWidget);
+      expect(find.text('second day'), findsOneWidget);
+      expect(find.text('legs'), findsOneWidget);
 
-    expect(find.byType(Card), findsWidgets);
-    // expect(find.byType(Card), findsNWidgets(4));
-  });
+      expect(find.byType(Card), findsWidgets);
+      // expect(find.byType(Card), findsNWidgets(4));
+    },
+    tags: ['golden'],
+  );
 }