diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
index ab3b72537..ca737991a 100644
--- a/.github/workflows/analyze.yml
+++ b/.github/workflows/analyze.yml
@@ -1,6 +1,10 @@
 name: Analyze
 on:
+  # Direct pushes are only validated on master (post-merge); everything else
+  # is covered by the pull_request trigger, avoiding duplicate runs for
+  # same-repo PR branches.
   push:
+    branches: [ master, ]
     paths:
       - '**.dart'
       - 'pubspec.yaml'
@@ -9,7 +13,6 @@ on:
       - 'ios/Runner/Info.plist'
       - 'android/app/src/main/res/xml/locales_config.xml'
   pull_request:
-    branches: [ master, ]
     paths:
       - '**/*.dart'
       - 'pubspec.yaml'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3d6b13e50..6b247b36e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,11 +1,14 @@
-name: Continous Integration
+name: Continuous Integration
 on:
+  # Direct pushes are only validated on master (post-merge); everything else
+  # is covered by the pull_request trigger, avoiding duplicate runs for
+  # same-repo PR branches.
   push:
+    branches: [ master, ]
     paths:
       - '**.dart'
       - 'pubspec.yaml'
   pull_request:
-    branches: [ master, ]
     paths:
       - '**/*.dart'
       - 'pubspec.yaml'
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 7fd9ed267..db37fc7a0 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -40,10 +40,14 @@ android {
     defaultConfig {
         // Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "de.wger.flutter"
-        minSdkVersion flutter.minSdkVersion
+        minSdkVersion 26
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName
+
+        // Overridden by the debug build type. Set here rather than per build
+        // type so the profile variant has it as well
+        resValue "string", "app_name", "wger"
     }
 
     signingConfigs {
@@ -59,7 +63,11 @@ android {
             signingConfig signingConfigs.release
         }
         debug {
+            // Own application id and name, so a debug build can sit next to the
+            // installed release one on the same device. The launcher icon keeps
+            // the wger logo on a different background, see src/debug/res
             applicationIdSuffix ".debug"
+            resValue "string", "app_name", "wger - debug"
         }
     }
 }
diff --git a/android/app/src/debug/res/values/colors.xml b/android/app/src/debug/res/values/colors.xml
new file mode 100644
index 000000000..abf0b1a42
--- /dev/null
+++ b/android/app/src/debug/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Background of the adaptive launcher icon. Overrides the release blue so
+         a debug build is recognisable at a glance next to the installed app -->
+    <color name="ic_launcher_background">#e63946</color>
+</resources>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index df240b94f..39d865df8 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -9,11 +9,34 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.INTERNET" />
 
+    <!-- Health Connect permissions for the imported measurement types. Must
+         list every type in enabledHealthMetrics: Health Connect cannot grant
+         what is not declared here, so a missing entry silently costs that
+         metric its import. Guarded by health_manifest_test.dart -->
+    <uses-permission android:name="android.permission.health.READ_WEIGHT"/>
+    <uses-permission android:name="android.permission.health.READ_BODY_FAT"/>
+    <uses-permission android:name="android.permission.health.READ_LEAN_BODY_MASS"/>
+    <uses-permission android:name="android.permission.health.READ_HEIGHT"/>
+    <uses-permission android:name="android.permission.health.READ_BLOOD_PRESSURE"/>
+    <uses-permission android:name="android.permission.health.READ_HEART_RATE"/>
+    <uses-permission android:name="android.permission.health.READ_RESTING_HEART_RATE"/>
+    <uses-permission android:name="android.permission.health.READ_OXYGEN_SATURATION"/>
+    <uses-permission android:name="android.permission.health.READ_SLEEP"/>
+    <uses-permission android:name="android.permission.health.READ_STEPS"/>
+    <uses-permission android:name="android.permission.health.READ_DISTANCE"/>
+    <uses-permission android:name="android.permission.health.READ_ACTIVE_CALORIES_BURNED"/>
+    <uses-permission android:name="android.permission.health.READ_HEALTH_DATA_HISTORY"/>
+
     <queries>
         <intent>
             <action android:name="android.intent.action.VIEW" />
             <data android:scheme="https" />
         </intent>
+        <!-- Health Connect -->
+        <package android:name="com.google.android.apps.healthdata" />
+        <intent>
+            <action android:name="androidx.health.ACTION_SHOW_PERMISSIONS_RATIONALE" />
+        </intent>
     </queries>
 
     <supports-screens
@@ -24,7 +47,7 @@
 
     <application
         android:name="${applicationName}"
-        android:label="wger"
+        android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher"
         android:enableOnBackInvokedCallback="true"
         android:networkSecurityConfig="@xml/network_security_config"
@@ -66,8 +89,24 @@
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="wger" android:host="app-auth" />
             </intent-filter>
+
+            <!-- Health Connect permissions rationale -->
+            <intent-filter>
+                <action android:name="androidx.health.ACTION_SHOW_PERMISSIONS_RATIONALE" />
+            </intent-filter>
         </activity>
 
+        <!-- Required for Health Connect on Google Play -->
+        <activity-alias
+            android:name="ViewPermissionUsageActivity"
+            android:exported="true"
+            android:targetActivity=".MainActivity"
+            android:permission="android.permission.START_VIEW_PERMISSION_USAGE">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW_PERMISSION_USAGE" />
+                <category android:name="android.intent.category.HEALTH_PERMISSIONS" />
+            </intent-filter>
+        </activity-alias>
 
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
diff --git a/android/app/src/main/kotlin/de/wger/flutter/MainActivity.kt b/android/app/src/main/kotlin/de/wger/flutter/MainActivity.kt
index 421496c68..3e9f4cd14 100644
--- a/android/app/src/main/kotlin/de/wger/flutter/MainActivity.kt
+++ b/android/app/src/main/kotlin/de/wger/flutter/MainActivity.kt
@@ -1,6 +1,6 @@
 package de.wger.flutter
 
-import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.android.FlutterFragmentActivity
 
-class MainActivity: FlutterActivity() {
+class MainActivity: FlutterFragmentActivity() {
 }
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 8384323ad..006be35e8 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -287,7 +287,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -375,7 +375,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -424,7 +424,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 82371b5f1..b0855683b 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -87,6 +87,8 @@
 		<true/>
 		<key>NSCameraUsageDescription</key>
 		<string>Workout photos</string>
+		<key>NSHealthShareUsageDescription</key>
+		<string>wger reads your health data to automatically import body measurements such as weight, body fat, blood pressure, heart rate and blood oxygen</string>
 		<key>UIApplicationSceneManifest</key>
 		<dict>
 			<key>UIApplicationSupportsMultipleScenes</key>
diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
index 903def2af..c77f75e0e 100644
--- a/ios/Runner/Runner.entitlements
+++ b/ios/Runner/Runner.entitlements
@@ -4,5 +4,7 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.developer.healthkit</key>
+	<true/>
 </dict>
 </plist>
diff --git a/lib/core/consts.dart b/lib/core/consts.dart
index 65c9c38a6..cf6da6b3b 100644
--- a/lib/core/consts.dart
+++ b/lib/core/consts.dart
@@ -24,7 +24,7 @@ import 'package:intl/intl.dart';
 /// Bump this value whenever you depend on API changes that are only available
 /// in a newer server release. The check is performed during login and
 /// auto-login and mirrors what the server does with MIN_APP_VERSION.
-const MIN_SERVER_VERSION = '2.6';
+const MIN_SERVER_VERSION = '2.7';
 
 /// Size for the "smaller" icons, e.g. when they belong to less important items
 /// and we don't want to fill the whole screen
@@ -69,6 +69,9 @@ const PREFS_LAST_SERVER = 'lastServer';
 const PREFS_USE_DYNAMIC_COLOR = 'useDynamicColor';
 const USE_DYNAMIC_COLOR_DEFAULT = false;
 
+/// The chart range the measurement screens share, held as `ChartRange.name`
+const PREFS_CHART_RANGE = 'measurementChartRange';
+
 /// Headless JWT auth: SharedPreferences keys.
 ///
 /// Read in parallel with the legacy `PREFS_USER` blob during the migration
diff --git a/lib/core/formatting/formatting.dart b/lib/core/formatting/formatting.dart
index 5294e789e..2f7d008cc 100644
--- a/lib/core/formatting/formatting.dart
+++ b/lib/core/formatting/formatting.dart
@@ -1,6 +1,6 @@
 /*
  * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (c) 2026 wger Team
+ * Copyright (c) 2026 - 2026 wger Team
  *
  * wger Workout Manager is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -16,8 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'dart:math';
+
 import 'package:flutter/widgets.dart';
 import 'package:intl/intl.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
 
 /// A short date format (`DateFormat.yMd`) bound to the current locale's
 /// language. Chain further patterns (e.g. `.add_Hm()`) as needed.
@@ -27,3 +30,118 @@ DateFormat localizedDate(BuildContext context) =>
 /// A decimal number format bound to the current locale.
 NumberFormat localizedNumberFormat(BuildContext context) =>
     NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
+
+/// A date in the past as a relative phrase ("today", "3 weeks ago").
+///
+/// Counts calendar days rather than elapsed hours, so an entry from late
+/// yesterday still reads as yesterday this morning. The unit grows with the
+/// distance: days within a week, then weeks, months, years. Matches react's
+/// dateToRelative for past dates, which reaches the same output through Intl.
+///
+/// A date ahead of [now] reads as today: the pickers do not offer one, so it
+/// only ever arrives through clock skew between devices, and the phrases for
+/// it (react has them from Intl) would be four more strings to translate for
+/// a case nobody is looking at.
+String relativeDate(BuildContext context, DateTime date, {DateTime? now}) {
+  final today = now ?? DateTime.now();
+  // Calendar arithmetic in UTC, so a DST day is not 23 or 25 hours long
+  final elapsed = DateTime.utc(
+    today.year,
+    today.month,
+    today.day,
+  ).difference(DateTime.utc(date.year, date.month, date.day)).inDays;
+  final days = max(0, elapsed);
+
+  final i18n = AppLocalizations.of(context);
+  if (days < DateTime.daysPerWeek) {
+    return i18n.relativeDaysAgo(days);
+  }
+  if (days < 31) {
+    return i18n.relativeWeeksAgo((days / 7).round());
+  }
+  if (days < 365) {
+    return i18n.relativeMonthsAgo((days / 30).round());
+  }
+  return i18n.relativeYearsAgo((days / 365).round());
+}
+
+/// The unit a duration is stored in, which is what the health platforms deliver.
+const durationUnit = 'min';
+
+/// A duration in minutes as hours and minutes, e.g. 452 as `7:32`.
+///
+/// Neither intl nor intl4x has a duration formatter, so the parts are put
+/// together the way flutter_localizations does it for a time of day: the
+/// digits come from the locale (`۷:۳۲` in Persian) and the minutes are zero
+/// padded through the number format rather than through the string. The sign
+/// is ours, a duration is only ever negative here as a change between two of
+/// them. The web side reaches the same output through Intl.DurationFormat.
+String hoursAndMinutes(num minutes, String locale) {
+  final rounded = minutes.round();
+  final absolute = rounded.abs();
+
+  return '${rounded < 0 ? '-' : ''}'
+      '${NumberFormat.decimalPattern(locale).format(absolute ~/ 60)}:'
+      '${NumberFormat('00', locale).format(absolute % 60)}';
+}
+
+/// A measured value on its own, formatted the way its unit is read. For the
+/// ends of a range, where only the last one carries the unit.
+///
+/// [decimals] caps the fraction digits, for at-a-glance readings; without it
+/// the locale default (up to three) applies. A duration ignores it, hours and
+/// minutes have no decimals to cap.
+String measurementValue(BuildContext context, num value, String unit, {int? decimals}) =>
+    unit == durationUnit
+    ? hoursAndMinutes(value, Localizations.localeOf(context).toString())
+    : (decimals == null
+              ? localizedNumberFormat(context)
+              : (localizedNumberFormat(context)..maximumFractionDigits = decimals))
+          .format(value);
+
+/// The unit as it is shown. A duration is stored in minutes but read in hours,
+/// and the symbol stays untranslated like the units of the other categories.
+String measurementUnit(String unit) => unit == durationUnit ? 'h' : unit;
+
+/// An already formatted value followed by its unit, or on its own where there
+/// is none: a step count is a bare number, and so may be a free-form category.
+String unitSuffixed(String formatted, String unit) =>
+    unit.isEmpty ? formatted : '$formatted ${measurementUnit(unit)}';
+
+/// A measured value with its unit. [decimals] as in [measurementValue].
+String measurementWithUnit(BuildContext context, num value, String unit, {int? decimals}) =>
+    unitSuffixed(measurementValue(context, value, unit, decimals: decimals), unit);
+
+/// Ticks a duration axis aims for, few enough that the labels stay apart.
+const _DURATION_TICKS = 6;
+
+const _MINUTES_PER_HOUR = 60;
+
+/// Bounds and tick interval of an axis of durations, null for every other
+/// unit, where fl_chart picks them.
+///
+/// A duration is read in hours, so a tick belongs on a whole one: an axis
+/// labelled 6:40, 8:20, 10:00 is arithmetically correct and unreadable. The
+/// interval grows in whole hours until few enough ticks are left, and the
+/// bounds are widened to the hours around the data, because fl_chart counts
+/// the ticks from the lower bound.
+({double min, double max, double interval})? durationAxis(
+  String unit,
+  num min,
+  num max,
+) {
+  if (unit != durationUnit) {
+    return null;
+  }
+
+  final from = (min / _MINUTES_PER_HOUR).floor() * _MINUTES_PER_HOUR;
+  final to = (max / _MINUTES_PER_HOUR).ceil() * _MINUTES_PER_HOUR;
+  final hours = ((to - from) / _MINUTES_PER_HOUR).clamp(1, double.infinity);
+  final interval = (hours / _DURATION_TICKS).ceil() * _MINUTES_PER_HOUR;
+
+  // The top follows the interval rather than the data: a bound that ended
+  // below the last tick would cut the values it was derived from
+  final top = from + ((to - from) / interval).ceil() * interval;
+
+  return (min: from.toDouble(), max: top.toDouble(), interval: interval.toDouble());
+}
diff --git a/lib/core/home_tabs_screen.dart b/lib/core/home_tabs_screen.dart
index f6b5f46ac..0d9654683 100644
--- a/lib/core/home_tabs_screen.dart
+++ b/lib/core/home_tabs_screen.dart
@@ -22,9 +22,10 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:wger/core/dashboard.dart';
 import 'package:wger/core/material.dart';
 import 'package:wger/features/gallery/screens/gallery_screen.dart';
+import 'package:wger/features/health/providers/health_sync.dart';
+import 'package:wger/features/measurements/screens/measurement_categories_screen.dart';
 import 'package:wger/features/nutrition/screens/nutritional_plans_screen.dart';
 import 'package:wger/features/routines/screens/routine_list_screen.dart';
-import 'package:wger/features/weight/screens/weight_screen.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
 class HomeTabsScreen extends ConsumerStatefulWidget {
@@ -41,6 +42,20 @@ class _HomeTabsScreenState extends ConsumerState<HomeTabsScreen>
   int _selectedIndex = 0;
   bool _isWideScreen = false;
 
+  @override
+  void initState() {
+    super.initState();
+
+    // Pull any new readings from Apple Health / Health Connect once the app is
+    // open. The sync is a no-op unless the user enabled it in the settings.
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) {
+        return;
+      }
+      ref.read(healthSyncProvider.notifier).sync();
+    });
+  }
+
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
@@ -59,7 +74,7 @@ class _HomeTabsScreenState extends ConsumerState<HomeTabsScreen>
     const DashboardScreen(),
     const RoutineListScreen(),
     const NutritionalPlansScreen(),
-    const WeightScreen(),
+    const MeasurementCategoriesScreen(),
     const GalleryScreen(),
   ];
 
@@ -80,7 +95,7 @@ class _HomeTabsScreenState extends ConsumerState<HomeTabsScreen>
       ),
       NavigationDestination(
         icon: const FaIcon(FontAwesomeIcons.weightScale, size: 20),
-        label: AppLocalizations.of(context).weight,
+        label: AppLocalizations.of(context).labelBottomNavBody,
       ),
       NavigationDestination(
         icon: const Icon(Icons.photo_library),
diff --git a/lib/core/network/auth_notifier.g.dart b/lib/core/network/auth_notifier.g.dart
index 86ce6eeff..7d29a5ac1 100644
--- a/lib/core/network/auth_notifier.g.dart
+++ b/lib/core/network/auth_notifier.g.dart
@@ -32,7 +32,7 @@ final class AuthNotifierProvider extends $AsyncNotifierProvider<AuthNotifier, Au
   AuthNotifier create() => AuthNotifier();
 }
 
-String _$authNotifierHash() => r'19bf6776a00c5a7374ddc918f55709ee3a193b3f';
+String _$authNotifierHash() => r'2e848f93a2dec9ca9c98ce85e860864c58fa0a2b';
 
 abstract class _$AuthNotifier extends $AsyncNotifier<AuthState> {
   FutureOr<AuthState> build();
diff --git a/lib/core/shared_preferences.dart b/lib/core/shared_preferences.dart
index de3ed3b16..a54b58671 100644
--- a/lib/core/shared_preferences.dart
+++ b/lib/core/shared_preferences.dart
@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:shared_preferences/util/legacy_to_async_migration_util.dart';
 import 'package:wger/core/search_options.dart';
@@ -132,4 +134,72 @@ class PreferenceHelper {
       orElse: () => fallback.searchMode,
     );
   }
+
+  // --- Health sync ---
+
+  static const _healthSyncEnabledKey = 'healthSyncEnabled';
+  static const _healthSyncWatermarksKey = 'healthSyncWatermarks';
+  static const _healthSyncReadableTypesKey = 'healthSyncReadableTypes';
+  static const _healthSyncEmptyMetricsKey = 'healthSyncEmptyMetrics';
+
+  Future<void> setHealthSyncEnabled(bool value) async {
+    await PreferenceHelper.asyncPref.setBool(_healthSyncEnabledKey, value);
+  }
+
+  Future<bool> getHealthSyncEnabled() async {
+    final value = await PreferenceHelper.asyncPref.getBool(_healthSyncEnabledKey);
+    return value ?? false;
+  }
+
+  /// How far each metric has been imported, keyed by `MetricType.name` and
+  /// held as ISO-8601 timestamps.
+  ///
+  /// Per metric rather than one for all of them, so an import interrupted
+  /// halfway resumes where each metric got to instead of starting over, and
+  /// so that a metric that cannot be imported holds nobody else back.
+  Future<void> setHealthSyncWatermarks(Map<String, String> value) async {
+    await PreferenceHelper.asyncPref.setString(_healthSyncWatermarksKey, jsonEncode(value));
+  }
+
+  Future<Map<String, String>> getHealthSyncWatermarks() async {
+    final stored = await PreferenceHelper.asyncPref.getString(_healthSyncWatermarksKey);
+    if (stored == null) {
+      return {};
+    }
+    return (jsonDecode(stored) as Map<String, dynamic>).cast<String, String>();
+  }
+
+  /// The health data types the platform let us read during the last sync.
+  ///
+  /// A type that was not readable then has no history in wger, so the sync
+  /// reads the full window once it becomes readable, instead of starting at
+  /// the watermark and leaving everything before it missing.
+  Future<void> setHealthSyncReadableTypes(List<String> value) async {
+    await PreferenceHelper.asyncPref.setStringList(_healthSyncReadableTypesKey, value);
+  }
+
+  Future<List<String>?> getHealthSyncReadableTypes() async {
+    return PreferenceHelper.asyncPref.getStringList(_healthSyncReadableTypesKey);
+  }
+
+  /// The metrics the platform had nothing at all for when their full history
+  /// was last read.
+  ///
+  /// Such a metric never gets a category, and a missing category is what sends
+  /// the sync back to the full window; without this it would do so on every
+  /// run, for every metric.
+  Future<void> setHealthSyncEmptyMetrics(List<String> value) async {
+    await PreferenceHelper.asyncPref.setStringList(_healthSyncEmptyMetricsKey, value);
+  }
+
+  Future<List<String>?> getHealthSyncEmptyMetrics() async {
+    return PreferenceHelper.asyncPref.getStringList(_healthSyncEmptyMetricsKey);
+  }
+
+  Future<void> clearHealthSyncPreferences() async {
+    await PreferenceHelper.asyncPref.remove(_healthSyncEnabledKey);
+    await PreferenceHelper.asyncPref.remove(_healthSyncWatermarksKey);
+    await PreferenceHelper.asyncPref.remove(_healthSyncReadableTypesKey);
+    await PreferenceHelper.asyncPref.remove(_healthSyncEmptyMetricsKey);
+  }
 }
diff --git a/lib/core/widgets/dashboard/calendar.dart b/lib/core/widgets/dashboard/calendar.dart
index 719a2a4ae..77afb1696 100644
--- a/lib/core/widgets/dashboard/calendar.dart
+++ b/lib/core/widgets/dashboard/calendar.dart
@@ -24,14 +24,17 @@ import 'package:wger/core/date.dart';
 import 'package:wger/core/formatting/formatting.dart';
 import 'package:wger/core/json.dart';
 import 'package:wger/core/widgets/progress_indicator.dart';
+import 'package:wger/features/account/providers/user_profile_notifier.dart';
+import 'package:wger/features/measurements/charts/data.dart';
+import 'package:wger/features/measurements/models/measurement_bucket.dart';
 import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/unit_conversion.dart';
 import 'package:wger/features/measurements/providers/measurement_notifier.dart';
+import 'package:wger/features/measurements/widgets/charts.dart';
 import 'package:wger/features/nutrition/models/nutritional_plan.dart';
 import 'package:wger/features/nutrition/providers/nutrition_notifier.dart';
 import 'package:wger/features/routines/models/session.dart';
 import 'package:wger/features/routines/providers/routines_notifier.dart';
-import 'package:wger/features/weight/models/weight_entry.dart';
-import 'package:wger/features/weight/providers/body_weight_notifier.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/theme/theme.dart';
 
@@ -78,30 +81,44 @@ class _DashboardCalendarWidgetState extends riverpod.ConsumerState<DashboardCale
   /// Builds the date → events map from already-loaded provider data
   Map<String, List<Event>> _buildEvents({
     required BuildContext context,
-    required List<WeightEntry> entries,
+    required bool isMetric,
     required List<MeasurementCategory> categories,
+    required Map<String, List<MeasurementBucket>> dailyBuckets,
     required List<WorkoutSession> sessions,
     required List<NutritionalPlan> plans,
   }) {
-    final numberFormat = localizedNumberFormat(context);
     final i18n = AppLocalizations.of(context);
     final events = <String, List<Event>>{};
 
-    for (final entry in entries) {
-      final date = DateFormatLists.format(entry.date);
-      events.putIfAbsent(date, () => []);
-      events[date]!.add(Event(EventType.weight, '${numberFormat.format(entry.weight)} kg'));
-    }
-
     for (final category in categories) {
-      for (final entry in category.entries) {
-        final date = DateFormatLists.format(entry.date);
+      // Body weight entries live in the official category but keep their own
+      // event type (no category-name prefix) and are shown in the profile's
+      // display unit; other measurements show in the category unit
+      final isBodyWeight = category.isOfficialBodyWeight;
+      final displayUnit = isBodyWeight ? weightDisplayUnit(isMetric) : category.unit;
+      // the conversion needs the wire unit, the label the localized one
+      final unitLabel = isBodyWeight ? weightUnit(isMetric, context) : category.unit;
+
+      // One event per day, not per reading: an imported metric writes hundreds
+      // of samples onto a day, and they describe that day together
+      final points = chartEntriesForBuckets(
+        dailyBuckets[category.id] ?? const [],
+        targetUnit: displayUnit,
+        categoryUnit: category.unit,
+        summed: category.metricType.isSummedPerDay,
+      );
+
+      for (final point in points) {
+        final date = DateFormatLists.format(point.date);
+        final value = unitSuffixed(
+          measurementValue(context, point.value, displayUnit),
+          unitLabel,
+        );
         events.putIfAbsent(date, () => []);
         events[date]!.add(
-          Event(
-            EventType.measurement,
-            '${category.name}: ${numberFormat.format(entry.value)} ${category.unit}',
-          ),
+          isBodyWeight
+              ? Event(EventType.weight, value)
+              : Event(EventType.measurement, '${category.name}: $value'),
         );
       }
     }
@@ -187,21 +204,27 @@ class _DashboardCalendarWidgetState extends riverpod.ConsumerState<DashboardCale
 
   @override
   Widget build(BuildContext context) {
-    final entries = ref.watch(weightEntryProvider).value;
-    final categories = ref.watch(measurementProvider).value;
+    final categories = ref.watch(measurementCategoriesProvider).value;
+    final dailyBuckets = ref.watch(measurementDailyBucketsProvider).value;
     final routinesState = ref.watch(routinesRiverpodProvider).value;
     final nutritionState = ref.watch(nutritionProvider).value;
+    final profile = ref.watch(userProfileProvider).value;
 
     // Show a spinner until every source has produced at least one value. Same
     // pattern as the other dashboard widgets via [AsyncValueWidget].
-    if (entries == null || categories == null || routinesState == null || nutritionState == null) {
+    if (categories == null ||
+        dailyBuckets == null ||
+        routinesState == null ||
+        nutritionState == null ||
+        profile == null) {
       return _shell(context, const BoxedProgressIndicator());
     }
 
     final events = _buildEvents(
       context: context,
-      entries: entries,
+      isMetric: profile.isMetric,
       categories: categories,
+      dailyBuckets: dailyBuckets,
       sessions: routinesState.sessions,
       plans: nutritionState.plans,
     );
diff --git a/lib/core/widgets/dashboard/widgets/measurements.dart b/lib/core/widgets/dashboard/widgets/measurements.dart
index 75eabbcb6..a26380147 100644
--- a/lib/core/widgets/dashboard/widgets/measurements.dart
+++ b/lib/core/widgets/dashboard/widgets/measurements.dart
@@ -43,9 +43,17 @@ class _DashboardMeasurementWidgetState extends ConsumerState<DashboardMeasuremen
   @override
   Widget build(BuildContext context) {
     return AsyncValueWidget<List<MeasurementCategory>>(
-      value: ref.watch(measurementProvider),
+      // The categories alone; a card reads its own points, and the latest
+      // value of a component comes from its own query, see CategoriesCard
+      value: ref.watch(measurementCategoriesProvider),
       loggerName: 'DashboardMeasurementWidget',
-      data: (categoriesList) {
+      data: (allCategories) {
+        // Children of multi-value groups are shown inside their parent's card.
+        // Body weight has its own dashboard widget.
+        final categoriesList = allCategories
+            .where((c) => c.parentId == null && !c.isOfficialBodyWeight)
+            .toList();
+
         if (categoriesList.isEmpty) {
           return NothingFound(
             AppLocalizations.of(context).moreMeasurementEntries,
diff --git a/lib/core/widgets/dashboard/widgets/routines.dart b/lib/core/widgets/dashboard/widgets/routines.dart
index c326fdd61..871e5bfd1 100644
--- a/lib/core/widgets/dashboard/widgets/routines.dart
+++ b/lib/core/widgets/dashboard/widgets/routines.dart
@@ -245,6 +245,7 @@ class DetailContentWidget extends StatelessWidget {
                       const Icon(Icons.hotel)
                     else
                       IconButton(
+                        tooltip: AppLocalizations.of(context).gymMode,
                         icon: const Icon(Icons.play_arrow),
                         color: Theme.of(context).colorScheme.primary,
                         onPressed: () {
diff --git a/lib/core/widgets/dashboard/widgets/weight.dart b/lib/core/widgets/dashboard/widgets/weight.dart
index 976be228a..b3be1d8ef 100644
--- a/lib/core/widgets/dashboard/widgets/weight.dart
+++ b/lib/core/widgets/dashboard/widgets/weight.dart
@@ -25,12 +25,16 @@ import 'package:wger/core/widgets/error.dart';
 import 'package:wger/core/widgets/progress_indicator.dart';
 import 'package:wger/features/account/models/user_profile.dart';
 import 'package:wger/features/account/providers/user_profile_notifier.dart';
+import 'package:wger/features/measurements/charts/data.dart';
+import 'package:wger/features/measurements/charts/range.dart';
+import 'package:wger/features/measurements/charts/series.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/unit_conversion.dart';
+import 'package:wger/features/measurements/providers/body_weight_provider.dart';
+import 'package:wger/features/measurements/screens/weight_screen.dart';
 import 'package:wger/features/measurements/widgets/charts.dart';
 import 'package:wger/features/measurements/widgets/helpers.dart';
-import 'package:wger/features/weight/models/weight_entry.dart';
-import 'package:wger/features/weight/providers/body_weight_notifier.dart';
-import 'package:wger/features/weight/screens/weight_screen.dart';
-import 'package:wger/features/weight/widgets/forms.dart';
+import 'package:wger/features/measurements/widgets/weight_form.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
 class DashboardWeightWidget extends ConsumerWidget {
@@ -59,21 +63,21 @@ class DashboardWeightWidget extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final entriesAsync = ref.watch(weightEntryProvider);
+    final categoryAsync = ref.watch(bodyWeightCategoryOnlyProvider);
     final profileAsync = ref.watch(userProfileProvider);
 
     // Composite loading / error / data resolution. We need both providers
-    // ready before we can render the chart (entries → series, profile →
+    // ready before we can render the chart (category → series, profile →
     // unit). Treating them independently with a nested .when() is what gave
     // us the eternal-spinner bug when fetchProfile() returned null, so we
     // funnel everything through a single decision tree here.
-    if (entriesAsync.isLoading || profileAsync.isLoading) {
+    if (categoryAsync.isLoading || profileAsync.isLoading) {
       return _shell(context, const BoxedProgressIndicator());
     }
-    if (entriesAsync.hasError) {
+    if (categoryAsync.hasError) {
       return _shell(
         context,
-        StreamErrorIndicator(entriesAsync.error!, stacktrace: entriesAsync.stackTrace),
+        StreamErrorIndicator(categoryAsync.error!, stacktrace: categoryAsync.stackTrace),
       );
     }
     if (profileAsync.hasError) {
@@ -91,41 +95,63 @@ class DashboardWeightWidget extends ConsumerWidget {
       // permanent-looking error; the widget rebuilds once the row lands.
       return _shell(context, const BoxedProgressIndicator());
     }
+    final category = categoryAsync.value;
+    if (category == null) {
+      // The official body weight category is created by the server; it is
+      // missing only while the initial sync is still running.
+      return _shell(context, const BoxedProgressIndicator());
+    }
+
+    // The chart is drawn from the aggregated query, so the card condenses the
+    // history in SQL rather than reading an object per entry. Mixed-unit
+    // entries (kg/lb) are normalized to the profile's display unit
+    final pointsAsync = chartPointsFor(
+      ref,
+      category,
+      ChartRange.all,
+      targetUnit: weightDisplayUnit(profile.isMetric),
+    );
+    final points = pointsAsync.value;
+    if (points == null) {
+      return _shell(context, const BoxedProgressIndicator());
+    }
 
-    return _shell(context, _buildContent(context, entriesAsync.value!, profile));
+    return _shell(context, _buildContent(context, category, profile, points));
   }
 
   Widget _buildContent(
     BuildContext context,
-    List<WeightEntry> entriesList,
+    MeasurementCategory category,
     UserProfile profile,
+    List<MeasurementChartEntry> points,
   ) {
-    if (entriesList.isEmpty) {
+    if (points.isEmpty) {
       return NothingFound(
         AppLocalizations.of(context).noWeightEntries,
         AppLocalizations.of(context).newEntry,
-        WeightForm(),
+        WeightForm(category),
       );
     }
 
-    final (entriesAll, entries7dAvg) = sensibleRange(
-      entriesList.map((e) => MeasurementChartEntry(e.weight, e.date)).toList(),
+    final (entriesAll, average) = sensibleRange(
+      points,
+      averageDays: category.chartSettings.averageWindow,
     );
 
     return Column(
       children: [
         SizedBox(
           height: 200,
-          child: MeasurementChartWidgetFl(
+          child: MeasurementChartWidgetFl.singleMeasurement(
             entriesAll,
             weightUnit(profile.isMetric, context),
-            avgs: entries7dAvg,
+            avgs: average,
           ),
         ),
-        if (entries7dAvg.isNotEmpty)
+        if (average.isNotEmpty)
           MeasurementOverallChangeWidget(
-            entries7dAvg.first,
-            entries7dAvg.last,
+            average.first,
+            average.last,
             weightUnit(profile.isMetric, context),
           ),
         LayoutBuilder(
@@ -154,7 +180,7 @@ class DashboardWeightWidget extends ConsumerWidget {
                           FormScreen.routeName,
                           arguments: FormScreenArguments(
                             AppLocalizations.of(context).newEntry,
-                            WeightForm(),
+                            WeightForm(category),
                           ),
                         );
                       },
diff --git a/lib/core/widgets/datetime_input.dart b/lib/core/widgets/datetime_input.dart
index 1dab063dc..e2f3aa745 100644
--- a/lib/core/widgets/datetime_input.dart
+++ b/lib/core/widgets/datetime_input.dart
@@ -18,6 +18,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:wger/core/formatting/formatting.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
 
 /// Read-only field that opens a time picker on tap.
 ///
@@ -221,3 +222,72 @@ class _DateInputWidgetState extends State<DateInputWidget> {
     );
   }
 }
+
+/// The two halves of one [DateTime]: a date field above a time field, each
+/// reporting the whole moment through [onChanged].
+///
+/// For the entries that are stamped with a single point in time. Where date
+/// and time are stored apart (a meal has a time and no date), the two fields
+/// are used on their own instead.
+class DateTimeInputWidget extends StatefulWidget {
+  const DateTimeInputWidget({
+    required this.value,
+    required this.onChanged,
+    this.firstDate,
+    this.lastDate,
+    super.key,
+  });
+
+  /// The moment both fields show, and the one edits are applied to.
+  final DateTime value;
+
+  /// Called with the full moment after either half was picked.
+  final ValueChanged<DateTime> onChanged;
+
+  /// Earliest selectable date, ten years back by default.
+  final DateTime? firstDate;
+
+  /// Latest selectable date, today by default.
+  final DateTime? lastDate;
+
+  @override
+  State<DateTimeInputWidget> createState() => _DateTimeInputWidgetState();
+}
+
+class _DateTimeInputWidgetState extends State<DateTimeInputWidget> {
+  /// The moment as far as it has been edited. Kept here because the callers
+  /// collect what they build without rebuilding, so the value passed in would
+  /// still be the one the form started with when the second half is picked.
+  late DateTime _value = widget.value;
+
+  void _report(DateTime value) {
+    setState(() => _value = value);
+    widget.onChanged(value);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    return Column(
+      children: [
+        DateInputWidget(
+          value: _value,
+          labelText: i18n.date,
+          firstDate: widget.firstDate ?? DateTime(DateTime.now().year - 10),
+          lastDate: widget.lastDate ?? DateTime.now(),
+          onChanged: (date) => _report(
+            _value.copyWith(year: date.year, month: date.month, day: date.day),
+          ),
+        ),
+        TimeInputWidget(
+          value: TimeOfDay.fromDateTime(_value),
+          labelText: i18n.time,
+          onChanged: (time) => _report(
+            _value.copyWith(hour: time.hour, minute: time.minute, second: 0),
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/core/widgets/decimal_input.dart b/lib/core/widgets/decimal_input.dart
index 625806b08..6a144c2b9 100644
--- a/lib/core/widgets/decimal_input.dart
+++ b/lib/core/widgets/decimal_input.dart
@@ -17,6 +17,7 @@
  */
 
 import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:wger/core/consts.dart';
 import 'package:wger/core/formatting/formatting.dart';
 import 'package:wger/core/number_input.dart';
@@ -28,7 +29,10 @@ import 'package:wger/l10n/generated/app_localizations.dart';
 /// through [onChanged] as a parsed [num], or null when the field is empty.
 /// Display and parsing always go through the same NumberFormat, so a value can
 /// never be mis-read because of a decimal-separator mismatch between locales.
-class DecimalInputWidget extends StatelessWidget {
+///
+/// [value] seeds the field, later changes to it are ignored: what the user
+/// typed is what stands.
+class DecimalInputWidget extends StatefulWidget {
   const DecimalInputWidget({
     required this.value,
     required this.onChanged,
@@ -37,6 +41,7 @@ class DecimalInputWidget extends StatelessWidget {
     this.isRequired = false,
     this.min,
     this.max,
+    this.steppers = const [],
     super.key,
   });
 
@@ -61,31 +66,120 @@ class DecimalInputWidget extends StatelessWidget {
   /// Optional inclusive upper bound. See [min].
   final num? max;
 
+  /// Step sizes for the quick +/- buttons around the field, biggest first.
+  /// Empty for a plain field.
+  final List<num> steppers;
+
+  @override
+  State<DecimalInputWidget> createState() => _DecimalInputWidgetState();
+}
+
+class _DecimalInputWidgetState extends State<DecimalInputWidget> {
+  /// Controller rather than `initialValue`, because the steppers write into
+  /// the field. Seeded in didChangeDependencies, which is where the locale
+  /// that formats the value is available.
+  final _controller = TextEditingController();
+  bool _seeded = false;
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    if (!_seeded) {
+      _seeded = true;
+      final value = widget.value;
+      if (value != null) {
+        _controller.text = localizedNumberFormat(context).format(value);
+      }
+    }
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  /// Adds [delta] to what the field currently holds, unless that leaves the
+  /// valid range or the field holds nothing to add to.
+  void _step(num delta) {
+    final numberFormat = localizedNumberFormat(context);
+    final parsed = numberFormat.tryParse(_controller.text);
+    if (parsed == null) {
+      return;
+    }
+
+    final stepped = parsed + delta;
+    if ((widget.min != null && stepped < widget.min!) ||
+        (widget.max != null && stepped > widget.max!)) {
+      return;
+    }
+
+    _controller.text = numberFormat.format(stepped);
+    // Setting the text does not run the field's onChanged
+    widget.onChanged(stepped);
+  }
+
+  /// The quick-change buttons of one side, biggest step outermost. The biggest
+  /// one is drawn as a circled icon, so the two sizes stay apart at a glance.
+  List<Widget> _stepperButtons({required bool plus}) => [
+    for (final (index, step) in widget.steppers.indexed)
+      IconButton(
+        key: Key('stepper-${plus ? 'plus' : 'minus'}-$index'),
+        icon: FaIcon(
+          switch ((index, plus)) {
+            (0, false) => FontAwesomeIcons.circleMinus,
+            (0, true) => FontAwesomeIcons.circlePlus,
+            (_, false) => FontAwesomeIcons.minus,
+            (_, true) => FontAwesomeIcons.plus,
+          },
+        ),
+        onPressed: () => _step(plus ? step : -step),
+      ),
+  ];
+
   @override
   Widget build(BuildContext context) {
     final i18n = AppLocalizations.of(context);
     final numberFormat = localizedNumberFormat(context);
+    final hasSteppers = widget.steppers.isNotEmpty;
 
     return TextFormField(
-      initialValue: value == null ? '' : numberFormat.format(value),
-      decoration: InputDecoration(labelText: labelText, suffixText: suffixText),
+      controller: _controller,
+      decoration: InputDecoration(
+        labelText: widget.labelText,
+        suffixText: widget.suffixText,
+        prefix: hasSteppers
+            ? Row(
+                mainAxisSize: MainAxisSize.min,
+                children: _stepperButtons(plus: false),
+              )
+            : null,
+        suffix: hasSteppers
+            ? Row(
+                mainAxisSize: MainAxisSize.min,
+                children: _stepperButtons(plus: true).reversed.toList(),
+              )
+            : null,
+      ),
       keyboardType: textInputTypeDecimal,
       inputFormatters: [LocalizedDecimalInputFormatter(numberFormat.symbols.DECIMAL_SEP)],
       onChanged: (text) {
         final trimmed = text.trim();
-        onChanged(trimmed.isEmpty ? null : numberFormat.tryParse(trimmed));
+        widget.onChanged(trimmed.isEmpty ? null : numberFormat.tryParse(trimmed));
       },
       validator: (text) {
         final trimmed = text?.trim() ?? '';
         if (trimmed.isEmpty) {
-          return isRequired ? i18n.enterValue : null;
+          return widget.isRequired ? i18n.enterValue : null;
         }
         final parsed = numberFormat.tryParse(trimmed);
         if (parsed == null) {
           return i18n.enterValidNumber;
         }
-        if (min != null && max != null && (parsed < min! || parsed > max!)) {
-          return i18n.formMinMaxValues(min!.toInt(), max!.toInt());
+        if (widget.min != null &&
+            widget.max != null &&
+            (parsed < widget.min! || parsed > widget.max!)) {
+          return i18n.formMinMaxValues(widget.min!.toInt(), widget.max!.toInt());
         }
         return null;
       },
diff --git a/lib/database/converters/json_map_converter.dart b/lib/database/converters/json_map_converter.dart
new file mode 100644
index 000000000..e76112efd
--- /dev/null
+++ b/lib/database/converters/json_map_converter.dart
@@ -0,0 +1,46 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'dart:convert';
+
+import 'package:drift/drift.dart';
+
+/// Maps a JSON object column to a Dart map.
+///
+/// PowerSync stores server-side JSON fields as text, so the SQL value is the
+/// serialized JSON string. Anything that is not a JSON object (empty string,
+/// array, scalar) reads as an empty map.
+class JsonMapConverter extends TypeConverter<Map<String, dynamic>, String> {
+  const JsonMapConverter();
+
+  @override
+  Map<String, dynamic> fromSql(String fromDb) {
+    if (fromDb.isEmpty) {
+      return const {};
+    }
+    try {
+      final decoded = json.decode(fromDb);
+      return decoded is Map<String, dynamic> ? decoded : const {};
+    } on FormatException {
+      return const {};
+    }
+  }
+
+  @override
+  String toSql(Map<String, dynamic> value) => json.encode(value);
+}
diff --git a/lib/database/converters/measurement_chart_type_converter.dart b/lib/database/converters/measurement_chart_type_converter.dart
new file mode 100644
index 000000000..d947f4975
--- /dev/null
+++ b/lib/database/converters/measurement_chart_type_converter.dart
@@ -0,0 +1,35 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2020 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:drift/drift.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+
+/// Maps a [ChartType] to and from the SQLite string format.
+///
+/// The column is nullable while the model field is not: NULL is the server's
+/// "no override", which is [ChartType.auto] here. Rows that were synced before
+/// the column existed read NULL as well and arrive at the same default.
+class MeasurementChartTypeConverter extends TypeConverter<ChartType, String?> {
+  const MeasurementChartTypeConverter();
+
+  @override
+  ChartType fromSql(String? fromDb) => ChartType.fromWire(fromDb);
+
+  @override
+  String? toSql(ChartType value) => value.wireValue;
+}
diff --git a/lib/database/powersync/tables/weight.dart b/lib/database/converters/measurement_metric_type_converter.dart
similarity index 55%
rename from lib/database/powersync/tables/weight.dart
rename to lib/database/converters/measurement_metric_type_converter.dart
index 82f54ed85..da716261c 100644
--- a/lib/database/powersync/tables/weight.dart
+++ b/lib/database/converters/measurement_metric_type_converter.dart
@@ -1,40 +1,31 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (c)  2026 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:drift/drift.dart';
-import 'package:powersync/powersync.dart' as ps;
-import 'package:wger/database/converters/utc_datetime_converter.dart';
-import 'package:wger/features/weight/models/weight_entry.dart';
-
-@UseRowClass(WeightEntry)
-class WeightEntryTable extends Table {
-  @override
-  String get tableName => 'weight_weightentry';
-
-  TextColumn get id => text().clientDefault(() => ps.uuid.v7())();
-  RealColumn get weight => real()();
-  DateTimeColumn get date => dateTime().nullable().map(const UtcDateTimeConverter())();
-}
-
-const PowersyncWeightEntryTable = ps.Table(
-  'weight_weightentry',
-  [
-    ps.Column.real('weight'),
-    ps.Column.text('date'),
-  ],
-);
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2020 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:drift/drift.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+
+/// Maps a [MetricType] to and from the SQLite string format.
+class MeasurementMetricTypeConverter extends TypeConverter<MetricType, String> {
+  const MeasurementMetricTypeConverter();
+
+  @override
+  MetricType fromSql(String fromDb) => MetricType.fromWire(fromDb);
+
+  @override
+  String toSql(MetricType value) => value.wireValue;
+}
diff --git a/lib/database/powersync/database.dart b/lib/database/powersync/database.dart
index 46f25cf54..5cf338c0a 100644
--- a/lib/database/powersync/database.dart
+++ b/lib/database/powersync/database.dart
@@ -25,6 +25,9 @@ import 'package:wger/core/language.dart';
 import 'package:wger/core/license.dart';
 import 'package:wger/database/converters/date_only_text_converter.dart';
 import 'package:wger/database/converters/exercise_image_style_converter.dart';
+import 'package:wger/database/converters/json_map_converter.dart';
+import 'package:wger/database/converters/measurement_chart_type_converter.dart';
+import 'package:wger/database/converters/measurement_metric_type_converter.dart';
 import 'package:wger/database/converters/time_of_day_converter.dart';
 import 'package:wger/database/converters/utc_datetime_converter.dart';
 import 'package:wger/database/converters/workout_impression_converter.dart';
@@ -51,7 +54,6 @@ import 'package:wger/features/routines/models/repetition_unit.dart';
 import 'package:wger/features/routines/models/routine.dart';
 import 'package:wger/features/routines/models/session.dart';
 import 'package:wger/features/routines/models/weight_unit.dart';
-import 'package:wger/features/weight/models/weight_entry.dart';
 
 import 'powersync.dart';
 import 'tables/exercise.dart';
@@ -63,7 +65,6 @@ import 'tables/measurements.dart';
 import 'tables/nutrition.dart';
 import 'tables/routines.dart';
 import 'tables/user_profile.dart';
-import 'tables/weight.dart';
 
 part 'database.g.dart';
 
@@ -88,9 +89,6 @@ part 'database.g.dart';
     ExerciseImageTable,
     ExerciseVideoTable,
 
-    // Body weight
-    WeightEntryTable,
-
     // Measurements
     MeasurementCategoryTable,
     MeasurementEntryTable,
diff --git a/lib/database/powersync/database.g.dart b/lib/database/powersync/database.g.dart
index 18dbe7b23..2f706ad44 100644
--- a/lib/database/powersync/database.g.dart
+++ b/lib/database/powersync/database.g.dart
@@ -4674,12 +4674,12 @@ class ExerciseVideoTableCompanion extends UpdateCompanion<Video> {
   }
 }
 
-class $WeightEntryTableTable extends WeightEntryTable
-    with TableInfo<$WeightEntryTableTable, WeightEntry> {
+class $MeasurementCategoryTableTable extends MeasurementCategoryTable
+    with TableInfo<$MeasurementCategoryTableTable, MeasurementCategory> {
   @override
   final GeneratedDatabase attachedDatabase;
   final String? _alias;
-  $WeightEntryTableTable(this.attachedDatabase, [this._alias]);
+  $MeasurementCategoryTableTable(this.attachedDatabase, [this._alias]);
   static const VerificationMeta _idMeta = const VerificationMeta('id');
   @override
   late final GeneratedColumn<String> id = GeneratedColumn<String>(
@@ -4690,198 +4690,108 @@ class $WeightEntryTableTable extends WeightEntryTable
     requiredDuringInsert: false,
     clientDefault: () => ps.uuid.v7(),
   );
-  static const VerificationMeta _weightMeta = const VerificationMeta('weight');
+  static const VerificationMeta _nameMeta = const VerificationMeta('name');
   @override
-  late final GeneratedColumn<double> weight = GeneratedColumn<double>(
-    'weight',
+  late final GeneratedColumn<String> name = GeneratedColumn<String>(
+    'name',
     aliasedName,
     false,
-    type: DriftSqlType.double,
+    type: DriftSqlType.string,
     requiredDuringInsert: true,
   );
+  static const VerificationMeta _unitMeta = const VerificationMeta('unit');
   @override
-  late final GeneratedColumnWithTypeConverter<DateTime?, DateTime> date = GeneratedColumn<DateTime>(
-    'date',
+  late final GeneratedColumn<String> unit = GeneratedColumn<String>(
+    'unit',
     aliasedName,
-    true,
-    type: DriftSqlType.dateTime,
-    requiredDuringInsert: false,
-  ).withConverter<DateTime?>($WeightEntryTableTable.$converterdaten);
-  @override
-  List<GeneratedColumn> get $columns => [id, weight, date];
-  @override
-  String get aliasedName => _alias ?? actualTableName;
-  @override
-  String get actualTableName => $name;
-  static const String $name = 'weight_weightentry';
-  @override
-  VerificationContext validateIntegrity(
-    Insertable<WeightEntry> instance, {
-    bool isInserting = false,
-  }) {
-    final context = VerificationContext();
-    final data = instance.toColumns(true);
-    if (data.containsKey('id')) {
-      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
-    }
-    if (data.containsKey('weight')) {
-      context.handle(
-        _weightMeta,
-        weight.isAcceptableOrUnknown(data['weight']!, _weightMeta),
-      );
-    } else if (isInserting) {
-      context.missing(_weightMeta);
-    }
-    return context;
-  }
-
-  @override
-  Set<GeneratedColumn> get $primaryKey => const {};
-  @override
-  WeightEntry map(Map<String, dynamic> data, {String? tablePrefix}) {
-    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return WeightEntry(
-      id: attachedDatabase.typeMapping.read(
-        DriftSqlType.string,
-        data['${effectivePrefix}id'],
-      )!,
-      weight: attachedDatabase.typeMapping.read(
-        DriftSqlType.double,
-        data['${effectivePrefix}weight'],
-      )!,
-      date: $WeightEntryTableTable.$converterdaten.fromSql(
-        attachedDatabase.typeMapping.read(
-          DriftSqlType.dateTime,
-          data['${effectivePrefix}date'],
-        ),
-      ),
-    );
-  }
-
-  @override
-  $WeightEntryTableTable createAlias(String alias) {
-    return $WeightEntryTableTable(attachedDatabase, alias);
-  }
-
-  static TypeConverter<DateTime, DateTime> $converterdate = const UtcDateTimeConverter();
-  static TypeConverter<DateTime?, DateTime?> $converterdaten = NullAwareTypeConverter.wrap(
-    $converterdate,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
   );
-}
-
-class WeightEntryTableCompanion extends UpdateCompanion<WeightEntry> {
-  final Value<String> id;
-  final Value<double> weight;
-  final Value<DateTime?> date;
-  final Value<int> rowid;
-  const WeightEntryTableCompanion({
-    this.id = const Value.absent(),
-    this.weight = const Value.absent(),
-    this.date = const Value.absent(),
-    this.rowid = const Value.absent(),
-  });
-  WeightEntryTableCompanion.insert({
-    this.id = const Value.absent(),
-    required double weight,
-    this.date = const Value.absent(),
-    this.rowid = const Value.absent(),
-  }) : weight = Value(weight);
-  static Insertable<WeightEntry> custom({
-    Expression<String>? id,
-    Expression<double>? weight,
-    Expression<DateTime>? date,
-    Expression<int>? rowid,
-  }) {
-    return RawValuesInsertable({
-      if (id != null) 'id': id,
-      if (weight != null) 'weight': weight,
-      if (date != null) 'date': date,
-      if (rowid != null) 'rowid': rowid,
-    });
-  }
-
-  WeightEntryTableCompanion copyWith({
-    Value<String>? id,
-    Value<double>? weight,
-    Value<DateTime?>? date,
-    Value<int>? rowid,
-  }) {
-    return WeightEntryTableCompanion(
-      id: id ?? this.id,
-      weight: weight ?? this.weight,
-      date: date ?? this.date,
-      rowid: rowid ?? this.rowid,
-    );
-  }
-
   @override
-  Map<String, Expression> toColumns(bool nullToAbsent) {
-    final map = <String, Expression>{};
-    if (id.present) {
-      map['id'] = Variable<String>(id.value);
-    }
-    if (weight.present) {
-      map['weight'] = Variable<double>(weight.value);
-    }
-    if (date.present) {
-      map['date'] = Variable<DateTime>(
-        $WeightEntryTableTable.$converterdaten.toSql(date.value),
+  late final GeneratedColumnWithTypeConverter<MetricType?, String> metricType =
+      GeneratedColumn<String>(
+        'metric_type',
+        aliasedName,
+        true,
+        type: DriftSqlType.string,
+        requiredDuringInsert: false,
+      ).withConverter<MetricType?>(
+        $MeasurementCategoryTableTable.$convertermetricTypen,
       );
-    }
-    if (rowid.present) {
-      map['rowid'] = Variable<int>(rowid.value);
-    }
-    return map;
-  }
-
   @override
-  String toString() {
-    return (StringBuffer('WeightEntryTableCompanion(')
-          ..write('id: $id, ')
-          ..write('weight: $weight, ')
-          ..write('date: $date, ')
-          ..write('rowid: $rowid')
-          ..write(')'))
-        .toString();
-  }
-}
-
-class $MeasurementCategoryTableTable extends MeasurementCategoryTable
-    with TableInfo<$MeasurementCategoryTableTable, MeasurementCategory> {
+  late final GeneratedColumnWithTypeConverter<ChartType, String> chartType =
+      GeneratedColumn<String>(
+        'chart_type',
+        aliasedName,
+        true,
+        type: DriftSqlType.string,
+        requiredDuringInsert: false,
+      ).withConverter<ChartType>(
+        $MeasurementCategoryTableTable.$converterchartType,
+      );
   @override
-  final GeneratedDatabase attachedDatabase;
-  final String? _alias;
-  $MeasurementCategoryTableTable(this.attachedDatabase, [this._alias]);
-  static const VerificationMeta _idMeta = const VerificationMeta('id');
+  late final GeneratedColumnWithTypeConverter<Map<String, dynamic>?, String> chartConfig =
+      GeneratedColumn<String>(
+        'chart_config',
+        aliasedName,
+        true,
+        type: DriftSqlType.string,
+        requiredDuringInsert: false,
+      ).withConverter<Map<String, dynamic>?>(
+        $MeasurementCategoryTableTable.$converterchartConfign,
+      );
+  static const VerificationMeta _parentIdMeta = const VerificationMeta(
+    'parentId',
+  );
   @override
-  late final GeneratedColumn<String> id = GeneratedColumn<String>(
-    'id',
+  late final GeneratedColumn<String> parentId = GeneratedColumn<String>(
+    'parent_id',
     aliasedName,
-    false,
+    true,
     type: DriftSqlType.string,
     requiredDuringInsert: false,
-    clientDefault: () => ps.uuid.v7(),
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES measurements_category (id)',
+    ),
   );
-  static const VerificationMeta _nameMeta = const VerificationMeta('name');
+  static const VerificationMeta _orderMeta = const VerificationMeta('order');
   @override
-  late final GeneratedColumn<String> name = GeneratedColumn<String>(
-    'name',
+  late final GeneratedColumn<int> order = GeneratedColumn<int>(
+    'order',
     aliasedName,
-    false,
-    type: DriftSqlType.string,
-    requiredDuringInsert: true,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const Constant(0),
+  );
+  static const VerificationMeta _isOfficialMeta = const VerificationMeta(
+    'isOfficial',
   );
-  static const VerificationMeta _unitMeta = const VerificationMeta('unit');
   @override
-  late final GeneratedColumn<String> unit = GeneratedColumn<String>(
-    'unit',
+  late final GeneratedColumn<bool> isOfficial = GeneratedColumn<bool>(
+    'is_official',
     aliasedName,
-    false,
-    type: DriftSqlType.string,
-    requiredDuringInsert: true,
+    true,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("is_official" IN (0, 1))',
+    ),
+    defaultValue: const Constant(false),
   );
   @override
-  List<GeneratedColumn> get $columns => [id, name, unit];
+  List<GeneratedColumn> get $columns => [
+    id,
+    name,
+    unit,
+    metricType,
+    chartType,
+    chartConfig,
+    parentId,
+    order,
+    isOfficial,
+  ];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -4913,6 +4823,24 @@ class $MeasurementCategoryTableTable extends MeasurementCategoryTable
     } else if (isInserting) {
       context.missing(_unitMeta);
     }
+    if (data.containsKey('parent_id')) {
+      context.handle(
+        _parentIdMeta,
+        parentId.isAcceptableOrUnknown(data['parent_id']!, _parentIdMeta),
+      );
+    }
+    if (data.containsKey('order')) {
+      context.handle(
+        _orderMeta,
+        order.isAcceptableOrUnknown(data['order']!, _orderMeta),
+      );
+    }
+    if (data.containsKey('is_official')) {
+      context.handle(
+        _isOfficialMeta,
+        isOfficial.isAcceptableOrUnknown(data['is_official']!, _isOfficialMeta),
+      );
+    }
     return context;
   }
 
@@ -4921,7 +4849,7 @@ class $MeasurementCategoryTableTable extends MeasurementCategoryTable
   @override
   MeasurementCategory map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return MeasurementCategory(
+    return MeasurementCategory.fromDb(
       id: attachedDatabase.typeMapping.read(
         DriftSqlType.string,
         data['${effectivePrefix}id'],
@@ -4934,6 +4862,36 @@ class $MeasurementCategoryTableTable extends MeasurementCategoryTable
         DriftSqlType.string,
         data['${effectivePrefix}unit'],
       )!,
+      chartType: $MeasurementCategoryTableTable.$converterchartType.fromSql(
+        attachedDatabase.typeMapping.read(
+          DriftSqlType.string,
+          data['${effectivePrefix}chart_type'],
+        ),
+      ),
+      metricType: $MeasurementCategoryTableTable.$convertermetricTypen.fromSql(
+        attachedDatabase.typeMapping.read(
+          DriftSqlType.string,
+          data['${effectivePrefix}metric_type'],
+        ),
+      ),
+      chartConfig: $MeasurementCategoryTableTable.$converterchartConfign.fromSql(
+        attachedDatabase.typeMapping.read(
+          DriftSqlType.string,
+          data['${effectivePrefix}chart_config'],
+        ),
+      ),
+      parentId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}parent_id'],
+      ),
+      order: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}order'],
+      ),
+      isOfficial: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}is_official'],
+      ),
     );
   }
 
@@ -4941,23 +4899,53 @@ class $MeasurementCategoryTableTable extends MeasurementCategoryTable
   $MeasurementCategoryTableTable createAlias(String alias) {
     return $MeasurementCategoryTableTable(attachedDatabase, alias);
   }
+
+  static TypeConverter<MetricType, String> $convertermetricType =
+      const MeasurementMetricTypeConverter();
+  static TypeConverter<MetricType?, String?> $convertermetricTypen = NullAwareTypeConverter.wrap(
+    $convertermetricType,
+  );
+  static TypeConverter<ChartType, String?> $converterchartType =
+      const MeasurementChartTypeConverter();
+  static TypeConverter<Map<String, dynamic>, String> $converterchartConfig =
+      const JsonMapConverter();
+  static TypeConverter<Map<String, dynamic>?, String?> $converterchartConfign =
+      NullAwareTypeConverter.wrap($converterchartConfig);
 }
 
 class MeasurementCategoryTableCompanion extends UpdateCompanion<MeasurementCategory> {
   final Value<String> id;
   final Value<String> name;
   final Value<String> unit;
+  final Value<MetricType?> metricType;
+  final Value<ChartType> chartType;
+  final Value<Map<String, dynamic>?> chartConfig;
+  final Value<String?> parentId;
+  final Value<int?> order;
+  final Value<bool?> isOfficial;
   final Value<int> rowid;
   const MeasurementCategoryTableCompanion({
     this.id = const Value.absent(),
     this.name = const Value.absent(),
     this.unit = const Value.absent(),
+    this.metricType = const Value.absent(),
+    this.chartType = const Value.absent(),
+    this.chartConfig = const Value.absent(),
+    this.parentId = const Value.absent(),
+    this.order = const Value.absent(),
+    this.isOfficial = const Value.absent(),
     this.rowid = const Value.absent(),
   });
   MeasurementCategoryTableCompanion.insert({
     this.id = const Value.absent(),
     required String name,
     required String unit,
+    this.metricType = const Value.absent(),
+    this.chartType = const Value.absent(),
+    this.chartConfig = const Value.absent(),
+    this.parentId = const Value.absent(),
+    this.order = const Value.absent(),
+    this.isOfficial = const Value.absent(),
     this.rowid = const Value.absent(),
   }) : name = Value(name),
        unit = Value(unit);
@@ -4965,12 +4953,24 @@ class MeasurementCategoryTableCompanion extends UpdateCompanion<MeasurementCateg
     Expression<String>? id,
     Expression<String>? name,
     Expression<String>? unit,
+    Expression<String>? metricType,
+    Expression<String>? chartType,
+    Expression<String>? chartConfig,
+    Expression<String>? parentId,
+    Expression<int>? order,
+    Expression<bool>? isOfficial,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
       if (id != null) 'id': id,
       if (name != null) 'name': name,
       if (unit != null) 'unit': unit,
+      if (metricType != null) 'metric_type': metricType,
+      if (chartType != null) 'chart_type': chartType,
+      if (chartConfig != null) 'chart_config': chartConfig,
+      if (parentId != null) 'parent_id': parentId,
+      if (order != null) 'order': order,
+      if (isOfficial != null) 'is_official': isOfficial,
       if (rowid != null) 'rowid': rowid,
     });
   }
@@ -4979,12 +4979,24 @@ class MeasurementCategoryTableCompanion extends UpdateCompanion<MeasurementCateg
     Value<String>? id,
     Value<String>? name,
     Value<String>? unit,
+    Value<MetricType?>? metricType,
+    Value<ChartType>? chartType,
+    Value<Map<String, dynamic>?>? chartConfig,
+    Value<String?>? parentId,
+    Value<int?>? order,
+    Value<bool?>? isOfficial,
     Value<int>? rowid,
   }) {
     return MeasurementCategoryTableCompanion(
       id: id ?? this.id,
       name: name ?? this.name,
       unit: unit ?? this.unit,
+      metricType: metricType ?? this.metricType,
+      chartType: chartType ?? this.chartType,
+      chartConfig: chartConfig ?? this.chartConfig,
+      parentId: parentId ?? this.parentId,
+      order: order ?? this.order,
+      isOfficial: isOfficial ?? this.isOfficial,
       rowid: rowid ?? this.rowid,
     );
   }
@@ -5001,6 +5013,36 @@ class MeasurementCategoryTableCompanion extends UpdateCompanion<MeasurementCateg
     if (unit.present) {
       map['unit'] = Variable<String>(unit.value);
     }
+    if (metricType.present) {
+      map['metric_type'] = Variable<String>(
+        $MeasurementCategoryTableTable.$convertermetricTypen.toSql(
+          metricType.value,
+        ),
+      );
+    }
+    if (chartType.present) {
+      map['chart_type'] = Variable<String>(
+        $MeasurementCategoryTableTable.$converterchartType.toSql(
+          chartType.value,
+        ),
+      );
+    }
+    if (chartConfig.present) {
+      map['chart_config'] = Variable<String>(
+        $MeasurementCategoryTableTable.$converterchartConfign.toSql(
+          chartConfig.value,
+        ),
+      );
+    }
+    if (parentId.present) {
+      map['parent_id'] = Variable<String>(parentId.value);
+    }
+    if (order.present) {
+      map['order'] = Variable<int>(order.value);
+    }
+    if (isOfficial.present) {
+      map['is_official'] = Variable<bool>(isOfficial.value);
+    }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
     }
@@ -5013,6 +5055,12 @@ class MeasurementCategoryTableCompanion extends UpdateCompanion<MeasurementCateg
           ..write('id: $id, ')
           ..write('name: $name, ')
           ..write('unit: $unit, ')
+          ..write('metricType: $metricType, ')
+          ..write('chartType: $chartType, ')
+          ..write('chartConfig: $chartConfig, ')
+          ..write('parentId: $parentId, ')
+          ..write('order: $order, ')
+          ..write('isOfficial: $isOfficial, ')
           ..write('rowid: $rowid')
           ..write(')'))
         .toString();
@@ -5075,8 +5123,49 @@ class $MeasurementEntryTableTable extends MeasurementEntryTable
     type: DriftSqlType.string,
     requiredDuringInsert: true,
   );
+  static const VerificationMeta _sourceMeta = const VerificationMeta('source');
+  @override
+  late final GeneratedColumn<String> source = GeneratedColumn<String>(
+    'source',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    defaultValue: const Constant('user'),
+  );
+  static const VerificationMeta _externalIdMeta = const VerificationMeta(
+    'externalId',
+  );
   @override
-  List<GeneratedColumn> get $columns => [id, categoryId, date, value, notes];
+  late final GeneratedColumn<String> externalId = GeneratedColumn<String>(
+    'external_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  @override
+  late final GeneratedColumnWithTypeConverter<Map<String, dynamic>?, String> extraData =
+      GeneratedColumn<String>(
+        'extra_data',
+        aliasedName,
+        true,
+        type: DriftSqlType.string,
+        requiredDuringInsert: false,
+      ).withConverter<Map<String, dynamic>?>(
+        $MeasurementEntryTableTable.$converterextraDatan,
+      );
+  @override
+  List<GeneratedColumn> get $columns => [
+    id,
+    categoryId,
+    date,
+    value,
+    notes,
+    source,
+    externalId,
+    extraData,
+  ];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -5116,6 +5205,18 @@ class $MeasurementEntryTableTable extends MeasurementEntryTable
     } else if (isInserting) {
       context.missing(_notesMeta);
     }
+    if (data.containsKey('source')) {
+      context.handle(
+        _sourceMeta,
+        source.isAcceptableOrUnknown(data['source']!, _sourceMeta),
+      );
+    }
+    if (data.containsKey('external_id')) {
+      context.handle(
+        _externalIdMeta,
+        externalId.isAcceptableOrUnknown(data['external_id']!, _externalIdMeta),
+      );
+    }
     return context;
   }
 
@@ -5124,7 +5225,7 @@ class $MeasurementEntryTableTable extends MeasurementEntryTable
   @override
   MeasurementEntry map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return MeasurementEntry(
+    return MeasurementEntry.fromDb(
       id: attachedDatabase.typeMapping.read(
         DriftSqlType.string,
         data['${effectivePrefix}id'],
@@ -5147,6 +5248,20 @@ class $MeasurementEntryTableTable extends MeasurementEntryTable
         DriftSqlType.string,
         data['${effectivePrefix}notes'],
       )!,
+      source: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}source'],
+      ),
+      externalId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}external_id'],
+      ),
+      extraData: $MeasurementEntryTableTable.$converterextraDatan.fromSql(
+        attachedDatabase.typeMapping.read(
+          DriftSqlType.string,
+          data['${effectivePrefix}extra_data'],
+        ),
+      ),
     );
   }
 
@@ -5156,6 +5271,9 @@ class $MeasurementEntryTableTable extends MeasurementEntryTable
   }
 
   static TypeConverter<DateTime, DateTime> $converterdate = const UtcDateTimeConverter();
+  static TypeConverter<Map<String, dynamic>, String> $converterextraData = const JsonMapConverter();
+  static TypeConverter<Map<String, dynamic>?, String?> $converterextraDatan =
+      NullAwareTypeConverter.wrap($converterextraData);
 }
 
 class MeasurementEntryTableCompanion extends UpdateCompanion<MeasurementEntry> {
@@ -5164,6 +5282,9 @@ class MeasurementEntryTableCompanion extends UpdateCompanion<MeasurementEntry> {
   final Value<DateTime> date;
   final Value<double> value;
   final Value<String> notes;
+  final Value<String?> source;
+  final Value<String?> externalId;
+  final Value<Map<String, dynamic>?> extraData;
   final Value<int> rowid;
   const MeasurementEntryTableCompanion({
     this.id = const Value.absent(),
@@ -5171,6 +5292,9 @@ class MeasurementEntryTableCompanion extends UpdateCompanion<MeasurementEntry> {
     this.date = const Value.absent(),
     this.value = const Value.absent(),
     this.notes = const Value.absent(),
+    this.source = const Value.absent(),
+    this.externalId = const Value.absent(),
+    this.extraData = const Value.absent(),
     this.rowid = const Value.absent(),
   });
   MeasurementEntryTableCompanion.insert({
@@ -5179,6 +5303,9 @@ class MeasurementEntryTableCompanion extends UpdateCompanion<MeasurementEntry> {
     required DateTime date,
     required double value,
     required String notes,
+    this.source = const Value.absent(),
+    this.externalId = const Value.absent(),
+    this.extraData = const Value.absent(),
     this.rowid = const Value.absent(),
   }) : categoryId = Value(categoryId),
        date = Value(date),
@@ -5190,6 +5317,9 @@ class MeasurementEntryTableCompanion extends UpdateCompanion<MeasurementEntry> {
     Expression<DateTime>? date,
     Expression<double>? value,
     Expression<String>? notes,
+    Expression<String>? source,
+    Expression<String>? externalId,
+    Expression<String>? extraData,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
@@ -5198,6 +5328,9 @@ class MeasurementEntryTableCompanion extends UpdateCompanion<MeasurementEntry> {
       if (date != null) 'date': date,
       if (value != null) 'value': value,
       if (notes != null) 'notes': notes,
+      if (source != null) 'source': source,
+      if (externalId != null) 'external_id': externalId,
+      if (extraData != null) 'extra_data': extraData,
       if (rowid != null) 'rowid': rowid,
     });
   }
@@ -5208,6 +5341,9 @@ class MeasurementEntryTableCompanion extends UpdateCompanion<MeasurementEntry> {
     Value<DateTime>? date,
     Value<double>? value,
     Value<String>? notes,
+    Value<String?>? source,
+    Value<String?>? externalId,
+    Value<Map<String, dynamic>?>? extraData,
     Value<int>? rowid,
   }) {
     return MeasurementEntryTableCompanion(
@@ -5216,6 +5352,9 @@ class MeasurementEntryTableCompanion extends UpdateCompanion<MeasurementEntry> {
       date: date ?? this.date,
       value: value ?? this.value,
       notes: notes ?? this.notes,
+      source: source ?? this.source,
+      externalId: externalId ?? this.externalId,
+      extraData: extraData ?? this.extraData,
       rowid: rowid ?? this.rowid,
     );
   }
@@ -5240,6 +5379,17 @@ class MeasurementEntryTableCompanion extends UpdateCompanion<MeasurementEntry> {
     if (notes.present) {
       map['notes'] = Variable<String>(notes.value);
     }
+    if (source.present) {
+      map['source'] = Variable<String>(source.value);
+    }
+    if (externalId.present) {
+      map['external_id'] = Variable<String>(externalId.value);
+    }
+    if (extraData.present) {
+      map['extra_data'] = Variable<String>(
+        $MeasurementEntryTableTable.$converterextraDatan.toSql(extraData.value),
+      );
+    }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
     }
@@ -5254,6 +5404,9 @@ class MeasurementEntryTableCompanion extends UpdateCompanion<MeasurementEntry> {
           ..write('date: $date, ')
           ..write('value: $value, ')
           ..write('notes: $notes, ')
+          ..write('source: $source, ')
+          ..write('externalId: $externalId, ')
+          ..write('extraData: $extraData, ')
           ..write('rowid: $rowid')
           ..write(')'))
         .toString();
@@ -10154,9 +10307,6 @@ abstract class _$DriftPowersyncDatabase extends GeneratedDatabase {
   late final $ExerciseEquipmentM2NTable exerciseEquipmentM2N = $ExerciseEquipmentM2NTable(this);
   late final $ExerciseImageTableTable exerciseImageTable = $ExerciseImageTableTable(this);
   late final $ExerciseVideoTableTable exerciseVideoTable = $ExerciseVideoTableTable(this);
-  late final $WeightEntryTableTable weightEntryTable = $WeightEntryTableTable(
-    this,
-  );
   late final $MeasurementCategoryTableTable measurementCategoryTable =
       $MeasurementCategoryTableTable(this);
   late final $MeasurementEntryTableTable measurementEntryTable = $MeasurementEntryTableTable(this);
@@ -10201,7 +10351,6 @@ abstract class _$DriftPowersyncDatabase extends GeneratedDatabase {
     exerciseEquipmentM2N,
     exerciseImageTable,
     exerciseVideoTable,
-    weightEntryTable,
     measurementCategoryTable,
     measurementEntryTable,
     routineTable,
@@ -16117,254 +16266,97 @@ class $$ExerciseVideoTableTableTableManager
                 size: size,
                 duration: duration,
                 width: width,
-                height: height,
-                codec: codec,
-                codecLong: codecLong,
-                created: created,
-                lastUpdate: lastUpdate,
-                licenseId: licenseId,
-                licenseTitle: licenseTitle,
-                licenseObjectUrl: licenseObjectUrl,
-                licenseAuthor: licenseAuthor,
-                licenseAuthorUrl: licenseAuthorUrl,
-                licenseDerivativeSourceUrl: licenseDerivativeSourceUrl,
-                rowid: rowid,
-              ),
-          withReferenceMapper: (p0) => p0
-              .map(
-                (e) => (
-                  e.readTable(table),
-                  $$ExerciseVideoTableTableReferences(db, table, e),
-                ),
-              )
-              .toList(),
-          prefetchHooksCallback: ({exerciseId = false}) {
-            return PrefetchHooks(
-              db: db,
-              explicitlyWatchedTables: [],
-              addJoins:
-                  <
-                    T extends TableManagerState<
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic
-                    >
-                  >(state) {
-                    if (exerciseId) {
-                      state =
-                          state.withJoin(
-                                currentTable: table,
-                                currentColumn: table.exerciseId,
-                                referencedTable: $$ExerciseVideoTableTableReferences
-                                    ._exerciseIdTable(db),
-                                referencedColumn: $$ExerciseVideoTableTableReferences
-                                    ._exerciseIdTable(db)
-                                    .id,
-                              )
-                              as T;
-                    }
-
-                    return state;
-                  },
-              getPrefetchedDataCallback: (items) async {
-                return [];
-              },
-            );
-          },
-        ),
-      );
-}
-
-typedef $$ExerciseVideoTableTableProcessedTableManager =
-    ProcessedTableManager<
-      _$DriftPowersyncDatabase,
-      $ExerciseVideoTableTable,
-      Video,
-      $$ExerciseVideoTableTableFilterComposer,
-      $$ExerciseVideoTableTableOrderingComposer,
-      $$ExerciseVideoTableTableAnnotationComposer,
-      $$ExerciseVideoTableTableCreateCompanionBuilder,
-      $$ExerciseVideoTableTableUpdateCompanionBuilder,
-      (Video, $$ExerciseVideoTableTableReferences),
-      Video,
-      PrefetchHooks Function({bool exerciseId})
-    >;
-typedef $$WeightEntryTableTableCreateCompanionBuilder =
-    WeightEntryTableCompanion Function({
-      Value<String> id,
-      required double weight,
-      Value<DateTime?> date,
-      Value<int> rowid,
-    });
-typedef $$WeightEntryTableTableUpdateCompanionBuilder =
-    WeightEntryTableCompanion Function({
-      Value<String> id,
-      Value<double> weight,
-      Value<DateTime?> date,
-      Value<int> rowid,
-    });
-
-class $$WeightEntryTableTableFilterComposer
-    extends Composer<_$DriftPowersyncDatabase, $WeightEntryTableTable> {
-  $$WeightEntryTableTableFilterComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  ColumnFilters<String> get id => $composableBuilder(
-    column: $table.id,
-    builder: (column) => ColumnFilters(column),
-  );
-
-  ColumnFilters<double> get weight => $composableBuilder(
-    column: $table.weight,
-    builder: (column) => ColumnFilters(column),
-  );
-
-  ColumnWithTypeConverterFilters<DateTime?, DateTime, DateTime> get date => $composableBuilder(
-    column: $table.date,
-    builder: (column) => ColumnWithTypeConverterFilters(column),
-  );
-}
-
-class $$WeightEntryTableTableOrderingComposer
-    extends Composer<_$DriftPowersyncDatabase, $WeightEntryTableTable> {
-  $$WeightEntryTableTableOrderingComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  ColumnOrderings<String> get id => $composableBuilder(
-    column: $table.id,
-    builder: (column) => ColumnOrderings(column),
-  );
-
-  ColumnOrderings<double> get weight => $composableBuilder(
-    column: $table.weight,
-    builder: (column) => ColumnOrderings(column),
-  );
-
-  ColumnOrderings<DateTime> get date => $composableBuilder(
-    column: $table.date,
-    builder: (column) => ColumnOrderings(column),
-  );
-}
-
-class $$WeightEntryTableTableAnnotationComposer
-    extends Composer<_$DriftPowersyncDatabase, $WeightEntryTableTable> {
-  $$WeightEntryTableTableAnnotationComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  GeneratedColumn<String> get id =>
-      $composableBuilder(column: $table.id, builder: (column) => column);
-
-  GeneratedColumn<double> get weight =>
-      $composableBuilder(column: $table.weight, builder: (column) => column);
-
-  GeneratedColumnWithTypeConverter<DateTime?, DateTime> get date =>
-      $composableBuilder(column: $table.date, builder: (column) => column);
-}
-
-class $$WeightEntryTableTableTableManager
-    extends
-        RootTableManager<
-          _$DriftPowersyncDatabase,
-          $WeightEntryTableTable,
-          WeightEntry,
-          $$WeightEntryTableTableFilterComposer,
-          $$WeightEntryTableTableOrderingComposer,
-          $$WeightEntryTableTableAnnotationComposer,
-          $$WeightEntryTableTableCreateCompanionBuilder,
-          $$WeightEntryTableTableUpdateCompanionBuilder,
-          (
-            WeightEntry,
-            BaseReferences<_$DriftPowersyncDatabase, $WeightEntryTableTable, WeightEntry>,
-          ),
-          WeightEntry,
-          PrefetchHooks Function()
-        > {
-  $$WeightEntryTableTableTableManager(
-    _$DriftPowersyncDatabase db,
-    $WeightEntryTableTable table,
-  ) : super(
-        TableManagerState(
-          db: db,
-          table: table,
-          createFilteringComposer: () =>
-              $$WeightEntryTableTableFilterComposer($db: db, $table: table),
-          createOrderingComposer: () =>
-              $$WeightEntryTableTableOrderingComposer($db: db, $table: table),
-          createComputedFieldComposer: () =>
-              $$WeightEntryTableTableAnnotationComposer($db: db, $table: table),
-          updateCompanionCallback:
-              ({
-                Value<String> id = const Value.absent(),
-                Value<double> weight = const Value.absent(),
-                Value<DateTime?> date = const Value.absent(),
-                Value<int> rowid = const Value.absent(),
-              }) => WeightEntryTableCompanion(
-                id: id,
-                weight: weight,
-                date: date,
-                rowid: rowid,
-              ),
-          createCompanionCallback:
-              ({
-                Value<String> id = const Value.absent(),
-                required double weight,
-                Value<DateTime?> date = const Value.absent(),
-                Value<int> rowid = const Value.absent(),
-              }) => WeightEntryTableCompanion.insert(
-                id: id,
-                weight: weight,
-                date: date,
+                height: height,
+                codec: codec,
+                codecLong: codecLong,
+                created: created,
+                lastUpdate: lastUpdate,
+                licenseId: licenseId,
+                licenseTitle: licenseTitle,
+                licenseObjectUrl: licenseObjectUrl,
+                licenseAuthor: licenseAuthor,
+                licenseAuthorUrl: licenseAuthorUrl,
+                licenseDerivativeSourceUrl: licenseDerivativeSourceUrl,
                 rowid: rowid,
               ),
-          withReferenceMapper: (p0) =>
-              p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(),
-          prefetchHooksCallback: null,
+          withReferenceMapper: (p0) => p0
+              .map(
+                (e) => (
+                  e.readTable(table),
+                  $$ExerciseVideoTableTableReferences(db, table, e),
+                ),
+              )
+              .toList(),
+          prefetchHooksCallback: ({exerciseId = false}) {
+            return PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins:
+                  <
+                    T extends TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic
+                    >
+                  >(state) {
+                    if (exerciseId) {
+                      state =
+                          state.withJoin(
+                                currentTable: table,
+                                currentColumn: table.exerciseId,
+                                referencedTable: $$ExerciseVideoTableTableReferences
+                                    ._exerciseIdTable(db),
+                                referencedColumn: $$ExerciseVideoTableTableReferences
+                                    ._exerciseIdTable(db)
+                                    .id,
+                              )
+                              as T;
+                    }
+
+                    return state;
+                  },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
         ),
       );
 }
 
-typedef $$WeightEntryTableTableProcessedTableManager =
+typedef $$ExerciseVideoTableTableProcessedTableManager =
     ProcessedTableManager<
       _$DriftPowersyncDatabase,
-      $WeightEntryTableTable,
-      WeightEntry,
-      $$WeightEntryTableTableFilterComposer,
-      $$WeightEntryTableTableOrderingComposer,
-      $$WeightEntryTableTableAnnotationComposer,
-      $$WeightEntryTableTableCreateCompanionBuilder,
-      $$WeightEntryTableTableUpdateCompanionBuilder,
-      (
-        WeightEntry,
-        BaseReferences<_$DriftPowersyncDatabase, $WeightEntryTableTable, WeightEntry>,
-      ),
-      WeightEntry,
-      PrefetchHooks Function()
+      $ExerciseVideoTableTable,
+      Video,
+      $$ExerciseVideoTableTableFilterComposer,
+      $$ExerciseVideoTableTableOrderingComposer,
+      $$ExerciseVideoTableTableAnnotationComposer,
+      $$ExerciseVideoTableTableCreateCompanionBuilder,
+      $$ExerciseVideoTableTableUpdateCompanionBuilder,
+      (Video, $$ExerciseVideoTableTableReferences),
+      Video,
+      PrefetchHooks Function({bool exerciseId})
     >;
 typedef $$MeasurementCategoryTableTableCreateCompanionBuilder =
     MeasurementCategoryTableCompanion Function({
       Value<String> id,
       required String name,
       required String unit,
+      Value<MetricType?> metricType,
+      Value<ChartType> chartType,
+      Value<Map<String, dynamic>?> chartConfig,
+      Value<String?> parentId,
+      Value<int?> order,
+      Value<bool?> isOfficial,
       Value<int> rowid,
     });
 typedef $$MeasurementCategoryTableTableUpdateCompanionBuilder =
@@ -16372,6 +16364,12 @@ typedef $$MeasurementCategoryTableTableUpdateCompanionBuilder =
       Value<String> id,
       Value<String> name,
       Value<String> unit,
+      Value<MetricType?> metricType,
+      Value<ChartType> chartType,
+      Value<Map<String, dynamic>?> chartConfig,
+      Value<String?> parentId,
+      Value<int?> order,
+      Value<bool?> isOfficial,
       Value<int> rowid,
     });
 
@@ -16388,6 +16386,26 @@ final class $$MeasurementCategoryTableTableReferences
     super.$_typedResult,
   );
 
+  static $MeasurementCategoryTableTable _parentIdTable(
+    _$DriftPowersyncDatabase db,
+  ) => db.measurementCategoryTable.createAlias(
+    'measurements_category__parent_id__measurements_category__id',
+  );
+
+  $$MeasurementCategoryTableTableProcessedTableManager? get parentId {
+    final $_column = $_itemColumn<String>('parent_id');
+    if ($_column == null) return null;
+    final manager = $$MeasurementCategoryTableTableTableManager(
+      $_db,
+      $_db.measurementCategoryTable,
+    ).filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_parentIdTable($_db));
+    if (item == null) return manager;
+    return ProcessedTableManager(
+      manager.$state.copyWith(prefetchedData: [item]),
+    );
+  }
+
   static MultiTypedResultKey<$MeasurementEntryTableTable, List<MeasurementEntry>>
   _measurementEntryTableRefsTable(_$DriftPowersyncDatabase db) => MultiTypedResultKey.fromTable(
     db.measurementEntryTable,
@@ -16433,6 +16451,55 @@ class $$MeasurementCategoryTableTableFilterComposer
     builder: (column) => ColumnFilters(column),
   );
 
+  ColumnWithTypeConverterFilters<MetricType?, MetricType, String> get metricType =>
+      $composableBuilder(
+        column: $table.metricType,
+        builder: (column) => ColumnWithTypeConverterFilters(column),
+      );
+
+  ColumnWithTypeConverterFilters<ChartType, ChartType, String> get chartType => $composableBuilder(
+    column: $table.chartType,
+    builder: (column) => ColumnWithTypeConverterFilters(column),
+  );
+
+  ColumnWithTypeConverterFilters<Map<String, dynamic>?, Map<String, dynamic>, String>
+  get chartConfig => $composableBuilder(
+    column: $table.chartConfig,
+    builder: (column) => ColumnWithTypeConverterFilters(column),
+  );
+
+  ColumnFilters<int> get order => $composableBuilder(
+    column: $table.order,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<bool> get isOfficial => $composableBuilder(
+    column: $table.isOfficial,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  $$MeasurementCategoryTableTableFilterComposer get parentId {
+    final $$MeasurementCategoryTableTableFilterComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.parentId,
+      referencedTable: $db.measurementCategoryTable,
+      getReferencedColumn: (t) => t.id,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$MeasurementCategoryTableTableFilterComposer(
+            $db: $db,
+            $table: $db.measurementCategoryTable,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer: $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
+
   Expression<bool> measurementEntryTableRefs(
     Expression<bool> Function($$MeasurementEntryTableTableFilterComposer f) f,
   ) {
@@ -16481,6 +16548,53 @@ class $$MeasurementCategoryTableTableOrderingComposer
     column: $table.unit,
     builder: (column) => ColumnOrderings(column),
   );
+
+  ColumnOrderings<String> get metricType => $composableBuilder(
+    column: $table.metricType,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get chartType => $composableBuilder(
+    column: $table.chartType,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get chartConfig => $composableBuilder(
+    column: $table.chartConfig,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get order => $composableBuilder(
+    column: $table.order,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<bool> get isOfficial => $composableBuilder(
+    column: $table.isOfficial,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  $$MeasurementCategoryTableTableOrderingComposer get parentId {
+    final $$MeasurementCategoryTableTableOrderingComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.parentId,
+      referencedTable: $db.measurementCategoryTable,
+      getReferencedColumn: (t) => t.id,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$MeasurementCategoryTableTableOrderingComposer(
+            $db: $db,
+            $table: $db.measurementCategoryTable,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer: $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
 }
 
 class $$MeasurementCategoryTableTableAnnotationComposer
@@ -16501,6 +16615,50 @@ class $$MeasurementCategoryTableTableAnnotationComposer
   GeneratedColumn<String> get unit =>
       $composableBuilder(column: $table.unit, builder: (column) => column);
 
+  GeneratedColumnWithTypeConverter<MetricType?, String> get metricType => $composableBuilder(
+    column: $table.metricType,
+    builder: (column) => column,
+  );
+
+  GeneratedColumnWithTypeConverter<ChartType, String> get chartType =>
+      $composableBuilder(column: $table.chartType, builder: (column) => column);
+
+  GeneratedColumnWithTypeConverter<Map<String, dynamic>?, String> get chartConfig =>
+      $composableBuilder(
+        column: $table.chartConfig,
+        builder: (column) => column,
+      );
+
+  GeneratedColumn<int> get order =>
+      $composableBuilder(column: $table.order, builder: (column) => column);
+
+  GeneratedColumn<bool> get isOfficial => $composableBuilder(
+    column: $table.isOfficial,
+    builder: (column) => column,
+  );
+
+  $$MeasurementCategoryTableTableAnnotationComposer get parentId {
+    final $$MeasurementCategoryTableTableAnnotationComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.parentId,
+      referencedTable: $db.measurementCategoryTable,
+      getReferencedColumn: (t) => t.id,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$MeasurementCategoryTableTableAnnotationComposer(
+            $db: $db,
+            $table: $db.measurementCategoryTable,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer: $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
+
   Expression<T> measurementEntryTableRefs<T extends Object>(
     Expression<T> Function($$MeasurementEntryTableTableAnnotationComposer a) f,
   ) {
@@ -16539,7 +16697,10 @@ class $$MeasurementCategoryTableTableTableManager
           $$MeasurementCategoryTableTableUpdateCompanionBuilder,
           (MeasurementCategory, $$MeasurementCategoryTableTableReferences),
           MeasurementCategory,
-          PrefetchHooks Function({bool measurementEntryTableRefs})
+          PrefetchHooks Function({
+            bool parentId,
+            bool measurementEntryTableRefs,
+          })
         > {
   $$MeasurementCategoryTableTableTableManager(
     _$DriftPowersyncDatabase db,
@@ -16565,11 +16726,23 @@ class $$MeasurementCategoryTableTableTableManager
                 Value<String> id = const Value.absent(),
                 Value<String> name = const Value.absent(),
                 Value<String> unit = const Value.absent(),
+                Value<MetricType?> metricType = const Value.absent(),
+                Value<ChartType> chartType = const Value.absent(),
+                Value<Map<String, dynamic>?> chartConfig = const Value.absent(),
+                Value<String?> parentId = const Value.absent(),
+                Value<int?> order = const Value.absent(),
+                Value<bool?> isOfficial = const Value.absent(),
                 Value<int> rowid = const Value.absent(),
               }) => MeasurementCategoryTableCompanion(
                 id: id,
                 name: name,
                 unit: unit,
+                metricType: metricType,
+                chartType: chartType,
+                chartConfig: chartConfig,
+                parentId: parentId,
+                order: order,
+                isOfficial: isOfficial,
                 rowid: rowid,
               ),
           createCompanionCallback:
@@ -16577,11 +16750,23 @@ class $$MeasurementCategoryTableTableTableManager
                 Value<String> id = const Value.absent(),
                 required String name,
                 required String unit,
+                Value<MetricType?> metricType = const Value.absent(),
+                Value<ChartType> chartType = const Value.absent(),
+                Value<Map<String, dynamic>?> chartConfig = const Value.absent(),
+                Value<String?> parentId = const Value.absent(),
+                Value<int?> order = const Value.absent(),
+                Value<bool?> isOfficial = const Value.absent(),
                 Value<int> rowid = const Value.absent(),
               }) => MeasurementCategoryTableCompanion.insert(
                 id: id,
                 name: name,
                 unit: unit,
+                metricType: metricType,
+                chartType: chartType,
+                chartConfig: chartConfig,
+                parentId: parentId,
+                order: order,
+                isOfficial: isOfficial,
                 rowid: rowid,
               ),
           withReferenceMapper: (p0) => p0
@@ -16592,13 +16777,44 @@ class $$MeasurementCategoryTableTableTableManager
                 ),
               )
               .toList(),
-          prefetchHooksCallback: ({measurementEntryTableRefs = false}) {
+          prefetchHooksCallback: ({parentId = false, measurementEntryTableRefs = false}) {
             return PrefetchHooks(
               db: db,
               explicitlyWatchedTables: [
                 if (measurementEntryTableRefs) db.measurementEntryTable,
               ],
-              addJoins: null,
+              addJoins:
+                  <
+                    T extends TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic
+                    >
+                  >(state) {
+                    if (parentId) {
+                      state =
+                          state.withJoin(
+                                currentTable: table,
+                                currentColumn: table.parentId,
+                                referencedTable: $$MeasurementCategoryTableTableReferences
+                                    ._parentIdTable(db),
+                                referencedColumn: $$MeasurementCategoryTableTableReferences
+                                    ._parentIdTable(db)
+                                    .id,
+                              )
+                              as T;
+                    }
+
+                    return state;
+                  },
               getPrefetchedDataCallback: (items) async {
                 return [
                   if (measurementEntryTableRefs)
@@ -16616,7 +16832,9 @@ class $$MeasurementCategoryTableTableTableManager
                         p0,
                       ).measurementEntryTableRefs,
                       referencedItemsForCurrentItem: (item, referencedItems) =>
-                          referencedItems.where((e) => e.categoryId == item.id),
+                          referencedItems.where(
+                            (e) => e.categoryId == item.id,
+                          ),
                       typedResults: items,
                     ),
                 ];
@@ -16639,7 +16857,7 @@ typedef $$MeasurementCategoryTableTableProcessedTableManager =
       $$MeasurementCategoryTableTableUpdateCompanionBuilder,
       (MeasurementCategory, $$MeasurementCategoryTableTableReferences),
       MeasurementCategory,
-      PrefetchHooks Function({bool measurementEntryTableRefs})
+      PrefetchHooks Function({bool parentId, bool measurementEntryTableRefs})
     >;
 typedef $$MeasurementEntryTableTableCreateCompanionBuilder =
     MeasurementEntryTableCompanion Function({
@@ -16648,6 +16866,9 @@ typedef $$MeasurementEntryTableTableCreateCompanionBuilder =
       required DateTime date,
       required double value,
       required String notes,
+      Value<String?> source,
+      Value<String?> externalId,
+      Value<Map<String, dynamic>?> extraData,
       Value<int> rowid,
     });
 typedef $$MeasurementEntryTableTableUpdateCompanionBuilder =
@@ -16657,6 +16878,9 @@ typedef $$MeasurementEntryTableTableUpdateCompanionBuilder =
       Value<DateTime> date,
       Value<double> value,
       Value<String> notes,
+      Value<String?> source,
+      Value<String?> externalId,
+      Value<Map<String, dynamic>?> extraData,
       Value<int> rowid,
     });
 
@@ -16719,6 +16943,22 @@ class $$MeasurementEntryTableTableFilterComposer
     builder: (column) => ColumnFilters(column),
   );
 
+  ColumnFilters<String> get source => $composableBuilder(
+    column: $table.source,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get externalId => $composableBuilder(
+    column: $table.externalId,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnWithTypeConverterFilters<Map<String, dynamic>?, Map<String, dynamic>, String>
+  get extraData => $composableBuilder(
+    column: $table.extraData,
+    builder: (column) => ColumnWithTypeConverterFilters(column),
+  );
+
   $$MeasurementCategoryTableTableFilterComposer get categoryId {
     final $$MeasurementCategoryTableTableFilterComposer composer = $composerBuilder(
       composer: this,
@@ -16771,6 +17011,21 @@ class $$MeasurementEntryTableTableOrderingComposer
     builder: (column) => ColumnOrderings(column),
   );
 
+  ColumnOrderings<String> get source => $composableBuilder(
+    column: $table.source,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get externalId => $composableBuilder(
+    column: $table.externalId,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get extraData => $composableBuilder(
+    column: $table.extraData,
+    builder: (column) => ColumnOrderings(column),
+  );
+
   $$MeasurementCategoryTableTableOrderingComposer get categoryId {
     final $$MeasurementCategoryTableTableOrderingComposer composer = $composerBuilder(
       composer: this,
@@ -16815,6 +17070,17 @@ class $$MeasurementEntryTableTableAnnotationComposer
   GeneratedColumn<String> get notes =>
       $composableBuilder(column: $table.notes, builder: (column) => column);
 
+  GeneratedColumn<String> get source =>
+      $composableBuilder(column: $table.source, builder: (column) => column);
+
+  GeneratedColumn<String> get externalId => $composableBuilder(
+    column: $table.externalId,
+    builder: (column) => column,
+  );
+
+  GeneratedColumnWithTypeConverter<Map<String, dynamic>?, String> get extraData =>
+      $composableBuilder(column: $table.extraData, builder: (column) => column);
+
   $$MeasurementCategoryTableTableAnnotationComposer get categoryId {
     final $$MeasurementCategoryTableTableAnnotationComposer composer = $composerBuilder(
       composer: this,
@@ -16879,6 +17145,9 @@ class $$MeasurementEntryTableTableTableManager
                 Value<DateTime> date = const Value.absent(),
                 Value<double> value = const Value.absent(),
                 Value<String> notes = const Value.absent(),
+                Value<String?> source = const Value.absent(),
+                Value<String?> externalId = const Value.absent(),
+                Value<Map<String, dynamic>?> extraData = const Value.absent(),
                 Value<int> rowid = const Value.absent(),
               }) => MeasurementEntryTableCompanion(
                 id: id,
@@ -16886,6 +17155,9 @@ class $$MeasurementEntryTableTableTableManager
                 date: date,
                 value: value,
                 notes: notes,
+                source: source,
+                externalId: externalId,
+                extraData: extraData,
                 rowid: rowid,
               ),
           createCompanionCallback:
@@ -16895,6 +17167,9 @@ class $$MeasurementEntryTableTableTableManager
                 required DateTime date,
                 required double value,
                 required String notes,
+                Value<String?> source = const Value.absent(),
+                Value<String?> externalId = const Value.absent(),
+                Value<Map<String, dynamic>?> extraData = const Value.absent(),
                 Value<int> rowid = const Value.absent(),
               }) => MeasurementEntryTableCompanion.insert(
                 id: id,
@@ -16902,6 +17177,9 @@ class $$MeasurementEntryTableTableTableManager
                 date: date,
                 value: value,
                 notes: notes,
+                source: source,
+                externalId: externalId,
+                extraData: extraData,
                 rowid: rowid,
               ),
           withReferenceMapper: (p0) => p0
@@ -22046,8 +22324,6 @@ class $DriftPowersyncDatabaseManager {
       $$ExerciseImageTableTableTableManager(_db, _db.exerciseImageTable);
   $$ExerciseVideoTableTableTableManager get exerciseVideoTable =>
       $$ExerciseVideoTableTableTableManager(_db, _db.exerciseVideoTable);
-  $$WeightEntryTableTableTableManager get weightEntryTable =>
-      $$WeightEntryTableTableTableManager(_db, _db.weightEntryTable);
   $$MeasurementCategoryTableTableTableManager get measurementCategoryTable =>
       $$MeasurementCategoryTableTableTableManager(
         _db,
diff --git a/lib/database/powersync/tables/measurements.dart b/lib/database/powersync/tables/measurements.dart
index cb9f2d247..79cb1edee 100644
--- a/lib/database/powersync/tables/measurements.dart
+++ b/lib/database/powersync/tables/measurements.dart
@@ -18,11 +18,14 @@
 
 import 'package:drift/drift.dart';
 import 'package:powersync/powersync.dart' as ps;
+import 'package:wger/database/converters/json_map_converter.dart';
+import 'package:wger/database/converters/measurement_chart_type_converter.dart';
+import 'package:wger/database/converters/measurement_metric_type_converter.dart';
 import 'package:wger/database/converters/utc_datetime_converter.dart';
 import 'package:wger/features/measurements/models/measurement_category.dart';
 import 'package:wger/features/measurements/models/measurement_entry.dart';
 
-@UseRowClass(MeasurementCategory)
+@UseRowClass(MeasurementCategory, constructor: 'fromDb')
 class MeasurementCategoryTable extends Table {
   @override
   String get tableName => 'measurements_category';
@@ -31,6 +34,34 @@ class MeasurementCategoryTable extends Table {
 
   TextColumn get name => text()();
   TextColumn get unit => text()();
+  // The new 2.7 columns (metricType, order, isOfficial, source) are nullable:
+  // rows synced before the schema change lack the keys in their local ps_data
+  // and read as NULL until the full re-sync replaces them. The `fromDb`
+  // constructors map NULL to the defaults so the UI keeps working meanwhile.
+  TextColumn get metricType =>
+      text().named('metric_type').map(const MeasurementMetricTypeConverter()).nullable()();
+
+  /// Chart the user picked, NULL for the one derived from the metric type.
+  TextColumn get chartType =>
+      text().named('chart_type').nullable().map(const MeasurementChartTypeConverter())();
+
+  /// Taste-level chart settings (server JSONField), e.g. the trend character.
+  /// A missing key, and a missing object, mean the client default.
+  TextColumn get chartConfig =>
+      text().named('chart_config').map(const JsonMapConverter()).nullable()();
+
+  /// Multi-value groups: parent category id (max. one level of nesting; only
+  /// leaf categories carry entries).
+  TextColumn get parentId =>
+      text().named('parent_id').nullable().references(MeasurementCategoryTable, #id)();
+
+  /// Position in the category list; for children, the position within the group
+  IntColumn get order => integer().withDefault(const Constant(0)).nullable()();
+
+  /// Server-managed official category (max. one per metric type and user).
+  /// Body weight entries live in the official `body_weight` category.
+  BoolColumn get isOfficial =>
+      boolean().named('is_official').withDefault(const Constant(false)).nullable()();
 }
 
 const PowersyncMeasurementCategoryTable = ps.Table(
@@ -38,10 +69,21 @@ const PowersyncMeasurementCategoryTable = ps.Table(
   [
     ps.Column.text('name'),
     ps.Column.text('unit'),
+    ps.Column.text('metric_type'),
+    ps.Column.text('chart_type'),
+    // JSON object, synced and stored as text
+    ps.Column.text('chart_config'),
+    ps.Column.text('parent_id'),
+    ps.Column.integer('order'),
+    // Postgres boolean; integer so the view yields 0/1, not the string '0'
+    ps.Column.integer('is_official'),
+  ],
+  indexes: [
+    ps.Index('parent_idx', [ps.IndexedColumn('parent_id')]),
   ],
 );
 
-@UseRowClass(MeasurementEntry)
+@UseRowClass(MeasurementEntry, constructor: 'fromDb')
 class MeasurementEntryTable extends Table {
   @override
   String get tableName => 'measurements_measurement';
@@ -53,6 +95,18 @@ class MeasurementEntryTable extends Table {
   DateTimeColumn get date => dateTime().map(const UtcDateTimeConverter())();
   RealColumn get value => real()();
   TextColumn get notes => text()();
+
+  /// Where the reading came from; one of the server's `source` values:
+  /// `user` for manual entries or a health platform (`apple`, `google`).
+  TextColumn get source => text().withDefault(const Constant('user')).nullable()();
+
+  /// Platform record UUID, used to deduplicate re-imports. `null` for manual
+  /// entries.
+  TextColumn get externalId => text().named('external_id').nullable()();
+
+  /// Per-entry metadata (server JSONField). The `unit` key holds the unit the
+  /// value was entered in; absent, the category unit applies.
+  TextColumn get extraData => text().named('extra_data').map(const JsonMapConverter()).nullable()();
 }
 
 const PowersyncMeasurementEntryTable = ps.Table(
@@ -62,8 +116,19 @@ const PowersyncMeasurementEntryTable = ps.Table(
     ps.Column.text('date'),
     ps.Column.real('value'),
     ps.Column.text('notes'),
+    ps.Column.text('source'),
+    ps.Column.text('external_id'),
+    // JSON object, synced and stored as text
+    ps.Column.text('extra_data'),
   ],
   indexes: [
-    ps.Index('category_idx', [ps.IndexedColumn('category_id')]),
+    // Entries are read per category and bounded by date (the charts read a
+    // range, the lists sort by it). The date is stored as an ISO string, which
+    // sorts the same way the timestamps do, so a range is one index scan
+    ps.Index('category_idx', [
+      ps.IndexedColumn('category_id'),
+      ps.IndexedColumn('date'),
+    ]),
+    ps.Index('external_id_idx', [ps.IndexedColumn('external_id')]),
   ],
 );
diff --git a/lib/features/account/widgets/settings.dart b/lib/features/account/widgets/settings.dart
index f1eaed814..0d4238d39 100644
--- a/lib/features/account/widgets/settings.dart
+++ b/lib/features/account/widgets/settings.dart
@@ -20,6 +20,7 @@ import 'package:flutter/material.dart';
 import 'package:wger/core/wide_screen_wrapper.dart';
 import 'package:wger/features/account/widgets/settings/certs_not_verified.dart';
 import 'package:wger/features/account/widgets/settings/data_privacy.dart';
+import 'package:wger/features/account/widgets/settings/health_sync.dart';
 import 'package:wger/features/account/widgets/settings/image_cache.dart';
 import 'package:wger/features/account/widgets/settings/language.dart';
 import 'package:wger/features/account/widgets/settings/theme.dart';
@@ -58,6 +59,7 @@ class SettingsPage extends StatelessWidget {
               ),
             ),
             const SettingsDataPrivacy(),
+            const HealthSyncSettingsTile(),
             ListTile(title: Text(i18n.others, style: Theme.of(context).textTheme.headlineSmall)),
             const SettingsTheme(),
             const SettingsLanguage(),
diff --git a/lib/features/account/widgets/settings/health_sync.dart b/lib/features/account/widgets/settings/health_sync.dart
new file mode 100644
index 000000000..4362bac40
--- /dev/null
+++ b/lib/features/account/widgets/settings/health_sync.dart
@@ -0,0 +1,214 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/foundation.dart' show TargetPlatform, defaultTargetPlatform;
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:logging/logging.dart';
+import 'package:wger/core/formatting/formatting.dart';
+import 'package:wger/features/health/providers/health_repository.dart';
+import 'package:wger/features/health/providers/health_sync.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+class HealthSyncSettingsTile extends ConsumerStatefulWidget {
+  const HealthSyncSettingsTile({super.key});
+
+  @override
+  ConsumerState<HealthSyncSettingsTile> createState() => _HealthSyncSettingsTileState();
+}
+
+class _HealthSyncSettingsTileState extends ConsumerState<HealthSyncSettingsTile> {
+  final _logger = Logger('HealthSyncSettingsTile');
+  HealthPlatformAvailability? _availability;
+
+  @override
+  void initState() {
+    super.initState();
+    _checkAvailability();
+  }
+
+  Future<void> _checkAvailability() async {
+    final notifier = ref.read(healthSyncProvider.notifier);
+    final availability = await notifier.availability();
+    if (mounted) {
+      setState(() => _availability = availability);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // Hide entirely (including the section header) while the platform check
+    // is running, and on platforms that have no health platform at all
+    if (_availability == null || _availability == HealthPlatformAvailability.unsupported) {
+      return const SizedBox.shrink();
+    }
+
+    final syncState = ref.watch(healthSyncProvider);
+
+    final i18n = AppLocalizations.of(context);
+
+    if (_availability != HealthPlatformAvailability.available) {
+      return Column(
+        children: [
+          ListTile(
+            title: Text(i18n.health, style: Theme.of(context).textTheme.headlineSmall),
+          ),
+          _installTile(i18n),
+        ],
+      );
+    }
+
+    return Column(
+      children: [
+        ListTile(
+          title: Text(i18n.health, style: Theme.of(context).textTheme.headlineSmall),
+        ),
+        SwitchListTile(
+          title: Text(i18n.healthSync),
+          subtitle: Text(i18n.healthSyncDescription),
+          value: syncState.isEnabled,
+          onChanged: syncState.isSyncing
+              ? null
+              : (enabled) async {
+                  final notifier = ref.read(healthSyncProvider.notifier);
+                  if (enabled) {
+                    // null means the platform permissions were not granted.
+                    // A platform that refuses the request outright throws, and
+                    // that must not reach the global error dialog: to the user
+                    // it is the same "no access" situation.
+                    int? count;
+                    try {
+                      count = await notifier.enableSync();
+                    } catch (e) {
+                      _logger.warning('Enabling health sync failed', e);
+                    }
+                    if (!context.mounted) {
+                      return;
+                    }
+                    if (count == null) {
+                      ScaffoldMessenger.of(context).showSnackBar(
+                        SnackBar(content: Text(i18n.healthSyncPermissionDenied)),
+                      );
+                    } else if (count > 0) {
+                      // Imported entries land in the local Drift DB and surface through
+                      // the measurement stream automatically, so no manual refresh is needed.
+                      ScaffoldMessenger.of(context).showSnackBar(
+                        SnackBar(content: Text(i18n.healthSyncSuccess(count))),
+                      );
+                    } else {
+                      // An empty initial import usually means the platform has
+                      // no data to give: either there is none, or the read
+                      // access was declined, which at least iOS never reports
+                      // (the request "succeeds" and reads come back empty).
+                      // Point at the platform's permission settings.
+                      ScaffoldMessenger.of(context).showSnackBar(
+                        SnackBar(content: Text(i18n.healthSyncNoData(_platformName))),
+                      );
+                    }
+                  } else {
+                    await notifier.disableSync();
+                  }
+                },
+        ),
+        if (syncState.isEnabled) _statusTile(syncState, i18n),
+      ],
+    );
+  }
+
+  String get _platformName =>
+      defaultTargetPlatform == TargetPlatform.iOS ? 'Apple Health' : 'Health Connect';
+
+  /// Offered instead of the toggle when Health Connect is missing or too old:
+  /// hiding the feature would leave the user with no idea it exists, or why
+  /// it disappeared.
+  Widget _installTile(AppLocalizations i18n) {
+    final needsUpdate = _availability == HealthPlatformAvailability.updateRequired;
+    return ListTile(
+      leading: const Icon(Icons.download),
+      title: Text(needsUpdate ? i18n.healthConnectUpdate : i18n.healthConnectInstall),
+      subtitle: Text(i18n.healthConnectRequired),
+      onTap: () async {
+        await ref.read(healthSyncProvider.notifier).openHealthConnectInstall();
+        // The store leaves the app, so re-check what came back
+        await _checkAvailability();
+      },
+    );
+  }
+
+  /// Status line under the toggle: what the last sync did or why it didn't,
+  /// a spinner while one is running, and tapping it syncs (or, when the
+  /// platform withholds the data, asks for access again).
+  Widget _statusTile(HealthSyncState syncState, AppLocalizations i18n) {
+    if (syncState.isSyncing) {
+      return ListTile(
+        leading: const SizedBox(
+          width: 24,
+          height: 24,
+          child: CircularProgressIndicator(strokeWidth: 2.5),
+        ),
+        title: Text(i18n.healthSyncSyncing),
+        enabled: false,
+      );
+    }
+
+    final needsPermission = syncState.issue == HealthSyncIssue.permissionsMissing;
+    final colors = Theme.of(context).colorScheme;
+    final lastSync = syncState.lastSyncTime;
+
+    final String title;
+    if (needsPermission) {
+      title = i18n.healthSyncPermissionMissing(_platformName);
+    } else if (syncState.issue == HealthSyncIssue.failed) {
+      title = i18n.healthSyncFailed;
+    } else if (lastSync != null) {
+      title = i18n.healthSyncStatus(
+        syncState.lastSyncCount,
+        localizedDate(context).add_Hm().format(lastSync),
+      );
+    } else {
+      title = i18n.healthSyncNow;
+    }
+
+    return ListTile(
+      leading: Icon(
+        needsPermission ? Icons.warning_amber : Icons.sync,
+        color: needsPermission ? colors.error : null,
+      ),
+      title: Text(
+        title,
+        style: needsPermission ? TextStyle(color: colors.error) : null,
+      ),
+      subtitle: Text(needsPermission ? i18n.healthSyncGrantAccess : i18n.healthSyncNow),
+      onTap: () async {
+        final notifier = ref.read(healthSyncProvider.notifier);
+        // Asking for the permissions shows the platform dialog, which only
+        // ever happens because the user tapped here
+        final count = needsPermission
+            ? await notifier.retryWithPermissions()
+            : await notifier.sync();
+        // The status line already covers "nothing new" and every failure;
+        // only actual imports get a snackbar
+        if (mounted && count != null && count > 0) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text(i18n.healthSyncSuccess(count))),
+          );
+        }
+      },
+    );
+  }
+}
diff --git a/lib/features/health/models/health_metric.dart b/lib/features/health/models/health_metric.dart
new file mode 100644
index 000000000..609f200ce
--- /dev/null
+++ b/lib/features/health/models/health_metric.dart
@@ -0,0 +1,319 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:health_bridge/health.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+
+/// Timeline a single platform query covers unless the metric says otherwise,
+/// see [HealthMetric.readWindow].
+const defaultReadWindow = Duration(days: 30);
+
+/// Query window for the metrics a wearable writes continuously.
+///
+/// Measured on a Pixel 7 Pro with a watch worn daily: a week of heart rate
+/// peaked at 134 MB of a 256 MB heap, i.e. half the budget for a history that
+/// is not unusually dense. Three days leave room for someone recording several
+/// times as densely, and cost almost nothing: the windows before the first
+/// record return in about 6 ms each, and the ones with data take as long as
+/// their data does, however it is sliced.
+const highVolumeReadWindow = Duration(days: 3);
+
+/// How a day's samples are condensed into the single value stored for it.
+enum DailyAggregation {
+  /// The day's mean, e.g. heart rate.
+  average,
+
+  /// The day's total, for cumulative counters like steps.
+  sum,
+
+  /// The time the day's samples cover, overlapping ones counted once, e.g.
+  /// sleep. Adding the durations up instead would double-count a night that
+  /// two sources both reported (a phone writing undifferentiated sleep while
+  /// a watch writes the stages of the very same night).
+  mergedDuration,
+}
+
+/// A body metric that can be imported from Apple Health / Health Connect into a
+/// measurement category.
+///
+/// [metricType] is stored on the created category; it drives the mapping back
+/// to a category on the next import.
+class HealthMetric {
+  const HealthMetric({
+    required this.metricType,
+    required HealthDataType this.dataType,
+    required this.toCategoryValue,
+    this.dailyAggregation,
+    this.dayRollsOverAtHour,
+    this.enabled = false,
+    this.disabledReason,
+    this.readWindow = defaultReadWindow,
+  }) : components = const [];
+
+  /// A metric whose readings are split over several categories, e.g. blood
+  /// pressure. It has no platform type of its own: what it reads is what its
+  /// [components] read.
+  const HealthMetric.group({
+    required this.metricType,
+    required this.components,
+    required this.toCategoryValue,
+    this.dailyAggregation,
+    this.dayRollsOverAtHour,
+    this.enabled = false,
+    this.disabledReason,
+    this.readWindow = defaultReadWindow,
+  }) : dataType = null;
+
+  /// Metric type stored on the category, e.g. [MetricType.bodyFat].
+  final MetricType metricType;
+
+  /// Health platform type this metric reads, null for a group, whose
+  /// components carry theirs.
+  final HealthDataType? dataType;
+
+  /// Name and unit the category is created under. They belong to the metric
+  /// type, so a category the user creates by hand looks the same.
+  String get canonicalName => metricType.canonicalName;
+
+  String get unit => metricType.defaultUnit;
+
+  /// Converts the platform's numeric value (in its native unit) into [unit].
+  final double Function(double raw) toCategoryValue;
+
+  /// Components of a multi-value metric. Non-empty marks the metric as a
+  /// group: readings go into one child category per component, matched by
+  /// in-group position (this list's order), and the group category itself
+  /// stays measurement-free.
+  final List<HealthMetricComponent> components;
+
+  /// How samples are condensed into one entry per day. `null` imports every
+  /// sample as its own entry. Set for metrics whose individual samples are
+  /// not meaningful on their own (high-frequency ones like heart rate, or
+  /// segmented ones like sleep); re-reads then update the day in place as
+  /// further samples arrive.
+  final DailyAggregation? dailyAggregation;
+
+  /// Hour at which a sample starts counting towards the *next* calendar day.
+  /// Sleep is attributed to the day the user wakes up, so a night starting at
+  /// 23:30 belongs to the following day. `null` buckets by plain calendar day.
+  final int? dayRollsOverAtHour;
+
+  /// Whether V1 imports this metric. Disabled ones are declared for visibility
+  /// and blocked on further groundwork (see [disabledReason]).
+  final bool enabled;
+
+  /// Why a declared metric is not imported yet.
+  final String? disabledReason;
+
+  /// How much of the timeline one platform query may cover for this metric.
+  ///
+  /// The plugin materialises every record it reads and then serialises the
+  /// whole batch for the method channel, so the query size decides the peak
+  /// memory, against an Android app heap capped at 256 MB. A scale writes a
+  /// handful of values a month, a watch writes heart rate around the clock:
+  /// measured on a real device, a month of heart rate needs ~240 MB, a week
+  /// well under a hundred.
+  final Duration readWindow;
+
+  /// All platform types this metric reads (the components' for a group), each
+  /// one once even when several components read it.
+  List<HealthDataType> get dataTypes {
+    final type = dataType;
+    return type != null ? [type] : components.expand((c) => c.dataTypes).toSet().toList();
+  }
+}
+
+/// One component of a multi-value metric (e.g. systolic), imported into its
+/// own child category of the group.
+class HealthMetricComponent {
+  const HealthMetricComponent({required this.dataTypes});
+
+  /// Health platform types this component reads. More than one where the
+  /// component is a roll-up of several platform types, e.g. total sleep.
+  final List<HealthDataType> dataTypes;
+}
+
+/// Apple Health / Health Connect report body fat as a fraction on iOS (0.15)
+/// but as a percentage on Health Connect (15). A real body fat percentage is
+/// never below ~1.5, and a fraction is always below 1, so the magnitude tells
+/// the two apart without branching on platform.
+double _bodyFatToPercent(double raw) => raw <= 1.5 ? raw * 100 : raw;
+
+/// Height is reported in meters on both platforms (~1.75). Guard against a
+/// value that already arrived in centimeters.
+double _heightToCm(double raw) => raw < 3 ? raw * 100 : raw;
+
+/// Blood oxygen has the same fraction-vs-percent split as body fat, with even
+/// more room between the two: a saturation worth recording is above 70, a
+/// fraction never reaches 1.01.
+double _saturationToPercent(double raw) => raw <= 1.5 ? raw * 100 : raw;
+
+double _identity(double raw) => raw;
+
+/// Both platforms report a distance in meters, the category stores kilometers.
+double _metersToKm(double raw) => raw / 1000;
+
+/// The V1 metric set (see `plan-measurements-health-v27.md`).
+///
+/// Only [HealthMetric.enabled] entries are imported. A disabled one stays
+/// declared so the mapping is visible in one place, with the groundwork it
+/// waits for in its [HealthMetric.disabledReason].
+const List<HealthMetric> healthMetrics = [
+  HealthMetric(
+    metricType: MetricType.bodyFat,
+    dataType: HealthDataType.BODY_FAT_PERCENTAGE,
+    toCategoryValue: _bodyFatToPercent,
+    enabled: true,
+  ),
+  HealthMetric(
+    // Both platforms report kilograms, like body weight. Unlike it, the
+    // category holds only kg: the per-entry unit of locked decision #9 is
+    // body weight's alone.
+    metricType: MetricType.leanBodyMass,
+    dataType: HealthDataType.LEAN_BODY_MASS,
+    toCategoryValue: _identity,
+    enabled: true,
+  ),
+  HealthMetric(
+    metricType: MetricType.height,
+    dataType: HealthDataType.HEIGHT,
+    toCategoryValue: _heightToCm,
+    enabled: true,
+  ),
+  HealthMetric(
+    metricType: MetricType.bodyWeight,
+    dataType: HealthDataType.WEIGHT,
+    toCategoryValue: _identity,
+    enabled: true,
+  ),
+  HealthMetric.group(
+    metricType: MetricType.bloodPressure,
+    toCategoryValue: _identity,
+    // Both platforms report mmHg; a reading is the systolic/diastolic pair
+    // sharing one timestamp.
+    components: [
+      HealthMetricComponent(
+        dataTypes: [HealthDataType.BLOOD_PRESSURE_SYSTOLIC],
+      ),
+      HealthMetricComponent(
+        dataTypes: [HealthDataType.BLOOD_PRESSURE_DIASTOLIC],
+      ),
+    ],
+    enabled: true,
+  ),
+  HealthMetric(
+    metricType: MetricType.heartRate,
+    dataType: HealthDataType.HEART_RATE,
+    toCategoryValue: _identity,
+    dailyAggregation: DailyAggregation.average,
+    enabled: true,
+    readWindow: highVolumeReadWindow,
+  ),
+  HealthMetric(
+    // Both platforms compute this themselves and write (typically) one value
+    // per day, so it is imported raw: no aggregation on our side, and the
+    // platform record uuid stays available for dedup.
+    metricType: MetricType.restingHeartRate,
+    dataType: HealthDataType.RESTING_HEART_RATE,
+    toCategoryValue: _identity,
+    enabled: true,
+  ),
+  HealthMetric(
+    // A single saturation says little on its own, and a wearable measures it
+    // through the night, so the day's mean is what is stored. The window is
+    // the small one until the log says how densely it actually arrives.
+    metricType: MetricType.bloodOxygen,
+    dataType: HealthDataType.BLOOD_OXYGEN,
+    toCategoryValue: _saturationToPercent,
+    dailyAggregation: DailyAggregation.average,
+    enabled: true,
+    readWindow: highVolumeReadWindow,
+  ),
+  HealthMetric.group(
+    // SLEEP_ASLEEP is not the whole night, it is the coarsest stage: the
+    // plugin filters it down to HealthKit's asleepUnspecified and to Health
+    // Connect's STAGE_TYPE_SLEEPING. Anything writing a real hypnogram (an
+    // Apple Watch, Samsung Health, Fitbit) writes light/deep/REM instead, so
+    // reading only SLEEP_ASLEEP imports nothing for exactly those users. The
+    // total therefore rolls the stages up, and each stage also gets its own
+    // category. All types report minutes on both platforms.
+    metricType: MetricType.sleep,
+    toCategoryValue: _identity,
+    components: [
+      HealthMetricComponent(
+        dataTypes: [
+          HealthDataType.SLEEP_ASLEEP,
+          HealthDataType.SLEEP_LIGHT,
+          HealthDataType.SLEEP_DEEP,
+          HealthDataType.SLEEP_REM,
+        ],
+      ),
+      HealthMetricComponent(
+        dataTypes: [HealthDataType.SLEEP_LIGHT],
+      ),
+      HealthMetricComponent(dataTypes: [HealthDataType.SLEEP_DEEP]),
+      HealthMetricComponent(dataTypes: [HealthDataType.SLEEP_REM]),
+      // Time awake during the night completes the picture but is not sleep,
+      // so it stays out of the total above
+      HealthMetricComponent(dataTypes: [HealthDataType.SLEEP_AWAKE]),
+    ],
+    dailyAggregation: DailyAggregation.mergedDuration,
+    dayRollsOverAtHour: 18,
+    enabled: true,
+  ),
+  // The three cumulative types below are counters, not measurements: a single
+  // record covers a few minutes and means nothing on its own, so only the
+  // day's total is stored. Both platforms can aggregate them themselves, which
+  // would replace the raw read with one row per day; until the importer has
+  // that path, they are read raw in small windows and summed here.
+  HealthMetric(
+    metricType: MetricType.steps,
+    dataType: HealthDataType.STEPS,
+    toCategoryValue: _identity,
+    dailyAggregation: DailyAggregation.sum,
+    enabled: true,
+    readWindow: highVolumeReadWindow,
+  ),
+  HealthMetric(
+    metricType: MetricType.distance,
+    dataType: HealthDataType.DISTANCE_DELTA,
+    toCategoryValue: _metersToKm,
+    dailyAggregation: DailyAggregation.sum,
+    enabled: true,
+    readWindow: highVolumeReadWindow,
+  ),
+  HealthMetric(
+    // Active energy only: the basal part is a platform estimate the user never
+    // recorded, and adding it in would make the day's number depend on which
+    // platform wrote it.
+    metricType: MetricType.energy,
+    dataType: HealthDataType.ACTIVE_ENERGY_BURNED,
+    toCategoryValue: _identity,
+    dailyAggregation: DailyAggregation.sum,
+    enabled: true,
+    readWindow: highVolumeReadWindow,
+  ),
+];
+
+/// The enabled subset that the importer actually pulls.
+List<HealthMetric> get enabledHealthMetrics => healthMetrics.where((m) => m.enabled).toList();
+
+/// Every platform data type the enabled metrics are made of, i.e. what
+/// permissions are asked for and what is checked as readable.
+List<HealthDataType> get enabledHealthDataTypes =>
+    enabledHealthMetrics.expand((m) => m.dataTypes).toList();
diff --git a/lib/features/health/models/health_reading.dart b/lib/features/health/models/health_reading.dart
new file mode 100644
index 000000000..51491e0df
--- /dev/null
+++ b/lib/features/health/models/health_reading.dart
@@ -0,0 +1,100 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:health_bridge/health.dart';
+
+/// A single reading pulled from a health platform, reduced to the fields the
+/// importer needs. Keeps the `health` package's [HealthDataPoint] out of the
+/// notifier so the sync logic can be tested with plain values.
+class HealthReading {
+  const HealthReading({
+    required this.type,
+    required this.value,
+    required this.date,
+    this.externalId,
+    this.unit = HealthDataUnit.NO_UNIT,
+    this.dateTo,
+    this.recordingMethod = RecordingMethod.unknown,
+    this.sourceName,
+    this.sourceId,
+    this.deviceModel,
+    this.sourceDeviceId,
+  });
+
+  /// The platform type this reading belongs to (matched against
+  /// `HealthMetric.dataType`).
+  final HealthDataType type;
+
+  /// Numeric value in the platform's native unit.
+  final double value;
+
+  /// Start of the reading.
+  final DateTime date;
+
+  /// Platform record UUID for deduplication; `null` when the platform gives none.
+  final String? externalId;
+
+  /// Unit [value] is reported in by the platform.
+  final HealthDataUnit unit;
+
+  /// End of the reading's interval; `null` when it equals [date] (a sample
+  /// rather than a duration record).
+  final DateTime? dateTo;
+
+  /// How the platform recorded the point (manual entry, automatic, ...).
+  final RecordingMethod recordingMethod;
+
+  /// Human-readable source ("Withings Body+"); `null` when not reported.
+  final String? sourceName;
+
+  /// Bundle id of the app that wrote the point; `null` when not reported.
+  final String? sourceId;
+
+  /// Recording device ("Watch"), iOS only; `null` elsewhere.
+  final String? deviceModel;
+
+  /// Device identifier; `null` when not reported.
+  final String? sourceDeviceId;
+
+  /// Builds a reading from a platform data point, or `null` for a non-numeric
+  /// point (which the importer cannot store).
+  static HealthReading? fromDataPoint(HealthDataPoint point) {
+    final value = point.value;
+    if (value is! NumericHealthValue) {
+      return null;
+    }
+    String? nonEmpty(String? s) => (s == null || s.isEmpty) ? null : s;
+
+    return HealthReading(
+      type: point.type,
+      value: value.numericValue.toDouble(),
+      date: point.dateFrom,
+      // HealthKit reports UUIDs in uppercase, but the server's UUIDField
+      // normalizes to lowercase. Lowercase here so the dedup key stays stable
+      // once the entry round-trips through the server.
+      externalId: point.uuid.isEmpty ? null : point.uuid.toLowerCase(),
+      unit: point.unit,
+      dateTo: point.dateTo == point.dateFrom ? null : point.dateTo,
+      recordingMethod: point.recordingMethod,
+      sourceName: nonEmpty(point.sourceName),
+      sourceId: nonEmpty(point.sourceId),
+      deviceModel: nonEmpty(point.deviceModel),
+      sourceDeviceId: nonEmpty(point.sourceDeviceId),
+    );
+  }
+}
diff --git a/lib/features/health/providers/health_importer.dart b/lib/features/health/providers/health_importer.dart
new file mode 100644
index 000000000..41c96919a
--- /dev/null
+++ b/lib/features/health/providers/health_importer.dart
@@ -0,0 +1,799 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:collection/collection.dart';
+import 'package:health_bridge/health.dart';
+import 'package:logging/logging.dart';
+import 'package:powersync/powersync.dart' as ps;
+import 'package:wger/core/consts.dart';
+import 'package:wger/core/network/auth_credentials_storage.dart';
+import 'package:wger/core/shared_preferences.dart';
+import 'package:wger/features/health/models/health_metric.dart';
+import 'package:wger/features/health/models/health_reading.dart';
+import 'package:wger/features/health/providers/health_repository.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/models/unit_conversion.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+
+final _uuidPattern = RegExp(r'^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$');
+
+/// Stable id identifying the aggregate of [day] within [categoryId].
+///
+/// Deterministic, so re-reading a day within the overlap window updates the
+/// same entry instead of adding a second one. It has to be a real UUID rather
+/// than a readable `day-<date>` key, because the server stores `external_id`
+/// as a UUIDField and rejects anything else permanently. The category id is
+/// itself a UUID and serves as the v5 namespace, which is exactly the
+/// "day X within category Y" relationship the id expresses.
+String dailyAggregateExternalId(String categoryId, DateTime day) =>
+    ps.uuid.v5(categoryId, DateFormatLists.format(day));
+
+/// Why the last sync did not deliver, if it didn't.
+enum HealthSyncIssue {
+  /// The platform refuses to hand over data. Either the permissions were
+  /// declined, or they were never actually granted to this installation
+  /// (see [HealthRepository.isAuthorizationMissing]). Recoverable by asking
+  /// for them again, which needs the user to start it.
+  permissionsMissing,
+
+  /// The import failed for another reason; the details are in the log.
+  failed,
+}
+
+/// What one [HealthImporter.run] produced.
+///
+/// `completed` is false when the run gave up before reading any metric, which
+/// is what tells a caller apart from an import that simply found nothing.
+typedef HealthImportResult = ({int imported, HealthSyncIssue? issue, bool completed});
+
+/// Imports body metrics from Apple Health / Health Connect into measurement
+/// categories.
+///
+/// Read-only towards the platform: reads it via [HealthRepository], writes to
+/// the local Drift DB, and lets PowerSync push the rows up. Re-imports are
+/// deduplicated via each measurement's [MeasurementEntry.externalId] (the
+/// platform record UUID).
+///
+/// Plain Dart and constructed with its dependencies rather than reading them
+/// from a container, so a run needs nothing but the four below. What drives
+/// the runs, and the state they produce, is the notifier's.
+class HealthImporter {
+  HealthImporter({
+    required HealthRepository health,
+    required MeasurementRepository measurements,
+    required PreferenceHelper prefs,
+    required AuthCredentialsStorage credentials,
+  }) : _health = health,
+       _measurements = measurements,
+       _prefs = prefs,
+       _credentials = credentials;
+
+  final HealthRepository _health;
+  final MeasurementRepository _measurements;
+  final PreferenceHelper _prefs;
+  final AuthCredentialsStorage _credentials;
+
+  final _logger = Logger('HealthImporter');
+
+  /// How far a read window reaches back before the metric's watermark, to
+  /// pick up records that arrived late with a past date. Re-reads are
+  /// deduplicated via their external id.
+  static const _syncOverlap = Duration(days: 30);
+
+  /// Where a full read starts, i.e. when a metric has no watermark to go from.
+  ///
+  /// Not the epoch: every window before the first record is a platform query
+  /// that returns nothing, and for a metric read in weekly windows those add
+  /// up. Health Connect shipped in 2022 and HealthKit's own data rarely
+  /// predates a wearable, so this cuts the empty part without cutting real
+  /// history in practice.
+  static final _fullHistoryStart = DateTime(2020);
+
+  /// Platform record ids folded into a UUID during the running import, see
+  /// [_externalIdFor]. Expected to stay 0; anything else means a platform
+  /// changed its id format under us.
+  var _normalizedIdCount = 0;
+
+  /// Readings dropped during the running import because their value is outside
+  /// what its metric type allows, see [_isInRange].
+  var _outOfRangeCount = 0;
+
+  /// Reads the enabled metrics from the health platform and writes any new
+  /// readings to the matching measurement categories.
+  ///
+  /// Permissions are checked silently, never requested: this runs on app open
+  /// and resume, where a platform dialog would come out of nowhere. Asking
+  /// again is the user's call, which the notifier offers.
+  Future<HealthImportResult> run() async {
+    _normalizedIdCount = 0;
+    _outOfRangeCount = 0;
+
+    try {
+      final readable = await _health.readableTypes(enabledHealthDataTypes);
+      final metrics = enabledHealthMetrics
+          .where((m) => m.dataTypes.every(readable.contains))
+          .toList();
+      if (metrics.isEmpty) {
+        _logger.warning('Health permissions not granted, skipping sync');
+        return (imported: 0, issue: HealthSyncIssue.permissionsMissing, completed: false);
+      }
+      if (metrics.length < enabledHealthMetrics.length) {
+        // A declined type costs its own metric its import, nothing else. Both
+        // platforms hand out access per type, so this is the normal state
+        // after a user unticked one, not an error
+        final blocked = enabledHealthMetrics.where((m) => !metrics.contains(m));
+        _logger.info(
+          'No access to ${blocked.map((m) => m.metricType.name).join(', ')}, '
+          'importing the remaining ${metrics.length} metrics',
+        );
+      }
+
+      // The ids of the typed categories are derived from the user, see
+      // [deterministicCategoryId]. Without one nothing could be created that
+      // another device would recognise as the same category
+      final userId = await _credentials.dbOwnerUserId();
+      if (userId == null) {
+        _logger.warning('Local database has no owner, skipping health sync');
+        return (imported: 0, issue: HealthSyncIssue.failed, completed: false);
+      }
+
+      final categories = await _measurements.getCategoriesOnce();
+
+      final watermarks = await _readWatermarks();
+      // Metrics the platform has nothing for never get a category, so counting
+      // them as missing would ask for the full window on every sync
+      final knownEmpty = {...?await _prefs.getHealthSyncEmptyMetrics()};
+      final withoutCategory = _missingCategories(
+        metrics,
+        categories,
+      ).map((m) => m.metricType.name).toSet();
+      final readsEverything = await _hasNewlyReadableTypes(readable);
+      final endTime = DateTime.now();
+
+      final source = _health.sourceName;
+      var synced = 0;
+      var failedMetric = false;
+      var permissionsMissing = false;
+
+      for (final metric in metrics) {
+        final name = metric.metricType.name;
+        // A metric with nothing imported yet has no watermark to go from, and
+        // one without a category has no history behind its watermark either:
+        // reading from it would import what happened since and leave
+        // everything before it missing, silently
+        final startTime =
+            readsEverything ||
+                watermarks[name] == null ||
+                (withoutCategory.contains(name) && !knownEmpty.contains(name))
+            ? _fullHistoryStart
+            : watermarks[name]!.subtract(_syncOverlap);
+        final readsFullHistory = startTime == _fullHistoryStart;
+        // One line per metric would be eight per sync in the exportable log,
+        // where the summary below is what a report needs
+        _logger.fine('Syncing $name from $startTime to $endTime');
+
+        // One bad metric must not cost the others their import, and its own
+        // watermark has to stay put for whatever it could not write
+        try {
+          // Read per metric: how much of the timeline one platform query may
+          // cover depends on how densely the metric is written, see
+          // [HealthMetric.readWindow]
+          final readings = await _health.read(
+            types: metric.dataTypes,
+            start: _windowStartFor(startTime, metric),
+            end: endTime,
+            window: metric.readWindow,
+          );
+
+          // Pair each target category with the readings it receives: the metric's
+          // own category, or one child per component for a group metric.
+          final List<(MeasurementCategory, Iterable<HealthReading>)> targets;
+          if (metric.components.isEmpty) {
+            final metricReadings = readings.where((r) => metric.dataTypes.contains(r.type));
+            if (metricReadings.isEmpty) {
+              if (readsFullHistory && withoutCategory.contains(name)) {
+                knownEmpty.add(name);
+              }
+              watermarks[name] = endTime;
+              continue;
+            }
+            knownEmpty.remove(name);
+            final category = await _findOrCreateCategory(metric, categories, userId);
+            if (category == null) {
+              continue;
+            }
+            targets = [(category, metricReadings)];
+          } else {
+            final byComponent = [
+              for (final component in metric.components)
+                readings.where((r) => component.dataTypes.contains(r.type)),
+            ];
+            if (byComponent.every((r) => r.isEmpty)) {
+              if (readsFullHistory && withoutCategory.contains(name)) {
+                knownEmpty.add(name);
+              }
+              watermarks[name] = endTime;
+              continue;
+            }
+            knownEmpty.remove(name);
+            final children = await _findOrCreateGroupChildren(metric, categories, userId);
+            if (children == null) {
+              continue;
+            }
+            targets = [for (var i = 0; i < children.length; i++) (children[i], byComponent[i])];
+          }
+
+          DateTime? latest;
+          for (final (category, metricReadings) in targets) {
+            final (importedCount, newest) = metric.dailyAggregation != null
+                ? await _importDailyAggregates(metric, metricReadings, category, source)
+                : await _importReadings(metric, metricReadings, category, source);
+            synced += importedCount;
+            if (newest != null && (latest == null || newest.isAfter(latest))) {
+              latest = newest;
+            }
+          }
+
+          // A reading dated in the future (a device with a wrong clock) must
+          // not drag the watermark along with it, or everything recorded until
+          // that date is skipped on the next run
+          watermarks[name] = latest == null || latest.isAfter(endTime) ? endTime : latest;
+        } catch (e, s) {
+          if (HealthRepository.isAuthorizationMissing(e)) {
+            // The one permission failure iOS reports, and it reports it only
+            // when the read runs. Worth telling apart, the user can fix it
+            _logger.warning('No authorization to read ${metric.metricType.name}', e);
+            permissionsMissing = true;
+          } else {
+            _logger.severe('Importing ${metric.metricType.name} failed', e, s);
+            failedMetric = true;
+          }
+        }
+      }
+
+      // Recorded after the metrics ran, so a sync that died earlier tries
+      // again rather than remembering an access it never used
+      await _prefs.setHealthSyncReadableTypes(readable.map((t) => t.name).toList());
+      // A metric that threw is in neither set and keeps its full-window read
+      await _prefs.setHealthSyncEmptyMetrics(knownEmpty.toList());
+      await _writeWatermarks(watermarks);
+
+      if (_normalizedIdCount > 0) {
+        _logger.warning(
+          'Folded $_normalizedIdCount platform record ids into UUIDs during this sync',
+        );
+      }
+      if (_outOfRangeCount > 0) {
+        _logger.warning('Dropped $_outOfRangeCount readings outside their metric limits');
+      }
+      _logger.info(
+        'Imported $synced health measurements, '
+        '${watermarks.length} of ${metrics.length} metrics now have a watermark',
+      );
+      return (
+        imported: synced,
+        issue: failedMetric
+            ? HealthSyncIssue.failed
+            : permissionsMissing
+            ? HealthSyncIssue.permissionsMissing
+            : null,
+        completed: true,
+      );
+    } catch (e, s) {
+      // A read the platform refuses for lack of permissions is the one
+      // permission problem iOS reports at all, so it is worth telling apart
+      // from a genuine failure: the user can fix it by granting access again.
+      final missing = HealthRepository.isAuthorizationMissing(e);
+      if (missing) {
+        _logger.warning('Health sync stopped, the platform reports no authorization', e);
+      } else {
+        _logger.severe('Health sync failed', e, s);
+      }
+      return (
+        imported: 0,
+        issue: missing ? HealthSyncIssue.permissionsMissing : HealthSyncIssue.failed,
+        completed: false,
+      );
+    }
+  }
+
+  /// Imports [metricReadings] into [category], deduplicating against the
+  /// entries already present via their externalId. Returns the number of
+  /// imported entries and the newest imported reading date.
+  Future<(int, DateTime?)> _importReadings(
+    HealthMetric metric,
+    Iterable<HealthReading> metricReadings,
+    MeasurementCategory category,
+    String source,
+  ) async {
+    final seen = await _measurements.getExternalIds(category.id!);
+    var synced = 0;
+    DateTime? latest;
+
+    for (final reading in metricReadings) {
+      final uuid = _externalIdFor(reading.externalId, category.id!);
+      if (uuid != null && seen.contains(uuid)) {
+        continue;
+      }
+
+      // Body weight is stored in kg. Should a platform report it in
+      // pounds, convert and keep the original for provenance.
+      var raw = reading.value;
+      String? sourceUnit;
+      if (metric.metricType == MetricType.bodyWeight && reading.unit == HealthDataUnit.POUND) {
+        sourceUnit = 'lb';
+        raw = convertWeight(reading.value, from: 'lb', to: 'kg');
+      }
+
+      final converted = metric.toCategoryValue(raw);
+      // The server stores values as Decimal with 2 places and rejects
+      // anything more precise, so round away unit-conversion float noise
+      // (1.803 m * 100 = 180.29999999999998).
+      final value = (converted * 100).roundToDouble() / 100;
+
+      if (_isInRange(value, category, metric)) {
+        await _measurements.addLocalDrift(
+          MeasurementEntry(
+            categoryId: category.id!,
+            date: reading.date,
+            value: value,
+            notes: '',
+            source: source,
+            externalId: uuid,
+            extraData: _extraDataFor(
+              metric,
+              reading,
+              converted: sourceUnit != null || converted != reading.value,
+              sourceUnit: sourceUnit,
+              // Only set when the platform id had to be folded into a UUID
+              sourceRecordId: uuid == reading.externalId ? null : reading.externalId,
+            ),
+          ),
+        );
+
+        if (uuid != null) {
+          seen.add(uuid);
+        }
+        synced++;
+      }
+
+      // Also for a dropped reading: it will never become importable, so
+      // holding the watermark back would only mean reading it again forever
+      if (latest == null || reading.date.isAfter(latest)) {
+        latest = reading.date;
+      }
+    }
+    return (synced, latest);
+  }
+
+  /// Imports [metricReadings] as one entry per day, condensed per the metric's
+  /// [HealthMetric.dailyAggregation]. Days are keyed by
+  /// [dailyAggregateExternalId], so a re-read within the overlap window updates
+  /// the aggregate in place when late samples change it (the current day keeps
+  /// growing until it ends). The entry's date is the start of that day; for
+  /// metrics that roll over (sleep) the samples' real window is kept in
+  /// extra_data. Returns the number of written entries and the newest
+  /// processed sample date.
+  Future<(int, DateTime?)> _importDailyAggregates(
+    HealthMetric metric,
+    Iterable<HealthReading> metricReadings,
+    MeasurementCategory category,
+    String source,
+  ) async {
+    var synced = 0;
+    DateTime? latest;
+    final byDay = groupBy(metricReadings, (r) => _dayOf(r.date, metric));
+    // Read once for the whole category: a day is looked up by its key below,
+    // and a full history holds one aggregate per day
+    final stored = await _measurements.getEntriesByExternalId(category.id!);
+
+    for (final MapEntry(key: day, value: samples) in byDay.entries) {
+      final values = samples.map((r) => metric.toCategoryValue(r.value)).toList();
+      final aggregate = switch (metric.dailyAggregation!) {
+        DailyAggregation.average => values.average,
+        DailyAggregation.sum => values.sum,
+        DailyAggregation.mergedDuration => _mergedDurationMinutes(samples),
+      };
+      // Round like the raw import: the server stores Decimal with 2 places
+      final value = (aggregate * 100).roundToDouble() / 100;
+      final extraData = <String, dynamic>{
+        if (metric.dailyAggregation == DailyAggregation.average) ...{
+          'min': values.min,
+          'max': values.max,
+        },
+        'sample_count': values.length,
+        // The types actually seen, not the metric's own: a component can roll
+        // several of them up (total sleep)
+        'record_type': (samples.map((r) => r.type.name).toSet().toList()..sort()).join(','),
+        // A rolled-over day is not the samples' calendar day, so keep the
+        // window they actually cover
+        if (metric.dayRollsOverAtHour != null) ...{
+          'date_from': samples.map((r) => r.date).reduce(_earlier).toIso8601String(),
+          'date_to': samples.map((r) => r.dateTo ?? r.date).reduce(_later).toIso8601String(),
+        },
+      };
+
+      if (_isInRange(value, category, metric)) {
+        final externalId = dailyAggregateExternalId(category.id!, day);
+        final existing = stored[externalId];
+        if (existing == null) {
+          await _measurements.addLocalDrift(
+            MeasurementEntry(
+              categoryId: category.id!,
+              date: day,
+              value: value,
+              notes: '',
+              source: source,
+              externalId: externalId,
+              extraData: extraData,
+            ),
+          );
+          synced++;
+        } else if (existing.value != value ||
+            !const MapEquality<String, dynamic>().equals(existing.extraData, extraData)) {
+          await _measurements.updateLocalDrift(
+            existing.copyWith(value: value, extraData: extraData),
+          );
+          synced++;
+        }
+      }
+
+      for (final sample in samples) {
+        if (latest == null || sample.date.isAfter(latest)) {
+          latest = sample.date;
+        }
+      }
+    }
+    return (synced, latest);
+  }
+
+  /// How far each metric has been imported.
+  Future<Map<String, DateTime>> _readWatermarks() async {
+    final stored = await _prefs.getHealthSyncWatermarks();
+    return {for (final e in stored.entries) e.key: DateTime.parse(e.value)};
+  }
+
+  Future<void> _writeWatermarks(Map<String, DateTime> watermarks) async {
+    await _prefs.setHealthSyncWatermarks({
+      for (final e in watermarks.entries) e.key: e.value.toIso8601String(),
+    });
+  }
+
+  /// The time [samples] cover in minutes, counting overlapping stretches once.
+  ///
+  /// Adding the durations up would report a night twice when two sources both
+  /// recorded it, which is the normal case for sleep: a phone writes the night
+  /// as undifferentiated sleep while a watch writes the same night as its
+  /// stages. A sample without an end is taken to last as long as its value
+  /// says.
+  double _mergedDurationMinutes(Iterable<HealthReading> samples) {
+    final intervals =
+        samples
+            .map(
+              (r) => (
+                r.date,
+                r.dateTo ?? r.date.add(Duration(microseconds: (r.value * 60 * 1000000).round())),
+              ),
+            )
+            .toList()
+          ..sort((a, b) => a.$1.compareTo(b.$1));
+
+    var total = Duration.zero;
+    DateTime? start;
+    DateTime? end;
+    for (final (from, to) in intervals) {
+      if (end == null || from.isAfter(end)) {
+        if (start != null) {
+          total += end!.difference(start);
+        }
+        start = from;
+        end = to;
+        continue;
+      }
+      if (to.isAfter(end)) {
+        end = to;
+      }
+    }
+    if (start != null) {
+      total += end!.difference(start);
+    }
+    return total.inMicroseconds / Duration.microsecondsPerMinute;
+  }
+
+  /// Where the read window starts for [metric].
+  ///
+  /// A daily aggregate is recomputed from what the window returns, so a start
+  /// inside a day would overwrite it with a fraction of it.
+  DateTime _windowStartFor(DateTime start, HealthMetric metric) {
+    if (metric.dailyAggregation == null) {
+      return start;
+    }
+
+    final rollover = metric.dayRollsOverAtHour;
+    if (rollover == null) {
+      return DateTime(start.year, start.month, start.day);
+    }
+
+    // Before the rollover hour the current day began on the previous one
+    final dayBegan = start.hour >= rollover ? start.day : start.day - 1;
+    return DateTime(start.year, start.month, dayBegan, rollover);
+  }
+
+  /// The day a sample is attributed to. Plain calendar day, unless the metric
+  /// rolls over: samples at or after [HealthMetric.dayRollsOverAtHour] then
+  /// count towards the next day, so a night of sleep lands on the day the user
+  /// wakes up instead of being split at midnight.
+  DateTime _dayOf(DateTime date, HealthMetric metric) {
+    final rollover = metric.dayRollsOverAtHour;
+    final rollsOver = rollover != null && date.hour >= rollover;
+
+    // Calendar arithmetic, not +24h: a DST day is 23 or 25 hours long
+    return DateTime(date.year, date.month, date.day + (rollsOver ? 1 : 0));
+  }
+
+  static DateTime _earlier(DateTime a, DateTime b) => a.isBefore(b) ? a : b;
+
+  static DateTime _later(DateTime a, DateTime b) => a.isAfter(b) ? a : b;
+
+  /// Builds an imported entry's `extra_data` from the reading's provenance.
+  ///
+  /// `unit` is the only key with server semantics (kg|lb, validated for body
+  /// weight); the rest is provenance for debugging and later duplicate
+  /// detection. Keys without a value are omitted, never written as null.
+  /// [converted] marks readings whose stored value differs from the platform
+  /// value; the original is then kept in `source_value` (and `source_unit`
+  /// when the difference is a weight-unit conversion). [sourceRecordId] is the
+  /// platform's own record id, kept when it had to be folded into a UUID.
+  Map<String, dynamic> _extraDataFor(
+    HealthMetric metric,
+    HealthReading reading, {
+    required bool converted,
+    String? sourceUnit,
+    String? sourceRecordId,
+  }) {
+    return {
+      if (metric.metricType == MetricType.bodyWeight) 'unit': 'kg',
+      if (reading.dateTo != null) 'date_to': reading.dateTo!.toIso8601String(),
+      'recording_method': reading.recordingMethod.name,
+      'record_type': reading.type.name,
+      if (reading.sourceName != null) 'source_name': reading.sourceName,
+      if (reading.sourceId != null) 'source_id': reading.sourceId,
+      if (reading.deviceModel != null) 'device_model': reading.deviceModel,
+      if (reading.sourceDeviceId != null) 'source_device_id': reading.sourceDeviceId,
+      if (converted) 'source_value': reading.value,
+      'source_unit': ?sourceUnit,
+      'source_record_id': ?sourceRecordId,
+    };
+  }
+
+  /// The id stored in `external_id` for a platform record.
+  ///
+  /// The server's `external_id` is a UUIDField and rejects anything else
+  /// permanently, but Health Connect documents `Metadata.id` only as a
+  /// platform-assigned String. Ids that are not UUIDs are therefore folded
+  /// into one deterministically (same scheme as the daily aggregates, so the
+  /// mapping is stable across syncs and dedup keeps working); the original is
+  /// kept in `extra_data.source_record_id`, which is what a later delete-sync
+  /// via `deleteByUUID` needs.
+  String? _externalIdFor(String? platformId, String categoryId) {
+    if (platformId == null || _uuidPattern.hasMatch(platformId)) {
+      return platformId;
+    }
+    if (_normalizedIdCount == 0) {
+      _logger.warning(
+        'Health platform returned a record id that is not a UUID ("$platformId"). '
+        'Folding it into one so the entry can sync; see extra_data.source_record_id',
+      );
+    }
+    _normalizedIdCount++;
+    return ps.uuid.v5(categoryId, platformId);
+  }
+
+  /// Whether [value] is within what the server accepts for [category].
+  ///
+  /// A value outside those bounds is rejected with a 400, and a validation
+  /// failure is permanent by design: the entry would sit in the local database
+  /// and never sync. So it is dropped here instead of written. Nobody ever
+  /// complains about a dropped wearable artifact, which makes this log the only
+  /// signal that a bound is too tight.
+  ///
+  /// The unit is the metric's, not the category's: body weight is imported in
+  /// kilograms and stamped as such, even into a category labelled in pounds.
+  bool _isInRange(num value, MeasurementCategory category, HealthMetric metric) {
+    final limits = category.metricType.limits(metric.unit);
+    if (limits.contains(value)) {
+      return true;
+    }
+
+    if (_outOfRangeCount == 0) {
+      _logger.warning(
+        'Dropping a ${category.metricType.name} reading of $value ${metric.unit}, '
+        'outside the accepted ${limits.min} to ${limits.max}',
+      );
+    }
+    _outOfRangeCount++;
+    return false;
+  }
+
+  /// Whether the platform now lets us read a type it did not last time.
+  ///
+  /// Such a type has no history in wger for the same reason a deleted category
+  /// has none: nothing was ever imported for it, so the watermark says nothing
+  /// about it. That happens when the user grants access they had declined, and
+  /// after an app update that added the type.
+  Future<bool> _hasNewlyReadableTypes(Set<HealthDataType> readable) async {
+    final previous = await _prefs.getHealthSyncReadableTypes();
+    if (previous == null) {
+      return false;
+    }
+
+    final newlyReadable = readable.map((t) => t.name).toSet().difference(previous.toSet());
+    if (newlyReadable.isNotEmpty) {
+      _logger.info(
+        'Access to ${newlyReadable.join(', ')} is new, '
+        'reading the full history instead of from the watermark',
+      );
+    }
+    return newlyReadable.isNotEmpty;
+  }
+
+  /// The enabled metrics that have no category to import into.
+  ///
+  /// Their history in wger is empty, either because the user deleted the
+  /// category or because the metric was only just enabled, so the watermark
+  /// says nothing about them: reading from it would import what has happened
+  /// since and leave everything before it missing, silently. The sync falls
+  /// back to the full window for that run instead. Since the categories exist
+  /// afterwards, the next sync is back on the watermark, and the entries the
+  /// other metrics re-read are deduplicated via their external ids.
+  ///
+  /// The caller excludes the metrics the platform has nothing for, see
+  /// setHealthSyncEmptyMetrics.
+  List<HealthMetric> _missingCategories(
+    List<HealthMetric> metrics,
+    List<MeasurementCategory> categories,
+  ) {
+    bool hasCategories(HealthMetric metric) {
+      if (metric.metricType == MetricType.bodyWeight) {
+        return categories.any((c) => c.isOfficialBodyWeight);
+      }
+
+      final group = categories.firstWhereOrNull(
+        (c) => c.parentId == null && c.metricType == metric.metricType,
+      );
+      if (group == null) {
+        return false;
+      }
+      // Empty for everything but a group metric, whose readings live in one
+      // child category per component
+      return metric.metricType.components.every(
+        (component) => categories.any((c) => c.parentId == group.id && c.metricType == component),
+      );
+    }
+
+    final missing = metrics.where((m) => !hasCategories(m)).toList();
+    if (missing.isNotEmpty) {
+      _logger.info('No category for ${missing.map((m) => m.metricType.name).join(', ')}');
+    }
+    return missing;
+  }
+
+  /// Finds the category for [metric] by its `metric_type`, or creates it. The
+  /// created category is appended to [categories] so a later metric in the same
+  /// run reuses it.
+  ///
+  /// Matching by name as well was dropped deliberately: it hit any hand-made
+  /// category that happened to be called like the metric in English and missed
+  /// it in every other language, so the target depended on the UI language. A
+  /// hand-kept category cannot be adopted into a metric type yet, see the plan.
+  ///
+  /// Body weight is the exception: it goes only into the official category,
+  /// which the server creates for every user. It is never created here;
+  /// returns `null` (skip the metric) while the initial sync has not
+  /// delivered it yet.
+  Future<MeasurementCategory?> _findOrCreateCategory(
+    HealthMetric metric,
+    List<MeasurementCategory> categories,
+    String userId,
+  ) async {
+    if (metric.metricType == MetricType.bodyWeight) {
+      final official = categories.firstWhereOrNull((c) => c.isOfficialBodyWeight);
+      if (official == null) {
+        _logger.info('Official body weight category not synced yet, skipping weight import');
+      }
+      return official;
+    }
+
+    final existing = categories.firstWhereOrNull((c) => c.metricType == metric.metricType);
+    if (existing != null) {
+      return existing;
+    }
+
+    final category = MeasurementCategory(
+      id: deterministicCategoryId(userId, metric.metricType),
+      name: metric.canonicalName,
+      unit: metric.unit,
+      metricType: metric.metricType,
+    );
+    await _measurements.addLocalDriftCategory(category);
+    categories.add(category);
+    return category;
+  }
+
+  /// Finds the child categories a group metric imports into, one per
+  /// component matched by its own metric type, creating the group and any
+  /// missing children as needed. Returns `null` (skip the metric) when the
+  /// matching category holds entries itself: the server allows measurements
+  /// only on leaves, so attaching children would make its rows invalid.
+  Future<List<MeasurementCategory>?> _findOrCreateGroupChildren(
+    HealthMetric metric,
+    List<MeasurementCategory> categories,
+    String userId,
+  ) async {
+    final existing = categories.firstWhereOrNull(
+      (c) => c.parentId == null && c.metricType == metric.metricType,
+    );
+    if (existing != null && await _measurements.hasEntries(existing.id!)) {
+      _logger.warning(
+        'Category "${existing.name}" holds entries itself and cannot become '
+        'a ${metric.metricType.name} group, skipping the import',
+      );
+      return null;
+    }
+
+    final parent =
+        existing ??
+        MeasurementCategory(
+          id: deterministicCategoryId(userId, metric.metricType),
+          name: metric.canonicalName,
+          unit: metric.unit,
+          metricType: metric.metricType,
+        );
+    if (existing == null) {
+      await _measurements.addLocalDriftCategory(parent);
+      categories.add(parent);
+    }
+
+    // The component categories come from the metric type, in the same order as
+    // the metric's health data types, so the caller can pair them by index.
+    // The server creates them on the very same ids when it sees the group
+    final result = <MeasurementCategory>[];
+    for (final (order, metricType) in metric.metricType.components.indexed) {
+      final existingChild = categories.firstWhereOrNull(
+        (c) => c.parentId == parent.id && c.metricType == metricType,
+      );
+      if (existingChild != null) {
+        result.add(existingChild);
+        continue;
+      }
+      final child = MeasurementCategory(
+        id: deterministicCategoryId(userId, metricType),
+        name: metricType.canonicalName,
+        unit: metricType.defaultUnit,
+        metricType: metricType,
+        parentId: parent.id,
+        order: order,
+      );
+      await _measurements.addLocalDriftCategory(child);
+      categories.add(child);
+      result.add(child);
+    }
+    return result;
+  }
+}
diff --git a/lib/features/health/providers/health_repository.dart b/lib/features/health/providers/health_repository.dart
new file mode 100644
index 000000000..177499aa3
--- /dev/null
+++ b/lib/features/health/providers/health_repository.dart
@@ -0,0 +1,267 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'dart:io';
+
+import 'package:flutter/foundation.dart' show kIsWeb;
+import 'package:flutter/services.dart' show PlatformException;
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:health_bridge/health.dart';
+import 'package:logging/logging.dart';
+import 'package:wger/features/health/models/health_metric.dart';
+import 'package:wger/features/health/models/health_reading.dart';
+
+final healthRepositoryProvider = Provider<HealthRepository>((ref) {
+  return HealthRepository();
+});
+
+/// How usable the health platform is on this device.
+enum HealthPlatformAvailability {
+  available,
+
+  /// Android without Health Connect installed.
+  notInstalled,
+
+  /// Android with a Health Connect too old for the SDK.
+  updateRequired,
+
+  /// Neither Apple Health nor Health Connect exists here (desktop, web).
+  unsupported,
+}
+
+/// Wraps the `health` plugin so the rest of the app talks to a small, mockable
+/// surface instead of Apple Health / Health Connect directly.
+class HealthRepository {
+  HealthRepository([Health? health]) : _health = health ?? Health();
+
+  final Health _health;
+  final _logger = Logger('HealthRepository');
+
+  /// The measurement `source` value for readings from this platform: `apple`
+  /// for Apple Health, `google` for Health Connect.
+  String get sourceName => Platform.isIOS ? 'apple' : 'google';
+
+  /// Whether a health platform is usable on this device.
+  Future<bool> isAvailable() async => await availability() == HealthPlatformAvailability.available;
+
+  /// How usable the device's health platform is.
+  ///
+  /// Android tells the two unusable cases apart, and both are the user's to
+  /// fix: Health Connect can be installed or updated from the store, see
+  /// [openHealthConnectInstall].
+  Future<HealthPlatformAvailability> availability() async {
+    // Checked before anything else: on web `dart:io` is a stub whose
+    // Platform getters throw instead of returning false
+    if (kIsWeb) {
+      return HealthPlatformAvailability.unsupported;
+    }
+    if (Platform.isAndroid) {
+      await _health.configure();
+      return switch (await _health.getHealthConnectSdkStatus()) {
+        HealthConnectSdkStatus.sdkAvailable => HealthPlatformAvailability.available,
+        HealthConnectSdkStatus.sdkUnavailableProviderUpdateRequired =>
+          HealthPlatformAvailability.updateRequired,
+        _ => HealthPlatformAvailability.notInstalled,
+      };
+    }
+    return Platform.isIOS
+        ? HealthPlatformAvailability.available
+        : HealthPlatformAvailability.unsupported;
+  }
+
+  /// Sends the user to the store page for installing or updating Health
+  /// Connect. Android only, a no-op elsewhere.
+  Future<void> openHealthConnectInstall() => _health.installHealthConnect();
+
+  /// Whether the platform grants access to records older than 30 days.
+  ///
+  /// Android gates the history behind its own permission; without it Health
+  /// Connect silently limits every read to the last 30 days, which would make
+  /// the first import look complete while missing everything before that.
+  /// Always true on iOS, which has no such gate.
+  Future<bool> ensureHistoryAuthorized() async {
+    if (kIsWeb || !Platform.isAndroid) {
+      return true;
+    }
+    return _health.requestHealthDataHistoryAuthorization();
+  }
+
+  /// The subset of [types] the platform lets us read, without ever showing a
+  /// permission dialog.
+  ///
+  /// Asked per type on purpose. Both platforms hand out access per data type,
+  /// and Health Connect's dialog invites the user to untick individual ones,
+  /// so a single declined type must cost only its own metric its import.
+  /// (`hasPermissions` answers for the whole list at once, which turned one
+  /// declined type into a full stop.)
+  ///
+  /// Only Android answers exactly. HealthKit does not disclose read access, so
+  /// the types it maps come back as `requestedOrUnknown` and count as
+  /// readable; a denial there only shows up when the read fails, see
+  /// [isAuthorizationMissing].
+  Future<Set<HealthDataType>> readableTypes(List<HealthDataType> types) async {
+    if (types.isEmpty) {
+      return {};
+    }
+    await _health.configure();
+
+    try {
+      final snapshot = await _health.getAuthorizationSnapshot(types.toSet().toList());
+      if (!snapshot.available) {
+        return {};
+      }
+      return {
+        for (final entry in snapshot.types)
+          if (_isReadable(entry.read)) entry.type,
+      };
+    } catch (e) {
+      // The snapshot only refines what we try: without it every type is read
+      // and the ones the platform refuses fail individually, which is the
+      // behaviour this method improves on, not one it depends on
+      _logger.warning('Could not read the authorization snapshot, trying every type: $e');
+      return types.toSet();
+    }
+  }
+
+  static bool _isReadable(HealthAuthorizationState state) => switch (state) {
+    // iOS never reports more than "was requested at some point"
+    HealthAuthorizationState.authorized || HealthAuthorizationState.requestedOrUnknown => true,
+    _ => false,
+  };
+
+  /// Whether [error] is the platform refusing a read for lack of permissions.
+  ///
+  /// HealthKit throws this when authorization for a type was never requested
+  /// for the current installation, which is the one permission problem iOS
+  /// does report (a plain denial silently reads as "no data"). Reinstalling
+  /// the app resets the grants while the app's own preferences survive, so a
+  /// sync can hit this even though the user did grant access earlier.
+  static bool isAuthorizationMissing(Object error) =>
+      error is PlatformException &&
+      (error.message ?? '').toLowerCase().contains('authorization not determined');
+
+  /// Ensures READ access to [types] (requesting it if needed) and, on Android,
+  /// access to historical data. Returns whether access is granted.
+  ///
+  /// Shows the platform's permission dialog, so only call this from a path the
+  /// user started themselves.
+  Future<bool> ensureAuthorized(List<HealthDataType> types) async {
+    await _health.configure();
+
+    if ((await readableTypes(types)).length < types.length) {
+      // The return value is deliberately ignored: Android reports success as
+      // soon as the dialog closes, whatever the user ticked there. Only the
+      // snapshot afterwards says what we may actually read
+      await _health.requestAuthorization(
+        types,
+        permissions: List.filled(types.length, HealthDataAccess.READ),
+      );
+    }
+
+    final readable = await readableTypes(types);
+    if (readable.isEmpty) {
+      _logger.warning('Health permissions not granted');
+      return false;
+    }
+    if (readable.length < types.length) {
+      _logger.info('Health access granted for ${readable.length} of ${types.length} types');
+    }
+
+    // Not fatal: without it the import still works, it just cannot reach
+    // further back than 30 days
+    if (!await ensureHistoryAuthorized()) {
+      _logger.warning(
+        'Access to the health history was not granted, only the last 30 days can be imported',
+      );
+    }
+    return true;
+  }
+
+  /// Reads all [types] between [start] and [end], platform-deduplicated and
+  /// reduced to numeric [HealthReading]s.
+  ///
+  /// Types are read one by one: a single type the platform refuses (an
+  /// unauthorized type throws rather than coming back empty) would otherwise
+  /// cost every other type its import too. A failing type is logged by name
+  /// and skipped; only when every type fails does the error propagate, so a
+  /// wholesale denial still surfaces as one.
+  ///
+  /// Each type is read in windows of [window]: the plugin turns every record
+  /// into a map and then serialises the whole batch for the method channel, so
+  /// one query spanning years of a densely written type fills the Android app
+  /// heap, which is capped at 256 MB however much RAM the device has, and the
+  /// process is killed. How large a window a metric can afford is a property
+  /// of the metric, see [HealthMetric.readWindow]. The windows are contiguous,
+  /// and a record sitting exactly on a boundary is removed by the
+  /// deduplication below.
+  Future<List<HealthReading>> read({
+    required List<HealthDataType> types,
+    required DateTime start,
+    required DateTime end,
+    required Duration window,
+  }) async {
+    final points = <HealthDataPoint>[];
+    Object? firstError;
+    var failed = 0;
+
+    for (final type in types) {
+      try {
+        // Collected per type and only handed over once every window of it
+        // returned, see the catch below
+        final readForType = <HealthDataPoint>[];
+        var windowStart = start;
+        while (windowStart.isBefore(end)) {
+          final windowEnd = windowStart.add(window);
+          final batch = await _health.getHealthDataFromTypes(
+            types: [type],
+            startTime: windowStart,
+            endTime: windowEnd.isAfter(end) ? end : windowEnd,
+          );
+          // How much a window holds is what decides whether [window] is small
+          // enough, so it is worth having in a bug report instead of being
+          // reconstructed from GC lines afterwards
+          if (batch.isNotEmpty) {
+            _logger.finer('Read ${batch.length} ${type.name} records from $windowStart');
+          }
+          readForType.addAll(batch);
+          windowStart = windowEnd;
+        }
+        if (readForType.isNotEmpty) {
+          _logger.fine('Read ${readForType.length} ${type.name} records in total');
+        }
+        points.addAll(readForType);
+      } catch (e) {
+        // The whole type is dropped even when earlier windows delivered:
+        // importing half a type would let the watermark move past the readings
+        // the failing windows never returned
+        failed++;
+        firstError ??= e;
+        _logger.warning('Reading ${type.name} from the health platform failed: $e');
+      }
+    }
+
+    if (firstError != null && failed == types.length) {
+      throw firstError;
+    }
+    return _health
+        .removeDuplicates(points)
+        .map(HealthReading.fromDataPoint)
+        .whereType<HealthReading>()
+        .toList();
+  }
+}
diff --git a/lib/features/health/providers/health_sync.dart b/lib/features/health/providers/health_sync.dart
new file mode 100644
index 000000000..a23db4769
--- /dev/null
+++ b/lib/features/health/providers/health_sync.dart
@@ -0,0 +1,177 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/widgets.dart' show AppLifecycleListener;
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:logging/logging.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:wger/core/network/auth_credentials_storage.dart';
+import 'package:wger/core/shared_preferences.dart';
+import 'package:wger/features/health/models/health_metric.dart';
+import 'package:wger/features/health/providers/health_importer.dart';
+import 'package:wger/features/health/providers/health_repository.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+
+/// The importer's outcome is part of what this notifier exposes, so it reads
+/// as one API from the outside.
+export 'package:wger/features/health/providers/health_importer.dart'
+    show HealthSyncIssue, dailyAggregateExternalId;
+
+part 'health_sync.freezed.dart';
+part 'health_sync.g.dart';
+
+@freezed
+sealed class HealthSyncState with _$HealthSyncState {
+  const factory HealthSyncState({
+    @Default(false) bool isEnabled,
+    @Default(false) bool isSyncing,
+    @Default(0) int lastSyncCount,
+
+    /// When the last successful sync finished; null until one succeeded in
+    /// this session.
+    DateTime? lastSyncTime,
+
+    /// What went wrong during the last sync, null when it went through.
+    HealthSyncIssue? issue,
+  }) = _HealthSyncState;
+}
+
+/// Drives the health import: the user's preference, when a run happens, and
+/// what the settings screen shows about it.
+///
+/// The import itself is [HealthImporter], which this only starts and reports
+/// on. Everything about how readings become measurements lives there.
+@Riverpod(keepAlive: true)
+class HealthSyncNotifier extends _$HealthSyncNotifier {
+  /// Minimum pause between the automatic re-syncs on app resume.
+  static const _resumeThrottle = Duration(minutes: 15);
+
+  final _logger = Logger('HealthSyncNotifier');
+  late final HealthRepository _health;
+  late final HealthImporter _importer;
+
+  @override
+  HealthSyncState build() {
+    _health = ref.read(healthRepositoryProvider);
+    _importer = HealthImporter(
+      health: _health,
+      measurements: ref.read(measurementRepositoryProvider),
+      prefs: PreferenceHelper.instance,
+      credentials: ref.read(authCredentialsStorageProvider),
+    );
+    _loadPersistedState();
+
+    // New readings often exist exactly when the app comes back from the
+    // background (the user just weighed in, granted permissions, ...), so
+    // resume triggers a sync as well, throttled to stay unobtrusive
+    final lifecycleListener = AppLifecycleListener(
+      onResume: () {
+        final last = state.lastSyncTime;
+        if (last == null || DateTime.now().difference(last) >= _resumeThrottle) {
+          sync();
+        }
+      },
+    );
+    ref.onDispose(lifecycleListener.dispose);
+
+    return const HealthSyncState();
+  }
+
+  Future<void> _loadPersistedState() async {
+    if (await PreferenceHelper.instance.getHealthSyncEnabled()) {
+      state = state.copyWith(isEnabled: true);
+    }
+  }
+
+  /// Whether a health platform is available on this device.
+  Future<bool> isAvailable() => _health.isAvailable();
+
+  /// How usable the device's health platform is, so the settings can offer
+  /// installing or updating Health Connect instead of hiding the feature.
+  Future<HealthPlatformAvailability> availability() => _health.availability();
+
+  /// Sends the user to the store page for Health Connect. Android only.
+  Future<void> openHealthConnectInstall() => _health.openHealthConnectInstall();
+
+  /// Requests permissions, persists the preference, and runs an initial import.
+  ///
+  /// Returns the number of imported entries, or `null` when the platform
+  /// permissions were not granted (sync stays disabled).
+  Future<int?> enableSync() async {
+    _logger.info('Enabling health sync');
+    if (!await _health.ensureAuthorized(enabledHealthDataTypes)) {
+      return null;
+    }
+    await PreferenceHelper.instance.setHealthSyncEnabled(true);
+    state = state.copyWith(isEnabled: true);
+    return sync();
+  }
+
+  /// Asks the platform for the permissions again and retries the import.
+  ///
+  /// For [HealthSyncIssue.permissionsMissing]: this shows the platform dialog,
+  /// so it belongs behind a user action, unlike the automatic [sync].
+  /// Returns the number of imported entries, or `null` when access was again
+  /// not granted.
+  Future<int?> retryWithPermissions() async {
+    _logger.info('Re-requesting health permissions');
+    if (!await _health.ensureAuthorized(enabledHealthDataTypes)) {
+      state = state.copyWith(issue: HealthSyncIssue.permissionsMissing);
+      return null;
+    }
+    return sync();
+  }
+
+  /// Clears the preference and disables importing.
+  ///
+  /// The sync watermark goes with it, so switching back on re-reads the full
+  /// history. That is slower but never leaves a hole: everything recorded
+  /// while the sync was off would otherwise stay outside the read window
+  /// forever. Re-reads are deduplicated via externalId.
+  Future<void> disableSync() async {
+    _logger.info('Disabling health sync');
+    await PreferenceHelper.instance.clearHealthSyncPreferences();
+    state = const HealthSyncState();
+  }
+
+  /// Runs one import and reports it in the state. Returns the number of
+  /// imported entries. A no-op unless the user enabled sync, and while one is
+  /// already running. Triggered on app open, on app resume, and manually from
+  /// the settings.
+  Future<int> sync() async {
+    if (!await PreferenceHelper.instance.getHealthSyncEnabled()) {
+      return 0;
+    }
+    if (state.isSyncing) {
+      return 0;
+    }
+    state = state.copyWith(isEnabled: true, isSyncing: true, issue: null);
+
+    final result = await _importer.run();
+
+    // The timestamp says when the metrics were last read, so a run that gave
+    // up before reading any of them leaves the previous one standing
+    state = state.copyWith(
+      isSyncing: false,
+      lastSyncCount: result.imported,
+      lastSyncTime: result.completed ? DateTime.now() : state.lastSyncTime,
+      issue: result.issue,
+    );
+    return result.imported;
+  }
+}
diff --git a/lib/features/health/providers/health_sync.freezed.dart b/lib/features/health/providers/health_sync.freezed.dart
new file mode 100644
index 000000000..83ec258ae
--- /dev/null
+++ b/lib/features/health/providers/health_sync.freezed.dart
@@ -0,0 +1,283 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'health_sync.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+/// @nodoc
+mixin _$HealthSyncState {
+
+ bool get isEnabled; bool get isSyncing; int get lastSyncCount;/// When the last successful sync finished; null until one succeeded in
+/// this session.
+ DateTime? get lastSyncTime;/// What went wrong during the last sync, null when it went through.
+ HealthSyncIssue? get issue;
+/// Create a copy of HealthSyncState
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$HealthSyncStateCopyWith<HealthSyncState> get copyWith => _$HealthSyncStateCopyWithImpl<HealthSyncState>(this as HealthSyncState, _$identity);
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is HealthSyncState&&(identical(other.isEnabled, isEnabled) || other.isEnabled == isEnabled)&&(identical(other.isSyncing, isSyncing) || other.isSyncing == isSyncing)&&(identical(other.lastSyncCount, lastSyncCount) || other.lastSyncCount == lastSyncCount)&&(identical(other.lastSyncTime, lastSyncTime) || other.lastSyncTime == lastSyncTime)&&(identical(other.issue, issue) || other.issue == issue));
+}
+
+
+@override
+int get hashCode => Object.hash(runtimeType,isEnabled,isSyncing,lastSyncCount,lastSyncTime,issue);
+
+@override
+String toString() {
+  return 'HealthSyncState(isEnabled: $isEnabled, isSyncing: $isSyncing, lastSyncCount: $lastSyncCount, lastSyncTime: $lastSyncTime, issue: $issue)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $HealthSyncStateCopyWith<$Res>  {
+  factory $HealthSyncStateCopyWith(HealthSyncState value, $Res Function(HealthSyncState) _then) = _$HealthSyncStateCopyWithImpl;
+@useResult
+$Res call({
+ bool isEnabled, bool isSyncing, int lastSyncCount, DateTime? lastSyncTime, HealthSyncIssue? issue
+});
+
+
+
+
+}
+/// @nodoc
+class _$HealthSyncStateCopyWithImpl<$Res>
+    implements $HealthSyncStateCopyWith<$Res> {
+  _$HealthSyncStateCopyWithImpl(this._self, this._then);
+
+  final HealthSyncState _self;
+  final $Res Function(HealthSyncState) _then;
+
+/// Create a copy of HealthSyncState
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? isEnabled = null,Object? isSyncing = null,Object? lastSyncCount = null,Object? lastSyncTime = freezed,Object? issue = freezed,}) {
+  return _then(_self.copyWith(
+isEnabled: null == isEnabled ? _self.isEnabled : isEnabled // ignore: cast_nullable_to_non_nullable
+as bool,isSyncing: null == isSyncing ? _self.isSyncing : isSyncing // ignore: cast_nullable_to_non_nullable
+as bool,lastSyncCount: null == lastSyncCount ? _self.lastSyncCount : lastSyncCount // ignore: cast_nullable_to_non_nullable
+as int,lastSyncTime: freezed == lastSyncTime ? _self.lastSyncTime : lastSyncTime // ignore: cast_nullable_to_non_nullable
+as DateTime?,issue: freezed == issue ? _self.issue : issue // ignore: cast_nullable_to_non_nullable
+as HealthSyncIssue?,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [HealthSyncState].
+extension HealthSyncStatePatterns on HealthSyncState {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _HealthSyncState value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _HealthSyncState() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _HealthSyncState value)  $default,){
+final _that = this;
+switch (_that) {
+case _HealthSyncState():
+return $default(_that);}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _HealthSyncState value)?  $default,){
+final _that = this;
+switch (_that) {
+case _HealthSyncState() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool isEnabled,  bool isSyncing,  int lastSyncCount,  DateTime? lastSyncTime,  HealthSyncIssue? issue)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _HealthSyncState() when $default != null:
+return $default(_that.isEnabled,_that.isSyncing,_that.lastSyncCount,_that.lastSyncTime,_that.issue);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool isEnabled,  bool isSyncing,  int lastSyncCount,  DateTime? lastSyncTime,  HealthSyncIssue? issue)  $default,) {final _that = this;
+switch (_that) {
+case _HealthSyncState():
+return $default(_that.isEnabled,_that.isSyncing,_that.lastSyncCount,_that.lastSyncTime,_that.issue);}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool isEnabled,  bool isSyncing,  int lastSyncCount,  DateTime? lastSyncTime,  HealthSyncIssue? issue)?  $default,) {final _that = this;
+switch (_that) {
+case _HealthSyncState() when $default != null:
+return $default(_that.isEnabled,_that.isSyncing,_that.lastSyncCount,_that.lastSyncTime,_that.issue);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+
+
+class _HealthSyncState implements HealthSyncState {
+  const _HealthSyncState({this.isEnabled = false, this.isSyncing = false, this.lastSyncCount = 0, this.lastSyncTime, this.issue});
+  
+
+@override@JsonKey() final  bool isEnabled;
+@override@JsonKey() final  bool isSyncing;
+@override@JsonKey() final  int lastSyncCount;
+/// When the last successful sync finished; null until one succeeded in
+/// this session.
+@override final  DateTime? lastSyncTime;
+/// What went wrong during the last sync, null when it went through.
+@override final  HealthSyncIssue? issue;
+
+/// Create a copy of HealthSyncState
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$HealthSyncStateCopyWith<_HealthSyncState> get copyWith => __$HealthSyncStateCopyWithImpl<_HealthSyncState>(this, _$identity);
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _HealthSyncState&&(identical(other.isEnabled, isEnabled) || other.isEnabled == isEnabled)&&(identical(other.isSyncing, isSyncing) || other.isSyncing == isSyncing)&&(identical(other.lastSyncCount, lastSyncCount) || other.lastSyncCount == lastSyncCount)&&(identical(other.lastSyncTime, lastSyncTime) || other.lastSyncTime == lastSyncTime)&&(identical(other.issue, issue) || other.issue == issue));
+}
+
+
+@override
+int get hashCode => Object.hash(runtimeType,isEnabled,isSyncing,lastSyncCount,lastSyncTime,issue);
+
+@override
+String toString() {
+  return 'HealthSyncState(isEnabled: $isEnabled, isSyncing: $isSyncing, lastSyncCount: $lastSyncCount, lastSyncTime: $lastSyncTime, issue: $issue)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$HealthSyncStateCopyWith<$Res> implements $HealthSyncStateCopyWith<$Res> {
+  factory _$HealthSyncStateCopyWith(_HealthSyncState value, $Res Function(_HealthSyncState) _then) = __$HealthSyncStateCopyWithImpl;
+@override @useResult
+$Res call({
+ bool isEnabled, bool isSyncing, int lastSyncCount, DateTime? lastSyncTime, HealthSyncIssue? issue
+});
+
+
+
+
+}
+/// @nodoc
+class __$HealthSyncStateCopyWithImpl<$Res>
+    implements _$HealthSyncStateCopyWith<$Res> {
+  __$HealthSyncStateCopyWithImpl(this._self, this._then);
+
+  final _HealthSyncState _self;
+  final $Res Function(_HealthSyncState) _then;
+
+/// Create a copy of HealthSyncState
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? isEnabled = null,Object? isSyncing = null,Object? lastSyncCount = null,Object? lastSyncTime = freezed,Object? issue = freezed,}) {
+  return _then(_HealthSyncState(
+isEnabled: null == isEnabled ? _self.isEnabled : isEnabled // ignore: cast_nullable_to_non_nullable
+as bool,isSyncing: null == isSyncing ? _self.isSyncing : isSyncing // ignore: cast_nullable_to_non_nullable
+as bool,lastSyncCount: null == lastSyncCount ? _self.lastSyncCount : lastSyncCount // ignore: cast_nullable_to_non_nullable
+as int,lastSyncTime: freezed == lastSyncTime ? _self.lastSyncTime : lastSyncTime // ignore: cast_nullable_to_non_nullable
+as DateTime?,issue: freezed == issue ? _self.issue : issue // ignore: cast_nullable_to_non_nullable
+as HealthSyncIssue?,
+  ));
+}
+
+
+}
+
+// dart format on
diff --git a/lib/features/health/providers/health_sync.g.dart b/lib/features/health/providers/health_sync.g.dart
new file mode 100644
index 000000000..cba6a02e7
--- /dev/null
+++ b/lib/features/health/providers/health_sync.g.dart
@@ -0,0 +1,83 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'health_sync.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint, type=warning
+/// Drives the health import: the user's preference, when a run happens, and
+/// what the settings screen shows about it.
+///
+/// The import itself is [HealthImporter], which this only starts and reports
+/// on. Everything about how readings become measurements lives there.
+
+@ProviderFor(HealthSyncNotifier)
+final healthSyncProvider = HealthSyncNotifierProvider._();
+
+/// Drives the health import: the user's preference, when a run happens, and
+/// what the settings screen shows about it.
+///
+/// The import itself is [HealthImporter], which this only starts and reports
+/// on. Everything about how readings become measurements lives there.
+final class HealthSyncNotifierProvider
+    extends $NotifierProvider<HealthSyncNotifier, HealthSyncState> {
+  /// Drives the health import: the user's preference, when a run happens, and
+  /// what the settings screen shows about it.
+  ///
+  /// The import itself is [HealthImporter], which this only starts and reports
+  /// on. Everything about how readings become measurements lives there.
+  HealthSyncNotifierProvider._()
+    : super(
+        from: null,
+        argument: null,
+        retry: null,
+        name: r'healthSyncProvider',
+        isAutoDispose: false,
+        dependencies: null,
+        $allTransitiveDependencies: null,
+      );
+
+  @override
+  String debugGetCreateSourceHash() => _$healthSyncNotifierHash();
+
+  @$internal
+  @override
+  HealthSyncNotifier create() => HealthSyncNotifier();
+
+  /// {@macro riverpod.override_with_value}
+  Override overrideWithValue(HealthSyncState value) {
+    return $ProviderOverride(
+      origin: this,
+      providerOverride: $SyncValueProvider<HealthSyncState>(value),
+    );
+  }
+}
+
+String _$healthSyncNotifierHash() => r'9ed53f8b6656f0bc283d1acdbe1b29da2b6e9642';
+
+/// Drives the health import: the user's preference, when a run happens, and
+/// what the settings screen shows about it.
+///
+/// The import itself is [HealthImporter], which this only starts and reports
+/// on. Everything about how readings become measurements lives there.
+
+abstract class _$HealthSyncNotifier extends $Notifier<HealthSyncState> {
+  HealthSyncState build();
+  @$mustCallSuper
+  @override
+  WhenComplete runBuild() {
+    final ref = this.ref as $Ref<HealthSyncState, HealthSyncState>;
+    final element =
+        ref.element
+            as $ClassProviderElement<
+              AnyNotifier<HealthSyncState, HealthSyncState>,
+              HealthSyncState,
+              Object?,
+              Object?
+            >;
+    return element.handleCreate(ref, build);
+  }
+}
diff --git a/lib/features/measurements/charts/calendar.dart b/lib/features/measurements/charts/calendar.dart
new file mode 100644
index 000000000..1dd5fc0aa
--- /dev/null
+++ b/lib/features/measurements/charts/calendar.dart
@@ -0,0 +1,39 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/// Calendar-day arithmetic for the charts, in one place because it is easy to
+/// get subtly wrong: a Duration is wall-clock time and a DST day is 23 or 25
+/// hours long, so days are shifted through the date components and counted in
+/// UTC, never added as multiples of 24 hours.
+library;
+
+/// [date]'s calendar day, i.e. its midnight.
+DateTime dayOf(DateTime date) => DateTime(date.year, date.month, date.day);
+
+/// The calendar day [days] days after [day] (negative for before), at midnight.
+DateTime shiftDays(DateTime day, int days) => DateTime(day.year, day.month, day.day + days);
+
+/// The Monday of the week [date] falls into, at midnight.
+DateTime weekStart(DateTime date) => shiftDays(date, -(date.weekday - 1));
+
+/// Whole days from [from] to [to], both taken as calendar days.
+int daysBetween(DateTime from, DateTime to) => DateTime.utc(
+  to.year,
+  to.month,
+  to.day,
+).difference(DateTime.utc(from.year, from.month, from.day)).inDays;
diff --git a/lib/features/measurements/charts/colors.dart b/lib/features/measurements/charts/colors.dart
new file mode 100644
index 000000000..aee5a022f
--- /dev/null
+++ b/lib/features/measurements/charts/colors.dart
@@ -0,0 +1,45 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2020 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:wger/features/measurements/charts/series.dart';
+
+/// Fill of a plan period band, shared with the legend so its swatch matches.
+Color planBandColor(BuildContext context) =>
+    Theme.of(context).colorScheme.primary.withValues(alpha: 0.15);
+
+/// The component colours in order: what [componentColor] indexes into, and
+/// what the spark painters take as a whole. One list, so a spark segment, its
+/// full-chart line and the legend never drift apart.
+List<Color> componentPalette(BuildContext context) {
+  final scheme = Theme.of(context).colorScheme;
+  return [scheme.primary, scheme.tertiary, scheme.secondary, scheme.error];
+}
+
+/// Colour of the [index]-th [MeasurementSeriesRole.component] line. Shared
+/// with the legend so a component's colour matches its line.
+Color componentColor(BuildContext context, int index) {
+  final colors = componentPalette(context);
+  return colors[index % colors.length];
+}
+
+/// Colour of a change bar, by which way it points. Theme colours rather than
+/// green and red: which direction is the good one depends on the goal (losing
+/// weight, building muscle), and the chart should not assert one.
+Color deltaColor(BuildContext context, num delta) =>
+    delta < 0 ? Theme.of(context).colorScheme.tertiary : Theme.of(context).colorScheme.primary;
diff --git a/lib/features/measurements/charts/data.dart b/lib/features/measurements/charts/data.dart
new file mode 100644
index 000000000..a89857a8a
--- /dev/null
+++ b/lib/features/measurements/charts/data.dart
@@ -0,0 +1,745 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2020 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'dart:math';
+
+import 'package:collection/collection.dart';
+import 'package:flutter/material.dart';
+import 'package:wger/features/measurements/charts/calendar.dart';
+import 'package:wger/features/measurements/charts/range.dart';
+import 'package:wger/features/measurements/charts/series.dart';
+import 'package:wger/features/measurements/measurements.dart';
+import 'package:wger/features/measurements/models/measurement_bucket.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/models/unit_conversion.dart';
+
+/// The parts of [periods] that overlap [bounds], clamped to it. Periods
+/// entirely outside [bounds] are dropped.
+List<DateTimeRange> clampPeriods(List<DateTimeRange> periods, DateTimeRange bounds) => [
+  for (final period in periods)
+    if (period.start.isBefore(bounds.end) && period.end.isAfter(bounds.start))
+      DateTimeRange(
+        start: period.start.isAfter(bounds.start) ? period.start : bounds.start,
+        end: period.end.isBefore(bounds.end) ? period.end : bounds.end,
+      ),
+];
+
+/// For each point, the average of all the points in the [days] preceding it.
+List<MeasurementChartEntry> movingAverage(List<MeasurementChartEntry> vals, {int days = 7}) {
+  var start = 0;
+  var end = 0;
+  final List<MeasurementChartEntry> out = <MeasurementChartEntry>[];
+
+  // first make sure our list is in ascending order, without reordering the
+  // caller's own list
+  final sorted = [...vals]..sort((a, b) => a.date.compareTo(b.date));
+
+  // The window total is carried along instead of re-summing the window for
+  // every point: with densely sampled metrics the window holds thousands of
+  // values, and re-adding them each time makes this quadratic
+  num sum = 0;
+
+  while (end < sorted.length) {
+    sum += sorted[end].value;
+
+    // since users can log measurements several days, or minutes apart,
+    // we can't make assumptions.  We have to manually advance 'start'
+    // such that it is always the first point within our desired range.
+    // posibly start == end (when there is only one point in the range)
+    final intervalStart = sorted[end].date.subtract(Duration(days: days));
+    while (start < end && sorted[start].date.isBefore(intervalStart)) {
+      sum -= sorted[start].value;
+      start++;
+    }
+
+    out.add(MeasurementChartEntry(sum / (end - start + 1), sorted[end].date));
+
+    end++;
+  }
+  return out;
+}
+
+/// Produces a smoothed trendline via an Exponential Moving Average (EMA),
+/// seeded with the first data point. A larger [period] tracks the raw values
+/// more loosely (smoother, more lag).
+List<MeasurementChartEntry> smoothedTrendline(
+  List<MeasurementChartEntry> vals, {
+  int period = 10,
+}) {
+  if (vals.isEmpty) {
+    return [];
+  }
+
+  final sorted = [...vals]..sort((a, b) => a.date.compareTo(b.date));
+  final List<MeasurementChartEntry> out = [];
+
+  // Seed the initialization layer with the first data point value
+  double currentEma = sorted[0].value.toDouble();
+  final double smoothing = 2 / (period + 1);
+
+  for (int i = 0; i < sorted.length; i++) {
+    final point = sorted[i];
+
+    if (i > 0) {
+      // EMA equation: point.weight * smoothing + ema * (1 - smoothing)
+      currentEma = (point.value * smoothing) + (currentEma * (1 - smoothing));
+    }
+
+    out.add(MeasurementChartEntry(currentEma, point.date));
+  }
+
+  return out;
+}
+
+/// Sums entries per calendar day. Used for metric types where individual
+/// samples aren't meaningful on their own (steps, distance, energy, sleep) —
+/// see MeasurementMetricType.isSummedPerDay.
+List<MeasurementChartEntry> aggregatePerDay(List<MeasurementChartEntry> vals) {
+  if (vals.isEmpty) {
+    return [];
+  }
+
+  // Bucket by the day component only (strip time-of-day).
+  final Map<DateTime, num> sums = {};
+  for (final e in vals) {
+    final day = DateTime(e.date.year, e.date.month, e.date.day);
+    sums.update(day, (existing) => existing + e.value, ifAbsent: () => e.value);
+  }
+
+  final out = sums.entries.map((e) => MeasurementChartEntry(e.value, e.key)).toList()
+    ..sort((a, b) => a.date.compareTo(b.date));
+  return out;
+}
+
+/// Averages entries per calendar day.
+///
+/// The per-day counterpart of [aggregatePerDay] for the sample metrics (body
+/// weight, heart rate), where a day's readings are repeated measurements of the
+/// same thing and adding them up would be meaningless. Used by the charts that
+/// need exactly one value per day.
+List<MeasurementChartEntry> averagePerDay(List<MeasurementChartEntry> vals) {
+  if (vals.isEmpty) {
+    return [];
+  }
+
+  final byDay = groupBy(
+    vals,
+    (MeasurementChartEntry e) => DateTime(e.date.year, e.date.month, e.date.day),
+  );
+
+  return [
+    for (final day in byDay.keys.toList()..sort())
+      MeasurementChartEntry(byDay[day]!.map((e) => e.value).average, day),
+  ];
+}
+
+/// The level a week is summarised at: its total for the summed metric types,
+/// its average for the sample ones, whose readings repeat the same measurement.
+num _weekLevel(List<MeasurementChartEntry> week, bool summed) =>
+    summed ? week.map((e) => e.value).sum : week.map((e) => e.value).average;
+
+/// Week-over-week change: one point per calendar week against the last week
+/// with readings, summarised (see [_weekLevel]) before subtracting so no single
+/// reading decides a bar. The running week of a summed metric is left out,
+/// its total is still growing and would read as a drop until Sunday.
+List<MeasurementChartEntry> weeklyDeltas(
+  List<MeasurementChartEntry> vals, {
+  bool summed = false,
+  DateTime? today,
+}) {
+  final byWeek = groupBy(vals, (MeasurementChartEntry e) => weekStart(e.date));
+  if (summed) {
+    byWeek.remove(weekStart(today ?? DateTime.now()));
+  }
+  final weeks = byWeek.keys.toList()..sort();
+
+  return [
+    for (final (index, week) in weeks.indexed.skip(1))
+      MeasurementChartEntry(
+        _weekLevel(byWeek[week]!, summed) - _weekLevel(byWeek[weeks[index - 1]]!, summed),
+        week,
+      ),
+  ];
+}
+
+// the start of a "sensible range": something relatively recent, which is most
+// relevant for the user to track their progress, but a range should always
+// include at least 5 points, and if not we chose a bigger one.
+// we return the start of the last 2 months, 4 months, or null for the full history
+DateTime? sensibleRangeStart(List<MeasurementChartEntry> entriesAll) {
+  final twoMonthsAgo = DateTime.now().subtract(const Duration(days: 61));
+  final fourMonthsAgo = DateTime.now().subtract(const Duration(days: 122));
+
+  if (entriesAll.whereDate(twoMonthsAgo, null).length > 4) {
+    return twoMonthsAgo;
+  }
+  if (entriesAll.whereDate(fourMonthsAgo, null).length > 4) {
+    return fourMonthsAgo;
+  }
+  return null;
+}
+
+// return the raw and average measurements for a "sensible range", see
+// sensibleRangeStart. [averageDays] is the window of the moving average, which
+// the category can configure.
+(List<MeasurementChartEntry>, List<MeasurementChartEntry>) sensibleRange(
+  List<MeasurementChartEntry> entriesAll, {
+  int averageDays = 7,
+}) {
+  final average = movingAverage(entriesAll, days: averageDays);
+  final start = sensibleRangeStart(entriesAll);
+
+  if (start == null) {
+    return (entriesAll, average);
+  }
+  return (entriesAll.whereDate(start, null), average.whereDate(start, null));
+}
+
+/// Turns stored entries into chart points, converting the value to [targetUnit].
+///
+/// Entries stored as a daily aggregate keep the range they summarise in
+/// `extra_data` (heart rate min/max); it is lifted onto the point so the chart
+/// draws a band around the line. Those bounds share the value's unit and are
+/// converted along with it.
+List<MeasurementChartEntry> chartEntriesFor(
+  List<MeasurementEntry> entries, {
+  required String targetUnit,
+  required String categoryUnit,
+}) => entries.map((entry) {
+  num? bound(String key) {
+    final stored = entry.extraData?[key];
+    return stored is num ? entry.boundIn(stored, targetUnit, categoryUnit: categoryUnit) : null;
+  }
+
+  return MeasurementChartEntry(
+    entry.valueIn(targetUnit, categoryUnit: categoryUnit),
+    entry.date,
+    min: bound('min'),
+    max: bound('max'),
+  );
+}).toList();
+
+/// The point level a category's chart needs.
+///
+/// Two charts are built on a calendar unit and fix it: a heatmap draws days, a
+/// week-over-week chart weeks. A distribution has no time axis and reads
+/// counted values of its own; the points it gets here are what its fallback
+/// draws when there are too few values to bin.
+MeasurementBucketLevel chartBucketLevel(MetricType metricType, ChartType chartType) =>
+    switch (metricType.resolveChartType(chartType)) {
+      ChartType.heatmap => MeasurementBucketLevel.day,
+      ChartType.delta => MeasurementBucketLevel.week,
+      // The summed types are drawn as daily totals whatever the range
+      _ => metricType.isSummedPerDay ? MeasurementBucketLevel.day : MeasurementBucketLevel.auto,
+    };
+
+/// What a chart draws over [range]: the points in it, and the moving average
+/// over them.
+///
+/// The average is computed over all of [points], which reach back beyond the
+/// range, and only then cut, so the first ones average the days before them
+/// instead of starting over at the cutoff.
+({List<MeasurementChartEntry> entries, List<MeasurementChartEntry> average}) chartSeriesFor(
+  List<MeasurementChartEntry> points,
+  ChartRange range,
+  ChartSettings settings,
+) {
+  final average = movingAverage(points, days: settings.averageWindow);
+  final cutoff = range.cutoff;
+
+  return cutoff == null
+      ? (entries: points, average: average)
+      : (entries: points.whereDate(cutoff, null), average: average.whereDate(cutoff, null));
+}
+
+/// Turns SQL-condensed buckets into chart points, converting to [targetUnit].
+///
+/// The counterpart of [chartEntriesFor] for the aggregated read path. A bucket
+/// arrives once per unit its entries were written in, so the slices are
+/// converted before they are merged. Their spread becomes the point's range,
+/// left off where it says nothing (a single reading, a [summed] total).
+List<MeasurementChartEntry> chartEntriesForBuckets(
+  List<MeasurementBucket> buckets, {
+  required String targetUnit,
+  required String categoryUnit,
+  bool summed = false,
+}) {
+  return [
+    for (final MapEntry(key: start, value: slices) in groupBy(
+      buckets,
+      (MeasurementBucket b) => b.start,
+    ).entries)
+      _mergeSlices(
+        start,
+        slices,
+        targetUnit: targetUnit,
+        categoryUnit: categoryUnit,
+        summed: summed,
+      ),
+  ];
+}
+
+/// The one point the [slices] of a bucket stand for, each converted from the
+/// unit it was written in first.
+MeasurementChartEntry _mergeSlices(
+  DateTime start,
+  List<MeasurementBucket> slices, {
+  required String targetUnit,
+  required String categoryUnit,
+  required bool summed,
+}) {
+  double convert(num value, String? from) =>
+      convertWeight(value, from: unitOrFallback(from, categoryUnit), to: targetUnit);
+
+  final readings = slices.map((s) => s.count).sum;
+  final total = slices.map((s) => convert(s.sum, s.unit)).sum;
+  if (summed) {
+    return MeasurementChartEntry(total, start, count: readings);
+  }
+
+  final value = total / readings;
+  final low = slices.map((s) => convert(s.min, s.unit)).min;
+  final high = slices.map((s) => convert(s.max, s.unit)).max;
+  final hasRange = low < value || high > value;
+
+  return MeasurementChartEntry(
+    value,
+    start,
+    min: hasRange ? low : null,
+    max: hasRange ? high : null,
+    count: readings,
+  );
+}
+
+/// The points of every component of [group], keyed by component id.
+///
+/// All components are condensed at one calendar unit, which is what lets the
+/// halves of a reading still meet on the same point.
+Map<String, List<MeasurementChartEntry>> groupComponentPoints(
+  MeasurementCategory group,
+  Map<String, List<MeasurementBucket>> buckets, {
+  DateTime? cutoff,
+}) {
+  List<MeasurementChartEntry> pointsOf(MeasurementCategory child) {
+    final points = chartEntriesForBuckets(
+      buckets[child.id] ?? const [],
+      targetUnit: child.unit,
+      categoryUnit: child.unit,
+      // A stage the night was slept in twice is that night's total, not the
+      // average of its two stretches
+      summed: child.metricType.isSummedPerDay,
+    );
+
+    return cutoff == null ? points : points.whereDate(cutoff, null);
+  }
+
+  return {for (final child in group.children) child.id!: pointsOf(child)};
+}
+
+/// The readings of a two-component group as ranges: one point per bucket,
+/// spanning from the lower component to the upper one.
+///
+/// A reading is one event, so it is drawn as a single bar (diastolic to
+/// systolic) rather than as two lines: the components belong together, and
+/// nothing was measured between two readings. An unpaired half-reading is
+/// skipped, it has no range.
+List<MeasurementChartEntry> groupRangeEntries(Map<String, List<MeasurementChartEntry>> points) {
+  final byDate = <DateTime, List<num>>{};
+  for (final component in points.values) {
+    for (final point in component) {
+      byDate.putIfAbsent(point.date, () => []).add(point.value);
+    }
+  }
+
+  return [
+    for (final MapEntry(key: date, value: values) in byDate.entries)
+      if (values.length > 1)
+        MeasurementChartEntry(
+          values.average,
+          date,
+          min: values.min,
+          max: values.max,
+        ),
+  ]..sort((a, b) => a.date.compareTo(b.date));
+}
+
+/// One line per component of a multi-value group, in the children's in-group
+/// order and named after them.
+///
+/// All components share the same range, so their lines cover the same span
+/// even when one of them has fewer readings.
+List<MeasurementChartSeries> groupComponentSeries(
+  BuildContext context,
+  MeasurementCategory group,
+  Map<String, List<MeasurementChartEntry>> points,
+) => [
+  for (final child in group.children)
+    MeasurementChartSeries(
+      points[child.id] ?? const [],
+      MeasurementSeriesRole.component,
+      label: child.displayName(context),
+    ),
+];
+
+/// The components of [group] that stack into one whole, i.e. everything but a
+/// roll-up component (see [MetricType.isGroupTotal]).
+List<MeasurementCategory> stackableComponents(MeasurementCategory group) =>
+    group.children.where((c) => !c.metricType.isGroupTotal).toList();
+
+/// One stacked bar per day for [components], stacked in the order they are
+/// given.
+///
+/// Only days that any component reported are returned; the query already
+/// summed a component's readings for the day the bar shows.
+List<MeasurementStackedEntry> groupStackedEntries(
+  List<MeasurementCategory> components,
+  Map<String, List<MeasurementChartEntry>> points,
+) {
+  final byDay = <DateTime, List<num?>>{};
+  for (final (index, child) in components.indexed) {
+    for (final point in points[child.id] ?? const <MeasurementChartEntry>[]) {
+      final values = byDay.putIfAbsent(
+        point.date,
+        () => List<num?>.filled(components.length, null),
+      );
+      values[index] = (values[index] ?? 0) + point.value;
+    }
+  }
+
+  return [
+    for (final MapEntry(key: day, value: values) in byDay.entries)
+      MeasurementStackedEntry(
+        day,
+        values,
+      ),
+  ]..sort((a, b) => a.date.compareTo(b.date));
+}
+
+/// How one reading of [group] is quoted: the roll-up total alone where there
+/// is one, otherwise the values joined the way the reading is read (a blood
+/// pressure as 120/80, largest first).
+///
+/// The one place this rule lives: the overview tile and the entries screen
+/// quote through it, so they can never disagree. [values] holds what was
+/// measured, keyed by component id; [format] renders one value.
+String quoteGroupReading(
+  MeasurementCategory group,
+  Map<String, num> values,
+  String Function(num) format,
+) {
+  final total = group.children.firstWhereOrNull((c) => c.metricType.isGroupTotal)?.id;
+  if (total != null && values.containsKey(total)) {
+    return format(values[total]!);
+  }
+  return values.values.sorted((a, b) => b.compareTo(a)).map(format).join('/');
+}
+
+/// The readings of a group, newest first: one per timestamp, with what each
+/// component holds for it.
+///
+/// Components are paired by their shared timestamp, which is how the importer
+/// and the group form write them. A reading only some components reported is
+/// kept, listing what there is: for a group whose parts are optional (a night
+/// without deep sleep) that is the normal case, not a broken pair.
+List<(DateTime, Map<String, num>)> groupReadings(
+  MeasurementCategory group,
+  List<MeasurementEntry> entries,
+) {
+  final unitOf = {for (final child in group.children) child.id!: child.unit};
+
+  // Keyed by the component id rather than by its name: the name is translated
+  // for display, and two components could carry the same one
+  final byDate = <DateTime, Map<String, num>>{};
+  for (final entry in entries) {
+    final unit = unitOf[entry.categoryId];
+    if (unit == null) {
+      continue;
+    }
+    final values = byDate.putIfAbsent(entry.date, () => {});
+    final value = entry.valueIn(unit, categoryUnit: unit);
+    values[entry.categoryId] = (values[entry.categoryId] ?? 0) + value;
+  }
+
+  return [for (final MapEntry(key: date, value: values) in byDate.entries) (date, values)]
+    ..sort((a, b) => b.$1.compareTo(a.$1));
+}
+
+/// Whether a group has anything to draw at all.
+bool groupHasData(Map<String, List<MeasurementChartEntry>> points) =>
+    points.values.any((component) => component.isNotEmpty);
+
+/// The chart [picked] resolves to, given the data it would draw.
+///
+/// On top of [MetricType.resolveChartType]'s rule that a pick has to fit the
+/// type, a distribution needs enough readings to be one: a histogram of a
+/// handful is noise with gaps, so it falls back to the derived default. The
+/// criterion lives here so every dispatch point applies it identically, or
+/// the overview card and the detail screen would draw different charts.
+///
+/// What is counted is what the histogram bins: readings for the sample types,
+/// days for the summed ones. A condensed point stands for several readings
+/// ([MeasurementChartEntry.count]), so counting points would call a hundred
+/// weigh-ins around one number too few to bin.
+ChartType resolveChartTypeForData(
+  MetricType metricType,
+  ChartType picked,
+  List<MeasurementChartEntry> raw,
+) {
+  final resolved = metricType.resolveChartType(picked);
+  if (resolved != ChartType.distribution) {
+    return resolved;
+  }
+
+  // For the summed types the histogram bins their daily totals, so a day is
+  // what counts there; everything else bins the readings themselves
+  final readings = metricType.isSummedPerDay
+      ? aggregatePerDay(raw).length
+      : raw.map((e) => e.count).sum;
+
+  return readings < distributionMinValues ? metricType.defaultChartType : resolved;
+}
+
+/// Fewest values a distribution says anything about: below this a histogram
+/// is noise with gaps, and the chart falls back to the derived default. Same
+/// principle as a group whose readings are all unpaired falling back to
+/// lines: never an empty or misleading card.
+const distributionMinValues = 15;
+
+/// Widest a histogram gets, in bins. A single outlier (a lb reading stored
+/// into a kg category) would otherwise stretch a fixed-width histogram into
+/// hundreds of near-empty bins.
+const _distributionMaxBins = 100;
+
+/// A bin width for values nothing is known about: the span split into
+/// [targetBins], rounded up to 1, 2 or 5 times a power of ten so the edges
+/// land on round numbers. For the typed metrics the maintained widths in
+/// MetricType.binWidth are used instead.
+num niceBinWidth(num min, num max, {int targetBins = 20}) {
+  final span = max - min;
+  if (span <= 0) {
+    return 1;
+  }
+
+  final raw = span / targetBins;
+  final magnitude = pow(10.0, (log(raw) / ln10).floor());
+  final normalized = raw / magnitude;
+  return (normalized <= 1
+          ? 1
+          : normalized <= 2
+          ? 2
+          : normalized <= 5
+          ? 5
+          : 10) *
+      magnitude;
+}
+
+/// A distribution: the values of a period binned by size instead of plotted
+/// over time, which is what shows the spread and the outliers.
+class MeasurementHistogram {
+  /// Lower edge of the first bin, a multiple of [binWidth] so the edges land
+  /// on round numbers (60-62, not 59.3-61.3).
+  final num firstEdge;
+
+  final num binWidth;
+
+  /// How many values each bin holds. Bins between the occupied ones are
+  /// present with a zero: a gap in the distribution is worth seeing.
+  final List<int> counts;
+
+  /// Median of the binned values.
+  final num median;
+
+  /// The newest value, i.e. where in the distribution the user is today.
+  final num latest;
+
+  const MeasurementHistogram({
+    required this.firstEdge,
+    required this.binWidth,
+    required this.counts,
+    required this.median,
+    required this.latest,
+  });
+
+  num lowerEdgeOf(int bin) => firstEdge + bin * binWidth;
+
+  num upperEdgeOf(int bin) => firstEdge + (bin + 1) * binWidth;
+}
+
+/// One value and how often it occurred.
+typedef ValueCount = ({num value, int count});
+
+/// Bins values into a histogram of [binWidth]-wide bins aligned to round
+/// boundaries; without a width (free-form categories) one is derived from the
+/// span, see [niceBinWidth].
+///
+/// Values arrive counted rather than one by one, which is how the aggregated
+/// query reads them. [latest] is where the user stands today; it cannot be
+/// derived here, since counting a value throws away when it was measured.
+///
+/// What one value stands for (a reading, a daily total) is the caller's
+/// decision, the same split as for the heatmap: the summed types distribute
+/// their days, the sample types every reading.
+MeasurementHistogram buildWeightedHistogram(
+  List<ValueCount> values, {
+  required num latest,
+  num? binWidth,
+}) {
+  assert(values.isNotEmpty, 'a histogram of nothing has no bins');
+
+  final sorted = [...values]..sort((a, b) => a.value.compareTo(b.value));
+  final minValue = sorted.first.value;
+  final maxValue = sorted.last.value;
+
+  var width = binWidth ?? niceBinWidth(minValue, maxValue);
+  // Doubling keeps the edges round, unlike recomputing a fitted width
+  while ((maxValue / width).floor() - (minValue / width).floor() >= _distributionMaxBins) {
+    width *= 2;
+  }
+
+  final firstBin = (minValue / width).floor();
+  final counts = List<int>.filled((maxValue / width).floor() - firstBin + 1, 0);
+  for (final entry in sorted) {
+    counts[(entry.value / width).floor() - firstBin] += entry.count;
+  }
+
+  return MeasurementHistogram(
+    firstEdge: firstBin * width,
+    binWidth: width,
+    counts: counts,
+    median: _weightedMedian(sorted),
+    latest: latest,
+  );
+}
+
+/// The middle value of [sorted], counting each of them as often as it occurred.
+num _weightedMedian(List<ValueCount> sorted) {
+  final total = sorted.map((e) => e.count).sum;
+  final firstHalf = _valueAt(sorted, (total - 1) ~/ 2);
+
+  return total.isOdd ? firstHalf : (firstHalf + _valueAt(sorted, total ~/ 2)) / 2;
+}
+
+num _valueAt(List<ValueCount> sorted, int index) {
+  var seen = 0;
+  for (final entry in sorted) {
+    seen += entry.count;
+    if (index < seen) {
+      return entry.value;
+    }
+  }
+  return sorted.last.value;
+}
+
+/// A calendar heatmap laid out as a grid of week columns and weekday rows,
+/// with the values it draws.
+///
+/// Days are addressed by their position in the grid, so nothing downstream has
+/// to do calendar arithmetic: column 0 row 0 is [start], which is always a
+/// Monday.
+class MeasurementHeatmapGrid {
+  /// Monday of the first (oldest) week column.
+  final DateTime start;
+
+  /// Number of week columns.
+  final int weeks;
+
+  /// Value of each day the grid shows that has one, keyed by the day at
+  /// midnight. Days outside the window are not part of this chart and are left
+  /// out, see [buildHeatmapGrid].
+  final Map<DateTime, num> values;
+
+  /// Largest value in [values], the top of the colour scale. Zero for an empty
+  /// grid, and for a history that holds nothing but zeroes.
+  final num maxValue;
+
+  const MeasurementHeatmapGrid({
+    required this.start,
+    required this.weeks,
+    required this.values,
+    required this.maxValue,
+  });
+
+  /// The day in column [week], row [weekday] (0 = Monday).
+  DateTime dayAt(int week, int weekday) =>
+      DateTime(start.year, start.month, start.day + week * 7 + weekday);
+
+  /// The value of that day, null when nothing was measured on it. That is the
+  /// distinction the chart exists for, so it is kept apart from a zero.
+  num? valueAt(int week, int weekday) => values[dayAt(week, weekday)];
+}
+
+/// Widest a heatmap gets, in week columns.
+///
+/// A year is where the grid stops being readable: 53 columns already put the
+/// cells at a few pixels each, and a history of several years would be a wall
+/// rather than a chart. The range selector above the chart can go further
+/// (all-time), so the heatmap caps itself here; the month labels along the top
+/// say which span is actually drawn.
+const heatmapMaxWeeks = 53;
+
+/// Lays [days] out as a calendar grid, newest week last.
+///
+/// Expects one entry per calendar day (see [aggregatePerDay] and
+/// [averagePerDay]). The grid ends with the current week, so a stretch without
+/// measurements at the end stays visible as empty cells; only a history that
+/// ended longer ago than the grid is wide is anchored at its own last day
+/// instead, since an empty grid shows nothing at all.
+MeasurementHeatmapGrid buildHeatmapGrid(
+  List<MeasurementChartEntry> days, {
+  int maxWeeks = heatmapMaxWeeks,
+  DateTime? today,
+}) {
+  final values = {for (final day in days) dayOf(day.date): day.value};
+  final now = dayOf(today ?? DateTime.now());
+
+  if (values.isEmpty) {
+    return MeasurementHeatmapGrid(
+      start: shiftDays(weekStart(now), -7 * (maxWeeks - 1)),
+      weeks: maxWeeks,
+      values: const {},
+      maxValue: 0,
+    );
+  }
+
+  final first = values.keys.reduce((a, b) => a.isBefore(b) ? a : b);
+  final last = values.keys.reduce((a, b) => a.isAfter(b) ? a : b);
+  final oldestVisible = shiftDays(weekStart(now), -7 * (maxWeeks - 1));
+  final end = weekStart(last).isBefore(oldestVisible) ? last : now;
+
+  final endMonday = weekStart(end);
+  final weeks = min(maxWeeks, daysBetween(weekStart(first), endMonday) ~/ 7 + 1);
+  final start = shiftDays(endMonday, -7 * (weeks - 1));
+  final lastDay = shiftDays(start, 7 * weeks - 1);
+
+  // Only the days the grid actually shows. A history longer than the grid is
+  // wide keeps its older days out of the window, and a spike among them would
+  // otherwise set the top of the colour scale without being visible itself,
+  // washing out every cell that is
+  final visible = {
+    for (final MapEntry(key: day, value: value) in values.entries)
+      if (!day.isBefore(start) && !day.isAfter(lastDay)) day: value,
+  };
+
+  return MeasurementHeatmapGrid(
+    start: start,
+    weeks: weeks,
+    values: visible,
+    maxValue: visible.isEmpty ? 0 : visible.values.max,
+  );
+}
diff --git a/lib/features/measurements/charts/range.dart b/lib/features/measurements/charts/range.dart
new file mode 100644
index 000000000..0d342f7e1
--- /dev/null
+++ b/lib/features/measurements/charts/range.dart
@@ -0,0 +1,79 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2020 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:collection/collection.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+/// The range the charts cover until the user picks another one.
+const defaultChartRange = ChartRange.lastMonth;
+
+/// Time range the user can pick to limit how far back the charts go.
+enum ChartRange {
+  all(null),
+  lastYear(365),
+  last3Months(90),
+  lastMonth(30),
+  // Six, not seven: the cutoff lands at midnight six days back, so the window
+  // is today plus the six days before it, i.e. one week of calendar days
+  lastWeek(6);
+
+  const ChartRange(this._days);
+
+  final int? _days;
+
+  /// Oldest date still shown, null for the full history.
+  DateTime? get cutoff => _days == null ? null : DateTime.now().subtract(Duration(days: _days));
+
+  /// Days read beyond [cutoff], so the moving average of the first days in
+  /// range averages the days before them instead of starting over at the
+  /// cutoff. The largest window a category can be set to, rather than its own,
+  /// so changing that setting does not invalidate the provider.
+  static final _averageLeadDays = ChartSettings.averageWindows.max;
+
+  /// Oldest entry to read from the database, null for the full history.
+  ///
+  /// Reaches [_averageLeadDays] beyond [cutoff], and is rounded down to
+  /// midnight like [countCutoff], for the same reason.
+  DateTime? get readCutoff => _atMidnight(Duration(days: _averageLeadDays));
+
+  /// Oldest entry to count, null for the full history: the range itself, with
+  /// no lead, for the queries that summarise exactly what is on screen.
+  DateTime? get countCutoff => _atMidnight(Duration.zero);
+
+  /// [cutoff] minus [lead], rounded down to midnight.
+  ///
+  /// The rounding is deliberate: these identify a provider and have to stay
+  /// the same across rebuilds, which a bound derived from the current instant
+  /// would not.
+  DateTime? _atMidnight(Duration lead) {
+    final from = cutoff?.subtract(lead);
+
+    return from == null ? null : DateTime(from.year, from.month, from.day);
+  }
+
+  /// Label for the selector, counted rather than one string per range, so a
+  /// range added here needs no new translation.
+  String label(AppLocalizations i18n) => switch (this) {
+    ChartRange.all => i18n.chartRangeAll,
+    ChartRange.lastYear => i18n.chartRangeYears(1),
+    ChartRange.last3Months => i18n.chartRangeMonths(3),
+    ChartRange.lastMonth => i18n.chartRangeMonths(1),
+    ChartRange.lastWeek => i18n.chartRangeWeeks(1),
+  };
+}
diff --git a/lib/features/measurements/charts/series.dart b/lib/features/measurements/charts/series.dart
new file mode 100644
index 000000000..de563768a
--- /dev/null
+++ b/lib/features/measurements/charts/series.dart
@@ -0,0 +1,90 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2020 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart' show DateTimeRange;
+
+/// A nutrition plan period shown for context: shaded as a vertical band in
+/// the chart, and named in the tooltip of the points it contains.
+typedef PlanPeriod = ({DateTimeRange range, String name});
+
+class MeasurementChartEntry {
+  num value;
+  DateTime date;
+
+  /// Lower and upper bound of the values [value] summarises. Set for metrics
+  /// stored as a daily aggregate (heart rate min/max); the chart then draws a
+  /// band around the line. Both are null for a plain sample.
+  num? min;
+  num? max;
+
+  /// How many readings this point stands for, which a condensed one summarises
+  /// several of. Only the distribution asks: a histogram of a handful of
+  /// readings is noise, however many points they were condensed into.
+  int count;
+
+  MeasurementChartEntry(this.value, this.date, {this.min, this.max, this.count = 1});
+
+  /// Whether this point carries a range that can be drawn as a band.
+  bool get hasRange => min != null && max != null;
+}
+
+/// What a series means, which decides how it is drawn. The colours come from
+/// the theme when the chart is built, not from the series itself.
+enum MeasurementSeriesRole {
+  /// The measured values themselves, drawn as dots.
+  raw,
+
+  /// A moving average over [raw].
+  average,
+
+  /// The smoothed trend through [raw].
+  trend,
+
+  /// One component of a multi-value metric (systolic, diastolic, ...). Every
+  /// component gets its own colour and appears in the legend by name.
+  component,
+}
+
+/// One line of a chart: its points and what they mean.
+///
+/// A chart takes a list of these, which is what lets one chart show several
+/// lines (the components of a group) instead of a single measurement.
+class MeasurementChartSeries {
+  const MeasurementChartSeries(this.entries, this.role, {this.label});
+
+  final List<MeasurementChartEntry> entries;
+  final MeasurementSeriesRole role;
+
+  /// Name for the legend and the tooltip. Null for the unnamed series of a
+  /// plain category, where the chart title already says what is shown.
+  final String? label;
+}
+
+/// One stacked bar: a day, and the value each component contributed to it.
+///
+/// [values] runs parallel to the components the chart was given, a null
+/// standing for a component that has nothing on that day.
+class MeasurementStackedEntry {
+  const MeasurementStackedEntry(this.date, this.values);
+
+  final DateTime date;
+  final List<num?> values;
+
+  /// The bar's full height, i.e. what the components add up to.
+  num get total => values.fold(0, (sum, value) => sum + (value ?? 0));
+}
diff --git a/lib/features/measurements/charts/spark.dart b/lib/features/measurements/charts/spark.dart
new file mode 100644
index 000000000..943d99f76
--- /dev/null
+++ b/lib/features/measurements/charts/spark.dart
@@ -0,0 +1,326 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/// What the spark chart of an overview tile draws: the miniature a category's
+/// chart type survives as, and the window the range filter gives it. The
+/// widgets that paint it live in `../widgets/charts/spark_charts.dart`.
+library;
+
+import 'dart:math';
+
+import 'package:collection/collection.dart';
+import 'package:wger/features/measurements/charts/calendar.dart';
+import 'package:wger/features/measurements/charts/series.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+
+/// The shapes a spark chart comes in. Fewer than the full chart types: a
+/// distribution does not survive miniaturisation and a group's structural
+/// charts (floating, stacked) are bar sparks with more than one segment.
+enum SparkKind { line, bars, delta, heatmap }
+
+/// Fewest and most week columns of a heatmap spark. The filter decides within
+/// these: below the floor a heatmap says nothing about regularity, above the
+/// cap the columns stop fitting the tile as legible cells.
+const sparkHeatmapMinWeeks = 4;
+const sparkHeatmapMaxWeeks = 16;
+
+/// Longest a bar or delta spark gets, in weekly slots. Bounds the unlimited
+/// range: a year of weeks is where the slots reach hairline width.
+const sparkMaxWeeks = 52;
+
+/// Widest window drawn as one slot per day. Beyond it the daily bars fall
+/// below legibility and the bar family switches to weekly slots.
+const sparkWeeklyThresholdDays = 35;
+
+/// Fewest points in the window before a line spark draws dots instead: a line
+/// through a handful of readings claims a continuity they do not have.
+const sparkSparseMinDays = 3;
+
+/// The spark a category of [metricType] is drawn as, honoring [picked]
+/// wherever the format survives miniaturisation.
+///
+/// A distribution has no time axis to shrink, so it falls back to the type's
+/// default spark, the same principle as `resolveChartTypeForData`'s fallback
+/// for a pick that does not fit its data.
+SparkKind sparkKindFor(MetricType metricType, ChartType picked) =>
+    switch (metricType.resolveChartType(picked)) {
+      ChartType.heatmap => SparkKind.heatmap,
+      ChartType.delta => SparkKind.delta,
+      ChartType.bar => SparkKind.bars,
+      ChartType.distribution => metricType.isSummedPerDay ? SparkKind.bars : SparkKind.line,
+      _ => SparkKind.line,
+    };
+
+/// The stretch a spark covers and how it is slotted.
+///
+/// [start] doubles as the query bound and identifies a provider, so it is
+/// always a midnight (see `ChartRange.countCutoff` for the same rule). It is
+/// null only for a full-history line, whose start follows from the data.
+class SparkWindow {
+  const SparkWindow({this.start, this.days, this.weekly = false});
+
+  final DateTime? start;
+  final int? days;
+
+  /// Whether the bars hold one week rather than one day. Weekly windows start
+  /// on a Monday, so the slots are calendar weeks.
+  final bool weekly;
+
+  /// How many slots a bar spark lays across the width.
+  int? get slotCount => days == null ? null : (weekly ? days! ~/ 7 : days);
+}
+
+/// The window a spark of [kind] draws under the range filter, whose cutoff is
+/// passed in (null for the full history).
+///
+/// The line follows the filter as it is. The bar family switches to weekly
+/// slots beyond [sparkWeeklyThresholdDays] and is capped at [sparkMaxWeeks];
+/// the heatmap follows it within its own, tighter legibility bounds. The
+/// delta window gets one slot beyond its weeks for the running week.
+SparkWindow sparkWindowFor(SparkKind kind, {required DateTime? cutoff, DateTime? today}) {
+  final now = dayOf(today ?? DateTime.now());
+  final days = cutoff == null ? null : daysBetween(dayOf(cutoff), now) + 1;
+  int weeksOf(int? days) => days == null ? sparkMaxWeeks : min(sparkMaxWeeks, (days / 7).ceil());
+
+  switch (kind) {
+    case SparkKind.heatmap:
+      final weeks = weeksOf(days).clamp(sparkHeatmapMinWeeks, sparkHeatmapMaxWeeks);
+      return SparkWindow(
+        start: shiftDays(weekStart(now), -7 * (weeks - 1)),
+        days: 7 * weeks,
+        weekly: true,
+      );
+
+    case SparkKind.delta:
+      final weeks = weeksOf(days);
+      return SparkWindow(
+        start: shiftDays(weekStart(now), -7 * weeks),
+        days: 7 * (weeks + 1),
+        weekly: true,
+      );
+
+    case SparkKind.bars:
+      if (days != null && days <= sparkWeeklyThresholdDays) {
+        return SparkWindow(start: dayOf(cutoff!), days: days);
+      }
+      final weeks = weeksOf(days);
+      return SparkWindow(
+        start: shiftDays(weekStart(now), -7 * (weeks - 1)),
+        days: 7 * weeks,
+        weekly: true,
+      );
+
+    case SparkKind.line:
+      return days == null ? const SparkWindow() : SparkWindow(start: dayOf(cutoff!), days: days);
+  }
+}
+
+/// Whether the window holds too few points for a line, see [sparkSparseMinDays].
+bool sparkIsSparse(List<MeasurementChartEntry> days) => days.length < sparkSparseMinDays;
+
+/// One point per calendar week: the mean of the week's daily values, carrying
+/// the span of everything measured in it as its range.
+///
+/// The mean rather than the sum, so a weekly bar keeps the daily level and the
+/// axis does not jump by a factor of seven when the range filter crosses the
+/// weekly threshold. The plain bars ignore the range; the floating bars draw
+/// it (a week of blood pressure readings from diastolic to systolic).
+List<MeasurementChartEntry> sparkWeeklyPoints(List<MeasurementChartEntry> days) => [
+  for (final MapEntry(key: week, value: ofWeek) in groupBy(
+    days,
+    (MeasurementChartEntry e) => weekStart(e.date),
+  ).entries)
+    MeasurementChartEntry(
+      ofWeek.map((e) => e.value).average,
+      week,
+      min: ofWeek.map((e) => e.min ?? e.value).min,
+      max: ofWeek.map((e) => e.max ?? e.value).max,
+    ),
+]..sort((a, b) => a.date.compareTo(b.date));
+
+/// One stacked bar per calendar week: per component the mean over the days it
+/// reported, so the stack keeps the height of a typical night.
+List<MeasurementStackedEntry> sparkWeeklyStacks(List<MeasurementStackedEntry> days) {
+  if (days.isEmpty) {
+    return const [];
+  }
+
+  final components = days.first.values.length;
+  return [
+    for (final MapEntry(key: week, value: ofWeek) in groupBy(
+      days,
+      (MeasurementStackedEntry e) => weekStart(e.date),
+    ).entries)
+      MeasurementStackedEntry(week, [
+        for (var component = 0; component < components; component++)
+          switch (ofWeek.map((e) => e.values[component]).nonNulls.toList()) {
+            [] => null,
+            final reported => reported.average,
+          },
+      ]),
+  ]..sort((a, b) => a.date.compareTo(b.date));
+}
+
+/// One piece of a spark bar: plain bars have one from zero, floating bars one
+/// spanning the reading, stacked bars one per component. The colour index
+/// picks the component colour and is 0 for the single-segment shapes.
+typedef SparkSegment = ({num from, num to, int colorIndex});
+
+/// One bar and the slot it sits in.
+typedef SparkBar = ({int slot, List<SparkSegment> segments});
+
+/// What a bar spark draws: [slotCount] slots across the width, of which only
+/// the measured ones hold a bar.
+class SparkBarsData {
+  final int slotCount;
+  final List<SparkBar> bars;
+
+  /// Whether the values are changes: their bars hang off a zero hairline and
+  /// point both ways.
+  final bool signed;
+
+  const SparkBarsData({required this.slotCount, required this.bars, this.signed = false});
+
+  bool get isEmpty => bars.isEmpty;
+
+  Iterable<num> get _drawn sync* {
+    for (final bar in bars) {
+      for (final segment in bar.segments) {
+        yield segment.from;
+        yield segment.to;
+      }
+    }
+  }
+
+  /// Bounds of everything drawn, including the zero line of a signed spark.
+  /// Zero for an empty spark, which is never painted.
+  num get minValue => signed ? _drawn.fold(0, (a, b) => a < b ? a : b) : _fold((a, b) => a < b);
+
+  num get maxValue => signed ? _drawn.fold(0, (a, b) => a > b ? a : b) : _fold((a, b) => a > b);
+
+  num _fold(bool Function(num, num) keepFirst) =>
+      _drawn.isEmpty ? 0 : _drawn.reduce((a, b) => keepFirst(a, b) ? a : b);
+}
+
+/// One plain bar per entry, from zero to its value, slotted per day or, with
+/// `slotDays: 7` and a Monday [start], per calendar week.
+SparkBarsData sparkBars(
+  List<MeasurementChartEntry> entries, {
+  required DateTime start,
+  required int slotCount,
+  int slotDays = 1,
+}) => SparkBarsData(
+  slotCount: slotCount,
+  bars: _slotted(
+    entries,
+    start,
+    slotDays,
+    slotCount,
+    (e) => e.date,
+    (e) => [
+      (from: 0, to: e.value, colorIndex: 0),
+    ],
+  ),
+);
+
+/// One floating bar per entry, spanning the reading's range (a blood pressure
+/// day or week from diastolic to systolic). Points without a range carry a
+/// single value and are drawn as a short bar around it.
+SparkBarsData sparkFloatingBars(
+  List<MeasurementChartEntry> ranges, {
+  required DateTime start,
+  required int slotCount,
+  int slotDays = 1,
+}) => SparkBarsData(
+  slotCount: slotCount,
+  bars: _slotted(
+    ranges,
+    start,
+    slotDays,
+    slotCount,
+    (e) => e.date,
+    (e) => [
+      (from: e.min ?? e.value, to: e.max ?? e.value, colorIndex: 0),
+    ],
+  ),
+);
+
+/// One stacked bar per entry, a segment per component in the order the
+/// entries carry them (see `groupStackedEntries`).
+SparkBarsData sparkStackedBars(
+  List<MeasurementStackedEntry> days, {
+  required DateTime start,
+  required int slotCount,
+  int slotDays = 1,
+}) {
+  List<SparkSegment> segmentsOf(MeasurementStackedEntry entry) {
+    var offset = 0.0;
+    final segments = <SparkSegment>[];
+    for (final (index, value) in entry.values.indexed) {
+      if (value == null || value <= 0) {
+        continue;
+      }
+      segments.add((from: offset, to: offset + value, colorIndex: index));
+      offset += value.toDouble();
+    }
+    return segments;
+  }
+
+  return SparkBarsData(
+    slotCount: slotCount,
+    bars: _slotted(days, start, slotDays, slotCount, (e) => e.date, segmentsOf),
+  );
+}
+
+/// One signed bar per week (see `weeklyDeltas`), hanging off the zero line.
+SparkBarsData sparkDeltaBars(
+  List<MeasurementChartEntry> deltas, {
+  required DateTime start,
+  required int slotCount,
+}) => SparkBarsData(
+  slotCount: slotCount,
+  signed: true,
+  bars: _slotted(
+    deltas,
+    start,
+    7,
+    slotCount,
+    (e) => e.date,
+    (e) => [
+      (from: 0, to: e.value, colorIndex: 0),
+    ],
+  ),
+);
+
+/// The entries laid into their slots, [slotDays] calendar days per slot;
+/// whatever falls outside the window is dropped.
+List<SparkBar> _slotted<T>(
+  List<T> entries,
+  DateTime start,
+  int slotDays,
+  int slotCount,
+  DateTime Function(T) dateOf,
+  List<SparkSegment> Function(T) segments,
+) => [
+  // Truncating division would fold the days just before the window into slot
+  // 0, so the days are bounds-checked before they become a slot
+  for (final entry in entries)
+    if (daysBetween(start, dateOf(entry)) case final days
+        when days >= 0 && days ~/ slotDays < slotCount)
+      (slot: days ~/ slotDays, segments: segments(entry)),
+];
diff --git a/lib/features/measurements/measurements.dart b/lib/features/measurements/measurements.dart
index d4b7636fa..1c554b96f 100644
--- a/lib/features/measurements/measurements.dart
+++ b/lib/features/measurements/measurements.dart
@@ -18,7 +18,7 @@
 
 import 'package:wger/core/consts.dart';
 import 'package:wger/core/date.dart';
-import 'package:wger/features/measurements/widgets/charts.dart';
+import 'package:wger/features/measurements/charts/series.dart';
 
 extension MeasurementChartEntryListExtensions on List<MeasurementChartEntry> {
   List<MeasurementChartEntry> whereDate(DateTime start, DateTime? end) {
diff --git a/lib/features/measurements/models/measurement_bucket.dart b/lib/features/measurements/models/measurement_bucket.dart
new file mode 100644
index 000000000..dfa6de090
--- /dev/null
+++ b/lib/features/measurements/models/measurement_bucket.dart
@@ -0,0 +1,106 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/// Points a chart is condensed to. Plotting more than the chart has pixels
+/// only overdraws: a season of raw heart rate samples is tens of thousands of
+/// values on a few hundred pixels, and comes out as a solid block.
+const measurementChartMaxPoints = 200;
+
+/// Calendar units a category's entries are condensed into, finest first.
+///
+/// The calendar rather than equal slices of the span: these metrics have a
+/// daily rhythm, so slices that do not line up with a day each catch a
+/// different phase of it and the chart oscillates at the slice frequency.
+enum MeasurementBucketUnit {
+  /// One bucket per entry, i.e. no condensing.
+  entry,
+  hour,
+  day,
+  week,
+  month,
+}
+
+/// The level a chart wants its points at.
+///
+/// Only [auto] is free to pick from the whole ladder; the others exist because
+/// the chart itself is built on a calendar unit and coarser points would draw
+/// a grid of the wrong cells.
+enum MeasurementBucketLevel {
+  /// The finest unit that keeps the series under the point limit.
+  auto,
+
+  /// One point per calendar day, whatever the point count.
+  day,
+
+  /// One point per calendar week (starting Monday).
+  week,
+}
+
+/// How often one value occurred, the histogram's counterpart to a bucket.
+///
+/// Grouped by the unit it was entered in for the same reason: the value still
+/// goes through the conversion helper before it is binned.
+class MeasurementValueCount {
+  const MeasurementValueCount({
+    required this.value,
+    required this.unit,
+    required this.count,
+    required this.newest,
+  });
+
+  final num value;
+  final String? unit;
+  final int count;
+
+  /// Newest entry holding this value, so the histogram can mark where the user
+  /// stands today.
+  final DateTime newest;
+}
+
+/// One calendar bucket of a category's entries, as SQLite aggregated it.
+///
+/// Grouped by bucket *and* by the unit the values were entered in, so a
+/// category holding mixed units yields one bucket per unit and the caller
+/// converts each before merging them.
+class MeasurementBucket {
+  const MeasurementBucket({
+    required this.start,
+    required this.unit,
+    required this.count,
+    required this.sum,
+    required this.min,
+    required this.max,
+  });
+
+  /// Start of the bucket in the local zone; the entry's own timestamp at the
+  /// [MeasurementBucketUnit.entry] level.
+  final DateTime start;
+
+  /// Unit the values in it were entered in (`extra_data.unit`), null when they
+  /// carry none and the category unit applies.
+  final String? unit;
+
+  final int count;
+  final num sum;
+
+  /// Lowest and highest value the bucket stands for. A daily aggregate
+  /// contributes its stored bounds rather than its value, so condensing one
+  /// keeps the true extremes.
+  final num min;
+  final num max;
+}
diff --git a/lib/features/measurements/models/measurement_category.dart b/lib/features/measurements/models/measurement_category.dart
index 3dd72751e..f1254b046 100644
--- a/lib/features/measurements/models/measurement_category.dart
+++ b/lib/features/measurements/models/measurement_category.dart
@@ -17,13 +17,492 @@
  */
 
 import 'package:drift/drift.dart' hide JsonKey;
+import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:wger/core/exceptions/no_such_entry_exception.dart';
+import 'package:powersync/powersync.dart' as ps;
 import 'package:wger/database/powersync/database.dart';
-import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
 
 part 'measurement_category.freezed.dart';
 
+/// Namespace of the derived category ids.
+///
+/// MUST stay identical to CATEGORY_NAMESPACE on the server: a UUIDv5 hashes
+/// namespace and name together, so a different constant here derives different
+/// ids and the whole point of [deterministicCategoryId] collapses.
+const categoryIdNamespace = '4c5ef6dd-97c9-5b18-9f8b-2a5c1ed70a2f';
+
+/// The id the category of [metricType] has for the user [userId].
+///
+/// A typed category is the one place its metric lives, but the app creates it
+/// while offline, so two devices would otherwise produce two rows for the same
+/// metric. Deriving the id makes both arrive at the same one, and the server
+/// acknowledges the second push as a no-op instead of rejecting it against its
+/// uniqueness constraint.
+String deterministicCategoryId(String userId, MetricType metricType) =>
+    ps.uuid.v5(categoryIdNamespace, '$userId:${metricType.wireValue}');
+
+/// Largest value the server's column can hold (numeric(8, 2)). It is what a
+/// category without a metric type is bounded by, since nothing about a
+/// free-form category says more.
+const measurementSchemaMaxValue = 999999.99;
+
+/// The range a measurement value of one metric type may be in.
+///
+/// [min] and [max] are what the API enforces, a value outside them comes back
+/// as a 400. [softMin] and [softMax] are the everyday range, meant for warnings
+/// and chart axes; nothing enforces them.
+class MetricLimits {
+  final num min;
+  final num max;
+  final num? softMin;
+  final num? softMax;
+
+  const MetricLimits(this.min, this.max, [this.softMin, this.softMax]);
+
+  bool contains(num value) => value >= min && value <= max;
+}
+
+/// Chart a category is drawn as.
+///
+/// The wire values mirror the server's ChartType, where the override is a
+/// nullable column: [ChartType.auto] is that null, i.e. "derive the chart from
+/// the metric type", which is what every category does unless the user picked
+/// something else. Only the shapes that are a matter of taste are offered; a
+/// floating bar (two components) and a stacked bar (a summed group) follow from
+/// what the group is and are not choices.
+enum ChartType {
+  auto(null),
+  line('line'),
+  bar('bar'),
+  heatmap('heatmap'),
+  delta('delta'),
+  distribution('distribution');
+
+  final String? wireValue;
+  const ChartType(this.wireValue);
+
+  /// Looks up an enum case by its Django wire value.
+  ///
+  /// Defaults to [ChartType.auto] for an unknown value, which is what keeps a
+  /// chart type added after this release from leaving the chart blank.
+  static ChartType fromWire(String? value) => ChartType.values.firstWhere(
+    (e) => e.wireValue == value,
+    orElse: () => ChartType.auto,
+  );
+}
+
+/// How closely the trend line follows the values, as the EMA period it maps to.
+///
+/// Stored as the character rather than the number, so the periods stay tunable
+/// without touching what users configured.
+enum TrendCharacter {
+  reactive('reactive', 5),
+  balanced('balanced', 10),
+  sluggish('sluggish', 20);
+
+  final String wireValue;
+  final int emaPeriod;
+  const TrendCharacter(this.wireValue, this.emaPeriod);
+
+  /// Falls back to [TrendCharacter.balanced], which is the unconfigured chart.
+  static TrendCharacter fromWire(Object? value) => TrendCharacter.values.firstWhere(
+    (e) => e.wireValue == value,
+    orElse: () => TrendCharacter.balanced,
+  );
+}
+
+extension MeasurementTrendCharacterL10n on TrendCharacter {
+  /// Localized human-readable label for the picker.
+  String localized(BuildContext context) {
+    final l10n = AppLocalizations.of(context);
+    return switch (this) {
+      TrendCharacter.reactive => l10n.trendReactive,
+      TrendCharacter.balanced => l10n.trendBalanced,
+      TrendCharacter.sluggish => l10n.trendSluggish,
+    };
+  }
+}
+
+/// The taste-level chart settings of a category, resolved.
+///
+/// One object rather than one parameter per setting: the charts take it as a
+/// whole, so a setting added here reaches them without touching a signature.
+/// The defaults are what an unconfigured category is drawn with.
+class ChartSettings {
+  /// Windows the moving average may be computed over, in days.
+  static const averageWindows = [7, 14, 30];
+
+  final TrendCharacter trend;
+
+  /// Window the moving average covers, in days
+  final int averageWindow;
+
+  const ChartSettings({
+    this.trend = TrendCharacter.balanced,
+    this.averageWindow = 7,
+  });
+
+  /// Reads the settings out of a stored `chart_config`.
+  ///
+  /// A value this release does not know, and a missing object, fall back to
+  /// the default, the same rule an unfitting [ChartType] follows.
+  factory ChartSettings.fromConfig(Map<String, dynamic>? config) {
+    final window = config?['average_window'];
+
+    return ChartSettings(
+      trend: TrendCharacter.fromWire(config?['trend']),
+      averageWindow: window is int && averageWindows.contains(window)
+          ? window
+          : averageWindows.first,
+    );
+  }
+}
+
+extension MeasurementChartTypeL10n on ChartType {
+  /// Localized human-readable label for the picker.
+  String localized(BuildContext context) {
+    final l10n = AppLocalizations.of(context);
+    return switch (this) {
+      ChartType.auto => l10n.chartTypeAuto,
+      ChartType.line => l10n.chartTypeLine,
+      ChartType.bar => l10n.chartTypeBar,
+      ChartType.heatmap => l10n.chartTypeHeatmap,
+      ChartType.delta => l10n.chartTypeDelta,
+      ChartType.distribution => l10n.chartTypeDistribution,
+    };
+  }
+}
+
+/// The wire values mirror the Django API field names (e.g., 'body_weight', 'heart_rate'),
+enum MetricType {
+  custom('custom'),
+  bodyWeight('body_weight'),
+  bodyFat('body_fat'),
+  leanBodyMass('lean_body_mass'),
+  height('height'),
+  bloodPressure('blood_pressure'),
+  bloodPressureSystolic('blood_pressure_systolic'),
+  bloodPressureDiastolic('blood_pressure_diastolic'),
+  heartRate('heart_rate'),
+  restingHeartRate('resting_heart_rate'),
+  bloodOxygen('blood_oxygen'),
+  steps('steps'),
+  distance('distance'),
+  energy('energy'),
+  sleep('sleep'),
+  sleepTotal('sleep_total'),
+  sleepLight('sleep_light'),
+  sleepDeep('sleep_deep'),
+  sleepRem('sleep_rem'),
+  sleepAwake('sleep_awake');
+
+  final String wireValue;
+  const MetricType(this.wireValue);
+
+  /// Looks up an enum case by its Django wire value.
+  ///
+  /// Defaults to [MetricType.custom] if the value is not recognized.
+  static MetricType fromWire(String value) => MetricType.values.firstWhere(
+    (e) => e.wireValue == value,
+    orElse: () => MetricType.custom,
+  );
+
+  /// `true` for metric types that should be aggregated per-day and shown as
+  /// a bar/histogram instead of a raw-sample line chart.
+  bool get isSummedPerDay => switch (this) {
+    MetricType.steps ||
+    MetricType.distance ||
+    MetricType.energy ||
+    MetricType.sleep ||
+    MetricType.sleepTotal ||
+    MetricType.sleepLight ||
+    MetricType.sleepDeep ||
+    MetricType.sleepRem ||
+    MetricType.sleepAwake => true,
+    _ => false,
+  };
+
+  /// The chart a category of this type is drawn as when the user picked none.
+  ///
+  /// Summed types are one value per day and are drawn as that day's bar,
+  /// everything else is a series of samples and gets the line chart. A group
+  /// has no default here: its chart follows from what its components are to
+  /// each other, see buildGroupChart.
+  ChartType get defaultChartType => isSummedPerDay ? ChartType.bar : ChartType.line;
+
+  /// The chart types a category of this type may be drawn as, i.e. what the
+  /// picker offers on top of [ChartType.auto].
+  ///
+  /// The alternatives fit every leaf type: the heatmap answers how regularly
+  /// rather than how much, and is the only chart of the set where a missing
+  /// day is visible instead of being spanned by a line; the delta chart
+  /// answers which way it is going, which a line only implies; the
+  /// distribution answers what is normal and what is an outlier, which no
+  /// chart over time shows. A group is left out, its chart is structural
+  /// rather than a preference.
+  List<ChartType> get availableChartTypes => isGroup
+      ? const []
+      : [defaultChartType, ChartType.heatmap, ChartType.delta, ChartType.distribution];
+
+  /// The chart a category of this type is drawn as, given what the user picked.
+  ///
+  /// A pick that does not fit the type falls back to the derived default
+  /// instead of being refused: the server stores the string without judging it,
+  /// so this is also what keeps a category configured on a newer client from
+  /// showing nothing here.
+  ChartType resolveChartType(ChartType picked) =>
+      availableChartTypes.contains(picked) ? picked : defaultChartType;
+
+  /// `true` for metric types that are reserved for the official categories
+  /// the server manages: users cannot create categories of these types.
+  bool get isOfficial => switch (this) {
+    MetricType.bodyWeight => true,
+    _ => false,
+  };
+
+  /// The components of the multi-value metric types, in group order. Mirrors
+  /// GROUP_COMPONENTS on the server.
+  static const _groupComponents = <MetricType, List<MetricType>>{
+    MetricType.bloodPressure: [
+      MetricType.bloodPressureSystolic,
+      MetricType.bloodPressureDiastolic,
+    ],
+    // The total is a component of its own because a group carries no
+    // measurements. It is not the sum of the three stages below it: platforms
+    // also report sleep without a stage breakdown, which counts towards the
+    // total and has no stage category to live in
+    MetricType.sleep: [
+      MetricType.sleepTotal,
+      MetricType.sleepLight,
+      MetricType.sleepDeep,
+      MetricType.sleepRem,
+      MetricType.sleepAwake,
+    ],
+  };
+
+  /// `true` for a container type whose readings live in its components, e.g.
+  /// blood pressure. A group category never carries entries of its own.
+  bool get isGroup => _groupComponents.containsKey(this);
+
+  /// `true` for one component of a group, e.g. systolic. Components exist
+  /// only as children of their group and are not offered when creating a
+  /// category.
+  bool get isComponent => _groupComponents.values.any((c) => c.contains(this));
+
+  /// The components of this group, in group order; empty for every other type
+  List<MetricType> get components => _groupComponents[this] ?? const [];
+
+  /// `true` for the types a user can pick when creating a category. Body
+  /// weight is the server's, a component comes with its group, and a custom
+  /// category is not picked but described.
+  bool get isPickable => !isOfficial && !isComponent && this != MetricType.custom;
+
+  /// Stable, non-localized name the category of this type is created under.
+  ///
+  /// Users see [localized] instead, this is what ends up in the database. Both
+  /// the server and the health importer create their categories under the same
+  /// names, so whoever gets there first, the row looks the same.
+  String get canonicalName => switch (this) {
+    MetricType.custom => '',
+    MetricType.bodyWeight => 'Weight',
+    MetricType.bodyFat => 'Body fat',
+    MetricType.leanBodyMass => 'Lean body mass',
+    MetricType.height => 'Height',
+    MetricType.bloodPressure => 'Blood pressure',
+    MetricType.bloodPressureSystolic => 'Systolic',
+    MetricType.bloodPressureDiastolic => 'Diastolic',
+    MetricType.heartRate => 'Heart rate',
+    MetricType.restingHeartRate => 'Resting heart rate',
+    MetricType.bloodOxygen => 'Blood oxygen',
+    MetricType.steps => 'Steps',
+    MetricType.distance => 'Distance',
+    MetricType.energy => 'Energy',
+    MetricType.sleep => 'Sleep',
+    MetricType.sleepTotal => 'Total sleep',
+    MetricType.sleepLight => 'Light sleep',
+    MetricType.sleepDeep => 'Deep sleep',
+    MetricType.sleepRem => 'REM sleep',
+    MetricType.sleepAwake => 'Awake',
+  };
+
+  /// Unit the values of this type are stored in, empty for a free-form
+  /// category, whose unit the user gives it.
+  ///
+  /// [limits] is keyed by type alone, so this is the unit those bounds mean.
+  /// Body weight is the exception: it is also stored in lb, and its category
+  /// follows the profile.
+  String get defaultUnit => switch (this) {
+    MetricType.custom => '',
+    MetricType.bodyWeight || MetricType.leanBodyMass => 'kg',
+    MetricType.bodyFat || MetricType.bloodOxygen => '%',
+    MetricType.height => 'cm',
+    MetricType.bloodPressure ||
+    MetricType.bloodPressureSystolic ||
+    MetricType.bloodPressureDiastolic => 'mmHg',
+    MetricType.heartRate || MetricType.restingHeartRate => 'bpm',
+    // A step count is a bare number, not a quantity in some unit
+    MetricType.steps => '',
+    MetricType.distance => 'km',
+    MetricType.energy => 'kcal',
+    MetricType.sleep ||
+    MetricType.sleepTotal ||
+    MetricType.sleepLight ||
+    MetricType.sleepDeep ||
+    MetricType.sleepRem ||
+    MetricType.sleepAwake => 'min',
+  };
+
+  /// `true` for the component that rolls its siblings up instead of being one
+  /// part next to them. Total sleep already covers the stages beside it, so a
+  /// stacked chart has to leave it out or it counts every night twice.
+  bool get isGroupTotal => this == MetricType.sleepTotal;
+
+  /// `true` for the types whose category id is derived instead of random,
+  /// see [deterministicCategoryId]. Body weight is excluded: the server
+  /// creates that category itself and the app looks it up by [isOfficial].
+  bool get hasDeterministicId => this != MetricType.custom && this != MetricType.bodyWeight;
+
+  /// `true` for metric types whose charts show nutrition plan periods for
+  /// context. Custom categories are typically hand-kept body measurements
+  /// (waist, biceps), so they qualify; the typed health metrics do not.
+  bool get correlatesWithNutrition => switch (this) {
+    MetricType.bodyWeight ||
+    MetricType.bodyFat ||
+    MetricType.leanBodyMass ||
+    MetricType.custom => true,
+    _ => false,
+  };
+
+  /// The range a value of this type may be in, in the unit the type is stored
+  /// in. Body weight is the only one that comes in more than one unit, so it is
+  /// the only one [unit] matters for.
+  ///
+  /// MUST stay identical to METRIC_LIMITS on the server: this is the copy the
+  /// app validates against while offline, and a value the app accepts but the
+  /// server does not is rejected permanently on push. Bounds may therefore be
+  /// widened over releases, never tightened.
+  MetricLimits limits([String? unit]) => switch (this) {
+    MetricType.bodyWeight =>
+      unit == 'lb' ? const MetricLimits(44, 770, 66, 661) : const MetricLimits(20, 350, 30, 300),
+    MetricType.bodyFat => const MetricLimits(2, 60, 5, 50),
+    // Always below the body weight it is part of, so the floor can sit lower
+    MetricType.leanBodyMass => const MetricLimits(10, 250, 30, 90),
+    MetricType.height => const MetricLimits(50, 250, 140, 210),
+    MetricType.bloodPressureSystolic => const MetricLimits(50, 250, 90, 180),
+    MetricType.bloodPressureDiastolic => const MetricLimits(30, 150, 50, 110),
+    MetricType.heartRate => const MetricLimits(30, 250, 40, 200),
+    MetricType.restingHeartRate => const MetricLimits(30, 120, 40, 100),
+    // A saturation cannot exceed 100 %, and the floor is deliberately far
+    // below what a pulse oximeter still displays
+    MetricType.bloodOxygen => const MetricLimits(50, 100, 90, 100),
+    // The cumulative types hold a whole day, and a rest day really is 0 steps
+    MetricType.steps => const MetricLimits(0, 100000, 0, 30000),
+    MetricType.distance => const MetricLimits(0, 500, 0, 30),
+    MetricType.energy => const MetricLimits(0, 10000, 0, 2000),
+    // Sleep is stored in minutes, so the upper bound is not a rarity but
+    // arithmetic: a day has 1440 of them
+    MetricType.sleepTotal => const MetricLimits(0, 1440, 180, 720),
+    MetricType.sleepLight ||
+    MetricType.sleepDeep ||
+    MetricType.sleepRem ||
+    MetricType.sleepAwake => const MetricLimits(0, 1440, 0, 720),
+    // Free-form categories, and the group containers, which carry no
+    // measurements at all
+    _ => const MetricLimits(0, measurementSchemaMaxValue),
+  };
+
+  /// Most decimals a value of this type is shown with at a glance: the tile
+  /// hero, its chips and the group rows. Detail screens, forms and tooltips
+  /// keep the stored value.
+  ///
+  /// Follows the resolution the metric is measured at, like [binWidth]: a
+  /// pulse has no meaningful tenths, a body weight does, and a short walk
+  /// needs its hundredths of a kilometre. Durations never ask, they are read
+  /// as hours and minutes.
+  int get displayDecimals => switch (this) {
+    MetricType.bodyWeight ||
+    MetricType.leanBodyMass ||
+    MetricType.bodyFat ||
+    MetricType.custom => 1,
+    MetricType.distance => 2,
+    _ => 0,
+  };
+
+  /// Width of one distribution-histogram bin, in the unit the type is stored
+  /// in. Body weight is the only type that comes in more than one unit, so it
+  /// is the only one [unit] matters for. Null for the types nothing is known
+  /// about (free-form categories, and the groups, which are never drawn as a
+  /// distribution): their width is derived from the data instead.
+  ///
+  /// Fixed per type rather than computed (Freedman-Diaconis and friends):
+  /// a computed width changes with every range switch, which makes two looks
+  /// at the same category incomparable, and it lands on edges like 0.73 kg
+  /// where a maintained table lands on round ones.
+  ///
+  /// MUST stay identical to BIN_WIDTHS in react, or the same category bins
+  /// differently per client.
+  num? binWidth([String? unit]) => switch (this) {
+    MetricType.bodyWeight => unit == 'lb' ? 1 : 0.5,
+    MetricType.bodyFat => 0.5,
+    MetricType.leanBodyMass => 0.5,
+    MetricType.height => 1,
+    MetricType.bloodPressureSystolic || MetricType.bloodPressureDiastolic => 5,
+    MetricType.heartRate => 2,
+    MetricType.restingHeartRate => 1,
+    MetricType.bloodOxygen => 1,
+    MetricType.steps => 1000,
+    MetricType.distance => 1,
+    MetricType.energy => 100,
+    MetricType.sleepTotal => 30,
+    MetricType.sleepLight ||
+    MetricType.sleepDeep ||
+    MetricType.sleepRem ||
+    MetricType.sleepAwake => 15,
+    _ => null,
+  };
+}
+
+extension MeasurementMetricTypeL10n on MetricType {
+  /// Localized human-readable label (e.g., "Body Weight", "Heart Rate").
+  String localized(BuildContext context) {
+    final l10n = AppLocalizations.of(context);
+    return switch (this) {
+      MetricType.custom => l10n.metricCustom,
+      MetricType.bodyWeight => l10n.metricBodyWeight,
+      MetricType.bodyFat => l10n.metricBodyFat,
+      MetricType.leanBodyMass => l10n.metricLeanBodyMass,
+      MetricType.height => l10n.metricHeight,
+      MetricType.bloodPressure => l10n.metricBloodPressure,
+      MetricType.bloodPressureSystolic => l10n.metricBloodPressureSystolic,
+      MetricType.bloodPressureDiastolic => l10n.metricBloodPressureDiastolic,
+      MetricType.heartRate => l10n.metricHeartRate,
+      MetricType.restingHeartRate => l10n.metricRestingHeartRate,
+      MetricType.bloodOxygen => l10n.metricBloodOxygen,
+      MetricType.steps => l10n.metricSteps,
+      MetricType.distance => l10n.metricDistance,
+      MetricType.energy => l10n.metricEnergy,
+      MetricType.sleep => l10n.metricSleep,
+      MetricType.sleepTotal => l10n.metricSleepTotal,
+      MetricType.sleepLight => l10n.metricSleepLight,
+      MetricType.sleepDeep => l10n.metricSleepDeep,
+      MetricType.sleepRem => l10n.metricSleepRem,
+      MetricType.sleepAwake => l10n.metricSleepAwake,
+    };
+  }
+}
+
+extension MeasurementCategoryDisplay on MeasurementCategory {
+  /// Name to show the user.
+  ///
+  /// A typed category is created by the server or by the health importer and
+  /// carries an English name ("Systolic", "Deep sleep"), while its metric type
+  /// already has a translated label. Only a free-form category holds a name
+  /// the user picked themselves.
+  String displayName(BuildContext context) =>
+      metricType == MetricType.custom ? name : metricType.localized(context);
+}
+
 @freezed
 class MeasurementCategory with _$MeasurementCategory {
   /// Inclusive upper bound for [name]
@@ -42,22 +521,108 @@ class MeasurementCategory with _$MeasurementCategory {
   @override
   final String unit;
 
+  /// Drives the health-platform mapping (and, later, default unit/aggregation/
+  /// chart). [MetricType.custom] for plain user-created categories.
   @override
-  final List<MeasurementEntry> entries;
+  final MetricType metricType;
+
+  /// Chart the user picked for this category, [ChartType.auto] (the server's
+  /// null) for the one derived from [metricType].
+  @override
+  final ChartType chartType;
+
+  /// Taste-level chart settings, read through [chartSettings].
+  ///
+  /// Null for a category that configured none, which is also what a row synced
+  /// before the column existed reads. Keys this release does not know are
+  /// kept: another client may have written them, and a write from here
+  /// replaces the whole object.
+  @override
+  final Map<String, dynamic>? chartConfig;
+
+  /// Multi-value groups (e.g. blood pressure): id of the parent category, one
+  /// child per component. Max. one level of nesting; only leaf categories
+  /// (no children) carry entries.
+  @override
+  final String? parentId;
+
+  /// Position in the category list; for children, the position within the group
+  @override
+  final int order;
+
+  /// Server-managed official category (max. one per metric type and user).
+  /// The app never creates official categories itself.
+  @override
+  final bool isOfficial;
+
+  /// Child categories (components) of this group. Populated by the repository
+  /// for display, never persisted directly.
+  @override
+  final List<MeasurementCategory> children;
 
   MeasurementCategory({
     this.id,
     this.name = '',
     this.unit = '',
-    this.entries = const [],
+    this.metricType = MetricType.custom,
+    this.chartType = ChartType.auto,
+    this.chartConfig,
+    this.parentId,
+    this.order = 0,
+    this.isOfficial = false,
+    this.children = const [],
   });
 
-  MeasurementEntry findEntryById(String id) {
-    return entries.firstWhere(
-      (entry) => entry.id == id,
-      orElse: () => throw const NoSuchEntryException(),
-    );
-  }
+  /// Maps a row of the local database. Rows synced before the 2.7 schema
+  /// change lack the new columns and read as NULL; they fall back to the
+  /// defaults until the full re-sync replaces them.
+  MeasurementCategory.fromDb({
+    required String id,
+    required String name,
+    required String unit,
+    required ChartType chartType,
+    MetricType? metricType,
+    Map<String, dynamic>? chartConfig,
+    String? parentId,
+    int? order,
+    bool? isOfficial,
+  }) : this(
+         id: id,
+         name: name,
+         unit: unit,
+         metricType: metricType ?? MetricType.custom,
+         chartType: chartType,
+         chartConfig: chartConfig,
+         parentId: parentId,
+         order: order ?? 0,
+         isOfficial: isOfficial ?? false,
+       );
+
+  /// How this category is drawn, beyond the chart type: see [ChartSettings].
+  ChartSettings get chartSettings => ChartSettings.fromConfig(chartConfig);
+
+  /// A copy with one chart setting changed, keeping the keys this release does
+  /// not know: a write replaces the whole object.
+  MeasurementCategory withChartSetting(String key, Object value) =>
+      copyWith(chartConfig: {...?chartConfig, key: value});
+
+  /// `true` for group parents (blood pressure etc.), which hold no entries of
+  /// their own. Answers for this row: a group whose components have not synced
+  /// yet has none, unlike the structural [MetricType.isGroup].
+  bool get hasChildren => children.isNotEmpty;
+
+  /// The user's body weight category. It has its own screens (weight feature)
+  /// and is hidden from the general measurements UI.
+  bool get isOfficialBodyWeight => isOfficial && metricType == MetricType.bodyWeight;
+
+  /// Whether the category form has anything to offer for this category.
+  ///
+  /// A free-form one owns its name and unit, a typed leaf can still be drawn
+  /// differently, and a group has neither: its name and unit come from the
+  /// metric type and its chart from what its components are to each other.
+  bool get isEditable =>
+      metricType == MetricType.custom ||
+      (!hasChildren && metricType.availableChartTypes.isNotEmpty);
 
   // Boilerplate
   MeasurementCategoryTableCompanion toCompanion() {
@@ -65,6 +630,12 @@ class MeasurementCategory with _$MeasurementCategory {
       id: id != null ? Value(id!) : const Value.absent(),
       name: Value(name),
       unit: Value(unit),
+      metricType: Value(metricType),
+      chartType: Value(chartType),
+      chartConfig: Value(chartConfig),
+      parentId: Value(parentId),
+      order: Value(order),
+      isOfficial: Value(isOfficial),
     );
   }
 }
diff --git a/lib/features/measurements/models/measurement_category.freezed.dart b/lib/features/measurements/models/measurement_category.freezed.dart
index 4d6754060..4b3a254d5 100644
--- a/lib/features/measurements/models/measurement_category.freezed.dart
+++ b/lib/features/measurements/models/measurement_category.freezed.dart
@@ -15,7 +15,25 @@ T _$identity<T>(T value) => value;
 mixin _$MeasurementCategory {
 
 /// Client-generated UUID, is `null` only before the first persist
- String? get id; String get name; String get unit; List<MeasurementEntry> get entries;
+ String? get id; String get name; String get unit;/// Drives the health-platform mapping (and, later, default unit/aggregation/
+/// chart). [MetricType.custom] for plain user-created categories.
+ MetricType get metricType;/// Chart the user picked for this category, [ChartType.auto] (the server's
+/// null) for the one derived from [metricType].
+ ChartType get chartType;/// Taste-level chart settings, read through [chartSettings].
+///
+/// Null for a category that configured none, which is also what a row synced
+/// before the column existed reads. Keys this release does not know are
+/// kept: another client may have written them, and a write from here
+/// replaces the whole object.
+ Map<String, dynamic>? get chartConfig;/// Multi-value groups (e.g. blood pressure): id of the parent category, one
+/// child per component. Max. one level of nesting; only leaf categories
+/// (no children) carry entries.
+ String? get parentId;/// Position in the category list; for children, the position within the group
+ int get order;/// Server-managed official category (max. one per metric type and user).
+/// The app never creates official categories itself.
+ bool get isOfficial;/// Child categories (components) of this group. Populated by the repository
+/// for display, never persisted directly.
+ List<MeasurementCategory> get children;
 /// Create a copy of MeasurementCategory
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -26,16 +44,16 @@ $MeasurementCategoryCopyWith<MeasurementCategory> get copyWith => _$MeasurementC
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is MeasurementCategory&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.unit, unit) || other.unit == unit)&&const DeepCollectionEquality().equals(other.entries, entries));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is MeasurementCategory&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.unit, unit) || other.unit == unit)&&(identical(other.metricType, metricType) || other.metricType == metricType)&&(identical(other.chartType, chartType) || other.chartType == chartType)&&const DeepCollectionEquality().equals(other.chartConfig, chartConfig)&&(identical(other.parentId, parentId) || other.parentId == parentId)&&(identical(other.order, order) || other.order == order)&&(identical(other.isOfficial, isOfficial) || other.isOfficial == isOfficial)&&const DeepCollectionEquality().equals(other.children, children));
 }
 
 
 @override
-int get hashCode => Object.hash(runtimeType,id,name,unit,const DeepCollectionEquality().hash(entries));
+int get hashCode => Object.hash(runtimeType,id,name,unit,metricType,chartType,const DeepCollectionEquality().hash(chartConfig),parentId,order,isOfficial,const DeepCollectionEquality().hash(children));
 
 @override
 String toString() {
-  return 'MeasurementCategory(id: $id, name: $name, unit: $unit, entries: $entries)';
+  return 'MeasurementCategory(id: $id, name: $name, unit: $unit, metricType: $metricType, chartType: $chartType, chartConfig: $chartConfig, parentId: $parentId, order: $order, isOfficial: $isOfficial, children: $children)';
 }
 
 
@@ -46,7 +64,7 @@ abstract mixin class $MeasurementCategoryCopyWith<$Res>  {
   factory $MeasurementCategoryCopyWith(MeasurementCategory value, $Res Function(MeasurementCategory) _then) = _$MeasurementCategoryCopyWithImpl;
 @useResult
 $Res call({
- String? id, String name, String unit, List<MeasurementEntry> entries
+ String? id, String name, String unit, MetricType metricType, ChartType chartType, Map<String, dynamic>? chartConfig, String? parentId, int order, bool isOfficial, List<MeasurementCategory> children
 });
 
 
@@ -63,13 +81,19 @@ class _$MeasurementCategoryCopyWithImpl<$Res>
 
 /// Create a copy of MeasurementCategory
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = freezed,Object? name = null,Object? unit = null,Object? entries = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = freezed,Object? name = null,Object? unit = null,Object? metricType = null,Object? chartType = null,Object? chartConfig = freezed,Object? parentId = freezed,Object? order = null,Object? isOfficial = null,Object? children = null,}) {
   return _then(MeasurementCategory(
 id: freezed == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String?,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
 as String,unit: null == unit ? _self.unit : unit // ignore: cast_nullable_to_non_nullable
-as String,entries: null == entries ? _self.entries : entries // ignore: cast_nullable_to_non_nullable
-as List<MeasurementEntry>,
+as String,metricType: null == metricType ? _self.metricType : metricType // ignore: cast_nullable_to_non_nullable
+as MetricType,chartType: null == chartType ? _self.chartType : chartType // ignore: cast_nullable_to_non_nullable
+as ChartType,chartConfig: freezed == chartConfig ? _self.chartConfig : chartConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,parentId: freezed == parentId ? _self.parentId : parentId // ignore: cast_nullable_to_non_nullable
+as String?,order: null == order ? _self.order : order // ignore: cast_nullable_to_non_nullable
+as int,isOfficial: null == isOfficial ? _self.isOfficial : isOfficial // ignore: cast_nullable_to_non_nullable
+as bool,children: null == children ? _self.children : children // ignore: cast_nullable_to_non_nullable
+as List<MeasurementCategory>,
   ));
 }
 
diff --git a/lib/features/measurements/models/measurement_entry.dart b/lib/features/measurements/models/measurement_entry.dart
index 2d5e8f636..8e3128ef7 100644
--- a/lib/features/measurements/models/measurement_entry.dart
+++ b/lib/features/measurements/models/measurement_entry.dart
@@ -24,9 +24,6 @@ part 'measurement_entry.freezed.dart';
 
 @freezed
 class MeasurementEntry with _$MeasurementEntry {
-  static const minValue = 0;
-  static const maxValue = 1000;
-
   /// Client-generated UUID, is `null` only before the first persist
   @override
   final String? id;
@@ -43,14 +40,57 @@ class MeasurementEntry with _$MeasurementEntry {
   @override
   final String notes;
 
+  /// Origin of the reading; one of the server's `source` values
+  /// (`user`, `google`, `apple`).
+  @override
+  final String source;
+
+  /// Platform record UUID, used to deduplicate re-imports. `null` for manual
+  /// entries.
+  @override
+  final String? externalId;
+
+  /// Per-entry metadata (server JSONField). The `unit` key holds the unit
+  /// [value] was entered in; without it the category unit applies. Raw values
+  /// are meaningless without their unit, so display and calculations go
+  /// through `valueIn` instead of reading [value] directly.
+  @override
+  final Map<String, dynamic>? extraData;
+
   MeasurementEntry({
     this.id,
     required this.categoryId,
     required this.date,
     required this.value,
     required this.notes,
+    this.source = 'user',
+    this.externalId,
+    this.extraData,
   });
 
+  /// Maps a row of the local database. Rows synced before the 2.7 schema
+  /// change lack the new columns and read as NULL; they fall back to the
+  /// defaults until the full re-sync replaces them.
+  MeasurementEntry.fromDb({
+    required String id,
+    required String categoryId,
+    required DateTime date,
+    required double value,
+    required String notes,
+    String? source,
+    String? externalId,
+    Map<String, dynamic>? extraData,
+  }) : this(
+         id: id,
+         categoryId: categoryId,
+         date: date,
+         value: value,
+         notes: notes,
+         source: source ?? 'user',
+         externalId: externalId,
+         extraData: extraData,
+       );
+
   // Boilerplate
   MeasurementEntryTableCompanion toCompanion() {
     return MeasurementEntryTableCompanion(
@@ -59,6 +99,9 @@ class MeasurementEntry with _$MeasurementEntry {
       date: Value(date),
       value: Value(value.toDouble()),
       notes: Value(notes),
+      source: Value(source),
+      externalId: Value(externalId),
+      extraData: Value(extraData),
     );
   }
 }
diff --git a/lib/features/measurements/models/measurement_entry.freezed.dart b/lib/features/measurements/models/measurement_entry.freezed.dart
index e4423aa6a..2d3e66044 100644
--- a/lib/features/measurements/models/measurement_entry.freezed.dart
+++ b/lib/features/measurements/models/measurement_entry.freezed.dart
@@ -15,7 +15,15 @@ T _$identity<T>(T value) => value;
 mixin _$MeasurementEntry {
 
 /// Client-generated UUID, is `null` only before the first persist
- String? get id; String get categoryId; DateTime get date; num get value; String get notes;
+ String? get id; String get categoryId; DateTime get date; num get value; String get notes;/// Origin of the reading; one of the server's `source` values
+/// (`user`, `google`, `apple`).
+ String get source;/// Platform record UUID, used to deduplicate re-imports. `null` for manual
+/// entries.
+ String? get externalId;/// Per-entry metadata (server JSONField). The `unit` key holds the unit
+/// [value] was entered in; without it the category unit applies. Raw values
+/// are meaningless without their unit, so display and calculations go
+/// through `valueIn` instead of reading [value] directly.
+ Map<String, dynamic>? get extraData;
 /// Create a copy of MeasurementEntry
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -26,16 +34,16 @@ $MeasurementEntryCopyWith<MeasurementEntry> get copyWith => _$MeasurementEntryCo
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is MeasurementEntry&&(identical(other.id, id) || other.id == id)&&(identical(other.categoryId, categoryId) || other.categoryId == categoryId)&&(identical(other.date, date) || other.date == date)&&(identical(other.value, value) || other.value == value)&&(identical(other.notes, notes) || other.notes == notes));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is MeasurementEntry&&(identical(other.id, id) || other.id == id)&&(identical(other.categoryId, categoryId) || other.categoryId == categoryId)&&(identical(other.date, date) || other.date == date)&&(identical(other.value, value) || other.value == value)&&(identical(other.notes, notes) || other.notes == notes)&&(identical(other.source, source) || other.source == source)&&(identical(other.externalId, externalId) || other.externalId == externalId)&&const DeepCollectionEquality().equals(other.extraData, extraData));
 }
 
 
 @override
-int get hashCode => Object.hash(runtimeType,id,categoryId,date,value,notes);
+int get hashCode => Object.hash(runtimeType,id,categoryId,date,value,notes,source,externalId,const DeepCollectionEquality().hash(extraData));
 
 @override
 String toString() {
-  return 'MeasurementEntry(id: $id, categoryId: $categoryId, date: $date, value: $value, notes: $notes)';
+  return 'MeasurementEntry(id: $id, categoryId: $categoryId, date: $date, value: $value, notes: $notes, source: $source, externalId: $externalId, extraData: $extraData)';
 }
 
 
@@ -46,7 +54,7 @@ abstract mixin class $MeasurementEntryCopyWith<$Res>  {
   factory $MeasurementEntryCopyWith(MeasurementEntry value, $Res Function(MeasurementEntry) _then) = _$MeasurementEntryCopyWithImpl;
 @useResult
 $Res call({
- String? id, String categoryId, DateTime date, num value, String notes
+ String? id, String categoryId, DateTime date, num value, String notes, String source, String? externalId, Map<String, dynamic>? extraData
 });
 
 
@@ -63,14 +71,17 @@ class _$MeasurementEntryCopyWithImpl<$Res>
 
 /// Create a copy of MeasurementEntry
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = freezed,Object? categoryId = null,Object? date = null,Object? value = null,Object? notes = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = freezed,Object? categoryId = null,Object? date = null,Object? value = null,Object? notes = null,Object? source = null,Object? externalId = freezed,Object? extraData = freezed,}) {
   return _then(MeasurementEntry(
 id: freezed == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String?,categoryId: null == categoryId ? _self.categoryId : categoryId // ignore: cast_nullable_to_non_nullable
 as String,date: null == date ? _self.date : date // ignore: cast_nullable_to_non_nullable
 as DateTime,value: null == value ? _self.value : value // ignore: cast_nullable_to_non_nullable
 as num,notes: null == notes ? _self.notes : notes // ignore: cast_nullable_to_non_nullable
-as String,
+as String,source: null == source ? _self.source : source // ignore: cast_nullable_to_non_nullable
+as String,externalId: freezed == externalId ? _self.externalId : externalId // ignore: cast_nullable_to_non_nullable
+as String?,extraData: freezed == extraData ? _self.extraData : extraData // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,
   ));
 }
 
diff --git a/lib/features/measurements/models/unit_conversion.dart b/lib/features/measurements/models/unit_conversion.dart
new file mode 100644
index 000000000..13c7ed1da
--- /dev/null
+++ b/lib/features/measurements/models/unit_conversion.dart
@@ -0,0 +1,66 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+
+// Mirror the server's constants (wger/utils/units.py) so both sides round to
+// the same two-decimal results.
+const _lbPerKg = 2.20462262;
+const _kgPerLb = 0.45359237;
+
+/// Units the app can convert between. Anything else (custom category units)
+/// is a plain label and values pass through unchanged.
+const convertibleUnits = {'kg', 'lb'};
+
+/// The canonical unit weight values are displayed in for the profile setting.
+/// Use `weightUnit` from the chart helpers for the localized label.
+String weightDisplayUnit(bool isMetric) => isMetric ? 'kg' : 'lb';
+
+/// Converts [value] from [from] to [to] (kg/lb, quantized to two decimals like
+/// the server's `Measurement.value_in`). Non-convertible units pass through.
+double convertWeight(num value, {required String from, required String to}) {
+  if (from == to || !convertibleUnits.contains(from) || !convertibleUnits.contains(to)) {
+    return value.toDouble();
+  }
+  final converted = from == 'kg' ? value * _lbPerKg : value * _kgPerLb;
+  return (converted * 100).roundToDouble() / 100;
+}
+
+/// The unit a value was entered in: [stored], falling back to [categoryUnit]
+/// when it is absent or empty (same chain as the server).
+String unitOrFallback(Object? stored, String categoryUnit) =>
+    stored is String && stored.isNotEmpty ? stored : categoryUnit;
+
+extension MeasurementEntryUnit on MeasurementEntry {
+  /// The unit this entry's value was entered in.
+  String unitOrFallbackFor(String categoryUnit) => unitOrFallback(extraData?['unit'], categoryUnit);
+
+  /// The entry's value in [targetUnit]. The single way to read a measurement
+  /// value for display or calculation; a category can hold mixed units, so
+  /// the raw value alone is meaningless.
+  double valueIn(String targetUnit, {required String categoryUnit}) {
+    return convertWeight(value, from: unitOrFallbackFor(categoryUnit), to: targetUnit);
+  }
+
+  /// A number stored in `extra_data` next to [value] in [targetUnit], such as
+  /// the bounds of a daily aggregate. They are written in the value's unit, so
+  /// they have to follow it through the same conversion.
+  double boundIn(num bound, String targetUnit, {required String categoryUnit}) {
+    return convertWeight(bound, from: unitOrFallbackFor(categoryUnit), to: targetUnit);
+  }
+}
diff --git a/lib/features/weight/providers/body_weight_notifier.dart b/lib/features/measurements/providers/body_weight_provider.dart
similarity index 51%
rename from lib/features/weight/providers/body_weight_notifier.dart
rename to lib/features/measurements/providers/body_weight_provider.dart
index d39f53c45..d6c84369a 100644
--- a/lib/features/weight/providers/body_weight_notifier.dart
+++ b/lib/features/measurements/providers/body_weight_provider.dart
@@ -16,36 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:wger/features/weight/models/weight_entry.dart';
-
-import 'body_weight_repository.dart';
-
-part 'body_weight_notifier.g.dart';
-
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+
+part 'body_weight_provider.g.dart';
+
+/// The user's official body weight category.
+///
+/// The category is created by the server (registration / data migration) and
+/// only arrives via sync; a `null` value means the initial sync has not
+/// delivered it yet. Mutations go through `measurementProvider`'s notifier,
+/// its readings through the aggregated queries, which take its id from here.
+///
+/// Selected by its type in the query rather than picked out of every category
+/// afterwards: it has no fixed id, the server assigns it.
 @riverpod
-final class WeightEntryNotifier extends _$WeightEntryNotifier {
-  final _logger = Logger('WeightEntryNotifier');
-  late BodyWeightRepository _repo;
-
-  @override
-  Stream<List<WeightEntry>> build() {
-    _repo = ref.read(bodyWeightRepositoryProvider);
-    _logger.finer('Building WeightEntryNotifier');
-
-    return _repo.watchAllDrift();
-  }
-
-  Future<void> deleteEntry(String id) async {
-    await _repo.deleteLocalDrift(id);
-  }
-
-  Future<void> updateEntry(WeightEntry entry) async {
-    await _repo.updateLocalDrift(entry);
-  }
-
-  Future<void> addEntry(WeightEntry entry) async {
-    await _repo.addLocalDrift(entry);
-  }
+Stream<MeasurementCategory?> bodyWeightCategoryOnly(Ref ref) {
+  return ref.read(measurementRepositoryProvider).watchOfficialBodyWeightCategory();
 }
diff --git a/lib/features/measurements/providers/body_weight_provider.g.dart b/lib/features/measurements/providers/body_weight_provider.g.dart
new file mode 100644
index 000000000..abaafb063
--- /dev/null
+++ b/lib/features/measurements/providers/body_weight_provider.g.dart
@@ -0,0 +1,77 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'body_weight_provider.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint, type=warning
+/// The user's official body weight category.
+///
+/// The category is created by the server (registration / data migration) and
+/// only arrives via sync; a `null` value means the initial sync has not
+/// delivered it yet. Mutations go through `measurementProvider`'s notifier,
+/// its readings through the aggregated queries, which take its id from here.
+///
+/// Selected by its type in the query rather than picked out of every category
+/// afterwards: it has no fixed id, the server assigns it.
+
+@ProviderFor(bodyWeightCategoryOnly)
+final bodyWeightCategoryOnlyProvider = BodyWeightCategoryOnlyProvider._();
+
+/// The user's official body weight category.
+///
+/// The category is created by the server (registration / data migration) and
+/// only arrives via sync; a `null` value means the initial sync has not
+/// delivered it yet. Mutations go through `measurementProvider`'s notifier,
+/// its readings through the aggregated queries, which take its id from here.
+///
+/// Selected by its type in the query rather than picked out of every category
+/// afterwards: it has no fixed id, the server assigns it.
+
+final class BodyWeightCategoryOnlyProvider
+    extends
+        $FunctionalProvider<
+          AsyncValue<MeasurementCategory?>,
+          MeasurementCategory?,
+          Stream<MeasurementCategory?>
+        >
+    with $FutureModifier<MeasurementCategory?>, $StreamProvider<MeasurementCategory?> {
+  /// The user's official body weight category.
+  ///
+  /// The category is created by the server (registration / data migration) and
+  /// only arrives via sync; a `null` value means the initial sync has not
+  /// delivered it yet. Mutations go through `measurementProvider`'s notifier,
+  /// its readings through the aggregated queries, which take its id from here.
+  ///
+  /// Selected by its type in the query rather than picked out of every category
+  /// afterwards: it has no fixed id, the server assigns it.
+  BodyWeightCategoryOnlyProvider._()
+    : super(
+        from: null,
+        argument: null,
+        retry: null,
+        name: r'bodyWeightCategoryOnlyProvider',
+        isAutoDispose: true,
+        dependencies: null,
+        $allTransitiveDependencies: null,
+      );
+
+  @override
+  String debugGetCreateSourceHash() => _$bodyWeightCategoryOnlyHash();
+
+  @$internal
+  @override
+  $StreamProviderElement<MeasurementCategory?> $createElement(
+    $ProviderPointer pointer,
+  ) => $StreamProviderElement(pointer);
+
+  @override
+  Stream<MeasurementCategory?> create(Ref ref) {
+    return bodyWeightCategoryOnly(ref);
+  }
+}
+
+String _$bodyWeightCategoryOnlyHash() => r'4da2ba139461e391f146b0a3d51e59a82c28afe3';
diff --git a/lib/features/measurements/providers/chart_range_setting.dart b/lib/features/measurements/providers/chart_range_setting.dart
new file mode 100644
index 000000000..bda7f6c52
--- /dev/null
+++ b/lib/features/measurements/providers/chart_range_setting.dart
@@ -0,0 +1,68 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'dart:async';
+
+import 'package:collection/collection.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:wger/core/app_settings_notifier.dart';
+import 'package:wger/core/consts.dart';
+import 'package:wger/features/measurements/charts/range.dart';
+
+part 'chart_range_setting.g.dart';
+
+/// The time range the measurement charts cover, shared by the overview, the
+/// category detail screens and the weight screen: a pick follows the user
+/// through them instead of every screen starting over at its own default,
+/// and it is persisted
+///
+/// keepAlive on purpose: autoDispose would reset the pick whenever no screen
+/// is listening for a moment (a tab switch), which is exactly the surprise
+/// this provider removes.
+@Riverpod(keepAlive: true)
+class ChartRangeSetting extends _$ChartRangeSetting {
+  /// Whether the user picked a range this session: their pick wins over the
+  /// stored one arriving late.
+  bool _picked = false;
+
+  @override
+  ChartRange build() {
+    unawaited(_load());
+    return defaultChartRange;
+  }
+
+  /// The stored pick, applied once it is read; a value this release does not
+  /// know (or none) leaves the default.
+  Future<void> _load() async {
+    // Read the accessor before the first await: the provider may be disposed
+    // by the time the value arrives (widget tests tear the container down)
+    final prefs = ref.read(appSettingsPrefsProvider);
+    final stored = await prefs.getString(PREFS_CHART_RANGE);
+    final range = ChartRange.values.firstWhereOrNull((r) => r.name == stored);
+    if (ref.mounted && range != null && !_picked) {
+      state = range;
+    }
+  }
+
+  void set(ChartRange range) {
+    _picked = true;
+    state = range;
+    // Fire and forget: the pick applies immediately, nothing waits on disk
+    unawaited(ref.read(appSettingsPrefsProvider).setString(PREFS_CHART_RANGE, range.name));
+  }
+}
diff --git a/lib/features/measurements/providers/chart_range_setting.g.dart b/lib/features/measurements/providers/chart_range_setting.g.dart
new file mode 100644
index 000000000..a12ee23d3
--- /dev/null
+++ b/lib/features/measurements/providers/chart_range_setting.g.dart
@@ -0,0 +1,94 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'chart_range_setting.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint, type=warning
+/// The time range the measurement charts cover, shared by the overview, the
+/// category detail screens and the weight screen: a pick follows the user
+/// through them instead of every screen starting over at its own default,
+/// and it is persisted
+///
+/// keepAlive on purpose: autoDispose would reset the pick whenever no screen
+/// is listening for a moment (a tab switch), which is exactly the surprise
+/// this provider removes.
+
+@ProviderFor(ChartRangeSetting)
+final chartRangeSettingProvider = ChartRangeSettingProvider._();
+
+/// The time range the measurement charts cover, shared by the overview, the
+/// category detail screens and the weight screen: a pick follows the user
+/// through them instead of every screen starting over at its own default,
+/// and it is persisted
+///
+/// keepAlive on purpose: autoDispose would reset the pick whenever no screen
+/// is listening for a moment (a tab switch), which is exactly the surprise
+/// this provider removes.
+final class ChartRangeSettingProvider extends $NotifierProvider<ChartRangeSetting, ChartRange> {
+  /// The time range the measurement charts cover, shared by the overview, the
+  /// category detail screens and the weight screen: a pick follows the user
+  /// through them instead of every screen starting over at its own default,
+  /// and it is persisted
+  ///
+  /// keepAlive on purpose: autoDispose would reset the pick whenever no screen
+  /// is listening for a moment (a tab switch), which is exactly the surprise
+  /// this provider removes.
+  ChartRangeSettingProvider._()
+    : super(
+        from: null,
+        argument: null,
+        retry: null,
+        name: r'chartRangeSettingProvider',
+        isAutoDispose: false,
+        dependencies: null,
+        $allTransitiveDependencies: null,
+      );
+
+  @override
+  String debugGetCreateSourceHash() => _$chartRangeSettingHash();
+
+  @$internal
+  @override
+  ChartRangeSetting create() => ChartRangeSetting();
+
+  /// {@macro riverpod.override_with_value}
+  Override overrideWithValue(ChartRange value) {
+    return $ProviderOverride(
+      origin: this,
+      providerOverride: $SyncValueProvider<ChartRange>(value),
+    );
+  }
+}
+
+String _$chartRangeSettingHash() => r'1baa3a7e0c1a7643fa93631c51f8f3672b54e30f';
+
+/// The time range the measurement charts cover, shared by the overview, the
+/// category detail screens and the weight screen: a pick follows the user
+/// through them instead of every screen starting over at its own default,
+/// and it is persisted
+///
+/// keepAlive on purpose: autoDispose would reset the pick whenever no screen
+/// is listening for a moment (a tab switch), which is exactly the surprise
+/// this provider removes.
+
+abstract class _$ChartRangeSetting extends $Notifier<ChartRange> {
+  ChartRange build();
+  @$mustCallSuper
+  @override
+  WhenComplete runBuild() {
+    final ref = this.ref as $Ref<ChartRange, ChartRange>;
+    final element =
+        ref.element
+            as $ClassProviderElement<
+              AnyNotifier<ChartRange, ChartRange>,
+              ChartRange,
+              Object?,
+              Object?
+            >;
+    return element.handleCreate(ref, build);
+  }
+}
diff --git a/lib/features/measurements/providers/measurement_notifier.dart b/lib/features/measurements/providers/measurement_notifier.dart
index 8c8f6471f..f3d0a6675 100644
--- a/lib/features/measurements/providers/measurement_notifier.dart
+++ b/lib/features/measurements/providers/measurement_notifier.dart
@@ -20,9 +20,9 @@
  * Riverpod notifier for measurement entries backed by Drift.
  */
 
-import 'package:collection/collection.dart';
-import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:wger/core/network/auth_credentials_storage.dart';
+import 'package:wger/features/measurements/models/measurement_bucket.dart';
 import 'package:wger/features/measurements/models/measurement_category.dart';
 import 'package:wger/features/measurements/models/measurement_entry.dart';
 
@@ -30,34 +30,112 @@ import 'measurement_repository.dart';
 
 part 'measurement_notifier.g.dart';
 
+/// All categories with their children.
+///
+/// The one place the screens read categories from. What they draw on top of
+/// them comes from the aggregated queries and the paged lists below, never
+/// from a category itself, which is why none of these carries entries.
 @riverpod
-final class MeasurementNotifier extends _$MeasurementNotifier {
-  final _logger = Logger('MeasurementNotifier');
+Stream<List<MeasurementCategory>> measurementCategories(Ref ref) {
+  return ref.read(measurementRepositoryProvider).watchAllWithoutEntries();
+}
 
-  late MeasurementRepository _repo;
+/// One page of a category's entries, newest first.
+@riverpod
+Stream<List<MeasurementEntry>> measurementEntriesPage(Ref ref, String categoryId, int limit) {
+  return ref.read(measurementRepositoryProvider).watchEntries(categoryId, limit: limit);
+}
 
-  @override
-  Stream<List<MeasurementCategory>> build() {
-    _repo = ref.read(measurementRepositoryProvider);
-    _logger.finer('Building stream');
+/// One page of the entries of a group's components, newest first, out of which
+/// the readings are paired.
+@riverpod
+Stream<List<MeasurementEntry>> measurementGroupEntriesPage(Ref ref, String parentId, int limit) {
+  return ref.read(measurementRepositoryProvider).watchGroupEntries(parentId, limit: limit);
+}
 
-    return _repo.watchAll();
-  }
+/// The newest entry of every category, keyed by category id.
+///
+/// For the rows that show a last known value next to a chart of a shorter
+/// range: widening the chart's range to reach the value would materialise
+/// every entry in between.
+@riverpod
+Stream<Map<String, MeasurementEntry>> latestMeasurementEntries(Ref ref) {
+  return ref.read(measurementRepositoryProvider).watchLatestEntries();
+}
 
-  Stream<MeasurementCategory?> watchCategoryById(String id) {
-    _logger.finer('Watching local measurement category $id');
-    return _repo.watchLocalDriftCategoryById(id);
-  }
+/// The chart points of one category, condensed by SQLite.
+///
+/// Kept apart from the category streams, which hand over the entries
+/// themselves. [level] is what the chart in question needs, see
+/// `chartBucketLevel`; [until] is exclusive and bounds a chart that shows a
+/// closed period rather than everything up to today.
+@riverpod
+Stream<List<MeasurementBucket>> measurementChartBuckets(
+  Ref ref,
+  String categoryId,
+  DateTime? since,
+  DateTime? until,
+  MeasurementBucketLevel level,
+) {
+  return ref
+      .read(measurementRepositoryProvider)
+      .watchEntryBuckets(categoryId, since: since, until: until, level: level);
+}
 
-  Future<MeasurementCategory?> getCategoryById(String id) async {
-    // Data already loaded
-    final categories = state.asData?.value;
-    if (categories != null) {
-      return categories.firstWhereOrNull((c) => c.id == id);
-    }
+/// The chart points of a group's components, keyed by component id.
+///
+/// One query for the whole group, and one calendar unit: a component condensed
+/// on its own would put the halves of a reading in different buckets.
+@riverpod
+Stream<Map<String, List<MeasurementBucket>>> measurementGroupBuckets(
+  Ref ref,
+  String parentId,
+  DateTime? since,
+  MeasurementBucketLevel level,
+) {
+  return ref
+      .read(measurementRepositoryProvider)
+      .watchGroupBuckets(parentId, since: since, level: level);
+}
 
-    // Read from DB
-    return _repo.watchLocalDriftCategoryById(id).first;
+/// One point per day and category, keyed by category id.
+///
+/// For the calendar, which marks the days something was measured on rather
+/// than the single readings.
+@riverpod
+Stream<Map<String, List<MeasurementBucket>>> measurementDailyBuckets(Ref ref) {
+  return ref.read(measurementRepositoryProvider).watchDailyBuckets();
+}
+
+/// How often each value of a category occurred, for the histogram.
+@riverpod
+Stream<List<MeasurementValueCount>> measurementValueCounts(
+  Ref ref,
+  String categoryId,
+  DateTime? since,
+  bool summedPerDay,
+) {
+  return ref
+      .read(measurementRepositoryProvider)
+      .watchValueCounts(categoryId, since: since, summedPerDay: summedPerDay);
+}
+
+/// One category with its children, null while it does not exist (or no longer
+/// does).
+@riverpod
+Stream<MeasurementCategory?> measurementCategory(Ref ref, String id) {
+  return ref.read(measurementRepositoryProvider).watchCategoryWithoutEntries(id);
+}
+
+/// Writing side of the measurements: what the screens read is watched through
+/// the providers above, which this only changes the data of.
+@riverpod
+final class MeasurementNotifier extends _$MeasurementNotifier {
+  late MeasurementRepository _repo;
+
+  @override
+  void build() {
+    _repo = ref.read(measurementRepositoryProvider);
   }
 
   Future<void> deleteEntry(String id) async {
@@ -72,6 +150,12 @@ final class MeasurementNotifier extends _$MeasurementNotifier {
     await _repo.addLocalDrift(entry);
   }
 
+  /// Adds one reading of a multi-value group (one entry per component,
+  /// persisted atomically).
+  Future<void> addGroupEntries(List<MeasurementEntry> entries) async {
+    await _repo.addLocalDriftGroupEntries(entries);
+  }
+
   // --- MeasurementCategory operations (delegated to repository) ---
   Future<void> deleteCategory(String id) async {
     await _repo.deleteLocalDriftCategory(id);
@@ -81,7 +165,58 @@ final class MeasurementNotifier extends _$MeasurementNotifier {
     await _repo.updateLocalDriftCategory(category);
   }
 
-  Future<void> addCategory(MeasurementCategory category) async {
-    await _repo.addLocalDriftCategory(category);
+  /// Adds a category, and its components when it is a group. Returns the id it
+  /// was created under, null for a free-form one, where the database assigns it.
+  ///
+  /// A typed category takes the id derived from user and metric type (see
+  /// [deterministicCategoryId]) instead of a random one, so that a category
+  /// created here and the same one created on another device converge on one
+  /// row rather than colliding with the server's uniqueness constraint.
+  Future<String?> addCategory(MeasurementCategory category) async {
+    final userId = await ref.read(authCredentialsStorageProvider).dbOwnerUserId();
+    if (userId == null || !category.metricType.hasDeterministicId) {
+      await _repo.addLocalDriftCategory(category);
+      return category.id;
+    }
+
+    final parent = category.copyWith(
+      id: category.id ?? deterministicCategoryId(userId, category.metricType),
+    );
+
+    // A group is a container, its readings live in one child per component.
+    // The server creates them as well, on the same ids, so whichever side
+    // gets there first wins and the other is acknowledged as a no-op
+    await _repo.addLocalDriftCategoryGroup([
+      parent,
+      for (final (order, metricType) in parent.metricType.components.indexed)
+        MeasurementCategory(
+          id: deterministicCategoryId(userId, metricType),
+          name: metricType.canonicalName,
+          unit: metricType.defaultUnit,
+          metricType: metricType,
+          parentId: parent.id,
+          order: order,
+        ),
+    ]);
+    return parent.id;
+  }
+
+  /// Moves the category at [oldIndex] of [categories] to [newIndex] and
+  /// persists the resulting order.
+  ///
+  /// The list is passed in rather than derived here, so the indices are the
+  /// ones of the list the user dragged in. It holds the top-level categories
+  /// only: children of multi-value groups keep their in-group order, and the
+  /// official body weight category is hidden from the sort screen.
+  Future<void> setCategoryOrder(
+    List<MeasurementCategory> categories,
+    int oldIndex,
+    int newIndex,
+  ) async {
+    final reordered = [...categories];
+    final moved = reordered.removeAt(oldIndex);
+    reordered.insert(newIndex, moved);
+
+    await _repo.reorderCategories([for (final c in reordered) c.id!]);
   }
 }
diff --git a/lib/features/measurements/providers/measurement_notifier.g.dart b/lib/features/measurements/providers/measurement_notifier.g.dart
index 598a5a4c9..3585dbf07 100644
--- a/lib/features/measurements/providers/measurement_notifier.g.dart
+++ b/lib/features/measurements/providers/measurement_notifier.g.dart
@@ -8,12 +8,783 @@ part of 'measurement_notifier.dart';
 
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint, type=warning
+/// All categories with their children.
+///
+/// The one place the screens read categories from. What they draw on top of
+/// them comes from the aggregated queries and the paged lists below, never
+/// from a category itself, which is why none of these carries entries.
+
+@ProviderFor(measurementCategories)
+final measurementCategoriesProvider = MeasurementCategoriesProvider._();
+
+/// All categories with their children.
+///
+/// The one place the screens read categories from. What they draw on top of
+/// them comes from the aggregated queries and the paged lists below, never
+/// from a category itself, which is why none of these carries entries.
+
+final class MeasurementCategoriesProvider
+    extends
+        $FunctionalProvider<
+          AsyncValue<List<MeasurementCategory>>,
+          List<MeasurementCategory>,
+          Stream<List<MeasurementCategory>>
+        >
+    with $FutureModifier<List<MeasurementCategory>>, $StreamProvider<List<MeasurementCategory>> {
+  /// All categories with their children.
+  ///
+  /// The one place the screens read categories from. What they draw on top of
+  /// them comes from the aggregated queries and the paged lists below, never
+  /// from a category itself, which is why none of these carries entries.
+  MeasurementCategoriesProvider._()
+    : super(
+        from: null,
+        argument: null,
+        retry: null,
+        name: r'measurementCategoriesProvider',
+        isAutoDispose: true,
+        dependencies: null,
+        $allTransitiveDependencies: null,
+      );
+
+  @override
+  String debugGetCreateSourceHash() => _$measurementCategoriesHash();
+
+  @$internal
+  @override
+  $StreamProviderElement<List<MeasurementCategory>> $createElement(
+    $ProviderPointer pointer,
+  ) => $StreamProviderElement(pointer);
+
+  @override
+  Stream<List<MeasurementCategory>> create(Ref ref) {
+    return measurementCategories(ref);
+  }
+}
+
+String _$measurementCategoriesHash() => r'0fbe4c5b49eed79ffe307763e0fec417a5899356';
+
+/// One page of a category's entries, newest first.
+
+@ProviderFor(measurementEntriesPage)
+final measurementEntriesPageProvider = MeasurementEntriesPageFamily._();
+
+/// One page of a category's entries, newest first.
+
+final class MeasurementEntriesPageProvider
+    extends
+        $FunctionalProvider<
+          AsyncValue<List<MeasurementEntry>>,
+          List<MeasurementEntry>,
+          Stream<List<MeasurementEntry>>
+        >
+    with $FutureModifier<List<MeasurementEntry>>, $StreamProvider<List<MeasurementEntry>> {
+  /// One page of a category's entries, newest first.
+  MeasurementEntriesPageProvider._({
+    required MeasurementEntriesPageFamily super.from,
+    required (String, int) super.argument,
+  }) : super(
+         retry: null,
+         name: r'measurementEntriesPageProvider',
+         isAutoDispose: true,
+         dependencies: null,
+         $allTransitiveDependencies: null,
+       );
+
+  @override
+  String debugGetCreateSourceHash() => _$measurementEntriesPageHash();
+
+  @override
+  String toString() {
+    return r'measurementEntriesPageProvider'
+        ''
+        '$argument';
+  }
+
+  @$internal
+  @override
+  $StreamProviderElement<List<MeasurementEntry>> $createElement(
+    $ProviderPointer pointer,
+  ) => $StreamProviderElement(pointer);
+
+  @override
+  Stream<List<MeasurementEntry>> create(Ref ref) {
+    final argument = this.argument as (String, int);
+    return measurementEntriesPage(ref, argument.$1, argument.$2);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is MeasurementEntriesPageProvider && other.argument == argument;
+  }
+
+  @override
+  int get hashCode {
+    return argument.hashCode;
+  }
+}
+
+String _$measurementEntriesPageHash() => r'6c0e572a7fee33e5905441299d9ed23fcb5b83e2';
+
+/// One page of a category's entries, newest first.
+
+final class MeasurementEntriesPageFamily extends $Family
+    with $FunctionalFamilyOverride<Stream<List<MeasurementEntry>>, (String, int)> {
+  MeasurementEntriesPageFamily._()
+    : super(
+        retry: null,
+        name: r'measurementEntriesPageProvider',
+        dependencies: null,
+        $allTransitiveDependencies: null,
+        isAutoDispose: true,
+      );
+
+  /// One page of a category's entries, newest first.
+
+  MeasurementEntriesPageProvider call(String categoryId, int limit) =>
+      MeasurementEntriesPageProvider._(
+        argument: (categoryId, limit),
+        from: this,
+      );
+
+  @override
+  String toString() => r'measurementEntriesPageProvider';
+}
+
+/// One page of the entries of a group's components, newest first, out of which
+/// the readings are paired.
+
+@ProviderFor(measurementGroupEntriesPage)
+final measurementGroupEntriesPageProvider = MeasurementGroupEntriesPageFamily._();
+
+/// One page of the entries of a group's components, newest first, out of which
+/// the readings are paired.
+
+final class MeasurementGroupEntriesPageProvider
+    extends
+        $FunctionalProvider<
+          AsyncValue<List<MeasurementEntry>>,
+          List<MeasurementEntry>,
+          Stream<List<MeasurementEntry>>
+        >
+    with $FutureModifier<List<MeasurementEntry>>, $StreamProvider<List<MeasurementEntry>> {
+  /// One page of the entries of a group's components, newest first, out of which
+  /// the readings are paired.
+  MeasurementGroupEntriesPageProvider._({
+    required MeasurementGroupEntriesPageFamily super.from,
+    required (String, int) super.argument,
+  }) : super(
+         retry: null,
+         name: r'measurementGroupEntriesPageProvider',
+         isAutoDispose: true,
+         dependencies: null,
+         $allTransitiveDependencies: null,
+       );
+
+  @override
+  String debugGetCreateSourceHash() => _$measurementGroupEntriesPageHash();
+
+  @override
+  String toString() {
+    return r'measurementGroupEntriesPageProvider'
+        ''
+        '$argument';
+  }
+
+  @$internal
+  @override
+  $StreamProviderElement<List<MeasurementEntry>> $createElement(
+    $ProviderPointer pointer,
+  ) => $StreamProviderElement(pointer);
+
+  @override
+  Stream<List<MeasurementEntry>> create(Ref ref) {
+    final argument = this.argument as (String, int);
+    return measurementGroupEntriesPage(ref, argument.$1, argument.$2);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is MeasurementGroupEntriesPageProvider && other.argument == argument;
+  }
+
+  @override
+  int get hashCode {
+    return argument.hashCode;
+  }
+}
+
+String _$measurementGroupEntriesPageHash() => r'd88344f85d8353a89bc662788974a6e43c92c1ac';
+
+/// One page of the entries of a group's components, newest first, out of which
+/// the readings are paired.
+
+final class MeasurementGroupEntriesPageFamily extends $Family
+    with $FunctionalFamilyOverride<Stream<List<MeasurementEntry>>, (String, int)> {
+  MeasurementGroupEntriesPageFamily._()
+    : super(
+        retry: null,
+        name: r'measurementGroupEntriesPageProvider',
+        dependencies: null,
+        $allTransitiveDependencies: null,
+        isAutoDispose: true,
+      );
+
+  /// One page of the entries of a group's components, newest first, out of which
+  /// the readings are paired.
+
+  MeasurementGroupEntriesPageProvider call(String parentId, int limit) =>
+      MeasurementGroupEntriesPageProvider._(
+        argument: (parentId, limit),
+        from: this,
+      );
+
+  @override
+  String toString() => r'measurementGroupEntriesPageProvider';
+}
+
+/// The newest entry of every category, keyed by category id.
+///
+/// For the rows that show a last known value next to a chart of a shorter
+/// range: widening the chart's range to reach the value would materialise
+/// every entry in between.
+
+@ProviderFor(latestMeasurementEntries)
+final latestMeasurementEntriesProvider = LatestMeasurementEntriesProvider._();
+
+/// The newest entry of every category, keyed by category id.
+///
+/// For the rows that show a last known value next to a chart of a shorter
+/// range: widening the chart's range to reach the value would materialise
+/// every entry in between.
+
+final class LatestMeasurementEntriesProvider
+    extends
+        $FunctionalProvider<
+          AsyncValue<Map<String, MeasurementEntry>>,
+          Map<String, MeasurementEntry>,
+          Stream<Map<String, MeasurementEntry>>
+        >
+    with
+        $FutureModifier<Map<String, MeasurementEntry>>,
+        $StreamProvider<Map<String, MeasurementEntry>> {
+  /// The newest entry of every category, keyed by category id.
+  ///
+  /// For the rows that show a last known value next to a chart of a shorter
+  /// range: widening the chart's range to reach the value would materialise
+  /// every entry in between.
+  LatestMeasurementEntriesProvider._()
+    : super(
+        from: null,
+        argument: null,
+        retry: null,
+        name: r'latestMeasurementEntriesProvider',
+        isAutoDispose: true,
+        dependencies: null,
+        $allTransitiveDependencies: null,
+      );
+
+  @override
+  String debugGetCreateSourceHash() => _$latestMeasurementEntriesHash();
+
+  @$internal
+  @override
+  $StreamProviderElement<Map<String, MeasurementEntry>> $createElement(
+    $ProviderPointer pointer,
+  ) => $StreamProviderElement(pointer);
+
+  @override
+  Stream<Map<String, MeasurementEntry>> create(Ref ref) {
+    return latestMeasurementEntries(ref);
+  }
+}
+
+String _$latestMeasurementEntriesHash() => r'87b87ef6ca747e9f47855692f9e687b85f81e99b';
+
+/// The chart points of one category, condensed by SQLite.
+///
+/// Kept apart from the category streams, which hand over the entries
+/// themselves. [level] is what the chart in question needs, see
+/// `chartBucketLevel`; [until] is exclusive and bounds a chart that shows a
+/// closed period rather than everything up to today.
+
+@ProviderFor(measurementChartBuckets)
+final measurementChartBucketsProvider = MeasurementChartBucketsFamily._();
+
+/// The chart points of one category, condensed by SQLite.
+///
+/// Kept apart from the category streams, which hand over the entries
+/// themselves. [level] is what the chart in question needs, see
+/// `chartBucketLevel`; [until] is exclusive and bounds a chart that shows a
+/// closed period rather than everything up to today.
+
+final class MeasurementChartBucketsProvider
+    extends
+        $FunctionalProvider<
+          AsyncValue<List<MeasurementBucket>>,
+          List<MeasurementBucket>,
+          Stream<List<MeasurementBucket>>
+        >
+    with $FutureModifier<List<MeasurementBucket>>, $StreamProvider<List<MeasurementBucket>> {
+  /// The chart points of one category, condensed by SQLite.
+  ///
+  /// Kept apart from the category streams, which hand over the entries
+  /// themselves. [level] is what the chart in question needs, see
+  /// `chartBucketLevel`; [until] is exclusive and bounds a chart that shows a
+  /// closed period rather than everything up to today.
+  MeasurementChartBucketsProvider._({
+    required MeasurementChartBucketsFamily super.from,
+    required (String, DateTime?, DateTime?, MeasurementBucketLevel) super.argument,
+  }) : super(
+         retry: null,
+         name: r'measurementChartBucketsProvider',
+         isAutoDispose: true,
+         dependencies: null,
+         $allTransitiveDependencies: null,
+       );
+
+  @override
+  String debugGetCreateSourceHash() => _$measurementChartBucketsHash();
+
+  @override
+  String toString() {
+    return r'measurementChartBucketsProvider'
+        ''
+        '$argument';
+  }
+
+  @$internal
+  @override
+  $StreamProviderElement<List<MeasurementBucket>> $createElement(
+    $ProviderPointer pointer,
+  ) => $StreamProviderElement(pointer);
+
+  @override
+  Stream<List<MeasurementBucket>> create(Ref ref) {
+    final argument = this.argument as (String, DateTime?, DateTime?, MeasurementBucketLevel);
+    return measurementChartBuckets(
+      ref,
+      argument.$1,
+      argument.$2,
+      argument.$3,
+      argument.$4,
+    );
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is MeasurementChartBucketsProvider && other.argument == argument;
+  }
+
+  @override
+  int get hashCode {
+    return argument.hashCode;
+  }
+}
+
+String _$measurementChartBucketsHash() => r'28d36f1f980010549496808722f116c1ab6db8dd';
+
+/// The chart points of one category, condensed by SQLite.
+///
+/// Kept apart from the category streams, which hand over the entries
+/// themselves. [level] is what the chart in question needs, see
+/// `chartBucketLevel`; [until] is exclusive and bounds a chart that shows a
+/// closed period rather than everything up to today.
+
+final class MeasurementChartBucketsFamily extends $Family
+    with
+        $FunctionalFamilyOverride<
+          Stream<List<MeasurementBucket>>,
+          (String, DateTime?, DateTime?, MeasurementBucketLevel)
+        > {
+  MeasurementChartBucketsFamily._()
+    : super(
+        retry: null,
+        name: r'measurementChartBucketsProvider',
+        dependencies: null,
+        $allTransitiveDependencies: null,
+        isAutoDispose: true,
+      );
+
+  /// The chart points of one category, condensed by SQLite.
+  ///
+  /// Kept apart from the category streams, which hand over the entries
+  /// themselves. [level] is what the chart in question needs, see
+  /// `chartBucketLevel`; [until] is exclusive and bounds a chart that shows a
+  /// closed period rather than everything up to today.
+
+  MeasurementChartBucketsProvider call(
+    String categoryId,
+    DateTime? since,
+    DateTime? until,
+    MeasurementBucketLevel level,
+  ) => MeasurementChartBucketsProvider._(
+    argument: (categoryId, since, until, level),
+    from: this,
+  );
+
+  @override
+  String toString() => r'measurementChartBucketsProvider';
+}
+
+/// The chart points of a group's components, keyed by component id.
+///
+/// One query for the whole group, and one calendar unit: a component condensed
+/// on its own would put the halves of a reading in different buckets.
+
+@ProviderFor(measurementGroupBuckets)
+final measurementGroupBucketsProvider = MeasurementGroupBucketsFamily._();
+
+/// The chart points of a group's components, keyed by component id.
+///
+/// One query for the whole group, and one calendar unit: a component condensed
+/// on its own would put the halves of a reading in different buckets.
+
+final class MeasurementGroupBucketsProvider
+    extends
+        $FunctionalProvider<
+          AsyncValue<Map<String, List<MeasurementBucket>>>,
+          Map<String, List<MeasurementBucket>>,
+          Stream<Map<String, List<MeasurementBucket>>>
+        >
+    with
+        $FutureModifier<Map<String, List<MeasurementBucket>>>,
+        $StreamProvider<Map<String, List<MeasurementBucket>>> {
+  /// The chart points of a group's components, keyed by component id.
+  ///
+  /// One query for the whole group, and one calendar unit: a component condensed
+  /// on its own would put the halves of a reading in different buckets.
+  MeasurementGroupBucketsProvider._({
+    required MeasurementGroupBucketsFamily super.from,
+    required (String, DateTime?, MeasurementBucketLevel) super.argument,
+  }) : super(
+         retry: null,
+         name: r'measurementGroupBucketsProvider',
+         isAutoDispose: true,
+         dependencies: null,
+         $allTransitiveDependencies: null,
+       );
+
+  @override
+  String debugGetCreateSourceHash() => _$measurementGroupBucketsHash();
+
+  @override
+  String toString() {
+    return r'measurementGroupBucketsProvider'
+        ''
+        '$argument';
+  }
+
+  @$internal
+  @override
+  $StreamProviderElement<Map<String, List<MeasurementBucket>>> $createElement(
+    $ProviderPointer pointer,
+  ) => $StreamProviderElement(pointer);
+
+  @override
+  Stream<Map<String, List<MeasurementBucket>>> create(Ref ref) {
+    final argument = this.argument as (String, DateTime?, MeasurementBucketLevel);
+    return measurementGroupBuckets(ref, argument.$1, argument.$2, argument.$3);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is MeasurementGroupBucketsProvider && other.argument == argument;
+  }
+
+  @override
+  int get hashCode {
+    return argument.hashCode;
+  }
+}
+
+String _$measurementGroupBucketsHash() => r'c266e55762bf15490b557a3dae3de909eee55ea0';
+
+/// The chart points of a group's components, keyed by component id.
+///
+/// One query for the whole group, and one calendar unit: a component condensed
+/// on its own would put the halves of a reading in different buckets.
+
+final class MeasurementGroupBucketsFamily extends $Family
+    with
+        $FunctionalFamilyOverride<
+          Stream<Map<String, List<MeasurementBucket>>>,
+          (String, DateTime?, MeasurementBucketLevel)
+        > {
+  MeasurementGroupBucketsFamily._()
+    : super(
+        retry: null,
+        name: r'measurementGroupBucketsProvider',
+        dependencies: null,
+        $allTransitiveDependencies: null,
+        isAutoDispose: true,
+      );
+
+  /// The chart points of a group's components, keyed by component id.
+  ///
+  /// One query for the whole group, and one calendar unit: a component condensed
+  /// on its own would put the halves of a reading in different buckets.
+
+  MeasurementGroupBucketsProvider call(
+    String parentId,
+    DateTime? since,
+    MeasurementBucketLevel level,
+  ) => MeasurementGroupBucketsProvider._(
+    argument: (parentId, since, level),
+    from: this,
+  );
+
+  @override
+  String toString() => r'measurementGroupBucketsProvider';
+}
+
+/// One point per day and category, keyed by category id.
+///
+/// For the calendar, which marks the days something was measured on rather
+/// than the single readings.
+
+@ProviderFor(measurementDailyBuckets)
+final measurementDailyBucketsProvider = MeasurementDailyBucketsProvider._();
+
+/// One point per day and category, keyed by category id.
+///
+/// For the calendar, which marks the days something was measured on rather
+/// than the single readings.
+
+final class MeasurementDailyBucketsProvider
+    extends
+        $FunctionalProvider<
+          AsyncValue<Map<String, List<MeasurementBucket>>>,
+          Map<String, List<MeasurementBucket>>,
+          Stream<Map<String, List<MeasurementBucket>>>
+        >
+    with
+        $FutureModifier<Map<String, List<MeasurementBucket>>>,
+        $StreamProvider<Map<String, List<MeasurementBucket>>> {
+  /// One point per day and category, keyed by category id.
+  ///
+  /// For the calendar, which marks the days something was measured on rather
+  /// than the single readings.
+  MeasurementDailyBucketsProvider._()
+    : super(
+        from: null,
+        argument: null,
+        retry: null,
+        name: r'measurementDailyBucketsProvider',
+        isAutoDispose: true,
+        dependencies: null,
+        $allTransitiveDependencies: null,
+      );
+
+  @override
+  String debugGetCreateSourceHash() => _$measurementDailyBucketsHash();
+
+  @$internal
+  @override
+  $StreamProviderElement<Map<String, List<MeasurementBucket>>> $createElement(
+    $ProviderPointer pointer,
+  ) => $StreamProviderElement(pointer);
+
+  @override
+  Stream<Map<String, List<MeasurementBucket>>> create(Ref ref) {
+    return measurementDailyBuckets(ref);
+  }
+}
+
+String _$measurementDailyBucketsHash() => r'3326fa1cdf57148a2eb4d60cd78a26becc6b812e';
+
+/// How often each value of a category occurred, for the histogram.
+
+@ProviderFor(measurementValueCounts)
+final measurementValueCountsProvider = MeasurementValueCountsFamily._();
+
+/// How often each value of a category occurred, for the histogram.
+
+final class MeasurementValueCountsProvider
+    extends
+        $FunctionalProvider<
+          AsyncValue<List<MeasurementValueCount>>,
+          List<MeasurementValueCount>,
+          Stream<List<MeasurementValueCount>>
+        >
+    with
+        $FutureModifier<List<MeasurementValueCount>>,
+        $StreamProvider<List<MeasurementValueCount>> {
+  /// How often each value of a category occurred, for the histogram.
+  MeasurementValueCountsProvider._({
+    required MeasurementValueCountsFamily super.from,
+    required (String, DateTime?, bool) super.argument,
+  }) : super(
+         retry: null,
+         name: r'measurementValueCountsProvider',
+         isAutoDispose: true,
+         dependencies: null,
+         $allTransitiveDependencies: null,
+       );
+
+  @override
+  String debugGetCreateSourceHash() => _$measurementValueCountsHash();
+
+  @override
+  String toString() {
+    return r'measurementValueCountsProvider'
+        ''
+        '$argument';
+  }
+
+  @$internal
+  @override
+  $StreamProviderElement<List<MeasurementValueCount>> $createElement(
+    $ProviderPointer pointer,
+  ) => $StreamProviderElement(pointer);
+
+  @override
+  Stream<List<MeasurementValueCount>> create(Ref ref) {
+    final argument = this.argument as (String, DateTime?, bool);
+    return measurementValueCounts(ref, argument.$1, argument.$2, argument.$3);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is MeasurementValueCountsProvider && other.argument == argument;
+  }
+
+  @override
+  int get hashCode {
+    return argument.hashCode;
+  }
+}
+
+String _$measurementValueCountsHash() => r'a92e20ad52075b37e2faaa754ff9fd7619a36be7';
+
+/// How often each value of a category occurred, for the histogram.
+
+final class MeasurementValueCountsFamily extends $Family
+    with $FunctionalFamilyOverride<Stream<List<MeasurementValueCount>>, (String, DateTime?, bool)> {
+  MeasurementValueCountsFamily._()
+    : super(
+        retry: null,
+        name: r'measurementValueCountsProvider',
+        dependencies: null,
+        $allTransitiveDependencies: null,
+        isAutoDispose: true,
+      );
+
+  /// How often each value of a category occurred, for the histogram.
+
+  MeasurementValueCountsProvider call(
+    String categoryId,
+    DateTime? since,
+    bool summedPerDay,
+  ) => MeasurementValueCountsProvider._(
+    argument: (categoryId, since, summedPerDay),
+    from: this,
+  );
+
+  @override
+  String toString() => r'measurementValueCountsProvider';
+}
+
+/// One category with its children, null while it does not exist (or no longer
+/// does).
+
+@ProviderFor(measurementCategory)
+final measurementCategoryProvider = MeasurementCategoryFamily._();
+
+/// One category with its children, null while it does not exist (or no longer
+/// does).
+
+final class MeasurementCategoryProvider
+    extends
+        $FunctionalProvider<
+          AsyncValue<MeasurementCategory?>,
+          MeasurementCategory?,
+          Stream<MeasurementCategory?>
+        >
+    with $FutureModifier<MeasurementCategory?>, $StreamProvider<MeasurementCategory?> {
+  /// One category with its children, null while it does not exist (or no longer
+  /// does).
+  MeasurementCategoryProvider._({
+    required MeasurementCategoryFamily super.from,
+    required String super.argument,
+  }) : super(
+         retry: null,
+         name: r'measurementCategoryProvider',
+         isAutoDispose: true,
+         dependencies: null,
+         $allTransitiveDependencies: null,
+       );
+
+  @override
+  String debugGetCreateSourceHash() => _$measurementCategoryHash();
+
+  @override
+  String toString() {
+    return r'measurementCategoryProvider'
+        ''
+        '($argument)';
+  }
+
+  @$internal
+  @override
+  $StreamProviderElement<MeasurementCategory?> $createElement(
+    $ProviderPointer pointer,
+  ) => $StreamProviderElement(pointer);
+
+  @override
+  Stream<MeasurementCategory?> create(Ref ref) {
+    final argument = this.argument as String;
+    return measurementCategory(ref, argument);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is MeasurementCategoryProvider && other.argument == argument;
+  }
+
+  @override
+  int get hashCode {
+    return argument.hashCode;
+  }
+}
+
+String _$measurementCategoryHash() => r'9064d6e8ee04c562a1ae1bb8c1f6523f6f22ee9d';
+
+/// One category with its children, null while it does not exist (or no longer
+/// does).
+
+final class MeasurementCategoryFamily extends $Family
+    with $FunctionalFamilyOverride<Stream<MeasurementCategory?>, String> {
+  MeasurementCategoryFamily._()
+    : super(
+        retry: null,
+        name: r'measurementCategoryProvider',
+        dependencies: null,
+        $allTransitiveDependencies: null,
+        isAutoDispose: true,
+      );
+
+  /// One category with its children, null while it does not exist (or no longer
+  /// does).
+
+  MeasurementCategoryProvider call(String id) =>
+      MeasurementCategoryProvider._(argument: id, from: this);
+
+  @override
+  String toString() => r'measurementCategoryProvider';
+}
+
+/// Writing side of the measurements: what the screens read is watched through
+/// the providers above, which this only changes the data of.
 
 @ProviderFor(MeasurementNotifier)
 final measurementProvider = MeasurementNotifierProvider._();
 
-final class MeasurementNotifierProvider
-    extends $StreamNotifierProvider<MeasurementNotifier, List<MeasurementCategory>> {
+/// Writing side of the measurements: what the screens read is watched through
+/// the providers above, which this only changes the data of.
+final class MeasurementNotifierProvider extends $NotifierProvider<MeasurementNotifier, void> {
+  /// Writing side of the measurements: what the screens read is watched through
+  /// the providers above, which this only changes the data of.
   MeasurementNotifierProvider._()
     : super(
         from: null,
@@ -31,24 +802,29 @@ final class MeasurementNotifierProvider
   @$internal
   @override
   MeasurementNotifier create() => MeasurementNotifier();
+
+  /// {@macro riverpod.override_with_value}
+  Override overrideWithValue(void value) {
+    return $ProviderOverride(
+      origin: this,
+      providerOverride: $SyncValueProvider<void>(value),
+    );
+  }
 }
 
-String _$measurementNotifierHash() => r'94978ed841f94d3481322dc144ef82da95cfb62c';
+String _$measurementNotifierHash() => r'5dac4662d46ec3d421a0ae6e9d6e8a88d681072a';
+
+/// Writing side of the measurements: what the screens read is watched through
+/// the providers above, which this only changes the data of.
 
-abstract class _$MeasurementNotifier extends $StreamNotifier<List<MeasurementCategory>> {
-  Stream<List<MeasurementCategory>> build();
+abstract class _$MeasurementNotifier extends $Notifier<void> {
+  void build();
   @$mustCallSuper
   @override
   WhenComplete runBuild() {
-    final ref = this.ref as $Ref<AsyncValue<List<MeasurementCategory>>, List<MeasurementCategory>>;
+    final ref = this.ref as $Ref<void, void>;
     final element =
-        ref.element
-            as $ClassProviderElement<
-              AnyNotifier<AsyncValue<List<MeasurementCategory>>, List<MeasurementCategory>>,
-              AsyncValue<List<MeasurementCategory>>,
-              Object?,
-              Object?
-            >;
+        ref.element as $ClassProviderElement<AnyNotifier<void, void>, void, Object?, Object?>;
     return element.handleCreate(ref, build);
   }
 }
diff --git a/lib/features/measurements/providers/measurement_repository.dart b/lib/features/measurements/providers/measurement_repository.dart
index 5763e6e03..2e357e693 100644
--- a/lib/features/measurements/providers/measurement_repository.dart
+++ b/lib/features/measurements/providers/measurement_repository.dart
@@ -24,7 +24,9 @@ import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
+import 'package:stream_transform/stream_transform.dart';
 import 'package:wger/database/powersync/database.dart';
+import 'package:wger/features/measurements/models/measurement_bucket.dart';
 import 'package:wger/features/measurements/models/measurement_category.dart';
 import 'package:wger/features/measurements/models/measurement_entry.dart';
 
@@ -39,47 +41,469 @@ class MeasurementRepository {
 
   MeasurementRepository(this._db);
 
-  /// Watches all categories, populated with their appropriate entries
-  Stream<List<MeasurementCategory>> watchAll() {
-    _logger.finer('Watching all measurement categories with entries');
-
-    final joined =
-        _db.select(_db.measurementCategoryTable).join([
-          leftOuterJoin(
-            _db.measurementEntryTable,
-            _db.measurementEntryTable.categoryId.equalsExp(_db.measurementCategoryTable.id),
-          ),
-        ])..orderBy([
-          OrderingTerm(expression: _db.measurementCategoryTable.name),
-          OrderingTerm(expression: _db.measurementEntryTable.date, mode: OrderingMode.desc),
-        ]);
-
-    return joined.watch().map((rows) {
-      final Map<String, MeasurementCategory> map = {};
-
-      for (final row in rows) {
-        final category = row.readTable(_db.measurementCategoryTable);
-        final entry = row.readTableOrNull(_db.measurementEntryTable);
-
-        final current = map.putIfAbsent(
-          category.id!,
-          () => category.copyWith(entries: []),
+  /// Coalesces the bursts a health import writes, so the per-emission work
+  /// below runs once they settle. Leading, unlike the nutrition streams: a
+  /// screen is waiting for the first emission.
+  static const _emitDebounce = Duration(milliseconds: 200);
+
+  /// Watches all categories with their children.
+  ///
+  /// The list is flat (children of multi-value groups appear as regular items
+  /// with a non-null `parentId`), but group parents additionally get their
+  /// [MeasurementCategory.children] attached, sorted by their in-group order.
+  ///
+  /// A category never carries its entries: those of a watch-fed metric are
+  /// tens of thousands of rows a year, and building an object per row to then
+  /// chart a few hundred points is the cost the aggregated queries below
+  /// avoid.
+  Stream<List<MeasurementCategory>> watchAllWithoutEntries() {
+    _logger.finer('Watching all measurement categories');
+    return _watchCategories();
+  }
+
+  /// One category with its children. See [watchAllWithoutEntries].
+  Stream<MeasurementCategory?> watchCategoryWithoutEntries(String id) {
+    _logger.finer('Watching measurement category $id');
+    return _watchCategories(
+      filter: (table) => table.id.equals(id) | table.parentId.equals(id),
+    ).map((categories) => categories.firstWhereOrNull((c) => c.id == id));
+  }
+
+  /// Watches the categories matching [filter] (all of them when it is null),
+  /// group parents with their children attached.
+  Stream<List<MeasurementCategory>> _watchCategories({
+    Expression<bool> Function($MeasurementCategoryTableTable table)? filter,
+  }) {
+    final select = _db.select(_db.measurementCategoryTable);
+    if (filter != null) {
+      select.where(filter);
+    }
+    select.orderBy([
+      (t) => OrderingTerm(expression: t.order),
+      (t) => OrderingTerm(expression: t.name),
+    ]);
+
+    return select.watch().debounce(_emitDebounce, leading: true).map(_attachChildren);
+  }
+
+  /// Attaches the children of every group parent. The rows arrive sorted by
+  /// order and name, so insertion order is the display order.
+  List<MeasurementCategory> _attachChildren(List<MeasurementCategory> categories) =>
+      categories.map((c) {
+        final children = categories.where((other) => other.parentId == c.id).toList();
+        return children.isEmpty ? c : c.copyWith(children: children);
+      }).toList();
+
+  /// Watches the user's official body weight category.
+  ///
+  /// The category has no fixed id (the server assigns it), so it is selected
+  /// by its type in the query rather than picked out of every category
+  /// afterwards.
+  Stream<MeasurementCategory?> watchOfficialBodyWeightCategory() {
+    _logger.finer('Watching the official body weight category');
+    return _watchCategories(
+      filter: (table) =>
+          table.isOfficial.equals(true) & table.metricType.equalsValue(MetricType.bodyWeight),
+    ).map((categories) => categories.firstOrNull);
+  }
+
+  /// The newest entries of [categoryId], at most [limit] of them.
+  ///
+  /// For the lists, which show a page at a time rather than a history that
+  /// runs into five figures. Ordered by date and, among the rows sharing one,
+  /// by id: the sync writes entries on the same timestamp (a day aggregate at
+  /// midnight, the components of a reading at its exact time), and a limit
+  /// over an ambiguous order picks a different row on every read.
+  Stream<List<MeasurementEntry>> watchEntries(String categoryId, {required int limit}) {
+    _logger.finer('Watching $limit entries of measurement category $categoryId');
+
+    final query = _db.select(_db.measurementEntryTable)
+      ..where((t) => t.categoryId.equals(categoryId))
+      ..orderBy([
+        (t) => OrderingTerm.desc(t.date),
+        (t) => OrderingTerm.desc(t.id),
+      ])
+      ..limit(limit);
+
+    return query.watch().debounce(_emitDebounce, leading: true);
+  }
+
+  /// The newest entries of every component of the group [parentId], at most
+  /// [limit] of them, in the order [watchEntries] describes.
+  ///
+  /// One query over the components rather than one each: the readings are
+  /// paired afterwards, and a page has to cover the same span for all of them.
+  Stream<List<MeasurementEntry>> watchGroupEntries(String parentId, {required int limit}) {
+    _logger.finer('Watching $limit entries of measurement group $parentId');
+
+    final query =
+        _db.select(_db.measurementEntryTable).join([
+            innerJoin(
+              _db.measurementCategoryTable,
+              _db.measurementCategoryTable.id.equalsExp(_db.measurementEntryTable.categoryId),
+            ),
+          ])
+          ..where(_db.measurementCategoryTable.parentId.equals(parentId))
+          ..orderBy([
+            OrderingTerm.desc(_db.measurementEntryTable.date),
+            OrderingTerm.desc(_db.measurementEntryTable.id),
+          ])
+          ..limit(limit);
+
+    return query
+        .watch()
+        .debounce(_emitDebounce, leading: true)
+        .map(
+          (rows) => rows.map((row) => row.readTable(_db.measurementEntryTable)).toList(),
         );
+  }
 
-        if (entry != null && !current.entries.any((e) => e.id == entry.id)) {
-          current.entries.add(entry);
-        }
-      }
+  /// The newest entry of every category, keyed by category id.
+  ///
+  /// For the places that show the last known value without charting anything:
+  /// reading a range wide enough to be sure to contain it would materialise
+  /// every entry in that range, and a metric synced from a watch writes
+  /// hundreds a day.
+  Stream<Map<String, MeasurementEntry>> watchLatestEntries() {
+    _logger.finer('Watching the latest measurement entry per category');
+
+    final table = _db.measurementEntryTable;
+    // Not the typed API: its datetime aggregate goes through UNIXEPOCH and
+    // drops the sub-second part the sync writes, and the NOT EXISTS it can
+    // express wraps both dates in JULIANDAY, losing the index (0.2 s vs 90 s)
+    final query = _db.customSelect(
+      'SELECT entry.* FROM ${table.actualTableName} entry '
+      'WHERE entry.date = ('
+      'SELECT MAX(newest.date) FROM ${table.actualTableName} newest '
+      'WHERE newest.category_id = entry.category_id)',
+      readsFrom: {table},
+    );
 
-      return map.values
-          .map((c) => c.copyWith(entries: List<MeasurementEntry>.from(c.entries)))
-          .toList();
+    // Entries that share the newest timestamp (the importer writes a day
+    // aggregate on midnight) collapse onto one, which is what a single latest
+    // value means
+    return query.watch().debounce(_emitDebounce, leading: true).map((rows) {
+      final entries = rows.map((row) => table.map(row.data));
+      return {for (final entry in entries) entry.categoryId: entry};
     });
   }
 
-  Stream<MeasurementCategory?> watchLocalDriftCategoryById(String id) {
-    _logger.finer('Watching local measurement category $id');
-    return watchAll().map((categories) => categories.firstWhereOrNull((c) => c.id == id));
+  /// Chart points for [categoryId]: one bucket per calendar unit, condensed by
+  /// SQLite instead of by walking every entry in Dart.
+  ///
+  /// [level] fixes the unit for the charts built on one; `auto` takes the
+  /// finest that keeps the series under [maxPoints], down to one bucket per
+  /// entry. [since] and [until] bound the entries read, null on both covers the
+  /// full history; [until] is exclusive.
+  Stream<List<MeasurementBucket>> watchEntryBuckets(
+    String categoryId, {
+    DateTime? since,
+    DateTime? until,
+    MeasurementBucketLevel level = MeasurementBucketLevel.auto,
+    int maxPoints = measurementChartMaxPoints,
+  }) {
+    _logger.finer('Watching $level buckets of measurement category $categoryId');
+
+    return _watchBucketRows(
+      where: 'WHERE category_id = ?1${_bucketRange(since, until)}',
+      variables: _bucketVariables(categoryId, since, until),
+      level: level,
+      maxPoints: maxPoints,
+    ).map(_toBuckets);
+  }
+
+  /// Chart points for every child of [parentId], keyed by child, all at one
+  /// calendar unit.
+  ///
+  /// One unit for the whole group rather than one per component: the halves of
+  /// a reading are paired on their shared bucket, and a component condensed on
+  /// its own would put them in different ones.
+  Stream<Map<String, List<MeasurementBucket>>> watchGroupBuckets(
+    String parentId, {
+    DateTime? since,
+    MeasurementBucketLevel level = MeasurementBucketLevel.auto,
+    int maxPoints = measurementChartMaxPoints,
+  }) {
+    _logger.finer('Watching $level buckets of measurement group $parentId');
+
+    return _watchBucketRows(
+      where:
+          'WHERE category_id IN ('
+          'SELECT id FROM ${_db.measurementCategoryTable.actualTableName} WHERE parent_id = ?1)'
+          '${_bucketRange(since, null)}',
+      variables: _bucketVariables(parentId, since, null),
+      level: level,
+      maxPoints: maxPoints,
+      perCategory: true,
+    ).map(_toBucketsByCategory);
+  }
+
+  /// One point per day and category, over every category there is.
+  ///
+  /// For the calendar, which marks days rather than readings: a metric fed by
+  /// a watch writes hundreds of entries onto the same square, and reading them
+  /// to draw one marker is what this avoids.
+  Stream<Map<String, List<MeasurementBucket>>> watchDailyBuckets() {
+    _logger.finer('Watching the day buckets of every measurement category');
+
+    return _watchBucketRows(
+      where: '',
+      variables: [],
+      level: MeasurementBucketLevel.day,
+      maxPoints: measurementChartMaxPoints,
+      perCategory: true,
+    ).map(_toBucketsByCategory);
+  }
+
+  /// The aggregated rows of whatever [where] selects, at the calendar unit
+  /// [level] asks for: fixed for the charts built on one, otherwise the finest
+  /// that keeps the series under [maxPoints].
+  ///
+  /// Only `auto` reads the probe, so a fixed level does not pay for it.
+  Stream<List<QueryRow>> _watchBucketRows({
+    required String where,
+    required List<Variable> variables,
+    required MeasurementBucketLevel level,
+    required int maxPoints,
+    bool perCategory = false,
+  }) {
+    final fixed = switch (level) {
+      MeasurementBucketLevel.day => MeasurementBucketUnit.day,
+      MeasurementBucketLevel.week => MeasurementBucketUnit.week,
+      MeasurementBucketLevel.auto => null,
+    };
+    if (fixed != null) {
+      return _bucketQuery(
+        fixed,
+        where,
+        variables,
+        perCategory: perCategory,
+      ).watch().debounce(_emitDebounce, leading: true);
+    }
+
+    return _probeQuery(where, variables)
+        .watchSingle()
+        .debounce(_emitDebounce, leading: true)
+        .asyncMap(
+          (row) => _bucketQuery(
+            _ladderUnit(row, maxPoints),
+            where,
+            variables,
+            perCategory: perCategory,
+          ).get(),
+        );
+  }
+
+  /// The id the query is scoped to, and the date bounds it has.
+  ///
+  /// Encoded the way drift writes the column (UTC ISO-8601 text), so a bucket
+  /// query reads the same rows as the typed ones.
+  List<Variable> _bucketVariables(String id, DateTime? since, DateTime? until) => [
+    Variable.withString(id),
+    if (since != null) Variable.withString(since.toUtc().toIso8601String()),
+    if (until != null) Variable.withString(until.toUtc().toIso8601String()),
+  ];
+
+  /// The date bounds as SQL, against the variables [_bucketVariables] binds
+  /// after the id. The upper one is exclusive, so a caller passes the start of
+  /// the day after the last one it wants.
+  String _bucketRange(DateTime? since, DateTime? until) => [
+    if (since != null) ' AND date >= ?2',
+    if (until != null) ' AND date < ?${since == null ? 2 : 3}',
+  ].join();
+
+  /// How often each value occurred in [categoryId], for the histogram.
+  ///
+  /// Not bucketed by time but by value, which is the granularity a histogram
+  /// bins at anyway: a year of heart rate is tens of thousands of readings
+  /// over some two hundred distinct bpm. Counting instead of binning in SQL
+  /// keeps the conversion of a mixed-unit category exact, since the values
+  /// still go through the one helper. [summedPerDay] counts daily totals
+  /// rather than single readings, for the metrics whose samples mean nothing
+  /// on their own.
+  Stream<List<MeasurementValueCount>> watchValueCounts(
+    String categoryId, {
+    DateTime? since,
+    bool summedPerDay = false,
+  }) {
+    _logger.finer('Watching the value counts of measurement category $categoryId');
+
+    final variables = [
+      Variable.withString(categoryId),
+      if (since != null) Variable.withString(since.toUtc().toIso8601String()),
+    ];
+    final where = 'WHERE category_id = ?1${since == null ? '' : ' AND date >= ?2'}';
+    final day = _bucketExpression(MeasurementBucketUnit.day);
+    final source = summedPerDay
+        ? 'SELECT '
+              r"json_extract(extra_data, '$.unit') AS unit, "
+              'SUM(value) AS v, MAX(date) AS newest '
+              'FROM ${_db.measurementEntryTable.actualTableName} $where '
+              'GROUP BY $day, unit'
+        : 'SELECT '
+              r"json_extract(extra_data, '$.unit') AS unit, "
+              'value AS v, date AS newest '
+              'FROM ${_db.measurementEntryTable.actualTableName} $where';
+
+    return _db
+        .customSelect(
+          'SELECT unit, v, COUNT(*) AS n, MAX(newest) AS newest FROM ($source) '
+          'GROUP BY unit, v ORDER BY v',
+          variables: variables,
+          readsFrom: {_db.measurementEntryTable},
+        )
+        .watch()
+        .debounce(_emitDebounce, leading: true)
+        .map(
+          (rows) => [
+            for (final row in rows)
+              MeasurementValueCount(
+                value: row.read<double>('v'),
+                unit: row.read<String?>('unit'),
+                count: row.read<int>('n'),
+                newest: _parseDbDate(row.read<String>('newest')),
+              ),
+          ],
+        );
+  }
+
+  /// The aggregate of a category's entries at [unit], one row per bucket and
+  /// per unit the values were entered in: a mean over kg and lb values would
+  /// be a number in neither.
+  Selectable<QueryRow> _bucketQuery(
+    MeasurementBucketUnit unit,
+    String where,
+    List<Variable> variables, {
+    bool perCategory = false,
+  }) {
+    final by = perCategory ? 'category_id, ' : '';
+    return _db.customSelect(
+      'SELECT $by${_bucketExpression(unit)} AS bucket, '
+      r"json_extract(extra_data, '$.unit') AS unit, "
+      'COUNT(*) AS n, '
+      'SUM(value) AS total, '
+      // A daily aggregate contributes the range it summarises, not its mean
+      r"MIN(COALESCE(json_extract(extra_data, '$.min'), value)) AS low, "
+      r"MAX(COALESCE(json_extract(extra_data, '$.max'), value)) AS high "
+      'FROM ${_db.measurementEntryTable.actualTableName} $where '
+      'GROUP BY ${by}bucket, unit ORDER BY bucket',
+      variables: variables,
+      readsFrom: {_db.measurementEntryTable},
+    );
+  }
+
+  /// Every unit's point count in one pass, so picking one costs no scan per
+  /// candidate.
+  Selectable<QueryRow> _probeQuery(String where, List<Variable> variables) => _db.customSelect(
+    'SELECT COUNT(*) AS entries, '
+    'COUNT(DISTINCT ${_bucketExpression(MeasurementBucketUnit.hour)}) AS hours, '
+    'COUNT(DISTINCT ${_bucketExpression(MeasurementBucketUnit.day)}) AS days, '
+    'COUNT(DISTINCT ${_bucketExpression(MeasurementBucketUnit.week)}) AS weeks '
+    'FROM ${_db.measurementEntryTable.actualTableName} $where',
+    variables: variables,
+    readsFrom: {_db.measurementEntryTable},
+  );
+
+  MeasurementBucket _toBucket(QueryRow row) => MeasurementBucket(
+    start: _parseDbDate(row.read<String>('bucket')),
+    unit: row.read<String?>('unit'),
+    count: row.read<int>('n'),
+    sum: row.read<double>('total'),
+    min: row.read<double>('low'),
+    max: row.read<double>('high'),
+  );
+
+  List<MeasurementBucket> _toBuckets(List<QueryRow> rows) => rows.map(_toBucket).toList();
+
+  Map<String, List<MeasurementBucket>> _toBucketsByCategory(List<QueryRow> rows) {
+    final out = <String, List<MeasurementBucket>>{};
+    for (final row in rows) {
+      out.putIfAbsent(row.read<String>('category_id'), () => []).add(_toBucket(row));
+    }
+    return out;
+  }
+
+  /// The finest unit that keeps the series under [maxPoints].
+  MeasurementBucketUnit _ladderUnit(QueryRow probe, int maxPoints) {
+    for (final (unit, points) in [
+      (MeasurementBucketUnit.entry, probe.read<int>('entries')),
+      (MeasurementBucketUnit.hour, probe.read<int>('hours')),
+      (MeasurementBucketUnit.day, probe.read<int>('days')),
+      (MeasurementBucketUnit.week, probe.read<int>('weeks')),
+    ]) {
+      if (points <= maxPoints) {
+        return unit;
+      }
+    }
+    return MeasurementBucketUnit.month;
+  }
+
+  /// The SQL producing a bucket key, which is also the bucket's start.
+  ///
+  /// Shifted to the local zone, since the column is UTC: a reading half an
+  /// hour after midnight belongs to the day the user had it.
+  String _bucketExpression(MeasurementBucketUnit unit) => switch (unit) {
+    MeasurementBucketUnit.entry => 'date',
+    MeasurementBucketUnit.hour => "strftime('%Y-%m-%dT%H:00:00', date, 'localtime')",
+    MeasurementBucketUnit.day => "strftime('%Y-%m-%dT00:00:00', date, 'localtime')",
+    // 'weekday 1' moves to the next Monday or stays on one, so -6 days
+    // first lands on the Monday of the entry's own week
+    MeasurementBucketUnit.week =>
+      "strftime('%Y-%m-%dT00:00:00', date, 'localtime', '-6 days', 'weekday 1')",
+    MeasurementBucketUnit.month => "strftime('%Y-%m-01T00:00:00', date, 'localtime')",
+  };
+
+  /// A date column or bucket key as a local [DateTime]. A stored date is UTC
+  /// and marked as such; a bucket key was already shifted to the local zone by
+  /// the query.
+  DateTime _parseDbDate(String value) {
+    final parsed = DateTime.parse(value);
+    return parsed.isUtc ? parsed.toLocal() : parsed;
+  }
+
+  /// One-shot snapshot of all categories with their children, without their
+  /// entries. See [watchAllWithoutEntries].
+  Future<List<MeasurementCategory>> getCategoriesOnce() => watchAllWithoutEntries().first;
+
+  /// The external ids of [categoryId]'s entries.
+  ///
+  /// Only the ids: an import deduplicates by comparing keys and has no use for
+  /// the entries themselves, of which a watch-fed metric writes hundreds a day.
+  Future<Set<String>> getExternalIds(String categoryId) async {
+    _logger.finer('Reading the external ids of measurement category $categoryId');
+
+    final table = _db.measurementEntryTable;
+    final query = _db.selectOnly(table)
+      ..addColumns([table.externalId])
+      ..where(table.categoryId.equals(categoryId) & table.externalId.isNotNull());
+
+    final rows = await query.get();
+    return {for (final row in rows) row.read(table.externalId)!};
+  }
+
+  /// The entries of [categoryId] that carry an external id, keyed by it.
+  ///
+  /// For the day aggregates, which are rewritten when late samples change
+  /// them, so their importer needs the stored row rather than just its key.
+  Future<Map<String, MeasurementEntry>> getEntriesByExternalId(String categoryId) async {
+    _logger.finer('Reading the keyed entries of measurement category $categoryId');
+
+    final query = _db.select(_db.measurementEntryTable)
+      ..where((t) => t.categoryId.equals(categoryId) & t.externalId.isNotNull());
+
+    final entries = await query.get();
+    return {for (final entry in entries) entry.externalId!: entry};
+  }
+
+  /// Whether [categoryId] holds any entry of its own.
+  Future<bool> hasEntries(String categoryId) async {
+    _logger.finer('Checking whether measurement category $categoryId holds entries');
+
+    final query = _db.select(_db.measurementEntryTable)
+      ..where((t) => t.categoryId.equals(categoryId))
+      ..limit(1);
+
+    return await query.getSingleOrNull() != null;
   }
 
   // Entries
@@ -99,10 +523,26 @@ class MeasurementRepository {
     await _db.into(_db.measurementEntryTable).insert(entry.toCompanion());
   }
 
+  /// Inserts one reading of a multi-value group: one entry per component,
+  /// written in a single transaction so a reading is never half-persisted.
+  Future<void> addLocalDriftGroupEntries(List<MeasurementEntry> entries) async {
+    _logger.finer('Adding ${entries.length} local measurement entries for a group reading');
+    await _db.transaction(() async {
+      for (final entry in entries) {
+        await _db.into(_db.measurementEntryTable).insert(entry.toCompanion());
+      }
+    });
+  }
+
   // Categories
   Future<void> deleteLocalDriftCategory(String id) async {
     _logger.finer('Deleting local measurement category $id');
-    await (_db.delete(_db.measurementCategoryTable)..where((t) => t.id.equals(id))).go();
+    await _db.transaction(() async {
+      // Children of a multi-value group are meaningless without their parent;
+      // the server cascades the same way.
+      await (_db.delete(_db.measurementCategoryTable)..where((t) => t.parentId.equals(id))).go();
+      await (_db.delete(_db.measurementCategoryTable)..where((t) => t.id.equals(id))).go();
+    });
   }
 
   Future<void> updateLocalDriftCategory(MeasurementCategory category) async {
@@ -115,4 +555,30 @@ class MeasurementRepository {
     _logger.finer('Adding local measurement category ${category.name}');
     await _db.into(_db.measurementCategoryTable).insert(category.toCompanion());
   }
+
+  /// Inserts a group together with its components, in a single transaction so
+  /// a group is never left without the children its readings live in.
+  Future<void> addLocalDriftCategoryGroup(List<MeasurementCategory> categories) async {
+    _logger.finer('Adding a local measurement group of ${categories.length} categories');
+    await _db.transaction(() async {
+      for (final category in categories) {
+        await _db.into(_db.measurementCategoryTable).insert(category.toCompanion());
+      }
+    });
+  }
+
+  /// Persists the given display order: each category gets its list index as
+  /// [MeasurementCategory.order]. Categories whose order is unchanged are not
+  /// written, so no sync upload is queued for them.
+  Future<void> reorderCategories(List<String> orderedIds) async {
+    _logger.finer('Reordering ${orderedIds.length} categories');
+    await _db.transaction(() async {
+      for (var i = 0; i < orderedIds.length; i++) {
+        final stmt = _db.update(_db.measurementCategoryTable)
+          // IS NOT so legacy rows with a NULL order still get written
+          ..where((t) => t.id.equals(orderedIds[i]) & t.order.isNotValue(i));
+        await stmt.write(MeasurementCategoryTableCompanion(order: Value(i)));
+      }
+    });
+  }
 }
diff --git a/lib/features/measurements/screens/measurement_categories_screen.dart b/lib/features/measurements/screens/measurement_categories_screen.dart
index 985f020fd..e2797c6b3 100644
--- a/lib/features/measurements/screens/measurement_categories_screen.dart
+++ b/lib/features/measurements/screens/measurement_categories_screen.dart
@@ -17,10 +17,10 @@
  */
 
 import 'package:flutter/material.dart';
-import 'package:wger/core/form_screen.dart';
 import 'package:wger/core/wide_screen_wrapper.dart';
+import 'package:wger/features/measurements/screens/measurement_category_sort_screen.dart';
 import 'package:wger/features/measurements/widgets/categories.dart';
-import 'package:wger/features/measurements/widgets/forms.dart';
+import 'package:wger/features/measurements/widgets/measurement_fab.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
 class MeasurementCategoriesScreen extends StatelessWidget {
@@ -30,21 +30,20 @@ class MeasurementCategoriesScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
     return Scaffold(
-      appBar: AppBar(title: Text(AppLocalizations.of(context).measurements)),
-      floatingActionButton: FloatingActionButton(
-        child: const Icon(Icons.add, color: Colors.white),
-        onPressed: () {
-          Navigator.pushNamed(
-            context,
-            FormScreen.routeName,
-            arguments: FormScreenArguments(
-              AppLocalizations.of(context).newEntry,
-              const MeasurementCategoryForm(),
-            ),
-          );
-        },
+      appBar: AppBar(
+        title: Text(i18n.labelBottomNavBody),
+        actions: [
+          IconButton(
+            icon: const Icon(Icons.sort),
+            tooltip: i18n.reorderCategories,
+            onPressed: () =>
+                Navigator.of(context).pushNamed(MeasurementCategorySortScreen.routeName),
+          ),
+        ],
       ),
+      floatingActionButton: const MeasurementsFab(),
       body: const WidescreenWrapper(
         child: CategoriesList(),
       ),
diff --git a/lib/features/measurements/screens/measurement_category_sort_screen.dart b/lib/features/measurements/screens/measurement_category_sort_screen.dart
new file mode 100644
index 000000000..4ffac10bd
--- /dev/null
+++ b/lib/features/measurements/screens/measurement_category_sort_screen.dart
@@ -0,0 +1,82 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c)  2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:wger/core/wide_screen_wrapper.dart';
+import 'package:wger/core/widgets/async_value_widget.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+/// Drag-and-drop reordering of the top-level measurement categories.
+///
+/// Children of multi-value groups are not listed; they keep their in-group
+/// order and follow their parent.
+class MeasurementCategorySortScreen extends ConsumerWidget {
+  static const routeName = '/measurement-categories-sort';
+
+  const MeasurementCategorySortScreen({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final i18n = AppLocalizations.of(context);
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(i18n.reorderCategories),
+      ),
+      body: WidescreenWrapper(
+        child: AsyncValueWidget<List<MeasurementCategory>>(
+          value: ref.watch(measurementCategoriesProvider),
+          loggerName: 'MeasurementCategorySortScreen',
+          data: (categories) => _SortableList(
+            categories.where((c) => c.parentId == null && !c.isOfficialBodyWeight).toList(),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _SortableList extends ConsumerWidget {
+  final List<MeasurementCategory> _categories;
+  const _SortableList(this._categories);
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final notifier = ref.read(measurementProvider.notifier);
+    return ReorderableListView.builder(
+      buildDefaultDragHandles: false,
+      itemCount: _categories.length,
+      itemBuilder: (context, index) {
+        final category = _categories[index];
+        return ListTile(
+          key: ValueKey(category.id),
+          title: Text(category.displayName(context)),
+          subtitle: Text(category.unit),
+          trailing: ReorderableDragStartListener(
+            index: index,
+            child: const Icon(Icons.drag_handle),
+          ),
+        );
+      },
+      onReorderItem: (oldIndex, newIndex) =>
+          notifier.setCategoryOrder(_categories, oldIndex, newIndex),
+    );
+  }
+}
diff --git a/lib/features/measurements/screens/measurement_entries_screen.dart b/lib/features/measurements/screens/measurement_entries_screen.dart
index 3e35801fb..1a32e8f81 100644
--- a/lib/features/measurements/screens/measurement_entries_screen.dart
+++ b/lib/features/measurements/screens/measurement_entries_screen.dart
@@ -25,6 +25,7 @@ import 'package:wger/core/widgets/error.dart';
 import 'package:wger/core/widgets/object_gone_redirect.dart';
 import 'package:wger/core/widgets/progress_indicator.dart';
 import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/providers/chart_range_setting.dart';
 import 'package:wger/features/measurements/providers/measurement_notifier.dart';
 import 'package:wger/features/measurements/widgets/entries.dart';
 import 'package:wger/features/measurements/widgets/forms.dart';
@@ -46,106 +47,115 @@ class MeasurementEntriesScreen extends ConsumerStatefulWidget {
 
 class _MeasurementEntriesScreenState extends ConsumerState<MeasurementEntriesScreen> {
   late final String _categoryId;
-  late final Stream<MeasurementCategory?> _categoryStream;
   bool _initialised = false;
 
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    // Initialise once, the route argument and notifier don't change for the
-    // lifetime of this screen, so we must not recreate the stream on every build
+    // Initialise once, the route argument doesn't change for the lifetime of
+    // this screen
     if (!_initialised) {
       _categoryId = ModalRoute.of(context)!.settings.arguments as String;
-      _categoryStream = ref.read(measurementProvider.notifier).watchCategoryById(_categoryId);
       _initialised = true;
     }
   }
 
   @override
   Widget build(BuildContext context) {
-    return StreamBuilder<MeasurementCategory?>(
-      stream: _categoryStream,
-      builder: (context, snapshot) {
-        if (snapshot.connectionState == ConnectionState.waiting) {
-          return const BoxedProgressIndicator();
-        }
-        if (snapshot.hasError) {
-          return StreamErrorIndicator(snapshot.error.toString());
-        }
+    final categoryValue = ref.watch(measurementCategoryProvider(_categoryId));
 
-        // Category was deleted (locally or via PowerSync from another device).
-        // Leave this now-stale screen.
-        final category = snapshot.data;
-        if (category == null) {
-          return objectGoneRedirect(context);
-        }
+    // Category was deleted (locally or via PowerSync from another device).
+    // Leave this now-stale screen.
+    if (categoryValue.hasValue && categoryValue.value == null) {
+      return objectGoneRedirect(context);
+    }
+
+    final category = categoryValue.value;
 
-        return Scaffold(
-          appBar: AppBar(
-            title: Text(category.name),
-            actions: [
-              PopupMenuButton<MeasurementOptions>(
-                icon: const Icon(Icons.more_vert),
-                onSelected: (value) {
-                  switch (value) {
-                    case MeasurementOptions.edit:
-                      Navigator.pushNamed(
-                        context,
-                        FormScreen.routeName,
-                        arguments: FormScreenArguments(
-                          AppLocalizations.of(context).edit,
-                          MeasurementCategoryForm(category),
-                        ),
-                      );
-                      break;
+    // The scaffold is built whether or not there is data: a bare indicator in
+    // its place is a screen without a background, i.e. a black flash
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(category?.displayName(context) ?? ''),
+        actions: [
+          if (category != null)
+            PopupMenuButton<MeasurementOptions>(
+              icon: const Icon(Icons.more_vert),
+              onSelected: (value) {
+                switch (value) {
+                  case MeasurementOptions.edit:
+                    Navigator.pushNamed(
+                      context,
+                      FormScreen.routeName,
+                      arguments: FormScreenArguments(
+                        AppLocalizations.of(context).edit,
+                        MeasurementCategoryForm(category),
+                      ),
+                    );
+                    break;
 
-                    case MeasurementOptions.delete:
-                      showConfirmDeleteDialog(
-                        context,
-                        itemName: category.name,
-                        onConfirm: () =>
-                            ref.read(measurementProvider.notifier).deleteCategory(category.id!),
-                        // Exit the detail screen once the category is gone.
-                        onDeleted: () => Navigator.of(context).pop(),
-                      );
-                      break;
-                  }
-                },
-                itemBuilder: (context) {
-                  return [
+                  case MeasurementOptions.delete:
+                    showConfirmDeleteDialog(
+                      context,
+                      itemName: category.displayName(context),
+                      onConfirm: () =>
+                          ref.read(measurementProvider.notifier).deleteCategory(category.id!),
+                      // Exit the detail screen once the category is gone.
+                      onDeleted: () => Navigator.of(context).pop(),
+                    );
+                    break;
+                }
+              },
+              itemBuilder: (context) {
+                return [
+                  if (category.isEditable)
                     PopupMenuItem<MeasurementOptions>(
                       value: MeasurementOptions.edit,
                       child: Text(AppLocalizations.of(context).edit),
                     ),
-                    PopupMenuItem<MeasurementOptions>(
-                      value: MeasurementOptions.delete,
-                      child: Text(AppLocalizations.of(context).delete),
-                    ),
-                  ];
-                },
-              ),
-            ],
-          ),
-          floatingActionButton: FloatingActionButton(
-            child: const Icon(Icons.add, color: Colors.white),
-            onPressed: () {
-              Navigator.pushNamed(
-                context,
-                FormScreen.routeName,
-                arguments: FormScreenArguments(
-                  AppLocalizations.of(context).newEntry,
-                  MeasurementEntryForm(_categoryId),
-                ),
-              );
-            },
-          ),
-          body: WidescreenWrapper(
-            child: SingleChildScrollView(
-              child: EntriesList(category),
+                  PopupMenuItem<MeasurementOptions>(
+                    value: MeasurementOptions.delete,
+                    child: Text(AppLocalizations.of(context).delete),
+                  ),
+                ];
+              },
+            ),
+        ],
+      ),
+      floatingActionButton: category == null
+          ? null
+          : FloatingActionButton(
+              child: const Icon(Icons.add, color: Colors.white),
+              onPressed: () {
+                Navigator.pushNamed(
+                  context,
+                  FormScreen.routeName,
+                  arguments: FormScreenArguments(
+                    AppLocalizations.of(context).newEntry,
+                    // A group holds no entries itself: one reading is a value
+                    // per component, entered in one go
+                    category.hasChildren
+                        ? GroupMeasurementEntryForm(category)
+                        : MeasurementEntryForm(_categoryId),
+                  ),
+                );
+              },
+            ),
+      body: WidescreenWrapper(
+        child: switch ((category, categoryValue)) {
+          (final MeasurementCategory category, _) => SingleChildScrollView(
+            child: EntriesList(
+              category,
+              // Shared with the overview: the range picked there follows the
+              // user in here, and a pick here follows them back out
+              range: ref.watch(chartRangeSettingProvider),
+              onRangeChanged: (range) => ref.read(chartRangeSettingProvider.notifier).set(range),
             ),
           ),
-        );
-      },
+          (_, AsyncError(:final error)) => StreamErrorIndicator(error.toString()),
+          _ => const BoxedProgressIndicator(),
+        },
+      ),
     );
   }
 }
diff --git a/lib/features/measurements/screens/weight_screen.dart b/lib/features/measurements/screens/weight_screen.dart
new file mode 100644
index 000000000..9191dc533
--- /dev/null
+++ b/lib/features/measurements/screens/weight_screen.dart
@@ -0,0 +1,91 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c)  2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:wger/core/form_screen.dart';
+import 'package:wger/core/wide_screen_wrapper.dart';
+import 'package:wger/core/widgets/app_bar.dart';
+import 'package:wger/core/widgets/progress_indicator.dart';
+import 'package:wger/features/account/providers/user_profile_notifier.dart';
+import 'package:wger/features/measurements/models/unit_conversion.dart';
+import 'package:wger/features/measurements/providers/body_weight_provider.dart';
+import 'package:wger/features/measurements/providers/chart_range_setting.dart';
+import 'package:wger/features/measurements/widgets/charts.dart';
+import 'package:wger/features/measurements/widgets/entries.dart';
+import 'package:wger/features/measurements/widgets/weight_form.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+/// Body weight, presented as its own tab.
+///
+/// The data is the official body weight category, so this is [EntriesList]
+/// over it. What the category alone does not say is presentation: the values
+/// are shown in the profile unit (entries can be stored in kg or lb), the
+/// title is translated rather than taken from the server-created category, and
+/// the entry form is the one with the quick steppers.
+class WeightScreen extends ConsumerWidget {
+  const WeightScreen();
+
+  static const routeName = '/weight';
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final i18n = AppLocalizations.of(context);
+    // New entries need the official category, which the server creates and the
+    // initial sync delivers; hide the FAB until it is there.
+    final category = ref.watch(bodyWeightCategoryOnlyProvider).value;
+    // The profile decides the display unit, so nothing can be drawn without it
+    final profile = ref.watch(userProfileProvider).value;
+
+    return Scaffold(
+      appBar: EmptyAppBar(i18n.weight),
+      floatingActionButton: category == null
+          ? null
+          : FloatingActionButton(
+              child: const Icon(Icons.add, color: Colors.white),
+              onPressed: () {
+                Navigator.pushNamed(
+                  context,
+                  FormScreen.routeName,
+                  arguments: FormScreenArguments(
+                    i18n.newEntry,
+                    WeightForm(category),
+                  ),
+                );
+              },
+            ),
+      body: WidescreenWrapper(
+        child: SingleChildScrollView(
+          child: category == null || profile == null
+              ? const BoxedProgressIndicator()
+              : EntriesList(
+                  category,
+                  // Shared with the whole measurements tab, see ChartRangeSetting
+                  range: ref.watch(chartRangeSettingProvider),
+                  onRangeChanged: (range) =>
+                      ref.read(chartRangeSettingProvider.notifier).set(range),
+                  title: i18n.weight,
+                  displayUnit: weightDisplayUnit(profile.isMetric),
+                  displayUnitLabel: weightUnit(profile.isMetric, context),
+                  editFormBuilder: (entry) => WeightForm(category, entry),
+                ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/features/measurements/widgets/categories.dart b/lib/features/measurements/widgets/categories.dart
index 585f6a631..9405dc966 100644
--- a/lib/features/measurements/widgets/categories.dart
+++ b/lib/features/measurements/widgets/categories.dart
@@ -19,23 +19,106 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:wger/core/widgets/async_value_widget.dart';
+import 'package:wger/features/account/providers/user_profile_notifier.dart';
+import 'package:wger/features/measurements/charts/range.dart';
 import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/unit_conversion.dart';
+import 'package:wger/features/measurements/providers/body_weight_provider.dart';
+import 'package:wger/features/measurements/providers/chart_range_setting.dart';
 import 'package:wger/features/measurements/providers/measurement_notifier.dart';
+import 'package:wger/features/measurements/screens/weight_screen.dart';
+import 'package:wger/features/measurements/widgets/chart_range_selector.dart';
+import 'package:wger/features/measurements/widgets/charts.dart';
+import 'package:wger/features/measurements/widgets/measurement_tile.dart';
+import 'package:wger/features/measurements/widgets/weight_form.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
 
 import 'categories_card.dart';
 
 class CategoriesList extends ConsumerWidget {
   const CategoriesList();
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    // One range for the whole screen, shared with the detail screens through
+    // the provider: picking it per card would put three buttons on every tile
+    final range = ref.watch(chartRangeSettingProvider);
+
     return AsyncValueWidget<List<MeasurementCategory>>(
-      value: ref.watch(measurementProvider),
+      // The categories alone: the cards read what they draw through the
+      // aggregated queries
+      value: ref.watch(measurementCategoriesProvider),
       loggerName: 'CategoriesList',
-      data: (categoriesList) => ListView.builder(
-        padding: const EdgeInsets.all(10.0),
-        itemCount: categoriesList.length,
-        itemBuilder: (context, index) => CategoriesCard(categoriesList[index]),
-      ),
+      data: (categoriesList) {
+        // Children of multi-value groups are rendered inside their parent's
+        // tile, not as own grid items. Body weight keeps its full card on top
+        // of the grid instead of becoming a tile among the others.
+        final topLevel = categoriesList
+            .where((c) => c.parentId == null && !c.isOfficialBodyWeight)
+            .toList();
+        final weightCard = _weightCard(context, ref, range);
+
+        return Column(
+          children: [
+            const SizedBox(height: 10),
+            ChartRangeSelector(
+              value: range,
+              onChanged: (range) => ref.read(chartRangeSettingProvider.notifier).set(range),
+            ),
+            Expanded(
+              child: CustomScrollView(
+                slivers: [
+                  if (weightCard != null)
+                    SliverPadding(
+                      padding: const EdgeInsets.all(10),
+                      sliver: SliverToBoxAdapter(child: weightCard),
+                    ),
+                  SliverPadding(
+                    padding: const EdgeInsets.symmetric(horizontal: 10),
+                    sliver: SliverGrid(
+                      gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                        crossAxisCount: 2,
+                        mainAxisExtent: measurementTileExtent,
+                        mainAxisSpacing: 10,
+                        crossAxisSpacing: 10,
+                      ),
+                      delegate: SliverChildBuilderDelegate(
+                        (context, index) => MeasurementTile(topLevel[index], range: range),
+                        childCount: topLevel.length,
+                      ),
+                    ),
+                  ),
+                  // Keeps the last row clear of the FAB
+                  const SliverToBoxAdapter(child: SizedBox(height: 88)),
+                ],
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  /// The body weight card, null while what it needs is still syncing.
+  ///
+  /// Presented like the weight screen it leads to rather than like the
+  /// category it is stored as: the values are shown in the profile unit
+  /// (entries can be stored in kg or lb) and entered with the quick steppers.
+  Widget? _weightCard(BuildContext context, WidgetRef ref, ChartRange range) {
+    final category = ref.watch(bodyWeightCategoryOnlyProvider).value;
+    final profile = ref.watch(userProfileProvider).value;
+    if (category == null || profile == null) {
+      return null;
+    }
+
+    return CategoriesCard(
+      category,
+      range: range,
+      title: AppLocalizations.of(context).weight,
+      displayUnit: weightDisplayUnit(profile.isMetric),
+      displayUnitLabel: weightUnit(profile.isMetric, context),
+      newEntryForm: WeightForm(category),
+      onShowDetails: () => Navigator.pushNamed(context, WeightScreen.routeName),
     );
   }
 }
diff --git a/lib/features/measurements/widgets/categories_card.dart b/lib/features/measurements/widgets/categories_card.dart
index b0d798ff1..63e85e4bd 100644
--- a/lib/features/measurements/widgets/categories_card.dart
+++ b/lib/features/measurements/widgets/categories_card.dart
@@ -16,9 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:wger/core/form_screen.dart';
+import 'package:wger/core/formatting/formatting.dart';
+import 'package:wger/features/measurements/charts/colors.dart';
+import 'package:wger/features/measurements/charts/data.dart';
+import 'package:wger/features/measurements/charts/range.dart';
+import 'package:wger/features/measurements/charts/series.dart';
 import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/unit_conversion.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.dart';
 import 'package:wger/features/measurements/screens/measurement_entries_screen.dart';
 import 'package:wger/features/measurements/widgets/helpers.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
@@ -26,17 +35,47 @@ import 'package:wger/l10n/generated/app_localizations.dart';
 import 'charts.dart';
 import 'forms.dart';
 
-class CategoriesCard extends StatelessWidget {
+class CategoriesCard extends ConsumerWidget {
   final MeasurementCategory currentCategory;
   final double? elevation;
+  final ChartRange range;
 
-  const CategoriesCard(this.currentCategory, {this.elevation});
+  /// Name the card is titled with, `category.displayName` by default. Body
+  /// weight is titled like the screen it leads to.
+  final String? title;
+
+  /// Unit the values are converted to, `category.unit` by default. Body weight
+  /// is shown in the profile unit, since its entries can be stored in either.
+  final String? displayUnit;
+
+  /// Label for [displayUnit], the unit itself by default. The two differ where
+  /// the unit is translated (kg reads كغم in Arabic).
+  final String? displayUnitLabel;
+
+  /// Form the add action opens, [MeasurementEntryForm] by default. Body weight
+  /// has one of its own, with quick steppers and a unit dropdown.
+  final Widget? newEntryForm;
+
+  /// What the detail link opens, the entries screen of the category by
+  /// default. Body weight has a screen of its own.
+  final VoidCallback? onShowDetails;
+
+  const CategoriesCard(
+    this.currentCategory, {
+    this.elevation,
+    this.range = defaultChartRange,
+    this.title,
+    this.displayUnit,
+    this.displayUnitLabel,
+    this.newEntryForm,
+    this.onShowDetails,
+  });
 
   @override
-  Widget build(BuildContext context) {
-    final (entriesAll, entries7dAvg) = sensibleRange(
-      currentCategory.entries.map((e) => MeasurementChartEntry(e.value, e.date)).toList(),
-    );
+  Widget build(BuildContext context, WidgetRef ref) {
+    if (currentCategory.hasChildren) {
+      return _buildGroupCard(context, ref);
+    }
 
     return Card(
       elevation: elevation,
@@ -47,28 +86,21 @@ class CategoriesCard extends StatelessWidget {
             Padding(
               padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
               child: Text(
-                currentCategory.name,
+                title ?? currentCategory.displayName(context),
                 style: Theme.of(context).textTheme.titleLarge,
                 textAlign: TextAlign.center,
                 maxLines: 2,
                 overflow: TextOverflow.ellipsis,
               ),
             ),
-            Container(
-              padding: const EdgeInsets.all(10),
-              height: 220,
-              child: MeasurementChartWidgetFl(
-                entriesAll,
-                currentCategory.unit,
-                avgs: entries7dAvg,
-              ),
+            MeasurementChartArea<List<MeasurementChartEntry>>(
+              identity: currentCategory.id!,
+              watch: (ref) => chartPointsFor(ref, currentCategory, range, targetUnit: displayUnit),
+              builder: _chart,
+              // The card is one of many on the overview; a failing query takes
+              // its chart, not the way into the category
+              onError: (_, _) => const [SizedBox(height: 220)],
             ),
-            if (entries7dAvg.isNotEmpty)
-              MeasurementOverallChangeWidget(
-                entries7dAvg.first,
-                entries7dAvg.last,
-                currentCategory.unit,
-              ),
             const Divider(),
             LayoutBuilder(
               builder: (context, constraints) {
@@ -80,14 +112,16 @@ class CategoriesCard extends StatelessWidget {
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
                         TextButton(
+                          onPressed:
+                              onShowDetails ??
+                              () {
+                                Navigator.pushNamed(
+                                  context,
+                                  MeasurementEntriesScreen.routeName,
+                                  arguments: currentCategory.id,
+                                );
+                              },
                           child: Text(AppLocalizations.of(context).goToDetailPage),
-                          onPressed: () {
-                            Navigator.pushNamed(
-                              context,
-                              MeasurementEntriesScreen.routeName,
-                              arguments: currentCategory.id,
-                            );
-                          },
                         ),
                         IconButton(
                           onPressed: () async {
@@ -96,7 +130,7 @@ class CategoriesCard extends StatelessWidget {
                               FormScreen.routeName,
                               arguments: FormScreenArguments(
                                 AppLocalizations.of(context).newEntry,
-                                MeasurementEntryForm(currentCategory.id!),
+                                newEntryForm ?? MeasurementEntryForm(currentCategory.id!),
                               ),
                             );
                           },
@@ -113,4 +147,184 @@ class CategoriesCard extends StatelessWidget {
       ),
     );
   }
+
+  /// The chart itself and the one-number change below it.
+  List<Widget> _chart(BuildContext context, List<MeasurementChartEntry> allPoints) {
+    final settings = currentCategory.chartSettings;
+    final (:entries, :average) = chartSeriesFor(allPoints, range, settings);
+    final unit = displayUnit ?? currentCategory.unit;
+    final unitLabel = displayUnitLabel ?? unit;
+
+    return [
+      Container(
+        padding: const EdgeInsets.all(10),
+        height: 220,
+        child: buildChartForMetricType(
+          currentCategory.metricType,
+          entries,
+          average,
+          unitLabel,
+          chartType: currentCategory.chartType,
+          settings: settings,
+          distribution: MeasurementDistributionChart(
+            category: currentCategory,
+            range: range,
+            unitLabel: unitLabel,
+            targetUnit: unit,
+          ),
+        ),
+      ),
+      if (average.isNotEmpty && !currentCategory.metricType.isSummedPerDay)
+        MeasurementOverallChangeWidget(
+          average.first,
+          average.last,
+          unitLabel,
+        ),
+    ];
+  }
+
+  /// The group's chart and one row per component with its latest reading.
+  List<Widget> _groupChartAndRows(
+    BuildContext context,
+    Map<String, List<MeasurementChartEntry>> points,
+  ) {
+    // A range is a single bar whose ends speak for themselves, and a stacked
+    // bar's segments carry the component colours; only the line chart needs
+    // the dots on the rows below to tie a component to its line.
+    final asRange = currentCategory.children.length == 2 && groupRangeEntries(points).isNotEmpty;
+    // The stacked chart draws only the components that are parts of the whole,
+    // so a row's colour has to come from that list rather than from its
+    // position among all children
+    final stacked = currentCategory.metricType.isSummedPerDay
+        ? stackableComponents(currentCategory)
+        : null;
+
+    return [
+      if (groupHasData(points))
+        Container(
+          padding: const EdgeInsets.all(10),
+          height: 220,
+          child: buildGroupChart(context, currentCategory, points),
+        ),
+      // One watch for all the rows: every emission rebuilds them together
+      // anyway. Read separately from the chart above, whose points cover the
+      // charted range, while a component measured less often than that still
+      // has a last known value worth showing.
+      Consumer(
+        builder: (context, ref, _) {
+          final latest = ref.watch(latestMeasurementEntriesProvider).value ?? const {};
+
+          return Column(
+            mainAxisSize: MainAxisSize.min,
+            children: currentCategory.children.mapIndexed((index, child) {
+              final colorIndex = stacked == null
+                  ? index
+                  : stacked.indexWhere((c) => c.id == child.id);
+              final value = latest[child.id];
+
+              return ListTile(
+                dense: true,
+                // The dot ties the row to its part of the chart above. A range
+                // is a single bar, where the ends speak for themselves, and a
+                // roll-up component is no segment of the stack.
+                leading: asRange || colorIndex < 0
+                    ? null
+                    : Container(
+                        width: 12,
+                        height: 12,
+                        decoration: BoxDecoration(
+                          shape: BoxShape.circle,
+                          color: componentColor(context, colorIndex),
+                        ),
+                      ),
+                title: Text(child.displayName(context)),
+                trailing: Text(
+                  value != null
+                      ? measurementWithUnit(
+                          context,
+                          value.valueIn(child.unit, categoryUnit: child.unit),
+                          child.unit,
+                          decimals: child.metricType.displayDecimals,
+                        )
+                      : '—',
+                  style: Theme.of(context).textTheme.bodyLarge,
+                ),
+                onTap: () => Navigator.pushNamed(
+                  context,
+                  MeasurementEntriesScreen.routeName,
+                  arguments: child.id,
+                ),
+              );
+            }).toList(),
+          );
+        },
+      ),
+    ];
+  }
+
+  /// Card for a multi-value group (e.g. blood pressure): all components in one
+  /// chart, then one row per component with its latest reading; new readings
+  /// are entered for all components at once.
+  Widget _buildGroupCard(BuildContext context, WidgetRef ref) {
+    return Card(
+      elevation: elevation,
+      // Scrolls like the leaf card above: a group of five components (the
+      // sleep stages) is taller than the box the dashboard carousel gives it
+      child: SingleChildScrollView(
+        scrollDirection: Axis.vertical,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
+              child: Text(
+                currentCategory.displayName(context),
+                style: Theme.of(context).textTheme.titleLarge,
+                textAlign: TextAlign.center,
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis,
+              ),
+            ),
+            MeasurementChartArea<Map<String, List<MeasurementChartEntry>>>(
+              identity: currentCategory.id!,
+              watch: (ref) => groupPointsFor(ref, currentCategory, range),
+              builder: _groupChartAndRows,
+              // The rows are the way into the components, so a failing query
+              // takes the chart above them and nothing else
+              onError: (context, _) => _groupChartAndRows(context, const {}),
+            ),
+            const Divider(),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                TextButton(
+                  child: Text(AppLocalizations.of(context).goToDetailPage),
+                  onPressed: () {
+                    Navigator.pushNamed(
+                      context,
+                      MeasurementEntriesScreen.routeName,
+                      arguments: currentCategory.id,
+                    );
+                  },
+                ),
+                IconButton(
+                  onPressed: () async {
+                    await Navigator.pushNamed(
+                      context,
+                      FormScreen.routeName,
+                      arguments: FormScreenArguments(
+                        AppLocalizations.of(context).newEntry,
+                        GroupMeasurementEntryForm(currentCategory),
+                      ),
+                    );
+                  },
+                  icon: const Icon(Icons.add),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
 }
diff --git a/lib/features/measurements/widgets/chart_range_selector.dart b/lib/features/measurements/widgets/chart_range_selector.dart
new file mode 100644
index 000000000..c6169cf67
--- /dev/null
+++ b/lib/features/measurements/widgets/chart_range_selector.dart
@@ -0,0 +1,50 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2020 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:wger/features/measurements/charts/range.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+/// Segmented buttons to pick the [ChartRange] the charts below cover.
+class ChartRangeSelector extends StatelessWidget {
+  final ChartRange value;
+  final ValueChanged<ChartRange> onChanged;
+
+  const ChartRangeSelector({required this.value, required this.onChanged, super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 15),
+      child: SingleChildScrollView(
+        scrollDirection: Axis.horizontal,
+        child: SegmentedButton<ChartRange>(
+          showSelectedIcon: false,
+          segments: [
+            for (final range in ChartRange.values)
+              ButtonSegment(value: range, label: Text(range.label(i18n))),
+          ],
+          selected: {value},
+          onSelectionChanged: (selection) => onChanged(selection.first),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/features/measurements/widgets/charts.dart b/lib/features/measurements/widgets/charts.dart
index f12762f01..9737a7c54 100644
--- a/lib/features/measurements/widgets/charts.dart
+++ b/lib/features/measurements/widgets/charts.dart
@@ -1,13 +1,13 @@
 /*
  * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
+ * Copyright (c) 2020 - 2026 wger Team
  *
  * wger Workout Manager is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * wger Workout Manager is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
@@ -16,275 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import 'package:fl_chart/fl_chart.dart';
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:wger/core/charts.dart';
-import 'package:wger/core/consts.dart';
-import 'package:wger/core/formatting/formatting.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
+/// The measurement chart widgets: the fl_chart ones, and the two that are
+/// painted by hand. What they draw is computed in `../charts/`.
+library;
 
-class MeasurementOverallChangeWidget extends StatelessWidget {
-  final MeasurementChartEntry _first;
-  final MeasurementChartEntry _last;
-  final String _unit;
-
-  const MeasurementOverallChangeWidget(this._first, this._last, this._unit);
-
-  @override
-  Widget build(BuildContext context) {
-    final delta = _last.value - _first.value;
-    String prefix = '';
-    if (delta > 0) {
-      prefix = '+';
-    } else if (delta < 0) {
-      prefix = '-';
-    }
-
-    return Text(
-      '${AppLocalizations.of(context).overallChangeWeight} '
-      '$prefix${delta.abs().toStringAsFixed(1)} $_unit',
-    );
-  }
-}
-
-String weightUnit(bool isMetric, BuildContext context) {
-  return isMetric ? AppLocalizations.of(context).kg : AppLocalizations.of(context).lb;
-}
-
-class MeasurementChartWidgetFl extends StatefulWidget {
-  final List<MeasurementChartEntry> _entries;
-  final List<MeasurementChartEntry>? avgs;
-  final String _unit;
-
-  const MeasurementChartWidgetFl(this._entries, this._unit, {this.avgs});
-
-  @override
-  State<MeasurementChartWidgetFl> createState() => _MeasurementChartWidgetFlState();
-}
-
-class _MeasurementChartWidgetFlState extends State<MeasurementChartWidgetFl> {
-  @override
-  Widget build(BuildContext context) {
-    return AspectRatio(
-      aspectRatio: 1.70,
-      child: Padding(
-        padding: const EdgeInsets.all(4),
-        child: LineChart(mainData()),
-      ),
-    );
-  }
-
-  LineTouchData tooltipData() {
-    return LineTouchData(
-      touchTooltipData: LineTouchTooltipData(
-        getTooltipColor: (touchedSpot) => Theme.of(context).colorScheme.primaryContainer,
-        getTooltipItems: (touchedSpots) {
-          final numberFormat = localizedNumberFormat(context);
-
-          return touchedSpots.map((touchedSpot) {
-            final msSinceEpoch = touchedSpot.x.toInt();
-            final DateTime date = DateTime.fromMillisecondsSinceEpoch(touchedSpot.x.toInt());
-            final dateStr = DateFormat.Md(
-              Localizations.localeOf(context).languageCode,
-            ).format(date);
-
-            // Check if this is an interpolated point (milliseconds ending with 123)
-            final bool isInterpolated = msSinceEpoch % 1000 == INTERPOLATION_MARKER;
-            final String interpolatedMarker = isInterpolated ? ' (interpolated)' : '';
-
-            return LineTooltipItem(
-              '$dateStr: ${numberFormat.format(touchedSpot.y)} ${widget._unit}$interpolatedMarker',
-              TextStyle(color: touchedSpot.bar.color),
-            );
-          }).toList();
-        },
-      ),
-    );
-  }
-
-  LineChartData mainData() {
-    final numberFormat = localizedNumberFormat(context);
-
-    return LineChartData(
-      lineTouchData: tooltipData(),
-      gridData: FlGridData(
-        show: true,
-        drawVerticalLine: true,
-        // horizontalInterval: 1,
-        // verticalInterval: 1,
-        getDrawingHorizontalLine: (value) {
-          return FlLine(color: Theme.of(context).colorScheme.outlineVariant, strokeWidth: 1);
-        },
-        getDrawingVerticalLine: (value) {
-          return FlLine(color: Theme.of(context).colorScheme.outlineVariant, strokeWidth: 1);
-        },
-      ),
-      titlesData: FlTitlesData(
-        show: true,
-        rightTitles: const AxisTitles(
-          sideTitles: SideTitles(showTitles: false),
-        ),
-        topTitles: const AxisTitles(
-          sideTitles: SideTitles(showTitles: false),
-        ),
-        bottomTitles: AxisTitles(
-          sideTitles: SideTitles(
-            showTitles: true,
-            getTitlesWidget: (value, meta) {
-              // Don't show the first and last entries, to avoid overlap
-              // see https://stackoverflow.com/questions/73355777/flutter-fl-chart-how-can-we-avoid-the-overlap-of-the-ordinate
-              // this is needlessly aggressive if the titles are "sparse", but we should optimize for more busy data
-              if (value == meta.min || value == meta.max) {
-                return const Text('');
-              }
-              final DateTime date = DateTime.fromMillisecondsSinceEpoch(value.toInt());
-              // if we go across years, show years in the ticks. otherwise leave them out
-              if (DateTime.fromMillisecondsSinceEpoch(meta.min.toInt()).year !=
-                  DateTime.fromMillisecondsSinceEpoch(meta.max.toInt()).year) {
-                return Text(
-                  localizedDate(context).format(date),
-                );
-              }
-              return Text(
-                DateFormat.Md(Localizations.localeOf(context).languageCode).format(date),
-              );
-            },
-            interval: widget._entries.isNotEmpty
-                ? chartGetInterval(
-                    widget._entries.last.date,
-                    widget._entries.first.date,
-                  )
-                : CHART_MILLISECOND_FACTOR,
-          ),
-        ),
-        leftTitles: AxisTitles(
-          sideTitles: SideTitles(
-            showTitles: true,
-            reservedSize: 65,
-            getTitlesWidget: (value, meta) {
-              // Don't show the first and last entries, to avoid overlap
-              // see https://stackoverflow.com/questions/73355777/flutter-fl-chart-how-can-we-avoid-the-overlap-of-the-ordinate
-              // this is needlessly aggressive if the titles are "sparse", but we should optimize for more busy data
-              if (value == meta.min || value == meta.max) {
-                return const Text('');
-              }
-
-              return Text('${numberFormat.format(value)} ${widget._unit}');
-            },
-          ),
-        ),
-      ),
-      borderData: FlBorderData(
-        show: true,
-        border: Border.all(color: Theme.of(context).colorScheme.outlineVariant),
-      ),
-      lineBarsData: [
-        LineChartBarData(
-          spots: widget._entries
-              .map(
-                (e) => FlSpot(
-                  e.date.millisecondsSinceEpoch.toDouble(),
-                  e.value.toDouble(),
-                ),
-              )
-              .toList(),
-          isCurved: false,
-          color: Theme.of(context).colorScheme.primary,
-          barWidth: 0,
-          isStrokeCapRound: true,
-          dotData: const FlDotData(show: true),
-        ),
-        if (widget.avgs != null)
-          LineChartBarData(
-            spots: widget.avgs!
-                .map(
-                  (e) => FlSpot(
-                    e.date.millisecondsSinceEpoch.toDouble(),
-                    e.value.toDouble(),
-                  ),
-                )
-                .toList(),
-            isCurved: false,
-            color: Theme.of(context).colorScheme.tertiary,
-            barWidth: 1,
-            dotData: const FlDotData(show: false),
-          ),
-      ],
-    );
-  }
-}
-
-class MeasurementChartEntry {
-  num value;
-  DateTime date;
-
-  MeasurementChartEntry(this.value, this.date);
-}
-
-// for each point, return the average of all the points in the 7 days preceding it
-List<MeasurementChartEntry> moving7dAverage(List<MeasurementChartEntry> vals) {
-  var start = 0;
-  var end = 0;
-  final List<MeasurementChartEntry> out = <MeasurementChartEntry>[];
-
-  // first make sure our list is in ascending order
-  vals.sort((a, b) => a.date.compareTo(b.date));
-
-  while (end < vals.length) {
-    // since users can log measurements several days, or minutes apart,
-    // we can't make assumptions.  We have to manually advance 'start'
-    // such that it is always the first point within our desired range.
-    // posibly start == end (when there is only one point in the range)
-    final intervalStart = vals[end].date.subtract(const Duration(days: 7));
-    while (start < end && vals[start].date.isBefore(intervalStart)) {
-      start++;
-    }
-
-    final sub = vals.sublist(start, end + 1).map((e) => e.value);
-    final sum = sub.reduce((val, el) => val + el);
-    out.add(MeasurementChartEntry(sum / sub.length, vals[end].date));
-
-    end++;
-  }
-  return out;
-}
-
-class Indicator extends StatelessWidget {
-  const Indicator({
-    super.key,
-    required this.color,
-    required this.text,
-    required this.isSquare,
-    this.size = 16,
-    this.marginRight = 15,
-    this.textColor,
-  });
-
-  final Color color;
-  final String text;
-  final bool isSquare;
-  final double size;
-  final double marginRight;
-  final Color? textColor;
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        Container(
-          width: size,
-          height: size,
-          decoration: BoxDecoration(
-            shape: isSquare ? BoxShape.rectangle : BoxShape.circle,
-            color: color,
-          ),
-        ),
-        const SizedBox(width: 4),
-        Text(text, style: TextStyle(color: textColor)),
-        SizedBox(width: marginRight),
-      ],
-    );
-  }
-}
+export 'charts/chart_widgets.dart';
+export 'charts/distribution_chart.dart';
+export 'charts/heatmap_chart.dart';
+export 'charts/spark_charts.dart';
diff --git a/lib/features/measurements/widgets/charts/chart_widgets.dart b/lib/features/measurements/widgets/charts/chart_widgets.dart
new file mode 100644
index 000000000..7ae2988ec
--- /dev/null
+++ b/lib/features/measurements/widgets/charts/chart_widgets.dart
@@ -0,0 +1,786 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2020 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'dart:math';
+
+import 'package:collection/collection.dart';
+import 'package:fl_chart/fl_chart.dart';
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:wger/core/charts.dart';
+import 'package:wger/core/consts.dart';
+import 'package:wger/core/formatting/formatting.dart';
+import 'package:wger/features/measurements/charts/colors.dart';
+import 'package:wger/features/measurements/charts/data.dart';
+import 'package:wger/features/measurements/charts/series.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+/// Number of dates to label on the x axis
+const X_LABEL_COUNT = 4;
+
+/// Widest a single bar gets, for charts with only a handful of entries
+const MAX_BAR_WIDTH = 12.0;
+
+const _hiddenTitles = AxisTitles(sideTitles: SideTitles(showTitles: false));
+
+class MeasurementOverallChangeWidget extends StatelessWidget {
+  final MeasurementChartEntry _first;
+  final MeasurementChartEntry _last;
+  final String _unit;
+
+  const MeasurementOverallChangeWidget(this._first, this._last, this._unit);
+
+  @override
+  Widget build(BuildContext context) {
+    final delta = _last.value - _first.value;
+    String prefix = '';
+    if (delta > 0) {
+      prefix = '+';
+    } else if (delta < 0) {
+      prefix = '-';
+    }
+
+    return Text(
+      '${AppLocalizations.of(context).overallChangeWeight} '
+      '$prefix${measurementWithUnit(context, delta.abs(), _unit)}',
+    );
+  }
+}
+
+String weightUnit(bool isMetric, BuildContext context) {
+  return isMetric ? AppLocalizations.of(context).kg : AppLocalizations.of(context).lb;
+}
+
+/// Y-axis tick label that never wraps: a long value+unit combination shrinks
+/// to fit the reserved width instead of breaking into overlapping lines.
+class _YAxisLabel extends StatelessWidget {
+  const _YAxisLabel(this.text);
+
+  final String text;
+
+  @override
+  Widget build(BuildContext context) {
+    return FittedBox(
+      fit: BoxFit.scaleDown,
+      child: Text(text, maxLines: 1),
+    );
+  }
+}
+
+/// The value axis, drawn the same way by every chart of the set.
+AxisTitles _valueTitles(BuildContext context, String unit, double? interval) => AxisTitles(
+  sideTitles: SideTitles(
+    showTitles: true,
+    reservedSize: 65,
+    interval: interval,
+    getTitlesWidget: (value, meta) {
+      // Don't show the first and last entries, to avoid overlap
+      // see https://stackoverflow.com/questions/73355777/flutter-fl-chart-how-can-we-avoid-the-overlap-of-the-ordinate
+      // this is needlessly aggressive if the titles are "sparse", but we should optimize for more busy data
+      if (value == meta.min || value == meta.max) {
+        return const Text('');
+      }
+
+      return _YAxisLabel(measurementWithUnit(context, value, unit));
+    },
+  ),
+);
+
+/// The date axis of the bar charts, which draw one title per group: their x
+/// value is a position in [dates] rather than a timestamp, so thinning the
+/// labels out has to happen here.
+AxisTitles _dateIndexTitles(BuildContext context, List<DateTime> dates) {
+  final labelStep = max(1, (dates.length / X_LABEL_COUNT).ceil());
+  // keep the labels away from the chart edges
+  final labelOffset = labelStep ~/ 2;
+  final spansYears = dates.isNotEmpty && dates.first.year != dates.last.year;
+
+  return AxisTitles(
+    sideTitles: SideTitles(
+      showTitles: true,
+      getTitlesWidget: (value, meta) {
+        final index = value.toInt();
+        if (index < 0 || index >= dates.length) {
+          return const Text('');
+        }
+        if ((index - labelOffset) % labelStep != 0) {
+          return const Text('');
+        }
+        // if we go across years, show years in the ticks. otherwise leave them out
+        final date = dates[index];
+        if (spansYears) {
+          return Text(localizedDate(context).format(date));
+        }
+        return Text(DateFormat.Md(Localizations.localeOf(context).languageCode).format(date));
+      },
+    ),
+  );
+}
+
+/// Bar width in pixels: the bars share the available width and keep a gap
+/// between them, but never go below a hairline. Without it a couple of months
+/// of readings overlap into a solid block.
+double _barWidth(int count, double availableWidth) =>
+    count == 0 ? MAX_BAR_WIDTH : (availableWidth / count * 0.7).clamp(1.0, MAX_BAR_WIDTH);
+
+/// Horizontal lines only: a vertical one per bar would only repeat the bars.
+FlGridData _barGrid(BuildContext context) => FlGridData(
+  show: true,
+  drawVerticalLine: false,
+  getDrawingHorizontalLine: (value) =>
+      FlLine(color: Theme.of(context).colorScheme.primaryContainer, strokeWidth: 1),
+);
+
+FlBorderData _barBorder(BuildContext context) => FlBorderData(
+  show: true,
+  border: Border.all(color: Theme.of(context).colorScheme.primaryContainer),
+);
+
+/// A series resolved into what fl_chart needs: the line itself plus, for range
+/// series, the two invisible bounds the band is painted between.
+class _ResolvedSeries {
+  _ResolvedSeries(this.line, this.label, {this.bounds});
+
+  final LineChartBarData line;
+  final String? label;
+  final (LineChartBarData, LineChartBarData)? bounds;
+}
+
+class MeasurementChartWidgetFl extends StatelessWidget {
+  /// Radius of a dot on a chart with room to spare
+  static const MAX_DOT_RADIUS = 4.0;
+
+  final List<MeasurementChartSeries> _series;
+  final String _unit;
+  final List<PlanPeriod> _planPeriods;
+
+  const MeasurementChartWidgetFl(
+    this._series,
+    this._unit, {
+    List<PlanPeriod> planPeriods = const [],
+    super.key,
+  }) : _planPeriods = planPeriods;
+
+  /// The usual single-measurement chart: the values plus their average and
+  /// trend line.
+  MeasurementChartWidgetFl.singleMeasurement(
+    List<MeasurementChartEntry> entries,
+    String unit, {
+    List<MeasurementChartEntry>? avgs,
+    List<MeasurementChartEntry>? trend,
+    List<PlanPeriod> planPeriods = const [],
+    super.key,
+  }) : _unit = unit,
+       _planPeriods = planPeriods,
+       _series = [
+         MeasurementChartSeries(entries, MeasurementSeriesRole.raw),
+         if (avgs != null) MeasurementChartSeries(avgs, MeasurementSeriesRole.average),
+         if (trend != null && trend.isNotEmpty)
+           MeasurementChartSeries(trend, MeasurementSeriesRole.trend),
+       ];
+
+  /// All points of all series, for the shared axis calculations.
+  List<MeasurementChartEntry> get _allEntries => _series.expand((s) => s.entries).toList();
+
+  @override
+  Widget build(BuildContext context) {
+    return AspectRatio(
+      aspectRatio: 1.70,
+      child: Padding(
+        padding: const EdgeInsets.all(4),
+        // Dot size is in pixels, so it has to follow from how many points
+        // share the available space, otherwise they merge into a blob
+        child: LayoutBuilder(
+          builder: (context, constraints) => LineChart(mainData(context, constraints.maxWidth)),
+        ),
+      ),
+    );
+  }
+
+  /// Dots shrink as points get denser, so they stay distinguishable instead of
+  /// overdrawing each other.
+  FlDotData _dotData(double availableWidth) {
+    final count = _series.map((s) => s.entries.length).fold(0, max);
+    if (count == 0) {
+      return const FlDotData(show: true);
+    }
+
+    final radius = (availableWidth / count / 2).clamp(0.5, MAX_DOT_RADIUS);
+    return FlDotData(
+      show: true,
+      getDotPainter: (spot, percent, barData, index) =>
+          FlDotCirclePainter(radius: radius, color: barData.color ?? Colors.transparent),
+    );
+  }
+
+  List<FlSpot> _spots(
+    List<MeasurementChartEntry> entries, [
+    num Function(MeasurementChartEntry)? y,
+  ]) => entries
+      .map(
+        (e) => FlSpot(
+          e.date.millisecondsSinceEpoch.toDouble(),
+          (y == null ? e.value : y(e)).toDouble(),
+        ),
+      )
+      .toList();
+
+  /// Turns the series into fl_chart lines, styled by their role.
+  List<_ResolvedSeries> _resolveSeries(BuildContext context, double availableWidth) {
+    final scheme = Theme.of(context).colorScheme;
+    final dots = _dotData(availableWidth);
+    var componentIndex = 0;
+
+    return _series.map((series) {
+      final spots = _spots(series.entries);
+      final LineChartBarData line;
+
+      switch (series.role) {
+        case MeasurementSeriesRole.raw:
+          line = LineChartBarData(
+            spots: spots,
+            isCurved: false,
+            color: scheme.primary,
+            barWidth: 0,
+            isStrokeCapRound: true,
+            dotData: dots,
+          );
+        case MeasurementSeriesRole.average:
+          line = LineChartBarData(
+            spots: spots,
+            isCurved: false,
+            color: scheme.tertiary,
+            barWidth: 1,
+            dotData: const FlDotData(show: false),
+          );
+        case MeasurementSeriesRole.trend:
+          line = LineChartBarData(
+            spots: spots,
+            isCurved: true,
+            curveSmoothness: 0.4,
+            color: scheme.secondary,
+            barWidth: 3,
+            dotData: const FlDotData(show: false),
+          );
+        case MeasurementSeriesRole.component:
+          line = LineChartBarData(
+            spots: spots,
+            isCurved: false,
+            color: componentColor(context, componentIndex++),
+            barWidth: 2,
+            isStrokeCapRound: true,
+            dotData: dots,
+          );
+      }
+
+      // Points that summarise a range get a band between their bounds. The
+      // bounds themselves are invisible; only the fill between them shows.
+      //
+      // Only for the measured series: a band says "this is the spread of the
+      // measurements", which a derived line has none of. Condensing attaches a
+      // range to every point, so an average that got downsampled along with
+      // its values would otherwise be given a second band of its own.
+      final carriesSpread =
+          series.role == MeasurementSeriesRole.raw ||
+          series.role == MeasurementSeriesRole.component;
+      final ranged = carriesSpread
+          ? series.entries.where((e) => e.hasRange).toList()
+          : const <MeasurementChartEntry>[];
+      return _ResolvedSeries(
+        line,
+        series.label,
+        bounds: ranged.length == series.entries.length && ranged.isNotEmpty
+            ? (
+                LineChartBarData(
+                  spots: _spots(ranged, (e) => e.min!),
+                  color: Colors.transparent,
+                  barWidth: 0,
+                  dotData: const FlDotData(show: false),
+                ),
+                LineChartBarData(
+                  spots: _spots(ranged, (e) => e.max!),
+                  color: Colors.transparent,
+                  barWidth: 0,
+                  dotData: const FlDotData(show: false),
+                ),
+              )
+            : null,
+      );
+    }).toList();
+  }
+
+  /// Names of the plans whose period contains [date].
+  List<String> _planNamesAt(DateTime date) => [
+    for (final p in _planPeriods)
+      if (!date.isBefore(p.range.start) && !date.isAfter(p.range.end)) p.name,
+  ];
+
+  /// The plan periods as translucent full-height bands, clamped to the span
+  /// of the data so they never draw outside the axes.
+  RangeAnnotations _planBands(BuildContext context, List<DateTime> dates) {
+    if (dates.isEmpty || _planPeriods.isEmpty) {
+      return const RangeAnnotations();
+    }
+
+    final bounds = DateTimeRange(start: dates.first, end: dates.last);
+    return RangeAnnotations(
+      verticalRangeAnnotations: [
+        for (final range in clampPeriods([for (final p in _planPeriods) p.range], bounds))
+          VerticalRangeAnnotation(
+            x1: range.start.millisecondsSinceEpoch.toDouble(),
+            x2: range.end.millisecondsSinceEpoch.toDouble(),
+            color: planBandColor(context),
+          ),
+      ],
+    );
+  }
+
+  /// [hidden] holds the indices of the invisible band bounds, which must not
+  /// show up as tooltip lines; [labels] names the series that have a name.
+  LineTouchData tooltipData(BuildContext context, Set<int> hidden, Map<int, String?> labels) {
+    return LineTouchData(
+      touchTooltipData: LineTouchTooltipData(
+        // Kept inside the chart, else the points near an edge show a tooltip
+        // that is cut off by it, or lies outside it entirely
+        fitInsideHorizontally: true,
+        fitInsideVertically: true,
+        getTooltipColor: (touchedSpot) => Theme.of(context).colorScheme.primaryContainer,
+        getTooltipItems: (touchedSpots) {
+          // The plan context belongs to the touched date, not to a series, so
+          // it goes below the last tooltip line instead of onto every line
+          final lastVisible = touchedSpots.lastWhereOrNull(
+            (s) => !hidden.contains(s.barIndex),
+          );
+
+          return touchedSpots.map((touchedSpot) {
+            if (hidden.contains(touchedSpot.barIndex)) {
+              return null;
+            }
+            final msSinceEpoch = touchedSpot.x.toInt();
+            final DateTime date = DateTime.fromMillisecondsSinceEpoch(touchedSpot.x.toInt());
+            final dateStr = DateFormat.Md(
+              Localizations.localeOf(context).languageCode,
+            ).format(date);
+
+            // Check if this is an interpolated point (milliseconds ending with 123)
+            final bool isInterpolated = msSinceEpoch % 1000 == INTERPOLATION_MARKER;
+            final String interpolatedMarker = isInterpolated ? ' (interpolated)' : '';
+            final label = labels[touchedSpot.barIndex];
+            final prefix = label == null ? '' : '$label ';
+
+            final planNames = identical(touchedSpot, lastVisible)
+                ? _planNamesAt(date)
+                : const <String>[];
+            return LineTooltipItem(
+              '$prefix$dateStr: '
+              '${measurementWithUnit(context, touchedSpot.y, _unit)}$interpolatedMarker',
+              TextStyle(color: touchedSpot.bar.color),
+              children: [
+                for (final name in planNames)
+                  TextSpan(
+                    text: '\n$name',
+                    style: TextStyle(color: Theme.of(context).colorScheme.onPrimaryContainer),
+                  ),
+              ],
+            );
+          }).toList();
+        },
+      ),
+    );
+  }
+
+  LineChartData mainData(BuildContext context, double availableWidth) {
+    final allEntries = _allEntries;
+    final dates = allEntries.map((e) => e.date).toList()..sort();
+
+    // The bounds of a band reach past the line they wrap, so the axis follows
+    // every value that is drawn, not just the plotted ones
+    final drawn = <num>[
+      for (final entry in allEntries) ...[
+        entry.value,
+        if (entry.min != null) entry.min!,
+        if (entry.max != null) entry.max!,
+      ],
+    ];
+    final yAxis = drawn.isEmpty ? null : durationAxis(_unit, drawn.reduce(min), drawn.reduce(max));
+
+    // Flatten the series into fl_chart's flat bar list, remembering which
+    // indices are band bounds (invisible) and which carry a name.
+    final bars = <LineChartBarData>[];
+    final bands = <BetweenBarsData>[];
+    final hidden = <int>{};
+    final labels = <int, String?>{};
+    for (final resolved in _resolveSeries(context, availableWidth)) {
+      if (resolved.bounds != null) {
+        final lower = bars.length;
+        bars.add(resolved.bounds!.$1);
+        final upper = bars.length;
+        bars.add(resolved.bounds!.$2);
+        hidden
+          ..add(lower)
+          ..add(upper);
+        bands.add(
+          BetweenBarsData(
+            fromIndex: lower,
+            toIndex: upper,
+            color: resolved.line.color?.withValues(alpha: 0.15),
+          ),
+        );
+      }
+      labels[bars.length] = resolved.label;
+      bars.add(resolved.line);
+    }
+
+    return LineChartData(
+      minY: yAxis?.min,
+      maxY: yAxis?.max,
+      lineTouchData: tooltipData(context, hidden, labels),
+      betweenBarsData: bands,
+      rangeAnnotations: _planBands(context, dates),
+      gridData: FlGridData(
+        show: true,
+        drawVerticalLine: true,
+        getDrawingHorizontalLine: (value) {
+          return FlLine(color: Theme.of(context).colorScheme.outlineVariant, strokeWidth: 1);
+        },
+        getDrawingVerticalLine: (value) {
+          return FlLine(color: Theme.of(context).colorScheme.outlineVariant, strokeWidth: 1);
+        },
+      ),
+      titlesData: FlTitlesData(
+        show: true,
+        rightTitles: _hiddenTitles,
+        topTitles: _hiddenTitles,
+        bottomTitles: AxisTitles(
+          sideTitles: SideTitles(
+            showTitles: true,
+            getTitlesWidget: (value, meta) {
+              // Don't show the first and last entries, to avoid overlap
+              // see https://stackoverflow.com/questions/73355777/flutter-fl-chart-how-can-we-avoid-the-overlap-of-the-ordinate
+              // this is needlessly aggressive if the titles are "sparse", but we should optimize for more busy data
+              if (value == meta.min || value == meta.max) {
+                return const Text('');
+              }
+              final DateTime date = DateTime.fromMillisecondsSinceEpoch(value.toInt());
+              // if we go across years, show years in the ticks. otherwise leave them out
+              if (DateTime.fromMillisecondsSinceEpoch(meta.min.toInt()).year !=
+                  DateTime.fromMillisecondsSinceEpoch(meta.max.toInt()).year) {
+                return Text(
+                  localizedDate(context).format(date),
+                );
+              }
+              return Text(
+                DateFormat.Md(Localizations.localeOf(context).languageCode).format(date),
+              );
+            },
+            interval: dates.isNotEmpty
+                ? chartGetInterval(dates.first, dates.last)
+                : CHART_MILLISECOND_FACTOR,
+          ),
+        ),
+        leftTitles: _valueTitles(context, _unit, yAxis?.interval),
+      ),
+      borderData: FlBorderData(
+        show: true,
+        border: Border.all(color: Theme.of(context).colorScheme.outlineVariant),
+      ),
+      lineBarsData: bars,
+    );
+  }
+}
+
+/// Bar chart for entries that are discrete events rather than a continuous
+/// series: daily totals, and the readings of a multi-value group.
+///
+/// Entries carrying a range (see [MeasurementChartEntry.hasRange]) are drawn
+/// as a bar spanning it, so a blood pressure reading appears as one bar from
+/// diastolic to systolic. That keeps the pair together as the single event it
+/// is, and claims nothing about the time between two readings.
+class MeasurementBarChartWidgetFl extends StatelessWidget {
+  final List<MeasurementChartEntry> _entries;
+  final String _unit;
+
+  /// Whether the values are changes rather than amounts: their bars hang off a
+  /// marked zero line and are coloured by their direction.
+  final bool _signed;
+
+  const MeasurementBarChartWidgetFl(this._entries, this._unit, {bool signed = false, super.key})
+    : _signed = signed;
+
+  @override
+  Widget build(BuildContext context) {
+    return AspectRatio(
+      aspectRatio: 1.70,
+      child: Padding(
+        padding: const EdgeInsets.all(4),
+        child: LayoutBuilder(
+          builder: (context, constraints) => BarChart(mainData(context, constraints.maxWidth)),
+        ),
+      ),
+    );
+  }
+
+  BarTouchData tooltipData(BuildContext context) {
+    return BarTouchData(
+      touchTooltipData: BarTouchTooltipData(
+        // Kept inside the chart, else the bars near an edge show a
+        // tooltip that is cut off by it, or lies outside it entirely
+        fitInsideHorizontally: true,
+        fitInsideVertically: true,
+        getTooltipColor: (group) => Theme.of(context).colorScheme.primaryContainer,
+        getTooltipItem: (group, groupIndex, rod, rodIndex) {
+          if (groupIndex < 0 || groupIndex >= _entries.length) {
+            return null;
+          }
+          final entry = _entries[groupIndex];
+          final dateStr = DateFormat.Md(
+            Localizations.localeOf(context).languageCode,
+          ).format(entry.date);
+          // A range is quoted as high over low, the way a blood pressure
+          // reading is written. A change carries its sign, and the plus has to
+          // be added: only the minus comes out of the number format
+          final value = entry.hasRange
+              ? '${measurementValue(context, entry.max!, _unit)}'
+                    '/${measurementValue(context, entry.min!, _unit)}'
+              : '${_signed && rod.toY > 0 ? '+' : ''}'
+                    '${measurementValue(context, rod.toY, _unit)}';
+
+          return BarTooltipItem(
+            '$dateStr: ${unitSuffixed(value, _unit)}',
+            TextStyle(color: Theme.of(context).colorScheme.onPrimaryContainer),
+          );
+        },
+      ),
+    );
+  }
+
+  BarChartData mainData(BuildContext context, double availableWidth) {
+    // A range bar spans from its lower to its upper bound, so both decide the
+    // axis; a plain bar grows from zero
+    final drawn = <num>[
+      0,
+      for (final entry in _entries) ...[
+        entry.value,
+        if (entry.min != null) entry.min!,
+        if (entry.max != null) entry.max!,
+      ],
+    ];
+    final yAxis = durationAxis(_unit, drawn.reduce(min), drawn.reduce(max));
+    final barWidth = _barWidth(_entries.length, availableWidth);
+
+    return BarChartData(
+      minY: yAxis?.min,
+      maxY: yAxis?.max,
+      barTouchData: tooltipData(context),
+      gridData: _barGrid(context),
+      titlesData: FlTitlesData(
+        show: true,
+        rightTitles: _hiddenTitles,
+        topTitles: _hiddenTitles,
+        bottomTitles: _dateIndexTitles(context, [for (final entry in _entries) entry.date]),
+        leftTitles: _valueTitles(context, _unit, yAxis?.interval),
+      ),
+      borderData: _barBorder(context),
+      // The line the change bars hang off. Without it a chart of only
+      // decreases reads as a normal bar chart pointing the wrong way
+      extraLinesData: ExtraLinesData(
+        horizontalLines: [
+          if (_signed)
+            HorizontalLine(y: 0, color: Theme.of(context).colorScheme.outline, strokeWidth: 1),
+        ],
+      ),
+      barGroups: _entries
+          .asMap()
+          .entries
+          .map(
+            (e) => BarChartGroupData(
+              x: e.key,
+              barRods: [
+                BarChartRodData(
+                  // A range spans its bounds, a plain value grows from zero
+                  fromY: e.value.hasRange ? e.value.min!.toDouble() : 0,
+                  toY: e.value.hasRange ? e.value.max!.toDouble() : e.value.value.toDouble(),
+                  color: _signed
+                      ? deltaColor(context, e.value.value)
+                      : Theme.of(context).colorScheme.primary,
+                  width: barWidth,
+                  borderRadius: e.value.hasRange
+                      ? BorderRadius.circular(2)
+                      // The rounded end is the one away from the baseline, so
+                      // a bar pointing down is capped at the bottom
+                      : BorderRadius.vertical(
+                          top: e.value.value < 0 ? Radius.zero : const Radius.circular(2),
+                          bottom: e.value.value < 0 ? const Radius.circular(2) : Radius.zero,
+                        ),
+                ),
+              ],
+            ),
+          )
+          .toList(),
+    );
+  }
+}
+
+/// Stacked bar chart for a group whose components are parts of one whole, e.g.
+/// the sleep stages of a night.
+///
+/// One bar per day, split into a segment per component in the components' own
+/// order, so the bar's height is the night and its segments are how it was
+/// spent. Colours come from [componentColor] by position, which is what ties a
+/// segment to its legend entry.
+class MeasurementStackedBarChartWidgetFl extends StatelessWidget {
+  final List<MeasurementStackedEntry> _entries;
+  final List<String> _labels;
+  final String _unit;
+
+  const MeasurementStackedBarChartWidgetFl(this._entries, this._labels, this._unit, {super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return AspectRatio(
+      aspectRatio: 1.70,
+      child: Padding(
+        padding: const EdgeInsets.all(4),
+        child: LayoutBuilder(
+          builder: (context, constraints) => BarChart(mainData(context, constraints.maxWidth)),
+        ),
+      ),
+    );
+  }
+
+  /// The whole bar with its parts, since a single segment says little without
+  /// the night it belongs to.
+  BarTouchData tooltipData(BuildContext context) {
+    return BarTouchData(
+      touchTooltipData: BarTouchTooltipData(
+        // Kept inside the chart, else the bars near an edge show a
+        // tooltip that is cut off by it, or lies outside it entirely
+        fitInsideHorizontally: true,
+        fitInsideVertically: true,
+        getTooltipColor: (group) => Theme.of(context).colorScheme.primaryContainer,
+        getTooltipItem: (group, groupIndex, rod, rodIndex) {
+          if (groupIndex < 0 || groupIndex >= _entries.length) {
+            return null;
+          }
+          final entry = _entries[groupIndex];
+          final dateStr = DateFormat.Md(
+            Localizations.localeOf(context).languageCode,
+          ).format(entry.date);
+          final parts = [
+            for (final (index, value) in entry.values.indexed)
+              if (value != null) '${_labels[index]}: ${measurementValue(context, value, _unit)}',
+          ];
+
+          return BarTooltipItem(
+            '$dateStr: ${measurementWithUnit(context, entry.total, _unit)}'
+            '${parts.isEmpty ? '' : '\n${parts.join('\n')}'}',
+            TextStyle(color: Theme.of(context).colorScheme.onPrimaryContainer),
+          );
+        },
+      ),
+    );
+  }
+
+  BarChartData mainData(BuildContext context, double availableWidth) {
+    // The bar is as tall as its segments together, so that is what the axis
+    // has to cover
+    final yAxis = durationAxis(_unit, 0, _entries.map((e) => e.total).fold<num>(0, max));
+    final barWidth = _barWidth(_entries.length, availableWidth);
+
+    return BarChartData(
+      minY: yAxis?.min,
+      maxY: yAxis?.max,
+      barTouchData: tooltipData(context),
+      gridData: _barGrid(context),
+      titlesData: FlTitlesData(
+        show: true,
+        rightTitles: _hiddenTitles,
+        topTitles: _hiddenTitles,
+        bottomTitles: _dateIndexTitles(context, [for (final entry in _entries) entry.date]),
+        leftTitles: _valueTitles(context, _unit, yAxis?.interval),
+      ),
+      borderData: _barBorder(context),
+      barGroups: _entries.asMap().entries.map((e) {
+        // fl_chart stacks by absolute offsets rather than by segment heights,
+        // so each part is placed on top of what came before it
+        var offset = 0.0;
+        final stack = <BarChartRodStackItem>[];
+        for (final (index, value) in e.value.values.indexed) {
+          if (value == null || value <= 0) {
+            continue;
+          }
+          stack.add(
+            BarChartRodStackItem(offset, offset + value.toDouble(), componentColor(context, index)),
+          );
+          offset += value.toDouble();
+        }
+
+        return BarChartGroupData(
+          x: e.key,
+          barRods: [
+            BarChartRodData(
+              toY: offset,
+              width: barWidth,
+              rodStackItems: stack,
+              borderRadius: const BorderRadius.vertical(top: Radius.circular(2)),
+            ),
+          ],
+        );
+      }).toList(),
+    );
+  }
+}
+
+class Indicator extends StatelessWidget {
+  const Indicator({
+    super.key,
+    required this.color,
+    required this.text,
+    required this.isSquare,
+    this.size = 16,
+    this.marginRight = 15,
+    this.textColor,
+  });
+
+  final Color color;
+  final String text;
+  final bool isSquare;
+  final double size;
+  final double marginRight;
+  final Color? textColor;
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Container(
+          width: size,
+          height: size,
+          decoration: BoxDecoration(
+            shape: isSquare ? BoxShape.rectangle : BoxShape.circle,
+            color: color,
+          ),
+        ),
+        const SizedBox(width: 4),
+        Text(text, style: TextStyle(color: textColor)),
+        SizedBox(width: marginRight),
+      ],
+    );
+  }
+}
diff --git a/lib/features/measurements/widgets/charts/distribution_chart.dart b/lib/features/measurements/widgets/charts/distribution_chart.dart
new file mode 100644
index 000000000..729e3bb7e
--- /dev/null
+++ b/lib/features/measurements/widgets/charts/distribution_chart.dart
@@ -0,0 +1,354 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2020 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'dart:math';
+import 'dart:ui' as ui;
+
+import 'package:collection/collection.dart';
+import 'package:flutter/material.dart';
+import 'package:wger/core/formatting/formatting.dart';
+import 'package:wger/features/measurements/charts/data.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+/// Histogram of how often each value occurred: the values of the selected
+/// range binned by size, with the median and the newest value marked.
+///
+/// The one chart of the set without a time axis. It answers what is normal
+/// and what is an outlier, which no chart over time shows, and the marked
+/// newest value places today within that. Painted by hand like the heatmap:
+/// fl_chart's BarChart cannot draw the vertical marker lines.
+class MeasurementDistributionWidgetFl extends StatefulWidget {
+  /// The values with how often each occurred, and where the user stands today.
+  final List<ValueCount> values;
+  final num latest;
+  final String unit;
+
+  /// Width of one bin, null to derive it from the data.
+  final num? binWidth;
+
+  /// Whether a bin's count is a number of days (the summed types) rather than
+  /// a number of readings, which is how the readout words it.
+  final bool countsAreDays;
+
+  const MeasurementDistributionWidgetFl(
+    this.values, {
+    required this.latest,
+    required this.unit,
+    this.binWidth,
+    this.countsAreDays = false,
+    super.key,
+  });
+
+  @override
+  State<MeasurementDistributionWidgetFl> createState() => _MeasurementDistributionWidgetFlState();
+}
+
+class _MeasurementDistributionWidgetFlState extends State<MeasurementDistributionWidgetFl> {
+  /// Bin the user tapped, read out above the bars like the heatmap's day.
+  int? _selected;
+
+  @override
+  Widget build(BuildContext context) {
+    if (widget.values.isEmpty) {
+      return const SizedBox.shrink();
+    }
+
+    final histogram = buildWeightedHistogram(
+      widget.values,
+      latest: widget.latest,
+      binWidth: widget.binWidth,
+    );
+    final theme = Theme.of(context);
+    // Tapping outside the grid clears the selection, so a stale bin does not
+    // stick around after the histogram underneath changed
+    if (_selected != null && _selected! >= histogram.counts.length) {
+      _selected = null;
+    }
+
+    return Column(
+      children: [
+        SizedBox(height: 20, child: _readout(histogram, theme)),
+        Expanded(
+          child: LayoutBuilder(
+            builder: (context, constraints) {
+              final layout = _DistributionLayout(constraints.biggest, histogram.counts.length);
+
+              return GestureDetector(
+                onTapDown: (details) {
+                  final bin = layout.binAt(details.localPosition, histogram.counts.length);
+                  setState(() => _selected = bin == _selected ? null : bin);
+                },
+                child: CustomPaint(
+                  size: constraints.biggest,
+                  painter: _DistributionPainter(
+                    histogram: histogram,
+                    layout: layout,
+                    selected: _selected,
+                    bar: theme.colorScheme.primary,
+                    median: theme.colorScheme.tertiary,
+                    latest: theme.colorScheme.secondary,
+                    grid: theme.colorScheme.outlineVariant,
+                    outline: theme.colorScheme.outline,
+                    labelStyle:
+                        theme.textTheme.bodySmall?.copyWith(fontSize: 9) ??
+                        const TextStyle(fontSize: 9),
+                    formatValue: (value) => measurementValue(context, value, widget.unit),
+                    formatCount: (count) => localizedNumberFormat(context).format(count),
+                  ),
+                ),
+              );
+            },
+          ),
+        ),
+      ],
+    );
+  }
+
+  /// The line above the bars: the tapped bin as its range and count, or the
+  /// median and newest value while nothing is selected, coloured like their
+  /// marker lines so the numbers say what the lines only place.
+  Widget _readout(MeasurementHistogram histogram, ThemeData theme) {
+    final l10n = AppLocalizations.of(context);
+    final selected = _selected;
+
+    if (selected != null) {
+      final count = histogram.counts[selected];
+      return Text(
+        '${measurementValue(context, histogram.lowerEdgeOf(selected), widget.unit)}'
+        '-${measurementWithUnit(context, histogram.upperEdgeOf(selected), widget.unit)}: '
+        '${widget.countsAreDays ? l10n.distributionDayCount(count) : l10n.distributionEntryCount(count)}',
+        style: theme.textTheme.bodySmall,
+        maxLines: 1,
+        overflow: TextOverflow.ellipsis,
+      );
+    }
+
+    return Text.rich(
+      TextSpan(
+        style: theme.textTheme.bodySmall,
+        children: [
+          TextSpan(
+            text:
+                '${l10n.distributionMedian}: '
+                '${measurementWithUnit(context, histogram.median, widget.unit)}',
+            style: TextStyle(color: theme.colorScheme.tertiary),
+          ),
+          const TextSpan(text: '  ·  '),
+          TextSpan(
+            text:
+                '${l10n.distributionLatest}: '
+                '${measurementWithUnit(context, histogram.latest, widget.unit)}',
+            style: TextStyle(color: theme.colorScheme.secondary),
+          ),
+        ],
+      ),
+      maxLines: 1,
+      overflow: TextOverflow.ellipsis,
+    );
+  }
+}
+
+/// Where the bars of a histogram sit, shared by the painter and the hit test
+/// so a tap lands on the bin it looks like it lands on.
+class _DistributionLayout {
+  /// Room for the count labels on the left and the edge labels below.
+  static const countLabelWidth = 30.0;
+  static const edgeLabelHeight = 14.0;
+
+  final double left;
+  final double plotWidth;
+  final double plotHeight;
+
+  /// Width of one bin on screen, gap included.
+  final double step;
+
+  factory _DistributionLayout(Size size, int bins) {
+    final plotWidth = max(1.0, size.width - countLabelWidth);
+    return _DistributionLayout._(
+      left: countLabelWidth,
+      plotWidth: plotWidth,
+      plotHeight: max(1.0, size.height - edgeLabelHeight),
+      step: plotWidth / max(bins, 1),
+    );
+  }
+
+  const _DistributionLayout._({
+    required this.left,
+    required this.plotWidth,
+    required this.plotHeight,
+    required this.step,
+  });
+
+  double xOfEdge(num edge) => left + edge * step;
+
+  /// The bin at [position], null when the tap missed the bars.
+  int? binAt(Offset position, int bins) {
+    final bin = ((position.dx - left) / step).floor();
+    if (bin < 0 || bin >= bins || position.dy > plotHeight) {
+      return null;
+    }
+    return bin;
+  }
+}
+
+class _DistributionPainter extends CustomPainter {
+  final MeasurementHistogram histogram;
+  final _DistributionLayout layout;
+  final int? selected;
+  final Color bar;
+  final Color median;
+  final Color latest;
+  final Color grid;
+  final Color outline;
+  final TextStyle labelStyle;
+  final String Function(num) formatValue;
+  final String Function(int) formatCount;
+
+  _DistributionPainter({
+    required this.histogram,
+    required this.layout,
+    required this.selected,
+    required this.bar,
+    required this.median,
+    required this.latest,
+    required this.grid,
+    required this.outline,
+    required this.labelStyle,
+    required this.formatValue,
+    required this.formatCount,
+  });
+
+  /// Number of labelled gridlines and bin edges the chart aims for.
+  static const _tickCount = 4;
+
+  /// The x pixel of [value] on the value axis the bins tile.
+  double _xOf(num value) => layout.xOfEdge((value - histogram.firstEdge) / histogram.binWidth);
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final counts = histogram.counts;
+    final maxCount = counts.max;
+
+    // The count axis climbs in round steps, and its top is the tick strictly
+    // above the tallest bin, so the tallest bar keeps headroom instead of
+    // ending flush at the canvas edge
+    final interval = max(1, niceBinWidth(0, maxCount, targetBins: _tickCount)).toInt();
+    final top = (maxCount ~/ interval + 1) * interval;
+    double yOf(num count) => layout.plotHeight * (1 - count / top);
+
+    final gridPaint = Paint()
+      ..color = grid
+      ..strokeWidth = 1;
+    const countLabelRight = _DistributionLayout.countLabelWidth - 4;
+    for (var tick = 0; tick <= top; tick += interval) {
+      final y = yOf(tick);
+      canvas.drawLine(Offset(layout.left, y), Offset(layout.left + layout.plotWidth, y), gridPaint);
+      if (tick > 0) {
+        // Right-aligned against the plot, centred on its gridline
+        final label = _layoutLabel(formatCount(tick), maxWidth: countLabelRight);
+        label.paint(canvas, Offset(countLabelRight - label.width, y - label.height / 2));
+      }
+    }
+
+    // The gap follows the bin width on screen, like the bar charts leave a
+    // gap between neighbouring bars but never go below a hairline
+    final gap = (layout.step * 0.15).clamp(0.5, 2.0);
+    final barPaint = Paint()..color = bar;
+    for (final (bin, count) in counts.indexed) {
+      if (count == 0) {
+        continue;
+      }
+      final rect = Rect.fromLTRB(
+        layout.xOfEdge(bin) + gap / 2,
+        yOf(count),
+        layout.xOfEdge(bin + 1) - gap / 2,
+        layout.plotHeight,
+      );
+      canvas.drawRect(rect, barPaint);
+
+      if (bin == selected) {
+        canvas.drawRect(
+          rect,
+          Paint()
+            ..style = PaintingStyle.stroke
+            ..strokeWidth = 1.5
+            ..color = outline,
+        );
+      }
+    }
+
+    // The markers sit at the exact value, not on a bin: that precision is why
+    // the histogram is painted by hand
+    _paintMarker(canvas, histogram.median, median);
+    _paintMarker(canvas, histogram.latest, latest, tipped: true);
+
+    _paintEdgeLabels(canvas, size, counts.length);
+  }
+
+  /// A vertical line at [value], with a small tip for the marker that means a
+  /// single point rather than a summary, so the two stay apart when they
+  /// coincide.
+  void _paintMarker(Canvas canvas, num value, Color color, {bool tipped = false}) {
+    final x = _xOf(value);
+    canvas.drawLine(
+      Offset(x, 0),
+      Offset(x, layout.plotHeight),
+      Paint()
+        ..color = color
+        ..strokeWidth = 1.5,
+    );
+
+    if (tipped) {
+      canvas.drawPath(
+        Path()
+          ..moveTo(x - 4, 0)
+          ..lineTo(x + 4, 0)
+          ..lineTo(x, 6)
+          ..close(),
+        Paint()..color = color,
+      );
+    }
+  }
+
+  /// Every k-th bin edge, labelled with its value: the edges are the round
+  /// numbers the bins were aligned to, so they are the natural ticks.
+  void _paintEdgeLabels(Canvas canvas, Size size, int bins) {
+    final labelEvery = max(1, (bins / _tickCount).ceil());
+    for (var edge = 0; edge <= bins; edge += labelEvery) {
+      final label = _layoutLabel(
+        formatValue(histogram.lowerEdgeOf(edge)),
+        maxWidth: layout.step * labelEvery,
+      );
+      // Centred on its edge, but kept inside the canvas
+      final x = (layout.xOfEdge(edge) - label.width / 2).clamp(0.0, size.width - label.width);
+      label.paint(canvas, Offset(x, layout.plotHeight + 2));
+    }
+  }
+
+  /// Lays [text] out as a single unwrapped line; the call sites position it.
+  TextPainter _layoutLabel(String text, {required double maxWidth}) => TextPainter(
+    text: TextSpan(text: text, style: labelStyle),
+    textDirection: ui.TextDirection.ltr,
+    maxLines: 1,
+    ellipsis: '',
+  )..layout(maxWidth: maxWidth);
+
+  @override
+  bool shouldRepaint(_DistributionPainter oldDelegate) =>
+      oldDelegate.selected != selected || oldDelegate.histogram != histogram;
+}
diff --git a/lib/features/measurements/widgets/charts/heatmap_chart.dart b/lib/features/measurements/widgets/charts/heatmap_chart.dart
new file mode 100644
index 000000000..692511dcb
--- /dev/null
+++ b/lib/features/measurements/widgets/charts/heatmap_chart.dart
@@ -0,0 +1,325 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2020 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'dart:math';
+import 'dart:ui' as ui;
+
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:wger/core/formatting/formatting.dart';
+import 'package:wger/features/measurements/charts/data.dart';
+import 'package:wger/features/measurements/charts/series.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+/// Calendar heatmap: one cell per day, coloured by that day's value.
+///
+/// Where a line or a bar answers how much, this answers how regularly, which
+/// for steps or sleep is often the more interesting question. It is also the
+/// only chart of the set where a gap is visible: a day without a measurement
+/// is an empty cell instead of a line segment that silently spans it.
+///
+/// Takes one entry per calendar day; how a day's readings became that value
+/// (summed, averaged) is decided by the caller, see [aggregatePerDay] and
+/// [averagePerDay].
+class MeasurementHeatmapWidgetFl extends StatefulWidget {
+  /// One entry per calendar day, see [aggregatePerDay] and [averagePerDay].
+  final List<MeasurementChartEntry> days;
+  final String unit;
+
+  const MeasurementHeatmapWidgetFl(this.days, this.unit, {super.key});
+
+  @override
+  State<MeasurementHeatmapWidgetFl> createState() => _MeasurementHeatmapWidgetFlState();
+}
+
+class _MeasurementHeatmapWidgetFlState extends State<MeasurementHeatmapWidgetFl> {
+  /// Day the user tapped, read out above the grid. A heatmap has no axis to
+  /// read a value off, so this is what the tooltip is on the other charts.
+  DateTime? _selected;
+
+  @override
+  Widget build(BuildContext context) {
+    final grid = buildHeatmapGrid(widget.days);
+    final theme = Theme.of(context);
+
+    return Column(
+      children: [
+        SizedBox(
+          height: 20,
+          child: Text(
+            _readout(grid),
+            style: theme.textTheme.bodySmall,
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+          ),
+        ),
+        Expanded(
+          child: LayoutBuilder(
+            builder: (context, constraints) {
+              final layout = _HeatmapLayout(constraints.biggest, grid.weeks);
+
+              return GestureDetector(
+                onTapDown: (details) {
+                  final day = layout.dayAt(details.localPosition, grid);
+                  setState(() => _selected = day == _selected ? null : day);
+                },
+                child: CustomPaint(
+                  size: constraints.biggest,
+                  painter: _HeatmapPainter(
+                    grid: grid,
+                    layout: layout,
+                    selected: _selected,
+                    filled: theme.colorScheme.primary,
+                    empty: theme.colorScheme.surfaceContainerHighest,
+                    outline: theme.colorScheme.outline,
+                    labelStyle:
+                        theme.textTheme.bodySmall?.copyWith(fontSize: 9) ??
+                        const TextStyle(fontSize: 9),
+                    locale: Localizations.localeOf(context).toString(),
+                  ),
+                ),
+              );
+            },
+          ),
+        ),
+      ],
+    );
+  }
+
+  /// The line above the grid: the tapped day, or the span the grid covers
+  /// while nothing is selected.
+  String _readout(MeasurementHeatmapGrid grid) {
+    final dateFormat = localizedDate(context);
+    final selected = _selected;
+    if (selected == null) {
+      // The grid is whole weeks and its last one usually runs past today, so
+      // the span it covers ends today rather than on that Sunday
+      final today = DateTime.now();
+      final last = grid.dayAt(grid.weeks - 1, DateTime.daysPerWeek - 1);
+      final end = last.isAfter(today) ? today : last;
+      return '${dateFormat.format(grid.start)} - ${dateFormat.format(end)}';
+    }
+
+    final value = grid.values[selected];
+    if (value == null) {
+      return '${dateFormat.format(selected)}: ${AppLocalizations.of(context).noDataAvailable}';
+    }
+
+    return '${dateFormat.format(selected)}: '
+        '${measurementWithUnit(context, value, widget.unit)}';
+  }
+}
+
+/// Where the cells of a heatmap sit, shared by the painter and the hit test so
+/// a tap lands on the cell it looks like it lands on.
+class _HeatmapLayout {
+  /// Room for the weekday labels on the left and the month labels on top.
+  static const weekdayLabelWidth = 22.0;
+  static const monthLabelHeight = 12.0;
+
+  /// Smallest a cell and its gap may get before the grid is unreadable rather
+  /// than merely dense.
+  static const minCell = 4.0;
+
+  final double step;
+  final double cell;
+  final double left;
+  final double top;
+
+  factory _HeatmapLayout(Size size, int weeks) {
+    final available = Size(
+      size.width - weekdayLabelWidth,
+      size.height - monthLabelHeight,
+    );
+    // Square cells, so the grid keeps the calendar's proportions whatever box
+    // it is given. A year of columns is limited by the width, a quarter by the
+    // height
+    final step = max(
+      minCell,
+      min(available.width / max(weeks, 1), available.height / DateTime.daysPerWeek),
+    );
+    // The gap follows the cell size: a fixed one is a hairline on a wide grid
+    // and half the cell on a year of columns, where it turns the squares into
+    // scattered dots
+    final gap = (step * 0.18).clamp(1.0, 3.0);
+
+    return _HeatmapLayout._(
+      step: step,
+      cell: step - gap,
+      left: weekdayLabelWidth,
+      // A year of columns is wider than it is tall, so it would otherwise sit
+      // against the top edge with the rest of the box empty below it
+      top: monthLabelHeight + max(0.0, available.height - step * DateTime.daysPerWeek) / 2,
+    );
+  }
+
+  const _HeatmapLayout._({
+    required this.step,
+    required this.cell,
+    required this.left,
+    required this.top,
+  });
+
+  Offset originOf(int week, int weekday) => Offset(left + week * step, top + weekday * step);
+
+  /// The day at [position], null when the tap missed the grid.
+  DateTime? dayAt(Offset position, MeasurementHeatmapGrid grid) {
+    final week = ((position.dx - left) / step).floor();
+    final weekday = ((position.dy - top) / step).floor();
+    if (week < 0 || week >= grid.weeks || weekday < 0 || weekday >= DateTime.daysPerWeek) {
+      return null;
+    }
+    return grid.dayAt(week, weekday);
+  }
+}
+
+class _HeatmapPainter extends CustomPainter {
+  final MeasurementHeatmapGrid grid;
+  final _HeatmapLayout layout;
+  final DateTime? selected;
+  final Color filled;
+  final Color empty;
+  final Color outline;
+  final TextStyle labelStyle;
+  final String locale;
+
+  _HeatmapPainter({
+    required this.grid,
+    required this.layout,
+    required this.selected,
+    required this.filled,
+    required this.empty,
+    required this.outline,
+    required this.labelStyle,
+    required this.locale,
+  });
+
+  /// Colour of a cell holding [value].
+  ///
+  /// A day without a measurement is neutral, everything else is tinted by how
+  /// large its value is within the grid. The scale is continuous and starts
+  /// well above transparent: a day that was measured has to read as measured
+  /// even when its value is the smallest one.
+  Color _cellColor(num? value) {
+    if (value == null) {
+      return empty;
+    }
+    final share = grid.maxValue <= 0 ? 1.0 : (value / grid.maxValue).clamp(0.0, 1.0);
+    return Color.lerp(filled.withValues(alpha: 0.3), filled, share)!;
+  }
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final paint = Paint()..style = PaintingStyle.fill;
+    final today = DateTime.now();
+    final endOfToday = DateTime(today.year, today.month, today.day);
+
+    for (var week = 0; week < grid.weeks; week++) {
+      for (var weekday = 0; weekday < DateTime.daysPerWeek; weekday++) {
+        final day = grid.dayAt(week, weekday);
+        // The grid is whole weeks, so the last one runs past today. Those days
+        // have not happened yet and are left blank rather than drawn as a gap
+        if (day.isAfter(endOfToday)) {
+          continue;
+        }
+
+        final rect = RRect.fromRectAndRadius(
+          layout.originOf(week, weekday) & Size(layout.cell, layout.cell),
+          // Rounded, but never so much that a small cell becomes a dot
+          Radius.circular(min(2, layout.cell / 4)),
+        );
+        canvas.drawRRect(rect, paint..color = _cellColor(grid.valueAt(week, weekday)));
+
+        if (day == selected) {
+          canvas.drawRRect(
+            rect,
+            Paint()
+              ..style = PaintingStyle.stroke
+              ..strokeWidth = 1.5
+              ..color = outline,
+          );
+        }
+      }
+    }
+
+    _paintWeekdayLabels(canvas);
+    _paintMonthLabels(canvas);
+  }
+
+  /// Every other weekday, the way a calendar heatmap is usually labelled:
+  /// naming all seven needs more room than the rows have.
+  void _paintWeekdayLabels(Canvas canvas) {
+    final format = DateFormat.E(locale);
+    for (var weekday = 0; weekday < DateTime.daysPerWeek; weekday += 2) {
+      final origin = layout.originOf(0, weekday);
+      _paintText(
+        canvas,
+        format.format(grid.dayAt(0, weekday)),
+        Offset(0, origin.dy + layout.cell / 2),
+        maxWidth: _HeatmapLayout.weekdayLabelWidth - 2,
+        centered: true,
+      );
+    }
+  }
+
+  /// The month above the column it starts in, which is what says where in the
+  /// year the grid is without a date axis.
+  void _paintMonthLabels(Canvas canvas) {
+    final format = DateFormat.MMM(locale);
+    var previous = -1;
+    for (var week = 0; week < grid.weeks; week++) {
+      final month = grid.dayAt(week, 0).month;
+      if (month == previous) {
+        continue;
+      }
+      previous = month;
+      _paintText(
+        canvas,
+        format.format(grid.dayAt(week, 0)),
+        // Sits right above the first column of the month
+        Offset(
+          layout.originOf(week, 0).dx,
+          layout.top - _HeatmapLayout.monthLabelHeight,
+        ),
+        maxWidth: layout.step * 4,
+      );
+    }
+  }
+
+  /// Draws [text] at [at], which is its top left corner or, with [centered],
+  /// the middle of its left edge.
+  void _paintText(
+    Canvas canvas,
+    String text,
+    Offset at, {
+    required double maxWidth,
+    bool centered = false,
+  }) {
+    final painter = TextPainter(
+      text: TextSpan(text: text, style: labelStyle),
+      textDirection: ui.TextDirection.ltr,
+      maxLines: 1,
+      ellipsis: '',
+    )..layout(maxWidth: maxWidth);
+    painter.paint(canvas, centered ? at.translate(0, -painter.height / 2) : at);
+  }
+
+  @override
+  bool shouldRepaint(_HeatmapPainter oldDelegate) =>
+      oldDelegate.selected != selected || oldDelegate.grid != grid;
+}
diff --git a/lib/features/measurements/widgets/charts/spark_charts.dart b/lib/features/measurements/widgets/charts/spark_charts.dart
new file mode 100644
index 000000000..a98779c1d
--- /dev/null
+++ b/lib/features/measurements/widgets/charts/spark_charts.dart
@@ -0,0 +1,312 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/// The spark charts of the overview tiles: value as the hero, chart as
+/// context. Painted by hand like the heatmap, not with fl_chart: a spark has
+/// no axes, tooltips, bands or legend, only the shape. What they draw is
+/// computed in `../../charts/spark.dart`.
+library;
+
+import 'dart:math';
+import 'dart:ui' show PointMode;
+
+import 'package:flutter/material.dart';
+import 'package:wger/features/measurements/charts/calendar.dart';
+import 'package:wger/features/measurements/charts/colors.dart';
+import 'package:wger/features/measurements/charts/data.dart';
+import 'package:wger/features/measurements/charts/series.dart';
+import 'package:wger/features/measurements/charts/spark.dart';
+
+/// Fraction of the value span kept clear above and below a spark, so the
+/// extremes are not glued to the edges.
+const _valuePadding = 0.12;
+
+/// Radius of a spark dot.
+const _dotRadius = 2.5;
+
+/// A value series as a miniature line, or as bare dots for a sparse category,
+/// where a line would claim a continuity a handful of readings does not have.
+class SparkLineChart extends StatelessWidget {
+  const SparkLineChart(
+    this.entries, {
+    required this.start,
+    required this.days,
+    this.dots = false,
+    super.key,
+  });
+
+  final List<MeasurementChartEntry> entries;
+
+  /// First day of the window; with [days] it fixes the x axis, so the spark
+  /// keeps its time scale even when only part of the window was measured.
+  final DateTime start;
+  final int days;
+
+  final bool dots;
+
+  @override
+  Widget build(BuildContext context) {
+    return CustomPaint(
+      size: Size.infinite,
+      painter: _SparkLinePainter(
+        entries: entries,
+        start: start,
+        days: days,
+        dots: dots,
+        color: Theme.of(context).colorScheme.primary,
+      ),
+    );
+  }
+}
+
+class _SparkLinePainter extends CustomPainter {
+  _SparkLinePainter({
+    required this.entries,
+    required this.start,
+    required this.days,
+    required this.dots,
+    required this.color,
+  });
+
+  final List<MeasurementChartEntry> entries;
+  final DateTime start;
+  final int days;
+  final bool dots;
+  final Color color;
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    if (entries.isEmpty) {
+      return;
+    }
+
+    final values = entries.map((e) => e.value);
+    final low = values.reduce(min);
+    final high = values.reduce(max);
+    final span = high - low;
+
+    double x(DateTime date) =>
+        days <= 1 ? size.width / 2 : daysBetween(start, date) / (days - 1) * size.width;
+    // A flat series sits mid-height rather than dividing by a zero span
+    double y(num value) => span == 0
+        ? size.height / 2
+        : size.height * (_valuePadding + (1 - 2 * _valuePadding) * (high - value) / span);
+
+    final points = [for (final e in entries) Offset(x(e.date), y(e.value))];
+    final fill = Paint()..color = color;
+
+    if (dots || points.length == 1) {
+      for (final point in points) {
+        canvas.drawCircle(point, _dotRadius, fill);
+      }
+      return;
+    }
+
+    canvas.drawPoints(
+      PointMode.polygon,
+      points,
+      Paint()
+        ..color = color
+        ..strokeWidth = 2
+        ..strokeCap = StrokeCap.round
+        ..strokeJoin = StrokeJoin.round
+        ..style = PaintingStyle.stroke,
+    );
+    // The end dot marks where the series stands today, like the hero value
+    canvas.drawCircle(points.last, _dotRadius, fill);
+  }
+
+  @override
+  bool shouldRepaint(_SparkLinePainter oldDelegate) =>
+      oldDelegate.entries != entries ||
+      oldDelegate.start != start ||
+      oldDelegate.dots != dots ||
+      oldDelegate.color != color;
+}
+
+/// The bar family as a miniature: plain daily bars, floating bars (blood
+/// pressure), stacked bars (sleep stages) and, with `signed`, the weekly
+/// change bars around a zero hairline. Which one it is follows from the data,
+/// see the `spark*Bars` builders.
+class SparkBarChart extends StatelessWidget {
+  const SparkBarChart(this.data, {super.key});
+
+  final SparkBarsData data;
+
+  @override
+  Widget build(BuildContext context) {
+    return CustomPaint(
+      size: Size.infinite,
+      painter: _SparkBarPainter(
+        data: data,
+        // componentColor's palette, so a stacked spark's segments match the
+        // full chart of the tile it leads to
+        palette: componentPalette(context),
+        zeroLine: Theme.of(context).colorScheme.outline,
+      ),
+    );
+  }
+}
+
+class _SparkBarPainter extends CustomPainter {
+  _SparkBarPainter({required this.data, required this.palette, required this.zeroLine});
+
+  final SparkBarsData data;
+  final List<Color> palette;
+  final Color zeroLine;
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    if (data.isEmpty) {
+      return;
+    }
+
+    final low = data.minValue;
+    final high = data.maxValue;
+    final span = high - low;
+
+    double y(num value) => span == 0
+        ? size.height / 2
+        : size.height * (_valuePadding + (1 - 2 * _valuePadding) * (high - value) / span);
+
+    final slotWidth = size.width / data.slotCount;
+    final barWidth = (slotWidth * 0.6).clamp(2.0, 12.0);
+
+    if (data.signed) {
+      canvas.drawLine(
+        Offset(0, y(0)),
+        Offset(size.width, y(0)),
+        Paint()
+          ..color = zeroLine
+          ..strokeWidth = 1,
+      );
+    }
+
+    final paint = Paint()..style = PaintingStyle.fill;
+    for (final bar in data.bars) {
+      final left = bar.slot * slotWidth + (slotWidth - barWidth) / 2;
+      for (final segment in bar.segments) {
+        final top = y(max(segment.from, segment.to));
+        // Never thinner than a hairline, or a small value disappears
+        final bottom = max(y(min(segment.from, segment.to)), top + 1);
+        paint.color = palette[segment.colorIndex % palette.length];
+        canvas.drawRRect(
+          RRect.fromLTRBR(left, top, left + barWidth, bottom, _radiusOf(bar, segment, barWidth)),
+          paint,
+        );
+      }
+    }
+  }
+
+  /// A lone segment is a small pill; the segments of a stack stay square so
+  /// they meet without seams.
+  Radius _radiusOf(SparkBar bar, SparkSegment segment, double barWidth) =>
+      bar.segments.length == 1 ? Radius.circular(barWidth / 3) : Radius.zero;
+
+  @override
+  bool shouldRepaint(_SparkBarPainter oldDelegate) =>
+      oldDelegate.data != data || oldDelegate.palette != palette;
+}
+
+/// A calendar strip laid out like the full heatmap (weeks as columns,
+/// weekdays as rows), without the labels or the tap readout: the width
+/// carries the time axis, the filter says which stretch it is.
+class SparkHeatmap extends StatelessWidget {
+  const SparkHeatmap(this.days, {required this.weeks, this.today, super.key});
+
+  /// One entry per calendar day, see `aggregatePerDay` / `averagePerDay`.
+  final List<MeasurementChartEntry> days;
+
+  /// Week columns to lay out, see `sparkWindowFor`.
+  final int weeks;
+
+  /// Injectable for tests; the widgets leave it at the current day.
+  final DateTime? today;
+
+  @override
+  Widget build(BuildContext context) {
+    final scheme = Theme.of(context).colorScheme;
+
+    return CustomPaint(
+      size: Size.infinite,
+      painter: _SparkHeatmapPainter(
+        grid: buildHeatmapGrid(days, maxWeeks: weeks, today: today),
+        today: today ?? DateTime.now(),
+        filled: scheme.primary,
+        empty: scheme.surfaceContainerHighest,
+      ),
+    );
+  }
+}
+
+class _SparkHeatmapPainter extends CustomPainter {
+  _SparkHeatmapPainter({
+    required this.grid,
+    required this.today,
+    required this.filled,
+    required this.empty,
+  });
+
+  final MeasurementHeatmapGrid grid;
+  final DateTime today;
+  final Color filled;
+  final Color empty;
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    // Square cells centered in the box, week columns and weekday rows
+    final step = min(size.width / grid.weeks, size.height / DateTime.daysPerWeek);
+    final cell = step - (step * 0.18).clamp(1.0, 3.0);
+    final left = (size.width - step * grid.weeks) / 2;
+    final top = (size.height - step * DateTime.daysPerWeek) / 2;
+    final endOfToday = DateTime(today.year, today.month, today.day);
+
+    final paint = Paint()..style = PaintingStyle.fill;
+    for (var week = 0; week < grid.weeks; week++) {
+      for (var weekday = 0; weekday < DateTime.daysPerWeek; weekday++) {
+        // Days of the current week that have not happened yet stay blank
+        if (grid.dayAt(week, weekday).isAfter(endOfToday)) {
+          continue;
+        }
+
+        paint.color = _cellColor(grid.valueAt(week, weekday));
+        canvas.drawRRect(
+          RRect.fromRectAndRadius(
+            Offset(left + week * step, top + weekday * step) & Size(cell, cell),
+            Radius.circular(min(2, cell / 4)),
+          ),
+          paint,
+        );
+      }
+    }
+  }
+
+  /// The full heatmap's colour rule: neutral for a day without a measurement,
+  /// tinted by size for the rest, starting well above transparent.
+  Color _cellColor(num? value) {
+    if (value == null) {
+      return empty;
+    }
+    final share = grid.maxValue <= 0 ? 1.0 : (value / grid.maxValue).clamp(0.0, 1.0);
+    return Color.lerp(filled.withValues(alpha: 0.3), filled, share)!;
+  }
+
+  @override
+  bool shouldRepaint(_SparkHeatmapPainter oldDelegate) =>
+      oldDelegate.grid != grid || oldDelegate.filled != filled;
+}
diff --git a/lib/features/measurements/widgets/entries.dart b/lib/features/measurements/widgets/entries.dart
index 9d4906fcd..264315df4 100644
--- a/lib/features/measurements/widgets/entries.dart
+++ b/lib/features/measurements/widgets/entries.dart
@@ -16,61 +16,279 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:wger/core/form_screen.dart';
 import 'package:wger/core/formatting/formatting.dart';
 import 'package:wger/core/snackbar.dart';
+import 'package:wger/core/widgets/error.dart';
+import 'package:wger/features/measurements/charts/colors.dart';
+import 'package:wger/features/measurements/charts/data.dart';
+import 'package:wger/features/measurements/charts/range.dart';
+import 'package:wger/features/measurements/charts/series.dart';
 import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/models/unit_conversion.dart';
 import 'package:wger/features/measurements/providers/measurement_notifier.dart';
-import 'package:wger/features/measurements/widgets/charts.dart';
+import 'package:wger/features/measurements/screens/measurement_entries_screen.dart';
+import 'package:wger/features/measurements/widgets/chart_range_selector.dart';
 import 'package:wger/features/measurements/widgets/helpers.dart';
+import 'package:wger/features/nutrition/models/nutritional_plan.dart';
 import 'package:wger/features/nutrition/providers/nutrition_notifier.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
 import 'forms.dart';
 
 class EntriesList extends ConsumerWidget {
-  final MeasurementCategory _category;
+  final MeasurementCategory category;
 
-  const EntriesList(this._category);
+  /// Range the entries were read for. Owned by the screen, because it decides
+  /// how far back the query reaches, not just what the chart draws.
+  final ChartRange range;
+  final ValueChanged<ChartRange> onRangeChanged;
+
+  /// Name the category is presented under, `category.name` by default. Body
+  /// weight is created by the server and is titled in the user's language
+  /// instead of with the name it was stored with.
+  final String? title;
+
+  /// Unit the values are converted to, `category.unit` by default. Body weight
+  /// is shown in the profile unit, since its entries can be stored in either.
+  final String? displayUnit;
+
+  /// Label for [displayUnit], the unit itself by default. The two differ where
+  /// the unit is translated (kg reads كغم in Arabic).
+  final String? displayUnitLabel;
+
+  /// Form the edit action opens, [MeasurementEntryForm] by default. Body
+  /// weight has one of its own, with quick steppers and a unit dropdown.
+  final Widget Function(MeasurementEntry entry)? editFormBuilder;
+
+  const EntriesList(
+    this.category, {
+    required this.range,
+    required this.onRangeChanged,
+    this.title,
+    this.displayUnit,
+    this.displayUnitLabel,
+    this.editFormBuilder,
+  });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final plans = ref.watch(nutritionProvider).value?.plans ?? const [];
-    final numberFormat = localizedNumberFormat(context);
-    final provider = ref.read(measurementProvider.notifier);
+    // The overrides describe a single category and only apply to the leaf
+    // branch below; a group is presented through its components
+    final name = title ?? category.displayName(context);
+    final unit = displayUnit ?? category.unit;
+    final unitLabel = displayUnitLabel ?? unit;
 
-    final entriesAll = _category.entries
-        .map((e) => MeasurementChartEntry(e.value, e.date))
-        .toList();
-    final entries7dAvg = moving7dAverage(entriesAll);
+    // A group carries no entries of its own, its readings live in the
+    // components, so everything below would chart an empty list
+    if (category.hasChildren) {
+      return _buildGroup(context, ref, category);
+    }
 
-    final datetimeFormat = localizedDate(context);
+    // Plan periods only matter where a nutrition plan can plausibly move the
+    // metric; other categories skip the watch, so nutrition edits don't
+    // rebuild them
+    final planPeriods = category.metricType.correlatesWithNutrition
+        ? [
+            for (final plan
+                in ref.watch(nutritionProvider).value?.plans ?? const <NutritionalPlan>[])
+              (
+                range: DateTimeRange(start: plan.startDate, end: plan.endDate ?? DateTime.now()),
+                name: plan.getLabel(context),
+              ),
+          ]
+        : const <PlanPeriod>[];
 
     return Column(
       children: [
-        ...getOverviewWidgetsSeries(
-          _category.name,
-          entriesAll,
-          entries7dAvg,
-          plans,
-          _category.unit,
-          context,
+        ChartRangeSelector(
+          value: range,
+          onChanged: onRangeChanged,
+        ),
+        MeasurementChartArea<List<MeasurementChartEntry>>(
+          identity: category.id!,
+          // Values are read through the unit helper; for plain categories
+          // without per-entry units this is a pass-through
+          watch: (ref) => chartPointsFor(ref, category, range, targetUnit: unit),
+          builder: (context, points) => _chart(context, points, name, unit, unitLabel, planPeriods),
+          onError: (_, error) => [StreamErrorIndicator(error.toString())],
+        ),
+        _EntryList(
+          category: category,
+          unit: unit,
+          unitLabel: unitLabel,
+          editFormBuilder: editFormBuilder,
         ),
-        SizedBox(
-          height: 300,
-          child: ListView.builder(
-            padding: const EdgeInsets.all(10.0),
-            itemCount: _category.entries.length,
-            itemBuilder: (context, index) {
-              final currentEntry = _category.entries[index];
-
-              return Card(
-                child: ListTile(
-                  title: Text('${numberFormat.format(currentEntry.value)} ${_category.unit}'),
-                  subtitle: Text(datetimeFormat.format(currentEntry.date)),
-                  trailing: PopupMenuButton(
+      ],
+    );
+  }
+
+  /// The chart, its overall change and the legend, over the range the points
+  /// were read for.
+  List<Widget> _chart(
+    BuildContext context,
+    List<MeasurementChartEntry> allPoints,
+    String name,
+    String unit,
+    String unitLabel,
+    List<PlanPeriod> planPeriods,
+  ) {
+    final settings = category.chartSettings;
+    final (:entries, :average) = chartSeriesFor(allPoints, range, settings);
+
+    return buildSeriesChartSection(
+      context,
+      name: name,
+      entriesAll: entries,
+      average: average,
+      unit: unitLabel,
+      planPeriods: planPeriods,
+      metricType: category.metricType,
+      chartType: category.chartType,
+      settings: settings,
+      distribution: MeasurementDistributionChart(
+        category: category,
+        range: range,
+        unitLabel: unitLabel,
+        targetUnit: unit,
+      ),
+    );
+  }
+
+  /// Detail view of a multi-value group: one chart over all components, a
+  /// legend that doubles as the way into each component, and the readings
+  /// themselves.
+  ///
+  /// Readings are shown but not edited here: one of them is several entries,
+  /// and the group form only creates. Editing stays on the component screens,
+  /// which the legend rows lead to.
+  Widget _buildGroup(BuildContext context, WidgetRef ref, MeasurementCategory category) {
+    final i18n = AppLocalizations.of(context);
+    // Only the stacked chart leaves a component out, so the colours of the
+    // rows below have to follow the same list
+    final stacked = category.metricType.isSummedPerDay ? stackableComponents(category) : null;
+
+    return Column(
+      children: [
+        ChartRangeSelector(
+          value: range,
+          onChanged: onRangeChanged,
+        ),
+        MeasurementChartArea<Map<String, List<MeasurementChartEntry>>>(
+          identity: category.id!,
+          watch: (ref) => groupPointsFor(ref, category, range),
+          builder: (context, points) => [
+            Container(
+              padding: const EdgeInsets.all(15),
+              height: 220,
+              child: groupHasData(points)
+                  ? buildGroupChart(context, category, points)
+                  : Center(
+                      child: Text(
+                        i18n.noDataAvailable,
+                        style: Theme.of(context).textTheme.bodyLarge?.copyWith(
+                          color: Theme.of(context).colorScheme.secondary.withValues(alpha: 0.7),
+                        ),
+                      ),
+                    ),
+            ),
+          ],
+          onError: (_, error) => [StreamErrorIndicator(error.toString())],
+        ),
+        ...category.children.mapIndexed((index, child) {
+          final colorIndex = stacked == null ? index : stacked.indexWhere((c) => c.id == child.id);
+          return ListTile(
+            dense: true,
+            leading: colorIndex < 0
+                ? null
+                : Container(
+                    width: 12,
+                    height: 12,
+                    decoration: BoxDecoration(
+                      shape: BoxShape.circle,
+                      color: componentColor(context, colorIndex),
+                    ),
+                  ),
+            title: Text(child.displayName(context)),
+            trailing: const Icon(Icons.chevron_right),
+            onTap: () => Navigator.pushNamed(
+              context,
+              MeasurementEntriesScreen.routeName,
+              arguments: child.id,
+            ),
+          );
+        }),
+        const Divider(),
+        _GroupReadingsList(category),
+      ],
+    );
+  }
+}
+
+/// A category's entries, newest first, read one page at a time.
+///
+/// A history that runs into five figures is not a list anyone scrolls to the
+/// end of, and reading it whole is what the aggregated queries were introduced
+/// to stop. The page grows as it is scrolled.
+class _EntryList extends ConsumerStatefulWidget {
+  const _EntryList({
+    required this.category,
+    required this.unit,
+    required this.unitLabel,
+    this.editFormBuilder,
+  });
+
+  final MeasurementCategory category;
+  final String unit;
+  final String unitLabel;
+  final Widget Function(MeasurementEntry entry)? editFormBuilder;
+
+  @override
+  ConsumerState<_EntryList> createState() => _EntryListState();
+}
+
+class _EntryListState extends ConsumerState<_EntryList> with _GrowsWhileScrolled {
+  @override
+  Widget build(BuildContext context) {
+    final category = widget.category;
+    final page = ref.watch(measurementEntriesPageProvider(category.id!, limit));
+    if (page case AsyncError(:final error)) {
+      return StreamErrorIndicator(error.toString());
+    }
+    final entries = page.value ?? const <MeasurementEntry>[];
+    final datetimeFormat = localizedDate(context);
+
+    return _pagedBox(
+      itemCount: entries.length,
+      hasMore: entries.length >= limit,
+      itemBuilder: (context, index) {
+        final currentEntry = entries[index];
+
+        return Card(
+          child: ListTile(
+            title: Text(
+              unitSuffixed(
+                measurementValue(
+                  context,
+                  currentEntry.valueIn(widget.unit, categoryUnit: category.unit),
+                  widget.unit,
+                ),
+                widget.unitLabel,
+              ),
+            ),
+            subtitle: Text(datetimeFormat.format(currentEntry.date)),
+            // Imported entries are read-only; changes belong in the source
+            // app, deletes would reappear on the next import
+            trailing: currentEntry.source != 'user'
+                ? Tooltip(
+                    message: AppLocalizations.of(context).importedEntry,
+                    child: const Icon(Icons.monitor_heart_outlined),
+                  )
+                : PopupMenuButton(
                     itemBuilder: (BuildContext context) {
                       return [
                         PopupMenuItem(
@@ -80,20 +298,18 @@ class EntriesList extends ConsumerWidget {
                             FormScreen.routeName,
                             arguments: FormScreenArguments(
                               AppLocalizations.of(context).edit,
-                              MeasurementEntryForm(
-                                _category.id!,
-                                currentEntry,
-                              ),
+                              widget.editFormBuilder?.call(currentEntry) ??
+                                  MeasurementEntryForm(category.id!, currentEntry),
                             ),
                           ),
                         ),
                         PopupMenuItem(
                           child: Text(AppLocalizations.of(context).delete),
                           onTap: () async {
-                            // Delete entry from DB
-                            await provider.deleteEntry(currentEntry.id!);
+                            await ref
+                                .read(measurementProvider.notifier)
+                                .deleteEntry(currentEntry.id!);
 
-                            // and inform the user
                             if (context.mounted) {
                               showSnackbar(
                                 context,
@@ -106,12 +322,113 @@ class EntriesList extends ConsumerWidget {
                       ];
                     },
                   ),
-                ),
-              );
-            },
           ),
+        );
+      },
+    );
+  }
+}
+
+/// The readings of a group, newest first, read one page at a time.
+///
+/// A page is entries, not readings, so it lists fewer rows than it read: a
+/// blood pressure page of fifty entries is twenty-five readings. Whether there
+/// is more to fetch therefore follows from the entries, not from the list.
+class _GroupReadingsList extends ConsumerStatefulWidget {
+  const _GroupReadingsList(this.category);
+
+  final MeasurementCategory category;
+
+  @override
+  ConsumerState<_GroupReadingsList> createState() => _GroupReadingsListState();
+}
+
+class _GroupReadingsListState extends ConsumerState<_GroupReadingsList> with _GrowsWhileScrolled {
+  @override
+  Widget build(BuildContext context) {
+    final category = widget.category;
+    final page = ref.watch(measurementGroupEntriesPageProvider(category.id!, limit));
+    if (page case AsyncError(:final error)) {
+      return StreamErrorIndicator(error.toString());
+    }
+    final entries = page.value ?? const <MeasurementEntry>[];
+    final readings = groupReadings(category, entries);
+    final datetimeFormat = localizedDate(context);
+    final total = category.children.firstWhereOrNull((c) => c.metricType.isGroupTotal)?.id;
+    final componentsById = {for (final c in category.children) c.id!: c};
+
+    return _pagedBox(
+      itemCount: readings.length,
+      hasMore: entries.length >= limit,
+      itemBuilder: (context, index) {
+        final (date, values) = readings[index];
+        // A roll-up leads and the parts explain it; without one the values are
+        // the reading itself, written the way it is read (a blood pressure as
+        // 120/80)
+        String formatted(num value) => measurementValue(context, value, category.unit);
+        final headline = unitSuffixed(
+          quoteGroupReading(category, values, formatted),
+          category.unit,
+        );
+        final parts = [
+          for (final MapEntry(key: id, value: value) in values.entries)
+            if (id != total) '${componentsById[id]!.displayName(context)} ${formatted(value)}',
+        ];
+
+        return Card(
+          child: ListTile(
+            title: Text(headline),
+            subtitle: Text(
+              [
+                datetimeFormat.format(date),
+                if (parts.isNotEmpty) parts.join(', '),
+              ].join(' · '),
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
+
+/// A fixed-height list that asks for the next page as it nears its end.
+mixin _GrowsWhileScrolled<T extends ConsumerStatefulWidget> on ConsumerState<T> {
+  static const _pageSize = 50;
+
+  int limit = _pageSize;
+
+  /// [hasMore] says whether the page came back full, i.e. whether asking for
+  /// a larger one can yield anything. It cannot be read off [itemCount], which
+  /// counts what is listed rather than what was read: a group lists one
+  /// reading per several entries.
+  Widget _pagedBox({
+    required int itemCount,
+    required bool hasMore,
+    required Widget? Function(BuildContext context, int index) itemBuilder,
+  }) {
+    // The limit [hasMore] was decided against. A drag sends many notifications
+    // before the rebuild, and without this one gesture would grow the page by
+    // several at once, since the answer to "is there more" cannot change
+    // until the next build.
+    final asked = limit;
+
+    return SizedBox(
+      height: 300,
+      child: NotificationListener<ScrollNotification>(
+        onNotification: (notification) {
+          // Grown before the end is reached, so the next page is there by the
+          // time the user gets to it
+          if (notification.metrics.extentAfter < 200 && hasMore && limit == asked) {
+            setState(() => limit += _pageSize);
+          }
+          return false;
+        },
+        child: ListView.builder(
+          padding: const EdgeInsets.all(10.0),
+          itemCount: itemCount,
+          itemBuilder: itemBuilder,
         ),
-      ],
+      ),
     );
   }
 }
diff --git a/lib/features/measurements/widgets/forms.dart b/lib/features/measurements/widgets/forms.dart
index d0543300c..dec23dfb9 100644
--- a/lib/features/measurements/widgets/forms.dart
+++ b/lib/features/measurements/widgets/forms.dart
@@ -50,49 +50,203 @@ class _MeasurementCategoryFormState extends ConsumerState<MeasurementCategoryFor
 
   @override
   Widget build(BuildContext context) {
+    // A category with children is a group whatever its metric type says, which
+    // is also how the charts decide. Both the chart type and the parent are
+    // meaningless for one
+    final categories = ref.watch(measurementCategoriesProvider).value ?? const [];
+    final hasChildren = _draft.id != null && categories.any((c) => c.parentId == _draft.id);
+    // Which categories hold entries, for the group check below: the map has a
+    // key exactly for those, and is loaded for the screens anyway
+    final withEntries = ref.watch(latestMeasurementEntriesProvider).value ?? const {};
+
+    // What the chart type picker offers: no override, plus what this metric
+    // type may be drawn as. Empty for a group, whose chart follows from what
+    // its components are to each other rather than from a preference
+    final chartTypes = hasChildren || _draft.metricType.availableChartTypes.isEmpty
+        ? const <ChartType>[]
+        : [ChartType.auto, ..._draft.metricType.availableChartTypes];
+
+    // Name and unit belong to the user only for a free-form category. A typed
+    // one takes both from its metric type, which is also what is shown for it
+    final isCustom = _draft.metricType == MetricType.custom;
+
+    // The trend line and the moving average are parts of the line chart: a
+    // category that can never be drawn as one is not offered them at all, and
+    // one that is currently drawn as something else keeps its settings but
+    // cannot change them
+    final canDrawLine =
+        !hasChildren && _draft.metricType.availableChartTypes.contains(ChartType.line);
+    final drawsLine = _draft.metricType.resolveChartType(_draft.chartType) == ChartType.line;
+    final settings = _draft.chartSettings;
+
     return Form(
       key: _form,
       child: Column(
         children: [
           // Name
-          TextFormField(
-            initialValue: _draft.name,
-            decoration: InputDecoration(
-              labelText: AppLocalizations.of(context).name,
-              helperText: AppLocalizations.of(context).measurementCategoriesHelpText,
+          if (isCustom)
+            TextFormField(
+              initialValue: _draft.name,
+              decoration: InputDecoration(
+                labelText: AppLocalizations.of(context).name,
+                helperText: AppLocalizations.of(context).measurementCategoriesHelpText,
+              ),
+              maxLength: MeasurementCategory.maxNameChars,
+              onSaved: (value) => _draft = _draft.copyWith(name: value ?? ''),
+              validator: (value) {
+                final i18n = AppLocalizations.of(context);
+                if (value!.isEmpty) {
+                  return i18n.enterValue;
+                }
+                if (value.length > MeasurementCategory.maxNameChars) {
+                  return i18n.enterMaxCharacters(MeasurementCategory.maxNameChars.toString());
+                }
+                return null;
+              },
             ),
-            maxLength: MeasurementCategory.maxNameChars,
-            onSaved: (value) => _draft = _draft.copyWith(name: value ?? ''),
-            validator: (value) {
-              final i18n = AppLocalizations.of(context);
-              if (value!.isEmpty) {
-                return i18n.enterValue;
-              }
-              if (value.length > MeasurementCategory.maxNameChars) {
-                return i18n.enterMaxCharacters(MeasurementCategory.maxNameChars.toString());
-              }
-              return null;
-            },
-          ),
 
           // Unit
-          TextFormField(
-            initialValue: _draft.unit,
-            decoration: InputDecoration(
-              labelText: AppLocalizations.of(context).unit,
-              helperText: AppLocalizations.of(context).measurementEntriesHelpText,
+          if (isCustom)
+            TextFormField(
+              initialValue: _draft.unit,
+              decoration: InputDecoration(
+                labelText: AppLocalizations.of(context).unit,
+                helperText: AppLocalizations.of(context).measurementEntriesHelpText,
+              ),
+              maxLength: MeasurementCategory.maxUnitChars,
+              onSaved: (value) => _draft = _draft.copyWith(unit: value ?? ''),
+              validator: (value) {
+                final i18n = AppLocalizations.of(context);
+                if (value!.isEmpty) {
+                  return i18n.enterValue;
+                }
+                if (value.length > MeasurementCategory.maxUnitChars) {
+                  return i18n.enterMaxCharacters(MeasurementCategory.maxUnitChars.toString());
+                }
+                return null;
+              },
             ),
-            maxLength: MeasurementCategory.maxUnitChars,
-            onSaved: (value) => _draft = _draft.copyWith(unit: value ?? ''),
-            validator: (value) {
-              final i18n = AppLocalizations.of(context);
-              if (value!.isEmpty) {
-                return i18n.enterValue;
+
+          // The metric type is picked when the category is created (see
+          // MetricPickerSheet) and fixed from then on: the key of a typed
+          // category is derived from it, and the server refuses a change
+
+          // Chart type. Only the shapes that are a matter of taste are offered,
+          // and only those the metric type can actually be drawn as; a group
+          // gets none, its chart follows from what its components are
+          if (chartTypes.isNotEmpty)
+            DropdownButtonFormField(
+              // A type stored by a client that offers more of them than this
+              // one falls back to the derived chart, so it shows as automatic
+              initialValue: chartTypes.contains(_draft.chartType)
+                  ? _draft.chartType
+                  : ChartType.auto,
+              decoration: InputDecoration(labelText: AppLocalizations.of(context).chartType),
+              items: chartTypes
+                  .map((t) => DropdownMenuItem(value: t, child: Text(t.localized(context))))
+                  .toList(),
+              onChanged: (value) {
+                if (value != null) {
+                  setState(() {
+                    _draft = _draft.copyWith(chartType: value);
+                  });
+                }
+              },
+            ),
+
+          // Trend character and average window, disabled while the category is
+          // drawn as something that has neither
+          if (canDrawLine) ...[
+            DropdownButtonFormField<TrendCharacter>(
+              initialValue: settings.trend,
+              decoration: InputDecoration(labelText: AppLocalizations.of(context).chartTrend),
+              items: TrendCharacter.values
+                  .map((t) => DropdownMenuItem(value: t, child: Text(t.localized(context))))
+                  .toList(),
+              onChanged: drawsLine
+                  ? (value) {
+                      if (value != null) {
+                        setState(() {
+                          _draft = _draft.withChartSetting('trend', value.wireValue);
+                        });
+                      }
+                    }
+                  : null,
+            ),
+            DropdownButtonFormField<int>(
+              initialValue: settings.averageWindow,
+              decoration: InputDecoration(
+                labelText: AppLocalizations.of(context).chartAverageWindow,
+              ),
+              items: ChartSettings.averageWindows
+                  .map(
+                    (days) => DropdownMenuItem(
+                      value: days,
+                      child: Text(AppLocalizations.of(context).chartAverageWindowDays(days)),
+                    ),
+                  )
+                  .toList(),
+              onChanged: drawsLine
+                  ? (value) {
+                      if (value != null) {
+                        setState(() {
+                          _draft = _draft.withChartSetting('average_window', value);
+                        });
+                      }
+                    }
+                  : null,
+            ),
+          ],
+
+          // Parent group (multi-value measurements, e.g. blood pressure).
+          // Mirrors the server rules: only top-level, entry-free categories
+          // can be parents, a category with children cannot be nested, a typed
+          // category stays top-level, and a group takes only its own
+          // components (which it is created with).
+          Builder(
+            builder: (context) {
+              if (hasChildren || _draft.metricType != MetricType.custom) {
+                return const SizedBox.shrink();
               }
-              if (value.length > MeasurementCategory.maxUnitChars) {
-                return i18n.enterMaxCharacters(MeasurementCategory.maxUnitChars.toString());
+
+              final candidates = categories
+                  .where(
+                    (c) =>
+                        c.parentId == null &&
+                        c.id != _draft.id &&
+                        !withEntries.containsKey(c.id) &&
+                        !c.isOfficialBodyWeight &&
+                        !c.metricType.isGroup,
+                  )
+                  .toList();
+              if (candidates.isEmpty) {
+                return const SizedBox.shrink();
               }
-              return null;
+
+              final initialParent = candidates.any((c) => c.id == _draft.parentId)
+                  ? _draft.parentId
+                  : null;
+
+              return DropdownButtonFormField<String?>(
+                initialValue: initialParent,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).partOfGroup,
+                ),
+                items: [
+                  DropdownMenuItem<String?>(
+                    value: null,
+                    child: Text(AppLocalizations.of(context).noGroup),
+                  ),
+                  ...candidates.map(
+                    (c) => DropdownMenuItem<String?>(value: c.id, child: Text(c.name)),
+                  ),
+                ],
+                onChanged: (value) {
+                  setState(() {
+                    _draft = _draft.copyWith(parentId: value);
+                  });
+                },
+              );
             },
           ),
           FormSubmitButton(
@@ -135,17 +289,26 @@ class _MeasurementEntryFormState extends ConsumerState<MeasurementEntryForm> {
   final _form = GlobalKey<FormState>();
   final _notesController = TextEditingController();
 
-  late final String? _existingId = widget._entry?.id;
-  late DateTime _date = widget._entry?.date ?? DateTime.now();
+  late MeasurementEntry _draft;
+
+  /// The one field kept outside [_draft]: an entry's value is non-null, while
+  /// the field starts empty for a new one and only has a value once it passes
+  /// validation. Folded into the draft on save.
   num? _value;
-  String _notes = '';
 
   @override
   void initState() {
     super.initState();
+    _draft =
+        widget._entry ??
+        MeasurementEntry(
+          categoryId: widget._categoryId,
+          date: DateTime.now(),
+          value: 0,
+          notes: '',
+        );
     _value = widget._entry?.value;
-    _notes = widget._entry?.notes ?? '';
-    _notesController.text = _notes;
+    _notesController.text = _draft.notes;
   }
 
   @override
@@ -157,55 +320,25 @@ class _MeasurementEntryFormState extends ConsumerState<MeasurementEntryForm> {
   @override
   Widget build(BuildContext context) {
     final notifier = ref.read(measurementProvider.notifier);
-    final Future<MeasurementCategory?> categoryFuture = notifier.getCategoryById(
-      widget._categoryId,
-    );
+    // Watched rather than read once: the form only needs name, unit and the
+    // limits, and a re-emission leaves the fields it does not feed alone
+    final categoryAsync = ref.watch(measurementCategoryProvider(widget._categoryId));
 
-    return FutureBuilder(
-      future: categoryFuture,
-      builder: (context, snapshot) {
-        if (snapshot.connectionState == ConnectionState.waiting) {
-          return const BoxedProgressIndicator();
-        }
-        if (snapshot.hasError) {
-          return StreamErrorIndicator(snapshot.error.toString());
-        }
-        if (!snapshot.hasData || snapshot.data == null) {
+    return categoryAsync.when(
+      loading: () => const BoxedProgressIndicator(),
+      error: (error, _) => StreamErrorIndicator(error.toString()),
+      data: (category) {
+        if (category == null) {
           return const Text('Category not found');
         }
 
-        final category = snapshot.data!;
-
         return Form(
           key: _form,
           child: Column(
             children: [
-              // Date
-              DateInputWidget(
-                value: _date,
-                labelText: AppLocalizations.of(context).date,
-                firstDate: DateTime(DateTime.now().year - 10),
-                lastDate: DateTime.now(),
-                onChanged: (date) {
-                  _date = _date.copyWith(
-                    year: date.year,
-                    month: date.month,
-                    day: date.day,
-                  );
-                },
-              ),
-
-              // Time
-              TimeInputWidget(
-                value: TimeOfDay.fromDateTime(_date),
-                labelText: AppLocalizations.of(context).time,
-                onChanged: (time) {
-                  _date = _date.copyWith(
-                    hour: time.hour,
-                    minute: time.minute,
-                    second: 0,
-                  );
-                },
+              DateTimeInputWidget(
+                value: _draft.date,
+                onChanged: (date) => _draft = _draft.copyWith(date: date),
               ),
 
               // Value
@@ -214,8 +347,8 @@ class _MeasurementEntryFormState extends ConsumerState<MeasurementEntryForm> {
                 labelText: AppLocalizations.of(context).value,
                 suffixText: category.unit,
                 isRequired: true,
-                min: MeasurementEntry.minValue,
-                max: MeasurementEntry.maxValue,
+                min: category.metricType.limits(category.unit).min,
+                max: category.metricType.limits(category.unit).max,
                 onChanged: (value) => _value = value,
               ),
               // Notes
@@ -223,7 +356,7 @@ class _MeasurementEntryFormState extends ConsumerState<MeasurementEntryForm> {
                 decoration: InputDecoration(labelText: AppLocalizations.of(context).notes),
                 controller: _notesController,
                 onSaved: (newValue) {
-                  _notes = newValue ?? '';
+                  _draft = _draft.copyWith(notes: newValue ?? '');
                 },
                 validator: (value) {
                   const minLength = 0;
@@ -247,13 +380,10 @@ class _MeasurementEntryFormState extends ConsumerState<MeasurementEntryForm> {
                   }
                   _form.currentState!.save();
 
-                  final entry = MeasurementEntry(
-                    id: _existingId,
-                    categoryId: category.id!,
-                    date: _date,
-                    value: _value!,
-                    notes: _notes,
-                  );
+                  // The draft carries what the form does not offer (source,
+                  // external id, extra data), so an edited import stays
+                  // deduplicable and the unit it was entered in survives
+                  final entry = _draft.copyWith(value: _value!);
                   if (entry.id == null) {
                     await notifier.addEntry(entry);
                   } else {
@@ -272,3 +402,78 @@ class _MeasurementEntryFormState extends ConsumerState<MeasurementEntryForm> {
     );
   }
 }
+
+/// Entry form for a multi-value group (e.g. blood pressure): one value field
+/// per component, saved as one entry per component with a shared timestamp.
+class GroupMeasurementEntryForm extends ConsumerStatefulWidget {
+  final MeasurementCategory _group;
+
+  const GroupMeasurementEntryForm(this._group);
+
+  @override
+  ConsumerState<GroupMeasurementEntryForm> createState() => _GroupMeasurementEntryFormState();
+}
+
+class _GroupMeasurementEntryFormState extends ConsumerState<GroupMeasurementEntryForm> {
+  final _form = GlobalKey<FormState>();
+
+  DateTime _date = DateTime.now();
+  late final Map<String, num?> _values = {
+    for (final child in widget._group.children) child.id!: null,
+  };
+
+  @override
+  Widget build(BuildContext context) {
+    return Form(
+      key: _form,
+      child: Column(
+        children: [
+          // Date and time are shared by all components of the reading
+          DateTimeInputWidget(
+            value: _date,
+            onChanged: (date) => _date = date,
+          ),
+
+          // One value field per component, each bounded by its own type:
+          // systolic and diastolic do not share a range
+          for (final child in widget._group.children)
+            DecimalInputWidget(
+              value: _values[child.id],
+              labelText: child.displayName(context),
+              suffixText: child.unit.isNotEmpty ? child.unit : widget._group.unit,
+              isRequired: true,
+              min: child.metricType.limits(child.unit).min,
+              max: child.metricType.limits(child.unit).max,
+              onChanged: (value) => _values[child.id!] = value,
+            ),
+
+          FormSubmitButton(
+            label: AppLocalizations.of(context).save,
+            onPressed: () async {
+              if (!_form.currentState!.validate()) {
+                return;
+              }
+              _form.currentState!.save();
+
+              final entries = widget._group.children
+                  .map(
+                    (child) => MeasurementEntry(
+                      categoryId: child.id!,
+                      date: _date,
+                      value: _values[child.id]!,
+                      notes: '',
+                    ),
+                  )
+                  .toList();
+              await ref.read(measurementProvider.notifier).addGroupEntries(entries);
+
+              if (context.mounted) {
+                Navigator.of(context).pop();
+              }
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/features/measurements/widgets/helpers.dart b/lib/features/measurements/widgets/helpers.dart
index d019a920d..554510a18 100644
--- a/lib/features/measurements/widgets/helpers.dart
+++ b/lib/features/measurements/widgets/helpers.dart
@@ -1,80 +1,130 @@
 import 'package:flutter/material.dart';
-import 'package:wger/features/measurements/measurements.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:wger/core/widgets/error.dart';
+import 'package:wger/core/widgets/progress_indicator.dart';
+import 'package:wger/features/measurements/charts/colors.dart';
+import 'package:wger/features/measurements/charts/data.dart';
+import 'package:wger/features/measurements/charts/range.dart';
+import 'package:wger/features/measurements/charts/series.dart';
+import 'package:wger/features/measurements/models/measurement_bucket.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/unit_conversion.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.dart';
 import 'package:wger/features/measurements/widgets/charts.dart';
-import 'package:wger/features/nutrition/models/nutritional_plan.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
-List<Widget> getOverviewWidgets(
-  String title,
-  List<MeasurementChartEntry> raw,
-  List<MeasurementChartEntry> avg,
-  String unit,
-  BuildContext context,
-) {
+/// A chart with the overall change below it, for a Column to spread, titled
+/// where [title] says something the screen around it does not.
+List<Widget> buildChartSection(
+  BuildContext context, {
+  String? title,
+  required List<MeasurementChartEntry> raw,
+  required List<MeasurementChartEntry> avg,
+  required String unit,
+  MetricType metricType = MetricType.custom,
+  List<PlanPeriod> planPeriods = const [],
+  List<MeasurementChartEntry>? trend,
+  ChartType chartType = ChartType.auto,
+  ChartSettings settings = const ChartSettings(),
+  Widget? distribution,
+}) {
   return [
-    Text(
-      title,
-      textAlign: TextAlign.center,
-      style: Theme.of(context).textTheme.titleLarge,
-    ),
+    if (title != null)
+      Text(
+        title,
+        textAlign: TextAlign.center,
+        style: Theme.of(context).textTheme.titleLarge,
+      ),
     Container(
       padding: const EdgeInsets.all(15),
       height: 220,
       child: raw.isEmpty
           ? Center(
               child: Text(
-                'No data available',
+                AppLocalizations.of(context).noDataAvailable,
                 style: Theme.of(context).textTheme.bodyLarge?.copyWith(
                   color: Theme.of(context).colorScheme.secondary.withValues(alpha: 0.7),
                 ),
               ),
             )
-          : MeasurementChartWidgetFl(raw, unit, avgs: avg),
+          : buildChartForMetricType(
+              metricType,
+              raw,
+              avg,
+              unit,
+              planPeriods: planPeriods,
+              trend: trend,
+              chartType: chartType,
+              settings: settings,
+              distribution: distribution,
+            ),
     ),
     if (avg.isNotEmpty) MeasurementOverallChangeWidget(avg.first, avg.last, unit),
     const SizedBox(height: 8),
   ];
 }
 
-List<Widget> getOverviewWidgetsSeries(
-  String name,
-  List<MeasurementChartEntry> entriesAll,
-  List<MeasurementChartEntry> entries7dAvg,
-  List<NutritionalPlan> plans,
-  String unit,
-  BuildContext context,
-) {
-  final monthAgo = DateTime.now().subtract(const Duration(days: 30));
+/// The chart of a measurement series: [buildChartSection] for the chart the
+/// type resolves to, plus the legend naming the lines it draws.
+List<Widget> buildSeriesChartSection(
+  BuildContext context, {
+  required String name,
+  required List<MeasurementChartEntry> entriesAll,
+  required List<MeasurementChartEntry> average,
+  required String unit,
+  List<PlanPeriod> planPeriods = const [],
+  MetricType metricType = MetricType.custom,
+  ChartType chartType = ChartType.auto,
+  ChartSettings settings = const ChartSettings(),
+  Widget? distribution,
+}) {
+  final resolved = resolveChartTypeForData(metricType, chartType, entriesAll);
+
+  // Neither the heatmap nor the change chart nor the distribution is a line
+  // over the range, and all of them bucket the points themselves: condensing
+  // would collapse the days (or narrow the spread) they are built from, the
+  // extra 30-day chart is a window they already show, and the legend names
+  // lines they do not draw
+  if (resolved == ChartType.heatmap ||
+      resolved == ChartType.delta ||
+      resolved == ChartType.distribution) {
+    return buildChartSection(
+      context,
+      // The screen names the category and the selector names the range, so a
+      // title is only worth its line where it says what the bars are
+      title: switch (resolved) {
+        ChartType.delta => AppLocalizations.of(context).chartWeeklyChangeTitle(name),
+        ChartType.distribution => AppLocalizations.of(context).chartDistributionTitle(name),
+        _ => null,
+      },
+      raw: entriesAll,
+      // The overall change is the one-number version of the change chart. Over
+      // a grid it measures a line that is not drawn, and a summed metric has no
+      // level to change.
+      avg: resolved == ChartType.delta && !metricType.isSummedPerDay ? average : const [],
+      unit: unit,
+      metricType: metricType,
+      chartType: chartType,
+      settings: settings,
+      distribution: distribution,
+    );
+  }
+
+  // The points arrive condensed, so the trend follows the shape across weeks
+  // rather than the swings within a single day
+  final summed = metricType.isSummedPerDay;
+  final trendAll = summed ? null : smoothedTrendline(entriesAll, period: settings.trend.emaPeriod);
   return [
-    ...getOverviewWidgets(
-      AppLocalizations.of(context).chartAllTimeTitle(name),
-      entriesAll,
-      entries7dAvg,
-      unit,
+    ...buildChartSection(
       context,
+      raw: entriesAll,
+      avg: average,
+      unit: unit,
+      metricType: metricType,
+      planPeriods: planPeriods,
+      trend: trendAll,
+      settings: settings,
     ),
-    // Show overview widgets for each plan in plans
-    for (final plan in plans)
-      ...getOverviewWidgets(
-        AppLocalizations.of(context).chartDuringPlanTitle(name, plan.description),
-        entriesAll.whereDateWithInterpolation(plan.startDate, plan.endDate),
-        entries7dAvg.whereDateWithInterpolation(plan.startDate, plan.endDate),
-        unit,
-        context,
-      ),
-    // if all time is significantly longer than 30 days (let's say > 75 days)
-    // then let's show a separate chart just focusing on the last 30 days,
-    // if there is data for it.
-    if (entriesAll.isNotEmpty &&
-        entriesAll.first.date.isBefore(entriesAll.last.date.subtract(const Duration(days: 75))) &&
-        entriesAll.any((e) => e.date.isAfter(monthAgo)))
-      ...getOverviewWidgets(
-        AppLocalizations.of(context).chart30DaysTitle(name),
-        entriesAll.whereDateWithInterpolation(monthAgo, null),
-        entries7dAvg.whereDateWithInterpolation(monthAgo, null),
-        unit,
-        context,
-      ),
     // legend
     Row(
       mainAxisAlignment: MainAxisAlignment.center,
@@ -89,34 +139,284 @@ List<Widget> getOverviewWidgetsSeries(
           text: AppLocalizations.of(context).indicatorAvg,
           isSquare: true,
         ),
+        if (!metricType.isSummedPerDay)
+          Indicator(
+            color: Theme.of(context).colorScheme.secondary,
+            text: AppLocalizations.of(context).indicatorTrend,
+            isSquare: true,
+          ),
+        if (planPeriods.isNotEmpty)
+          Indicator(
+            color: planBandColor(context),
+            text: AppLocalizations.of(context).nutritionalPlan,
+            isSquare: true,
+          ),
       ],
     ),
   ];
 }
 
-// return the raw and average measurements for a "sensible range"
-// a sensible range is something relatively recent, which is most relevant
-// for the user to track their progress, but a range should always include
-// at least 5 points, and if not we chose a bigger one.
-// we return a range of the last 2 months, 4 months, or the full history
-(List<MeasurementChartEntry>, List<MeasurementChartEntry>) sensibleRange(
-  List<MeasurementChartEntry> entriesAll,
+/// The points the chart of [category] draws, over the range it is read for.
+///
+/// They reach back beyond the range, so the moving average derived from them
+/// does not start over at the cutoff. [targetUnit] overrides the category
+/// unit, for body weight, which is shown in the profile unit.
+AsyncValue<List<MeasurementChartEntry>> chartPointsFor(
+  WidgetRef ref,
+  MeasurementCategory category,
+  ChartRange range, {
+  String? targetUnit,
+}) {
+  final unit = targetUnit ?? category.unit;
+  final level = chartBucketLevel(category.metricType, category.chartType);
+
+  return ref
+      .watch(measurementChartBucketsProvider(category.id!, range.readCutoff, null, level))
+      .whenData(
+        (buckets) => chartEntriesForBuckets(
+          buckets,
+          targetUnit: unit,
+          categoryUnit: category.unit,
+          summed: category.metricType.isSummedPerDay,
+        ),
+      );
+}
+
+/// Draws a chart from the aggregated queries, keeping what it last drew while
+/// another range loads.
+///
+/// Picking a range watches a different provider, which starts out loading:
+/// without this the chart would blank for a frame, which is what the range
+/// switch used to look like.
+class MeasurementChartArea<T> extends ConsumerStatefulWidget {
+  const MeasurementChartArea({
+    required this.identity,
+    required this.watch,
+    required this.builder,
+    required this.onError,
+    this.loading = const SizedBox(height: 220, child: BoxedProgressIndicator()),
+    super.key,
+  });
+
+  /// What the kept data belongs to. Another category in the same slot of a
+  /// list has nothing to do with what is on screen.
+  final Object identity;
+
+  final AsyncValue<T> Function(WidgetRef ref) watch;
+
+  /// Draws the chart for the data that arrived.
+  final List<Widget> Function(BuildContext context, T data) builder;
+
+  /// Drawn when nothing could be read and there is nothing to keep: a card
+  /// leaves the space empty, a detail screen names the error.
+  final List<Widget> Function(BuildContext context, Object error) onError;
+
+  /// Placeholder for the first load, before there is anything to keep.
+  final Widget loading;
+
+  @override
+  ConsumerState<MeasurementChartArea<T>> createState() => _MeasurementChartAreaState<T>();
+}
+
+class _MeasurementChartAreaState<T> extends ConsumerState<MeasurementChartArea<T>> {
+  T? _last;
+
+  @override
+  void didUpdateWidget(covariant MeasurementChartArea<T> oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.identity != widget.identity) {
+      _last = null;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final data = widget.watch(ref);
+    if (data.hasValue) {
+      _last = data.value;
+    }
+
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: switch ((data, _last)) {
+        (_, final T last) => widget.builder(context, last),
+        (AsyncError(:final error), _) => widget.onError(context, error),
+        _ => [widget.loading],
+      },
+    );
+  }
+}
+
+/// The chart points of a group's components, keyed by component id, over the
+/// range they are read for.
+AsyncValue<Map<String, List<MeasurementChartEntry>>> groupPointsFor(
+  WidgetRef ref,
+  MeasurementCategory group,
+  ChartRange range,
 ) {
-  final entries7dAvg = moving7dAverage(entriesAll);
-  final twoMonthsAgo = DateTime.now().subtract(const Duration(days: 61));
-  final fourMonthsAgo = DateTime.now().subtract(const Duration(days: 122));
-
-  if (entriesAll.whereDate(twoMonthsAgo, null).length > 4) {
-    return (
-      entriesAll.whereDate(twoMonthsAgo, null),
-      entries7dAvg.whereDate(twoMonthsAgo, null),
+  final level = group.metricType.isSummedPerDay
+      ? MeasurementBucketLevel.day
+      : MeasurementBucketLevel.auto;
+
+  return ref
+      .watch(measurementGroupBucketsProvider(group.id!, range.readCutoff, level))
+      .whenData((buckets) => groupComponentPoints(group, buckets, cutoff: range.cutoff));
+}
+
+/// The histogram of a category, read as counted values rather than as
+/// readings.
+///
+/// The one chart with its own query: it has no time axis, so it needs every
+/// value rather than a condensed series, and counting them is what keeps that
+/// from being every row.
+class MeasurementDistributionChart extends ConsumerWidget {
+  const MeasurementDistributionChart({
+    required this.category,
+    required this.range,
+    required this.unitLabel,
+    required this.targetUnit,
+    super.key,
+  });
+
+  final MeasurementCategory category;
+  final ChartRange range;
+
+  /// Label the values are shown with, and the unit they are converted to.
+  final String unitLabel;
+  final String targetUnit;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final summed = category.metricType.isSummedPerDay;
+
+    return MeasurementChartArea<List<MeasurementValueCount>>(
+      identity: category.id!,
+      watch: (ref) =>
+          ref.watch(measurementValueCountsProvider(category.id!, range.countCutoff, summed)),
+      loading: const CenteredProgressIndicator(),
+      // The histogram fills the height it is given; the column around it would
+      // otherwise offer it an unbounded one
+      builder: (context, counts) => [Expanded(child: _histogram(counts, summed))],
+      onError: (_, error) => [StreamErrorIndicator(error.toString())],
     );
   }
-  if (entriesAll.whereDate(fourMonthsAgo, null).length > 4) {
-    return (
-      entriesAll.whereDate(fourMonthsAgo, null),
-      entries7dAvg.whereDate(fourMonthsAgo, null),
+
+  Widget _histogram(List<MeasurementValueCount> counts, bool summed) {
+    if (counts.isEmpty) {
+      return const SizedBox.shrink();
+    }
+
+    // Values are counted per unit they were entered in, so each goes through
+    // the conversion helper before equal ones are added up
+    num inTargetUnit(MeasurementValueCount count) => convertWeight(
+      count.value,
+      from: unitOrFallback(count.unit, category.unit),
+      to: targetUnit,
     );
+
+    final merged = <num, int>{};
+    for (final count in counts) {
+      merged.update(
+        inTargetUnit(count),
+        (existing) => existing + count.count,
+        ifAbsent: () => count.count,
+      );
+    }
+
+    return MeasurementDistributionWidgetFl(
+      [for (final MapEntry(:key, :value) in merged.entries) (value: key, count: value)],
+      latest: inTargetUnit(counts.reduce((a, b) => b.newest.isAfter(a.newest) ? b : a)),
+      unit: unitLabel,
+      binWidth: category.metricType.binWidth(targetUnit),
+      countsAreDays: summed,
+    );
+  }
+}
+
+/// The chart a multi-value group gets, which follows from what its components
+/// are to each other.
+///
+/// Components that are parts of one whole (the sleep stages) stack into one
+/// bar per day. Two components that are the ends of a reading (blood pressure)
+/// become one floating bar spanning them. Everything else, and anything the
+/// first two have no data for, falls back to one line per component so the
+/// card never goes blank while there is something to show.
+Widget buildGroupChart(
+  BuildContext context,
+  MeasurementCategory group,
+  Map<String, List<MeasurementChartEntry>> points,
+) {
+  if (group.metricType.isSummedPerDay) {
+    final components = stackableComponents(group);
+    final stacked = groupStackedEntries(components, points);
+    if (stacked.isNotEmpty) {
+      return MeasurementStackedBarChartWidgetFl(
+        stacked,
+        components.map((c) => c.displayName(context)).toList(),
+        group.unit,
+      );
+    }
   }
-  return (entriesAll, entries7dAvg);
+
+  final ranges = group.children.length == 2
+      ? groupRangeEntries(points)
+      : const <MeasurementChartEntry>[];
+  if (ranges.isNotEmpty) {
+    return MeasurementBarChartWidgetFl(ranges, group.unit);
+  }
+
+  return MeasurementChartWidgetFl(groupComponentSeries(context, group, points), group.unit);
+}
+
+Widget buildChartForMetricType(
+  MetricType metricType,
+  List<MeasurementChartEntry> raw,
+  List<MeasurementChartEntry> avg,
+  String unit, {
+  List<PlanPeriod> planPeriods = const [],
+  List<MeasurementChartEntry>? trend,
+  ChartType chartType = ChartType.auto,
+  ChartSettings settings = const ChartSettings(),
+  Widget? distribution,
+}) {
+  final summed = metricType.isSummedPerDay;
+
+  // A pick that does not fit the metric type falls back to the derived chart,
+  // which is also what a category configured on a newer client gets here
+  final resolved = resolveChartTypeForData(metricType, chartType, raw);
+
+  if (resolved == ChartType.distribution) {
+    // Its own query, since a histogram needs every value and the points here
+    // are condensed. What is counted mirrors the heatmap's split: the summed
+    // types distribute their daily totals, the sample types every reading.
+    return distribution ?? const SizedBox.shrink();
+  }
+
+  if (resolved == ChartType.delta) {
+    // Not condensed: a week is already the bucket, and the deltas are what the
+    // chart draws rather than the values they were derived from
+    return MeasurementBarChartWidgetFl(weeklyDeltas(raw, summed: summed), unit, signed: true);
+  }
+
+  if (resolved == ChartType.heatmap) {
+    // The cells are days, so how a day's readings become one value has to be
+    // decided here: the summed types are a daily total, the sample types are
+    // repeated readings of the same thing and average
+    return MeasurementHeatmapWidgetFl(summed ? aggregatePerDay(raw) : averagePerDay(raw), unit);
+  }
+
+  if (summed) {
+    return MeasurementBarChartWidgetFl(aggregatePerDay(raw), unit);
+  }
+
+  // Condense before anything is derived from the points: a trend line over
+  // raw samples follows the swings within a single day instead of the trend
+  // across weeks, and the average is as dense as the values it summarises
+  return MeasurementChartWidgetFl.singleMeasurement(
+    raw,
+    unit,
+    avgs: avg,
+    trend: trend ?? smoothedTrendline(raw, period: settings.trend.emaPeriod),
+    planPeriods: planPeriods,
+  );
 }
diff --git a/lib/features/measurements/widgets/measurement_fab.dart b/lib/features/measurements/widgets/measurement_fab.dart
new file mode 100644
index 000000000..9cd9cac81
--- /dev/null
+++ b/lib/features/measurements/widgets/measurement_fab.dart
@@ -0,0 +1,99 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:wger/core/form_screen.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.dart';
+import 'package:wger/features/measurements/widgets/forms.dart';
+import 'package:wger/features/measurements/widgets/metric_picker.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+/// The overview's add button: opens a menu with one action per hand-kept
+/// category (straight into its entry form) plus the metric picker for
+/// starting something new.
+///
+/// A [MenuAnchor] rather than a hand-rolled expanding FAB: dismissal,
+/// positioning and focus come with it. Flutter's M3 menu is also as close as
+/// the stable SDK gets to the M3 FAB menu for now.
+class MeasurementsFab extends ConsumerWidget {
+  const MeasurementsFab({super.key});
+
+  Future<void> _addEntry(BuildContext context, MeasurementCategory category) async {
+    await Navigator.pushNamed(
+      context,
+      FormScreen.routeName,
+      arguments: FormScreenArguments(
+        AppLocalizations.of(context).newEntry,
+        category.hasChildren
+            ? GroupMeasurementEntryForm(category)
+            : MeasurementEntryForm(category.id!),
+      ),
+    );
+  }
+
+  /// Whether [category] is fed by hand rather than by the health sync, judged
+  /// by who wrote its newest reading. A category without entries counts as
+  /// hand-kept: it was just created and logging is what it is waiting for.
+  bool _isHandKept(MeasurementCategory category, Map<String, MeasurementEntry> latest) {
+    final newest = category.hasChildren
+        ? category.children.map((c) => latest[c.id])
+        : [latest[category.id]];
+
+    return newest.nonNulls.every((entry) => entry.source == 'user');
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final categories = ref.watch(measurementCategoriesProvider).value ?? const [];
+    final latest = ref.watch(latestMeasurementEntriesProvider).value ?? const {};
+    final handKept = [
+      for (final category in categories)
+        if (category.parentId == null &&
+            !category.isOfficialBodyWeight &&
+            _isHandKept(category, latest))
+          category,
+    ];
+
+    return MenuAnchor(
+      menuChildren: [
+        for (final category in handKept)
+          MenuItemButton(
+            leadingIcon: const Icon(Icons.add),
+            onPressed: () => _addEntry(context, category),
+            child: Text(category.displayName(context)),
+          ),
+        MenuItemButton(
+          leadingIcon: const Icon(Icons.playlist_add),
+          onPressed: () => showMetricPicker(context),
+          child: Text(AppLocalizations.of(context).trackNewMetric),
+        ),
+      ],
+      builder: (context, controller, child) => FloatingActionButton(
+        onPressed: () => controller.isOpen ? controller.close() : controller.open(),
+        child: AnimatedRotation(
+          turns: controller.isOpen ? 0.125 : 0,
+          duration: const Duration(milliseconds: 200),
+          child: const Icon(Icons.add, color: Colors.white),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/features/measurements/widgets/measurement_tile.dart b/lib/features/measurements/widgets/measurement_tile.dart
new file mode 100644
index 000000000..2afcca01c
--- /dev/null
+++ b/lib/features/measurements/widgets/measurement_tile.dart
@@ -0,0 +1,572 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'dart:math';
+
+import 'package:collection/collection.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:intl/intl.dart';
+import 'package:wger/core/formatting/formatting.dart';
+import 'package:wger/features/measurements/charts/calendar.dart';
+import 'package:wger/features/measurements/charts/data.dart';
+import 'package:wger/features/measurements/charts/range.dart';
+import 'package:wger/features/measurements/charts/series.dart';
+import 'package:wger/features/measurements/charts/spark.dart';
+import 'package:wger/features/measurements/models/measurement_bucket.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/models/unit_conversion.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.dart';
+import 'package:wger/features/measurements/screens/measurement_entries_screen.dart';
+import 'package:wger/features/measurements/widgets/charts.dart';
+import 'package:wger/features/measurements/widgets/helpers.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+/// Height of a tile in the overview grid, shared with the grid delegate.
+///
+/// Holds the rows a tile stacks (name, value, spark, axis, chip) with room to
+/// spare: they are laid out at their natural heights, so a tile sized to
+/// exactly fit them overflows as soon as the text does not render at the size
+/// it was measured at.
+const measurementTileExtent = 172.0;
+
+/// Height of the spark chart inside a tile.
+const _sparkHeight = 40.0;
+
+/// Height of a heatmap spark: it has no axis row, its grid takes that room
+/// instead, which is what makes the cells legible.
+const _heatmapHeight = 58.0;
+
+/// One category of the overview grid: latest value as the hero, a spark chart
+/// as context over the range the filter selects. A tap opens the category's
+/// entries screen; everything beyond a glance lives there.
+class MeasurementTile extends ConsumerWidget {
+  const MeasurementTile(this.category, {this.range = defaultChartRange, super.key});
+
+  final MeasurementCategory category;
+  final ChartRange range;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final latest = ref.watch(latestMeasurementEntriesProvider).value ?? const {};
+
+    return Card(
+      margin: EdgeInsets.zero,
+      clipBehavior: Clip.antiAlias,
+      child: InkWell(
+        onTap: () => Navigator.pushNamed(
+          context,
+          MeasurementEntriesScreen.routeName,
+          arguments: category.id,
+        ),
+        child: Padding(
+          padding: const EdgeInsets.all(12),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              // How old the reading is rides on the name's line: it qualifies
+              // the value below, but a row of its own costs the tile more
+              // height than it can spare, and next to the value it would push
+              // a wide reading (a blood pressure) into an ellipsis
+              Row(
+                children: [
+                  // Expanded, not Flexible: the name keeps the width the date
+                  // leaves, which pushes the date to the far edge instead of
+                  // crowding it against the name
+                  Expanded(
+                    child: Text(
+                      category.displayName(context),
+                      style: Theme.of(context).textTheme.titleSmall,
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                  ),
+                  const SizedBox(width: 6),
+                  _MeasuredAt(_newestOf(latest)),
+                ],
+              ),
+              _heroValue(context, latest),
+              const Spacer(),
+              if (category.hasChildren) _groupSpark(latest) else _leafSpark(latest),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  /// The latest reading, large: the one thing the tile exists to show. A
+  /// group is quoted through the shared rule, see [quoteGroupReading], so the
+  /// tile and the entries screen behind it read the same.
+  Widget _heroValue(BuildContext context, Map<String, MeasurementEntry> latest) {
+    String format(num value) => measurementValue(
+      context,
+      value,
+      category.unit,
+      decimals: category.metricType.displayDecimals,
+    );
+
+    final String value;
+    if (category.hasChildren) {
+      final values = {
+        for (final child in category.children)
+          if (latest[child.id] case final MeasurementEntry entry)
+            child.id!: entry.valueIn(child.unit, categoryUnit: child.unit),
+      };
+      value = values.isEmpty ? '—' : quoteGroupReading(category, values, format);
+    } else {
+      final latestValue = latest[category.id]?.valueIn(category.unit, categoryUnit: category.unit);
+      value = latestValue == null ? '—' : format(latestValue);
+    }
+
+    final theme = Theme.of(context);
+    return Text.rich(
+      TextSpan(
+        text: value,
+        style: theme.textTheme.headlineSmall,
+        children: [
+          if (category.unit.isNotEmpty)
+            TextSpan(
+              text: ' ${measurementUnit(category.unit)}',
+              style: theme.textTheme.bodySmall,
+            ),
+        ],
+      ),
+      maxLines: 1,
+      overflow: TextOverflow.ellipsis,
+    );
+  }
+
+  static const _emptySpark = [_SparkArea(child: SizedBox())];
+
+  /// The spark of a leaf category, honoring its chart type wherever the format
+  /// survives miniaturisation, see [sparkKindFor]. Keeps what it last drew
+  /// while another range loads, like the full-size charts.
+  Widget _leafSpark(Map<String, MeasurementEntry> latest) {
+    final kind = sparkKindFor(category.metricType, category.chartType);
+    final window = sparkWindowFor(kind, cutoff: range.countCutoff);
+    final level = kind == SparkKind.delta
+        ? MeasurementBucketLevel.week
+        : MeasurementBucketLevel.day;
+
+    return MeasurementChartArea<List<MeasurementChartEntry>>(
+      identity: category.id!,
+      loading: const _SparkArea(child: SizedBox()),
+      watch: (ref) => ref
+          .watch(measurementChartBucketsProvider(category.id!, window.start, null, level))
+          .whenData(
+            (buckets) => chartEntriesForBuckets(
+              buckets,
+              targetUnit: category.unit,
+              categoryUnit: category.unit,
+              summed: category.metricType.isSummedPerDay,
+            ),
+          ),
+      builder: (context, points) => _leafRows(context, kind, window, points, latest),
+      onError: (_, _) => _emptySpark,
+    );
+  }
+
+  List<Widget> _leafRows(
+    BuildContext context,
+    SparkKind kind,
+    SparkWindow window,
+    List<MeasurementChartEntry> points,
+    Map<String, MeasurementEntry> latest,
+  ) {
+    switch (kind) {
+      case SparkKind.heatmap:
+        return [
+          SizedBox(
+            height: _heatmapHeight,
+            width: double.infinity,
+            child: SparkHeatmap(points, weeks: window.slotCount!),
+          ),
+          // The same footer its kind would get elsewhere: a level for the
+          // summed types, a direction for the sample ones
+          if (category.metricType.isSummedPerDay)
+            _AverageChip(
+              points: points,
+              unit: category.unit,
+              decimals: category.metricType.displayDecimals,
+            )
+          else
+            _TrendChip(
+              points: points,
+              unit: category.unit,
+              decimals: category.metricType.displayDecimals,
+            ),
+        ];
+
+      case SparkKind.delta:
+        return [
+          _SparkArea(
+            child: SparkBarChart(
+              sparkDeltaBars(
+                weeklyDeltas(points, summed: category.metricType.isSummedPerDay),
+                start: window.start!,
+                slotCount: window.slotCount!,
+              ),
+            ),
+          ),
+          _MonthAxis(window.start!),
+        ];
+
+      case SparkKind.bars:
+        final data = window.weekly
+            ? sparkBars(
+                sparkWeeklyPoints(points),
+                start: window.start!,
+                slotCount: window.slotCount!,
+                slotDays: 7,
+              )
+            : sparkBars(points, start: window.start!, slotCount: window.slotCount!);
+        return [
+          _SparkArea(child: SparkBarChart(data)),
+          _axis(window.start!, window.days!, weekly: window.weekly),
+          _AverageChip(
+            points: points,
+            unit: category.unit,
+            decimals: category.metricType.displayDecimals,
+          ),
+        ];
+
+      case SparkKind.line:
+        // A full-history window has no fixed start; the data provides it
+        final start = window.start ?? dayOf(points.map((e) => e.date).minOrNull ?? DateTime.now());
+        final days = window.days ?? daysBetween(start, DateTime.now()) + 1;
+        final sparse = sparkIsSparse(points);
+        return [
+          _SparkArea(
+            child: SparkLineChart(points, start: start, days: days, dots: sparse),
+          ),
+          _axis(start, days, weekly: false),
+          _TrendChip(
+            points: points,
+            unit: category.unit,
+            decimals: category.metricType.displayDecimals,
+          ),
+        ];
+    }
+  }
+
+  /// The spark of a group, which keeps its structural form: sleep stacks,
+  /// blood pressure floats, anything else falls back to a line of its first
+  /// component with data.
+  Widget _groupSpark(Map<String, MeasurementEntry> latest) {
+    final window = sparkWindowFor(SparkKind.bars, cutoff: range.countCutoff);
+
+    return MeasurementChartArea<Map<String, List<MeasurementChartEntry>>>(
+      identity: category.id!,
+      loading: const _SparkArea(child: SizedBox()),
+      watch: (ref) => ref
+          .watch(
+            measurementGroupBucketsProvider(category.id!, window.start, MeasurementBucketLevel.day),
+          )
+          .whenData((buckets) => groupComponentPoints(category, buckets)),
+      builder: (context, points) => _groupRows(context, window, points, latest),
+      onError: (_, _) => _emptySpark,
+    );
+  }
+
+  List<Widget> _groupRows(
+    BuildContext context,
+    SparkWindow window,
+    Map<String, List<MeasurementChartEntry>> points,
+    Map<String, MeasurementEntry> latest,
+  ) {
+    final start = window.start!;
+    final slotCount = window.slotCount!;
+
+    if (category.metricType.isSummedPerDay) {
+      final components = stackableComponents(category);
+      final stacked = groupStackedEntries(components, points);
+      final data = window.weekly
+          ? sparkStackedBars(
+              sparkWeeklyStacks(stacked),
+              start: start,
+              slotCount: slotCount,
+              slotDays: 7,
+            )
+          : sparkStackedBars(stacked, start: start, slotCount: slotCount);
+      return [
+        _SparkArea(child: SparkBarChart(data)),
+        _axis(start, window.days!, weekly: window.weekly),
+        _AverageChip(
+          points: [for (final day in stacked) MeasurementChartEntry(day.total, day.date)],
+          unit: category.unit,
+          decimals: category.metricType.displayDecimals,
+        ),
+      ];
+    }
+
+    final ranges = category.children.length == 2
+        ? groupRangeEntries(points)
+        : const <MeasurementChartEntry>[];
+    if (ranges.isNotEmpty) {
+      final data = window.weekly
+          ? sparkFloatingBars(
+              sparkWeeklyPoints(ranges),
+              start: start,
+              slotCount: slotCount,
+              slotDays: 7,
+            )
+          : sparkFloatingBars(ranges, start: start, slotCount: slotCount);
+      return [
+        _SparkArea(child: SparkBarChart(data)),
+        _axis(start, window.days!, weekly: window.weekly),
+        // A range spans a reading rather than tracking a level, so the spread
+        // is what a chip could quote; the hero already says how recent it is
+        const SizedBox.shrink(),
+      ];
+    }
+
+    final fallback = category.children
+        .map((c) => points[c.id])
+        .firstWhereOrNull(
+          (p) => p != null && p.isNotEmpty,
+        );
+    return [
+      _SparkArea(
+        child: SparkLineChart(fallback ?? const [], start: start, days: window.days!),
+      ),
+      _axis(start, window.days!, weekly: window.weekly),
+      const SizedBox.shrink(),
+    ];
+  }
+
+  /// The entry the hero value comes from: the category's own for a leaf, the
+  /// newest of the components for a group.
+  MeasurementEntry? _newestOf(Map<String, MeasurementEntry> latest) {
+    final candidates = category.hasChildren
+        ? category.children.map((child) => latest[child.id])
+        : [latest[category.id]];
+
+    return candidates.nonNulls.fold(
+      null,
+      (newest, entry) => newest == null || entry.date.isAfter(newest.date) ? entry : newest,
+    );
+  }
+}
+
+/// The axis row under a spark: one weekday letter per day where the window is
+/// exactly one week of daily slots, the months it spans otherwise.
+Widget _axis(DateTime start, int days, {required bool weekly}) =>
+    !weekly && days == DateTime.daysPerWeek ? _WeekdayAxis(start) : _MonthAxis(start);
+
+/// One narrow letter per day of a one-week window, today highlighted.
+class _WeekdayAxis extends StatelessWidget {
+  const _WeekdayAxis(this.start);
+
+  final DateTime start;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final format = DateFormat('EEEEE', Localizations.localeOf(context).toString());
+    final now = DateTime.now();
+    final today = DateTime(now.year, now.month, now.day);
+
+    return Row(
+      children: [
+        for (var day = 0; day < DateTime.daysPerWeek; day++)
+          Expanded(
+            child: Text(
+              format.format(DateTime(start.year, start.month, start.day + day)),
+              textAlign: TextAlign.center,
+              style: DateTime(start.year, start.month, start.day + day) == today
+                  ? theme.textTheme.labelSmall?.copyWith(
+                      color: theme.colorScheme.primary,
+                      fontWeight: FontWeight.bold,
+                    )
+                  : theme.textTheme.labelSmall?.copyWith(
+                      color: theme.colorScheme.onSurfaceVariant,
+                    ),
+            ),
+          ),
+      ],
+    );
+  }
+}
+
+/// The fixed-height box every spark variant draws into, so the rows above and
+/// below it line up across the grid.
+class _SparkArea extends StatelessWidget {
+  const _SparkArea({required this.child});
+
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(height: _sparkHeight, width: double.infinity, child: child);
+  }
+}
+
+/// What stretch of the calendar the spark covers: its months or, over more
+/// than a year, its years. Kept to a few labels, the tile is narrow.
+class _MonthAxis extends StatelessWidget {
+  const _MonthAxis(this.start);
+
+  final DateTime start;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final locale = Localizations.localeOf(context).languageCode;
+    final today = DateTime.now();
+
+    final monthFormat = DateFormat.MMM(locale);
+    final months = <String>[];
+    var cursor = DateTime(start.year, start.month);
+    while (!cursor.isAfter(today)) {
+      months.add(monthFormat.format(cursor));
+      cursor = DateTime(cursor.year, cursor.month + 1);
+    }
+
+    final yearFormat = DateFormat.y(locale);
+    final labels = switch (months.length) {
+      > 12 => [
+        for (var year = start.year; year <= today.year; year++) yearFormat.format(DateTime(year)),
+      ],
+      > 4 => [months.first, months[months.length ~/ 2], months.last],
+      _ => months,
+    };
+
+    return Text(
+      labels.join(' · '),
+      textAlign: TextAlign.center,
+      maxLines: 1,
+      overflow: TextOverflow.ellipsis,
+      style: theme.textTheme.labelSmall?.copyWith(color: theme.colorScheme.onSurfaceVariant),
+    );
+  }
+}
+
+/// A neutral fact in chip form, see [_TrendChip] and [_AverageChip]. States
+/// what the numbers do, never whether that is good: which direction is the
+/// good one depends on the goal, and the tile should not assert one.
+class _FooterChip extends StatelessWidget {
+  const _FooterChip(this.text);
+
+  final String text;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 1),
+      decoration: BoxDecoration(
+        color: theme.colorScheme.surfaceContainerHighest,
+        borderRadius: BorderRadius.circular(8),
+      ),
+      child: Text(text, style: theme.textTheme.labelSmall, maxLines: 1),
+    );
+  }
+}
+
+/// Which way the window's values go, as a weekly rate ("↘ 0.3 kg/week"), or
+/// "stable" when the change is within noise of the value itself, or below
+/// what [decimals] can even show: a chip claiming "0.0 kg/week" says stable,
+/// only worse.
+class _TrendChip extends StatelessWidget {
+  const _TrendChip({required this.points, required this.unit, required this.decimals});
+
+  final List<MeasurementChartEntry> points;
+  final String unit;
+  final int decimals;
+
+  @override
+  Widget build(BuildContext context) {
+    if (points.length < 2) {
+      return const SizedBox.shrink();
+    }
+
+    final i18n = AppLocalizations.of(context);
+    final sorted = [...points]..sort((a, b) => a.date.compareTo(b.date));
+    final first = sorted.first;
+    final last = sorted.last;
+    final days = daysBetween(first.date, last.date);
+    if (days == 0) {
+      return const SizedBox.shrink();
+    }
+
+    final perWeek = (last.value - first.value) / days * 7;
+    final scale = last.value.abs();
+    final roundsToZero = perWeek.abs() < 0.5 / pow(10, decimals);
+    if (scale == 0 || roundsToZero || perWeek.abs() / scale < 0.01) {
+      return _FooterChip('→ ${i18n.sparkTrendStable}');
+    }
+
+    final arrow = perWeek < 0 ? '↘' : '↗';
+    return _FooterChip(
+      '$arrow '
+      '${i18n.sparkTrendPerWeek(measurementWithUnit(context, perWeek.abs(), unit, decimals: decimals))}',
+    );
+  }
+}
+
+/// The average over the window's measured days, for the summed types, whose
+/// per-day totals have a typical level rather than a trend.
+class _AverageChip extends StatelessWidget {
+  const _AverageChip({required this.points, required this.unit, required this.decimals});
+
+  final List<MeasurementChartEntry> points;
+  final String unit;
+  final int decimals;
+
+  @override
+  Widget build(BuildContext context) {
+    if (points.isEmpty) {
+      return const SizedBox.shrink();
+    }
+
+    final mean = points.map((e) => e.value).average;
+    return _FooterChip(
+      AppLocalizations.of(
+        context,
+      ).sparkAverage(measurementWithUnit(context, mean, unit, decimals: decimals)),
+    );
+  }
+}
+
+/// How long ago the value below was measured: for a category the health sync
+/// feeds every now and then, this is what says an old-looking chart is not a
+/// broken one.
+///
+/// Sizes to its text, so the row it sits in decides what happens when the
+/// two do not fit; it cannot ellipsify itself.
+class _MeasuredAt extends StatelessWidget {
+  const _MeasuredAt(this.entry);
+
+  final MeasurementEntry? entry;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    if (entry == null) {
+      return const SizedBox.shrink();
+    }
+
+    return Text(
+      relativeDate(context, entry!.date),
+      style: theme.textTheme.labelSmall?.copyWith(color: theme.colorScheme.onSurfaceVariant),
+    );
+  }
+}
diff --git a/lib/features/measurements/widgets/metric_picker.dart b/lib/features/measurements/widgets/metric_picker.dart
new file mode 100644
index 000000000..e765de018
--- /dev/null
+++ b/lib/features/measurements/widgets/metric_picker.dart
@@ -0,0 +1,124 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c)  2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:wger/core/form_screen.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.dart';
+import 'package:wger/features/measurements/screens/measurement_entries_screen.dart';
+import 'package:wger/features/measurements/widgets/forms.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+/// Asks what to track and creates the category for it.
+///
+/// A known metric needs no form: its name, unit and chart follow from the
+/// metric type, and the type is what the health import and the value limits
+/// hang off. It also cannot be changed afterwards, so it is picked here rather
+/// than being one field among others.
+Future<void> showMetricPicker(BuildContext context) => showModalBottomSheet(
+  context: context,
+  showDragHandle: true,
+  isScrollControlled: true,
+  // The list is long enough to fill the screen, which leaves nothing to tap
+  // next to the sheet and makes it dismissable by dragging alone
+  constraints: BoxConstraints(maxHeight: MediaQuery.sizeOf(context).height * 0.7),
+  builder: (context) => const MetricPickerSheet(),
+);
+
+class MetricPickerSheet extends ConsumerWidget {
+  const MetricPickerSheet();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final i18n = AppLocalizations.of(context);
+    // Only the types matter here, so this reads the categories without their
+    // entries rather than every reading of a synced account
+    final categories = ref.watch(measurementCategoriesProvider).value ?? const [];
+    final taken = categories.map((c) => c.metricType).toSet();
+
+    return SafeArea(
+      child: ListView(
+        shrinkWrap: true,
+        children: [
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
+            child: Text(
+              i18n.whatToTrack,
+              style: Theme.of(context).textTheme.titleLarge,
+            ),
+          ),
+          for (final metricType in MetricType.values.where((t) => t.isPickable))
+            ListTile(
+              enabled: !taken.contains(metricType),
+              title: Text(metricType.localized(context)),
+              // A metric without a unit gets no subtitle rather than an empty
+              // one, which would still take up its line
+              subtitle: switch ((taken.contains(metricType), metricType.defaultUnit)) {
+                (true, _) => Text(i18n.metricAlreadyTracked),
+                (false, '') => null,
+                (false, final unit) => Text(unit),
+              },
+              onTap: () async {
+                final id = await ref
+                    .read(measurementProvider.notifier)
+                    .addCategory(
+                      MeasurementCategory(
+                        name: metricType.canonicalName,
+                        unit: metricType.defaultUnit,
+                        metricType: metricType,
+                      ),
+                    );
+                if (!context.mounted) {
+                  return;
+                }
+                Navigator.of(context).pop();
+                // Straight to the new category: the overview is long enough
+                // that a card appearing somewhere in it does not read as
+                // "something happened"
+                if (id != null) {
+                  Navigator.pushNamed(
+                    context,
+                    MeasurementEntriesScreen.routeName,
+                    arguments: id,
+                  );
+                }
+              },
+            ),
+          const Divider(),
+          ListTile(
+            leading: const Icon(Icons.straighten),
+            title: Text(i18n.customMeasurement),
+            subtitle: Text(i18n.measurementCategoriesHelpText),
+            onTap: () {
+              Navigator.of(context).pop();
+              Navigator.pushNamed(
+                context,
+                FormScreen.routeName,
+                arguments: FormScreenArguments(
+                  i18n.newEntry,
+                  const MeasurementCategoryForm(),
+                ),
+              );
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/features/measurements/widgets/weight_form.dart b/lib/features/measurements/widgets/weight_form.dart
new file mode 100644
index 000000000..3713d2148
--- /dev/null
+++ b/lib/features/measurements/widgets/weight_form.dart
@@ -0,0 +1,150 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2020 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
+import 'package:wger/core/consts.dart';
+import 'package:wger/core/widgets/datetime_input.dart';
+import 'package:wger/core/widgets/decimal_input.dart';
+import 'package:wger/core/widgets/form_submit_button.dart';
+import 'package:wger/features/account/providers/user_profile_notifier.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/models/unit_conversion.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+/// Stepper sizes for the quick +/- buttons. The value bounds come from the
+/// metric type, which has them per unit (see [MetricType.limits])
+const _stepperSmall = 0.1;
+const _stepperBig = 1;
+
+/// Create/edit form for a body weight entry.
+///
+/// Entries are measurements in the official body weight [MeasurementCategory].
+/// The value is shown and edited in the unit it was entered in; the chosen
+/// unit is stamped into the entry's `extra_data`.
+class WeightForm extends riverpod.ConsumerStatefulWidget {
+  final MeasurementCategory _category;
+  final MeasurementEntry? _entry;
+
+  const WeightForm(this._category, [this._entry]);
+
+  @override
+  riverpod.ConsumerState<WeightForm> createState() => _WeightFormState();
+}
+
+class _WeightFormState extends riverpod.ConsumerState<WeightForm> {
+  final _form = GlobalKey<FormState>();
+
+  late DateTime _date;
+  num? _weight;
+  late String _unit;
+
+  @override
+  void initState() {
+    super.initState();
+    _date = widget._entry?.date ?? DateTime.now();
+    _weight = widget._entry?.value;
+
+    // Existing entries keep their stored unit (the value is shown exactly as
+    // entered); new entries default to the profile unit
+    final entry = widget._entry;
+    _unit = entry != null
+        ? entry.unitOrFallbackFor(widget._category.unit)
+        : weightDisplayUnit(ref.read(userProfileProvider).value?.isMetric ?? true);
+  }
+
+  /// The bounds of the unit the value is currently entered in
+  MetricLimits get _limits => MetricType.bodyWeight.limits(_unit);
+
+  @override
+  Widget build(BuildContext context) {
+    return Form(
+      key: _form,
+      child: Column(
+        children: [
+          DateTimeInputWidget(
+            key: const Key('dateTimeInput'),
+            value: _date,
+            onChanged: (value) => _date = value,
+          ),
+
+          // Weight
+          DecimalInputWidget(
+            key: const Key('weightInput'),
+            value: _weight,
+            labelText: AppLocalizations.of(context).weight,
+            isRequired: true,
+            min: _limits.min,
+            max: _limits.max,
+            steppers: const [_stepperBig, _stepperSmall],
+            onChanged: (value) => _weight = value,
+          ),
+
+          // Unit the value is entered in, stamped onto the entry when saving
+          DropdownButtonFormField<String>(
+            key: const Key('unitInput'),
+            initialValue: _unit,
+            decoration: InputDecoration(labelText: AppLocalizations.of(context).unit),
+            items: [
+              for (final unit in convertibleUnits) DropdownMenuItem(value: unit, child: Text(unit)),
+            ],
+            onChanged: (value) {
+              if (value != null) {
+                setState(() => _unit = value);
+              }
+            },
+          ),
+          FormSubmitButton(
+            key: const Key(SUBMIT_BUTTON_KEY_NAME),
+            label: AppLocalizations.of(context).save,
+            onPressed: () async {
+              final isValid = _form.currentState!.validate();
+              if (!isValid) {
+                return;
+              }
+              _form.currentState!.save();
+
+              // Notes, source and external id are not editable here; keep the
+              // existing values so edits to imported entries stay deduplicable.
+              // The chosen unit is stamped into extra_data, other keys survive.
+              final entry = MeasurementEntry(
+                id: widget._entry?.id,
+                categoryId: widget._category.id!,
+                date: _date,
+                value: _weight!,
+                notes: widget._entry?.notes ?? '',
+                source: widget._entry?.source ?? 'user',
+                externalId: widget._entry?.externalId,
+                extraData: {...?widget._entry?.extraData, 'unit': _unit},
+              );
+
+              final notifier = ref.read(measurementProvider.notifier);
+              entry.id == null ? await notifier.addEntry(entry) : await notifier.updateEntry(entry);
+
+              if (context.mounted) {
+                Navigator.of(context).pop();
+              }
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/features/nutrition/providers/nutrition_notifier.g.dart b/lib/features/nutrition/providers/nutrition_notifier.g.dart
index 7d78e5995..15815203f 100644
--- a/lib/features/nutrition/providers/nutrition_notifier.g.dart
+++ b/lib/features/nutrition/providers/nutrition_notifier.g.dart
@@ -33,7 +33,7 @@ final class NutritionNotifierProvider
   NutritionNotifier create() => NutritionNotifier();
 }
 
-String _$nutritionNotifierHash() => r'ecc463d68d5eae2df4c5e73e43e5cf214f6e1c8a';
+String _$nutritionNotifierHash() => r'd0db2f8f3853bd38ae28913cbb3256753e783f6c';
 
 abstract class _$NutritionNotifier extends $StreamNotifier<NutritionState> {
   Stream<NutritionState> build();
diff --git a/lib/features/nutrition/widgets/nutritional_plan_detail.dart b/lib/features/nutrition/widgets/nutritional_plan_detail.dart
index 820aae8e8..b47cc48af 100644
--- a/lib/features/nutrition/widgets/nutritional_plan_detail.dart
+++ b/lib/features/nutrition/widgets/nutritional_plan_detail.dart
@@ -19,13 +19,15 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
 import 'package:intl/intl.dart';
+import 'package:wger/features/measurements/models/unit_conversion.dart';
+import 'package:wger/features/measurements/providers/body_weight_provider.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.dart';
 import 'package:wger/features/nutrition/models/nutritional_plan.dart';
 import 'package:wger/features/nutrition/widgets/charts.dart';
 import 'package:wger/features/nutrition/widgets/macro_nutrients_table.dart';
 import 'package:wger/features/nutrition/widgets/meal.dart';
 import 'package:wger/features/nutrition/widgets/nutritional_diary_table.dart';
-import 'package:wger/features/weight/models/weight_entry.dart';
-import 'package:wger/features/weight/providers/body_weight_notifier.dart';
+import 'package:wger/features/nutrition/widgets/plan_weight_chart.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
 class NutritionalPlanDetailWidget extends riverpod.ConsumerWidget {
@@ -36,10 +38,17 @@ class NutritionalPlanDetailWidget extends riverpod.ConsumerWidget {
   @override
   Widget build(BuildContext context, riverpod.WidgetRef ref) {
     final nutritionalGoals = _nutritionalPlan.nutritionalGoals;
-    final entriesList = ref.watch(weightEntryProvider).asData?.value ?? [];
-    final WeightEntry? lastWeightEntry = entriesList.isNotEmpty ? entriesList.first : null;
+    final category = ref.watch(bodyWeightCategoryOnlyProvider).value;
+    // Only the last known weight is needed, which has its own query: reading a
+    // range wide enough to be sure to contain it would materialise everything
+    // in between
+    final lastWeightEntry = category == null
+        ? null
+        : ref.watch(latestMeasurementEntriesProvider).value?[category.id];
+    // Goals are per kilogram, so the weight must be normalized to kg no matter
+    // which unit it was entered in
     final nutritionalGoalsGperKg = lastWeightEntry != null
-        ? nutritionalGoals / lastWeightEntry.weight.toDouble()
+        ? nutritionalGoals / lastWeightEntry.valueIn('kg', categoryUnit: category!.unit)
         : null;
 
     final i18n = AppLocalizations.of(context);
@@ -139,6 +148,7 @@ class NutritionalPlanDetailWidget extends riverpod.ConsumerWidget {
                 ],
               ),
             ),
+          PlanWeightChart(_nutritionalPlan),
         ],
       ),
     );
diff --git a/lib/features/nutrition/widgets/nutritional_plans_list.dart b/lib/features/nutrition/widgets/nutritional_plans_list.dart
index a17138636..50c358554 100644
--- a/lib/features/nutrition/widgets/nutritional_plans_list.dart
+++ b/lib/features/nutrition/widgets/nutritional_plans_list.dart
@@ -23,11 +23,15 @@ import 'package:wger/core/widgets/async_value_widget.dart';
 import 'package:wger/core/widgets/confirm_delete_dialog.dart';
 import 'package:wger/core/widgets/text_prompt.dart';
 import 'package:wger/features/account/providers/user_profile_notifier.dart';
+import 'package:wger/features/measurements/charts/data.dart';
 import 'package:wger/features/measurements/measurements.dart';
+import 'package:wger/features/measurements/models/measurement_bucket.dart';
+import 'package:wger/features/measurements/models/unit_conversion.dart';
+import 'package:wger/features/measurements/providers/body_weight_provider.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.dart';
 import 'package:wger/features/measurements/widgets/charts.dart';
 import 'package:wger/features/nutrition/providers/nutrition_notifier.dart';
 import 'package:wger/features/nutrition/screens/nutritional_plan_screen.dart';
-import 'package:wger/features/weight/providers/body_weight_notifier.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
 class NutritionalPlansList extends riverpod.ConsumerWidget {
@@ -40,29 +44,54 @@ class NutritionalPlansList extends riverpod.ConsumerWidget {
     DateTime startDate,
     DateTime? endDate,
   ) {
-    final entriesList = ref.watch(weightEntryProvider).asData?.value ?? [];
+    final category = ref.watch(bodyWeightCategoryOnlyProvider).value;
+    final profile = ref.watch(userProfileProvider).value;
+    if (category == null || profile == null) {
+      // Not yet loaded, skip the weight-change row entirely. The widget will
+      // rebuild with the value once available.
+      return const SizedBox.shrink();
+    }
+
+    // The whole history rather than the plan's period: the boundary values are
+    // interpolated from the readings around it, which can lie outside. One
+    // point per day, so several readings on one day count once.
+    final buckets = ref
+        .watch(
+          measurementChartBucketsProvider(
+            category.id!,
+            null,
+            null,
+            MeasurementBucketLevel.day,
+          ),
+        )
+        .value;
+    if (buckets == null) {
+      return const SizedBox.shrink();
+    }
 
-    final entriesAll = entriesList.map((e) => MeasurementChartEntry(e.weight, e.date)).toList();
-    final entries7dAvg = moving7dAverage(entriesAll).whereDateWithInterpolation(startDate, endDate);
-    if (entries7dAvg.length < 2) {
+    // Normalize mixed-unit entries to the display unit before averaging
+    final displayUnit = weightDisplayUnit(profile.isMetric);
+    final entriesAll = chartEntriesForBuckets(
+      buckets,
+      targetUnit: displayUnit,
+      categoryUnit: category.unit,
+    );
+    final average = movingAverage(
+      entriesAll,
+      days: category.chartSettings.averageWindow,
+    ).whereDateWithInterpolation(startDate, endDate);
+    if (average.length < 2) {
       return const SizedBox.shrink();
     }
 
     // Calculate weight change
-    final firstWeight = entries7dAvg.first;
-    final lastWeight = entries7dAvg.last;
+    final firstWeight = average.first;
+    final lastWeight = average.last;
     final weightDifference = lastWeight.value - firstWeight.value;
 
     // Format the weight change text and determine color
     final String weightChangeText;
     final Color weightChangeColor;
-    final profile = ref.watch(userProfileProvider).value;
-    if (profile == null) {
-      // Profile not yet loaded, skip the weight-change row entirely. The
-      // widget will rebuild with the value once available.
-      return const SizedBox.shrink();
-    }
-
     final unit = weightUnit(profile.isMetric, context);
 
     if (weightDifference > 0) {
diff --git a/lib/features/nutrition/widgets/plan_weight_chart.dart b/lib/features/nutrition/widgets/plan_weight_chart.dart
new file mode 100644
index 000000000..12f2dcf04
--- /dev/null
+++ b/lib/features/nutrition/widgets/plan_weight_chart.dart
@@ -0,0 +1,96 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:wger/features/account/providers/user_profile_notifier.dart';
+import 'package:wger/features/measurements/charts/data.dart';
+import 'package:wger/features/measurements/models/measurement_bucket.dart';
+import 'package:wger/features/measurements/models/unit_conversion.dart';
+import 'package:wger/features/measurements/providers/body_weight_provider.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.dart';
+import 'package:wger/features/measurements/widgets/charts.dart';
+import 'package:wger/features/measurements/widgets/helpers.dart';
+import 'package:wger/features/nutrition/models/nutritional_plan.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+/// Body weight during the plan's period: chart plus overall change.
+///
+/// Hidden while the weight data is not loaded and when fewer than two
+/// readings fall into the period. All series are derived from the readings
+/// inside the period only, so the trend starts from a real measurement
+/// instead of an interpolated boundary point.
+class PlanWeightChart extends ConsumerWidget {
+  final NutritionalPlan _plan;
+
+  const PlanWeightChart(this._plan);
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final category = ref.watch(bodyWeightCategoryOnlyProvider).value;
+    final profile = ref.watch(userProfileProvider).value;
+    if (category == null || profile == null) {
+      return const SizedBox.shrink();
+    }
+
+    // The period is bounded in the query rather than afterwards, so a plan
+    // covering a month does not read the years around it. The end date is
+    // inclusive: readings on the plan's last day still count.
+    // Entries can be stored in mixed units (kg/lb); normalize everything
+    // to the profile's display unit before charting or averaging
+    final displayUnit = weightDisplayUnit(profile.isMetric);
+    final buckets = ref
+        .watch(
+          measurementChartBucketsProvider(
+            category.id!,
+            _plan.startDate,
+            _plan.endDate?.add(const Duration(days: 1)),
+            MeasurementBucketLevel.auto,
+          ),
+        )
+        .value;
+    if (buckets == null) {
+      return const SizedBox.shrink();
+    }
+
+    final points = chartEntriesForBuckets(
+      buckets,
+      targetUnit: displayUnit,
+      categoryUnit: category.unit,
+    );
+    // A single reading has no development to show
+    if (points.length < 2) {
+      return const SizedBox.shrink();
+    }
+
+    final settings = category.chartSettings;
+    final avg = movingAverage(points, days: settings.averageWindow);
+
+    return Column(
+      children: buildChartSection(
+        context,
+        title: AppLocalizations.of(context).weight,
+        raw: points,
+        avg: avg,
+        unit: weightUnit(profile.isMetric, context),
+        metricType: category.metricType,
+        settings: settings,
+      ),
+    );
+  }
+}
diff --git a/lib/features/nutrition/widgets/widgets.dart b/lib/features/nutrition/widgets/widgets.dart
index 3137d7b32..8e38a32e2 100644
--- a/lib/features/nutrition/widgets/widgets.dart
+++ b/lib/features/nutrition/widgets/widgets.dart
@@ -269,6 +269,7 @@ class _IngredientTypeaheadState extends ConsumerState<IngredientTypeahead> {
   Widget scanButton() {
     return IconButton(
       key: const Key('scan-button'),
+      tooltip: AppLocalizations.of(context).scanBarcode,
       icon: const FaIcon(FontAwesomeIcons.barcode),
       onPressed: () async {
         if (!widget.test) {
diff --git a/lib/features/routines/providers/gym_log_notifier.g.dart b/lib/features/routines/providers/gym_log_notifier.g.dart
index aa12a3505..0b99b311d 100644
--- a/lib/features/routines/providers/gym_log_notifier.g.dart
+++ b/lib/features/routines/providers/gym_log_notifier.g.dart
@@ -40,7 +40,7 @@ final class GymLogNotifierProvider extends $NotifierProvider<GymLogNotifier, Log
   }
 }
 
-String _$gymLogNotifierHash() => r'2a9eb1f27bcc5d72a893843ddfaa077a32f8ed26';
+String _$gymLogNotifierHash() => r'f19f65118fc2746149178debd2f5fcb1cdfcab3c';
 
 abstract class _$GymLogNotifier extends $Notifier<Log?> {
   Log? build();
diff --git a/lib/features/routines/providers/gym_state_notifier.g.dart b/lib/features/routines/providers/gym_state_notifier.g.dart
index 87afe3caf..691ca7d7f 100644
--- a/lib/features/routines/providers/gym_state_notifier.g.dart
+++ b/lib/features/routines/providers/gym_state_notifier.g.dart
@@ -40,7 +40,7 @@ final class GymStateNotifierProvider extends $NotifierProvider<GymStateNotifier,
   }
 }
 
-String _$gymStateNotifierHash() => r'018852d495cd23fd0f765591a02b9369764c2161';
+String _$gymStateNotifierHash() => r'be5943c4201793dc053ef44a4a243226e6d38526';
 
 abstract class _$GymStateNotifier extends $Notifier<GymModeState> {
   GymModeState build();
diff --git a/lib/features/weight/models/weight_entry.dart b/lib/features/weight/models/weight_entry.dart
deleted file mode 100644
index 385d9c533..000000000
--- a/lib/features/weight/models/weight_entry.dart
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (c) 2020 - 2026 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:drift/drift.dart';
-import 'package:wger/database/powersync/database.dart';
-
-class WeightEntry {
-  static const minValue = 30;
-  static const maxValue = 300;
-
-  static const stepperSmall = 0.1;
-  static const stepperBig = 1;
-
-  /// Client-generated UUID, is `null` only before the first persist
-  String? id;
-
-  late num weight = 0;
-
-  late DateTime date;
-
-  WeightEntry({this.id, num? weight, DateTime? date}) {
-    this.date = date ?? DateTime.now();
-
-    if (weight != null) {
-      this.weight = weight;
-    }
-  }
-
-  WeightEntry copyWith({String? id, int? weight, DateTime? date}) => WeightEntry(
-    id: id,
-    weight: weight ?? this.weight,
-    date: date ?? this.date,
-  );
-
-  WeightEntryTableCompanion toCompanion() {
-    return WeightEntryTableCompanion(
-      id: id != null ? Value(id!) : const Value.absent(),
-      date: Value(date),
-      weight: Value(weight as double),
-    );
-  }
-}
diff --git a/lib/features/weight/providers/body_weight_notifier.g.dart b/lib/features/weight/providers/body_weight_notifier.g.dart
deleted file mode 100644
index d9defc6ff..000000000
--- a/lib/features/weight/providers/body_weight_notifier.g.dart
+++ /dev/null
@@ -1,54 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'body_weight_notifier.dart';
-
-// **************************************************************************
-// RiverpodGenerator
-// **************************************************************************
-
-// GENERATED CODE - DO NOT MODIFY BY HAND
-// ignore_for_file: type=lint, type=warning
-
-@ProviderFor(WeightEntryNotifier)
-final weightEntryProvider = WeightEntryNotifierProvider._();
-
-final class WeightEntryNotifierProvider
-    extends $StreamNotifierProvider<WeightEntryNotifier, List<WeightEntry>> {
-  WeightEntryNotifierProvider._()
-    : super(
-        from: null,
-        argument: null,
-        retry: null,
-        name: r'weightEntryProvider',
-        isAutoDispose: true,
-        dependencies: null,
-        $allTransitiveDependencies: null,
-      );
-
-  @override
-  String debugGetCreateSourceHash() => _$weightEntryNotifierHash();
-
-  @$internal
-  @override
-  WeightEntryNotifier create() => WeightEntryNotifier();
-}
-
-String _$weightEntryNotifierHash() => r'c5cc65c04a047dc44bc02ae33ea45e76cd81894a';
-
-abstract class _$WeightEntryNotifier extends $StreamNotifier<List<WeightEntry>> {
-  Stream<List<WeightEntry>> build();
-  @$mustCallSuper
-  @override
-  WhenComplete runBuild() {
-    final ref = this.ref as $Ref<AsyncValue<List<WeightEntry>>, List<WeightEntry>>;
-    final element =
-        ref.element
-            as $ClassProviderElement<
-              AnyNotifier<AsyncValue<List<WeightEntry>>, List<WeightEntry>>,
-              AsyncValue<List<WeightEntry>>,
-              Object?,
-              Object?
-            >;
-    return element.handleCreate(ref, build);
-  }
-}
diff --git a/lib/features/weight/providers/body_weight_repository.dart b/lib/features/weight/providers/body_weight_repository.dart
deleted file mode 100644
index 2fc4a0b76..000000000
--- a/lib/features/weight/providers/body_weight_repository.dart
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (c) 2020,  wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Repository for body weight network operations.
- */
-
-import 'package:drift/drift.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:logging/logging.dart';
-import 'package:wger/database/powersync/database.dart';
-import 'package:wger/features/weight/models/weight_entry.dart';
-
-final bodyWeightRepositoryProvider = Provider<BodyWeightRepository>((ref) {
-  final db = ref.read(driftPowerSyncDatabase);
-  return BodyWeightRepository(db);
-});
-
-class BodyWeightRepository {
-  final _logger = Logger('BodyWeightRepository');
-  final DriftPowersyncDatabase _db;
-
-  BodyWeightRepository(this._db);
-
-  Stream<List<WeightEntry>> watchAllDrift() {
-    _logger.finer('Watching all local weight entries');
-    final query = _db.select(_db.weightEntryTable)
-      ..orderBy([(t) => OrderingTerm(expression: t.date, mode: OrderingMode.desc)]);
-    return query.watch();
-  }
-
-  Future<void> deleteLocalDrift(String id) async {
-    _logger.finer('Deleting local weight entry $id');
-    await (_db.delete(_db.weightEntryTable)..where((t) => t.id.equals(id))).go();
-  }
-
-  Future<void> updateLocalDrift(WeightEntry entry) async {
-    _logger.finer('Updating local weight entry ${entry.id}');
-    final stmt = _db.update(_db.weightEntryTable)..where((t) => t.id.equals(entry.id!));
-    await stmt.write(entry.toCompanion());
-  }
-
-  Future<void> addLocalDrift(WeightEntry entry) async {
-    _logger.finer('Adding local weight entry ${entry.date}');
-    await _db.into(_db.weightEntryTable).insert(entry.toCompanion());
-  }
-}
diff --git a/lib/features/weight/screens/weight_screen.dart b/lib/features/weight/screens/weight_screen.dart
deleted file mode 100644
index 7e64f9bc5..000000000
--- a/lib/features/weight/screens/weight_screen.dart
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (c)  2026 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:wger/core/form_screen.dart';
-import 'package:wger/core/wide_screen_wrapper.dart';
-import 'package:wger/core/widgets/app_bar.dart';
-import 'package:wger/features/weight/widgets/forms.dart';
-import 'package:wger/features/weight/widgets/weight_overview.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-
-class WeightScreen extends ConsumerWidget {
-  const WeightScreen();
-
-  static const routeName = '/weight';
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return Scaffold(
-      appBar: EmptyAppBar(AppLocalizations.of(context).weight),
-      floatingActionButton: FloatingActionButton(
-        child: const Icon(Icons.add, color: Colors.white),
-        onPressed: () {
-          Navigator.pushNamed(
-            context,
-            FormScreen.routeName,
-            arguments: FormScreenArguments(
-              AppLocalizations.of(context).newEntry,
-              WeightForm(),
-            ),
-          );
-        },
-      ),
-      body: const WidescreenWrapper(
-        child: SingleChildScrollView(
-          child: WeightOverview(),
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/features/weight/widgets/forms.dart b/lib/features/weight/widgets/forms.dart
deleted file mode 100644
index 47e8622e5..000000000
--- a/lib/features/weight/widgets/forms.dart
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (c) 2020 - 2026 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:wger/core/consts.dart';
-import 'package:wger/core/formatting/formatting.dart';
-import 'package:wger/core/number_input.dart';
-import 'package:wger/core/widgets/datetime_input.dart';
-import 'package:wger/core/widgets/form_submit_button.dart';
-import 'package:wger/features/weight/models/weight_entry.dart';
-import 'package:wger/features/weight/providers/body_weight_notifier.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-
-class WeightForm extends riverpod.ConsumerWidget {
-  final _form = GlobalKey<FormState>();
-  final weightController = TextEditingController(text: '');
-
-  final WeightEntry _weightEntry;
-
-  WeightForm([WeightEntry? weightEntry])
-    : _weightEntry = weightEntry ?? WeightEntry(date: DateTime.now());
-
-  @override
-  Widget build(BuildContext context, riverpod.WidgetRef ref) {
-    final numberFormat = localizedNumberFormat(context);
-
-    if (weightController.text.isEmpty && _weightEntry.weight != 0) {
-      weightController.text = numberFormat.format(_weightEntry.weight);
-    }
-
-    return Form(
-      key: _form,
-      child: Column(
-        children: [
-          DateInputWidget(
-            key: const Key('dateInput'),
-            value: _weightEntry.date,
-            labelText: AppLocalizations.of(context).date,
-            firstDate: DateTime(DateTime.now().year - 10),
-            lastDate: DateTime.now(),
-            onChanged: (date) {
-              _weightEntry.date = _weightEntry.date.copyWith(
-                year: date.year,
-                month: date.month,
-                day: date.day,
-              );
-            },
-          ),
-          TimeInputWidget(
-            key: const Key('timeInput'),
-            value: TimeOfDay.fromDateTime(_weightEntry.date),
-            labelText: AppLocalizations.of(context).time,
-            onChanged: (time) {
-              _weightEntry.date = _weightEntry.date.copyWith(
-                hour: time.hour,
-                minute: time.minute,
-                second: 0,
-              );
-            },
-          ),
-
-          // Weight
-          TextFormField(
-            key: const Key('weightInput'),
-            decoration: InputDecoration(
-              labelText: AppLocalizations.of(context).weight,
-              prefix: Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  IconButton(
-                    key: const Key('quickMinus'),
-                    icon: const FaIcon(FontAwesomeIcons.circleMinus),
-                    onPressed: () {
-                      final parsed = numberFormat.tryParse(weightController.text);
-                      if (parsed == null) {
-                        return;
-                      }
-                      final newValue = parsed - WeightEntry.stepperBig;
-                      if (newValue < WeightEntry.minValue) {
-                        return;
-                      }
-                      weightController.text = numberFormat.format(newValue);
-                    },
-                  ),
-                  IconButton(
-                    key: const Key('quickMinusSmall'),
-                    icon: const FaIcon(FontAwesomeIcons.minus),
-                    onPressed: () {
-                      final parsed = numberFormat.tryParse(weightController.text);
-                      if (parsed == null) {
-                        return;
-                      }
-                      final newValue = parsed - WeightEntry.stepperSmall;
-                      if (newValue < WeightEntry.minValue) {
-                        return;
-                      }
-                      weightController.text = numberFormat.format(newValue);
-                    },
-                  ),
-                ],
-              ),
-              suffix: Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  IconButton(
-                    key: const Key('quickPlusSmall'),
-                    icon: const FaIcon(FontAwesomeIcons.plus),
-                    onPressed: () {
-                      final parsed = numberFormat.tryParse(weightController.text);
-                      if (parsed == null) {
-                        return;
-                      }
-                      final newValue = parsed + WeightEntry.stepperSmall;
-                      if (newValue > WeightEntry.maxValue) {
-                        return;
-                      }
-                      weightController.text = numberFormat.format(newValue);
-                    },
-                  ),
-                  IconButton(
-                    key: const Key('quickPlus'),
-                    icon: const FaIcon(FontAwesomeIcons.circlePlus),
-                    onPressed: () {
-                      final parsed = numberFormat.tryParse(weightController.text);
-                      if (parsed == null) {
-                        return;
-                      }
-                      final newValue = parsed + WeightEntry.stepperBig;
-                      if (newValue > WeightEntry.maxValue) {
-                        return;
-                      }
-                      weightController.text = numberFormat.format(newValue);
-                    },
-                  ),
-                ],
-              ),
-            ),
-            controller: weightController,
-            keyboardType: textInputTypeDecimal,
-            inputFormatters: [LocalizedDecimalInputFormatter(numberFormat.symbols.DECIMAL_SEP)],
-            onSaved: (newValue) {
-              _weightEntry.weight = numberFormat.parse(newValue!);
-            },
-            validator: (value) {
-              final i18n = AppLocalizations.of(context);
-              if (value!.isEmpty) {
-                return i18n.enterValue;
-              }
-              final parsed = numberFormat.tryParse(value);
-              if (parsed == null) {
-                return i18n.enterValidNumber;
-              }
-              if (parsed < WeightEntry.minValue || parsed > WeightEntry.maxValue) {
-                return i18n.formMinMaxValues(WeightEntry.minValue, WeightEntry.maxValue);
-              }
-              return null;
-            },
-          ),
-          FormSubmitButton(
-            key: const Key(SUBMIT_BUTTON_KEY_NAME),
-            label: AppLocalizations.of(context).save,
-            onPressed: () async {
-              // Validate and save the current values to the weightEntry
-              final isValid = _form.currentState!.validate();
-              if (!isValid) {
-                return;
-              }
-              _form.currentState!.save();
-
-              // Save the entry on the server
-              final notifier = ref.read(weightEntryProvider.notifier);
-              _weightEntry.id == null
-                  ? await notifier.addEntry(_weightEntry)
-                  : await notifier.updateEntry(_weightEntry);
-
-              if (context.mounted) {
-                Navigator.of(context).pop();
-              }
-            },
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/features/weight/widgets/weight_overview.dart b/lib/features/weight/widgets/weight_overview.dart
deleted file mode 100644
index 02c8f81c8..000000000
--- a/lib/features/weight/widgets/weight_overview.dart
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (c)  2026 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
-import 'package:wger/core/form_screen.dart';
-import 'package:wger/core/formatting/formatting.dart';
-import 'package:wger/core/snackbar.dart';
-import 'package:wger/core/widgets/async_value_widget.dart';
-import 'package:wger/core/widgets/progress_indicator.dart';
-import 'package:wger/features/account/providers/user_profile_notifier.dart';
-import 'package:wger/features/measurements/widgets/charts.dart';
-import 'package:wger/features/measurements/widgets/helpers.dart';
-import 'package:wger/features/nutrition/providers/nutrition_notifier.dart';
-import 'package:wger/features/weight/models/weight_entry.dart';
-import 'package:wger/features/weight/providers/body_weight_notifier.dart';
-import 'package:wger/features/weight/widgets/forms.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-
-class WeightOverview extends riverpod.ConsumerWidget {
-  const WeightOverview();
-
-  @override
-  Widget build(BuildContext context, riverpod.WidgetRef ref) {
-    final profileAsync = ref.watch(userProfileProvider);
-    final numberFormat = localizedNumberFormat(context);
-    final plans = ref.watch(nutritionProvider).value?.plans ?? const [];
-
-    return AsyncValueWidget<List<WeightEntry>>(
-      value: ref.watch(weightEntryProvider),
-      loggerName: 'WeightOverview',
-      data: (entriesList) {
-        // Profile drives the unit display; show a spinner while it loads
-        // instead of bang-ing on a null value.
-        final profile = profileAsync.value;
-        if (profile == null) {
-          return const BoxedProgressIndicator();
-        }
-
-        final entriesAll = entriesList.map((e) => MeasurementChartEntry(e.weight, e.date)).toList();
-        final entries7dAvg = moving7dAverage(entriesAll);
-
-        final unit = weightUnit(profile.isMetric, context);
-
-        return Column(
-          children: [
-            ...getOverviewWidgetsSeries(
-              AppLocalizations.of(context).weight,
-              entriesAll,
-              entries7dAvg,
-              plans,
-              unit,
-              context,
-            ),
-            TextButton(
-              onPressed: () => Navigator.pushNamed(
-                context,
-                '/measurement-categories',
-              ),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.end,
-                children: [
-                  Text(AppLocalizations.of(context).measurements),
-                  const Icon(Icons.chevron_right),
-                ],
-              ),
-            ),
-            SizedBox(
-              height: 300,
-              child: ListView.builder(
-                padding: const EdgeInsets.all(10.0),
-                itemCount: entriesList.length,
-                itemBuilder: (context, index) {
-                  final currentEntry = entriesList[index];
-                  return Card(
-                    child: ListTile(
-                      title: Text(
-                        '${numberFormat.format(currentEntry.weight)} ${weightUnit(profile.isMetric, context)}',
-                      ),
-                      subtitle: Text(
-                        localizedDate(context).add_Hm().format(currentEntry.date),
-                      ),
-                      trailing: PopupMenuButton(
-                        itemBuilder: (BuildContext context) {
-                          return [
-                            PopupMenuItem(
-                              child: Text(AppLocalizations.of(context).edit),
-                              onTap: () => Navigator.pushNamed(
-                                context,
-                                FormScreen.routeName,
-                                arguments: FormScreenArguments(
-                                  AppLocalizations.of(context).edit,
-                                  WeightForm(currentEntry),
-                                ),
-                              ),
-                            ),
-                            PopupMenuItem(
-                              child: Text(AppLocalizations.of(context).delete),
-                              onTap: () async {
-                                await ref
-                                    .read(weightEntryProvider.notifier)
-                                    .deleteEntry(currentEntry.id!);
-
-                                // and inform the user
-                                if (context.mounted) {
-                                  showSnackbar(
-                                    context,
-                                    AppLocalizations.of(context).successfullyDeleted,
-                                    center: true,
-                                  );
-                                }
-                              },
-                            ),
-                          ];
-                        },
-                      ),
-                    ),
-                  );
-                },
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
-}
diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb
index af23d0e0a..e0e350e61 100644
--- a/lib/l10n/app_ar.arb
+++ b/lib/l10n/app_ar.arb
@@ -108,10 +108,6 @@
     "@invalidUsername": {
         "description": "Error message when the user enters an invalid username"
     },
-    "newSet": "مجموعة جديدة",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "impression": "انطباع",
     "@impression": {
         "description": "General impression (e.g. for a workout session) such as good, bad, etc."
@@ -742,16 +738,6 @@
             }
         }
     },
-    "chart30DaysTitle": "{name} آخر 30 يوم",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
     "copyToClipboard": "النسخ إلى clipboard",
     "workoutCompleted": "تم الانتهاء من التمرين",
     "onlyLoggingHelpText": "ضع علامة في المربع إذا كنت ترغب فقط في تسجيل سعراتك الحرارية ولا ترغب في إعداد خطة غذائية مفصلة تتضمن وجبات محددة",
@@ -880,19 +866,6 @@
     "errorCouldNotConnectToServer": "لم يتمكن التطبيق من الاتصال بالخادم",
     "max": "الاقصى",
     "min": "الادنى",
-    "chartDuringPlanTitle": "{chartName} خلال الخطة الغذائية {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "endDate": "تاريخ الانتهاء",
     "@endDate": {
         "description": "The End date of a nutritional plan or routine"
@@ -954,7 +927,6 @@
             }
         }
     },
-    "identicalExercisePleaseDiscard": "إذا لاحظت وجود تمرين مطابق للتمرين الذي تضيفه، فيرجى حذف مسودتك وتعديل ذلك التمرين بدلاً من ذلك.",
     "imageDetailsTitle": "إذا لاحظت وجود تمرين مطابق للتمرين الذي تضيفه، فيرجى حذف مسودتك وتعديل ذلك التمرين بدلاً من ذلك.",
     "@imageDetailsTitle": {
         "description": "Title for image details form"
@@ -1004,16 +976,6 @@
             }
         }
     },
-    "imageFormatNotSupportedDetail": "لا يتم دعم الصور بصيغة {imageFormat} حتى الآن.",
-    "@imageFormatNotSupportedDetail": {
-        "description": "Label shown on the image preview container when image format is not supported",
-        "type": "text",
-        "placeholders": {
-            "imageFormat": {
-                "type": "String"
-            }
-        }
-    },
     "add": "اضفة",
     "@add": {
         "description": "Add button text"
@@ -1021,7 +983,6 @@
     "fitInWeek": "جدول أسبوعي ثابت",
     "fitInWeekHelp": "في حالة التفعيل، ستتكرر الأيام في دورة أسبوعية، وإلا ستتبع الأيام بالتسلسل دون مراعاة بداية أسبوع جديد.",
     "addSuperset": "أضف مجموعة فائقة",
-    "superset": "مجموعة فائقة",
     "setHasProgression": "تتضمن المجموعة تقدمًا",
     "setHasProgressionWarning": "يرجى العلم أنه لا يمكن حاليًا تعديل جميع إعدادات المجموعة على تطبيق الهاتف المحمول أو ضبط التقدم التلقائي. لذا، يُرجى استخدام تطبيق الويب في الوقت الحالي.",
     "setHasNoExercises": "لا تحتوي هذه المجموعة على أي تمارين حتى الآن!",
diff --git a/lib/l10n/app_ca.arb b/lib/l10n/app_ca.arb
index 76ef676e4..a04c5b486 100644
--- a/lib/l10n/app_ca.arb
+++ b/lib/l10n/app_ca.arb
@@ -123,10 +123,6 @@
         "description": "A (logged) workout session"
     },
     "newDay": "Nou dia",
-    "newSet": "Nova sèrie",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "selectExercises": "Si vols fer una supersèrie, pots cercar diversos exercicis: s'agruparan junts",
     "plateCalculator": "Plaques",
     "@plateCalculator": {
@@ -431,16 +427,6 @@
             }
         }
     },
-    "imageFormatNotSupportedDetail": "Les imatges {imageFormat} encara no són compatibles.",
-    "@imageFormatNotSupportedDetail": {
-        "description": "Label shown on the image preview container when image format is not supported",
-        "type": "text",
-        "placeholders": {
-            "imageFormat": {
-                "type": "String"
-            }
-        }
-    },
     "addImage": "Afegeix imatge",
     "dataCopied": "Dades copiades a una nova entrada",
     "@dataCopied": {
@@ -920,39 +906,6 @@
     "copyToClipboard": "Copia al porta-retalls",
     "min": "Mínim",
     "max": "Màxim",
-    "chartAllTimeTitle": "Històric: {name}",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chart30DaysTitle": "Últims 30 dies: {name}",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "{chartName} durant el pla nutricional {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "endDate": "Data fi",
     "@endDate": {
         "description": "The End date of a nutritional plan or routine"
@@ -986,7 +939,6 @@
             }
         }
     },
-    "identicalExercisePleaseDiscard": "Si notes que ja hi ha un exercici idèntic al que estàs afegint, descarta l'esborrany i edita l'exercici.",
     "checkInformationBeforeSubmitting": "Comprova que la informació introduïda es correcte abans d'enviar l'exercici",
     "imageDetailsTitle": "Detalls de la imatge",
     "@imageDetailsTitle": {
@@ -1034,7 +986,6 @@
     "fitInWeek": "Horari setmanal fixe",
     "fitInWeekHelp": "Si està actiu, els dies es repetiran en un cicle setmanal, d'altre manera els dies seran seqüencials sense importar l'inici d'una nova setmana.",
     "addSuperset": "Afegir superserie",
-    "superset": "Super-serie",
     "setHasProgression": "La serie té progressió",
     "setHasProgressionWarning": "Ara mateix no és possible editar totes les configuracions per a una serie o configurar la progressió automàtica des de l'aplicació mòbil. Per ara, usa l'aplicació web.",
     "setHasNoExercises": "Aquesta serie encara no te exercicis!",
diff --git a/lib/l10n/app_cs.arb b/lib/l10n/app_cs.arb
index 1e381d163..0a29ed607 100644
--- a/lib/l10n/app_cs.arb
+++ b/lib/l10n/app_cs.arb
@@ -360,10 +360,6 @@
         }
     },
     "newDay": "Nový den",
-    "newSet": "Nová sada",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "workoutSession": "Tréninková relace",
     "@workoutSession": {
         "description": "A (logged) workout session"
@@ -462,16 +458,6 @@
             }
         }
     },
-    "imageFormatNotSupportedDetail": "Obrazy {imageFormat} zatím nejsou podporovány.",
-    "@imageFormatNotSupportedDetail": {
-        "description": "Label shown on the image preview container when image format is not supported",
-        "type": "text",
-        "placeholders": {
-            "imageFormat": {
-                "type": "String"
-            }
-        }
-    },
     "productFound": "Produkt nalezen",
     "@productFound": {
         "description": "Header label for dialog when product is found with barcode"
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index 588ee634f..9f12ea734 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -105,10 +105,6 @@
     "cancel": "Abbrechen",
     "save": "Speichern",
     "description": "Beschreibung",
-    "newSet": "Neuer Satz",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "newDay": "Neuer Tag",
     "workoutSession": "Trainingseinheit",
     "@workoutSession": {
@@ -326,16 +322,6 @@
             }
         }
     },
-    "imageFormatNotSupportedDetail": "{imageFormat}-Bilder werden noch nicht unterstützt.",
-    "@imageFormatNotSupportedDetail": {
-        "description": "Label shown on the image preview container when image format is not supported",
-        "type": "text",
-        "placeholders": {
-            "imageFormat": {
-                "type": "String"
-            }
-        }
-    },
     "chooseFromLibrary": "Wähle aus der Bibliothek",
     "takePicture": "Bild aufnehmen",
     "selectImage": "Bitte wähle ein Bild aus",
@@ -417,6 +403,9 @@
         "description": "The value of a measurement entry"
     },
     "measurementCategoriesHelpText": "Messkategorie, z. B. „Bizeps“ oder „Körperfett“",
+    "whatToTrack": "Was möchtest du aufzeichnen?",
+    "customMeasurement": "Eigene Messung",
+    "metricAlreadyTracked": "Wird bereits aufgezeichnet",
     "measurementEntriesHelpText": "Die Einheit, die verwendet wird, um die Kategorie zu messen, wie z.B. „cm“ oder „%“",
     "fatShort": "F",
     "@fatShort": {
@@ -675,39 +664,6 @@
     "noIngredientsDefined": "Noch keine Zutaten definiert",
     "ingredientLogged": "Zutat im Tagebuch protokolliert",
     "selectMealToLog": "Wähle eine Mahlzeit, um sie im Tagebuch zu protokollieren",
-    "chartAllTimeTitle": "{name} aller Zeiten",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chart30DaysTitle": "{name} der letzten 30 Tage",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "{chartName} während des Ernährungsplans {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "surplus": "Überschuss",
     "@surplus": {
         "description": "Caloric surplus (either planned or unplanned)"
@@ -838,6 +794,7 @@
     "@indicatorAvg": {
         "description": "added for localization of Class Indicator's field text"
     },
+    "indicatorTrend": "Trend",
     "themeMode": "Theme Modus",
     "lightMode": "Immer Hellmodus",
     "systemMode": "Systemeinstellungen",
@@ -883,7 +840,6 @@
         "description": "When a nutrition plan has no pre-defined end date"
     },
     "overview": "Überblick",
-    "identicalExercisePleaseDiscard": "Wenn Sie eine Übung entdecken, die mit der von Ihnen hinzugefügten identisch ist, verwerfen Sie bitte Ihren Entwurf und bearbeiten Sie stattdessen diese Übung.",
     "checkInformationBeforeSubmitting": "Bitte überprüfe, ob die eingegebenen Informationen korrekt sind, bevor du die Übung abschickst",
     "imageDetailsTitle": "Bilddetails",
     "@imageDetailsTitle": {
@@ -971,7 +927,6 @@
             }
         }
     },
-    "superset": "Supersatz",
     "isVegan": "Vegan",
     "isVegetarian": "Vegetarisch",
     "filter": "Filtern",
@@ -1157,6 +1112,37 @@
     "endBeforeStart": "Der Endwert darf nicht vor dem Startwert liegen",
     "minLengthRoutine": "Die Routine muss mindestens {number} Wochen lang sein",
     "maxLengthRoutine": "Die Routine darf maximal {number} Wochen lang sein",
+    "metricType": "Metrik-Typ",
+    "reorderCategories": "Kategorien neu anordnen",
+    "metricCustom": "Benutzerdefiniert",
+    "metricBodyWeight": "Körpergewicht",
+    "metricLeanBodyMass": "Magermasse",
+    "metricBodyFat": "Körperfett",
+    "metricHeight": "Körpergröße",
+    "metricBloodPressure": "Blutdruck",
+    "metricBloodPressureSystolic": "Systolisch",
+    "metricBloodPressureDiastolic": "Diastolisch",
+    "metricHeartRate": "Herzfrequenz",
+    "metricRestingHeartRate": "Ruhepuls",
+    "metricBloodOxygen": "Sauerstoffsättigung",
+    "metricSteps": "Schritte",
+    "metricDistance": "Distanz",
+    "metricEnergy": "Energie",
+    "metricSleep": "Schlaf",
+    "metricSleepTotal": "Gesamtschlaf",
+    "metricSleepLight": "Leichtschlaf",
+    "metricSleepDeep": "Tiefschlaf",
+    "metricSleepRem": "REM-Schlaf",
+    "metricSleepAwake": "Wach",
+    "noDataAvailable": "Keine Daten vorhanden",
+    "partOfGroup": "Teil der Gruppe",
+    "noGroup": "Keine Gruppe",
+    "healthSync": "Health-Synchronisation",
+    "healthSyncDescription": "Importiert Körpermesswerte aus Apple Health oder Health Connect",
+    "healthSyncSuccess": "{count} Messwerte aus Health importiert",
+    "health": "Gesundheit",
+    "importedEntry": "Dieser Eintrag wurde aus einer Health-App synchronisiert und kann nur dort geändert werden",
+    "healthSyncPermissionDenied": "Zugriff auf die Gesundheitsdaten wurde nicht gewährt",
     "gymModeLogScope": "Frühere Protokolle",
     "gymModeLogScopeHelp": "Welche Protokolle beim Training als Referenz angezeigt werden",
     "gymModeLogScopeCurrentRoutine": "Aktuelle Routine",
@@ -1167,6 +1153,48 @@
     "allowSelfSignedCertsDetail": "Deaktiviert die Validierung des TLS-Zertifikats. Aktiviere das nur für einen Server, dem du vertraust.",
     "certsNotVerifiedTitle": "Zertifikatsvalidierung ist deaktiviert",
     "certsNotVerifiedDetail": "Zertifikate für {host} werden nicht geprüft. Zum Ändern melde dich ab und passe die Option im Anmeldebildschirm an.",
+    "chartRangeAll": "Gesamt",
+    "chartRangeMonths": "{count, plural, one{1 Monat} other{{count} Monate}}",
+    "chartRangeYears": "{count, plural, one{1 Jahr} other{{count} Jahre}}",
+    "chartType": "Diagrammtyp",
+    "chartTypeAuto": "Automatisch",
+    "chartTypeLine": "Linie",
+    "chartTypeBar": "Balken",
+    "chartTypeHeatmap": "Heatmap",
+    "chartTypeDelta": "Veränderung",
+    "chartWeeklyChangeTitle": "{name}, Veränderung pro Woche",
+    "chartTrend": "Trendlinie",
+    "trendReactive": "Reaktiv",
+    "trendBalanced": "Ausgewogen",
+    "trendSluggish": "Geglättet",
+    "chartAverageWindow": "Durchschnitt über",
+    "chartAverageWindowDays": "{days, plural, one{1 Tag} other{{days} Tage}}",
+    "chartTypeDistribution": "Verteilung",
+    "chartDistributionTitle": "{name}, Verteilung",
+    "distributionMedian": "Median",
+    "distributionLatest": "Aktuell",
+    "distributionEntryCount": "{count, plural, one{1 Eintrag} other{{count} Einträge}}",
+    "distributionDayCount": "{count, plural, one{1 Tag} other{{count} Tage}}",
+    "healthSyncNoData": "Es wurden keine Gesundheitsdaten gefunden. Prüfe in {platform}, ob wger deine Daten lesen darf.",
+    "healthSyncStatus": "{count, plural, =0{Letzter Abgleich: {time}, keine neuen Einträge} one{Letzter Abgleich: {time}, 1 neuer Eintrag} other{Letzter Abgleich: {time}, {count} neue Einträge}}",
+    "healthSyncSyncing": "Gesundheitsdaten werden synchronisiert …",
+    "healthSyncNow": "Jetzt synchronisieren",
+    "healthSyncPermissionMissing": "{platform} gibt deine Daten nicht frei",
+    "healthSyncGrantAccess": "Zum erneuten Erlauben antippen",
+    "healthSyncFailed": "Der letzte Abgleich konnte nicht abgeschlossen werden",
+    "healthConnectInstall": "Health Connect installieren",
+    "healthConnectUpdate": "Health Connect aktualisieren",
+    "healthConnectRequired": "Health Connect wird benötigt, um Körpermesswerte zu importieren",
+    "labelBottomNavBody": "Körper",
+    "sparkAverage": "Ø {value}",
+    "sparkTrendPerWeek": "{value}/Woche",
+    "sparkTrendStable": "stabil",
+    "trackNewMetric": "Etwas Neues aufzeichnen",
+    "chartRangeWeeks": "{count, plural, one{1 Woche} other{{count} Wochen}}",
+    "relativeDaysAgo": "{count, plural, =0{heute} =1{gestern} other{vor {count} Tagen}}",
+    "relativeWeeksAgo": "{count, plural, one{vor 1 Woche} other{vor {count} Wochen}}",
+    "relativeMonthsAgo": "{count, plural, one{vor 1 Monat} other{vor {count} Monaten}}",
+    "relativeYearsAgo": "{count, plural, one{vor 1 Jahr} other{vor {count} Jahren}}",
     "settingsVerboseLogging": "Ausführliches Protokoll",
     "settingsVerboseLoggingDescription": "Hilfreich, wenn du anhaltende Probleme meldest."
 }
diff --git a/lib/l10n/app_el.arb b/lib/l10n/app_el.arb
index 5f238b897..97ac8ce39 100644
--- a/lib/l10n/app_el.arb
+++ b/lib/l10n/app_el.arb
@@ -283,10 +283,6 @@
   "@impression": {
     "description": "General impression (e.g. for a workout session) such as good, bad, etc."
   },
-  "newSet": "Νέο σετ",
-  "@newSet": {
-    "description": "Header when adding a new set to a workout day"
-  },
   "gymMode": "Λειτουργία γυμναστηρίου",
   "@gymMode": {
     "description": "Label when starting the gym mode"
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 1aff62662..726bb1f1f 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -174,6 +174,10 @@
   "@labelBottomNavNutrition": {
     "description": "Label used in bottom navigation, use a short word"
   },
+  "labelBottomNavBody": "Body",
+  "@labelBottomNavBody": {
+    "description": "Label used in bottom navigation and as the title of the screen holding the body weight and the other measurements, use a short word"
+  },
   "labelWorkoutLogs": "Training logs",
   "@labelWorkoutLogs": {
     "description": "(Workout) logs"
@@ -358,10 +362,6 @@
   "resultingRoutine": "Resulting routine",
   "newDay": "New day",
   "@newDay": {},
-  "newSet": "New set",
-  "@newSet": {
-    "description": "Header when adding a new set to a workout day"
-  },
   "personalRecords": "Personal records",
   "gymMode": "Gym mode",
   "@gymMode": {
@@ -432,16 +432,16 @@
     "description": "Label for the button that adds a set (to a workout day)"
   },
   
-"gymModeLogScope": "Previous logs",
-"gymModeLogScopeHelp": "Which logs to show as reference while training",
-"gymModeLogScopeCurrentRoutine": "Current routine",
-"gymModeLogScopeWeeks": "Last {weeks} weeks",
-"@gymModeLogScopeWeeks": {
+  "gymModeLogScope": "Previous logs",
+  "gymModeLogScopeHelp": "Which logs to show as reference while training",
+  "gymModeLogScopeCurrentRoutine": "Current routine",
+  "gymModeLogScopeWeeks": "Last {weeks} weeks",
+  "@gymModeLogScopeWeeks": {
   "placeholders": {
     "weeks": { "type": "int" }
   }
 },
-"gymModeDistinctLogs": "Hide duplicate values",
+  "gymModeDistinctLogs": "Hide duplicate values",
   "addMeal": "Add meal",
   "@addMeal": {},
   "meal": "Meal",
@@ -533,9 +533,64 @@
   "@weight": {
     "description": "The weight of a workout log or body weight entry"
   },
-  "chartAllTimeTitle": "{name} all-time",
-  "@chartAllTimeTitle": {
-    "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+  "chartRangeAll": "All",
+  "@chartRangeAll": {
+    "description": "Label for the chart time-range selector option showing all data"
+  },
+  "chartRangeWeeks": "{count, plural, one{1 week} other{{count} weeks}}",
+  "@chartRangeWeeks": {
+    "description": "Chart time-range selector option covering a number of weeks",
+    "placeholders": {
+      "count": {
+        "type": "int"
+      }
+    }
+  },
+  "chartRangeMonths": "{count, plural, one{1 month} other{{count} months}}",
+  "@chartRangeMonths": {
+    "description": "Chart time-range selector option covering a number of months",
+    "placeholders": {
+      "count": {
+        "type": "int"
+      }
+    }
+  },
+  "chartRangeYears": "{count, plural, one{1 year} other{{count} years}}",
+  "@chartRangeYears": {
+    "description": "Chart time-range selector option covering a number of years",
+    "placeholders": {
+      "count": {
+        "type": "int"
+      }
+    }
+  },
+  "chartType": "Chart type",
+  "@chartType": {
+    "description": "Label of the chart type picker of a measurement category"
+  },
+  "chartTypeAuto": "Automatic",
+  "@chartTypeAuto": {
+    "description": "Chart type option that leaves the chart to the metric type of the category"
+  },
+  "chartTypeLine": "Line",
+  "@chartTypeLine": {
+    "description": "Chart type option: a line through the measured values"
+  },
+  "chartTypeBar": "Bars",
+  "@chartTypeBar": {
+    "description": "Chart type option: one bar per day"
+  },
+  "chartTypeHeatmap": "Heatmap",
+  "@chartTypeHeatmap": {
+    "description": "Chart type option: a calendar grid with one coloured cell per day"
+  },
+  "chartTypeDelta": "Change",
+  "@chartTypeDelta": {
+    "description": "Chart type option: one bar per week, showing how much the value changed"
+  },
+  "chartWeeklyChangeTitle": "{name}, change per week",
+  "@chartWeeklyChangeTitle": {
+    "description": "Title of the chart showing the weekly change of 'name' (e.g. 'weight', 'body fat' etc.)",
     "type": "text",
     "placeholders": {
       "name": {
@@ -543,9 +598,42 @@
       }
     }
   },
-  "chart30DaysTitle": "{name} last 30 days",
-  "@chart30DaysTitle": {
-    "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+  "chartTrend": "Trend line",
+  "@chartTrend": {
+    "description": "Label of the setting for how closely the trend line follows the values"
+  },
+  "trendReactive": "Reactive",
+  "@trendReactive": {
+    "description": "Trend line option: follows the values closely"
+  },
+  "trendBalanced": "Balanced",
+  "@trendBalanced": {
+    "description": "Trend line option: the default, between reactive and sluggish"
+  },
+  "trendSluggish": "Smooth",
+  "@trendSluggish": {
+    "description": "Trend line option: ignores short-term swings"
+  },
+  "chartAverageWindow": "Average over",
+  "@chartAverageWindow": {
+    "description": "Label of the setting for how many days the moving average covers"
+  },
+  "chartAverageWindowDays": "{days, plural, one{1 day} other{{days} days}}",
+  "@chartAverageWindowDays": {
+    "description": "One option of the average window setting, e.g. '7 days'",
+    "placeholders": {
+      "days": {
+        "type": "int"
+      }
+    }
+  },
+  "chartTypeDistribution": "Distribution",
+  "@chartTypeDistribution": {
+    "description": "Chart type option: a histogram of how often each value occurred"
+  },
+  "chartDistributionTitle": "{name}, distribution",
+  "@chartDistributionTitle": {
+    "description": "Title of the histogram showing how the values of 'name' (e.g. 'weight') are distributed",
     "type": "text",
     "placeholders": {
       "name": {
@@ -553,19 +641,94 @@
       }
     }
   },
-  "chartDuringPlanTitle": "{chartName} during nutritional plan {planName}",
-  "@chartDuringPlanTitle": {
-    "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-    "type": "text",
+  "distributionMedian": "Median",
+  "@distributionMedian": {
+    "description": "Label of the median marker in the distribution histogram"
+  },
+  "distributionLatest": "Latest",
+  "@distributionLatest": {
+    "description": "Label of the marker for the most recent value in the distribution histogram"
+  },
+  "distributionEntryCount": "{count, plural, one{1 entry} other{{count} entries}}",
+  "@distributionEntryCount": {
+    "description": "How many measurements fall into the tapped histogram bin",
+    "placeholders": {
+      "count": {
+        "type": "int"
+      }
+    }
+  },
+  "distributionDayCount": "{count, plural, one{1 day} other{{count} days}}",
+  "@distributionDayCount": {
+    "description": "How many days fall into the tapped histogram bin, for metrics summed per day",
+    "placeholders": {
+      "count": {
+        "type": "int"
+      }
+    }
+  },
+  "relativeDaysAgo": "{count, plural, =0{today} =1{yesterday} other{{count} days ago}}",
+  "@relativeDaysAgo": {
+    "description": "How long ago something was measured, for distances below a week",
+    "placeholders": {
+      "count": {
+        "type": "int"
+      }
+    }
+  },
+  "relativeWeeksAgo": "{count, plural, one{1 week ago} other{{count} weeks ago}}",
+  "@relativeWeeksAgo": {
+    "description": "How long ago something was measured, for distances below a month",
     "placeholders": {
-      "chartName": {
+      "count": {
+        "type": "int"
+      }
+    }
+  },
+  "relativeMonthsAgo": "{count, plural, one{1 month ago} other{{count} months ago}}",
+  "@relativeMonthsAgo": {
+    "description": "How long ago something was measured, for distances below a year",
+    "placeholders": {
+      "count": {
+        "type": "int"
+      }
+    }
+  },
+  "relativeYearsAgo": "{count, plural, one{1 year ago} other{{count} years ago}}",
+  "@relativeYearsAgo": {
+    "description": "How long ago something was measured, for distances of a year and more",
+    "placeholders": {
+      "count": {
+        "type": "int"
+      }
+    }
+  },
+  "sparkAverage": "avg {value}",
+  "@sparkAverage": {
+    "description": "Chip on an overview tile: the average over the charted days, e.g. 'avg 7:05' for sleep",
+    "placeholders": {
+      "value": {
         "type": "String"
-      },
-      "planName": {
+      }
+    }
+  },
+  "sparkTrendPerWeek": "{value}/week",
+  "@sparkTrendPerWeek": {
+    "description": "Chip on an overview tile: how much the value changes per week, shown after a direction arrow",
+    "placeholders": {
+      "value": {
         "type": "String"
       }
     }
   },
+  "sparkTrendStable": "stable",
+  "@sparkTrendStable": {
+    "description": "Chip on an overview tile when the value barely changes, shown after a right arrow"
+  },
+  "trackNewMetric": "Track something new",
+  "@trackNewMetric": {
+    "description": "Action in the overview's expanding + button that opens the sheet for starting a new measurement category"
+  },
   "measurement": "Measurement",
   "@measurement": {},
   "measurements": "Measurements",
@@ -574,8 +737,120 @@
   },
   "measurementCategoriesHelpText": "Measurement category, such as 'biceps' or 'body fat'",
   "@measurementCategoriesHelpText": {},
+  "whatToTrack": "What do you want to track?",
+  "@whatToTrack": {
+    "description": "Title of the sheet that starts a new measurement category"
+  },
+  "customMeasurement": "Custom measurement",
+  "@customMeasurement": {
+    "description": "Option that creates a free-form measurement category with its own name and unit"
+  },
+  "metricAlreadyTracked": "Already tracked",
+  "@metricAlreadyTracked": {
+    "description": "Shown for a metric the user already has a category for, which cannot be picked twice"
+  },
+  "metricType": "Metric Type",
+  "@metricType": {
+    "description": "Metric type for a measurement category"
+  },
+  "reorderCategories": "Reorder categories",
+  "@reorderCategories": {
+    "description": "measurement categories reordering"
+  },
+  "metricCustom": "Custom",
+  "@metricCustom": {
+    "description": "Label for custom metric type"
+  },
+  "metricBodyWeight": "Body weight",
+  "@metricBodyWeight": {
+    "description": "Label for body weight measurement"
+  },
+  "metricLeanBodyMass": "Lean body mass",
+  "@metricLeanBodyMass": {
+    "description": "Label for lean body mass measurement"
+  },
+  "metricBodyFat": "Body fat",
+  "@metricBodyFat": {
+    "description": "Label for body fat percentage measurement"
+  },
+  "metricHeight": "Height",
+  "@metricHeight": {
+    "description": "Label for height measurement"
+  },
+  "metricBloodPressure": "Blood pressure",
+  "@metricBloodPressure": {
+    "description": "Label for blood pressure measurement"
+  },
+  "metricBloodPressureSystolic": "Systolic",
+  "@metricBloodPressureSystolic": {
+    "description": "Label for the systolic component of a blood pressure reading"
+  },
+  "metricBloodPressureDiastolic": "Diastolic",
+  "@metricBloodPressureDiastolic": {
+    "description": "Label for the diastolic component of a blood pressure reading"
+  },
+  "metricHeartRate": "Heart rate",
+  "@metricHeartRate": {
+    "description": "Label for heart rate measurement"
+  },
+  "metricRestingHeartRate": "Resting heart rate",
+  "@metricRestingHeartRate": {
+    "description": "Label for resting heart rate measurement"
+  },
+  "metricBloodOxygen": "Blood oxygen",
+  "@metricBloodOxygen": {
+    "description": "Label for blood oxygen saturation measurement"
+  },
+  "metricSteps": "Steps",
+  "@metricSteps": {
+    "description": "Label for step count measurement"
+  },
+  "metricDistance": "Distance",
+  "@metricDistance": {
+    "description": "Label for distance measurement"
+  },
+  "metricEnergy": "Energy",
+  "@metricEnergy": {
+    "description": "Label for energy/calories burned measurement"
+  },
+  "metricSleep": "Sleep",
+  "@metricSleep": {
+    "description": "Label for sleep duration measurement"
+  },
+  "noDataAvailable": "No data available",
+  "@noDataAvailable": {
+    "description": "Shown in place of a chart when the category has no entries in the selected range"
+  },
+  "metricSleepTotal": "Total sleep",
+  "@metricSleepTotal": {
+    "description": "Label for the total time asleep in a night, all sleep stages together"
+  },
+  "metricSleepLight": "Light sleep",
+  "@metricSleepLight": {
+    "description": "Label for the light sleep stage"
+  },
+  "metricSleepDeep": "Deep sleep",
+  "@metricSleepDeep": {
+    "description": "Label for the deep sleep stage"
+  },
+  "metricSleepRem": "REM sleep",
+  "@metricSleepRem": {
+    "description": "Label for the REM (rapid eye movement) sleep stage"
+  },
+  "metricSleepAwake": "Awake",
+  "@metricSleepAwake": {
+    "description": "Label for the time spent awake during a night, not counted as sleep"
+  },
   "measurementEntriesHelpText": "The unit used to measure the category such as 'cm' or '%'",
   "@measurementEntriesHelpText": {},
+  "partOfGroup": "Part of group",
+  "@partOfGroup": {
+    "description": "Dropdown label: makes a measurement category a component of a multi-value group (e.g. blood pressure)"
+  },
+  "noGroup": "No group",
+  "@noGroup": {
+    "description": "Dropdown option for a measurement category that is not part of any group"
+  },
   "date": "Date",
   "@date": {
     "description": "The date of a workout log or body weight entry"
@@ -969,7 +1244,6 @@
   "@close": {
     "description": "Translation for close"
   },
-  "identicalExercisePleaseDiscard": "If you notice an exercise that is identical to the one you're adding, please discard your draft and edit that exercise instead.",
   "checkInformationBeforeSubmitting": "Please check that the information you entered is correct before submitting the exercise",
   "add_exercise_image_license": "Images must be compatible with the CC BY SA license. If in doubt, upload only photos you've taken yourself.",
   "imageDetailsTitle": "Image details",
@@ -1024,16 +1298,6 @@
           }
       }
   },
-  "imageFormatNotSupportedDetail": "{imageFormat} images are not supported yet.",
-  "@imageFormatNotSupportedDetail": {
-      "description": "Label shown on the image preview container when image format is not supported",
-      "type": "text",
-      "placeholders": {
-          "imageFormat": {
-              "type": "String"
-          }
-      }
-  },
   "add": "add",
   "@add": {
     "description": "Add button text"
@@ -1080,7 +1344,6 @@
   "fitInWeek": "Fixed weekly schedule",
   "fitInWeekHelp": "If enabled, the days will repeat in a weekly cycle, otherwise the days will follow sequentially without regards to the start of a new week.",
   "addSuperset": "Add superset",
-  "superset": "Superset",
   "setHasNoExercises": "This set has no exercises yet!",
   "contributeExercise": "Contribute an exercise",
   "translation": "Translation",
@@ -1311,6 +1574,10 @@
   "@indicatorAvg": {
     "description": "added for localization of Class Indicator's field text"
   },
+  "indicatorTrend": "trend",
+  "@indicatorTrend": {
+    "description": "Legend label for the smoothed trendline on measurement charts"
+  },
   "endWorkout": "End workout",
   "@endWorkout": {
     "description": "Use the imperative, label on button to finish the current workout in gym mode"
@@ -1496,5 +1763,95 @@
   "timeStartEndBothOrNeither": "Either set both start and end time or leave both empty",
   "@timeStartEndBothOrNeither": {
     "description": "Validation error when only one of start/end time is set on a workout session"
+  },
+  "healthSync": "Health sync",
+  "@healthSync": {
+    "description": "Title for the health platform sync setting"
+  },
+  "healthSyncDescription": "Import body measurements from Apple Health or Health Connect",
+  "@healthSyncDescription": {
+    "description": "Subtitle for the health platform sync setting"
+  },
+  "healthSyncSuccess": "Imported {count} measurements from Health",
+  "@healthSyncSuccess": {
+    "description": "Snackbar message after successful health sync",
+    "placeholders": {
+      "count": {
+        "type": "int"
+      }
+    }
+  },
+  "healthSyncPermissionDenied": "Access to health data was not granted",
+  "@healthSyncPermissionDenied": {
+    "description": "Snackbar shown when enabling health sync fails because the platform permissions were denied"
+  },
+  "healthSyncNoData": "No health data was found. Check in {platform} that wger is allowed to read your data.",
+  "@healthSyncNoData": {
+    "description": "Snackbar shown when enabling health sync imported nothing, pointing at the platform's permission settings",
+    "placeholders": {
+      "platform": {
+        "type": "String",
+        "example": "Apple Health"
+      }
+    }
+  },
+  "healthSyncStatus": "{count, plural, =0{Last sync: {time}, no new entries} one{Last sync: {time}, 1 new entry} other{Last sync: {time}, {count} new entries}}",
+  "@healthSyncStatus": {
+    "description": "Status line under the health sync toggle showing when the last sync ran and how many entries it imported",
+    "placeholders": {
+      "count": {
+        "type": "int"
+      },
+      "time": {
+        "type": "String",
+        "example": "7/31/2026 14:32"
+      }
+    }
+  },
+  "healthSyncSyncing": "Syncing health data…",
+  "@healthSyncSyncing": {
+    "description": "Status line under the health sync toggle while a sync is running"
+  },
+  "healthSyncNow": "Sync now",
+  "@healthSyncNow": {
+    "description": "Label of the manual health sync action in the settings"
+  },
+  "healthSyncPermissionMissing": "{platform} is not sharing your data",
+  "@healthSyncPermissionMissing": {
+    "description": "Status line under the health sync toggle when the platform refuses to hand over data",
+    "placeholders": {
+      "platform": {
+        "type": "String",
+        "example": "Apple Health"
+      }
+    }
+  },
+  "healthSyncGrantAccess": "Tap to grant access again",
+  "@healthSyncGrantAccess": {
+    "description": "Action hint below the missing-permission status line"
+  },
+  "healthSyncFailed": "The last sync could not be completed",
+  "@healthSyncFailed": {
+    "description": "Status line under the health sync toggle after a failed sync"
+  },
+  "healthConnectInstall": "Install Health Connect",
+  "@healthConnectInstall": {
+    "description": "Action shown instead of the health sync toggle when Health Connect is missing on Android"
+  },
+  "healthConnectUpdate": "Update Health Connect",
+  "@healthConnectUpdate": {
+    "description": "Action shown instead of the health sync toggle when the installed Health Connect is too old"
+  },
+  "healthConnectRequired": "Health Connect is needed to import body measurements",
+  "@healthConnectRequired": {
+    "description": "Explanation below the install/update Health Connect action"
+  },
+  "health": "Health",
+  "@health": {
+    "description": "Section header for health-related settings"
+  },
+  "importedEntry": "This entry was synced from a health app and can only be changed there",
+  "@importedEntry": {
+    "description": "Tooltip on the badge of a measurement entry imported from Apple Health / Health Connect; such entries cannot be edited or deleted in the app"
   }
 }
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
index f6b4b305a..f8f941e9c 100644
--- a/lib/l10n/app_es.arb
+++ b/lib/l10n/app_es.arb
@@ -168,10 +168,6 @@
         "description": "Label when starting the gym mode"
     },
     "selectExercises": "Si quieres hacer una superserie puedes buscar varios ejercicios, se agruparán juntos",
-    "newSet": "Nueva serie",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "newDay": "Nuevo día",
     "workoutSession": "Sesión de entrenamiento",
     "@workoutSession": {
@@ -314,16 +310,6 @@
             }
         }
     },
-    "imageFormatNotSupportedDetail": "Las imágenes {imageFormat} aún no son compatibles.",
-    "@imageFormatNotSupportedDetail": {
-        "description": "Label shown on the image preview container when image format is not supported",
-        "type": "text",
-        "placeholders": {
-            "imageFormat": {
-                "type": "String"
-            }
-        }
-    },
     "chooseFromLibrary": "Elije de la biblioteca de fotos",
     "takePicture": "Toma una foto",
     "optionsLabel": "Opciones",
@@ -381,6 +367,9 @@
     },
     "measurement": "Medida",
     "measurementCategoriesHelpText": "Categoría de medición, como \"bíceps\" o \"grasa corporal\"",
+    "whatToTrack": "¿Qué quieres registrar?",
+    "customMeasurement": "Medición personalizada",
+    "metricAlreadyTracked": "Ya se está registrando",
     "measurementEntriesHelpText": "La unidad utilizada para medir la categoría, como \"cm\" o \"%\"",
     "value": "Valor",
     "@value": {
@@ -733,29 +722,6 @@
     "endDate": "Fecha de finalización",
     "startDate": "Fecha de inicio",
     "min": "Mínimo",
-    "chart30DaysTitle": "{name} ultimos 30 días",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "{chartName} durante el plan nutricional {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "today": "Hoy",
     "loggedToday": "Registrado hoy",
     "surplus": "exceso calórico",
@@ -839,20 +805,11 @@
     "@indicatorAvg": {
         "description": "added for localization of Class Indicator's field text"
     },
+    "indicatorTrend": "tendencia",
     "themeMode": "Modo del tema",
     "darkMode": "Siempre en modo oscuro",
     "lightMode": "Siempre en modo claro",
     "systemMode": "Configuracion del sistema",
-    "chartAllTimeTitle": "Histórico {name}",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
     "setHasProgression": "La serie tiene progresión",
     "setHasProgressionWarning": "Tenga en cuenta que, por el momento, no es posible editar todos los ajustes de un set en la aplicación móvil ni configurar la progresión automática. Por ahora, utilice la aplicación web.",
     "applicationLogs": "Registro de la aplicación",
@@ -865,7 +822,6 @@
         "description": "When a nutrition plan has no pre-defined end date"
     },
     "overview": "Descripción general",
-    "identicalExercisePleaseDiscard": "Si observa un ejercicio idéntico al que está agregando, descarte el borrador y edítelo en su lugar.",
     "checkInformationBeforeSubmitting": "Por favor verifique que la información que ingresó sea correcta antes de enviar el ejercicio",
     "imageDetailsTitle": "Detalles de la imagen",
     "@imageDetailsTitle": {
@@ -970,7 +926,6 @@
             }
         }
     },
-    "superset": "Superserie",
     "endWorkout": "Finalizar entrenamiento",
     "@endWorkout": {
         "description": "Use the imperative, label on button to finish the current workout in gym mode"
@@ -1196,6 +1151,37 @@
     "endBeforeStart": "El final no puede ser anterior al inicio",
     "minLengthRoutine": "La rutina debe ser de al menos {number} semanas",
     "maxLengthRoutine": "La rutina debe tener como mucho {number} semanas",
+    "metricType": "Tipo de métrica",
+    "reorderCategories": "Reordenar categorías",
+    "metricCustom": "Personalizado",
+    "metricBodyWeight": "Peso corporal",
+    "metricLeanBodyMass": "Masa magra",
+    "metricBodyFat": "Grasa corporal",
+    "metricHeight": "Altura",
+    "metricBloodPressure": "Presión arterial",
+    "metricBloodPressureSystolic": "Sistólica",
+    "metricBloodPressureDiastolic": "Diastólica",
+    "metricHeartRate": "Frecuencia cardíaca",
+    "metricRestingHeartRate": "Frecuencia cardíaca en reposo",
+    "metricBloodOxygen": "Saturación de oxígeno",
+    "metricSteps": "Pasos",
+    "metricDistance": "Distancia",
+    "metricEnergy": "Energía",
+    "metricSleep": "Sueño",
+    "metricSleepTotal": "Sueño total",
+    "metricSleepLight": "Sueño ligero",
+    "metricSleepDeep": "Sueño profundo",
+    "metricSleepRem": "Sueño REM",
+    "metricSleepAwake": "Despierto",
+    "noDataAvailable": "No hay datos disponibles",
+    "partOfGroup": "Parte del grupo",
+    "noGroup": "Sin grupo",
+    "healthSync": "Sincronización de salud",
+    "healthSyncDescription": "Importa medidas corporales desde Apple Health o Health Connect",
+    "healthSyncSuccess": "Se importaron {count} medidas de salud",
+    "health": "Salud",
+    "importedEntry": "Esta entrada se sincronizó desde una aplicación de salud y solo se puede cambiar allí",
+    "healthSyncPermissionDenied": "No se concedió el acceso a los datos de salud",
     "gymModeLogScope": "Registros anteriores",
     "gymModeLogScopeHelp": "Qué registros mostrar como referencia durante el entrenamiento",
     "gymModeLogScopeCurrentRoutine": "Rutina actual",
@@ -1206,6 +1192,48 @@
     "allowSelfSignedCertsDetail": "Desactiva la validación del certificado TLS. Actívalo solo para un servidor de confianza.",
     "certsNotVerifiedTitle": "La validación de certificados está desactivada",
     "certsNotVerifiedDetail": "Los certificados de {host} no se comprueban. Para cambiarlo, cierra la sesión y ajusta la opción en la pantalla de inicio de sesión.",
+    "chartRangeAll": "Todo",
+    "chartRangeMonths": "{count, plural, one{1 mes} other{{count} meses}}",
+    "chartRangeYears": "{count, plural, one{1 año} other{{count} años}}",
+    "chartType": "Tipo de gráfico",
+    "chartTypeAuto": "Automático",
+    "chartTypeLine": "Línea",
+    "chartTypeBar": "Barras",
+    "chartTypeHeatmap": "Mapa de calor",
+    "chartTypeDelta": "Variación",
+    "chartWeeklyChangeTitle": "{name}, variación por semana",
+    "chartTrend": "Línea de tendencia",
+    "trendReactive": "Reactiva",
+    "trendBalanced": "Equilibrada",
+    "trendSluggish": "Suavizada",
+    "chartAverageWindow": "Promedio de",
+    "chartAverageWindowDays": "{days, plural, one{1 día} other{{days} días}}",
+    "chartTypeDistribution": "Distribución",
+    "chartDistributionTitle": "{name}, distribución",
+    "distributionMedian": "Mediana",
+    "distributionLatest": "Actual",
+    "distributionEntryCount": "{count, plural, one{1 entrada} other{{count} entradas}}",
+    "distributionDayCount": "{count, plural, one{1 día} other{{count} días}}",
+    "healthSyncNoData": "No se han encontrado datos de salud. Comprueba en {platform} que wger puede leer tus datos.",
+    "healthSyncStatus": "{count, plural, =0{Última sincronización: {time}, sin entradas nuevas} one{Última sincronización: {time}, 1 entrada nueva} other{Última sincronización: {time}, {count} entradas nuevas}}",
+    "healthSyncSyncing": "Sincronizando datos de salud…",
+    "healthSyncNow": "Sincronizar ahora",
+    "healthSyncPermissionMissing": "{platform} no comparte tus datos",
+    "healthSyncGrantAccess": "Toca para volver a dar acceso",
+    "healthSyncFailed": "No se ha podido completar la última sincronización",
+    "healthConnectInstall": "Instalar Health Connect",
+    "healthConnectUpdate": "Actualizar Health Connect",
+    "healthConnectRequired": "Health Connect es necesario para importar medidas corporales",
+    "labelBottomNavBody": "Cuerpo",
+    "sparkAverage": "prom. {value}",
+    "sparkTrendPerWeek": "{value}/semana",
+    "sparkTrendStable": "estable",
+    "trackNewMetric": "Registrar algo nuevo",
+    "chartRangeWeeks": "{count, plural, one{1 semana} other{{count} semanas}}",
+    "relativeDaysAgo": "{count, plural, =0{hoy} =1{ayer} other{hace {count} días}}",
+    "relativeWeeksAgo": "{count, plural, one{hace 1 semana} other{hace {count} semanas}}",
+    "relativeMonthsAgo": "{count, plural, one{hace 1 mes} other{hace {count} meses}}",
+    "relativeYearsAgo": "{count, plural, one{hace 1 año} other{hace {count} años}}",
     "settingsVerboseLogging": "Registro detallado",
     "settingsVerboseLoggingDescription": "Útil cuando informas de problemas persistentes."
 }
diff --git a/lib/l10n/app_fa.arb b/lib/l10n/app_fa.arb
index 5ab88e34e..9bbd6c0fa 100644
--- a/lib/l10n/app_fa.arb
+++ b/lib/l10n/app_fa.arb
@@ -155,10 +155,6 @@
     },
     "newDay": "روز جدید",
     "@newDay": {},
-    "newSet": "مجموعه جدید",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "selectExercises": "اگر می‌خواهید مجموعه ای از حرکات را انجام دهید، می‌توانید چندین تمرین را جستجو کنید، آنها در یک گروه قرار می‌گیرند",
     "@selectExercises": {},
     "gymMode": "حالت باشگاه",
@@ -275,39 +271,6 @@
     "@min": {},
     "max": "حداکثر",
     "@max": {},
-    "chartAllTimeTitle": "نمودار کلی {name}",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chart30DaysTitle": "نمودار 30 روزه {name}",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "نمودار {chartName} در برنامه {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "measurement": "اندازه گیری",
     "@measurement": {},
     "measurements": "اندازه گیری ها",
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
index a72f4e0ce..0b25110ef 100644
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -119,10 +119,6 @@
     "@gymMode": {
         "description": "Label when starting the gym mode"
     },
-    "newSet": "Nouvelle série",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "newDay": "Nouvelle journée",
     "workoutSession": "Session d’entraînement",
     "@workoutSession": {
@@ -323,16 +319,6 @@
             }
         }
     },
-    "imageFormatNotSupportedDetail": "{imageFormat} pas encore pris en charge.",
-    "@imageFormatNotSupportedDetail": {
-        "description": "Label shown on the image preview container when image format is not supported",
-        "type": "text",
-        "placeholders": {
-            "imageFormat": {
-                "type": "String"
-            }
-        }
-    },
     "chooseFromLibrary": "Choisir depuis la bibliothèque",
     "takePicture": "Prendre une photo",
     "selectImage": "Veuillez sélectionner une image",
@@ -415,6 +401,9 @@
     },
     "measurementEntriesHelpText": "L'unité utilisée pour mesurer la catégorie, comme cm ou %",
     "measurementCategoriesHelpText": "Catégorie de mesure, comme « biceps » ou « graisse corporelle »",
+    "whatToTrack": "Que voulez-vous suivre ?",
+    "customMeasurement": "Mesure personnalisée",
+    "metricAlreadyTracked": "Déjà suivi",
     "measurements": "Mesures",
     "@measurements": {
         "description": "Categories for the measurements such as biceps size, body fat, etc."
@@ -709,26 +698,6 @@
     "lightMode": "Mode clair permanent",
     "darkMode": "Mode sombre permanent",
     "systemMode": "Paramètres du système",
-    "chart30DaysTitle": "{name} les 30 derniers jours",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartAllTimeTitle": "{name} depuis le début",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
     "selectAvailablePlates": "Sélectionnez les poids disponibles",
     "barWeight": "Poids de la barre",
     "useColors": "Utiliser des couleurs",
@@ -762,6 +731,7 @@
     "@indicatorAvg": {
         "description": "added for localization of Class Indicator's field text"
     },
+    "indicatorTrend": "tendance",
     "resistance_band": "Bande de résistance",
     "@resistance_band": {
         "description": "Generated entry for translation for server strings"
@@ -773,19 +743,6 @@
     "needsLogsToAdvanceHelp": "Sélectionnez si vous souhaitez que la routine passe au jour programmé suivant uniquement si vous avez enregistré une séance d'entraînement pour la journée",
     "min": "Min",
     "themeMode": "Thème",
-    "chartDuringPlanTitle": "{chartName} pendant le plan nutritionnel {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "fitInWeek": "Planning hebdomadaire fixe",
     "addSuperset": "Ajouter une supersérie",
     "useApiToken": "Utiliser un jeton API",
@@ -877,7 +834,6 @@
         "description": "When a nutrition plan has no pre-defined end date"
     },
     "overview": "Aperçu",
-    "identicalExercisePleaseDiscard": "Si vous remarquez un exercice identique à celui que vous ajoutez, veuillez supprimer votre brouillon et modifier cet exercice à la place.",
     "checkInformationBeforeSubmitting": "Veuillez vérifier que les informations que vous avez saisies sont correctes avant de soumettre l'exercice",
     "imageDetailsTitle": "Détails de l'image",
     "@imageDetailsTitle": {
@@ -964,7 +920,6 @@
             }
         }
     },
-    "superset": "Superset",
     "personalRecords": "Enregistrements personnels",
     "noTrophies": "Vous n'avez pas encore de trophées",
     "serverUpdateTitle": "Mise à jour du serveur requise",
@@ -1167,6 +1122,37 @@
     "endBeforeStart": "La valeur de fin ne peut être avant le début",
     "minLengthRoutine": "La routine doit durer au moins {number} semaines",
     "maxLengthRoutine": "La routine peut durer au maximum {number} semaines",
+    "metricType": "Type de métrique",
+    "reorderCategories": "Réorganiser les catégories",
+    "metricCustom": "Personnalisé",
+    "metricBodyWeight": "Poids corporel",
+    "metricLeanBodyMass": "Masse maigre",
+    "metricBodyFat": "Graisse corporelle",
+    "metricHeight": "Taille",
+    "metricBloodPressure": "Pression artérielle",
+    "metricBloodPressureSystolic": "Systolique",
+    "metricBloodPressureDiastolic": "Diastolique",
+    "metricHeartRate": "Fréquence cardiaque",
+    "metricRestingHeartRate": "Fréquence cardiaque au repos",
+    "metricBloodOxygen": "Saturation en oxygène",
+    "metricSteps": "Pas",
+    "metricDistance": "Distance",
+    "metricEnergy": "Énergie",
+    "metricSleep": "Sommeil",
+    "metricSleepTotal": "Sommeil total",
+    "metricSleepLight": "Sommeil léger",
+    "metricSleepDeep": "Sommeil profond",
+    "metricSleepRem": "Sommeil paradoxal",
+    "metricSleepAwake": "Éveillé",
+    "noDataAvailable": "Aucune donnée disponible",
+    "partOfGroup": "Fait partie du groupe",
+    "noGroup": "Aucun groupe",
+    "healthSync": "Synchronisation santé",
+    "healthSyncDescription": "Importe les mesures corporelles depuis Apple Santé ou Health Connect",
+    "healthSyncSuccess": "{count} mesures de santé importées",
+    "health": "Santé",
+    "importedEntry": "Cette entrée a été synchronisée depuis une app de santé et ne peut être modifiée que là-bas",
+    "healthSyncPermissionDenied": "L'accès aux données de santé n'a pas été autorisé",
     "gymModeLogScope": "Journaux précédents",
     "gymModeLogScopeHelp": "Quels journaux afficher comme référence pendant l'entraînement",
     "gymModeLogScopeCurrentRoutine": "Routine actuelle",
@@ -1177,6 +1163,48 @@
     "allowSelfSignedCertsDetail": "Désactive la validation du certificat TLS. Ne l'activez que pour un serveur de confiance.",
     "certsNotVerifiedTitle": "La validation des certificats est désactivée",
     "certsNotVerifiedDetail": "Les certificats de {host} ne sont pas vérifiés. Pour changer cela, déconnectez-vous et modifiez l'option sur l'écran de connexion.",
+    "chartRangeAll": "Tout",
+    "chartRangeMonths": "{count, plural, one{1 mois} other{{count} mois}}",
+    "chartRangeYears": "{count, plural, one{1 an} other{{count} ans}}",
+    "chartType": "Type de graphique",
+    "chartTypeAuto": "Automatique",
+    "chartTypeLine": "Ligne",
+    "chartTypeBar": "Barres",
+    "chartTypeHeatmap": "Carte thermique",
+    "chartTypeDelta": "Variation",
+    "chartWeeklyChangeTitle": "{name}, variation par semaine",
+    "chartTrend": "Courbe de tendance",
+    "trendReactive": "Réactive",
+    "trendBalanced": "Équilibrée",
+    "trendSluggish": "Lissée",
+    "chartAverageWindow": "Moyenne sur",
+    "chartAverageWindowDays": "{days, plural, one{1 jour} other{{days} jours}}",
+    "chartTypeDistribution": "Répartition",
+    "chartDistributionTitle": "{name}, répartition",
+    "distributionMedian": "Médiane",
+    "distributionLatest": "Actuel",
+    "distributionEntryCount": "{count, plural, one{1 entrée} other{{count} entrées}}",
+    "distributionDayCount": "{count, plural, one{1 jour} other{{count} jours}}",
+    "healthSyncNoData": "Aucune donnée de santé n'a été trouvée. Vérifiez dans {platform} que wger peut lire vos données.",
+    "healthSyncStatus": "{count, plural, =0{Dernière synchronisation : {time}, aucune nouvelle entrée} one{Dernière synchronisation : {time}, 1 nouvelle entrée} other{Dernière synchronisation : {time}, {count} nouvelles entrées}}",
+    "healthSyncSyncing": "Synchronisation des données de santé…",
+    "healthSyncNow": "Synchroniser maintenant",
+    "healthSyncPermissionMissing": "{platform} ne partage pas vos données",
+    "healthSyncGrantAccess": "Appuyez pour autoriser l'accès à nouveau",
+    "healthSyncFailed": "La dernière synchronisation n'a pas pu être terminée",
+    "healthConnectInstall": "Installer Health Connect",
+    "healthConnectUpdate": "Mettre à jour Health Connect",
+    "healthConnectRequired": "Health Connect est nécessaire pour importer les mensurations",
+    "labelBottomNavBody": "Corps",
+    "sparkAverage": "moy. {value}",
+    "sparkTrendPerWeek": "{value}/semaine",
+    "sparkTrendStable": "stable",
+    "trackNewMetric": "Suivre autre chose",
+    "chartRangeWeeks": "{count, plural, one{1 semaine} other{{count} semaines}}",
+    "relativeDaysAgo": "{count, plural, =0{aujourd'hui} =1{hier} other{il y a {count} jours}}",
+    "relativeWeeksAgo": "{count, plural, one{il y a 1 semaine} other{il y a {count} semaines}}",
+    "relativeMonthsAgo": "{count, plural, one{il y a 1 mois} other{il y a {count} mois}}",
+    "relativeYearsAgo": "{count, plural, one{il y a 1 an} other{il y a {count} ans}}",
     "settingsVerboseLogging": "Journalisation détaillée",
     "settingsVerboseLoggingDescription": "Utile lorsque vous signalez des problèmes persistants."
 }
diff --git a/lib/l10n/app_he.arb b/lib/l10n/app_he.arb
index 2d776dfc2..6919d24d9 100644
--- a/lib/l10n/app_he.arb
+++ b/lib/l10n/app_he.arb
@@ -135,10 +135,6 @@
   },
   "newDay": "יום חדש",
   "@newDay": {},
-  "newSet": "סט חדש",
-  "@newSet": {
-    "description": "Header when adding a new set to a workout day"
-  },
   "plateCalculator": "צלחות",
   "@plateCalculator": {
     "description": "Label used for the plate calculator in the gym mode"
@@ -858,39 +854,6 @@
   "@toAddMealsToThePlanGoToNutritionalPlanDetails": {
     "description": "Message shown to guide users to the nutritional plan details page to add meals"
   },
-  "chartAllTimeTitle": "{name} בכל הזמנים",
-  "@chartAllTimeTitle": {
-    "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-    "type": "text",
-    "placeholders": {
-      "name": {
-        "type": "String"
-      }
-    }
-  },
-  "chart30DaysTitle": "{name} ב־30 הימים האחרונים",
-  "@chart30DaysTitle": {
-    "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-    "type": "text",
-    "placeholders": {
-      "name": {
-        "type": "String"
-      }
-    }
-  },
-  "chartDuringPlanTitle": "{chartName} במסגרת התוכנית התזונתית {planName}",
-  "@chartDuringPlanTitle": {
-    "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-    "type": "text",
-    "placeholders": {
-      "chartName": {
-        "type": "String"
-      },
-      "planName": {
-        "type": "String"
-      }
-    }
-  },
   "aboutDonateText": "בעוד המיזם הזה חופשי ותמיד יישאר כך, תפעול השרת כן עולה לנו כסף! גם הפיתוח דורש השקעה משמעותית של זמן ומאמץ של מתנדבים. התרומה שלך תלך ישירות לכיסוי העלויות האלה, המאפשרות לספק את השירות שלנו נאמנה.",
   "@aboutDonateText": {},
   "aboutContributeText": "אנחנו מעודדים את כל סוגי התרומה. בין אם היא מתבטאת בפיתוח קוד, תרגום, או אפילו רק תשוקה לכושר, אנו מעריכים כל סוג של תמיכה!",
diff --git a/lib/l10n/app_hi.arb b/lib/l10n/app_hi.arb
index 94eefcfc7..fc0850a82 100644
--- a/lib/l10n/app_hi.arb
+++ b/lib/l10n/app_hi.arb
@@ -105,8 +105,6 @@
   "@workoutSession": {},
   "newDay": "नया दिन",
   "@newDay": {},
-  "newSet": "नया सेट",
-  "@newSet": {},
   "selectExercises": "यदि आप एक सुपरसेट करना चाहते हैं तो आप कई अभ्यास खोज सकते हैं, उन्हें एक साथ समूहीकृत किया जाएगा",
   "@selectExercises": {},
   "gymMode": "जिम मोड",
diff --git a/lib/l10n/app_hr.arb b/lib/l10n/app_hr.arb
index d890f8935..c2967b67c 100644
--- a/lib/l10n/app_hr.arb
+++ b/lib/l10n/app_hr.arb
@@ -389,10 +389,6 @@
         "description": "A (logged) workout session"
     },
     "newDay": "Novi dan",
-    "newSet": "Nova serija",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "selectExercises": "Ako želiš izraditi nasdkup, traži i odaberi vježbe koje će se grupirati u jednu grupu",
     "gymMode": "Modus teretane",
     "@gymMode": {
@@ -801,40 +797,7 @@
     "darkMode": "Uvijek tamni modus",
     "lightMode": "Uvijek svijetli modus",
     "systemMode": "Postavke sustava",
-    "chartAllTimeTitle": "{name} – svo vrijeme",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "{chartName} tijekom plana prehrane {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "settingsIngredientCacheDescription": "Predmemorija sastojaka",
-    "chart30DaysTitle": "{name} – zadnjih 30 dana",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
     "barWeight": "Težina šipke",
     "useColors": "Koristi boje",
     "selectAvailablePlates": "Odaberi prosjećne ploće",
@@ -950,7 +913,6 @@
     "aboutContributeTitle": "Doprinesi",
     "aboutContributeText": "Sve vrste doprinosa su dobrodošle. Bilo da si programer, prevoditelj ili jednostavno strastveni ljubitelj fitnessa, svaka podrška je dobrodošla!",
     "aboutBugsListTitle": "Prijavi problem ili predloži funkciju",
-    "identicalExercisePleaseDiscard": "Ako primijetiš vježbu koja je identična onoj koju dodaješ, odbaci svoju vježbu i umjesto toga uredi tu vježbu.",
     "checkInformationBeforeSubmitting": "Provjeri točnost tvojih unesenih podataka prije slanja vježbe",
     "imageDetailsTitle": "Detalji slike",
     "@imageDetailsTitle": {
@@ -1001,16 +963,6 @@
             }
         }
     },
-    "imageFormatNotSupportedDetail": "{imageFormat} slike još nisu podržane.",
-    "@imageFormatNotSupportedDetail": {
-        "description": "Label shown on the image preview container when image format is not supported",
-        "type": "text",
-        "placeholders": {
-            "imageFormat": {
-                "type": "String"
-            }
-        }
-    },
     "add": "dodaj",
     "@add": {
         "description": "Add button text"
@@ -1074,7 +1026,6 @@
             }
         }
     },
-    "superset": "Super-serija",
     "trophies": "Trofeje",
     "productNotFoundOpenFoodFacts": "Dodaj ovaj proizvod na Open Food Facts i pomogni zajednici!",
     "@productNotFoundOpenFoodFacts": {
diff --git a/lib/l10n/app_hu.arb b/lib/l10n/app_hu.arb
index f84ba9e9a..a78e33ad6 100644
--- a/lib/l10n/app_hu.arb
+++ b/lib/l10n/app_hu.arb
@@ -394,10 +394,6 @@
     "routineDays": "A gyakorlatsor napjai",
     "resultingRoutine": "Eredményül kapott gyakorlatsor",
     "newDay": "Új nap",
-    "newSet": "Új sorozat",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "personalRecords": "Egyéni rekordok",
     "gymMode": "Edzőtermi mód",
     "@gymMode": {
@@ -528,39 +524,6 @@
     "errorViewDetails": "Technikai részletek",
     "applicationLogs": "Alkalmazásnaplók",
     "errorCouldNotConnectToServer": "Nem sikerült kapcsolódni a szerverhez",
-    "chartAllTimeTitle": "{name} – teljes időszak",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chart30DaysTitle": "{name} – elmúlt 30 nap",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "{chartName} a(z) {planName} táplálkozási terv időszakában",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "measurement": "Mérés",
     "measurements": "Mérések",
     "@measurements": {
@@ -913,7 +876,6 @@
     "@scanBarcode": {
         "description": "Label for scan barcode button"
     },
-    "identicalExercisePleaseDiscard": "Ha olyan gyakorlatot találsz, amely megegyezik az általad hozzáadottal, töröld a piszkozatot, és inkább azt a gyakorlatot szerkeszd.",
     "checkInformationBeforeSubmitting": "A gyakorlat beküldése előtt ellenőrizd, hogy helyesek-e a megadott adatok",
     "add_exercise_image_license": "A képeknek kompatibilisnek kell lenniük a CC BY-SA licenccel. Ha bizonytalan vagy, csak saját készítésű fényképeket tölts fel.",
     "imageDetailsTitle": "Kép részletei",
@@ -965,16 +927,6 @@
             }
         }
     },
-    "imageFormatNotSupportedDetail": "A(z) {imageFormat} formátumú képek még nem támogatottak.",
-    "@imageFormatNotSupportedDetail": {
-        "description": "Label shown on the image preview container when image format is not supported",
-        "type": "text",
-        "placeholders": {
-            "imageFormat": {
-                "type": "String"
-            }
-        }
-    },
     "add": "Hozzáadás",
     "@add": {
         "description": "Add button text"
@@ -1018,7 +970,6 @@
     "fitInWeek": "Rögzített heti ütemezés",
     "fitInWeekHelp": "Ha engedélyezed, a napok heti ciklusban ismétlődnek; ellenkező esetben egymás után következnek, az új hét kezdetétől függetlenül.",
     "addSuperset": "Szuperszett hozzáadása",
-    "superset": "Szuperszett",
     "setHasNoExercises": "Ez a sorozat még nem tartalmaz gyakorlatokat!",
     "contributeExercise": "Gyakorlat beküldése",
     "translateExercise": "Gyakorlat lefordítása most",
diff --git a/lib/l10n/app_id.arb b/lib/l10n/app_id.arb
index f6be16048..d692e6610 100644
--- a/lib/l10n/app_id.arb
+++ b/lib/l10n/app_id.arb
@@ -165,10 +165,6 @@
         "description": "A (logged) workout session"
     },
     "newDay": "Hari baru",
-    "newSet": "Set baru",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "selectExercises": "Jika Anda ingin melakukan superset, Anda dapat mencari beberapa latihan, mereka akan dikelompokkan bersama",
     "gymMode": "Mode gym",
     "@gymMode": {
@@ -580,39 +576,6 @@
     "errorCouldNotConnectToServer": "Tidak dapat terhubung ke server",
     "errorInfoDescription": "Maaf, terjadi kesalahan. Anda dapat membantu kami memperbaikinya dengan melaporkan masalah ini di GitHub.",
     "min": "Minimal",
-    "chartAllTimeTitle": "{name}Sepanjang waktu",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chart30DaysTitle": "{name} 30 hari terakhir",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "{chartName} selama rencana nutrisi {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "aboutWhySupportTitle": "Bersifat open source & gratis ❤️",
     "aboutSourceListTitle": "Lihat kode sumber",
     "aboutJoinCommunityTitle": "Gabung komunitas",
@@ -1008,7 +971,6 @@
     "@volume": {
         "description": "The volume of a workout or set, i.e. weight x reps"
     },
-    "identicalExercisePleaseDiscard": "Jika kamu menemukan latihan yang identik dengan yang sedang ditambahkan, harap batalkan draf kamu dan edit latihan tersebut.",
     "checkInformationBeforeSubmitting": "Pastikan informasi yang kamu masukkan sudah benar sebelum mengirimkan latihan",
     "imageDetailsTitle": "Detail gambar",
     "@imageDetailsTitle": {
@@ -1069,21 +1031,10 @@
             }
         }
     },
-    "imageFormatNotSupportedDetail": "Gambar {imageFormat} belum didukung.",
-    "@imageFormatNotSupportedDetail": {
-        "description": "Label shown on the image preview container when image format is not supported",
-        "type": "text",
-        "placeholders": {
-            "imageFormat": {
-                "type": "String"
-            }
-        }
-    },
     "add": "Tambah",
     "@add": {
         "description": "Add button text"
     },
-    "superset": "Superset",
     "useBasicMarkdown": "Kamu dapat menggunakan Markdown dasar untuk memformat teks",
     "editorBold": "Tebal",
     "@editorBold": {
diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
index e0b421c09..fddc9652c 100644
--- a/lib/l10n/app_it.arb
+++ b/lib/l10n/app_it.arb
@@ -118,10 +118,6 @@
     "@gymMode": {
         "description": "Label when starting the gym mode"
     },
-    "newSet": "Nuova serie",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "newDay": "Nuovo giorno",
     "workoutSession": "Sessione di allenamento",
     "@workoutSession": {
@@ -722,29 +718,6 @@
     "settingsCacheDeletedSnackbar": "Cache svuotata con successo",
     "done": "Fatto",
     "ingredientLogged": "Ingrediente registrato nel diario",
-    "chartDuringPlanTitle": "{chartName} durante il piano nutrizionale {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
-    "chart30DaysTitle": "{name} ultimi 30 giorni",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
     "goalMacro": "Obiettivi dei macronutrienti",
     "@goalMacro": {
         "description": "The goal for macronutrients"
@@ -826,16 +799,6 @@
     "@deficit": {
         "description": "Caloric deficit (either planned or unplanned)"
     },
-    "chartAllTimeTitle": "{name} storico",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
     "darkMode": "Sempre in modalità scura",
     "routines": "Routine",
     "newRoutine": "Nuova routine",
@@ -934,7 +897,6 @@
         "description": "When a nutrition plan has no pre-defined end date"
     },
     "overview": "Panoramica",
-    "identicalExercisePleaseDiscard": "Se trovate un esercizio identico a quello che state cercando di aggiungere, per favore scartate la vostra bozza e se necessario modificate l'esercizio esistente.",
     "checkInformationBeforeSubmitting": "Verificate che le informazioni siano corrette prima di aggiungere l'esercizio",
     "enterTextInLanguage": "Aggiungete il testo usando la lingua giusta!",
     "applicationLogs": "Registri dell'applicazione",
@@ -1073,17 +1035,6 @@
             }
         }
     },
-    "imageFormatNotSupportedDetail": "Le immagini in formato {imageFormat} non sono ancora supportate.",
-    "@imageFormatNotSupportedDetail": {
-        "description": "Label shown on the image preview container when image format is not supported",
-        "type": "text",
-        "placeholders": {
-            "imageFormat": {
-                "type": "String"
-            }
-        }
-    },
-    "superset": "Superset",
     "useBasicMarkdown": "Puoi usare il Markdown di base per formattare il testo",
     "editorBold": "Grassetto",
     "@editorBold": {
diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
index 7f6ddf35b..1a6afa772 100644
--- a/lib/l10n/app_ja.arb
+++ b/lib/l10n/app_ja.arb
@@ -175,10 +175,6 @@
     },
     "newDay": "新しい日",
     "@newDay": {},
-    "newSet": "新しいセット",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "selectExercises": "If you want to do a superset you can search for several exercises, they will be grouped together",
     "@selectExercises": {},
     "gymMode": "ジムモード",
@@ -483,16 +479,6 @@
             }
         }
     },
-    "imageFormatNotSupportedDetail": "{imageFormat}形式の画像はまだサポートされていません。",
-    "@imageFormatNotSupportedDetail": {
-        "description": "Label shown on the image preview container when image format is not supported",
-        "type": "text",
-        "placeholders": {
-            "imageFormat": {
-                "type": "String"
-            }
-        }
-    },
     "addImage": "Add image",
     "@addImage": {},
     "dataCopied": "Data copied to new entry",
diff --git a/lib/l10n/app_ko.arb b/lib/l10n/app_ko.arb
index ada472ea6..06d814019 100644
--- a/lib/l10n/app_ko.arb
+++ b/lib/l10n/app_ko.arb
@@ -218,29 +218,6 @@
         "description": "The weight of a workout log or body weight entry"
     },
     "min": "최소",
-    "chart30DaysTitle": "{name} 지난 30일",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "{chartName} 영양 계획 {planName} 중",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "measurements": "측정",
     "@measurements": {
         "description": "Categories for the measurements such as biceps size, body fat, etc."
@@ -546,10 +523,6 @@
         "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
     },
     "useColors": "색상 사용",
-    "newSet": "새 세트",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "selectAvailablePlates": "사용 가능한 플레이트 선택",
     "isRestDay": "쉬는 날인가",
     "logHelpEntries": "같은 날에 반복 횟수는 같지만 가중치가 다른 항목이 두 개 이상 있는 경우 다이어그램에는 가중치가 더 높은 항목만 표시됩니다.",
@@ -558,16 +531,6 @@
     "anErrorOccurred": "오류가 발생했습니다!",
     "onlyLoggingHelpText": "칼로리만 기록하고 특정 식사에 대한 자세한 영양 계획을 세우고 싶지 않은 경우 상자를 체크하세요",
     "measurement": "측정",
-    "chartAllTimeTitle": "{name} 역대",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
     "energy": "에너지",
     "@energy": {
         "description": "Energy in a meal, ingredient etc. e.g. in kJ"
diff --git a/lib/l10n/app_mk.arb b/lib/l10n/app_mk.arb
index 521f8decd..cc2f2e4f0 100644
--- a/lib/l10n/app_mk.arb
+++ b/lib/l10n/app_mk.arb
@@ -325,7 +325,6 @@
     "@close": {
         "description": "Translation for close"
     },
-    "identicalExercisePleaseDiscard": "Ако забележите вежба што е идентична со онаа што ја додавате, тогаш отфрлете го вашиот нацрт и наместо тоа уредете ја таа постоечка вежба.",
     "checkInformationBeforeSubmitting": "Ве молиме проверете дали информацијата што ја внесовте е точна пред да ја зачувате вежбата",
     "imageDetailsTitle": "Детали за слика",
     "@imageDetailsTitle": {
@@ -363,16 +362,6 @@
             }
         }
     },
-    "imageFormatNotSupportedDetail": "{imageFormat} сликите сеште не се поддржани.",
-    "@imageFormatNotSupportedDetail": {
-        "description": "Label shown on the image preview container when image format is not supported",
-        "type": "text",
-        "placeholders": {
-            "imageFormat": {
-                "type": "String"
-            }
-        }
-    },
     "add": "додади",
     "@add": {
         "description": "Add button text"
@@ -612,26 +601,6 @@
     },
     "min": "Минимум",
     "max": "Максимум",
-    "chart30DaysTitle": "{name} последни 30 дена",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartAllTimeTitle": "{name} цело време",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
     "copyToClipboard": "Копирај",
     "measurement": "Мерење",
     "measurements": "Мерења",
diff --git a/lib/l10n/app_nb.arb b/lib/l10n/app_nb.arb
index 40b67a1db..5a9768e2e 100644
--- a/lib/l10n/app_nb.arb
+++ b/lib/l10n/app_nb.arb
@@ -89,10 +89,6 @@
         "description": "Label when starting the gym mode"
     },
     "description": "Beskrivelse",
-    "newSet": "Nytt sett",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "newDay": "Ny dag",
     "workoutSession": "Treningsøkt",
     "@workoutSession": {
diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arb
index 27f390ad6..b0ef13ede 100644
--- a/lib/l10n/app_nl.arb
+++ b/lib/l10n/app_nl.arb
@@ -242,10 +242,6 @@
     "routineDays": "Dagen in routine",
     "resultingRoutine": "Resulterende routine",
     "newDay": "Nieuwe dag",
-    "newSet": "Nieuwe set",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "selectExercises": "Als je een superset wilt doen kan je naar verschillende oefeningen zoeken, en kan je ze samen groeperen",
     "gymMode": "Gym modus",
     "@gymMode": {
@@ -358,39 +354,6 @@
     },
     "min": "Min",
     "max": "Max",
-    "chartAllTimeTitle": "{name} door de tijd heen",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chart30DaysTitle": "{name} afgelopen 30 dagen",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "{chartName} tijdens voedingsplan {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "measurement": "Meting",
     "measurements": "Metingen",
     "@measurements": {
@@ -726,7 +689,6 @@
     "@close": {
         "description": "Translation for close"
     },
-    "identicalExercisePleaseDiscard": "Als je een oefening ziet die identiek is aan degene die je toevoegt, gooi dan je concept weg en bewerk die oefening in plaats daarvan.",
     "checkInformationBeforeSubmitting": "Controleer of de ingevoerde gegevens correct zijn voordat u de oefening indient",
     "add_exercise_image_license": "Afbeeldingen moeten compatibel zijn met de CC BY SA-licentie. Upload bij twijfel alleen foto's die je zelf hebt gemaakt.",
     "imageDetailsTitle": "Afbeeldingsdetails",
@@ -778,16 +740,6 @@
             }
         }
     },
-    "imageFormatNotSupportedDetail": "Afbeeldingen met het formaat {imageFormat} worden nog niet ondersteund.",
-    "@imageFormatNotSupportedDetail": {
-        "description": "Label shown on the image preview container when image format is not supported",
-        "type": "text",
-        "placeholders": {
-            "imageFormat": {
-                "type": "String"
-            }
-        }
-    },
     "add": "toevoegen",
     "@add": {
         "description": "Add button text"
@@ -827,7 +779,6 @@
     "fitInWeek": "Vast week­rooster",
     "fitInWeekHelp": "Indien ingeschakeld, zullen de dagen zich herhalen in een wekelijkse cyclus; anders zullen de dagen elkaar opeenvolgend opvolgen, ongeacht het begin van een nieuwe week.",
     "addSuperset": "Superset toevoegen",
-    "superset": "Superset",
     "setHasProgression": "Set heeft progressie",
     "setHasProgressionWarning": "Houd er rekening mee dat het momenteel niet mogelijk is om alle instellingen voor een set te bewerken in de mobiele app of om de automatische voortgang te configureren. Gebruik hiervoor voorlopig de webapp.",
     "setHasNoExercises": "Deze set heeft nog geen oefeningen!",
diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
index ea0b4791f..45cbf48b9 100644
--- a/lib/l10n/app_pl.arb
+++ b/lib/l10n/app_pl.arb
@@ -170,10 +170,6 @@
     "@workoutSession": {
         "description": "A (logged) workout session"
     },
-    "newSet": "Nowa seria",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "selectExercises": "Jeśli chcesz zrobić super serię, możesz wyszukać kilka ćwiczeń, zostaną one zgrupowane razem",
     "gymMode": "Tryb treningu",
     "@gymMode": {
@@ -683,26 +679,6 @@
     "@deficit": {
         "description": "Caloric deficit (either planned or unplanned)"
     },
-    "chartAllTimeTitle": "{name} Z całego okresu",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chart30DaysTitle": "{name} ostatnie 30 dni",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
     "useApiToken": "Użyj API Token",
     "apiToken": "API Token",
     "restTime": "Czas odpoczynku",
@@ -774,19 +750,6 @@
     "@toAddMealsToThePlanGoToNutritionalPlanDetails": {
         "description": "Message shown to guide users to the nutritional plan details page to add meals"
     },
-    "chartDuringPlanTitle": "{chartName} w planie żywieniowym {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "aboutContributeTitle": "Współtwórz",
     "aboutContributeText": "Zachęcamy do wszelkiego rodzaju wkładu. Niezależnie od tego, czy jesteś programistą, tłumaczem, czy po prostu pasjonatem fitnessu, każda forma wsparcia jest mile widziana!",
     "aboutBugsListTitle": "Zgłoś problem lub zaproponuj funkcję",
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
index 297dbe802..67a3ef63d 100644
--- a/lib/l10n/app_pt.arb
+++ b/lib/l10n/app_pt.arb
@@ -92,10 +92,6 @@
         "description": "Comment, additional information"
     },
     "newDay": "Novo dia",
-    "newSet": "Novo set",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "selectExercises": "Se você quiser fazer um conjunto, você pode procurar vários exercícios, eles serão agrupados",
     "todaysWorkout": "Seu treino hoje",
     "addSet": "Adicionar set",
@@ -682,40 +678,7 @@
     "@surplus": {
         "description": "Caloric surplus (either planned or unplanned)"
     },
-    "chart30DaysTitle": "{name} Ultimos 30 dias",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "{chartName} Durante o plano nutricional {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "loggedToday": "Registrado hoje",
-    "chartAllTimeTitle": "{name} de todo o tempo",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
     "overallChangeWeight": "Mudança geral",
     "@overallChangeWeight": {
         "description": "Overall change in weight, added for localization"
@@ -847,7 +810,6 @@
     },
     "enterTextInLanguage": "Por favor, introduz o texto la linguagem correta!",
     "checkInformationBeforeSubmitting": "Por favor, verifica que a informação introduzida está correta antes de submeter o exercício",
-    "identicalExercisePleaseDiscard": "Se encontrares um exercício igual ao que estás a introduzir, por favor descarta o teu rascunho e edita antes esse exercício.",
     "overview": "Panorama",
     "dashboardWidgets": "Widgets do Painel de Controle",
     "dayTypeCustom": "Personalizado",
@@ -971,21 +933,10 @@
             }
         }
     },
-    "imageFormatNotSupportedDetail": "{imageFormat} Imagens ainda não são suportadas.",
-    "@imageFormatNotSupportedDetail": {
-        "description": "Label shown on the image preview container when image format is not supported",
-        "type": "text",
-        "placeholders": {
-            "imageFormat": {
-                "type": "String"
-            }
-        }
-    },
     "add": "Adicionar texto ao botão",
     "@add": {
         "description": "Add button text"
     },
-    "superset": "Super Série",
     "endWorkout": "Fim do treino",
     "@endWorkout": {
         "description": "Use the imperative, label on button to finish the current workout in gym mode"
diff --git a/lib/l10n/app_pt_BR.arb b/lib/l10n/app_pt_BR.arb
index 83252975c..d6ebd9ce6 100644
--- a/lib/l10n/app_pt_BR.arb
+++ b/lib/l10n/app_pt_BR.arb
@@ -115,10 +115,6 @@
         "description": "A set in a workout plan"
     },
     "noMeasurementEntries": "Você não tem entradas de medição",
-    "newSet": "Nova séries",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "impression": "Impressão",
     "@impression": {
         "description": "General impression (e.g. for a workout session) such as good, bad, etc."
@@ -775,39 +771,6 @@
     "@lb": {
         "description": "Generated entry for translation for server strings"
     },
-    "chartAllTimeTitle": "{name} total",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chart30DaysTitle": "{name} últimos 30 dias",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "{chartName} durante plano nutricional {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "settingsIngredientCacheDescription": "Cache de Ingredientes",
     "cacheWarning": "Devido ao cache pode demorar algum tempo até que mudanças estejam visíveis na aplicação.",
     "swiss_ball": "Bola Suíça",
@@ -989,7 +952,6 @@
             }
         }
     },
-    "identicalExercisePleaseDiscard": "Se você notar um exercício idêntico ao que você está adicionando, descarte o rascunho e edite o exercício.",
     "checkInformationBeforeSubmitting": "Verifique se as informações inseridas estão corretas antes de enviar o exercício",
     "imageDetailsTitle": "Detalhes da imagem",
     "@imageDetailsTitle": {
@@ -1040,21 +1002,10 @@
             }
         }
     },
-    "imageFormatNotSupportedDetail": "Imagens {imageFormat} ainda não são suportadas.",
-    "@imageFormatNotSupportedDetail": {
-        "description": "Label shown on the image preview container when image format is not supported",
-        "type": "text",
-        "placeholders": {
-            "imageFormat": {
-                "type": "String"
-            }
-        }
-    },
     "add": "adicionar",
     "@add": {
         "description": "Add button text"
     },
-    "superset": "Supersérie",
     "enterTextInLanguage": "Por favor, insira o texto no idioma correto!",
     "endWorkout": "Terminar treino",
     "@endWorkout": {
diff --git a/lib/l10n/app_pt_PT.arb b/lib/l10n/app_pt_PT.arb
index ec60e40c5..8e12f48ae 100644
--- a/lib/l10n/app_pt_PT.arb
+++ b/lib/l10n/app_pt_PT.arb
@@ -295,39 +295,6 @@
     },
     "min": "Mín",
     "max": "Máx",
-    "chartAllTimeTitle": "{name} total",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chart30DaysTitle": "{name} últimos 30 dias",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "{chartName} durante o plano nutricional {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "measurement": "Medição",
     "measurementCategoriesHelpText": "Categoria de medição, como 'bíceps' ou 'gordura corporal'",
     "measurementEntriesHelpText": "Unidade usada para medir, como 'cm' ou '%'",
@@ -418,10 +385,6 @@
     "noIngredientsDefined": "Ainda não há ingredientes definidos",
     "routineDays": "Dias na rotina",
     "newDay": "Novo dia",
-    "newSet": "Nova série",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "kcalValue": "{value} kcal",
     "@kcalValue": {
         "description": "A value in kcal, e.g. 500 kcal",
diff --git a/lib/l10n/app_ro.arb b/lib/l10n/app_ro.arb
index 03dc77aba..a884c2c32 100644
--- a/lib/l10n/app_ro.arb
+++ b/lib/l10n/app_ro.arb
@@ -254,10 +254,6 @@
     },
     "anErrorOccurred": "A apărut o eroare!",
     "timeStartAhead": "Ora de începere nu poate fi după ora de finalizare",
-    "newSet": "Serie nouă",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "measurement": "Măsurătoare",
     "measurementCategoriesHelpText": "Categoria de măsurătoare, cum ar fi 'biceps' sau 'grăsime corporală'",
     "date": "Dată",
@@ -418,39 +414,6 @@
     "copyToClipboard": "Copiază în clipboard",
     "min": "Min",
     "max": "Max",
-    "chartAllTimeTitle": "{name} dintotdeauna",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chart30DaysTitle": "{name} ultimele 30 de zile",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "{chartName} pe durata planului nutrițional {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "endDate": "Data de sfârșit",
     "@endDate": {
         "description": "The End date of a nutritional plan or routine"
@@ -751,7 +714,6 @@
     "@close": {
         "description": "Translation for close"
     },
-    "identicalExercisePleaseDiscard": "Dacă observi un exercițiu identic cu cel pe care îl adaugi, te rugăm să renunți la ciornă și să editezi acel exercițiu în schimb.",
     "checkInformationBeforeSubmitting": "Te rugăm să verifici corectitudinea informațiilor introduse înainte de a trimite exercițiul",
     "add_exercise_image_license": "Imaginile trebuie să fie compatibile cu licența CC BY SA. Dacă ai dubii, încarcă doar fotografii făcute de tine.",
     "imageDetailsTitle": "Detalii imagine",
@@ -803,16 +765,6 @@
             }
         }
     },
-    "imageFormatNotSupportedDetail": "Imaginile de tip {imageFormat} nu sunt încă acceptate.",
-    "@imageFormatNotSupportedDetail": {
-        "description": "Label shown on the image preview container when image format is not supported",
-        "type": "text",
-        "placeholders": {
-            "imageFormat": {
-                "type": "String"
-            }
-        }
-    },
     "add": "adaugă",
     "@add": {
         "description": "Add button text"
@@ -852,7 +804,6 @@
     "fitInWeek": "Program săptămânal fix",
     "fitInWeekHelp": "Dacă este activată, zilele se vor repeta într-un ciclu săptămânal, altfel zilele vor urma secvențial, fără a ține cont de începutul unei noi săptămâni.",
     "addSuperset": "Adaugă superset",
-    "superset": "Superset",
     "setHasProgression": "Seria are progresie",
     "setHasProgressionWarning": "Te rugăm să reții că în acest moment nu este posibil să editezi toate setările pentru o serie în aplicația de mobil sau să configurezi progresia automată. Pentru moment, te rugăm să folosești aplicația web.",
     "setHasNoExercises": "Această serie nu are exerciții încă!",
diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb
index 3486bdb3c..77f91901d 100644
--- a/lib/l10n/app_ru.arb
+++ b/lib/l10n/app_ru.arb
@@ -399,10 +399,6 @@
         "description": "Label for the popup with general app options"
     },
     "sameRepetitions": "Если количество повторений и вес не меняются от подхода к подходу, достаточно указать данные один раз. Например, для 4 подходов введите 10 повторений, и это автоматически преобразуется в '4 x 10'.",
-    "newSet": "Новый подход (сет)",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "dataCopied": "Данные копируются в новую запись",
     "@dataCopied": {
         "description": "Snackbar message to show on copying data to a new log entry"
@@ -797,39 +793,6 @@
     "noIngredientsDefined": "Ингредиенты пока не определены",
     "ingredientLogged": "Ингредиент занесен в дневник",
     "selectMealToLog": "Выберите прием пищи для записи в дневник",
-    "chartAllTimeTitle": "{name} за все время",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chart30DaysTitle": "{name} последние 30 дней",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "{chartName} во время плана питания {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "settingsIngredientCacheDescription": "Кэш ингредиентов",
     "isRestDayHelp": "Пожалуйста, имейте в виду, что если вы отметите этот день как день отдыха, все подходы и упражнения будут удалены.",
     "routines": "Тренировки",
diff --git a/lib/l10n/app_sk.arb b/lib/l10n/app_sk.arb
index 87cb90e47..5b5eb0b19 100644
--- a/lib/l10n/app_sk.arb
+++ b/lib/l10n/app_sk.arb
@@ -225,10 +225,6 @@
     "@resultingRoutine": {},
     "newDay": "Nový deň",
     "@newDay": {},
-    "newSet": "Nová séria",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "selectExercises": "Ak chcete urobiť superset, môžete vyhľadať niekoľko cvikov, ktoré budú zoskupené dohromady",
     "@selectExercises": {},
     "gymMode": "Režim posilňovňa",
diff --git a/lib/l10n/app_sl.arb b/lib/l10n/app_sl.arb
index 9929bb071..e76b63cde 100644
--- a/lib/l10n/app_sl.arb
+++ b/lib/l10n/app_sl.arb
@@ -315,10 +315,6 @@
     "routineDays": "Dnevi v rutini",
     "resultingRoutine": "Končna rutina",
     "newDay": "Nov dan",
-    "newSet": "Nov niz",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "personalRecords": "Osebni rekordi",
     "gymMode": "Način telovadbe",
     "@gymMode": {
@@ -481,39 +477,6 @@
     },
     "min": "Min.",
     "max": "Maks.",
-    "chartAllTimeTitle": "{name} – ves čas",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chart30DaysTitle": "{name} – zadnjih 30 dni",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "{chartName} – med prehranskim načrtom {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "measurement": "Meritve",
     "measurements": "Meritve",
     "@measurements": {
diff --git a/lib/l10n/app_ta.arb b/lib/l10n/app_ta.arb
index c20247bb5..57a23990e 100644
--- a/lib/l10n/app_ta.arb
+++ b/lib/l10n/app_ta.arb
@@ -11,10 +11,6 @@
             }
         }
     },
-    "newSet": "புதிய தொகுப்பு",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "gymMode": "சிம் பயன்முறை",
     "@gymMode": {
         "description": "Label when starting the gym mode"
@@ -297,39 +293,6 @@
     "@weight": {
         "description": "The weight of a workout log or body weight entry"
     },
-    "chartAllTimeTitle": "{name} எல்லா நேரத்திலும்",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chart30DaysTitle": "{name} கடைசி 30 நாட்கள்",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "{chartName}ஊட்டச்சத்து திட்டத்தின்போது {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "measurementCategoriesHelpText": "'பைசெப்ச்' அல்லது 'உடல் கொழுப்பு' போன்ற அளவீட்டு வகை",
     "measurementEntriesHelpText": "'செ.மீ' அல்லது '%' போன்ற வகையை அளவிட பயன்படுத்தப்படும் அலகு",
     "date": "திகதி",
diff --git a/lib/l10n/app_tr.arb b/lib/l10n/app_tr.arb
index 1c628bf81..dd7dc9d3d 100644
--- a/lib/l10n/app_tr.arb
+++ b/lib/l10n/app_tr.arb
@@ -207,10 +207,6 @@
   },
   "newDay": "Yeni gün",
   "@newDay": {},
-  "newSet": "Yeni set",
-  "@newSet": {
-    "description": "Header when adding a new set to a workout day"
-  },
   "gymMode": "Spor salonu modu",
   "@gymMode": {
     "description": "Label when starting the gym mode"
@@ -814,39 +810,6 @@
   "@noIngredientsDefined": {},
   "settingsIngredientCacheDescription": "Malzeme önbelleği",
   "@settingsIngredientCacheDescription": {},
-  "chartAllTimeTitle": "tüm zamanlar {name}",
-  "@chartAllTimeTitle": {
-    "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-    "type": "text",
-    "placeholders": {
-      "name": {
-        "type": "String"
-      }
-    }
-  },
-  "chart30DaysTitle": "son 30 gün {name}",
-  "@chart30DaysTitle": {
-    "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-    "type": "text",
-    "placeholders": {
-      "name": {
-        "type": "String"
-      }
-    }
-  },
-  "chartDuringPlanTitle": "{planName} beslenme planı boyunca {chartName}",
-  "@chartDuringPlanTitle": {
-    "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-    "type": "text",
-    "placeholders": {
-      "chartName": {
-        "type": "String"
-      },
-      "planName": {
-        "type": "String"
-      }
-    }
-  },
   "endBeforeStart": "Son değer, başlangıç değerinden önce olamaz",
   "minLengthRoutine": "Program en az {number} hafta sürmelidir",
   "maxLengthRoutine": "Bu program en fazla {number} hafta sürebilir"
diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb
index 32efdf0a1..959b75c91 100644
--- a/lib/l10n/app_uk.arb
+++ b/lib/l10n/app_uk.arb
@@ -194,10 +194,6 @@
     "@notes": {
         "description": "Personal notes, e.g. for a workout session"
     },
-    "newSet": "Новий набір",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "measurementCategoriesHelpText": "Категорія вимірювання, така як \"біцепс\" або \"жир тіла\"",
     "time": "Час",
     "@time": {
@@ -440,16 +436,6 @@
             }
         }
     },
-    "imageFormatNotSupportedDetail": "Зображення {imageFormat} поки що не підтримуються.",
-    "@imageFormatNotSupportedDetail": {
-        "description": "Label shown on the image preview container when image format is not supported",
-        "type": "text",
-        "placeholders": {
-            "imageFormat": {
-                "type": "String"
-            }
-        }
-    },
     "addImage": "Додати зображення",
     "dataCopied": "Дані скопійовано до нового запису",
     "@dataCopied": {
@@ -672,39 +658,6 @@
         }
     },
     "settingsExerciseCacheDescription": "Кеш вправ",
-    "chartAllTimeTitle": "{name} за весь час",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chart30DaysTitle": "{name} останні 30 днів",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "{chartName} під час плану харчування {planName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "kcalValue": "{value} ккал",
     "@kcalValue": {
         "description": "A value in kcal, e.g. 500 kcal",
@@ -863,7 +816,6 @@
         "description": "When a nutrition plan has no pre-defined end date"
     },
     "overview": "Огляд",
-    "identicalExercisePleaseDiscard": "Якщо ви помітили вправу, ідентичну тій, яку ви додаєте, будь ласка, відкиньте свій чернетку та відредагуйте цю вправу.",
     "checkInformationBeforeSubmitting": "Будь ласка, перевірте правильність введеної вами інформації, перш ніж надсилати вправу",
     "enterTextInLanguage": "Будь ласка, введіть текст правильною мовою!",
     "imageDetailsTitle": "Деталі зображення",
@@ -1001,7 +953,6 @@
             }
         }
     },
-    "superset": "Суперсет",
     "dashboardWidgets": "Віджети панелі інструментів",
     "trophies": "Трофеї",
     "topSet": "Верхній набір: {value}",
diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
index a6d47d787..c5beb1414 100644
--- a/lib/l10n/app_zh.arb
+++ b/lib/l10n/app_zh.arb
@@ -358,10 +358,6 @@
     "@musclesSecondary": {
         "description": "secondary muscles trained by an exercise"
     },
-    "newSet": "新增训练日",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "plateCalculatorNotDivisible": "达不到预定重量",
     "@plateCalculatorNotDivisible": {
         "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
@@ -573,29 +569,6 @@
     "goalTypeMeals": "从饮食出发",
     "goalTypeBasic": "基础",
     "goalTypeAdvanced": "进阶",
-    "chartAllTimeTitle": "{name} 历史记录曲线",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "{chartName} 在计划 \"{planName}\" 期间的改变曲线",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "indicatorRaw": "原始值",
     "indicatorAvg": "平均值",
     "textPromptTitle": "准备就绪？",
@@ -658,16 +631,6 @@
     "@none__bodyweight_exercise_": {
         "description": "Generated entry for translation for server strings"
     },
-    "chart30DaysTitle": "{name} 过去三十天",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
     "oneNamePerLine": "每行一个名字",
     "settingsExerciseCacheDescription": "动作缓存",
     "settingsIngredientCacheDescription": "营养成分缓存",
diff --git a/lib/l10n/app_zh_Hant.arb b/lib/l10n/app_zh_Hant.arb
index f0b8b9b8f..f3b61a969 100644
--- a/lib/l10n/app_zh_Hant.arb
+++ b/lib/l10n/app_zh_Hant.arb
@@ -311,10 +311,6 @@
     },
     "weightUnit": "重量單位",
     "newDay": "新的一天",
-    "newSet": "新增一組",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
     "start": "開始",
     "@start": {
         "description": "Label on button to start the gym mode (i.e., an imperative)"
@@ -799,39 +795,6 @@
     "darkMode": "保持深色模式",
     "lightMode": "保持淺色模式",
     "systemMode": "系統設定",
-    "chartAllTimeTitle": "{name} 歷史紀錄",
-    "@chartAllTimeTitle": {
-        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chart30DaysTitle": "{name} 最近 30 天",
-    "@chart30DaysTitle": {
-        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-        "type": "text",
-        "placeholders": {
-            "name": {
-                "type": "String"
-            }
-        }
-    },
-    "chartDuringPlanTitle": "營養計劃 {planName} 期間的 {chartName}",
-    "@chartDuringPlanTitle": {
-        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-        "type": "text",
-        "placeholders": {
-            "chartName": {
-                "type": "String"
-            },
-            "planName": {
-                "type": "String"
-            }
-        }
-    },
     "noIngredientsDefined": "尚未定義食材",
     "ingredientLogged": "食材已紀錄到日記",
     "selectMealToLog": "選擇要紀錄到日記的餐點",
@@ -957,7 +920,6 @@
             }
         }
     },
-    "identicalExercisePleaseDiscard": "如果你發現有訓練動作與你正在新增的動作相同，請捨棄目前的草稿，改為編輯該訓練動作。",
     "checkInformationBeforeSubmitting": "提交訓練動作前，請確認你輸入的資訊正確無誤。",
     "imageDetailsTitle": "圖片資訊",
     "@imageDetailsTitle": {
@@ -974,19 +936,8 @@
             }
         }
     },
-    "imageFormatNotSupportedDetail": "目前尚不支援 {imageFormat} 格式的圖片。",
-    "@imageFormatNotSupportedDetail": {
-        "description": "Label shown on the image preview container when image format is not supported",
-        "type": "text",
-        "placeholders": {
-            "imageFormat": {
-                "type": "String"
-            }
-        }
-    },
     "fitInWeekHelp": "啟用後，訓練日會以每週為週期循環；若未啟用，訓練日會依序進行，不受每週起始日影響。",
     "addSuperset": "新增超級組",
-    "superset": "超級組",
     "setHasNoExercises": "此組尚未加入任何動作！",
     "useBasicMarkdown": "您可以使用基本的 Markdown 語法來格式化文字",
     "simpleModeHelp": "編輯動作時，隱藏部分進階設定",
diff --git a/lib/main.dart b/lib/main.dart
index f3049784c..ccb4c93c3 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -55,7 +55,9 @@ import 'package:wger/features/exercises/screens/exercise_screen.dart';
 import 'package:wger/features/exercises/screens/exercises_screen.dart';
 import 'package:wger/features/gallery/screens/gallery_screen.dart';
 import 'package:wger/features/measurements/screens/measurement_categories_screen.dart';
+import 'package:wger/features/measurements/screens/measurement_category_sort_screen.dart';
 import 'package:wger/features/measurements/screens/measurement_entries_screen.dart';
+import 'package:wger/features/measurements/screens/weight_screen.dart';
 import 'package:wger/features/nutrition/screens/ingredient_detail_screen.dart';
 import 'package:wger/features/nutrition/screens/ingredients_screen.dart';
 import 'package:wger/features/nutrition/screens/log_meal_screen.dart';
@@ -70,7 +72,6 @@ import 'package:wger/features/routines/screens/routine_logs_screen.dart';
 import 'package:wger/features/routines/screens/routine_screen.dart';
 import 'package:wger/features/routines/screens/settings_plates_screen.dart';
 import 'package:wger/features/trophies/screens/trophy_screen.dart';
-import 'package:wger/features/weight/screens/weight_screen.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/theme/dynamic_color.dart';
 import 'package:wger/theme/theme.dart';
@@ -267,6 +268,8 @@ class MainApp extends ConsumerWidget {
                 GymModeScreen.routeName: (ctx) => const GymModeScreen(),
                 HomeTabsScreen.routeName: (ctx) => const HomeTabsScreen(),
                 MeasurementCategoriesScreen.routeName: (ctx) => const MeasurementCategoriesScreen(),
+                MeasurementCategorySortScreen.routeName: (ctx) =>
+                    const MeasurementCategorySortScreen(),
                 MeasurementEntriesScreen.routeName: (ctx) => const MeasurementEntriesScreen(),
                 NutritionalPlansScreen.routeName: (ctx) => const NutritionalPlansScreen(),
                 NutritionalDiaryScreen.routeName: (ctx) => const NutritionalDiaryScreen(),
diff --git a/lib/powersync/connector.dart b/lib/powersync/connector.dart
index 1058f458e..9967fe272 100644
--- a/lib/powersync/connector.dart
+++ b/lib/powersync/connector.dart
@@ -247,7 +247,10 @@ class DjangoConnector extends PowerSyncBackendConnector {
       if (k == 'id') {
         return;
       }
-      final key = k.endsWith('_id') ? k.substring(0, k.length - 3) : k;
+      // Trailing `_id` marks a foreign key, which Django exposes without the
+      // suffix (`category_id` -> `category`). `external_id` is a plain value
+      // column, not an FK, so it keeps its name.
+      final key = (k.endsWith('_id') && k != 'external_id') ? k.substring(0, k.length - 3) : k;
       out[key] = (dateFields.contains(key) && v is String && v.length >= 10)
           ? v.substring(0, 10)
           : v;
diff --git a/lib/powersync/schema.dart b/lib/powersync/schema.dart
index 1b562e5ab..c5e37130c 100644
--- a/lib/powersync/schema.dart
+++ b/lib/powersync/schema.dart
@@ -26,7 +26,6 @@ import 'package:wger/database/powersync/tables/measurements.dart';
 import 'package:wger/database/powersync/tables/nutrition.dart';
 import 'package:wger/database/powersync/tables/routines.dart';
 import 'package:wger/database/powersync/tables/user_profile.dart';
-import 'package:wger/database/powersync/tables/weight.dart';
 
 Schema schema = const Schema(
   [
@@ -56,9 +55,6 @@ Schema schema = const Schema(
     PowersyncMealItemTable,
     PowersyncLogItemTable,
 
-    // Body weight
-    PowersyncWeightEntryTable,
-
     // Measurements
     PowersyncMeasurementCategoryTable,
     PowersyncMeasurementEntryTable,
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index eb9b91c91..58ea715f2 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -7,6 +7,7 @@ import Foundation
 
 import app_links
 import connectivity_plus
+import device_info_plus
 import dynamic_color
 import file_selector_macos
 import flutter_secure_storage_darwin
@@ -18,6 +19,7 @@ import video_player_avfoundation
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin"))
   ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
+  DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
   FlutterSecureStorageDarwinPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageDarwinPlugin"))
diff --git a/pubspec.lock b/pubspec.lock
index c4c41dbbd..8832cb3d6 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -361,6 +361,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.13"
+  device_info_plus:
+    dependency: "direct overridden"
+    description:
+      name: device_info_plus
+      sha256: "0891702f96b2e465fe567b7ec448380e6b1c14f60af552a8536d9f583b6b8442"
+      url: "https://pub.dev"
+    source: hosted
+    version: "13.2.0"
+  device_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: device_info_plus_platform_interface
+      sha256: "04b173a92e2d9161dfead145667037c8d834db725ce2e7b942bfe18fd2f45a46"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.1.0"
   drift:
     dependency: "direct main"
     description:
@@ -727,6 +743,15 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.0"
+  health_bridge:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: "3d52dfef40534bf57d449c9be94eddba31852b34"
+      resolved-ref: "3d52dfef40534bf57d449c9be94eddba31852b34"
+      url: "https://github.com/ytsni/health_bridge.git"
+    source: git
+    version: "2.0.0"
   hooks:
     dependency: transitive
     description:
@@ -1817,6 +1842,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.4.0"
+  win32_registry:
+    dependency: transitive
+    description:
+      name: win32_registry
+      sha256: "73b1d78920a9d6e03f8b4e43e612b87bf3152a0e5c5e5150267762b7c4116904"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.3"
   xdg_directories:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 8ff99106f..3c65fac08 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -21,7 +21,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 #   - the version number is taken from the git tag vX.Y.Z
 #   - the build number is computed by reading the last one from the play store
 #     and increasing by one
-version: 2.0.3+240
+version: 2.1.0+240
 
 environment:
   sdk: '>=3.10.0 <4.0.0'
@@ -52,6 +52,15 @@ dependencies:
   flutter_zxing: ^2.3.0
   font_awesome_flutter: ^11.0.0
   freezed_annotation: ^3.1.0
+  # Temporarily swap `health` with a fork with Swift Package Manager support.
+  # Once that is available on upstream (see e.g. https://github.com/carp-dk/carp-health-flutter/issues/480 )
+  # we can switch back. Note that if this doesn't happen in the near future we
+  # can just re-activate the cocoapods infrastructure.
+  # health: ^13.3.1
+  health_bridge:
+    git:
+      url: https://github.com/ytsni/health_bridge.git
+      ref: 3d52dfef40534bf57d449c9be94eddba31852b34
   http: ^1.6.0
   image_picker: ^1.2.3
   intl: ^0.20.2
@@ -75,6 +84,12 @@ dependencies:
   connectivity_plus: ^7.3.1
   powersync: ^2.3.3
 
+dependency_overrides:
+  # health -> device_info_plus ^12.1.0 pins win32 5.x, which conflicts with
+  # package_info_plus 10.2.0 (win32 ^6). device_info_plus 13.x is a pure win32
+  # bump with no Dart API change, so it satisfies health while keeping win32 6.
+  device_info_plus: ^13.0.0
+
 dev_dependencies:
   flutter_test:
     sdk: flutter
diff --git a/test/core/formatting_test.dart b/test/core/formatting_test.dart
new file mode 100644
index 000000000..288ac9ee5
--- /dev/null
+++ b/test/core/formatting_test.dart
@@ -0,0 +1,163 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/core/formatting/formatting.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+void main() {
+  group('hoursAndMinutes', () {
+    test('splits the minutes into hours and minutes', () {
+      expect(hoursAndMinutes(452, 'en'), '7:32');
+    });
+
+    test('pads the minutes so the values line up', () {
+      expect(hoursAndMinutes(425, 'en'), '7:05');
+    });
+
+    test('keeps a duration below an hour in the same shape', () {
+      expect(hoursAndMinutes(45, 'en'), '0:45');
+    });
+
+    test('rounds to whole minutes', () {
+      expect(hoursAndMinutes(59.6, 'en'), '1:00');
+    });
+
+    test('keeps the sign of a negative change', () {
+      expect(hoursAndMinutes(-95, 'en'), '-1:35');
+    });
+
+    test('takes the digits from the locale', () {
+      expect(hoursAndMinutes(452, 'fa'), '۷:۳۲');
+    });
+  });
+
+  group('durationAxis', () {
+    test('leaves the ticks to the chart for every other unit', () {
+      expect(durationAxis('kg', 60, 100), isNull);
+    });
+
+    test('puts every tick on a whole hour', () {
+      final axis = durationAxis('min', 0, 300)!;
+
+      expect(axis.interval, 60);
+      expect(axis.min, 0);
+      expect(axis.max, 300);
+    });
+
+    test('widens the interval until the ticks are few enough', () {
+      expect(durationAxis('min', 0, 540)!.interval, 120);
+    });
+
+    test('keeps the bounds from cutting the values they were derived from', () {
+      expect(durationAxis('min', 0, 540)!.max, greaterThanOrEqualTo(540));
+    });
+
+    test('starts at the hour below the data instead of at zero', () {
+      expect(durationAxis('min', 385, 460)!.min, 360);
+    });
+  });
+
+  group('measurementUnit', () {
+    test('reads a duration in hours', () {
+      expect(measurementUnit('min'), 'h');
+    });
+
+    test('leaves every other unit alone', () {
+      expect(measurementUnit('kg'), 'kg');
+    });
+  });
+
+  group('relativeDate', () {
+    final today = DateTime(2026, 8, 8, 14, 30);
+
+    /// [relativeDate] for a date [daysAgo] days back, read in [locale].
+    Future<String> phraseFor(WidgetTester tester, int daysAgo, {String locale = 'en'}) async {
+      late String phrase;
+      await tester.pumpWidget(
+        MaterialApp(
+          locale: Locale(locale),
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Builder(
+            builder: (context) {
+              phrase = relativeDate(
+                context,
+                DateTime(today.year, today.month, today.day - daysAgo, 6),
+                now: today,
+              );
+              return const SizedBox();
+            },
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+      return phrase;
+    }
+
+    testWidgets('names the days close by instead of counting them', (tester) async {
+      expect(await phraseFor(tester, 0), 'today');
+      expect(await phraseFor(tester, 1), 'yesterday');
+      expect(await phraseFor(tester, 3), '3 days ago');
+    });
+
+    testWidgets('the unit grows with the distance', (tester) async {
+      expect(await phraseFor(tester, 21), '3 weeks ago');
+      expect(await phraseFor(tester, 60), '2 months ago');
+      expect(await phraseFor(tester, 400), '1 year ago');
+    });
+
+    testWidgets('counts calendar days, so this morning still reads as yesterday', (tester) async {
+      // The entry is 20 hours old but fell on yesterday's calendar day
+      late String phrase;
+      await tester.pumpWidget(
+        MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Builder(
+            builder: (context) {
+              phrase = relativeDate(
+                context,
+                DateTime(2026, 8, 7, 18),
+                now: DateTime(2026, 8, 8, 9),
+              );
+              return const SizedBox();
+            },
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(phrase, 'yesterday');
+    });
+
+    testWidgets('a date ahead of now reads as today rather than counting down', (tester) async {
+      // Only reachable through clock skew between devices, and the plural
+      // messages have no phrases for it: "-1 days ago" is what it used to say
+      expect(await phraseFor(tester, -1), 'today');
+      expect(await phraseFor(tester, -10), 'today');
+      expect(await phraseFor(tester, -400), 'today');
+    });
+
+    testWidgets('speaks the locale it is read in', (tester) async {
+      expect(await phraseFor(tester, 0, locale: 'de'), 'heute');
+      expect(await phraseFor(tester, 21, locale: 'de'), 'vor 3 Wochen');
+    });
+  });
+}
diff --git a/test/core/validators_test.mocks.dart b/test/core/validators_test.mocks.dart
index 2df3fa82d..8afb9e7ca 100644
--- a/test/core/validators_test.mocks.dart
+++ b/test/core/validators_test.mocks.dart
@@ -503,6 +503,39 @@ class MockAppLocalizations extends _i1.Mock implements _i2.AppLocalizations {
           )
           as String);
 
+  @override
+  String get allowSelfSignedCertsTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#allowSelfSignedCertsTitle),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#allowSelfSignedCertsTitle),
+            ),
+          )
+          as String);
+
+  @override
+  String get allowSelfSignedCertsDetail =>
+      (super.noSuchMethod(
+            Invocation.getter(#allowSelfSignedCertsDetail),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#allowSelfSignedCertsDetail),
+            ),
+          )
+          as String);
+
+  @override
+  String get certsNotVerifiedTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#certsNotVerifiedTitle),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#certsNotVerifiedTitle),
+            ),
+          )
+          as String);
+
   @override
   String get authOptionPasswordTitle =>
       (super.noSuchMethod(
@@ -613,6 +646,17 @@ class MockAppLocalizations extends _i1.Mock implements _i2.AppLocalizations {
           )
           as String);
 
+  @override
+  String get labelBottomNavBody =>
+      (super.noSuchMethod(
+            Invocation.getter(#labelBottomNavBody),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#labelBottomNavBody),
+            ),
+          )
+          as String);
+
   @override
   String get labelWorkoutLogs =>
       (super.noSuchMethod(
@@ -1316,17 +1360,6 @@ class MockAppLocalizations extends _i1.Mock implements _i2.AppLocalizations {
           )
           as String);
 
-  @override
-  String get newSet =>
-      (super.noSuchMethod(
-            Invocation.getter(#newSet),
-            returnValue: _i3.dummyValue<String>(
-              this,
-              Invocation.getter(#newSet),
-            ),
-          )
-          as String);
-
   @override
   String get personalRecords =>
       (super.noSuchMethod(
@@ -1662,6 +1695,14 @@ class MockAppLocalizations extends _i1.Mock implements _i2.AppLocalizations {
           )
           as String);
 
+  @override
+  String get meal =>
+      (super.noSuchMethod(
+            Invocation.getter(#meal),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#meal)),
+          )
+          as String);
+
   @override
   String get mealLogged =>
       (super.noSuchMethod(
@@ -2042,2683 +2083,3497 @@ class MockAppLocalizations extends _i1.Mock implements _i2.AppLocalizations {
           as String);
 
   @override
-  String get measurement =>
+  String get chartRangeAll =>
       (super.noSuchMethod(
-            Invocation.getter(#measurement),
+            Invocation.getter(#chartRangeAll),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#measurement),
+              Invocation.getter(#chartRangeAll),
             ),
           )
           as String);
 
   @override
-  String get measurements =>
+  String get chartType =>
       (super.noSuchMethod(
-            Invocation.getter(#measurements),
+            Invocation.getter(#chartType),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#measurements),
+              Invocation.getter(#chartType),
             ),
           )
           as String);
 
   @override
-  String get measurementCategoriesHelpText =>
+  String get chartTypeAuto =>
       (super.noSuchMethod(
-            Invocation.getter(#measurementCategoriesHelpText),
+            Invocation.getter(#chartTypeAuto),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#measurementCategoriesHelpText),
+              Invocation.getter(#chartTypeAuto),
             ),
           )
           as String);
 
   @override
-  String get measurementEntriesHelpText =>
+  String get chartTypeLine =>
       (super.noSuchMethod(
-            Invocation.getter(#measurementEntriesHelpText),
+            Invocation.getter(#chartTypeLine),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#measurementEntriesHelpText),
+              Invocation.getter(#chartTypeLine),
             ),
           )
           as String);
 
   @override
-  String get date =>
-      (super.noSuchMethod(
-            Invocation.getter(#date),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#date)),
-          )
-          as String);
-
-  @override
-  String get endDate =>
+  String get chartTypeBar =>
       (super.noSuchMethod(
-            Invocation.getter(#endDate),
+            Invocation.getter(#chartTypeBar),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#endDate),
+              Invocation.getter(#chartTypeBar),
             ),
           )
           as String);
 
   @override
-  String get endBeforeStart =>
+  String get chartTypeHeatmap =>
       (super.noSuchMethod(
-            Invocation.getter(#endBeforeStart),
+            Invocation.getter(#chartTypeHeatmap),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#endBeforeStart),
+              Invocation.getter(#chartTypeHeatmap),
             ),
           )
           as String);
 
   @override
-  String get openEnded =>
+  String get chartTypeDelta =>
       (super.noSuchMethod(
-            Invocation.getter(#openEnded),
+            Invocation.getter(#chartTypeDelta),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#openEnded),
+              Invocation.getter(#chartTypeDelta),
             ),
           )
           as String);
 
   @override
-  String get value =>
+  String get chartTrend =>
       (super.noSuchMethod(
-            Invocation.getter(#value),
+            Invocation.getter(#chartTrend),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#value),
+              Invocation.getter(#chartTrend),
             ),
           )
           as String);
 
   @override
-  String get start =>
+  String get trendReactive =>
       (super.noSuchMethod(
-            Invocation.getter(#start),
+            Invocation.getter(#trendReactive),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#start),
+              Invocation.getter(#trendReactive),
             ),
           )
           as String);
 
   @override
-  String get time =>
+  String get trendBalanced =>
       (super.noSuchMethod(
-            Invocation.getter(#time),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#time)),
+            Invocation.getter(#trendBalanced),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#trendBalanced),
+            ),
           )
           as String);
 
   @override
-  String get timeStart =>
+  String get trendSluggish =>
       (super.noSuchMethod(
-            Invocation.getter(#timeStart),
+            Invocation.getter(#trendSluggish),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#timeStart),
+              Invocation.getter(#trendSluggish),
             ),
           )
           as String);
 
   @override
-  String get timeEnd =>
+  String get chartAverageWindow =>
       (super.noSuchMethod(
-            Invocation.getter(#timeEnd),
+            Invocation.getter(#chartAverageWindow),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#timeEnd),
+              Invocation.getter(#chartAverageWindow),
             ),
           )
           as String);
 
   @override
-  String get timeStartAhead =>
+  String get chartTypeDistribution =>
       (super.noSuchMethod(
-            Invocation.getter(#timeStartAhead),
+            Invocation.getter(#chartTypeDistribution),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#timeStartAhead),
+              Invocation.getter(#chartTypeDistribution),
             ),
           )
           as String);
 
   @override
-  String get ingredient =>
+  String get distributionMedian =>
       (super.noSuchMethod(
-            Invocation.getter(#ingredient),
+            Invocation.getter(#distributionMedian),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#ingredient),
+              Invocation.getter(#distributionMedian),
             ),
           )
           as String);
 
   @override
-  String get energy =>
+  String get distributionLatest =>
       (super.noSuchMethod(
-            Invocation.getter(#energy),
+            Invocation.getter(#distributionLatest),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#energy),
+              Invocation.getter(#distributionLatest),
             ),
           )
           as String);
 
   @override
-  String get energyShort =>
+  String get sparkTrendStable =>
       (super.noSuchMethod(
-            Invocation.getter(#energyShort),
+            Invocation.getter(#sparkTrendStable),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#energyShort),
+              Invocation.getter(#sparkTrendStable),
             ),
           )
           as String);
 
   @override
-  String get dietaryInformation =>
+  String get trackNewMetric =>
       (super.noSuchMethod(
-            Invocation.getter(#dietaryInformation),
+            Invocation.getter(#trackNewMetric),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#dietaryInformation),
+              Invocation.getter(#trackNewMetric),
             ),
           )
           as String);
 
   @override
-  String get macronutrients =>
+  String get measurement =>
       (super.noSuchMethod(
-            Invocation.getter(#macronutrients),
+            Invocation.getter(#measurement),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#macronutrients),
+              Invocation.getter(#measurement),
             ),
           )
           as String);
 
   @override
-  String get planned =>
+  String get measurements =>
       (super.noSuchMethod(
-            Invocation.getter(#planned),
+            Invocation.getter(#measurements),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#planned),
+              Invocation.getter(#measurements),
             ),
           )
           as String);
 
   @override
-  String get logged =>
+  String get measurementCategoriesHelpText =>
       (super.noSuchMethod(
-            Invocation.getter(#logged),
+            Invocation.getter(#measurementCategoriesHelpText),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#logged),
+              Invocation.getter(#measurementCategoriesHelpText),
             ),
           )
           as String);
 
   @override
-  String get today =>
+  String get whatToTrack =>
       (super.noSuchMethod(
-            Invocation.getter(#today),
+            Invocation.getter(#whatToTrack),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#today),
+              Invocation.getter(#whatToTrack),
             ),
           )
           as String);
 
   @override
-  String get loggedToday =>
+  String get customMeasurement =>
       (super.noSuchMethod(
-            Invocation.getter(#loggedToday),
+            Invocation.getter(#customMeasurement),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#loggedToday),
+              Invocation.getter(#customMeasurement),
             ),
           )
           as String);
 
   @override
-  String get weekAverage =>
+  String get metricAlreadyTracked =>
       (super.noSuchMethod(
-            Invocation.getter(#weekAverage),
+            Invocation.getter(#metricAlreadyTracked),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#weekAverage),
+              Invocation.getter(#metricAlreadyTracked),
             ),
           )
           as String);
 
   @override
-  String get surplus =>
+  String get metricType =>
       (super.noSuchMethod(
-            Invocation.getter(#surplus),
+            Invocation.getter(#metricType),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#surplus),
+              Invocation.getter(#metricType),
             ),
           )
           as String);
 
   @override
-  String get deficit =>
+  String get reorderCategories =>
       (super.noSuchMethod(
-            Invocation.getter(#deficit),
+            Invocation.getter(#reorderCategories),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#deficit),
+              Invocation.getter(#reorderCategories),
             ),
           )
           as String);
 
   @override
-  String get difference =>
+  String get metricCustom =>
       (super.noSuchMethod(
-            Invocation.getter(#difference),
+            Invocation.getter(#metricCustom),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#difference),
+              Invocation.getter(#metricCustom),
             ),
           )
           as String);
 
   @override
-  String get percentEnergy =>
+  String get metricBodyWeight =>
       (super.noSuchMethod(
-            Invocation.getter(#percentEnergy),
+            Invocation.getter(#metricBodyWeight),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#percentEnergy),
+              Invocation.getter(#metricBodyWeight),
             ),
           )
           as String);
 
   @override
-  String get gPerBodyKg =>
+  String get metricLeanBodyMass =>
       (super.noSuchMethod(
-            Invocation.getter(#gPerBodyKg),
+            Invocation.getter(#metricLeanBodyMass),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#gPerBodyKg),
+              Invocation.getter(#metricLeanBodyMass),
             ),
           )
           as String);
 
   @override
-  String get total =>
+  String get metricBodyFat =>
       (super.noSuchMethod(
-            Invocation.getter(#total),
+            Invocation.getter(#metricBodyFat),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#total),
+              Invocation.getter(#metricBodyFat),
             ),
           )
           as String);
 
   @override
-  String get kcal =>
+  String get metricHeight =>
       (super.noSuchMethod(
-            Invocation.getter(#kcal),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#kcal)),
+            Invocation.getter(#metricHeight),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#metricHeight),
+            ),
           )
           as String);
 
   @override
-  String get kJ =>
+  String get metricBloodPressure =>
       (super.noSuchMethod(
-            Invocation.getter(#kJ),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#kJ)),
+            Invocation.getter(#metricBloodPressure),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#metricBloodPressure),
+            ),
           )
           as String);
 
   @override
-  String get g =>
+  String get metricBloodPressureSystolic =>
       (super.noSuchMethod(
-            Invocation.getter(#g),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#g)),
+            Invocation.getter(#metricBloodPressureSystolic),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#metricBloodPressureSystolic),
+            ),
           )
           as String);
 
   @override
-  String get protein =>
+  String get metricBloodPressureDiastolic =>
       (super.noSuchMethod(
-            Invocation.getter(#protein),
+            Invocation.getter(#metricBloodPressureDiastolic),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#protein),
+              Invocation.getter(#metricBloodPressureDiastolic),
             ),
           )
           as String);
 
   @override
-  String get proteinShort =>
+  String get metricHeartRate =>
       (super.noSuchMethod(
-            Invocation.getter(#proteinShort),
+            Invocation.getter(#metricHeartRate),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#proteinShort),
+              Invocation.getter(#metricHeartRate),
             ),
           )
           as String);
 
   @override
-  String get carbohydrates =>
+  String get metricRestingHeartRate =>
       (super.noSuchMethod(
-            Invocation.getter(#carbohydrates),
+            Invocation.getter(#metricRestingHeartRate),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#carbohydrates),
+              Invocation.getter(#metricRestingHeartRate),
             ),
           )
           as String);
 
   @override
-  String get carbohydratesShort =>
+  String get metricBloodOxygen =>
       (super.noSuchMethod(
-            Invocation.getter(#carbohydratesShort),
+            Invocation.getter(#metricBloodOxygen),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#carbohydratesShort),
+              Invocation.getter(#metricBloodOxygen),
             ),
           )
           as String);
 
   @override
-  String get sugars =>
+  String get metricSteps =>
       (super.noSuchMethod(
-            Invocation.getter(#sugars),
+            Invocation.getter(#metricSteps),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#sugars),
+              Invocation.getter(#metricSteps),
             ),
           )
           as String);
 
   @override
-  String get fat =>
+  String get metricDistance =>
       (super.noSuchMethod(
-            Invocation.getter(#fat),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#fat)),
+            Invocation.getter(#metricDistance),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#metricDistance),
+            ),
           )
           as String);
 
   @override
-  String get fatShort =>
+  String get metricEnergy =>
       (super.noSuchMethod(
-            Invocation.getter(#fatShort),
+            Invocation.getter(#metricEnergy),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#fatShort),
+              Invocation.getter(#metricEnergy),
             ),
           )
           as String);
 
   @override
-  String get saturatedFat =>
+  String get metricSleep =>
       (super.noSuchMethod(
-            Invocation.getter(#saturatedFat),
+            Invocation.getter(#metricSleep),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#saturatedFat),
+              Invocation.getter(#metricSleep),
             ),
           )
           as String);
 
   @override
-  String get fiber =>
+  String get noDataAvailable =>
       (super.noSuchMethod(
-            Invocation.getter(#fiber),
+            Invocation.getter(#noDataAvailable),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#fiber),
+              Invocation.getter(#noDataAvailable),
             ),
           )
           as String);
 
   @override
-  String get sodium =>
+  String get metricSleepTotal =>
       (super.noSuchMethod(
-            Invocation.getter(#sodium),
+            Invocation.getter(#metricSleepTotal),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#sodium),
+              Invocation.getter(#metricSleepTotal),
             ),
           )
           as String);
 
   @override
-  String get carbohydratesSugar =>
+  String get metricSleepLight =>
       (super.noSuchMethod(
-            Invocation.getter(#carbohydratesSugar),
+            Invocation.getter(#metricSleepLight),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#carbohydratesSugar),
+              Invocation.getter(#metricSleepLight),
             ),
           )
           as String);
 
   @override
-  String get amount =>
+  String get metricSleepDeep =>
       (super.noSuchMethod(
-            Invocation.getter(#amount),
+            Invocation.getter(#metricSleepDeep),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#amount),
+              Invocation.getter(#metricSleepDeep),
             ),
           )
           as String);
 
   @override
-  String get unit =>
+  String get metricSleepRem =>
       (super.noSuchMethod(
-            Invocation.getter(#unit),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#unit)),
+            Invocation.getter(#metricSleepRem),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#metricSleepRem),
+            ),
           )
           as String);
 
   @override
-  String get newEntry =>
+  String get metricSleepAwake =>
       (super.noSuchMethod(
-            Invocation.getter(#newEntry),
+            Invocation.getter(#metricSleepAwake),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#newEntry),
+              Invocation.getter(#metricSleepAwake),
             ),
           )
           as String);
 
   @override
-  String get noTrophies =>
+  String get measurementEntriesHelpText =>
       (super.noSuchMethod(
-            Invocation.getter(#noTrophies),
+            Invocation.getter(#measurementEntriesHelpText),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#noTrophies),
+              Invocation.getter(#measurementEntriesHelpText),
             ),
           )
           as String);
 
   @override
-  String get noWeightEntries =>
+  String get partOfGroup =>
       (super.noSuchMethod(
-            Invocation.getter(#noWeightEntries),
+            Invocation.getter(#partOfGroup),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#noWeightEntries),
+              Invocation.getter(#partOfGroup),
             ),
           )
           as String);
 
   @override
-  String get moreMeasurementEntries =>
+  String get noGroup =>
       (super.noSuchMethod(
-            Invocation.getter(#moreMeasurementEntries),
+            Invocation.getter(#noGroup),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#moreMeasurementEntries),
+              Invocation.getter(#noGroup),
             ),
           )
           as String);
 
   @override
-  String get edit =>
+  String get date =>
       (super.noSuchMethod(
-            Invocation.getter(#edit),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#edit)),
+            Invocation.getter(#date),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#date)),
           )
           as String);
 
   @override
-  String get preview =>
+  String get endDate =>
       (super.noSuchMethod(
-            Invocation.getter(#preview),
+            Invocation.getter(#endDate),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#preview),
+              Invocation.getter(#endDate),
             ),
           )
           as String);
 
   @override
-  String get delete =>
+  String get endBeforeStart =>
       (super.noSuchMethod(
-            Invocation.getter(#delete),
+            Invocation.getter(#endBeforeStart),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#delete),
+              Invocation.getter(#endBeforeStart),
             ),
           )
           as String);
 
   @override
-  String get newNutritionalPlan =>
+  String get openEnded =>
       (super.noSuchMethod(
-            Invocation.getter(#newNutritionalPlan),
+            Invocation.getter(#openEnded),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#newNutritionalPlan),
+              Invocation.getter(#openEnded),
             ),
           )
           as String);
 
   @override
-  String get overview =>
+  String get value =>
       (super.noSuchMethod(
-            Invocation.getter(#overview),
+            Invocation.getter(#value),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#overview),
+              Invocation.getter(#value),
             ),
           )
           as String);
 
   @override
-  String get toggleDetails =>
+  String get start =>
       (super.noSuchMethod(
-            Invocation.getter(#toggleDetails),
+            Invocation.getter(#start),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#toggleDetails),
+              Invocation.getter(#start),
             ),
           )
           as String);
 
   @override
-  String get goToDetailPage =>
+  String get time =>
       (super.noSuchMethod(
-            Invocation.getter(#goToDetailPage),
-            returnValue: _i3.dummyValue<String>(
-              this,
-              Invocation.getter(#goToDetailPage),
-            ),
+            Invocation.getter(#time),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#time)),
           )
           as String);
 
   @override
-  String get aboutWhySupportTitle =>
+  String get timeStart =>
       (super.noSuchMethod(
-            Invocation.getter(#aboutWhySupportTitle),
+            Invocation.getter(#timeStart),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#aboutWhySupportTitle),
+              Invocation.getter(#timeStart),
             ),
           )
           as String);
 
   @override
-  String get aboutDescription =>
+  String get timeEnd =>
       (super.noSuchMethod(
-            Invocation.getter(#aboutDescription),
+            Invocation.getter(#timeEnd),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#aboutDescription),
+              Invocation.getter(#timeEnd),
             ),
           )
           as String);
 
   @override
-  String get aboutDonateTitle =>
+  String get timeStartAhead =>
       (super.noSuchMethod(
-            Invocation.getter(#aboutDonateTitle),
+            Invocation.getter(#timeStartAhead),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#aboutDonateTitle),
+              Invocation.getter(#timeStartAhead),
             ),
           )
           as String);
 
   @override
-  String get aboutDonateText =>
+  String get ingredient =>
       (super.noSuchMethod(
-            Invocation.getter(#aboutDonateText),
+            Invocation.getter(#ingredient),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#aboutDonateText),
+              Invocation.getter(#ingredient),
             ),
           )
           as String);
 
   @override
-  String get aboutContributeTitle =>
+  String get energy =>
       (super.noSuchMethod(
-            Invocation.getter(#aboutContributeTitle),
+            Invocation.getter(#energy),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#aboutContributeTitle),
+              Invocation.getter(#energy),
             ),
           )
           as String);
 
   @override
-  String get aboutContributeText =>
+  String get energyShort =>
       (super.noSuchMethod(
-            Invocation.getter(#aboutContributeText),
+            Invocation.getter(#energyShort),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#aboutContributeText),
+              Invocation.getter(#energyShort),
             ),
           )
           as String);
 
   @override
-  String get aboutBugsListTitle =>
+  String get dietaryInformation =>
       (super.noSuchMethod(
-            Invocation.getter(#aboutBugsListTitle),
+            Invocation.getter(#dietaryInformation),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#aboutBugsListTitle),
+              Invocation.getter(#dietaryInformation),
             ),
           )
           as String);
 
   @override
-  String get aboutTranslationListTitle =>
+  String get macronutrients =>
       (super.noSuchMethod(
-            Invocation.getter(#aboutTranslationListTitle),
+            Invocation.getter(#macronutrients),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#aboutTranslationListTitle),
+              Invocation.getter(#macronutrients),
             ),
           )
           as String);
 
   @override
-  String get aboutSourceListTitle =>
+  String get planned =>
       (super.noSuchMethod(
-            Invocation.getter(#aboutSourceListTitle),
+            Invocation.getter(#planned),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#aboutSourceListTitle),
+              Invocation.getter(#planned),
             ),
           )
           as String);
 
   @override
-  String get aboutJoinCommunityTitle =>
+  String get logged =>
       (super.noSuchMethod(
-            Invocation.getter(#aboutJoinCommunityTitle),
+            Invocation.getter(#logged),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#aboutJoinCommunityTitle),
+              Invocation.getter(#logged),
             ),
           )
           as String);
 
   @override
-  String get aboutMastodonTitle =>
+  String get today =>
       (super.noSuchMethod(
-            Invocation.getter(#aboutMastodonTitle),
+            Invocation.getter(#today),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#aboutMastodonTitle),
+              Invocation.getter(#today),
             ),
           )
           as String);
 
   @override
-  String get aboutDiscordTitle =>
+  String get loggedToday =>
       (super.noSuchMethod(
-            Invocation.getter(#aboutDiscordTitle),
+            Invocation.getter(#loggedToday),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#aboutDiscordTitle),
+              Invocation.getter(#loggedToday),
             ),
           )
           as String);
 
   @override
-  String get aboutViewDocsTitle =>
+  String get weekAverage =>
       (super.noSuchMethod(
-            Invocation.getter(#aboutViewDocsTitle),
+            Invocation.getter(#weekAverage),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#aboutViewDocsTitle),
+              Invocation.getter(#weekAverage),
             ),
           )
           as String);
 
   @override
-  String get aboutViewLicensesTitle =>
+  String get surplus =>
       (super.noSuchMethod(
-            Invocation.getter(#aboutViewLicensesTitle),
+            Invocation.getter(#surplus),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#aboutViewLicensesTitle),
+              Invocation.getter(#surplus),
             ),
           )
           as String);
 
   @override
-  String get others =>
+  String get deficit =>
       (super.noSuchMethod(
-            Invocation.getter(#others),
+            Invocation.getter(#deficit),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#others),
+              Invocation.getter(#deficit),
             ),
           )
           as String);
 
   @override
-  String get calendar =>
+  String get difference =>
       (super.noSuchMethod(
-            Invocation.getter(#calendar),
+            Invocation.getter(#difference),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#calendar),
+              Invocation.getter(#difference),
             ),
           )
           as String);
 
   @override
-  String get enterValue =>
+  String get percentEnergy =>
       (super.noSuchMethod(
-            Invocation.getter(#enterValue),
+            Invocation.getter(#percentEnergy),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#enterValue),
+              Invocation.getter(#percentEnergy),
             ),
           )
           as String);
 
   @override
-  String get selectEntry =>
+  String get gPerBodyKg =>
       (super.noSuchMethod(
-            Invocation.getter(#selectEntry),
+            Invocation.getter(#gPerBodyKg),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#selectEntry),
+              Invocation.getter(#gPerBodyKg),
             ),
           )
           as String);
 
   @override
-  String get selectExercise =>
+  String get total =>
       (super.noSuchMethod(
-            Invocation.getter(#selectExercise),
+            Invocation.getter(#total),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#selectExercise),
+              Invocation.getter(#total),
             ),
           )
           as String);
 
   @override
-  String get baseNameEnglish =>
+  String get kcal =>
       (super.noSuchMethod(
-            Invocation.getter(#baseNameEnglish),
-            returnValue: _i3.dummyValue<String>(
-              this,
-              Invocation.getter(#baseNameEnglish),
-            ),
+            Invocation.getter(#kcal),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#kcal)),
           )
           as String);
 
   @override
-  String get enterValidNumber =>
+  String get kJ =>
       (super.noSuchMethod(
-            Invocation.getter(#enterValidNumber),
-            returnValue: _i3.dummyValue<String>(
-              this,
-              Invocation.getter(#enterValidNumber),
-            ),
+            Invocation.getter(#kJ),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#kJ)),
           )
           as String);
 
   @override
-  String get selectIngredient =>
+  String get g =>
       (super.noSuchMethod(
-            Invocation.getter(#selectIngredient),
-            returnValue: _i3.dummyValue<String>(
-              this,
-              Invocation.getter(#selectIngredient),
-            ),
+            Invocation.getter(#g),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#g)),
           )
           as String);
 
   @override
-  String get recentlyUsedIngredients =>
+  String get protein =>
       (super.noSuchMethod(
-            Invocation.getter(#recentlyUsedIngredients),
+            Invocation.getter(#protein),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#recentlyUsedIngredients),
+              Invocation.getter(#protein),
             ),
           )
           as String);
 
   @override
-  String get selectImage =>
+  String get proteinShort =>
       (super.noSuchMethod(
-            Invocation.getter(#selectImage),
+            Invocation.getter(#proteinShort),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#selectImage),
+              Invocation.getter(#proteinShort),
             ),
           )
           as String);
 
   @override
-  String get optionsLabel =>
+  String get carbohydrates =>
       (super.noSuchMethod(
-            Invocation.getter(#optionsLabel),
+            Invocation.getter(#carbohydrates),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#optionsLabel),
+              Invocation.getter(#carbohydrates),
             ),
           )
           as String);
 
   @override
-  String get takePicture =>
+  String get carbohydratesShort =>
       (super.noSuchMethod(
-            Invocation.getter(#takePicture),
+            Invocation.getter(#carbohydratesShort),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#takePicture),
+              Invocation.getter(#carbohydratesShort),
             ),
           )
           as String);
 
   @override
-  String get chooseFromLibrary =>
+  String get sugars =>
       (super.noSuchMethod(
-            Invocation.getter(#chooseFromLibrary),
+            Invocation.getter(#sugars),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#chooseFromLibrary),
+              Invocation.getter(#sugars),
             ),
           )
           as String);
 
   @override
-  String get gallery =>
+  String get fat =>
       (super.noSuchMethod(
-            Invocation.getter(#gallery),
-            returnValue: _i3.dummyValue<String>(
-              this,
-              Invocation.getter(#gallery),
-            ),
+            Invocation.getter(#fat),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#fat)),
           )
           as String);
 
   @override
-  String get addImage =>
+  String get fatShort =>
       (super.noSuchMethod(
-            Invocation.getter(#addImage),
+            Invocation.getter(#fatShort),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#addImage),
+              Invocation.getter(#fatShort),
             ),
           )
           as String);
 
   @override
-  String get dataCopied =>
+  String get saturatedFat =>
       (super.noSuchMethod(
-            Invocation.getter(#dataCopied),
+            Invocation.getter(#saturatedFat),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#dataCopied),
+              Invocation.getter(#saturatedFat),
             ),
           )
           as String);
 
   @override
-  String get appUpdateTitle =>
+  String get fiber =>
       (super.noSuchMethod(
-            Invocation.getter(#appUpdateTitle),
+            Invocation.getter(#fiber),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#appUpdateTitle),
+              Invocation.getter(#fiber),
             ),
           )
           as String);
 
   @override
-  String get appUpdateContent =>
+  String get sodium =>
       (super.noSuchMethod(
-            Invocation.getter(#appUpdateContent),
+            Invocation.getter(#sodium),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#appUpdateContent),
+              Invocation.getter(#sodium),
             ),
           )
           as String);
 
   @override
-  String get serverUpdateTitle =>
+  String get carbohydratesSugar =>
       (super.noSuchMethod(
-            Invocation.getter(#serverUpdateTitle),
+            Invocation.getter(#carbohydratesSugar),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#serverUpdateTitle),
+              Invocation.getter(#carbohydratesSugar),
             ),
           )
           as String);
 
   @override
-  String get powerSyncUnreachableTitle =>
+  String get amount =>
       (super.noSuchMethod(
-            Invocation.getter(#powerSyncUnreachableTitle),
+            Invocation.getter(#amount),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#powerSyncUnreachableTitle),
+              Invocation.getter(#amount),
             ),
           )
           as String);
 
   @override
-  String get powerSyncUnreachableContent =>
+  String get unit =>
       (super.noSuchMethod(
-            Invocation.getter(#powerSyncUnreachableContent),
-            returnValue: _i3.dummyValue<String>(
-              this,
-              Invocation.getter(#powerSyncUnreachableContent),
-            ),
+            Invocation.getter(#unit),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#unit)),
           )
           as String);
 
   @override
-  String get serverUnreachableRetry =>
+  String get newEntry =>
       (super.noSuchMethod(
-            Invocation.getter(#serverUnreachableRetry),
+            Invocation.getter(#newEntry),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#serverUnreachableRetry),
+              Invocation.getter(#newEntry),
             ),
           )
           as String);
 
   @override
-  String get productFound =>
+  String get noTrophies =>
       (super.noSuchMethod(
-            Invocation.getter(#productFound),
+            Invocation.getter(#noTrophies),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#productFound),
+              Invocation.getter(#noTrophies),
             ),
           )
           as String);
 
   @override
-  String get productNotFound =>
+  String get noWeightEntries =>
       (super.noSuchMethod(
-            Invocation.getter(#productNotFound),
+            Invocation.getter(#noWeightEntries),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#productNotFound),
+              Invocation.getter(#noWeightEntries),
             ),
           )
           as String);
 
   @override
-  String get scanBarcode =>
+  String get moreMeasurementEntries =>
       (super.noSuchMethod(
-            Invocation.getter(#scanBarcode),
+            Invocation.getter(#moreMeasurementEntries),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#scanBarcode),
+              Invocation.getter(#moreMeasurementEntries),
             ),
           )
           as String);
 
   @override
-  String get close =>
+  String get edit =>
       (super.noSuchMethod(
-            Invocation.getter(#close),
-            returnValue: _i3.dummyValue<String>(
-              this,
-              Invocation.getter(#close),
-            ),
+            Invocation.getter(#edit),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#edit)),
           )
           as String);
 
   @override
-  String get identicalExercisePleaseDiscard =>
+  String get preview =>
       (super.noSuchMethod(
-            Invocation.getter(#identicalExercisePleaseDiscard),
+            Invocation.getter(#preview),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#identicalExercisePleaseDiscard),
+              Invocation.getter(#preview),
             ),
           )
           as String);
 
   @override
-  String get checkInformationBeforeSubmitting =>
+  String get delete =>
       (super.noSuchMethod(
-            Invocation.getter(#checkInformationBeforeSubmitting),
+            Invocation.getter(#delete),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#checkInformationBeforeSubmitting),
+              Invocation.getter(#delete),
             ),
           )
           as String);
 
   @override
-  String get add_exercise_image_license =>
+  String get newNutritionalPlan =>
       (super.noSuchMethod(
-            Invocation.getter(#add_exercise_image_license),
+            Invocation.getter(#newNutritionalPlan),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#add_exercise_image_license),
+              Invocation.getter(#newNutritionalPlan),
             ),
           )
           as String);
 
   @override
-  String get imageDetailsTitle =>
+  String get overview =>
       (super.noSuchMethod(
-            Invocation.getter(#imageDetailsTitle),
+            Invocation.getter(#overview),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#imageDetailsTitle),
+              Invocation.getter(#overview),
             ),
           )
           as String);
 
   @override
-  String get imageDetailsLicenseTitle =>
+  String get toggleDetails =>
       (super.noSuchMethod(
-            Invocation.getter(#imageDetailsLicenseTitle),
+            Invocation.getter(#toggleDetails),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#imageDetailsLicenseTitle),
+              Invocation.getter(#toggleDetails),
             ),
           )
           as String);
 
   @override
-  String get imageDetailsLicenseTitleHint =>
+  String get goToDetailPage =>
       (super.noSuchMethod(
-            Invocation.getter(#imageDetailsLicenseTitleHint),
+            Invocation.getter(#goToDetailPage),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#imageDetailsLicenseTitleHint),
+              Invocation.getter(#goToDetailPage),
             ),
           )
           as String);
 
   @override
-  String get imageDetailsSourceLink =>
+  String get aboutWhySupportTitle =>
       (super.noSuchMethod(
-            Invocation.getter(#imageDetailsSourceLink),
+            Invocation.getter(#aboutWhySupportTitle),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#imageDetailsSourceLink),
+              Invocation.getter(#aboutWhySupportTitle),
             ),
           )
           as String);
 
   @override
-  String get author =>
+  String get aboutDescription =>
       (super.noSuchMethod(
-            Invocation.getter(#author),
+            Invocation.getter(#aboutDescription),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#author),
+              Invocation.getter(#aboutDescription),
             ),
           )
           as String);
 
   @override
-  String get authorHint =>
+  String get aboutDonateTitle =>
       (super.noSuchMethod(
-            Invocation.getter(#authorHint),
+            Invocation.getter(#aboutDonateTitle),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#authorHint),
+              Invocation.getter(#aboutDonateTitle),
             ),
           )
           as String);
 
   @override
-  String get imageDetailsAuthorLink =>
+  String get aboutDonateText =>
       (super.noSuchMethod(
-            Invocation.getter(#imageDetailsAuthorLink),
+            Invocation.getter(#aboutDonateText),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#imageDetailsAuthorLink),
+              Invocation.getter(#aboutDonateText),
             ),
           )
           as String);
 
   @override
-  String get imageDetailsDerivativeSource =>
+  String get aboutContributeTitle =>
       (super.noSuchMethod(
-            Invocation.getter(#imageDetailsDerivativeSource),
+            Invocation.getter(#aboutContributeTitle),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#imageDetailsDerivativeSource),
+              Invocation.getter(#aboutContributeTitle),
             ),
           )
           as String);
 
   @override
-  String get imageDetailsDerivativeHelp =>
+  String get aboutContributeText =>
       (super.noSuchMethod(
-            Invocation.getter(#imageDetailsDerivativeHelp),
+            Invocation.getter(#aboutContributeText),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#imageDetailsDerivativeHelp),
+              Invocation.getter(#aboutContributeText),
             ),
           )
           as String);
 
   @override
-  String get imageDetailsImageType =>
+  String get aboutBugsListTitle =>
       (super.noSuchMethod(
-            Invocation.getter(#imageDetailsImageType),
+            Invocation.getter(#aboutBugsListTitle),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#imageDetailsImageType),
+              Invocation.getter(#aboutBugsListTitle),
             ),
           )
           as String);
 
   @override
-  String get imageDetailsLicenseNotice =>
+  String get aboutTranslationListTitle =>
       (super.noSuchMethod(
-            Invocation.getter(#imageDetailsLicenseNotice),
+            Invocation.getter(#aboutTranslationListTitle),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#imageDetailsLicenseNotice),
+              Invocation.getter(#aboutTranslationListTitle),
             ),
           )
           as String);
 
   @override
-  String get imageDetailsLicenseNoticeLinkToLicense =>
+  String get aboutSourceListTitle =>
       (super.noSuchMethod(
-            Invocation.getter(#imageDetailsLicenseNoticeLinkToLicense),
+            Invocation.getter(#aboutSourceListTitle),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#imageDetailsLicenseNoticeLinkToLicense),
+              Invocation.getter(#aboutSourceListTitle),
             ),
           )
           as String);
 
   @override
-  String get add =>
+  String get aboutJoinCommunityTitle =>
       (super.noSuchMethod(
-            Invocation.getter(#add),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#add)),
+            Invocation.getter(#aboutJoinCommunityTitle),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#aboutJoinCommunityTitle),
+            ),
           )
           as String);
 
   @override
-  String get increase =>
+  String get aboutMastodonTitle =>
       (super.noSuchMethod(
-            Invocation.getter(#increase),
+            Invocation.getter(#aboutMastodonTitle),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#increase),
+              Invocation.getter(#aboutMastodonTitle),
             ),
           )
           as String);
 
   @override
-  String get decrease =>
+  String get aboutDiscordTitle =>
       (super.noSuchMethod(
-            Invocation.getter(#decrease),
+            Invocation.getter(#aboutDiscordTitle),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#decrease),
+              Invocation.getter(#aboutDiscordTitle),
             ),
           )
           as String);
 
   @override
-  String get variations =>
+  String get aboutViewDocsTitle =>
       (super.noSuchMethod(
-            Invocation.getter(#variations),
+            Invocation.getter(#aboutViewDocsTitle),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#variations),
+              Invocation.getter(#aboutViewDocsTitle),
             ),
           )
           as String);
 
   @override
-  String get verifiedEmail =>
+  String get aboutViewLicensesTitle =>
       (super.noSuchMethod(
-            Invocation.getter(#verifiedEmail),
+            Invocation.getter(#aboutViewLicensesTitle),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#verifiedEmail),
+              Invocation.getter(#aboutViewLicensesTitle),
             ),
           )
           as String);
 
   @override
-  String get unVerifiedEmail =>
+  String get others =>
       (super.noSuchMethod(
-            Invocation.getter(#unVerifiedEmail),
+            Invocation.getter(#others),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#unVerifiedEmail),
+              Invocation.getter(#others),
             ),
           )
           as String);
 
   @override
-  String get alternativeNames =>
+  String get calendar =>
       (super.noSuchMethod(
-            Invocation.getter(#alternativeNames),
+            Invocation.getter(#calendar),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#alternativeNames),
+              Invocation.getter(#calendar),
             ),
           )
           as String);
 
   @override
-  String get oneNamePerLine =>
+  String get enterValue =>
       (super.noSuchMethod(
-            Invocation.getter(#oneNamePerLine),
+            Invocation.getter(#enterValue),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#oneNamePerLine),
+              Invocation.getter(#enterValue),
             ),
           )
           as String);
 
   @override
-  String get whatVariationsExist =>
+  String get selectEntry =>
       (super.noSuchMethod(
-            Invocation.getter(#whatVariationsExist),
+            Invocation.getter(#selectEntry),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#whatVariationsExist),
+              Invocation.getter(#selectEntry),
             ),
           )
           as String);
 
   @override
-  String get previous =>
+  String get selectExercise =>
       (super.noSuchMethod(
-            Invocation.getter(#previous),
+            Invocation.getter(#selectExercise),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#previous),
+              Invocation.getter(#selectExercise),
             ),
           )
           as String);
 
   @override
-  String get next =>
+  String get baseNameEnglish =>
       (super.noSuchMethod(
-            Invocation.getter(#next),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#next)),
+            Invocation.getter(#baseNameEnglish),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#baseNameEnglish),
+            ),
           )
           as String);
 
   @override
-  String get images =>
+  String get enterValidNumber =>
       (super.noSuchMethod(
-            Invocation.getter(#images),
+            Invocation.getter(#enterValidNumber),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#images),
+              Invocation.getter(#enterValidNumber),
             ),
           )
           as String);
 
   @override
-  String get language =>
+  String get selectIngredient =>
       (super.noSuchMethod(
-            Invocation.getter(#language),
+            Invocation.getter(#selectIngredient),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#language),
+              Invocation.getter(#selectIngredient),
             ),
           )
           as String);
 
   @override
-  String get addExercise =>
+  String get recentlyUsedIngredients =>
       (super.noSuchMethod(
-            Invocation.getter(#addExercise),
+            Invocation.getter(#recentlyUsedIngredients),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#addExercise),
+              Invocation.getter(#recentlyUsedIngredients),
             ),
           )
           as String);
 
   @override
-  String get fitInWeek =>
+  String get selectImage =>
       (super.noSuchMethod(
-            Invocation.getter(#fitInWeek),
+            Invocation.getter(#selectImage),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#fitInWeek),
+              Invocation.getter(#selectImage),
             ),
           )
           as String);
 
   @override
-  String get fitInWeekHelp =>
+  String get optionsLabel =>
       (super.noSuchMethod(
-            Invocation.getter(#fitInWeekHelp),
+            Invocation.getter(#optionsLabel),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#fitInWeekHelp),
+              Invocation.getter(#optionsLabel),
             ),
           )
           as String);
 
   @override
-  String get addSuperset =>
+  String get takePicture =>
       (super.noSuchMethod(
-            Invocation.getter(#addSuperset),
+            Invocation.getter(#takePicture),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#addSuperset),
+              Invocation.getter(#takePicture),
             ),
           )
           as String);
 
   @override
-  String get superset =>
+  String get chooseFromLibrary =>
       (super.noSuchMethod(
-            Invocation.getter(#superset),
+            Invocation.getter(#chooseFromLibrary),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#superset),
+              Invocation.getter(#chooseFromLibrary),
             ),
           )
           as String);
 
   @override
-  String get setHasNoExercises =>
+  String get gallery =>
       (super.noSuchMethod(
-            Invocation.getter(#setHasNoExercises),
+            Invocation.getter(#gallery),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#setHasNoExercises),
+              Invocation.getter(#gallery),
             ),
           )
           as String);
 
   @override
-  String get contributeExercise =>
+  String get addImage =>
       (super.noSuchMethod(
-            Invocation.getter(#contributeExercise),
+            Invocation.getter(#addImage),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#contributeExercise),
+              Invocation.getter(#addImage),
             ),
           )
           as String);
 
   @override
-  String get translation =>
+  String get dataCopied =>
       (super.noSuchMethod(
-            Invocation.getter(#translation),
+            Invocation.getter(#dataCopied),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#translation),
+              Invocation.getter(#dataCopied),
             ),
           )
           as String);
 
   @override
-  String get translateExercise =>
+  String get appUpdateTitle =>
       (super.noSuchMethod(
-            Invocation.getter(#translateExercise),
+            Invocation.getter(#appUpdateTitle),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#translateExercise),
+              Invocation.getter(#appUpdateTitle),
             ),
           )
           as String);
 
   @override
-  String get baseData =>
+  String get appUpdateContent =>
       (super.noSuchMethod(
-            Invocation.getter(#baseData),
+            Invocation.getter(#appUpdateContent),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#baseData),
+              Invocation.getter(#appUpdateContent),
             ),
           )
           as String);
 
   @override
-  String get useBasicMarkdown =>
+  String get serverUpdateTitle =>
       (super.noSuchMethod(
-            Invocation.getter(#useBasicMarkdown),
+            Invocation.getter(#serverUpdateTitle),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#useBasicMarkdown),
+              Invocation.getter(#serverUpdateTitle),
             ),
           )
           as String);
 
   @override
-  String get editorBold =>
+  String get powerSyncUnreachableTitle =>
       (super.noSuchMethod(
-            Invocation.getter(#editorBold),
+            Invocation.getter(#powerSyncUnreachableTitle),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#editorBold),
+              Invocation.getter(#powerSyncUnreachableTitle),
             ),
           )
           as String);
 
   @override
-  String get editorItalic =>
+  String get powerSyncUnreachableContent =>
       (super.noSuchMethod(
-            Invocation.getter(#editorItalic),
+            Invocation.getter(#powerSyncUnreachableContent),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#editorItalic),
+              Invocation.getter(#powerSyncUnreachableContent),
             ),
           )
           as String);
 
   @override
-  String get editorList =>
+  String get serverUnreachableRetry =>
       (super.noSuchMethod(
-            Invocation.getter(#editorList),
+            Invocation.getter(#serverUnreachableRetry),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#editorList),
+              Invocation.getter(#serverUnreachableRetry),
             ),
           )
           as String);
 
   @override
-  String get enterTextInLanguage =>
+  String get productFound =>
       (super.noSuchMethod(
-            Invocation.getter(#enterTextInLanguage),
+            Invocation.getter(#productFound),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#enterTextInLanguage),
+              Invocation.getter(#productFound),
             ),
           )
           as String);
 
   @override
-  String get settingsTitle =>
+  String get productNotFound =>
       (super.noSuchMethod(
-            Invocation.getter(#settingsTitle),
+            Invocation.getter(#productNotFound),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#settingsTitle),
+              Invocation.getter(#productNotFound),
             ),
           )
           as String);
 
   @override
-  String get settingsCacheTitle =>
+  String get scanBarcode =>
       (super.noSuchMethod(
-            Invocation.getter(#settingsCacheTitle),
+            Invocation.getter(#scanBarcode),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#settingsCacheTitle),
+              Invocation.getter(#scanBarcode),
             ),
           )
           as String);
 
   @override
-  String get settingsImageCacheDescription =>
+  String get close =>
       (super.noSuchMethod(
-            Invocation.getter(#settingsImageCacheDescription),
+            Invocation.getter(#close),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#settingsImageCacheDescription),
+              Invocation.getter(#close),
             ),
           )
           as String);
 
   @override
-  String get settingsCacheDeletedSnackbar =>
+  String get checkInformationBeforeSubmitting =>
       (super.noSuchMethod(
-            Invocation.getter(#settingsCacheDeletedSnackbar),
+            Invocation.getter(#checkInformationBeforeSubmitting),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#settingsCacheDeletedSnackbar),
+              Invocation.getter(#checkInformationBeforeSubmitting),
             ),
           )
           as String);
 
   @override
-  String get settingsDataTitle =>
+  String get add_exercise_image_license =>
       (super.noSuchMethod(
-            Invocation.getter(#settingsDataTitle),
+            Invocation.getter(#add_exercise_image_license),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#settingsDataTitle),
+              Invocation.getter(#add_exercise_image_license),
             ),
           )
           as String);
 
   @override
-  String get settingsKeepDataOnLogout =>
+  String get imageDetailsTitle =>
       (super.noSuchMethod(
-            Invocation.getter(#settingsKeepDataOnLogout),
+            Invocation.getter(#imageDetailsTitle),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#settingsKeepDataOnLogout),
+              Invocation.getter(#imageDetailsTitle),
             ),
           )
           as String);
 
   @override
-  String get settingsKeepDataOnLogoutDescription =>
+  String get imageDetailsLicenseTitle =>
       (super.noSuchMethod(
-            Invocation.getter(#settingsKeepDataOnLogoutDescription),
+            Invocation.getter(#imageDetailsLicenseTitle),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#settingsKeepDataOnLogoutDescription),
+              Invocation.getter(#imageDetailsLicenseTitle),
             ),
           )
           as String);
 
   @override
-  String get aboutPageTitle =>
+  String get imageDetailsLicenseTitleHint =>
       (super.noSuchMethod(
-            Invocation.getter(#aboutPageTitle),
+            Invocation.getter(#imageDetailsLicenseTitleHint),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#aboutPageTitle),
+              Invocation.getter(#imageDetailsLicenseTitleHint),
             ),
           )
           as String);
 
   @override
-  String get simpleMode =>
+  String get imageDetailsSourceLink =>
       (super.noSuchMethod(
-            Invocation.getter(#simpleMode),
+            Invocation.getter(#imageDetailsSourceLink),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#simpleMode),
+              Invocation.getter(#imageDetailsSourceLink),
             ),
           )
           as String);
 
   @override
-  String get simpleModeHelp =>
+  String get author =>
       (super.noSuchMethod(
-            Invocation.getter(#simpleModeHelp),
+            Invocation.getter(#author),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#simpleModeHelp),
+              Invocation.getter(#author),
             ),
           )
           as String);
 
   @override
-  String get progressionRules =>
+  String get authorHint =>
       (super.noSuchMethod(
-            Invocation.getter(#progressionRules),
+            Invocation.getter(#authorHint),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#progressionRules),
+              Invocation.getter(#authorHint),
             ),
           )
           as String);
 
   @override
-  String get cacheWarning =>
+  String get imageDetailsAuthorLink =>
       (super.noSuchMethod(
-            Invocation.getter(#cacheWarning),
+            Invocation.getter(#imageDetailsAuthorLink),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#cacheWarning),
+              Invocation.getter(#imageDetailsAuthorLink),
             ),
           )
           as String);
 
   @override
-  String get textPromptTitle =>
+  String get imageDetailsDerivativeSource =>
       (super.noSuchMethod(
-            Invocation.getter(#textPromptTitle),
+            Invocation.getter(#imageDetailsDerivativeSource),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#textPromptTitle),
+              Invocation.getter(#imageDetailsDerivativeSource),
             ),
           )
           as String);
 
   @override
-  String get textPromptSubheading =>
+  String get imageDetailsDerivativeHelp =>
       (super.noSuchMethod(
-            Invocation.getter(#textPromptSubheading),
+            Invocation.getter(#imageDetailsDerivativeHelp),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#textPromptSubheading),
+              Invocation.getter(#imageDetailsDerivativeHelp),
             ),
           )
           as String);
 
   @override
-  String get abs =>
+  String get imageDetailsImageType =>
       (super.noSuchMethod(
-            Invocation.getter(#abs),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#abs)),
+            Invocation.getter(#imageDetailsImageType),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#imageDetailsImageType),
+            ),
           )
           as String);
 
   @override
-  String get arms =>
+  String get imageDetailsLicenseNotice =>
       (super.noSuchMethod(
-            Invocation.getter(#arms),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#arms)),
+            Invocation.getter(#imageDetailsLicenseNotice),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#imageDetailsLicenseNotice),
+            ),
           )
           as String);
 
   @override
-  String get back =>
+  String get imageDetailsLicenseNoticeLinkToLicense =>
       (super.noSuchMethod(
-            Invocation.getter(#back),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#back)),
+            Invocation.getter(#imageDetailsLicenseNoticeLinkToLicense),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#imageDetailsLicenseNoticeLinkToLicense),
+            ),
           )
           as String);
 
   @override
-  String get barbell =>
+  String get add =>
       (super.noSuchMethod(
-            Invocation.getter(#barbell),
-            returnValue: _i3.dummyValue<String>(
-              this,
-              Invocation.getter(#barbell),
-            ),
+            Invocation.getter(#add),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#add)),
           )
           as String);
 
   @override
-  String get bench =>
+  String get increase =>
       (super.noSuchMethod(
-            Invocation.getter(#bench),
+            Invocation.getter(#increase),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#bench),
+              Invocation.getter(#increase),
             ),
           )
           as String);
 
   @override
-  String get biceps =>
+  String get decrease =>
       (super.noSuchMethod(
-            Invocation.getter(#biceps),
+            Invocation.getter(#decrease),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#biceps),
+              Invocation.getter(#decrease),
             ),
           )
           as String);
 
   @override
-  String get body_weight =>
+  String get variations =>
       (super.noSuchMethod(
-            Invocation.getter(#body_weight),
+            Invocation.getter(#variations),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#body_weight),
+              Invocation.getter(#variations),
             ),
           )
           as String);
 
   @override
-  String get calves =>
+  String get verifiedEmail =>
       (super.noSuchMethod(
-            Invocation.getter(#calves),
+            Invocation.getter(#verifiedEmail),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#calves),
+              Invocation.getter(#verifiedEmail),
             ),
           )
           as String);
 
   @override
-  String get cardio =>
+  String get unVerifiedEmail =>
       (super.noSuchMethod(
-            Invocation.getter(#cardio),
+            Invocation.getter(#unVerifiedEmail),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#cardio),
+              Invocation.getter(#unVerifiedEmail),
             ),
           )
           as String);
 
   @override
-  String get chest =>
+  String get alternativeNames =>
       (super.noSuchMethod(
-            Invocation.getter(#chest),
+            Invocation.getter(#alternativeNames),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#chest),
+              Invocation.getter(#alternativeNames),
             ),
           )
           as String);
 
   @override
-  String get dumbbell =>
+  String get oneNamePerLine =>
       (super.noSuchMethod(
-            Invocation.getter(#dumbbell),
+            Invocation.getter(#oneNamePerLine),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#dumbbell),
+              Invocation.getter(#oneNamePerLine),
             ),
           )
           as String);
 
   @override
-  String get glutes =>
+  String get whatVariationsExist =>
       (super.noSuchMethod(
-            Invocation.getter(#glutes),
+            Invocation.getter(#whatVariationsExist),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#glutes),
+              Invocation.getter(#whatVariationsExist),
             ),
           )
           as String);
 
   @override
-  String get gym_mat =>
+  String get previous =>
       (super.noSuchMethod(
-            Invocation.getter(#gym_mat),
+            Invocation.getter(#previous),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#gym_mat),
+              Invocation.getter(#previous),
             ),
           )
           as String);
 
   @override
-  String get hamstrings =>
+  String get next =>
       (super.noSuchMethod(
-            Invocation.getter(#hamstrings),
-            returnValue: _i3.dummyValue<String>(
-              this,
-              Invocation.getter(#hamstrings),
-            ),
+            Invocation.getter(#next),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#next)),
           )
           as String);
 
   @override
-  String get incline_bench =>
+  String get images =>
       (super.noSuchMethod(
-            Invocation.getter(#incline_bench),
+            Invocation.getter(#images),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#incline_bench),
+              Invocation.getter(#images),
             ),
           )
           as String);
 
   @override
-  String get kettlebell =>
+  String get language =>
       (super.noSuchMethod(
-            Invocation.getter(#kettlebell),
+            Invocation.getter(#language),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#kettlebell),
+              Invocation.getter(#language),
             ),
           )
           as String);
 
   @override
-  String get kilometers =>
+  String get addExercise =>
       (super.noSuchMethod(
-            Invocation.getter(#kilometers),
+            Invocation.getter(#addExercise),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#kilometers),
+              Invocation.getter(#addExercise),
             ),
           )
           as String);
 
   @override
-  String get kilometers_per_hour =>
+  String get fitInWeek =>
       (super.noSuchMethod(
-            Invocation.getter(#kilometers_per_hour),
+            Invocation.getter(#fitInWeek),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#kilometers_per_hour),
+              Invocation.getter(#fitInWeek),
             ),
           )
           as String);
 
   @override
-  String get lats =>
+  String get fitInWeekHelp =>
       (super.noSuchMethod(
-            Invocation.getter(#lats),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#lats)),
+            Invocation.getter(#fitInWeekHelp),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#fitInWeekHelp),
+            ),
           )
           as String);
 
   @override
-  String get legs =>
+  String get addSuperset =>
       (super.noSuchMethod(
-            Invocation.getter(#legs),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#legs)),
+            Invocation.getter(#addSuperset),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#addSuperset),
+            ),
           )
           as String);
 
   @override
-  String get lower_back =>
+  String get setHasNoExercises =>
       (super.noSuchMethod(
-            Invocation.getter(#lower_back),
+            Invocation.getter(#setHasNoExercises),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#lower_back),
+              Invocation.getter(#setHasNoExercises),
             ),
           )
           as String);
 
   @override
-  String get max_reps =>
+  String get contributeExercise =>
+      (super.noSuchMethod(
+            Invocation.getter(#contributeExercise),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#contributeExercise),
+            ),
+          )
+          as String);
+
+  @override
+  String get translation =>
+      (super.noSuchMethod(
+            Invocation.getter(#translation),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#translation),
+            ),
+          )
+          as String);
+
+  @override
+  String get translateExercise =>
+      (super.noSuchMethod(
+            Invocation.getter(#translateExercise),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#translateExercise),
+            ),
+          )
+          as String);
+
+  @override
+  String get baseData =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseData),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#baseData),
+            ),
+          )
+          as String);
+
+  @override
+  String get useBasicMarkdown =>
+      (super.noSuchMethod(
+            Invocation.getter(#useBasicMarkdown),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#useBasicMarkdown),
+            ),
+          )
+          as String);
+
+  @override
+  String get editorBold =>
+      (super.noSuchMethod(
+            Invocation.getter(#editorBold),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#editorBold),
+            ),
+          )
+          as String);
+
+  @override
+  String get editorItalic =>
+      (super.noSuchMethod(
+            Invocation.getter(#editorItalic),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#editorItalic),
+            ),
+          )
+          as String);
+
+  @override
+  String get editorList =>
+      (super.noSuchMethod(
+            Invocation.getter(#editorList),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#editorList),
+            ),
+          )
+          as String);
+
+  @override
+  String get enterTextInLanguage =>
+      (super.noSuchMethod(
+            Invocation.getter(#enterTextInLanguage),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#enterTextInLanguage),
+            ),
+          )
+          as String);
+
+  @override
+  String get settingsTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsTitle),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#settingsTitle),
+            ),
+          )
+          as String);
+
+  @override
+  String get settingsCacheTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsCacheTitle),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#settingsCacheTitle),
+            ),
+          )
+          as String);
+
+  @override
+  String get settingsImageCacheDescription =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsImageCacheDescription),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#settingsImageCacheDescription),
+            ),
+          )
+          as String);
+
+  @override
+  String get settingsCacheDeletedSnackbar =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsCacheDeletedSnackbar),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#settingsCacheDeletedSnackbar),
+            ),
+          )
+          as String);
+
+  @override
+  String get settingsDataTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsDataTitle),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#settingsDataTitle),
+            ),
+          )
+          as String);
+
+  @override
+  String get settingsKeepDataOnLogout =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsKeepDataOnLogout),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#settingsKeepDataOnLogout),
+            ),
+          )
+          as String);
+
+  @override
+  String get settingsKeepDataOnLogoutDescription =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsKeepDataOnLogoutDescription),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#settingsKeepDataOnLogoutDescription),
+            ),
+          )
+          as String);
+
+  @override
+  String get settingsVerboseLogging =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsVerboseLogging),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#settingsVerboseLogging),
+            ),
+          )
+          as String);
+
+  @override
+  String get settingsVerboseLoggingDescription =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsVerboseLoggingDescription),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#settingsVerboseLoggingDescription),
+            ),
+          )
+          as String);
+
+  @override
+  String get aboutPageTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutPageTitle),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#aboutPageTitle),
+            ),
+          )
+          as String);
+
+  @override
+  String get simpleMode =>
+      (super.noSuchMethod(
+            Invocation.getter(#simpleMode),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#simpleMode),
+            ),
+          )
+          as String);
+
+  @override
+  String get simpleModeHelp =>
+      (super.noSuchMethod(
+            Invocation.getter(#simpleModeHelp),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#simpleModeHelp),
+            ),
+          )
+          as String);
+
+  @override
+  String get progressionRules =>
+      (super.noSuchMethod(
+            Invocation.getter(#progressionRules),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#progressionRules),
+            ),
+          )
+          as String);
+
+  @override
+  String get cacheWarning =>
+      (super.noSuchMethod(
+            Invocation.getter(#cacheWarning),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#cacheWarning),
+            ),
+          )
+          as String);
+
+  @override
+  String get textPromptTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#textPromptTitle),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#textPromptTitle),
+            ),
+          )
+          as String);
+
+  @override
+  String get textPromptSubheading =>
+      (super.noSuchMethod(
+            Invocation.getter(#textPromptSubheading),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#textPromptSubheading),
+            ),
+          )
+          as String);
+
+  @override
+  String get abs =>
+      (super.noSuchMethod(
+            Invocation.getter(#abs),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#abs)),
+          )
+          as String);
+
+  @override
+  String get arms =>
+      (super.noSuchMethod(
+            Invocation.getter(#arms),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#arms)),
+          )
+          as String);
+
+  @override
+  String get back =>
+      (super.noSuchMethod(
+            Invocation.getter(#back),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#back)),
+          )
+          as String);
+
+  @override
+  String get barbell =>
+      (super.noSuchMethod(
+            Invocation.getter(#barbell),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#barbell),
+            ),
+          )
+          as String);
+
+  @override
+  String get bench =>
+      (super.noSuchMethod(
+            Invocation.getter(#bench),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#bench),
+            ),
+          )
+          as String);
+
+  @override
+  String get biceps =>
+      (super.noSuchMethod(
+            Invocation.getter(#biceps),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#biceps),
+            ),
+          )
+          as String);
+
+  @override
+  String get body_weight =>
+      (super.noSuchMethod(
+            Invocation.getter(#body_weight),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#body_weight),
+            ),
+          )
+          as String);
+
+  @override
+  String get calves =>
+      (super.noSuchMethod(
+            Invocation.getter(#calves),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#calves),
+            ),
+          )
+          as String);
+
+  @override
+  String get cardio =>
+      (super.noSuchMethod(
+            Invocation.getter(#cardio),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#cardio),
+            ),
+          )
+          as String);
+
+  @override
+  String get chest =>
+      (super.noSuchMethod(
+            Invocation.getter(#chest),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#chest),
+            ),
+          )
+          as String);
+
+  @override
+  String get dumbbell =>
+      (super.noSuchMethod(
+            Invocation.getter(#dumbbell),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#dumbbell),
+            ),
+          )
+          as String);
+
+  @override
+  String get glutes =>
+      (super.noSuchMethod(
+            Invocation.getter(#glutes),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#glutes),
+            ),
+          )
+          as String);
+
+  @override
+  String get gym_mat =>
+      (super.noSuchMethod(
+            Invocation.getter(#gym_mat),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#gym_mat),
+            ),
+          )
+          as String);
+
+  @override
+  String get hamstrings =>
+      (super.noSuchMethod(
+            Invocation.getter(#hamstrings),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#hamstrings),
+            ),
+          )
+          as String);
+
+  @override
+  String get incline_bench =>
+      (super.noSuchMethod(
+            Invocation.getter(#incline_bench),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#incline_bench),
+            ),
+          )
+          as String);
+
+  @override
+  String get kettlebell =>
+      (super.noSuchMethod(
+            Invocation.getter(#kettlebell),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#kettlebell),
+            ),
+          )
+          as String);
+
+  @override
+  String get kilometers =>
+      (super.noSuchMethod(
+            Invocation.getter(#kilometers),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#kilometers),
+            ),
+          )
+          as String);
+
+  @override
+  String get kilometers_per_hour =>
+      (super.noSuchMethod(
+            Invocation.getter(#kilometers_per_hour),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#kilometers_per_hour),
+            ),
+          )
+          as String);
+
+  @override
+  String get lats =>
+      (super.noSuchMethod(
+            Invocation.getter(#lats),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#lats)),
+          )
+          as String);
+
+  @override
+  String get legs =>
+      (super.noSuchMethod(
+            Invocation.getter(#legs),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#legs)),
+          )
+          as String);
+
+  @override
+  String get lower_back =>
+      (super.noSuchMethod(
+            Invocation.getter(#lower_back),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#lower_back),
+            ),
+          )
+          as String);
+
+  @override
+  String get max_reps =>
       (super.noSuchMethod(
             Invocation.getter(#max_reps),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#max_reps),
+              Invocation.getter(#max_reps),
+            ),
+          )
+          as String);
+
+  @override
+  String get miles =>
+      (super.noSuchMethod(
+            Invocation.getter(#miles),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#miles),
+            ),
+          )
+          as String);
+
+  @override
+  String get miles_per_hour =>
+      (super.noSuchMethod(
+            Invocation.getter(#miles_per_hour),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#miles_per_hour),
+            ),
+          )
+          as String);
+
+  @override
+  String get minutes =>
+      (super.noSuchMethod(
+            Invocation.getter(#minutes),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#minutes),
+            ),
+          )
+          as String);
+
+  @override
+  String get plates =>
+      (super.noSuchMethod(
+            Invocation.getter(#plates),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#plates),
+            ),
+          )
+          as String);
+
+  @override
+  String get pull_up_bar =>
+      (super.noSuchMethod(
+            Invocation.getter(#pull_up_bar),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#pull_up_bar),
+            ),
+          )
+          as String);
+
+  @override
+  String get quads =>
+      (super.noSuchMethod(
+            Invocation.getter(#quads),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#quads),
+            ),
+          )
+          as String);
+
+  @override
+  String get repetitions =>
+      (super.noSuchMethod(
+            Invocation.getter(#repetitions),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#repetitions),
+            ),
+          )
+          as String);
+
+  @override
+  String get resistance_band =>
+      (super.noSuchMethod(
+            Invocation.getter(#resistance_band),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#resistance_band),
+            ),
+          )
+          as String);
+
+  @override
+  String get sz_bar =>
+      (super.noSuchMethod(
+            Invocation.getter(#sz_bar),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#sz_bar),
+            ),
+          )
+          as String);
+
+  @override
+  String get seconds =>
+      (super.noSuchMethod(
+            Invocation.getter(#seconds),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#seconds),
+            ),
+          )
+          as String);
+
+  @override
+  String get shoulders =>
+      (super.noSuchMethod(
+            Invocation.getter(#shoulders),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#shoulders),
+            ),
+          )
+          as String);
+
+  @override
+  String get swiss_ball =>
+      (super.noSuchMethod(
+            Invocation.getter(#swiss_ball),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#swiss_ball),
+            ),
+          )
+          as String);
+
+  @override
+  String get triceps =>
+      (super.noSuchMethod(
+            Invocation.getter(#triceps),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#triceps),
+            ),
+          )
+          as String);
+
+  @override
+  String get until_failure =>
+      (super.noSuchMethod(
+            Invocation.getter(#until_failure),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#until_failure),
+            ),
+          )
+          as String);
+
+  @override
+  String get kg =>
+      (super.noSuchMethod(
+            Invocation.getter(#kg),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#kg)),
+          )
+          as String);
+
+  @override
+  String get lb =>
+      (super.noSuchMethod(
+            Invocation.getter(#lb),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#lb)),
+          )
+          as String);
+
+  @override
+  String get none__bodyweight_exercise_ =>
+      (super.noSuchMethod(
+            Invocation.getter(#none__bodyweight_exercise_),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#none__bodyweight_exercise_),
+            ),
+          )
+          as String);
+
+  @override
+  String get log =>
+      (super.noSuchMethod(
+            Invocation.getter(#log),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#log)),
+          )
+          as String);
+
+  @override
+  String get done =>
+      (super.noSuchMethod(
+            Invocation.getter(#done),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#done)),
+          )
+          as String);
+
+  @override
+  String get overallChangeWeight =>
+      (super.noSuchMethod(
+            Invocation.getter(#overallChangeWeight),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#overallChangeWeight),
             ),
           )
           as String);
 
   @override
-  String get miles =>
+  String get goalTypeMeals =>
       (super.noSuchMethod(
-            Invocation.getter(#miles),
+            Invocation.getter(#goalTypeMeals),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#miles),
+              Invocation.getter(#goalTypeMeals),
             ),
           )
           as String);
 
   @override
-  String get miles_per_hour =>
+  String get goalTypeBasic =>
       (super.noSuchMethod(
-            Invocation.getter(#miles_per_hour),
+            Invocation.getter(#goalTypeBasic),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#miles_per_hour),
+              Invocation.getter(#goalTypeBasic),
             ),
           )
           as String);
 
   @override
-  String get minutes =>
+  String get goalTypeAdvanced =>
       (super.noSuchMethod(
-            Invocation.getter(#minutes),
+            Invocation.getter(#goalTypeAdvanced),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#minutes),
+              Invocation.getter(#goalTypeAdvanced),
             ),
           )
           as String);
 
   @override
-  String get plates =>
+  String get indicatorRaw =>
       (super.noSuchMethod(
-            Invocation.getter(#plates),
+            Invocation.getter(#indicatorRaw),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#plates),
+              Invocation.getter(#indicatorRaw),
             ),
           )
           as String);
 
   @override
-  String get pull_up_bar =>
+  String get indicatorAvg =>
       (super.noSuchMethod(
-            Invocation.getter(#pull_up_bar),
+            Invocation.getter(#indicatorAvg),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#pull_up_bar),
+              Invocation.getter(#indicatorAvg),
             ),
           )
           as String);
 
   @override
-  String get quads =>
+  String get indicatorTrend =>
       (super.noSuchMethod(
-            Invocation.getter(#quads),
+            Invocation.getter(#indicatorTrend),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#quads),
+              Invocation.getter(#indicatorTrend),
             ),
           )
           as String);
 
   @override
-  String get repetitions =>
+  String get endWorkout =>
       (super.noSuchMethod(
-            Invocation.getter(#repetitions),
+            Invocation.getter(#endWorkout),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#repetitions),
+              Invocation.getter(#endWorkout),
             ),
           )
           as String);
 
   @override
-  String get resistance_band =>
+  String get themeMode =>
       (super.noSuchMethod(
-            Invocation.getter(#resistance_band),
+            Invocation.getter(#themeMode),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#resistance_band),
+              Invocation.getter(#themeMode),
             ),
           )
           as String);
 
   @override
-  String get sz_bar =>
+  String get darkMode =>
       (super.noSuchMethod(
-            Invocation.getter(#sz_bar),
+            Invocation.getter(#darkMode),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#sz_bar),
+              Invocation.getter(#darkMode),
             ),
           )
           as String);
 
   @override
-  String get seconds =>
+  String get lightMode =>
       (super.noSuchMethod(
-            Invocation.getter(#seconds),
+            Invocation.getter(#lightMode),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#seconds),
+              Invocation.getter(#lightMode),
             ),
           )
           as String);
 
   @override
-  String get shoulders =>
+  String get systemMode =>
       (super.noSuchMethod(
-            Invocation.getter(#shoulders),
+            Invocation.getter(#systemMode),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#shoulders),
+              Invocation.getter(#systemMode),
             ),
           )
           as String);
 
   @override
-  String get swiss_ball =>
+  String get useDynamicColor =>
       (super.noSuchMethod(
-            Invocation.getter(#swiss_ball),
+            Invocation.getter(#useDynamicColor),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#swiss_ball),
+              Invocation.getter(#useDynamicColor),
             ),
           )
           as String);
 
   @override
-  String get triceps =>
+  String get youAreOffline =>
       (super.noSuchMethod(
-            Invocation.getter(#triceps),
+            Invocation.getter(#youAreOffline),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#triceps),
+              Invocation.getter(#youAreOffline),
             ),
           )
           as String);
 
   @override
-  String get until_failure =>
+  String get appLanguage =>
       (super.noSuchMethod(
-            Invocation.getter(#until_failure),
+            Invocation.getter(#appLanguage),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#until_failure),
+              Invocation.getter(#appLanguage),
             ),
           )
           as String);
 
   @override
-  String get kg =>
+  String get appLanguageSystem =>
       (super.noSuchMethod(
-            Invocation.getter(#kg),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#kg)),
+            Invocation.getter(#appLanguageSystem),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#appLanguageSystem),
+            ),
           )
           as String);
 
   @override
-  String get lb =>
+  String get productNotFoundOpenFoodFacts =>
       (super.noSuchMethod(
-            Invocation.getter(#lb),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#lb)),
+            Invocation.getter(#productNotFoundOpenFoodFacts),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#productNotFoundOpenFoodFacts),
+            ),
           )
           as String);
 
   @override
-  String get none__bodyweight_exercise_ =>
+  String get addToOpenFoodFacts =>
       (super.noSuchMethod(
-            Invocation.getter(#none__bodyweight_exercise_),
+            Invocation.getter(#addToOpenFoodFacts),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#none__bodyweight_exercise_),
+              Invocation.getter(#addToOpenFoodFacts),
             ),
           )
           as String);
 
   @override
-  String get log =>
+  String get isVegan =>
       (super.noSuchMethod(
-            Invocation.getter(#log),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#log)),
+            Invocation.getter(#isVegan),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#isVegan),
+            ),
           )
           as String);
 
   @override
-  String get done =>
+  String get isVegetarian =>
       (super.noSuchMethod(
-            Invocation.getter(#done),
-            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#done)),
+            Invocation.getter(#isVegetarian),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#isVegetarian),
+            ),
           )
           as String);
 
   @override
-  String get overallChangeWeight =>
+  String get filter =>
       (super.noSuchMethod(
-            Invocation.getter(#overallChangeWeight),
+            Invocation.getter(#filter),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#overallChangeWeight),
+              Invocation.getter(#filter),
             ),
           )
           as String);
 
   @override
-  String get goalTypeMeals =>
+  String get searchLanguageAll =>
       (super.noSuchMethod(
-            Invocation.getter(#goalTypeMeals),
+            Invocation.getter(#searchLanguageAll),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#goalTypeMeals),
+              Invocation.getter(#searchLanguageAll),
             ),
           )
           as String);
 
   @override
-  String get goalTypeBasic =>
+  String get exerciseSearchMode =>
       (super.noSuchMethod(
-            Invocation.getter(#goalTypeBasic),
+            Invocation.getter(#exerciseSearchMode),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#goalTypeBasic),
+              Invocation.getter(#exerciseSearchMode),
+            ),
+          )
+          as String);
+
+  @override
+  String get searchModeFuzzy =>
+      (super.noSuchMethod(
+            Invocation.getter(#searchModeFuzzy),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#searchModeFuzzy),
+            ),
+          )
+          as String);
+
+  @override
+  String get searchModeExact =>
+      (super.noSuchMethod(
+            Invocation.getter(#searchModeExact),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#searchModeExact),
+            ),
+          )
+          as String);
+
+  @override
+  String get syncStatusConnected =>
+      (super.noSuchMethod(
+            Invocation.getter(#syncStatusConnected),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#syncStatusConnected),
+            ),
+          )
+          as String);
+
+  @override
+  String get syncStatusConnecting =>
+      (super.noSuchMethod(
+            Invocation.getter(#syncStatusConnecting),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#syncStatusConnecting),
+            ),
+          )
+          as String);
+
+  @override
+  String get syncStatusDisconnected =>
+      (super.noSuchMethod(
+            Invocation.getter(#syncStatusDisconnected),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#syncStatusDisconnected),
+            ),
+          )
+          as String);
+
+  @override
+  String get syncStatusUploading =>
+      (super.noSuchMethod(
+            Invocation.getter(#syncStatusUploading),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#syncStatusUploading),
+            ),
+          )
+          as String);
+
+  @override
+  String get syncStatusDownloading =>
+      (super.noSuchMethod(
+            Invocation.getter(#syncStatusDownloading),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#syncStatusDownloading),
+            ),
+          )
+          as String);
+
+  @override
+  String get syncStatusSyncing =>
+      (super.noSuchMethod(
+            Invocation.getter(#syncStatusSyncing),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#syncStatusSyncing),
+            ),
+          )
+          as String);
+
+  @override
+  String get syncStatusError =>
+      (super.noSuchMethod(
+            Invocation.getter(#syncStatusError),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#syncStatusError),
             ),
           )
           as String);
 
   @override
-  String get goalTypeAdvanced =>
+  String get syncStatusDialogTitle =>
       (super.noSuchMethod(
-            Invocation.getter(#goalTypeAdvanced),
+            Invocation.getter(#syncStatusDialogTitle),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#goalTypeAdvanced),
+              Invocation.getter(#syncStatusDialogTitle),
             ),
           )
           as String);
 
   @override
-  String get indicatorRaw =>
+  String get syncStatusLastSynced =>
       (super.noSuchMethod(
-            Invocation.getter(#indicatorRaw),
+            Invocation.getter(#syncStatusLastSynced),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#indicatorRaw),
+              Invocation.getter(#syncStatusLastSynced),
             ),
           )
           as String);
 
   @override
-  String get indicatorAvg =>
+  String get syncStatusErrorDetails =>
       (super.noSuchMethod(
-            Invocation.getter(#indicatorAvg),
+            Invocation.getter(#syncStatusErrorDetails),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#indicatorAvg),
+              Invocation.getter(#syncStatusErrorDetails),
             ),
           )
           as String);
 
   @override
-  String get endWorkout =>
+  String get syncStatusStalledHint =>
       (super.noSuchMethod(
-            Invocation.getter(#endWorkout),
+            Invocation.getter(#syncStatusStalledHint),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#endWorkout),
+              Invocation.getter(#syncStatusStalledHint),
             ),
           )
           as String);
 
   @override
-  String get themeMode =>
+  String get syncStatusReconnect =>
       (super.noSuchMethod(
-            Invocation.getter(#themeMode),
+            Invocation.getter(#syncStatusReconnect),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#themeMode),
+              Invocation.getter(#syncStatusReconnect),
             ),
           )
           as String);
 
   @override
-  String get darkMode =>
+  String get syncStatusNeverSynced =>
       (super.noSuchMethod(
-            Invocation.getter(#darkMode),
+            Invocation.getter(#syncStatusNeverSynced),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#darkMode),
+              Invocation.getter(#syncStatusNeverSynced),
             ),
           )
           as String);
 
   @override
-  String get lightMode =>
+  String get filterNutriscore =>
       (super.noSuchMethod(
-            Invocation.getter(#lightMode),
+            Invocation.getter(#filterNutriscore),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#lightMode),
+              Invocation.getter(#filterNutriscore),
             ),
           )
           as String);
 
   @override
-  String get systemMode =>
+  String get filterNutriscoreOff =>
       (super.noSuchMethod(
-            Invocation.getter(#systemMode),
+            Invocation.getter(#filterNutriscoreOff),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#systemMode),
+              Invocation.getter(#filterNutriscoreOff),
             ),
           )
           as String);
 
   @override
-  String get youAreOffline =>
+  String get filterNutriscoreNoFilter =>
       (super.noSuchMethod(
-            Invocation.getter(#youAreOffline),
+            Invocation.getter(#filterNutriscoreNoFilter),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#youAreOffline),
+              Invocation.getter(#filterNutriscoreNoFilter),
             ),
           )
           as String);
 
   @override
-  String get appLanguage =>
+  String get serverConfigIssueTitle =>
       (super.noSuchMethod(
-            Invocation.getter(#appLanguage),
+            Invocation.getter(#serverConfigIssueTitle),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#appLanguage),
+              Invocation.getter(#serverConfigIssueTitle),
             ),
           )
           as String);
 
   @override
-  String get appLanguageSystem =>
+  String get serverConfigIssueMessage =>
       (super.noSuchMethod(
-            Invocation.getter(#appLanguageSystem),
+            Invocation.getter(#serverConfigIssueMessage),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#appLanguageSystem),
+              Invocation.getter(#serverConfigIssueMessage),
             ),
           )
           as String);
 
   @override
-  String get productNotFoundOpenFoodFacts =>
+  String get understand =>
       (super.noSuchMethod(
-            Invocation.getter(#productNotFoundOpenFoodFacts),
+            Invocation.getter(#understand),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#productNotFoundOpenFoodFacts),
+              Invocation.getter(#understand),
             ),
           )
           as String);
 
   @override
-  String get addToOpenFoodFacts =>
+  String get viewDocumentation =>
       (super.noSuchMethod(
-            Invocation.getter(#addToOpenFoodFacts),
+            Invocation.getter(#viewDocumentation),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#addToOpenFoodFacts),
+              Invocation.getter(#viewDocumentation),
             ),
           )
           as String);
 
   @override
-  String get isVegan =>
+  String get sessionExpired =>
       (super.noSuchMethod(
-            Invocation.getter(#isVegan),
+            Invocation.getter(#sessionExpired),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#isVegan),
+              Invocation.getter(#sessionExpired),
             ),
           )
           as String);
 
   @override
-  String get isVegetarian =>
+  String get weightOrRepsRequired =>
       (super.noSuchMethod(
-            Invocation.getter(#isVegetarian),
+            Invocation.getter(#weightOrRepsRequired),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#isVegetarian),
+              Invocation.getter(#weightOrRepsRequired),
             ),
           )
           as String);
 
   @override
-  String get filter =>
+  String get timeStartEndBothOrNeither =>
       (super.noSuchMethod(
-            Invocation.getter(#filter),
+            Invocation.getter(#timeStartEndBothOrNeither),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#filter),
+              Invocation.getter(#timeStartEndBothOrNeither),
             ),
           )
           as String);
 
   @override
-  String get searchLanguageAll =>
+  String get healthSync =>
       (super.noSuchMethod(
-            Invocation.getter(#searchLanguageAll),
+            Invocation.getter(#healthSync),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#searchLanguageAll),
+              Invocation.getter(#healthSync),
             ),
           )
           as String);
 
   @override
-  String get exerciseSearchMode =>
+  String get healthSyncDescription =>
       (super.noSuchMethod(
-            Invocation.getter(#exerciseSearchMode),
+            Invocation.getter(#healthSyncDescription),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#exerciseSearchMode),
+              Invocation.getter(#healthSyncDescription),
             ),
           )
           as String);
 
   @override
-  String get searchModeFuzzy =>
+  String get healthSyncPermissionDenied =>
       (super.noSuchMethod(
-            Invocation.getter(#searchModeFuzzy),
+            Invocation.getter(#healthSyncPermissionDenied),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#searchModeFuzzy),
+              Invocation.getter(#healthSyncPermissionDenied),
             ),
           )
           as String);
 
   @override
-  String get searchModeExact =>
+  String get healthSyncSyncing =>
       (super.noSuchMethod(
-            Invocation.getter(#searchModeExact),
+            Invocation.getter(#healthSyncSyncing),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#searchModeExact),
+              Invocation.getter(#healthSyncSyncing),
             ),
           )
           as String);
 
   @override
-  String get syncStatusConnected =>
+  String get healthSyncNow =>
       (super.noSuchMethod(
-            Invocation.getter(#syncStatusConnected),
+            Invocation.getter(#healthSyncNow),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#syncStatusConnected),
+              Invocation.getter(#healthSyncNow),
             ),
           )
           as String);
 
   @override
-  String get syncStatusConnecting =>
+  String get healthSyncGrantAccess =>
       (super.noSuchMethod(
-            Invocation.getter(#syncStatusConnecting),
+            Invocation.getter(#healthSyncGrantAccess),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#syncStatusConnecting),
+              Invocation.getter(#healthSyncGrantAccess),
             ),
           )
           as String);
 
   @override
-  String get syncStatusDisconnected =>
+  String get healthSyncFailed =>
       (super.noSuchMethod(
-            Invocation.getter(#syncStatusDisconnected),
+            Invocation.getter(#healthSyncFailed),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#syncStatusDisconnected),
+              Invocation.getter(#healthSyncFailed),
             ),
           )
           as String);
 
   @override
-  String get syncStatusUploading =>
+  String get healthConnectInstall =>
       (super.noSuchMethod(
-            Invocation.getter(#syncStatusUploading),
+            Invocation.getter(#healthConnectInstall),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#syncStatusUploading),
+              Invocation.getter(#healthConnectInstall),
             ),
           )
           as String);
 
   @override
-  String get syncStatusDownloading =>
+  String get healthConnectUpdate =>
       (super.noSuchMethod(
-            Invocation.getter(#syncStatusDownloading),
+            Invocation.getter(#healthConnectUpdate),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#syncStatusDownloading),
+              Invocation.getter(#healthConnectUpdate),
             ),
           )
           as String);
 
   @override
-  String get syncStatusSyncing =>
+  String get healthConnectRequired =>
       (super.noSuchMethod(
-            Invocation.getter(#syncStatusSyncing),
+            Invocation.getter(#healthConnectRequired),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#syncStatusSyncing),
+              Invocation.getter(#healthConnectRequired),
             ),
           )
           as String);
 
   @override
-  String get syncStatusError =>
+  String get health =>
       (super.noSuchMethod(
-            Invocation.getter(#syncStatusError),
+            Invocation.getter(#health),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#syncStatusError),
+              Invocation.getter(#health),
             ),
           )
           as String);
 
   @override
-  String get syncStatusDialogTitle =>
+  String get importedEntry =>
       (super.noSuchMethod(
-            Invocation.getter(#syncStatusDialogTitle),
+            Invocation.getter(#importedEntry),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#syncStatusDialogTitle),
+              Invocation.getter(#importedEntry),
             ),
           )
           as String);
 
   @override
-  String get syncStatusLastSynced =>
+  String certsNotVerifiedDetail(String? host) =>
       (super.noSuchMethod(
-            Invocation.getter(#syncStatusLastSynced),
+            Invocation.method(#certsNotVerifiedDetail, [host]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#syncStatusLastSynced),
+              Invocation.method(#certsNotVerifiedDetail, [host]),
             ),
           )
           as String);
 
   @override
-  String get syncStatusErrorDetails =>
+  String exerciseNr(String? nr) =>
       (super.noSuchMethod(
-            Invocation.getter(#syncStatusErrorDetails),
+            Invocation.method(#exerciseNr, [nr]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#syncStatusErrorDetails),
+              Invocation.method(#exerciseNr, [nr]),
             ),
           )
           as String);
 
   @override
-  String get filterNutriscore =>
+  String supersetNr(String? nr) =>
       (super.noSuchMethod(
-            Invocation.getter(#filterNutriscore),
+            Invocation.method(#supersetNr, [nr]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#filterNutriscore),
+              Invocation.method(#supersetNr, [nr]),
             ),
           )
           as String);
 
   @override
-  String get filterNutriscoreOff =>
+  String setNr(String? nr) =>
       (super.noSuchMethod(
-            Invocation.getter(#filterNutriscoreOff),
+            Invocation.method(#setNr, [nr]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#filterNutriscoreOff),
+              Invocation.method(#setNr, [nr]),
             ),
           )
           as String);
 
   @override
-  String get filterNutriscoreNoFilter =>
+  String topSet(String? value) =>
       (super.noSuchMethod(
-            Invocation.getter(#filterNutriscoreNoFilter),
+            Invocation.method(#topSet, [value]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#filterNutriscoreNoFilter),
+              Invocation.method(#topSet, [value]),
             ),
           )
           as String);
 
   @override
-  String get serverConfigIssueTitle =>
+  String durationHoursMinutes(int? hours, int? minutes) =>
       (super.noSuchMethod(
-            Invocation.getter(#serverConfigIssueTitle),
+            Invocation.method(#durationHoursMinutes, [hours, minutes]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#serverConfigIssueTitle),
+              Invocation.method(#durationHoursMinutes, [hours, minutes]),
             ),
           )
           as String);
 
   @override
-  String get serverConfigIssueMessage =>
+  String gymModeLogScopeWeeks(int? weeks) =>
       (super.noSuchMethod(
-            Invocation.getter(#serverConfigIssueMessage),
+            Invocation.method(#gymModeLogScopeWeeks, [weeks]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#serverConfigIssueMessage),
+              Invocation.method(#gymModeLogScopeWeeks, [weeks]),
             ),
           )
           as String);
 
   @override
-  String get understand =>
+  String planDateRange(String? startDate, String? endDate) =>
       (super.noSuchMethod(
-            Invocation.getter(#understand),
+            Invocation.method(#planDateRange, [startDate, endDate]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#understand),
+              Invocation.method(#planDateRange, [startDate, endDate]),
             ),
           )
           as String);
 
   @override
-  String get viewDocumentation =>
+  String planStartDate(String? startDate) =>
       (super.noSuchMethod(
-            Invocation.getter(#viewDocumentation),
+            Invocation.method(#planStartDate, [startDate]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#viewDocumentation),
+              Invocation.method(#planStartDate, [startDate]),
             ),
           )
           as String);
 
   @override
-  String get sessionExpired =>
+  String chartRangeWeeks(int? count) =>
       (super.noSuchMethod(
-            Invocation.getter(#sessionExpired),
+            Invocation.method(#chartRangeWeeks, [count]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#sessionExpired),
+              Invocation.method(#chartRangeWeeks, [count]),
             ),
           )
           as String);
 
   @override
-  String get weightOrRepsRequired =>
+  String chartRangeMonths(int? count) =>
       (super.noSuchMethod(
-            Invocation.getter(#weightOrRepsRequired),
+            Invocation.method(#chartRangeMonths, [count]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#weightOrRepsRequired),
+              Invocation.method(#chartRangeMonths, [count]),
             ),
           )
           as String);
 
   @override
-  String get timeStartEndBothOrNeither =>
+  String chartRangeYears(int? count) =>
       (super.noSuchMethod(
-            Invocation.getter(#timeStartEndBothOrNeither),
+            Invocation.method(#chartRangeYears, [count]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.getter(#timeStartEndBothOrNeither),
+              Invocation.method(#chartRangeYears, [count]),
             ),
           )
           as String);
 
   @override
-  String exerciseNr(String? nr) =>
+  String chartWeeklyChangeTitle(String? name) =>
       (super.noSuchMethod(
-            Invocation.method(#exerciseNr, [nr]),
+            Invocation.method(#chartWeeklyChangeTitle, [name]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.method(#exerciseNr, [nr]),
+              Invocation.method(#chartWeeklyChangeTitle, [name]),
             ),
           )
           as String);
 
   @override
-  String supersetNr(String? nr) =>
+  String chartAverageWindowDays(int? days) =>
       (super.noSuchMethod(
-            Invocation.method(#supersetNr, [nr]),
+            Invocation.method(#chartAverageWindowDays, [days]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.method(#supersetNr, [nr]),
+              Invocation.method(#chartAverageWindowDays, [days]),
             ),
           )
           as String);
 
   @override
-  String setNr(String? nr) =>
+  String chartDistributionTitle(String? name) =>
       (super.noSuchMethod(
-            Invocation.method(#setNr, [nr]),
+            Invocation.method(#chartDistributionTitle, [name]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.method(#setNr, [nr]),
+              Invocation.method(#chartDistributionTitle, [name]),
             ),
           )
           as String);
 
   @override
-  String topSet(String? value) =>
+  String distributionEntryCount(int? count) =>
       (super.noSuchMethod(
-            Invocation.method(#topSet, [value]),
+            Invocation.method(#distributionEntryCount, [count]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.method(#topSet, [value]),
+              Invocation.method(#distributionEntryCount, [count]),
             ),
           )
           as String);
 
   @override
-  String durationHoursMinutes(int? hours, int? minutes) =>
+  String distributionDayCount(int? count) =>
       (super.noSuchMethod(
-            Invocation.method(#durationHoursMinutes, [hours, minutes]),
+            Invocation.method(#distributionDayCount, [count]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.method(#durationHoursMinutes, [hours, minutes]),
+              Invocation.method(#distributionDayCount, [count]),
             ),
           )
           as String);
 
   @override
-  String gymModeLogScopeWeeks(int? weeks) =>
+  String relativeDaysAgo(int? count) =>
       (super.noSuchMethod(
-            Invocation.method(#gymModeLogScopeWeeks, [weeks]),
+            Invocation.method(#relativeDaysAgo, [count]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.method(#gymModeLogScopeWeeks, [weeks]),
+              Invocation.method(#relativeDaysAgo, [count]),
             ),
           )
           as String);
 
   @override
-  String planDateRange(String? startDate, String? endDate) =>
+  String relativeWeeksAgo(int? count) =>
       (super.noSuchMethod(
-            Invocation.method(#planDateRange, [startDate, endDate]),
+            Invocation.method(#relativeWeeksAgo, [count]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.method(#planDateRange, [startDate, endDate]),
+              Invocation.method(#relativeWeeksAgo, [count]),
             ),
           )
           as String);
 
   @override
-  String planStartDate(String? startDate) =>
+  String relativeMonthsAgo(int? count) =>
       (super.noSuchMethod(
-            Invocation.method(#planStartDate, [startDate]),
+            Invocation.method(#relativeMonthsAgo, [count]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.method(#planStartDate, [startDate]),
+              Invocation.method(#relativeMonthsAgo, [count]),
             ),
           )
           as String);
 
   @override
-  String chartAllTimeTitle(String? name) =>
+  String relativeYearsAgo(int? count) =>
       (super.noSuchMethod(
-            Invocation.method(#chartAllTimeTitle, [name]),
+            Invocation.method(#relativeYearsAgo, [count]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.method(#chartAllTimeTitle, [name]),
+              Invocation.method(#relativeYearsAgo, [count]),
             ),
           )
           as String);
 
   @override
-  String chart30DaysTitle(String? name) =>
+  String sparkAverage(String? value) =>
       (super.noSuchMethod(
-            Invocation.method(#chart30DaysTitle, [name]),
+            Invocation.method(#sparkAverage, [value]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.method(#chart30DaysTitle, [name]),
+              Invocation.method(#sparkAverage, [value]),
             ),
           )
           as String);
 
   @override
-  String chartDuringPlanTitle(String? chartName, String? planName) =>
+  String sparkTrendPerWeek(String? value) =>
       (super.noSuchMethod(
-            Invocation.method(#chartDuringPlanTitle, [chartName, planName]),
+            Invocation.method(#sparkTrendPerWeek, [value]),
             returnValue: _i3.dummyValue<String>(
               this,
-              Invocation.method(#chartDuringPlanTitle, [chartName, planName]),
+              Invocation.method(#sparkTrendPerWeek, [value]),
             ),
           )
           as String);
@@ -4888,17 +5743,6 @@ class MockAppLocalizations extends _i1.Mock implements _i2.AppLocalizations {
           )
           as String);
 
-  @override
-  String imageFormatNotSupportedDetail(String? imageFormat) =>
-      (super.noSuchMethod(
-            Invocation.method(#imageFormatNotSupportedDetail, [imageFormat]),
-            returnValue: _i3.dummyValue<String>(
-              this,
-              Invocation.method(#imageFormatNotSupportedDetail, [imageFormat]),
-            ),
-          )
-          as String);
-
   @override
   String alsoKnownAs(String? aliases) =>
       (super.noSuchMethod(
@@ -4954,6 +5798,17 @@ class MockAppLocalizations extends _i1.Mock implements _i2.AppLocalizations {
           )
           as String);
 
+  @override
+  String syncStatusPendingUploads(int? count) =>
+      (super.noSuchMethod(
+            Invocation.method(#syncStatusPendingUploads, [count]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#syncStatusPendingUploads, [count]),
+            ),
+          )
+          as String);
+
   @override
   String filterNutriscoreOrBetter(String? grade) =>
       (super.noSuchMethod(
@@ -4964,4 +5819,48 @@ class MockAppLocalizations extends _i1.Mock implements _i2.AppLocalizations {
             ),
           )
           as String);
+
+  @override
+  String healthSyncSuccess(int? count) =>
+      (super.noSuchMethod(
+            Invocation.method(#healthSyncSuccess, [count]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#healthSyncSuccess, [count]),
+            ),
+          )
+          as String);
+
+  @override
+  String healthSyncNoData(String? platform) =>
+      (super.noSuchMethod(
+            Invocation.method(#healthSyncNoData, [platform]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#healthSyncNoData, [platform]),
+            ),
+          )
+          as String);
+
+  @override
+  String healthSyncStatus(int? count, String? time) =>
+      (super.noSuchMethod(
+            Invocation.method(#healthSyncStatus, [count, time]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#healthSyncStatus, [count, time]),
+            ),
+          )
+          as String);
+
+  @override
+  String healthSyncPermissionMissing(String? platform) =>
+      (super.noSuchMethod(
+            Invocation.method(#healthSyncPermissionMissing, [platform]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#healthSyncPermissionMissing, [platform]),
+            ),
+          )
+          as String);
 }
diff --git a/test/core/widgets/datetime_input_test.dart b/test/core/widgets/datetime_input_test.dart
index 2a48bdef0..4c779e8c9 100644
--- a/test/core/widgets/datetime_input_test.dart
+++ b/test/core/widgets/datetime_input_test.dart
@@ -177,4 +177,38 @@ void main() {
       expect(find.text('1/5/2021'), findsOneWidget);
     });
   });
+
+  group('DateTimeInputWidget', () {
+    testWidgets('reports the whole moment, keeping the half picked before', (
+      WidgetTester tester,
+    ) async {
+      // The forms collect what they are told without rebuilding, so the
+      // second pick must not be applied to the moment they started with
+      DateTime? reported;
+      await tester.pumpWidget(
+        wrap(
+          DateTimeInputWidget(
+            value: DateTime(2021, 1, 1, 15, 30),
+            onChanged: (value) => reported = value,
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      // Straight through the two halves, whose own pickers are covered above
+      tester.widget<DateInputWidget>(find.byType(DateInputWidget)).onChanged(DateTime(2021, 1, 5));
+      await tester.pumpAndSettle();
+      expect(reported, DateTime(2021, 1, 5, 15, 30));
+
+      tester
+          .widget<TimeInputWidget>(find.byType(TimeInputWidget))
+          .onChanged(const TimeOfDay(hour: 9, minute: 45));
+      await tester.pumpAndSettle();
+
+      // The day of the first pick, the time of the second
+      expect(reported, DateTime(2021, 1, 5, 9, 45));
+      expect(find.text('1/5/2021'), findsOneWidget);
+      expect(find.text('9:45 AM'), findsOneWidget);
+    });
+  });
 }
diff --git a/test/core/widgets/decimal_input_test.dart b/test/core/widgets/decimal_input_test.dart
index 02c57ac97..1a8ee2149 100644
--- a/test/core/widgets/decimal_input_test.dart
+++ b/test/core/widgets/decimal_input_test.dart
@@ -142,4 +142,87 @@ void main() {
 
     expect(formKey.currentState!.validate(), isTrue);
   });
+
+  group('steppers', () {
+    Widget wrapStepped({
+      num? value = 80,
+      String locale = 'en',
+      num? min,
+      num? max,
+      required ValueChanged<num?> onChanged,
+    }) => wrap(
+      DecimalInputWidget(
+        value: value,
+        labelText: 'X',
+        min: min,
+        max: max,
+        steppers: const [1, 0.1],
+        onChanged: onChanged,
+      ),
+      locale: locale,
+    );
+
+    testWidgets('a field without them has no buttons', (WidgetTester tester) async {
+      await tester.pumpWidget(
+        wrap(DecimalInputWidget(value: 80, labelText: 'X', onChanged: (_) {})),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.byType(IconButton), findsNothing);
+    });
+
+    testWidgets('each button steps the field by its size and reports it', (
+      WidgetTester tester,
+    ) async {
+      num? captured;
+      await tester.pumpWidget(wrapStepped(onChanged: (value) => captured = value));
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.byKey(const Key('stepper-minus-0')));
+      await tester.pumpAndSettle();
+      expect(find.text('79'), findsOneWidget);
+      expect(captured, 79);
+
+      await tester.tap(find.byKey(const Key('stepper-plus-1')));
+      await tester.pumpAndSettle();
+      expect(find.text('79.1'), findsOneWidget);
+      expect(captured, 79.1);
+    });
+
+    testWidgets('steps in the format of the active locale', (WidgetTester tester) async {
+      await tester.pumpWidget(wrapStepped(locale: 'de', onChanged: (_) {}));
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.byKey(const Key('stepper-minus-1')));
+      await tester.pumpAndSettle();
+
+      expect(find.text('79,9'), findsOneWidget);
+    });
+
+    testWidgets('a step out of the valid range is ignored', (WidgetTester tester) async {
+      num? captured;
+      await tester.pumpWidget(
+        wrapStepped(value: 80, min: 80, max: 80.5, onChanged: (value) => captured = value),
+      );
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.byKey(const Key('stepper-minus-0')));
+      await tester.tap(find.byKey(const Key('stepper-plus-0')));
+      await tester.pumpAndSettle();
+
+      expect(find.text('80'), findsOneWidget);
+      expect(captured, isNull);
+    });
+
+    testWidgets('an empty field has nothing to step', (WidgetTester tester) async {
+      await tester.pumpWidget(wrapStepped(value: null, onChanged: (_) {}));
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.byKey(const Key('stepper-plus-0')));
+      await tester.pumpAndSettle();
+
+      expect(tester.takeException(), isNull);
+      expect(find.text('1'), findsNothing);
+    });
+  });
 }
diff --git a/test/database/converters/json_map_converter_test.dart b/test/database/converters/json_map_converter_test.dart
new file mode 100644
index 000000000..b7922acfa
--- /dev/null
+++ b/test/database/converters/json_map_converter_test.dart
@@ -0,0 +1,87 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:drift/drift.dart' hide isNull;
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/database/converters/json_map_converter.dart';
+import 'package:wger/database/powersync/database.dart';
+
+import '../../helpers/in_memory_drift.dart';
+
+void main() {
+  const converter = JsonMapConverter();
+
+  group('JsonMapConverter', () {
+    test('decodes a JSON object', () {
+      expect(converter.fromSql('{"unit": "lb", "device": "Scale"}'), {
+        'unit': 'lb',
+        'device': 'Scale',
+      });
+    });
+
+    test('anything that is not a JSON object reads as an empty map', () {
+      expect(converter.fromSql(''), <String, dynamic>{});
+      expect(converter.fromSql('{not json'), <String, dynamic>{});
+      expect(converter.fromSql('[1, 2]'), <String, dynamic>{});
+      expect(converter.fromSql('"kg"'), <String, dynamic>{});
+      expect(converter.fromSql('42'), <String, dynamic>{});
+    });
+  });
+
+  group('extra_data through the Drift database', () {
+    late DriftPowersyncDatabase db;
+
+    setUp(() async {
+      db = await openTestDatabase();
+    });
+
+    tearDown(() async {
+      await db.close();
+    });
+
+    test('a written map survives the roundtrip', () async {
+      await db
+          .into(db.measurementEntryTable)
+          .insert(
+            MeasurementEntryTableCompanion(
+              id: const Value('e-1'),
+              categoryId: const Value('c-1'),
+              date: Value(DateTime.utc(2026, 1, 1)),
+              value: const Value(80.5),
+              notes: const Value(''),
+              extraData: const Value({'unit': 'lb', 'source_unit': 'lb'}),
+            ),
+          );
+
+      final row = await db.select(db.measurementEntryTable).getSingle();
+      expect(row.extraData, {'unit': 'lb', 'source_unit': 'lb'});
+    });
+
+    test('text written by PowerSync is decoded on read', () async {
+      // PowerSync syncs JSON columns as raw text, bypassing the converter
+      await db.customStatement(
+        'INSERT INTO measurements_measurement '
+        '(id, category_id, date, value, notes, source, extra_data) '
+        "VALUES ('e-2', 'c-1', '2026-01-01T00:00:00.000Z', 80.5, '', 'user', '{\"unit\": \"kg\"}')",
+      );
+
+      final row = await db.select(db.measurementEntryTable).getSingle();
+      expect(row.extraData, {'unit': 'kg'});
+    });
+  });
+}
diff --git a/test/features/account/widgets/settings/health_sync_test.dart b/test/features/account/widgets/settings/health_sync_test.dart
new file mode 100644
index 000000000..0c4d7df61
--- /dev/null
+++ b/test/features/account/widgets/settings/health_sync_test.dart
@@ -0,0 +1,265 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/features/account/widgets/settings/health_sync.dart';
+import 'package:wger/features/health/providers/health_repository.dart';
+import 'package:wger/features/health/providers/health_sync.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+/// Reports the platform as available and returns canned results without
+/// touching the real health/preferences stack.
+class _FakeHealthSyncNotifier extends HealthSyncNotifier {
+  final int? enableSyncResult;
+  final HealthSyncState initialState;
+  final HealthPlatformAvailability platformAvailability;
+  int syncCalls = 0;
+  int retryCalls = 0;
+  int installCalls = 0;
+
+  _FakeHealthSyncNotifier(
+    this.enableSyncResult, {
+    this.initialState = const HealthSyncState(),
+    this.platformAvailability = HealthPlatformAvailability.available,
+  });
+
+  @override
+  HealthSyncState build() => initialState;
+
+  @override
+  Future<bool> isAvailable() async => platformAvailability == HealthPlatformAvailability.available;
+
+  @override
+  Future<HealthPlatformAvailability> availability() async => platformAvailability;
+
+  @override
+  Future<void> openHealthConnectInstall() async => installCalls++;
+
+  @override
+  Future<int?> enableSync() async {
+    if (enableSyncResult != null) {
+      state = state.copyWith(isEnabled: true);
+    }
+    return enableSyncResult;
+  }
+
+  @override
+  Future<int> sync() async {
+    syncCalls++;
+    return 0;
+  }
+
+  @override
+  Future<int?> retryWithPermissions() async {
+    retryCalls++;
+    return 0;
+  }
+}
+
+/// Throws from [enableSync], the way a platform that refuses the request does.
+class _ThrowingHealthSyncNotifier extends _FakeHealthSyncNotifier {
+  _ThrowingHealthSyncNotifier() : super(null);
+
+  @override
+  Future<int?> enableSync() async => throw Exception('platform refused');
+}
+
+void main() {
+  Widget createTile(_FakeHealthSyncNotifier fake) {
+    return ProviderScope(
+      overrides: [
+        healthSyncProvider.overrideWith(() => fake),
+      ],
+      child: const MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(body: HealthSyncSettingsTile()),
+      ),
+    );
+  }
+
+  testWidgets('shows a snackbar when the permissions are denied', (tester) async {
+    await tester.pumpWidget(createTile(_FakeHealthSyncNotifier(null)));
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byType(SwitchListTile));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Access to health data was not granted'), findsOneWidget);
+  });
+
+  testWidgets('shows the import count after a successful sync', (tester) async {
+    await tester.pumpWidget(createTile(_FakeHealthSyncNotifier(5)));
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byType(SwitchListTile));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Imported 5 measurements from Health'), findsOneWidget);
+  });
+
+  testWidgets('points at the platform settings when nothing was imported', (tester) async {
+    // An empty first import is what a declined read permission looks like,
+    // iOS never reports the denial itself
+    await tester.pumpWidget(createTile(_FakeHealthSyncNotifier(0)));
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byType(SwitchListTile));
+    await tester.pumpAndSettle();
+
+    expect(
+      find.text(
+        'No health data was found. Check in Health Connect that wger is allowed to read your data.',
+      ),
+      findsOneWidget,
+    );
+  });
+
+  testWidgets('status line shows the last sync and starts a manual one', (tester) async {
+    final fake = _FakeHealthSyncNotifier(
+      null,
+      initialState: HealthSyncState(
+        isEnabled: true,
+        lastSyncCount: 3,
+        lastSyncTime: DateTime(2026, 7, 31, 14, 32),
+      ),
+    );
+    await tester.pumpWidget(createTile(fake));
+    await tester.pumpAndSettle();
+
+    expect(find.textContaining('3 new entries'), findsOneWidget);
+    expect(find.text('Sync now'), findsOneWidget);
+
+    await tester.tap(find.byIcon(Icons.sync));
+    await tester.pumpAndSettle();
+
+    expect(fake.syncCalls, 1);
+  });
+
+  testWidgets('missing permissions are shown and retried interactively', (tester) async {
+    final fake = _FakeHealthSyncNotifier(
+      null,
+      initialState: const HealthSyncState(
+        isEnabled: true,
+        issue: HealthSyncIssue.permissionsMissing,
+      ),
+    );
+    await tester.pumpWidget(createTile(fake));
+    await tester.pumpAndSettle();
+
+    expect(find.textContaining('is not sharing your data'), findsOneWidget);
+    expect(find.text('Tap to grant access again'), findsOneWidget);
+
+    await tester.tap(find.byIcon(Icons.warning_amber));
+    await tester.pumpAndSettle();
+
+    // Re-requesting prompts, a plain sync would not
+    expect(fake.retryCalls, 1);
+    expect(fake.syncCalls, 0);
+  });
+
+  testWidgets('a failed sync is shown as such', (tester) async {
+    await tester.pumpWidget(
+      createTile(
+        _FakeHealthSyncNotifier(
+          null,
+          initialState: const HealthSyncState(isEnabled: true, issue: HealthSyncIssue.failed),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.text('The last sync could not be completed'), findsOneWidget);
+  });
+
+  testWidgets('a throwing enableSync stays in the tile', (tester) async {
+    await tester.pumpWidget(createTile(_ThrowingHealthSyncNotifier()));
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byType(SwitchListTile));
+    await tester.pumpAndSettle();
+
+    // Treated like a denial instead of bubbling into the global error dialog
+    expect(tester.takeException(), isNull);
+    expect(find.text('Access to health data was not granted'), findsOneWidget);
+  });
+
+  testWidgets('offers installing Health Connect instead of hiding the feature', (tester) async {
+    final fake = _FakeHealthSyncNotifier(
+      null,
+      platformAvailability: HealthPlatformAvailability.notInstalled,
+    );
+    await tester.pumpWidget(createTile(fake));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Install Health Connect'), findsOneWidget);
+    expect(find.byType(SwitchListTile), findsNothing);
+
+    await tester.tap(find.text('Install Health Connect'));
+    await tester.pumpAndSettle();
+
+    expect(fake.installCalls, 1);
+  });
+
+  testWidgets('offers updating an outdated Health Connect', (tester) async {
+    await tester.pumpWidget(
+      createTile(
+        _FakeHealthSyncNotifier(
+          null,
+          platformAvailability: HealthPlatformAvailability.updateRequired,
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.text('Update Health Connect'), findsOneWidget);
+  });
+
+  testWidgets('stays hidden where no health platform exists', (tester) async {
+    await tester.pumpWidget(
+      createTile(
+        _FakeHealthSyncNotifier(
+          null,
+          platformAvailability: HealthPlatformAvailability.unsupported,
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.text('Health'), findsNothing);
+    expect(find.byType(ListTile), findsNothing);
+  });
+
+  testWidgets('shows a spinner and blocks interaction while syncing', (tester) async {
+    await tester.pumpWidget(
+      createTile(
+        _FakeHealthSyncNotifier(
+          null,
+          initialState: const HealthSyncState(isEnabled: true, isSyncing: true),
+        ),
+      ),
+    );
+    await tester.pump();
+
+    expect(find.byType(CircularProgressIndicator), findsOneWidget);
+    expect(find.text('Syncing health data…'), findsOneWidget);
+    expect(tester.widget<SwitchListTile>(find.byType(SwitchListTile)).onChanged, isNull);
+  });
+}
diff --git a/test/features/account/widgets/settings_test.dart b/test/features/account/widgets/settings_test.dart
index c3d1ae6d9..91cbc5635 100644
--- a/test/features/account/widgets/settings_test.dart
+++ b/test/features/account/widgets/settings_test.dart
@@ -25,11 +25,26 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:wger/core/app_settings_notifier.dart';
 import 'package:wger/core/consts.dart';
 import 'package:wger/features/account/widgets/settings.dart';
+import 'package:wger/features/health/providers/health_repository.dart';
+import 'package:wger/features/health/providers/health_sync.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/theme/dynamic_color.dart';
 
 import 'settings_test.mocks.dart';
 
+/// Keeps the health sync tile inert (reports the platform as unavailable) so
+/// the settings page renders without booting the real health/preferences stack.
+class _FakeHealthSyncNotifier extends HealthSyncNotifier {
+  @override
+  HealthSyncState build() => const HealthSyncState();
+
+  @override
+  Future<bool> isAvailable() async => false;
+
+  @override
+  Future<HealthPlatformAvailability> availability() async => HealthPlatformAvailability.unsupported;
+}
+
 @GenerateMocks([
   SharedPreferencesAsync,
 ])
@@ -54,6 +69,7 @@ void main() {
     return riverpod.ProviderScope(
       overrides: [
         appSettingsPrefsProvider.overrideWithValue(mockSharedPreferences),
+        healthSyncProvider.overrideWith(_FakeHealthSyncNotifier.new),
         // The plugin has no test implementation and would report the toggle as
         // unsupported, which hides it.
         dynamicColorAvailableProvider.overrideWith((ref) async => dynamicColorAvailable),
diff --git a/test/features/health/health_manifest_test.dart b/test/features/health/health_manifest_test.dart
new file mode 100644
index 000000000..3a03bab0c
--- /dev/null
+++ b/test/features/health/health_manifest_test.dart
@@ -0,0 +1,90 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'dart:io';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:health_bridge/health.dart';
+import 'package:wger/features/health/models/health_metric.dart';
+
+/// The Health Connect read permission each imported type needs declared, as
+/// `HealthPermission.getReadPermission` derives it from the record class.
+/// Deliberately covers the parked types too, so enabling one fails with a
+/// missing manifest entry rather than with an unknown type.
+const _readPermissions = {
+  HealthDataType.WEIGHT: 'android.permission.health.READ_WEIGHT',
+  HealthDataType.BODY_FAT_PERCENTAGE: 'android.permission.health.READ_BODY_FAT',
+  HealthDataType.LEAN_BODY_MASS: 'android.permission.health.READ_LEAN_BODY_MASS',
+  HealthDataType.HEIGHT: 'android.permission.health.READ_HEIGHT',
+  HealthDataType.BLOOD_PRESSURE_SYSTOLIC: 'android.permission.health.READ_BLOOD_PRESSURE',
+  HealthDataType.BLOOD_PRESSURE_DIASTOLIC: 'android.permission.health.READ_BLOOD_PRESSURE',
+  HealthDataType.HEART_RATE: 'android.permission.health.READ_HEART_RATE',
+  HealthDataType.RESTING_HEART_RATE: 'android.permission.health.READ_RESTING_HEART_RATE',
+  HealthDataType.BLOOD_OXYGEN: 'android.permission.health.READ_OXYGEN_SATURATION',
+  // Every sleep type is a SleepSessionRecord, so they share one permission
+  HealthDataType.SLEEP_ASLEEP: 'android.permission.health.READ_SLEEP',
+  HealthDataType.SLEEP_LIGHT: 'android.permission.health.READ_SLEEP',
+  HealthDataType.SLEEP_DEEP: 'android.permission.health.READ_SLEEP',
+  HealthDataType.SLEEP_REM: 'android.permission.health.READ_SLEEP',
+  HealthDataType.SLEEP_AWAKE: 'android.permission.health.READ_SLEEP',
+  HealthDataType.STEPS: 'android.permission.health.READ_STEPS',
+  HealthDataType.DISTANCE_DELTA: 'android.permission.health.READ_DISTANCE',
+  HealthDataType.ACTIVE_ENERGY_BURNED: 'android.permission.health.READ_ACTIVE_CALORIES_BURNED',
+};
+
+void main() {
+  group('Android manifest', () {
+    late String manifest;
+
+    setUpAll(() {
+      manifest = File('android/app/src/main/AndroidManifest.xml').readAsStringSync();
+    });
+
+    test('declares a read permission for every imported type', () {
+      // Health Connect can only grant what the manifest declares, and it
+      // reports an undeclared type as not granted rather than as an error, so
+      // a forgotten entry costs that metric its import without a trace
+      for (final metric in enabledHealthMetrics) {
+        for (final type in metric.dataTypes) {
+          final permission = _readPermissions[type];
+          expect(
+            permission,
+            isNotNull,
+            reason: 'No known Health Connect permission for ${type.name}, add it here',
+          );
+          expect(
+            manifest,
+            contains('android:name="$permission"'),
+            reason:
+                '${metric.metricType.name} imports ${type.name}, '
+                'which needs $permission in the manifest',
+          );
+        }
+      }
+    });
+
+    test('declares the history permission', () {
+      // Without it Health Connect silently caps every read at 30 days, which
+      // makes the first import look complete while missing everything before
+      expect(
+        manifest,
+        contains('android:name="android.permission.health.READ_HEALTH_DATA_HISTORY"'),
+      );
+    });
+  });
+}
diff --git a/test/features/health/models/health_metric_test.dart b/test/features/health/models/health_metric_test.dart
new file mode 100644
index 000000000..b0959d382
--- /dev/null
+++ b/test/features/health/models/health_metric_test.dart
@@ -0,0 +1,150 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:health_bridge/health.dart';
+import 'package:wger/features/health/models/health_metric.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+
+HealthMetric _metric(MetricType type) => healthMetrics.firstWhere((m) => m.metricType == type);
+
+void main() {
+  group('Enabled metric set', () {
+    test('every declared metric is imported', () {
+      expect(
+        enabledHealthMetrics.map((m) => m.metricType),
+        containsAll([
+          MetricType.bodyFat,
+          MetricType.leanBodyMass,
+          MetricType.height,
+          MetricType.bodyWeight,
+          MetricType.bloodPressure,
+          MetricType.heartRate,
+          MetricType.restingHeartRate,
+          MetricType.bloodOxygen,
+          MetricType.sleep,
+          MetricType.steps,
+          MetricType.distance,
+          MetricType.energy,
+        ]),
+      );
+      expect(enabledHealthMetrics.length, 12);
+    });
+
+    test('daily aggregation is set per metric', () {
+      expect(_metric(MetricType.heartRate).dailyAggregation, DailyAggregation.average);
+      // Measured through the night, so a single saturation says little
+      expect(_metric(MetricType.bloodOxygen).dailyAggregation, DailyAggregation.average);
+      // A night arrives as segments from possibly several sources, so the
+      // time they cover is counted once rather than added up
+      expect(_metric(MetricType.sleep).dailyAggregation, DailyAggregation.mergedDuration);
+      // The platforms compute the resting rate per day themselves
+      expect(_metric(MetricType.restingHeartRate).dailyAggregation, isNull);
+      // One record of a counter covers minutes, only the day's total is a
+      // measurement
+      for (final type in [MetricType.steps, MetricType.distance, MetricType.energy]) {
+        expect(_metric(type).dailyAggregation, DailyAggregation.sum);
+      }
+    });
+
+    test('the cumulative types are read in small windows', () {
+      for (final type in [MetricType.steps, MetricType.distance, MetricType.energy]) {
+        expect(_metric(type).readWindow, highVolumeReadWindow);
+      }
+    });
+
+    test('a distance arrives in meters and is stored in kilometers', () {
+      expect(_metric(MetricType.distance).toCategoryValue(5300), closeTo(5.3, 0.001));
+    });
+
+    test('sleep is attributed to the wake day', () {
+      expect(_metric(MetricType.sleep).dayRollsOverAtHour, 18);
+      expect(_metric(MetricType.heartRate).dayRollsOverAtHour, isNull);
+    });
+
+    test('blood pressure reads both component types', () {
+      final bp = _metric(MetricType.bloodPressure);
+      expect(bp.dataTypes, [
+        HealthDataType.BLOOD_PRESSURE_SYSTOLIC,
+        HealthDataType.BLOOD_PRESSURE_DIASTOLIC,
+      ]);
+    });
+
+    test('every group metric has one component per component category', () {
+      // The two lists are paired by position: the readings of the n-th
+      // component go into the category of the n-th component metric type
+      for (final metric in healthMetrics.where((m) => m.components.isNotEmpty)) {
+        expect(metric.components.length, metric.metricType.components.length);
+      }
+    });
+
+    test('every disabled metric explains why', () {
+      // Nothing is parked at the moment; the rule is for the next type that is
+      // declared before its groundwork exists
+      expect(healthMetrics.where((m) => !m.enabled).every((m) => m.disabledReason != null), isTrue);
+    });
+
+    test('metric types are unique', () {
+      final types = healthMetrics.map((m) => m.metricType).toList();
+      expect(types.length, types.toSet().length);
+    });
+  });
+
+  group('Body fat conversion', () {
+    final bodyFat = _metric(MetricType.bodyFat);
+
+    test('iOS fraction is scaled to a percentage', () {
+      expect(bodyFat.toCategoryValue(0.15), closeTo(15, 0.001));
+    });
+
+    test('Health Connect percentage is kept as-is', () {
+      expect(bodyFat.toCategoryValue(15), closeTo(15, 0.001));
+    });
+  });
+
+  group('Blood oxygen conversion', () {
+    final bloodOxygen = _metric(MetricType.bloodOxygen);
+
+    test('iOS fraction is scaled to a percentage', () {
+      expect(bloodOxygen.toCategoryValue(0.95), closeTo(95, 0.001));
+    });
+
+    test('Health Connect percentage is kept as-is', () {
+      expect(bloodOxygen.toCategoryValue(95), closeTo(95, 0.001));
+    });
+  });
+
+  group('Height conversion', () {
+    final height = _metric(MetricType.height);
+
+    test('meters are converted to centimeters', () {
+      expect(height.toCategoryValue(1.75), closeTo(175, 0.001));
+    });
+
+    test('a value already in centimeters is kept as-is', () {
+      expect(height.toCategoryValue(180), closeTo(180, 0.001));
+    });
+  });
+
+  test('enabledHealthMetrics matches the enabled flag', () {
+    expect(
+      enabledHealthMetrics,
+      healthMetrics.where((m) => m.enabled).toList(),
+    );
+  });
+}
diff --git a/test/features/health/models/health_reading_test.dart b/test/features/health/models/health_reading_test.dart
new file mode 100644
index 000000000..b80fec904
--- /dev/null
+++ b/test/features/health/models/health_reading_test.dart
@@ -0,0 +1,86 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:health_bridge/health.dart';
+import 'package:wger/features/health/models/health_reading.dart';
+
+HealthDataPoint dataPoint({String uuid = 'abc-123', HealthValue? value}) {
+  return HealthDataPoint(
+    uuid: uuid,
+    value: value ?? NumericHealthValue(numericValue: 1.8),
+    type: HealthDataType.HEIGHT,
+    unit: HealthDataUnit.METER,
+    dateFrom: DateTime(2026, 1, 1, 8, 30),
+    dateTo: DateTime(2026, 1, 1, 8, 30),
+    sourcePlatform: HealthPlatformType.appleHealth,
+    sourceDeviceId: 'device',
+    sourceId: 'source',
+    sourceName: 'test',
+  );
+}
+
+void main() {
+  group('fromDataPoint', () {
+    test('extracts the numeric value, type, dates and provenance', () {
+      final reading = HealthReading.fromDataPoint(dataPoint())!;
+
+      expect(reading.type, HealthDataType.HEIGHT);
+      expect(reading.value, 1.8);
+      expect(reading.date, DateTime(2026, 1, 1, 8, 30));
+      expect(reading.externalId, 'abc-123');
+      expect(reading.unit, HealthDataUnit.METER);
+      // dateTo equal to dateFrom marks a sample, not a duration record
+      expect(reading.dateTo, isNull);
+      expect(reading.recordingMethod, RecordingMethod.unknown);
+      expect(reading.sourceName, 'test');
+      expect(reading.sourceId, 'source');
+      expect(reading.sourceDeviceId, 'device');
+      // Not reported by the fixture, must be null rather than an empty string
+      expect(reading.deviceModel, isNull);
+    });
+
+    test('keeps the interval end for duration records', () {
+      final point = dataPoint();
+      point.dateTo = DateTime(2026, 1, 1, 9, 0);
+
+      expect(HealthReading.fromDataPoint(point)!.dateTo, DateTime(2026, 1, 1, 9, 0));
+    });
+
+    test('returns null for a non-numeric value', () {
+      final point = dataPoint(value: NutritionHealthValue());
+
+      expect(HealthReading.fromDataPoint(point), isNull);
+    });
+
+    test('lowercases the platform UUID to match the server normalization', () {
+      final point = dataPoint(uuid: '1A2B3C4D-C36C-495A-93FC-0C247A3E6E5F');
+
+      expect(
+        HealthReading.fromDataPoint(point)!.externalId,
+        '1a2b3c4d-c36c-495a-93fc-0c247a3e6e5f',
+      );
+    });
+
+    test('maps an empty UUID to null', () {
+      final point = dataPoint(uuid: '');
+
+      expect(HealthReading.fromDataPoint(point)!.externalId, isNull);
+    });
+  });
+}
diff --git a/test/features/health/providers/health_importer_test.dart b/test/features/health/providers/health_importer_test.dart
new file mode 100644
index 000000000..261039a63
--- /dev/null
+++ b/test/features/health/providers/health_importer_test.dart
@@ -0,0 +1,1484 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:health_bridge/health.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+import 'package:wger/core/network/auth_credentials_storage.dart';
+import 'package:wger/core/shared_preferences.dart';
+import 'package:wger/features/health/models/health_metric.dart';
+import 'package:wger/features/health/models/health_reading.dart';
+import 'package:wger/features/health/providers/health_importer.dart';
+import 'package:wger/features/health/providers/health_repository.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+
+import 'health_importer_test.mocks.dart';
+
+// Platform record ids are UUIDs in production and only pass through unchanged
+// if they are, so the fixtures use real ones behind readable names.
+const _idBf1 = '00000001-0000-4000-8000-000000000001'; // bf-1
+const _idBf2 = '00000002-0000-4000-8000-000000000002'; // bf-2
+const _idBp1 = '00000003-0000-4000-8000-000000000003'; // bp-1
+const _idH1 = '00000004-0000-4000-8000-000000000004'; // h-1
+const _idHInterval = '00000005-0000-4000-8000-000000000005'; // h-interval
+const _idHr1 = '00000006-0000-4000-8000-000000000006'; // hr-1
+const _idHr2 = '00000007-0000-4000-8000-000000000007'; // hr-2
+const _idHr3 = '00000008-0000-4000-8000-000000000008'; // hr-3
+const _idRhr1 = '00000009-0000-4000-8000-000000000009'; // rhr-1
+const _idS1 = '0000000a-0000-4000-8000-000000000010'; // s-1
+const _idS2 = '0000000b-0000-4000-8000-000000000011'; // s-2
+const _idS3 = '0000000c-0000-4000-8000-000000000012'; // s-3
+const _idS4 = '0000000f-0000-4000-8000-000000000015'; // s-4
+const _idW1 = '0000000d-0000-4000-8000-000000000013'; // w-1
+const _idWLb = '0000000e-0000-4000-8000-000000000014'; // w-lb
+
+// Category ids are UUIDs too, and dailyAggregateExternalId parses them as the
+// v5 namespace.
+const _catHrId = 'aaaaaaaa-0000-4000-8000-000000000001';
+const _catSleepId = 'bbbbbbbb-0000-4000-8000-000000000002';
+
+/// Whether the local zone shifts its clocks in the night the DST test uses.
+///
+/// The zone belongs to the process, so a single test cannot pick its own; where
+/// there is no shift, that test cannot tell the two ways of counting a day
+/// apart and is skipped rather than passing without meaning.
+final _springsForward =
+    DateTime(2026, 3, 29).timeZoneOffset != DateTime(2026, 3, 30).timeZoneOffset;
+
+@GenerateMocks([HealthRepository, MeasurementRepository, AuthCredentialsStorage])
+void main() {
+  // SharedPreferencesAsync needs a binding for its platform channel
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  late MockHealthRepository health;
+  late MockMeasurementRepository measurements;
+  late MockAuthCredentialsStorage credentials;
+
+  setUp(() async {
+    SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
+    // SharedPreferencesAsync captures the platform instance in its constructor,
+    // and PreferenceHelper builds its own once for the whole run, so the line
+    // above only takes effect for the first test. Clear what this suite writes
+    await PreferenceHelper.instance.clearHealthSyncPreferences();
+    await PreferenceHelper.instance.setHealthSyncEnabled(true);
+
+    health = MockHealthRepository();
+    measurements = MockMeasurementRepository();
+    credentials = MockAuthCredentialsStorage();
+    when(credentials.dbOwnerUserId()).thenAnswer((_) async => '2');
+
+    when(health.ensureAuthorized(any)).thenAnswer((_) async => true);
+    when(health.readableTypes(any)).thenAnswer(
+      (invocation) async => (invocation.positionalArguments.first as List<HealthDataType>).toSet(),
+    );
+    when(health.sourceName).thenReturn('apple');
+    when(measurements.addLocalDrift(any)).thenAnswer((_) async {});
+    when(measurements.updateLocalDrift(any)).thenAnswer((_) async {});
+    when(measurements.addLocalDriftCategory(any)).thenAnswer((_) async {});
+    when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+    when(measurements.getExternalIds(any)).thenAnswer((_) async => <String>{});
+    when(
+      measurements.getEntriesByExternalId(any),
+    ).thenAnswer((_) async => <String, MeasurementEntry>{});
+    when(measurements.hasEntries(any)).thenAnswer((_) async => false);
+  });
+
+  HealthImporter createImporter() => HealthImporter(
+    health: health,
+    measurements: measurements,
+    prefs: PreferenceHelper.instance,
+    credentials: credentials,
+  );
+
+  /// One run, reduced to the number of entries it wrote.
+  Future<int> runImport() async => (await createImporter().run()).imported;
+
+  /// A watermark for every enabled metric, i.e. what an install that has
+  /// imported before looks like.
+  Future<void> seedWatermarks(String timestamp) =>
+      PreferenceHelper.instance.setHealthSyncWatermarks({
+        for (final metric in enabledHealthMetrics) metric.metricType.name: timestamp,
+      });
+
+  /// How far [type] has been imported, null while it has no watermark.
+  Future<String?> watermarkOf(MetricType type) async =>
+      (await PreferenceHelper.instance.getHealthSyncWatermarks())[type.name];
+
+  /// A category for every enabled metric, components included, all on the ids
+  /// the sync derives. Without them the sync reads the full history instead of
+  /// starting from the watermark.
+  List<MeasurementCategory> categoriesForEveryMetric() {
+    final categories = <MeasurementCategory>[];
+    for (final metric in enabledHealthMetrics) {
+      if (metric.metricType == MetricType.bodyWeight) {
+        categories.add(
+          MeasurementCategory(
+            id: 'official-body-weight',
+            name: 'Body weight',
+            unit: 'kg',
+            metricType: MetricType.bodyWeight,
+            isOfficial: true,
+          ),
+        );
+        continue;
+      }
+
+      final parentId = deterministicCategoryId('2', metric.metricType);
+      categories.add(
+        MeasurementCategory(
+          id: parentId,
+          name: metric.canonicalName,
+          unit: metric.unit,
+          metricType: metric.metricType,
+        ),
+      );
+      for (final (order, metricType) in metric.metricType.components.indexed) {
+        categories.add(
+          MeasurementCategory(
+            id: deterministicCategoryId('2', metricType),
+            name: metricType.canonicalName,
+            unit: metricType.defaultUnit,
+            metricType: metricType,
+            parentId: parentId,
+            order: order,
+          ),
+        );
+      }
+    }
+    return categories;
+  }
+
+  /// The start of the window the sync asked the platform for, per data type.
+  ///
+  /// Every metric is read separately and a metric that aggregates per day
+  /// starts at the beginning of its own day, so the starts differ.
+  Map<HealthDataType, DateTime> capturedReadStarts() {
+    final captured = verify(
+      health.read(
+        types: captureAnyNamed('types'),
+        start: captureAnyNamed('start'),
+        end: anyNamed('end'),
+        window: anyNamed('window'),
+      ),
+    ).captured;
+
+    final starts = <HealthDataType, DateTime>{};
+    for (var i = 0; i < captured.length; i += 2) {
+      for (final type in captured[i] as List<HealthDataType>) {
+        starts[type] = captured[i + 1] as DateTime;
+      }
+    }
+    return starts;
+  }
+
+  /// The start of the window for the metric reading [type], body weight by
+  /// default: a plain sample metric, which reads from the unrounded start
+  DateTime capturedReadStart([HealthDataType type = HealthDataType.WEIGHT]) =>
+      capturedReadStarts()[type]!;
+
+  /// Every health data type the sync asked the platform for
+  List<HealthDataType> capturedReadTypes() => verify(
+    health.read(
+      types: captureAnyNamed('types'),
+      start: anyNamed('start'),
+      end: anyNamed('end'),
+      window: anyNamed('window'),
+    ),
+  ).captured.cast<List<HealthDataType>>().expand((types) => types).toList();
+
+  void stubReadings(List<HealthReading> readings) {
+    when(
+      health.read(
+        types: anyNamed('types'),
+        start: anyNamed('start'),
+        end: anyNamed('end'),
+        window: anyNamed('window'),
+      ),
+    ).thenAnswer((_) async => readings);
+  }
+
+  group('run', () {
+    test('never asks for permissions itself, it would prompt out of nowhere', () async {
+      stubReadings([]);
+
+      await runImport();
+
+      verify(health.readableTypes(any)).called(1);
+      verifyNever(health.ensureAuthorized(any));
+    });
+
+    test('flags missing permissions instead of reading', () async {
+      when(health.readableTypes(any)).thenAnswer((_) async => <HealthDataType>{});
+
+      final result = await createImporter().run();
+
+      expect(result.imported, 0);
+      expect(result.issue, HealthSyncIssue.permissionsMissing);
+      verifyNever(
+        health.read(
+          types: anyNamed('types'),
+          start: anyNamed('start'),
+          end: anyNamed('end'),
+          window: anyNamed('window'),
+        ),
+      );
+    });
+
+    test('a metric without access costs only itself its import', () async {
+      // Both platforms hand out access per type, and Health Connect invites
+      // the user to untick single ones, so one declined type must not stop
+      // everything else
+      final bloodPressure = enabledHealthMetrics.firstWhere(
+        (m) => m.metricType == MetricType.bloodPressure,
+      );
+      when(health.readableTypes(any)).thenAnswer(
+        (invocation) async => (invocation.positionalArguments.first as List<HealthDataType>)
+            .toSet()
+            .difference(bloodPressure.dataTypes.toSet()),
+      );
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.BODY_FAT_PERCENTAGE,
+          value: 0.2,
+          date: DateTime(2026, 1, 1),
+          externalId: _idBf1,
+        ),
+      ]);
+
+      final result = await createImporter().run();
+
+      expect(result.imported, 1);
+      expect(result.issue, isNull);
+      // The declined types are not even asked for
+      final requested = capturedReadTypes();
+      expect(requested, isNot(contains(HealthDataType.BLOOD_PRESSURE_SYSTOLIC)));
+      expect(requested, contains(HealthDataType.BODY_FAT_PERCENTAGE));
+    });
+
+    test('reads the full history when a type becomes readable', () async {
+      // Granting access to a type that was declined leaves the same hole as a
+      // deleted category: nothing was ever imported for it
+      await seedWatermarks('2026-06-01T12:00:00.000');
+      await PreferenceHelper.instance.setHealthSyncReadableTypes([
+        HealthDataType.BODY_FAT_PERCENTAGE.name,
+      ]);
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => categoriesForEveryMetric());
+      stubReadings([]);
+
+      await runImport();
+
+      expect(capturedReadStart(), DateTime(2020));
+    });
+
+    test('stays on the watermark while the readable types are unchanged', () async {
+      await seedWatermarks('2026-06-01T12:00:00.000');
+      await PreferenceHelper.instance.setHealthSyncReadableTypes([
+        for (final metric in enabledHealthMetrics)
+          for (final type in metric.dataTypes) type.name,
+      ]);
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => categoriesForEveryMetric());
+      stubReadings([]);
+
+      await runImport();
+
+      expect(capturedReadStart(), DateTime(2026, 5, 2, 12));
+    });
+
+    test('a read the platform refuses for authorization is a permission issue', () async {
+      // The one permission problem iOS reports at all, and what a reinstall
+      // leaves behind: the preference says enabled, HealthKit disagrees
+      when(
+        health.read(
+          types: anyNamed('types'),
+          start: anyNamed('start'),
+          end: anyNamed('end'),
+          window: anyNamed('window'),
+        ),
+      ).thenThrow(
+        PlatformException(
+          code: 'HEALTH_ERROR',
+          message: 'Error getting health data: Authorization not determined',
+        ),
+      );
+
+      final result = await createImporter().run();
+
+      expect(result.imported, 0);
+      expect(result.issue, HealthSyncIssue.permissionsMissing);
+    });
+
+    test('any other failure is reported as a plain failure', () async {
+      when(
+        health.read(
+          types: anyNamed('types'),
+          start: anyNamed('start'),
+          end: anyNamed('end'),
+          window: anyNamed('window'),
+        ),
+      ).thenThrow(Exception('boom'));
+
+      final result = await createImporter().run();
+
+      expect(result.imported, 0);
+      expect(result.issue, HealthSyncIssue.failed);
+    });
+
+    test('one failing metric does not cost the others their import', () async {
+      // Writing the body fat entry fails; height must still make it in, and
+      // the watermark must stay put so the lost readings stay in the window
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+      when(measurements.addLocalDrift(any)).thenAnswer((invocation) async {
+        final entry = invocation.positionalArguments.first as MeasurementEntry;
+        if (entry.value == 20) {
+          throw Exception('write failed');
+        }
+      });
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.BODY_FAT_PERCENTAGE,
+          value: 0.2,
+          date: DateTime(2026, 1, 1),
+          externalId: _idBf1,
+        ),
+        HealthReading(
+          type: HealthDataType.HEIGHT,
+          value: 1.8,
+          date: DateTime(2026, 1, 2),
+          externalId: _idH1,
+        ),
+      ]);
+
+      final result = await createImporter().run();
+
+      expect(result.imported, 1);
+      expect(result.issue, HealthSyncIssue.failed);
+      // Body fat keeps its full-window read, height moves on without it
+      expect(await watermarkOf(MetricType.bodyFat), isNull);
+      expect(await watermarkOf(MetricType.height), isNotNull);
+    });
+
+    test('imports enabled metrics into new categories with converted values', () async {
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.BODY_FAT_PERCENTAGE,
+          value: 0.2,
+          date: DateTime(2026, 1, 1),
+          externalId: _idBf1,
+        ),
+        HealthReading(
+          type: HealthDataType.HEIGHT,
+          // 1.803 * 100 is 180.29999999999998 in double arithmetic; the
+          // server's Decimal(2) validation requires the stored value to be
+          // rounded to exactly 180.3
+          value: 1.803,
+          date: DateTime(2026, 1, 2),
+          externalId: _idH1,
+        ),
+        // A blood pressure reading is the systolic/diastolic pair sharing one
+        // timestamp; Health Connect also shares the record uuid between them
+        HealthReading(
+          type: HealthDataType.BLOOD_PRESSURE_SYSTOLIC,
+          value: 120,
+          date: DateTime(2026, 1, 3),
+          externalId: _idBp1,
+        ),
+        HealthReading(
+          type: HealthDataType.BLOOD_PRESSURE_DIASTOLIC,
+          value: 80,
+          date: DateTime(2026, 1, 3),
+          externalId: _idBp1,
+        ),
+      ]);
+
+      final count = await runImport();
+      expect(count, 4);
+
+      final createdCategories = verify(
+        measurements.addLocalDriftCategory(captureAny),
+      ).captured.cast<MeasurementCategory>();
+      expect(
+        createdCategories.map((c) => c.metricType),
+        containsAll([MetricType.bodyFat, MetricType.height, MetricType.bloodPressure]),
+      );
+
+      // Blood pressure becomes a group: the typed parent stays entry-free,
+      // the readings go into its ordered children
+      final bloodPressure = createdCategories.firstWhere(
+        (c) => c.metricType == MetricType.bloodPressure,
+      );
+      expect(bloodPressure.parentId, isNull);
+      final systolic = createdCategories.firstWhere(
+        (c) => c.metricType == MetricType.bloodPressureSystolic,
+      );
+      final diastolic = createdCategories.firstWhere(
+        (c) => c.metricType == MetricType.bloodPressureDiastolic,
+      );
+      expect(systolic.name, 'Systolic');
+      expect(systolic.parentId, bloodPressure.id);
+      expect(systolic.order, 0);
+      expect(diastolic.name, 'Diastolic');
+      expect(diastolic.parentId, bloodPressure.id);
+      expect(diastolic.order, 1);
+
+      // Every created category takes the id derived from user and metric
+      // type, which is the one the server derives as well
+      for (final category in createdCategories) {
+        expect(category.id, deterministicCategoryId('2', category.metricType));
+      }
+
+      final entries = verify(
+        measurements.addLocalDrift(captureAny),
+      ).captured.cast<MeasurementEntry>();
+
+      final bodyFat = entries.firstWhere((e) => e.externalId == _idBf1);
+      expect(bodyFat.value, closeTo(20, 0.001)); // fraction -> percent
+      expect(bodyFat.source, 'apple');
+      // No unit key (category unit applies), but the conversion provenance
+      // keeps the platform's original value
+      expect(bodyFat.extraData, {
+        'recording_method': 'unknown',
+        'record_type': 'BODY_FAT_PERCENTAGE',
+        'source_value': 0.2,
+      });
+
+      final height = entries.firstWhere((e) => e.externalId == _idH1);
+      expect(height.value, 180.3); // meters -> cm, rounded to two decimals
+
+      final systolicEntry = entries.firstWhere((e) => e.categoryId == systolic.id);
+      final diastolicEntry = entries.firstWhere((e) => e.categoryId == diastolic.id);
+      expect(systolicEntry.value, 120);
+      expect(diastolicEntry.value, 80);
+      // The pair keeps its shared timestamp and record uuid
+      expect(systolicEntry.date, diastolicEntry.date);
+      expect(systolicEntry.externalId, _idBp1);
+      expect(diastolicEntry.externalId, _idBp1);
+      expect(entries, hasLength(4));
+
+      // The newest imported reading date becomes the metric's next watermark
+      expect(
+        await watermarkOf(MetricType.bloodPressure),
+        DateTime(2026, 1, 3).toIso8601String(),
+      );
+    });
+
+    test('folds a non-UUID platform id into a UUID and keeps the original', () async {
+      // Health Connect only documents Metadata.id as a String; a non-UUID would
+      // be rejected permanently by the server's UUIDField
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.HEIGHT,
+          value: 1.8,
+          date: DateTime(2026, 1, 2),
+          externalId: 'not-a-uuid-42',
+        ),
+      ]);
+
+      await runImport();
+
+      final entry =
+          verify(measurements.addLocalDrift(captureAny)).captured.single as MeasurementEntry;
+      expect(entry.externalId, matches(RegExp(r'^[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$')));
+      // The platform's own id survives for the later delete sync
+      expect(entry.extraData?['source_record_id'], 'not-a-uuid-42');
+    });
+
+    test('passes a valid platform UUID through untouched', () async {
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.HEIGHT,
+          value: 1.8,
+          date: DateTime(2026, 1, 2),
+          externalId: '3f2504e0-4f89-41d3-9a0c-0305e82c3301',
+        ),
+      ]);
+
+      await runImport();
+
+      final entry =
+          verify(measurements.addLocalDrift(captureAny)).captured.single as MeasurementEntry;
+      expect(entry.externalId, '3f2504e0-4f89-41d3-9a0c-0305e82c3301');
+      expect(entry.extraData, isNot(contains('source_record_id')));
+    });
+
+    test('dedups folded ids on re-import', () async {
+      // The fold is deterministic, so the second sync recognises the entry
+      final existing = MeasurementCategory(
+        id: _catHrId,
+        name: 'Height',
+        unit: 'cm',
+        metricType: MetricType.height,
+      );
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => [existing]);
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.HEIGHT,
+          value: 1.8,
+          date: DateTime(2026, 1, 2),
+          externalId: 'not-a-uuid-42',
+        ),
+      ]);
+
+      await runImport();
+      final firstId =
+          (verify(measurements.addLocalDrift(captureAny)).captured.single as MeasurementEntry)
+              .externalId!;
+
+      // Same reading again, with the entry already stored under the folded id
+      when(measurements.getExternalIds(_catHrId)).thenAnswer((_) async => {firstId});
+
+      final count = await runImport();
+
+      expect(count, 0);
+      verifyNever(measurements.addLocalDrift(any));
+    });
+
+    test('skips readings already imported (dedup by externalId)', () async {
+      final existing = MeasurementCategory(
+        id: 'cat-bf',
+        name: 'Body fat',
+        unit: '%',
+        metricType: MetricType.bodyFat,
+      );
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => [existing]);
+      when(measurements.getExternalIds('cat-bf')).thenAnswer((_) async => {_idBf1});
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.BODY_FAT_PERCENTAGE,
+          value: 0.2,
+          date: DateTime(2026, 1, 1),
+          externalId: _idBf1, // already imported
+        ),
+        HealthReading(
+          type: HealthDataType.BODY_FAT_PERCENTAGE,
+          value: 0.22,
+          date: DateTime(2026, 1, 3),
+          externalId: _idBf2, // new
+        ),
+      ]);
+
+      final count = await runImport();
+      expect(count, 1);
+      verifyNever(measurements.addLocalDriftCategory(any));
+
+      final entries = verify(
+        measurements.addLocalDrift(captureAny),
+      ).captured.cast<MeasurementEntry>();
+      expect(entries.single.externalId, _idBf2);
+    });
+
+    test('drops a reading outside the limits of its metric type', () async {
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.BODY_FAT_PERCENTAGE,
+          value: 0.9, // 90 %, more than the server accepts
+          date: DateTime(2026, 1, 1),
+          externalId: _idBf1,
+        ),
+        HealthReading(
+          type: HealthDataType.BODY_FAT_PERCENTAGE,
+          value: 0.22,
+          date: DateTime(2026, 1, 3),
+          externalId: _idBf2,
+        ),
+      ]);
+
+      final count = await runImport();
+
+      expect(count, 1);
+      final entries = verify(
+        measurements.addLocalDrift(captureAny),
+      ).captured.cast<MeasurementEntry>();
+      expect(entries.single.externalId, _idBf2);
+    });
+
+    test('imports weight only into the official body weight category', () async {
+      // A user-created lookalike must not receive the readings
+      final lookalike = MeasurementCategory(
+        id: 'cat-custom',
+        name: 'Weight',
+        unit: 'kg',
+        metricType: MetricType.bodyWeight,
+      );
+      final official = MeasurementCategory(
+        id: 'cat-official',
+        name: 'Weight',
+        unit: 'kg',
+        metricType: MetricType.bodyWeight,
+        isOfficial: true,
+      );
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => [lookalike, official]);
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.WEIGHT,
+          value: 80.5,
+          date: DateTime(2026, 1, 1),
+          externalId: _idW1,
+        ),
+      ]);
+
+      final count = await runImport();
+      expect(count, 1);
+      verifyNever(measurements.addLocalDriftCategory(any));
+
+      final entry =
+          verify(measurements.addLocalDrift(captureAny)).captured.single as MeasurementEntry;
+      expect(entry.categoryId, 'cat-official');
+      // Stored unconverted, with the unit and the recording provenance stamped
+      expect(entry.value, 80.5);
+      expect(entry.extraData, {
+        'unit': 'kg',
+        'recording_method': 'unknown',
+        'record_type': 'WEIGHT',
+      });
+    });
+
+    test('converts pound readings to kg and keeps the original', () async {
+      final official = MeasurementCategory(
+        id: 'cat-official',
+        name: 'Weight',
+        unit: 'kg',
+        metricType: MetricType.bodyWeight,
+        isOfficial: true,
+      );
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => [official]);
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.WEIGHT,
+          value: 177.0,
+          unit: HealthDataUnit.POUND,
+          date: DateTime(2026, 1, 1),
+          externalId: _idWLb,
+          recordingMethod: RecordingMethod.manual,
+          sourceName: 'Withings Body+',
+        ),
+      ]);
+
+      await runImport();
+
+      final entry =
+          verify(measurements.addLocalDrift(captureAny)).captured.single as MeasurementEntry;
+      // 177 lb * 0.45359237 = 80.29 kg
+      expect(entry.value, 80.29);
+      expect(entry.extraData, {
+        'unit': 'kg',
+        'recording_method': 'manual',
+        'record_type': 'WEIGHT',
+        'source_name': 'Withings Body+',
+        'source_value': 177.0,
+        'source_unit': 'lb',
+      });
+    });
+
+    test('aggregates heart rate into one entry per day', () async {
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.HEART_RATE,
+          value: 60,
+          date: DateTime(2026, 1, 1, 8),
+          externalId: _idHr1,
+        ),
+        HealthReading(
+          type: HealthDataType.HEART_RATE,
+          value: 71,
+          date: DateTime(2026, 1, 1, 20),
+          externalId: _idHr2,
+        ),
+        HealthReading(
+          type: HealthDataType.HEART_RATE,
+          value: 64,
+          date: DateTime(2026, 1, 2, 9),
+          externalId: _idHr3,
+        ),
+      ]);
+
+      final count = await runImport();
+
+      // Three samples become two daily entries
+      expect(count, 2);
+      final entries = verify(
+        measurements.addLocalDrift(captureAny),
+      ).captured.cast<MeasurementEntry>();
+      expect(entries, hasLength(2));
+
+      final categoryId =
+          (verify(measurements.addLocalDriftCategory(captureAny)).captured.single
+                  as MeasurementCategory)
+              .id!;
+
+      final day1 = entries.firstWhere(
+        (e) => e.externalId == dailyAggregateExternalId(categoryId, DateTime(2026, 1, 1)),
+      );
+      expect(day1.date, DateTime(2026, 1, 1));
+      expect(day1.value, 65.5); // (60 + 71) / 2
+      expect(day1.extraData, {
+        'min': 60,
+        'max': 71,
+        'sample_count': 2,
+        'record_type': 'HEART_RATE',
+      });
+
+      final day2 = entries.firstWhere(
+        (e) => e.externalId == dailyAggregateExternalId(categoryId, DateTime(2026, 1, 2)),
+      );
+      expect(day2.value, 64);
+      expect(day2.extraData?['sample_count'], 1);
+
+      // The watermark tracks the newest sample, not the aggregate's date
+      expect(
+        await watermarkOf(MetricType.heartRate),
+        DateTime(2026, 1, 2, 9).toIso8601String(),
+      );
+    });
+
+    test('keeps resting heart rate in its own category, imported raw', () async {
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.HEART_RATE,
+          value: 70,
+          date: DateTime(2026, 1, 1, 8),
+          externalId: _idHr1,
+        ),
+        HealthReading(
+          type: HealthDataType.RESTING_HEART_RATE,
+          value: 52,
+          date: DateTime(2026, 1, 1, 4),
+          externalId: _idRhr1,
+        ),
+      ]);
+
+      await runImport();
+
+      final categories = verify(
+        measurements.addLocalDriftCategory(captureAny),
+      ).captured.cast<MeasurementCategory>();
+      final heartRate = categories.firstWhere((c) => c.metricType == MetricType.heartRate);
+      final resting = categories.firstWhere((c) => c.metricType == MetricType.restingHeartRate);
+      expect(resting.id, isNot(heartRate.id));
+
+      final entries = verify(
+        measurements.addLocalDrift(captureAny),
+      ).captured.cast<MeasurementEntry>();
+      final restingEntry = entries.firstWhere((e) => e.categoryId == resting.id);
+      // Raw import: the platform record uuid and timestamp are kept as-is,
+      // no day- key and no aggregate extra_data
+      expect(restingEntry.externalId, _idRhr1);
+      expect(restingEntry.date, DateTime(2026, 1, 1, 4));
+      expect(restingEntry.value, 52);
+      expect(restingEntry.extraData, isNot(contains('sample_count')));
+    });
+
+    test('sums a night of sleep onto the wake day', () async {
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+      stubReadings([
+        // One night, split into segments across midnight: everything from
+        // 18:00 onwards counts towards the following day
+        HealthReading(
+          type: HealthDataType.SLEEP_ASLEEP,
+          value: 90,
+          date: DateTime(2026, 1, 1, 22, 30),
+          dateTo: DateTime(2026, 1, 2, 0, 0),
+          externalId: _idS1,
+        ),
+        HealthReading(
+          type: HealthDataType.SLEEP_ASLEEP,
+          value: 360,
+          date: DateTime(2026, 1, 2, 0, 0),
+          dateTo: DateTime(2026, 1, 2, 6, 0),
+          externalId: _idS2,
+        ),
+        // A nap in the afternoon lands on its own calendar day
+        HealthReading(
+          type: HealthDataType.SLEEP_ASLEEP,
+          value: 30,
+          date: DateTime(2026, 1, 2, 14, 0),
+          dateTo: DateTime(2026, 1, 2, 14, 30),
+          externalId: _idS3,
+        ),
+      ]);
+
+      final count = await runImport();
+
+      // All three segments belong to 2026-01-02, and only the total collects
+      // them: the stage categories have no samples of their own here
+      expect(count, 1);
+      final entry =
+          verify(measurements.addLocalDrift(captureAny)).captured.single as MeasurementEntry;
+      final categoryId = _sleepCategoryId(measurements, MetricType.sleepTotal);
+      expect(entry.categoryId, categoryId);
+      expect(entry.externalId, dailyAggregateExternalId(categoryId, DateTime(2026, 1, 2)));
+      expect(entry.date, DateTime(2026, 1, 2));
+      expect(entry.value, 480); // 90 + 360 + 30 minutes
+      expect(entry.extraData, {
+        'sample_count': 3,
+        'record_type': 'SLEEP_ASLEEP',
+        // The window the segments really cover, since the entry's date is the
+        // wake day rather than the samples' calendar day
+        'date_from': DateTime(2026, 1, 1, 22, 30).toIso8601String(),
+        'date_to': DateTime(2026, 1, 2, 14, 30).toIso8601String(),
+      });
+      // A summed metric has no meaningful per-sample min/max
+      expect(entry.extraData, isNot(contains('min')));
+    });
+
+    test('splits sleep into separate days at the rollover hour', () async {
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+      stubReadings([
+        // 17:59 still belongs to the first day, 18:00 already to the next
+        HealthReading(
+          type: HealthDataType.SLEEP_ASLEEP,
+          value: 20,
+          date: DateTime(2026, 1, 1, 17, 59),
+          externalId: _idS1,
+        ),
+        HealthReading(
+          type: HealthDataType.SLEEP_ASLEEP,
+          value: 400,
+          date: DateTime(2026, 1, 1, 18, 0),
+          externalId: _idS2,
+        ),
+      ]);
+
+      final count = await runImport();
+
+      expect(count, 2);
+      final entries = verify(
+        measurements.addLocalDrift(captureAny),
+      ).captured.cast<MeasurementEntry>();
+      final categoryId = _sleepCategoryId(measurements, MetricType.sleepTotal);
+      final byDay = {
+        for (final e in entries) e.externalId: e.value,
+      };
+      expect(byDay[dailyAggregateExternalId(categoryId, DateTime(2026, 1, 1))], 20);
+      expect(byDay[dailyAggregateExternalId(categoryId, DateTime(2026, 1, 2))], 400);
+    });
+
+    test(
+      'keeps a night across a time change as one aggregate',
+      () async {
+        // With +24h the two halves of the night key apart but format to the same
+        // date, so both would claim one external id
+        when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+        stubReadings([
+          HealthReading(
+            type: HealthDataType.SLEEP_ASLEEP,
+            value: 120,
+            date: DateTime(2026, 3, 29, 23, 0),
+            dateTo: DateTime(2026, 3, 30, 1, 0),
+            externalId: _idS1,
+          ),
+          HealthReading(
+            type: HealthDataType.SLEEP_ASLEEP,
+            value: 300,
+            date: DateTime(2026, 3, 30, 1, 0),
+            dateTo: DateTime(2026, 3, 30, 6, 0),
+            externalId: _idS2,
+          ),
+        ]);
+
+        final count = await runImport();
+
+        expect(count, 1);
+        final entry =
+            verify(measurements.addLocalDrift(captureAny)).captured.single as MeasurementEntry;
+        final categoryId = _sleepCategoryId(measurements, MetricType.sleepTotal);
+        expect(entry.externalId, dailyAggregateExternalId(categoryId, DateTime(2026, 3, 30)));
+        expect(entry.date, DateTime(2026, 3, 30));
+        expect(entry.value, 420);
+      },
+      skip: _springsForward ? false : 'needs a time zone that shifts on 2026-03-30 (CI: Berlin)',
+    );
+
+    test('imports each sleep stage into its own category', () async {
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+      stubReadings([
+        // A night as a watch records it: stages rather than one asleep block
+        HealthReading(
+          type: HealthDataType.SLEEP_LIGHT,
+          value: 120,
+          date: DateTime(2026, 1, 1, 23, 0),
+          dateTo: DateTime(2026, 1, 2, 1, 0),
+          externalId: _idS1,
+        ),
+        HealthReading(
+          type: HealthDataType.SLEEP_DEEP,
+          value: 90,
+          date: DateTime(2026, 1, 2, 1, 0),
+          dateTo: DateTime(2026, 1, 2, 2, 30),
+          externalId: _idS2,
+        ),
+        HealthReading(
+          type: HealthDataType.SLEEP_REM,
+          value: 60,
+          date: DateTime(2026, 1, 2, 2, 30),
+          dateTo: DateTime(2026, 1, 2, 3, 30),
+          externalId: _idS3,
+        ),
+        HealthReading(
+          type: HealthDataType.SLEEP_AWAKE,
+          value: 15,
+          date: DateTime(2026, 1, 2, 3, 30),
+          dateTo: DateTime(2026, 1, 2, 3, 45),
+          externalId: _idS4,
+        ),
+      ]);
+
+      await runImport();
+
+      final entries = verify(
+        measurements.addLocalDrift(captureAny),
+      ).captured.cast<MeasurementEntry>();
+      final categories = verify(
+        measurements.addLocalDriftCategory(captureAny),
+      ).captured.cast<MeasurementCategory>();
+      final typeOf = {for (final c in categories) c.id: c.metricType};
+      final byType = {for (final e in entries) typeOf[e.categoryId]: e.value};
+
+      expect(byType[MetricType.sleepLight], 120);
+      expect(byType[MetricType.sleepDeep], 90);
+      expect(byType[MetricType.sleepRem], 60);
+      expect(byType[MetricType.sleepAwake], 15);
+      // The stages roll up into the total, the waking quarter hour does not
+      expect(byType[MetricType.sleepTotal], 270);
+      // The group itself never carries entries
+      expect(byType.containsKey(MetricType.sleep), isFalse);
+    });
+
+    test('counts a night reported by two sources once', () async {
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+      stubReadings([
+        // The phone writes the whole night as undifferentiated sleep while the
+        // watch writes the very same night as its stages. Adding the durations
+        // up would report twice the sleep.
+        HealthReading(
+          type: HealthDataType.SLEEP_ASLEEP,
+          value: 240,
+          date: DateTime(2026, 1, 1, 23, 0),
+          dateTo: DateTime(2026, 1, 2, 3, 0),
+          externalId: _idS1,
+        ),
+        HealthReading(
+          type: HealthDataType.SLEEP_LIGHT,
+          value: 180,
+          date: DateTime(2026, 1, 1, 23, 0),
+          dateTo: DateTime(2026, 1, 2, 2, 0),
+          externalId: _idS2,
+        ),
+        HealthReading(
+          type: HealthDataType.SLEEP_DEEP,
+          value: 60,
+          date: DateTime(2026, 1, 2, 2, 0),
+          dateTo: DateTime(2026, 1, 2, 3, 0),
+          externalId: _idS3,
+        ),
+      ]);
+
+      await runImport();
+
+      final entries = verify(
+        measurements.addLocalDrift(captureAny),
+      ).captured.cast<MeasurementEntry>();
+      final totalId = _sleepCategoryId(measurements, MetricType.sleepTotal);
+      final total = entries.firstWhere((e) => e.categoryId == totalId);
+
+      expect(total.value, 240);
+      expect(total.extraData!['record_type'], 'SLEEP_ASLEEP,SLEEP_DEEP,SLEEP_LIGHT');
+    });
+
+    test('updates a daily aggregate when later samples change it', () async {
+      final existing = MeasurementCategory(
+        id: _catHrId,
+        name: 'Heart rate',
+        unit: 'bpm',
+        metricType: MetricType.heartRate,
+      );
+      final stored = MeasurementEntry(
+        id: 'e1',
+        categoryId: _catHrId,
+        date: DateTime(2026, 1, 1),
+        value: 60,
+        notes: '',
+        externalId: dailyAggregateExternalId(_catHrId, DateTime(2026, 1, 1)),
+        extraData: const {
+          'min': 60,
+          'max': 60,
+          'sample_count': 1,
+          'record_type': 'HEART_RATE',
+        },
+      );
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => [existing]);
+      when(
+        measurements.getEntriesByExternalId(_catHrId),
+      ).thenAnswer((_) async => {stored.externalId!: stored});
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.HEART_RATE,
+          value: 60,
+          date: DateTime(2026, 1, 1, 8),
+          externalId: _idHr1,
+        ),
+        // A sample that arrived after the previous sync
+        HealthReading(
+          type: HealthDataType.HEART_RATE,
+          value: 70,
+          date: DateTime(2026, 1, 1, 20),
+          externalId: _idHr2,
+        ),
+      ]);
+
+      final count = await runImport();
+
+      expect(count, 1);
+      verifyNever(measurements.addLocalDrift(any));
+      final updated =
+          verify(measurements.updateLocalDrift(captureAny)).captured.single as MeasurementEntry;
+      expect(updated.id, 'e1');
+      expect(updated.value, 65);
+      expect(updated.extraData, {
+        'min': 60,
+        'max': 70,
+        'sample_count': 2,
+        'record_type': 'HEART_RATE',
+      });
+    });
+
+    test('leaves an unchanged daily aggregate alone', () async {
+      final existing = MeasurementCategory(
+        id: _catHrId,
+        name: 'Heart rate',
+        unit: 'bpm',
+        metricType: MetricType.heartRate,
+      );
+      final stored = MeasurementEntry(
+        id: 'e1',
+        categoryId: _catHrId,
+        date: DateTime(2026, 1, 1),
+        value: 60,
+        notes: '',
+        externalId: dailyAggregateExternalId(_catHrId, DateTime(2026, 1, 1)),
+        extraData: const {
+          'min': 60,
+          'max': 60,
+          'sample_count': 1,
+          'record_type': 'HEART_RATE',
+        },
+      );
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => [existing]);
+      when(
+        measurements.getEntriesByExternalId(_catHrId),
+      ).thenAnswer((_) async => {stored.externalId!: stored});
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.HEART_RATE,
+          value: 60,
+          date: DateTime(2026, 1, 1, 8),
+          externalId: _idHr1,
+        ),
+      ]);
+
+      // Re-reading the same samples within the overlap window must not queue
+      // a pointless sync upload
+      final count = await runImport();
+
+      expect(count, 0);
+      verifyNever(measurements.addLocalDrift(any));
+      verifyNever(measurements.updateLocalDrift(any));
+    });
+
+    test('imports blood pressure into an existing group by component type', () async {
+      // The user's own group with different names: components map onto the
+      // children by their metric type, not by name
+      final parent = MeasurementCategory(
+        id: 'bp',
+        name: 'BP',
+        unit: 'mmHg',
+        metricType: MetricType.bloodPressure,
+      );
+      final upper = MeasurementCategory(
+        id: 'upper',
+        name: 'Upper',
+        unit: 'mmHg',
+        metricType: MetricType.bloodPressureSystolic,
+        parentId: 'bp',
+      );
+      final lower = MeasurementCategory(
+        id: 'lower',
+        name: 'Lower',
+        unit: 'mmHg',
+        metricType: MetricType.bloodPressureDiastolic,
+        parentId: 'bp',
+        order: 1,
+      );
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => [parent, upper, lower]);
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.BLOOD_PRESSURE_SYSTOLIC,
+          value: 120,
+          date: DateTime(2026, 1, 3),
+          externalId: _idBp1,
+        ),
+        HealthReading(
+          type: HealthDataType.BLOOD_PRESSURE_DIASTOLIC,
+          value: 80,
+          date: DateTime(2026, 1, 3),
+          externalId: _idBp1,
+        ),
+      ]);
+
+      final count = await runImport();
+      expect(count, 2);
+      verifyNever(measurements.addLocalDriftCategory(any));
+
+      final entries = verify(
+        measurements.addLocalDrift(captureAny),
+      ).captured.cast<MeasurementEntry>();
+      expect(entries.firstWhere((e) => e.value == 120).categoryId, 'upper');
+      expect(entries.firstWhere((e) => e.value == 80).categoryId, 'lower');
+    });
+
+    test(
+      'a category with the canonical name is not adopted, only the metric type counts',
+      () async {
+        // Matching by name made the target depend on the UI language, so a
+        // hand-kept category is only used once it carries the metric type
+        final handMade = MeasurementCategory(id: 'own', name: 'Body fat', unit: '%');
+        when(measurements.getCategoriesOnce()).thenAnswer((_) async => [handMade]);
+        stubReadings([
+          HealthReading(
+            type: HealthDataType.BODY_FAT_PERCENTAGE,
+            value: 0.2,
+            date: DateTime(2026, 1, 1),
+            externalId: _idBf1,
+          ),
+        ]);
+
+        await runImport();
+
+        final created = verify(
+          measurements.addLocalDriftCategory(captureAny),
+        ).captured.cast<MeasurementCategory>();
+        expect(created.single.metricType, MetricType.bodyFat);
+        expect(created.single.id, deterministicCategoryId('2', MetricType.bodyFat));
+
+        final entries = verify(
+          measurements.addLocalDrift(captureAny),
+        ).captured.cast<MeasurementEntry>();
+        expect(entries.single.categoryId, created.single.id);
+      },
+    );
+
+    test('skips blood pressure when the matching category holds entries', () async {
+      await seedWatermarks('2020-01-01T00:00:00.000');
+      // A plain leaf category of the blood pressure type: attaching children
+      // would make its entries invalid (measurements only on leaves), so the
+      // import must not touch it
+      final leaf = MeasurementCategory(
+        id: 'bp',
+        name: 'Blood pressure',
+        unit: 'mmHg',
+        metricType: MetricType.bloodPressure,
+      );
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => [leaf]);
+      when(measurements.hasEntries('bp')).thenAnswer((_) async => true);
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.BLOOD_PRESSURE_SYSTOLIC,
+          value: 120,
+          date: DateTime(2026, 1, 3),
+          externalId: _idBp1,
+        ),
+      ]);
+
+      final count = await runImport();
+
+      // Nothing is written and the watermark holds, so the readings are
+      // retried once the conflict is resolved
+      expect(count, 0);
+      verifyNever(measurements.addLocalDriftCategory(any));
+      verifyNever(measurements.addLocalDrift(any));
+      expect(await watermarkOf(MetricType.bloodPressure), '2020-01-01T00:00:00.000');
+    });
+
+    test('duration records keep their interval end as date_to', () async {
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.HEIGHT,
+          value: 180,
+          date: DateTime.utc(2026, 1, 1, 8),
+          dateTo: DateTime.utc(2026, 1, 1, 9),
+          externalId: _idHInterval,
+        ),
+      ]);
+
+      await runImport();
+
+      final entry =
+          verify(measurements.addLocalDrift(captureAny)).captured.single as MeasurementEntry;
+      expect(entry.extraData?['date_to'], '2026-01-01T09:00:00.000Z');
+    });
+
+    test('skips weight while the official category has not been synced', () async {
+      await seedWatermarks('2020-01-01T00:00:00.000');
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.WEIGHT,
+          value: 80.5,
+          date: DateTime(2026, 1, 1),
+          externalId: _idW1,
+        ),
+      ]);
+
+      final count = await runImport();
+
+      // Never creates the official category; the reading stays unimported (no
+      // watermark advance) and is retried on the next sync
+      expect(count, 0);
+      verifyNever(measurements.addLocalDriftCategory(any));
+      verifyNever(measurements.addLocalDrift(any));
+      expect(await watermarkOf(MetricType.bodyWeight), '2020-01-01T00:00:00.000');
+    });
+
+    test('a skipped metric holds its watermark while the others move on', () async {
+      await seedWatermarks('2020-01-01T00:00:00.000');
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.WEIGHT,
+          value: 80.5,
+          date: DateTime(2026, 1, 1),
+          externalId: _idW1,
+        ),
+        HealthReading(
+          type: HealthDataType.HEIGHT,
+          value: 1.8,
+          date: DateTime(2026, 1, 2),
+          externalId: _idH1,
+        ),
+      ]);
+
+      final count = await runImport();
+
+      // Weight must not advance past readings it could not import: they would
+      // leave the overlap window before the official category ever syncs and
+      // be lost for good. Height has no such problem and is not held back
+      expect(count, 1);
+      expect(await watermarkOf(MetricType.bodyWeight), '2020-01-01T00:00:00.000');
+      expect(await watermarkOf(MetricType.height), DateTime(2026, 1, 2).toIso8601String());
+    });
+
+    test('a metric that found nothing still advances its own watermark', () async {
+      // Otherwise a metric the platform has no data for would read the full
+      // history on every single run
+      await seedWatermarks('2026-06-01T12:00:00.000');
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => categoriesForEveryMetric());
+      stubReadings([]);
+
+      await runImport();
+
+      expect(await watermarkOf(MetricType.height), isNotNull);
+      expect(await watermarkOf(MetricType.height), isNot('2026-06-01T12:00:00.000'));
+    });
+
+    test('each metric reads from its own watermark', () async {
+      // What the per-metric watermarks are for: a first import that died after
+      // height resumes at 2020 for the rest and at the watermark for height
+      await PreferenceHelper.instance.setHealthSyncWatermarks({
+        MetricType.height.name: '2026-06-01T12:00:00.000',
+      });
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => categoriesForEveryMetric());
+      stubReadings([]);
+
+      await runImport();
+
+      final starts = capturedReadStarts();
+      expect(starts[HealthDataType.HEIGHT], DateTime(2026, 5, 2, 12));
+      expect(starts[HealthDataType.BODY_FAT_PERCENTAGE], DateTime(2020));
+    });
+
+    test('reads with an overlap window before the stored watermark', () async {
+      await seedWatermarks('2026-06-01T12:00:00.000');
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => categoriesForEveryMetric());
+      stubReadings([]);
+
+      await runImport();
+
+      // 30 days before the watermark, so late-arriving backdated records
+      // (e.g. a scale syncing days after the measurement) are still picked up
+      expect(capturedReadStart(), DateTime(2026, 5, 2, 12));
+    });
+
+    test('a metric the platform has nothing for stops forcing the full history', () async {
+      // No reading means no category, and a metric without one is what asks
+      // for the full window: it would do so on every sync, for every metric
+      await seedWatermarks('2026-06-01T12:00:00.000');
+      when(measurements.getCategoriesOnce()).thenAnswer(
+        (_) async =>
+            categoriesForEveryMetric().where((c) => c.metricType != MetricType.bodyFat).toList(),
+      );
+      stubReadings([]);
+
+      await runImport();
+      expect(capturedReadStart(HealthDataType.BODY_FAT_PERCENTAGE), DateTime(2020));
+
+      // The metric it happened to is the only one dragged back
+      await runImport();
+      expect(
+        capturedReadStart(HealthDataType.BODY_FAT_PERCENTAGE),
+        isNot(DateTime(2020)),
+      );
+    });
+
+    test('a deleted category is read again even after an empty run', () async {
+      // Only a metric without a category is remembered as empty, so deleting
+      // the category of one that has data still gets its history back
+      await seedWatermarks('2026-06-01T12:00:00.000');
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => categoriesForEveryMetric());
+      stubReadings([]);
+
+      await runImport();
+      expect(capturedReadStart(HealthDataType.BODY_FAT_PERCENTAGE), DateTime(2026, 5, 2, 12));
+
+      when(measurements.getCategoriesOnce()).thenAnswer(
+        (_) async =>
+            categoriesForEveryMetric().where((c) => c.metricType != MetricType.bodyFat).toList(),
+      );
+
+      await runImport();
+      expect(capturedReadStart(HealthDataType.BODY_FAT_PERCENTAGE), DateTime(2020));
+    });
+
+    test('an aggregating metric reads from the start of its own day', () async {
+      // The overlap start is a time of day, and a daily aggregate is
+      // recomputed from what the window returns: cutting into the day would
+      // overwrite that day's stored value with the part that was read
+      await seedWatermarks('2026-06-01T12:00:00.000');
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => categoriesForEveryMetric());
+      stubReadings([]);
+
+      await runImport();
+
+      final starts = capturedReadStarts();
+      // A sample metric has no aggregate to protect and reads from the
+      // watermark minus the overlap
+      expect(starts[HealthDataType.WEIGHT], DateTime(2026, 5, 2, 12));
+      // Heart rate is stored as one aggregate per calendar day
+      expect(starts[HealthDataType.HEART_RATE], DateTime(2026, 5, 2));
+      // The sleep day of 2 May began at 18:00 on 1 May
+      expect(starts[HealthDataType.SLEEP_ASLEEP], DateTime(2026, 5, 1, 18));
+    });
+
+    test('reads the full history when a category was deleted', () async {
+      // Deleting a category takes its entries with it, and the watermark says
+      // nothing about a metric that has no history left: reading from it would
+      // import only what happened since and leave the rest missing
+      await seedWatermarks('2026-06-01T12:00:00.000');
+      final remaining = categoriesForEveryMetric()
+          .where((c) => c.metricType != MetricType.bodyFat)
+          .toList();
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => remaining);
+      stubReadings([]);
+
+      await runImport();
+
+      final starts = capturedReadStarts();
+      expect(starts[HealthDataType.BODY_FAT_PERCENTAGE], DateTime(2020));
+      // The metric that lost its category is the only one sent back
+      expect(starts[HealthDataType.WEIGHT], DateTime(2026, 5, 2, 12));
+    });
+
+    test('reads the full history when one component of a group was deleted', () async {
+      // The readings live in the components, so a group that lost one of them
+      // has the same hole as a metric without any category
+      await seedWatermarks('2026-06-01T12:00:00.000');
+      final remaining = categoriesForEveryMetric()
+          .where((c) => c.metricType != MetricType.bloodPressureDiastolic)
+          .toList();
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => remaining);
+      stubReadings([]);
+
+      await runImport();
+
+      expect(
+        capturedReadStart(HealthDataType.BLOOD_PRESSURE_SYSTOLIC),
+        DateTime(2020),
+      );
+    });
+
+    test('each metric is read with the window its density affords', () async {
+      // A month of heart rate does not fit into the Android app heap, a month
+      // of scale readings is nothing, so the window comes from the metric
+      stubReadings([]);
+
+      await runImport();
+
+      final calls = verify(
+        health.read(
+          types: captureAnyNamed('types'),
+          start: anyNamed('start'),
+          end: anyNamed('end'),
+          window: captureAnyNamed('window'),
+        ),
+      ).captured;
+      final windowByType = <HealthDataType, Duration>{
+        for (var i = 0; i < calls.length; i += 2)
+          for (final type in calls[i] as List<HealthDataType>) type: calls[i + 1] as Duration,
+      };
+
+      expect(windowByType[HealthDataType.HEART_RATE], highVolumeReadWindow);
+      expect(windowByType[HealthDataType.BODY_FAT_PERCENTAGE], defaultReadWindow);
+    });
+  });
+
+  group('dailyAggregateExternalId', () {
+    test('is a UUID', () {
+      // The server stores external_id as a UUIDField and rejects anything
+      // else permanently, so a readable day key would silently lose every
+      // aggregate on push
+      expect(
+        dailyAggregateExternalId(_catHrId, DateTime(2026, 1, 1)),
+        matches(RegExp(r'^[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$')),
+      );
+    });
+
+    test('is stable per category and day, and differs across both', () {
+      final id = dailyAggregateExternalId(_catHrId, DateTime(2026, 1, 1));
+      expect(dailyAggregateExternalId(_catHrId, DateTime(2026, 1, 1)), id);
+      expect(dailyAggregateExternalId(_catHrId, DateTime(2026, 1, 2)), isNot(id));
+      expect(dailyAggregateExternalId(_catSleepId, DateTime(2026, 1, 1)), isNot(id));
+    });
+  });
+}
+
+/// The id of the sleep category with [metricType] among the ones the sync
+/// created. Sleep is a group, so a run creates the group plus one child per
+/// stage; consumes the recorded calls, so call it once per test.
+String _sleepCategoryId(MockMeasurementRepository measurements, MetricType metricType) => verify(
+  measurements.addLocalDriftCategory(captureAny),
+).captured.cast<MeasurementCategory>().firstWhere((c) => c.metricType == metricType).id!;
diff --git a/test/features/health/providers/health_importer_test.mocks.dart b/test/features/health/providers/health_importer_test.mocks.dart
new file mode 100644
index 000000000..40434553a
--- /dev/null
+++ b/test/features/health/providers/health_importer_test.mocks.dart
@@ -0,0 +1,517 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/health/providers/health_importer_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i4;
+
+import 'package:health_bridge/health.dart' as _i5;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i3;
+import 'package:wger/core/network/auth_credentials_storage.dart' as _i11;
+import 'package:wger/core/network/auth_state.dart' as _i12;
+import 'package:wger/features/health/models/health_reading.dart' as _i6;
+import 'package:wger/features/health/providers/health_repository.dart' as _i2;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i10;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i8;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i9;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i7;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+/// A class which mocks [HealthRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockHealthRepository extends _i1.Mock implements _i2.HealthRepository {
+  MockHealthRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get sourceName =>
+      (super.noSuchMethod(
+            Invocation.getter(#sourceName),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#sourceName),
+            ),
+          )
+          as String);
+
+  @override
+  _i4.Future<bool> isAvailable() =>
+      (super.noSuchMethod(
+            Invocation.method(#isAvailable, []),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<_i2.HealthPlatformAvailability> availability() =>
+      (super.noSuchMethod(
+            Invocation.method(#availability, []),
+            returnValue: _i4.Future<_i2.HealthPlatformAvailability>.value(
+              _i2.HealthPlatformAvailability.available,
+            ),
+          )
+          as _i4.Future<_i2.HealthPlatformAvailability>);
+
+  @override
+  _i4.Future<void> openHealthConnectInstall() =>
+      (super.noSuchMethod(
+            Invocation.method(#openHealthConnectInstall, []),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<bool> ensureHistoryAuthorized() =>
+      (super.noSuchMethod(
+            Invocation.method(#ensureHistoryAuthorized, []),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<Set<_i5.HealthDataType>> readableTypes(
+    List<_i5.HealthDataType>? types,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#readableTypes, [types]),
+            returnValue: _i4.Future<Set<_i5.HealthDataType>>.value(
+              <_i5.HealthDataType>{},
+            ),
+          )
+          as _i4.Future<Set<_i5.HealthDataType>>);
+
+  @override
+  _i4.Future<bool> ensureAuthorized(List<_i5.HealthDataType>? types) =>
+      (super.noSuchMethod(
+            Invocation.method(#ensureAuthorized, [types]),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<List<_i6.HealthReading>> read({
+    required List<_i5.HealthDataType>? types,
+    required DateTime? start,
+    required DateTime? end,
+    required Duration? window,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#read, [], {
+              #types: types,
+              #start: start,
+              #end: end,
+              #window: window,
+            }),
+            returnValue: _i4.Future<List<_i6.HealthReading>>.value(
+              <_i6.HealthReading>[],
+            ),
+          )
+          as _i4.Future<List<_i6.HealthReading>>);
+}
+
+/// A class which mocks [MeasurementRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockMeasurementRepository extends _i1.Mock implements _i7.MeasurementRepository {
+  MockMeasurementRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i4.Stream<List<_i8.MeasurementCategory>> watchAllWithoutEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i4.Stream<List<_i8.MeasurementCategory>>.empty(),
+          )
+          as _i4.Stream<List<_i8.MeasurementCategory>>);
+
+  @override
+  _i4.Stream<_i8.MeasurementCategory?> watchCategoryWithoutEntries(
+    String? id,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
+            returnValue: _i4.Stream<_i8.MeasurementCategory?>.empty(),
+          )
+          as _i4.Stream<_i8.MeasurementCategory?>);
+
+  @override
+  _i4.Stream<_i8.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i4.Stream<_i8.MeasurementCategory?>.empty(),
+          )
+          as _i4.Stream<_i8.MeasurementCategory?>);
+
+  @override
+  _i4.Stream<List<_i9.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i4.Stream<List<_i9.MeasurementEntry>>.empty(),
+          )
+          as _i4.Stream<List<_i9.MeasurementEntry>>);
+
+  @override
+  _i4.Stream<List<_i9.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i4.Stream<List<_i9.MeasurementEntry>>.empty(),
+          )
+          as _i4.Stream<List<_i9.MeasurementEntry>>);
+
+  @override
+  _i4.Stream<Map<String, _i9.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i4.Stream<Map<String, _i9.MeasurementEntry>>.empty(),
+          )
+          as _i4.Stream<Map<String, _i9.MeasurementEntry>>);
+
+  @override
+  _i4.Stream<List<_i10.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i10.MeasurementBucketLevel? level = _i10.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i4.Stream<List<_i10.MeasurementBucket>>.empty(),
+          )
+          as _i4.Stream<List<_i10.MeasurementBucket>>);
+
+  @override
+  _i4.Stream<Map<String, List<_i10.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i10.MeasurementBucketLevel? level = _i10.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i4.Stream<Map<String, List<_i10.MeasurementBucket>>>.empty(),
+          )
+          as _i4.Stream<Map<String, List<_i10.MeasurementBucket>>>);
+
+  @override
+  _i4.Stream<Map<String, List<_i10.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i4.Stream<Map<String, List<_i10.MeasurementBucket>>>.empty(),
+          )
+          as _i4.Stream<Map<String, List<_i10.MeasurementBucket>>>);
+
+  @override
+  _i4.Stream<List<_i10.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i4.Stream<List<_i10.MeasurementValueCount>>.empty(),
+          )
+          as _i4.Stream<List<_i10.MeasurementValueCount>>);
+
+  @override
+  _i4.Future<List<_i8.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i4.Future<List<_i8.MeasurementCategory>>.value(
+              <_i8.MeasurementCategory>[],
+            ),
+          )
+          as _i4.Future<List<_i8.MeasurementCategory>>);
+
+  @override
+  _i4.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i4.Future<Set<String>>.value(<String>{}),
+          )
+          as _i4.Future<Set<String>>);
+
+  @override
+  _i4.Future<Map<String, _i9.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i4.Future<Map<String, _i9.MeasurementEntry>>.value(
+              <String, _i9.MeasurementEntry>{},
+            ),
+          )
+          as _i4.Future<Map<String, _i9.MeasurementEntry>>);
+
+  @override
+  _i4.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<void> deleteLocalDrift(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDrift, [id]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> updateLocalDrift(_i9.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDrift, [entry]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> addLocalDrift(_i9.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDrift, [entry]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> addLocalDriftGroupEntries(
+    List<_i9.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> deleteLocalDriftCategory(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDriftCategory, [id]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> updateLocalDriftCategory(
+    _i8.MeasurementCategory? category,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDriftCategory, [category]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> addLocalDriftCategory(_i8.MeasurementCategory? category) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategory, [category]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> addLocalDriftCategoryGroup(
+    List<_i8.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+}
+
+/// A class which mocks [AuthCredentialsStorage].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockAuthCredentialsStorage extends _i1.Mock implements _i11.AuthCredentialsStorage {
+  MockAuthCredentialsStorage() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i4.Future<_i11.StoredAuth?> load() =>
+      (super.noSuchMethod(
+            Invocation.method(#load, []),
+            returnValue: _i4.Future<_i11.StoredAuth?>.value(),
+          )
+          as _i4.Future<_i11.StoredAuth?>);
+
+  @override
+  _i4.Future<void> saveJwt({
+    required _i12.JwtCredential? credential,
+    required String? serverUrl,
+    String? refreshToken,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#saveJwt, [], {
+              #credential: credential,
+              #serverUrl: serverUrl,
+              #refreshToken: refreshToken,
+            }),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> updateJwt({
+    required _i12.JwtCredential? credential,
+    String? refreshToken,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateJwt, [], {
+              #credential: credential,
+              #refreshToken: refreshToken,
+            }),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> clearJwt() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearJwt, []),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> clearLegacy() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearLegacy, []),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> clearCredentials() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearCredentials, []),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> clearAll() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearAll, []),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<String?> dbOwnerUserId() =>
+      (super.noSuchMethod(
+            Invocation.method(#dbOwnerUserId, []),
+            returnValue: _i4.Future<String?>.value(),
+          )
+          as _i4.Future<String?>);
+
+  @override
+  _i4.Future<void> setDbOwnerUserId(String? userId) =>
+      (super.noSuchMethod(
+            Invocation.method(#setDbOwnerUserId, [userId]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<bool> keepDataOnLogout() =>
+      (super.noSuchMethod(
+            Invocation.method(#keepDataOnLogout, []),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<bool> hasEverSynced() =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEverSynced, []),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<void> markEverSynced() =>
+      (super.noSuchMethod(
+            Invocation.method(#markEverSynced, []),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<String?> readRefreshToken() =>
+      (super.noSuchMethod(
+            Invocation.method(#readRefreshToken, []),
+            returnValue: _i4.Future<String?>.value(),
+          )
+          as _i4.Future<String?>);
+}
diff --git a/test/features/health/providers/health_repository_test.dart b/test/features/health/providers/health_repository_test.dart
new file mode 100644
index 000000000..cba49a53f
--- /dev/null
+++ b/test/features/health/providers/health_repository_test.dart
@@ -0,0 +1,217 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:health_bridge/health.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:wger/features/health/models/health_metric.dart';
+import 'package:wger/features/health/providers/health_repository.dart';
+
+import 'health_repository_test.mocks.dart';
+
+HealthDataPoint dataPoint(HealthDataType type) => HealthDataPoint(
+  uuid: '${type.name}-1',
+  value: NumericHealthValue(numericValue: 60),
+  type: type,
+  unit: HealthDataUnit.MINUTE,
+  dateFrom: DateTime(2026, 1, 2),
+  dateTo: DateTime(2026, 1, 2, 1),
+  sourcePlatform: HealthPlatformType.googleHealthConnect,
+  sourceDeviceId: 'device',
+  sourceId: 'source',
+  sourceName: 'test',
+);
+
+@GenerateMocks([Health])
+void main() {
+  late MockHealth health;
+  late HealthRepository repository;
+
+  setUp(() {
+    health = MockHealth();
+    repository = HealthRepository(health);
+
+    when(health.configure()).thenAnswer((_) async {});
+    when(
+      health.getHealthDataFromTypes(
+        types: anyNamed('types'),
+        startTime: anyNamed('startTime'),
+        endTime: anyNamed('endTime'),
+      ),
+    ).thenAnswer((_) async => <HealthDataPoint>[]);
+    when(health.removeDuplicates(any)).thenAnswer(
+      (invocation) => invocation.positionalArguments.first as List<HealthDataPoint>,
+    );
+  });
+
+  /// The (start, end) of every query the repository sent, in order
+  List<(DateTime, DateTime)> capturedWindows() {
+    final captured = verify(
+      health.getHealthDataFromTypes(
+        types: anyNamed('types'),
+        startTime: captureAnyNamed('startTime'),
+        endTime: captureAnyNamed('endTime'),
+      ),
+    ).captured;
+    return [
+      for (var i = 0; i < captured.length; i += 2)
+        (captured[i] as DateTime, captured[i + 1] as DateTime),
+    ];
+  }
+
+  group('read', () {
+    test('a range shorter than the window is one query', () async {
+      final start = DateTime(2026, 1, 1);
+      final end = DateTime(2026, 1, 20);
+
+      await repository.read(
+        types: [HealthDataType.WEIGHT],
+        start: start,
+        end: end,
+        window: defaultReadWindow,
+      );
+
+      expect(capturedWindows(), [(start, end)]);
+    });
+
+    test('a long range is read in contiguous windows', () async {
+      // A single query over years of a high-frequency type fills the Android
+      // app heap, so the platform is asked for one window at a time
+      final start = DateTime(2026, 1, 1);
+      final end = DateTime(2026, 4, 10);
+
+      await repository.read(
+        types: [HealthDataType.HEART_RATE],
+        start: start,
+        end: end,
+        window: highVolumeReadWindow,
+      );
+
+      final windows = capturedWindows();
+      expect(windows.length, greaterThan(1));
+      expect(windows.first.$1, start);
+      expect(windows.last.$2, end, reason: 'The last window must not read past the end');
+      for (var i = 1; i < windows.length; i++) {
+        expect(windows[i].$1, windows[i - 1].$2, reason: 'Windows must leave no gap');
+      }
+      for (final window in windows) {
+        expect(
+          window.$2.difference(window.$1),
+          lessThanOrEqualTo(highVolumeReadWindow),
+        );
+      }
+    });
+
+    test('every type is windowed on its own', () async {
+      final start = DateTime(2026, 1, 1);
+      final end = DateTime(2026, 3, 1);
+
+      await repository.read(
+        types: [HealthDataType.WEIGHT, HealthDataType.HEART_RATE],
+        start: start,
+        end: end,
+        window: defaultReadWindow,
+      );
+
+      final windows = capturedWindows();
+      // Both types cover the same range, so each window shows up twice
+      expect(windows.where((w) => w.$1 == start), hasLength(2));
+    });
+
+    test('a failing window does not cost the other types their read', () async {
+      when(
+        health.getHealthDataFromTypes(
+          types: [HealthDataType.HEART_RATE],
+          startTime: anyNamed('startTime'),
+          endTime: anyNamed('endTime'),
+        ),
+      ).thenThrow(Exception('boom'));
+
+      final readings = await repository.read(
+        types: [HealthDataType.HEART_RATE, HealthDataType.WEIGHT],
+        start: DateTime(2026, 1, 1),
+        end: DateTime(2026, 4, 1),
+        window: defaultReadWindow,
+      );
+
+      expect(readings, isEmpty);
+      verify(
+        health.getHealthDataFromTypes(
+          types: [HealthDataType.WEIGHT],
+          startTime: anyNamed('startTime'),
+          endTime: anyNamed('endTime'),
+        ),
+      ).called(greaterThan(1));
+    });
+
+    test('a type that fails halfway is dropped whole, windows it did read included', () async {
+      // The watermark moves with what was imported, so half a type would put
+      // the windows that never returned out of reach for good
+      var call = 0;
+      when(
+        health.getHealthDataFromTypes(
+          types: [HealthDataType.SLEEP_DEEP],
+          startTime: anyNamed('startTime'),
+          endTime: anyNamed('endTime'),
+        ),
+      ).thenAnswer((_) async {
+        if (call++ > 0) {
+          throw Exception('boom');
+        }
+        return [dataPoint(HealthDataType.SLEEP_DEEP)];
+      });
+      when(
+        health.getHealthDataFromTypes(
+          types: [HealthDataType.SLEEP_REM],
+          startTime: anyNamed('startTime'),
+          endTime: anyNamed('endTime'),
+        ),
+      ).thenAnswer((_) async => [dataPoint(HealthDataType.SLEEP_REM)]);
+
+      final readings = await repository.read(
+        types: [HealthDataType.SLEEP_DEEP, HealthDataType.SLEEP_REM],
+        start: DateTime(2026, 1, 1),
+        end: DateTime(2026, 4, 1),
+        window: defaultReadWindow,
+      );
+
+      expect(readings.map((r) => r.type).toSet(), {HealthDataType.SLEEP_REM});
+    });
+
+    test('a wholesale failure still propagates', () async {
+      when(
+        health.getHealthDataFromTypes(
+          types: anyNamed('types'),
+          startTime: anyNamed('startTime'),
+          endTime: anyNamed('endTime'),
+        ),
+      ).thenThrow(Exception('boom'));
+
+      expect(
+        () => repository.read(
+          types: [HealthDataType.WEIGHT],
+          start: DateTime(2026, 1, 1),
+          end: DateTime(2026, 2, 1),
+          window: defaultReadWindow,
+        ),
+        throwsException,
+      );
+    });
+  });
+}
diff --git a/test/features/health/providers/health_repository_test.mocks.dart b/test/features/health/providers/health_repository_test.mocks.dart
new file mode 100644
index 000000000..dfcb215d1
--- /dev/null
+++ b/test/features/health/providers/health_repository_test.mocks.dart
@@ -0,0 +1,804 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/health/providers/health_repository_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i4;
+
+import 'package:health_bridge/health.dart' as _i2;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i3;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+/// A class which mocks [Health].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockHealth extends _i1.Mock implements _i2.Health {
+  MockHealth() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.HealthConnectSdkStatus get healthConnectSdkStatus =>
+      (super.noSuchMethod(
+            Invocation.getter(#healthConnectSdkStatus),
+            returnValue: _i2.HealthConnectSdkStatus.sdkUnavailable,
+          )
+          as _i2.HealthConnectSdkStatus);
+
+  @override
+  _i2.HealthPlatformType get platformType =>
+      (super.noSuchMethod(
+            Invocation.getter(#platformType),
+            returnValue: _i2.HealthPlatformType.appleHealth,
+          )
+          as _i2.HealthPlatformType);
+
+  @override
+  String get deviceId =>
+      (super.noSuchMethod(
+            Invocation.getter(#deviceId),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#deviceId),
+            ),
+          )
+          as String);
+
+  @override
+  _i4.Future<void> configure() =>
+      (super.noSuchMethod(
+            Invocation.method(#configure, []),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  bool isDataTypeAvailable(_i2.HealthDataType? dataType) =>
+      (super.noSuchMethod(
+            Invocation.method(#isDataTypeAvailable, [dataType]),
+            returnValue: false,
+          )
+          as bool);
+
+  @override
+  _i4.Future<bool?> hasPermissions(
+    List<_i2.HealthDataType>? types, {
+    List<_i2.HealthDataAccess>? permissions,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #hasPermissions,
+              [types],
+              {#permissions: permissions},
+            ),
+            returnValue: _i4.Future<bool?>.value(),
+          )
+          as _i4.Future<bool?>);
+
+  @override
+  _i4.Future<_i2.HealthAuthorizationSnapshot> getAuthorizationSnapshot(
+    List<_i2.HealthDataType>? types,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getAuthorizationSnapshot, [types]),
+            returnValue: _i4.Future<_i2.HealthAuthorizationSnapshot>.value(
+              _i3.dummyValue<_i2.HealthAuthorizationSnapshot>(
+                this,
+                Invocation.method(#getAuthorizationSnapshot, [types]),
+              ),
+            ),
+          )
+          as _i4.Future<_i2.HealthAuthorizationSnapshot>);
+
+  @override
+  _i4.Future<void> revokePermissions() =>
+      (super.noSuchMethod(
+            Invocation.method(#revokePermissions, []),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<_i2.HealthConnectSdkStatus?> getHealthConnectSdkStatus() =>
+      (super.noSuchMethod(
+            Invocation.method(#getHealthConnectSdkStatus, []),
+            returnValue: _i4.Future<_i2.HealthConnectSdkStatus?>.value(),
+          )
+          as _i4.Future<_i2.HealthConnectSdkStatus?>);
+
+  @override
+  _i4.Future<bool> isHealthConnectAvailable() =>
+      (super.noSuchMethod(
+            Invocation.method(#isHealthConnectAvailable, []),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<void> installHealthConnect() =>
+      (super.noSuchMethod(
+            Invocation.method(#installHealthConnect, []),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<bool> isHealthDataHistoryAvailable() =>
+      (super.noSuchMethod(
+            Invocation.method(#isHealthDataHistoryAvailable, []),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<bool> isHealthDataHistoryAuthorized() =>
+      (super.noSuchMethod(
+            Invocation.method(#isHealthDataHistoryAuthorized, []),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<bool> requestHealthDataHistoryAuthorization() =>
+      (super.noSuchMethod(
+            Invocation.method(#requestHealthDataHistoryAuthorization, []),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<bool> isHealthDataInBackgroundAvailable() =>
+      (super.noSuchMethod(
+            Invocation.method(#isHealthDataInBackgroundAvailable, []),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<bool> isHealthDataInBackgroundAuthorized() =>
+      (super.noSuchMethod(
+            Invocation.method(#isHealthDataInBackgroundAuthorized, []),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<bool> requestHealthDataInBackgroundAuthorization() =>
+      (super.noSuchMethod(
+            Invocation.method(#requestHealthDataInBackgroundAuthorization, []),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<bool> isSkinTemperatureAvailable() =>
+      (super.noSuchMethod(
+            Invocation.method(#isSkinTemperatureAvailable, []),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<bool> requestAuthorization(
+    List<_i2.HealthDataType>? types, {
+    List<_i2.HealthDataAccess>? permissions,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #requestAuthorization,
+              [types],
+              {#permissions: permissions},
+            ),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<String?> writeHealthData({
+    required double? value,
+    _i2.HealthDataUnit? unit,
+    required _i2.HealthDataType? type,
+    required DateTime? startTime,
+    String? clientRecordId,
+    double? clientRecordVersion,
+    DateTime? endTime,
+    _i2.RecordingMethod? recordingMethod = _i2.RecordingMethod.automatic,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#writeHealthData, [], {
+              #value: value,
+              #unit: unit,
+              #type: type,
+              #startTime: startTime,
+              #clientRecordId: clientRecordId,
+              #clientRecordVersion: clientRecordVersion,
+              #endTime: endTime,
+              #recordingMethod: recordingMethod,
+            }),
+            returnValue: _i4.Future<String?>.value(),
+          )
+          as _i4.Future<String?>);
+
+  @override
+  _i4.Future<bool> writeActivityIntensity({
+    required _i2.ActivityIntensityLevel? intensityLevel,
+    required DateTime? startTime,
+    DateTime? endTime,
+    _i2.RecordingMethod? recordingMethod = _i2.RecordingMethod.automatic,
+    String? clientRecordId,
+    double? clientRecordVersion,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#writeActivityIntensity, [], {
+              #intensityLevel: intensityLevel,
+              #startTime: startTime,
+              #endTime: endTime,
+              #recordingMethod: recordingMethod,
+              #clientRecordId: clientRecordId,
+              #clientRecordVersion: clientRecordVersion,
+            }),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<bool> delete({
+    required _i2.HealthDataType? type,
+    required DateTime? startTime,
+    DateTime? endTime,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#delete, [], {
+              #type: type,
+              #startTime: startTime,
+              #endTime: endTime,
+            }),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<bool> deleteByUUID({
+    required String? uuid,
+    _i2.HealthDataType? type,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteByUUID, [], {#uuid: uuid, #type: type}),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<bool> deleteByClientRecordId({
+    required _i2.HealthDataType? dataTypeKey,
+    required String? clientRecordId,
+    String? recordId,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteByClientRecordId, [], {
+              #dataTypeKey: dataTypeKey,
+              #clientRecordId: clientRecordId,
+              #recordId: recordId,
+            }),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<bool> writeBloodPressure({
+    required int? systolic,
+    required int? diastolic,
+    required DateTime? startTime,
+    String? clientRecordId,
+    double? clientRecordVersion,
+    DateTime? endTime,
+    _i2.RecordingMethod? recordingMethod = _i2.RecordingMethod.automatic,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#writeBloodPressure, [], {
+              #systolic: systolic,
+              #diastolic: diastolic,
+              #startTime: startTime,
+              #clientRecordId: clientRecordId,
+              #clientRecordVersion: clientRecordVersion,
+              #endTime: endTime,
+              #recordingMethod: recordingMethod,
+            }),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<bool> writeBloodOxygen({
+    required double? saturation,
+    required DateTime? startTime,
+    DateTime? endTime,
+    _i2.RecordingMethod? recordingMethod = _i2.RecordingMethod.automatic,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#writeBloodOxygen, [], {
+              #saturation: saturation,
+              #startTime: startTime,
+              #endTime: endTime,
+              #recordingMethod: recordingMethod,
+            }),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<bool> writeMeal({
+    required _i2.MealType? mealType,
+    required DateTime? startTime,
+    required DateTime? endTime,
+    String? clientRecordId,
+    double? clientRecordVersion,
+    double? caloriesConsumed,
+    double? carbohydrates,
+    double? protein,
+    double? fatTotal,
+    String? name,
+    double? caffeine,
+    double? vitaminA,
+    double? b1Thiamin,
+    double? b2Riboflavin,
+    double? b3Niacin,
+    double? b5PantothenicAcid,
+    double? b6Pyridoxine,
+    double? b7Biotin,
+    double? b9Folate,
+    double? b12Cobalamin,
+    double? vitaminC,
+    double? vitaminD,
+    double? vitaminE,
+    double? vitaminK,
+    double? calcium,
+    double? cholesterol,
+    double? chloride,
+    double? chromium,
+    double? copper,
+    double? fatUnsaturated,
+    double? fatMonounsaturated,
+    double? fatPolyunsaturated,
+    double? fatSaturated,
+    double? fatTransMonoenoic,
+    double? fiber,
+    double? iodine,
+    double? iron,
+    double? magnesium,
+    double? manganese,
+    double? molybdenum,
+    double? phosphorus,
+    double? potassium,
+    double? selenium,
+    double? sodium,
+    double? sugar,
+    double? water,
+    double? zinc,
+    _i2.RecordingMethod? recordingMethod = _i2.RecordingMethod.automatic,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#writeMeal, [], {
+              #mealType: mealType,
+              #startTime: startTime,
+              #endTime: endTime,
+              #clientRecordId: clientRecordId,
+              #clientRecordVersion: clientRecordVersion,
+              #caloriesConsumed: caloriesConsumed,
+              #carbohydrates: carbohydrates,
+              #protein: protein,
+              #fatTotal: fatTotal,
+              #name: name,
+              #caffeine: caffeine,
+              #vitaminA: vitaminA,
+              #b1Thiamin: b1Thiamin,
+              #b2Riboflavin: b2Riboflavin,
+              #b3Niacin: b3Niacin,
+              #b5PantothenicAcid: b5PantothenicAcid,
+              #b6Pyridoxine: b6Pyridoxine,
+              #b7Biotin: b7Biotin,
+              #b9Folate: b9Folate,
+              #b12Cobalamin: b12Cobalamin,
+              #vitaminC: vitaminC,
+              #vitaminD: vitaminD,
+              #vitaminE: vitaminE,
+              #vitaminK: vitaminK,
+              #calcium: calcium,
+              #cholesterol: cholesterol,
+              #chloride: chloride,
+              #chromium: chromium,
+              #copper: copper,
+              #fatUnsaturated: fatUnsaturated,
+              #fatMonounsaturated: fatMonounsaturated,
+              #fatPolyunsaturated: fatPolyunsaturated,
+              #fatSaturated: fatSaturated,
+              #fatTransMonoenoic: fatTransMonoenoic,
+              #fiber: fiber,
+              #iodine: iodine,
+              #iron: iron,
+              #magnesium: magnesium,
+              #manganese: manganese,
+              #molybdenum: molybdenum,
+              #phosphorus: phosphorus,
+              #potassium: potassium,
+              #selenium: selenium,
+              #sodium: sodium,
+              #sugar: sugar,
+              #water: water,
+              #zinc: zinc,
+              #recordingMethod: recordingMethod,
+            }),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<bool> writeMenstruationFlow({
+    required _i2.MenstrualFlow? flow,
+    required DateTime? startTime,
+    required DateTime? endTime,
+    required bool? isStartOfCycle,
+    _i2.RecordingMethod? recordingMethod = _i2.RecordingMethod.automatic,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#writeMenstruationFlow, [], {
+              #flow: flow,
+              #startTime: startTime,
+              #endTime: endTime,
+              #isStartOfCycle: isStartOfCycle,
+              #recordingMethod: recordingMethod,
+            }),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<bool> writeAudiogram({
+    required List<double>? frequencies,
+    required List<double>? leftEarSensitivities,
+    required List<double>? rightEarSensitivities,
+    required DateTime? startTime,
+    DateTime? endTime,
+    Map<String, dynamic>? metadata,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#writeAudiogram, [], {
+              #frequencies: frequencies,
+              #leftEarSensitivities: leftEarSensitivities,
+              #rightEarSensitivities: rightEarSensitivities,
+              #startTime: startTime,
+              #endTime: endTime,
+              #metadata: metadata,
+            }),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<bool> writeInsulinDelivery(
+    double? units,
+    _i2.InsulinDeliveryReason? reason,
+    DateTime? startTime,
+    DateTime? endTime,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#writeInsulinDelivery, [
+              units,
+              reason,
+              startTime,
+              endTime,
+            ]),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<_i2.HealthDataPoint?> getHealthDataByUUID({
+    required String? uuid,
+    required _i2.HealthDataType? type,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#getHealthDataByUUID, [], {
+              #uuid: uuid,
+              #type: type,
+            }),
+            returnValue: _i4.Future<_i2.HealthDataPoint?>.value(),
+          )
+          as _i4.Future<_i2.HealthDataPoint?>);
+
+  @override
+  _i4.Future<List<_i2.HealthDataPoint>> getHealthDataFromTypes({
+    required List<_i2.HealthDataType>? types,
+    Map<_i2.HealthDataType, _i2.HealthDataUnit>? preferredUnits,
+    required DateTime? startTime,
+    required DateTime? endTime,
+    List<_i2.RecordingMethod>? recordingMethodsToFilter = const [],
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#getHealthDataFromTypes, [], {
+              #types: types,
+              #preferredUnits: preferredUnits,
+              #startTime: startTime,
+              #endTime: endTime,
+              #recordingMethodsToFilter: recordingMethodsToFilter,
+            }),
+            returnValue: _i4.Future<List<_i2.HealthDataPoint>>.value(
+              <_i2.HealthDataPoint>[],
+            ),
+          )
+          as _i4.Future<List<_i2.HealthDataPoint>>);
+
+  @override
+  _i4.Future<List<_i2.HealthDataPoint>> getHealthIntervalDataFromTypes({
+    required DateTime? startDate,
+    required DateTime? endDate,
+    required List<_i2.HealthDataType>? types,
+    required int? interval,
+    List<_i2.RecordingMethod>? recordingMethodsToFilter = const [],
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#getHealthIntervalDataFromTypes, [], {
+              #startDate: startDate,
+              #endDate: endDate,
+              #types: types,
+              #interval: interval,
+              #recordingMethodsToFilter: recordingMethodsToFilter,
+            }),
+            returnValue: _i4.Future<List<_i2.HealthDataPoint>>.value(
+              <_i2.HealthDataPoint>[],
+            ),
+          )
+          as _i4.Future<List<_i2.HealthDataPoint>>);
+
+  @override
+  _i4.Future<List<_i2.HealthDataPoint>> getHealthAggregateDataFromTypes({
+    required List<_i2.HealthDataType>? types,
+    required DateTime? startDate,
+    required DateTime? endDate,
+    int? activitySegmentDuration = 1,
+    bool? includeManualEntry = true,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#getHealthAggregateDataFromTypes, [], {
+              #types: types,
+              #startDate: startDate,
+              #endDate: endDate,
+              #activitySegmentDuration: activitySegmentDuration,
+              #includeManualEntry: includeManualEntry,
+            }),
+            returnValue: _i4.Future<List<_i2.HealthDataPoint>>.value(
+              <_i2.HealthDataPoint>[],
+            ),
+          )
+          as _i4.Future<List<_i2.HealthDataPoint>>);
+
+  @override
+  _i4.Future<String?> getChangesToken({
+    required List<_i2.HealthDataType>? types,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#getChangesToken, [], {#types: types}),
+            returnValue: _i4.Future<String?>.value(),
+          )
+          as _i4.Future<String?>);
+
+  @override
+  _i4.Future<_i2.HealthChangesResponse?> getChanges({
+    required String? changesToken,
+    bool? includeSelf = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#getChanges, [], {
+              #changesToken: changesToken,
+              #includeSelf: includeSelf,
+            }),
+            returnValue: _i4.Future<_i2.HealthChangesResponse?>.value(),
+          )
+          as _i4.Future<_i2.HealthChangesResponse?>);
+
+  @override
+  List<_i2.HealthDataPoint> removeDuplicates(
+    List<_i2.HealthDataPoint>? points,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#removeDuplicates, [points]),
+            returnValue: <_i2.HealthDataPoint>[],
+          )
+          as List<_i2.HealthDataPoint>);
+
+  @override
+  _i4.Future<int?> getTotalStepsInInterval(
+    DateTime? startTime,
+    DateTime? endTime, {
+    bool? includeManualEntry = true,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #getTotalStepsInInterval,
+              [startTime, endTime],
+              {#includeManualEntry: includeManualEntry},
+            ),
+            returnValue: _i4.Future<int?>.value(),
+          )
+          as _i4.Future<int?>);
+
+  @override
+  _i4.Future<_i2.HealthWorkoutWriteResult> writeWorkoutData({
+    required String? workoutClientRecordId,
+    String? energyClientRecordId,
+    required int? clientRecordVersion,
+    required _i2.HealthWorkoutActivityType? activityType,
+    required DateTime? start,
+    required DateTime? end,
+    required int? startZoneOffsetSeconds,
+    required int? endZoneOffsetSeconds,
+    double? activeEnergyKcal,
+    required String? title,
+    required _i2.HealthRecordingProvenance? recordingProvenance,
+    required _i2.HealthRecordingDevice? recordingDevice,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#writeWorkoutData, [], {
+              #workoutClientRecordId: workoutClientRecordId,
+              #energyClientRecordId: energyClientRecordId,
+              #clientRecordVersion: clientRecordVersion,
+              #activityType: activityType,
+              #start: start,
+              #end: end,
+              #startZoneOffsetSeconds: startZoneOffsetSeconds,
+              #endZoneOffsetSeconds: endZoneOffsetSeconds,
+              #activeEnergyKcal: activeEnergyKcal,
+              #title: title,
+              #recordingProvenance: recordingProvenance,
+              #recordingDevice: recordingDevice,
+            }),
+            returnValue: _i4.Future<_i2.HealthWorkoutWriteResult>.value(
+              _i3.dummyValue<_i2.HealthWorkoutWriteResult>(
+                this,
+                Invocation.method(#writeWorkoutData, [], {
+                  #workoutClientRecordId: workoutClientRecordId,
+                  #energyClientRecordId: energyClientRecordId,
+                  #clientRecordVersion: clientRecordVersion,
+                  #activityType: activityType,
+                  #start: start,
+                  #end: end,
+                  #startZoneOffsetSeconds: startZoneOffsetSeconds,
+                  #endZoneOffsetSeconds: endZoneOffsetSeconds,
+                  #activeEnergyKcal: activeEnergyKcal,
+                  #title: title,
+                  #recordingProvenance: recordingProvenance,
+                  #recordingDevice: recordingDevice,
+                }),
+              ),
+            ),
+          )
+          as _i4.Future<_i2.HealthWorkoutWriteResult>);
+
+  @override
+  _i4.Future<_i2.HealthWorkoutLookupResult> lookupWorkoutData({
+    required String? workoutClientRecordId,
+    String? energyClientRecordId,
+    required DateTime? start,
+    required DateTime? end,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#lookupWorkoutData, [], {
+              #workoutClientRecordId: workoutClientRecordId,
+              #energyClientRecordId: energyClientRecordId,
+              #start: start,
+              #end: end,
+            }),
+            returnValue: _i4.Future<_i2.HealthWorkoutLookupResult>.value(
+              _i3.dummyValue<_i2.HealthWorkoutLookupResult>(
+                this,
+                Invocation.method(#lookupWorkoutData, [], {
+                  #workoutClientRecordId: workoutClientRecordId,
+                  #energyClientRecordId: energyClientRecordId,
+                  #start: start,
+                  #end: end,
+                }),
+              ),
+            ),
+          )
+          as _i4.Future<_i2.HealthWorkoutLookupResult>);
+
+  @override
+  _i4.Future<_i2.HealthBodyMassLookupResult> lookupBodyMassData({
+    required String? clientRecordId,
+    required DateTime? measuredAt,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#lookupBodyMassData, [], {
+              #clientRecordId: clientRecordId,
+              #measuredAt: measuredAt,
+            }),
+            returnValue: _i4.Future<_i2.HealthBodyMassLookupResult>.value(
+              _i3.dummyValue<_i2.HealthBodyMassLookupResult>(
+                this,
+                Invocation.method(#lookupBodyMassData, [], {
+                  #clientRecordId: clientRecordId,
+                  #measuredAt: measuredAt,
+                }),
+              ),
+            ),
+          )
+          as _i4.Future<_i2.HealthBodyMassLookupResult>);
+
+  @override
+  _i4.Future<String> startWorkoutRoute() =>
+      (super.noSuchMethod(
+            Invocation.method(#startWorkoutRoute, []),
+            returnValue: _i4.Future<String>.value(
+              _i3.dummyValue<String>(
+                this,
+                Invocation.method(#startWorkoutRoute, []),
+              ),
+            ),
+          )
+          as _i4.Future<String>);
+
+  @override
+  _i4.Future<bool> insertWorkoutRouteData({
+    required String? builderId,
+    required List<_i2.WorkoutRouteLocation>? locations,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#insertWorkoutRouteData, [], {
+              #builderId: builderId,
+              #locations: locations,
+            }),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<String> finishWorkoutRoute({
+    required String? builderId,
+    required String? workoutUuid,
+    Map<String, dynamic>? metadata,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#finishWorkoutRoute, [], {
+              #builderId: builderId,
+              #workoutUuid: workoutUuid,
+              #metadata: metadata,
+            }),
+            returnValue: _i4.Future<String>.value(
+              _i3.dummyValue<String>(
+                this,
+                Invocation.method(#finishWorkoutRoute, [], {
+                  #builderId: builderId,
+                  #workoutUuid: workoutUuid,
+                  #metadata: metadata,
+                }),
+              ),
+            ),
+          )
+          as _i4.Future<String>);
+
+  @override
+  _i4.Future<bool> discardWorkoutRoute(String? builderId) =>
+      (super.noSuchMethod(
+            Invocation.method(#discardWorkoutRoute, [builderId]),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+}
diff --git a/test/features/health/providers/health_sync_test.dart b/test/features/health/providers/health_sync_test.dart
new file mode 100644
index 000000000..9f94ce0c6
--- /dev/null
+++ b/test/features/health/providers/health_sync_test.dart
@@ -0,0 +1,239 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:health_bridge/health.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+import 'package:wger/core/network/auth_credentials_storage.dart';
+import 'package:wger/core/shared_preferences.dart';
+import 'package:wger/features/health/models/health_reading.dart';
+import 'package:wger/features/health/providers/health_repository.dart';
+import 'package:wger/features/health/providers/health_sync.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+
+import 'health_sync_test.mocks.dart';
+
+// A platform record id, as a real UUID. What happens to one that is not is
+// the importer's business, not this one's.
+const _idH1 = '00000004-0000-4000-8000-000000000004';
+
+@GenerateMocks([HealthRepository, MeasurementRepository, AuthCredentialsStorage])
+void main() {
+  // The notifier registers an AppLifecycleListener for the resume re-sync,
+  // which needs a live widgets binding even in plain tests
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  late MockHealthRepository health;
+  late MockMeasurementRepository measurements;
+  late MockAuthCredentialsStorage credentials;
+
+  setUp(() async {
+    SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
+    // SharedPreferencesAsync captures the platform instance in its constructor,
+    // and PreferenceHelper builds its own once for the whole run, so the line
+    // above only takes effect for the first test. Clear what this suite writes
+    await PreferenceHelper.instance.clearHealthSyncPreferences();
+    await PreferenceHelper.instance.setHealthSyncEnabled(true);
+
+    health = MockHealthRepository();
+    measurements = MockMeasurementRepository();
+    credentials = MockAuthCredentialsStorage();
+    when(credentials.dbOwnerUserId()).thenAnswer((_) async => '2');
+
+    when(health.ensureAuthorized(any)).thenAnswer((_) async => true);
+    when(health.readableTypes(any)).thenAnswer(
+      (invocation) async => (invocation.positionalArguments.first as List<HealthDataType>).toSet(),
+    );
+    when(health.sourceName).thenReturn('apple');
+    when(measurements.addLocalDrift(any)).thenAnswer((_) async {});
+    when(measurements.updateLocalDrift(any)).thenAnswer((_) async {});
+    when(measurements.addLocalDriftCategory(any)).thenAnswer((_) async {});
+    when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+    when(measurements.getExternalIds(any)).thenAnswer((_) async => <String>{});
+    when(
+      measurements.getEntriesByExternalId(any),
+    ).thenAnswer((_) async => <String, MeasurementEntry>{});
+    when(measurements.hasEntries(any)).thenAnswer((_) async => false);
+  });
+
+  late ProviderContainer container;
+
+  HealthSyncNotifier createNotifier() {
+    container = ProviderContainer.test(
+      overrides: [
+        healthRepositoryProvider.overrideWithValue(health),
+        measurementRepositoryProvider.overrideWithValue(measurements),
+        authCredentialsStorageProvider.overrideWithValue(credentials),
+      ],
+    );
+    return container.read(healthSyncProvider.notifier);
+  }
+
+  void stubReadings(List<HealthReading> readings) {
+    when(
+      health.read(
+        types: anyNamed('types'),
+        start: anyNamed('start'),
+        end: anyNamed('end'),
+        window: anyNamed('window'),
+      ),
+    ).thenAnswer((_) async => readings);
+  }
+
+  group('HealthSyncState', () {
+    test('default state has sync disabled', () {
+      const state = HealthSyncState();
+      expect(state.isEnabled, false);
+      expect(state.isSyncing, false);
+      expect(state.lastSyncCount, 0);
+    });
+
+    test('copyWith updates individual fields', () {
+      const state = HealthSyncState();
+      final updated = state.copyWith(isEnabled: true, lastSyncCount: 5);
+      expect(updated.isEnabled, true);
+      expect(updated.isSyncing, false);
+      expect(updated.lastSyncCount, 5);
+    });
+  });
+
+  group('enableSync', () {
+    test('returns null and stays disabled when permissions are denied', () async {
+      await PreferenceHelper.instance.setHealthSyncEnabled(false);
+      when(health.ensureAuthorized(any)).thenAnswer((_) async => false);
+
+      final count = await createNotifier().enableSync();
+
+      expect(count, isNull);
+      expect(await PreferenceHelper.instance.getHealthSyncEnabled(), isFalse);
+      verifyNever(
+        health.read(
+          types: anyNamed('types'),
+          start: anyNamed('start'),
+          end: anyNamed('end'),
+          window: anyNamed('window'),
+        ),
+      );
+    });
+
+    test('persists the preference and runs an initial import', () async {
+      await PreferenceHelper.instance.setHealthSyncEnabled(false);
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.HEIGHT,
+          value: 1.8,
+          date: DateTime(2026, 1, 2),
+          externalId: _idH1,
+        ),
+      ]);
+
+      final count = await createNotifier().enableSync();
+
+      expect(count, 1);
+      expect(await PreferenceHelper.instance.getHealthSyncEnabled(), isTrue);
+    });
+  });
+
+  group('disableSync', () {
+    test('clears the preferences and resets the state', () async {
+      await PreferenceHelper.instance.setHealthSyncWatermarks({
+        'height': '2026-06-01T12:00:00.000',
+      });
+      final notifier = createNotifier();
+      // let _loadPersistedState finish so it cannot re-enable the state later
+      await pumpEventQueue();
+      expect(container.read(healthSyncProvider).isEnabled, isTrue);
+
+      await notifier.disableSync();
+
+      expect(await PreferenceHelper.instance.getHealthSyncEnabled(), isFalse);
+      expect(await PreferenceHelper.instance.getHealthSyncWatermarks(), isEmpty);
+      expect(container.read(healthSyncProvider).isEnabled, isFalse);
+    });
+  });
+
+  group('sync', () {
+    test('does nothing while the preference is off', () async {
+      await PreferenceHelper.instance.setHealthSyncEnabled(false);
+
+      expect(await createNotifier().sync(), 0);
+      verifyNever(health.readableTypes(any));
+    });
+
+    test('does nothing while a run is already going', () async {
+      // The resume listener fires while a manual sync is still running, and a
+      // second pass would re-read the same window for nothing
+      stubReadings([]);
+      final notifier = createNotifier();
+      final first = notifier.sync();
+
+      expect(await notifier.sync(), 0);
+      await first;
+      verify(health.readableTypes(any)).called(1);
+    });
+
+    test('stamps lastSyncTime after a completed run, even an empty one', () async {
+      stubReadings([]);
+      final notifier = createNotifier();
+
+      expect(container.read(healthSyncProvider).lastSyncTime, isNull);
+      await notifier.sync();
+
+      expect(container.read(healthSyncProvider).lastSyncTime, isNotNull);
+      expect(container.read(healthSyncProvider).isSyncing, isFalse);
+      expect(container.read(healthSyncProvider).issue, isNull);
+    });
+
+    test('a run that gave up early reports the issue and keeps the timestamp', () async {
+      // Nothing was read, so the last time the metrics were looked at still
+      // stands; the state says why this attempt delivered nothing
+      stubReadings([]);
+      final notifier = createNotifier();
+      await notifier.sync();
+      final stamped = container.read(healthSyncProvider).lastSyncTime;
+
+      when(health.readableTypes(any)).thenAnswer((_) async => <HealthDataType>{});
+      await notifier.sync();
+
+      expect(container.read(healthSyncProvider).issue, HealthSyncIssue.permissionsMissing);
+      expect(container.read(healthSyncProvider).lastSyncTime, stamped);
+    });
+
+    test('carries the imported count into the state', () async {
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.HEIGHT,
+          value: 1.8,
+          date: DateTime(2026, 1, 2),
+          externalId: _idH1,
+        ),
+      ]);
+
+      await createNotifier().sync();
+
+      expect(container.read(healthSyncProvider).lastSyncCount, 1);
+    });
+  });
+}
diff --git a/test/features/health/providers/health_sync_test.mocks.dart b/test/features/health/providers/health_sync_test.mocks.dart
new file mode 100644
index 000000000..12361f924
--- /dev/null
+++ b/test/features/health/providers/health_sync_test.mocks.dart
@@ -0,0 +1,517 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/health/providers/health_sync_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i4;
+
+import 'package:health_bridge/health.dart' as _i5;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i3;
+import 'package:wger/core/network/auth_credentials_storage.dart' as _i11;
+import 'package:wger/core/network/auth_state.dart' as _i12;
+import 'package:wger/features/health/models/health_reading.dart' as _i6;
+import 'package:wger/features/health/providers/health_repository.dart' as _i2;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i10;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i8;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i9;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i7;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+/// A class which mocks [HealthRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockHealthRepository extends _i1.Mock implements _i2.HealthRepository {
+  MockHealthRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get sourceName =>
+      (super.noSuchMethod(
+            Invocation.getter(#sourceName),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#sourceName),
+            ),
+          )
+          as String);
+
+  @override
+  _i4.Future<bool> isAvailable() =>
+      (super.noSuchMethod(
+            Invocation.method(#isAvailable, []),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<_i2.HealthPlatformAvailability> availability() =>
+      (super.noSuchMethod(
+            Invocation.method(#availability, []),
+            returnValue: _i4.Future<_i2.HealthPlatformAvailability>.value(
+              _i2.HealthPlatformAvailability.available,
+            ),
+          )
+          as _i4.Future<_i2.HealthPlatformAvailability>);
+
+  @override
+  _i4.Future<void> openHealthConnectInstall() =>
+      (super.noSuchMethod(
+            Invocation.method(#openHealthConnectInstall, []),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<bool> ensureHistoryAuthorized() =>
+      (super.noSuchMethod(
+            Invocation.method(#ensureHistoryAuthorized, []),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<Set<_i5.HealthDataType>> readableTypes(
+    List<_i5.HealthDataType>? types,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#readableTypes, [types]),
+            returnValue: _i4.Future<Set<_i5.HealthDataType>>.value(
+              <_i5.HealthDataType>{},
+            ),
+          )
+          as _i4.Future<Set<_i5.HealthDataType>>);
+
+  @override
+  _i4.Future<bool> ensureAuthorized(List<_i5.HealthDataType>? types) =>
+      (super.noSuchMethod(
+            Invocation.method(#ensureAuthorized, [types]),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<List<_i6.HealthReading>> read({
+    required List<_i5.HealthDataType>? types,
+    required DateTime? start,
+    required DateTime? end,
+    required Duration? window,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#read, [], {
+              #types: types,
+              #start: start,
+              #end: end,
+              #window: window,
+            }),
+            returnValue: _i4.Future<List<_i6.HealthReading>>.value(
+              <_i6.HealthReading>[],
+            ),
+          )
+          as _i4.Future<List<_i6.HealthReading>>);
+}
+
+/// A class which mocks [MeasurementRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockMeasurementRepository extends _i1.Mock implements _i7.MeasurementRepository {
+  MockMeasurementRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i4.Stream<List<_i8.MeasurementCategory>> watchAllWithoutEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i4.Stream<List<_i8.MeasurementCategory>>.empty(),
+          )
+          as _i4.Stream<List<_i8.MeasurementCategory>>);
+
+  @override
+  _i4.Stream<_i8.MeasurementCategory?> watchCategoryWithoutEntries(
+    String? id,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
+            returnValue: _i4.Stream<_i8.MeasurementCategory?>.empty(),
+          )
+          as _i4.Stream<_i8.MeasurementCategory?>);
+
+  @override
+  _i4.Stream<_i8.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i4.Stream<_i8.MeasurementCategory?>.empty(),
+          )
+          as _i4.Stream<_i8.MeasurementCategory?>);
+
+  @override
+  _i4.Stream<List<_i9.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i4.Stream<List<_i9.MeasurementEntry>>.empty(),
+          )
+          as _i4.Stream<List<_i9.MeasurementEntry>>);
+
+  @override
+  _i4.Stream<List<_i9.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i4.Stream<List<_i9.MeasurementEntry>>.empty(),
+          )
+          as _i4.Stream<List<_i9.MeasurementEntry>>);
+
+  @override
+  _i4.Stream<Map<String, _i9.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i4.Stream<Map<String, _i9.MeasurementEntry>>.empty(),
+          )
+          as _i4.Stream<Map<String, _i9.MeasurementEntry>>);
+
+  @override
+  _i4.Stream<List<_i10.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i10.MeasurementBucketLevel? level = _i10.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i4.Stream<List<_i10.MeasurementBucket>>.empty(),
+          )
+          as _i4.Stream<List<_i10.MeasurementBucket>>);
+
+  @override
+  _i4.Stream<Map<String, List<_i10.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i10.MeasurementBucketLevel? level = _i10.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i4.Stream<Map<String, List<_i10.MeasurementBucket>>>.empty(),
+          )
+          as _i4.Stream<Map<String, List<_i10.MeasurementBucket>>>);
+
+  @override
+  _i4.Stream<Map<String, List<_i10.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i4.Stream<Map<String, List<_i10.MeasurementBucket>>>.empty(),
+          )
+          as _i4.Stream<Map<String, List<_i10.MeasurementBucket>>>);
+
+  @override
+  _i4.Stream<List<_i10.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i4.Stream<List<_i10.MeasurementValueCount>>.empty(),
+          )
+          as _i4.Stream<List<_i10.MeasurementValueCount>>);
+
+  @override
+  _i4.Future<List<_i8.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i4.Future<List<_i8.MeasurementCategory>>.value(
+              <_i8.MeasurementCategory>[],
+            ),
+          )
+          as _i4.Future<List<_i8.MeasurementCategory>>);
+
+  @override
+  _i4.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i4.Future<Set<String>>.value(<String>{}),
+          )
+          as _i4.Future<Set<String>>);
+
+  @override
+  _i4.Future<Map<String, _i9.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i4.Future<Map<String, _i9.MeasurementEntry>>.value(
+              <String, _i9.MeasurementEntry>{},
+            ),
+          )
+          as _i4.Future<Map<String, _i9.MeasurementEntry>>);
+
+  @override
+  _i4.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<void> deleteLocalDrift(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDrift, [id]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> updateLocalDrift(_i9.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDrift, [entry]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> addLocalDrift(_i9.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDrift, [entry]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> addLocalDriftGroupEntries(
+    List<_i9.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> deleteLocalDriftCategory(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDriftCategory, [id]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> updateLocalDriftCategory(
+    _i8.MeasurementCategory? category,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDriftCategory, [category]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> addLocalDriftCategory(_i8.MeasurementCategory? category) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategory, [category]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> addLocalDriftCategoryGroup(
+    List<_i8.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+}
+
+/// A class which mocks [AuthCredentialsStorage].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockAuthCredentialsStorage extends _i1.Mock implements _i11.AuthCredentialsStorage {
+  MockAuthCredentialsStorage() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i4.Future<_i11.StoredAuth?> load() =>
+      (super.noSuchMethod(
+            Invocation.method(#load, []),
+            returnValue: _i4.Future<_i11.StoredAuth?>.value(),
+          )
+          as _i4.Future<_i11.StoredAuth?>);
+
+  @override
+  _i4.Future<void> saveJwt({
+    required _i12.JwtCredential? credential,
+    required String? serverUrl,
+    String? refreshToken,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#saveJwt, [], {
+              #credential: credential,
+              #serverUrl: serverUrl,
+              #refreshToken: refreshToken,
+            }),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> updateJwt({
+    required _i12.JwtCredential? credential,
+    String? refreshToken,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateJwt, [], {
+              #credential: credential,
+              #refreshToken: refreshToken,
+            }),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> clearJwt() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearJwt, []),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> clearLegacy() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearLegacy, []),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> clearCredentials() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearCredentials, []),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> clearAll() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearAll, []),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<String?> dbOwnerUserId() =>
+      (super.noSuchMethod(
+            Invocation.method(#dbOwnerUserId, []),
+            returnValue: _i4.Future<String?>.value(),
+          )
+          as _i4.Future<String?>);
+
+  @override
+  _i4.Future<void> setDbOwnerUserId(String? userId) =>
+      (super.noSuchMethod(
+            Invocation.method(#setDbOwnerUserId, [userId]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<bool> keepDataOnLogout() =>
+      (super.noSuchMethod(
+            Invocation.method(#keepDataOnLogout, []),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<bool> hasEverSynced() =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEverSynced, []),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
+
+  @override
+  _i4.Future<void> markEverSynced() =>
+      (super.noSuchMethod(
+            Invocation.method(#markEverSynced, []),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<String?> readRefreshToken() =>
+      (super.noSuchMethod(
+            Invocation.method(#readRefreshToken, []),
+            returnValue: _i4.Future<String?>.value(),
+          )
+          as _i4.Future<String?>);
+}
diff --git a/test/features/measurements/charts/data_test.dart b/test/features/measurements/charts/data_test.dart
new file mode 100644
index 000000000..8e0ed494f
--- /dev/null
+++ b/test/features/measurements/charts/data_test.dart
@@ -0,0 +1,736 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:collection/collection.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/features/measurements/charts/data.dart';
+import 'package:wger/features/measurements/charts/range.dart';
+import 'package:wger/features/measurements/charts/series.dart';
+import 'package:wger/features/measurements/models/measurement_bucket.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+
+void main() {
+  MeasurementChartEntry entry(num value, DateTime date) => MeasurementChartEntry(value, date);
+
+  group('MeasurementChartEntry', () {
+    test('only counts as a range when both bounds are set', () {
+      expect(entry(60, DateTime(2026, 1, 1)).hasRange, isFalse);
+      expect(MeasurementChartEntry(60, DateTime(2026, 1, 1), min: 50).hasRange, isFalse);
+      expect(
+        MeasurementChartEntry(60, DateTime(2026, 1, 1), min: 50, max: 70).hasRange,
+        isTrue,
+      );
+    });
+  });
+
+  group('clampPeriods', () {
+    final bounds = DateTimeRange(start: DateTime(2026, 1, 10), end: DateTime(2026, 1, 20));
+
+    test('keeps a period inside the bounds untouched', () {
+      final period = DateTimeRange(start: DateTime(2026, 1, 12), end: DateTime(2026, 1, 15));
+      expect(clampPeriods([period], bounds), [period]);
+    });
+
+    test('clamps overlapping periods to the bounds', () {
+      final result = clampPeriods([
+        DateTimeRange(start: DateTime(2026, 1, 1), end: DateTime(2026, 1, 12)),
+        DateTimeRange(start: DateTime(2026, 1, 15), end: DateTime(2026, 2, 1)),
+      ], bounds);
+
+      expect(result, [
+        DateTimeRange(start: DateTime(2026, 1, 10), end: DateTime(2026, 1, 12)),
+        DateTimeRange(start: DateTime(2026, 1, 15), end: DateTime(2026, 1, 20)),
+      ]);
+    });
+
+    test('drops periods outside the bounds, including touching ones', () {
+      final result = clampPeriods([
+        DateTimeRange(start: DateTime(2026, 1, 1), end: DateTime(2026, 1, 5)),
+        // ends exactly at the bounds' start: zero width, nothing to draw
+        DateTimeRange(start: DateTime(2026, 1, 1), end: DateTime(2026, 1, 10)),
+        DateTimeRange(start: DateTime(2026, 2, 1), end: DateTime(2026, 2, 5)),
+      ], bounds);
+
+      expect(result, isEmpty);
+    });
+  });
+
+  group('movingAverage', () {
+    test('returns an empty list for no entries', () {
+      expect(movingAverage([]), isEmpty);
+    });
+
+    test('averages over everything within the preceding 7 days', () {
+      final result = movingAverage([
+        entry(10, DateTime(2026, 1, 1)),
+        entry(20, DateTime(2026, 1, 2)),
+        entry(30, DateTime(2026, 1, 3)),
+      ]);
+
+      expect(result.map((e) => e.value), [10, 15, 20]);
+      expect(result.map((e) => e.date), [
+        DateTime(2026, 1, 1),
+        DateTime(2026, 1, 2),
+        DateTime(2026, 1, 3),
+      ]);
+    });
+
+    test('drops points that fell out of the window', () {
+      final result = movingAverage([
+        entry(10, DateTime(2026, 1, 1)),
+        entry(20, DateTime(2026, 1, 20)),
+      ]);
+
+      // the january 1st entry is far outside the 7 days before january 20th
+      expect(result.last.value, 20);
+    });
+
+    test('sorts unordered input by date first', () {
+      final result = movingAverage([
+        entry(30, DateTime(2026, 1, 3)),
+        entry(10, DateTime(2026, 1, 1)),
+        entry(20, DateTime(2026, 1, 2)),
+      ]);
+
+      expect(result.map((e) => e.value), [10, 15, 20]);
+    });
+
+    test('stays accurate over a long dense series', () {
+      // The window total is carried along rather than re-summed, so this
+      // guards against drift piling up
+      final result = movingAverage([
+        for (var i = 0; i < 5000; i++) entry(100, DateTime(2026, 1, 1).add(Duration(minutes: i))),
+      ]);
+
+      expect(result.every((e) => (e.value - 100).abs() < 0.000001), isTrue);
+    });
+
+    test('a wider window reaches further back', () {
+      final points = [
+        entry(10, DateTime(2026, 1, 1)),
+        entry(20, DateTime(2026, 1, 12)),
+      ];
+
+      // the january 1st entry is outside 7 days but inside 14
+      expect(movingAverage(points, days: 7).last.value, 20);
+      expect(movingAverage(points, days: 14).last.value, 15);
+    });
+  });
+
+  group('aggregatePerDay', () {
+    test('returns an empty list for no entries', () {
+      expect(aggregatePerDay([]), isEmpty);
+    });
+
+    test('sums entries sharing a calendar day into one point', () {
+      final result = aggregatePerDay([
+        entry(1000, DateTime(2026, 1, 1, 8)),
+        entry(2500, DateTime(2026, 1, 1, 20)),
+      ]);
+
+      expect(result.length, 1);
+      expect(result.single.value, 3500);
+      // time-of-day is stripped to the day boundary
+      expect(result.single.date, DateTime(2026, 1, 1));
+    });
+
+    test('keeps separate days apart and sorts them ascending', () {
+      final result = aggregatePerDay([
+        entry(30, DateTime(2026, 1, 3)),
+        entry(10, DateTime(2026, 1, 1, 6)),
+        entry(5, DateTime(2026, 1, 1, 23)),
+        entry(20, DateTime(2026, 1, 2)),
+      ]);
+
+      expect(result.map((e) => e.date), [
+        DateTime(2026, 1, 1),
+        DateTime(2026, 1, 2),
+        DateTime(2026, 1, 3),
+      ]);
+      expect(result.map((e) => e.value), [15, 20, 30]);
+    });
+  });
+
+  group('averagePerDay', () {
+    test('returns an empty list for no entries', () {
+      expect(averagePerDay([]), isEmpty);
+    });
+
+    test('averages entries sharing a calendar day into one point', () {
+      final result = averagePerDay([
+        entry(80, DateTime(2026, 1, 1, 8)),
+        entry(82, DateTime(2026, 1, 1, 20)),
+      ]);
+
+      expect(result.single.value, 81);
+      expect(result.single.date, DateTime(2026, 1, 1));
+    });
+
+    test('keeps separate days apart and sorts them ascending', () {
+      final result = averagePerDay([
+        entry(30, DateTime(2026, 1, 3)),
+        entry(10, DateTime(2026, 1, 1)),
+        entry(20, DateTime(2026, 1, 2)),
+      ]);
+
+      expect(result.map((e) => e.date), [
+        DateTime(2026, 1, 1),
+        DateTime(2026, 1, 2),
+        DateTime(2026, 1, 3),
+      ]);
+      expect(result.map((e) => e.value), [10, 20, 30]);
+    });
+  });
+
+  group('weeklyDeltas', () {
+    // 5 January 2026 is a Monday
+    final monday = DateTime(2026, 1, 5);
+    DateTime week(int index) => monday.add(Duration(days: 7 * index));
+
+    test('returns an empty list for no entries', () {
+      expect(weeklyDeltas([]), isEmpty);
+    });
+
+    test('has no bar for a single week, which has nothing to compare against', () {
+      expect(
+        weeklyDeltas([entry(80, monday), entry(81, monday.add(const Duration(days: 2)))]),
+        isEmpty,
+      );
+    });
+
+    test('subtracts the previous week, dated on the week it belongs to', () {
+      final result = weeklyDeltas([
+        entry(80, monday),
+        entry(79, week(1)),
+        entry(79.5, week(2)),
+      ]);
+
+      expect(result.map((e) => e.date), [week(1), week(2)]);
+      expect(result.map((e) => e.value), [-1, 0.5]);
+    });
+
+    test('compares the weeks by their average, not by single readings', () {
+      // the low reading is an outlier within its week and must not decide the bar
+      final result = weeklyDeltas([
+        entry(80, monday),
+        entry(82, monday.add(const Duration(days: 3))),
+        entry(75, week(1)),
+        entry(87, week(1).add(const Duration(days: 3))),
+      ]);
+
+      expect(result.single.value, 0);
+    });
+
+    test('sums the weeks of a metric that is read as a total', () {
+      final result = weeklyDeltas([
+        entry(3000, monday),
+        entry(4000, monday.add(const Duration(days: 1))),
+        entry(9000, week(1)),
+      ], summed: true);
+
+      expect(result.single.value, 2000);
+    });
+
+    test('takes the week after a gap against the last week that has readings', () {
+      final result = weeklyDeltas([entry(80, monday), entry(77, week(3))]);
+
+      // one bar on the week that was measured, holding the whole change, so the
+      // bars still add up to the change across the range
+      expect(result.single.date, week(3));
+      expect(result.single.value, -3);
+    });
+
+    test('sorts unordered input by week first', () {
+      final result = weeklyDeltas([entry(79, week(1)), entry(80, monday)]);
+
+      expect(result.single.value, -1);
+    });
+
+    test('leaves the running week out of a summed metric', () {
+      // its total is still growing and would read as a drop until Sunday
+      final result = weeklyDeltas(
+        [entry(7000, monday), entry(3000, week(1))],
+        summed: true,
+        today: week(1).add(const Duration(days: 2)),
+      );
+
+      expect(result, isEmpty);
+    });
+
+    test('keeps the running week of an averaged metric', () {
+      final result = weeklyDeltas(
+        [entry(80, monday), entry(79, week(1))],
+        today: week(1).add(const Duration(days: 2)),
+      );
+
+      expect(result.single.value, -1);
+    });
+  });
+
+  group('smoothedTrendline', () {
+    test('returns an empty list for no entries', () {
+      expect(smoothedTrendline([]), isEmpty);
+    });
+
+    test('seeds the first point with the raw value and keeps the dates', () {
+      final input = [
+        entry(10, DateTime(2026, 1, 1)),
+        entry(20, DateTime(2026, 1, 2)),
+        entry(30, DateTime(2026, 1, 3)),
+      ];
+      final result = smoothedTrendline(input, period: 10);
+
+      expect(result.length, 3);
+      expect(result.first.value, 10); // seed == first raw value
+      expect(result.map((e) => e.date), input.map((e) => e.date));
+    });
+
+    test('EMA follows a rising series but lags behind the raw values', () {
+      final result = smoothedTrendline([
+        entry(10, DateTime(2026, 1, 1)),
+        entry(20, DateTime(2026, 1, 2)),
+        entry(30, DateTime(2026, 1, 3)),
+      ], period: 10);
+
+      // smoothing k = 2 / (10 + 1) ~= 0.1818
+      // point 2: 20*k + 10*(1-k) = 11.818...
+      expect(result[1].value, closeTo(11.818, 0.001));
+      // point 3: 30*k + 11.818*(1-k) = 15.123...
+      expect(result[2].value, closeTo(15.123, 0.001));
+      // trend trails the raw climb
+      expect(result[2].value, lessThan(30));
+    });
+
+    test('sorts unordered input by date before smoothing', () {
+      final result = smoothedTrendline([
+        entry(30, DateTime(2026, 1, 3)),
+        entry(10, DateTime(2026, 1, 1)),
+        entry(20, DateTime(2026, 1, 2)),
+      ], period: 10);
+
+      expect(result.first.date, DateTime(2026, 1, 1));
+      expect(result.first.value, 10);
+      expect(result.last.date, DateTime(2026, 1, 3));
+    });
+  });
+
+  group('chartEntriesFor', () {
+    test('converts the aggregate bounds along with the value', () {
+      // Reading the value in lb but the bounds in kg would put the band a
+      // factor 2.2 off the line it is supposed to wrap
+      final points = chartEntriesFor(
+        [
+          MeasurementEntry(
+            categoryId: 'c',
+            date: DateTime(2026, 1, 1),
+            value: 80,
+            notes: '',
+            extraData: const {'min': 70, 'max': 90},
+          ),
+        ],
+        targetUnit: 'lb',
+        categoryUnit: 'kg',
+      );
+
+      expect(points.single.value, 176.37);
+      expect(points.single.min, 154.32);
+      expect(points.single.max, 198.42);
+    });
+
+    test('leaves entries without bounds unranged', () {
+      final points = chartEntriesFor(
+        [
+          MeasurementEntry(
+            categoryId: 'c',
+            date: DateTime(2026, 1, 1),
+            value: 80,
+            notes: '',
+          ),
+        ],
+        targetUnit: 'kg',
+        categoryUnit: 'kg',
+      );
+
+      expect(points.single.hasRange, isFalse);
+    });
+  });
+  group('chartEntriesForBuckets', () {
+    MeasurementBucket bucket(
+      num sum, {
+      int count = 1,
+      String? unit,
+      num? min,
+      num? max,
+      DateTime? start,
+    }) => MeasurementBucket(
+      start: start ?? DateTime(2026, 1, 1),
+      unit: unit,
+      count: count,
+      sum: sum,
+      min: min ?? sum / count,
+      max: max ?? sum / count,
+    );
+
+    test('a bucket becomes its mean, spanning the values it stands for', () {
+      final points = chartEntriesForBuckets(
+        [bucket(300, count: 4, min: 60, max: 90)],
+        targetUnit: 'bpm',
+        categoryUnit: 'bpm',
+      );
+
+      expect(points.single.value, 75);
+      expect(points.single.min, 60);
+      expect(points.single.max, 90);
+      // What the point stands for, which the distribution's threshold counts
+      expect(points.single.count, 4);
+    });
+
+    test('a single reading gets no band', () {
+      // A zero-width band is a line drawn twice
+      final points = chartEntriesForBuckets(
+        [bucket(80)],
+        targetUnit: 'kg',
+        categoryUnit: 'kg',
+      );
+
+      expect(points.single.value, 80);
+      expect(points.single.hasRange, isFalse);
+    });
+
+    test('slices are converted before they are merged', () {
+      // The kg and lb halves of one day: averaging the stored numbers first
+      // would produce a value in neither unit
+      final points = chartEntriesForBuckets(
+        [
+          bucket(80, unit: 'kg'),
+          bucket(180, unit: 'lb'),
+        ],
+        targetUnit: 'kg',
+        categoryUnit: 'kg',
+      );
+
+      // 180 lb is 81.65 kg, so the day averages the two
+      expect(points.single.value, closeTo(80.83, 0.01));
+      expect(points.single.min, 80);
+      expect(points.single.max, 81.65);
+    });
+
+    test('the mean is weighted by how many readings each slice holds', () {
+      final points = chartEntriesForBuckets(
+        [
+          bucket(300, count: 4, unit: 'kg'),
+          bucket(100, count: 1, unit: 'kg'),
+        ],
+        targetUnit: 'kg',
+        categoryUnit: 'kg',
+      );
+
+      // 400 over five readings, not the 87.5 an unweighted mean would give
+      expect(points.single.value, 80);
+    });
+
+    test('a slice without a unit falls back to the category one', () {
+      final points = chartEntriesForBuckets(
+        [bucket(180)],
+        targetUnit: 'kg',
+        categoryUnit: 'lb',
+      );
+
+      expect(points.single.value, closeTo(81.65, 0.01));
+    });
+
+    test('a summed metric totals its slices and gets no band', () {
+      // A band around a daily step count is a spread the total has not
+      final points = chartEntriesForBuckets(
+        [bucket(6000, count: 3, min: 1000, max: 3000)],
+        targetUnit: 'steps',
+        categoryUnit: 'steps',
+        summed: true,
+      );
+
+      expect(points.single.value, 6000);
+      expect(points.single.hasRange, isFalse);
+    });
+
+    test('buckets of different starts stay separate points', () {
+      final points = chartEntriesForBuckets(
+        [
+          bucket(80, start: DateTime(2026, 1, 1)),
+          bucket(81, start: DateTime(2026, 1, 2)),
+        ],
+        targetUnit: 'kg',
+        categoryUnit: 'kg',
+      );
+
+      expect(points.map((p) => p.date), [DateTime(2026, 1, 1), DateTime(2026, 1, 2)]);
+      expect(points.map((p) => p.value), [80, 81]);
+    });
+  });
+  group('chartSeriesFor', () {
+    test('cuts both series at the range, after averaging over all points', () {
+      // The points reach back beyond the range so the first ones in it average
+      // the days before them instead of starting over at the cutoff
+      final points = [
+        for (var day = 0; day < 20; day++)
+          MeasurementChartEntry(
+            day.isEven ? 70 : 80,
+            DateTime.now().subtract(Duration(days: 19 - day)),
+          ),
+      ];
+
+      final (:entries, :average) = chartSeriesFor(
+        points,
+        ChartRange.lastMonth,
+        const ChartSettings(),
+      );
+
+      expect(entries, hasLength(20));
+      expect(average, hasLength(20));
+      // The last point averages a full window, not just itself
+      expect(average.last.value, closeTo(75, 1));
+    });
+  });
+  group('sensibleRange', () {
+    test('averages over the window the category configured', () {
+      final points = [
+        MeasurementChartEntry(10, DateTime.now().subtract(const Duration(days: 11))),
+        MeasurementChartEntry(20, DateTime.now()),
+      ];
+
+      // the older point is outside 7 days but inside 14
+      expect(sensibleRange(points).$2.last.value, 20);
+      expect(sensibleRange(points, averageDays: 14).$2.last.value, 15);
+    });
+  });
+
+  group('niceBinWidth', () {
+    test('rounds the span split into ~20 bins up to 1, 2 or 5 times a power of ten', () {
+      // span 14.6 / 20 = 0.73 -> 1, not an edge like 59.3-61.3
+      expect(niceBinWidth(59.3, 73.9), 1);
+      // span 30000 / 20 = 1500 -> 2000
+      expect(niceBinWidth(0, 30000), 2000);
+      // span 9 / 20 = 0.45 -> 0.5
+      expect(niceBinWidth(1, 10), 0.5);
+    });
+
+    test('a span of nothing still has a width', () {
+      expect(niceBinWidth(80, 80), 1);
+    });
+  });
+  group('buildWeightedHistogram', () {
+    test('counts a value as often as it occurred', () {
+      // What the aggregated query hands over: a year of readings arrives as
+      // the distinct values it covers, with their counts
+      final result = buildWeightedHistogram(
+        [(value: 60, count: 30), (value: 61, count: 5)],
+        latest: 61,
+        binWidth: 1,
+      );
+
+      expect(result.counts, [30, 5]);
+    });
+
+    test('the median weighs the counts, not the distinct values', () {
+      // Thirty readings at 60 and one at 90: the middle reading is a 60, which
+      // an unweighted median over the two values would miss
+      final result = buildWeightedHistogram(
+        [(value: 60, count: 30), (value: 90, count: 1)],
+        latest: 90,
+        binWidth: 10,
+      );
+
+      expect(result.median, 60);
+    });
+
+    test('an even number of readings averages the two in the middle', () {
+      final result = buildWeightedHistogram(
+        [(value: 60, count: 1), (value: 70, count: 1)],
+        latest: 70,
+        binWidth: 10,
+      );
+
+      expect(result.median, 65);
+    });
+  });
+  group('buildWeightedHistogram bins', () {
+    test('aligns the bin edges to round multiples of the width', () {
+      final result = buildWeightedHistogram(
+        [
+          (value: 79.7, count: 1),
+          (value: 82.3, count: 1),
+        ],
+        latest: 0,
+        binWidth: 0.5,
+      );
+
+      expect(result.firstEdge, 79.5);
+      expect(result.lowerEdgeOf(1), 80);
+      expect(result.upperEdgeOf(result.counts.length - 1), 82.5);
+    });
+
+    test('keeps empty bins between the occupied ones, a gap is information', () {
+      final result = buildWeightedHistogram(
+        [
+          (value: 60, count: 1),
+          (value: 61, count: 1),
+          (value: 65, count: 1),
+        ],
+        latest: 0,
+        binWidth: 2,
+      );
+
+      expect(result.counts, [2, 0, 1]);
+    });
+
+    test('takes the median of the values, odd and even', () {
+      final odd = buildWeightedHistogram(
+        [
+          (value: 60, count: 1),
+          (value: 62, count: 1),
+          (value: 70, count: 1),
+        ],
+        latest: 0,
+        binWidth: 2,
+      );
+      expect(odd.median, 62);
+
+      final even = buildWeightedHistogram(
+        [
+          (value: 60, count: 1),
+          (value: 63, count: 1),
+          (value: 65, count: 1),
+          (value: 70, count: 1),
+        ],
+        latest: 0,
+        binWidth: 2,
+      );
+      expect(even.median, 64);
+    });
+
+    test('derives a width from the span when the type brings none', () {
+      final result = buildWeightedHistogram([
+        (value: 59.3, count: 1),
+        (value: 73.9, count: 1),
+      ], latest: 0);
+
+      expect(result.binWidth, 1);
+    });
+
+    test('doubles the width until an outlier no longer stretches it into hundreds of bins', () {
+      // 20 to 350 at 0.5 kg would be 661 bins; doubling keeps the edges round
+      final result = buildWeightedHistogram(
+        [
+          (value: 20, count: 1),
+          (value: 80, count: 1),
+          (value: 350, count: 1),
+        ],
+        latest: 0,
+        binWidth: 0.5,
+      );
+
+      expect(result.binWidth, 4);
+      expect(result.counts.length, lessThanOrEqualTo(100));
+      expect(result.counts.sum, 3);
+    });
+  });
+
+  group('buildHeatmapGrid', () {
+    // 2 March 2026 is a Monday, 18 March a Wednesday
+    final monday = DateTime(2026, 3, 2);
+    final wednesday = DateTime(2026, 3, 18);
+
+    test('starts on the Monday of the oldest week and ends with today', () {
+      final grid = buildHeatmapGrid(
+        [entry(10, monday), entry(20, wednesday)],
+        today: wednesday,
+      );
+
+      expect(grid.start, monday);
+      expect(grid.weeks, 3);
+      expect(grid.dayAt(0, 0), monday);
+      expect(grid.dayAt(2, 2), wednesday);
+    });
+
+    test('leaves days without a measurement empty rather than zero', () {
+      final grid = buildHeatmapGrid([entry(10, monday)], today: monday);
+
+      expect(grid.valueAt(0, 0), 10);
+      expect(grid.valueAt(0, 1), isNull);
+    });
+
+    test('runs up to today, so a stretch without measurements stays visible', () {
+      final grid = buildHeatmapGrid([entry(10, monday)], today: wednesday);
+
+      expect(grid.weeks, 3);
+      expect(grid.valueAt(2, 2), isNull);
+    });
+
+    test('caps a long history at a year of week columns', () {
+      final grid = buildHeatmapGrid(
+        [entry(10, DateTime(2020, 1, 1)), entry(20, wednesday)],
+        today: wednesday,
+      );
+
+      expect(grid.weeks, heatmapMaxWeeks);
+      expect(grid.dayAt(grid.weeks - 1, 2), wednesday);
+    });
+
+    test('anchors on the last measurement when the history ended long ago', () {
+      // Anchoring on today would put the whole history outside the grid and
+      // draw an empty one
+      final grid = buildHeatmapGrid(
+        [entry(10, monday), entry(20, wednesday)],
+        today: DateTime(2028, 1, 1),
+      );
+
+      expect(grid.dayAt(grid.weeks - 1, 2), wednesday);
+      expect(grid.valueAt(grid.weeks - 1, 2), 20);
+    });
+
+    test('takes the top of the colour scale only from the days it shows', () {
+      // A spike outside the window would scale the colours of every visible
+      // cell without being visible itself, washing out the whole grid
+      final grid = buildHeatmapGrid(
+        [entry(45000, DateTime(2024, 1, 3)), entry(8000, wednesday)],
+        today: wednesday,
+      );
+
+      expect(grid.maxValue, 8000);
+      expect(grid.values.containsKey(DateTime(2024, 1, 3)), isFalse);
+    });
+
+    test('takes the top of the colour scale from the largest value', () {
+      final grid = buildHeatmapGrid(
+        [entry(10, monday), entry(8000, wednesday)],
+        today: wednesday,
+      );
+
+      expect(grid.maxValue, 8000);
+    });
+
+    test('is a full grid of the last year when there is nothing to show', () {
+      final grid = buildHeatmapGrid([]);
+
+      expect(grid.weeks, heatmapMaxWeeks);
+      expect(grid.maxValue, 0);
+      expect(grid.valueAt(0, 0), isNull);
+    });
+  });
+}
diff --git a/test/features/measurements/charts/range_test.dart b/test/features/measurements/charts/range_test.dart
new file mode 100644
index 000000000..3202d4443
--- /dev/null
+++ b/test/features/measurements/charts/range_test.dart
@@ -0,0 +1,68 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2020 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/features/measurements/charts/range.dart';
+
+void main() {
+  group('ChartRange', () {
+    test('the week is the shortest range, the full history the longest', () {
+      final now = DateTime.now();
+
+      expect(ChartRange.all.cutoff, isNull);
+      expect(ChartRange.lastMonth.cutoff!.isAfter(ChartRange.last3Months.cutoff!), isTrue);
+      expect(ChartRange.lastWeek.cutoff!.isAfter(ChartRange.lastMonth.cutoff!), isTrue);
+      expect(ChartRange.lastWeek.cutoff!.isBefore(now), isTrue);
+    });
+
+    test('the week covers today plus the six days before it', () {
+      // Seven calendar days in all: the count cutoff sits at midnight six
+      // days back, so a weekday axis gets one letter per day
+      final count = ChartRange.lastWeek.countCutoff!;
+      final now = DateTime.now();
+
+      expect(DateTime(now.year, now.month, now.day - 6), count);
+    });
+
+    test('the read cutoff leaves room for the widest average window', () {
+      // 30 days of range plus the 30-day window the category may be set to
+      final read = ChartRange.lastMonth.readCutoff!;
+
+      expect(ChartRange.lastMonth.cutoff!.difference(read).inDays, greaterThanOrEqualTo(29));
+    });
+
+    test('the count cutoff is the range itself, with no lead', () {
+      final count = ChartRange.lastMonth.countCutoff!;
+
+      expect(ChartRange.lastMonth.cutoff!.difference(count).inHours, lessThan(24));
+      expect(count.isAfter(ChartRange.lastMonth.readCutoff!), isTrue);
+    });
+
+    test('the query cutoffs stay the same across rebuilds', () {
+      // They identify a provider: derived from the current instant, every
+      // rebuild would watch a new one, re-query the database and drop what it
+      // was showing. Unlike cutoff, which is only ever compared against.
+      for (final range in ChartRange.values) {
+        expect(range.readCutoff, range.readCutoff);
+        expect(range.countCutoff, range.countCutoff);
+      }
+      expect(ChartRange.lastMonth.countCutoff!.hour, 0);
+      expect(ChartRange.lastMonth.countCutoff!.minute, 0);
+    });
+  });
+}
diff --git a/test/features/measurements/charts/spark_test.dart b/test/features/measurements/charts/spark_test.dart
new file mode 100644
index 000000000..220a9d3bf
--- /dev/null
+++ b/test/features/measurements/charts/spark_test.dart
@@ -0,0 +1,293 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/features/measurements/charts/series.dart';
+import 'package:wger/features/measurements/charts/spark.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+
+void main() {
+  group('sparkKindFor', () {
+    test('honors the picked chart type where it survives miniaturisation', () {
+      expect(sparkKindFor(MetricType.restingHeartRate, ChartType.line), SparkKind.line);
+      expect(sparkKindFor(MetricType.steps, ChartType.bar), SparkKind.bars);
+      expect(sparkKindFor(MetricType.steps, ChartType.heatmap), SparkKind.heatmap);
+      expect(sparkKindFor(MetricType.restingHeartRate, ChartType.delta), SparkKind.delta);
+    });
+
+    test('auto derives the default spark from the metric type', () {
+      expect(sparkKindFor(MetricType.restingHeartRate, ChartType.auto), SparkKind.line);
+      expect(sparkKindFor(MetricType.steps, ChartType.auto), SparkKind.bars);
+      expect(sparkKindFor(MetricType.custom, ChartType.auto), SparkKind.line);
+    });
+
+    test('a distribution falls back to the default spark of the type', () {
+      expect(sparkKindFor(MetricType.restingHeartRate, ChartType.distribution), SparkKind.line);
+      expect(sparkKindFor(MetricType.steps, ChartType.distribution), SparkKind.bars);
+    });
+
+    test('a pick that does not fit the type falls back like the full chart', () {
+      // A summed type has no line chart to shrink, see resolveChartType
+      expect(sparkKindFor(MetricType.steps, ChartType.line), SparkKind.bars);
+    });
+  });
+
+  group('sparkWindowFor', () {
+    // A Friday; its Monday is 2026-08-03
+    final today = DateTime(2026, 8, 7);
+
+    test('a line follows the filter cutoff as it is', () {
+      final window = sparkWindowFor(
+        SparkKind.line,
+        cutoff: DateTime(2026, 7, 8),
+        today: today,
+      );
+
+      expect(window.start, DateTime(2026, 7, 8));
+      expect(window.days, 31);
+      expect(window.weekly, isFalse);
+    });
+
+    test('a full-history line has no fixed start, the data provides it', () {
+      final window = sparkWindowFor(SparkKind.line, cutoff: null, today: today);
+
+      expect(window.start, isNull);
+      expect(window.days, isNull);
+    });
+
+    test('bars stay daily up to the weekly threshold', () {
+      final window = sparkWindowFor(
+        SparkKind.bars,
+        cutoff: DateTime(2026, 7, 8),
+        today: today,
+      );
+
+      expect(window.weekly, isFalse);
+      expect(window.slotCount, 31);
+    });
+
+    test('bars switch to Monday-aligned calendar weeks beyond it', () {
+      final window = sparkWindowFor(
+        SparkKind.bars,
+        cutoff: DateTime(2026, 5, 9),
+        today: today,
+      );
+
+      expect(window.weekly, isTrue);
+      expect(window.start!.weekday, DateTime.monday);
+      expect(window.slotCount, 13);
+      // 13 week columns, the newest being the running one
+      expect(window.start, DateTime(2026, 5, 11));
+    });
+
+    test('the unlimited range is capped at a year of weekly slots', () {
+      final window = sparkWindowFor(SparkKind.bars, cutoff: null, today: today);
+
+      expect(window.weekly, isTrue);
+      expect(window.slotCount, sparkMaxWeeks);
+    });
+
+    test('the delta window gets one slot beyond its weeks for the running week', () {
+      final window = sparkWindowFor(
+        SparkKind.delta,
+        cutoff: DateTime(2026, 5, 9),
+        today: today,
+      );
+
+      expect(window.start, DateTime(2026, 5, 4));
+      expect(window.slotCount, 14);
+    });
+
+    test('the heatmap follows the filter within its legibility bounds', () {
+      // A month is five week columns, ending in the running week
+      final month = sparkWindowFor(
+        SparkKind.heatmap,
+        cutoff: DateTime(2026, 7, 8),
+        today: today,
+      );
+      expect(month.slotCount, 5);
+      expect(month.start, DateTime(2026, 7, 6));
+
+      // A week is below what a heatmap says anything about
+      final week = sparkWindowFor(
+        SparkKind.heatmap,
+        cutoff: DateTime(2026, 8, 1),
+        today: today,
+      );
+      expect(week.slotCount, sparkHeatmapMinWeeks);
+
+      // The unlimited range is capped where the columns stop fitting
+      final all = sparkWindowFor(SparkKind.heatmap, cutoff: null, today: today);
+      expect(all.slotCount, sparkHeatmapMaxWeeks);
+    });
+  });
+
+  group('sparkWeeklyPoints', () {
+    test('one point per calendar week, keeping the daily level', () {
+      final means = sparkWeeklyPoints([
+        MeasurementChartEntry(8000, DateTime(2026, 8, 3)),
+        MeasurementChartEntry(6000, DateTime(2026, 8, 5)),
+        MeasurementChartEntry(10000, DateTime(2026, 7, 29)),
+      ]);
+
+      expect(means.map((e) => e.date), [DateTime(2026, 7, 27), DateTime(2026, 8, 3)]);
+      expect(means.map((e) => e.value), [10000, 7000]);
+    });
+
+    test('carries the span of everything measured in the week', () {
+      final ranges = sparkWeeklyPoints([
+        MeasurementChartEntry(100, DateTime(2026, 8, 3), min: 79, max: 122),
+        MeasurementChartEntry(105, DateTime(2026, 8, 5), min: 82, max: 128),
+      ]);
+
+      final week = ranges.single;
+      expect(week.date, DateTime(2026, 8, 3));
+      expect(week.min, 79);
+      expect(week.max, 128);
+    });
+  });
+
+  group('sparkWeeklyStacks', () {
+    test('per component the mean over the days it reported', () {
+      final stacks = sparkWeeklyStacks([
+        MeasurementStackedEntry(DateTime(2026, 8, 3), const [400, 90]),
+        MeasurementStackedEntry(DateTime(2026, 8, 4), const [440, null]),
+      ]);
+
+      final week = stacks.single;
+      expect(week.date, DateTime(2026, 8, 3));
+      expect(week.values, [420, 90]);
+    });
+  });
+
+  group('sparkBars', () {
+    final start = DateTime(2026, 8, 1);
+
+    test('lays each day into its slot, one segment from zero', () {
+      final data = sparkBars(
+        [
+          MeasurementChartEntry(10, DateTime(2026, 8, 1)),
+          MeasurementChartEntry(20, DateTime(2026, 8, 3)),
+        ],
+        start: start,
+        slotCount: 7,
+      );
+
+      expect(data.bars.map((b) => b.slot), [0, 2]);
+      expect(data.bars.first.segments.single, (from: 0, to: 10, colorIndex: 0));
+      expect(data.minValue, 0);
+      expect(data.maxValue, 20);
+    });
+
+    test('weekly slots hold a calendar week each', () {
+      final monday = DateTime(2026, 5, 11);
+      final data = sparkBars(
+        [
+          MeasurementChartEntry(7000, DateTime(2026, 5, 11)),
+          MeasurementChartEntry(9000, DateTime(2026, 8, 3)),
+        ],
+        start: monday,
+        slotCount: 13,
+        slotDays: 7,
+      );
+
+      expect(data.bars.map((b) => b.slot), [0, 12]);
+    });
+
+    test('drops what falls outside the window instead of misplacing it', () {
+      final data = sparkBars(
+        [
+          MeasurementChartEntry(10, DateTime(2026, 7, 31)),
+          MeasurementChartEntry(20, DateTime(2026, 8, 8)),
+        ],
+        start: start,
+        slotCount: 7,
+      );
+
+      expect(data.isEmpty, isTrue);
+    });
+  });
+
+  group('sparkFloatingBars', () {
+    test('spans the reading, and holds a single value as a point-sized bar', () {
+      final data = sparkFloatingBars(
+        [
+          MeasurementChartEntry(100, DateTime(2026, 8, 1), min: 79, max: 122),
+          MeasurementChartEntry(110, DateTime(2026, 8, 2)),
+        ],
+        start: DateTime(2026, 8, 1),
+        slotCount: 7,
+      );
+
+      expect(data.bars.first.segments.single, (from: 79, to: 122, colorIndex: 0));
+      expect(data.bars.last.segments.single, (from: 110, to: 110, colorIndex: 0));
+      // The bars float: the axis follows the readings, not zero
+      expect(data.minValue, 79);
+    });
+  });
+
+  group('sparkStackedBars', () {
+    test('one segment per component, coloured by its position', () {
+      final data = sparkStackedBars(
+        [
+          MeasurementStackedEntry(DateTime(2026, 8, 2), const [240, null, 60]),
+        ],
+        start: DateTime(2026, 8, 1),
+        slotCount: 7,
+      );
+
+      expect(data.bars.single.slot, 1);
+      expect(data.bars.single.segments, [
+        (from: 0.0, to: 240.0, colorIndex: 0),
+        (from: 240.0, to: 300.0, colorIndex: 2),
+      ]);
+    });
+  });
+
+  group('sparkDeltaBars', () {
+    test('one signed bar per week, slotted by its Monday', () {
+      final start = DateTime(2026, 6, 8);
+      final data = sparkDeltaBars(
+        [
+          MeasurementChartEntry(-0.4, DateTime(2026, 6, 15)),
+          MeasurementChartEntry(0.2, DateTime(2026, 8, 3)),
+        ],
+        start: start,
+        slotCount: 9,
+      );
+
+      expect(data.signed, isTrue);
+      expect(data.bars.map((b) => b.slot), [1, 8]);
+      // Signed bars hang off zero, so the bounds always include it
+      expect(data.minValue, -0.4);
+      expect(data.maxValue, 0.2);
+    });
+  });
+
+  group('sparkIsSparse', () {
+    test('below the minimum the line spark switches to dots', () {
+      final days = [
+        MeasurementChartEntry(1, DateTime(2026, 8, 1)),
+        MeasurementChartEntry(2, DateTime(2026, 8, 2)),
+      ];
+
+      expect(sparkIsSparse(days), isTrue);
+      expect(sparkIsSparse([...days, MeasurementChartEntry(3, DateTime(2026, 8, 3))]), isFalse);
+    });
+  });
+}
diff --git a/test/features/measurements/measurements_test.dart b/test/features/measurements/measurements_test.dart
index 410829c0d..dab222d66 100644
--- a/test/features/measurements/measurements_test.dart
+++ b/test/features/measurements/measurements_test.dart
@@ -1,7 +1,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:wger/core/consts.dart';
+import 'package:wger/features/measurements/charts/series.dart';
 import 'package:wger/features/measurements/measurements.dart';
-import 'package:wger/features/measurements/widgets/charts.dart';
 
 void main() {
   group('whereDateWithInterpolation', () {
diff --git a/test/features/measurements/models/measurement_category_test.dart b/test/features/measurements/models/measurement_category_test.dart
index e76820418..4213b2fb3 100644
--- a/test/features/measurements/models/measurement_category_test.dart
+++ b/test/features/measurements/models/measurement_category_test.dart
@@ -17,30 +17,208 @@
  */
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:wger/core/exceptions/no_such_entry_exception.dart';
 import 'package:wger/features/measurements/models/measurement_category.dart';
 
-import '../../../../test_data/measurements.dart';
-
 void main() {
-  late MeasurementCategory category;
+  group('isOfficialBodyWeight', () {
+    test('is true only for the official body weight category', () {
+      final official = MeasurementCategory(
+        metricType: MetricType.bodyWeight,
+        isOfficial: true,
+      );
+      expect(official.isOfficialBodyWeight, isTrue);
+
+      // A user-created category with the same metric type is not official
+      expect(MeasurementCategory(metricType: MetricType.bodyWeight).isOfficialBodyWeight, isFalse);
+      // Other official metric types are not body weight
+      expect(
+        MeasurementCategory(metricType: MetricType.height, isOfficial: true).isOfficialBodyWeight,
+        isFalse,
+      );
+    });
+  });
+
+  group('ChartType', () {
+    test('fromWire maps null, the server default, to no override', () {
+      expect(ChartType.fromWire(null), ChartType.auto);
+    });
+
+    test('fromWire defaults to auto for a type this release does not know', () {
+      expect(ChartType.fromWire('sunburst'), ChartType.auto);
+    });
+
+    test('wireValue round-trips through fromWire for every case', () {
+      for (final type in ChartType.values) {
+        expect(ChartType.fromWire(type.wireValue), type);
+      }
+    });
+
+    test('the offered types follow the metric type', () {
+      expect(MetricType.steps.availableChartTypes, [
+        ChartType.bar,
+        ChartType.heatmap,
+        ChartType.delta,
+        ChartType.distribution,
+      ]);
+      expect(MetricType.custom.availableChartTypes, [
+        ChartType.line,
+        ChartType.heatmap,
+        ChartType.delta,
+        ChartType.distribution,
+      ]);
+
+      // a group is drawn by what its components are to each other
+      expect(MetricType.bloodPressure.availableChartTypes, isEmpty);
+    });
+
+    test('a type that does not fit falls back to the derived chart', () {
+      expect(MetricType.custom.resolveChartType(ChartType.bar), ChartType.line);
+      expect(MetricType.steps.resolveChartType(ChartType.line), ChartType.bar);
+      expect(MetricType.custom.resolveChartType(ChartType.auto), ChartType.line);
+    });
+
+    test('a type that fits is kept', () {
+      expect(MetricType.custom.resolveChartType(ChartType.heatmap), ChartType.heatmap);
+      expect(MetricType.steps.resolveChartType(ChartType.bar), ChartType.bar);
+      expect(MetricType.bodyWeight.resolveChartType(ChartType.delta), ChartType.delta);
+      expect(
+        MetricType.restingHeartRate.resolveChartType(ChartType.distribution),
+        ChartType.distribution,
+      );
+    });
+  });
+
+  group('chartConfig', () {
+    MeasurementCategory withConfig(Map<String, dynamic> config) =>
+        MeasurementCategory(chartConfig: config);
+
+    test('an unconfigured category gets the defaults', () {
+      // A row synced before the column existed reads null, one the user never
+      // configured an empty object; both mean the same thing
+      expect(MeasurementCategory().chartSettings.trend, TrendCharacter.balanced);
+      expect(MeasurementCategory().chartSettings.averageWindow, 7);
+      expect(withConfig({}).chartSettings.trend, TrendCharacter.balanced);
+      expect(withConfig({}).chartSettings.averageWindow, 7);
+    });
+
+    test('reads what was configured', () {
+      expect(withConfig({'trend': 'sluggish'}).chartSettings.trend, TrendCharacter.sluggish);
+      expect(withConfig({'average_window': 30}).chartSettings.averageWindow, 30);
+    });
+
+    test('a value this release does not know falls back to the default', () {
+      expect(withConfig({'trend': 'glacial'}).chartSettings.trend, TrendCharacter.balanced);
+      expect(withConfig({'average_window': 21}).chartSettings.averageWindow, 7);
+      expect(withConfig({'average_window': 'a fortnight'}).chartSettings.averageWindow, 7);
+    });
+
+    test('a setting is changed without dropping the keys of another client', () {
+      final category = withConfig({'goal_line': 75}).withChartSetting('trend', 'reactive');
+
+      expect(category.chartConfig, {'goal_line': 75, 'trend': 'reactive'});
+    });
 
-  setUp(() {
-    category = getMeasurementCategories()[0];
+    test('the trend character maps to the EMA period the chart uses', () {
+      expect(TrendCharacter.reactive.emaPeriod, lessThan(TrendCharacter.balanced.emaPeriod));
+      expect(TrendCharacter.sluggish.emaPeriod, greaterThan(TrendCharacter.balanced.emaPeriod));
+    });
+  });
+
+  group('binWidth', () {
+    test('body weight follows the unit, like its limits do', () {
+      expect(MetricType.bodyWeight.binWidth('kg'), 0.5);
+      expect(MetricType.bodyWeight.binWidth('lb'), 1);
+    });
+
+    test('the typed metrics carry a fixed width', () {
+      expect(MetricType.restingHeartRate.binWidth(), 1);
+      expect(MetricType.steps.binWidth(), 1000);
+      expect(MetricType.sleepTotal.binWidth(), 30);
+    });
+
+    test('free-form categories and groups have none, theirs follows the data', () {
+      expect(MetricType.custom.binWidth(), isNull);
+      expect(MetricType.bloodPressure.binWidth(), isNull);
+    });
+  });
+
+  group('displayDecimals', () {
+    test('follows the resolution the metric is measured at', () {
+      expect(MetricType.restingHeartRate.displayDecimals, 0);
+      expect(MetricType.bloodPressureSystolic.displayDecimals, 0);
+      expect(MetricType.energy.displayDecimals, 0);
+      expect(MetricType.bodyWeight.displayDecimals, 1);
+      expect(MetricType.bodyFat.displayDecimals, 1);
+      expect(MetricType.custom.displayDecimals, 1);
+      expect(MetricType.distance.displayDecimals, 2);
+    });
   });
 
-  group('findEntryById()', () {
-    test('should find an entry in the entries list', () {
-      // act
-      final result = category.findEntryById('1');
+  group('MetricType', () {
+    test('fromWire maps a known wire value to its enum case', () {
+      expect(MetricType.fromWire('body_fat'), MetricType.bodyFat);
+      expect(MetricType.fromWire('blood_pressure'), MetricType.bloodPressure);
+      expect(MetricType.fromWire('custom'), MetricType.custom);
+    });
+
+    test('fromWire defaults to custom for an unknown value', () {
+      expect(MetricType.fromWire('something_new'), MetricType.custom);
+      expect(MetricType.fromWire(''), MetricType.custom);
+    });
+
+    test('wireValue round-trips through fromWire for every case', () {
+      for (final type in MetricType.values) {
+        expect(MetricType.fromWire(type.wireValue), type);
+      }
+    });
+
+    test('isSummedPerDay is true only for cumulative daily metrics', () {
+      expect(MetricType.steps.isSummedPerDay, isTrue);
+      expect(MetricType.distance.isSummedPerDay, isTrue);
+      expect(MetricType.energy.isSummedPerDay, isTrue);
+      expect(MetricType.sleep.isSummedPerDay, isTrue);
+
+      expect(MetricType.custom.isSummedPerDay, isFalse);
+      expect(MetricType.bodyWeight.isSummedPerDay, isFalse);
+      expect(MetricType.heartRate.isSummedPerDay, isFalse);
+    });
+
+    test('limits are per unit for body weight only', () {
+      expect(MetricType.bodyWeight.limits('kg').max, 350);
+      expect(MetricType.bodyWeight.limits('lb').max, 770);
+
+      // every other type has one unit, so the argument changes nothing
+      expect(MetricType.heartRate.limits('bpm').max, MetricType.heartRate.limits().max);
+    });
+
+    test('limits of the components differ from each other', () {
+      expect(MetricType.bloodPressureSystolic.limits().max, 250);
+      expect(MetricType.bloodPressureDiastolic.limits().max, 150);
+    });
 
-      // assert
-      expect(result.id, '1');
+    test('limits of an untyped category are the column itself', () {
+      expect(MetricType.custom.limits().min, 0);
+      expect(MetricType.custom.limits().max, measurementSchemaMaxValue);
     });
 
-    test('should throw a NoSuchEntryException if no MeasurementEntry was found', () {
-      // act & assert
-      expect(() => category.findEntryById('abc'), throwsA(isA<NoSuchEntryException>()));
+    test('contains is inclusive', () {
+      final limits = MetricType.steps.limits();
+
+      expect(limits.contains(0), isTrue);
+      expect(limits.contains(100000), isTrue);
+      expect(limits.contains(100001), isFalse);
+    });
+
+    test('correlatesWithNutrition is true for body composition and custom', () {
+      expect(MetricType.bodyWeight.correlatesWithNutrition, isTrue);
+      expect(MetricType.bodyFat.correlatesWithNutrition, isTrue);
+      expect(MetricType.custom.correlatesWithNutrition, isTrue);
+
+      // the typed health metrics don't get nutrition plan context
+      expect(MetricType.heartRate.correlatesWithNutrition, isFalse);
+      expect(MetricType.bloodPressure.correlatesWithNutrition, isFalse);
+      expect(MetricType.steps.correlatesWithNutrition, isFalse);
+      expect(MetricType.sleep.correlatesWithNutrition, isFalse);
     });
   });
 }
diff --git a/test/features/measurements/models/unit_conversion_test.dart b/test/features/measurements/models/unit_conversion_test.dart
new file mode 100644
index 000000000..4c1c3ffaa
--- /dev/null
+++ b/test/features/measurements/models/unit_conversion_test.dart
@@ -0,0 +1,92 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/models/unit_conversion.dart';
+
+MeasurementEntry entry(num value, {Map<String, dynamic>? extraData}) => MeasurementEntry(
+  categoryId: 'c',
+  date: DateTime(2026, 1, 1),
+  value: value,
+  notes: '',
+  extraData: extraData,
+);
+
+void main() {
+  group('convertWeight', () {
+    test('same unit passes through unquantized', () {
+      expect(convertWeight(80.567, from: 'kg', to: 'kg'), 80.567);
+    });
+
+    test('kg to lb matches the server rounding (two decimals)', () {
+      // 80.5 * 2.20462262 = 177.4721...
+      expect(convertWeight(80.5, from: 'kg', to: 'lb'), 177.47);
+    });
+
+    test('lb to kg matches the server rounding (two decimals)', () {
+      // 176.4 * 0.45359237 = 80.0137...
+      expect(convertWeight(176.4, from: 'lb', to: 'kg'), 80.01);
+    });
+
+    test('label-only units are never converted', () {
+      expect(convertWeight(42, from: 'cm', to: 'kg'), 42);
+      expect(convertWeight(42, from: 'kg', to: 'cm'), 42);
+    });
+  });
+
+  group('MeasurementEntryUnit', () {
+    test('unitOrFallbackFor prefers the stamped unit', () {
+      expect(entry(80, extraData: {'unit': 'lb'}).unitOrFallbackFor('kg'), 'lb');
+    });
+
+    test('unitOrFallbackFor uses the category unit when absent or empty', () {
+      expect(entry(80).unitOrFallbackFor('kg'), 'kg');
+      expect(entry(80, extraData: {}).unitOrFallbackFor('kg'), 'kg');
+      // Same chain as the server: an empty string counts as absent
+      expect(entry(80, extraData: {'unit': ''}).unitOrFallbackFor('kg'), 'kg');
+    });
+
+    test('valueIn converts a stamped entry to the target unit', () {
+      expect(entry(176.4, extraData: {'unit': 'lb'}).valueIn('kg', categoryUnit: 'kg'), 80.01);
+    });
+
+    test('valueIn passes unstamped entries through via the category unit', () {
+      expect(entry(80).valueIn('kg', categoryUnit: 'kg'), 80);
+      expect(entry(80).valueIn('lb', categoryUnit: 'kg'), 176.37);
+    });
+
+    test('boundIn follows the value through the same conversion', () {
+      // The bounds of an aggregate are stored in the value's unit, so reading
+      // the value in lb and the bounds in kg would put the band 2.2x off
+      final aggregate = entry(80, extraData: {'min': 70, 'max': 90});
+
+      expect(aggregate.valueIn('lb', categoryUnit: 'kg'), 176.37);
+      expect(aggregate.boundIn(70, 'lb', categoryUnit: 'kg'), 154.32);
+      expect(aggregate.boundIn(90, 'lb', categoryUnit: 'kg'), 198.42);
+    });
+
+    test('boundIn honours the entry stamp like valueIn does', () {
+      final stamped = entry(176.4, extraData: {'unit': 'lb'});
+
+      expect(stamped.boundIn(176.4, 'kg', categoryUnit: 'kg'), 80.01);
+      // and leaves label-only units alone
+      expect(entry(60).boundIn(50, 'bpm', categoryUnit: 'bpm'), 50);
+    });
+  });
+}
diff --git a/test/features/measurements/providers/body_weight_provider_test.dart b/test/features/measurements/providers/body_weight_provider_test.dart
new file mode 100644
index 000000000..9b3d205cc
--- /dev/null
+++ b/test/features/measurements/providers/body_weight_provider_test.dart
@@ -0,0 +1,76 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/providers/body_weight_provider.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+
+import '../../../../test_data/body_weight.dart';
+import 'body_weight_provider_test.mocks.dart';
+
+@GenerateMocks([MeasurementRepository])
+void main() {
+  late MockMeasurementRepository mockRepo;
+  late ProviderContainer container;
+
+  ProviderContainer buildContainer(MeasurementCategory? category) {
+    when(
+      mockRepo.watchOfficialBodyWeightCategory(),
+    ).thenAnswer((_) => Stream.value(category));
+    return ProviderContainer.test(
+      overrides: [measurementRepositoryProvider.overrideWithValue(mockRepo)],
+    );
+  }
+
+  setUp(() {
+    mockRepo = MockMeasurementRepository();
+  });
+
+  test('exposes the official body weight category', () async {
+    container = buildContainer(getBodyWeightCategory());
+    container.listen(bodyWeightCategoryOnlyProvider, (_, _) {});
+    await pumpEventQueue();
+
+    expect(container.read(bodyWeightCategoryOnlyProvider).value?.id, testBodyWeightCategoryId);
+  });
+
+  test('is null while no official category has been synced', () async {
+    container = buildContainer(null);
+    container.listen(bodyWeightCategoryOnlyProvider, (_, _) {});
+    await pumpEventQueue();
+
+    final async = container.read(bodyWeightCategoryOnlyProvider);
+    expect(async.hasValue, isTrue);
+    expect(async.value, isNull);
+  });
+
+  test('asks the repository for one category instead of for all of them', () async {
+    // Reading every category and keeping one made any other category's entry
+    // rebuild the weight screen, and the sync writes five sleep rows a night
+    container = buildContainer(getBodyWeightCategory());
+    container.listen(bodyWeightCategoryOnlyProvider, (_, _) {});
+    await pumpEventQueue();
+
+    verify(mockRepo.watchOfficialBodyWeightCategory()).called(1);
+    verifyNever(mockRepo.watchAllWithoutEntries());
+  });
+}
diff --git a/test/features/measurements/providers/body_weight_provider_test.mocks.dart b/test/features/measurements/providers/body_weight_provider_test.mocks.dart
new file mode 100644
index 000000000..903488b65
--- /dev/null
+++ b/test/features/measurements/providers/body_weight_provider_test.mocks.dart
@@ -0,0 +1,281 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/measurements/providers/body_weight_provider_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i3;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i6;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i4;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i5;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i2;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+/// A class which mocks [MeasurementRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepository {
+  MockMeasurementRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<List<_i4.MeasurementCategory>> watchAllWithoutEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i3.Stream<List<_i4.MeasurementCategory>>.empty(),
+          )
+          as _i3.Stream<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchCategoryWithoutEntries(
+    String? id,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<Map<String, _i5.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i3.Stream<Map<String, _i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementBucket>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementBucket>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementValueCount>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementValueCount>>);
+
+  @override
+  _i3.Future<List<_i4.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i3.Future<List<_i4.MeasurementCategory>>.value(
+              <_i4.MeasurementCategory>[],
+            ),
+          )
+          as _i3.Future<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
+
+  @override
+  _i3.Future<Map<String, _i5.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i3.Future<Map<String, _i5.MeasurementEntry>>.value(
+              <String, _i5.MeasurementEntry>{},
+            ),
+          )
+          as _i3.Future<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
+  @override
+  _i3.Future<void> deleteLocalDrift(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDrift, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftGroupEntries(
+    List<_i5.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteLocalDriftCategory(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDriftCategory, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDriftCategory(
+    _i4.MeasurementCategory? category,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategory(_i4.MeasurementCategory? category) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategoryGroup(
+    List<_i4.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}
diff --git a/test/features/measurements/providers/chart_range_setting_test.dart b/test/features/measurements/providers/chart_range_setting_test.dart
new file mode 100644
index 000000000..740990cb5
--- /dev/null
+++ b/test/features/measurements/providers/chart_range_setting_test.dart
@@ -0,0 +1,96 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+import 'package:wger/core/app_settings_notifier.dart';
+import 'package:wger/core/consts.dart';
+import 'package:wger/features/measurements/charts/range.dart';
+import 'package:wger/features/measurements/providers/chart_range_setting.dart';
+
+void main() {
+  late SharedPreferencesAsync prefs;
+  late ProviderContainer container;
+
+  setUp(() {
+    SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
+    prefs = SharedPreferencesAsync();
+    container = ProviderContainer.test(
+      overrides: [appSettingsPrefsProvider.overrideWithValue(prefs)],
+    );
+  });
+
+  group('ChartRangeSetting', () {
+    test('starts at the default while nothing is stored', () async {
+      expect(container.read(chartRangeSettingProvider), defaultChartRange);
+
+      await pumpEventQueue();
+      expect(container.read(chartRangeSettingProvider), defaultChartRange);
+    });
+
+    test('a pick is what every watcher reads afterwards, and it is persisted', () async {
+      container.read(chartRangeSettingProvider.notifier).set(ChartRange.lastWeek);
+
+      expect(container.read(chartRangeSettingProvider), ChartRange.lastWeek);
+      await pumpEventQueue();
+      expect(await prefs.getString(PREFS_CHART_RANGE), 'lastWeek');
+    });
+
+    test('the stored pick survives a restart', () async {
+      // Deliberately not the default, or the test would pass without loading
+      await prefs.setString(PREFS_CHART_RANGE, 'lastYear');
+
+      // A fresh container stands in for the next app run
+      final restarted = ProviderContainer.test(
+        overrides: [appSettingsPrefsProvider.overrideWithValue(prefs)],
+      );
+      restarted.listen(chartRangeSettingProvider, (_, _) {});
+      await pumpEventQueue();
+
+      expect(restarted.read(chartRangeSettingProvider), ChartRange.lastYear);
+    });
+
+    test('a value this release does not know leaves the default', () async {
+      await prefs.setString(PREFS_CHART_RANGE, 'lastDecade');
+
+      final restarted = ProviderContainer.test(
+        overrides: [appSettingsPrefsProvider.overrideWithValue(prefs)],
+      );
+      restarted.listen(chartRangeSettingProvider, (_, _) {});
+      await pumpEventQueue();
+
+      expect(restarted.read(chartRangeSettingProvider), defaultChartRange);
+    });
+
+    test('a pick made before the stored value arrives is not overwritten', () async {
+      await prefs.setString(PREFS_CHART_RANGE, 'lastYear');
+
+      final restarted = ProviderContainer.test(
+        overrides: [appSettingsPrefsProvider.overrideWithValue(prefs)],
+      );
+      // Picked in the very first frame, before the async load lands
+      restarted.read(chartRangeSettingProvider.notifier).set(ChartRange.all);
+      await pumpEventQueue();
+
+      expect(restarted.read(chartRangeSettingProvider), ChartRange.all);
+    });
+  });
+}
diff --git a/test/features/measurements/providers/measurement_notifier_test.dart b/test/features/measurements/providers/measurement_notifier_test.dart
index f1987e09f..7ea1010ee 100644
--- a/test/features/measurements/providers/measurement_notifier_test.dart
+++ b/test/features/measurements/providers/measurement_notifier_test.dart
@@ -20,33 +20,41 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
+import 'package:wger/core/network/auth_credentials_storage.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
 import 'package:wger/features/measurements/providers/measurement_notifier.dart';
 import 'package:wger/features/measurements/providers/measurement_repository.dart';
 
 import '../../../../test_data/measurements.dart';
 import 'measurement_notifier_test.mocks.dart';
 
-@GenerateMocks([MeasurementRepository])
+@GenerateMocks([MeasurementRepository, AuthCredentialsStorage])
 void main() {
   late MockMeasurementRepository mockRepo;
+  late MockAuthCredentialsStorage mockCredentials;
   late ProviderContainer container;
 
   setUp(() {
     mockRepo = MockMeasurementRepository();
+    mockCredentials = MockAuthCredentialsStorage();
+    when(mockCredentials.dbOwnerUserId()).thenAnswer((_) async => '2');
 
     // Default stubs
-    when(mockRepo.watchAll()).thenAnswer((_) => Stream.value([]));
     when(mockRepo.deleteLocalDrift(any)).thenAnswer((_) async {});
     when(mockRepo.updateLocalDrift(any)).thenAnswer((_) async {});
     when(mockRepo.addLocalDrift(any)).thenAnswer((_) async {});
 
+    when(mockRepo.addLocalDriftGroupEntries(any)).thenAnswer((_) async {});
+
     when(mockRepo.deleteLocalDriftCategory(any)).thenAnswer((_) async {});
     when(mockRepo.updateLocalDriftCategory(any)).thenAnswer((_) async {});
     when(mockRepo.addLocalDriftCategory(any)).thenAnswer((_) async {});
+    when(mockRepo.addLocalDriftCategoryGroup(any)).thenAnswer((_) async {});
 
     container = ProviderContainer(
       overrides: [
         measurementRepositoryProvider.overrideWithValue(mockRepo),
+        authCredentialsStorageProvider.overrideWithValue(mockCredentials),
       ],
     );
   });
@@ -96,10 +104,113 @@ void main() {
       verify(mockRepo.addLocalDriftCategory(category)).called(1);
     });
 
-    test('build watches repository stream', () async {
-      container.read(measurementProvider);
+    test('addCategory derives the id of a typed category', () async {
+      final notifier = container.read(measurementProvider.notifier);
+
+      await notifier.addCategory(
+        MeasurementCategory(
+          name: 'Steps',
+          unit: 'count',
+          metricType: MetricType.steps,
+        ),
+      );
+
+      final added =
+          verify(
+                mockRepo.addLocalDriftCategoryGroup(captureAny),
+              ).captured.single
+              as List<MeasurementCategory>;
+      expect(added.single.id, deterministicCategoryId('2', MetricType.steps));
+    });
+
+    test('addCategory creates a group with its components', () async {
+      final notifier = container.read(measurementProvider.notifier);
+
+      await notifier.addCategory(
+        MeasurementCategory(
+          name: 'Blood pressure',
+          unit: 'mmHg',
+          metricType: MetricType.bloodPressure,
+        ),
+      );
+
+      final added =
+          verify(
+                mockRepo.addLocalDriftCategoryGroup(captureAny),
+              ).captured.single
+              as List<MeasurementCategory>;
+      expect(
+        added.map((c) => (c.metricType, c.name, c.order)),
+        [
+          (MetricType.bloodPressure, 'Blood pressure', 0),
+          (MetricType.bloodPressureSystolic, 'Systolic', 0),
+          (MetricType.bloodPressureDiastolic, 'Diastolic', 1),
+        ],
+      );
+      expect(added.last.parentId, added.first.id);
+      expect(added.last.id, deterministicCategoryId('2', MetricType.bloodPressureDiastolic));
+    });
+
+    test('the notifier reads nothing, it only writes', () async {
+      // What the screens show is watched through the providers next to it;
+      // instantiating the notifier to delete an entry must not start a read
+      container.read(measurementProvider.notifier);
+
+      verifyNever(mockRepo.watchAllWithoutEntries());
+      verifyNever(mockRepo.watchLatestEntries());
+    });
+  });
+
+  group('addGroupEntries', () {
+    test('addGroupEntries calls repository', () async {
+      final notifier = container.read(measurementProvider.notifier);
+      final entries = [testNeasurementEntry9, testNeasurementEntry10];
+
+      await notifier.addGroupEntries(entries);
+      verify(mockRepo.addLocalDriftGroupEntries(entries)).called(1);
+    });
+
+    test('addGroupEntries forwards empty list to repository', () async {
+      final notifier = container.read(measurementProvider.notifier);
+
+      await notifier.addGroupEntries([]);
+      verify(mockRepo.addLocalDriftGroupEntries([])).called(1);
+    });
+  });
+
+  group('setCategoryOrder', () {
+    // The list the sort screen shows: its top-level categories, in the order
+    // they are drawn in. Which categories those are is the screen's business
+    final categories = [
+      ...getMeasurementCategories(),
+      testMeasurementCategoryBloodPressure,
+    ];
+
+    setUp(() {
+      when(mockRepo.reorderCategories(any)).thenAnswer((_) async {});
+    });
+
+    test('moves an item down (newIndex already adjusted, onReorderItem semantics)', () async {
+      final notifier = container.read(measurementProvider.notifier);
+
+      await notifier.setCategoryOrder(categories, 0, 2);
+      verify(mockRepo.reorderCategories(['2', 'bp', '1'])).called(1);
+    });
+
+    test('moves an item up', () async {
+      final notifier = container.read(measurementProvider.notifier);
+
+      await notifier.setCategoryOrder(categories, 2, 0);
+      verify(mockRepo.reorderCategories(['bp', '1', '2'])).called(1);
+    });
+
+    test('leaves the list it was given alone', () async {
+      // It belongs to the screen, which rebuilds from the stream rather than
+      // from a list reordered under it
+      final notifier = container.read(measurementProvider.notifier);
 
-      verify(mockRepo.watchAll()).called(1);
+      await notifier.setCategoryOrder(categories, 0, 2);
+      expect(categories.map((c) => c.id), ['1', '2', 'bp']);
     });
   });
 }
diff --git a/test/features/measurements/providers/measurement_notifier_test.mocks.dart b/test/features/measurements/providers/measurement_notifier_test.mocks.dart
index 4f7399345..08ad2a9df 100644
--- a/test/features/measurements/providers/measurement_notifier_test.mocks.dart
+++ b/test/features/measurements/providers/measurement_notifier_test.mocks.dart
@@ -6,6 +6,9 @@
 import 'dart:async' as _i3;
 
 import 'package:mockito/mockito.dart' as _i1;
+import 'package:wger/core/network/auth_credentials_storage.dart' as _i7;
+import 'package:wger/core/network/auth_state.dart' as _i8;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i6;
 import 'package:wger/features/measurements/models/measurement_category.dart' as _i4;
 import 'package:wger/features/measurements/models/measurement_entry.dart' as _i5;
 import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i2;
@@ -34,23 +37,163 @@ class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepos
   }
 
   @override
-  _i3.Stream<List<_i4.MeasurementCategory>> watchAll() =>
+  _i3.Stream<List<_i4.MeasurementCategory>> watchAllWithoutEntries() =>
       (super.noSuchMethod(
-            Invocation.method(#watchAll, []),
+            Invocation.method(#watchAllWithoutEntries, []),
             returnValue: _i3.Stream<List<_i4.MeasurementCategory>>.empty(),
           )
           as _i3.Stream<List<_i4.MeasurementCategory>>);
 
   @override
-  _i3.Stream<_i4.MeasurementCategory?> watchLocalDriftCategoryById(
+  _i3.Stream<_i4.MeasurementCategory?> watchCategoryWithoutEntries(
     String? id,
   ) =>
       (super.noSuchMethod(
-            Invocation.method(#watchLocalDriftCategoryById, [id]),
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
             returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
           )
           as _i3.Stream<_i4.MeasurementCategory?>);
 
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<Map<String, _i5.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i3.Stream<Map<String, _i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementBucket>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementBucket>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementValueCount>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementValueCount>>);
+
+  @override
+  _i3.Future<List<_i4.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i3.Future<List<_i4.MeasurementCategory>>.value(
+              <_i4.MeasurementCategory>[],
+            ),
+          )
+          as _i3.Future<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
+
+  @override
+  _i3.Future<Map<String, _i5.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i3.Future<Map<String, _i5.MeasurementEntry>>.value(
+              <String, _i5.MeasurementEntry>{},
+            ),
+          )
+          as _i3.Future<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
   @override
   _i3.Future<void> deleteLocalDrift(String? id) =>
       (super.noSuchMethod(
@@ -78,6 +221,17 @@ class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepos
           )
           as _i3.Future<void>);
 
+  @override
+  _i3.Future<void> addLocalDriftGroupEntries(
+    List<_i5.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
   @override
   _i3.Future<void> deleteLocalDriftCategory(String? id) =>
       (super.noSuchMethod(
@@ -106,4 +260,159 @@ class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepos
             returnValueForMissingStub: _i3.Future<void>.value(),
           )
           as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategoryGroup(
+    List<_i4.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}
+
+/// A class which mocks [AuthCredentialsStorage].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockAuthCredentialsStorage extends _i1.Mock implements _i7.AuthCredentialsStorage {
+  MockAuthCredentialsStorage() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Future<_i7.StoredAuth?> load() =>
+      (super.noSuchMethod(
+            Invocation.method(#load, []),
+            returnValue: _i3.Future<_i7.StoredAuth?>.value(),
+          )
+          as _i3.Future<_i7.StoredAuth?>);
+
+  @override
+  _i3.Future<void> saveJwt({
+    required _i8.JwtCredential? credential,
+    required String? serverUrl,
+    String? refreshToken,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#saveJwt, [], {
+              #credential: credential,
+              #serverUrl: serverUrl,
+              #refreshToken: refreshToken,
+            }),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateJwt({
+    required _i8.JwtCredential? credential,
+    String? refreshToken,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateJwt, [], {
+              #credential: credential,
+              #refreshToken: refreshToken,
+            }),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> clearJwt() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearJwt, []),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> clearLegacy() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearLegacy, []),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> clearCredentials() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearCredentials, []),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> clearAll() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearAll, []),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<String?> dbOwnerUserId() =>
+      (super.noSuchMethod(
+            Invocation.method(#dbOwnerUserId, []),
+            returnValue: _i3.Future<String?>.value(),
+          )
+          as _i3.Future<String?>);
+
+  @override
+  _i3.Future<void> setDbOwnerUserId(String? userId) =>
+      (super.noSuchMethod(
+            Invocation.method(#setDbOwnerUserId, [userId]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<bool> keepDataOnLogout() =>
+      (super.noSuchMethod(
+            Invocation.method(#keepDataOnLogout, []),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
+  @override
+  _i3.Future<bool> hasEverSynced() =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEverSynced, []),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
+  @override
+  _i3.Future<void> markEverSynced() =>
+      (super.noSuchMethod(
+            Invocation.method(#markEverSynced, []),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<String?> readRefreshToken() =>
+      (super.noSuchMethod(
+            Invocation.method(#readRefreshToken, []),
+            returnValue: _i3.Future<String?>.value(),
+          )
+          as _i3.Future<String?>);
 }
diff --git a/test/features/measurements/providers/measurement_repository_test.dart b/test/features/measurements/providers/measurement_repository_test.dart
index 89a508cd5..addd97f4d 100644
--- a/test/features/measurements/providers/measurement_repository_test.dart
+++ b/test/features/measurements/providers/measurement_repository_test.dart
@@ -20,10 +20,12 @@ import 'dart:async';
 
 import 'package:flutter_test/flutter_test.dart';
 import 'package:wger/database/powersync/database.dart';
+import 'package:wger/features/measurements/models/measurement_bucket.dart';
 import 'package:wger/features/measurements/models/measurement_category.dart';
 import 'package:wger/features/measurements/models/measurement_entry.dart';
 import 'package:wger/features/measurements/providers/measurement_repository.dart';
 
+import '../../../../test_data/body_weight.dart';
 import '../../../../test_data/measurements.dart';
 import '../../../helpers/in_memory_drift.dart';
 
@@ -43,101 +45,768 @@ void main() {
   Future<void> seedCategoriesAndEntries() async {
     for (final category in getMeasurementCategories()) {
       await db.into(db.measurementCategoryTable).insert(category.toCompanion());
-      for (final entry in category.entries) {
+      for (final entry in getMeasurementEntries()[category.id] ?? const []) {
         await db.into(db.measurementEntryTable).insert(entry.toCompanion());
       }
     }
   }
 
-  group('watchAll', () {
-    test('groups entries under their category', () async {
+  group('watchLatestEntries', () {
+    test('returns the newest entry of every category', () async {
       await seedCategoriesAndEntries();
 
-      final emitted = await repo.watchAll().first;
+      final latest = await repo.watchLatestEntries().first;
 
-      expect(emitted, hasLength(2));
-      final bodyFat = emitted.firstWhere((c) => c.name == 'Body fat');
-      final biceps = emitted.firstWhere((c) => c.name == 'Biceps');
-      expect(bodyFat.entries, hasLength(6));
-      expect(biceps.entries, hasLength(2));
-      expect(bodyFat.entries.every((e) => e.categoryId == '1'), isTrue);
-      expect(biceps.entries.every((e) => e.categoryId == '2'), isTrue);
+      final entries = getMeasurementEntries();
+      expect(latest.keys.toSet(), entries.keys.toSet());
+      for (final MapEntry(key: id, value: ofCategory) in entries.entries) {
+        final newest = ofCategory.reduce((a, b) => b.date.isAfter(a.date) ? b : a);
+        expect(latest[id]!.id, newest.id);
+      }
+    });
+
+    test('reaches past the range a chart would read', () async {
+      // The point of the query: a value older than any range the card charts
+      // is still the last known one
+      final category = getMeasurementCategories()[0];
+      await db.into(db.measurementCategoryTable).insert(category.toCompanion());
+      final old = MeasurementEntry(
+        id: 'ancient',
+        categoryId: category.id!,
+        date: DateTime.now().subtract(const Duration(days: 900)),
+        value: 42,
+        notes: '',
+      );
+      await db.into(db.measurementEntryTable).insert(old.toCompanion());
+
+      final latest = await repo.watchLatestEntries().first;
+
+      expect(latest[category.id]!.id, 'ancient');
+    });
+
+    test('tells sub-second timestamps apart', () async {
+      // What the sync writes: the sleep segments land microseconds apart. A
+      // formulation that compares whole seconds picks the wrong row, or none
+      final category = getMeasurementCategories()[0];
+      await db.into(db.measurementCategoryTable).insert(category.toCompanion());
+      final second = DateTime(2026, 8, 5, 3, 39, 3);
+      for (final (index, micros) in [280477, 775505].indexed) {
+        await db
+            .into(db.measurementEntryTable)
+            .insert(
+              MeasurementEntry(
+                id: 'e$index',
+                categoryId: category.id!,
+                date: second.add(Duration(microseconds: micros)),
+                value: 42,
+                notes: '',
+              ).toCompanion(),
+            );
+      }
+
+      final latest = await repo.watchLatestEntries().first;
+
+      expect(latest[category.id]!.id, 'e1');
     });
 
-    test('returns categories without entries when no entries exist', () async {
-      // Seed only the categories, no entries.
+    test('a category without entries is absent', () async {
       await db
           .into(db.measurementCategoryTable)
-          .insert(
-            MeasurementCategory(id: '1', name: 'Body fat', unit: '%').toCompanion(),
-          );
+          .insert(getMeasurementCategories()[0].toCompanion());
+
+      expect(await repo.watchLatestEntries().first, isEmpty);
+    });
+  });
 
-      final emitted = await repo.watchAll().first;
+  group('watchAllWithoutEntries', () {
+    test('reads the categories only, so an entry does not re-emit them', () async {
+      // The screens draw from the aggregated queries; rebuilding every
+      // category because a sleep row arrived is the cost that buys nothing
+      await seedCategoriesAndEntries();
+      final emissions = <List<MeasurementCategory>>[];
+      final sub = repo.watchAllWithoutEntries().listen(emissions.add);
 
-      expect(emitted, hasLength(1));
-      expect(emitted.first.entries, isEmpty);
+      await Future<void>.delayed(const Duration(milliseconds: 50));
+      expect(emissions, hasLength(1));
+
+      await repo.addLocalDrift(
+        MeasurementEntry(categoryId: '1', date: DateTime.utc(2027, 1, 1), value: 99, notes: ''),
+      );
+      await Future<void>.delayed(const Duration(milliseconds: 400));
+
+      expect(emissions, hasLength(1));
+      await sub.cancel();
+    });
+
+    test('coalesces a burst of writes into one emission', () async {
+      final emissions = <List<MeasurementCategory>>[];
+      final sub = repo.watchAllWithoutEntries().listen(emissions.add);
+
+      // The leading emission is not held back: a screen waits for it
+      await Future<void>.delayed(const Duration(milliseconds: 50));
+      expect(emissions, hasLength(1));
+
+      for (var i = 0; i < 5; i++) {
+        await repo.addLocalDriftCategory(
+          MeasurementCategory(id: 'c$i', name: 'Category $i', unit: 'cm'),
+        );
+      }
+      await Future<void>.delayed(const Duration(milliseconds: 400));
+
+      expect(emissions.length, lessThanOrEqualTo(2));
+      expect(emissions.last, hasLength(5));
+
+      await sub.cancel();
     });
 
-    test('emits entries newest first within each category', () async {
+    test('returns the categories and their children', () async {
       await seedCategoriesAndEntries();
+      for (final category in getBloodPressureGroup()) {
+        await repo.addLocalDriftCategory(category);
+      }
 
-      final emitted = await repo.watchAll().first;
+      final emitted = await repo.watchAllWithoutEntries().first;
 
-      final bodyFat = emitted.firstWhere((c) => c.name == 'Body fat');
-      final dates = bodyFat.entries.map((e) => e.date).toList();
-      final sorted = [...dates]..sort((a, b) => b.compareTo(a));
-      expect(dates, sorted);
+      expect(emitted.firstWhere((c) => c.id == 'bp').children.map((c) => c.id), ['sys', 'dia']);
     });
 
-    test('re-emits when an entry is added', () async {
+    test('sorts by order before name', () async {
+      await repo.addLocalDriftCategory(
+        MeasurementCategory(id: 'c1', name: 'Aaa', unit: 'cm', order: 5),
+      );
+      await repo.addLocalDriftCategory(
+        MeasurementCategory(id: 'c2', name: 'Zzz', unit: 'cm', order: 1),
+      );
+
+      expect((await repo.watchAllWithoutEntries().first).map((c) => c.id), ['c2', 'c1']);
+    });
+
+    test('watchCategoryWithoutEntries keeps a group its children', () async {
+      for (final category in getBloodPressureGroup()) {
+        await repo.addLocalDriftCategory(category);
+      }
+
+      final emitted = await repo.watchCategoryWithoutEntries('bp').first;
+
+      expect(emitted!.children.map((c) => c.id), ['sys', 'dia']);
+    });
+
+    test('watchCategoryWithoutEntries can watch a component on its own', () async {
+      for (final category in getBloodPressureGroup()) {
+        await repo.addLocalDriftCategory(category);
+      }
+
+      final emitted = await repo.watchCategoryWithoutEntries('sys').first;
+
+      expect(emitted!.name, 'Systolic');
+      expect(emitted.children, isEmpty);
+    });
+
+    test('watchCategoryWithoutEntries is null when no category matches', () async {
       await seedCategoriesAndEntries();
-      final stream = repo.watchAll();
-      final iter = StreamIterator(stream);
 
-      await iter.moveNext();
-      final initial = iter.current.firstWhere((c) => c.name == 'Body fat').entries.length;
+      expect(await repo.watchCategoryWithoutEntries('does-not-exist').first, isNull);
+    });
+
+    test('getCategoriesOnce returns one snapshot without entries', () async {
+      await seedCategoriesAndEntries();
+
+      final categories = await repo.getCategoriesOnce();
+
+      expect(
+        categories.map((c) => c.id),
+        (await repo.watchAllWithoutEntries().first).map((c) => c.id),
+      );
+    });
+
+    test('maps the NULL columns of a pre-2.7 row to the defaults', () async {
+      // A row synced before the 2.7 schema change carries no value for the new
+      // columns and reads NULL until a re-sync replaces it
+      await db.customStatement(
+        'INSERT INTO measurements_category (id, name, unit, metric_type, "order", is_official) '
+        "VALUES ('legacy', 'Old category', 'cm', NULL, NULL, NULL)",
+      );
+      await db.customStatement(
+        'INSERT INTO measurements_measurement (id, category_id, date, value, notes, source) '
+        "VALUES ('legacy-entry', 'legacy', '2026-01-01T00:00:00.000Z', 42, '', NULL)",
+      );
 
+      final category = (await repo.watchAllWithoutEntries().first).single;
+      expect(category.metricType, MetricType.custom);
+      expect(category.order, 0);
+      expect(category.isOfficial, isFalse);
+
+      final entry = (await repo.watchEntries('legacy', limit: 10).first).single;
+      expect(entry.source, 'user');
+    });
+  });
+
+  group('the import dedup queries', () {
+    /// An entry of ['1'], keyed by [externalId] unless it is null.
+    Future<void> seedEntry(String id, {String? externalId, double value = 1}) => repo.addLocalDrift(
+      MeasurementEntry(
+        id: id,
+        categoryId: '1',
+        date: DateTime.utc(2026, 1, 1),
+        value: value,
+        notes: '',
+        externalId: externalId,
+      ),
+    );
+
+    test('getExternalIds returns the keys of one category, skipping the unkeyed', () async {
+      await seedEntry('e1', externalId: 'key-1');
+      await seedEntry('e2', externalId: 'key-2');
+      // A hand-entered measurement has no external id
+      await seedEntry('e3');
       await repo.addLocalDrift(
         MeasurementEntry(
-          categoryId: '1',
-          date: DateTime.utc(2027, 1, 1),
-          value: 99,
-          notes: 'fresh',
+          id: 'other',
+          categoryId: '2',
+          date: DateTime.utc(2026, 1, 1),
+          value: 1,
+          notes: '',
+          externalId: 'key-3',
         ),
       );
 
-      await iter.moveNext();
+      expect(await repo.getExternalIds('1'), {'key-1', 'key-2'});
+    });
+
+    test('getExternalIds returns nothing for a category without entries', () async {
+      expect(await repo.getExternalIds('1'), isEmpty);
+    });
+
+    test('getEntriesByExternalId keys the entries the importer may update', () async {
+      await seedEntry('e1', externalId: 'key-1', value: 60);
+      await seedEntry('e2');
+
+      final stored = await repo.getEntriesByExternalId('1');
+
+      expect(stored.keys, ['key-1']);
+      // The row itself, not just its key: the update writes it back
+      expect(stored['key-1']!.id, 'e1');
+      expect(stored['key-1']!.value, 60);
+    });
+
+    test('hasEntries answers for the category asked about', () async {
+      await repo.addLocalDrift(
+        MeasurementEntry(
+          id: 'other',
+          categoryId: '2',
+          date: DateTime.utc(2026, 1, 1),
+          value: 1,
+          notes: '',
+        ),
+      );
+
+      expect(await repo.hasEntries('1'), isFalse);
+      expect(await repo.hasEntries('2'), isTrue);
+    });
+  });
+
+  group('watchEntries', () {
+    test('returns the newest entries first, at most the limit', () async {
+      await seedCategoriesAndEntries();
+
+      final page = await repo.watchEntries('1', limit: 3).first;
+
+      final dates = page.map((e) => e.date).toList();
+      expect(page, hasLength(3));
+      expect(dates, [...dates]..sort((a, b) => b.compareTo(a)));
       expect(
-        iter.current.firstWhere((c) => c.name == 'Body fat').entries,
-        hasLength(initial + 1),
+        dates.first,
+        getMeasurementEntries()['1']!.map((e) => e.date).reduce((a, b) => a.isAfter(b) ? a : b),
+      );
+    });
+
+    test('a growing limit extends the same page', () async {
+      await seedCategoriesAndEntries();
+
+      final short = await repo.watchEntries('1', limit: 2).first;
+      final long = await repo.watchEntries('1', limit: 4).first;
+
+      expect(long.take(2).map((e) => e.id), short.map((e) => e.id));
+    });
+
+    test('entries sharing a timestamp keep a stable order', () async {
+      // The sync writes them: a day aggregate at midnight, the components of a
+      // reading at its exact time. A limit over an ambiguous order would pick
+      // a different row on every read.
+      await db
+          .into(db.measurementCategoryTable)
+          .insert(MeasurementCategory(id: '1', name: 'Sleep', unit: 'min').toCompanion());
+      final shared = DateTime(2026, 5, 4);
+      for (final id in ['a', 'b', 'c']) {
+        await repo.addLocalDrift(
+          MeasurementEntry(id: id, categoryId: '1', date: shared, value: 60, notes: ''),
+        );
+      }
+
+      final first = await repo.watchEntries('1', limit: 2).first;
+      final second = await repo.watchEntries('1', limit: 2).first;
+
+      expect(first.map((e) => e.id), second.map((e) => e.id));
+      expect(first.map((e) => e.id), ['c', 'b']);
+    });
+
+    test('only the requested category is read', () async {
+      await seedCategoriesAndEntries();
+
+      final page = await repo.watchEntries('2', limit: 10).first;
+
+      expect(page.every((e) => e.categoryId == '2'), isTrue);
+    });
+  });
+
+  group('watchGroupEntries', () {
+    test('returns the entries of every component, newest first', () async {
+      for (final category in getBloodPressureGroup()) {
+        await repo.addLocalDriftCategory(category);
+      }
+      for (final (index, date) in [DateTime(2026, 5, 4, 8), DateTime(2026, 5, 5, 8)].indexed) {
+        await repo.addLocalDriftGroupEntries([
+          MeasurementEntry(id: 's$index', categoryId: 'sys', date: date, value: 120, notes: ''),
+          MeasurementEntry(id: 'd$index', categoryId: 'dia', date: date, value: 80, notes: ''),
+        ]);
+      }
+
+      final page = await repo.watchGroupEntries('bp', limit: 2).first;
+
+      expect(page.map((e) => e.categoryId).toSet(), {'sys', 'dia'});
+      expect(page.every((e) => e.date == DateTime(2026, 5, 5, 8)), isTrue);
+    });
+
+    test('a component id yields no group entries', () async {
+      for (final category in getBloodPressureGroup()) {
+        await repo.addLocalDriftCategory(category);
+      }
+
+      expect(await repo.watchGroupEntries('sys', limit: 10).first, isEmpty);
+    });
+  });
+
+  group('watchEntryBuckets', () {
+    /// Local dates throughout: the query buckets in the local zone, so UTC
+    /// fixtures would put a reading in a different day on every machine.
+    Future<void> seedEntries(
+      List<(DateTime, num)> readings, {
+      Map<String, dynamic>? extraData,
+    }) async {
+      await db
+          .into(db.measurementCategoryTable)
+          .insert(MeasurementCategory(id: '1', name: 'Heart rate', unit: 'bpm').toCompanion());
+      for (final (index, (date, value)) in readings.indexed) {
+        await db
+            .into(db.measurementEntryTable)
+            .insert(
+              MeasurementEntry(
+                id: 'e$index',
+                categoryId: '1',
+                date: date,
+                value: value,
+                notes: '',
+                extraData: extraData,
+              ).toCompanion(),
+            );
+      }
+    }
+
+    test('a series that fits keeps one bucket per entry', () async {
+      await seedEntries([
+        (DateTime(2026, 5, 4, 8, 30), 60),
+        (DateTime(2026, 5, 4, 20, 15), 70),
+      ]);
+
+      final buckets = await repo.watchEntryBuckets('1').first;
+
+      expect(buckets.map((b) => b.start), [
+        DateTime(2026, 5, 4, 8, 30),
+        DateTime(2026, 5, 4, 20, 15),
+      ]);
+      expect(buckets.map((b) => b.count), [1, 1]);
+      expect(buckets.map((b) => b.sum), [60, 70]);
+    });
+
+    test('condenses to the finest calendar unit that fits', () async {
+      // Two readings a day over four days: entry level would be eight points,
+      // the hour level still eight, so the day is the first one under the limit
+      await seedEntries([
+        for (var day = 4; day <= 7; day++) ...[
+          (DateTime(2026, 5, day, 8, 0), 60),
+          (DateTime(2026, 5, day, 20, 0), 80),
+        ],
+      ]);
+
+      final buckets = await repo.watchEntryBuckets('1', maxPoints: 5).first;
+
+      expect(buckets, hasLength(4));
+      expect(buckets.first.start, DateTime(2026, 5, 4));
+      expect(buckets.first.count, 2);
+      expect(buckets.first.sum, 140);
+      expect(buckets.first.min, 60);
+      expect(buckets.first.max, 80);
+    });
+
+    test('a week bucket starts on the Monday of the reading', () async {
+      // 2026-05-04 is a Monday, 2026-05-10 the Sunday closing that week
+      await seedEntries([
+        (DateTime(2026, 5, 4, 12), 60),
+        (DateTime(2026, 5, 10, 12), 80),
+      ]);
+
+      final buckets = await repo.watchEntryBuckets('1', level: MeasurementBucketLevel.week).first;
+
+      expect(buckets.single.start, DateTime(2026, 5, 4));
+      expect(buckets.single.count, 2);
+    });
+
+    test('a day bucket is a calendar day whatever the point count', () async {
+      await seedEntries([
+        (DateTime(2026, 5, 4, 23, 30), 60),
+        (DateTime(2026, 5, 5, 0, 30), 80),
+      ]);
+
+      final buckets = await repo.watchEntryBuckets('1', level: MeasurementBucketLevel.day).first;
+
+      expect(buckets.map((b) => b.start), [DateTime(2026, 5, 4), DateTime(2026, 5, 5)]);
+    });
+
+    test('an aggregate entry contributes its stored bounds, not its value', () async {
+      // What the health sync writes for heart rate: one row a day, holding the
+      // day's average with the range it summarises
+      await seedEntries(
+        [(DateTime(2026, 5, 4, 12), 70)],
+        extraData: {'min': 48, 'max': 165},
+      );
+
+      final buckets = await repo.watchEntryBuckets('1', level: MeasurementBucketLevel.day).first;
+
+      expect(buckets.single.min, 48);
+      expect(buckets.single.max, 165);
+      expect(buckets.single.sum, 70);
+    });
+
+    test('mixed units are kept apart', () async {
+      // A category holding kg and lb entries: one mean over both would be a
+      // number in neither, so the slices come back separately
+      await db
+          .into(db.measurementCategoryTable)
+          .insert(MeasurementCategory(id: '1', name: 'Weight', unit: 'kg').toCompanion());
+      for (final (index, (value, unit)) in [(80, 'kg'), (180, 'lb')].indexed) {
+        await db
+            .into(db.measurementEntryTable)
+            .insert(
+              MeasurementEntry(
+                id: 'e$index',
+                categoryId: '1',
+                date: DateTime(2026, 5, 4, 8 + index),
+                value: value,
+                notes: '',
+                extraData: {'unit': unit},
+              ).toCompanion(),
+            );
+      }
+
+      final buckets = await repo.watchEntryBuckets('1', level: MeasurementBucketLevel.day).first;
+
+      expect(buckets, hasLength(2));
+      expect(buckets.map((b) => b.start).toSet(), {DateTime(2026, 5, 4)});
+      expect(buckets.map((b) => b.unit), ['kg', 'lb']);
+      expect(buckets.map((b) => b.sum), [80, 180]);
+    });
+
+    test('since bounds the entries read', () async {
+      await seedEntries([
+        (DateTime(2026, 1, 1, 12), 60),
+        (DateTime(2026, 5, 4, 12), 80),
+      ]);
+
+      final buckets = await repo.watchEntryBuckets('1', since: DateTime(2026, 3, 1)).first;
+
+      expect(buckets.map((b) => b.sum), [80]);
+    });
+
+    test('until bounds the entries read, excluding its own day', () async {
+      // What a chart of a finished plan period reads: everything after the
+      // last day belongs to no plan
+      await seedEntries([
+        (DateTime(2026, 1, 1, 12), 60),
+        (DateTime(2026, 5, 4, 12), 80),
+      ]);
+
+      final buckets = await repo.watchEntryBuckets('1', until: DateTime(2026, 5, 4)).first;
+
+      expect(buckets.map((b) => b.sum), [60]);
+    });
+
+    test('since and until bound the entries together', () async {
+      await seedEntries([
+        (DateTime(2026, 1, 1, 12), 60),
+        (DateTime(2026, 3, 4, 12), 70),
+        (DateTime(2026, 5, 4, 12), 80),
+      ]);
+
+      final buckets = await repo
+          .watchEntryBuckets('1', since: DateTime(2026, 2, 1), until: DateTime(2026, 4, 1))
+          .first;
+
+      expect(buckets.map((b) => b.sum), [70]);
+    });
+
+    test('only the requested category is read', () async {
+      await seedEntries([(DateTime(2026, 5, 4, 12), 60)]);
+      await db
+          .into(db.measurementCategoryTable)
+          .insert(MeasurementCategory(id: '2', name: 'Other', unit: 'cm').toCompanion());
+      await repo.addLocalDrift(
+        MeasurementEntry(categoryId: '2', date: DateTime(2026, 5, 4, 13), value: 99, notes: ''),
+      );
+
+      final buckets = await repo.watchEntryBuckets('1').first;
+
+      expect(buckets.map((b) => b.sum), [60]);
+    });
+
+    test('re-emits when an entry is added', () async {
+      await seedEntries([(DateTime(2026, 5, 4, 12), 60)]);
+      final iter = StreamIterator(repo.watchEntryBuckets('1'));
+
+      await iter.moveNext();
+      expect(iter.current, hasLength(1));
+
+      await repo.addLocalDrift(
+        MeasurementEntry(categoryId: '1', date: DateTime(2026, 5, 5, 12), value: 80, notes: ''),
       );
 
+      await iter.moveNext();
+      expect(iter.current, hasLength(2));
       await iter.cancel();
     });
   });
 
-  group('watchLocalDriftCategoryById', () {
-    test('returns the matching category', () async {
+  group('watchDailyBuckets', () {
+    test('returns one bucket per day and category, over all of them', () async {
       await seedCategoriesAndEntries();
+      // Two readings on one day, which the calendar shows as one event
+      await repo.addLocalDrift(
+        MeasurementEntry(
+          id: 'x1',
+          categoryId: '1',
+          date: DateTime(2026, 5, 4, 8),
+          value: 20,
+          notes: '',
+        ),
+      );
+      await repo.addLocalDrift(
+        MeasurementEntry(
+          id: 'x2',
+          categoryId: '1',
+          date: DateTime(2026, 5, 4, 20),
+          value: 22,
+          notes: '',
+        ),
+      );
+
+      final buckets = await repo.watchDailyBuckets().first;
+
+      expect(buckets.keys.toSet(), {'1', '2'});
+      final day = buckets['1']!.firstWhere((b) => b.start == DateTime(2026, 5, 4));
+      expect(day.count, 2);
+      expect(day.sum, 42);
+      expect(buckets['2'], isNotEmpty);
+    });
+
+    test('a category without entries is absent', () async {
+      await repo.addLocalDriftCategory(MeasurementCategory(id: 'c1', name: 'Waist', unit: 'cm'));
+
+      expect(await repo.watchDailyBuckets().first, isEmpty);
+    });
+  });
+
+  group('watchGroupBuckets', () {
+    Future<void> seedBloodPressure(List<(DateTime, num, num)> readings) async {
+      for (final category in getBloodPressureGroup()) {
+        await repo.addLocalDriftCategory(category);
+      }
+      for (final (index, (date, systolic, diastolic)) in readings.indexed) {
+        await repo.addLocalDriftGroupEntries([
+          MeasurementEntry(
+            id: 's$index',
+            categoryId: 'sys',
+            date: date,
+            value: systolic,
+            notes: '',
+          ),
+          MeasurementEntry(
+            id: 'd$index',
+            categoryId: 'dia',
+            date: date,
+            value: diastolic,
+            notes: '',
+          ),
+        ]);
+      }
+    }
+
+    test('returns the buckets of every component, keyed by component', () async {
+      await seedBloodPressure([(DateTime(2026, 5, 4, 8), 120, 80)]);
+
+      final buckets = await repo.watchGroupBuckets('bp').first;
+
+      expect(buckets.keys.toSet(), {'sys', 'dia'});
+      expect(buckets['sys']!.single.sum, 120);
+      expect(buckets['dia']!.single.sum, 80);
+    });
+
+    test('all components share one calendar unit', () async {
+      // Condensing per component would put the halves of a reading in
+      // different buckets, and the chart could not pair them any more
+      await seedBloodPressure([
+        for (var day = 1; day <= 10; day++)
+          for (var hour = 6; hour < 12; hour++) (DateTime(2026, 5, day, hour), 120, 80),
+      ]);
+
+      final buckets = await repo.watchGroupBuckets('bp', maxPoints: 20).first;
+
+      expect(buckets['sys']!.map((b) => b.start), buckets['dia']!.map((b) => b.start));
+      expect(buckets['sys']!.first.start, DateTime(2026, 5, 1));
+    });
+
+    test('a category that is not a group has no components', () async {
+      await seedBloodPressure([(DateTime(2026, 5, 4, 8), 120, 80)]);
+
+      expect(await repo.watchGroupBuckets('sys').first, isEmpty);
+    });
+  });
+
+  group('watchValueCounts', () {
+    Future<void> seedValues(List<(DateTime, num)> readings) async {
+      await db
+          .into(db.measurementCategoryTable)
+          .insert(MeasurementCategory(id: '1', name: 'Heart rate', unit: 'bpm').toCompanion());
+      for (final (index, (date, value)) in readings.indexed) {
+        await db
+            .into(db.measurementEntryTable)
+            .insert(
+              MeasurementEntry(
+                id: 'e$index',
+                categoryId: '1',
+                date: date,
+                value: value,
+                notes: '',
+              ).toCompanion(),
+            );
+      }
+    }
+
+    test('counts how often each value occurred', () async {
+      // What makes the histogram cheap: a year of readings comes back as the
+      // distinct values it covers
+      await seedValues([
+        (DateTime(2026, 5, 4, 8), 60),
+        (DateTime(2026, 5, 4, 9), 60),
+        (DateTime(2026, 5, 5, 8), 75),
+      ]);
 
-      final emitted = await repo.watchLocalDriftCategoryById('1').first;
+      final counts = await repo.watchValueCounts('1').first;
 
-      expect(emitted, isNotNull);
-      expect(emitted!.name, 'Body fat');
-      expect(emitted.entries, hasLength(6));
+      expect(counts.map((c) => (c.value, c.count)), [(60, 2), (75, 1)]);
     });
 
-    test('returns null when no category matches', () async {
+    test('carries the newest date a value was measured on', () async {
+      await seedValues([
+        (DateTime(2026, 5, 4, 8), 60),
+        (DateTime(2026, 5, 6, 8), 60),
+      ]);
+
+      final counts = await repo.watchValueCounts('1').first;
+
+      expect(counts.single.newest, DateTime(2026, 5, 6, 8));
+    });
+
+    test('counts daily totals for a summed metric', () async {
+      await seedValues([
+        (DateTime(2026, 5, 4, 8), 3000),
+        (DateTime(2026, 5, 4, 20), 2000),
+        (DateTime(2026, 5, 5, 8), 5000),
+      ]);
+
+      final counts = await repo.watchValueCounts('1', summedPerDay: true).first;
+
+      // Both days total 5000, so the histogram sees one value twice
+      expect(counts.single.value, 5000);
+      expect(counts.single.count, 2);
+    });
+
+    test('mixed units are kept apart', () async {
+      await db
+          .into(db.measurementCategoryTable)
+          .insert(MeasurementCategory(id: '1', name: 'Weight', unit: 'kg').toCompanion());
+      for (final (index, (value, unit)) in [(80, 'kg'), (80, 'lb')].indexed) {
+        await db
+            .into(db.measurementEntryTable)
+            .insert(
+              MeasurementEntry(
+                id: 'e$index',
+                categoryId: '1',
+                date: DateTime(2026, 5, 4, 8 + index),
+                value: value,
+                notes: '',
+                extraData: {'unit': unit},
+              ).toCompanion(),
+            );
+      }
+
+      final counts = await repo.watchValueCounts('1').first;
+
+      expect(counts.map((c) => c.unit), ['kg', 'lb']);
+      expect(counts.every((c) => c.count == 1), isTrue);
+    });
+  });
+
+  group('watchOfficialBodyWeightCategory', () {
+    Future<void> seedBodyWeight() async {
+      await repo.addLocalDriftCategory(getBodyWeightCategory());
+      for (final entry in [testWeightEntry1, testWeightEntry2]) {
+        await repo.addLocalDrift(entry);
+      }
+    }
+
+    test('returns the official category out of all of them', () async {
       await seedCategoriesAndEntries();
+      await seedBodyWeight();
+
+      final emitted = await repo.watchOfficialBodyWeightCategory().first;
+
+      expect(emitted!.id, testBodyWeightCategoryId);
+    });
+
+    test('a category of the same type that is not official is ignored', () async {
+      await repo.addLocalDriftCategory(
+        MeasurementCategory(
+          id: 'custom',
+          name: 'My weight',
+          unit: 'kg',
+          metricType: MetricType.bodyWeight,
+        ),
+      );
+      await seedBodyWeight();
+
+      final emitted = await repo.watchOfficialBodyWeightCategory().first;
 
-      final emitted = await repo.watchLocalDriftCategoryById('does-not-exist').first;
+      expect(emitted!.id, testBodyWeightCategoryId);
+    });
+
+    test('is null before the category has been synced', () async {
+      await seedCategoriesAndEntries();
 
-      expect(emitted, isNull);
+      expect(await repo.watchOfficialBodyWeightCategory().first, isNull);
     });
   });
 
   group('entry CRUD', () {
-    test('addLocalDrift inserts a row visible in watchAll', () async {
+    test('addLocalDrift inserts a row visible in watchEntries', () async {
       await db
           .into(db.measurementCategoryTable)
           .insert(
@@ -146,9 +815,9 @@ void main() {
 
       await repo.addLocalDrift(testMeasurementEntry1);
 
-      final categories = await repo.watchAll().first;
-      expect(categories.first.entries, hasLength(1));
-      expect(categories.first.entries.single.value, 30);
+      final entries = await repo.watchEntries('1', limit: 10).first;
+      expect(entries, hasLength(1));
+      expect(entries.single.value, 30);
     });
 
     test('updateLocalDrift overwrites the row with matching id', () async {
@@ -168,7 +837,7 @@ void main() {
       );
       await repo.updateLocalDrift(updated);
 
-      final entries = (await repo.watchAll().first).first.entries;
+      final entries = await repo.watchEntries('1', limit: 10).first;
       expect(entries.single.value, 99);
       expect(entries.single.notes, 'updated');
     });
@@ -178,21 +847,39 @@ void main() {
 
       await repo.deleteLocalDrift(testMeasurementEntry1.id!);
 
-      final entries = (await repo.watchAll().first).firstWhere((c) => c.name == 'Body fat').entries;
+      final entries = await repo.watchEntries('1', limit: 10).first;
       expect(entries.map((e) => e.id), isNot(contains(testMeasurementEntry1.id)));
       expect(entries, hasLength(5));
     });
   });
 
   group('category CRUD', () {
-    test('addLocalDriftCategory inserts a row visible in watchAll', () async {
+    test('addLocalDriftCategory inserts a row visible in the category stream', () async {
       final category = MeasurementCategory(id: 'c1', name: 'Waist', unit: 'cm');
 
       await repo.addLocalDriftCategory(category);
 
-      final emitted = await repo.watchAll().first;
+      final emitted = await repo.watchAllWithoutEntries().first;
       expect(emitted, hasLength(1));
       expect(emitted.single.name, 'Waist');
+      expect(emitted.single.isOfficial, isFalse);
+    });
+
+    test('isOfficial and metricType round-trip through the table', () async {
+      await repo.addLocalDriftCategory(
+        MeasurementCategory(
+          id: 'bw',
+          name: 'Weight',
+          unit: 'kg',
+          metricType: MetricType.bodyWeight,
+          isOfficial: true,
+        ),
+      );
+
+      final emitted = await repo.watchAllWithoutEntries().first;
+      expect(emitted.single.isOfficial, isTrue);
+      expect(emitted.single.metricType, MetricType.bodyWeight);
+      expect(emitted.single.isOfficialBodyWeight, isTrue);
     });
 
     test('updateLocalDriftCategory overwrites name and unit', () async {
@@ -203,7 +890,7 @@ void main() {
         MeasurementCategory(id: 'c1', name: 'Hips', unit: 'inch'),
       );
 
-      final emitted = await repo.watchAll().first;
+      final emitted = await repo.watchAllWithoutEntries().first;
       expect(emitted.single.name, 'Hips');
       expect(emitted.single.unit, 'inch');
     });
@@ -218,8 +905,92 @@ void main() {
 
       await repo.deleteLocalDriftCategory('c1');
 
-      final emitted = await repo.watchAll().first;
+      final emitted = await repo.watchAllWithoutEntries().first;
       expect(emitted.map((c) => c.id), ['c2']);
     });
   });
+
+  group('multi-value groups', () {
+    Future<void> seedBloodPressureGroup() async {
+      for (final category in getBloodPressureGroup()) {
+        await repo.addLocalDriftCategory(category);
+      }
+    }
+
+    test('the category stream attaches children to their parent in group order', () async {
+      await seedBloodPressureGroup();
+
+      final emitted = await repo.watchAllWithoutEntries().first;
+
+      final parent = emitted.firstWhere((c) => c.id == 'bp');
+      expect(parent.hasChildren, isTrue);
+      expect(parent.children.map((c) => c.id), ['sys', 'dia']);
+    });
+
+    test('the category stream sorts categories by order before name', () async {
+      await repo.addLocalDriftCategory(
+        MeasurementCategory(id: 'c1', name: 'Aaa', unit: 'cm', order: 5),
+      );
+      await repo.addLocalDriftCategory(
+        MeasurementCategory(id: 'c2', name: 'Zzz', unit: 'cm', order: 1),
+      );
+
+      final emitted = await repo.watchAllWithoutEntries().first;
+
+      expect(emitted.map((c) => c.id), ['c2', 'c1']);
+    });
+
+    test('addLocalDriftGroupEntries inserts one entry per component', () async {
+      await seedBloodPressureGroup();
+      final date = DateTime.utc(2026, 7, 10, 14, 32);
+
+      await repo.addLocalDriftGroupEntries([
+        MeasurementEntry(id: 'e1', categoryId: 'sys', date: date, value: 120, notes: ''),
+        MeasurementEntry(id: 'e2', categoryId: 'dia', date: date, value: 80, notes: ''),
+      ]);
+
+      final entries = await repo.watchGroupEntries('bp', limit: 10).first;
+      expect(entries.map((e) => e.value).toSet(), {120, 80});
+      expect(entries.first.date, entries.last.date);
+    });
+
+    test('deleteLocalDriftCategory removes children along with the parent', () async {
+      await seedBloodPressureGroup();
+
+      await repo.deleteLocalDriftCategory('bp');
+
+      final emitted = await repo.watchAllWithoutEntries().first;
+      expect(emitted, isEmpty);
+    });
+  });
+
+  group('reorderCategories', () {
+    test('persists the list positions as order', () async {
+      await repo.addLocalDriftCategory(MeasurementCategory(id: 'c1', name: 'Aaa', unit: 'cm'));
+      await repo.addLocalDriftCategory(MeasurementCategory(id: 'c2', name: 'Bbb', unit: 'cm'));
+      await repo.addLocalDriftCategory(MeasurementCategory(id: 'c3', name: 'Ccc', unit: 'cm'));
+
+      await repo.reorderCategories(['c3', 'c1', 'c2']);
+
+      final emitted = await repo.watchAllWithoutEntries().first;
+      expect(emitted.map((c) => c.id), ['c3', 'c1', 'c2']);
+      expect(emitted.map((c) => c.order), [0, 1, 2]);
+    });
+
+    test('keeps the in-group order of children', () async {
+      for (final category in getBloodPressureGroup()) {
+        await repo.addLocalDriftCategory(category);
+      }
+      await repo.addLocalDriftCategory(
+        MeasurementCategory(id: 'c1', name: 'Waist', unit: 'cm', order: 1),
+      );
+
+      await repo.reorderCategories(['c1', 'bp']);
+
+      final emitted = await repo.watchAllWithoutEntries().first;
+      final parent = emitted.firstWhere((c) => c.id == 'bp');
+      expect(parent.order, 1);
+      expect(parent.children.map((c) => c.id), ['sys', 'dia']);
+    });
+  });
 }
diff --git a/test/features/measurements/screens/measurement_categories_screen_test.dart b/test/features/measurements/screens/measurement_categories_screen_test.dart
index 03bc12dc7..a2714fce4 100644
--- a/test/features/measurements/screens/measurement_categories_screen_test.dart
+++ b/test/features/measurements/screens/measurement_categories_screen_test.dart
@@ -20,27 +20,44 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
-import 'package:mockito/mockito.dart';
-import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+import 'package:wger/core/app_settings_notifier.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.dart';
 import 'package:wger/features/measurements/providers/measurement_repository.dart';
 import 'package:wger/features/measurements/screens/measurement_categories_screen.dart';
-import 'package:wger/features/measurements/widgets/charts.dart';
+import 'package:wger/features/measurements/widgets/measurement_fab.dart';
+import 'package:wger/features/measurements/widgets/measurement_tile.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
 import '../../../../test_data/measurements.dart';
+import '../../../helpers/measurement_chart_buckets.dart';
+import '../../../helpers/measurement_repository_stubs.dart';
 import 'measurement_categories_screen_test.mocks.dart';
 
 @GenerateMocks([MeasurementRepository])
 void main() {
+  setUp(() {
+    // The shared chart range hydrates from SharedPreferences on first read
+    SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
+  });
+
   Widget createMeasurementScreen({locale = 'en'}) {
+    final categories = [...getMeasurementCategories(), ...getBloodPressureGroup()];
+    final entries = {...getMeasurementEntries(), ...getBloodPressureEntries()};
     final mockRepo = MockMeasurementRepository();
-    when(
-      mockRepo.watchAll(),
-    ).thenAnswer((_) => Stream<List<MeasurementCategory>>.value(getMeasurementCategories()));
+    stubMeasurementReads(mockRepo, categories, entries);
 
     return ProviderScope(
       overrides: [
         measurementRepositoryProvider.overrideWithValue(mockRepo),
+        // A fresh accessor per test: the app-wide singleton keeps the
+        // in-memory store of the first test alive across the file
+        appSettingsPrefsProvider.overrideWithValue(SharedPreferencesAsync()),
+        // The charts read their points from the aggregated query
+        measurementChartBucketsProvider.overrideWith(chartBucketsFrom(entries)),
+        measurementGroupBucketsProvider.overrideWith(groupBucketsFrom(categories, entries)),
       ],
       child: MaterialApp(
         locale: Locale(locale),
@@ -52,13 +69,19 @@ void main() {
   }
 
   testWidgets('Test the widgets on the measurement category screen', (WidgetTester tester) async {
+    tester.view.physicalSize = const Size(800, 2200);
+    tester.view.devicePixelRatio = 1.0;
+
     await tester.pumpWidget(createMeasurementScreen());
     await tester.pumpAndSettle();
 
-    expect(find.text('Measurements'), findsOneWidget);
-    expect(find.text('Body fat'), findsOneWidget);
-    expect(find.text('Biceps'), findsOneWidget);
-    expect(find.byType(Card), findsNWidgets(2));
-    expect(find.byType(MeasurementChartWidgetFl), findsNWidgets(2));
+    expect(find.text('Body'), findsOneWidget);
+    // One tile per top-level category; the components live behind the group's.
+    // hitTestable: the closed FAB menu holds the same names, invisibly.
+    expect(find.byType(MeasurementTile), findsNWidgets(3));
+    expect(find.text('Body fat').hitTestable(), findsOneWidget);
+    expect(find.text('Biceps').hitTestable(), findsOneWidget);
+    expect(find.text('Blood pressure').hitTestable(), findsOneWidget);
+    expect(find.byType(MeasurementsFab), findsOneWidget);
   });
 }
diff --git a/test/features/measurements/screens/measurement_categories_screen_test.mocks.dart b/test/features/measurements/screens/measurement_categories_screen_test.mocks.dart
index 8b8ed109a..c23d61fa2 100644
--- a/test/features/measurements/screens/measurement_categories_screen_test.mocks.dart
+++ b/test/features/measurements/screens/measurement_categories_screen_test.mocks.dart
@@ -6,6 +6,7 @@
 import 'dart:async' as _i3;
 
 import 'package:mockito/mockito.dart' as _i1;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i6;
 import 'package:wger/features/measurements/models/measurement_category.dart' as _i4;
 import 'package:wger/features/measurements/models/measurement_entry.dart' as _i5;
 import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i2;
@@ -34,23 +35,163 @@ class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepos
   }
 
   @override
-  _i3.Stream<List<_i4.MeasurementCategory>> watchAll() =>
+  _i3.Stream<List<_i4.MeasurementCategory>> watchAllWithoutEntries() =>
       (super.noSuchMethod(
-            Invocation.method(#watchAll, []),
+            Invocation.method(#watchAllWithoutEntries, []),
             returnValue: _i3.Stream<List<_i4.MeasurementCategory>>.empty(),
           )
           as _i3.Stream<List<_i4.MeasurementCategory>>);
 
   @override
-  _i3.Stream<_i4.MeasurementCategory?> watchLocalDriftCategoryById(
+  _i3.Stream<_i4.MeasurementCategory?> watchCategoryWithoutEntries(
     String? id,
   ) =>
       (super.noSuchMethod(
-            Invocation.method(#watchLocalDriftCategoryById, [id]),
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
             returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
           )
           as _i3.Stream<_i4.MeasurementCategory?>);
 
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<Map<String, _i5.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i3.Stream<Map<String, _i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementBucket>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementBucket>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementValueCount>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementValueCount>>);
+
+  @override
+  _i3.Future<List<_i4.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i3.Future<List<_i4.MeasurementCategory>>.value(
+              <_i4.MeasurementCategory>[],
+            ),
+          )
+          as _i3.Future<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
+
+  @override
+  _i3.Future<Map<String, _i5.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i3.Future<Map<String, _i5.MeasurementEntry>>.value(
+              <String, _i5.MeasurementEntry>{},
+            ),
+          )
+          as _i3.Future<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
   @override
   _i3.Future<void> deleteLocalDrift(String? id) =>
       (super.noSuchMethod(
@@ -78,6 +219,17 @@ class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepos
           )
           as _i3.Future<void>);
 
+  @override
+  _i3.Future<void> addLocalDriftGroupEntries(
+    List<_i5.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
   @override
   _i3.Future<void> deleteLocalDriftCategory(String? id) =>
       (super.noSuchMethod(
@@ -106,4 +258,24 @@ class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepos
             returnValueForMissingStub: _i3.Future<void>.value(),
           )
           as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategoryGroup(
+    List<_i4.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
 }
diff --git a/test/features/measurements/screens/measurement_category_sort_screen_test.dart b/test/features/measurements/screens/measurement_category_sort_screen_test.dart
new file mode 100644
index 000000000..b94309b02
--- /dev/null
+++ b/test/features/measurements/screens/measurement_category_sort_screen_test.dart
@@ -0,0 +1,103 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c)  2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+import 'package:wger/features/measurements/screens/measurement_category_sort_screen.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../../test_data/body_weight.dart';
+import '../../../../test_data/measurements.dart';
+import 'measurement_category_sort_screen_test.mocks.dart';
+
+@GenerateMocks([MeasurementRepository])
+void main() {
+  late MockMeasurementRepository mockRepo;
+
+  // Three top-level categories: Body fat ('1'), Biceps ('2') and the blood
+  // pressure group parent ('bp'); its children must not be listed.
+  final categories = [
+    ...getMeasurementCategories(),
+    ...getBloodPressureGroup(),
+  ];
+
+  setUp(() {
+    mockRepo = MockMeasurementRepository();
+    when(mockRepo.watchAllWithoutEntries()).thenAnswer((_) => Stream.value(categories));
+    when(mockRepo.reorderCategories(any)).thenAnswer((_) async {});
+  });
+
+  Widget createSortScreen() {
+    return ProviderScope(
+      overrides: [
+        measurementRepositoryProvider.overrideWithValue(mockRepo),
+      ],
+      child: const MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: MeasurementCategorySortScreen(),
+      ),
+    );
+  }
+
+  testWidgets('lists only top-level categories', (tester) async {
+    await tester.pumpWidget(createSortScreen());
+    await tester.pumpAndSettle();
+
+    expect(find.text('Body fat'), findsOneWidget);
+    expect(find.text('Biceps'), findsOneWidget);
+    expect(find.text('Blood pressure'), findsOneWidget);
+    expect(find.text('Systolic'), findsNothing);
+    expect(find.text('Diastolic'), findsNothing);
+    expect(find.byIcon(Icons.drag_handle), findsNWidgets(3));
+  });
+
+  testWidgets('the official body weight category is not listed', (tester) async {
+    // It has its own screen and is hidden from the measurements UI, so it must
+    // not take a position in the order either
+    when(mockRepo.watchAllWithoutEntries()).thenAnswer(
+      (_) => Stream.value([getBodyWeightCategory(), ...getMeasurementCategories()]),
+    );
+
+    await tester.pumpWidget(createSortScreen());
+    await tester.pumpAndSettle();
+
+    expect(find.text('Weight'), findsNothing);
+    expect(find.byIcon(Icons.drag_handle), findsNWidgets(2));
+  });
+
+  testWidgets('dragging an item to the bottom persists the new order', (tester) async {
+    await tester.pumpWidget(createSortScreen());
+    await tester.pumpAndSettle();
+
+    final firstHandle = find.byIcon(Icons.drag_handle).first;
+    final itemHeight = tester.getSize(find.byType(ListTile).first).height;
+    await tester.timedDrag(
+      firstHandle,
+      Offset(0, itemHeight * 3),
+      const Duration(milliseconds: 300),
+    );
+    await tester.pumpAndSettle();
+
+    verify(mockRepo.reorderCategories(['2', 'bp', '1'])).called(1);
+  });
+}
diff --git a/test/features/measurements/screens/measurement_category_sort_screen_test.mocks.dart b/test/features/measurements/screens/measurement_category_sort_screen_test.mocks.dart
new file mode 100644
index 000000000..6e338281c
--- /dev/null
+++ b/test/features/measurements/screens/measurement_category_sort_screen_test.mocks.dart
@@ -0,0 +1,281 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/measurements/screens/measurement_category_sort_screen_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i3;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i6;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i4;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i5;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i2;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+/// A class which mocks [MeasurementRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepository {
+  MockMeasurementRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<List<_i4.MeasurementCategory>> watchAllWithoutEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i3.Stream<List<_i4.MeasurementCategory>>.empty(),
+          )
+          as _i3.Stream<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchCategoryWithoutEntries(
+    String? id,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<Map<String, _i5.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i3.Stream<Map<String, _i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementBucket>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementBucket>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementValueCount>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementValueCount>>);
+
+  @override
+  _i3.Future<List<_i4.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i3.Future<List<_i4.MeasurementCategory>>.value(
+              <_i4.MeasurementCategory>[],
+            ),
+          )
+          as _i3.Future<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
+
+  @override
+  _i3.Future<Map<String, _i5.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i3.Future<Map<String, _i5.MeasurementEntry>>.value(
+              <String, _i5.MeasurementEntry>{},
+            ),
+          )
+          as _i3.Future<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
+  @override
+  _i3.Future<void> deleteLocalDrift(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDrift, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftGroupEntries(
+    List<_i5.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteLocalDriftCategory(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDriftCategory, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDriftCategory(
+    _i4.MeasurementCategory? category,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategory(_i4.MeasurementCategory? category) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategoryGroup(
+    List<_i4.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}
diff --git a/test/features/measurements/screens/measurement_entries_screen_test.dart b/test/features/measurements/screens/measurement_entries_screen_test.dart
index 4b4d9581d..b66b0f75b 100644
--- a/test/features/measurements/screens/measurement_entries_screen_test.dart
+++ b/test/features/measurements/screens/measurement_entries_screen_test.dart
@@ -21,14 +21,23 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+import 'package:wger/core/app_settings_notifier.dart';
 import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.dart';
 import 'package:wger/features/measurements/providers/measurement_repository.dart';
 import 'package:wger/features/measurements/screens/measurement_entries_screen.dart';
+import 'package:wger/features/measurements/widgets/charts.dart';
 import 'package:wger/features/nutrition/providers/ingredient_repository.dart';
 import 'package:wger/features/nutrition/providers/nutrition_repository.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
 import '../../../../test_data/measurements.dart';
+import '../../../helpers/measurement_chart_buckets.dart';
+import '../../../helpers/measurement_repository_stubs.dart';
 import 'measurement_entries_screen_test.mocks.dart';
 
 @GenerateMocks([MeasurementRepository, NutritionRepository, IngredientRepository])
@@ -37,23 +46,45 @@ void main() {
   late MockNutritionRepository mockNutritionRepo;
   late MockIngredientRepository mockIngredientRepo;
 
+  /// The fixture's entries moved into the last few days, for the tests that
+  /// need a chart in every range rather than only in the full history
+  Map<String, List<MeasurementEntry>> recentEntries() => {
+    '1': [
+      for (final (index, entry) in getMeasurementEntries()['1']!.indexed)
+        entry.copyWith(date: DateTime.now().subtract(Duration(days: index))),
+    ],
+  };
+
   setUp(() {
+    // The shared chart range hydrates from SharedPreferences on first read
+    SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
     mockMeasurementRepo = MockMeasurementRepository();
-    when(
-      mockMeasurementRepo.watchLocalDriftCategoryById(any),
-    ).thenAnswer((_) => Stream<MeasurementCategory>.value(getMeasurementCategories()[0]));
+    stubMeasurementReads(
+      mockMeasurementRepo,
+      [getMeasurementCategories()[0]],
+      getMeasurementEntries(),
+    );
 
     mockNutritionRepo = MockNutritionRepository();
     mockIngredientRepo = MockIngredientRepository();
     when(mockIngredientRepo.getById(any)).thenAnswer((_) async => null);
   });
 
-  Widget createEntriesScreen({locale = 'en'}) {
+  Widget createEntriesScreen({locale = 'en', Map<String, List<MeasurementEntry>>? entries}) {
     final key = GlobalKey<NavigatorState>();
+    final seeded = entries ?? getMeasurementEntries();
+    if (entries != null) {
+      stubMeasurementReads(mockMeasurementRepo, [getMeasurementCategories()[0]], entries);
+    }
 
     return ProviderScope(
       overrides: [
         measurementRepositoryProvider.overrideWithValue(mockMeasurementRepo),
+        // A fresh accessor per test: the app-wide singleton keeps the
+        // in-memory store of the first test alive across the file
+        appSettingsPrefsProvider.overrideWithValue(SharedPreferencesAsync()),
+        // The chart reads its points from the aggregated query
+        measurementChartBucketsProvider.overrideWith(chartBucketsFrom(seeded)),
         nutritionRepositoryProvider.overrideWithValue(mockNutritionRepo),
         ingredientRepositoryProvider.overrideWithValue(mockIngredientRepo),
       ],
@@ -80,11 +111,56 @@ void main() {
     await tester.tap(find.byType(TextButton));
     await tester.pumpAndSettle();
 
-    // Nav bar
+    // Nav bar, with the name a free-form category was given
     expect(find.text('Body fat'), findsOneWidget);
 
-    // Entries
-    expect(find.text('30 %'), findsNWidgets(1));
+    // Entries, newest first
+    expect(find.text('23 %'), findsNWidgets(1));
+  });
+
+  testWidgets('A typed category is titled by its metric type, not by the stored name', (
+    tester,
+  ) async {
+    // The server and the importer create typed categories with an English
+    // name; the metric type is what carries the translation
+    stubMeasurementReads(
+      mockMeasurementRepo,
+      [
+        MeasurementCategory(
+          id: '1',
+          name: 'Blutdruck',
+          unit: 'mmHg',
+          metricType: MetricType.bloodPressureSystolic,
+        ),
+      ],
+      getMeasurementEntries(),
+    );
+
+    await tester.pumpWidget(createEntriesScreen());
+    await tester.tap(find.byType(TextButton));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Systolic'), findsOneWidget);
+    expect(find.text('Blutdruck'), findsNothing);
+  });
+
+  testWidgets('switching the range keeps the screen it already drew', (tester) async {
+    // Entries in every range, so the switch is between two ranges that both
+    // have something to draw
+    await tester.pumpWidget(createEntriesScreen(entries: recentEntries()));
+    await tester.tap(find.byType(TextButton));
+    await tester.pumpAndSettle();
+    expect(find.byType(MeasurementChartWidgetFl), findsOneWidget);
+
+    // The new range watches different providers, both starting out loading:
+    // this is the frame in which the screen used to drop everything it had
+    await tester.ensureVisible(find.text('1 year'));
+    await tester.tap(find.text('1 year'));
+    await tester.pump();
+
+    expect(find.text('Body fat'), findsOneWidget);
+    expect(find.byType(CircularProgressIndicator), findsNothing);
+    expect(find.byType(MeasurementChartWidgetFl), findsOneWidget);
   });
 
   testWidgets('Tests the localization of dates - EN', (WidgetTester tester) async {
@@ -92,9 +168,9 @@ void main() {
     await tester.tap(find.byType(TextButton));
     await tester.pumpAndSettle();
 
-    // From the entries list and from the chart
-    expect(find.text('9/10/2022'), findsWidgets);
-    expect(find.text('10/5/2022'), findsWidgets);
+    // From the entries list, which shows the newest first
+    expect(find.text('11/15/2022'), findsWidgets);
+    expect(find.text('11/10/2022'), findsWidgets);
   });
 
   testWidgets('Tests the localization of dates - DE', (WidgetTester tester) async {
@@ -102,8 +178,8 @@ void main() {
     await tester.tap(find.byType(TextButton));
     await tester.pumpAndSettle();
 
-    // From the entries list and from the chart
-    expect(find.text('10.9.2022'), findsWidgets);
-    expect(find.text('5.10.2022'), findsWidgets);
+    // From the entries list, which shows the newest first
+    expect(find.text('15.11.2022'), findsWidgets);
+    expect(find.text('10.11.2022'), findsWidgets);
   });
 }
diff --git a/test/features/measurements/screens/measurement_entries_screen_test.mocks.dart b/test/features/measurements/screens/measurement_entries_screen_test.mocks.dart
index 8612dcbf4..4050a77fd 100644
--- a/test/features/measurements/screens/measurement_entries_screen_test.mocks.dart
+++ b/test/features/measurements/screens/measurement_entries_screen_test.mocks.dart
@@ -6,18 +6,19 @@
 import 'dart:async' as _i3;
 
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:wger/core/search_options.dart' as _i14;
+import 'package:wger/core/search_options.dart' as _i15;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i6;
 import 'package:wger/features/measurements/models/measurement_category.dart' as _i4;
 import 'package:wger/features/measurements/models/measurement_entry.dart' as _i5;
 import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i2;
-import 'package:wger/features/nutrition/models/ingredient.dart' as _i12;
-import 'package:wger/features/nutrition/models/ingredient_filters.dart' as _i13;
-import 'package:wger/features/nutrition/models/log.dart' as _i10;
-import 'package:wger/features/nutrition/models/meal.dart' as _i8;
-import 'package:wger/features/nutrition/models/meal_item.dart' as _i9;
-import 'package:wger/features/nutrition/models/nutritional_plan.dart' as _i7;
-import 'package:wger/features/nutrition/providers/ingredient_repository.dart' as _i11;
-import 'package:wger/features/nutrition/providers/nutrition_repository.dart' as _i6;
+import 'package:wger/features/nutrition/models/ingredient.dart' as _i13;
+import 'package:wger/features/nutrition/models/ingredient_filters.dart' as _i14;
+import 'package:wger/features/nutrition/models/log.dart' as _i11;
+import 'package:wger/features/nutrition/models/meal.dart' as _i9;
+import 'package:wger/features/nutrition/models/meal_item.dart' as _i10;
+import 'package:wger/features/nutrition/models/nutritional_plan.dart' as _i8;
+import 'package:wger/features/nutrition/providers/ingredient_repository.dart' as _i12;
+import 'package:wger/features/nutrition/providers/nutrition_repository.dart' as _i7;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -43,23 +44,163 @@ class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepos
   }
 
   @override
-  _i3.Stream<List<_i4.MeasurementCategory>> watchAll() =>
+  _i3.Stream<List<_i4.MeasurementCategory>> watchAllWithoutEntries() =>
       (super.noSuchMethod(
-            Invocation.method(#watchAll, []),
+            Invocation.method(#watchAllWithoutEntries, []),
             returnValue: _i3.Stream<List<_i4.MeasurementCategory>>.empty(),
           )
           as _i3.Stream<List<_i4.MeasurementCategory>>);
 
   @override
-  _i3.Stream<_i4.MeasurementCategory?> watchLocalDriftCategoryById(
+  _i3.Stream<_i4.MeasurementCategory?> watchCategoryWithoutEntries(
     String? id,
   ) =>
       (super.noSuchMethod(
-            Invocation.method(#watchLocalDriftCategoryById, [id]),
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
             returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
           )
           as _i3.Stream<_i4.MeasurementCategory?>);
 
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<Map<String, _i5.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i3.Stream<Map<String, _i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementBucket>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementBucket>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementValueCount>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementValueCount>>);
+
+  @override
+  _i3.Future<List<_i4.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i3.Future<List<_i4.MeasurementCategory>>.value(
+              <_i4.MeasurementCategory>[],
+            ),
+          )
+          as _i3.Future<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
+
+  @override
+  _i3.Future<Map<String, _i5.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i3.Future<Map<String, _i5.MeasurementEntry>>.value(
+              <String, _i5.MeasurementEntry>{},
+            ),
+          )
+          as _i3.Future<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
   @override
   _i3.Future<void> deleteLocalDrift(String? id) =>
       (super.noSuchMethod(
@@ -87,6 +228,17 @@ class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepos
           )
           as _i3.Future<void>);
 
+  @override
+  _i3.Future<void> addLocalDriftGroupEntries(
+    List<_i5.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
   @override
   _i3.Future<void> deleteLocalDriftCategory(String? id) =>
       (super.noSuchMethod(
@@ -115,26 +267,46 @@ class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepos
             returnValueForMissingStub: _i3.Future<void>.value(),
           )
           as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategoryGroup(
+    List<_i4.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
 }
 
 /// A class which mocks [NutritionRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNutritionRepository extends _i1.Mock implements _i6.NutritionRepository {
+class MockNutritionRepository extends _i1.Mock implements _i7.NutritionRepository {
   MockNutritionRepository() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i3.Stream<List<_i7.NutritionalPlan>> watchAllDrift() =>
+  _i3.Stream<List<_i8.NutritionalPlan>> watchAllDrift() =>
       (super.noSuchMethod(
             Invocation.method(#watchAllDrift, []),
-            returnValue: _i3.Stream<List<_i7.NutritionalPlan>>.empty(),
+            returnValue: _i3.Stream<List<_i8.NutritionalPlan>>.empty(),
           )
-          as _i3.Stream<List<_i7.NutritionalPlan>>);
+          as _i3.Stream<List<_i8.NutritionalPlan>>);
 
   @override
-  _i3.Future<void> addPlanLocalDrift(_i7.NutritionalPlan? plan) =>
+  _i3.Future<void> addPlanLocalDrift(_i8.NutritionalPlan? plan) =>
       (super.noSuchMethod(
             Invocation.method(#addPlanLocalDrift, [plan]),
             returnValue: _i3.Future<void>.value(),
@@ -143,7 +315,7 @@ class MockNutritionRepository extends _i1.Mock implements _i6.NutritionRepositor
           as _i3.Future<void>);
 
   @override
-  _i3.Future<void> editLocalDrift(_i7.NutritionalPlan? plan) =>
+  _i3.Future<void> editLocalDrift(_i8.NutritionalPlan? plan) =>
       (super.noSuchMethod(
             Invocation.method(#editLocalDrift, [plan]),
             returnValue: _i3.Future<void>.value(),
@@ -161,15 +333,15 @@ class MockNutritionRepository extends _i1.Mock implements _i6.NutritionRepositor
           as _i3.Future<void>);
 
   @override
-  _i3.Stream<List<_i8.Meal>> watchAllMealsHydrated() =>
+  _i3.Stream<List<_i9.Meal>> watchAllMealsHydrated() =>
       (super.noSuchMethod(
             Invocation.method(#watchAllMealsHydrated, []),
-            returnValue: _i3.Stream<List<_i8.Meal>>.empty(),
+            returnValue: _i3.Stream<List<_i9.Meal>>.empty(),
           )
-          as _i3.Stream<List<_i8.Meal>>);
+          as _i3.Stream<List<_i9.Meal>>);
 
   @override
-  _i3.Future<void> addMealLocalDrift(_i8.Meal? meal) =>
+  _i3.Future<void> addMealLocalDrift(_i9.Meal? meal) =>
       (super.noSuchMethod(
             Invocation.method(#addMealLocalDrift, [meal]),
             returnValue: _i3.Future<void>.value(),
@@ -178,7 +350,7 @@ class MockNutritionRepository extends _i1.Mock implements _i6.NutritionRepositor
           as _i3.Future<void>);
 
   @override
-  _i3.Future<void> editMealLocalDrift(_i8.Meal? meal) =>
+  _i3.Future<void> editMealLocalDrift(_i9.Meal? meal) =>
       (super.noSuchMethod(
             Invocation.method(#editMealLocalDrift, [meal]),
             returnValue: _i3.Future<void>.value(),
@@ -196,7 +368,7 @@ class MockNutritionRepository extends _i1.Mock implements _i6.NutritionRepositor
           as _i3.Future<void>);
 
   @override
-  _i3.Future<void> addMealItemLocalDrift(_i9.MealItem? item) =>
+  _i3.Future<void> addMealItemLocalDrift(_i10.MealItem? item) =>
       (super.noSuchMethod(
             Invocation.method(#addMealItemLocalDrift, [item]),
             returnValue: _i3.Future<void>.value(),
@@ -205,7 +377,7 @@ class MockNutritionRepository extends _i1.Mock implements _i6.NutritionRepositor
           as _i3.Future<void>);
 
   @override
-  _i3.Future<void> editMealItemLocalDrift(_i9.MealItem? item) =>
+  _i3.Future<void> editMealItemLocalDrift(_i10.MealItem? item) =>
       (super.noSuchMethod(
             Invocation.method(#editMealItemLocalDrift, [item]),
             returnValue: _i3.Future<void>.value(),
@@ -223,15 +395,15 @@ class MockNutritionRepository extends _i1.Mock implements _i6.NutritionRepositor
           as _i3.Future<void>);
 
   @override
-  _i3.Stream<List<_i10.LogItem>> watchAllLogsHydrated() =>
+  _i3.Stream<List<_i11.LogItem>> watchAllLogsHydrated() =>
       (super.noSuchMethod(
             Invocation.method(#watchAllLogsHydrated, []),
-            returnValue: _i3.Stream<List<_i10.LogItem>>.empty(),
+            returnValue: _i3.Stream<List<_i11.LogItem>>.empty(),
           )
-          as _i3.Stream<List<_i10.LogItem>>);
+          as _i3.Stream<List<_i11.LogItem>>);
 
   @override
-  _i3.Future<void> addLogLocalDrift(_i10.LogItem? log) =>
+  _i3.Future<void> addLogLocalDrift(_i11.LogItem? log) =>
       (super.noSuchMethod(
             Invocation.method(#addLogLocalDrift, [log]),
             returnValue: _i3.Future<void>.value(),
@@ -252,43 +424,43 @@ class MockNutritionRepository extends _i1.Mock implements _i6.NutritionRepositor
 /// A class which mocks [IngredientRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockIngredientRepository extends _i1.Mock implements _i11.IngredientRepository {
+class MockIngredientRepository extends _i1.Mock implements _i12.IngredientRepository {
   MockIngredientRepository() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i3.Stream<_i12.Ingredient?> watchById(int? id) =>
+  _i3.Stream<_i13.Ingredient?> watchById(int? id) =>
       (super.noSuchMethod(
             Invocation.method(#watchById, [id]),
-            returnValue: _i3.Stream<_i12.Ingredient?>.empty(),
+            returnValue: _i3.Stream<_i13.Ingredient?>.empty(),
           )
-          as _i3.Stream<_i12.Ingredient?>);
+          as _i3.Stream<_i13.Ingredient?>);
 
   @override
-  _i3.Stream<List<_i12.Ingredient>> watchAllDrift({
-    _i13.IngredientFilters? filters = const _i13.IngredientFilters(),
+  _i3.Stream<List<_i13.Ingredient>> watchAllDrift({
+    _i14.IngredientFilters? filters = const _i14.IngredientFilters(),
   }) =>
       (super.noSuchMethod(
             Invocation.method(#watchAllDrift, [], {#filters: filters}),
-            returnValue: _i3.Stream<List<_i12.Ingredient>>.empty(),
+            returnValue: _i3.Stream<List<_i13.Ingredient>>.empty(),
           )
-          as _i3.Stream<List<_i12.Ingredient>>);
+          as _i3.Stream<List<_i13.Ingredient>>);
 
   @override
-  _i3.Future<_i12.Ingredient?> getById(int? id) =>
+  _i3.Future<_i13.Ingredient?> getById(int? id) =>
       (super.noSuchMethod(
             Invocation.method(#getById, [id]),
-            returnValue: _i3.Future<_i12.Ingredient?>.value(),
+            returnValue: _i3.Future<_i13.Ingredient?>.value(),
           )
-          as _i3.Future<_i12.Ingredient?>);
+          as _i3.Future<_i13.Ingredient?>);
 
   @override
-  _i3.Future<List<_i12.Ingredient>> searchIngredientLocal(
+  _i3.Future<List<_i13.Ingredient>> searchIngredientLocal(
     String? term, {
     bool? isVegan = false,
     bool? isVegetarian = false,
-    _i12.NutriScore? nutriscoreMax,
+    _i13.NutriScore? nutriscoreMax,
     int? limit = 100,
   }) =>
       (super.noSuchMethod(
@@ -302,20 +474,20 @@ class MockIngredientRepository extends _i1.Mock implements _i11.IngredientReposi
                 #limit: limit,
               },
             ),
-            returnValue: _i3.Future<List<_i12.Ingredient>>.value(
-              <_i12.Ingredient>[],
+            returnValue: _i3.Future<List<_i13.Ingredient>>.value(
+              <_i13.Ingredient>[],
             ),
           )
-          as _i3.Future<List<_i12.Ingredient>>);
+          as _i3.Future<List<_i13.Ingredient>>);
 
   @override
-  _i3.Future<List<_i12.Ingredient>> searchIngredientServer(
+  _i3.Future<List<_i13.Ingredient>> searchIngredientServer(
     String? name, {
     String? languageCode = 'en',
-    _i14.SearchLanguage? searchLanguage = _i14.SearchLanguage.current,
+    _i15.SearchLanguage? searchLanguage = _i15.SearchLanguage.current,
     bool? isVegan = false,
     bool? isVegetarian = false,
-    _i12.NutriScore? nutriscoreMax,
+    _i13.NutriScore? nutriscoreMax,
   }) =>
       (super.noSuchMethod(
             Invocation.method(
@@ -329,21 +501,21 @@ class MockIngredientRepository extends _i1.Mock implements _i11.IngredientReposi
                 #nutriscoreMax: nutriscoreMax,
               },
             ),
-            returnValue: _i3.Future<List<_i12.Ingredient>>.value(
-              <_i12.Ingredient>[],
+            returnValue: _i3.Future<List<_i13.Ingredient>>.value(
+              <_i13.Ingredient>[],
             ),
           )
-          as _i3.Future<List<_i12.Ingredient>>);
+          as _i3.Future<List<_i13.Ingredient>>);
 
   @override
-  _i3.Future<List<_i12.Ingredient>> search(
+  _i3.Future<List<_i13.Ingredient>> search(
     String? name, {
     required bool? isOnline,
     String? languageCode = 'en',
-    _i14.SearchLanguage? searchLanguage = _i14.SearchLanguage.current,
+    _i15.SearchLanguage? searchLanguage = _i15.SearchLanguage.current,
     bool? isVegan = false,
     bool? isVegetarian = false,
-    _i12.NutriScore? nutriscoreMax,
+    _i13.NutriScore? nutriscoreMax,
   }) =>
       (super.noSuchMethod(
             Invocation.method(
@@ -358,17 +530,17 @@ class MockIngredientRepository extends _i1.Mock implements _i11.IngredientReposi
                 #nutriscoreMax: nutriscoreMax,
               },
             ),
-            returnValue: _i3.Future<List<_i12.Ingredient>>.value(
-              <_i12.Ingredient>[],
+            returnValue: _i3.Future<List<_i13.Ingredient>>.value(
+              <_i13.Ingredient>[],
             ),
           )
-          as _i3.Future<List<_i12.Ingredient>>);
+          as _i3.Future<List<_i13.Ingredient>>);
 
   @override
-  _i3.Future<_i12.Ingredient?> searchIngredientByBarcode(String? barcode) =>
+  _i3.Future<_i13.Ingredient?> searchIngredientByBarcode(String? barcode) =>
       (super.noSuchMethod(
             Invocation.method(#searchIngredientByBarcode, [barcode]),
-            returnValue: _i3.Future<_i12.Ingredient?>.value(),
+            returnValue: _i3.Future<_i13.Ingredient?>.value(),
           )
-          as _i3.Future<_i12.Ingredient?>);
+          as _i3.Future<_i13.Ingredient?>);
 }
diff --git a/test/features/measurements/screens/weight_screen_test.dart b/test/features/measurements/screens/weight_screen_test.dart
new file mode 100644
index 000000000..e6e67ede3
--- /dev/null
+++ b/test/features/measurements/screens/weight_screen_test.dart
@@ -0,0 +1,261 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+import 'package:wger/core/app_settings_notifier.dart';
+import 'package:wger/core/form_screen.dart';
+import 'package:wger/features/account/providers/user_profile_repository.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+import 'package:wger/features/measurements/screens/weight_screen.dart';
+import 'package:wger/features/measurements/widgets/chart_range_selector.dart';
+import 'package:wger/features/measurements/widgets/charts.dart';
+import 'package:wger/features/measurements/widgets/weight_form.dart';
+import 'package:wger/features/nutrition/providers/ingredient_repository.dart';
+import 'package:wger/features/nutrition/providers/nutrition_repository.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../../test_data/body_weight.dart';
+import '../../../../test_data/profile.dart';
+import '../../../helpers/measurement_chart_buckets.dart';
+import '../../../helpers/measurement_repository_stubs.dart';
+import 'weight_screen_test.mocks.dart';
+
+@GenerateMocks([
+  NutritionRepository,
+  IngredientRepository,
+  MeasurementRepository,
+  UserProfileRepository,
+])
+void main() {
+  late MockNutritionRepository mockNutritionRepo;
+  late MockIngredientRepository mockIngredientRepo;
+  late MockUserProfileRepository mockUserProfileRepository;
+  late MockMeasurementRepository mockMeasurementRepository;
+
+  /// The entries seeded for the official category, which no longer carries them
+  late Map<String, List<MeasurementEntry>> entries;
+
+  setUp(() {
+    // The shared chart range hydrates from SharedPreferences on first read
+    SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
+    mockNutritionRepo = MockNutritionRepository();
+    mockIngredientRepo = MockIngredientRepository();
+    when(mockIngredientRepo.getById(any)).thenAnswer((_) async => null);
+
+    mockUserProfileRepository = MockUserProfileRepository();
+    when(
+      mockUserProfileRepository.watchDrift(),
+    ).thenAnswer((_) => Stream.value(tUserProfile1));
+
+    mockMeasurementRepository = MockMeasurementRepository();
+    entries = bodyWeightEntries();
+    stubMeasurementReads(mockMeasurementRepository, [getBodyWeightCategory()], entries);
+    when(
+      mockMeasurementRepository.deleteLocalDrift(any),
+    ).thenAnswer((_) async => Future.value());
+  });
+
+  Widget createWeightScreen({locale = 'en'}) {
+    return ProviderScope(
+      overrides: [
+        measurementRepositoryProvider.overrideWithValue(mockMeasurementRepository),
+        // A fresh accessor per test: the app-wide singleton keeps the
+        // in-memory store of the first test alive across the file
+        appSettingsPrefsProvider.overrideWithValue(SharedPreferencesAsync()),
+        // The chart reads its points from the aggregated query
+        measurementChartBucketsProvider.overrideWith(chartBucketsFrom(entries)),
+        userProfileRepositoryProvider.overrideWithValue(mockUserProfileRepository),
+        nutritionRepositoryProvider.overrideWithValue(mockNutritionRepo),
+        ingredientRepositoryProvider.overrideWithValue(mockIngredientRepo),
+      ],
+      child: MaterialApp(
+        locale: Locale(locale),
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: const WeightScreen(),
+        routes: {FormScreen.routeName: (_) => const FormScreen()},
+      ),
+    );
+  }
+
+  testWidgets('Test the widgets on the body weight screen', (WidgetTester tester) async {
+    await tester.pumpWidget(createWeightScreen());
+    await tester.pumpAndSettle();
+
+    expect(find.text('Weight'), findsOneWidget);
+    expect(find.byType(Card), findsNWidgets(2));
+    expect(find.byType(ListTile), findsNWidgets(2));
+
+    // The seeded entries are from 2021, so they only show in the full history
+    await tester.ensureVisible(find.text('All'));
+    await tester.tap(find.text('All'));
+    await tester.pumpAndSettle();
+    expect(find.byType(MeasurementChartWidgetFl), findsOneWidget);
+  });
+
+  testWidgets('Weight chart range selector filters the data', (WidgetTester tester) async {
+    await tester.pumpWidget(createWeightScreen());
+    await tester.pumpAndSettle();
+
+    // The range selector is shown with the three options
+    expect(find.byType(ChartRangeSelector), findsOneWidget);
+    expect(find.text('All'), findsOneWidget);
+    expect(find.text('1 year'), findsOneWidget);
+    expect(find.text('3 months'), findsOneWidget);
+
+    // The default range excludes the (old) seeded data
+    expect(find.byType(MeasurementChartWidgetFl), findsNothing);
+    expect(find.text('No data available'), findsOneWidget);
+
+    // Switching to all time shows the chart
+    await tester.ensureVisible(find.text('All'));
+    await tester.tap(find.text('All'));
+    await tester.pumpAndSettle();
+    expect(find.byType(MeasurementChartWidgetFl), findsOneWidget);
+
+    // and back again
+    await tester.ensureVisible(find.text('3 months'));
+    await tester.tap(find.text('3 months'));
+    await tester.pumpAndSettle();
+    expect(find.byType(MeasurementChartWidgetFl), findsNothing);
+  });
+
+  testWidgets('the category is read once, whatever range is picked', (WidgetTester tester) async {
+    // The range drives the aggregated queries; the category itself carries no
+    // entries, so switching must not re-read it
+    await tester.pumpWidget(createWeightScreen());
+    await tester.pumpAndSettle();
+    verify(mockMeasurementRepository.watchOfficialBodyWeightCategory()).called(1);
+
+    await tester.ensureVisible(find.text('All'));
+    await tester.tap(find.text('All'));
+    await tester.pumpAndSettle();
+
+    verifyNever(mockMeasurementRepository.watchOfficialBodyWeightCategory());
+  });
+
+  testWidgets('Test deleting an item using the Delete button', (WidgetTester tester) async {
+    // Arrange
+    await tester.pumpWidget(createWeightScreen());
+    await tester.pumpAndSettle();
+
+    // Act
+    expect(find.byType(ListTile), findsNWidgets(2));
+    await tester.tap(find.byTooltip('Show menu').first);
+    await tester.pumpAndSettle();
+
+    // Assert
+    await tester.tap(find.text('Delete'));
+    await tester.pumpAndSettle();
+
+    // We would delete the entry from the DB (the newest entry is listed first)
+    verify(mockMeasurementRepository.deleteLocalDrift('2')).called(1);
+  });
+
+  testWidgets('Test the form on the body weight screen', (WidgetTester tester) async {
+    await tester.pumpWidget(createWeightScreen());
+    await tester.pumpAndSettle();
+
+    expect(find.byType(WeightForm), findsNothing);
+    await tester.tap(find.byType(FloatingActionButton));
+    await tester.pumpAndSettle();
+    expect(find.byType(WeightForm), findsOneWidget);
+  });
+
+  testWidgets('Converts mixed-unit entries to the profile unit', (WidgetTester tester) async {
+    // 176.4 lb convert to 80.01 kg for the metric profile; the kg entry stays
+    entries = bodyWeightEntries([testWeightEntryLb, testWeightEntry1]);
+    stubMeasurementReads(mockMeasurementRepository, [getBodyWeightCategory()], entries);
+
+    await tester.pumpWidget(createWeightScreen());
+    await tester.pumpAndSettle();
+
+    // The converted value can also appear in the chart labels, so only the
+    // absence of the raw lb value is asserted strictly
+    expect(find.text('80.01 kg'), findsWidgets);
+    expect(find.text('80 kg'), findsWidgets);
+    expect(find.text('176.4 lb'), findsNothing);
+    expect(find.textContaining('176.4'), findsNothing);
+  });
+
+  testWidgets('Imported entries show a badge instead of the edit menu', (
+    WidgetTester tester,
+  ) async {
+    final imported = MeasurementEntry(
+      id: 'imp',
+      categoryId: testBodyWeightCategoryId,
+      value: 80.5,
+      date: DateTime.utc(2021, 02, 01, 9, 0),
+      notes: '',
+      source: 'apple',
+      externalId: 'w-1',
+    );
+    entries = bodyWeightEntries([imported, testWeightEntry1]);
+    stubMeasurementReads(mockMeasurementRepository, [getBodyWeightCategory()], entries);
+
+    await tester.pumpWidget(createWeightScreen());
+    await tester.pumpAndSettle();
+
+    // Only the manual entry has the menu, the imported one carries the badge
+    expect(find.byTooltip('Show menu'), findsOneWidget);
+    expect(find.byIcon(Icons.monitor_heart_outlined), findsOneWidget);
+  });
+
+  testWidgets('No FAB while the official category has not been synced', (
+    WidgetTester tester,
+  ) async {
+    when(
+      mockMeasurementRepository.watchOfficialBodyWeightCategory(),
+    ).thenAnswer((_) => Stream.value(null));
+
+    await tester.pumpWidget(createWeightScreen());
+    // No pumpAndSettle: the overview shows an endless spinner in this state
+    await tester.pump();
+    await tester.pump();
+
+    expect(find.byType(FloatingActionButton), findsNothing);
+  });
+
+  // The chart axis titles are not asserted: with this few points they are
+  // suppressed to avoid overlapping labels. The entry list carries the same
+  // dates and is stable to assert on.
+  testWidgets('Tests the localization of dates - EN', (WidgetTester tester) async {
+    await tester.pumpWidget(createWeightScreen());
+    await tester.pumpAndSettle();
+
+    expect(find.text('1/1/2021'), findsOneWidget);
+    expect(find.text('1/10/2021'), findsOneWidget);
+  });
+
+  testWidgets('Tests the localization of dates - DE', (WidgetTester tester) async {
+    await tester.pumpWidget(createWeightScreen(locale: 'de'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('1.1.2021'), findsOneWidget);
+    expect(find.text('10.1.2021'), findsOneWidget);
+  });
+}
diff --git a/test/features/weight/screens/weight_screen_test.mocks.dart b/test/features/measurements/screens/weight_screen_test.mocks.dart
similarity index 57%
rename from test/features/weight/screens/weight_screen_test.mocks.dart
rename to test/features/measurements/screens/weight_screen_test.mocks.dart
index da87a606f..ad1ac704d 100644
--- a/test/features/weight/screens/weight_screen_test.mocks.dart
+++ b/test/features/measurements/screens/weight_screen_test.mocks.dart
@@ -1,5 +1,5 @@
 // Mocks generated by Mockito 5.4.6 from annotations
-// in wger/test/features/weight/screens/weight_screen_test.dart.
+// in wger/test/features/measurements/screens/weight_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
@@ -7,8 +7,12 @@ import 'dart:async' as _i3;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:wger/core/search_options.dart' as _i11;
-import 'package:wger/features/account/models/user_profile.dart' as _i15;
-import 'package:wger/features/account/providers/user_profile_repository.dart' as _i14;
+import 'package:wger/features/account/models/user_profile.dart' as _i17;
+import 'package:wger/features/account/providers/user_profile_repository.dart' as _i16;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i15;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i13;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i14;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i12;
 import 'package:wger/features/nutrition/models/ingredient.dart' as _i9;
 import 'package:wger/features/nutrition/models/ingredient_filters.dart' as _i10;
 import 'package:wger/features/nutrition/models/log.dart' as _i7;
@@ -17,8 +21,6 @@ import 'package:wger/features/nutrition/models/meal_item.dart' as _i6;
 import 'package:wger/features/nutrition/models/nutritional_plan.dart' as _i4;
 import 'package:wger/features/nutrition/providers/ingredient_repository.dart' as _i8;
 import 'package:wger/features/nutrition/providers/nutrition_repository.dart' as _i2;
-import 'package:wger/features/weight/models/weight_entry.dart' as _i13;
-import 'package:wger/features/weight/providers/body_weight_repository.dart' as _i12;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -291,21 +293,171 @@ class MockIngredientRepository extends _i1.Mock implements _i8.IngredientReposit
           as _i3.Future<_i9.Ingredient?>);
 }
 
-/// A class which mocks [BodyWeightRepository].
+/// A class which mocks [MeasurementRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBodyWeightRepository extends _i1.Mock implements _i12.BodyWeightRepository {
-  MockBodyWeightRepository() {
+class MockMeasurementRepository extends _i1.Mock implements _i12.MeasurementRepository {
+  MockMeasurementRepository() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i3.Stream<List<_i13.WeightEntry>> watchAllDrift() =>
+  _i3.Stream<List<_i13.MeasurementCategory>> watchAllWithoutEntries() =>
       (super.noSuchMethod(
-            Invocation.method(#watchAllDrift, []),
-            returnValue: _i3.Stream<List<_i13.WeightEntry>>.empty(),
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i3.Stream<List<_i13.MeasurementCategory>>.empty(),
+          )
+          as _i3.Stream<List<_i13.MeasurementCategory>>);
+
+  @override
+  _i3.Stream<_i13.MeasurementCategory?> watchCategoryWithoutEntries(
+    String? id,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
+            returnValue: _i3.Stream<_i13.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i13.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<_i13.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i3.Stream<_i13.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i13.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<List<_i14.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i14.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i14.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i14.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i14.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i14.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<Map<String, _i14.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i3.Stream<Map<String, _i14.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<Map<String, _i14.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i15.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i15.MeasurementBucketLevel? level = _i15.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i3.Stream<List<_i15.MeasurementBucket>>.empty(),
+          )
+          as _i3.Stream<List<_i15.MeasurementBucket>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i15.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i15.MeasurementBucketLevel? level = _i15.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i3.Stream<Map<String, List<_i15.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i15.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i15.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i3.Stream<Map<String, List<_i15.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i15.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<List<_i15.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i3.Stream<List<_i15.MeasurementValueCount>>.empty(),
+          )
+          as _i3.Stream<List<_i15.MeasurementValueCount>>);
+
+  @override
+  _i3.Future<List<_i13.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i3.Future<List<_i13.MeasurementCategory>>.value(
+              <_i13.MeasurementCategory>[],
+            ),
           )
-          as _i3.Stream<List<_i13.WeightEntry>>);
+          as _i3.Future<List<_i13.MeasurementCategory>>);
+
+  @override
+  _i3.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
+
+  @override
+  _i3.Future<Map<String, _i14.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i3.Future<Map<String, _i14.MeasurementEntry>>.value(
+              <String, _i14.MeasurementEntry>{},
+            ),
+          )
+          as _i3.Future<Map<String, _i14.MeasurementEntry>>);
+
+  @override
+  _i3.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
 
   @override
   _i3.Future<void> deleteLocalDrift(String? id) =>
@@ -317,7 +469,7 @@ class MockBodyWeightRepository extends _i1.Mock implements _i12.BodyWeightReposi
           as _i3.Future<void>);
 
   @override
-  _i3.Future<void> updateLocalDrift(_i13.WeightEntry? entry) =>
+  _i3.Future<void> updateLocalDrift(_i14.MeasurementEntry? entry) =>
       (super.noSuchMethod(
             Invocation.method(#updateLocalDrift, [entry]),
             returnValue: _i3.Future<void>.value(),
@@ -326,33 +478,93 @@ class MockBodyWeightRepository extends _i1.Mock implements _i12.BodyWeightReposi
           as _i3.Future<void>);
 
   @override
-  _i3.Future<void> addLocalDrift(_i13.WeightEntry? entry) =>
+  _i3.Future<void> addLocalDrift(_i14.MeasurementEntry? entry) =>
       (super.noSuchMethod(
             Invocation.method(#addLocalDrift, [entry]),
             returnValue: _i3.Future<void>.value(),
             returnValueForMissingStub: _i3.Future<void>.value(),
           )
           as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftGroupEntries(
+    List<_i14.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteLocalDriftCategory(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDriftCategory, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDriftCategory(
+    _i13.MeasurementCategory? category,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategory(_i13.MeasurementCategory? category) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategoryGroup(
+    List<_i13.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
 }
 
 /// A class which mocks [UserProfileRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockUserProfileRepository extends _i1.Mock implements _i14.UserProfileRepository {
+class MockUserProfileRepository extends _i1.Mock implements _i16.UserProfileRepository {
   MockUserProfileRepository() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i3.Stream<_i15.UserProfile?> watchDrift() =>
+  _i3.Stream<_i17.UserProfile?> watchDrift() =>
       (super.noSuchMethod(
             Invocation.method(#watchDrift, []),
-            returnValue: _i3.Stream<_i15.UserProfile?>.empty(),
+            returnValue: _i3.Stream<_i17.UserProfile?>.empty(),
           )
-          as _i3.Stream<_i15.UserProfile?>);
+          as _i3.Stream<_i17.UserProfile?>);
 
   @override
-  _i3.Future<void> editLocalDrift(_i15.UserProfile? profile) =>
+  _i3.Future<void> editLocalDrift(_i17.UserProfile? profile) =>
       (super.noSuchMethod(
             Invocation.method(#editLocalDrift, [profile]),
             returnValue: _i3.Future<void>.value(),
diff --git a/test/features/measurements/widgets/categories_card_test.dart b/test/features/measurements/widgets/categories_card_test.dart
new file mode 100644
index 000000000..919eb490e
--- /dev/null
+++ b/test/features/measurements/widgets/categories_card_test.dart
@@ -0,0 +1,326 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:fl_chart/fl_chart.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/features/measurements/charts/range.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.dart';
+import 'package:wger/features/measurements/widgets/categories_card.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../../test_data/measurements.dart';
+import '../../../helpers/measurement_chart_buckets.dart';
+
+/// A category and the entries it holds, which it no longer carries itself.
+typedef _Seed = ({MeasurementCategory category, Map<String, List<MeasurementEntry>> entries});
+
+Widget _wrap(
+  Widget child, {
+  Map<String, MeasurementEntry> latest = const {},
+  List<MeasurementCategory> categories = const [],
+  Map<String, List<MeasurementEntry>> entries = const {},
+}) => ProviderScope(
+  overrides: [
+    // The component rows read their last known value from its own query
+    latestMeasurementEntriesProvider.overrideWith((ref) => Stream.value(latest)),
+    // The chart reads its points from the aggregated query
+    measurementChartBucketsProvider.overrideWith(chartBucketsFrom(entries)),
+    measurementGroupBucketsProvider.overrideWith(groupBucketsFrom(categories, entries)),
+  ],
+  child: MaterialApp(
+    localizationsDelegates: AppLocalizations.localizationsDelegates,
+    supportedLocales: AppLocalizations.supportedLocales,
+    home: Scaffold(body: child),
+  ),
+);
+
+/// The newest entry per category, i.e. what the query behind the rows returns
+Map<String, MeasurementEntry> _latestOf(Map<String, List<MeasurementEntry>> entries) => {
+  for (final MapEntry(key: id, value: ofCategory) in entries.entries)
+    if (ofCategory.isNotEmpty) id: ofCategory.first,
+};
+
+/// The fixtures have fixed dates, so the card charts the full history instead
+/// of the range it defaults to
+Widget _card(_Seed seed) => _wrap(
+  CategoriesCard(seed.category, range: ChartRange.all),
+  latest: _latestOf(seed.entries),
+  categories: [seed.category],
+  entries: seed.entries,
+);
+
+_Seed _bpGroup({bool withEntries = false}) => (
+  category: testMeasurementCategoryBloodPressure,
+  entries: withEntries ? getBloodPressureEntries() : const {},
+);
+
+/// A group with three components, which cannot be read as a low/high range
+_Seed _tripleGroup() {
+  final children = [
+    for (var i = 0; i < 3; i++)
+      MeasurementCategory(
+        id: 'c$i',
+        name: 'Component $i',
+        unit: 'mmHg',
+        parentId: 'bp',
+        order: i,
+      ),
+  ];
+
+  return (
+    category: testMeasurementCategoryBloodPressure.copyWith(children: children),
+    entries: {
+      for (final (i, child) in children.indexed)
+        child.id!: [
+          MeasurementEntry(
+            id: 'e$i',
+            categoryId: child.id!,
+            date: DateTime(2026, 1, 1),
+            value: 100 + i * 10,
+            notes: '',
+          ),
+        ],
+    },
+  );
+}
+
+/// A sleep group: the total plus two stages, all on the same night
+_Seed _sleepGroup() {
+  MeasurementCategory child(String id, String name, MetricType type, int order) =>
+      MeasurementCategory(
+        id: id,
+        name: name,
+        unit: 'min',
+        metricType: type,
+        parentId: 'sleep',
+        order: order,
+      );
+
+  MeasurementEntry reading(String id, num value) => MeasurementEntry(
+    id: 'e-$id',
+    categoryId: id,
+    date: DateTime(2026, 1, 2),
+    value: value,
+    notes: '',
+  );
+
+  return (
+    category: MeasurementCategory(
+      id: 'sleep',
+      name: 'Sleep',
+      unit: 'min',
+      metricType: MetricType.sleep,
+      children: [
+        child('total', 'Total sleep', MetricType.sleepTotal, 0),
+        child('deep', 'Deep sleep', MetricType.sleepDeep, 1),
+        child('rem', 'REM sleep', MetricType.sleepRem, 2),
+      ],
+    ),
+    entries: {
+      'total': [reading('total', 480)],
+      'deep': [reading('deep', 90)],
+      'rem': [reading('rem', 60)],
+    },
+  );
+}
+
+void main() {
+  group('CategoriesCard group card', () {
+    testWidgets('shows one ListTile per child with latest reading', (tester) async {
+      await tester.pumpWidget(_card(_bpGroup(withEntries: true)));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(ListTile), findsNWidgets(2));
+      expect(find.textContaining('120'), findsOneWidget);
+      expect(find.textContaining('80'), findsOneWidget);
+    });
+
+    testWidgets('shows dash when child has no entries', (tester) async {
+      await tester.pumpWidget(_card(_bpGroup(withEntries: false)));
+      await tester.pumpAndSettle();
+
+      // Text('—') should appear for both children
+      expect(find.text('—'), findsNWidgets(2));
+    });
+
+    testWidgets('draws a reading as one bar spanning its components', (tester) async {
+      await tester.pumpWidget(_card(_bpGroup(withEntries: true)));
+      await tester.pumpAndSettle();
+
+      // One event, one bar: no line claiming values between two readings
+      expect(find.byType(LineChart), findsNothing);
+      final groups = tester.widget<BarChart>(find.byType(BarChart)).data.barGroups;
+      expect(groups, hasLength(1));
+
+      final rod = groups.single.barRods.single;
+      expect(rod.fromY, 80); // diastolic
+      expect(rod.toY, 120); // systolic
+    });
+
+    testWidgets('a range needs no per-component colour dots', (tester) async {
+      await tester.pumpWidget(_card(_bpGroup(withEntries: true)));
+      await tester.pumpAndSettle();
+
+      // The ends of the bar say which is which
+      expect(
+        tester.widgetList<ListTile>(find.byType(ListTile)).every((t) => t.leading == null),
+        isTrue,
+      );
+    });
+
+    testWidgets('falls back to lines when the readings are not paired', (tester) async {
+      // Editing the date of one half pulls a reading apart, and there is then
+      // no range to draw. The card must still show the data it has instead of
+      // going blank.
+      final group = (
+        category: testMeasurementCategoryBloodPressure,
+        entries: {
+          'sys': [testNeasurementEntry9],
+          'dia': [testNeasurementEntry10.copyWith(date: DateTime(2026, 1, 1, 9, 30))],
+        },
+      );
+
+      await tester.pumpWidget(_card(group));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(BarChart), findsNothing);
+      final data = tester.widget<LineChart>(find.byType(LineChart)).data;
+      expect(data.lineBarsData, hasLength(2));
+    });
+
+    testWidgets('renders no chart while no component has readings', (tester) async {
+      await tester.pumpWidget(_card(_bpGroup(withEntries: false)));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(BarChart), findsNothing);
+      expect(find.byType(LineChart), findsNothing);
+    });
+
+    testWidgets('a group of three keeps one line per component', (tester) async {
+      // Only two components form a low/high range; more stay separate lines
+      await tester.pumpWidget(_card(_tripleGroup()));
+      await tester.pumpAndSettle();
+
+      final data = tester.widget<LineChart>(find.byType(LineChart)).data;
+      expect(data.lineBarsData, hasLength(3));
+
+      final lineColors = data.lineBarsData.map((b) => b.color).toList();
+      final dotColors = tester
+          .widgetList<ListTile>(find.byType(ListTile))
+          .map((t) => ((t.leading! as Container).decoration! as BoxDecoration).color)
+          .toList();
+      expect(dotColors, lineColors);
+    });
+
+    testWidgets('add icon button is present on group card', (tester) async {
+      await tester.pumpWidget(_card(_bpGroup()));
+      await tester.pumpAndSettle();
+
+      expect(find.byIcon(Icons.add), findsOneWidget);
+    });
+
+    testWidgets('the group itself can be opened, like any other category', (tester) async {
+      await tester.pumpWidget(_card(_bpGroup(withEntries: true)));
+      await tester.pumpAndSettle();
+
+      expect(find.text('Go to detail page'), findsOneWidget);
+    });
+
+    testWidgets('sleep stacks its stages into one bar per night', (tester) async {
+      await tester.pumpWidget(_card(_sleepGroup()));
+      await tester.pumpAndSettle();
+
+      final groups = tester.widget<BarChart>(find.byType(BarChart)).data.barGroups;
+      expect(groups, hasLength(1));
+
+      // The stages stack, the total does not: it already covers them
+      final rod = groups.single.barRods.single;
+      expect(rod.rodStackItems.map((s) => s.toY - s.fromY), [90, 60]);
+      expect(rod.toY, 150);
+    });
+
+    testWidgets('a duration row reads h:mm, not minutes', (tester) async {
+      await tester.pumpWidget(_card(_sleepGroup()));
+      await tester.pumpAndSettle();
+
+      expect(find.text('8:00 h'), findsOneWidget);
+      expect(find.text('1:30 h'), findsOneWidget);
+    });
+
+    testWidgets('the roll-up row gets no colour dot', (tester) async {
+      await tester.pumpWidget(_card(_sleepGroup()));
+      await tester.pumpAndSettle();
+
+      // Total sleep is no segment of the stack, so no colour identifies it
+      final tiles = tester.widgetList<ListTile>(find.byType(ListTile)).toList();
+      expect(tiles.first.leading, isNull);
+      expect(tiles.skip(1).every((t) => t.leading != null), isTrue);
+    });
+  });
+
+  group('CategoriesCard daily aggregates', () {
+    /// A heart rate category as the importer stores it: one entry per day
+    /// holding the day's average, with the range it summarises in extra_data.
+    _Seed heartRate({bool withRange = true}) => (
+      category: MeasurementCategory(
+        id: 'hr',
+        name: 'Heart rate',
+        unit: 'bpm',
+        metricType: MetricType.heartRate,
+      ),
+      entries: {
+        'hr': [
+          for (var day = 1; day <= 3; day++)
+            MeasurementEntry(
+              id: 'e$day',
+              categoryId: 'hr',
+              date: DateTime(2026, 1, day),
+              value: 60 + day,
+              notes: '',
+              source: 'apple',
+              extraData: withRange ? {'min': 50 + day, 'max': 90 + day} : const {},
+            ),
+        ],
+      },
+    );
+
+    testWidgets('draws the summarised range as a band around the line', (tester) async {
+      await tester.pumpWidget(_card(heartRate()));
+      await tester.pumpAndSettle();
+
+      final data = tester.widget<LineChart>(find.byType(LineChart)).data;
+      expect(data.betweenBarsData, hasLength(1));
+      // the bounds come from extra_data, the line they wrap from the values
+      final bounds = data.betweenBarsData.single;
+      expect(data.lineBarsData[bounds.fromIndex].spots.map((s) => s.y), [51, 52, 53]);
+      expect(data.lineBarsData[bounds.toIndex].spots.map((s) => s.y), [91, 92, 93]);
+      expect(data.lineBarsData[bounds.toIndex + 1].spots.map((s) => s.y), [61, 62, 63]);
+    });
+
+    testWidgets('plain entries get no band', (tester) async {
+      await tester.pumpWidget(_card(heartRate(withRange: false)));
+      await tester.pumpAndSettle();
+
+      expect(tester.widget<LineChart>(find.byType(LineChart)).data.betweenBarsData, isEmpty);
+    });
+  });
+}
diff --git a/test/features/measurements/widgets/categories_test.dart b/test/features/measurements/widgets/categories_test.dart
new file mode 100644
index 000000000..5c7e1ab86
--- /dev/null
+++ b/test/features/measurements/widgets/categories_test.dart
@@ -0,0 +1,153 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+import 'package:wger/core/app_settings_notifier.dart';
+import 'package:wger/features/account/providers/user_profile_repository.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+import 'package:wger/features/measurements/widgets/categories.dart';
+import 'package:wger/features/measurements/widgets/categories_card.dart';
+import 'package:wger/features/measurements/widgets/measurement_tile.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../../test_data/body_weight.dart';
+import '../../../../test_data/measurements.dart';
+import '../../../../test_data/profile.dart';
+import '../../../helpers/measurement_chart_buckets.dart';
+import '../../../helpers/measurement_repository_stubs.dart';
+import 'categories_test.mocks.dart';
+
+Widget _wrap(
+  MockMeasurementRepository mockRepo, {
+  List<MeasurementCategory> categories = const [],
+  Map<String, List<MeasurementEntry>> entries = const {},
+}) {
+  // The weight card needs the display unit, so it only appears once the
+  // profile is there
+  final mockProfileRepo = MockUserProfileRepository();
+  when(mockProfileRepo.watchDrift()).thenAnswer((_) => Stream.value(tUserProfile1));
+
+  return ProviderScope(
+    overrides: [
+      measurementRepositoryProvider.overrideWithValue(mockRepo),
+      userProfileRepositoryProvider.overrideWithValue(mockProfileRepo),
+      // A fresh accessor per test: the app-wide singleton keeps the
+      // in-memory store of the first test alive across the file
+      appSettingsPrefsProvider.overrideWithValue(SharedPreferencesAsync()),
+      // The cards read their chart points from the aggregated queries
+      measurementChartBucketsProvider.overrideWith(chartBucketsFrom(entries)),
+      measurementGroupBucketsProvider.overrideWith(groupBucketsFrom(categories, entries)),
+    ],
+    child: const MaterialApp(
+      localizationsDelegates: AppLocalizations.localizationsDelegates,
+      supportedLocales: AppLocalizations.supportedLocales,
+      home: Scaffold(body: CategoriesList()),
+    ),
+  );
+}
+
+@GenerateMocks([MeasurementRepository, UserProfileRepository])
+void main() {
+  late MockMeasurementRepository mockRepo;
+
+  setUp(() {
+    // The shared chart range hydrates from SharedPreferences on first read
+    SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
+    mockRepo = MockMeasurementRepository();
+  });
+
+  group('CategoriesList', () {
+    testWidgets('two top-level categories render two grid tiles', (tester) async {
+      stubMeasurementReads(mockRepo, getMeasurementCategories(), getMeasurementEntries());
+
+      await tester.pumpWidget(
+        _wrap(
+          mockRepo,
+          categories: getMeasurementCategories(),
+          entries: getMeasurementEntries(),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.byType(MeasurementTile), findsNWidgets(2));
+    });
+
+    testWidgets('children of multi-value groups are not rendered as own tiles', (
+      tester,
+    ) async {
+      // Only 'bp' should produce a tile; the components live behind it.
+      stubMeasurementReads(mockRepo, getBloodPressureGroup(), getBloodPressureEntries());
+
+      await tester.pumpWidget(
+        _wrap(
+          mockRepo,
+          categories: getBloodPressureGroup(),
+          entries: getBloodPressureEntries(),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.byType(MeasurementTile), findsOneWidget);
+      expect(find.text('Blood pressure'), findsOneWidget);
+    });
+
+    testWidgets('body weight keeps its full card on top of the grid', (tester) async {
+      // The card is the way into the weight screen and stays a card, the one
+      // format decision the grid does not touch
+      final categories = [...getMeasurementCategories(), getBodyWeightCategory()];
+      final entries = {...getMeasurementEntries(), ...bodyWeightEntries()};
+      stubMeasurementReads(mockRepo, categories, entries);
+      // Tall enough for the card and the grid together
+      tester.view.physicalSize = const Size(800, 2200);
+      tester.view.devicePixelRatio = 1.0;
+      addTearDown(tester.view.reset);
+
+      await tester.pumpWidget(_wrap(mockRepo, categories: categories, entries: entries));
+      await tester.pumpAndSettle();
+
+      // Once, on top: the official category is left out of the grid below
+      expect(find.byType(CategoriesCard), findsOneWidget);
+      expect(find.byType(MeasurementTile), findsNWidgets(2));
+      expect(find.text('Weight'), findsOneWidget);
+      expect(
+        tester.getTopLeft(find.text('Weight')).dy,
+        lessThan(tester.getTopLeft(find.text('Body fat')).dy),
+      );
+    });
+
+    testWidgets('empty list renders neither card nor tiles', (tester) async {
+      stubMeasurementReads(mockRepo, []);
+
+      await tester.pumpWidget(_wrap(mockRepo));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(CategoriesCard), findsNothing);
+      expect(find.byType(MeasurementTile), findsNothing);
+    });
+  });
+}
diff --git a/test/features/measurements/widgets/categories_test.mocks.dart b/test/features/measurements/widgets/categories_test.mocks.dart
new file mode 100644
index 000000000..9e60c1edd
--- /dev/null
+++ b/test/features/measurements/widgets/categories_test.mocks.dart
@@ -0,0 +1,309 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/measurements/widgets/categories_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i3;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:wger/features/account/models/user_profile.dart' as _i8;
+import 'package:wger/features/account/providers/user_profile_repository.dart' as _i7;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i6;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i4;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i5;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i2;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+/// A class which mocks [MeasurementRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepository {
+  MockMeasurementRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<List<_i4.MeasurementCategory>> watchAllWithoutEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i3.Stream<List<_i4.MeasurementCategory>>.empty(),
+          )
+          as _i3.Stream<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchCategoryWithoutEntries(
+    String? id,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<Map<String, _i5.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i3.Stream<Map<String, _i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementBucket>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementBucket>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementValueCount>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementValueCount>>);
+
+  @override
+  _i3.Future<List<_i4.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i3.Future<List<_i4.MeasurementCategory>>.value(
+              <_i4.MeasurementCategory>[],
+            ),
+          )
+          as _i3.Future<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
+
+  @override
+  _i3.Future<Map<String, _i5.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i3.Future<Map<String, _i5.MeasurementEntry>>.value(
+              <String, _i5.MeasurementEntry>{},
+            ),
+          )
+          as _i3.Future<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
+  @override
+  _i3.Future<void> deleteLocalDrift(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDrift, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftGroupEntries(
+    List<_i5.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteLocalDriftCategory(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDriftCategory, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDriftCategory(
+    _i4.MeasurementCategory? category,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategory(_i4.MeasurementCategory? category) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategoryGroup(
+    List<_i4.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}
+
+/// A class which mocks [UserProfileRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockUserProfileRepository extends _i1.Mock implements _i7.UserProfileRepository {
+  MockUserProfileRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<_i8.UserProfile?> watchDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDrift, []),
+            returnValue: _i3.Stream<_i8.UserProfile?>.empty(),
+          )
+          as _i3.Stream<_i8.UserProfile?>);
+
+  @override
+  _i3.Future<void> editLocalDrift(_i8.UserProfile? profile) =>
+      (super.noSuchMethod(
+            Invocation.method(#editLocalDrift, [profile]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}
diff --git a/test/features/measurements/widgets/chart_range_selector_test.dart b/test/features/measurements/widgets/chart_range_selector_test.dart
new file mode 100644
index 000000000..6cd7971eb
--- /dev/null
+++ b/test/features/measurements/widgets/chart_range_selector_test.dart
@@ -0,0 +1,46 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/features/measurements/charts/range.dart';
+import 'package:wger/features/measurements/widgets/chart_range_selector.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+void main() {
+  testWidgets('every range is offered', (tester) async {
+    var picked = ChartRange.last3Months;
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: ChartRangeSelector(
+            value: picked,
+            onChanged: (range) => picked = range,
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.text('1 month'), findsOneWidget);
+    await tester.tap(find.text('1 month'));
+    expect(picked, ChartRange.lastMonth);
+  });
+}
diff --git a/test/features/measurements/widgets/charts/chart_widgets_test.dart b/test/features/measurements/widgets/charts/chart_widgets_test.dart
new file mode 100644
index 000000000..6f0badcc7
--- /dev/null
+++ b/test/features/measurements/widgets/charts/chart_widgets_test.dart
@@ -0,0 +1,472 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:fl_chart/fl_chart.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/features/measurements/charts/series.dart';
+import 'package:wger/features/measurements/widgets/charts/chart_widgets.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+Widget _wrap(Widget child) => MaterialApp(
+  localizationsDelegates: AppLocalizations.localizationsDelegates,
+  supportedLocales: AppLocalizations.supportedLocales,
+  home: Scaffold(
+    body: SizedBox(width: 400, height: 300, child: child),
+  ),
+);
+
+void main() {
+  MeasurementChartEntry entry(num value, DateTime date) => MeasurementChartEntry(value, date);
+
+  group('MeasurementBarChartWidgetFl', () {
+    testWidgets('renders without error for empty entries', (tester) async {
+      await tester.pumpWidget(
+        _wrap(const MeasurementBarChartWidgetFl([], 'steps')),
+      );
+      await tester.pumpAndSettle();
+      expect(find.byType(MeasurementBarChartWidgetFl), findsOneWidget);
+      expect(tester.takeException(), isNull);
+    });
+
+    testWidgets('BarChart is present for non-empty entries', (tester) async {
+      final entries = [
+        entry(1000, DateTime(2026, 1, 1)),
+        entry(2000, DateTime(2026, 1, 2)),
+        entry(1500, DateTime(2026, 1, 3)),
+      ];
+      await tester.pumpWidget(_wrap(MeasurementBarChartWidgetFl(entries, 'steps')));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(BarChart), findsOneWidget);
+    });
+
+    testWidgets('the tooltip stays inside the chart', (tester) async {
+      // Without this the reading at either end shows a tooltip that is cut
+      // off by the chart edge, or lies outside it altogether
+      await tester.pumpWidget(
+        _wrap(MeasurementBarChartWidgetFl([entry(1000, DateTime(2026, 1, 1))], 'steps')),
+      );
+      await tester.pumpAndSettle();
+
+      final tooltip = tester
+          .widget<BarChart>(find.byType(BarChart))
+          .data
+          .barTouchData
+          .touchTooltipData;
+      expect(tooltip.fitInsideHorizontally, isTrue);
+      expect(tooltip.fitInsideVertically, isTrue);
+    });
+
+    testWidgets('only labels a few dates on the x axis', (tester) async {
+      final entries = List.generate(
+        40,
+        (i) => entry(1000 + i, DateTime(2026, 1, 1).add(Duration(days: i))),
+      );
+      await tester.pumpWidget(_wrap(MeasurementBarChartWidgetFl(entries, 'steps')));
+      await tester.pumpAndSettle();
+
+      final dateLabels = find.byWidgetPredicate(
+        (w) => w is Text && RegExp(r'^\d+/\d+$').hasMatch(w.data ?? ''),
+      );
+      expect(dateLabels, findsNWidgets(4));
+      // the labels are spread out and kept away from the axis edges
+      expect(find.text('1/6'), findsOneWidget);
+      expect(find.text('2/5'), findsOneWidget);
+      expect(find.text('1/1'), findsNothing);
+    });
+  });
+
+  group('MeasurementChartWidgetFl series', () {
+    /// The chart data fl_chart actually receives
+    LineChartData chartData(WidgetTester tester) =>
+        tester.widget<LineChart>(find.byType(LineChart)).data;
+
+    final points = [
+      entry(60, DateTime(2026, 1, 1)),
+      entry(70, DateTime(2026, 1, 2)),
+    ];
+
+    testWidgets('singleMeasurement draws one line per given role', (tester) async {
+      await tester.pumpWidget(
+        _wrap(
+          MeasurementChartWidgetFl.singleMeasurement(
+            points,
+            'kg',
+            avgs: points,
+            trend: points,
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(chartData(tester).lineBarsData, hasLength(3));
+      expect(chartData(tester).betweenBarsData, isEmpty);
+    });
+
+    testWidgets('omits the lines it was not given', (tester) async {
+      await tester.pumpWidget(
+        _wrap(MeasurementChartWidgetFl.singleMeasurement(points, 'kg')),
+      );
+      await tester.pumpAndSettle();
+
+      expect(chartData(tester).lineBarsData, hasLength(1));
+    });
+
+    testWidgets('draws one line per component, in distinct colours', (tester) async {
+      await tester.pumpWidget(
+        _wrap(
+          MeasurementChartWidgetFl([
+            MeasurementChartSeries(points, MeasurementSeriesRole.component, label: 'Systolic'),
+            MeasurementChartSeries(points, MeasurementSeriesRole.component, label: 'Diastolic'),
+          ], 'mmHg'),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      final bars = chartData(tester).lineBarsData;
+      expect(bars, hasLength(2));
+      expect(bars.first.color, isNot(bars.last.color));
+    });
+
+    testWidgets('a range series adds a band between two invisible bounds', (tester) async {
+      final ranged = [
+        MeasurementChartEntry(60, DateTime(2026, 1, 1), min: 50, max: 80),
+        MeasurementChartEntry(70, DateTime(2026, 1, 2), min: 55, max: 95),
+      ];
+      await tester.pumpWidget(
+        _wrap(
+          MeasurementChartWidgetFl([
+            MeasurementChartSeries(ranged, MeasurementSeriesRole.raw),
+          ], 'bpm'),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      final data = chartData(tester);
+      // lower bound, upper bound, and the line itself
+      expect(data.lineBarsData, hasLength(3));
+      expect(data.betweenBarsData, hasLength(1));
+      expect(data.betweenBarsData.single.fromIndex, 0);
+      expect(data.betweenBarsData.single.toIndex, 1);
+      // the bounds carry the range, not the value
+      expect(data.lineBarsData[0].spots.map((s) => s.y), [50, 55]);
+      expect(data.lineBarsData[1].spots.map((s) => s.y), [80, 95]);
+      expect(data.lineBarsData[2].spots.map((s) => s.y), [60, 70]);
+    });
+
+    testWidgets('only the measured series gets a band, not its average', (tester) async {
+      // Condensing attaches a range to every point, so a downsampled average
+      // would otherwise be drawn with a band of its own. The band means "this
+      // is the spread of the measurements", which a smoothed line has not.
+      final ranged = [
+        MeasurementChartEntry(60, DateTime(2026, 1, 1), min: 50, max: 80),
+        MeasurementChartEntry(70, DateTime(2026, 1, 2), min: 55, max: 95),
+      ];
+      await tester.pumpWidget(
+        _wrap(
+          MeasurementChartWidgetFl([
+            MeasurementChartSeries(ranged, MeasurementSeriesRole.raw),
+            MeasurementChartSeries(ranged, MeasurementSeriesRole.average),
+            MeasurementChartSeries(ranged, MeasurementSeriesRole.trend),
+          ], 'bpm'),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(chartData(tester).betweenBarsData, hasLength(1));
+    });
+
+    testWidgets('no band when only some points carry a range', (tester) async {
+      await tester.pumpWidget(
+        _wrap(
+          MeasurementChartWidgetFl([
+            MeasurementChartSeries([
+              MeasurementChartEntry(60, DateTime(2026, 1, 1), min: 50, max: 80),
+              entry(70, DateTime(2026, 1, 2)),
+            ], MeasurementSeriesRole.raw),
+          ], 'bpm'),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(chartData(tester).betweenBarsData, isEmpty);
+      expect(chartData(tester).lineBarsData, hasLength(1));
+    });
+  });
+
+  group('MeasurementChartWidgetFl plan periods', () {
+    LineChartData chartData(WidgetTester tester) =>
+        tester.widget<LineChart>(find.byType(LineChart)).data;
+
+    final points = [
+      entry(60, DateTime(2026, 1, 1)),
+      entry(70, DateTime(2026, 1, 10)),
+    ];
+
+    testWidgets('periods become vertical bands clamped to the data', (tester) async {
+      await tester.pumpWidget(
+        _wrap(
+          MeasurementChartWidgetFl.singleMeasurement(
+            points,
+            'kg',
+            planPeriods: [
+              (
+                range: DateTimeRange(start: DateTime(2025, 12, 20), end: DateTime(2026, 1, 5)),
+                name: 'Cut',
+              ),
+              (
+                range: DateTimeRange(start: DateTime(2026, 2, 1), end: DateTime(2026, 2, 10)),
+                name: 'Bulk',
+              ),
+            ],
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      final annotations = chartData(tester).rangeAnnotations.verticalRangeAnnotations;
+      // the february plan does not overlap the data and draws nothing
+      expect(annotations, hasLength(1));
+      expect(annotations.single.x1, DateTime(2026, 1, 1).millisecondsSinceEpoch.toDouble());
+      expect(annotations.single.x2, DateTime(2026, 1, 5).millisecondsSinceEpoch.toDouble());
+    });
+
+    testWidgets('no bands without periods', (tester) async {
+      await tester.pumpWidget(_wrap(MeasurementChartWidgetFl.singleMeasurement(points, 'kg')));
+      await tester.pumpAndSettle();
+
+      expect(chartData(tester).rangeAnnotations.verticalRangeAnnotations, isEmpty);
+    });
+
+    testWidgets('tooltip names the plan once, below the last line', (tester) async {
+      await tester.pumpWidget(
+        _wrap(
+          MeasurementChartWidgetFl.singleMeasurement(
+            points,
+            'kg',
+            avgs: points,
+            trend: points,
+            planPeriods: [
+              (
+                range: DateTimeRange(start: DateTime(2025, 12, 20), end: DateTime(2026, 1, 5)),
+                name: 'Prep Sommer 2026',
+              ),
+            ],
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      final data = chartData(tester);
+      // a touch on the first point, which every series has a spot for
+      final touched = [
+        for (final (i, bar) in data.lineBarsData.indexed) LineBarSpot(bar, i, bar.spots.first),
+      ];
+      final items = data.lineTouchData.touchTooltipData.getTooltipItems(touched).nonNulls.toList();
+
+      expect(items, hasLength(3));
+      final mentions = [
+        for (final item in items) ...?item.children,
+      ].whereType<TextSpan>().where((s) => s.text!.contains('Prep Sommer 2026'));
+      expect(mentions, hasLength(1));
+      expect(items.take(2).every((i) => i.children == null || i.children!.isEmpty), isTrue);
+    });
+
+    testWidgets('no plan name for a point outside every period', (tester) async {
+      await tester.pumpWidget(
+        _wrap(
+          MeasurementChartWidgetFl.singleMeasurement(
+            points,
+            'kg',
+            planPeriods: [
+              (
+                range: DateTimeRange(start: DateTime(2025, 12, 20), end: DateTime(2026, 1, 5)),
+                name: 'Cut',
+              ),
+            ],
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      final data = chartData(tester);
+      // the second point (january 10th) lies after the period's end
+      final touched = [
+        LineBarSpot(data.lineBarsData.single, 0, data.lineBarsData.single.spots.last),
+      ];
+      final items = data.lineTouchData.touchTooltipData.getTooltipItems(touched).nonNulls.toList();
+
+      expect(items.single.children, anyOf(isNull, isEmpty));
+    });
+  });
+
+  group('MeasurementBarChartWidgetFl ranges', () {
+    BarChartData chartData(WidgetTester tester) =>
+        tester.widget<BarChart>(find.byType(BarChart)).data;
+
+    testWidgets('a range entry becomes a bar spanning its bounds', (tester) async {
+      await tester.pumpWidget(
+        _wrap(
+          MeasurementBarChartWidgetFl([
+            MeasurementChartEntry(100, DateTime(2026, 1, 1), min: 80, max: 120),
+          ], 'mmHg'),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      final rod = chartData(tester).barGroups.single.barRods.single;
+      expect(rod.fromY, 80);
+      expect(rod.toY, 120);
+    });
+
+    testWidgets('a plain entry still grows from zero', (tester) async {
+      await tester.pumpWidget(
+        _wrap(MeasurementBarChartWidgetFl([entry(1500, DateTime(2026, 1, 1))], 'steps')),
+      );
+      await tester.pumpAndSettle();
+
+      final rod = chartData(tester).barGroups.single.barRods.single;
+      expect(rod.fromY, 0);
+      expect(rod.toY, 1500);
+    });
+
+    testWidgets('bars get thinner the more of them share the width', (tester) async {
+      Future<double> barWidthFor(int count) async {
+        await tester.pumpWidget(
+          _wrap(
+            MeasurementBarChartWidgetFl(
+              List.generate(count, (i) => entry(100, DateTime(2026, 1, 1).add(Duration(days: i)))),
+              'steps',
+            ),
+          ),
+        );
+        await tester.pumpAndSettle();
+        return chartData(tester).barGroups.first.barRods.single.width;
+      }
+
+      // a handful of bars stay comfortably wide, a season of readings must not
+      // overflow into a solid block
+      expect(await barWidthFor(5), 12.0);
+      expect(await barWidthFor(120), lessThan(4));
+      expect(await barWidthFor(120), greaterThanOrEqualTo(1));
+    });
+  });
+
+  group('MeasurementChartWidgetFl dot size', () {
+    double dotRadius(WidgetTester tester) {
+      final data = tester.widget<LineChart>(find.byType(LineChart)).data;
+      final painter = data.lineBarsData.first.dotData.getDotPainter(
+        FlSpot.zero,
+        0,
+        data.lineBarsData.first,
+        0,
+      );
+      return (painter as FlDotCirclePainter).radius;
+    }
+
+    Future<double> radiusFor(WidgetTester tester, int count) async {
+      await tester.pumpWidget(
+        _wrap(
+          MeasurementChartWidgetFl.singleMeasurement(
+            List.generate(count, (i) => entry(60, DateTime(2026, 1, 1).add(Duration(days: i)))),
+            'kg',
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+      return dotRadius(tester);
+    }
+
+    testWidgets('dots shrink as the points get denser', (tester) async {
+      expect(await radiusFor(tester, 5), 4.0);
+      expect(await radiusFor(tester, 300), lessThan(1.5));
+      // but never vanish
+      expect(await radiusFor(tester, 5000), greaterThanOrEqualTo(0.5));
+    });
+  });
+
+  group('MeasurementBarChartWidgetFl changes', () {
+    BarChartData chartData(WidgetTester tester) =>
+        tester.widget<BarChart>(find.byType(BarChart)).data;
+
+    Future<BarChartData> pumpSigned(
+      WidgetTester tester,
+      List<MeasurementChartEntry> entries,
+    ) async {
+      await tester.pumpWidget(_wrap(MeasurementBarChartWidgetFl(entries, 'kg', signed: true)));
+      await tester.pumpAndSettle();
+      return chartData(tester);
+    }
+
+    testWidgets('a decrease hangs below the zero line, an increase above it', (tester) async {
+      final data = await pumpSigned(tester, [
+        entry(-1.5, DateTime(2026, 1, 5)),
+        entry(0.5, DateTime(2026, 1, 12)),
+      ]);
+
+      expect(data.barGroups.map((g) => g.barRods.single.fromY), [0, 0]);
+      expect(data.barGroups.map((g) => g.barRods.single.toY), [-1.5, 0.5]);
+      // the rounded end is the one away from the baseline
+      expect(data.barGroups.first.barRods.single.borderRadius?.bottomLeft, isNot(Radius.zero));
+      expect(data.barGroups.last.barRods.single.borderRadius?.topLeft, isNot(Radius.zero));
+    });
+
+    testWidgets('the two directions are told apart by colour', (tester) async {
+      final data = await pumpSigned(tester, [
+        entry(-1.5, DateTime(2026, 1, 5)),
+        entry(0.5, DateTime(2026, 1, 12)),
+      ]);
+
+      final colors = data.barGroups.map((g) => g.barRods.single.color).toList();
+      expect(colors.first, isNot(colors.last));
+    });
+
+    testWidgets('the zero line is drawn, so a chart of only decreases reads right', (
+      tester,
+    ) async {
+      final data = await pumpSigned(tester, [entry(-1.5, DateTime(2026, 1, 5))]);
+
+      expect(data.extraLinesData.horizontalLines.single.y, 0);
+    });
+
+    testWidgets('an amount chart has no zero line', (tester) async {
+      await tester.pumpWidget(
+        _wrap(MeasurementBarChartWidgetFl([entry(1500, DateTime(2026, 1, 5))], 'steps')),
+      );
+      await tester.pumpAndSettle();
+
+      expect(chartData(tester).extraLinesData.horizontalLines, isEmpty);
+    });
+
+    testWidgets('the tooltip quotes a change with its sign', (tester) async {
+      await pumpSigned(tester, [entry(0.5, DateTime(2026, 1, 12))]);
+
+      final data = chartData(tester);
+      final rod = data.barGroups.single.barRods.single;
+      final item = data.barTouchData.touchTooltipData.getTooltipItem(
+        data.barGroups.single,
+        0,
+        rod,
+        0,
+      );
+
+      expect(item!.text, contains('+0.5'));
+    });
+  });
+}
diff --git a/test/features/measurements/widgets/charts/distribution_chart_test.dart b/test/features/measurements/widgets/charts/distribution_chart_test.dart
new file mode 100644
index 000000000..3045c43cb
--- /dev/null
+++ b/test/features/measurements/widgets/charts/distribution_chart_test.dart
@@ -0,0 +1,110 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/features/measurements/charts/data.dart';
+import 'package:wger/features/measurements/widgets/charts/distribution_chart.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+Widget _wrap(Widget child) => MaterialApp(
+  localizationsDelegates: AppLocalizations.localizationsDelegates,
+  supportedLocales: AppLocalizations.supportedLocales,
+  home: Scaffold(
+    body: SizedBox(width: 400, height: 300, child: child),
+  ),
+);
+
+void main() {
+  group('MeasurementDistributionWidgetFl', () {
+    const counted = <ValueCount>[
+      (value: 60, count: 1),
+      (value: 61, count: 1),
+      (value: 65, count: 1),
+    ];
+
+    testWidgets('renders nothing for no values instead of crashing', (tester) async {
+      await tester.pumpWidget(
+        _wrap(const MeasurementDistributionWidgetFl([], latest: 0, unit: 'kg')),
+      );
+      await tester.pumpAndSettle();
+
+      expect(tester.takeException(), isNull);
+    });
+
+    testWidgets('reads out the median and the newest value, which the lines only place', (
+      tester,
+    ) async {
+      await tester.pumpWidget(
+        _wrap(const MeasurementDistributionWidgetFl(counted, latest: 65, unit: 'kg', binWidth: 2)),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.textContaining('Median: 61 kg', findRichText: true), findsOneWidget);
+      expect(find.textContaining('Latest: 65 kg', findRichText: true), findsOneWidget);
+    });
+
+    // Mirrors the widget's own layout: the read-out line on top, the count
+    // labels to the left, the bins sharing the rest of the width
+    Offset firstBinCenter(WidgetTester tester, {required int bins}) {
+      const readoutHeight = 20.0;
+      const countLabelWidth = 30.0;
+      final box = tester.getRect(find.byType(MeasurementDistributionWidgetFl));
+      final step = (box.width - countLabelWidth) / bins;
+      return Offset(box.left + countLabelWidth + step / 2, box.top + readoutHeight + 100);
+    }
+
+    testWidgets('a tapped bin reads out as its range and count', (tester) async {
+      await tester.pumpWidget(
+        _wrap(const MeasurementDistributionWidgetFl(counted, latest: 65, unit: 'kg', binWidth: 2)),
+      );
+      await tester.pumpAndSettle();
+
+      // Bins are [60-62): 2, [62-64): 0, [64-66): 1
+      await tester.tapAt(firstBinCenter(tester, bins: 3));
+      await tester.pumpAndSettle();
+
+      expect(find.textContaining('60-62 kg: 2 entries'), findsOneWidget);
+
+      // Tapping the bin again clears the selection
+      await tester.tapAt(firstBinCenter(tester, bins: 3));
+      await tester.pumpAndSettle();
+      expect(find.textContaining('Median:', findRichText: true), findsOneWidget);
+    });
+
+    testWidgets('counts read as days for a metric summed per day', (tester) async {
+      await tester.pumpWidget(
+        _wrap(
+          const MeasurementDistributionWidgetFl(
+            counted,
+            latest: 65,
+            unit: 'kg',
+            binWidth: 2,
+            countsAreDays: true,
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      await tester.tapAt(firstBinCenter(tester, bins: 3));
+      await tester.pumpAndSettle();
+
+      expect(find.textContaining('60-62 kg: 2 days'), findsOneWidget);
+    });
+  });
+}
diff --git a/test/features/measurements/widgets/charts/heatmap_chart_test.dart b/test/features/measurements/widgets/charts/heatmap_chart_test.dart
new file mode 100644
index 000000000..4893051c6
--- /dev/null
+++ b/test/features/measurements/widgets/charts/heatmap_chart_test.dart
@@ -0,0 +1,77 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/features/measurements/charts/data.dart';
+import 'package:wger/features/measurements/charts/series.dart';
+import 'package:wger/features/measurements/widgets/charts/heatmap_chart.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+Widget _wrap(Widget child) => MaterialApp(
+  localizationsDelegates: AppLocalizations.localizationsDelegates,
+  supportedLocales: AppLocalizations.supportedLocales,
+  home: Scaffold(
+    body: SizedBox(width: 400, height: 300, child: child),
+  ),
+);
+
+void main() {
+  MeasurementChartEntry entry(num value, DateTime date) => MeasurementChartEntry(value, date);
+
+  group('MeasurementHeatmapWidgetFl', () {
+    testWidgets('renders without error for empty entries', (tester) async {
+      await tester.pumpWidget(_wrap(const MeasurementHeatmapWidgetFl([], 'steps')));
+      await tester.pumpAndSettle();
+
+      expect(tester.takeException(), isNull);
+    });
+
+    testWidgets('reads out the day that was tapped', (tester) async {
+      final today = DateTime.now();
+      final day = DateTime(today.year, today.month, today.day);
+      await tester.pumpWidget(_wrap(MeasurementHeatmapWidgetFl([entry(500, day)], 'steps')));
+      await tester.pumpAndSettle();
+
+      // A single day is a one-column grid, so its cell sits in the row of its
+      // weekday. The read-out is what the tooltip is on the other charts.
+      expect(buildHeatmapGrid([entry(500, day)]).weeks, 1);
+
+      // Mirrors the widget's own layout: the read-out line above the grid, the
+      // weekday labels to its left, the month labels on top, and the square
+      // cells centred in what is left
+      const readoutHeight = 20.0;
+      const labelWidth = 22.0;
+      const labelHeight = 12.0;
+      final box = tester.getRect(find.byType(MeasurementHeatmapWidgetFl));
+      final gridHeight = box.height - readoutHeight - labelHeight;
+      final step = min(box.width - labelWidth, gridHeight / DateTime.daysPerWeek);
+      final top =
+          box.top + readoutHeight + labelHeight + (gridHeight - step * DateTime.daysPerWeek) / 2;
+
+      await tester.tapAt(
+        Offset(box.left + labelWidth + step / 2, top + step * (day.weekday - 1) + step / 2),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.textContaining('500'), findsOneWidget);
+    });
+  });
+}
diff --git a/test/features/measurements/widgets/charts/spark_charts_test.dart b/test/features/measurements/widgets/charts/spark_charts_test.dart
new file mode 100644
index 000000000..4a17dbc8b
--- /dev/null
+++ b/test/features/measurements/widgets/charts/spark_charts_test.dart
@@ -0,0 +1,137 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/features/measurements/charts/series.dart';
+import 'package:wger/features/measurements/charts/spark.dart';
+import 'package:wger/features/measurements/widgets/charts/spark_charts.dart';
+
+Widget _wrap(Widget spark) => MaterialApp(
+  home: Scaffold(body: SizedBox(width: 150, height: 40, child: spark)),
+);
+
+void main() {
+  final start = DateTime(2026, 8, 1);
+
+  group('SparkLineChart', () {
+    testWidgets('paints a line for a series, and nothing for an empty one', (tester) async {
+      final entries = [
+        MeasurementChartEntry(80, DateTime(2026, 8, 1)),
+        MeasurementChartEntry(81, DateTime(2026, 8, 3)),
+        MeasurementChartEntry(80.5, DateTime(2026, 8, 7)),
+      ];
+
+      await tester.pumpWidget(_wrap(SparkLineChart(entries, start: start, days: 7)));
+      expect(find.byType(SparkLineChart), findsOneWidget);
+
+      // An empty series paints nothing, but the widget itself never fails
+      await tester.pumpWidget(_wrap(SparkLineChart(const [], start: start, days: 7)));
+      expect(tester.takeException(), isNull);
+    });
+
+    testWidgets('a flat series stays paintable instead of dividing by zero', (tester) async {
+      final entries = [
+        MeasurementChartEntry(80, DateTime(2026, 8, 1)),
+        MeasurementChartEntry(80, DateTime(2026, 8, 5)),
+      ];
+
+      await tester.pumpWidget(_wrap(SparkLineChart(entries, start: start, days: 7)));
+
+      expect(tester.takeException(), isNull);
+    });
+
+    testWidgets('dots mode renders for a sparse series', (tester) async {
+      final entries = [MeasurementChartEntry(38.5, DateTime(2026, 8, 1))];
+
+      await tester.pumpWidget(
+        _wrap(SparkLineChart(entries, start: start, days: 91, dots: true)),
+      );
+
+      expect(tester.takeException(), isNull);
+    });
+  });
+
+  group('SparkBarChart', () {
+    testWidgets('paints plain, floating, stacked and signed data', (tester) async {
+      final variants = [
+        sparkBars(
+          [
+            MeasurementChartEntry(8000, DateTime(2026, 8, 2)),
+          ],
+          start: start,
+          slotCount: 7,
+        ),
+        sparkFloatingBars(
+          [
+            MeasurementChartEntry(100, DateTime(2026, 8, 2), min: 79, max: 122),
+          ],
+          start: start,
+          slotCount: 7,
+        ),
+        sparkStackedBars(
+          [
+            MeasurementStackedEntry(DateTime(2026, 8, 2), const [240, 60]),
+          ],
+          start: start,
+          slotCount: 7,
+        ),
+        sparkDeltaBars(
+          [
+            MeasurementChartEntry(-0.4, DateTime(2026, 8, 3)),
+          ],
+          start: start,
+          slotCount: 9,
+        ),
+      ];
+
+      for (final data in variants) {
+        await tester.pumpWidget(_wrap(SparkBarChart(data)));
+        expect(tester.takeException(), isNull);
+      }
+    });
+
+    testWidgets('an empty spark paints nothing without failing', (tester) async {
+      await tester.pumpWidget(
+        _wrap(SparkBarChart(sparkBars(const [], start: start, slotCount: 7))),
+      );
+
+      expect(tester.takeException(), isNull);
+    });
+  });
+
+  group('SparkHeatmap', () {
+    testWidgets('paints the four-week strip', (tester) async {
+      final today = DateTime(2026, 8, 7);
+      final days = [
+        for (var day = 0; day < 14; day++)
+          MeasurementChartEntry(day.isEven ? 8000 : 0, DateTime(2026, 8, 7 - day)),
+      ];
+
+      await tester.pumpWidget(_wrap(SparkHeatmap(days, weeks: 4, today: today)));
+
+      expect(tester.takeException(), isNull);
+    });
+
+    testWidgets('an empty history paints the empty grid', (tester) async {
+      await tester.pumpWidget(_wrap(SparkHeatmap(const [], weeks: 4, today: DateTime(2026, 8, 7))));
+
+      expect(tester.takeException(), isNull);
+    });
+  });
+}
diff --git a/test/features/measurements/widgets/entries_test.dart b/test/features/measurements/widgets/entries_test.dart
new file mode 100644
index 000000000..b0ae036be
--- /dev/null
+++ b/test/features/measurements/widgets/entries_test.dart
@@ -0,0 +1,231 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:wger/features/measurements/charts/range.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+import 'package:wger/features/measurements/widgets/charts.dart';
+import 'package:wger/features/measurements/widgets/entries.dart';
+import 'package:wger/features/nutrition/providers/ingredient_repository.dart';
+import 'package:wger/features/nutrition/providers/nutrition_repository.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../helpers/measurement_chart_buckets.dart';
+import '../../../helpers/measurement_repository_stubs.dart';
+import 'entries_test.mocks.dart';
+
+@GenerateMocks([MeasurementRepository, NutritionRepository, IngredientRepository])
+void main() {
+  final userEntry = MeasurementEntry(
+    id: 'e-user',
+    categoryId: 'c1',
+    date: DateTime(2026, 1, 2),
+    value: 20,
+    notes: '',
+  );
+  final importedEntry = MeasurementEntry(
+    id: 'e-import',
+    categoryId: 'c1',
+    date: DateTime(2026, 1, 1),
+    value: 21,
+    notes: '',
+    source: 'apple',
+    externalId: 'bf-1',
+  );
+
+  Widget createEntriesList(
+    MeasurementCategory category,
+    Map<String, List<MeasurementEntry>> entries, {
+    MockMeasurementRepository? repo,
+  }) {
+    final mockRepo = repo ?? MockMeasurementRepository();
+    stubMeasurementReads(mockRepo, [category], entries);
+
+    return ProviderScope(
+      overrides: [
+        measurementRepositoryProvider.overrideWithValue(mockRepo),
+        nutritionRepositoryProvider.overrideWithValue(MockNutritionRepository()),
+        ingredientRepositoryProvider.overrideWithValue(MockIngredientRepository()),
+        // The chart reads its points from the aggregated query
+        measurementChartBucketsProvider.overrideWith(chartBucketsFrom(entries)),
+        measurementGroupBucketsProvider.overrideWith(groupBucketsFrom([category], entries)),
+      ],
+      child: MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: SingleChildScrollView(
+            child: EntriesList(
+              category,
+              range: ChartRange.last3Months,
+              onRangeChanged: (_) {},
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  testWidgets('Imported entries show a badge instead of the edit menu', (
+    WidgetTester tester,
+  ) async {
+    final category = MeasurementCategory(
+      id: 'c1',
+      name: 'Body fat',
+      unit: '%',
+    );
+
+    await tester.pumpWidget(
+      createEntriesList(category, {
+        'c1': [userEntry, importedEntry],
+      }),
+    );
+    await tester.pumpAndSettle();
+
+    // Only the manual entry has the menu, the imported one carries the badge
+    expect(find.byTooltip('Show menu'), findsOneWidget);
+    expect(find.byIcon(Icons.monitor_heart_outlined), findsOneWidget);
+  });
+
+  testWidgets('A group charts its components and lists the readings', (
+    WidgetTester tester,
+  ) async {
+    // The list defaults to the last three months, so a fixed date would fall
+    // out of the range as time passes
+    final night = DateTime.now().subtract(const Duration(days: 1));
+    MeasurementCategory child(String id, String name, MetricType type, int order) =>
+        MeasurementCategory(
+          id: id,
+          name: name,
+          unit: 'min',
+          metricType: type,
+          parentId: 'sleep',
+          order: order,
+        );
+    final group = MeasurementCategory(
+      id: 'sleep',
+      name: 'Sleep',
+      unit: 'min',
+      metricType: MetricType.sleep,
+      children: [
+        child('total', 'Total sleep', MetricType.sleepTotal, 0),
+        child('deep', 'Deep sleep', MetricType.sleepDeep, 1),
+      ],
+    );
+    final entries = {
+      for (final (id, value) in [('total', 480), ('deep', 90)])
+        id: [MeasurementEntry(id: 'e-$id', categoryId: id, date: night, value: value, notes: '')],
+    };
+
+    await tester.pumpWidget(createEntriesList(group, entries));
+    await tester.pumpAndSettle();
+
+    // The group holds no entries itself, so its own list would be empty: it
+    // shows the components' readings instead, the roll-up leading
+    expect(find.byType(MeasurementStackedBarChartWidgetFl), findsOneWidget);
+    // A duration is read in hours and minutes, not in the minutes it is stored as
+    expect(find.text('8:00 h'), findsOneWidget);
+    expect(find.textContaining('Deep sleep 1:30'), findsOneWidget);
+    // Each component is a way into its own screen
+    expect(find.byIcon(Icons.chevron_right), findsNWidgets(2));
+  });
+
+  testWidgets('scrolling a group list asks for the next page', (WidgetTester tester) async {
+    // A page is entries, a row is a reading, and a blood pressure page of
+    // fifty entries lists twenty-five: reading "more to come" off the rows
+    // left the list stuck on its first page
+    final readings = [
+      for (var day = 0; day < 40; day++) DateTime.now().subtract(Duration(days: day)),
+    ];
+    MeasurementCategory component(String id, String name, MetricType type) => MeasurementCategory(
+      id: id,
+      name: name,
+      unit: 'mmHg',
+      metricType: type,
+      parentId: 'bp',
+    );
+    final group = MeasurementCategory(
+      id: 'bp',
+      name: 'Blood pressure',
+      unit: 'mmHg',
+      metricType: MetricType.bloodPressure,
+      children: [
+        component('sys', 'Systolic', MetricType.bloodPressureSystolic),
+        component('dia', 'Diastolic', MetricType.bloodPressureDiastolic),
+      ],
+    );
+    final entries = {
+      for (final (id, value) in [('sys', 120), ('dia', 80)])
+        id: [
+          for (final (index, date) in readings.indexed)
+            MeasurementEntry(id: '$id-$index', categoryId: id, date: date, value: value, notes: ''),
+        ],
+    };
+    final mockRepo = MockMeasurementRepository();
+    // Tall enough that the list below the chart is on screen and can be
+    // dragged rather than the page around it
+    tester.view.physicalSize = const Size(800, 1600);
+    tester.view.devicePixelRatio = 1.0;
+    addTearDown(tester.view.reset);
+
+    await tester.pumpWidget(createEntriesList(group, entries, repo: mockRepo));
+    await tester.pumpAndSettle();
+    verify(mockRepo.watchGroupEntries('bp', limit: 50)).called(greaterThanOrEqualTo(1));
+
+    // Past the end, so the assertion does not hang on a row height
+    await tester.drag(find.byType(ListView).last, const Offset(0, -3000));
+    await tester.pumpAndSettle();
+
+    verify(mockRepo.watchGroupEntries('bp', limit: 100)).called(greaterThanOrEqualTo(1));
+  });
+
+  testWidgets('A distribution category draws its histogram in the chart box', (
+    WidgetTester tester,
+  ) async {
+    // The histogram fills the height it is given, and the list around it is a
+    // scrollable: an unbounded box reaching it is a layout error
+    final category = MeasurementCategory(
+      id: 'c1',
+      name: 'Bizeps',
+      unit: 'cm',
+      chartType: ChartType.distribution,
+    );
+    final entries = [
+      for (var day = 0; day < 30; day++)
+        MeasurementEntry(
+          id: 'e-$day',
+          categoryId: 'c1',
+          date: DateTime.now().subtract(Duration(days: day)),
+          value: 30 + day % 5,
+          notes: '',
+        ),
+    ];
+
+    await tester.pumpWidget(createEntriesList(category, {'c1': entries}));
+    await tester.pumpAndSettle();
+
+    expect(find.byType(MeasurementDistributionWidgetFl), findsOneWidget);
+  });
+}
diff --git a/test/features/measurements/widgets/entries_test.mocks.dart b/test/features/measurements/widgets/entries_test.mocks.dart
new file mode 100644
index 000000000..88400880a
--- /dev/null
+++ b/test/features/measurements/widgets/entries_test.mocks.dart
@@ -0,0 +1,546 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/measurements/widgets/entries_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i3;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:wger/core/search_options.dart' as _i15;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i6;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i4;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i5;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i2;
+import 'package:wger/features/nutrition/models/ingredient.dart' as _i13;
+import 'package:wger/features/nutrition/models/ingredient_filters.dart' as _i14;
+import 'package:wger/features/nutrition/models/log.dart' as _i11;
+import 'package:wger/features/nutrition/models/meal.dart' as _i9;
+import 'package:wger/features/nutrition/models/meal_item.dart' as _i10;
+import 'package:wger/features/nutrition/models/nutritional_plan.dart' as _i8;
+import 'package:wger/features/nutrition/providers/ingredient_repository.dart' as _i12;
+import 'package:wger/features/nutrition/providers/nutrition_repository.dart' as _i7;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+/// A class which mocks [MeasurementRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepository {
+  MockMeasurementRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<List<_i4.MeasurementCategory>> watchAllWithoutEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i3.Stream<List<_i4.MeasurementCategory>>.empty(),
+          )
+          as _i3.Stream<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchCategoryWithoutEntries(
+    String? id,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<Map<String, _i5.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i3.Stream<Map<String, _i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementBucket>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementBucket>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementValueCount>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementValueCount>>);
+
+  @override
+  _i3.Future<List<_i4.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i3.Future<List<_i4.MeasurementCategory>>.value(
+              <_i4.MeasurementCategory>[],
+            ),
+          )
+          as _i3.Future<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
+
+  @override
+  _i3.Future<Map<String, _i5.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i3.Future<Map<String, _i5.MeasurementEntry>>.value(
+              <String, _i5.MeasurementEntry>{},
+            ),
+          )
+          as _i3.Future<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
+  @override
+  _i3.Future<void> deleteLocalDrift(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDrift, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftGroupEntries(
+    List<_i5.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteLocalDriftCategory(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDriftCategory, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDriftCategory(
+    _i4.MeasurementCategory? category,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategory(_i4.MeasurementCategory? category) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategoryGroup(
+    List<_i4.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}
+
+/// A class which mocks [NutritionRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockNutritionRepository extends _i1.Mock implements _i7.NutritionRepository {
+  MockNutritionRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<List<_i8.NutritionalPlan>> watchAllDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllDrift, []),
+            returnValue: _i3.Stream<List<_i8.NutritionalPlan>>.empty(),
+          )
+          as _i3.Stream<List<_i8.NutritionalPlan>>);
+
+  @override
+  _i3.Future<void> addPlanLocalDrift(_i8.NutritionalPlan? plan) =>
+      (super.noSuchMethod(
+            Invocation.method(#addPlanLocalDrift, [plan]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> editLocalDrift(_i8.NutritionalPlan? plan) =>
+      (super.noSuchMethod(
+            Invocation.method(#editLocalDrift, [plan]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteLocalDrift(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDrift, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Stream<List<_i9.Meal>> watchAllMealsHydrated() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllMealsHydrated, []),
+            returnValue: _i3.Stream<List<_i9.Meal>>.empty(),
+          )
+          as _i3.Stream<List<_i9.Meal>>);
+
+  @override
+  _i3.Future<void> addMealLocalDrift(_i9.Meal? meal) =>
+      (super.noSuchMethod(
+            Invocation.method(#addMealLocalDrift, [meal]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> editMealLocalDrift(_i9.Meal? meal) =>
+      (super.noSuchMethod(
+            Invocation.method(#editMealLocalDrift, [meal]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteMealLocalDrift(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteMealLocalDrift, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addMealItemLocalDrift(_i10.MealItem? item) =>
+      (super.noSuchMethod(
+            Invocation.method(#addMealItemLocalDrift, [item]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> editMealItemLocalDrift(_i10.MealItem? item) =>
+      (super.noSuchMethod(
+            Invocation.method(#editMealItemLocalDrift, [item]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteMealItemLocalDrift(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteMealItemLocalDrift, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Stream<List<_i11.LogItem>> watchAllLogsHydrated() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllLogsHydrated, []),
+            returnValue: _i3.Stream<List<_i11.LogItem>>.empty(),
+          )
+          as _i3.Stream<List<_i11.LogItem>>);
+
+  @override
+  _i3.Future<void> addLogLocalDrift(_i11.LogItem? log) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLogLocalDrift, [log]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteLogLocalDrift(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLogLocalDrift, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}
+
+/// A class which mocks [IngredientRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockIngredientRepository extends _i1.Mock implements _i12.IngredientRepository {
+  MockIngredientRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<_i13.Ingredient?> watchById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchById, [id]),
+            returnValue: _i3.Stream<_i13.Ingredient?>.empty(),
+          )
+          as _i3.Stream<_i13.Ingredient?>);
+
+  @override
+  _i3.Stream<List<_i13.Ingredient>> watchAllDrift({
+    _i14.IngredientFilters? filters = const _i14.IngredientFilters(),
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllDrift, [], {#filters: filters}),
+            returnValue: _i3.Stream<List<_i13.Ingredient>>.empty(),
+          )
+          as _i3.Stream<List<_i13.Ingredient>>);
+
+  @override
+  _i3.Future<_i13.Ingredient?> getById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#getById, [id]),
+            returnValue: _i3.Future<_i13.Ingredient?>.value(),
+          )
+          as _i3.Future<_i13.Ingredient?>);
+
+  @override
+  _i3.Future<List<_i13.Ingredient>> searchIngredientLocal(
+    String? term, {
+    bool? isVegan = false,
+    bool? isVegetarian = false,
+    _i13.NutriScore? nutriscoreMax,
+    int? limit = 100,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #searchIngredientLocal,
+              [term],
+              {
+                #isVegan: isVegan,
+                #isVegetarian: isVegetarian,
+                #nutriscoreMax: nutriscoreMax,
+                #limit: limit,
+              },
+            ),
+            returnValue: _i3.Future<List<_i13.Ingredient>>.value(
+              <_i13.Ingredient>[],
+            ),
+          )
+          as _i3.Future<List<_i13.Ingredient>>);
+
+  @override
+  _i3.Future<List<_i13.Ingredient>> searchIngredientServer(
+    String? name, {
+    String? languageCode = 'en',
+    _i15.SearchLanguage? searchLanguage = _i15.SearchLanguage.current,
+    bool? isVegan = false,
+    bool? isVegetarian = false,
+    _i13.NutriScore? nutriscoreMax,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #searchIngredientServer,
+              [name],
+              {
+                #languageCode: languageCode,
+                #searchLanguage: searchLanguage,
+                #isVegan: isVegan,
+                #isVegetarian: isVegetarian,
+                #nutriscoreMax: nutriscoreMax,
+              },
+            ),
+            returnValue: _i3.Future<List<_i13.Ingredient>>.value(
+              <_i13.Ingredient>[],
+            ),
+          )
+          as _i3.Future<List<_i13.Ingredient>>);
+
+  @override
+  _i3.Future<List<_i13.Ingredient>> search(
+    String? name, {
+    required bool? isOnline,
+    String? languageCode = 'en',
+    _i15.SearchLanguage? searchLanguage = _i15.SearchLanguage.current,
+    bool? isVegan = false,
+    bool? isVegetarian = false,
+    _i13.NutriScore? nutriscoreMax,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #search,
+              [name],
+              {
+                #isOnline: isOnline,
+                #languageCode: languageCode,
+                #searchLanguage: searchLanguage,
+                #isVegan: isVegan,
+                #isVegetarian: isVegetarian,
+                #nutriscoreMax: nutriscoreMax,
+              },
+            ),
+            returnValue: _i3.Future<List<_i13.Ingredient>>.value(
+              <_i13.Ingredient>[],
+            ),
+          )
+          as _i3.Future<List<_i13.Ingredient>>);
+
+  @override
+  _i3.Future<_i13.Ingredient?> searchIngredientByBarcode(String? barcode) =>
+      (super.noSuchMethod(
+            Invocation.method(#searchIngredientByBarcode, [barcode]),
+            returnValue: _i3.Future<_i13.Ingredient?>.value(),
+          )
+          as _i3.Future<_i13.Ingredient?>);
+}
diff --git a/test/features/measurements/widgets/forms_test.dart b/test/features/measurements/widgets/forms_test.dart
new file mode 100644
index 000000000..123760889
--- /dev/null
+++ b/test/features/measurements/widgets/forms_test.dart
@@ -0,0 +1,312 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:wger/core/widgets/decimal_input.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+import 'package:wger/features/measurements/widgets/forms.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../../test_data/measurements.dart';
+import '../../../helpers/measurement_repository_stubs.dart';
+import 'forms_test.mocks.dart';
+
+@GenerateMocks([MeasurementRepository])
+void main() {
+  late MockMeasurementRepository mockRepo;
+
+  setUp(() {
+    mockRepo = MockMeasurementRepository();
+    stubMeasurementReads(mockRepo, []);
+    when(mockRepo.addLocalDriftGroupEntries(any)).thenAnswer((_) async {});
+  });
+
+  Widget wrap(Widget child) {
+    return ProviderScope(
+      overrides: [
+        measurementRepositoryProvider.overrideWithValue(mockRepo),
+      ],
+      child: MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: SingleChildScrollView(child: child),
+        ),
+      ),
+    );
+  }
+
+  group('MeasurementCategoryForm validation', () {
+    testWidgets('empty name fails validation', (tester) async {
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+
+      // Tap save without entering any text
+      await tester.tap(find.byType(ElevatedButton));
+      await tester.pumpAndSettle();
+
+      // Check for validation errors.
+      final error = find.byWidgetPredicate((widget) {
+        if (widget is TextField) {
+          return widget.decoration?.errorText != null;
+        }
+        return false;
+      });
+      expect(error, findsAtLeastNWidgets(1));
+    });
+
+    testWidgets('empty unit field fails validation', (tester) async {
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+
+      // Fill name but leave unit empty
+      await tester.enterText(find.byType(TextFormField).first, 'Body fat');
+      await tester.tap(find.byType(ElevatedButton));
+      await tester.pumpAndSettle();
+
+      // still on same screen
+      expect(find.byType(MeasurementCategoryForm), findsOneWidget);
+    });
+
+    testWidgets('the metric type is not offered', (tester) async {
+      // It is picked when the category is created and immutable from then on,
+      // the server refuses a change
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(DropdownButtonFormField<MetricType>), findsNothing);
+    });
+
+    testWidgets('a typed category has neither a name nor a unit field', (tester) async {
+      final typed = getMeasurementCategories()[1].copyWith(metricType: MetricType.heartRate);
+
+      await tester.pumpWidget(wrap(MeasurementCategoryForm(typed)));
+      await tester.pumpAndSettle();
+
+      // Both come from the metric type, which is also what is displayed
+      expect(find.byType(TextFormField), findsNothing);
+      expect(find.byType(DropdownButtonFormField<ChartType>), findsOneWidget);
+    });
+
+    testWidgets('a category with children gets no chart type picker', (tester) async {
+      // Its chart follows from what its components are to each other, which is
+      // what buildGroupChart decides; a pick would have no effect
+      final parent = getMeasurementCategories()[1];
+      final child = getMeasurementCategories()[0].copyWith(parentId: parent.id);
+      stubMeasurementReads(mockRepo, [parent, child]);
+
+      await tester.pumpWidget(wrap(MeasurementCategoryForm(parent)));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(DropdownButtonFormField<ChartType>), findsNothing);
+    });
+
+    testWidgets('a leaf category gets the chart type picker', (tester) async {
+      final category = getMeasurementCategories()[1];
+      stubMeasurementReads(mockRepo, [category]);
+
+      await tester.pumpWidget(wrap(MeasurementCategoryForm(category)));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(DropdownButtonFormField<ChartType>), findsOneWidget);
+    });
+
+    testWidgets('a leaf category gets the line chart settings', (tester) async {
+      final category = getMeasurementCategories()[1];
+      stubMeasurementReads(mockRepo, [category]);
+
+      await tester.pumpWidget(wrap(MeasurementCategoryForm(category)));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(DropdownButtonFormField<TrendCharacter>), findsOneWidget);
+      expect(find.byType(DropdownButtonFormField<int>), findsOneWidget);
+    });
+
+    testWidgets('a summed type has no line to configure', (tester) async {
+      // Its chart is one bar per day, which has neither a trend nor an
+      // average, and no pick can turn it into a line
+      final steps = getMeasurementCategories()[1].copyWith(metricType: MetricType.steps);
+      stubMeasurementReads(mockRepo, [steps]);
+
+      await tester.pumpWidget(wrap(MeasurementCategoryForm(steps)));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(DropdownButtonFormField<TrendCharacter>), findsNothing);
+      expect(find.byType(DropdownButtonFormField<int>), findsNothing);
+    });
+
+    testWidgets('the line settings are disabled for a chart without a line', (tester) async {
+      // Kept rather than hidden: switching the chart type back applies them
+      // again, and a field that vanishes takes the reason with it
+      final category = getMeasurementCategories()[1].copyWith(chartType: ChartType.delta);
+      stubMeasurementReads(mockRepo, [category]);
+
+      await tester.pumpWidget(wrap(MeasurementCategoryForm(category)));
+      await tester.pumpAndSettle();
+
+      expect(
+        tester
+            .widget<DropdownButtonFormField<TrendCharacter>>(
+              find.byType(DropdownButtonFormField<TrendCharacter>),
+            )
+            .onChanged,
+        isNull,
+      );
+      expect(
+        tester
+            .widget<DropdownButtonFormField<int>>(
+              find.byType(DropdownButtonFormField<int>),
+            )
+            .onChanged,
+        isNull,
+      );
+    });
+
+    testWidgets('the line settings are enabled while the chart is a line', (tester) async {
+      final category = getMeasurementCategories()[1].copyWith(chartType: ChartType.auto);
+      stubMeasurementReads(mockRepo, [category]);
+
+      await tester.pumpWidget(wrap(MeasurementCategoryForm(category)));
+      await tester.pumpAndSettle();
+
+      expect(
+        tester
+            .widget<DropdownButtonFormField<TrendCharacter>>(
+              find.byType(DropdownButtonFormField<TrendCharacter>),
+            )
+            .onChanged,
+        isNotNull,
+      );
+    });
+
+    testWidgets('picking a trend keeps the settings of another client', (tester) async {
+      final category = getMeasurementCategories()[1].copyWith(chartConfig: {'goal_line': 75});
+      stubMeasurementReads(mockRepo, [category]);
+
+      await tester.pumpWidget(wrap(MeasurementCategoryForm(category)));
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.byType(DropdownButtonFormField<TrendCharacter>));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('Reactive').last);
+      await tester.pumpAndSettle();
+      await tester.tap(find.byType(ElevatedButton));
+      await tester.pumpAndSettle();
+
+      final saved =
+          verify(mockRepo.updateLocalDriftCategory(captureAny)).captured.single
+              as MeasurementCategory;
+      expect(saved.chartConfig, {'goal_line': 75, 'trend': 'reactive'});
+    });
+
+    testWidgets('editing existing category pre-fills name and unit', (tester) async {
+      final existing = getMeasurementCategories()[1];
+
+      await tester.pumpWidget(wrap(MeasurementCategoryForm(existing)));
+      await tester.pumpAndSettle();
+
+      expect(find.widgetWithText(TextFormField, 'Biceps'), findsOneWidget);
+      expect(find.widgetWithText(TextFormField, 'cm'), findsOneWidget);
+    });
+  });
+
+  group('MeasurementEntryForm', () {
+    testWidgets('editing keeps source and externalId of imported entries', (tester) async {
+      final category = getMeasurementCategories()[0];
+      stubMeasurementReads(mockRepo, [category]);
+      when(mockRepo.updateLocalDrift(any)).thenAnswer((_) async {});
+
+      final imported = MeasurementEntry(
+        id: 'e-import',
+        categoryId: category.id!,
+        date: DateTime(2026, 1, 1),
+        value: 30,
+        notes: '',
+        source: 'apple',
+        externalId: 'platform-uuid',
+        extraData: const {'unit': 'kg'},
+      );
+
+      await tester.pumpWidget(wrap(MeasurementEntryForm(category.id!, imported)));
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.byType(ElevatedButton));
+      await tester.pumpAndSettle();
+
+      final saved =
+          verify(mockRepo.updateLocalDrift(captureAny)).captured.single as MeasurementEntry;
+      expect(saved.source, 'apple');
+      expect(saved.externalId, 'platform-uuid');
+      expect(saved.extraData, {'unit': 'kg'});
+      expect(saved.value, 30);
+    });
+  });
+
+  group('GroupMeasurementEntryForm', () {
+    testWidgets('renders one DecimalInputWidget per child component', (tester) async {
+      await tester.pumpWidget(
+        wrap(GroupMeasurementEntryForm(testMeasurementCategoryBloodPressure)),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.byType(DecimalInputWidget), findsNWidgets(2));
+    });
+
+    testWidgets('empty value fields fail validation', (tester) async {
+      await tester.pumpWidget(
+        wrap(GroupMeasurementEntryForm(testMeasurementCategoryBloodPressure)),
+      );
+      await tester.pumpAndSettle();
+
+      // Tap save without entering values
+      await tester.tap(find.byType(ElevatedButton));
+      await tester.pumpAndSettle();
+
+      // Form does not pop
+      expect(find.byType(GroupMeasurementEntryForm), findsOneWidget);
+      verifyNever(mockRepo.addLocalDriftGroupEntries(any));
+    });
+
+    testWidgets('valid submission adds one entry per component, sharing the date', (tester) async {
+      await tester.pumpWidget(
+        wrap(GroupMeasurementEntryForm(testMeasurementCategoryBloodPressure)),
+      );
+      await tester.pumpAndSettle();
+
+      final fields = find.byType(TextFormField);
+      // Fields: date, time, systolic value, diastolic value
+      await tester.enterText(fields.at(2), '120');
+      await tester.enterText(fields.at(3), '80');
+
+      await tester.tap(find.byType(ElevatedButton));
+      await tester.pumpAndSettle();
+
+      final entries =
+          verify(mockRepo.addLocalDriftGroupEntries(captureAny)).captured.single
+              as List<MeasurementEntry>;
+      expect(entries.map((e) => (e.categoryId, e.value)), [('sys', 120), ('dia', 80)]);
+      expect(entries.first.date, entries.last.date);
+    });
+  });
+}
diff --git a/test/features/measurements/widgets/forms_test.mocks.dart b/test/features/measurements/widgets/forms_test.mocks.dart
new file mode 100644
index 000000000..c112af419
--- /dev/null
+++ b/test/features/measurements/widgets/forms_test.mocks.dart
@@ -0,0 +1,281 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/measurements/widgets/forms_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i3;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i6;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i4;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i5;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i2;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+/// A class which mocks [MeasurementRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepository {
+  MockMeasurementRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<List<_i4.MeasurementCategory>> watchAllWithoutEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i3.Stream<List<_i4.MeasurementCategory>>.empty(),
+          )
+          as _i3.Stream<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchCategoryWithoutEntries(
+    String? id,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<Map<String, _i5.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i3.Stream<Map<String, _i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementBucket>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementBucket>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementValueCount>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementValueCount>>);
+
+  @override
+  _i3.Future<List<_i4.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i3.Future<List<_i4.MeasurementCategory>>.value(
+              <_i4.MeasurementCategory>[],
+            ),
+          )
+          as _i3.Future<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
+
+  @override
+  _i3.Future<Map<String, _i5.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i3.Future<Map<String, _i5.MeasurementEntry>>.value(
+              <String, _i5.MeasurementEntry>{},
+            ),
+          )
+          as _i3.Future<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
+  @override
+  _i3.Future<void> deleteLocalDrift(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDrift, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftGroupEntries(
+    List<_i5.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteLocalDriftCategory(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDriftCategory, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDriftCategory(
+    _i4.MeasurementCategory? category,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategory(_i4.MeasurementCategory? category) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategoryGroup(
+    List<_i4.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}
diff --git a/test/features/measurements/widgets/helpers_test.dart b/test/features/measurements/widgets/helpers_test.dart
new file mode 100644
index 000000000..d6f829d6f
--- /dev/null
+++ b/test/features/measurements/widgets/helpers_test.dart
@@ -0,0 +1,703 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:fl_chart/fl_chart.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/features/measurements/charts/data.dart';
+import 'package:wger/features/measurements/charts/series.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/widgets/charts.dart';
+import 'package:wger/features/measurements/widgets/helpers.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../helpers/measurement_chart_buckets.dart';
+
+Widget _wrapChart(Widget chart) => MaterialApp(
+  localizationsDelegates: AppLocalizations.localizationsDelegates,
+  supportedLocales: AppLocalizations.supportedLocales,
+  home: Scaffold(
+    body: SizedBox(width: 400, height: 300, child: chart),
+  ),
+);
+
+/// Pumps a MaterialApp whose body is the widget list built by [builder].
+Future<void> _pumpWidgetList(
+  WidgetTester tester,
+  List<Widget> Function(BuildContext context) builder,
+) async {
+  await tester.pumpWidget(
+    MaterialApp(
+      localizationsDelegates: AppLocalizations.localizationsDelegates,
+      supportedLocales: AppLocalizations.supportedLocales,
+      home: Builder(
+        builder: (ctx) => Scaffold(
+          body: SingleChildScrollView(child: Column(children: builder(ctx))),
+        ),
+      ),
+    ),
+  );
+  await tester.pumpAndSettle();
+}
+
+void main() {
+  final rawEntries = [
+    MeasurementChartEntry(10, DateTime(2026, 1, 1)),
+    MeasurementChartEntry(20, DateTime(2026, 1, 10)),
+  ];
+  final avgEntries = movingAverage(rawEntries);
+
+  group('buildChartForMetricType routing', () {
+    final entries = [
+      MeasurementChartEntry(1000, DateTime(2026, 1, 1)),
+      MeasurementChartEntry(2000, DateTime(2026, 1, 2)),
+    ];
+
+    testWidgets('steps -> MeasurementBarChartWidgetFl', (tester) async {
+      final widget = buildChartForMetricType(MetricType.steps, entries, [], 'steps');
+      await tester.pumpWidget(_wrapChart(widget));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(MeasurementBarChartWidgetFl), findsOneWidget);
+      expect(find.byType(MeasurementChartWidgetFl), findsNothing);
+    });
+
+    testWidgets('custom -> MeasurementChartWidgetFl', (tester) async {
+      final widget = buildChartForMetricType(MetricType.custom, entries, [], 'cm');
+      await tester.pumpWidget(_wrapChart(widget));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(MeasurementChartWidgetFl), findsOneWidget);
+      expect(find.byType(MeasurementBarChartWidgetFl), findsNothing);
+    });
+
+    testWidgets('a condensed history draws one band, around the values', (tester) async {
+      // Condensed points carry the range they stand for, and the average
+      // derived from them inherits it. Only the values may be given a band;
+      // the average must not get a second one.
+      final many = [
+        for (var i = 0; i < 40; i++)
+          MeasurementChartEntry(
+            60 + i % 7,
+            DateTime(2026, 1, 1).add(Duration(days: i)),
+            min: 55,
+            max: 70,
+          ),
+      ];
+      final widget = buildChartForMetricType(
+        MetricType.custom,
+        many,
+        movingAverage(many),
+        'kg',
+      );
+      await tester.pumpWidget(_wrapChart(widget));
+      await tester.pumpAndSettle();
+
+      final data = tester.widget<LineChart>(find.byType(LineChart)).data;
+      expect(data.betweenBarsData, hasLength(1));
+    });
+
+    testWidgets('energy -> MeasurementBarChartWidgetFl', (tester) async {
+      final widget = buildChartForMetricType(MetricType.energy, entries, [], 'kcal');
+      await tester.pumpWidget(_wrapChart(widget));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(MeasurementBarChartWidgetFl), findsOneWidget);
+    });
+
+    testWidgets('a heatmap override wins over the derived chart', (tester) async {
+      final widget = buildChartForMetricType(
+        MetricType.steps,
+        entries,
+        [],
+        'steps',
+        chartType: ChartType.heatmap,
+      );
+      await tester.pumpWidget(_wrapChart(widget));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(MeasurementHeatmapWidgetFl), findsOneWidget);
+      expect(find.byType(MeasurementBarChartWidgetFl), findsNothing);
+    });
+
+    testWidgets('a sample type keeps its line chart under a bar override', (tester) async {
+      // Bars are not offered for a sample type, and a value that does not fit
+      // falls back to the derived chart instead of being drawn anyway
+      final widget = buildChartForMetricType(
+        MetricType.custom,
+        entries,
+        [],
+        'cm',
+        chartType: ChartType.bar,
+      );
+      await tester.pumpWidget(_wrapChart(widget));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(MeasurementChartWidgetFl), findsOneWidget);
+    });
+
+    testWidgets('a delta override draws the weekly changes as signed bars', (tester) async {
+      // 5 January 2026 is a Monday
+      final weekly = [
+        MeasurementChartEntry(80, DateTime(2026, 1, 5)),
+        MeasurementChartEntry(79, DateTime(2026, 1, 12)),
+        MeasurementChartEntry(79.5, DateTime(2026, 1, 19)),
+      ];
+      final widget = buildChartForMetricType(
+        MetricType.bodyWeight,
+        weekly,
+        [],
+        'kg',
+        chartType: ChartType.delta,
+      );
+      await tester.pumpWidget(_wrapChart(widget));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(MeasurementChartWidgetFl), findsNothing);
+      final rods = tester
+          .widget<BarChart>(find.byType(BarChart))
+          .data
+          .barGroups
+          .map((g) => g.barRods.single);
+      expect(rods.map((r) => r.toY), [-1, 0.5]);
+      expect(rods.first.color, isNot(rods.last.color));
+    });
+
+    testWidgets('a distribution override bins the values instead of plotting them', (tester) async {
+      final history = [
+        for (var i = 0; i < 30; i++) MeasurementChartEntry(80 + (i % 5), DateTime(2026, 1, 1 + i)),
+      ];
+      final widget = buildChartForMetricType(
+        MetricType.bodyWeight,
+        history,
+        [],
+        'kg',
+        chartType: ChartType.distribution,
+        // Built by the caller, which is where the counted values are read
+        distribution: MeasurementDistributionWidgetFl(
+          [for (final point in history) (value: point.value, count: 1)],
+          latest: history.last.value,
+          unit: 'kg',
+        ),
+      );
+      await tester.pumpWidget(_wrapChart(widget));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(MeasurementChartWidgetFl), findsNothing);
+      expect(find.byType(MeasurementDistributionWidgetFl), findsOneWidget);
+    });
+
+    testWidgets('a distribution of too few values falls back to the derived chart', (tester) async {
+      // A histogram of a handful of values is noise with gaps, so the card
+      // shows the default chart instead of an empty-looking one
+      final widget = buildChartForMetricType(
+        MetricType.bodyWeight,
+        [for (var i = 0; i < 5; i++) MeasurementChartEntry(80, DateTime(2026, 1, 1 + i))],
+        [],
+        'kg',
+        chartType: ChartType.distribution,
+      );
+      await tester.pumpWidget(_wrapChart(widget));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(MeasurementDistributionWidgetFl), findsNothing);
+      expect(find.byType(MeasurementChartWidgetFl), findsOneWidget);
+    });
+
+    testWidgets('condensed points are counted by what they stand for', (tester) async {
+      // A hundred weigh-ins around one number are a distribution, however few
+      // points they were condensed into
+      final widget = buildChartForMetricType(
+        MetricType.bodyWeight,
+        [
+          for (var i = 0; i < 5; i++)
+            MeasurementChartEntry(80, DateTime(2026, 1, 1 + i), count: 20),
+        ],
+        [],
+        'kg',
+        chartType: ChartType.distribution,
+        distribution: const MeasurementDistributionWidgetFl(
+          [(value: 80, count: 100)],
+          latest: 80,
+          unit: 'kg',
+        ),
+      );
+      await tester.pumpWidget(_wrapChart(widget));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(MeasurementDistributionWidgetFl), findsOneWidget);
+    });
+
+    testWidgets('a summed distribution measures its days, not its samples', (tester) async {
+      // 30 samples on 5 days are 5 daily totals: not enough for a histogram,
+      // whatever the sample count says
+      final widget = buildChartForMetricType(
+        MetricType.steps,
+        [
+          for (var i = 0; i < 30; i++)
+            MeasurementChartEntry(500, DateTime(2026, 1, 1 + i % 5, 8 + i ~/ 5)),
+        ],
+        [],
+        'count',
+        chartType: ChartType.distribution,
+      );
+      await tester.pumpWidget(_wrapChart(widget));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(MeasurementDistributionWidgetFl), findsNothing);
+      expect(find.byType(BarChart), findsOneWidget);
+    });
+
+    testWidgets('a heatmap keeps one point per day instead of condensing', (tester) async {
+      // Past ~200 points the line chart condenses into calendar buckets, which
+      // for a grid of days would collapse whole weeks into a single cell
+      final many = [
+        for (var i = 0; i < 300; i++)
+          MeasurementChartEntry(60 + i % 7, DateTime(2026, 1, 1).add(Duration(days: i))),
+      ];
+      final widget = buildChartForMetricType(
+        MetricType.custom,
+        many,
+        [],
+        'kg',
+        chartType: ChartType.heatmap,
+      );
+      await tester.pumpWidget(_wrapChart(widget));
+      await tester.pumpAndSettle();
+
+      final heatmap = tester.widget<MeasurementHeatmapWidgetFl>(
+        find.byType(MeasurementHeatmapWidgetFl),
+      );
+      expect(heatmap.days, hasLength(300));
+    });
+  });
+
+  group('group charts', () {
+    MeasurementEntry entry(String categoryId, DateTime date, num value) =>
+        MeasurementEntry(categoryId: categoryId, date: date, value: value, notes: '');
+
+    /// A sleep group as the importer writes it: the total plus its stages.
+    MeasurementCategory sleepGroup() => MeasurementCategory(
+      id: 'g',
+      name: 'Sleep',
+      unit: 'min',
+      metricType: MetricType.sleep,
+      children: [
+        MeasurementCategory(
+          id: 'total',
+          name: 'Total sleep',
+          unit: 'min',
+          metricType: MetricType.sleepTotal,
+          parentId: 'g',
+        ),
+        MeasurementCategory(
+          id: 'deep',
+          name: 'Deep sleep',
+          unit: 'min',
+          metricType: MetricType.sleepDeep,
+          parentId: 'g',
+          order: 1,
+        ),
+        MeasurementCategory(
+          id: 'rem',
+          name: 'REM sleep',
+          unit: 'min',
+          metricType: MetricType.sleepRem,
+          parentId: 'g',
+          order: 2,
+        ),
+      ],
+    );
+
+    Map<String, List<MeasurementEntry>> sleepEntries({bool withStages = true}) => {
+      'total': [entry('total', DateTime(2026, 1, 2), 480)],
+      'deep': withStages ? [entry('deep', DateTime(2026, 1, 2), 90)] : const [],
+      'rem': withStages ? [entry('rem', DateTime(2026, 1, 2), 60)] : const [],
+    };
+
+    MeasurementCategory bloodPressure() => MeasurementCategory(
+      id: 'bp',
+      name: 'Blood pressure',
+      unit: 'mmHg',
+      metricType: MetricType.bloodPressure,
+      children: [
+        MeasurementCategory(
+          id: 'sys',
+          name: 'Systolic',
+          unit: 'mmHg',
+          metricType: MetricType.bloodPressureSystolic,
+          parentId: 'bp',
+        ),
+        MeasurementCategory(
+          id: 'dia',
+          name: 'Diastolic',
+          unit: 'mmHg',
+          metricType: MetricType.bloodPressureDiastolic,
+          parentId: 'bp',
+          order: 1,
+        ),
+      ],
+    );
+
+    Map<String, List<MeasurementEntry>> bloodPressureEntries() => {
+      'sys': [entry('sys', DateTime(2026, 1, 2, 8), 120)],
+      'dia': [entry('dia', DateTime(2026, 1, 2, 8), 80)],
+    };
+
+    /// The points the aggregated query returns for [group], which is one
+    /// bucket per entry unless the metric is summed per day
+    Map<String, List<MeasurementChartEntry>> pointsOf(
+      MeasurementCategory group,
+      Map<String, List<MeasurementEntry>> entries,
+    ) => groupComponentPoints(group, {
+      for (final child in group.children)
+        child.id!: group.metricType.isSummedPerDay
+            ? dayBuckets(entries[child.id] ?? const [])
+            : entryBuckets(entries[child.id] ?? const []),
+    });
+
+    test('the roll-up component is left out of the stack', () {
+      // Total sleep covers the stages, so stacking it would count the night
+      // twice
+      expect(
+        stackableComponents(sleepGroup()).map((c) => c.metricType),
+        [MetricType.sleepDeep, MetricType.sleepRem],
+      );
+      expect(stackableComponents(bloodPressure()), hasLength(2));
+    });
+
+    test('stacked entries carry one value per component and day', () {
+      final components = stackableComponents(sleepGroup());
+      final stacked = groupStackedEntries(components, pointsOf(sleepGroup(), sleepEntries()));
+
+      expect(stacked, hasLength(1));
+      expect(stacked.single.date, DateTime(2026, 1, 2));
+      expect(stacked.single.values, [90, 60]);
+      expect(stacked.single.total, 150);
+    });
+
+    test('several entries of one day add up within their component', () {
+      // A nap next to the night: the bar shows the day, not the segment
+      final group = MeasurementCategory(
+        id: 'g',
+        name: 'Sleep',
+        unit: 'min',
+        metricType: MetricType.sleep,
+        children: [
+          MeasurementCategory(
+            id: 'deep',
+            name: 'Deep sleep',
+            unit: 'min',
+            metricType: MetricType.sleepDeep,
+            parentId: 'g',
+          ),
+        ],
+      );
+      final entries = {
+        'deep': [
+          entry('deep', DateTime(2026, 1, 2, 3), 90),
+          entry('deep', DateTime(2026, 1, 2, 14), 20),
+        ],
+      };
+
+      expect(groupStackedEntries(group.children, pointsOf(group, entries)).single.values, [110]);
+    });
+
+    test('readings pair the components on their shared timestamp', () {
+      final group = bloodPressure();
+      final readings = groupReadings(
+        group,
+        bloodPressureEntries().values.expand((e) => e).toList(),
+      );
+
+      expect(readings, hasLength(1));
+      expect(readings.single.$1, DateTime(2026, 1, 2, 8));
+      // keyed by the component id, the name is translated for display
+      expect(readings.single.$2, {'sys': 120, 'dia': 80});
+    });
+
+    testWidgets('a summed group stacks its components', (tester) async {
+      await tester.pumpWidget(
+        _wrapChart(
+          Builder(
+            builder: (ctx) =>
+                buildGroupChart(ctx, sleepGroup(), pointsOf(sleepGroup(), sleepEntries())),
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.byType(MeasurementStackedBarChartWidgetFl), findsOneWidget);
+    });
+
+    testWidgets('a two-component group is a floating bar per reading', (tester) async {
+      await tester.pumpWidget(
+        _wrapChart(
+          Builder(
+            builder: (ctx) => buildGroupChart(
+              ctx,
+              bloodPressure(),
+              pointsOf(bloodPressure(), bloodPressureEntries()),
+            ),
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.byType(MeasurementBarChartWidgetFl), findsOneWidget);
+      expect(find.byType(MeasurementStackedBarChartWidgetFl), findsNothing);
+    });
+
+    testWidgets('without stage data the group falls back to lines', (tester) async {
+      // Only the total reported, so there is nothing to stack. Falling through
+      // to the line chart keeps the card from going blank while data exists
+      await tester.pumpWidget(
+        _wrapChart(
+          Builder(
+            builder: (ctx) => buildGroupChart(
+              ctx,
+              sleepGroup(),
+              pointsOf(sleepGroup(), sleepEntries(withStages: false)),
+            ),
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.byType(MeasurementStackedBarChartWidgetFl), findsNothing);
+      expect(find.byType(MeasurementChartWidgetFl), findsOneWidget);
+    });
+  });
+
+  group('buildChartSection', () {
+    testWidgets('empty raw shows no-data placeholder', (tester) async {
+      await _pumpWidgetList(
+        tester,
+        (ctx) => buildChartSection(ctx, title: 'Test', raw: [], avg: [], unit: 'cm'),
+      );
+
+      expect(find.text('No data available'), findsOneWidget);
+    });
+
+    testWidgets('non-empty avg includes MeasurementOverallChangeWidget', (tester) async {
+      await _pumpWidgetList(
+        tester,
+        (ctx) =>
+            buildChartSection(ctx, title: 'Test', raw: rawEntries, avg: avgEntries, unit: 'cm'),
+      );
+
+      expect(find.byType(MeasurementOverallChangeWidget), findsOneWidget);
+    });
+  });
+
+  group('buildSeriesChartSection legend', () {
+    testWidgets('three Indicator widgets for non-summed metric (custom)', (tester) async {
+      await _pumpWidgetList(
+        tester,
+        (ctx) => buildSeriesChartSection(
+          ctx,
+          name: 'Weight',
+          entriesAll: rawEntries,
+          average: avgEntries,
+          unit: 'kg',
+          metricType: MetricType.custom,
+        ),
+      );
+
+      expect(find.byType(Indicator), findsNWidgets(3));
+      // The screen names the category and the range selector names the range
+      expect(find.textContaining('Weight'), findsNothing);
+    });
+
+    testWidgets('two Indicator widgets for summed metric (steps, no trend)', (tester) async {
+      await _pumpWidgetList(
+        tester,
+        (ctx) => buildSeriesChartSection(
+          ctx,
+          name: 'Steps',
+          entriesAll: rawEntries,
+          average: avgEntries,
+          unit: 'steps',
+          metricType: MetricType.steps,
+        ),
+      );
+
+      // isSummedPerDay -> trend indicator is hidden
+      expect(find.byType(Indicator), findsNWidgets(2));
+    });
+
+    testWidgets('plan periods add their own indicator', (tester) async {
+      await _pumpWidgetList(
+        tester,
+        (ctx) => buildSeriesChartSection(
+          ctx,
+          name: 'Weight',
+          entriesAll: rawEntries,
+          average: avgEntries,
+          unit: 'kg',
+          planPeriods: [
+            (
+              range: DateTimeRange(start: DateTime(2026, 1, 2), end: DateTime(2026, 1, 5)),
+              name: 'Cut',
+            ),
+          ],
+          metricType: MetricType.custom,
+        ),
+      );
+
+      expect(find.byType(Indicator), findsNWidgets(4));
+    });
+  });
+
+  group('buildSeriesChartSection change chart', () {
+    final history = [
+      for (var i = 0; i < 100; i++)
+        MeasurementChartEntry(60 + (i % 5), DateTime.now().subtract(Duration(days: 99 - i))),
+    ];
+
+    Future<void> pumpDelta(WidgetTester tester) => _pumpWidgetList(
+      tester,
+      (ctx) => buildSeriesChartSection(
+        ctx,
+        name: 'Weight',
+        entriesAll: history,
+        average: movingAverage(history),
+        unit: 'kg',
+        metricType: MetricType.bodyWeight,
+        chartType: ChartType.delta,
+      ),
+    );
+
+    testWidgets('one chart, without the legend of lines it does not draw', (tester) async {
+      await pumpDelta(tester);
+
+      expect(find.byType(BarChart), findsOneWidget);
+      expect(find.byType(LineChart), findsNothing);
+      expect(find.byType(Indicator), findsNothing);
+    });
+
+    testWidgets('the title says the bars are changes, not values', (tester) async {
+      await pumpDelta(tester);
+
+      expect(find.text('Weight, change per week'), findsOneWidget);
+    });
+
+    testWidgets('keeps the overall change, the one-number version of it', (tester) async {
+      await pumpDelta(tester);
+
+      expect(find.byType(MeasurementOverallChangeWidget), findsOneWidget);
+    });
+  });
+
+  group('buildSeriesChartSection distribution chart', () {
+    final history = [
+      for (var i = 0; i < 100; i++)
+        MeasurementChartEntry(60 + (i % 5), DateTime.now().subtract(Duration(days: 99 - i))),
+    ];
+
+    Future<void> pumpDistribution(WidgetTester tester) => _pumpWidgetList(
+      tester,
+      (ctx) => buildSeriesChartSection(
+        ctx,
+        name: 'Weight',
+        entriesAll: history,
+        average: movingAverage(history),
+        unit: 'kg',
+        metricType: MetricType.bodyWeight,
+        chartType: ChartType.distribution,
+        // Built by the caller, which is where the counted values are read
+        distribution: MeasurementDistributionWidgetFl(
+          [for (final point in history) (value: point.value, count: 1)],
+          latest: history.last.value,
+          unit: 'kg',
+        ),
+      ),
+    );
+
+    testWidgets('one histogram, without the legend of lines it does not draw', (tester) async {
+      await pumpDistribution(tester);
+
+      expect(find.byType(MeasurementDistributionWidgetFl), findsOneWidget);
+      expect(find.byType(LineChart), findsNothing);
+      expect(find.byType(Indicator), findsNothing);
+    });
+
+    testWidgets('the title says the bars are a distribution, not a history', (tester) async {
+      await pumpDistribution(tester);
+
+      expect(find.text('Weight, distribution'), findsOneWidget);
+    });
+
+    testWidgets('no overall change: a distribution has no direction', (tester) async {
+      await pumpDistribution(tester);
+
+      expect(find.byType(MeasurementOverallChangeWidget), findsNothing);
+    });
+
+    testWidgets('too few values fall back to the usual line chart', (tester) async {
+      await _pumpWidgetList(
+        tester,
+        (ctx) => buildSeriesChartSection(
+          ctx,
+          name: 'Weight',
+          entriesAll: history.take(5).toList(),
+          average: movingAverage(history.take(5).toList()),
+          unit: 'kg',
+          metricType: MetricType.bodyWeight,
+          chartType: ChartType.distribution,
+        ),
+      );
+
+      expect(find.byType(MeasurementDistributionWidgetFl), findsNothing);
+      expect(find.byType(LineChart), findsOneWidget);
+      expect(find.text('Weight, distribution'), findsNothing);
+    });
+  });
+
+  group('buildSeriesChartSection plan periods', () {
+    testWidgets('one chart with bands instead of one chart per plan', (tester) async {
+      await _pumpWidgetList(
+        tester,
+        (ctx) => buildSeriesChartSection(
+          ctx,
+          name: 'Weight',
+          entriesAll: rawEntries,
+          average: avgEntries,
+          unit: 'kg',
+          planPeriods: [
+            (
+              range: DateTimeRange(start: DateTime(2026, 1, 2), end: DateTime(2026, 1, 5)),
+              name: 'Cut',
+            ),
+            (
+              range: DateTimeRange(start: DateTime(2026, 2, 1), end: DateTime(2026, 2, 10)),
+              name: 'Bulk',
+            ),
+          ],
+          metricType: MetricType.custom,
+        ),
+      );
+
+      expect(find.byType(MeasurementChartWidgetFl), findsOneWidget);
+      final data = tester.widget<LineChart>(find.byType(LineChart)).data;
+      // only the february plan misses the data range
+      expect(data.rangeAnnotations.verticalRangeAnnotations, hasLength(1));
+    });
+  });
+}
diff --git a/test/features/measurements/widgets/measurement_fab_test.dart b/test/features/measurements/widgets/measurement_fab_test.dart
new file mode 100644
index 000000000..1ac29858a
--- /dev/null
+++ b/test/features/measurements/widgets/measurement_fab_test.dart
@@ -0,0 +1,128 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:wger/core/form_screen.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+import 'package:wger/features/measurements/widgets/measurement_fab.dart';
+import 'package:wger/features/measurements/widgets/metric_picker.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../helpers/measurement_repository_stubs.dart';
+import 'measurement_fab_test.mocks.dart';
+
+MeasurementEntry _entry(String categoryId, {required String source}) => MeasurementEntry(
+  id: '$categoryId-1',
+  categoryId: categoryId,
+  date: DateTime(2026, 8, 1),
+  value: 1,
+  notes: '',
+  source: source,
+);
+
+Widget _wrap(
+  List<MeasurementCategory> categories,
+  Map<String, List<MeasurementEntry>> entries,
+) {
+  final mockRepo = MockMeasurementRepository();
+  stubMeasurementReads(mockRepo, categories, entries);
+
+  return ProviderScope(
+    overrides: [measurementRepositoryProvider.overrideWithValue(mockRepo)],
+    child: MaterialApp(
+      localizationsDelegates: AppLocalizations.localizationsDelegates,
+      supportedLocales: AppLocalizations.supportedLocales,
+      routes: {FormScreen.routeName: (_) => const Text('form-screen')},
+      home: const Scaffold(floatingActionButton: MeasurementsFab()),
+    ),
+  );
+}
+
+@GenerateMocks([MeasurementRepository])
+void main() {
+  final biceps = MeasurementCategory(id: 'biceps', name: 'Biceps', unit: 'cm');
+  final restingHeartRate = MeasurementCategory(
+    id: 'rhr',
+    name: 'Resting heart rate',
+    unit: 'bpm',
+    metricType: MetricType.restingHeartRate,
+  );
+
+  final categories = [biceps, restingHeartRate];
+  final entries = {
+    'biceps': [_entry('biceps', source: 'user')],
+    'rhr': [_entry('rhr', source: 'google')],
+  };
+
+  group('MeasurementsFab', () {
+    testWidgets('opens into the hand-kept categories and the picker action', (tester) async {
+      await tester.pumpWidget(_wrap(categories, entries));
+      await tester.pumpAndSettle();
+
+      // Closed: the menu is not tappable
+      expect(find.text('Biceps').hitTestable(), findsNothing);
+
+      await tester.tap(find.byType(FloatingActionButton));
+      await tester.pumpAndSettle();
+
+      expect(find.text('Biceps').hitTestable(), findsOneWidget);
+      expect(find.text('Track something new').hitTestable(), findsOneWidget);
+      // Machine-fed by its newest reading, so logging by hand is not offered
+      expect(find.text('Resting heart rate').hitTestable(), findsNothing);
+    });
+
+    testWidgets('a category action opens its entry form', (tester) async {
+      await tester.pumpWidget(_wrap(categories, entries));
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.byType(FloatingActionButton));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('Biceps'));
+      await tester.pumpAndSettle();
+
+      expect(find.text('form-screen'), findsOneWidget);
+    });
+
+    testWidgets('the picker action opens the metric picker sheet', (tester) async {
+      await tester.pumpWidget(_wrap(categories, entries));
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.byType(FloatingActionButton));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('Track something new'));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(MetricPickerSheet), findsOneWidget);
+    });
+
+    testWidgets('a category without entries counts as hand-kept', (tester) async {
+      await tester.pumpWidget(_wrap([restingHeartRate], const {}));
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.byType(FloatingActionButton));
+      await tester.pumpAndSettle();
+
+      expect(find.text('Resting heart rate').hitTestable(), findsOneWidget);
+    });
+  });
+}
diff --git a/test/features/measurements/widgets/measurement_fab_test.mocks.dart b/test/features/measurements/widgets/measurement_fab_test.mocks.dart
new file mode 100644
index 000000000..6e91c093c
--- /dev/null
+++ b/test/features/measurements/widgets/measurement_fab_test.mocks.dart
@@ -0,0 +1,281 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/measurements/widgets/measurement_fab_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i3;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i6;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i4;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i5;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i2;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+/// A class which mocks [MeasurementRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepository {
+  MockMeasurementRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<List<_i4.MeasurementCategory>> watchAllWithoutEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i3.Stream<List<_i4.MeasurementCategory>>.empty(),
+          )
+          as _i3.Stream<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchCategoryWithoutEntries(
+    String? id,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<Map<String, _i5.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i3.Stream<Map<String, _i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementBucket>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementBucket>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementValueCount>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementValueCount>>);
+
+  @override
+  _i3.Future<List<_i4.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i3.Future<List<_i4.MeasurementCategory>>.value(
+              <_i4.MeasurementCategory>[],
+            ),
+          )
+          as _i3.Future<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
+
+  @override
+  _i3.Future<Map<String, _i5.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i3.Future<Map<String, _i5.MeasurementEntry>>.value(
+              <String, _i5.MeasurementEntry>{},
+            ),
+          )
+          as _i3.Future<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
+  @override
+  _i3.Future<void> deleteLocalDrift(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDrift, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftGroupEntries(
+    List<_i5.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteLocalDriftCategory(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDriftCategory, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDriftCategory(
+    _i4.MeasurementCategory? category,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategory(_i4.MeasurementCategory? category) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategoryGroup(
+    List<_i4.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}
diff --git a/test/features/measurements/widgets/measurement_tile_test.dart b/test/features/measurements/widgets/measurement_tile_test.dart
new file mode 100644
index 000000000..4673065a9
--- /dev/null
+++ b/test/features/measurements/widgets/measurement_tile_test.dart
@@ -0,0 +1,329 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:wger/features/measurements/charts/range.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+import 'package:wger/features/measurements/screens/measurement_entries_screen.dart';
+import 'package:wger/features/measurements/widgets/charts.dart';
+import 'package:wger/features/measurements/widgets/measurement_tile.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../helpers/measurement_chart_buckets.dart';
+import '../../../helpers/measurement_repository_stubs.dart';
+import 'measurement_tile_test.mocks.dart';
+
+/// The calendar day [daysAgo] days back, at midnight like a day bucket.
+DateTime _day(int daysAgo) {
+  final now = DateTime.now();
+  return DateTime(now.year, now.month, now.day - daysAgo);
+}
+
+MeasurementEntry _entry(String categoryId, num value, DateTime date, {String source = 'user'}) =>
+    MeasurementEntry(
+      id: '$categoryId-$date',
+      categoryId: categoryId,
+      date: date,
+      value: value,
+      notes: '',
+      source: source,
+    );
+
+Widget _wrap(
+  MeasurementCategory category, {
+  List<MeasurementCategory> categories = const [],
+  Map<String, List<MeasurementEntry>> entries = const {},
+  ChartRange range = ChartRange.last3Months,
+}) {
+  final mockRepo = MockMeasurementRepository();
+  stubMeasurementReads(mockRepo, categories.isEmpty ? [category] : categories, entries);
+
+  return ProviderScope(
+    overrides: [
+      measurementRepositoryProvider.overrideWithValue(mockRepo),
+      measurementChartBucketsProvider.overrideWith(chartBucketsFrom(entries)),
+      measurementGroupBucketsProvider.overrideWith(
+        groupBucketsFrom(categories.isEmpty ? [category] : categories, entries),
+      ),
+    ],
+    child: MaterialApp(
+      localizationsDelegates: AppLocalizations.localizationsDelegates,
+      supportedLocales: AppLocalizations.supportedLocales,
+      routes: {
+        MeasurementEntriesScreen.routeName: (_) => const Text('entries-screen'),
+      },
+      home: Scaffold(
+        body: Center(
+          child: SizedBox(
+            width: 180,
+            height: measurementTileExtent,
+            child: MeasurementTile(category, range: range),
+          ),
+        ),
+      ),
+    ),
+  );
+}
+
+@GenerateMocks([MeasurementRepository])
+void main() {
+  final restingHeartRate = MeasurementCategory(
+    id: 'rhr',
+    name: 'Resting heart rate',
+    unit: 'bpm',
+    metricType: MetricType.restingHeartRate,
+  );
+
+  group('MeasurementTile', () {
+    testWidgets('daily tile: latest value, weekday axis and a stable trend', (tester) async {
+      final entries = {
+        'rhr': [for (var day = 6; day >= 0; day--) _entry('rhr', 61, _day(day))],
+      };
+
+      await tester.pumpWidget(_wrap(restingHeartRate, entries: entries));
+      await tester.pumpAndSettle();
+
+      expect(find.text('Resting heart rate'), findsOneWidget);
+      expect(find.text('61 bpm'), findsOneWidget);
+      expect(find.byType(SparkLineChart), findsOneWidget);
+      expect(find.textContaining('stable'), findsOneWidget);
+    });
+
+    testWidgets('a moving value quotes its weekly rate instead', (tester) async {
+      final entries = {
+        'rhr': [for (var day = 6; day >= 0; day--) _entry('rhr', 70 - day * 2, _day(day))],
+      };
+
+      await tester.pumpWidget(_wrap(restingHeartRate, entries: entries));
+      await tester.pumpAndSettle();
+
+      expect(find.textContaining('/week'), findsOneWidget);
+      expect(find.textContaining('↗'), findsOneWidget);
+    });
+
+    testWidgets('sparse tile: dots and the month axis', (tester) async {
+      final entries = {
+        'biceps': [_entry('biceps', 38.5, _day(21))],
+      };
+      final biceps = MeasurementCategory(id: 'biceps', name: 'Biceps', unit: 'cm');
+
+      await tester.pumpWidget(_wrap(biceps, entries: entries));
+      await tester.pumpAndSettle();
+
+      expect(find.text('38.5 cm'), findsOneWidget);
+      final dots = tester.widget<SparkLineChart>(find.byType(SparkLineChart));
+      expect(dots.dots, isTrue);
+    });
+
+    testWidgets('the hero says how long ago it was measured', (tester) async {
+      // Right under the value, since it qualifies the value rather than the
+      // chart; a stale-looking spark is then readable as "not measured since"
+      await tester.pumpWidget(
+        _wrap(
+          restingHeartRate,
+          entries: {
+            'rhr': [_entry('rhr', 61, _day(0))],
+          },
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.text('today'), findsOneWidget);
+    });
+
+    testWidgets('a value measured a while back says so in weeks', (tester) async {
+      await tester.pumpWidget(
+        _wrap(
+          restingHeartRate,
+          entries: {
+            'rhr': [_entry('rhr', 61, _day(21))],
+          },
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.text('3 weeks ago'), findsOneWidget);
+    });
+
+    testWidgets('summed tile: bars and the window average', (tester) async {
+      final steps = MeasurementCategory(
+        id: 'steps',
+        name: 'Steps',
+        metricType: MetricType.steps,
+      );
+      final entries = {
+        'steps': [_entry('steps', 8000, _day(1)), _entry('steps', 6000, _day(2))],
+      };
+
+      await tester.pumpWidget(_wrap(steps, entries: entries));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(SparkBarChart), findsOneWidget);
+      expect(find.textContaining('avg'), findsOneWidget);
+    });
+
+    testWidgets('the range filter decides between daily and weekly slots', (tester) async {
+      final steps = MeasurementCategory(
+        id: 'steps',
+        name: 'Steps',
+        metricType: MetricType.steps,
+      );
+      final entries = {
+        'steps': [_entry('steps', 8000, _day(1)), _entry('steps', 6000, _day(2))],
+      };
+
+      // A week is seven daily slots and a month one per day; three months
+      // come as calendar weeks
+      await tester.pumpWidget(_wrap(steps, entries: entries, range: ChartRange.lastWeek));
+      await tester.pumpAndSettle();
+      var chart = tester.widget<SparkBarChart>(find.byType(SparkBarChart));
+      expect(chart.data.slotCount, 7);
+
+      await tester.pumpWidget(_wrap(steps, entries: entries, range: ChartRange.lastMonth));
+      await tester.pumpAndSettle();
+      chart = tester.widget<SparkBarChart>(find.byType(SparkBarChart));
+      expect(chart.data.slotCount, 31);
+
+      await tester.pumpWidget(_wrap(steps, entries: entries, range: ChartRange.last3Months));
+      await tester.pumpAndSettle();
+      chart = tester.widget<SparkBarChart>(find.byType(SparkBarChart));
+      expect(chart.data.slotCount, 13);
+    });
+
+    testWidgets('blood pressure tile: the reading quoted high over low', (tester) async {
+      final group = MeasurementCategory(
+        id: 'bp',
+        name: 'Blood pressure',
+        unit: 'mmHg',
+        metricType: MetricType.bloodPressure,
+        children: [
+          MeasurementCategory(id: 'sys', name: 'Systolic', unit: 'mmHg', parentId: 'bp'),
+          MeasurementCategory(id: 'dia', name: 'Diastolic', unit: 'mmHg', parentId: 'bp'),
+        ],
+      );
+      final entries = {
+        'sys': [_entry('sys', 122, _day(0))],
+        'dia': [_entry('dia', 79, _day(0))],
+      };
+
+      await tester.pumpWidget(
+        _wrap(group, categories: [group, ...group.children], entries: entries),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.text('122/79 mmHg'), findsOneWidget);
+      expect(find.byType(SparkBarChart), findsOneWidget);
+    });
+
+    testWidgets('sleep tile: the total leads, stacked bars behind it', (tester) async {
+      final group = MeasurementCategory(
+        id: 'sleep',
+        name: 'Sleep',
+        unit: 'min',
+        metricType: MetricType.sleep,
+        children: [
+          MeasurementCategory(
+            id: 'total',
+            name: 'Total sleep',
+            unit: 'min',
+            metricType: MetricType.sleepTotal,
+            parentId: 'sleep',
+          ),
+          MeasurementCategory(
+            id: 'deep',
+            name: 'Deep sleep',
+            unit: 'min',
+            metricType: MetricType.sleepDeep,
+            parentId: 'sleep',
+          ),
+        ],
+      );
+      final entries = {
+        'total': [_entry('total', 432, _day(1))],
+        'deep': [_entry('deep', 90, _day(1))],
+      };
+
+      await tester.pumpWidget(
+        _wrap(group, categories: [group, ...group.children], entries: entries),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.text('7:12 h'), findsOneWidget);
+      expect(find.byType(SparkBarChart), findsOneWidget);
+    });
+
+    testWidgets('heatmap tile: the grid plus the footer of its kind', (tester) async {
+      final steps = MeasurementCategory(
+        id: 'steps',
+        name: 'Steps',
+        metricType: MetricType.steps,
+        chartType: ChartType.heatmap,
+      );
+      final entries = {
+        'steps': [_entry('steps', 8000, _day(1)), _entry('steps', 6000, _day(2))],
+      };
+
+      await tester.pumpWidget(_wrap(steps, entries: entries));
+      await tester.pumpAndSettle();
+
+      final heatmap = tester.widget<SparkHeatmap>(find.byType(SparkHeatmap));
+      // Three months of filter come as 13 week columns
+      expect(heatmap.weeks, 13);
+      expect(find.textContaining('avg'), findsOneWidget);
+    });
+
+    testWidgets('the hero rounds to the decimals the type is measured at', (tester) async {
+      // A pulse has no meaningful tenths; the stored value stays exact and is
+      // shown in full on the detail screens
+      final entries = {
+        'rhr': [_entry('rhr', 61.44, _day(0))],
+      };
+
+      await tester.pumpWidget(_wrap(restingHeartRate, entries: entries));
+      await tester.pumpAndSettle();
+
+      expect(find.text('61 bpm'), findsOneWidget);
+    });
+
+    testWidgets('a tile without entries still stands, value dashed out', (tester) async {
+      await tester.pumpWidget(_wrap(restingHeartRate));
+      await tester.pumpAndSettle();
+
+      expect(find.text('— bpm'), findsOneWidget);
+    });
+
+    testWidgets('tapping the tile opens the entries screen', (tester) async {
+      final entries = {
+        'rhr': [_entry('rhr', 61, _day(0))],
+      };
+
+      await tester.pumpWidget(_wrap(restingHeartRate, entries: entries));
+      await tester.pumpAndSettle();
+      await tester.tap(find.byType(MeasurementTile));
+      await tester.pumpAndSettle();
+
+      expect(find.text('entries-screen'), findsOneWidget);
+    });
+  });
+}
diff --git a/test/features/measurements/widgets/measurement_tile_test.mocks.dart b/test/features/measurements/widgets/measurement_tile_test.mocks.dart
new file mode 100644
index 000000000..b417f3393
--- /dev/null
+++ b/test/features/measurements/widgets/measurement_tile_test.mocks.dart
@@ -0,0 +1,281 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/measurements/widgets/measurement_tile_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i3;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i6;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i4;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i5;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i2;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+/// A class which mocks [MeasurementRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepository {
+  MockMeasurementRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<List<_i4.MeasurementCategory>> watchAllWithoutEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i3.Stream<List<_i4.MeasurementCategory>>.empty(),
+          )
+          as _i3.Stream<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchCategoryWithoutEntries(
+    String? id,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<Map<String, _i5.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i3.Stream<Map<String, _i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementBucket>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementBucket>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementValueCount>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementValueCount>>);
+
+  @override
+  _i3.Future<List<_i4.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i3.Future<List<_i4.MeasurementCategory>>.value(
+              <_i4.MeasurementCategory>[],
+            ),
+          )
+          as _i3.Future<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
+
+  @override
+  _i3.Future<Map<String, _i5.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i3.Future<Map<String, _i5.MeasurementEntry>>.value(
+              <String, _i5.MeasurementEntry>{},
+            ),
+          )
+          as _i3.Future<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
+  @override
+  _i3.Future<void> deleteLocalDrift(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDrift, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftGroupEntries(
+    List<_i5.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteLocalDriftCategory(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDriftCategory, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDriftCategory(
+    _i4.MeasurementCategory? category,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategory(_i4.MeasurementCategory? category) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategoryGroup(
+    List<_i4.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}
diff --git a/test/features/measurements/widgets/metric_picker_test.dart b/test/features/measurements/widgets/metric_picker_test.dart
new file mode 100644
index 000000000..b9f75e256
--- /dev/null
+++ b/test/features/measurements/widgets/metric_picker_test.dart
@@ -0,0 +1,182 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+import 'package:wger/core/form_screen.dart';
+import 'package:wger/core/network/auth_credentials_storage.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+import 'package:wger/features/measurements/screens/measurement_entries_screen.dart';
+import 'package:wger/features/measurements/widgets/forms.dart';
+import 'package:wger/features/measurements/widgets/metric_picker.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../helpers/measurement_repository_stubs.dart';
+import 'metric_picker_test.mocks.dart';
+
+@GenerateMocks([MeasurementRepository, AuthCredentialsStorage])
+void main() {
+  late MockMeasurementRepository mockRepo;
+  late MockAuthCredentialsStorage mockCredentials;
+
+  setUp(() {
+    // The entries screen a new category opens reads the shared chart range
+    SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
+    mockRepo = MockMeasurementRepository();
+    mockCredentials = MockAuthCredentialsStorage();
+    when(mockCredentials.dbOwnerUserId()).thenAnswer((_) async => '2');
+    stubMeasurementReads(mockRepo, []);
+    when(mockRepo.addLocalDriftCategory(any)).thenAnswer((_) async {});
+    when(mockRepo.addLocalDriftCategoryGroup(any)).thenAnswer((_) async {});
+  });
+
+  Widget wrap() {
+    return ProviderScope(
+      overrides: [
+        measurementRepositoryProvider.overrideWithValue(mockRepo),
+        authCredentialsStorageProvider.overrideWithValue(mockCredentials),
+      ],
+      child: MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        routes: {
+          FormScreen.routeName: (_) => const FormScreen(),
+          MeasurementEntriesScreen.routeName: (_) => const MeasurementEntriesScreen(),
+        },
+        home: const Scaffold(body: MetricPickerSheet()),
+      ),
+    );
+  }
+
+  testWidgets('offers neither body weight nor the components', (tester) async {
+    // Body weight is the server's category and a component comes with its
+    // group, so neither is something to start here
+    await tester.pumpWidget(wrap());
+    await tester.pumpAndSettle();
+
+    final context = tester.element(find.byType(MetricPickerSheet));
+    for (final hidden in [
+      MetricType.bodyWeight,
+      MetricType.bloodPressureSystolic,
+      MetricType.sleepDeep,
+    ]) {
+      expect(find.text(hidden.localized(context)), findsNothing);
+    }
+    expect(find.text(MetricType.bloodPressure.localized(context)), findsOneWidget);
+  });
+
+  testWidgets('a metric that already has a category cannot be picked again', (tester) async {
+    stubMeasurementReads(mockRepo, [
+      MeasurementCategory(
+        id: 'hr',
+        name: 'Heart rate',
+        unit: 'bpm',
+        metricType: MetricType.heartRate,
+      ),
+    ]);
+
+    await tester.pumpWidget(wrap());
+    await tester.pumpAndSettle();
+
+    final context = tester.element(find.byType(MetricPickerSheet));
+    final tile = tester.widget<ListTile>(
+      find.ancestor(
+        of: find.text(MetricType.heartRate.localized(context)),
+        matching: find.byType(ListTile),
+      ),
+    );
+    expect(tile.enabled, isFalse);
+
+    await tester.tap(find.text(MetricType.heartRate.localized(context)));
+    await tester.pumpAndSettle();
+    verifyNever(mockRepo.addLocalDriftCategoryGroup(any));
+  });
+
+  testWidgets('picking a metric creates the category with the name and unit of its type', (
+    tester,
+  ) async {
+    await tester.pumpWidget(wrap());
+    await tester.pumpAndSettle();
+
+    final context = tester.element(find.byType(MetricPickerSheet));
+    await tester.tap(find.text(MetricType.restingHeartRate.localized(context)));
+    await tester.pumpAndSettle();
+
+    final added =
+        (verify(mockRepo.addLocalDriftCategoryGroup(captureAny)).captured.single
+                as List<MeasurementCategory>)
+            .single;
+    expect(added.metricType, MetricType.restingHeartRate);
+    expect(added.name, 'Resting heart rate');
+    expect(added.unit, 'bpm');
+    expect(added.id, deterministicCategoryId('2', MetricType.restingHeartRate));
+  });
+
+  testWidgets('the new category is opened right away', (tester) async {
+    // The overview is long enough that a new card somewhere in it does not
+    // read as "something happened"
+    final id = deterministicCategoryId('2', MetricType.restingHeartRate);
+    // Only the screen behind the tap knows the category, not the picker: it
+    // is created by the tap, and a metric that already exists is disabled
+    when(mockRepo.watchCategoryWithoutEntries(id)).thenAnswer(
+      (_) => Stream.value(
+        MeasurementCategory(
+          id: id,
+          name: 'Resting heart rate',
+          unit: 'bpm',
+          metricType: MetricType.restingHeartRate,
+        ),
+      ),
+    );
+
+    await tester.pumpWidget(wrap());
+    await tester.pumpAndSettle();
+
+    final context = tester.element(find.byType(MetricPickerSheet));
+    await tester.tap(find.text(MetricType.restingHeartRate.localized(context)));
+    await tester.pumpAndSettle();
+
+    expect(find.byType(MeasurementEntriesScreen), findsOneWidget);
+  });
+
+  testWidgets('a custom measurement leads into the form', (tester) async {
+    await tester.pumpWidget(wrap());
+    await tester.pumpAndSettle();
+
+    // Last of the list, below the fold on a test-sized screen
+    final custom = find.text(
+      AppLocalizations.of(tester.element(find.byType(MetricPickerSheet))).customMeasurement,
+    );
+    await tester.dragUntilVisible(custom, find.byType(ListView), const Offset(0, -100));
+    // The drag stops as soon as the tile is built, which can still leave it
+    // just below the fold
+    await tester.ensureVisible(custom);
+    await tester.pumpAndSettle();
+    await tester.tap(custom);
+    await tester.pumpAndSettle();
+
+    expect(find.byType(MeasurementCategoryForm), findsOneWidget);
+    verifyNever(mockRepo.addLocalDriftCategoryGroup(any));
+  });
+}
diff --git a/test/features/measurements/widgets/metric_picker_test.mocks.dart b/test/features/measurements/widgets/metric_picker_test.mocks.dart
new file mode 100644
index 000000000..b6250c593
--- /dev/null
+++ b/test/features/measurements/widgets/metric_picker_test.mocks.dart
@@ -0,0 +1,418 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/measurements/widgets/metric_picker_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i3;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:wger/core/network/auth_credentials_storage.dart' as _i7;
+import 'package:wger/core/network/auth_state.dart' as _i8;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i6;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i4;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i5;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i2;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+/// A class which mocks [MeasurementRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepository {
+  MockMeasurementRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<List<_i4.MeasurementCategory>> watchAllWithoutEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i3.Stream<List<_i4.MeasurementCategory>>.empty(),
+          )
+          as _i3.Stream<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchCategoryWithoutEntries(
+    String? id,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<Map<String, _i5.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i3.Stream<Map<String, _i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementBucket>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementBucket>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementValueCount>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementValueCount>>);
+
+  @override
+  _i3.Future<List<_i4.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i3.Future<List<_i4.MeasurementCategory>>.value(
+              <_i4.MeasurementCategory>[],
+            ),
+          )
+          as _i3.Future<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
+
+  @override
+  _i3.Future<Map<String, _i5.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i3.Future<Map<String, _i5.MeasurementEntry>>.value(
+              <String, _i5.MeasurementEntry>{},
+            ),
+          )
+          as _i3.Future<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
+  @override
+  _i3.Future<void> deleteLocalDrift(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDrift, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftGroupEntries(
+    List<_i5.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteLocalDriftCategory(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDriftCategory, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDriftCategory(
+    _i4.MeasurementCategory? category,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategory(_i4.MeasurementCategory? category) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategoryGroup(
+    List<_i4.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}
+
+/// A class which mocks [AuthCredentialsStorage].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockAuthCredentialsStorage extends _i1.Mock implements _i7.AuthCredentialsStorage {
+  MockAuthCredentialsStorage() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Future<_i7.StoredAuth?> load() =>
+      (super.noSuchMethod(
+            Invocation.method(#load, []),
+            returnValue: _i3.Future<_i7.StoredAuth?>.value(),
+          )
+          as _i3.Future<_i7.StoredAuth?>);
+
+  @override
+  _i3.Future<void> saveJwt({
+    required _i8.JwtCredential? credential,
+    required String? serverUrl,
+    String? refreshToken,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#saveJwt, [], {
+              #credential: credential,
+              #serverUrl: serverUrl,
+              #refreshToken: refreshToken,
+            }),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateJwt({
+    required _i8.JwtCredential? credential,
+    String? refreshToken,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateJwt, [], {
+              #credential: credential,
+              #refreshToken: refreshToken,
+            }),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> clearJwt() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearJwt, []),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> clearLegacy() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearLegacy, []),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> clearCredentials() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearCredentials, []),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> clearAll() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearAll, []),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<String?> dbOwnerUserId() =>
+      (super.noSuchMethod(
+            Invocation.method(#dbOwnerUserId, []),
+            returnValue: _i3.Future<String?>.value(),
+          )
+          as _i3.Future<String?>);
+
+  @override
+  _i3.Future<void> setDbOwnerUserId(String? userId) =>
+      (super.noSuchMethod(
+            Invocation.method(#setDbOwnerUserId, [userId]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<bool> keepDataOnLogout() =>
+      (super.noSuchMethod(
+            Invocation.method(#keepDataOnLogout, []),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
+  @override
+  _i3.Future<bool> hasEverSynced() =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEverSynced, []),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
+  @override
+  _i3.Future<void> markEverSynced() =>
+      (super.noSuchMethod(
+            Invocation.method(#markEverSynced, []),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<String?> readRefreshToken() =>
+      (super.noSuchMethod(
+            Invocation.method(#readRefreshToken, []),
+            returnValue: _i3.Future<String?>.value(),
+          )
+          as _i3.Future<String?>);
+}
diff --git a/test/features/measurements/widgets/weight_form_test.dart b/test/features/measurements/widgets/weight_form_test.dart
new file mode 100644
index 000000000..bf3de3e1d
--- /dev/null
+++ b/test/features/measurements/widgets/weight_form_test.dart
@@ -0,0 +1,290 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_riverpod/misc.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:wger/core/consts.dart';
+import 'package:wger/features/account/models/user_profile.dart';
+import 'package:wger/features/account/providers/user_profile_notifier.dart';
+import 'package:wger/features/account/providers/user_profile_repository.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+import 'package:wger/features/measurements/widgets/weight_form.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../../test_data/body_weight.dart';
+import '../../../../test_data/profile.dart';
+import '../../../helpers/measurement_repository_stubs.dart';
+import 'weight_form_test.mocks.dart';
+
+@GenerateMocks([MeasurementRepository, UserProfileRepository])
+void main() {
+  late MockMeasurementRepository mockRepo;
+  late MockUserProfileRepository mockProfileRepo;
+
+  setUp(() {
+    mockRepo = MockMeasurementRepository();
+    stubMeasurementReads(mockRepo, [getBodyWeightCategory()]);
+    when(mockRepo.addLocalDrift(any)).thenAnswer((_) async {});
+    when(mockRepo.updateLocalDrift(any)).thenAnswer((_) async {});
+
+    mockProfileRepo = MockUserProfileRepository();
+    when(mockProfileRepo.watchDrift()).thenAnswer((_) => Stream.value(tUserProfile1));
+  });
+
+  Widget createWeightForm({
+    locale = 'en',
+    MeasurementEntry? entry,
+    List<Override> overrides = const [],
+  }) {
+    return ProviderScope(
+      overrides: [
+        measurementRepositoryProvider.overrideWithValue(mockRepo),
+        userProfileRepositoryProvider.overrideWithValue(mockProfileRepo),
+        ...overrides,
+      ],
+      child: MaterialApp(
+        locale: Locale(locale),
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: SingleChildScrollView(child: WeightForm(getBodyWeightCategory(), entry)),
+        ),
+      ),
+    );
+  }
+
+  testWidgets('Correctly prefills and localizes the data - en', (WidgetTester tester) async {
+    await tester.pumpWidget(createWeightForm(entry: testWeightEntry1));
+    await tester.pumpAndSettle();
+
+    expect(find.text('1/1/2021'), findsOneWidget);
+    expect(find.text('3:30 PM'), findsOneWidget);
+    expect(find.text('80'), findsOneWidget);
+  });
+
+  testWidgets('Correctly prefills and localizes the data - de', (WidgetTester tester) async {
+    await tester.pumpWidget(createWeightForm(entry: testWeightEntry1, locale: 'de'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('1.1.2021'), findsOneWidget);
+    expect(find.text('15:30'), findsOneWidget);
+    expect(find.text('80'), findsOneWidget);
+  });
+
+  testWidgets('It is possible to quick-change the weight', (WidgetTester tester) async {
+    await tester.pumpWidget(createWeightForm(entry: testWeightEntry1));
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byKey(const Key('stepper-minus-0')));
+    expect(find.text('79'), findsOneWidget);
+
+    await tester.tap(find.byKey(const Key('stepper-minus-1')));
+    expect(find.text('78.9'), findsOneWidget);
+
+    await tester.tap(find.byKey(const Key('stepper-plus-0')));
+    expect(find.text('79.9'), findsOneWidget);
+
+    await tester.tap(find.byKey(const Key('stepper-plus-1')));
+    expect(find.text('80'), findsOneWidget);
+  });
+
+  testWidgets('Non-numeric input never reaches the field', (WidgetTester tester) async {
+    await tester.pumpWidget(createWeightForm(entry: testWeightEntry1));
+    await tester.pumpAndSettle();
+
+    await tester.enterText(find.byKey(const Key('weightInput')), 'shiba inu');
+    await tester.pumpAndSettle();
+    expect(find.text('shiba inu'), findsNothing);
+
+    // Quick-change still works on the now-empty field
+    await tester.tap(find.byKey(const Key('stepper-minus-0')));
+    await tester.pumpAndSettle();
+    expect(find.text('shiba inu'), findsNothing);
+  });
+
+  testWidgets('Accepts a dot as decimal separator in the de locale', (WidgetTester tester) async {
+    await tester.pumpWidget(createWeightForm(locale: 'de'));
+    await tester.pumpAndSettle();
+
+    await tester.enterText(find.byKey(const Key('weightInput')), '81.5');
+    await tester.pumpAndSettle();
+
+    expect(find.text('81,5'), findsOneWidget);
+  });
+
+  testWidgets('Widget works if there is no last entry', (WidgetTester tester) async {
+    await tester.pumpWidget(createWeightForm());
+    await tester.pumpAndSettle();
+  });
+
+  testWidgets('Saving keeps an afternoon (PM) time intact', (WidgetTester tester) async {
+    await tester.pumpWidget(createWeightForm(entry: testWeightEntry1));
+    await tester.pumpAndSettle();
+
+    // The stored 15:30 renders as a PM time in a 12-hour locale
+    expect(find.text('3:30 PM'), findsOneWidget);
+
+    // Save without changing anything
+    await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
+    await tester.pumpAndSettle();
+
+    final saved = verify(mockRepo.updateLocalDrift(captureAny)).captured.single as MeasurementEntry;
+    expect(saved.categoryId, testBodyWeightCategoryId);
+    expect(saved.date.hour, 15);
+    expect(saved.date.minute, 30);
+  });
+
+  group('units', () {
+    testWidgets('New entries default to the profile unit and stamp it on save', (
+      WidgetTester tester,
+    ) async {
+      when(
+        mockProfileRepo.watchDrift(),
+      ).thenAnswer((_) => Stream.value(UserProfile(id: 1, weightUnitStr: 'lb')));
+
+      // The form reads the profile once on creation, so it must already be
+      // loaded, as it always is when the form is reachable in the app
+      final container = ProviderContainer.test(
+        overrides: [
+          measurementRepositoryProvider.overrideWithValue(mockRepo),
+          userProfileRepositoryProvider.overrideWithValue(mockProfileRepo),
+        ],
+      );
+      container.listen(userProfileProvider, (_, _) {});
+      // pumpEventQueue relies on timers, which testWidgets' fake async only
+      // fires via the tester; run it on the real event loop instead
+      await tester.runAsync(pumpEventQueue);
+
+      await tester.pumpWidget(
+        UncontrolledProviderScope(
+          container: container,
+          child: MaterialApp(
+            localizationsDelegates: AppLocalizations.localizationsDelegates,
+            supportedLocales: AppLocalizations.supportedLocales,
+            home: Scaffold(
+              body: SingleChildScrollView(
+                child: WeightForm(getBodyWeightCategory()),
+              ),
+            ),
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.text('lb'), findsOneWidget);
+
+      await tester.enterText(find.byKey(const Key('weightInput')), '180');
+      await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
+      await tester.pumpAndSettle();
+
+      final saved = verify(mockRepo.addLocalDrift(captureAny)).captured.single as MeasurementEntry;
+      // The value is stored as entered, in the entered unit
+      expect(saved.value, 180);
+      expect(saved.extraData, {'unit': 'lb'});
+    });
+
+    testWidgets('Accepts imperial weights over the metric bound', (WidgetTester tester) async {
+      when(
+        mockProfileRepo.watchDrift(),
+      ).thenAnswer((_) => Stream.value(UserProfile(id: 1, weightUnitStr: 'lb')));
+
+      final container = ProviderContainer.test(
+        overrides: [
+          measurementRepositoryProvider.overrideWithValue(mockRepo),
+          userProfileRepositoryProvider.overrideWithValue(mockProfileRepo),
+        ],
+      );
+      container.listen(userProfileProvider, (_, _) {});
+      await tester.runAsync(pumpEventQueue);
+
+      await tester.pumpWidget(
+        UncontrolledProviderScope(
+          container: container,
+          child: MaterialApp(
+            localizationsDelegates: AppLocalizations.localizationsDelegates,
+            supportedLocales: AppLocalizations.supportedLocales,
+            home: Scaffold(
+              body: SingleChildScrollView(
+                child: WeightForm(getBodyWeightCategory()),
+              ),
+            ),
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      // 365 lb are over the numeric kg bound but a perfectly valid weight
+      await tester.enterText(find.byKey(const Key('weightInput')), '400');
+      await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
+      await tester.pumpAndSettle();
+
+      final saved = verify(mockRepo.addLocalDrift(captureAny)).captured.single as MeasurementEntry;
+      expect(saved.value, 400);
+      expect(saved.extraData, {'unit': 'lb'});
+    });
+
+    testWidgets('Rejects implausible weights with bounds in the entered unit', (
+      WidgetTester tester,
+    ) async {
+      await tester.pumpWidget(createWeightForm(entry: testWeightEntryLb));
+      await tester.pumpAndSettle();
+
+      // 35 lb are below the plausible minimum
+      await tester.enterText(find.byKey(const Key('weightInput')), '35');
+      await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
+      await tester.pumpAndSettle();
+
+      verifyNever(mockRepo.updateLocalDrift(any));
+      expect(find.text('Please enter a value between 44 and 770'), findsOneWidget);
+    });
+
+    testWidgets('Editing shows the stored value in its stored unit, unconverted', (
+      WidgetTester tester,
+    ) async {
+      await tester.pumpWidget(createWeightForm(entry: testWeightEntryLb));
+      await tester.pumpAndSettle();
+
+      expect(find.text('176.4'), findsOneWidget);
+      expect(find.text('lb'), findsOneWidget);
+    });
+
+    testWidgets('Switching the unit stamps the new unit on save', (WidgetTester tester) async {
+      await tester.pumpWidget(createWeightForm(entry: testWeightEntry1));
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.byKey(const Key('unitInput')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('lb').last);
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
+      await tester.pumpAndSettle();
+
+      final saved =
+          verify(mockRepo.updateLocalDrift(captureAny)).captured.single as MeasurementEntry;
+      expect(saved.extraData, {'unit': 'lb'});
+      // The typed value itself is not converted, only re-interpreted
+      expect(saved.value, 80);
+    });
+  });
+}
diff --git a/test/features/measurements/widgets/weight_form_test.mocks.dart b/test/features/measurements/widgets/weight_form_test.mocks.dart
new file mode 100644
index 000000000..de778e593
--- /dev/null
+++ b/test/features/measurements/widgets/weight_form_test.mocks.dart
@@ -0,0 +1,309 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/measurements/widgets/weight_form_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i3;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:wger/features/account/models/user_profile.dart' as _i8;
+import 'package:wger/features/account/providers/user_profile_repository.dart' as _i7;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i6;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i4;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i5;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i2;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+/// A class which mocks [MeasurementRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepository {
+  MockMeasurementRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<List<_i4.MeasurementCategory>> watchAllWithoutEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i3.Stream<List<_i4.MeasurementCategory>>.empty(),
+          )
+          as _i3.Stream<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchCategoryWithoutEntries(
+    String? id,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<Map<String, _i5.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i3.Stream<Map<String, _i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementBucket>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementBucket>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementValueCount>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementValueCount>>);
+
+  @override
+  _i3.Future<List<_i4.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i3.Future<List<_i4.MeasurementCategory>>.value(
+              <_i4.MeasurementCategory>[],
+            ),
+          )
+          as _i3.Future<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
+
+  @override
+  _i3.Future<Map<String, _i5.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i3.Future<Map<String, _i5.MeasurementEntry>>.value(
+              <String, _i5.MeasurementEntry>{},
+            ),
+          )
+          as _i3.Future<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
+  @override
+  _i3.Future<void> deleteLocalDrift(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDrift, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftGroupEntries(
+    List<_i5.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteLocalDriftCategory(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDriftCategory, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDriftCategory(
+    _i4.MeasurementCategory? category,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategory(_i4.MeasurementCategory? category) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategoryGroup(
+    List<_i4.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}
+
+/// A class which mocks [UserProfileRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockUserProfileRepository extends _i1.Mock implements _i7.UserProfileRepository {
+  MockUserProfileRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<_i8.UserProfile?> watchDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDrift, []),
+            returnValue: _i3.Stream<_i8.UserProfile?>.empty(),
+          )
+          as _i3.Stream<_i8.UserProfile?>);
+
+  @override
+  _i3.Future<void> editLocalDrift(_i8.UserProfile? profile) =>
+      (super.noSuchMethod(
+            Invocation.method(#editLocalDrift, [profile]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}
diff --git a/test/features/nutrition/screens/nutritional_plan_screen_test.dart b/test/features/nutrition/screens/nutritional_plan_screen_test.dart
index 5bd2393cd..1f79192a7 100644
--- a/test/features/nutrition/screens/nutritional_plan_screen_test.dart
+++ b/test/features/nutrition/screens/nutritional_plan_screen_test.dart
@@ -27,12 +27,12 @@ import 'package:http/http.dart' as http;
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:wger/core/network/network_provider.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
 import 'package:wger/features/nutrition/models/ingredient.dart';
 import 'package:wger/features/nutrition/models/nutritional_plan.dart';
 import 'package:wger/features/nutrition/providers/ingredient_repository.dart';
 import 'package:wger/features/nutrition/providers/nutrition_repository.dart';
 import 'package:wger/features/nutrition/screens/nutritional_plan_screen.dart';
-import 'package:wger/features/weight/providers/body_weight_repository.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
 import '../../../../test_data/body_weight.dart';
@@ -40,29 +40,32 @@ import '../../../../test_data/nutritional_plans.dart';
 import '../../../fixtures/fixture_reader.dart';
 import '../../../helpers/fake_auth_environment.dart';
 import '../../../helpers/fake_connectivity.dart';
+import '../../../helpers/measurement_repository_stubs.dart';
 import 'nutritional_plan_screen_test.mocks.dart';
 
 @GenerateMocks([
   NutritionRepository,
   IngredientRepository,
   http.Client,
-  BodyWeightRepository,
+  MeasurementRepository,
 ])
 void main() {
   installFakeConnectivity();
   installFakeAuthEnvironment();
 
-  late BodyWeightRepository mockBodyWeightRepository;
+  late MockMeasurementRepository mockMeasurementRepository;
   late MockNutritionRepository mockNutritionRepo;
   late MockIngredientRepository mockIngredientRepo;
 
   late Ingredient fetchedIngredient;
 
   setUp(() {
-    mockBodyWeightRepository = MockBodyWeightRepository();
-    when(
-      mockBodyWeightRepository.watchAllDrift(),
-    ).thenAnswer((_) => Stream.value([testWeightEntry1]));
+    mockMeasurementRepository = MockMeasurementRepository();
+    stubMeasurementReads(
+      mockMeasurementRepository,
+      [getBodyWeightCategory()],
+      bodyWeightEntries([testWeightEntry1]),
+    );
 
     mockNutritionRepo = MockNutritionRepository();
     mockIngredientRepo = MockIngredientRepository();
@@ -94,7 +97,7 @@ void main() {
     final container = ProviderContainer(
       overrides: [
         networkStatusProvider.overrideWithValue(isOnline),
-        bodyWeightRepositoryProvider.overrideWithValue(mockBodyWeightRepository),
+        measurementRepositoryProvider.overrideWithValue(mockMeasurementRepository),
         nutritionRepositoryProvider.overrideWithValue(mockNutritionRepo),
         ingredientRepositoryProvider.overrideWithValue(mockIngredientRepo),
       ],
diff --git a/test/features/nutrition/screens/nutritional_plan_screen_test.mocks.dart b/test/features/nutrition/screens/nutritional_plan_screen_test.mocks.dart
index c97b14acb..bc56942ef 100644
--- a/test/features/nutrition/screens/nutritional_plan_screen_test.mocks.dart
+++ b/test/features/nutrition/screens/nutritional_plan_screen_test.mocks.dart
@@ -11,6 +11,10 @@ import 'package:http/http.dart' as _i2;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:mockito/src/dummies.dart' as _i14;
 import 'package:wger/core/search_options.dart' as _i12;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i19;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i17;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i18;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i16;
 import 'package:wger/features/nutrition/models/ingredient.dart' as _i10;
 import 'package:wger/features/nutrition/models/ingredient_filters.dart' as _i11;
 import 'package:wger/features/nutrition/models/log.dart' as _i8;
@@ -19,8 +23,6 @@ import 'package:wger/features/nutrition/models/meal_item.dart' as _i7;
 import 'package:wger/features/nutrition/models/nutritional_plan.dart' as _i5;
 import 'package:wger/features/nutrition/providers/ingredient_repository.dart' as _i9;
 import 'package:wger/features/nutrition/providers/nutrition_repository.dart' as _i3;
-import 'package:wger/features/weight/models/weight_entry.dart' as _i17;
-import 'package:wger/features/weight/providers/body_weight_repository.dart' as _i16;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -484,21 +486,171 @@ class MockClient extends _i1.Mock implements _i2.Client {
   );
 }
 
-/// A class which mocks [BodyWeightRepository].
+/// A class which mocks [MeasurementRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBodyWeightRepository extends _i1.Mock implements _i16.BodyWeightRepository {
-  MockBodyWeightRepository() {
+class MockMeasurementRepository extends _i1.Mock implements _i16.MeasurementRepository {
+  MockMeasurementRepository() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i4.Stream<List<_i17.WeightEntry>> watchAllDrift() =>
+  _i4.Stream<List<_i17.MeasurementCategory>> watchAllWithoutEntries() =>
       (super.noSuchMethod(
-            Invocation.method(#watchAllDrift, []),
-            returnValue: _i4.Stream<List<_i17.WeightEntry>>.empty(),
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i4.Stream<List<_i17.MeasurementCategory>>.empty(),
+          )
+          as _i4.Stream<List<_i17.MeasurementCategory>>);
+
+  @override
+  _i4.Stream<_i17.MeasurementCategory?> watchCategoryWithoutEntries(
+    String? id,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
+            returnValue: _i4.Stream<_i17.MeasurementCategory?>.empty(),
+          )
+          as _i4.Stream<_i17.MeasurementCategory?>);
+
+  @override
+  _i4.Stream<_i17.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i4.Stream<_i17.MeasurementCategory?>.empty(),
+          )
+          as _i4.Stream<_i17.MeasurementCategory?>);
+
+  @override
+  _i4.Stream<List<_i18.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i4.Stream<List<_i18.MeasurementEntry>>.empty(),
+          )
+          as _i4.Stream<List<_i18.MeasurementEntry>>);
+
+  @override
+  _i4.Stream<List<_i18.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i4.Stream<List<_i18.MeasurementEntry>>.empty(),
+          )
+          as _i4.Stream<List<_i18.MeasurementEntry>>);
+
+  @override
+  _i4.Stream<Map<String, _i18.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i4.Stream<Map<String, _i18.MeasurementEntry>>.empty(),
+          )
+          as _i4.Stream<Map<String, _i18.MeasurementEntry>>);
+
+  @override
+  _i4.Stream<List<_i19.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i19.MeasurementBucketLevel? level = _i19.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i4.Stream<List<_i19.MeasurementBucket>>.empty(),
+          )
+          as _i4.Stream<List<_i19.MeasurementBucket>>);
+
+  @override
+  _i4.Stream<Map<String, List<_i19.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i19.MeasurementBucketLevel? level = _i19.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i4.Stream<Map<String, List<_i19.MeasurementBucket>>>.empty(),
+          )
+          as _i4.Stream<Map<String, List<_i19.MeasurementBucket>>>);
+
+  @override
+  _i4.Stream<Map<String, List<_i19.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i4.Stream<Map<String, List<_i19.MeasurementBucket>>>.empty(),
+          )
+          as _i4.Stream<Map<String, List<_i19.MeasurementBucket>>>);
+
+  @override
+  _i4.Stream<List<_i19.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i4.Stream<List<_i19.MeasurementValueCount>>.empty(),
+          )
+          as _i4.Stream<List<_i19.MeasurementValueCount>>);
+
+  @override
+  _i4.Future<List<_i17.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i4.Future<List<_i17.MeasurementCategory>>.value(
+              <_i17.MeasurementCategory>[],
+            ),
           )
-          as _i4.Stream<List<_i17.WeightEntry>>);
+          as _i4.Future<List<_i17.MeasurementCategory>>);
+
+  @override
+  _i4.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i4.Future<Set<String>>.value(<String>{}),
+          )
+          as _i4.Future<Set<String>>);
+
+  @override
+  _i4.Future<Map<String, _i18.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i4.Future<Map<String, _i18.MeasurementEntry>>.value(
+              <String, _i18.MeasurementEntry>{},
+            ),
+          )
+          as _i4.Future<Map<String, _i18.MeasurementEntry>>);
+
+  @override
+  _i4.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
 
   @override
   _i4.Future<void> deleteLocalDrift(String? id) =>
@@ -510,7 +662,7 @@ class MockBodyWeightRepository extends _i1.Mock implements _i16.BodyWeightReposi
           as _i4.Future<void>);
 
   @override
-  _i4.Future<void> updateLocalDrift(_i17.WeightEntry? entry) =>
+  _i4.Future<void> updateLocalDrift(_i18.MeasurementEntry? entry) =>
       (super.noSuchMethod(
             Invocation.method(#updateLocalDrift, [entry]),
             returnValue: _i4.Future<void>.value(),
@@ -519,11 +671,71 @@ class MockBodyWeightRepository extends _i1.Mock implements _i16.BodyWeightReposi
           as _i4.Future<void>);
 
   @override
-  _i4.Future<void> addLocalDrift(_i17.WeightEntry? entry) =>
+  _i4.Future<void> addLocalDrift(_i18.MeasurementEntry? entry) =>
       (super.noSuchMethod(
             Invocation.method(#addLocalDrift, [entry]),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
           as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> addLocalDriftGroupEntries(
+    List<_i18.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> deleteLocalDriftCategory(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDriftCategory, [id]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> updateLocalDriftCategory(
+    _i17.MeasurementCategory? category,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDriftCategory, [category]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> addLocalDriftCategory(_i17.MeasurementCategory? category) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategory, [category]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> addLocalDriftCategoryGroup(
+    List<_i17.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
 }
diff --git a/test/features/nutrition/screens/nutritional_plans_screen_test.dart b/test/features/nutrition/screens/nutritional_plans_screen_test.dart
index 4c9ab86c8..29ad21727 100644
--- a/test/features/nutrition/screens/nutritional_plans_screen_test.dart
+++ b/test/features/nutrition/screens/nutritional_plans_screen_test.dart
@@ -26,22 +26,23 @@ import 'package:wger/core/form_screen.dart';
 import 'package:wger/core/network/network_provider.dart';
 import 'package:wger/features/account/models/user_profile.dart';
 import 'package:wger/features/account/providers/user_profile_repository.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
 import 'package:wger/features/nutrition/models/nutritional_plan.dart';
 import 'package:wger/features/nutrition/providers/ingredient_repository.dart';
 import 'package:wger/features/nutrition/providers/nutrition_repository.dart';
 import 'package:wger/features/nutrition/screens/nutritional_plans_screen.dart';
 import 'package:wger/features/nutrition/widgets/forms.dart';
-import 'package:wger/features/weight/providers/body_weight_repository.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
 import '../../../helpers/fake_connectivity.dart';
+import '../../../helpers/measurement_repository_stubs.dart';
 import 'nutritional_plans_screen_test.mocks.dart';
 
 @GenerateMocks([
   NutritionRepository,
   IngredientRepository,
   http.Client,
-  BodyWeightRepository,
+  MeasurementRepository,
   UserProfileRepository,
 ])
 void main() {
@@ -49,6 +50,7 @@ void main() {
 
   late MockNutritionRepository mockNutritionRepo;
   late MockIngredientRepository mockIngredientRepo;
+  late MockMeasurementRepository mockMeasurementRepository;
   late MockUserProfileRepository mockUserProfileRepository;
 
   final testProfile = UserProfile(id: 1, weightUnitStr: 'kg');
@@ -74,6 +76,8 @@ void main() {
   setUp(() async {
     mockNutritionRepo = MockNutritionRepository();
     mockIngredientRepo = MockIngredientRepository();
+    mockMeasurementRepository = MockMeasurementRepository();
+    stubMeasurementReads(mockMeasurementRepository, []);
     mockUserProfileRepository = MockUserProfileRepository();
 
     when(
@@ -91,7 +95,7 @@ void main() {
     final container = ProviderContainer.test(
       overrides: [
         networkStatusProvider.overrideWithValue(isOnline),
-        bodyWeightRepositoryProvider.overrideWithValue(MockBodyWeightRepository()),
+        measurementRepositoryProvider.overrideWithValue(mockMeasurementRepository),
         userProfileRepositoryProvider.overrideWithValue(mockUserProfileRepository),
         nutritionRepositoryProvider.overrideWithValue(mockNutritionRepo),
         ingredientRepositoryProvider.overrideWithValue(mockIngredientRepo),
diff --git a/test/features/nutrition/screens/nutritional_plans_screen_test.mocks.dart b/test/features/nutrition/screens/nutritional_plans_screen_test.mocks.dart
index 538cdd616..39e6823e3 100644
--- a/test/features/nutrition/screens/nutritional_plans_screen_test.mocks.dart
+++ b/test/features/nutrition/screens/nutritional_plans_screen_test.mocks.dart
@@ -11,8 +11,12 @@ import 'package:http/http.dart' as _i2;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:mockito/src/dummies.dart' as _i14;
 import 'package:wger/core/search_options.dart' as _i12;
-import 'package:wger/features/account/models/user_profile.dart' as _i19;
-import 'package:wger/features/account/providers/user_profile_repository.dart' as _i18;
+import 'package:wger/features/account/models/user_profile.dart' as _i21;
+import 'package:wger/features/account/providers/user_profile_repository.dart' as _i20;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i19;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i17;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i18;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i16;
 import 'package:wger/features/nutrition/models/ingredient.dart' as _i10;
 import 'package:wger/features/nutrition/models/ingredient_filters.dart' as _i11;
 import 'package:wger/features/nutrition/models/log.dart' as _i8;
@@ -21,8 +25,6 @@ import 'package:wger/features/nutrition/models/meal_item.dart' as _i7;
 import 'package:wger/features/nutrition/models/nutritional_plan.dart' as _i5;
 import 'package:wger/features/nutrition/providers/ingredient_repository.dart' as _i9;
 import 'package:wger/features/nutrition/providers/nutrition_repository.dart' as _i3;
-import 'package:wger/features/weight/models/weight_entry.dart' as _i17;
-import 'package:wger/features/weight/providers/body_weight_repository.dart' as _i16;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -486,21 +488,171 @@ class MockClient extends _i1.Mock implements _i2.Client {
   );
 }
 
-/// A class which mocks [BodyWeightRepository].
+/// A class which mocks [MeasurementRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBodyWeightRepository extends _i1.Mock implements _i16.BodyWeightRepository {
-  MockBodyWeightRepository() {
+class MockMeasurementRepository extends _i1.Mock implements _i16.MeasurementRepository {
+  MockMeasurementRepository() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i4.Stream<List<_i17.WeightEntry>> watchAllDrift() =>
+  _i4.Stream<List<_i17.MeasurementCategory>> watchAllWithoutEntries() =>
       (super.noSuchMethod(
-            Invocation.method(#watchAllDrift, []),
-            returnValue: _i4.Stream<List<_i17.WeightEntry>>.empty(),
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i4.Stream<List<_i17.MeasurementCategory>>.empty(),
+          )
+          as _i4.Stream<List<_i17.MeasurementCategory>>);
+
+  @override
+  _i4.Stream<_i17.MeasurementCategory?> watchCategoryWithoutEntries(
+    String? id,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
+            returnValue: _i4.Stream<_i17.MeasurementCategory?>.empty(),
+          )
+          as _i4.Stream<_i17.MeasurementCategory?>);
+
+  @override
+  _i4.Stream<_i17.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i4.Stream<_i17.MeasurementCategory?>.empty(),
+          )
+          as _i4.Stream<_i17.MeasurementCategory?>);
+
+  @override
+  _i4.Stream<List<_i18.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i4.Stream<List<_i18.MeasurementEntry>>.empty(),
+          )
+          as _i4.Stream<List<_i18.MeasurementEntry>>);
+
+  @override
+  _i4.Stream<List<_i18.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i4.Stream<List<_i18.MeasurementEntry>>.empty(),
+          )
+          as _i4.Stream<List<_i18.MeasurementEntry>>);
+
+  @override
+  _i4.Stream<Map<String, _i18.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i4.Stream<Map<String, _i18.MeasurementEntry>>.empty(),
+          )
+          as _i4.Stream<Map<String, _i18.MeasurementEntry>>);
+
+  @override
+  _i4.Stream<List<_i19.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i19.MeasurementBucketLevel? level = _i19.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i4.Stream<List<_i19.MeasurementBucket>>.empty(),
+          )
+          as _i4.Stream<List<_i19.MeasurementBucket>>);
+
+  @override
+  _i4.Stream<Map<String, List<_i19.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i19.MeasurementBucketLevel? level = _i19.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i4.Stream<Map<String, List<_i19.MeasurementBucket>>>.empty(),
+          )
+          as _i4.Stream<Map<String, List<_i19.MeasurementBucket>>>);
+
+  @override
+  _i4.Stream<Map<String, List<_i19.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i4.Stream<Map<String, List<_i19.MeasurementBucket>>>.empty(),
+          )
+          as _i4.Stream<Map<String, List<_i19.MeasurementBucket>>>);
+
+  @override
+  _i4.Stream<List<_i19.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i4.Stream<List<_i19.MeasurementValueCount>>.empty(),
+          )
+          as _i4.Stream<List<_i19.MeasurementValueCount>>);
+
+  @override
+  _i4.Future<List<_i17.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i4.Future<List<_i17.MeasurementCategory>>.value(
+              <_i17.MeasurementCategory>[],
+            ),
           )
-          as _i4.Stream<List<_i17.WeightEntry>>);
+          as _i4.Future<List<_i17.MeasurementCategory>>);
+
+  @override
+  _i4.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i4.Future<Set<String>>.value(<String>{}),
+          )
+          as _i4.Future<Set<String>>);
+
+  @override
+  _i4.Future<Map<String, _i18.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i4.Future<Map<String, _i18.MeasurementEntry>>.value(
+              <String, _i18.MeasurementEntry>{},
+            ),
+          )
+          as _i4.Future<Map<String, _i18.MeasurementEntry>>);
+
+  @override
+  _i4.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i4.Future<bool>.value(false),
+          )
+          as _i4.Future<bool>);
 
   @override
   _i4.Future<void> deleteLocalDrift(String? id) =>
@@ -512,7 +664,7 @@ class MockBodyWeightRepository extends _i1.Mock implements _i16.BodyWeightReposi
           as _i4.Future<void>);
 
   @override
-  _i4.Future<void> updateLocalDrift(_i17.WeightEntry? entry) =>
+  _i4.Future<void> updateLocalDrift(_i18.MeasurementEntry? entry) =>
       (super.noSuchMethod(
             Invocation.method(#updateLocalDrift, [entry]),
             returnValue: _i4.Future<void>.value(),
@@ -521,33 +673,93 @@ class MockBodyWeightRepository extends _i1.Mock implements _i16.BodyWeightReposi
           as _i4.Future<void>);
 
   @override
-  _i4.Future<void> addLocalDrift(_i17.WeightEntry? entry) =>
+  _i4.Future<void> addLocalDrift(_i18.MeasurementEntry? entry) =>
       (super.noSuchMethod(
             Invocation.method(#addLocalDrift, [entry]),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
           as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> addLocalDriftGroupEntries(
+    List<_i18.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> deleteLocalDriftCategory(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDriftCategory, [id]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> updateLocalDriftCategory(
+    _i17.MeasurementCategory? category,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDriftCategory, [category]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> addLocalDriftCategory(_i17.MeasurementCategory? category) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategory, [category]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> addLocalDriftCategoryGroup(
+    List<_i17.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
 }
 
 /// A class which mocks [UserProfileRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockUserProfileRepository extends _i1.Mock implements _i18.UserProfileRepository {
+class MockUserProfileRepository extends _i1.Mock implements _i20.UserProfileRepository {
   MockUserProfileRepository() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i4.Stream<_i19.UserProfile?> watchDrift() =>
+  _i4.Stream<_i21.UserProfile?> watchDrift() =>
       (super.noSuchMethod(
             Invocation.method(#watchDrift, []),
-            returnValue: _i4.Stream<_i19.UserProfile?>.empty(),
+            returnValue: _i4.Stream<_i21.UserProfile?>.empty(),
           )
-          as _i4.Stream<_i19.UserProfile?>);
+          as _i4.Stream<_i21.UserProfile?>);
 
   @override
-  _i4.Future<void> editLocalDrift(_i19.UserProfile? profile) =>
+  _i4.Future<void> editLocalDrift(_i21.UserProfile? profile) =>
       (super.noSuchMethod(
             Invocation.method(#editLocalDrift, [profile]),
             returnValue: _i4.Future<void>.value(),
diff --git a/test/features/nutrition/widgets/plan_weight_chart_test.dart b/test/features/nutrition/widgets/plan_weight_chart_test.dart
new file mode 100644
index 000000000..6e820f1e2
--- /dev/null
+++ b/test/features/nutrition/widgets/plan_weight_chart_test.dart
@@ -0,0 +1,114 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:fl_chart/fl_chart.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:wger/features/account/providers/user_profile_repository.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+import 'package:wger/features/measurements/widgets/charts.dart';
+import 'package:wger/features/nutrition/models/nutritional_plan.dart';
+import 'package:wger/features/nutrition/widgets/plan_weight_chart.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../../test_data/body_weight.dart';
+import '../../../../test_data/profile.dart';
+import '../../../helpers/measurement_repository_stubs.dart';
+import 'plan_weight_chart_test.mocks.dart';
+
+@GenerateMocks([MeasurementRepository, UserProfileRepository])
+void main() {
+  late MockMeasurementRepository mockMeasurementRepo;
+  late MockUserProfileRepository mockUserProfileRepo;
+
+  setUp(() {
+    mockMeasurementRepo = MockMeasurementRepository();
+    // The chart reads the official category and its points through their own
+    // queries, not the whole list
+    stubMeasurementReads(
+      mockMeasurementRepo,
+      [getBodyWeightCategory()],
+      bodyWeightEntries([testWeightEntry2, testWeightEntry1, testWeightEntryLb]),
+    );
+
+    mockUserProfileRepo = MockUserProfileRepository();
+    when(mockUserProfileRepo.watchDrift()).thenAnswer((_) => Stream.value(tUserProfile1));
+  });
+
+  Future<void> pumpChart(WidgetTester tester, NutritionalPlan plan) async {
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          measurementRepositoryProvider.overrideWithValue(mockMeasurementRepo),
+          userProfileRepositoryProvider.overrideWithValue(mockUserProfileRepo),
+        ],
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(body: SingleChildScrollView(child: PlanWeightChart(plan))),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+  }
+
+  testWidgets('shows the readings of the plan period', (tester) async {
+    // Two of the three entries fall into the period; the january 20th one is
+    // after the end and must not be drawn
+    await pumpChart(
+      tester,
+      NutritionalPlan(
+        description: 'Cut',
+        startDate: DateTime(2021, 1, 1),
+        endDate: DateTime(2021, 1, 15),
+      ),
+    );
+
+    expect(find.text('Weight'), findsOneWidget);
+    expect(find.byType(MeasurementOverallChangeWidget), findsOneWidget);
+    final data = tester.widget<LineChart>(find.byType(LineChart)).data;
+    expect(data.lineBarsData.first.spots, hasLength(2));
+  });
+
+  testWidgets('an open-ended plan includes everything since its start', (tester) async {
+    await pumpChart(
+      tester,
+      NutritionalPlan(description: 'Bulk', startDate: DateTime(2021, 1, 1)),
+    );
+
+    final data = tester.widget<LineChart>(find.byType(LineChart)).data;
+    expect(data.lineBarsData.first.spots, hasLength(3));
+  });
+
+  testWidgets('hidden when fewer than two readings fall into the period', (tester) async {
+    await pumpChart(
+      tester,
+      NutritionalPlan(
+        description: 'Cut',
+        startDate: DateTime(2021, 1, 5),
+        endDate: DateTime(2021, 1, 15),
+      ),
+    );
+
+    expect(find.byType(LineChart), findsNothing);
+    expect(find.text('Weight'), findsNothing);
+  });
+}
diff --git a/test/features/nutrition/widgets/plan_weight_chart_test.mocks.dart b/test/features/nutrition/widgets/plan_weight_chart_test.mocks.dart
new file mode 100644
index 000000000..7c2316bb7
--- /dev/null
+++ b/test/features/nutrition/widgets/plan_weight_chart_test.mocks.dart
@@ -0,0 +1,309 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/nutrition/widgets/plan_weight_chart_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i3;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:wger/features/account/models/user_profile.dart' as _i8;
+import 'package:wger/features/account/providers/user_profile_repository.dart' as _i7;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i6;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i4;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i5;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i2;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+/// A class which mocks [MeasurementRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepository {
+  MockMeasurementRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<List<_i4.MeasurementCategory>> watchAllWithoutEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i3.Stream<List<_i4.MeasurementCategory>>.empty(),
+          )
+          as _i3.Stream<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchCategoryWithoutEntries(
+    String? id,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<Map<String, _i5.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i3.Stream<Map<String, _i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementBucket>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementBucket>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementValueCount>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementValueCount>>);
+
+  @override
+  _i3.Future<List<_i4.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i3.Future<List<_i4.MeasurementCategory>>.value(
+              <_i4.MeasurementCategory>[],
+            ),
+          )
+          as _i3.Future<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
+
+  @override
+  _i3.Future<Map<String, _i5.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i3.Future<Map<String, _i5.MeasurementEntry>>.value(
+              <String, _i5.MeasurementEntry>{},
+            ),
+          )
+          as _i3.Future<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
+  @override
+  _i3.Future<void> deleteLocalDrift(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDrift, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDrift(_i5.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDrift, [entry]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftGroupEntries(
+    List<_i5.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteLocalDriftCategory(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDriftCategory, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDriftCategory(
+    _i4.MeasurementCategory? category,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategory(_i4.MeasurementCategory? category) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategoryGroup(
+    List<_i4.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}
+
+/// A class which mocks [UserProfileRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockUserProfileRepository extends _i1.Mock implements _i7.UserProfileRepository {
+  MockUserProfileRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<_i8.UserProfile?> watchDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDrift, []),
+            returnValue: _i3.Stream<_i8.UserProfile?>.empty(),
+          )
+          as _i3.Stream<_i8.UserProfile?>);
+
+  @override
+  _i3.Future<void> editLocalDrift(_i8.UserProfile? profile) =>
+      (super.noSuchMethod(
+            Invocation.method(#editLocalDrift, [profile]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}
diff --git a/test/features/routines/providers/routines_repository_test.mocks.dart b/test/features/routines/providers/routines_repository_test.mocks.dart
index 65a35a37c..d69c0d1e8 100644
--- a/test/features/routines/providers/routines_repository_test.mocks.dart
+++ b/test/features/routines/providers/routines_repository_test.mocks.dart
@@ -140,189 +140,184 @@ class _Fake$ExerciseVideoTableTable_19 extends _i1.SmartFake
     : super(parent, parentInvocation);
 }
 
-class _Fake$WeightEntryTableTable_20 extends _i1.SmartFake implements _i4.$WeightEntryTableTable {
-  _Fake$WeightEntryTableTable_20(Object parent, Invocation parentInvocation)
-    : super(parent, parentInvocation);
-}
-
-class _Fake$MeasurementCategoryTableTable_21 extends _i1.SmartFake
+class _Fake$MeasurementCategoryTableTable_20 extends _i1.SmartFake
     implements _i4.$MeasurementCategoryTableTable {
-  _Fake$MeasurementCategoryTableTable_21(
+  _Fake$MeasurementCategoryTableTable_20(
     Object parent,
     Invocation parentInvocation,
   ) : super(parent, parentInvocation);
 }
 
-class _Fake$MeasurementEntryTableTable_22 extends _i1.SmartFake
+class _Fake$MeasurementEntryTableTable_21 extends _i1.SmartFake
     implements _i4.$MeasurementEntryTableTable {
-  _Fake$MeasurementEntryTableTable_22(
+  _Fake$MeasurementEntryTableTable_21(
     Object parent,
     Invocation parentInvocation,
   ) : super(parent, parentInvocation);
 }
 
-class _Fake$RoutineTableTable_23 extends _i1.SmartFake implements _i4.$RoutineTableTable {
-  _Fake$RoutineTableTable_23(Object parent, Invocation parentInvocation)
+class _Fake$RoutineTableTable_22 extends _i1.SmartFake implements _i4.$RoutineTableTable {
+  _Fake$RoutineTableTable_22(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _Fake$WorkoutLogTableTable_24 extends _i1.SmartFake implements _i4.$WorkoutLogTableTable {
-  _Fake$WorkoutLogTableTable_24(Object parent, Invocation parentInvocation)
+class _Fake$WorkoutLogTableTable_23 extends _i1.SmartFake implements _i4.$WorkoutLogTableTable {
+  _Fake$WorkoutLogTableTable_23(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _Fake$WorkoutSessionTableTable_25 extends _i1.SmartFake
+class _Fake$WorkoutSessionTableTable_24 extends _i1.SmartFake
     implements _i4.$WorkoutSessionTableTable {
-  _Fake$WorkoutSessionTableTable_25(Object parent, Invocation parentInvocation)
+  _Fake$WorkoutSessionTableTable_24(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _Fake$RoutineRepetitionUnitTableTable_26 extends _i1.SmartFake
+class _Fake$RoutineRepetitionUnitTableTable_25 extends _i1.SmartFake
     implements _i4.$RoutineRepetitionUnitTableTable {
-  _Fake$RoutineRepetitionUnitTableTable_26(
+  _Fake$RoutineRepetitionUnitTableTable_25(
     Object parent,
     Invocation parentInvocation,
   ) : super(parent, parentInvocation);
 }
 
-class _Fake$RoutineWeightUnitTableTable_27 extends _i1.SmartFake
+class _Fake$RoutineWeightUnitTableTable_26 extends _i1.SmartFake
     implements _i4.$RoutineWeightUnitTableTable {
-  _Fake$RoutineWeightUnitTableTable_27(
+  _Fake$RoutineWeightUnitTableTable_26(
     Object parent,
     Invocation parentInvocation,
   ) : super(parent, parentInvocation);
 }
 
-class _Fake$NutritionalPlanTableTable_28 extends _i1.SmartFake
+class _Fake$NutritionalPlanTableTable_27 extends _i1.SmartFake
     implements _i4.$NutritionalPlanTableTable {
-  _Fake$NutritionalPlanTableTable_28(Object parent, Invocation parentInvocation)
+  _Fake$NutritionalPlanTableTable_27(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _Fake$IngredientTableTable_29 extends _i1.SmartFake implements _i4.$IngredientTableTable {
-  _Fake$IngredientTableTable_29(Object parent, Invocation parentInvocation)
+class _Fake$IngredientTableTable_28 extends _i1.SmartFake implements _i4.$IngredientTableTable {
+  _Fake$IngredientTableTable_28(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _Fake$IngredientImageTableTable_30 extends _i1.SmartFake
+class _Fake$IngredientImageTableTable_29 extends _i1.SmartFake
     implements _i4.$IngredientImageTableTable {
-  _Fake$IngredientImageTableTable_30(Object parent, Invocation parentInvocation)
+  _Fake$IngredientImageTableTable_29(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _Fake$IngredientWeightUnitTableTable_31 extends _i1.SmartFake
+class _Fake$IngredientWeightUnitTableTable_30 extends _i1.SmartFake
     implements _i4.$IngredientWeightUnitTableTable {
-  _Fake$IngredientWeightUnitTableTable_31(
+  _Fake$IngredientWeightUnitTableTable_30(
     Object parent,
     Invocation parentInvocation,
   ) : super(parent, parentInvocation);
 }
 
-class _Fake$MealTableTable_32 extends _i1.SmartFake implements _i4.$MealTableTable {
-  _Fake$MealTableTable_32(Object parent, Invocation parentInvocation)
+class _Fake$MealTableTable_31 extends _i1.SmartFake implements _i4.$MealTableTable {
+  _Fake$MealTableTable_31(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _Fake$MealItemTableTable_33 extends _i1.SmartFake implements _i4.$MealItemTableTable {
-  _Fake$MealItemTableTable_33(Object parent, Invocation parentInvocation)
+class _Fake$MealItemTableTable_32 extends _i1.SmartFake implements _i4.$MealItemTableTable {
+  _Fake$MealItemTableTable_32(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _Fake$LogItemTableTable_34 extends _i1.SmartFake implements _i4.$LogItemTableTable {
-  _Fake$LogItemTableTable_34(Object parent, Invocation parentInvocation)
+class _Fake$LogItemTableTable_33 extends _i1.SmartFake implements _i4.$LogItemTableTable {
+  _Fake$LogItemTableTable_33(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _Fake$GalleryImageTableTable_35 extends _i1.SmartFake implements _i4.$GalleryImageTableTable {
-  _Fake$GalleryImageTableTable_35(Object parent, Invocation parentInvocation)
+class _Fake$GalleryImageTableTable_34 extends _i1.SmartFake implements _i4.$GalleryImageTableTable {
+  _Fake$GalleryImageTableTable_34(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _FakeDriftDatabaseOptions_36 extends _i1.SmartFake implements _i3.DriftDatabaseOptions {
-  _FakeDriftDatabaseOptions_36(Object parent, Invocation parentInvocation)
+class _FakeDriftDatabaseOptions_35 extends _i1.SmartFake implements _i3.DriftDatabaseOptions {
+  _FakeDriftDatabaseOptions_35(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _FakeGeneratedDatabase_37 extends _i1.SmartFake implements _i3.GeneratedDatabase {
-  _FakeGeneratedDatabase_37(Object parent, Invocation parentInvocation)
+class _FakeGeneratedDatabase_36 extends _i1.SmartFake implements _i3.GeneratedDatabase {
+  _FakeGeneratedDatabase_36(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _FakeStreamQueryUpdateRules_38 extends _i1.SmartFake implements _i3.StreamQueryUpdateRules {
-  _FakeStreamQueryUpdateRules_38(Object parent, Invocation parentInvocation)
+class _FakeStreamQueryUpdateRules_37 extends _i1.SmartFake implements _i3.StreamQueryUpdateRules {
+  _FakeStreamQueryUpdateRules_37(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _FakeDatabaseConnection_39 extends _i1.SmartFake implements _i3.DatabaseConnection {
-  _FakeDatabaseConnection_39(Object parent, Invocation parentInvocation)
+class _FakeDatabaseConnection_38 extends _i1.SmartFake implements _i3.DatabaseConnection {
+  _FakeDatabaseConnection_38(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _FakeQueryExecutor_40 extends _i1.SmartFake implements _i3.QueryExecutor {
-  _FakeQueryExecutor_40(Object parent, Invocation parentInvocation)
+class _FakeQueryExecutor_39 extends _i1.SmartFake implements _i3.QueryExecutor {
+  _FakeQueryExecutor_39(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _FakeStreamQueryStore_41 extends _i1.SmartFake implements _i5.StreamQueryStore {
-  _FakeStreamQueryStore_41(Object parent, Invocation parentInvocation)
+class _FakeStreamQueryStore_40 extends _i1.SmartFake implements _i5.StreamQueryStore {
+  _FakeStreamQueryStore_40(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _FakeDatabaseConnectionUser_42 extends _i1.SmartFake implements _i3.DatabaseConnectionUser {
-  _FakeDatabaseConnectionUser_42(Object parent, Invocation parentInvocation)
+class _FakeDatabaseConnectionUser_41 extends _i1.SmartFake implements _i3.DatabaseConnectionUser {
+  _FakeDatabaseConnectionUser_41(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _FakeMigrator_43 extends _i1.SmartFake implements _i3.Migrator {
-  _FakeMigrator_43(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeMigrator_42 extends _i1.SmartFake implements _i3.Migrator {
+  _FakeMigrator_42(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
-class _FakeFuture_44<T> extends _i1.SmartFake implements _i6.Future<T> {
-  _FakeFuture_44(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeFuture_43<T> extends _i1.SmartFake implements _i6.Future<T> {
+  _FakeFuture_43(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
-class _FakeInsertStatement_45<T1 extends _i3.Table, D1> extends _i1.SmartFake
+class _FakeInsertStatement_44<T1 extends _i3.Table, D1> extends _i1.SmartFake
     implements _i3.InsertStatement<T1, D1> {
-  _FakeInsertStatement_45(Object parent, Invocation parentInvocation)
+  _FakeInsertStatement_44(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _FakeUpdateStatement_46<T extends _i3.Table, D> extends _i1.SmartFake
+class _FakeUpdateStatement_45<T extends _i3.Table, D> extends _i1.SmartFake
     implements _i3.UpdateStatement<T, D> {
-  _FakeUpdateStatement_46(Object parent, Invocation parentInvocation)
+  _FakeUpdateStatement_45(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _FakeSimpleSelectStatement_47<T1 extends _i3.HasResultSet, D> extends _i1.SmartFake
+class _FakeSimpleSelectStatement_46<T1 extends _i3.HasResultSet, D> extends _i1.SmartFake
     implements _i3.SimpleSelectStatement<T1, D> {
-  _FakeSimpleSelectStatement_47(Object parent, Invocation parentInvocation)
+  _FakeSimpleSelectStatement_46(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _FakeJoinedSelectStatement_48<FirstT extends _i3.HasResultSet, FirstD> extends _i1.SmartFake
+class _FakeJoinedSelectStatement_47<FirstT extends _i3.HasResultSet, FirstD> extends _i1.SmartFake
     implements _i3.JoinedSelectStatement<FirstT, FirstD> {
-  _FakeJoinedSelectStatement_48(Object parent, Invocation parentInvocation)
+  _FakeJoinedSelectStatement_47(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _FakeBaseSelectStatement_49<Row> extends _i1.SmartFake
+class _FakeBaseSelectStatement_48<Row> extends _i1.SmartFake
     implements _i3.BaseSelectStatement<Row> {
-  _FakeBaseSelectStatement_49(Object parent, Invocation parentInvocation)
+  _FakeBaseSelectStatement_48(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _FakeDeleteStatement_50<T1 extends _i3.Table, D1> extends _i1.SmartFake
+class _FakeDeleteStatement_49<T1 extends _i3.Table, D1> extends _i1.SmartFake
     implements _i3.DeleteStatement<T1, D1> {
-  _FakeDeleteStatement_50(Object parent, Invocation parentInvocation)
+  _FakeDeleteStatement_49(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
-class _FakeSelectable_51<T> extends _i1.SmartFake implements _i3.Selectable<T> {
-  _FakeSelectable_51(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeSelectable_50<T> extends _i1.SmartFake implements _i3.Selectable<T> {
+  _FakeSelectable_50(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
-class _FakeGenerationContext_52 extends _i1.SmartFake implements _i3.GenerationContext {
-  _FakeGenerationContext_52(Object parent, Invocation parentInvocation)
+class _FakeGenerationContext_51 extends _i1.SmartFake implements _i3.GenerationContext {
+  _FakeGenerationContext_51(Object parent, Invocation parentInvocation)
     : super(parent, parentInvocation);
 }
 
@@ -687,22 +682,11 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
           )
           as _i4.$ExerciseVideoTableTable);
 
-  @override
-  _i4.$WeightEntryTableTable get weightEntryTable =>
-      (super.noSuchMethod(
-            Invocation.getter(#weightEntryTable),
-            returnValue: _Fake$WeightEntryTableTable_20(
-              this,
-              Invocation.getter(#weightEntryTable),
-            ),
-          )
-          as _i4.$WeightEntryTableTable);
-
   @override
   _i4.$MeasurementCategoryTableTable get measurementCategoryTable =>
       (super.noSuchMethod(
             Invocation.getter(#measurementCategoryTable),
-            returnValue: _Fake$MeasurementCategoryTableTable_21(
+            returnValue: _Fake$MeasurementCategoryTableTable_20(
               this,
               Invocation.getter(#measurementCategoryTable),
             ),
@@ -713,7 +697,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i4.$MeasurementEntryTableTable get measurementEntryTable =>
       (super.noSuchMethod(
             Invocation.getter(#measurementEntryTable),
-            returnValue: _Fake$MeasurementEntryTableTable_22(
+            returnValue: _Fake$MeasurementEntryTableTable_21(
               this,
               Invocation.getter(#measurementEntryTable),
             ),
@@ -724,7 +708,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i4.$RoutineTableTable get routineTable =>
       (super.noSuchMethod(
             Invocation.getter(#routineTable),
-            returnValue: _Fake$RoutineTableTable_23(
+            returnValue: _Fake$RoutineTableTable_22(
               this,
               Invocation.getter(#routineTable),
             ),
@@ -735,7 +719,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i4.$WorkoutLogTableTable get workoutLogTable =>
       (super.noSuchMethod(
             Invocation.getter(#workoutLogTable),
-            returnValue: _Fake$WorkoutLogTableTable_24(
+            returnValue: _Fake$WorkoutLogTableTable_23(
               this,
               Invocation.getter(#workoutLogTable),
             ),
@@ -746,7 +730,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i4.$WorkoutSessionTableTable get workoutSessionTable =>
       (super.noSuchMethod(
             Invocation.getter(#workoutSessionTable),
-            returnValue: _Fake$WorkoutSessionTableTable_25(
+            returnValue: _Fake$WorkoutSessionTableTable_24(
               this,
               Invocation.getter(#workoutSessionTable),
             ),
@@ -757,7 +741,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i4.$RoutineRepetitionUnitTableTable get routineRepetitionUnitTable =>
       (super.noSuchMethod(
             Invocation.getter(#routineRepetitionUnitTable),
-            returnValue: _Fake$RoutineRepetitionUnitTableTable_26(
+            returnValue: _Fake$RoutineRepetitionUnitTableTable_25(
               this,
               Invocation.getter(#routineRepetitionUnitTable),
             ),
@@ -768,7 +752,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i4.$RoutineWeightUnitTableTable get routineWeightUnitTable =>
       (super.noSuchMethod(
             Invocation.getter(#routineWeightUnitTable),
-            returnValue: _Fake$RoutineWeightUnitTableTable_27(
+            returnValue: _Fake$RoutineWeightUnitTableTable_26(
               this,
               Invocation.getter(#routineWeightUnitTable),
             ),
@@ -779,7 +763,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i4.$NutritionalPlanTableTable get nutritionalPlanTable =>
       (super.noSuchMethod(
             Invocation.getter(#nutritionalPlanTable),
-            returnValue: _Fake$NutritionalPlanTableTable_28(
+            returnValue: _Fake$NutritionalPlanTableTable_27(
               this,
               Invocation.getter(#nutritionalPlanTable),
             ),
@@ -790,7 +774,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i4.$IngredientTableTable get ingredientTable =>
       (super.noSuchMethod(
             Invocation.getter(#ingredientTable),
-            returnValue: _Fake$IngredientTableTable_29(
+            returnValue: _Fake$IngredientTableTable_28(
               this,
               Invocation.getter(#ingredientTable),
             ),
@@ -801,7 +785,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i4.$IngredientImageTableTable get ingredientImageTable =>
       (super.noSuchMethod(
             Invocation.getter(#ingredientImageTable),
-            returnValue: _Fake$IngredientImageTableTable_30(
+            returnValue: _Fake$IngredientImageTableTable_29(
               this,
               Invocation.getter(#ingredientImageTable),
             ),
@@ -812,7 +796,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i4.$IngredientWeightUnitTableTable get ingredientWeightUnitTable =>
       (super.noSuchMethod(
             Invocation.getter(#ingredientWeightUnitTable),
-            returnValue: _Fake$IngredientWeightUnitTableTable_31(
+            returnValue: _Fake$IngredientWeightUnitTableTable_30(
               this,
               Invocation.getter(#ingredientWeightUnitTable),
             ),
@@ -823,7 +807,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i4.$MealTableTable get mealTable =>
       (super.noSuchMethod(
             Invocation.getter(#mealTable),
-            returnValue: _Fake$MealTableTable_32(
+            returnValue: _Fake$MealTableTable_31(
               this,
               Invocation.getter(#mealTable),
             ),
@@ -834,7 +818,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i4.$MealItemTableTable get mealItemTable =>
       (super.noSuchMethod(
             Invocation.getter(#mealItemTable),
-            returnValue: _Fake$MealItemTableTable_33(
+            returnValue: _Fake$MealItemTableTable_32(
               this,
               Invocation.getter(#mealItemTable),
             ),
@@ -845,7 +829,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i4.$LogItemTableTable get logItemTable =>
       (super.noSuchMethod(
             Invocation.getter(#logItemTable),
-            returnValue: _Fake$LogItemTableTable_34(
+            returnValue: _Fake$LogItemTableTable_33(
               this,
               Invocation.getter(#logItemTable),
             ),
@@ -856,7 +840,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i4.$GalleryImageTableTable get galleryImageTable =>
       (super.noSuchMethod(
             Invocation.getter(#galleryImageTable),
-            returnValue: _Fake$GalleryImageTableTable_35(
+            returnValue: _Fake$GalleryImageTableTable_34(
               this,
               Invocation.getter(#galleryImageTable),
             ),
@@ -883,7 +867,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i3.DriftDatabaseOptions get options =>
       (super.noSuchMethod(
             Invocation.getter(#options),
-            returnValue: _FakeDriftDatabaseOptions_36(
+            returnValue: _FakeDriftDatabaseOptions_35(
               this,
               Invocation.getter(#options),
             ),
@@ -894,7 +878,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i3.GeneratedDatabase get attachedDatabase =>
       (super.noSuchMethod(
             Invocation.getter(#attachedDatabase),
-            returnValue: _FakeGeneratedDatabase_37(
+            returnValue: _FakeGeneratedDatabase_36(
               this,
               Invocation.getter(#attachedDatabase),
             ),
@@ -905,7 +889,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i3.StreamQueryUpdateRules get streamUpdateRules =>
       (super.noSuchMethod(
             Invocation.getter(#streamUpdateRules),
-            returnValue: _FakeStreamQueryUpdateRules_38(
+            returnValue: _FakeStreamQueryUpdateRules_37(
               this,
               Invocation.getter(#streamUpdateRules),
             ),
@@ -916,7 +900,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i3.DatabaseConnection get connection =>
       (super.noSuchMethod(
             Invocation.getter(#connection),
-            returnValue: _FakeDatabaseConnection_39(
+            returnValue: _FakeDatabaseConnection_38(
               this,
               Invocation.getter(#connection),
             ),
@@ -938,7 +922,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i3.QueryExecutor get executor =>
       (super.noSuchMethod(
             Invocation.getter(#executor),
-            returnValue: _FakeQueryExecutor_40(
+            returnValue: _FakeQueryExecutor_39(
               this,
               Invocation.getter(#executor),
             ),
@@ -949,7 +933,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i5.StreamQueryStore get streamQueries =>
       (super.noSuchMethod(
             Invocation.getter(#streamQueries),
-            returnValue: _FakeStreamQueryStore_41(
+            returnValue: _FakeStreamQueryStore_40(
               this,
               Invocation.getter(#streamQueries),
             ),
@@ -960,7 +944,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i3.DatabaseConnectionUser get resolvedEngine =>
       (super.noSuchMethod(
             Invocation.getter(#resolvedEngine),
-            returnValue: _FakeDatabaseConnectionUser_42(
+            returnValue: _FakeDatabaseConnectionUser_41(
               this,
               Invocation.getter(#resolvedEngine),
             ),
@@ -971,7 +955,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   _i3.Migrator createMigrator() =>
       (super.noSuchMethod(
             Invocation.method(#createMigrator, []),
-            returnValue: _FakeMigrator_43(
+            returnValue: _FakeMigrator_42(
               this,
               Invocation.method(#createMigrator, []),
             ),
@@ -1020,7 +1004,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
                   ),
                   (Ret v) => _i6.Future<Ret>.value(v),
                 ) ??
-                _FakeFuture_44<Ret>(
+                _FakeFuture_43<Ret>(
                   this,
                   Invocation.method(#computeWithDatabase, [], {
                     #computation: computation,
@@ -1087,7 +1071,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
                   ),
                   (T v) => _i6.Future<T>.value(v),
                 ) ??
-                _FakeFuture_44<T>(this, Invocation.method(#doWhenOpened, [fn])),
+                _FakeFuture_43<T>(this, Invocation.method(#doWhenOpened, [fn])),
           )
           as _i6.Future<T>);
 
@@ -1097,7 +1081,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   ) =>
       (super.noSuchMethod(
             Invocation.method(#into, [table]),
-            returnValue: _FakeInsertStatement_45<T, D>(
+            returnValue: _FakeInsertStatement_44<T, D>(
               this,
               Invocation.method(#into, [table]),
             ),
@@ -1110,7 +1094,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   ) =>
       (super.noSuchMethod(
             Invocation.method(#update, [table]),
-            returnValue: _FakeUpdateStatement_46<Tbl, R>(
+            returnValue: _FakeUpdateStatement_45<Tbl, R>(
               this,
               Invocation.method(#update, [table]),
             ),
@@ -1124,7 +1108,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   }) =>
       (super.noSuchMethod(
             Invocation.method(#select, [table], {#distinct: distinct}),
-            returnValue: _FakeSimpleSelectStatement_47<T, R>(
+            returnValue: _FakeSimpleSelectStatement_46<T, R>(
               this,
               Invocation.method(#select, [table], {#distinct: distinct}),
             ),
@@ -1138,7 +1122,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   }) =>
       (super.noSuchMethod(
             Invocation.method(#selectOnly, [table], {#distinct: distinct}),
-            returnValue: _FakeJoinedSelectStatement_48<T, R>(
+            returnValue: _FakeJoinedSelectStatement_47<T, R>(
               this,
               Invocation.method(#selectOnly, [table], {#distinct: distinct}),
             ),
@@ -1151,7 +1135,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   ) =>
       (super.noSuchMethod(
             Invocation.method(#selectExpressions, [columns]),
-            returnValue: _FakeBaseSelectStatement_49<_i3.TypedResult>(
+            returnValue: _FakeBaseSelectStatement_48<_i3.TypedResult>(
               this,
               Invocation.method(#selectExpressions, [columns]),
             ),
@@ -1164,7 +1148,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
   ) =>
       (super.noSuchMethod(
             Invocation.method(#delete, [table]),
-            returnValue: _FakeDeleteStatement_50<T, D>(
+            returnValue: _FakeDeleteStatement_49<T, D>(
               this,
               Invocation.method(#delete, [table]),
             ),
@@ -1241,7 +1225,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
               [query],
               {#variables: variables, #readsFrom: readsFrom},
             ),
-            returnValue: _FakeSelectable_51<_i3.QueryRow>(
+            returnValue: _FakeSelectable_50<_i3.QueryRow>(
               this,
               Invocation.method(
                 #customSelect,
@@ -1264,7 +1248,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
               [query],
               {#variables: variables, #readsFrom: readsFrom},
             ),
-            returnValue: _FakeSelectable_51<_i3.QueryRow>(
+            returnValue: _FakeSelectable_50<_i3.QueryRow>(
               this,
               Invocation.method(
                 #customSelectQuery,
@@ -1307,7 +1291,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
                   ),
                   (T v) => _i6.Future<T>.value(v),
                 ) ??
-                _FakeFuture_44<T>(
+                _FakeFuture_43<T>(
                   this,
                   Invocation.method(
                     #transaction,
@@ -1330,7 +1314,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
                   ),
                   (T v) => _i6.Future<T>.value(v),
                 ) ??
-                _FakeFuture_44<T>(
+                _FakeFuture_43<T>(
                   this,
                   Invocation.method(#exclusively, [action]),
                 ),
@@ -1369,7 +1353,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
                   ),
                   (T v) => _i6.Future<T>.value(v),
                 ) ??
-                _FakeFuture_44<T>(
+                _FakeFuture_43<T>(
                   this,
                   Invocation.method(
                     #runWithInterceptor,
@@ -1392,7 +1376,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
               [component],
               {#hasMultipleTables: hasMultipleTables, #startIndex: startIndex},
             ),
-            returnValue: _FakeGenerationContext_52(
+            returnValue: _FakeGenerationContext_51(
               this,
               Invocation.method(
                 #$write,
@@ -1418,7 +1402,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
               [table, insertable],
               {#startIndex: startIndex},
             ),
-            returnValue: _FakeGenerationContext_52(
+            returnValue: _FakeGenerationContext_51(
               this,
               Invocation.method(
                 #$writeInsertable,
@@ -1429,6 +1413,29 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
           )
           as _i3.GenerationContext);
 
+  @override
+  _i3.GenerationContext $writeUpdateInsertable(
+    _i3.TableInfo<_i3.Table, dynamic>? table,
+    _i3.Insertable<dynamic>? insertable, {
+    int? startIndex,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #$writeUpdateInsertable,
+              [table, insertable],
+              {#startIndex: startIndex},
+            ),
+            returnValue: _FakeGenerationContext_51(
+              this,
+              Invocation.method(
+                #$writeUpdateInsertable,
+                [table, insertable],
+                {#startIndex: startIndex},
+              ),
+            ),
+          )
+          as _i3.GenerationContext);
+
   @override
   String $expandVar(int? start, int? amount) =>
       (super.noSuchMethod(
diff --git a/test/features/weight/providers/body_weight_notifier_test.dart b/test/features/weight/providers/body_weight_notifier_test.dart
deleted file mode 100644
index c19924b73..000000000
--- a/test/features/weight/providers/body_weight_notifier_test.dart
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * wger Workout Manager is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:mockito/annotations.dart';
-import 'package:mockito/mockito.dart';
-import 'package:wger/features/weight/models/weight_entry.dart';
-import 'package:wger/features/weight/providers/body_weight_notifier.dart';
-import 'package:wger/features/weight/providers/body_weight_repository.dart';
-
-import 'body_weight_notifier_test.mocks.dart';
-
-@GenerateMocks([BodyWeightRepository])
-void main() {
-  late MockBodyWeightRepository mockBodyWeightRepository;
-  late ProviderContainer container;
-
-  setUp(() {
-    mockBodyWeightRepository = MockBodyWeightRepository();
-    when(mockBodyWeightRepository.watchAllDrift()).thenAnswer((_) => Stream.value(<WeightEntry>[]));
-    when(mockBodyWeightRepository.deleteLocalDrift(any)).thenAnswer((_) async {});
-    when(mockBodyWeightRepository.updateLocalDrift(any)).thenAnswer((_) async {});
-    container = ProviderContainer.test(
-      overrides: [bodyWeightRepositoryProvider.overrideWithValue(mockBodyWeightRepository)],
-    );
-  });
-
-  group('test body weight provider', () {
-    test('deleteEntry correctly calls repository.deleteLocalDrift', () async {
-      final notifier = container.read(weightEntryProvider.notifier);
-
-      await notifier.deleteEntry('123');
-      verify(mockBodyWeightRepository.deleteLocalDrift('123')).called(1);
-    });
-
-    test('updateEntry correctly calls repository.updateLocalDrift', () async {
-      final notifier = container.read(weightEntryProvider.notifier);
-      final entry = WeightEntry(id: '123', date: DateTime.now(), weight: 70.0);
-
-      await notifier.updateEntry(entry);
-      verify(mockBodyWeightRepository.updateLocalDrift(entry)).called(1);
-    });
-  });
-}
diff --git a/test/features/weight/providers/body_weight_notifier_test.mocks.dart b/test/features/weight/providers/body_weight_notifier_test.mocks.dart
deleted file mode 100644
index d434294ad..000000000
--- a/test/features/weight/providers/body_weight_notifier_test.mocks.dart
+++ /dev/null
@@ -1,69 +0,0 @@
-// Mocks generated by Mockito 5.4.6 from annotations
-// in wger/test/features/weight/providers/body_weight_notifier_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i3;
-
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:wger/features/weight/models/weight_entry.dart' as _i4;
-import 'package:wger/features/weight/providers/body_weight_repository.dart' as _i2;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: deprecated_member_use
-// ignore_for_file: deprecated_member_use_from_same_package
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: must_be_immutable
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-// ignore_for_file: invalid_use_of_internal_member
-
-/// A class which mocks [BodyWeightRepository].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockBodyWeightRepository extends _i1.Mock implements _i2.BodyWeightRepository {
-  MockBodyWeightRepository() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i3.Stream<List<_i4.WeightEntry>> watchAllDrift() =>
-      (super.noSuchMethod(
-            Invocation.method(#watchAllDrift, []),
-            returnValue: _i3.Stream<List<_i4.WeightEntry>>.empty(),
-          )
-          as _i3.Stream<List<_i4.WeightEntry>>);
-
-  @override
-  _i3.Future<void> deleteLocalDrift(String? id) =>
-      (super.noSuchMethod(
-            Invocation.method(#deleteLocalDrift, [id]),
-            returnValue: _i3.Future<void>.value(),
-            returnValueForMissingStub: _i3.Future<void>.value(),
-          )
-          as _i3.Future<void>);
-
-  @override
-  _i3.Future<void> updateLocalDrift(_i4.WeightEntry? entry) =>
-      (super.noSuchMethod(
-            Invocation.method(#updateLocalDrift, [entry]),
-            returnValue: _i3.Future<void>.value(),
-            returnValueForMissingStub: _i3.Future<void>.value(),
-          )
-          as _i3.Future<void>);
-
-  @override
-  _i3.Future<void> addLocalDrift(_i4.WeightEntry? entry) =>
-      (super.noSuchMethod(
-            Invocation.method(#addLocalDrift, [entry]),
-            returnValue: _i3.Future<void>.value(),
-            returnValueForMissingStub: _i3.Future<void>.value(),
-          )
-          as _i3.Future<void>);
-}
diff --git a/test/features/weight/providers/body_weight_repository_test.dart b/test/features/weight/providers/body_weight_repository_test.dart
deleted file mode 100644
index d27ae43b3..000000000
--- a/test/features/weight/providers/body_weight_repository_test.dart
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (c) 2026 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'dart:async';
-
-import 'package:flutter_test/flutter_test.dart';
-import 'package:wger/database/powersync/database.dart';
-import 'package:wger/features/weight/models/weight_entry.dart';
-import 'package:wger/features/weight/providers/body_weight_repository.dart';
-
-import '../../../../test_data/body_weight.dart';
-import '../../../helpers/in_memory_drift.dart';
-
-void main() {
-  late DriftPowersyncDatabase db;
-  late BodyWeightRepository repo;
-
-  setUp(() async {
-    db = await openTestDatabase();
-    repo = BodyWeightRepository(db);
-  });
-
-  tearDown(() async {
-    await db.close();
-  });
-
-  Future<List<WeightEntry>> readAll() => db.select(db.weightEntryTable).get();
-
-  test('addLocalDrift inserts a row visible via the table query', () async {
-    await repo.addLocalDrift(testWeightEntry1);
-
-    final rows = await readAll();
-    expect(rows, hasLength(1));
-    expect(rows.first.weight, testWeightEntry1.weight);
-    // Stored as UTC, read back in the device's local zone (same instant).
-    expect(rows.first.date, testWeightEntry1.date.toLocal());
-    // The entry's `id` field is ignored on insert (toCompanion uses
-    // includeId:false) so the table's clientDefault assigns a fresh UUID.
-    expect(rows.first.id, isNotEmpty);
-  });
-
-  test('updateLocalDrift overwrites the row with matching id', () async {
-    await repo.addLocalDrift(testWeightEntry1);
-    final inserted = (await readAll()).single;
-
-    final updated = WeightEntry(
-      id: inserted.id,
-      weight: 90.0,
-      date: DateTime.utc(2026, 4, 16),
-    );
-    await repo.updateLocalDrift(updated);
-
-    final rows = await readAll();
-    expect(rows, hasLength(1));
-    expect(rows.first.id, inserted.id);
-    expect(rows.first.weight, 90.0);
-    expect(rows.first.date, DateTime.utc(2026, 4, 16).toLocal());
-  });
-
-  test('deleteLocalDrift removes the row with matching id', () async {
-    await repo.addLocalDrift(testWeightEntry1);
-    await repo.addLocalDrift(testWeightEntry2);
-    final all = await readAll();
-    final toDelete = all.firstWhere((e) => e.weight == testWeightEntry1.weight).id!;
-
-    await repo.deleteLocalDrift(toDelete);
-
-    final remaining = await readAll();
-    expect(remaining, hasLength(1));
-    expect(remaining.first.weight, testWeightEntry2.weight);
-  });
-
-  test('deleteLocalDrift on a non-existent id is a no-op', () async {
-    await repo.addLocalDrift(testWeightEntry1);
-
-    await repo.deleteLocalDrift('does-not-exist');
-
-    expect(await readAll(), hasLength(1));
-  });
-
-  group('watchAllDrift', () {
-    test('emits the current rows ordered by date desc', () async {
-      // testWeightEntry1.date = 2021-01-01; testWeightEntry2.date = 2021-01-10.
-      // Insert in non-sorted order to make sure the order comes from the query,
-      // not insertion order.
-      await repo.addLocalDrift(testWeightEntry1);
-      await repo.addLocalDrift(testWeightEntry2);
-
-      final emitted = await repo.watchAllDrift().first;
-
-      expect(
-        emitted.map((e) => e.weight).toList(),
-        [testWeightEntry2.weight, testWeightEntry1.weight],
-      );
-    });
-
-    test('re-emits after an insert', () async {
-      final stream = repo.watchAllDrift();
-      final iter = StreamIterator(stream);
-
-      await iter.moveNext();
-      expect(iter.current, isEmpty);
-
-      await repo.addLocalDrift(testWeightEntry1);
-
-      await iter.moveNext();
-      expect(iter.current, hasLength(1));
-
-      await iter.cancel();
-    });
-  });
-}
diff --git a/test/features/weight/screens/weight_screen_test.dart b/test/features/weight/screens/weight_screen_test.dart
deleted file mode 100644
index 3e5e09104..000000000
--- a/test/features/weight/screens/weight_screen_test.dart
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * wger Workout Manager is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:mockito/annotations.dart';
-import 'package:mockito/mockito.dart';
-import 'package:wger/core/form_screen.dart';
-import 'package:wger/features/account/providers/user_profile_repository.dart';
-import 'package:wger/features/measurements/widgets/charts.dart';
-import 'package:wger/features/nutrition/providers/ingredient_repository.dart';
-import 'package:wger/features/nutrition/providers/nutrition_repository.dart';
-import 'package:wger/features/weight/providers/body_weight_repository.dart';
-import 'package:wger/features/weight/screens/weight_screen.dart';
-import 'package:wger/features/weight/widgets/forms.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-
-import '../../../../test_data/body_weight.dart';
-import '../../../../test_data/profile.dart';
-import 'weight_screen_test.mocks.dart';
-
-@GenerateMocks([
-  NutritionRepository,
-  IngredientRepository,
-  BodyWeightRepository,
-  UserProfileRepository,
-])
-void main() {
-  late MockNutritionRepository mockNutritionRepo;
-  late MockIngredientRepository mockIngredientRepo;
-  late MockUserProfileRepository mockUserProfileRepository;
-  MockBodyWeightRepository mockBodyWeightRepository = MockBodyWeightRepository();
-
-  setUp(() {
-    mockNutritionRepo = MockNutritionRepository();
-    mockIngredientRepo = MockIngredientRepository();
-    when(mockIngredientRepo.getById(any)).thenAnswer((_) async => null);
-
-    mockUserProfileRepository = MockUserProfileRepository();
-    when(
-      mockUserProfileRepository.watchDrift(),
-    ).thenAnswer((_) => Stream.value(tUserProfile1));
-
-    mockBodyWeightRepository = MockBodyWeightRepository();
-    when(
-      mockBodyWeightRepository.watchAllDrift(),
-    ).thenAnswer((_) => Stream.value(getWeightEntries()));
-    when(
-      mockBodyWeightRepository.deleteLocalDrift(any),
-    ).thenAnswer((_) async => Future.value());
-  });
-
-  Widget createWeightScreen({locale = 'en'}) {
-    return ProviderScope(
-      overrides: [
-        bodyWeightRepositoryProvider.overrideWithValue(mockBodyWeightRepository),
-        userProfileRepositoryProvider.overrideWithValue(mockUserProfileRepository),
-        nutritionRepositoryProvider.overrideWithValue(mockNutritionRepo),
-        ingredientRepositoryProvider.overrideWithValue(mockIngredientRepo),
-      ],
-      child: MaterialApp(
-        locale: Locale(locale),
-        localizationsDelegates: AppLocalizations.localizationsDelegates,
-        supportedLocales: AppLocalizations.supportedLocales,
-        home: const WeightScreen(),
-        routes: {FormScreen.routeName: (_) => const FormScreen()},
-      ),
-    );
-  }
-
-  testWidgets('Test the widgets on the body weight screen', (WidgetTester tester) async {
-    await tester.pumpWidget(createWeightScreen());
-    await tester.pumpAndSettle();
-
-    expect(find.text('Weight'), findsOneWidget);
-    expect(find.byType(MeasurementChartWidgetFl), findsOneWidget);
-    expect(find.byType(Card), findsNWidgets(2));
-    expect(find.byType(ListTile), findsNWidgets(2));
-  });
-
-  testWidgets('Test deleting an item using the Delete button', (WidgetTester tester) async {
-    // Arrange
-    await tester.pumpWidget(createWeightScreen());
-    await tester.pumpAndSettle();
-
-    // Act
-    expect(find.byType(ListTile), findsNWidgets(2));
-    await tester.tap(find.byTooltip('Show menu').first);
-    await tester.pumpAndSettle();
-
-    // Assert
-    await tester.tap(find.text('Delete'));
-    await tester.pumpAndSettle();
-
-    // We would delete the entry from the DB
-    verify(mockBodyWeightRepository.deleteLocalDrift('1')).called(1);
-  });
-
-  testWidgets('Test the form on the body weight screen', (WidgetTester tester) async {
-    await tester.pumpWidget(createWeightScreen());
-    await tester.pumpAndSettle();
-
-    expect(find.byType(WeightForm), findsNothing);
-    await tester.tap(find.byType(FloatingActionButton));
-    await tester.pumpAndSettle();
-    expect(find.byType(WeightForm), findsOneWidget);
-  });
-
-  // The chart axis titles are not asserted: with only two points they are
-  // suppressed to avoid overlapping labels. The entry list carries the same
-  // dates and is stable to assert on.
-  testWidgets('Tests the localization of dates - EN', (WidgetTester tester) async {
-    await tester.pumpWidget(createWeightScreen());
-    await tester.pumpAndSettle();
-
-    expect(find.text('1/1/2021 15:30'), findsOneWidget);
-    expect(find.text('1/10/2021 10:00'), findsOneWidget);
-  });
-
-  testWidgets('Tests the localization of dates - DE', (WidgetTester tester) async {
-    await tester.pumpWidget(createWeightScreen(locale: 'de'));
-    await tester.pumpAndSettle();
-
-    expect(find.text('1.1.2021 15:30'), findsOneWidget);
-    expect(find.text('10.1.2021 10:00'), findsOneWidget);
-  });
-}
diff --git a/test/features/weight/widgets/forms_test.dart b/test/features/weight/widgets/forms_test.dart
deleted file mode 100644
index 9ff18f112..000000000
--- a/test/features/weight/widgets/forms_test.dart
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * wger Workout Manager is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter_riverpod/misc.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:mockito/annotations.dart';
-import 'package:mockito/mockito.dart';
-import 'package:wger/core/consts.dart';
-import 'package:wger/features/weight/models/weight_entry.dart';
-import 'package:wger/features/weight/providers/body_weight_repository.dart';
-import 'package:wger/features/weight/widgets/forms.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-
-import '../../../../test_data/body_weight.dart';
-import 'forms_test.mocks.dart';
-
-@GenerateMocks([BodyWeightRepository])
-void main() {
-  Widget createWeightForm({
-    locale = 'en',
-    weightEntry = WeightEntry,
-    List<Override> overrides = const [],
-  }) {
-    return ProviderScope(
-      overrides: overrides,
-      child: MaterialApp(
-        locale: Locale(locale),
-        localizationsDelegates: AppLocalizations.localizationsDelegates,
-        supportedLocales: AppLocalizations.supportedLocales,
-        home: Scaffold(body: WeightForm(weightEntry)),
-      ),
-    );
-  }
-
-  testWidgets('Correctly prefills and localizes the data - en', (WidgetTester tester) async {
-    await tester.pumpWidget(createWeightForm(weightEntry: testWeightEntry1));
-    await tester.pumpAndSettle();
-
-    expect(find.text('1/1/2021'), findsOneWidget);
-    expect(find.text('3:30 PM'), findsOneWidget);
-    expect(find.text('80'), findsOneWidget);
-  });
-
-  testWidgets('Correctly prefills and localizes the data - de', (WidgetTester tester) async {
-    await tester.pumpWidget(createWeightForm(weightEntry: testWeightEntry1, locale: 'de'));
-    await tester.pumpAndSettle();
-
-    expect(find.text('1.1.2021'), findsOneWidget);
-    expect(find.text('15:30'), findsOneWidget);
-    expect(find.text('80'), findsOneWidget);
-  });
-
-  testWidgets('It is possible to quick-change the weight', (WidgetTester tester) async {
-    await tester.pumpWidget(createWeightForm(weightEntry: testWeightEntry1));
-    await tester.pumpAndSettle();
-
-    await tester.tap(find.byKey(const Key('quickMinus')));
-    expect(find.text('79'), findsOneWidget);
-
-    await tester.tap(find.byKey(const Key('quickMinusSmall')));
-    expect(find.text('78.9'), findsOneWidget);
-
-    await tester.tap(find.byKey(const Key('quickPlus')));
-    expect(find.text('79.9'), findsOneWidget);
-
-    await tester.tap(find.byKey(const Key('quickPlusSmall')));
-    expect(find.text('80'), findsOneWidget);
-  });
-
-  testWidgets('Non-numeric input never reaches the field', (WidgetTester tester) async {
-    await tester.pumpWidget(createWeightForm(weightEntry: testWeightEntry1));
-    await tester.pumpAndSettle();
-
-    await tester.enterText(find.byKey(const Key('weightInput')), 'shiba inu');
-    await tester.pumpAndSettle();
-    expect(find.text('shiba inu'), findsNothing);
-
-    // Quick-change still works on the now-empty field
-    await tester.tap(find.byKey(const Key('quickMinus')));
-    await tester.pumpAndSettle();
-    expect(find.text('shiba inu'), findsNothing);
-  });
-
-  testWidgets('Accepts a dot as decimal separator in the de locale', (WidgetTester tester) async {
-    await tester.pumpWidget(createWeightForm(weightEntry: null, locale: 'de'));
-    await tester.pumpAndSettle();
-
-    await tester.enterText(find.byKey(const Key('weightInput')), '81.5');
-    await tester.pumpAndSettle();
-
-    expect(find.text('81,5'), findsOneWidget);
-  });
-
-  testWidgets('Widget works if there is no last entry', (WidgetTester tester) async {
-    await tester.pumpWidget(createWeightForm(weightEntry: null));
-    await tester.pumpAndSettle();
-  });
-
-  testWidgets('Saving keeps an afternoon (PM) time intact', (WidgetTester tester) async {
-    final mockRepo = MockBodyWeightRepository();
-    when(mockRepo.watchAllDrift()).thenAnswer((_) => Stream.value(<WeightEntry>[]));
-    when(mockRepo.updateLocalDrift(any)).thenAnswer((_) async {});
-
-    await tester.pumpWidget(
-      createWeightForm(
-        weightEntry: testWeightEntry1,
-        overrides: [bodyWeightRepositoryProvider.overrideWithValue(mockRepo)],
-      ),
-    );
-    await tester.pumpAndSettle();
-
-    // The stored 15:30 renders as a PM time in a 12-hour locale
-    expect(find.text('3:30 PM'), findsOneWidget);
-
-    // Save without changing anything
-    await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
-    await tester.pumpAndSettle();
-
-    final saved = verify(mockRepo.updateLocalDrift(captureAny)).captured.single as WeightEntry;
-    expect(saved.date.hour, 15);
-    expect(saved.date.minute, 30);
-  });
-}
diff --git a/test/features/weight/widgets/forms_test.mocks.dart b/test/features/weight/widgets/forms_test.mocks.dart
deleted file mode 100644
index f93df1a68..000000000
--- a/test/features/weight/widgets/forms_test.mocks.dart
+++ /dev/null
@@ -1,69 +0,0 @@
-// Mocks generated by Mockito 5.4.6 from annotations
-// in wger/test/features/weight/widgets/forms_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i3;
-
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:wger/features/weight/models/weight_entry.dart' as _i4;
-import 'package:wger/features/weight/providers/body_weight_repository.dart' as _i2;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: deprecated_member_use
-// ignore_for_file: deprecated_member_use_from_same_package
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: must_be_immutable
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-// ignore_for_file: invalid_use_of_internal_member
-
-/// A class which mocks [BodyWeightRepository].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockBodyWeightRepository extends _i1.Mock implements _i2.BodyWeightRepository {
-  MockBodyWeightRepository() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i3.Stream<List<_i4.WeightEntry>> watchAllDrift() =>
-      (super.noSuchMethod(
-            Invocation.method(#watchAllDrift, []),
-            returnValue: _i3.Stream<List<_i4.WeightEntry>>.empty(),
-          )
-          as _i3.Stream<List<_i4.WeightEntry>>);
-
-  @override
-  _i3.Future<void> deleteLocalDrift(String? id) =>
-      (super.noSuchMethod(
-            Invocation.method(#deleteLocalDrift, [id]),
-            returnValue: _i3.Future<void>.value(),
-            returnValueForMissingStub: _i3.Future<void>.value(),
-          )
-          as _i3.Future<void>);
-
-  @override
-  _i3.Future<void> updateLocalDrift(_i4.WeightEntry? entry) =>
-      (super.noSuchMethod(
-            Invocation.method(#updateLocalDrift, [entry]),
-            returnValue: _i3.Future<void>.value(),
-            returnValueForMissingStub: _i3.Future<void>.value(),
-          )
-          as _i3.Future<void>);
-
-  @override
-  _i3.Future<void> addLocalDrift(_i4.WeightEntry? entry) =>
-      (super.noSuchMethod(
-            Invocation.method(#addLocalDrift, [entry]),
-            returnValue: _i3.Future<void>.value(),
-            returnValueForMissingStub: _i3.Future<void>.value(),
-          )
-          as _i3.Future<void>);
-}
diff --git a/test/helpers/measurement_chart_buckets.dart b/test/helpers/measurement_chart_buckets.dart
new file mode 100644
index 000000000..c4a2145b1
--- /dev/null
+++ b/test/helpers/measurement_chart_buckets.dart
@@ -0,0 +1,118 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:wger/features/measurements/models/measurement_bucket.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+
+/// One bucket per entry, oldest first: what the aggregated query returns for a
+/// series short enough not to be condensed, which every widget fixture is.
+/// Condensing is covered where it happens, in the repository.
+List<MeasurementBucket> entryBuckets(Iterable<MeasurementEntry> entries, {DateTime? since}) => [
+  for (final entry in entries)
+    if (since == null || !entry.date.isBefore(since))
+      MeasurementBucket(
+        start: entry.date,
+        unit: entry.extraData?['unit'] as String?,
+        count: 1,
+        sum: entry.value,
+        min: entry.extraData?['min'] as num? ?? entry.value,
+        max: entry.extraData?['max'] as num? ?? entry.value,
+      ),
+]..sort((a, b) => a.start.compareTo(b.start));
+
+/// What `measurementChartBucketsProvider.overrideWith` takes.
+typedef ChartBucketsStub =
+    Stream<List<MeasurementBucket>> Function(
+      Ref,
+      (String, DateTime?, DateTime?, MeasurementBucketLevel),
+    );
+
+/// Buckets at the day level: one per calendar day, holding the day's total.
+/// What the query returns for a summed metric, whatever the point count.
+List<MeasurementBucket> dayBuckets(Iterable<MeasurementEntry> entries) {
+  final byDay = <DateTime, List<MeasurementEntry>>{};
+  for (final entry in entries) {
+    final day = DateTime(entry.date.year, entry.date.month, entry.date.day);
+    byDay.putIfAbsent(day, () => []).add(entry);
+  }
+
+  return [
+    for (final MapEntry(key: day, value: ofDay) in byDay.entries)
+      MeasurementBucket(
+        start: day,
+        unit: ofDay.first.extraData?['unit'] as String?,
+        count: ofDay.length,
+        sum: ofDay.map((e) => e.value).reduce((a, b) => a + b),
+        min: ofDay.map((e) => e.value).reduce((a, b) => a < b ? a : b),
+        max: ofDay.map((e) => e.value).reduce((a, b) => a > b ? a : b),
+      ),
+  ]..sort((a, b) => a.start.compareTo(b.start));
+}
+
+/// What `measurementGroupBucketsProvider.overrideWith` takes.
+typedef GroupBucketsStub =
+    Stream<Map<String, List<MeasurementBucket>>> Function(
+      Ref,
+      (String, DateTime?, MeasurementBucketLevel),
+    );
+
+/// The group counterpart of [chartBucketsFrom]: the components of a group,
+/// keyed by component id, from the [entries] of each.
+GroupBucketsStub groupBucketsFrom(
+  List<MeasurementCategory> categories,
+  Map<String, List<MeasurementEntry>> entries,
+) {
+  final byParent = {
+    for (final category in categories)
+      if (category.children.isNotEmpty) category.id: category,
+  };
+
+  return (ref, args) {
+    final (parentId, since, _) = args;
+    final group = byParent[parentId];
+    if (group == null) {
+      return Stream.value(const {});
+    }
+
+    final summed = group.metricType.isSummedPerDay;
+    return Stream.value({
+      for (final child in group.children)
+        child.id!: summed
+            ? dayBuckets(
+                (entries[child.id] ?? const []).where(
+                  (e) => since == null || !e.date.isBefore(since),
+                ),
+              )
+            : entryBuckets(entries[child.id] ?? const [], since: since),
+    });
+  };
+}
+
+/// Serves the chart query from [entries] keyed by the category holding them,
+/// so a widget test seeds one map for the lists and the charts alike.
+ChartBucketsStub chartBucketsFrom(Map<String, List<MeasurementEntry>> entries) {
+  return (ref, args) {
+    final (categoryId, since, until, _) = args;
+    final ofCategory = (entries[categoryId] ?? const []).where(
+      (e) => until == null || e.date.isBefore(until),
+    );
+    return Stream.value(entryBuckets(ofCategory, since: since));
+  };
+}
diff --git a/test/helpers/measurement_repository_stubs.dart b/test/helpers/measurement_repository_stubs.dart
new file mode 100644
index 000000000..cd050be87
--- /dev/null
+++ b/test/helpers/measurement_repository_stubs.dart
@@ -0,0 +1,154 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:collection/collection.dart';
+import 'package:mockito/mockito.dart';
+import 'package:wger/features/measurements/models/measurement_bucket.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+
+import 'measurement_chart_buckets.dart';
+
+/// Answers the reads a measurement screen does: the category streams, the
+/// paged lists and the aggregated queries, all served from [entries] keyed by
+/// the category holding them.
+///
+/// [repo] is a generated `MockMeasurementRepository`, typed dynamically
+/// because only the mock's own signatures accept mockito's matchers.
+void stubMeasurementReads(
+  dynamic repo,
+  List<MeasurementCategory> categories, [
+  Map<String, List<MeasurementEntry>> entries = const {},
+]) {
+  // A fixture either carries its children already or is a flat list to be
+  // grouped, and both shapes are in use
+  final withChildren = [
+    for (final category in categories)
+      if (category.children.isNotEmpty)
+        category
+      else
+        category.copyWith(children: categories.where((c) => c.parentId == category.id).toList()),
+  ];
+  when(repo.watchAllWithoutEntries()).thenAnswer((_) => Stream.value(withChildren));
+
+  when(repo.watchOfficialBodyWeightCategory()).thenAnswer(
+    (_) => Stream.value(withChildren.firstWhereOrNull((c) => c.isOfficialBodyWeight)),
+  );
+
+  when(repo.watchCategoryWithoutEntries(any)).thenAnswer((invocation) {
+    final id = invocation.positionalArguments.first as String;
+    return Stream.value(withChildren.firstWhereOrNull((c) => c.id == id));
+  });
+
+  when(repo.watchEntries(any, limit: anyNamed('limit'))).thenAnswer((invocation) {
+    final id = invocation.positionalArguments.first as String;
+    return Stream.value(
+      _newestFirst(entries[id] ?? const [], invocation.namedArguments[#limit] as int),
+    );
+  });
+
+  when(repo.watchGroupEntries(any, limit: anyNamed('limit'))).thenAnswer((invocation) {
+    final id = invocation.positionalArguments.first as String;
+    final group = withChildren.firstWhereOrNull((c) => c.id == id);
+    final ofGroup = [
+      for (final child in group?.children ?? const <MeasurementCategory>[]) ...?entries[child.id],
+    ];
+    return Stream.value(_newestFirst(ofGroup, invocation.namedArguments[#limit] as int));
+  });
+
+  when(repo.watchLatestEntries()).thenAnswer(
+    (_) => Stream.value({
+      for (final MapEntry(key: id, value: ofCategory) in entries.entries)
+        if (ofCategory.isNotEmpty) id: ofCategory.reduce((a, b) => b.date.isAfter(a.date) ? b : a),
+    }),
+  );
+
+  // The aggregated queries, answered at the level the caller asked for. One
+  // bucket per entry for `auto`: every fixture is short enough not to be
+  // condensed, and condensing is covered where it happens, in the repository
+  List<MeasurementBucket> bucketsOf(String id, DateTime? since, DateTime? until, Object? level) {
+    final ofCategory = (entries[id] ?? const [])
+        .where((e) => since == null || !e.date.isBefore(since))
+        .where((e) => until == null || e.date.isBefore(until));
+
+    return level == MeasurementBucketLevel.auto ? entryBuckets(ofCategory) : dayBuckets(ofCategory);
+  }
+
+  when(
+    repo.watchEntryBuckets(
+      any,
+      since: anyNamed('since'),
+      until: anyNamed('until'),
+      level: anyNamed('level'),
+    ),
+  ).thenAnswer((invocation) {
+    final named = invocation.namedArguments;
+    return Stream.value(
+      bucketsOf(
+        invocation.positionalArguments.first as String,
+        named[#since] as DateTime?,
+        named[#until] as DateTime?,
+        named[#level],
+      ),
+    );
+  });
+
+  when(repo.watchGroupBuckets(any, since: anyNamed('since'), level: anyNamed('level'))).thenAnswer((
+    invocation,
+  ) {
+    final group = withChildren.firstWhereOrNull(
+      (c) => c.id == invocation.positionalArguments.first,
+    );
+    final named = invocation.namedArguments;
+    return Stream.value({
+      for (final child in group?.children ?? const <MeasurementCategory>[])
+        child.id!: bucketsOf(child.id!, named[#since] as DateTime?, null, named[#level]),
+    });
+  });
+
+  // Counted over the whole fixture: the cutoff and the daily summing are the
+  // repository's own, and covered where they happen
+  when(
+    repo.watchValueCounts(any, since: anyNamed('since'), summedPerDay: anyNamed('summedPerDay')),
+  ).thenAnswer((invocation) {
+    final ofCategory = entries[invocation.positionalArguments.first as String] ?? const [];
+    final byValue = <num, List<MeasurementEntry>>{};
+    for (final entry in ofCategory) {
+      byValue.putIfAbsent(entry.value, () => []).add(entry);
+    }
+
+    return Stream.value([
+      for (final MapEntry(:key, :value) in byValue.entries)
+        MeasurementValueCount(
+          value: key,
+          unit: null,
+          count: value.length,
+          newest: value.map((e) => e.date).reduce((a, b) => b.isAfter(a) ? b : a),
+        ),
+    ]);
+  });
+
+  when(repo.watchDailyBuckets()).thenAnswer(
+    (_) => Stream.value({
+      for (final id in entries.keys) id: dayBuckets(entries[id]!),
+    }),
+  );
+}
+
+List<MeasurementEntry> _newestFirst(Iterable<MeasurementEntry> entries, int limit) =>
+    (entries.toList()..sort((a, b) => b.date.compareTo(a.date))).take(limit).toList();
diff --git a/test/powersync/connector_test.dart b/test/powersync/connector_test.dart
index 2a2ec3bb4..08d916f5d 100644
--- a/test/powersync/connector_test.dart
+++ b/test/powersync/connector_test.dart
@@ -79,6 +79,16 @@ void main() {
       expect(out.containsKey('routine_id'), isFalse);
     });
 
+    test('keeps `external_id`, which is a value column and not a foreign key', () {
+      final out = connector.genericTransform(
+        'measurements_measurement',
+        {'external_id': 'abc-123', 'category_id': 5},
+        '1',
+      );
+      expect(out['external_id'], 'abc-123');
+      expect(out['category'], 5);
+    });
+
     test('handles null opData (delete events)', () {
       final out = connector.genericTransform('manager_routine', null, '99');
       expect(out, {'id': '99'});
diff --git a/test/screenshots/screenshots_01_dashboard.dart b/test/screenshots/screenshots_01_dashboard.dart
index a14937ac0..29238e1ec 100644
--- a/test/screenshots/screenshots_01_dashboard.dart
+++ b/test/screenshots/screenshots_01_dashboard.dart
@@ -26,33 +26,31 @@ import 'package:wger/core/network/auth_state.dart';
 import 'package:wger/core/network/network_provider.dart';
 import 'package:wger/features/account/providers/user_profile_repository.dart';
 import 'package:wger/features/gallery/providers/gallery_repository.dart';
-import 'package:wger/features/measurements/models/measurement_category.dart';
 import 'package:wger/features/measurements/providers/measurement_repository.dart';
 import 'package:wger/features/nutrition/providers/ingredient_repository.dart';
 import 'package:wger/features/nutrition/providers/nutrition_notifier.dart';
 import 'package:wger/features/nutrition/providers/nutrition_repository.dart';
 import 'package:wger/features/routines/providers/routines_repository.dart';
 import 'package:wger/features/trophies/providers/trophy_repository.dart';
-import 'package:wger/features/weight/providers/body_weight_repository.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/theme/theme.dart';
 
 import '../../test_data/body_weight.dart';
-import '../../test_data/exercises.dart';
 import '../../test_data/gallery.dart';
-import '../../test_data/measurements.dart';
-import '../../test_data/nutritional_plans.dart';
 import '../../test_data/profile.dart';
-import '../../test_data/routines.dart';
+import '../../test_data/screenshots/measurements.dart';
+import '../../test_data/screenshots/nutrition.dart';
+import '../../test_data/screenshots/routines.dart';
+import '../../test_data/screenshots/weight.dart';
 import '../../test_data/trophies.dart';
 import '../helpers/fake_auth_notifier.dart';
+import '../helpers/measurement_repository_stubs.dart';
 import 'screenshots_01_dashboard.mocks.dart';
 
 @GenerateMocks([
   GalleryRepository,
   NutritionRepository,
   IngredientRepository,
-  BodyWeightRepository,
   MeasurementRepository,
   UserProfileRepository,
   RoutinesRepository,
@@ -68,15 +66,13 @@ Widget createDashboardScreen({Locale? locale}) {
   final mockIngredientRepo = MockIngredientRepository();
   when(mockIngredientRepo.getById(any)).thenAnswer((_) async => null);
 
-  final mockBodyWeightRepository = MockBodyWeightRepository();
-  when(
-    mockBodyWeightRepository.watchAllDrift(),
-  ).thenAnswer((_) => Stream.value(getScreenshotWeightEntries()));
-
   final mockMeasurementRepo = MockMeasurementRepository();
-  when(
-    mockMeasurementRepo.watchAll(),
-  ).thenAnswer((_) => Stream<List<MeasurementCategory>>.value(getMeasurementCategories()));
+  final measurements = getScreenshotMeasurements();
+  stubMeasurementReads(
+    mockMeasurementRepo,
+    [getBodyWeightCategory(), ...measurements.categories],
+    {...getScreenshotBodyWeightEntries(), ...measurements.entries},
+  );
 
   final mockUserProfileRepo = MockUserProfileRepository();
   when(
@@ -86,7 +82,7 @@ Widget createDashboardScreen({Locale? locale}) {
   final mockRoutinesRepo = MockRoutinesRepository();
   when(
     mockRoutinesRepo.watchAllDrift(),
-  ).thenAnswer((_) => Stream.value([getTestRoutine(exercises: getScreenshotExercises())]));
+  ).thenAnswer((_) => Stream.value([getScreenshotRoutine()]));
 
   final mockTrophyRepo = MockTrophyRepository();
   when(
@@ -112,7 +108,6 @@ Widget createDashboardScreen({Locale? locale}) {
   );
   final container = ProviderContainer.test(
     overrides: [
-      bodyWeightRepositoryProvider.overrideWithValue(mockBodyWeightRepository),
       measurementRepositoryProvider.overrideWithValue(mockMeasurementRepo),
       authProvider.overrideWith(() => FakeAuthNotifier(loggedInAuth)),
       userProfileRepositoryProvider.overrideWithValue(mockUserProfileRepo),
diff --git a/test/screenshots/screenshots_01_dashboard.mocks.dart b/test/screenshots/screenshots_01_dashboard.mocks.dart
index 82a19b2ff..48e7bd513 100644
--- a/test/screenshots/screenshots_01_dashboard.mocks.dart
+++ b/test/screenshots/screenshots_01_dashboard.mocks.dart
@@ -7,16 +7,17 @@ import 'dart:async' as _i10;
 
 import 'package:image_picker/image_picker.dart' as _i11;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:mockito/src/dummies.dart' as _i32;
+import 'package:mockito/src/dummies.dart' as _i31;
 import 'package:wger/core/network/base_provider.dart' as _i8;
 import 'package:wger/core/search_options.dart' as _i20;
-import 'package:wger/features/account/models/user_profile.dart' as _i27;
-import 'package:wger/features/account/providers/user_profile_repository.dart' as _i26;
+import 'package:wger/features/account/models/user_profile.dart' as _i26;
+import 'package:wger/features/account/providers/user_profile_repository.dart' as _i25;
 import 'package:wger/features/gallery/models/image.dart' as _i2;
 import 'package:wger/features/gallery/providers/gallery_repository.dart' as _i9;
-import 'package:wger/features/measurements/models/measurement_category.dart' as _i24;
-import 'package:wger/features/measurements/models/measurement_entry.dart' as _i25;
-import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i23;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i24;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i22;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i23;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i21;
 import 'package:wger/features/nutrition/models/ingredient.dart' as _i18;
 import 'package:wger/features/nutrition/models/ingredient_filters.dart' as _i19;
 import 'package:wger/features/nutrition/models/log.dart' as _i16;
@@ -27,18 +28,16 @@ import 'package:wger/features/nutrition/providers/ingredient_repository.dart' as
 import 'package:wger/features/nutrition/providers/nutrition_repository.dart' as _i12;
 import 'package:wger/features/routines/models/base_config.dart' as _i7;
 import 'package:wger/features/routines/models/day.dart' as _i4;
-import 'package:wger/features/routines/models/repetition_unit.dart' as _i30;
+import 'package:wger/features/routines/models/repetition_unit.dart' as _i29;
 import 'package:wger/features/routines/models/routine.dart' as _i3;
 import 'package:wger/features/routines/models/slot.dart' as _i5;
 import 'package:wger/features/routines/models/slot_entry.dart' as _i6;
-import 'package:wger/features/routines/models/weight_unit.dart' as _i29;
-import 'package:wger/features/routines/providers/routines_repository.dart' as _i28;
-import 'package:wger/features/trophies/models/trophy.dart' as _i33;
-import 'package:wger/features/trophies/models/user_trophy.dart' as _i34;
-import 'package:wger/features/trophies/models/user_trophy_progression.dart' as _i35;
-import 'package:wger/features/trophies/providers/trophy_repository.dart' as _i31;
-import 'package:wger/features/weight/models/weight_entry.dart' as _i22;
-import 'package:wger/features/weight/providers/body_weight_repository.dart' as _i21;
+import 'package:wger/features/routines/models/weight_unit.dart' as _i28;
+import 'package:wger/features/routines/providers/routines_repository.dart' as _i27;
+import 'package:wger/features/trophies/models/trophy.dart' as _i32;
+import 'package:wger/features/trophies/models/user_trophy.dart' as _i33;
+import 'package:wger/features/trophies/models/user_trophy_progression.dart' as _i34;
+import 'package:wger/features/trophies/providers/trophy_repository.dart' as _i30;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -402,75 +401,171 @@ class MockIngredientRepository extends _i1.Mock implements _i17.IngredientReposi
           as _i10.Future<_i18.Ingredient?>);
 }
 
-/// A class which mocks [BodyWeightRepository].
+/// A class which mocks [MeasurementRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBodyWeightRepository extends _i1.Mock implements _i21.BodyWeightRepository {
-  MockBodyWeightRepository() {
+class MockMeasurementRepository extends _i1.Mock implements _i21.MeasurementRepository {
+  MockMeasurementRepository() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i10.Stream<List<_i22.WeightEntry>> watchAllDrift() =>
+  _i10.Stream<List<_i22.MeasurementCategory>> watchAllWithoutEntries() =>
       (super.noSuchMethod(
-            Invocation.method(#watchAllDrift, []),
-            returnValue: _i10.Stream<List<_i22.WeightEntry>>.empty(),
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i10.Stream<List<_i22.MeasurementCategory>>.empty(),
           )
-          as _i10.Stream<List<_i22.WeightEntry>>);
+          as _i10.Stream<List<_i22.MeasurementCategory>>);
 
   @override
-  _i10.Future<void> deleteLocalDrift(String? id) =>
+  _i10.Stream<_i22.MeasurementCategory?> watchCategoryWithoutEntries(
+    String? id,
+  ) =>
       (super.noSuchMethod(
-            Invocation.method(#deleteLocalDrift, [id]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
+            returnValue: _i10.Stream<_i22.MeasurementCategory?>.empty(),
           )
-          as _i10.Future<void>);
+          as _i10.Stream<_i22.MeasurementCategory?>);
 
   @override
-  _i10.Future<void> updateLocalDrift(_i22.WeightEntry? entry) =>
+  _i10.Stream<_i22.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
       (super.noSuchMethod(
-            Invocation.method(#updateLocalDrift, [entry]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i10.Stream<_i22.MeasurementCategory?>.empty(),
           )
-          as _i10.Future<void>);
+          as _i10.Stream<_i22.MeasurementCategory?>);
 
   @override
-  _i10.Future<void> addLocalDrift(_i22.WeightEntry? entry) =>
+  _i10.Stream<List<_i23.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
       (super.noSuchMethod(
-            Invocation.method(#addLocalDrift, [entry]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i10.Stream<List<_i23.MeasurementEntry>>.empty(),
           )
-          as _i10.Future<void>);
-}
+          as _i10.Stream<List<_i23.MeasurementEntry>>);
 
-/// A class which mocks [MeasurementRepository].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockMeasurementRepository extends _i1.Mock implements _i23.MeasurementRepository {
-  MockMeasurementRepository() {
-    _i1.throwOnMissingStub(this);
-  }
+  @override
+  _i10.Stream<List<_i23.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i10.Stream<List<_i23.MeasurementEntry>>.empty(),
+          )
+          as _i10.Stream<List<_i23.MeasurementEntry>>);
 
   @override
-  _i10.Stream<List<_i24.MeasurementCategory>> watchAll() =>
+  _i10.Stream<Map<String, _i23.MeasurementEntry>> watchLatestEntries() =>
       (super.noSuchMethod(
-            Invocation.method(#watchAll, []),
-            returnValue: _i10.Stream<List<_i24.MeasurementCategory>>.empty(),
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i10.Stream<Map<String, _i23.MeasurementEntry>>.empty(),
           )
-          as _i10.Stream<List<_i24.MeasurementCategory>>);
+          as _i10.Stream<Map<String, _i23.MeasurementEntry>>);
 
   @override
-  _i10.Stream<_i24.MeasurementCategory?> watchLocalDriftCategoryById(
-    String? id,
+  _i10.Stream<List<_i24.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i24.MeasurementBucketLevel? level = _i24.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i10.Stream<List<_i24.MeasurementBucket>>.empty(),
+          )
+          as _i10.Stream<List<_i24.MeasurementBucket>>);
+
+  @override
+  _i10.Stream<Map<String, List<_i24.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i24.MeasurementBucketLevel? level = _i24.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i10.Stream<Map<String, List<_i24.MeasurementBucket>>>.empty(),
+          )
+          as _i10.Stream<Map<String, List<_i24.MeasurementBucket>>>);
+
+  @override
+  _i10.Stream<Map<String, List<_i24.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i10.Stream<Map<String, List<_i24.MeasurementBucket>>>.empty(),
+          )
+          as _i10.Stream<Map<String, List<_i24.MeasurementBucket>>>);
+
+  @override
+  _i10.Stream<List<_i24.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i10.Stream<List<_i24.MeasurementValueCount>>.empty(),
+          )
+          as _i10.Stream<List<_i24.MeasurementValueCount>>);
+
+  @override
+  _i10.Future<List<_i22.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i10.Future<List<_i22.MeasurementCategory>>.value(
+              <_i22.MeasurementCategory>[],
+            ),
+          )
+          as _i10.Future<List<_i22.MeasurementCategory>>);
+
+  @override
+  _i10.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i10.Future<Set<String>>.value(<String>{}),
+          )
+          as _i10.Future<Set<String>>);
+
+  @override
+  _i10.Future<Map<String, _i23.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
   ) =>
       (super.noSuchMethod(
-            Invocation.method(#watchLocalDriftCategoryById, [id]),
-            returnValue: _i10.Stream<_i24.MeasurementCategory?>.empty(),
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i10.Future<Map<String, _i23.MeasurementEntry>>.value(
+              <String, _i23.MeasurementEntry>{},
+            ),
+          )
+          as _i10.Future<Map<String, _i23.MeasurementEntry>>);
+
+  @override
+  _i10.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i10.Future<bool>.value(false),
           )
-          as _i10.Stream<_i24.MeasurementCategory?>);
+          as _i10.Future<bool>);
 
   @override
   _i10.Future<void> deleteLocalDrift(String? id) =>
@@ -482,7 +577,7 @@ class MockMeasurementRepository extends _i1.Mock implements _i23.MeasurementRepo
           as _i10.Future<void>);
 
   @override
-  _i10.Future<void> updateLocalDrift(_i25.MeasurementEntry? entry) =>
+  _i10.Future<void> updateLocalDrift(_i23.MeasurementEntry? entry) =>
       (super.noSuchMethod(
             Invocation.method(#updateLocalDrift, [entry]),
             returnValue: _i10.Future<void>.value(),
@@ -491,7 +586,7 @@ class MockMeasurementRepository extends _i1.Mock implements _i23.MeasurementRepo
           as _i10.Future<void>);
 
   @override
-  _i10.Future<void> addLocalDrift(_i25.MeasurementEntry? entry) =>
+  _i10.Future<void> addLocalDrift(_i23.MeasurementEntry? entry) =>
       (super.noSuchMethod(
             Invocation.method(#addLocalDrift, [entry]),
             returnValue: _i10.Future<void>.value(),
@@ -499,6 +594,17 @@ class MockMeasurementRepository extends _i1.Mock implements _i23.MeasurementRepo
           )
           as _i10.Future<void>);
 
+  @override
+  _i10.Future<void> addLocalDriftGroupEntries(
+    List<_i23.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
   @override
   _i10.Future<void> deleteLocalDriftCategory(String? id) =>
       (super.noSuchMethod(
@@ -510,7 +616,7 @@ class MockMeasurementRepository extends _i1.Mock implements _i23.MeasurementRepo
 
   @override
   _i10.Future<void> updateLocalDriftCategory(
-    _i24.MeasurementCategory? category,
+    _i22.MeasurementCategory? category,
   ) =>
       (super.noSuchMethod(
             Invocation.method(#updateLocalDriftCategory, [category]),
@@ -520,33 +626,53 @@ class MockMeasurementRepository extends _i1.Mock implements _i23.MeasurementRepo
           as _i10.Future<void>);
 
   @override
-  _i10.Future<void> addLocalDriftCategory(_i24.MeasurementCategory? category) =>
+  _i10.Future<void> addLocalDriftCategory(_i22.MeasurementCategory? category) =>
       (super.noSuchMethod(
             Invocation.method(#addLocalDriftCategory, [category]),
             returnValue: _i10.Future<void>.value(),
             returnValueForMissingStub: _i10.Future<void>.value(),
           )
           as _i10.Future<void>);
+
+  @override
+  _i10.Future<void> addLocalDriftCategoryGroup(
+    List<_i22.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
 }
 
 /// A class which mocks [UserProfileRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockUserProfileRepository extends _i1.Mock implements _i26.UserProfileRepository {
+class MockUserProfileRepository extends _i1.Mock implements _i25.UserProfileRepository {
   MockUserProfileRepository() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i10.Stream<_i27.UserProfile?> watchDrift() =>
+  _i10.Stream<_i26.UserProfile?> watchDrift() =>
       (super.noSuchMethod(
             Invocation.method(#watchDrift, []),
-            returnValue: _i10.Stream<_i27.UserProfile?>.empty(),
+            returnValue: _i10.Stream<_i26.UserProfile?>.empty(),
           )
-          as _i10.Stream<_i27.UserProfile?>);
+          as _i10.Stream<_i26.UserProfile?>);
 
   @override
-  _i10.Future<void> editLocalDrift(_i27.UserProfile? profile) =>
+  _i10.Future<void> editLocalDrift(_i26.UserProfile? profile) =>
       (super.noSuchMethod(
             Invocation.method(#editLocalDrift, [profile]),
             returnValue: _i10.Future<void>.value(),
@@ -558,7 +684,7 @@ class MockUserProfileRepository extends _i1.Mock implements _i26.UserProfileRepo
 /// A class which mocks [RoutinesRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockRoutinesRepository extends _i1.Mock implements _i28.RoutinesRepository {
+class MockRoutinesRepository extends _i1.Mock implements _i27.RoutinesRepository {
   MockRoutinesRepository() {
     _i1.throwOnMissingStub(this);
   }
@@ -616,20 +742,20 @@ class MockRoutinesRepository extends _i1.Mock implements _i28.RoutinesRepository
           as _i10.Future<void>);
 
   @override
-  _i10.Stream<List<_i29.WeightUnit>> watchWeightUnitsDrift() =>
+  _i10.Stream<List<_i28.WeightUnit>> watchWeightUnitsDrift() =>
       (super.noSuchMethod(
             Invocation.method(#watchWeightUnitsDrift, []),
-            returnValue: _i10.Stream<List<_i29.WeightUnit>>.empty(),
+            returnValue: _i10.Stream<List<_i28.WeightUnit>>.empty(),
           )
-          as _i10.Stream<List<_i29.WeightUnit>>);
+          as _i10.Stream<List<_i28.WeightUnit>>);
 
   @override
-  _i10.Stream<List<_i30.RepetitionUnit>> watchRepetitionUnitsDrift() =>
+  _i10.Stream<List<_i29.RepetitionUnit>> watchRepetitionUnitsDrift() =>
       (super.noSuchMethod(
             Invocation.method(#watchRepetitionUnitsDrift, []),
-            returnValue: _i10.Stream<List<_i30.RepetitionUnit>>.empty(),
+            returnValue: _i10.Stream<List<_i29.RepetitionUnit>>.empty(),
           )
-          as _i10.Stream<List<_i30.RepetitionUnit>>);
+          as _i10.Stream<List<_i29.RepetitionUnit>>);
 
   @override
   _i10.Future<_i4.Day> addDayServer(_i4.Day? day) =>
@@ -776,7 +902,7 @@ class MockRoutinesRepository extends _i1.Mock implements _i28.RoutinesRepository
 /// A class which mocks [TrophyRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockTrophyRepository extends _i1.Mock implements _i31.TrophyRepository {
+class MockTrophyRepository extends _i1.Mock implements _i30.TrophyRepository {
   MockTrophyRepository() {
     _i1.throwOnMissingStub(this);
   }
@@ -796,7 +922,7 @@ class MockTrophyRepository extends _i1.Mock implements _i31.TrophyRepository {
   String get trophiesPath =>
       (super.noSuchMethod(
             Invocation.getter(#trophiesPath),
-            returnValue: _i32.dummyValue<String>(
+            returnValue: _i31.dummyValue<String>(
               this,
               Invocation.getter(#trophiesPath),
             ),
@@ -807,7 +933,7 @@ class MockTrophyRepository extends _i1.Mock implements _i31.TrophyRepository {
   String get userTrophiesPath =>
       (super.noSuchMethod(
             Invocation.getter(#userTrophiesPath),
-            returnValue: _i32.dummyValue<String>(
+            returnValue: _i31.dummyValue<String>(
               this,
               Invocation.getter(#userTrophiesPath),
             ),
@@ -818,7 +944,7 @@ class MockTrophyRepository extends _i1.Mock implements _i31.TrophyRepository {
   String get userTrophyProgressionPath =>
       (super.noSuchMethod(
             Invocation.getter(#userTrophyProgressionPath),
-            returnValue: _i32.dummyValue<String>(
+            returnValue: _i31.dummyValue<String>(
               this,
               Invocation.getter(#userTrophyProgressionPath),
             ),
@@ -826,15 +952,15 @@ class MockTrophyRepository extends _i1.Mock implements _i31.TrophyRepository {
           as String);
 
   @override
-  _i10.Future<List<_i33.Trophy>> fetchTrophies({String? language}) =>
+  _i10.Future<List<_i32.Trophy>> fetchTrophies({String? language}) =>
       (super.noSuchMethod(
             Invocation.method(#fetchTrophies, [], {#language: language}),
-            returnValue: _i10.Future<List<_i33.Trophy>>.value(<_i33.Trophy>[]),
+            returnValue: _i10.Future<List<_i32.Trophy>>.value(<_i32.Trophy>[]),
           )
-          as _i10.Future<List<_i33.Trophy>>);
+          as _i10.Future<List<_i32.Trophy>>);
 
   @override
-  _i10.Future<List<_i34.UserTrophy>> fetchUserTrophies({
+  _i10.Future<List<_i33.UserTrophy>> fetchUserTrophies({
     Map<String, String>? filterQuery,
     String? language,
   }) =>
@@ -843,14 +969,14 @@ class MockTrophyRepository extends _i1.Mock implements _i31.TrophyRepository {
               #filterQuery: filterQuery,
               #language: language,
             }),
-            returnValue: _i10.Future<List<_i34.UserTrophy>>.value(
-              <_i34.UserTrophy>[],
+            returnValue: _i10.Future<List<_i33.UserTrophy>>.value(
+              <_i33.UserTrophy>[],
             ),
           )
-          as _i10.Future<List<_i34.UserTrophy>>);
+          as _i10.Future<List<_i33.UserTrophy>>);
 
   @override
-  _i10.Future<List<_i35.UserTrophyProgression>> fetchProgression({
+  _i10.Future<List<_i34.UserTrophyProgression>> fetchProgression({
     Map<String, String>? filterQuery,
     String? language,
   }) =>
@@ -859,9 +985,9 @@ class MockTrophyRepository extends _i1.Mock implements _i31.TrophyRepository {
               #filterQuery: filterQuery,
               #language: language,
             }),
-            returnValue: _i10.Future<List<_i35.UserTrophyProgression>>.value(
-              <_i35.UserTrophyProgression>[],
+            returnValue: _i10.Future<List<_i34.UserTrophyProgression>>.value(
+              <_i34.UserTrophyProgression>[],
             ),
           )
-          as _i10.Future<List<_i35.UserTrophyProgression>>);
+          as _i10.Future<List<_i34.UserTrophyProgression>>);
 }
diff --git a/test/screenshots/screenshots_02_workout.dart b/test/screenshots/screenshots_02_workout.dart
index 184418f4c..00fb45fb5 100644
--- a/test/screenshots/screenshots_02_workout.dart
+++ b/test/screenshots/screenshots_02_workout.dart
@@ -25,8 +25,7 @@ import 'package:wger/features/routines/screens/routine_screen.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/theme/theme.dart';
 
-import '../../test_data/exercises.dart';
-import '../../test_data/routines.dart';
+import '../../test_data/screenshots/routines.dart';
 import 'screenshots_02_workout.mocks.dart';
 
 @GenerateMocks([RoutinesRepository])
@@ -34,7 +33,7 @@ Widget createWorkoutDetailScreen({Locale? locale}) {
   locale ??= const Locale('en');
   final key = GlobalKey<NavigatorState>();
 
-  final routine = getTestRoutine(exercises: getScreenshotExercises());
+  final routine = getScreenshotRoutine();
   final mockRoutinesRepo = MockRoutinesRepository();
   when(mockRoutinesRepo.watchAllDrift()).thenAnswer((_) => Stream.value([routine]));
 
diff --git a/test/screenshots/screenshots_03_gym_mode.dart b/test/screenshots/screenshots_03_gym_mode.dart
index c7546f5e7..945b86a38 100644
--- a/test/screenshots/screenshots_03_gym_mode.dart
+++ b/test/screenshots/screenshots_03_gym_mode.dart
@@ -31,8 +31,8 @@ import 'package:wger/features/routines/widgets/gym_mode/summary.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/theme/theme.dart';
 
-import '../../test_data/exercises.dart';
-import '../../test_data/routines.dart';
+import '../../test_data/screenshots/exercises.dart';
+import '../../test_data/screenshots/routines.dart';
 
 class _StubRoutinesRiverpod extends RoutinesRiverpod {
   _StubRoutinesRiverpod(this._routines);
@@ -46,17 +46,17 @@ Widget createGymModeScreen({Locale? locale}) {
   locale ??= const Locale('en');
   final key = GlobalKey<NavigatorState>();
 
-  final routine = getTestRoutine(exercises: getScreenshotExercises());
+  final routine = getScreenshotRoutine();
   final container = riverpod.ProviderContainer.test(
     overrides: [
       exerciseListFiltersProvider.overrideWithValue(
-        ExerciseFilterState(exercises: getTestExercises()),
+        ExerciseFilterState(exercises: getScreenshotExercises()),
       ),
     ],
   );
   container.read(routinesRiverpodProvider.notifier).state = riverpod.AsyncData(
     RoutinesState(
-      routines: [getTestRoutine(exercises: getScreenshotExercises())],
+      routines: [getScreenshotRoutine()],
     ),
   );
 
@@ -99,7 +99,7 @@ Widget createGymModeResultsScreen({Locale? locale}) {
   final controller = PageController(initialPage: 0);
 
   final key = GlobalKey<NavigatorState>();
-  final routine = getTestRoutine(exercises: getScreenshotExercises());
+  final routine = getScreenshotRoutine();
   routine.sessions[0] = routine.sessions.first.copyWith(date: clock.now());
 
   return riverpod.UncontrolledProviderScope(
diff --git a/test/screenshots/screenshots_04_measurements.dart b/test/screenshots/screenshots_04_measurements.dart
index 1097ea8f2..8088e5ca1 100644
--- a/test/screenshots/screenshots_04_measurements.dart
+++ b/test/screenshots/screenshots_04_measurements.dart
@@ -20,27 +20,34 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
-import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/account/providers/user_profile_repository.dart';
 import 'package:wger/features/measurements/providers/measurement_repository.dart';
 import 'package:wger/features/measurements/screens/measurement_categories_screen.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/theme/theme.dart';
 
-import '../../test_data/measurements.dart';
+import '../../test_data/profile.dart';
+import '../../test_data/screenshots/measurements.dart';
+import '../helpers/measurement_repository_stubs.dart';
 import 'screenshots_04_measurements.mocks.dart';
 
-@GenerateMocks([MeasurementRepository])
+@GenerateMocks([MeasurementRepository, UserProfileRepository])
 Widget createMeasurementScreen({Locale? locale}) {
   locale ??= const Locale('en');
 
   final mockMeasurementRepo = MockMeasurementRepository();
-  when(
-    mockMeasurementRepo.watchAll(),
-  ).thenAnswer((_) => Stream<List<MeasurementCategory>>.value(getMeasurementCategories()));
+  final measurements = getScreenshotMeasurements();
+  stubMeasurementReads(mockMeasurementRepo, measurements.categories, measurements.entries);
+
+  // The weight card shows the values in the profile unit, so it only appears
+  // once the profile is there
+  final mockUserProfileRepo = MockUserProfileRepository();
+  when(mockUserProfileRepo.watchDrift()).thenAnswer((_) => Stream.value(tUserProfile1));
 
   final container = ProviderContainer.test(
     overrides: [
       measurementRepositoryProvider.overrideWithValue(mockMeasurementRepo),
+      userProfileRepositoryProvider.overrideWithValue(mockUserProfileRepo),
     ],
   );
 
diff --git a/test/screenshots/screenshots_04_measurements.mocks.dart b/test/screenshots/screenshots_04_measurements.mocks.dart
index ba5ffa86f..b448dd76f 100644
--- a/test/screenshots/screenshots_04_measurements.mocks.dart
+++ b/test/screenshots/screenshots_04_measurements.mocks.dart
@@ -6,6 +6,9 @@
 import 'dart:async' as _i3;
 
 import 'package:mockito/mockito.dart' as _i1;
+import 'package:wger/features/account/models/user_profile.dart' as _i8;
+import 'package:wger/features/account/providers/user_profile_repository.dart' as _i7;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i6;
 import 'package:wger/features/measurements/models/measurement_category.dart' as _i4;
 import 'package:wger/features/measurements/models/measurement_entry.dart' as _i5;
 import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i2;
@@ -34,23 +37,163 @@ class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepos
   }
 
   @override
-  _i3.Stream<List<_i4.MeasurementCategory>> watchAll() =>
+  _i3.Stream<List<_i4.MeasurementCategory>> watchAllWithoutEntries() =>
       (super.noSuchMethod(
-            Invocation.method(#watchAll, []),
+            Invocation.method(#watchAllWithoutEntries, []),
             returnValue: _i3.Stream<List<_i4.MeasurementCategory>>.empty(),
           )
           as _i3.Stream<List<_i4.MeasurementCategory>>);
 
   @override
-  _i3.Stream<_i4.MeasurementCategory?> watchLocalDriftCategoryById(
+  _i3.Stream<_i4.MeasurementCategory?> watchCategoryWithoutEntries(
     String? id,
   ) =>
       (super.noSuchMethod(
-            Invocation.method(#watchLocalDriftCategoryById, [id]),
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
             returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
           )
           as _i3.Stream<_i4.MeasurementCategory?>);
 
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<Map<String, _i5.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i3.Stream<Map<String, _i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementBucket>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementBucket>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementValueCount>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementValueCount>>);
+
+  @override
+  _i3.Future<List<_i4.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i3.Future<List<_i4.MeasurementCategory>>.value(
+              <_i4.MeasurementCategory>[],
+            ),
+          )
+          as _i3.Future<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
+
+  @override
+  _i3.Future<Map<String, _i5.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i3.Future<Map<String, _i5.MeasurementEntry>>.value(
+              <String, _i5.MeasurementEntry>{},
+            ),
+          )
+          as _i3.Future<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
   @override
   _i3.Future<void> deleteLocalDrift(String? id) =>
       (super.noSuchMethod(
@@ -78,6 +221,17 @@ class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepos
           )
           as _i3.Future<void>);
 
+  @override
+  _i3.Future<void> addLocalDriftGroupEntries(
+    List<_i5.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
   @override
   _i3.Future<void> deleteLocalDriftCategory(String? id) =>
       (super.noSuchMethod(
@@ -106,4 +260,50 @@ class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepos
             returnValueForMissingStub: _i3.Future<void>.value(),
           )
           as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategoryGroup(
+    List<_i4.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}
+
+/// A class which mocks [UserProfileRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockUserProfileRepository extends _i1.Mock implements _i7.UserProfileRepository {
+  MockUserProfileRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<_i8.UserProfile?> watchDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDrift, []),
+            returnValue: _i3.Stream<_i8.UserProfile?>.empty(),
+          )
+          as _i3.Stream<_i8.UserProfile?>);
+
+  @override
+  _i3.Future<void> editLocalDrift(_i8.UserProfile? profile) =>
+      (super.noSuchMethod(
+            Invocation.method(#editLocalDrift, [profile]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
 }
diff --git a/test/screenshots/screenshots_04_measurements_test.dart b/test/screenshots/screenshots_04_measurements_test.dart
new file mode 100644
index 000000000..bf9ecf6c8
--- /dev/null
+++ b/test/screenshots/screenshots_04_measurements_test.dart
@@ -0,0 +1,54 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+import 'package:wger/features/measurements/widgets/categories_card.dart';
+import 'package:wger/features/measurements/widgets/measurement_tile.dart';
+
+import 'screenshots_04_measurements.dart';
+
+void main() {
+  setUp(() {
+    // The overview reads the shared chart range, which hydrates from prefs
+    SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
+  });
+
+  testWidgets('the store scene fills the grid: weight card plus one tile per form', (
+    tester,
+  ) async {
+    // Tall enough for the whole grid; the slivers build only what they show
+    tester.view.physicalSize = const Size(800, 2600);
+    tester.view.devicePixelRatio = 1.0;
+    addTearDown(tester.view.reset);
+
+    await tester.pumpWidget(createMeasurementScreen());
+    await tester.pumpAndSettle();
+
+    // The weight card on top, every other category as a tile
+    expect(find.byType(CategoriesCard), findsOneWidget);
+    expect(find.byType(MeasurementTile), findsNWidgets(7));
+
+    // One tile per spark form, recognisable by its hero or footer: the sleep
+    // total, the fixed last-night reading, and the hand-kept tape measure
+    expect(find.text('7:12 h'), findsOneWidget);
+    expect(find.text('38.5 cm'), findsOneWidget);
+  });
+}
diff --git a/test/screenshots/screenshots_05_nutritional_plan.dart b/test/screenshots/screenshots_05_nutritional_plan.dart
index b86024466..eecc9e88c 100644
--- a/test/screenshots/screenshots_05_nutritional_plan.dart
+++ b/test/screenshots/screenshots_05_nutritional_plan.dart
@@ -20,19 +20,21 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
 import 'package:wger/features/nutrition/providers/ingredient_repository.dart';
 import 'package:wger/features/nutrition/providers/nutrition_notifier.dart';
 import 'package:wger/features/nutrition/providers/nutrition_repository.dart';
 import 'package:wger/features/nutrition/screens/nutritional_plan_screen.dart';
-import 'package:wger/features/weight/providers/body_weight_repository.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/theme/theme.dart';
 
 import '../../test_data/body_weight.dart';
-import '../../test_data/nutritional_plans.dart';
+import '../../test_data/screenshots/nutrition.dart';
+import '../../test_data/screenshots/weight.dart';
+import '../helpers/measurement_repository_stubs.dart';
 import 'screenshots_05_nutritional_plan.mocks.dart';
 
-@GenerateMocks([NutritionRepository, IngredientRepository, BodyWeightRepository])
+@GenerateMocks([NutritionRepository, IngredientRepository, MeasurementRepository])
 Widget createNutritionalPlanScreen({Locale? locale}) {
   locale ??= const Locale('en');
 
@@ -43,14 +45,16 @@ Widget createNutritionalPlanScreen({Locale? locale}) {
   final mockIngredientRepo = MockIngredientRepository();
   when(mockIngredientRepo.getById(any)).thenAnswer((_) async => null);
 
-  final mockBodyWeightRepository = MockBodyWeightRepository();
-  when(
-    mockBodyWeightRepository.watchAllDrift(),
-  ).thenAnswer((_) => Stream.value(getScreenshotWeightEntries()));
+  final mockMeasurementRepository = MockMeasurementRepository();
+  stubMeasurementReads(
+    mockMeasurementRepository,
+    [getBodyWeightCategory()],
+    getScreenshotBodyWeightEntries(),
+  );
 
   final container = ProviderContainer.test(
     overrides: [
-      bodyWeightRepositoryProvider.overrideWithValue(mockBodyWeightRepository),
+      measurementRepositoryProvider.overrideWithValue(mockMeasurementRepository),
       nutritionRepositoryProvider.overrideWithValue(mockNutritionRepo),
       ingredientRepositoryProvider.overrideWithValue(mockIngredientRepo),
     ],
diff --git a/test/screenshots/screenshots_05_nutritional_plan.mocks.dart b/test/screenshots/screenshots_05_nutritional_plan.mocks.dart
index fcd658c35..ecf475d6b 100644
--- a/test/screenshots/screenshots_05_nutritional_plan.mocks.dart
+++ b/test/screenshots/screenshots_05_nutritional_plan.mocks.dart
@@ -7,6 +7,10 @@ import 'dart:async' as _i3;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:wger/core/search_options.dart' as _i11;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i15;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i13;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i14;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i12;
 import 'package:wger/features/nutrition/models/ingredient.dart' as _i9;
 import 'package:wger/features/nutrition/models/ingredient_filters.dart' as _i10;
 import 'package:wger/features/nutrition/models/log.dart' as _i7;
@@ -15,8 +19,6 @@ import 'package:wger/features/nutrition/models/meal_item.dart' as _i6;
 import 'package:wger/features/nutrition/models/nutritional_plan.dart' as _i4;
 import 'package:wger/features/nutrition/providers/ingredient_repository.dart' as _i8;
 import 'package:wger/features/nutrition/providers/nutrition_repository.dart' as _i2;
-import 'package:wger/features/weight/models/weight_entry.dart' as _i13;
-import 'package:wger/features/weight/providers/body_weight_repository.dart' as _i12;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -289,21 +291,171 @@ class MockIngredientRepository extends _i1.Mock implements _i8.IngredientReposit
           as _i3.Future<_i9.Ingredient?>);
 }
 
-/// A class which mocks [BodyWeightRepository].
+/// A class which mocks [MeasurementRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBodyWeightRepository extends _i1.Mock implements _i12.BodyWeightRepository {
-  MockBodyWeightRepository() {
+class MockMeasurementRepository extends _i1.Mock implements _i12.MeasurementRepository {
+  MockMeasurementRepository() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i3.Stream<List<_i13.WeightEntry>> watchAllDrift() =>
+  _i3.Stream<List<_i13.MeasurementCategory>> watchAllWithoutEntries() =>
       (super.noSuchMethod(
-            Invocation.method(#watchAllDrift, []),
-            returnValue: _i3.Stream<List<_i13.WeightEntry>>.empty(),
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i3.Stream<List<_i13.MeasurementCategory>>.empty(),
+          )
+          as _i3.Stream<List<_i13.MeasurementCategory>>);
+
+  @override
+  _i3.Stream<_i13.MeasurementCategory?> watchCategoryWithoutEntries(
+    String? id,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
+            returnValue: _i3.Stream<_i13.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i13.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<_i13.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i3.Stream<_i13.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i13.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<List<_i14.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i14.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i14.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i14.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i14.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i14.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<Map<String, _i14.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i3.Stream<Map<String, _i14.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<Map<String, _i14.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i15.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i15.MeasurementBucketLevel? level = _i15.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i3.Stream<List<_i15.MeasurementBucket>>.empty(),
+          )
+          as _i3.Stream<List<_i15.MeasurementBucket>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i15.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i15.MeasurementBucketLevel? level = _i15.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i3.Stream<Map<String, List<_i15.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i15.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i15.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i3.Stream<Map<String, List<_i15.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i15.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<List<_i15.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i3.Stream<List<_i15.MeasurementValueCount>>.empty(),
+          )
+          as _i3.Stream<List<_i15.MeasurementValueCount>>);
+
+  @override
+  _i3.Future<List<_i13.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i3.Future<List<_i13.MeasurementCategory>>.value(
+              <_i13.MeasurementCategory>[],
+            ),
           )
-          as _i3.Stream<List<_i13.WeightEntry>>);
+          as _i3.Future<List<_i13.MeasurementCategory>>);
+
+  @override
+  _i3.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
+
+  @override
+  _i3.Future<Map<String, _i14.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i3.Future<Map<String, _i14.MeasurementEntry>>.value(
+              <String, _i14.MeasurementEntry>{},
+            ),
+          )
+          as _i3.Future<Map<String, _i14.MeasurementEntry>>);
+
+  @override
+  _i3.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
 
   @override
   _i3.Future<void> deleteLocalDrift(String? id) =>
@@ -315,7 +467,7 @@ class MockBodyWeightRepository extends _i1.Mock implements _i12.BodyWeightReposi
           as _i3.Future<void>);
 
   @override
-  _i3.Future<void> updateLocalDrift(_i13.WeightEntry? entry) =>
+  _i3.Future<void> updateLocalDrift(_i14.MeasurementEntry? entry) =>
       (super.noSuchMethod(
             Invocation.method(#updateLocalDrift, [entry]),
             returnValue: _i3.Future<void>.value(),
@@ -324,11 +476,71 @@ class MockBodyWeightRepository extends _i1.Mock implements _i12.BodyWeightReposi
           as _i3.Future<void>);
 
   @override
-  _i3.Future<void> addLocalDrift(_i13.WeightEntry? entry) =>
+  _i3.Future<void> addLocalDrift(_i14.MeasurementEntry? entry) =>
       (super.noSuchMethod(
             Invocation.method(#addLocalDrift, [entry]),
             returnValue: _i3.Future<void>.value(),
             returnValueForMissingStub: _i3.Future<void>.value(),
           )
           as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftGroupEntries(
+    List<_i14.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteLocalDriftCategory(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDriftCategory, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDriftCategory(
+    _i13.MeasurementCategory? category,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategory(_i13.MeasurementCategory? category) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategoryGroup(
+    List<_i13.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
 }
diff --git a/test/screenshots/screenshots_06_weight.dart b/test/screenshots/screenshots_06_weight.dart
index c7c718f61..cec8ee502 100644
--- a/test/screenshots/screenshots_06_weight.dart
+++ b/test/screenshots/screenshots_06_weight.dart
@@ -22,31 +22,34 @@ import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:wger/core/form_screen.dart';
 import 'package:wger/features/account/providers/user_profile_repository.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+import 'package:wger/features/measurements/screens/weight_screen.dart';
 import 'package:wger/features/nutrition/providers/ingredient_repository.dart';
 import 'package:wger/features/nutrition/providers/nutrition_notifier.dart';
 import 'package:wger/features/nutrition/providers/nutrition_repository.dart';
-import 'package:wger/features/weight/providers/body_weight_repository.dart';
-import 'package:wger/features/weight/screens/weight_screen.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/theme/theme.dart';
 
 import '../../test_data/body_weight.dart';
-import '../../test_data/nutritional_plans.dart';
 import '../../test_data/profile.dart';
+import '../../test_data/screenshots/weight.dart';
+import '../helpers/measurement_repository_stubs.dart';
 import 'screenshots_06_weight.mocks.dart';
 
 @GenerateMocks([
-  BodyWeightRepository,
+  MeasurementRepository,
   UserProfileRepository,
   NutritionRepository,
   IngredientRepository,
 ])
 Widget createWeightScreen({Locale? locale}) {
   locale ??= const Locale('en');
-  final mockBodyWeightRepository = MockBodyWeightRepository();
-  when(
-    mockBodyWeightRepository.watchAllDrift(),
-  ).thenAnswer((_) => Stream.value(getScreenshotWeightEntries()));
+  final mockMeasurementRepository = MockMeasurementRepository();
+  stubMeasurementReads(
+    mockMeasurementRepository,
+    [getBodyWeightCategory()],
+    getScreenshotBodyWeightEntries(),
+  );
 
   final mockUserProfileRepository = MockUserProfileRepository();
   when(
@@ -59,15 +62,16 @@ Widget createWeightScreen({Locale? locale}) {
 
   final container = ProviderContainer(
     overrides: [
-      bodyWeightRepositoryProvider.overrideWithValue(mockBodyWeightRepository),
+      measurementRepositoryProvider.overrideWithValue(mockMeasurementRepository),
       userProfileRepositoryProvider.overrideWithValue(mockUserProfileRepository),
       nutritionRepositoryProvider.overrideWithValue(mockNutritionRepo),
       ingredientRepositoryProvider.overrideWithValue(mockIngredientRepo),
     ],
   );
-  // Seed the nutrition notifier with a plan so the weight overview can show it.
+  // Seed the nutrition notifier with the plans behind the weight phases, so
+  // the chart shows their periods as bands.
   container.read(nutritionProvider.notifier).state = AsyncData(
-    NutritionState(plans: [getNutritionalPlan()]),
+    NutritionState(plans: getScreenshotWeightPlans()),
   );
 
   return MediaQuery(
diff --git a/test/screenshots/screenshots_06_weight.mocks.dart b/test/screenshots/screenshots_06_weight.mocks.dart
index d9c43d176..2306330c2 100644
--- a/test/screenshots/screenshots_06_weight.mocks.dart
+++ b/test/screenshots/screenshots_06_weight.mocks.dart
@@ -6,19 +6,21 @@
 import 'dart:async' as _i3;
 
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:wger/core/search_options.dart' as _i15;
-import 'package:wger/features/account/models/user_profile.dart' as _i6;
-import 'package:wger/features/account/providers/user_profile_repository.dart' as _i5;
-import 'package:wger/features/nutrition/models/ingredient.dart' as _i13;
-import 'package:wger/features/nutrition/models/ingredient_filters.dart' as _i14;
-import 'package:wger/features/nutrition/models/log.dart' as _i11;
-import 'package:wger/features/nutrition/models/meal.dart' as _i9;
-import 'package:wger/features/nutrition/models/meal_item.dart' as _i10;
-import 'package:wger/features/nutrition/models/nutritional_plan.dart' as _i8;
-import 'package:wger/features/nutrition/providers/ingredient_repository.dart' as _i12;
-import 'package:wger/features/nutrition/providers/nutrition_repository.dart' as _i7;
-import 'package:wger/features/weight/models/weight_entry.dart' as _i4;
-import 'package:wger/features/weight/providers/body_weight_repository.dart' as _i2;
+import 'package:wger/core/search_options.dart' as _i17;
+import 'package:wger/features/account/models/user_profile.dart' as _i8;
+import 'package:wger/features/account/providers/user_profile_repository.dart' as _i7;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i6;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i4;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i5;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i2;
+import 'package:wger/features/nutrition/models/ingredient.dart' as _i15;
+import 'package:wger/features/nutrition/models/ingredient_filters.dart' as _i16;
+import 'package:wger/features/nutrition/models/log.dart' as _i13;
+import 'package:wger/features/nutrition/models/meal.dart' as _i11;
+import 'package:wger/features/nutrition/models/meal_item.dart' as _i12;
+import 'package:wger/features/nutrition/models/nutritional_plan.dart' as _i10;
+import 'package:wger/features/nutrition/providers/ingredient_repository.dart' as _i14;
+import 'package:wger/features/nutrition/providers/nutrition_repository.dart' as _i9;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -35,21 +37,171 @@ import 'package:wger/features/weight/providers/body_weight_repository.dart' as _
 // ignore_for_file: subtype_of_sealed_class
 // ignore_for_file: invalid_use_of_internal_member
 
-/// A class which mocks [BodyWeightRepository].
+/// A class which mocks [MeasurementRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBodyWeightRepository extends _i1.Mock implements _i2.BodyWeightRepository {
-  MockBodyWeightRepository() {
+class MockMeasurementRepository extends _i1.Mock implements _i2.MeasurementRepository {
+  MockMeasurementRepository() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i3.Stream<List<_i4.WeightEntry>> watchAllDrift() =>
+  _i3.Stream<List<_i4.MeasurementCategory>> watchAllWithoutEntries() =>
       (super.noSuchMethod(
-            Invocation.method(#watchAllDrift, []),
-            returnValue: _i3.Stream<List<_i4.WeightEntry>>.empty(),
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i3.Stream<List<_i4.MeasurementCategory>>.empty(),
+          )
+          as _i3.Stream<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchCategoryWithoutEntries(
+    String? id,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoryWithoutEntries, [id]),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<_i4.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i3.Stream<_i4.MeasurementCategory?>.empty(),
+          )
+          as _i3.Stream<_i4.MeasurementCategory?>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchEntries(
+    String? categoryId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEntries, [categoryId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i5.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i3.Stream<List<_i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<List<_i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<Map<String, _i5.MeasurementEntry>> watchLatestEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i3.Stream<Map<String, _i5.MeasurementEntry>>.empty(),
+          )
+          as _i3.Stream<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementBucket>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementBucket>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i6.MeasurementBucketLevel? level = _i6.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<Map<String, List<_i6.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>.empty(),
+          )
+          as _i3.Stream<Map<String, List<_i6.MeasurementBucket>>>);
+
+  @override
+  _i3.Stream<List<_i6.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i3.Stream<List<_i6.MeasurementValueCount>>.empty(),
+          )
+          as _i3.Stream<List<_i6.MeasurementValueCount>>);
+
+  @override
+  _i3.Future<List<_i4.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i3.Future<List<_i4.MeasurementCategory>>.value(
+              <_i4.MeasurementCategory>[],
+            ),
           )
-          as _i3.Stream<List<_i4.WeightEntry>>);
+          as _i3.Future<List<_i4.MeasurementCategory>>);
+
+  @override
+  _i3.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
+
+  @override
+  _i3.Future<Map<String, _i5.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i3.Future<Map<String, _i5.MeasurementEntry>>.value(
+              <String, _i5.MeasurementEntry>{},
+            ),
+          )
+          as _i3.Future<Map<String, _i5.MeasurementEntry>>);
+
+  @override
+  _i3.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
 
   @override
   _i3.Future<void> deleteLocalDrift(String? id) =>
@@ -61,7 +213,7 @@ class MockBodyWeightRepository extends _i1.Mock implements _i2.BodyWeightReposit
           as _i3.Future<void>);
 
   @override
-  _i3.Future<void> updateLocalDrift(_i4.WeightEntry? entry) =>
+  _i3.Future<void> updateLocalDrift(_i5.MeasurementEntry? entry) =>
       (super.noSuchMethod(
             Invocation.method(#updateLocalDrift, [entry]),
             returnValue: _i3.Future<void>.value(),
@@ -70,33 +222,93 @@ class MockBodyWeightRepository extends _i1.Mock implements _i2.BodyWeightReposit
           as _i3.Future<void>);
 
   @override
-  _i3.Future<void> addLocalDrift(_i4.WeightEntry? entry) =>
+  _i3.Future<void> addLocalDrift(_i5.MeasurementEntry? entry) =>
       (super.noSuchMethod(
             Invocation.method(#addLocalDrift, [entry]),
             returnValue: _i3.Future<void>.value(),
             returnValueForMissingStub: _i3.Future<void>.value(),
           )
           as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftGroupEntries(
+    List<_i5.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteLocalDriftCategory(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDriftCategory, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateLocalDriftCategory(
+    _i4.MeasurementCategory? category,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategory(_i4.MeasurementCategory? category) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategory, [category]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> addLocalDriftCategoryGroup(
+    List<_i4.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
 }
 
 /// A class which mocks [UserProfileRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockUserProfileRepository extends _i1.Mock implements _i5.UserProfileRepository {
+class MockUserProfileRepository extends _i1.Mock implements _i7.UserProfileRepository {
   MockUserProfileRepository() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i3.Stream<_i6.UserProfile?> watchDrift() =>
+  _i3.Stream<_i8.UserProfile?> watchDrift() =>
       (super.noSuchMethod(
             Invocation.method(#watchDrift, []),
-            returnValue: _i3.Stream<_i6.UserProfile?>.empty(),
+            returnValue: _i3.Stream<_i8.UserProfile?>.empty(),
           )
-          as _i3.Stream<_i6.UserProfile?>);
+          as _i3.Stream<_i8.UserProfile?>);
 
   @override
-  _i3.Future<void> editLocalDrift(_i6.UserProfile? profile) =>
+  _i3.Future<void> editLocalDrift(_i8.UserProfile? profile) =>
       (super.noSuchMethod(
             Invocation.method(#editLocalDrift, [profile]),
             returnValue: _i3.Future<void>.value(),
@@ -108,21 +320,21 @@ class MockUserProfileRepository extends _i1.Mock implements _i5.UserProfileRepos
 /// A class which mocks [NutritionRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNutritionRepository extends _i1.Mock implements _i7.NutritionRepository {
+class MockNutritionRepository extends _i1.Mock implements _i9.NutritionRepository {
   MockNutritionRepository() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i3.Stream<List<_i8.NutritionalPlan>> watchAllDrift() =>
+  _i3.Stream<List<_i10.NutritionalPlan>> watchAllDrift() =>
       (super.noSuchMethod(
             Invocation.method(#watchAllDrift, []),
-            returnValue: _i3.Stream<List<_i8.NutritionalPlan>>.empty(),
+            returnValue: _i3.Stream<List<_i10.NutritionalPlan>>.empty(),
           )
-          as _i3.Stream<List<_i8.NutritionalPlan>>);
+          as _i3.Stream<List<_i10.NutritionalPlan>>);
 
   @override
-  _i3.Future<void> addPlanLocalDrift(_i8.NutritionalPlan? plan) =>
+  _i3.Future<void> addPlanLocalDrift(_i10.NutritionalPlan? plan) =>
       (super.noSuchMethod(
             Invocation.method(#addPlanLocalDrift, [plan]),
             returnValue: _i3.Future<void>.value(),
@@ -131,7 +343,7 @@ class MockNutritionRepository extends _i1.Mock implements _i7.NutritionRepositor
           as _i3.Future<void>);
 
   @override
-  _i3.Future<void> editLocalDrift(_i8.NutritionalPlan? plan) =>
+  _i3.Future<void> editLocalDrift(_i10.NutritionalPlan? plan) =>
       (super.noSuchMethod(
             Invocation.method(#editLocalDrift, [plan]),
             returnValue: _i3.Future<void>.value(),
@@ -149,15 +361,15 @@ class MockNutritionRepository extends _i1.Mock implements _i7.NutritionRepositor
           as _i3.Future<void>);
 
   @override
-  _i3.Stream<List<_i9.Meal>> watchAllMealsHydrated() =>
+  _i3.Stream<List<_i11.Meal>> watchAllMealsHydrated() =>
       (super.noSuchMethod(
             Invocation.method(#watchAllMealsHydrated, []),
-            returnValue: _i3.Stream<List<_i9.Meal>>.empty(),
+            returnValue: _i3.Stream<List<_i11.Meal>>.empty(),
           )
-          as _i3.Stream<List<_i9.Meal>>);
+          as _i3.Stream<List<_i11.Meal>>);
 
   @override
-  _i3.Future<void> addMealLocalDrift(_i9.Meal? meal) =>
+  _i3.Future<void> addMealLocalDrift(_i11.Meal? meal) =>
       (super.noSuchMethod(
             Invocation.method(#addMealLocalDrift, [meal]),
             returnValue: _i3.Future<void>.value(),
@@ -166,7 +378,7 @@ class MockNutritionRepository extends _i1.Mock implements _i7.NutritionRepositor
           as _i3.Future<void>);
 
   @override
-  _i3.Future<void> editMealLocalDrift(_i9.Meal? meal) =>
+  _i3.Future<void> editMealLocalDrift(_i11.Meal? meal) =>
       (super.noSuchMethod(
             Invocation.method(#editMealLocalDrift, [meal]),
             returnValue: _i3.Future<void>.value(),
@@ -184,7 +396,7 @@ class MockNutritionRepository extends _i1.Mock implements _i7.NutritionRepositor
           as _i3.Future<void>);
 
   @override
-  _i3.Future<void> addMealItemLocalDrift(_i10.MealItem? item) =>
+  _i3.Future<void> addMealItemLocalDrift(_i12.MealItem? item) =>
       (super.noSuchMethod(
             Invocation.method(#addMealItemLocalDrift, [item]),
             returnValue: _i3.Future<void>.value(),
@@ -193,7 +405,7 @@ class MockNutritionRepository extends _i1.Mock implements _i7.NutritionRepositor
           as _i3.Future<void>);
 
   @override
-  _i3.Future<void> editMealItemLocalDrift(_i10.MealItem? item) =>
+  _i3.Future<void> editMealItemLocalDrift(_i12.MealItem? item) =>
       (super.noSuchMethod(
             Invocation.method(#editMealItemLocalDrift, [item]),
             returnValue: _i3.Future<void>.value(),
@@ -211,15 +423,15 @@ class MockNutritionRepository extends _i1.Mock implements _i7.NutritionRepositor
           as _i3.Future<void>);
 
   @override
-  _i3.Stream<List<_i11.LogItem>> watchAllLogsHydrated() =>
+  _i3.Stream<List<_i13.LogItem>> watchAllLogsHydrated() =>
       (super.noSuchMethod(
             Invocation.method(#watchAllLogsHydrated, []),
-            returnValue: _i3.Stream<List<_i11.LogItem>>.empty(),
+            returnValue: _i3.Stream<List<_i13.LogItem>>.empty(),
           )
-          as _i3.Stream<List<_i11.LogItem>>);
+          as _i3.Stream<List<_i13.LogItem>>);
 
   @override
-  _i3.Future<void> addLogLocalDrift(_i11.LogItem? log) =>
+  _i3.Future<void> addLogLocalDrift(_i13.LogItem? log) =>
       (super.noSuchMethod(
             Invocation.method(#addLogLocalDrift, [log]),
             returnValue: _i3.Future<void>.value(),
@@ -240,43 +452,43 @@ class MockNutritionRepository extends _i1.Mock implements _i7.NutritionRepositor
 /// A class which mocks [IngredientRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockIngredientRepository extends _i1.Mock implements _i12.IngredientRepository {
+class MockIngredientRepository extends _i1.Mock implements _i14.IngredientRepository {
   MockIngredientRepository() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i3.Stream<_i13.Ingredient?> watchById(int? id) =>
+  _i3.Stream<_i15.Ingredient?> watchById(int? id) =>
       (super.noSuchMethod(
             Invocation.method(#watchById, [id]),
-            returnValue: _i3.Stream<_i13.Ingredient?>.empty(),
+            returnValue: _i3.Stream<_i15.Ingredient?>.empty(),
           )
-          as _i3.Stream<_i13.Ingredient?>);
+          as _i3.Stream<_i15.Ingredient?>);
 
   @override
-  _i3.Stream<List<_i13.Ingredient>> watchAllDrift({
-    _i14.IngredientFilters? filters = const _i14.IngredientFilters(),
+  _i3.Stream<List<_i15.Ingredient>> watchAllDrift({
+    _i16.IngredientFilters? filters = const _i16.IngredientFilters(),
   }) =>
       (super.noSuchMethod(
             Invocation.method(#watchAllDrift, [], {#filters: filters}),
-            returnValue: _i3.Stream<List<_i13.Ingredient>>.empty(),
+            returnValue: _i3.Stream<List<_i15.Ingredient>>.empty(),
           )
-          as _i3.Stream<List<_i13.Ingredient>>);
+          as _i3.Stream<List<_i15.Ingredient>>);
 
   @override
-  _i3.Future<_i13.Ingredient?> getById(int? id) =>
+  _i3.Future<_i15.Ingredient?> getById(int? id) =>
       (super.noSuchMethod(
             Invocation.method(#getById, [id]),
-            returnValue: _i3.Future<_i13.Ingredient?>.value(),
+            returnValue: _i3.Future<_i15.Ingredient?>.value(),
           )
-          as _i3.Future<_i13.Ingredient?>);
+          as _i3.Future<_i15.Ingredient?>);
 
   @override
-  _i3.Future<List<_i13.Ingredient>> searchIngredientLocal(
+  _i3.Future<List<_i15.Ingredient>> searchIngredientLocal(
     String? term, {
     bool? isVegan = false,
     bool? isVegetarian = false,
-    _i13.NutriScore? nutriscoreMax,
+    _i15.NutriScore? nutriscoreMax,
     int? limit = 100,
   }) =>
       (super.noSuchMethod(
@@ -290,20 +502,20 @@ class MockIngredientRepository extends _i1.Mock implements _i12.IngredientReposi
                 #limit: limit,
               },
             ),
-            returnValue: _i3.Future<List<_i13.Ingredient>>.value(
-              <_i13.Ingredient>[],
+            returnValue: _i3.Future<List<_i15.Ingredient>>.value(
+              <_i15.Ingredient>[],
             ),
           )
-          as _i3.Future<List<_i13.Ingredient>>);
+          as _i3.Future<List<_i15.Ingredient>>);
 
   @override
-  _i3.Future<List<_i13.Ingredient>> searchIngredientServer(
+  _i3.Future<List<_i15.Ingredient>> searchIngredientServer(
     String? name, {
     String? languageCode = 'en',
-    _i15.SearchLanguage? searchLanguage = _i15.SearchLanguage.current,
+    _i17.SearchLanguage? searchLanguage = _i17.SearchLanguage.current,
     bool? isVegan = false,
     bool? isVegetarian = false,
-    _i13.NutriScore? nutriscoreMax,
+    _i15.NutriScore? nutriscoreMax,
   }) =>
       (super.noSuchMethod(
             Invocation.method(
@@ -317,21 +529,21 @@ class MockIngredientRepository extends _i1.Mock implements _i12.IngredientReposi
                 #nutriscoreMax: nutriscoreMax,
               },
             ),
-            returnValue: _i3.Future<List<_i13.Ingredient>>.value(
-              <_i13.Ingredient>[],
+            returnValue: _i3.Future<List<_i15.Ingredient>>.value(
+              <_i15.Ingredient>[],
             ),
           )
-          as _i3.Future<List<_i13.Ingredient>>);
+          as _i3.Future<List<_i15.Ingredient>>);
 
   @override
-  _i3.Future<List<_i13.Ingredient>> search(
+  _i3.Future<List<_i15.Ingredient>> search(
     String? name, {
     required bool? isOnline,
     String? languageCode = 'en',
-    _i15.SearchLanguage? searchLanguage = _i15.SearchLanguage.current,
+    _i17.SearchLanguage? searchLanguage = _i17.SearchLanguage.current,
     bool? isVegan = false,
     bool? isVegetarian = false,
-    _i13.NutriScore? nutriscoreMax,
+    _i15.NutriScore? nutriscoreMax,
   }) =>
       (super.noSuchMethod(
             Invocation.method(
@@ -346,17 +558,17 @@ class MockIngredientRepository extends _i1.Mock implements _i12.IngredientReposi
                 #nutriscoreMax: nutriscoreMax,
               },
             ),
-            returnValue: _i3.Future<List<_i13.Ingredient>>.value(
-              <_i13.Ingredient>[],
+            returnValue: _i3.Future<List<_i15.Ingredient>>.value(
+              <_i15.Ingredient>[],
             ),
           )
-          as _i3.Future<List<_i13.Ingredient>>);
+          as _i3.Future<List<_i15.Ingredient>>);
 
   @override
-  _i3.Future<_i13.Ingredient?> searchIngredientByBarcode(String? barcode) =>
+  _i3.Future<_i15.Ingredient?> searchIngredientByBarcode(String? barcode) =>
       (super.noSuchMethod(
             Invocation.method(#searchIngredientByBarcode, [barcode]),
-            returnValue: _i3.Future<_i13.Ingredient?>.value(),
+            returnValue: _i3.Future<_i15.Ingredient?>.value(),
           )
-          as _i3.Future<_i13.Ingredient?>);
+          as _i3.Future<_i15.Ingredient?>);
 }
diff --git a/test_data/body_weight.dart b/test_data/body_weight.dart
index 8e5cc9c42..718e16f87 100644
--- a/test_data/body_weight.dart
+++ b/test_data/body_weight.dart
@@ -1,6 +1,6 @@
 /*
  * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
+ * Copyright (C) 2020 - 2026 wger Team
  *
  * wger Workout Manager is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -16,39 +16,54 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import 'package:wger/features/weight/models/weight_entry.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
 
-final testWeightEntry1 = WeightEntry(
+/// Body weight entries are measurements in the user's official body weight
+/// category (metric_type=body_weight, is_official=true), created by the server.
+const testBodyWeightCategoryId = 'bw';
+
+final testWeightEntry1 = MeasurementEntry(
   id: '1',
-  weight: 80.0,
+  categoryId: testBodyWeightCategoryId,
+  value: 80.0,
   date: DateTime.utc(2021, 01, 01, 15, 30),
+  notes: '',
 );
-final testWeightEntry2 = WeightEntry(
+final testWeightEntry2 = MeasurementEntry(
   id: '2',
-  weight: 81.0,
+  categoryId: testBodyWeightCategoryId,
+  value: 81.0,
   date: DateTime.utc(2021, 01, 10, 10, 0),
+  notes: '',
+);
+
+/// Entry recorded in pounds (extra_data.unit); 176.4 lb are 80.01 kg
+final testWeightEntryLb = MeasurementEntry(
+  id: '3',
+  categoryId: testBodyWeightCategoryId,
+  value: 176.4,
+  date: DateTime.utc(2021, 01, 20, 8, 0),
+  notes: '',
+  extraData: const {'unit': 'lb'},
 );
 
-List<WeightEntry> getWeightEntries() {
-  return [testWeightEntry1, testWeightEntry2];
+/// The official category. Its entries are seeded apart from it, see
+/// [bodyWeightEntries].
+MeasurementCategory getBodyWeightCategory() {
+  return MeasurementCategory(
+    id: testBodyWeightCategoryId,
+    name: 'Weight',
+    unit: 'kg',
+    metricType: MetricType.bodyWeight,
+    isOfficial: true,
+  );
 }
 
-List<WeightEntry> getScreenshotWeightEntries() {
-  return [
-    WeightEntry(id: '1', weight: 86, date: DateTime.utc(2021, 01, 01)),
-    WeightEntry(id: '2', weight: 81, date: DateTime.utc(2021, 01, 10)),
-    WeightEntry(id: '3', weight: 82, date: DateTime.utc(2021, 01, 20)),
-    WeightEntry(id: '4', weight: 83, date: DateTime.utc(2021, 01, 30)),
-    WeightEntry(id: '5', weight: 86, date: DateTime.utc(2021, 02, 20)),
-    WeightEntry(id: '6', weight: 90, date: DateTime.utc(2021, 02, 28)),
-    WeightEntry(id: '7', weight: 91, date: DateTime.utc(2021, 03, 20)),
-    WeightEntry(id: '8', weight: 91.1, date: DateTime.utc(2021, 03, 30)),
-    WeightEntry(id: '9', weight: 90, date: DateTime.utc(2021, 05, 1)),
-    WeightEntry(id: '10', weight: 91, date: DateTime.utc(2021, 6, 5)),
-    WeightEntry(id: '11', weight: 89, date: DateTime.utc(2021, 6, 20)),
-    WeightEntry(id: '12', weight: 88, date: DateTime.utc(2021, 7, 15)),
-    WeightEntry(id: '13', weight: 86, date: DateTime.utc(2021, 7, 20)),
-    WeightEntry(id: '14', weight: 83, date: DateTime.utc(2021, 7, 30)),
-    WeightEntry(id: '15', weight: 80, date: DateTime.utc(2021, 8, 10)),
-  ];
+/// [entries] keyed for the official category, as the seeding helpers take
+/// them. Defaults to the two test entries, newest first.
+Map<String, List<MeasurementEntry>> bodyWeightEntries([List<MeasurementEntry>? entries]) {
+  return {
+    testBodyWeightCategoryId: entries ?? [testWeightEntry2, testWeightEntry1],
+  };
 }
diff --git a/test_data/exercises.dart b/test_data/exercises.dart
index 3e8da9f7c..829a7029b 100644
--- a/test_data/exercises.dart
+++ b/test_data/exercises.dart
@@ -23,8 +23,6 @@ import 'package:wger/features/exercises/models/exercise.dart';
 import 'package:wger/features/exercises/models/muscle.dart';
 import 'package:wger/features/exercises/models/translation.dart';
 
-import 'screenshots_exercises.dart';
-
 const testGerman = Language(id: 1, shortName: 'de', fullName: 'Deutsch');
 const testEnglish = Language(id: 2, shortName: 'en', fullName: 'English');
 const testFrench = Language(id: 3, shortName: 'fr', fullName: 'Français');
@@ -230,14 +228,3 @@ final sideRaisesEn = Translation(
 List<Exercise> getTestExercises() {
   return [testBenchPress, testCrunches, testDeadLift, testCurls, testSquats, testSideRaises];
 }
-
-List<Exercise> getScreenshotExercises() {
-  return [
-    testBenchPress.copyWith(translations: benchPressTranslations),
-    testCrunches.copyWith(translations: crunchesTranslations),
-    testDeadLift.copyWith(translations: deadLiftTranslations),
-    testCurls.copyWith(translations: curlsTranslations),
-    testSquats.copyWith(translations: squatsTranslations),
-    testSideRaises.copyWith(translations: raisesTranslations),
-  ];
-}
diff --git a/test_data/measurements.dart b/test_data/measurements.dart
index 3ada4ceea..2360fa6d8 100644
--- a/test_data/measurements.dart
+++ b/test_data/measurements.dart
@@ -78,29 +78,87 @@ final testMeasurementEntry8 = MeasurementEntry(
   notes: '',
 );
 
+final testNeasurementEntry9 = MeasurementEntry(
+  id: 'e1',
+  categoryId: 'sys',
+  date: DateTime(2026, 1, 1),
+  value: 120,
+  notes: '',
+);
+
+final testNeasurementEntry10 = MeasurementEntry(
+  id: 'e2',
+  categoryId: 'dia',
+  date: DateTime(2026, 1, 1),
+  value: 80,
+  notes: '',
+);
+
+/// Multi-value group: blood pressure with systolic/diastolic components.
+final testMeasurementCategoryBloodPressure = MeasurementCategory(
+  id: 'bp',
+  name: 'Blood pressure',
+  unit: 'mmHg',
+  metricType: MetricType.bloodPressure,
+  children: [testMeasurementCategorySystolic, testMeasurementCategoryDiastolic],
+);
+
+final testMeasurementCategorySystolic = MeasurementCategory(
+  id: 'sys',
+  name: 'Systolic',
+  unit: 'mmHg',
+  parentId: 'bp',
+  order: 0,
+);
+
+final testMeasurementCategoryDiastolic = MeasurementCategory(
+  id: 'dia',
+  name: 'Diastolic',
+  unit: 'mmHg',
+  parentId: 'bp',
+  order: 1,
+);
+
+/// The blood pressure group as a flat list (parent first) with the children
+/// attached to the parent, matching the shape the repository's watchAll()
+/// returns. Not included in [getMeasurementCategories].
+List<MeasurementCategory> getBloodPressureGroup() {
+  return [
+    testMeasurementCategoryBloodPressure,
+    testMeasurementCategorySystolic,
+    testMeasurementCategoryDiastolic,
+  ];
+}
+
 List<MeasurementCategory> getMeasurementCategories() {
   return [
-    MeasurementCategory(
-      id: '1',
-      name: 'Body fat',
-      unit: '%',
-      entries: [
-        testMeasurementEntry1,
-        testMeasurementEntry2,
-        testMeasurementEntry3,
-        testMeasurementEntry4,
-        testMeasurementEntry5,
-        testMeasurementEntry6,
-      ],
-    ),
-    MeasurementCategory(
-      id: '2',
-      name: 'Biceps',
-      unit: 'cm',
-      entries: [
-        testMeasurementEntry7,
-        testMeasurementEntry8,
-      ],
-    ),
+    MeasurementCategory(id: '1', name: 'Body fat', unit: '%'),
+    MeasurementCategory(id: '2', name: 'Biceps', unit: 'cm'),
   ];
 }
+
+/// The entries of [getMeasurementCategories], keyed by category id.
+///
+/// Apart from the categories, which no longer carry them: what a screen shows
+/// is read through its own query, so a test seeds the two independently.
+Map<String, List<MeasurementEntry>> getMeasurementEntries() {
+  return {
+    '1': [
+      testMeasurementEntry1,
+      testMeasurementEntry2,
+      testMeasurementEntry3,
+      testMeasurementEntry4,
+      testMeasurementEntry5,
+      testMeasurementEntry6,
+    ],
+    '2': [testMeasurementEntry7, testMeasurementEntry8],
+  };
+}
+
+/// The entries of [getBloodPressureGroup], keyed by component id.
+Map<String, List<MeasurementEntry>> getBloodPressureEntries() {
+  return {
+    'sys': [testNeasurementEntry9],
+    'dia': [testNeasurementEntry10],
+  };
+}
diff --git a/test_data/nutritional_plans.dart b/test_data/nutritional_plans.dart
index 92791001b..e3ce6e17e 100644
--- a/test_data/nutritional_plans.dart
+++ b/test_data/nutritional_plans.dart
@@ -16,8 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import 'dart:math';
-
 import 'package:flutter/material.dart';
 import 'package:wger/features/nutrition/models/ingredient.dart';
 import 'package:wger/features/nutrition/models/log.dart';
@@ -230,64 +228,3 @@ NutritionalPlan getNutritionalPlan() {
 
   return plan;
 }
-
-NutritionalPlan getNutritionalPlanScreenshot() {
-  final random = Random();
-
-  final mealItem1 = MealItem(ingredientId: 1, amount: 100, ingredient: muesli);
-  final mealItem2 = MealItem(ingredientId: 2, amount: 75, ingredient: milk);
-  final mealItem3 = MealItem(ingredientId: 3, amount: 100, ingredient: apple);
-
-  final meal1 = Meal(
-    id: testMealUuid1,
-    plan: testPlanUuid1,
-    time: const TimeOfDay(hour: 8, minute: 30),
-    name: 'Breakfast',
-    mealItems: [mealItem1, mealItem2],
-  );
-
-  final meal2 = Meal(
-    id: testMealUuid2,
-    plan: testPlanUuid1,
-    time: const TimeOfDay(hour: 11, minute: 0),
-    name: 'Snack 1',
-    mealItems: [mealItem3],
-  );
-
-  final NutritionalPlan plan = NutritionalPlan(
-    id: testPlanUuid1,
-    description: 'Diet',
-    creationDate: DateTime(2021, 5, 23),
-    startDate: DateTime(2021, 5, 23),
-    meals: [meal1, meal2],
-  );
-
-  // Add logs
-  plan.diaryEntries.add(
-    LogItem.fromMealItem(mealItem1, testPlanUuid1, testMealUuid1, DateTime.now()),
-  );
-  plan.diaryEntries.add(
-    LogItem.fromMealItem(mealItem2, testPlanUuid1, testMealUuid1, DateTime.now()),
-  );
-  plan.diaryEntries.add(
-    LogItem.fromMealItem(mealItem3, testPlanUuid1, testMealUuid1, DateTime.now()),
-  );
-
-  for (final i in plan.diaryEntries) {
-    i.datetime = DateTime.now();
-    i.amount = i.amount / (1.0 + random.nextDouble() * (4.0 - 1.0));
-  }
-
-  final log = LogItem(
-    mealId: meal1.id,
-    ingredientId: 1,
-    weightUnitId: 1,
-    amount: 40,
-    planId: plan.id!,
-    datetime: DateTime.now(),
-  );
-  log.ingredient = cake;
-  plan.diaryEntries.add(log);
-
-  return plan;
-}
diff --git a/test_data/screenshots/exercises.dart b/test_data/screenshots/exercises.dart
new file mode 100644
index 000000000..2dabf0e3d
--- /dev/null
+++ b/test_data/screenshots/exercises.dart
@@ -0,0 +1,73 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:wger/features/exercises/models/exercise.dart';
+import 'package:wger/features/exercises/models/muscle.dart';
+
+import '../exercises.dart';
+import '../screenshots_exercises.dart';
+
+// Real muscles instead of the joke names of the unit-test fixtures; the gym
+// mode summary prints them as 'name (nameEn)' in the muscle distribution.
+const _chest = Muscle(id: 101, name: 'Pectoralis major', nameEn: 'Chest', isFront: true);
+const _delts = Muscle(id: 102, name: 'Deltoideus', nameEn: 'Shoulders', isFront: true);
+const _triceps = Muscle(id: 103, name: 'Triceps brachii', nameEn: 'Triceps', isFront: false);
+const _biceps = Muscle(id: 104, name: 'Biceps brachii', nameEn: 'Biceps', isFront: true);
+const _glutes = Muscle(id: 105, name: 'Gluteus maximus', nameEn: 'Glutes', isFront: false);
+const _quads = Muscle(id: 106, name: 'Quadriceps femoris', nameEn: 'Quads', isFront: true);
+const _hamstrings = Muscle(id: 107, name: 'Biceps femoris', nameEn: 'Hamstrings', isFront: false);
+const _abs = Muscle(id: 108, name: 'Rectus abdominis', nameEn: 'Abs', isFront: true);
+const _lowerBack = Muscle(id: 109, name: 'Erector spinae', nameEn: 'Lower back', isFront: false);
+
+/// The test exercises with their full translation sets and realistic muscle
+/// assignments attached, so the screenshots show localized exercise names and
+/// a plausible muscle distribution.
+List<Exercise> getScreenshotExercises() {
+  return [
+    testBenchPress.copyWith(
+      translations: benchPressTranslations,
+      muscles: const [_chest],
+      musclesSecondary: const [_delts, _triceps],
+    ),
+    testCrunches.copyWith(
+      translations: crunchesTranslations,
+      muscles: const [_abs],
+      musclesSecondary: const [],
+    ),
+    testDeadLift.copyWith(
+      translations: deadLiftTranslations,
+      muscles: const [_glutes, _lowerBack],
+      musclesSecondary: const [_hamstrings],
+    ),
+    testCurls.copyWith(
+      translations: curlsTranslations,
+      muscles: const [_biceps],
+      musclesSecondary: const [],
+    ),
+    testSquats.copyWith(
+      translations: squatsTranslations,
+      muscles: const [_quads],
+      musclesSecondary: const [_glutes, _abs],
+    ),
+    testSideRaises.copyWith(
+      translations: raisesTranslations,
+      muscles: const [_delts],
+      musclesSecondary: const [],
+    ),
+  ];
+}
diff --git a/test_data/screenshots/measurements.dart b/test_data/screenshots/measurements.dart
new file mode 100644
index 000000000..f13cfc39e
--- /dev/null
+++ b/test_data/screenshots/measurements.dart
@@ -0,0 +1,297 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'dart:math';
+
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+
+/// Measurement categories for the store screenshots: the account of someone
+/// syncing daily, shaped like a health import, plus a hand-kept tape measure.
+/// Three months of data ending today, so every tile of the overview grid has
+/// something to show: the weight card on top, each spark form (line, dots,
+/// bars, floating, stack, heatmap) and both footer kinds exactly once.
+/// Deterministic (fixed random seed); only the dates move with today.
+///
+/// The categories come as the flat parent-first list the repository emits,
+/// with the group's children attached to their parent; the entries alongside
+/// them, keyed by the category holding them, since a category carries none.
+({List<MeasurementCategory> categories, Map<String, List<MeasurementEntry>> entries})
+getScreenshotMeasurements() {
+  final random = Random(7);
+  final today = DateTime.now();
+  DateTime day(int daysAgo, {int hour = 0, int minute = 0}) =>
+      DateTime(today.year, today.month, today.day - daysAgo, hour, minute);
+
+  MeasurementEntry entry(
+    String categoryId,
+    Object key,
+    num value,
+    DateTime date, {
+    String source = 'apple_health',
+  }) => MeasurementEntry(
+    id: '$categoryId-$key',
+    categoryId: categoryId,
+    value: value,
+    date: date,
+    notes: '',
+    source: source,
+  );
+
+  // Body weight: the morning weigh-in, slowly losing. Feeds the full-width
+  // card on top of the grid, not a tile.
+  final weightEntries = <MeasurementEntry>[];
+  for (var daysAgo = 90; daysAgo >= 0; daysAgo--) {
+    final value = 84.2 - 0.02 * (90 - daysAgo) + (random.nextDouble() - 0.5) * 0.5;
+    weightEntries.add(
+      entry(
+        'screenshot-weight',
+        daysAgo,
+        (value * 10).round() / 10,
+        day(daysAgo, hour: 7, minute: 2),
+        source: 'user',
+      ),
+    );
+  }
+  final weight = MeasurementCategory(
+    id: 'screenshot-weight',
+    name: 'Weight',
+    unit: 'kg',
+    metricType: MetricType.bodyWeight,
+    isOfficial: true,
+  );
+
+  // Steps: quiet office days, active days, and the occasional long hike
+  final stepEntries = <MeasurementEntry>[];
+  for (var daysAgo = 90; daysAgo >= 0; daysAgo--) {
+    final roll = random.nextDouble();
+    final int steps;
+    if (roll < 0.1) {
+      steps = 15000 + random.nextInt(4000);
+    } else if (roll < 0.5) {
+      steps = 8500 + random.nextInt(3500);
+    } else {
+      steps = 4500 + random.nextInt(3000);
+    }
+    stepEntries.add(entry('screenshot-steps', daysAgo, steps, day(daysAgo, hour: 22)));
+  }
+  final steps = MeasurementCategory(
+    id: 'screenshot-steps',
+    name: 'Steps',
+    unit: 'count',
+    metricType: MetricType.steps,
+    isOfficial: true,
+  );
+
+  // Blood pressure: a morning reading every two to three days, slowly
+  // improving. Systolic and diastolic share their timestamp, which is how
+  // the components of a reading are paired.
+  final systolicEntries = <MeasurementEntry>[];
+  final diastolicEntries = <MeasurementEntry>[];
+  for (var daysAgo = 90; daysAgo >= 0; daysAgo -= 2 + random.nextInt(2)) {
+    final date = day(daysAgo, hour: 8, minute: 5);
+    final systolic = (123 + 11 * daysAgo / 90 + (random.nextDouble() - 0.5) * 8).roundToDouble();
+    final diastolic = (systolic - 46 + (random.nextDouble() - 0.5) * 6).roundToDouble();
+    systolicEntries.add(entry('screenshot-sys', daysAgo, systolic, date));
+    diastolicEntries.add(entry('screenshot-dia', daysAgo, diastolic, date));
+  }
+  final systolic = MeasurementCategory(
+    id: 'screenshot-sys',
+    name: 'Systolic',
+    unit: 'mmHg',
+    metricType: MetricType.bloodPressureSystolic,
+    parentId: 'screenshot-bp',
+    order: 0,
+  );
+  final diastolic = MeasurementCategory(
+    id: 'screenshot-dia',
+    name: 'Diastolic',
+    unit: 'mmHg',
+    metricType: MetricType.bloodPressureDiastolic,
+    parentId: 'screenshot-bp',
+    order: 1,
+  );
+  final bloodPressure = MeasurementCategory(
+    id: 'screenshot-bp',
+    name: 'Blood pressure',
+    unit: 'mmHg',
+    metricType: MetricType.bloodPressure,
+    isOfficial: true,
+    children: [systolic, diastolic],
+  );
+
+  // Body fat: measured with the weigh-in, falling steadily. The line tile
+  // with a downward weekly-rate chip.
+  final bodyFatEntries = <MeasurementEntry>[];
+  for (var daysAgo = 90; daysAgo >= 0; daysAgo--) {
+    final value = 21.8 - 0.03 * (90 - daysAgo) + (random.nextDouble() - 0.5) * 0.3;
+    bodyFatEntries.add(
+      entry('screenshot-fat', daysAgo, (value * 10).round() / 10, day(daysAgo, hour: 7, minute: 3)),
+    );
+  }
+  final bodyFat = MeasurementCategory(
+    id: 'screenshot-fat',
+    name: 'Body fat',
+    unit: '%',
+    metricType: MetricType.bodyFat,
+  );
+
+  // Resting heart rate: barely moves. The line tile with the "stable" chip.
+  final restingEntries = <MeasurementEntry>[];
+  for (var daysAgo = 90; daysAgo >= 0; daysAgo--) {
+    restingEntries.add(
+      entry(
+        'screenshot-rhr',
+        daysAgo,
+        (58 + (random.nextDouble() - 0.5) * 2).roundToDouble(),
+        day(daysAgo, hour: 6, minute: 45),
+      ),
+    );
+  }
+  final restingHeartRate = MeasurementCategory(
+    id: 'screenshot-rhr',
+    name: 'Resting heart rate',
+    unit: 'bpm',
+    metricType: MetricType.restingHeartRate,
+  );
+
+  // Sleep: a night per day, split into stages; the total leads the tile
+  // ("7:12" for the last night) over the stacked stage bars
+  final sleepTotalEntries = <MeasurementEntry>[];
+  final sleepLightEntries = <MeasurementEntry>[];
+  final sleepDeepEntries = <MeasurementEntry>[];
+  final sleepRemEntries = <MeasurementEntry>[];
+  for (var daysAgo = 90; daysAgo >= 0; daysAgo--) {
+    final light = daysAgo == 0 ? 240 : 220 + random.nextInt(60) - 30;
+    final deep = daysAgo == 0 ? 90 : 95 + random.nextInt(30) - 15;
+    final rem = daysAgo == 0 ? 102 : 105 + random.nextInt(30) - 15;
+    final date = day(daysAgo, hour: 7);
+
+    sleepTotalEntries.add(entry('screenshot-sleep-total', daysAgo, light + deep + rem, date));
+    sleepLightEntries.add(entry('screenshot-sleep-light', daysAgo, light, date));
+    sleepDeepEntries.add(entry('screenshot-sleep-deep', daysAgo, deep, date));
+    sleepRemEntries.add(entry('screenshot-sleep-rem', daysAgo, rem, date));
+  }
+  final sleepChildren = [
+    MeasurementCategory(
+      id: 'screenshot-sleep-total',
+      name: 'Total sleep',
+      unit: 'min',
+      metricType: MetricType.sleepTotal,
+      parentId: 'screenshot-sleep',
+      order: 0,
+    ),
+    MeasurementCategory(
+      id: 'screenshot-sleep-light',
+      name: 'Light sleep',
+      unit: 'min',
+      metricType: MetricType.sleepLight,
+      parentId: 'screenshot-sleep',
+      order: 1,
+    ),
+    MeasurementCategory(
+      id: 'screenshot-sleep-deep',
+      name: 'Deep sleep',
+      unit: 'min',
+      metricType: MetricType.sleepDeep,
+      parentId: 'screenshot-sleep',
+      order: 2,
+    ),
+    MeasurementCategory(
+      id: 'screenshot-sleep-rem',
+      name: 'REM sleep',
+      unit: 'min',
+      metricType: MetricType.sleepRem,
+      parentId: 'screenshot-sleep',
+      order: 3,
+    ),
+  ];
+  final sleep = MeasurementCategory(
+    id: 'screenshot-sleep',
+    name: 'Sleep',
+    unit: 'min',
+    metricType: MetricType.sleep,
+    isOfficial: true,
+    children: sleepChildren,
+  );
+
+  // Distance: configured as a heatmap, so the tile answers how regularly
+  // rather than how much; the rest days stay visible as gaps
+  final distanceEntries = <MeasurementEntry>[];
+  for (var daysAgo = 90; daysAgo >= 0; daysAgo--) {
+    if (random.nextDouble() < 0.3) {
+      continue;
+    }
+    distanceEntries.add(
+      entry(
+        'screenshot-distance',
+        daysAgo,
+        ((2 + random.nextDouble() * 9) * 100).round() / 100,
+        day(daysAgo, hour: 21),
+      ),
+    );
+  }
+  final distance = MeasurementCategory(
+    id: 'screenshot-distance',
+    name: 'Distance',
+    unit: 'km',
+    metricType: MetricType.distance,
+    chartType: ChartType.heatmap,
+  );
+
+  // Biceps: the hand-kept tape measure, taken every few weeks. The sparse
+  // tile (dots, last-measured date) and the one entry of the quick-add menu.
+  final bicepsEntries = <MeasurementEntry>[];
+  final bicepsReadings = [(88, 37.6), (67, 37.9), (46, 38.1), (28, 38.3), (21, 38.5)];
+  for (final (daysAgo, value) in bicepsReadings) {
+    bicepsEntries.add(
+      entry('screenshot-biceps', daysAgo, value, day(daysAgo, hour: 9), source: 'user'),
+    );
+  }
+  final biceps = MeasurementCategory(id: 'screenshot-biceps', name: 'Biceps', unit: 'cm');
+
+  return (
+    categories: [
+      weight,
+      bloodPressure,
+      systolic,
+      diastolic,
+      bodyFat,
+      restingHeartRate,
+      sleep,
+      ...sleepChildren,
+      steps,
+      distance,
+      biceps,
+    ],
+    entries: {
+      weight.id!: weightEntries,
+      systolic.id!: systolicEntries,
+      diastolic.id!: diastolicEntries,
+      bodyFat.id!: bodyFatEntries,
+      restingHeartRate.id!: restingEntries,
+      'screenshot-sleep-total': sleepTotalEntries,
+      'screenshot-sleep-light': sleepLightEntries,
+      'screenshot-sleep-deep': sleepDeepEntries,
+      'screenshot-sleep-rem': sleepRemEntries,
+      steps.id!: stepEntries,
+      distance.id!: distanceEntries,
+      biceps.id!: bicepsEntries,
+    },
+  );
+}
diff --git a/test_data/screenshots/nutrition.dart b/test_data/screenshots/nutrition.dart
new file mode 100644
index 000000000..3e741f52a
--- /dev/null
+++ b/test_data/screenshots/nutrition.dart
@@ -0,0 +1,282 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:wger/features/nutrition/models/ingredient.dart';
+import 'package:wger/features/nutrition/models/log.dart';
+import 'package:wger/features/nutrition/models/meal.dart';
+import 'package:wger/features/nutrition/models/meal_item.dart';
+import 'package:wger/features/nutrition/models/nutritional_plan.dart';
+
+const _planUuid = 'cc000000-0000-4000-8000-000000000010';
+const _mealUuids = [
+  'cc000000-0000-4000-8000-000000000001',
+  'cc000000-0000-4000-8000-000000000002',
+  'cc000000-0000-4000-8000-000000000003',
+  'cc000000-0000-4000-8000-000000000004',
+];
+
+/// Nutrition values are per 100 g, roughly matching the real foods.
+Ingredient _ingredient(
+  int id,
+  String name, {
+  required int energy,
+  required num carbs,
+  required num sugar,
+  required num protein,
+  required num fat,
+  required num fatSaturated,
+  required num fiber,
+  bool isVegan = false,
+  NutriScore? nutriscore,
+}) => Ingredient(
+  remoteId: '$id',
+  sourceName: 'Built-in testdata',
+  sourceUrl: 'https://example.com/ingredient/$id',
+  id: id,
+  code: '20000000$id',
+  name: name,
+  created: DateTime(2026, 1, 1),
+  energy: energy,
+  carbohydrates: carbs,
+  carbohydratesSugar: sugar,
+  protein: protein,
+  fat: fat,
+  fatSaturated: fatSaturated,
+  fiber: fiber,
+  sodium: 0.05,
+  isVegan: isVegan,
+  isVegetarian: true,
+  nutriscore: nutriscore,
+);
+
+final _oats = _ingredient(
+  201,
+  'Rolled oats',
+  energy: 372,
+  carbs: 58.7,
+  sugar: 0.7,
+  protein: 13.5,
+  fat: 7,
+  fatSaturated: 1.2,
+  fiber: 10,
+  isVegan: true,
+  nutriscore: NutriScore.a,
+);
+final _milk = _ingredient(
+  202,
+  'Whole milk',
+  energy: 64,
+  carbs: 4.7,
+  sugar: 4.7,
+  protein: 3.4,
+  fat: 3.6,
+  fatSaturated: 2.3,
+  fiber: 0,
+  nutriscore: NutriScore.b,
+);
+final _banana = _ingredient(
+  203,
+  'Banana',
+  energy: 89,
+  carbs: 22.8,
+  sugar: 12.2,
+  protein: 1.1,
+  fat: 0.3,
+  fatSaturated: 0.1,
+  fiber: 2.6,
+  isVegan: true,
+  nutriscore: NutriScore.a,
+);
+final _chicken = _ingredient(
+  204,
+  'Chicken breast',
+  energy: 107,
+  carbs: 0,
+  sugar: 0,
+  protein: 23.1,
+  fat: 1.8,
+  fatSaturated: 0.5,
+  fiber: 0,
+  nutriscore: NutriScore.a,
+);
+final _rice = _ingredient(
+  205,
+  'Basmati rice, cooked',
+  energy: 130,
+  carbs: 28.2,
+  sugar: 0.1,
+  protein: 2.7,
+  fat: 0.3,
+  fatSaturated: 0.1,
+  fiber: 0.4,
+  isVegan: true,
+  nutriscore: NutriScore.a,
+);
+final _broccoli = _ingredient(
+  206,
+  'Broccoli',
+  energy: 34,
+  carbs: 6.6,
+  sugar: 1.7,
+  protein: 2.8,
+  fat: 0.4,
+  fatSaturated: 0.1,
+  fiber: 2.6,
+  isVegan: true,
+  nutriscore: NutriScore.a,
+);
+final _skyr = _ingredient(
+  207,
+  'Skyr',
+  energy: 63,
+  carbs: 4,
+  sugar: 4,
+  protein: 10.6,
+  fat: 0.2,
+  fatSaturated: 0.1,
+  fiber: 0,
+  nutriscore: NutriScore.a,
+);
+final _apple = _ingredient(
+  208,
+  'Apple',
+  energy: 52,
+  carbs: 13.8,
+  sugar: 10.4,
+  protein: 0.3,
+  fat: 0.2,
+  fatSaturated: 0,
+  fiber: 2.4,
+  isVegan: true,
+  nutriscore: NutriScore.a,
+);
+final _salmon = _ingredient(
+  209,
+  'Salmon fillet',
+  energy: 208,
+  carbs: 0,
+  sugar: 0,
+  protein: 20.4,
+  fat: 13.4,
+  fatSaturated: 3.1,
+  fiber: 0,
+  nutriscore: NutriScore.b,
+);
+final _potatoes = _ingredient(
+  210,
+  'Potatoes, boiled',
+  energy: 77,
+  carbs: 17,
+  sugar: 0.8,
+  protein: 2,
+  fat: 0.1,
+  fatSaturated: 0,
+  fiber: 2.2,
+  isVegan: true,
+  nutriscore: NutriScore.a,
+);
+
+/// A lean bulk plan running relative to today: four meals with real foods,
+/// explicit macro goals, breakfast, lunch and the snack already logged today,
+/// and two weeks of diary history for the logged chart.
+NutritionalPlan getNutritionalPlanScreenshot() {
+  final today = DateTime.now();
+
+  MealItem item(Ingredient ingredient, num amount) =>
+      MealItem(ingredientId: ingredient.id, amount: amount, ingredient: ingredient);
+
+  final meals = [
+    Meal(
+      id: _mealUuids[0],
+      plan: _planUuid,
+      time: const TimeOfDay(hour: 7, minute: 0),
+      name: 'Breakfast',
+      mealItems: [item(_oats, 80), item(_milk, 300), item(_banana, 120)],
+    ),
+    Meal(
+      id: _mealUuids[1],
+      plan: _planUuid,
+      time: const TimeOfDay(hour: 12, minute: 30),
+      name: 'Lunch',
+      mealItems: [item(_chicken, 180), item(_rice, 250), item(_broccoli, 150)],
+    ),
+    Meal(
+      id: _mealUuids[2],
+      plan: _planUuid,
+      time: const TimeOfDay(hour: 16, minute: 0),
+      name: 'Snack',
+      mealItems: [item(_skyr, 300), item(_apple, 180)],
+    ),
+    Meal(
+      id: _mealUuids[3],
+      plan: _planUuid,
+      time: const TimeOfDay(hour: 19, minute: 0),
+      name: 'Dinner',
+      mealItems: [item(_salmon, 200), item(_potatoes, 300), item(_broccoli, 150)],
+    ),
+  ];
+
+  final plan = NutritionalPlan(
+    id: _planUuid,
+    description: 'Lean bulk',
+    creationDate: today.subtract(const Duration(days: 45)),
+    startDate: today.subtract(const Duration(days: 45)),
+    onlyLogging: false,
+    hasGoalCalories: true,
+    goalEnergy: 2400,
+    goalProtein: 150,
+    goalCarbohydrates: 250,
+    goalFat: 80,
+    goalFiber: 30,
+    meals: meals,
+  );
+
+  // A meal logged on [date]: one diary entry per planned item, attached to
+  // the plan and, for today, to the meal so its card shows the progress
+  void logMeal(Meal meal, DateTime date) {
+    for (final mealItem in meal.mealItems) {
+      final log = LogItem.fromMealItem(mealItem, _planUuid, meal.id, date);
+      plan.diaryEntries.add(log);
+      if (date.day == today.day && date.month == today.month && date.year == today.year) {
+        meal.diaryEntries.add(log);
+      }
+    }
+  }
+
+  DateTime at(int daysAgo, TimeOfDay time) => DateTime(
+    today.year,
+    today.month,
+    today.day - daysAgo,
+    time.hour,
+    time.minute,
+  );
+
+  // Today: everything up to the afternoon snack is logged, dinner is not
+  for (final meal in meals.take(3)) {
+    logMeal(meal, at(0, meal.time!));
+  }
+  // Two weeks of full days for the diary chart and table
+  for (var daysAgo = 1; daysAgo <= 14; daysAgo++) {
+    for (final meal in meals) {
+      logMeal(meal, at(daysAgo, meal.time!));
+    }
+  }
+
+  return plan;
+}
diff --git a/test_data/screenshots/routines.dart b/test_data/screenshots/routines.dart
new file mode 100644
index 000000000..a4a05995f
--- /dev/null
+++ b/test_data/screenshots/routines.dart
@@ -0,0 +1,301 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:wger/features/exercises/models/exercise.dart';
+import 'package:wger/features/routines/models/base_config.dart';
+import 'package:wger/features/routines/models/day.dart';
+import 'package:wger/features/routines/models/day_data.dart';
+import 'package:wger/features/routines/models/log.dart';
+import 'package:wger/features/routines/models/routine.dart';
+import 'package:wger/features/routines/models/session.dart';
+import 'package:wger/features/routines/models/set_config_data.dart';
+import 'package:wger/features/routines/models/slot.dart';
+import 'package:wger/features/routines/models/slot_data.dart';
+import 'package:wger/features/routines/models/slot_entry.dart';
+
+import '../routines.dart';
+import 'exercises.dart';
+
+/// A three day push/pull/legs routine, running relative to today, with a
+/// completed push session for the gym mode summary. Built from the screenshot
+/// exercises so names are localized and the muscle distribution is real.
+Routine getScreenshotRoutine() {
+  final exercises = getScreenshotExercises();
+  final benchPress = exercises[0];
+  final crunches = exercises[1];
+  final deadLift = exercises[2];
+  final curls = exercises[3];
+  final squats = exercises[4];
+  final raises = exercises[5];
+
+  final today = DateTime.now();
+
+  SlotEntry entry(
+    int slotId,
+    Exercise exercise, {
+    required int sets,
+    required int reps,
+    required num weight,
+  }) => SlotEntry(
+    slotId: slotId,
+    type: SlotEntryType.normal,
+    order: 1,
+    exerciseId: exercise.id,
+    repetitionUnitId: 1,
+    repetitionRounding: 1,
+    weightUnitId: 1,
+    weightRounding: 1.25,
+    comment: '',
+    repetitionUnit: testRepetitionUnit1,
+    weightUnit: testWeightUnit1,
+    exercise: exercise,
+    nrOfSetsConfigs: [BaseConfig.firstIteration(sets, 1)],
+    repetitionsConfigs: [BaseConfig.firstIteration(reps, 1)],
+    weightConfigs: [BaseConfig.firstIteration(weight, 1)],
+  );
+
+  Slot slot(
+    int id,
+    int dayId,
+    int order,
+    Exercise exercise, {
+    required int sets,
+    required int reps,
+    required num weight,
+    String comment = '',
+  }) {
+    final slot = Slot.withData(id: id, day: dayId, order: order, comment: comment);
+    slot.addExerciseBase(exercise);
+    slot.entries.add(entry(id, exercise, sets: sets, reps: reps, weight: weight));
+    return slot;
+  }
+
+  final dayPush = Day(
+    id: 1,
+    routineId: 1,
+    name: 'Push day',
+    description: 'Chest, shoulders and triceps',
+    slots: [
+      slot(1, 1, 1, benchPress, sets: 4, reps: 8, weight: 80, comment: 'Warm up properly first'),
+      slot(2, 1, 2, raises, sets: 3, reps: 12, weight: 10),
+    ],
+  );
+  final dayPull = Day(
+    id: 2,
+    routineId: 1,
+    name: 'Pull day',
+    description: 'Back and biceps',
+    slots: [
+      slot(3, 2, 1, deadLift, sets: 3, reps: 5, weight: 120),
+      slot(4, 2, 2, curls, sets: 3, reps: 12, weight: 14),
+    ],
+  );
+  final dayLegs = Day(
+    id: 3,
+    routineId: 1,
+    name: 'Legs and core',
+    description: 'Legs and abs',
+    slots: [
+      slot(5, 3, 1, squats, sets: 4, reps: 15, weight: 0),
+      slot(6, 3, 2, crunches, sets: 3, reps: 20, weight: 0),
+    ],
+  );
+
+  // One collapsed entry per exercise, the way the routine detail screen
+  // shows a day
+  SetConfigData displaySet(
+    Exercise exercise, {
+    required int sets,
+    required int reps,
+    num? weight,
+    int? restTime,
+    double? rir,
+  }) => SetConfigData(
+    exerciseId: exercise.id,
+    exercise: exercise,
+    slotEntryId: 1,
+    nrOfSets: sets,
+    repetitions: reps,
+    repetitionsUnit: testRepetitionUnit1,
+    weight: weight ?? 0,
+    weightUnit: testWeightUnit1,
+    restTime: restTime,
+    rir: rir,
+    rpe: null,
+    textRepr: weight == null ? '$sets sets $reps reps' : '$sets sets ${reps}x${weight}kg',
+  );
+
+  // One entry per set, the way gym mode steps through a day
+  SetConfigData gymSet(Exercise exercise, {required int reps, required num weight}) =>
+      SetConfigData(
+        exerciseId: exercise.id,
+        exercise: exercise,
+        slotEntryId: 1,
+        nrOfSets: 1,
+        repetitions: reps,
+        repetitionsUnit: testRepetitionUnit1,
+        weight: weight,
+        weightUnit: testWeightUnit1,
+        restTime: 120,
+        rir: 2,
+        rpe: null,
+        textRepr: '${reps}x${weight}kg',
+      );
+
+  final dayData = [
+    DayData(
+      iteration: 1,
+      date: today,
+      label: '',
+      day: dayPush,
+      slots: [
+        SlotData(
+          comment: 'Warm up properly first',
+          isSuperset: false,
+          exerciseIds: [benchPress.id],
+          setConfigs: [displaySet(benchPress, sets: 4, reps: 8, weight: 80, restTime: 120, rir: 2)],
+        ),
+        SlotData(
+          comment: '',
+          isSuperset: false,
+          exerciseIds: [raises.id],
+          setConfigs: [displaySet(raises, sets: 3, reps: 12, weight: 10, restTime: 60)],
+        ),
+      ],
+    ),
+    DayData(
+      iteration: 1,
+      date: today.add(const Duration(days: 2)),
+      label: '',
+      day: dayPull,
+      slots: [
+        SlotData(
+          comment: 'Reset your form between the reps',
+          isSuperset: false,
+          exerciseIds: [deadLift.id],
+          setConfigs: [displaySet(deadLift, sets: 3, reps: 5, weight: 120, restTime: 180, rir: 1)],
+        ),
+        SlotData(
+          comment: '',
+          isSuperset: false,
+          exerciseIds: [curls.id],
+          setConfigs: [displaySet(curls, sets: 3, reps: 12, weight: 14, restTime: 60)],
+        ),
+      ],
+    ),
+    DayData(
+      iteration: 1,
+      date: today.add(const Duration(days: 4)),
+      label: '',
+      day: dayLegs,
+      slots: [
+        SlotData(
+          comment: 'Keep a steady pace and brace your core',
+          isSuperset: false,
+          exerciseIds: [squats.id],
+          setConfigs: [displaySet(squats, sets: 4, reps: 15)],
+        ),
+        SlotData(
+          comment: '',
+          isSuperset: false,
+          exerciseIds: [crunches.id],
+          setConfigs: [displaySet(crunches, sets: 3, reps: 20)],
+        ),
+      ],
+    ),
+  ];
+
+  final dayDataGym = [
+    DayData(
+      iteration: 1,
+      date: today,
+      label: '',
+      day: dayPush,
+      slots: [
+        SlotData(
+          comment: 'Warm up properly first',
+          isSuperset: false,
+          exerciseIds: [benchPress.id],
+          setConfigs: [for (var i = 0; i < 4; i++) gymSet(benchPress, reps: 8, weight: 80)],
+        ),
+        SlotData(
+          comment: '',
+          isSuperset: false,
+          exerciseIds: [raises.id],
+          setConfigs: [for (var i = 0; i < 3; i++) gymSet(raises, reps: 12, weight: 10)],
+        ),
+      ],
+    ),
+  ];
+
+  // The push session behind the gym mode summary: every planned set logged
+  var logId = 0;
+  Log log(Exercise exercise, {required num weight, required int reps, double? rir}) {
+    final log = Log(
+      id: 'screenshot-log-${logId++}',
+      exerciseId: exercise.id,
+      iteration: 1,
+      slotEntryId: 1,
+      weight: weight,
+      rir: rir,
+      date: today,
+      repetitions: reps,
+      routineId: 1,
+    );
+    log.exercise = exercise;
+    log.weightUnit = testWeightUnit1;
+    log.repetitionUnit = testRepetitionUnit1;
+    return log;
+  }
+
+  final session = WorkoutSession(
+    id: 'screenshot-session-1',
+    routineId: 1,
+    date: today,
+    impression: WorkoutImpression.good,
+    notes: 'Bench felt strong today',
+    timeStart: const TimeOfDay(hour: 17, minute: 30),
+    timeEnd: const TimeOfDay(hour: 18, minute: 42),
+    logs: [
+      log(benchPress, weight: 80, reps: 8, rir: 2),
+      log(benchPress, weight: 80, reps: 8, rir: 2),
+      log(benchPress, weight: 80, reps: 8, rir: 1.5),
+      log(benchPress, weight: 80, reps: 8, rir: 1),
+      log(raises, weight: 10, reps: 12, rir: 2),
+      log(raises, weight: 10, reps: 12, rir: 2),
+      log(raises, weight: 10, reps: 12, rir: 1),
+    ],
+  );
+
+  return Routine(
+    id: 1,
+    created: today.subtract(const Duration(days: 42)),
+    name: '3 day split',
+    description:
+        'Push, pull and legs across the week. Add weight as soon as you hit '
+        'the top of the rep range on every set.',
+    start: today.subtract(const Duration(days: 42)),
+    end: today.add(const Duration(days: 42)),
+    days: [dayPush, dayPull, dayLegs],
+    sessions: [session],
+    dayData: dayData,
+    dayDataGym: dayDataGym,
+    isHydrated: true,
+  );
+}
diff --git a/test_data/screenshots/weight.dart b/test_data/screenshots/weight.dart
new file mode 100644
index 000000000..c2f100984
--- /dev/null
+++ b/test_data/screenshots/weight.dart
@@ -0,0 +1,98 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'dart:math';
+
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/nutrition/models/nutritional_plan.dart';
+
+import '../body_weight.dart';
+
+/// A year of body weight ending today, shaped like a real log: a slow drift
+/// up, a successful cut over the period of [getScreenshotWeightPlans]' first
+/// plan, a short maintenance phase, and a fresh cut under the active plan.
+/// The cut and the active plan fall inside the last three months, so the
+/// story is visible in every chart range.
+///
+/// Deterministic (fixed random seed); only the dates move with today.
+Map<String, List<MeasurementEntry>> getScreenshotBodyWeightEntries() {
+  final random = Random(42);
+  final today = DateTime.now();
+
+  // Piecewise linear phases over the last year, oldest first
+  double weightAt(int daysAgo) {
+    double phase(int from, int to, double start, double end) =>
+        start + (end - start) * (from - daysAgo) / (from - to);
+
+    if (daysAgo > 100) {
+      return phase(365, 100, 85.8, 87.5);
+    }
+    if (daysAgo > 75) {
+      return phase(100, 75, 87.5, 87.6);
+    }
+    if (daysAgo > 25) {
+      return phase(75, 25, 87.6, 82.5);
+    }
+    if (daysAgo > 10) {
+      return phase(25, 10, 82.5, 82.9);
+    }
+    return phase(10, 0, 82.9, 82.3);
+  }
+
+  final entries = <MeasurementEntry>[];
+  // Weigh-ins every two to three days, in the morning, with scale-level noise
+  for (var daysAgo = 365; daysAgo >= 0; daysAgo -= 2 + random.nextInt(2)) {
+    final value = weightAt(daysAgo) + (random.nextDouble() - 0.5) * 0.7;
+    entries.add(
+      MeasurementEntry(
+        id: 'screenshot-weight-${entries.length}',
+        categoryId: testBodyWeightCategoryId,
+        value: double.parse(value.toStringAsFixed(1)),
+        date: DateTime(today.year, today.month, today.day - daysAgo, 7, 30),
+        notes: '',
+      ),
+    );
+  }
+
+  // newest first, matching the order the paged list reads them in
+  return bodyWeightEntries(entries.reversed.toList());
+}
+
+/// The nutrition plans behind the weight phases of
+/// [getScreenshotBodyWeightEntries]: a finished cut covering the big drop
+/// and a currently active plan. Shown as period bands in the weight chart.
+List<NutritionalPlan> getScreenshotWeightPlans() {
+  final today = DateTime.now();
+  DateTime daysAgo(int days) => DateTime(today.year, today.month, today.day - days);
+
+  return [
+    NutritionalPlan(
+      id: 'bb000000-0000-4000-8000-000000000001',
+      description: 'Summer cut',
+      startDate: daysAgo(75),
+      endDate: daysAgo(25),
+      onlyLogging: true,
+    ),
+    NutritionalPlan(
+      id: 'bb000000-0000-4000-8000-000000000002',
+      description: 'Mini cut',
+      startDate: daysAgo(10),
+      onlyLogging: true,
+    ),
+  ];
+}
diff --git a/test_data/trophies.dart b/test_data/trophies.dart
index 524eada51..981d119f7 100644
--- a/test_data/trophies.dart
+++ b/test_data/trophies.dart
@@ -58,7 +58,7 @@ List<UserTrophy> getScreenshotUserTrophies() {
       trophy: trophy(
         2,
         '5000 kg lifted',
-        'Lifted a whole elefant',
+        'Lifted a whole elephant',
         TrophyType.volume,
         'volume/5353989b-adc0-481b-a9bc-64365a9179e8.png',
       ),